diff --git a/app/iscsi_tgt/iscsi_tgt.c b/app/iscsi_tgt/iscsi_tgt.c
index 6d6723fb7e..3307d7498e 100644
--- a/app/iscsi_tgt/iscsi_tgt.c
+++ b/app/iscsi_tgt/iscsi_tgt.c
@@ -36,7 +36,6 @@
 #include <stdlib.h>
 
 #include <rte_config.h>
-#include <rte_eal.h>
 #include <rte_lcore.h>
 
 #include "spdk/env.h"
diff --git a/examples/ioat/perf/perf.c b/examples/ioat/perf/perf.c
index 2f0f6204cd..2f3c29f2a5 100644
--- a/examples/ioat/perf/perf.c
+++ b/examples/ioat/perf/perf.c
@@ -36,8 +36,8 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+
 #include <rte_config.h>
-#include <rte_eal.h>
 #include <rte_lcore.h>
 
 #include "spdk/ioat.h"
diff --git a/examples/ioat/verify/verify.c b/examples/ioat/verify/verify.c
index 730b412fb3..950851dcf3 100644
--- a/examples/ioat/verify/verify.c
+++ b/examples/ioat/verify/verify.c
@@ -36,9 +36,9 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+
 #include <rte_config.h>
 #include <rte_lcore.h>
-#include <rte_eal.h>
 
 #include "spdk/ioat.h"
 #include "spdk/env.h"
diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c
index 7c70565256..213a152279 100644
--- a/lib/bdev/bdev.c
+++ b/lib/bdev/bdev.c
@@ -40,7 +40,6 @@
 #include <unistd.h>
 
 #include <rte_config.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_version.h>
 
diff --git a/lib/bdev/malloc/blockdev_malloc.c b/lib/bdev/malloc/blockdev_malloc.c
index 86c5c67018..467c6edca2 100644
--- a/lib/bdev/malloc/blockdev_malloc.c
+++ b/lib/bdev/malloc/blockdev_malloc.c
@@ -34,8 +34,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <rte_config.h>
-#include <rte_memcpy.h>
 
 #include "blockdev_malloc.h"
 #include "spdk/bdev.h"
diff --git a/lib/bdev/nvme/blockdev_nvme.c b/lib/bdev/nvme/blockdev_nvme.c
index 7844446997..32f9ede461 100644
--- a/lib/bdev/nvme/blockdev_nvme.c
+++ b/lib/bdev/nvme/blockdev_nvme.c
@@ -35,15 +35,12 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <sys/param.h>
 
 #include <pthread.h>
 
-#include <rte_config.h>
-#include <rte_ring.h>
-#include <rte_lcore.h>
-
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/env.h"
diff --git a/lib/copy/copy_engine.c b/lib/copy/copy_engine.c
index 4694f6f4e9..f245a4bb75 100644
--- a/lib/copy/copy_engine.c
+++ b/lib/copy/copy_engine.c
@@ -36,6 +36,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <errno.h>
+
 #include <rte_config.h>
 #include <rte_memcpy.h>
 
diff --git a/lib/copy/ioat/copy_engine_ioat.c b/lib/copy/ioat/copy_engine_ioat.c
index 34fc7d0f81..122c33c5ff 100644
--- a/lib/copy/ioat/copy_engine_ioat.c
+++ b/lib/copy/ioat/copy_engine_ioat.c
@@ -34,10 +34,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <errno.h>
-
-#include <rte_config.h>
-#include <rte_memcpy.h>
-#include <rte_lcore.h>
+#include <pthread.h>
 
 #include "spdk/copy_engine.h"
 #include "spdk/env.h"
diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c
index bb4f27be57..f8cd8ec64d 100644
--- a/lib/iscsi/iscsi.c
+++ b/lib/iscsi/iscsi.c
@@ -51,20 +51,7 @@
 #include <time.h>
 
 #include <rte_config.h>
-#include <rte_common.h>
-#include <rte_log.h>
-#include <rte_memcpy.h>
-#include <rte_tailq.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_launch.h>
-#include <rte_atomic.h>
-#include <rte_lcore.h>
-#include <rte_branch_prediction.h>
-#include <rte_ring.h>
-#include <rte_log.h>
 #include <rte_mempool.h>
