diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index bcf96d2cc..306b694d4 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -753,7 +753,6 @@ dispatch_scroll_motion(struct xwl_seat *xwl_seat)
                        MotionNotify, 0, POINTER_RELATIVE, &mask);
 }
 
-
 static void
 dispatch_pointer_motion_event(struct xwl_seat *xwl_seat)
 {
@@ -1704,7 +1703,6 @@ enable_device(struct xwl_seat *xwl_seat, DeviceIntPtr dev)
     EnableDevice(dev, TRUE);
 }
 
-
 static void
 init_pointer(struct xwl_seat *xwl_seat)
 {
@@ -2526,7 +2524,6 @@ static const struct zwp_tablet_pad_ring_v2_listener tablet_pad_ring_listener = {
     tablet_pad_ring_frame,
 };
 
-
 static void
 tablet_pad_strip_destroy(struct xwl_tablet_pad_strip *strip)
 {
diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
index 970fd289f..447a14b5d 100644
--- a/hw/xwayland/xwayland-output.c
+++ b/hw/xwayland/xwayland-output.c
@@ -952,7 +952,6 @@ xwl_output_from_wl_output(struct xwl_screen *xwl_screen,
     return NULL;
 }
 
-
 struct xwl_output *
 xwl_output_get_output_from_name(struct xwl_screen *xwl_screen, const char *name)
 {
diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
index 8e800d91b..f349f711b 100644
--- a/hw/xwayland/xwayland-present.c
+++ b/hw/xwayland/xwayland-present.c
@@ -47,7 +47,6 @@
 
 #define XWL_PRESENT_CAPS PresentCapabilityAsync | PresentCapabilityAsyncMayTear
 
-
 /*
  * When not flipping let Present copy with 60fps.
  * When flipping wait on frame_callback, otherwise
@@ -218,7 +217,6 @@ xwl_present_reset_timer(struct xwl_present_window *xwl_present_window)
     }
 }
 
-
 static void
 xwl_present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc);
 
@@ -463,7 +461,6 @@ xwl_present_update_window_crtc(present_window_priv_ptr window_priv, RRCrtcPtr cr
     window_priv->crtc = crtc;
 }
 
-
 void
 xwl_present_cleanup(WindowPtr window)
 {
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 1bdd957db..44e4a8055 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -1039,7 +1039,6 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
                              &registry_listener, xwl_screen);
     xwl_screen_roundtrip(xwl_screen);
 
-
     if (xwl_screen->fullscreen && xwl_screen->rootless) {
         ErrorF("error, cannot set fullscreen when running rootless\n");
         return FALSE;
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index e37bb4c51..1b3e383c0 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -1327,7 +1327,6 @@ xwl_create_root_surface(struct xwl_window *xwl_window)
     WindowPtr window = xwl_window->toplevel;
     struct wl_region *region;
 
-
 #ifdef XWL_HAS_LIBDECOR
     if (xwl_screen->decorate) {
         xwl_window->libdecor_frame =
diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
index 3890df303..05919a246 100644
--- a/hw/xwayland/xwayland-xtest.c
+++ b/hw/xwayland/xwayland-xtest.c
@@ -641,7 +641,6 @@ xwayland_xtest_fallback(DeviceIntPtr dev,
     }
 }
 
-
 static void
 xwayland_xtest_send_events(DeviceIntPtr dev,
                            int type, int detail, int flags, const ValuatorMask *mask)
@@ -695,7 +694,6 @@ xwayland_xtest_send_events(DeviceIntPtr dev,
         debug_ei("Not yet connected to EIS, queueing events\n");
         xwl_queue_emulated_event(xwl_ei_client, dev, type, detail, flags, mask);
     }
-
 }
 
 static bool