diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 6ff0ddda71..50d67b8349 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -60,6 +60,9 @@ extern HWEventQueuePtr checkForInput[2];
  /* -retro mode */
 extern Bool party_like_its_1989;
 
+/* needed by libglx and libglamor (server modules) */
+extern _X_EXPORT Bool enableIndirectGLX;
+
 /*
  * @brief callback right after one screen's root window has been initialized
  *
diff --git a/glamor/glamor_glx_provider.c b/glamor/glamor_glx_provider.c
index c27141c7c1..0545eb351b 100644
--- a/glamor/glamor_glx_provider.c
+++ b/glamor/glamor_glx_provider.c
@@ -32,6 +32,8 @@
 
 #include <dix-config.h>
 
+#include "dix/dix_priv.h"
+
 #define MESA_EGL_NO_X11_HEADERS
 #define EGL_NO_X11
 #include <epoxy/egl.h>
diff --git a/glx/createcontext.c b/glx/createcontext.c
index 4259ad99dc..0654666da1 100644
--- a/glx/createcontext.c
+++ b/glx/createcontext.c
@@ -23,6 +23,9 @@
 #include <dix-config.h>
 
 #include <GL/glxtokens.h>
+
+#include "dix/dix_priv.h"
+
 #include "glxserver.h"
 #include "glxext.h"
 #include "indirect_dispatch.h"
diff --git a/glx/extension_string.c b/glx/extension_string.c
index 0b3db576da..4170a8f9e4 100644
--- a/glx/extension_string.c
+++ b/glx/extension_string.c
@@ -33,6 +33,7 @@
 
 #include <dix-config.h>
 
+#include "dix/dix_priv.h"
 #include "include/extinit.h"
 
 #include "extension_string.h"
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index e98db459b4..d5dea0edeb 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -50,6 +50,7 @@
 #include <sys/types.h>
 #include <grp.h>
 
+#include "dix/dix_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/screensaver_priv.h"
 #include "include/extinit.h"
diff --git a/include/opaque.h b/include/opaque.h
index 7850792e88..b924cfa19c 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -33,8 +33,6 @@ from The Open Group.
 
 #include "globals.h"
 
-// needed by libglx and libglamor (server modules)
-extern _X_EXPORT Bool enableIndirectGLX;
 extern _X_EXPORT Bool bgNoneRoot;
 
 #endif                          /* OPAQUE_H */