diff --git a/dix/screenint_priv.h b/dix/screenint_priv.h
index 62a9ba6a2..a9d31195e 100644
--- a/dix/screenint_priv.h
+++ b/dix/screenint_priv.h
@@ -17,4 +17,7 @@ int AddGPUScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
 
 void RemoveGPUScreen(ScreenPtr pScreen);
 
+void AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
+void DetachUnboundGPU(ScreenPtr unbound);
+
 #endif /* _XSERVER_DIX_SCREENINT_PRIV_H */
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index ad66a9145..7943c02b8 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -24,6 +24,8 @@
 #include <xorg-config.h>
 #endif
 
+#include "dix/screenint_priv.h"
+
 #include "xf86.h"
 #include "os.h"
 #include "globals.h"
diff --git a/include/screenint.h b/include/screenint.h
index f213d311d..a9311c76f 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -54,11 +54,6 @@ typedef struct _Visual *VisualPtr;
 typedef struct _Depth *DepthPtr;
 typedef struct _Screen *ScreenPtr;
 
-extern _X_EXPORT void
-AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-extern _X_EXPORT void
-DetachUnboundGPU(ScreenPtr unbound);
-
 extern _X_EXPORT void
 AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);