-#include <rte_string_fns.h>
 
 #include "spdk/endian.h"
 #include "spdk/env.h"
diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c
index 1624cf911b..158ffaf4f0 100644
--- a/lib/iscsi/iscsi_subsystem.c
+++ b/lib/iscsi/iscsi_subsystem.c
@@ -32,27 +32,14 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rte_config.h>
-#include <rte_common.h>
-#include <rte_log.h>
-#include <rte_memcpy.h>
-#include <rte_tailq.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_launch.h>
-#include <rte_atomic.h>
-#include <rte_lcore.h>
-#include <rte_branch_prediction.h>
-#include <rte_ring.h>
-#include <rte_log.h>
-#include <rte_mempool.h>
-#include <rte_string_fns.h>
-#include <rte_version.h>
-
 #include <inttypes.h>
 #include <stddef.h>
 #include <unistd.h>
 
+#include <rte_config.h>
+#include <rte_mempool.h>
+#include <rte_version.h>
+
 #include "iscsi/iscsi.h"
 #include "iscsi/init_grp.h"
 #include "iscsi/portal_grp.h"
diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index 771c9d4f82..ae0697fe69 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -33,8 +33,6 @@
 
 #include <arpa/inet.h>
 
-#include <rte_config.h>
-
 #include "spdk/log.h"
 #include "spdk/conf.h"
 #include "subsystem.h"
diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c
index 781d269c08..d5dc34c38e 100644
--- a/lib/nvmf/rdma.c
+++ b/lib/nvmf/rdma.c
@@ -40,9 +40,6 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include <rte_config.h>
-#include <rte_lcore.h>
-
 #include "nvmf_internal.h"
 #include "request.h"
 #include "session.h"
diff --git a/test/lib/bdev/bdevio/bdevio.c b/test/lib/bdev/bdevio/bdevio.c
index a58b104f09..cae1fabd67 100644
--- a/test/lib/bdev/bdevio/bdevio.c
+++ b/test/lib/bdev/bdevio/bdevio.c
@@ -36,10 +36,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rte_config.h>
-#include <rte_eal.h>
-#include <rte_ring.h>
-
 #include "spdk/bdev.h"
 #include "spdk/copy_engine.h"
 #include "spdk/env.h"
diff --git a/test/lib/bdev/bdevperf/bdevperf.c b/test/lib/bdev/bdevperf/bdevperf.c
index 454e47a711..61f792f5cd 100644
--- a/test/lib/bdev/bdevperf/bdevperf.c
+++ b/test/lib/bdev/bdevperf/bdevperf.c
@@ -39,9 +39,7 @@
 #include <unistd.h>
 
 #include <rte_config.h>
-#include <rte_eal.h>
 #include <rte_mempool.h>
-#include <rte_ring.h>
 #include <rte_lcore.h>
 
 #include "spdk/bdev.h"
diff --git a/test/lib/nvme/sgl/nvme_sgl.c b/test/lib/nvme/sgl/nvme_sgl.c
index 81a1ebb9e1..c03164ed19 100644
--- a/test/lib/nvme/sgl/nvme_sgl.c
+++ b/test/lib/nvme/sgl/nvme_sgl.c
@@ -38,7 +38,7 @@
 #include <string.h>
 
 #include <rte_config.h>
-#include <rte_lcore.h>
+#include <rte_eal.h>
 
 #include "spdk/nvme.h"
 #include "spdk/env.h"
diff --git a/test/lib/nvmf/nvmf/nvmf_ut.c b/test/lib/nvmf/nvmf/nvmf_ut.c
index b56a853f96..666c6ec79e 100644
--- a/test/lib/nvmf/nvmf/nvmf_ut.c
+++ b/test/lib/nvmf/nvmf/nvmf_ut.c
@@ -36,9 +36,6 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include <rte_config.h>
-#include <rte_lcore.h>
-
 #include "spdk_cunit.h"
 
 #include "spdk/string.h"