diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index c0fcfe14d..463adfdca 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -266,9 +266,6 @@ xf86PrintModes(ScrnInfoPtr scrp);
 extern _X_EXPORT void
 xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts);
 
-/* xf86Extensions.c */
-extern void xf86ExtensionInit(void);
-
 /* convert ScreenPtr to ScrnInfoPtr */
 extern _X_EXPORT ScrnInfoPtr xf86ScreenToScrn(ScreenPtr pScreen);
 /* convert ScrnInfoPtr to ScreenPtr */
diff --git a/hw/xfree86/common/xf86Extensions.c b/hw/xfree86/common/xf86Extensions.c
index f6869ba93..2e898fd80 100644
--- a/hw/xfree86/common/xf86Extensions.c
+++ b/hw/xfree86/common/xf86Extensions.c
@@ -30,7 +30,7 @@
 #include "extension.h"
 #include "globals.h"
 
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Config.h"
 #include "xf86Module.h"
 #include "xf86Extensions.h"
diff --git a/hw/xfree86/common/xf86_priv.h b/hw/xfree86/common/xf86_priv.h
index 9ffabd68d..ec932cf83 100644
--- a/hw/xfree86/common/xf86_priv.h
+++ b/hw/xfree86/common/xf86_priv.h
@@ -35,4 +35,7 @@ ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int fla
 /* xf86RandR.c */
 Bool xf86RandRInit(ScreenPtr pScreen);
 
+/* xf86Extensions.c */
+void xf86ExtensionInit(void);
+
 #endif /* _XSERVER_XF86_PRIV_H */