diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index c3fbf4580..9da463f44 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -66,6 +66,8 @@ extern Bool party_like_its_1989;
 /* needed by libglx and libglamor (server modules) */
 extern _X_EXPORT Bool enableIndirectGLX;
 
+extern const char *defaultFontPath;
+
 /*
  * @brief callback right after one screen's root window has been initialized
  *
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 5d716acae..ae1761939 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -29,6 +29,7 @@
 
 #include <errno.h>
 
+#include "dix/dix_priv.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 #include "os/serverlock.h"
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
index 0cde2cd65..fc4103697 100644
--- a/hw/xwin/winconfig.c
+++ b/hw/xwin/winconfig.c
@@ -31,6 +31,9 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
+
+#include "dix/dix_priv.h"
+
 #include "win.h"
 #include "winconfig.h"
 #include "winmsg.h"
diff --git a/include/globals.h b/include/globals.h
index 78a0cbcf0..454f101d9 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -6,7 +6,6 @@
 
 /* Global X server variables that are visible to mi, dix, os, and ddx */
 
-extern _X_EXPORT const char *defaultFontPath;
 extern _X_EXPORT int monitorResolution;
 extern _X_EXPORT int defaultColorVisualClass;