diff --git a/Xext/saver.c b/Xext/saver.c
index f82607e7a..0a239cdd9 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -46,6 +46,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "extnsionst.h"
 #include "dixstruct.h"
 #include "resource.h"
+#include "opaque.h"
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
diff --git a/Xext/sync.c b/Xext/sync.c
index e0c012849..60cfc837d 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -67,6 +67,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "dixstruct.h"
 #include "pixmapstr.h"
 #include "resource.h"
+#include "opaque.h"
 #include "syncsrv.h"
 #include "syncsdk.h"
 #include "protocol-versions.h"
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index ec2ff44be..bb2773a24 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -230,26 +230,4 @@ int CorePointerProc(DeviceIntPtr dev, int what);
 
 int CoreKeyboardProc(DeviceIntPtr dev, int what);
 
-extern Bool whiteRoot;
-
-extern volatile char isItTimeToYield;
-
-/* bit values for dispatchException */
-#define DE_RESET     1
-#define DE_TERMINATE 2
-#define DE_PRIORITYCHANGE 4     /* set when a client's priority changes */
-
-extern volatile char dispatchException;
-
-extern int ScreenSaverBlanking;
-extern int ScreenSaverAllowExposures;
-extern int defaultScreenSaverBlanking;
-extern int defaultScreenSaverAllowExposures;
-extern const char *display;
-extern int displayfd;
-extern Bool explicit_display;
-
-extern Bool disableBackingStore;
-extern Bool enableBackingStore;
-
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/main.c b/dix/main.c
index 040dfd225..d4b78e248 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -110,6 +110,10 @@ Equipment Corporation.
 #include "colormapst.h"
 #include "cursorstr.h"
 #include "selection.h"
+#include <X11/fonts/font.h>
+#include <X11/fonts/fontstruct.h>
+#include <X11/fonts/libxfont2.h>
+#include "opaque.h"
 #include "servermd.h"
 #include "dixfont.h"
 #include "extnsionst.h"
diff --git a/glx/vndext.c b/glx/vndext.c
index a0519ff65..92b3001a3 100644
--- a/glx/vndext.c
+++ b/glx/vndext.c
@@ -40,8 +40,6 @@
 #include <GL/glxproto.h>
 #include "vndservervendor.h"
 
-#include "dix/dix_priv.h"
-
 ExtensionEntry *GlxExtensionEntry;
 int GlxErrorBase = 0;
 static CallbackListRec vndInitCallbackList;
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 0ce862fc9..ed4f85e9a 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -62,8 +62,6 @@
 
 #include "dix/input_priv.h"
 
-#include "dix/dix_priv.h"
-
 #include "misc.h"
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index dac4b4ed6..af49de8ef 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -32,8 +32,6 @@
 #include <X11/X.h>
 #include <X11/Xatom.h>
 
-#include "dix/dix_priv.h"
-
 #include "compositeext.h"
 #include "compint.h"
 #include "inputstr.h"
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index aeb6b9f84..30d3f625b 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -70,8 +70,6 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
 #include "extinit_priv.h"
 #include "pseudoramiX/pseudoramiX.h"
 
-#include "dix/dix_priv.h"
-
 #include "glx_extinit.h"
 #ifdef XWIN_GLX_WINDOWS
 #include "glx/glwindows.h"
diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c
index 58247675f..e3238ae76 100644
--- a/hw/xwin/wincreatewnd.c
+++ b/hw/xwin/wincreatewnd.c
@@ -31,9 +31,6 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
-
-#include "dix/dix_priv.h"
-
 #include "win.h"
 #include "shellapi.h"
 
diff --git a/hw/xwin/windisplay.c b/hw/xwin/windisplay.c
index 52ece1d88..17f0c7789 100644
--- a/hw/xwin/windisplay.c
+++ b/hw/xwin/windisplay.c
@@ -30,8 +30,6 @@
 #endif
 
 #include <opaque.h>             // for display
-#include "dix/dix_priv.h"       // for display
-
 #include "windisplay.h"
 #include "winmsg.h"
 
diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c
index 7da170d27..5d1e6aefa 100644
--- a/hw/xwin/wintrayicon.c
+++ b/hw/xwin/wintrayicon.c
@@ -38,8 +38,6 @@
 #include "winprefs.h"
 #include "winclipboard/winclipboard.h"
 
-#include "dix/dix_priv.h"
-
 /*
  * Initialize the tray icon
  */
diff --git a/include/opaque.h b/include/opaque.h
index 7850792e8..022efb4bc 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -35,6 +35,27 @@ from The Open Group.
 
 // needed by libglx and libglamor (server modules)
 extern _X_EXPORT Bool enableIndirectGLX;
