diff --git a/lib/ioat/ioat_impl.h b/lib/ioat/ioat_impl.h
index dea8c3f670..84fc66a0c4 100644
--- a/lib/ioat/ioat_impl.h
+++ b/lib/ioat/ioat_impl.h
@@ -76,6 +76,11 @@ ioat_zmalloc(const char *tag, size_t size, unsigned align, uint64_t *phys_addr)
 #define ioat_pcicfg_read32(handle, var, offset)  spdk_pci_device_cfg_read32(handle, var, offset)
 #define ioat_pcicfg_write32(handle, var, offset) spdk_pci_device_cfg_write32(handle, var, offset)
 
+struct ioat_pci_enum_ctx {
+	int (*user_enum_cb)(void *enum_ctx, struct spdk_pci_device *pci_dev);
+	void *user_enum_ctx;
+};
+
 #ifdef USE_PCIACCESS
 
 static inline bool
@@ -134,11 +139,6 @@ ioat_pci_device_match_id(uint16_t vendor_id, uint16_t device_id)
 	return false;
 }
 
-struct ioat_pci_enum_ctx {
-	int (*user_enum_cb)(void *enum_ctx, struct spdk_pci_device *pci_dev);
-	void *user_enum_ctx;
-};
-
 static int
 ioat_pci_enum_cb(void *enum_ctx, struct spdk_pci_device *pci_dev)
 {
@@ -244,11 +244,6 @@ static struct rte_pci_id ioat_driver_id[] = {
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
-struct ioat_pci_enum_ctx {
-	int (*user_enum_cb)(void *enum_ctx, struct spdk_pci_device *pci_dev);
-	void *user_enum_ctx;
-};
-
 /*
  * TODO: eliminate this global if possible (does rte_pci_driver have a context field for this?)
  *
diff --git a/lib/nvme/nvme_impl.h b/lib/nvme/nvme_impl.h
index b4ed54ce6b..2b178cff33 100644
--- a/lib/nvme/nvme_impl.h
+++ b/lib/nvme/nvme_impl.h
@@ -131,12 +131,13 @@ extern struct rte_mempool *request_mempool;
 #define nvme_pcicfg_read32(handle, var, offset)  spdk_pci_device_cfg_read32(handle, var, offset)
 #define nvme_pcicfg_write32(handle, var, offset) spdk_pci_device_cfg_write32(handle, var, offset)
 
-#ifdef USE_PCIACCESS
 struct nvme_pci_enum_ctx {
 	int (*user_enum_cb)(void *enum_ctx, struct spdk_pci_device *pci_dev);
 	void *user_enum_ctx;
 };
 
+#ifdef USE_PCIACCESS
+
 static int
 nvme_pci_enum_cb(void *enum_ctx, struct spdk_pci_device *pci_dev)
 {
@@ -203,11 +204,6 @@ static struct rte_pci_id nvme_pci_driver_id[] = {
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
-struct nvme_pci_enum_ctx {
-	int (*user_enum_cb)(void *enum_ctx, struct spdk_pci_device *pci_dev);
-	void *user_enum_ctx;
-};
-
 /*
  * TODO: eliminate this global if possible (does rte_pci_driver have a context field for this?)
  *