16 files changed, 17 insertions, 15 deletions
diff --git a/src/plugins/dev_ena/ena.c b/src/plugins/dev_ena/ena.c
index ead090839c7..ed5c47ed505 100644
--- a/src/plugins/dev_ena/ena.c
+++ b/src/plugins/dev_ena/ena.c
@@ -4,7 +4,7 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
+#include <vnet/dev/bus/pci.h>
 #include <dev_ena/ena.h>
 #include <dev_ena/ena_inlines.h>
 #include <vnet/ethernet/ethernet.h>
diff --git a/src/plugins/dev_ena/port.c b/src/plugins/dev_ena/port.c
index 2b26fefc5e3..95d8ff3a08c 100644
--- a/src/plugins/dev_ena/port.c
+++ b/src/plugins/dev_ena/port.c
@@ -4,7 +4,6 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
 #include <dev_ena/ena.h>
 #include <dev_ena/ena_inlines.h>
 #include <vnet/ethernet/ethernet.h>
diff --git a/src/plugins/dev_iavf/adminq.c b/src/plugins/dev_iavf/adminq.c
index c12dc8aa2f6..2072c697033 100644
--- a/src/plugins/dev_iavf/adminq.c
+++ b/src/plugins/dev_iavf/adminq.c
@@ -5,7 +5,7 @@
 #include <ctype.h>
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
+#include <vnet/dev/bus/pci.h>
 #include <vnet/dev/counters.h>
 #include <dev_iavf/iavf.h>
 #include <dev_iavf/iavf_regs.h>
diff --git a/src/plugins/dev_iavf/counters.c b/src/plugins/dev_iavf/counters.c
index 6dcd01141f0..3ab463edb9a 100644
--- a/src/plugins/dev_iavf/counters.c
+++ b/src/plugins/dev_iavf/counters.c
@@ -4,7 +4,6 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
 #include <vnet/dev/counters.h>
 #include <dev_iavf/iavf.h>
 #include <dev_iavf/virtchnl.h>
diff --git a/src/plugins/dev_iavf/format.c b/src/plugins/dev_iavf/format.c
index 9a3dde47ee9..b4a29e4e20a 100644
--- a/src/plugins/dev_iavf/format.c
+++ b/src/plugins/dev_iavf/format.c
@@ -4,7 +4,6 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
 #include <vnet/dev/counters.h>
 #include <dev_iavf/iavf.h>
 #include <dev_iavf/virtchnl.h>
diff --git a/src/plugins/dev_iavf/iavf.c b/src/plugins/dev_iavf/iavf.c
index d1c2b9edc63..f13440f4161 100644
--- a/src/plugins/dev_iavf/iavf.c
+++ b/src/plugins/dev_iavf/iavf.c
@@ -4,7 +4,7 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
+#include <vnet/dev/bus/pci.h>
 #include <vnet/dev/counters.h>
 #include <vppinfra/ring.h>
 #include <dev_iavf/iavf.h>
diff --git a/src/plugins/dev_iavf/port.c b/src/plugins/dev_iavf/port.c
index 90e81e960c4..7e4200ab37c 100644
--- a/src/plugins/dev_iavf/port.c
+++ b/src/plugins/dev_iavf/port.c
@@ -4,7 +4,7 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
+#include <vnet/dev/bus/pci.h>
 #include <vnet/dev/counters.h>
 #include <dev_iavf/iavf.h>
 #include <dev_iavf/iavf_regs.h>
diff --git a/src/plugins/dev_iavf/queue.c b/src/plugins/dev_iavf/queue.c
index 113c0dbdfc7..51bf69a458a 100644
--- a/src/plugins/dev_iavf/queue.c
+++ b/src/plugins/dev_iavf/queue.c
@@ -4,7 +4,6 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
 #include <vnet/dev/counters.h>
 #include <vppinfra/ring.h>
 #include <dev_iavf/iavf.h>
