diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 106d7ca386..0cffd9c79e 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -40,6 +40,7 @@
 #include "dix/request_priv.h"
 #include "dix/rpcbuf_priv.h"
 #include "os/bug_priv.h"
+#include "present/present_priv.h"
 
 #include "glxserver.h"
 #include <unpack.h>
diff --git a/hw/xfree86/drivers/video/modesetting/drmmode_display.c b/hw/xfree86/drivers/video/modesetting/drmmode_display.c
index 7d0e3b7ae1..32f1d4dfaf 100644
--- a/hw/xfree86/drivers/video/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/video/modesetting/drmmode_display.c
@@ -36,6 +36,7 @@
 
 #include "dix/dix_priv.h"
 #include "os/fmt.h"
+#include "present/present_priv.h"
 
 #include "dumb_bo.h"
 #include "inputstr.h"
@@ -51,7 +52,6 @@
 #include <xf86drm.h>
 #include "xf86Crtc.h"
 #include "drmmode_display.h"
-#include "present.h"
 
 #include <cursorstr.h>
 
diff --git a/os/utils.c b/os/utils.c
index badf3d112e..5a10837e64 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -107,12 +107,13 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include "os/osdep.h"
 #include "os/serverlock.h"
 #include "os/xhostname.h"
+#include "present/present_priv.h"
 #include "Xext/xf86bigfontsrv.h" /* XF86BigfontCleanup() */
 #include "xkb/xkbsrv_priv.h"
+
 #include "dixstruct.h"
 #include "picture.h"
 #include "miinitext.h"
-#include "present.h"
 #include "dixstruct_priv.h"
 #include "dpmsproc.h"
 
diff --git a/present/present.c b/present/present.c
index aa265aabf1..35388bc154 100644
--- a/present/present.c
+++ b/present/present.c
@@ -21,9 +21,9 @@
  */
 #include <dix-config.h>
 
+#include "present/present_priv.h"
 #include "randr/randrstr_priv.h"
 
-#include "present_priv.h"
 #include <gcstruct.h>
 
 uint32_t
diff --git a/present/present.h b/present/present.h
index 98ac4993b7..8d2d1d0ee0 100644
--- a/present/present.h
+++ b/present/present.h
@@ -158,22 +158,4 @@ present_event_notify(uint64_t event_id, uint64_t ust, uint64_t msc);
 extern _X_EXPORT Bool
 present_screen_init(ScreenPtr screen, present_screen_info_ptr info);
 
-extern _X_EXPORT void
-present_check_flips(WindowPtr window);
-
-typedef void (*present_complete_notify_proc)(WindowPtr window,
-                                             CARD8 kind,
-                                             CARD8 mode,
-                                             CARD32 serial,
-                                             uint64_t ust,
-                                             uint64_t msc);
-
-extern _X_EXPORT void
-present_register_complete_notify(present_complete_notify_proc proc);
-
-extern _X_EXPORT Bool
-present_can_window_flip(WindowPtr window);
-
-extern _X_EXPORT uint32_t FakeScreenFps;
-
 #endif /* _PRESENT_H_ */
diff --git a/present/present_event.c b/present/present_event.c
index 3ef9e4563b..af12c9ac7e 100644
--- a/present/present_event.c
+++ b/present/present_event.c
@@ -22,10 +22,9 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "present/present_priv.h"
 #include "Xext/geext_priv.h"
 
-#include "present_priv.h"
-
 static RESTYPE present_event_type;
 
 static int
diff --git a/present/present_execute.c b/present/present_execute.c
index 449ea5c539..8aea088b0f 100644
--- a/present/present_execute.c
+++ b/present/present_execute.c
@@ -21,8 +21,10 @@
  */
 #include <dix-config.h>
 
-#include "present_priv.h"
 #include <unistd.h>
+
+#include "present/present_priv.h"
+
 #ifdef DRI3
 #include <sys/eventfd.h>
 #endif /* DRI3 */
diff --git a/present/present_fake.c b/present/present_fake.c
index 3ce7295aa2..85feb6f4f0 100644
--- a/present/present_fake.c
+++ b/present/present_fake.c
@@ -21,8 +21,8 @@
  */
 #include <dix-config.h>
 
