diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 1921e0282..8b59dcac9 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -106,6 +106,8 @@
 #ifndef _PCI_H
 #define _PCI_H 1
 
+#include <X11/Xdefs.h>
+
 #include "xf86Pci.h"
 
 /*
@@ -145,4 +147,6 @@ extern void osPciInit(void);
 #error No PCI support available for this architecture/OS combination
 #endif
 
+Bool xf86scanpci(void);
+
 #endif                          /* _PCI_H */
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index 4dbe08bd7..88cebcf1c 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -228,12 +228,7 @@
 #define PCI_REG_USERCONFIG		0x40
 #define PCI_OPTION_REG			0x40
 
-/*
- * Typedefs, etc...
- */
-
 /* Public PCI access functions */
-extern _X_EXPORT Bool xf86scanpci(void);
 extern _X_EXPORT char *DRICreatePCIBusID(const struct pci_device *dev);
 
 #endif                          /* _XF86PCI_H */