diff --git a/src/plugins/dev_iavf/virtchnl.c b/src/plugins/dev_iavf/virtchnl.c
index eca48106ce3..7e7715262c2 100644
--- a/src/plugins/dev_iavf/virtchnl.c
+++ b/src/plugins/dev_iavf/virtchnl.c
@@ -4,7 +4,6 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
 #include <vnet/dev/counters.h>
 #include <dev_iavf/iavf.h>
 #include <dev_iavf/virtchnl.h>
diff --git a/src/plugins/dev_octeon/counter.c b/src/plugins/dev_octeon/counter.c
index dd73684c386..6f57c1ee649 100644
--- a/src/plugins/dev_octeon/counter.c
+++ b/src/plugins/dev_octeon/counter.c
@@ -6,7 +6,6 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
 #include <vnet/dev/counters.h>
 #include <dev_octeon/octeon.h>
 #include <dev_octeon/common.h>
diff --git a/src/plugins/dev_octeon/init.c b/src/plugins/dev_octeon/init.c
index 87ed8317277..fd65ce6d9e2 100644
--- a/src/plugins/dev_octeon/init.c
+++ b/src/plugins/dev_octeon/init.c
@@ -4,7 +4,7 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
+#include <vnet/dev/bus/pci.h>
 #include <vnet/dev/counters.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/plugin/plugin.h>
diff --git a/src/plugins/dev_octeon/port.c b/src/plugins/dev_octeon/port.c
index a53fa256884..8ba9041f858 100644
--- a/src/plugins/dev_octeon/port.c
+++ b/src/plugins/dev_octeon/port.c
@@ -4,7 +4,6 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
 #include <vnet/dev/counters.h>
 #include <dev_octeon/octeon.h>
 #include <dev_octeon/common.h>
diff --git a/src/plugins/dev_octeon/queue.c b/src/plugins/dev_octeon/queue.c
index d6ae794fb8d..58d391b8508 100644
--- a/src/plugins/dev_octeon/queue.c
+++ b/src/plugins/dev_octeon/queue.c
@@ -4,7 +4,6 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
 #include <vnet/dev/counters.h>
 #include <dev_octeon/octeon.h>
 #include <vnet/ethernet/ethernet.h>
diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt
index 0554e2f0f60..01958225343 100644
--- a/src/vnet/CMakeLists.txt
+++ b/src/vnet/CMakeLists.txt
@@ -28,6 +28,7 @@ list(APPEND VNET_SOURCES
   devices/netlink.c
   dev/api.c
   dev/args.c
+  dev/bus/pci.c
   dev/cli.c
   dev/config.c
   dev/counters.c
@@ -36,7 +37,6 @@ list(APPEND VNET_SOURCES
   dev/error.c
   dev/format.c
   dev/handlers.c
-  dev/pci.c
   dev/port.c
   dev/process.c
   dev/queue.c
@@ -74,7 +74,17 @@ list(APPEND VNET_HEADERS
   config.h
   devices/devices.h
   devices/netlink.h
+  dev/api.h
+  dev/args.h
+  dev/bus/pci.h
+  dev/counters.h
   dev/dev.h
+  dev/dev_funcs.h
+  dev/errors.h
+  dev/log.h
+  dev/mgmt.h
+  dev/process.h
+  dev/types.h
   flow/flow.h
   global_funcs.h
   interface/rx_queue_funcs.h
diff --git a/src/vnet/dev/pci.c b/src/vnet/dev/bus/pci.c
index 3cc0cba5003..4bb8660f4b4 100644
--- a/src/vnet/dev/pci.c
+++ b/src/vnet/dev/bus/pci.c
@@ -4,7 +4,7 @@
 
 #include <vnet/vnet.h>
 #include <vnet/dev/dev.h>
-#include <vnet/dev/pci.h>
+#include <vnet/dev/bus/pci.h>
 #include <vnet/dev/log.h>
 #include <vlib/unix/unix.h>
 
diff --git a/src/vnet/dev/pci.h b/src/vnet/dev/bus/pci.h
index ce9a53aa273..ce9a53aa273 100644
--- a/src/vnet/dev/pci.h
+++ b/src/vnet/dev/bus/pci.h