diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index b5bd7364e..8454f7936 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -43,6 +43,7 @@
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "hotplug_priv.h"
 
 /* Bus-specific headers */
 
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 18e40fb58..222073876 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -66,6 +66,7 @@
 #include <pciaccess.h>
 #endif
 #include "driver.h"
+#include "hotplug_priv.h"
 
 static void AdjustFrame(ScrnInfoPtr pScrn, int x, int y);
 static Bool CloseScreen(ScreenPtr pScreen);
diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
index 97f8902e9..5902474d4 100644
--- a/hw/xfree86/os-support/linux/systemd-logind.c
+++ b/hw/xfree86/os-support/linux/systemd-logind.c
@@ -42,7 +42,7 @@
 #include "xf86Xinput_priv.h"
 #include "xf86Priv.h"
 #include "globals.h"
-
+#include "hotplug_priv.h"
 #include "systemd-logind.h"
 
 struct systemd_logind_info {
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 74b71ea34..1bbbc685d 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -150,5 +150,17 @@ extern _X_EXPORT Bool xf86GARTCloseScreen(int screenNum);
 extern _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f) (int, void *),
                                              void *);
 
+#ifdef XSERVER_PLATFORM_BUS
+#include "hotplug.h"
+
+struct OdevAttributes;
+
+void
+xf86PlatformDeviceProbe(struct OdevAttributes *attribs);
+
+void
+xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs);
+#endif
+
 _XFUNCPROTOEND
 #endif                          /* _XF86_OSPROC_H */
diff --git a/meson.build b/meson.build
index 44cd930c4..5b40ad6f7 100644
--- a/meson.build
+++ b/meson.build
@@ -648,6 +648,7 @@ inc = include_directories(
     'miext/damage',
     'miext/shadow',
     'miext/sync',
+    'config',
     'dbe',
     'dix',
     'dri3',