diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index aa87558f3..dbaf3a7e5 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -17,6 +17,7 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
+#include "include/extinit_priv.h"
 #include "os/ddx_priv.h"
 
 #include "screenint.h"
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 8b5b7c38e..55304569e 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -42,6 +42,7 @@
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
 
+#include "extinit_priv.h"
 #include <micmap.h>
 #include <misyncshm.h>
 #include <os.h>
diff --git a/include/extinit.h b/include/extinit.h
index 1ad7cf1c3..937f71e0e 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -57,60 +57,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
 
-#ifdef DAMAGE
-extern _X_EXPORT Bool noDamageExtension;
-#endif
-
-#if defined(DBE)
-extern _X_EXPORT Bool noDbeExtension;
-#endif
-
-#if defined(DPMSExtension)
-extern _X_EXPORT Bool noDPMSExtension;
-#endif
-
-#ifdef GLXEXT
-extern _X_EXPORT Bool noGlxExtension;
-#endif
-
 #ifdef XINERAMA
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif /* XINERAMA */
 
-#ifdef RANDR
-extern _X_EXPORT Bool noRRExtension;
-#endif
-
-extern _X_EXPORT Bool noRenderExtension;
-
-#if defined(RES)
-extern _X_EXPORT Bool noResExtension;
-#endif
-
-#if defined(SCREENSAVER)
-extern _X_EXPORT Bool noScreenSaverExtension;
-#endif
-
-extern _X_EXPORT Bool noShapeExtension;
-
-#ifdef MITSHM
-extern _X_EXPORT Bool noMITShmExtension;
-#endif
-
-#ifdef XCSECURITY
-extern _X_EXPORT Bool noSecurityExtension;
-#endif
-
-#ifdef XF86BIGFONT
-extern _X_EXPORT Bool noXFree86BigfontExtension;
-#endif
-
-extern _X_EXPORT Bool noXFixesExtension;
-
-#if defined(XSELINUX)
-extern _X_EXPORT Bool noSELinuxExtension;
-#endif
-
 #if defined(XV)
 extern _X_EXPORT Bool noXvExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index 186fe8ad2..7ecbb55d5 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -8,7 +8,22 @@
 
 #include "extinit.h"
 
+extern Bool noDamageExtension;
+extern Bool noDbeExtension;
+extern Bool noDPMSExtension;
 extern Bool noGEExtension;
+extern Bool noGlxExtension;
+extern Bool noMITShmExtension;
+extern Bool noRenderExtension;
+extern Bool noResExtension;
+extern Bool noRRExtension;
+extern Bool noScreenSaverExtension;
+extern Bool noSecurityExtension;
+extern Bool noSELinuxExtension;
+extern Bool noShapeExtension;
+extern Bool noTestExtensions;
+extern Bool noXFixesExtension;
+extern Bool noXFree86BigfontExtension;
 
 void CompositeExtensionInit(void);
 void DamageExtensionInit(void);
diff --git a/include/globals.h b/include/globals.h
index 1ce5e8d39..65a25855e 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 a2c6c85e8..87c81f860 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -118,6 +118,7 @@ __stdcall unsigned long GetTickCount(void);
 #include "present.h"
 #include "dixstruct_priv.h"
 #include "dpmsproc.h"
+#include "extinit_priv.h"
 
 #define X_INCLUDE_NETDB_H
 #include <X11/Xos_r.h>