diff --git a/hw/xfree86/common/dgaproc.h b/hw/xfree86/common/dgaproc.h
index b9f003056..45b8481a8 100644
--- a/hw/xfree86/common/dgaproc.h
+++ b/hw/xfree86/common/dgaproc.h
@@ -52,16 +52,4 @@ typedef struct {
     int reserved2;
 } XDGAModeRec, *XDGAModePtr;
 
-/* DDX interface */
-
-extern Bool DGAScreenAvailable(ScreenPtr pScreen);
-extern Bool DGAActive(int Index);
-
-extern Bool DGAVTSwitch(void);
-extern Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index,
-                                int button, int is_down);
-extern Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy);
-extern Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index,
-                             int key_code, int is_down);
-
 #endif                          /* __DGAPROC_H */
diff --git a/hw/xfree86/common/dgaproc_priv.h b/hw/xfree86/common/dgaproc_priv.h
new file mode 100644
index 000000000..05d8f2bee
--- /dev/null
+++ b/hw/xfree86/common/dgaproc_priv.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef __XSERVER_XFREE86_DGAPROC_H
+#define __XSERVER_XFREE86_DGAPROC_H
+
+#include "screenint.h"
+#include "input.h"
+
+Bool DGAScreenAvailable(ScreenPtr pScreen);
+Bool DGAActive(int Index);
+
+Bool DGAVTSwitch(void);
+Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index, int button, int is_down);
+Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy);
+Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index, int key_code, int is_down);
+
+#endif /* __XSERVER_XFREE86_DGAPROC_H */
diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
index 8bb68a56f..37ae26c9a 100644
--- a/hw/xfree86/common/xf86Cursor.c
+++ b/hw/xfree86/common/xf86Cursor.c
@@ -46,6 +46,7 @@
 
 #ifdef XFreeXDGA
 #include "dgaproc.h"
+#include "dgaproc_priv.h"
 #endif
 
 typedef struct _xf86EdgeRec {
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index fa70ba2f0..fc1d73aaf 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -47,6 +47,7 @@
 #include "xf86str.h"
 #include "xf86Priv.h"
 #include "dgaproc.h"
+#include "dgaproc_priv.h"
 #include <X11/extensions/xf86dgaproto.h>
 #include "colormapst.h"
 #include "pixmapstr.h"
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 395bbc7b3..404c37e46 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -65,6 +65,7 @@
 
 #ifdef XFreeXDGA
 #include "dgaproc.h"
+#include "dgaproc_priv.h"
 #endif
 
 #include <X11/extensions/XI.h>
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 5b9823ed2..245db5776 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -98,6 +98,7 @@
 
 #ifdef XFreeXDGA
 #include "dgaproc.h"
+#include "dgaproc_priv.h"
 #endif
 
 #include "xkbsrv.h"
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 8588c9fba..501125671 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -55,6 +55,7 @@
 #ifdef XFreeXDGA
 #include <X11/extensions/xf86dgaproto.h>
 #include "dgaproc.h"
+#include "dgaproc_priv.h"
 #endif
 
 #include "xf86cmap.h"
diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c
index 368649852..114b6932f 100644
--- a/hw/xfree86/modes/xf86DiDGA.c
+++ b/hw/xfree86/modes/xf86DiDGA.c
@@ -28,6 +28,7 @@
 #include "xf86DDC.h"
 #include "xf86_OSproc.h"
 #include "dgaproc.h"
+#include "dgaproc_priv.h"
 #include "xf86Crtc.h"
 #include "xf86Modes.h"
 #include "gcstruct.h"