diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 3158d1486..759e13815 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -98,7 +98,6 @@ extern _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev,
                                      Bool active);
 extern _X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev,
                                      Bool active);
-extern _X_EXPORT Bool xf86DriverHasEntities(DriverPtr drvp);
 extern _X_EXPORT void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex);
 extern _X_EXPORT void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn,
                                                      int entityIndex,
diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h
index 8c1d940ec..7df068df0 100644
--- a/hw/xfree86/common/xf86Bus.h
+++ b/hw/xfree86/common/xf86Bus.h
@@ -73,5 +73,6 @@ extern int platformSlotClaimed;
 extern int pciSlotClaimed;
 
 Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func);
+Bool xf86DriverHasEntities(DriverPtr drvp);
 
 #endif                          /* _XF86_BUS_H */
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 0219bf69f..7b193a941 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -57,6 +57,7 @@
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
 #include "micmap.h"
+#include "xf86Bus.h"
 #include "xf86DDC.h"
 #include "xf86Xinput_priv.h"
 #include "xf86InPriv.h"