diff --git a/lib/bdev/nvme/blockdev_nvme.c b/lib/bdev/nvme/blockdev_nvme.c
index 39918bc24..467006f83 100644
--- a/lib/bdev/nvme/blockdev_nvme.c
+++ b/lib/bdev/nvme/blockdev_nvme.c
@@ -44,7 +44,6 @@
 
 #include "spdk/conf.h"
 #include "spdk/endian.h"
-#include "spdk/env.h"
 #include "spdk/log.h"
 #include "spdk/bdev.h"
 #include "spdk/nvme.h"
diff --git a/lib/bdev/nvme/blockdev_nvme.h b/lib/bdev/nvme/blockdev_nvme.h
index fd0a7e7a2..8f7a1e56e 100644
--- a/lib/bdev/nvme/blockdev_nvme.h
+++ b/lib/bdev/nvme/blockdev_nvme.h
@@ -35,20 +35,14 @@
 #define SPDK_BLOCKDEV_NVME_H
 
 #include <stdint.h>
+#include "spdk/env.h"
 
 #define NVME_MAX_CONTROLLERS 16
 
-struct nvme_bdf_whitelist {
-	uint16_t	domain;
-	uint8_t		bus;
-	uint8_t		dev;
-	uint8_t		func;
-};
-
 struct nvme_probe_ctx {
 	int controllers_remaining;
 	int num_whitelist_controllers;
-	struct nvme_bdf_whitelist whitelist[NVME_MAX_CONTROLLERS];
+	struct spdk_pci_addr whitelist[NVME_MAX_CONTROLLERS];
 };
 
 int