diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index ccb49f59f..db2a16637 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -50,7 +50,6 @@
 #endif
 
 /* General parameters */
-extern _X_EXPORT int xf86DoConfigure;
 extern _X_EXPORT Bool xf86DoConfigurePass1;
 extern _X_EXPORT Bool xf86ProbeIgnorePrimary;
 extern _X_EXPORT Bool xorgHWAccess;
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index f7d1a48a0..11929dd3a 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -41,7 +41,7 @@
 #include "config/hotplug_priv.h"
 
 #include "os.h"
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 
 /* Bus-specific headers */
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 6242cad50..e0bffef1a 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -32,7 +32,7 @@
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Config.h"
 #include "xf86_OSlib.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 01448dd21..1431f4d34 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -38,7 +38,7 @@
 #include "os.h"
 #include "windowstr.h"
 #include "propertyst.h"
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 #include "xf86Parser.h"
 #include "xf86Xinput.h"
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 57887fbbd..0219bf69f 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -53,7 +53,7 @@
 #include "propertyst.h"
 #include "gcstruct.h"
 #include "loaderProcs.h"
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
 #include "micmap.h"
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 3491b7325..fa9cc12e4 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -70,7 +70,7 @@
 #include "loaderProcs.h"
 
 #include "xf86Module_priv.h"
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 #include "xf86Config.h"
 #include "xf86_os_support.h"
diff --git a/hw/xfree86/common/xf86_priv.h b/hw/xfree86/common/xf86_priv.h
new file mode 100644
index 000000000..bc30af530
--- /dev/null
+++ b/hw/xfree86/common/xf86_priv.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_XF86_PRIV_H
+#define _XSERVER_XF86_PRIV_H
+
+#include "xf86.h"
+
+extern Bool xf86DoConfigure;
+
+#endif /* _XSERVER_XF86_PRIV_H */
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 434150ea9..07b6d50eb 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -42,7 +42,7 @@
 
 #include "os.h"
 #include "Pci.h"
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 #include "dirent.h"             /* DIR, FILE type definitions */
 
diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index 8a91e1f57..08dd84c5d 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <X11/X.h>
 #include "os.h"
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
 #include "xf86cmap.h"
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index ce2631179..b88cf2cbe 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -31,7 +31,7 @@
 
 #include "../../../../os/cmdline.h"
 
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
 #include "xf86_OSlib.h"