diff --git a/src/device/device.c b/src/device/device.c
index 9e068107d8..e068cee044 100644
--- a/src/device/device.c
+++ b/src/device/device.c
@@ -35,7 +35,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include <device/pci.h>
+#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/device/device_util.c b/src/device/device_util.c
index dc43b9a656..2bed4a9585 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -25,7 +25,7 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
-#include <device/pci.h>
+#include <device/pci_def.h>
 #include <device/resource.h>
 #include <string.h>
 
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index 1741c0d1e9..7504cc7269 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -15,6 +15,8 @@
 #ifndef PCI_H
 #define PCI_H
 
+#if CONFIG_PCI
+
 #include <stdint.h>
 #include <stddef.h>
 #include <arch/rules.h>
@@ -98,4 +100,7 @@ static inline const struct pci_operations *ops_pci(device_t dev)
 }
 
 #endif /* ! __SIMPLE_DEVICE__ */
+
+#endif /* CONFIG_PCI */
+
 #endif /* PCI_H */