diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index f700c9144..59c782cb5 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -243,8 +243,6 @@ xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth);
 
 /* xf86Mode.c */
 
-extern _X_EXPORT const char *
-xf86ModeStatusToString(ModeStatus status);
 extern _X_EXPORT ModeStatus
 xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor);
 extern _X_EXPORT ModeStatus
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index ae50ab1ae..0aa4ea3e0 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -93,7 +93,7 @@
 #include "os.h"
 #include "servermd.h"
 #include "globals.h"
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 #include "edid.h"
 
diff --git a/hw/xfree86/common/xf86_priv.h b/hw/xfree86/common/xf86_priv.h
index 337840033..a00351e95 100644
--- a/hw/xfree86/common/xf86_priv.h
+++ b/hw/xfree86/common/xf86_priv.h
@@ -28,4 +28,7 @@ void xf86EnableInputDeviceForVTSwitch(InputInfoPtr pInfo);
 void xf86DeleteDriver(int drvIndex);
 void xf86DeleteScreen(ScrnInfoPtr pScrn);
 
+/* xf86Mode.c */
+const char * xf86ModeStatusToString(ModeStatus status);
+
 #endif /* _XSERVER_XF86_PRIV_H */
diff --git a/hw/xfree86/int10/vbeModes.c b/hw/xfree86/int10/vbeModes.c
index 0cfaf3519..107eae2ee 100644
--- a/hw/xfree86/int10/vbeModes.c
+++ b/hw/xfree86/int10/vbeModes.c
@@ -38,7 +38,7 @@
 
 #include "os/log_priv.h"
 
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "vbe.h"
 #include "vbeModes.h"
 
diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
index fdcd26a31..eb958c3c4 100644
--- a/hw/xfree86/modes/xf86Modes.c
+++ b/hw/xfree86/modes/xf86Modes.c
@@ -31,6 +31,7 @@
 
 #include <libxcvt/libxcvt.h>
 
+#include "xf86_priv.h"
 #include "xf86Config.h"
 #include "xf86Modes.h"
 #include "xf86Priv.h"