diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index 9a46672a08..e9b65cbbc0 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -54,7 +54,6 @@
 #include "xf86Bus.h"
 #include "Pci.h"
 #include "xf86platformBus_priv.h"
-#include "xf86platformBus.h"
 #include "xf86Xinput_priv.h"
 #include "xf86Config.h"
 #include "xf86Crtc.h"
@@ -785,38 +784,4 @@ void xf86platformPrimary(void)
     }
 }
 
-char *
-_xf86_get_platform_device_attrib(struct xf86_platform_device *device, int attrib, int (*fake)[0])
-{
-    switch (attrib) {
-    case ODEV_ATTRIB_PATH:
-        return xf86_platform_device_odev_attributes(device)->path;
-    case ODEV_ATTRIB_SYSPATH:
-        return xf86_platform_device_odev_attributes(device)->syspath;
-    case ODEV_ATTRIB_BUSID:
-        return xf86_platform_device_odev_attributes(device)->busid;
-    case ODEV_ATTRIB_DRIVER:
-        return xf86_platform_device_odev_attributes(device)->driver;
-    default:
-        assert(FALSE);
-        return NULL;
-    }
-}
-
-int
-_xf86_get_platform_device_int_attrib(struct xf86_platform_device *device, int attrib, int (*fake)[0])
-{
-    switch (attrib) {
-    case ODEV_ATTRIB_FD:
-        return xf86_platform_device_odev_attributes(device)->fd;
-    case ODEV_ATTRIB_MAJOR:
-        return xf86_platform_device_odev_attributes(device)->major;
-    case ODEV_ATTRIB_MINOR:
-        return xf86_platform_device_odev_attributes(device)->minor;
-    default:
-        assert(FALSE);
-        return 0;
-    }
-}
-
 #endif /* XSERVER_PLATFORM_BUS */
diff --git a/hw/xfree86/common/xf86platformBus_priv.h b/hw/xfree86/common/xf86platformBus_priv.h
index 3cc5c5db32..2909c3702b 100644
--- a/hw/xfree86/common/xf86platformBus_priv.h
+++ b/hw/xfree86/common/xf86platformBus_priv.h
@@ -25,6 +25,7 @@
 #define _XSERVER_XF86_PLATFORM_BUS_PRIV_H_
 
 #include "xf86platformBus.h"
+#include "config/hotplug_priv.h"
 
 /* xf86_platform_device flags */
 #define XF86_PDEV_UNOWNED       0x01
@@ -141,10 +142,10 @@ _xf86_get_platform_device_int_attrib(struct xf86_platform_device *device, int at
     }
 }
 
-#define xf86_get_platform_device_int_attrib(device, attrib, def) _xf86_get_platform_device_int_attrib(device,attrib,_ODEV_ATTRIB_INT_CHECK(attrib,def))
-
 #endif /* _XORG_CONFIG_H_ */
 
+#define xf86_get_platform_device_int_attrib(device, attrib, def) _xf86_get_platform_device_int_attrib(device,attrib,_ODEV_ATTRIB_INT_CHECK(attrib,def))
+
 extern void xf86platformVTProbe(void);
 extern void xf86platformPrimary(void);
 
diff --git a/hw/xfree86/drivers/video/modesetting/driver.c b/hw/xfree86/drivers/video/modesetting/driver.c
index 410b2046cb..202e4a4e70 100644
--- a/hw/xfree86/drivers/video/modesetting/driver.c
+++ b/hw/xfree86/drivers/video/modesetting/driver.c
@@ -61,7 +61,7 @@
 #include "xf86xv.h"
 #include <xorg-config.h>
 #ifdef XSERVER_PLATFORM_BUS
-#include "xf86platformBus.h"
+#include "xf86platformBus_priv.h"
 #endif
 #ifdef XSERVER_LIBPCIACCESS
 #include <pciaccess.h>