-#include "present_priv.h"
-#include "list.h"
+#include "include/list.h"
+#include "present/present_priv.h"
 
 static struct xorg_list fake_vblank_queue;
 
diff --git a/present/present_fence.c b/present/present_fence.c
index 821cd60987..0e497e0ff8 100644
--- a/present/present_fence.c
+++ b/present/present_fence.c
@@ -21,7 +21,8 @@
  */
 #include <dix-config.h>
 
-#include "present_priv.h"
+#include "present/present_priv.h"
+
 #include <gcstruct.h>
 #include <misync.h>
 #include <misyncstr.h>
diff --git a/present/present_priv.h b/present/present_priv.h
index dafe75d26b..007e2d8cc6 100644
--- a/present/present_priv.h
+++ b/present/present_priv.h
@@ -23,14 +23,16 @@
 #ifndef _PRESENT_PRIV_H_
 #define _PRESENT_PRIV_H_
 
-#include "dix-config.h"
 #include <X11/X.h>
+#include <X11/Xmd.h>
+
+#include "present/present.h"
+
 #include "scrnintstr.h"
 #include "misc.h"
 #include "list.h"
 #include "windowstr.h"
 #include "dixstruct.h"
-#include "present.h"
 #include <syncsdk.h>
 #include <syncsrv.h>
 #include <xfixes.h>
@@ -528,4 +530,22 @@ present_vblank_scrap(present_vblank_ptr vblank);
 void
 present_vblank_destroy(present_vblank_ptr vblank);
 
+/* only for in-tree modesetting */ _X_EXPORT
+void present_check_flips(WindowPtr window);
+
+typedef void (*present_complete_notify_proc)(WindowPtr window,
+                                             CARD8 kind,
+                                             CARD8 mode,
+                                             CARD32 serial,
+                                             uint64_t ust,
+                                             uint64_t msc);
+
+/* only for in-tree GLX module */ _X_EXPORT
+void present_register_complete_notify(present_complete_notify_proc proc);
+
+/* only for in-tree modesetting */ _X_EXPORT
+Bool present_can_window_flip(WindowPtr window);
+
+extern uint32_t FakeScreenFps;
+
 #endif /*  _PRESENT_PRIV_H_ */
diff --git a/present/present_request.c b/present/present_request.c
index c9d4c2a23d..3560ec4149 100644
--- a/present/present_request.c
+++ b/present/present_request.c
@@ -24,8 +24,8 @@
 #include "dix/dix_priv.h"
 #include "dix/request_priv.h"
 #include "dri3/dri3_priv.h"
+#include "present/present_priv.h"
 
-#include "present_priv.h"
 #include "randrstr_priv.h"
 #include <protocol-versions.h>
 
diff --git a/present/present_scmd.c b/present/present_scmd.c
index 01c068f1ed..62c774f73a 100644
--- a/present/present_scmd.c
+++ b/present/present_scmd.c
@@ -21,9 +21,9 @@
  */
 #include <dix-config.h>
 
+#include "present/present_priv.h"
 #include "randr/randrstr_priv.h"
 
-#include "present_priv.h"
 #include <misync.h>
 #include <misyncstr.h>
 
diff --git a/present/present_screen.c b/present/present_screen.c
index cb5c7af5c8..cd09e3e310 100644
--- a/present/present_screen.c
+++ b/present/present_screen.c
@@ -22,10 +22,8 @@
 #include <dix-config.h>
 
 #include "dix/screen_hooks_priv.h"
-
-#include "present_priv.h"
-
 #include "miext/extinit_priv.h"
+#include "present/present_priv.h"
 
 int present_request;
 DevPrivateKeyRec present_screen_private_key;
diff --git a/present/present_vblank.c b/present/present_vblank.c
index 72a8b2e3e8..449b2a4f42 100644
--- a/present/present_vblank.c
+++ b/present/present_vblank.c
@@ -21,9 +21,10 @@
  */
 #include <dix-config.h>
 
-#include "present_priv.h"
 #include <unistd.h>
 
+#include "present/present_priv.h"
+
 void
 present_vblank_notify(present_vblank_ptr vblank, CARD8 kind, CARD8 mode, uint64_t ust, uint64_t crtc_msc)
 {