diff --git a/composite/compext.c b/composite/compext.c
index 0408ba79b2..421f7e627b 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -133,15 +133,15 @@ ProcCompositeQueryVersion(ClientPtr client)
     return X_SEND_REPLY_SIMPLE(client, rep);
 }
 
-#define VERIFY_WINDOW(pWindow, wid, client, mode)			\
-    do {								\
-	int err;							\
-	err = dixLookupResourceByType((void **) &pWindow, wid,	\
-				      X11_RESTYPE_WINDOW, client, mode);\
-	if (err != Success) {						\
-	    client->errorValue = wid;					\
-	    return err;							\
-	}								\
+#define VERIFY_WINDOW(pWindow, wid, client, mode)                       \
+    do {                                                                \
+        int err;                                                        \
+        err = dixLookupResourceByType((void **) &pWindow, wid,          \
+                                      X11_RESTYPE_WINDOW, client, mode);\
+        if (err != Success) {                                           \
+            client->errorValue = wid;                                   \
+            return err;                                                 \
+        }                                                               \
     } while (0)
 
 static int
diff --git a/composite/meson.build b/composite/meson.build
index af059714ba..3c88fb53e8 100644
--- a/composite/meson.build
+++ b/composite/meson.build
@@ -1,19 +1,19 @@
 srcs_composite = [
-	'compalloc.c',
-	'compext.c',
-	'compinit.c',
-	'compoverlay.c',
-	'compwindow.c',
+    'compalloc.c',
+    'compext.c',
+    'compinit.c',
+    'compoverlay.c',
+    'compwindow.c',
 ]
 
 hdrs_composite = [
-	'compositeext.h',
+    'compositeext.h',
 ]
 
 libxserver_composite = static_library('xserver_composite',
-	srcs_composite,
-	include_directories: inc,
-	dependencies: common_dep,
+    srcs_composite,
+    include_directories: inc,
+    dependencies: common_dep,
 )
 
 if build_xorg