+extern _X_EXPORT volatile char isItTimeToYield;
+extern _X_EXPORT volatile char dispatchException;
+
+/* bit values for dispatchException */
+#define DE_RESET     1
+#define DE_TERMINATE 2
+#define DE_PRIORITYCHANGE 4     /* set when a client's priority changes */
+
+extern _X_EXPORT int ScreenSaverBlanking;
+extern _X_EXPORT int ScreenSaverAllowExposures;
+extern _X_EXPORT int defaultScreenSaverBlanking;
+extern _X_EXPORT int defaultScreenSaverAllowExposures;
+extern _X_EXPORT const char *display;
+extern _X_EXPORT int displayfd;
+extern _X_EXPORT Bool explicit_display;
+
+extern _X_EXPORT Bool disableBackingStore;
+extern _X_EXPORT Bool enableBackingStore;
+extern _X_EXPORT Bool RunFromSigStopParent;
+
+extern _X_EXPORT Bool whiteRoot;
 extern _X_EXPORT Bool bgNoneRoot;
 
 #endif                          /* OPAQUE_H */
diff --git a/os/WaitFor.c b/os/WaitFor.c
index a616850ab..e7cbf81e0 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -70,7 +70,7 @@ SOFTWARE.
 #include "misc.h"
 #include "osdep.h"
 #include "dixstruct_priv.h"
-#include "globals.h"
+#include "opaque.h"
 #ifdef DPMSExtension
 #include "dpmsproc.h"
 #endif
diff --git a/os/connection.c b/os/connection.c
index 64aca9081..4618c7ce3 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -103,6 +103,7 @@ SOFTWARE.
 #include "os/osdep.h"
 
 #include "misc.h"               /* for typedef of pointer */
+#include "opaque.h"
 #include "dixstruct_priv.h"
 #include "globals.h"
 #include "xace.h"
diff --git a/os/osinit.c b/os/osinit.c
index 726602d0c..0e89e84c7 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -61,7 +61,6 @@ SOFTWARE.
 #include <execinfo.h>
 #endif
 
-#include "dix/dix_priv.h"
 #include "os/busfault.h"
 #include "os/serverlock.h"
 
diff --git a/os/utils.c b/os/utils.c
index 57c21a448..bc62d37df 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -184,8 +184,6 @@ Bool noGEExtension = FALSE;
 
 Bool CoreDump;
 
-Bool enableIndirectGLX = FALSE;
-
 Bool AllowByteSwappedClients = FALSE;
 
 #ifdef XINERAMA
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 955cee1b4..395635966 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -38,7 +38,6 @@
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
-#include "dix/dix_priv.h"
 #include "os/auth.h"
 
 #include "misc.h"
@@ -47,6 +46,7 @@
 #include "xdmauth.h"
 #include "input.h"
 #include "dixstruct.h"
+#include "opaque.h"
 
 #define XSERV_t
 #define TRANS_SERVER
diff --git a/randr/rrproperty.c b/randr/rrproperty.c
index f97c3464f..594fe5185 100644
--- a/randr/rrproperty.c
+++ b/randr/rrproperty.c
@@ -19,15 +19,11 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
-#include <dix-config.h>
-
-#include <X11/Xatom.h>
-
-#include "dix/dix_priv.h"
 
 #include "randrstr_priv.h"
 #include "propertyst.h"
 #include "swaprep.h"
+#include <X11/Xatom.h>
 
 static int
 DeliverPropertyEvent(WindowPtr pWin, void *value)
diff --git a/randr/rrproviderproperty.c b/randr/rrproviderproperty.c
index e84e0dff3..7c851c86b 100644
--- a/randr/rrproviderproperty.c
+++ b/randr/rrproviderproperty.c
@@ -19,9 +19,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
-#include <dix-config.h>
-
-#include "dix/dix_priv.h"
 
 #include "randrstr_priv.h"
 #include "propertyst.h"
diff --git a/xfixes/disconnect.c b/xfixes/disconnect.c
index 5b2945a4a..41be12d95 100644
--- a/xfixes/disconnect.c
+++ b/xfixes/disconnect.c
@@ -47,6 +47,7 @@
 #include "dix/dix_priv.h"
 
 #include "xfixesint.h"
+#include "opaque.h"
 
 static DevPrivateKeyRec ClientDisconnectPrivateKeyRec;
 
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 30f593bda..f3026ea3d 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -38,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XKM.h>
 
-#include "dix/dix_priv.h"
 #include "os/osdep.h"
 
 #include "inputstr.h"