2 files changed, 12 insertions, 6 deletions
diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h
index 83c1706c7182..cc4edad5de10 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.h
+++ b/sys/dev/aic7xxx/aic79xx_osm.h
@@ -38,9 +38,6 @@
 #define _AIC79XX_FREEBSD_H_
 
 #include <opt_aic79xx.h>	/* for config options */
-#ifndef NPCI
-#include <pci.h>
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,6 +47,12 @@
 #include <sys/malloc.h>
 #include <sys/queue.h>
 
+#if __FreeBSD_version < 500000
+#include <pci.h>
+#else
+#define NPCI 1
+#endif
+
 #define AHD_PCI_CONFIG 1
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h
index 86361ab3cef2..c81a1b2b301d 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.h
+++ b/sys/dev/aic7xxx/aic7xxx_osm.h
@@ -38,9 +38,6 @@
 #define _AIC7XXX_FREEBSD_H_
 
 #include <opt_aic7xxx.h>	/* for config options */
-#ifndef NPCI
-#include <pci.h>
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,6 +48,12 @@
 #include <sys/malloc.h>
 #include <sys/queue.h>
 
+#if __FreeBSD_version < 500000
+#include <pci.h>
+#else
+#define NPCI 1
+#endif
+
 #if NPCI > 0
 #define AHC_PCI_CONFIG 1
 #ifdef AHC_ALLOW_MEMIO