diff --git a/Xext/xtest.c b/Xext/xtest.c
index f881d8b42..757399b8d 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -60,6 +60,8 @@
 #include "inpututils.h"
 #include "extinit_priv.h"
 
+Bool noTestExtensions = FALSE;
+
 /* XTest events are sent during request processing and may be interrupted by
  * a SIGIO. We need a separate event list to avoid events overwriting each
  * other's memory.
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index dd96e89f7..70648eb30 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -37,6 +37,8 @@
 #import "X11Application.h"
 #import "NSUserDefaults+XQuartzDefaults.h"
 
+#include "include/extinit_priv.h"
+
 #include "darwin.h"
 #include "quartz.h"
 #include "darwinEvents.h"
@@ -80,7 +82,6 @@ static dispatch_queue_t eventTranslationQueue;
 #define APPKIT_APPFLAGS_HACK 1
 #endif
 
-extern Bool noTestExtensions;
 extern Bool noRenderExtension;
 
 static TISInputSourceRef last_key_layout;
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index e17535e33..0d5553c46 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -13,6 +13,7 @@ extern Bool noDbeExtension;
 extern Bool noDPMSExtension;
 extern Bool noGEExtension;
 extern Bool noGlxExtension;
+extern Bool noTestExtensions;
 
 void CompositeExtensionInit(void);
 void DamageExtensionInit(void);
diff --git a/include/globals.h b/include/globals.h
index 887e788c8..47b5bf1a7 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -25,7 +25,6 @@ extern _X_EXPORT int monitorResolution;
 extern _X_EXPORT int defaultColorVisualClass;
 
 extern _X_EXPORT int GrabInProgress;
-extern _X_EXPORT Bool noTestExtensions;
 extern _X_EXPORT char *SeatId;
 extern _X_EXPORT char *ConnectionInfo;
 extern _X_EXPORT sig_atomic_t inSignalContext;
diff --git a/os/utils.c b/os/utils.c
index 73c973b16..bf02bd2d7 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -121,8 +121,6 @@ __stdcall unsigned long GetTickCount(void);
 #include "dixstruct_priv.h"
 #include "dpmsproc.h"
 
-Bool noTestExtensions;
-
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif