diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 44a8e7dd8..f56a18e3e 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -58,18 +58,20 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/xf86bigfproto.h>
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "dixfontstr.h"
 #include "extnsionst.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "protocol-versions.h"
-
-#include <X11/extensions/xf86bigfproto.h>
 #include "xf86bigfontsrv.h"
 
+Bool noXFree86BigfontExtension = FALSE;
+
 static void XF86BigfontResetProc(ExtensionEntry *       /* extEntry */
     );
 
diff --git a/include/extinit.h b/include/extinit.h
index c8b5857b3..3825f43a7 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -62,10 +62,6 @@ extern _X_EXPORT Bool noCompositeExtension;
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif
 
-#ifdef XF86BIGFONT
-extern _X_EXPORT Bool noXFree86BigfontExtension;
-#endif
-
 extern _X_EXPORT Bool noXFixesExtension;
 
 #if defined(XSELINUX)
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index 2f0c3f23b..d5b099701 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -21,6 +21,7 @@ extern Bool noScreenSaverExtension;
 extern Bool noSecurityExtension;
 extern Bool noShapeExtension;
 extern Bool noTestExtensions;
+extern Bool noXFree86BigfontExtension;
 
 void CompositeExtensionInit(void);
 void DamageExtensionInit(void);
diff --git a/os/utils.c b/os/utils.c
index dc99a243e..4a3e12a79 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -123,9 +123,6 @@ __stdcall unsigned long GetTickCount(void);
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
-#ifdef XF86BIGFONT
-Bool noXFree86BigfontExtension = FALSE;
-#endif
 #ifdef XFreeXDGA
 Bool noXFree86DGAExtension = FALSE;
 #endif