From 30a1de105a5f40d77b344a891c4a68f79e815c43 Mon Sep 17 00:00:00 2001
From: Sean Morrissey <sean.morrissey@intel.com>
Date: Tue, 15 Feb 2022 12:29:49 +0000
Subject: [PATCH] lib: remove unneeded header includes

These header includes have been flagged by the iwyu_tool
and removed.

Signed-off-by: Sean Morrissey <sean.morrissey@intel.com>
---
 examples/vm_power_manager/guest_cli/main.c  |  1 +
 lib/acl/rte_acl.c                           |  1 -
 lib/bbdev/rte_bbdev.c                       |  4 ----
 lib/bbdev/rte_bbdev.h                       |  4 ----
 lib/bpf/bpf.c                               |  4 ----
 lib/bpf/bpf_exec.c                          |  6 ------
 lib/bpf/bpf_jit_x86.c                       |  5 -----
 lib/bpf/bpf_load.c                          |  8 --------
 lib/bpf/bpf_pkt.c                           | 12 ------------
 lib/bpf/bpf_validate.c                      |  3 ---
 lib/cmdline/cmdline.c                       |  2 --
 lib/cmdline/cmdline_parse.c                 |  3 ---
 lib/cmdline/cmdline_parse_portlist.c        |  3 ---
 lib/cmdline/cmdline_parse_string.c          |  4 ----
 lib/cmdline/cmdline_rdline.c                |  2 --
 lib/cmdline/cmdline_vt100.c                 |  3 ---
 lib/compressdev/rte_comp.c                  |  1 -
 lib/compressdev/rte_comp.h                  |  1 -
 lib/compressdev/rte_compressdev.c           |  1 -
 lib/compressdev/rte_compressdev.h           |  1 -
 lib/compressdev/rte_compressdev_pmd.h       |  2 --
 lib/cryptodev/cryptodev_pmd.h               |  4 ----
 lib/cryptodev/rte_cryptodev.c               | 11 -----------
 lib/cryptodev/rte_cryptodev.h               |  2 --
 lib/distributor/rte_distributor.c           |  2 --
 lib/distributor/rte_distributor_match_sse.c |  2 --
 lib/distributor/rte_distributor_single.c    |  2 --
 lib/dmadev/rte_dmadev.h                     |  1 -
 lib/eal/common/eal_common_dev.c             |  5 -----
 lib/eal/common/eal_common_devargs.c         |  1 -
 lib/eal/common/eal_common_errno.c           |  4 ----
 lib/eal/common/eal_common_fbarray.c         |  3 ---
 lib/eal/common/eal_common_hexdump.c         |  3 ---
 lib/eal/common/eal_common_launch.c          |  6 ------
 lib/eal/common/eal_common_lcore.c           |  7 +------
 lib/eal/common/eal_common_log.c             |  1 -
 lib/eal/common/eal_common_memalloc.c        |  3 ---
 lib/eal/common/eal_common_memory.c          |  4 ----
 lib/eal/common/eal_common_memzone.c         |  4 ----
 lib/eal/common/eal_common_options.c         |  2 --
 lib/eal/common/eal_common_proc.c            |  2 --
 lib/eal/common/eal_common_string_fns.c      |  2 --
 lib/eal/common/eal_common_tailqs.c          | 11 -----------
 lib/eal/common/eal_common_thread.c          |  3 ---
 lib/eal/common/eal_common_timer.c           |  6 ------
 lib/eal/common/eal_common_trace.c           |  1 -
 lib/eal/common/hotplug_mp.h                 |  1 -
 lib/eal/common/malloc_elem.c                |  6 ------
 lib/eal/common/malloc_heap.c                |  5 -----
 lib/eal/common/malloc_mp.c                  |  1 -
 lib/eal/common/malloc_mp.h                  |  2 --
 lib/eal/common/rte_malloc.c                 |  5 -----
 lib/eal/common/rte_random.c                 |  3 ---
 lib/eal/common/rte_service.c                |  6 ------
 lib/eal/include/rte_version.h               |  2 --
 lib/eal/linux/eal.c                         | 10 ----------
 lib/eal/linux/eal_alarm.c                   |  7 -------
 lib/eal/linux/eal_cpuflags.c                |  2 --
 lib/eal/linux/eal_debug.c                   |  5 -----
 lib/eal/linux/eal_dev.c                     |  4 ----
 lib/eal/linux/eal_hugepage_info.c           |  7 -------
 lib/eal/linux/eal_interrupts.c              |  8 --------
 lib/eal/linux/eal_lcore.c                   |  7 -------
 lib/eal/linux/eal_log.c                     |  9 ---------
 lib/eal/linux/eal_memalloc.c                |  8 --------
 lib/eal/linux/eal_memory.c                  |  9 ---------
 lib/eal/linux/eal_thread.c                  |  6 ------
 lib/eal/linux/eal_timer.c                   | 15 ---------------
 lib/eal/linux/eal_vfio_mp_sync.c            |  1 -
 lib/eal/unix/eal_file.c                     |  1 -
 lib/eal/unix/rte_thread.c                   |  1 -
 lib/eal/x86/rte_cycles.c                    |  1 -
 lib/efd/rte_efd.c                           |  3 ---
 lib/eventdev/rte_event_ring.c               |  6 ------
 lib/eventdev/rte_event_ring.h               |  2 --
 lib/eventdev/rte_event_timer_adapter.c      |  5 -----
 lib/eventdev/rte_event_timer_adapter.h      |  2 --
 lib/eventdev/rte_eventdev.c                 | 11 -----------
 lib/eventdev/rte_eventdev.h                 |  2 --
 lib/fib/dir24_8.c                           |  4 ----
 lib/fib/rte_fib.c                           |  2 --
 lib/fib/rte_fib.h                           |  1 -
 lib/fib/rte_fib6.c                          |  2 --
 lib/fib/rte_fib6.h                          |  1 -
 lib/fib/trie.c                              |  5 -----
 lib/fib/trie.h                              |  2 --
 lib/flow_classify/rte_flow_classify.c       |  3 ---
 lib/flow_classify/rte_flow_classify.h       |  4 ----
 lib/flow_classify/rte_flow_classify_parse.c |  1 -
 lib/flow_classify/rte_flow_classify_parse.h |  1 -
 lib/gpudev/gpudev.c                         |  1 -
 lib/graph/graph_debug.c                     |  2 --
 lib/graph/graph_ops.c                       |  1 -
 lib/graph/graph_populate.c                  |  2 --
 lib/graph/node.c                            |  1 -
 lib/gro/gro_tcp4.c                          |  1 -
 lib/gro/gro_tcp4.h                          |  2 --
 lib/gro/gro_udp4.c                          |  1 -
 lib/gro/gro_udp4.h                          |  2 --
 lib/gro/gro_vxlan_tcp4.c                    |  1 -
 lib/gro/gro_vxlan_udp4.c                    |  1 -
 lib/gro/rte_gro.c                           |  1 -
 lib/hash/rte_cuckoo_hash.c                  |  4 ----
 lib/hash/rte_fbk_hash.c                     |  6 ------
 lib/hash/rte_fbk_hash.h                     |  1 -
 lib/hash/rte_thash.c                        |  1 -
 lib/hash/rte_thash.h                        |  1 -
 lib/ip_frag/rte_ip_frag_common.c            |  1 -
 lib/ip_frag/rte_ipv4_fragmentation.c        |  2 --
 lib/ipsec/esp_inb.c                         |  1 -
 lib/ipsec/esp_outb.c                        |  1 -
 lib/ipsec/ipsec_sad.c                       |  1 -
 lib/ipsec/sa.c                              |  3 ---
 lib/ipsec/sa.h                              |  1 -
 lib/jobstats/rte_jobstats.c                 |  3 ---
 lib/kni/rte_kni.c                           |  2 --
 lib/kni/rte_kni.h                           |  2 --
 lib/kvargs/rte_kvargs.c                     |  1 -
 lib/latencystats/rte_latencystats.c         |  4 ----
 lib/lpm/rte_lpm.c                           |  7 -------
 lib/lpm/rte_lpm.h                           |  4 ----
 lib/lpm/rte_lpm6.c                          |  7 -------
 lib/lpm/rte_lpm6.h                          |  1 -
 lib/mbuf/rte_mbuf.c                         | 11 -----------
 lib/mbuf/rte_mbuf.h                         |  2 --
 lib/mbuf/rte_mbuf_dyn.h                     |  2 --
 lib/mbuf/rte_mbuf_pool_ops.c                |  1 -
 lib/mbuf/rte_mbuf_pool_ops.h                |  1 -
 lib/member/rte_member.c                     |  2 --
 lib/member/rte_member.h                     |  1 -
 lib/member/rte_member_vbf.c                 |  1 -
 lib/mempool/rte_mempool.c                   |  7 -------
 lib/mempool/rte_mempool.h                   |  4 ----
 lib/metrics/rte_metrics.c                   |  3 ---
 lib/net/net_crc_avx512.c                    |  3 ---
 lib/net/net_crc_sse.c                       |  1 -
 lib/net/rte_arp.c                           |  1 -
 lib/net/rte_ether.h                         |  1 -
 lib/net/rte_net_crc.c                       |  2 --
 lib/node/ethdev_ctrl.c                      |  2 --
 lib/node/ethdev_rx.c                        |  1 -
 lib/node/ethdev_tx.c                        |  1 -
 lib/node/ip4_lookup.c                       |  5 -----
 lib/node/ip4_rewrite.c                      |  4 ----
 lib/node/pkt_cls.c                          |  4 ----
 lib/node/pkt_drop.c                         |  1 -
 lib/pcapng/rte_pcapng.c                     |  1 -
 lib/pcapng/rte_pcapng.h                     |  2 --
 lib/pci/rte_pci.c                           | 15 +--------------
 lib/pci/rte_pci.h                           |  1 -
 lib/pdump/rte_pdump.c                       |  1 -
 lib/pdump/rte_pdump.h                       |  2 --
 lib/pipeline/rte_pipeline.c                 |  4 ----
 lib/pipeline/rte_port_in_action.c           |  2 --
 lib/pipeline/rte_swx_ctl.h                  |  2 --
 lib/pipeline/rte_swx_pipeline.c             |  1 -
 lib/pipeline/rte_swx_pipeline.h             |  1 -
 lib/pipeline/rte_swx_pipeline_spec.c        |  1 -
 lib/pipeline/rte_table_action.c             |  2 --
 lib/port/rte_port_fd.h                      |  1 -
 lib/port/rte_port_frag.c                    |  2 --
 lib/port/rte_port_frag.h                    |  1 -
 lib/port/rte_port_kni.c                     |  1 -
 lib/port/rte_port_kni.h                     |  1 -
 lib/port/rte_port_ras.c                     |  1 -
 lib/port/rte_port_ras.h                     |  1 -
 lib/port/rte_port_ring.h                    |  1 -
 lib/port/rte_port_sched.c                   |  1 -
 lib/port/rte_port_source_sink.c             |  1 -
 lib/port/rte_swx_port_fd.c                  |  1 -
 lib/port/rte_swx_port_fd.h                  |  1 -
 lib/port/rte_swx_port_ring.h                |  1 -
 lib/power/guest_channel.c                   |  2 --
 lib/power/power_acpi_cpufreq.c              |  7 -------
 lib/power/power_acpi_cpufreq.h              |  4 ----
 lib/power/power_common.h                    |  1 -
 lib/power/power_cppc_cpufreq.c              |  1 -
 lib/power/power_cppc_cpufreq.h              |  4 ----
 lib/power/power_kvm_vm.c                    |  1 -
 lib/power/power_kvm_vm.h                    |  4 ----
 lib/power/power_pstate_cpufreq.c            |  6 ------
 lib/power/power_pstate_cpufreq.h            |  4 ----
 lib/power/rte_power.c                       |  1 -
 lib/power/rte_power.h                       |  2 --
 lib/power/rte_power_empty_poll.c            |  2 --
 lib/rawdev/rte_rawdev.c                     | 14 --------------
 lib/rcu/rte_rcu_qsbr.c                      |  4 ----
 lib/rcu/rte_rcu_qsbr.h                      |  4 ----
 lib/regexdev/rte_regexdev.c                 |  2 --
 lib/regexdev/rte_regexdev.h                 |  3 ---
 lib/reorder/rte_reorder.c                   |  1 -
 lib/rib/rte_rib.c                           |  2 --
 lib/rib/rte_rib.h                           |  1 -
 lib/rib/rte_rib6.c                          |  2 --
 lib/rib/rte_rib6.h                          |  1 -
 lib/ring/rte_ring.c                         |  9 ---------
 lib/sched/rte_pie.c                         |  2 --
 lib/sched/rte_red.h                         |  1 -
 lib/sched/rte_sched.c                       |  1 -
 lib/sched/rte_sched.h                       |  1 -
 lib/security/rte_security.c                 |  2 --
 lib/security/rte_security.h                 |  3 ---
 lib/stack/rte_stack.c                       |  2 --
 lib/stack/rte_stack.h                       |  1 -
 lib/table/rte_swx_table_em.c                |  1 -
 lib/table/rte_swx_table_em.h                |  1 -
 lib/table/rte_swx_table_learner.c           |  1 -
 lib/table/rte_swx_table_learner.h           |  1 -
 lib/table/rte_swx_table_selector.c          |  1 -
 lib/table/rte_swx_table_wm.c                |  2 --
 lib/table/rte_swx_table_wm.h                |  1 -
 lib/table/rte_table_acl.c                   |  3 ---
 lib/table/rte_table_array.c                 |  2 --
 lib/table/rte_table_hash_cuckoo.c           |  2 --
 lib/table/rte_table_hash_ext.c              |  2 --
 lib/table/rte_table_hash_key16.c            |  2 --
 lib/table/rte_table_hash_key32.c            |  2 --
 lib/table/rte_table_hash_key8.c             |  2 --
 lib/table/rte_table_hash_lru.c              |  2 --
 lib/table/rte_table_lpm.c                   |  2 --
 lib/table/rte_table_lpm_ipv6.c              |  3 ---
 lib/table/rte_table_stub.c                  |  1 -
 lib/table/rte_table_stub.h                  |  1 -
 lib/telemetry/telemetry.c                   |  1 -
 lib/telemetry/telemetry_data.h              |  1 -
 lib/timer/rte_timer.c                       |  6 ------
 lib/vhost/fd_man.c                          |  6 ------
 lib/vhost/fd_man.h                          |  1 -
 lib/vhost/socket.c                          |  1 -
 lib/vhost/vdpa.c                            |  1 -
 lib/vhost/vhost.c                           |  4 ----
 lib/vhost/vhost.h                           |  2 --
 lib/vhost/vhost_user.c                      |  2 --
 233 files changed, 3 insertions(+), 681 deletions(-)

diff --git a/examples/vm_power_manager/guest_cli/main.c b/examples/vm_power_manager/guest_cli/main.c
index b8fa65ef15..9da50020ac 100644
--- a/examples/vm_power_manager/guest_cli/main.c
+++ b/examples/vm_power_manager/guest_cli/main.c
@@ -13,6 +13,7 @@
 #include <rte_debug.h>
 #include <rte_eal.h>
 #include <rte_log.h>
+#include <rte_string_fns.h>
 
 #include "vm_power_cli_guest.h"
 #include "parse.h"
diff --git a/lib/acl/rte_acl.c b/lib/acl/rte_acl.c
index 4e693b2488..a61c3ba188 100644
--- a/lib/acl/rte_acl.c
+++ b/lib/acl/rte_acl.c
@@ -6,7 +6,6 @@
 #include <rte_string_fns.h>
 #include <rte_acl.h>
 #include <rte_tailq.h>
-#include <rte_vect.h>
 
 #include "acl.h"
 
diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
index 7f353d4f7e..aaee7b7872 100644
--- a/lib/bbdev/rte_bbdev.c
+++ b/lib/bbdev/rte_bbdev.c
@@ -6,19 +6,15 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include <rte_compat.h>
 #include <rte_common.h>
 #include <rte_errno.h>
 #include <rte_log.h>
-#include <rte_debug.h>
 #include <rte_eal.h>
 #include <rte_malloc.h>
 #include <rte_mempool.h>
 #include <rte_memzone.h>
 #include <rte_lcore.h>
-#include <rte_dev.h>
 #include <rte_spinlock.h>
-#include <rte_tailq.h>
 #include <rte_interrupts.h>
 
 #include "rte_bbdev_op.h"
diff --git a/lib/bbdev/rte_bbdev.h b/lib/bbdev/rte_bbdev.h
index 1dbcf73b0e..b88c88167e 100644
--- a/lib/bbdev/rte_bbdev.h
+++ b/lib/bbdev/rte_bbdev.h
@@ -26,12 +26,8 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <string.h>
 
-#include <rte_compat.h>
-#include <rte_bus.h>
 #include <rte_cpuflags.h>
-#include <rte_memory.h>
 
 #include "rte_bbdev_op.h"
 
diff --git a/lib/bpf/bpf.c b/lib/bpf/bpf.c
index 0caad2a8f0..1e1dd42a58 100644
--- a/lib/bpf/bpf.c
+++ b/lib/bpf/bpf.c
@@ -2,15 +2,11 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
-#include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 #include <errno.h>
 #include <stdint.h>
-#include <inttypes.h>
 
 #include <rte_common.h>
-#include <rte_eal.h>
 
 #include "bpf_impl.h"
 
diff --git a/lib/bpf/bpf_exec.c b/lib/bpf/bpf_exec.c
index b921112feb..09f4a9a571 100644
--- a/lib/bpf/bpf_exec.c
+++ b/lib/bpf/bpf_exec.c
@@ -2,18 +2,12 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
-#include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
-#include <errno.h>
 #include <stdint.h>
-#include <inttypes.h>
 
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_debug.h>
-#include <rte_memory.h>
-#include <rte_eal.h>
 #include <rte_byteorder.h>
 
 #include "bpf_impl.h"
diff --git a/lib/bpf/bpf_jit_x86.c b/lib/bpf/bpf_jit_x86.c
index 518513376a..c1a30e0386 100644
--- a/lib/bpf/bpf_jit_x86.c
+++ b/lib/bpf/bpf_jit_x86.c
@@ -2,17 +2,12 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
-#include <stdarg.h>
 #include <errno.h>
 #include <stdint.h>
-#include <inttypes.h>
 
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_debug.h>
-#include <rte_memory.h>
-#include <rte_eal.h>
-#include <rte_byteorder.h>
 
 #include "bpf_impl.h"
 
diff --git a/lib/bpf/bpf_load.c b/lib/bpf/bpf_load.c
index 272f2ba11b..0c4ac7be6c 100644
--- a/lib/bpf/bpf_load.c
+++ b/lib/bpf/bpf_load.c
@@ -2,20 +2,12 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
-#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <stdint.h>
-#include <unistd.h>
-#include <inttypes.h>
 
-#include <rte_common.h>
 #include <rte_log.h>
-#include <rte_debug.h>
-#include <rte_memory.h>
-#include <rte_eal.h>
-#include <rte_byteorder.h>
 #include <rte_errno.h>
 
 #include "bpf_impl.h"
diff --git a/lib/bpf/bpf_pkt.c b/lib/bpf/bpf_pkt.c
index af422afc07..ffd2db7840 100644
--- a/lib/bpf/bpf_pkt.c
+++ b/lib/bpf/bpf_pkt.c
@@ -2,28 +2,16 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
-#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <stdint.h>
-#include <unistd.h>
-#include <inttypes.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <sys/queue.h>
 
 #include <rte_common.h>
-#include <rte_byteorder.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
-#include <rte_debug.h>
-#include <rte_cycles.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
 #include <rte_atomic.h>
 #include <rte_mbuf.h>
 #include <rte_ethdev.h>
diff --git a/lib/bpf/bpf_validate.c b/lib/bpf/bpf_validate.c
index 09331258eb..9ff86fc970 100644
--- a/lib/bpf/bpf_validate.c
+++ b/lib/bpf/bpf_validate.c
@@ -2,7 +2,6 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
-#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -10,8 +9,6 @@
 #include <inttypes.h>
 
 #include <rte_common.h>
-#include <rte_eal.h>
-#include <rte_byteorder.h>
 
 #include "bpf_impl.h"
 
diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c
index 8f1854cb0b..e1009ba4c4 100644
--- a/lib/cmdline/cmdline.c
+++ b/lib/cmdline/cmdline.c
@@ -9,8 +9,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <inttypes.h>
-#include <fcntl.h>
 #include <errno.h>
 
 #include <rte_string_fns.h>
diff --git a/lib/cmdline/cmdline_parse.c b/lib/cmdline/cmdline_parse.c
index f5cc934782..349ec87bd7 100644
--- a/lib/cmdline/cmdline_parse.c
+++ b/lib/cmdline/cmdline_parse.c
@@ -5,11 +5,8 @@
  */
 
 #include <stdio.h>
-#include <stdarg.h>
 #include <errno.h>
 #include <string.h>
-#include <inttypes.h>
-#include <ctype.h>
 
 #include <rte_string_fns.h>
 
diff --git a/lib/cmdline/cmdline_parse_portlist.c b/lib/cmdline/cmdline_parse_portlist.c
index e1aa07be4b..2e2294553a 100644
--- a/lib/cmdline/cmdline_parse_portlist.c
+++ b/lib/cmdline/cmdline_parse_portlist.c
@@ -6,11 +6,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
-#include <ctype.h>
 #include <string.h>
 #include <errno.h>
-#include <stdarg.h>
 
 #include <rte_string_fns.h>
 #include "cmdline_parse.h"
diff --git a/lib/cmdline/cmdline_parse_string.c b/lib/cmdline/cmdline_parse_string.c
index 9cf41d0f76..d756638905 100644
--- a/lib/cmdline/cmdline_parse_string.c
+++ b/lib/cmdline/cmdline_parse_string.c
@@ -5,11 +5,7 @@
  */
 
 #include <stdio.h>
-#include <inttypes.h>
-#include <ctype.h>
 #include <string.h>
-#include <stdarg.h>
-#include <errno.h>
 #include <rte_string_fns.h>
 
 #include "cmdline_parse.h"
diff --git a/lib/cmdline/cmdline_rdline.c b/lib/cmdline/cmdline_rdline.c
index d92b1cda53..5cf723a012 100644
--- a/lib/cmdline/cmdline_rdline.c
+++ b/lib/cmdline/cmdline_rdline.c
@@ -6,9 +6,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
-#include <stdarg.h>
 #include <errno.h>
 #include <ctype.h>
 
diff --git a/lib/cmdline/cmdline_vt100.c b/lib/cmdline/cmdline_vt100.c
index bb968dd5fa..4c9a46c953 100644
--- a/lib/cmdline/cmdline_vt100.c
+++ b/lib/cmdline/cmdline_vt100.c
@@ -4,12 +4,9 @@
  * All rights reserved.
  */
 
-#include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdarg.h>
-#include <ctype.h>
 
 #include "cmdline_vt100.h"
 
diff --git a/lib/compressdev/rte_comp.c b/lib/compressdev/rte_comp.c
index 3b0e46f96e..320c6dab92 100644
--- a/lib/compressdev/rte_comp.c
+++ b/lib/compressdev/rte_comp.c
@@ -3,7 +3,6 @@
  */
 
 #include "rte_comp.h"
-#include "rte_compressdev.h"
 #include "rte_compressdev_internal.h"
 
 const char *
diff --git a/lib/compressdev/rte_comp.h b/lib/compressdev/rte_comp.h
index 95306c5d03..cdb55e5887 100644
--- a/lib/compressdev/rte_comp.h
+++ b/lib/compressdev/rte_comp.h
@@ -16,7 +16,6 @@
 extern "C" {
 #endif
 
-#include <rte_mempool.h>
 #include <rte_mbuf.h>
 
 /**
diff --git a/lib/compressdev/rte_compressdev.c b/lib/compressdev/rte_compressdev.c
index d4f7d4d3da..22c438f2dd 100644
--- a/lib/compressdev/rte_compressdev.c
+++ b/lib/compressdev/rte_compressdev.c
@@ -3,7 +3,6 @@
  */
 
 #include <string.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <inttypes.h>
 
diff --git a/lib/compressdev/rte_compressdev.h b/lib/compressdev/rte_compressdev.h
index 2840c27c6c..aa865c4c03 100644
--- a/lib/compressdev/rte_compressdev.h
+++ b/lib/compressdev/rte_compressdev.h
@@ -21,7 +21,6 @@
 extern "C" {
 #endif
 
-#include <rte_common.h>
 
 #include "rte_comp.h"
 
diff --git a/lib/compressdev/rte_compressdev_pmd.h b/lib/compressdev/rte_compressdev_pmd.h
index f9a42d1f05..9fabc399c5 100644
--- a/lib/compressdev/rte_compressdev_pmd.h
+++ b/lib/compressdev/rte_compressdev_pmd.h
@@ -19,8 +19,6 @@ extern "C" {
 
 #include <string.h>
 
-#include <rte_dev.h>
-#include <rte_common.h>
 
 #include "rte_compressdev.h"
 #include "rte_compressdev_internal.h"
diff --git a/lib/cryptodev/cryptodev_pmd.h b/lib/cryptodev/cryptodev_pmd.h
index d91902f6e0..8bbb9caeae 100644
--- a/lib/cryptodev/cryptodev_pmd.h
+++ b/lib/cryptodev/cryptodev_pmd.h
@@ -15,11 +15,7 @@
 
 #include <string.h>
 
-#include <rte_config.h>
-#include <rte_dev.h>
 #include <rte_malloc.h>
-#include <rte_mbuf.h>
-#include <rte_mempool.h>
 #include <rte_log.h>
 #include <rte_common.h>
 
diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index 727d271fb9..321d2171d4 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -2,36 +2,25 @@
  * Copyright(c) 2015-2020 Intel Corporation
  */
 
-#include <sys/types.h>
 #include <sys/queue.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <errno.h>
 #include <stdint.h>
 #include <inttypes.h>
 
-#include <rte_byteorder.h>
 #include <rte_log.h>
 #include <rte_debug.h>
 #include <rte_dev.h>
-#include <rte_interrupts.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
-#include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-#include <rte_atomic.h>
-#include <rte_branch_prediction.h>
 #include <rte_common.h>
 #include <rte_mempool.h>
 #include <rte_malloc.h>
-#include <rte_mbuf.h>
 #include <rte_errno.h>
 #include <rte_spinlock.h>
 #include <rte_string_fns.h>
diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
index 19e2e70287..45d33f4a50 100644
--- a/lib/cryptodev/rte_cryptodev.h
+++ b/lib/cryptodev/rte_cryptodev.h
@@ -20,9 +20,7 @@ extern "C" {
 
 #include "rte_kvargs.h"
 #include "rte_crypto.h"
-#include "rte_dev.h"
 #include <rte_common.h>
-#include <rte_config.h>
 #include <rte_rcu_qsbr.h>
 
 #include "rte_cryptodev_trace_fp.h"
diff --git a/lib/distributor/rte_distributor.c b/lib/distributor/rte_distributor.c
index c210cf86bd..3035b7a999 100644
--- a/lib/distributor/rte_distributor.c
+++ b/lib/distributor/rte_distributor.c
@@ -6,7 +6,6 @@
 #include <sys/queue.h>
 #include <string.h>
 #include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_cycles.h>
 #include <rte_memzone.h>
 #include <rte_errno.h>
@@ -14,7 +13,6 @@
 #include <rte_eal_memconfig.h>
 #include <rte_pause.h>
 #include <rte_tailq.h>
-#include <rte_vect.h>
 
 #include "rte_distributor.h"
 #include "rte_distributor_single.h"
diff --git a/lib/distributor/rte_distributor_match_sse.c b/lib/distributor/rte_distributor_match_sse.c
index e3b3b79264..11d8819278 100644
--- a/lib/distributor/rte_distributor_match_sse.c
+++ b/lib/distributor/rte_distributor_match_sse.c
@@ -3,10 +3,8 @@
  */
 
 #include <rte_mbuf.h>
-#include "rte_distributor.h"
 #include "distributor_private.h"
 #include "smmintrin.h"
-#include "nmmintrin.h"
 
 
 void
diff --git a/lib/distributor/rte_distributor_single.c b/lib/distributor/rte_distributor_single.c
index b653620688..de90aa8bb5 100644
--- a/lib/distributor/rte_distributor_single.c
+++ b/lib/distributor/rte_distributor_single.c
@@ -4,9 +4,7 @@
 
 #include <stdio.h>
 #include <sys/queue.h>
-#include <string.h>
 #include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_errno.h>
 #include <rte_string_fns.h>
diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
index 4abe79c536..ad9e7a0975 100644
--- a/lib/dmadev/rte_dmadev.h
+++ b/lib/dmadev/rte_dmadev.h
@@ -149,7 +149,6 @@
 #include <rte_bitops.h>
 #include <rte_common.h>
 #include <rte_compat.h>
-#include <rte_dev.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c
index e1e9976d8d..c0ee4e442f 100644
--- a/lib/eal/common/eal_common_dev.c
+++ b/lib/eal/common/eal_common_dev.c
@@ -5,20 +5,15 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <inttypes.h>
 #include <sys/queue.h>
 
-#include <rte_compat.h>
 #include <rte_bus.h>
 #include <rte_class.h>
 #include <rte_dev.h>
 #include <rte_devargs.h>
-#include <rte_debug.h>
 #include <rte_errno.h>
-#include <rte_kvargs.h>
 #include <rte_log.h>
 #include <rte_spinlock.h>
-#include <rte_malloc.h>
 #include <rte_string_fns.h>
 
 #include "eal_private.h"
diff --git a/lib/eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c
index 69004b0a2d..8da3ba3879 100644
--- a/lib/eal/common/eal_common_devargs.c
+++ b/lib/eal/common/eal_common_devargs.c
@@ -12,7 +12,6 @@
 
 #include <rte_bus.h>
 #include <rte_class.h>
-#include <rte_compat.h>
 #include <rte_dev.h>
 #include <rte_devargs.h>
 #include <rte_errno.h>
diff --git a/lib/eal/common/eal_common_errno.c b/lib/eal/common/eal_common_errno.c
index 7507c746ec..ef8f782abb 100644
--- a/lib/eal/common/eal_common_errno.c
+++ b/lib/eal/common/eal_common_errno.c
@@ -5,15 +5,11 @@
 /* Use XSI-compliant portable version of strerror_r() */
 #undef _GNU_SOURCE
 
-#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdarg.h>
-#include <errno.h>
 
 #include <rte_per_lcore.h>
 #include <rte_errno.h>
-#include <rte_string_fns.h>
 
 #ifdef RTE_EXEC_ENV_WINDOWS
 #define strerror_r(errnum, buf, buflen) strerror_s(buf, buflen, errnum)
diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c
index 3a28a53247..f11f87979f 100644
--- a/lib/eal/common/eal_common_fbarray.c
+++ b/lib/eal/common/eal_common_fbarray.c
@@ -2,7 +2,6 @@
  * Copyright(c) 2017-2018 Intel Corporation
  */
 
-#include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdint.h>
@@ -14,9 +13,7 @@
 #include <rte_eal_paging.h>
 #include <rte_errno.h>
 #include <rte_log.h>
-#include <rte_memory.h>
 #include <rte_spinlock.h>
-#include <rte_tailq.h>
 
 #include "eal_filesystem.h"
 #include "eal_private.h"
diff --git a/lib/eal/common/eal_common_hexdump.c b/lib/eal/common/eal_common_hexdump.c
index 2d2179d411..63bbbdcf0a 100644
--- a/lib/eal/common/eal_common_hexdump.c
+++ b/lib/eal/common/eal_common_hexdump.c
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2010-2014 Intel Corporation
  */
-#include <stdlib.h>
 #include <stdio.h>
-#include <errno.h>
-#include <stdint.h>
 #include <rte_hexdump.h>
 #include <rte_string_fns.h>
 
diff --git a/lib/eal/common/eal_common_launch.c b/lib/eal/common/eal_common_launch.c
index e95dadffb3..9f393b9bda 100644
--- a/lib/eal/common/eal_common_launch.c
+++ b/lib/eal/common/eal_common_launch.c
@@ -3,16 +3,10 @@
  */
 
 #include <errno.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <sys/queue.h>
 
 #include <rte_launch.h>
-#include <rte_memory.h>
-#include <rte_eal.h>
 #include <rte_atomic.h>
 #include <rte_pause.h>
-#include <rte_per_lcore.h>
 #include <rte_lcore.h>
 
 #include "eal_private.h"
diff --git a/lib/eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c
index 5de7570aac..11092791a4 100644
--- a/lib/eal/common/eal_common_lcore.c
+++ b/lib/eal/common/eal_common_lcore.c
@@ -2,19 +2,14 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <unistd.h>
-#include <limits.h>
 #include <string.h>
 
 #include <rte_common.h>
-#include <rte_debug.h>
-#include <rte_eal.h>
+#include <rte_branch_prediction.h>
 #include <rte_errno.h>
 #include <rte_lcore.h>
 #include <rte_log.h>
-#include <rte_rwlock.h>
 
-#include "eal_memcfg.h"
 #include "eal_private.h"
 #include "eal_thread.h"
 
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index cbd0b851f2..d57dca9785 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -12,7 +12,6 @@
 #include <fnmatch.h>
 #include <sys/queue.h>
 
-#include <rte_eal.h>
 #include <rte_log.h>
 #include <rte_os_shim.h>
 #include <rte_per_lcore.h>
diff --git a/lib/eal/common/eal_common_memalloc.c b/lib/eal/common/eal_common_memalloc.c
index e872c6533b..f8770ff835 100644
--- a/lib/eal/common/eal_common_memalloc.c
+++ b/lib/eal/common/eal_common_memalloc.c
@@ -5,12 +5,9 @@
 #include <string.h>
 
 #include <rte_errno.h>
-#include <rte_lcore.h>
 #include <rte_fbarray.h>
-#include <rte_memzone.h>
 #include <rte_memory.h>
 #include <rte_string_fns.h>
-#include <rte_rwlock.h>
 
 #include "eal_private.h"
 #include "eal_internal_cfg.h"
diff --git a/lib/eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c
index 88517fd69e..688dc615d7 100644
--- a/lib/eal/common/eal_common_memory.c
+++ b/lib/eal/common/eal_common_memory.c
@@ -2,16 +2,12 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
-#include <unistd.h>
 #include <inttypes.h>
-#include <sys/queue.h>
 
 #include <rte_fbarray.h>
 #include <rte_memory.h>
diff --git a/lib/eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c
index 9a0c5309ac..860fb5fb64 100644
--- a/lib/eal/common/eal_common_memzone.c
+++ b/lib/eal/common/eal_common_memzone.c
@@ -2,20 +2,16 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
-#include <stdarg.h>
 #include <inttypes.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/queue.h>
 
 #include <rte_log.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_eal.h>
-#include <rte_per_lcore.h>
 #include <rte_errno.h>
 #include <rte_string_fns.h>
 #include <rte_common.h>
diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c
index ff44d2124b..f247a42455 100644
--- a/lib/eal/common/eal_common_options.c
+++ b/lib/eal/common/eal_common_options.c
@@ -4,7 +4,6 @@
  */
 
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 #ifndef RTE_EXEC_ENV_WINDOWS
 #include <syslog.h>
@@ -17,7 +16,6 @@
 #include <dlfcn.h>
 #include <libgen.h>
 #endif
-#include <sys/types.h>
 #include <sys/stat.h>
 #ifndef RTE_EXEC_ENV_WINDOWS
 #include <dirent.h>
diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c
index b33d58ea0a..313060528f 100644
--- a/lib/eal/common/eal_common_proc.c
+++ b/lib/eal/common/eal_common_proc.c
@@ -15,7 +15,6 @@
 #include <string.h>
 #include <sys/file.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
@@ -27,7 +26,6 @@
 #include <rte_errno.h>
 #include <rte_lcore.h>
 #include <rte_log.h>
-#include <rte_tailq.h>
 
 #include "eal_memcfg.h"
 #include "eal_private.h"
diff --git a/lib/eal/common/eal_common_string_fns.c b/lib/eal/common/eal_common_string_fns.c
index ddd1891656..0236ae4023 100644
--- a/lib/eal/common/eal_common_string_fns.c
+++ b/lib/eal/common/eal_common_string_fns.c
@@ -2,9 +2,7 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <string.h>
 #include <stdio.h>
-#include <stdarg.h>
 #include <errno.h>
 
 #include <rte_string_fns.h>
diff --git a/lib/eal/common/eal_common_tailqs.c b/lib/eal/common/eal_common_tailqs.c
index ead06897b8..580fbf24bc 100644
--- a/lib/eal/common/eal_common_tailqs.c
+++ b/lib/eal/common/eal_common_tailqs.c
@@ -3,24 +3,13 @@
  */
 
 #include <sys/queue.h>
-#include <stdint.h>
-#include <errno.h>
 #include <stdio.h>
-#include <stdarg.h>
 #include <string.h>
-#include <inttypes.h>
 
-#include <rte_memory.h>
-#include <rte_launch.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-#include <rte_atomic.h>
-#include <rte_branch_prediction.h>
 #include <rte_log.h>
 #include <rte_string_fns.h>
-#include <rte_debug.h>
 
 #include "eal_private.h"
 #include "eal_memcfg.h"
diff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c
index bb6fc8084c..684bea166c 100644
--- a/lib/eal/common/eal_common_thread.c
+++ b/lib/eal/common/eal_common_thread.c
@@ -4,10 +4,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
 #include <pthread.h>
-#include <signal.h>
 #include <sched.h>
 #include <assert.h>
 #include <string.h>
diff --git a/lib/eal/common/eal_common_timer.c b/lib/eal/common/eal_common_timer.c
index 86f8429847..5686a5102b 100644
--- a/lib/eal/common/eal_common_timer.c
+++ b/lib/eal/common/eal_common_timer.c
@@ -2,16 +2,10 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <string.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <inttypes.h>
-#include <sys/types.h>
-#include <time.h>
-#include <errno.h>
 
 #include <rte_common.h>
-#include <rte_compat.h>
 #include <rte_log.h>
 #include <rte_cycles.h>
 #include <rte_pause.h>
diff --git a/lib/eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c
index 7bff1cd2ce..036f6ac348 100644
--- a/lib/eal/common/eal_common_trace.c
+++ b/lib/eal/common/eal_common_trace.c
@@ -3,7 +3,6 @@
  */
 
 #include <fnmatch.h>
-#include <inttypes.h>
 #include <sys/queue.h>
 #include <regex.h>
 
diff --git a/lib/eal/common/hotplug_mp.h b/lib/eal/common/hotplug_mp.h
index 4848446c85..7221284286 100644
--- a/lib/eal/common/hotplug_mp.h
+++ b/lib/eal/common/hotplug_mp.h
@@ -6,7 +6,6 @@
 #define _HOTPLUG_MP_H_
 
 #include "rte_dev.h"
-#include "rte_bus.h"
 
 #define EAL_DEV_MP_ACTION_REQUEST      "eal_dev_mp_request"
 #define EAL_DEV_MP_ACTION_RESPONSE     "eal_dev_mp_response"
diff --git a/lib/eal/common/malloc_elem.c b/lib/eal/common/malloc_elem.c
index e04e0890fb..83f05497cc 100644
--- a/lib/eal/common/malloc_elem.c
+++ b/lib/eal/common/malloc_elem.c
@@ -6,17 +6,11 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/queue.h>
 
 #include <rte_memory.h>
 #include <rte_eal.h>
-#include <rte_launch.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-#include <rte_debug.h>
 #include <rte_common.h>
-#include <rte_spinlock.h>
 
 #include "eal_private.h"
 #include "eal_internal_cfg.h"
diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index 97191bcd9b..6c572b6f2c 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -5,7 +5,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdarg.h>
 #include <errno.h>
 #include <sys/queue.h>
 
@@ -13,15 +12,11 @@
 #include <rte_errno.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
-#include <rte_launch.h>
-#include <rte_per_lcore.h>
 #include <rte_lcore.h>
 #include <rte_common.h>
 #include <rte_string_fns.h>
 #include <rte_spinlock.h>
-#include <rte_memcpy.h>
 #include <rte_memzone.h>
-#include <rte_atomic.h>
 #include <rte_fbarray.h>
 
 #include "eal_internal_cfg.h"
diff --git a/lib/eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c
index 5f6f275b78..207b90847e 100644
--- a/lib/eal/common/malloc_mp.c
+++ b/lib/eal/common/malloc_mp.c
@@ -5,7 +5,6 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <rte_alarm.h>
 #include <rte_errno.h>
 #include <rte_string_fns.h>
 
diff --git a/lib/eal/common/malloc_mp.h b/lib/eal/common/malloc_mp.h
index c806f7beaf..8d148689ff 100644
--- a/lib/eal/common/malloc_mp.h
+++ b/lib/eal/common/malloc_mp.h
@@ -10,8 +10,6 @@
 
 #include <rte_common.h>
 #include <rte_random.h>
-#include <rte_spinlock.h>
-#include <rte_tailq.h>
 
 /* forward declarations */
 struct malloc_heap;
diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
index 71a3f7ecb4..7c67d2156f 100644
--- a/lib/eal/common/rte_malloc.c
+++ b/lib/eal/common/rte_malloc.c
@@ -13,11 +13,6 @@
 #include <rte_memory.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
-#include <rte_branch_prediction.h>
-#include <rte_debug.h>
-#include <rte_launch.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
 #include <rte_common.h>
 #include <rte_spinlock.h>
 
diff --git a/lib/eal/common/rte_random.c b/lib/eal/common/rte_random.c
index ce21c2242a..4535cc980c 100644
--- a/lib/eal/common/rte_random.c
+++ b/lib/eal/common/rte_random.c
@@ -5,14 +5,11 @@
 #ifdef __RDSEED__
 #include <x86intrin.h>
 #endif
-#include <stdlib.h>
 #include <unistd.h>
 
 #include <rte_branch_prediction.h>
 #include <rte_cycles.h>
-#include <rte_eal.h>
 #include <rte_lcore.h>
-#include <rte_memory.h>
 #include <rte_random.h>
 
 struct rte_rand_state {
diff --git a/lib/eal/common/rte_service.c b/lib/eal/common/rte_service.c
index bd8fb72e78..ef31b1f63c 100644
--- a/lib/eal/common/rte_service.c
+++ b/lib/eal/common/rte_service.c
@@ -3,22 +3,16 @@
  */
 
 #include <stdio.h>
-#include <unistd.h>
 #include <inttypes.h>
-#include <limits.h>
 #include <string.h>
 
-#include <rte_compat.h>
 #include <rte_service.h>
 #include <rte_service_component.h>
 
-#include <rte_eal.h>
 #include <rte_lcore.h>
 #include <rte_common.h>
-#include <rte_debug.h>
 #include <rte_cycles.h>
 #include <rte_atomic.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_spinlock.h>
 
diff --git a/lib/eal/include/rte_version.h b/lib/eal/include/rte_version.h
index b06a62e7a2..414b6167f2 100644
--- a/lib/eal/include/rte_version.h
+++ b/lib/eal/include/rte_version.h
@@ -14,10 +14,8 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
 #include <string.h>
 #include <stdio.h>
-#include <rte_common.h>
 #include <rte_compat.h>
 
 /**
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index e9990a95e6..025e5cc10d 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -7,10 +7,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <syslog.h>
 #include <getopt.h>
 #include <sys/file.h>
 #include <dirent.h>
@@ -20,32 +18,24 @@
 #include <errno.h>
 #include <limits.h>
 #include <sys/mman.h>
-#include <sys/queue.h>
 #include <sys/stat.h>
 #if defined(RTE_ARCH_X86)
 #include <sys/io.h>
 #endif
 #include <linux/version.h>
 
-#include <rte_compat.h>
 #include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_memory.h>
 #include <rte_launch.h>
 #include <rte_eal.h>
 #include <rte_errno.h>
-#include <rte_per_lcore.h>
 #include <rte_lcore.h>
 #include <rte_service_component.h>
 #include <rte_log.h>
-#include <rte_random.h>
-#include <rte_cycles.h>
 #include <rte_string_fns.h>
 #include <rte_cpuflags.h>
-#include <rte_interrupts.h>
 #include <rte_bus.h>
-#include <rte_dev.h>
-#include <rte_devargs.h>
 #include <rte_version.h>
 #include <malloc_heap.h>
 #include <rte_vfio.h>
diff --git a/lib/eal/linux/eal_alarm.c b/lib/eal/linux/eal_alarm.c
index 3b5e894595..4de67138bc 100644
--- a/lib/eal/linux/eal_alarm.c
+++ b/lib/eal/linux/eal_alarm.c
@@ -3,21 +3,14 @@
  */
 #include <stdio.h>
 #include <stdint.h>
-#include <signal.h>
 #include <errno.h>
-#include <string.h>
 #include <sys/queue.h>
 #include <sys/time.h>
 #include <sys/timerfd.h>
 
-#include <rte_memory.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_common.h>
-#include <rte_per_lcore.h>
-#include <rte_eal.h>
-#include <rte_launch.h>
-#include <rte_lcore.h>
 #include <rte_errno.h>
 #include <rte_spinlock.h>
 #include <rte_eal_trace.h>
diff --git a/lib/eal/linux/eal_cpuflags.c b/lib/eal/linux/eal_cpuflags.c
index d38296e1e5..c684940e1d 100644
--- a/lib/eal/linux/eal_cpuflags.c
+++ b/lib/eal/linux/eal_cpuflags.c
@@ -5,8 +5,6 @@
 #include <elf.h>
 #include <fcntl.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
diff --git a/lib/eal/linux/eal_debug.c b/lib/eal/linux/eal_debug.c
index 64dab4e0da..b0ecf5a9dc 100644
--- a/lib/eal/linux/eal_debug.c
+++ b/lib/eal/linux/eal_debug.c
@@ -5,16 +5,11 @@
 #ifdef RTE_BACKTRACE
 #include <execinfo.h>
 #endif
-#include <stdarg.h>
-#include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdint.h>
 
 #include <rte_log.h>
 #include <rte_debug.h>
-#include <rte_common.h>
-#include <rte_eal.h>
 
 #define BACKTRACE_SIZE 256
 
diff --git a/lib/eal/linux/eal_dev.c b/lib/eal/linux/eal_dev.c
index bde55a3d92..f6e5861221 100644
--- a/lib/eal/linux/eal_dev.c
+++ b/lib/eal/linux/eal_dev.c
@@ -4,20 +4,16 @@
 
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <sys/socket.h>
 #include <linux/netlink.h>
 
 #include <rte_string_fns.h>
 #include <rte_log.h>
-#include <rte_compat.h>
 #include <rte_dev.h>
-#include <rte_malloc.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_bus.h>
-#include <rte_eal.h>
 #include <rte_spinlock.h>
 #include <rte_errno.h>
 
diff --git a/lib/eal/linux/eal_hugepage_info.c b/lib/eal/linux/eal_hugepage_info.c
index ec172ef4b8..a1b6cb31ff 100644
--- a/lib/eal/linux/eal_hugepage_info.c
+++ b/lib/eal/linux/eal_hugepage_info.c
@@ -3,7 +3,6 @@
  */
 
 #include <string.h>
-#include <sys/types.h>
 #include <sys/file.h>
 #include <dirent.h>
 #include <fcntl.h>
@@ -12,19 +11,13 @@
 #include <stdio.h>
 #include <fnmatch.h>
 #include <inttypes.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/mman.h>
-#include <sys/queue.h>
 #include <sys/stat.h>
 
 #include <linux/mman.h> /* for hugetlb-related flags */
 
-#include <rte_memory.h>
-#include <rte_eal.h>
-#include <rte_launch.h>
-#include <rte_per_lcore.h>
 #include <rte_lcore.h>
 #include <rte_debug.h>
 #include <rte_log.h>
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index 70060bf3ef..d52ec8eb4c 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -7,13 +7,10 @@
 #include <stdlib.h>
 #include <pthread.h>
 #include <sys/queue.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <inttypes.h>
 #include <sys/epoll.h>
-#include <sys/signalfd.h>
 #include <sys/ioctl.h>
 #include <sys/eventfd.h>
 #include <assert.h>
@@ -21,9 +18,6 @@
 
 #include <rte_common.h>
 #include <rte_interrupts.h>
-#include <rte_memory.h>
-#include <rte_launch.h>
-#include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
 #include <rte_branch_prediction.h>
@@ -36,8 +30,6 @@
 #include <rte_eal_trace.h>
 
 #include "eal_private.h"
-#include "eal_vfio.h"
-#include "eal_thread.h"
 
 #define EAL_INTR_EPOLL_WAIT_FOREVER (-1)
 #define NB_OTHER_INTR               1
diff --git a/lib/eal/linux/eal_lcore.c b/lib/eal/linux/eal_lcore.c
index bc8965844c..2e6a350603 100644
--- a/lib/eal/linux/eal_lcore.c
+++ b/lib/eal/linux/eal_lcore.c
@@ -4,15 +4,8 @@
 
 #include <unistd.h>
 #include <limits.h>
-#include <string.h>
-#include <dirent.h>
 
 #include <rte_log.h>
-#include <rte_eal.h>
-#include <rte_lcore.h>
-#include <rte_common.h>
-#include <rte_string_fns.h>
-#include <rte_debug.h>
 
 #include "eal_private.h"
 #include "eal_filesystem.h"
diff --git a/lib/eal/linux/eal_log.c b/lib/eal/linux/eal_log.c
index 5a795ac9eb..d44416fd65 100644
--- a/lib/eal/linux/eal_log.c
+++ b/lib/eal/linux/eal_log.c
@@ -2,19 +2,10 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <string.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <sys/types.h>
 #include <syslog.h>
-#include <sys/queue.h>
 
-#include <rte_memory.h>
-#include <rte_eal.h>
-#include <rte_launch.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-#include <rte_spinlock.h>
 #include <rte_log.h>
 
 #include "eal_log.h"
diff --git a/lib/eal/linux/eal_memalloc.c b/lib/eal/linux/eal_memalloc.c
index 17f7c5394a..f8b1588cae 100644
--- a/lib/eal/linux/eal_memalloc.c
+++ b/lib/eal/linux/eal_memalloc.c
@@ -3,23 +3,17 @@
  */
 
 #include <errno.h>
-#include <stdarg.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
-#include <inttypes.h>
 #include <string.h>
 #include <sys/mman.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/queue.h>
 #include <sys/file.h>
 #include <unistd.h>
 #include <limits.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
 #include <signal.h>
 #include <setjmp.h>
 #ifdef F_ADD_SEALS /* if file sealing is supported, so is memfd */
@@ -36,9 +30,7 @@
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_eal.h>
-#include <rte_errno.h>
 #include <rte_memory.h>
-#include <rte_spinlock.h>
 
 #include "eal_filesystem.h"
 #include "eal_internal_cfg.h"
diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c
index 83eec078a4..ee1a9e6800 100644
--- a/lib/eal/linux/eal_memory.c
+++ b/lib/eal/linux/eal_memory.c
@@ -5,7 +5,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdarg.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -13,19 +12,14 @@
 #include <inttypes.h>
 #include <string.h>
 #include <sys/mman.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/queue.h>
 #include <sys/file.h>
 #include <sys/resource.h>
 #include <unistd.h>
 #include <limits.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
 #include <signal.h>
 #include <setjmp.h>
 #ifdef F_ADD_SEALS /* if file sealing is supported, so is memfd */
-#include <linux/memfd.h>
 #define MEMFD_SUPPORTED
 #endif
 #ifdef RTE_EAL_NUMA_AWARE_HUGEPAGES
@@ -36,12 +30,9 @@
 #include <rte_errno.h>
 #include <rte_log.h>
 #include <rte_memory.h>
-#include <rte_launch.h>
 #include <rte_eal.h>
-#include <rte_per_lcore.h>
 #include <rte_lcore.h>
 #include <rte_common.h>
-#include <rte_string_fns.h>
 
 #include "eal_private.h"
 #include "eal_memalloc.h"
diff --git a/lib/eal/linux/eal_thread.c b/lib/eal/linux/eal_thread.c
index c7f0f9b2f7..fa6cd7e2c4 100644
--- a/lib/eal/linux/eal_thread.c
+++ b/lib/eal/linux/eal_thread.c
@@ -4,20 +4,14 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <sched.h>
-#include <sys/queue.h>
 #include <sys/syscall.h>
 
 #include <rte_debug.h>
-#include <rte_atomic.h>
 #include <rte_launch.h>
 #include <rte_log.h>
-#include <rte_memory.h>
-#include <rte_per_lcore.h>
 #include <rte_eal.h>
 #include <rte_lcore.h>
 #include <rte_eal_trace.h>
diff --git a/lib/eal/linux/eal_timer.c b/lib/eal/linux/eal_timer.c
index 7cf15cabac..620baf038d 100644
--- a/lib/eal/linux/eal_timer.c
+++ b/lib/eal/linux/eal_timer.c
@@ -3,28 +3,13 @@
  * Copyright(c) 2012-2013 6WIND S.A.
  */
 
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <sys/mman.h>
-#include <sys/queue.h>
-#include <pthread.h>
-#include <errno.h>
 
 #include <rte_common.h>
-#include <rte_log.h>
 #include <rte_cycles.h>
-#include <rte_lcore.h>
-#include <rte_memory.h>
-#include <rte_eal.h>
-#include <rte_debug.h>
 
 #include "eal_private.h"
-#include "eal_internal_cfg.h"
 
 enum timer_source eal_timer_source = EAL_TIMER_HPET;
 
diff --git a/lib/eal/linux/eal_vfio_mp_sync.c b/lib/eal/linux/eal_vfio_mp_sync.c
index d12bbaee64..4e26781948 100644
--- a/lib/eal/linux/eal_vfio_mp_sync.c
+++ b/lib/eal/linux/eal_vfio_mp_sync.c
@@ -5,7 +5,6 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <rte_compat.h>
 #include <rte_errno.h>
 #include <rte_log.h>
 #include <rte_vfio.h>
diff --git a/lib/eal/unix/eal_file.c b/lib/eal/unix/eal_file.c
index ec554e0096..f04f5fbcbc 100644
--- a/lib/eal/unix/eal_file.c
+++ b/lib/eal/unix/eal_file.c
@@ -3,7 +3,6 @@
  */
 
 #include <sys/file.h>
-#include <sys/mman.h>
 #include <fcntl.h>
 #include <unistd.h>
 
diff --git a/lib/eal/unix/rte_thread.c b/lib/eal/unix/rte_thread.c
index c72d619ec1..c34ede9186 100644
--- a/lib/eal/unix/rte_thread.c
+++ b/lib/eal/unix/rte_thread.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rte_common.h>
 #include <rte_errno.h>
 #include <rte_log.h>
 #include <rte_thread.h>
diff --git a/lib/eal/x86/rte_cycles.c b/lib/eal/x86/rte_cycles.c
index edd9621abb..0e695caf28 100644
--- a/lib/eal/x86/rte_cycles.c
+++ b/lib/eal/x86/rte_cycles.c
@@ -6,7 +6,6 @@
 #include <unistd.h>
 #include <cpuid.h>
 
-#include <rte_common.h>
 
 #include "eal_private.h"
 
diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c
index 86ef46863c..560cd78961 100644
--- a/lib/efd/rte_efd.c
+++ b/lib/efd/rte_efd.c
@@ -6,7 +6,6 @@
 #include <stdint.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <stdarg.h>
 #include <sys/queue.h>
 
 #include <rte_string_fns.h>
@@ -21,11 +20,9 @@
 #include <rte_jhash.h>
 #include <rte_hash_crc.h>
 #include <rte_tailq.h>
-#include <rte_vect.h>
 
 #include "rte_efd.h"
 #if defined(RTE_ARCH_X86)
-#include "rte_efd_x86.h"
 #elif defined(RTE_ARCH_ARM64)
 #include "rte_efd_arm64.h"
 #endif
diff --git a/lib/eventdev/rte_event_ring.c b/lib/eventdev/rte_event_ring.c
index d27e23901d..c070715148 100644
--- a/lib/eventdev/rte_event_ring.c
+++ b/lib/eventdev/rte_event_ring.c
@@ -3,13 +3,7 @@
  * Copyright(c) 2019 Arm Limited
  */
 
-#include <sys/queue.h>
-#include <string.h>
 
-#include <rte_tailq.h>
-#include <rte_memzone.h>
-#include <rte_rwlock.h>
-#include <rte_eal_memconfig.h>
 #include "rte_event_ring.h"
 
 int
diff --git a/lib/eventdev/rte_event_ring.h b/lib/eventdev/rte_event_ring.h
index c0861b0ec2..0a54f7fde2 100644
--- a/lib/eventdev/rte_event_ring.h
+++ b/lib/eventdev/rte_event_ring.h
@@ -17,8 +17,6 @@
 #include <stdint.h>
 
 #include <rte_common.h>
-#include <rte_memory.h>
-#include <rte_malloc.h>
 #include <rte_ring.h>
 #include <rte_ring_elem.h>
 #include "rte_eventdev.h"
diff --git a/lib/eventdev/rte_event_timer_adapter.c b/lib/eventdev/rte_event_timer_adapter.c
index 9dad170b5a..7dc39386c9 100644
--- a/lib/eventdev/rte_event_timer_adapter.c
+++ b/lib/eventdev/rte_event_timer_adapter.c
@@ -6,19 +6,14 @@
 #include <string.h>
 #include <inttypes.h>
 #include <stdbool.h>
-#include <sys/queue.h>
 
 #include <rte_memzone.h>
-#include <rte_memory.h>
-#include <rte_dev.h>
 #include <rte_errno.h>
 #include <rte_malloc.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_common.h>
 #include <rte_timer.h>
 #include <rte_service_component.h>
-#include <rte_cycles.h>
 
 #include "event_timer_adapter_pmd.h"
 #include "eventdev_pmd.h"
diff --git a/lib/eventdev/rte_event_timer_adapter.h b/lib/eventdev/rte_event_timer_adapter.h
index e68d02da72..4c91e5516a 100644
--- a/lib/eventdev/rte_event_timer_adapter.h
+++ b/lib/eventdev/rte_event_timer_adapter.h
@@ -111,8 +111,6 @@
 extern "C" {
 #endif
 
-#include <rte_spinlock.h>
-#include <rte_memory.h>
 
 #include "rte_eventdev.h"
 #include "rte_eventdev_trace_fp.h"
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index 6988bf186e..532a253553 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -6,26 +6,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <errno.h>
 #include <stdint.h>
 #include <inttypes.h>
-#include <sys/types.h>
-#include <sys/queue.h>
 
 #include <rte_string_fns.h>
-#include <rte_byteorder.h>
 #include <rte_log.h>
-#include <rte_debug.h>
 #include <rte_dev.h>
-#include <rte_memory.h>
-#include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-#include <rte_atomic.h>
-#include <rte_branch_prediction.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
 #include <rte_errno.h>
diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
index 25fb7c89dd..67c4a5e036 100644
--- a/lib/eventdev/rte_eventdev.h
+++ b/lib/eventdev/rte_eventdev.h
@@ -211,10 +211,8 @@ extern "C" {
 #endif
 
 #include <rte_common.h>
-#include <rte_config.h>
 #include <rte_errno.h>
 #include <rte_mbuf_pool_ops.h>
-#include <rte_memory.h>
 #include <rte_mempool.h>
 
 #include "rte_eventdev_trace_fp.h"
diff --git a/lib/fib/dir24_8.c b/lib/fib/dir24_8.c
index bb3bc9753b..a8ba4f64ca 100644
--- a/lib/fib/dir24_8.c
+++ b/lib/fib/dir24_8.c
@@ -4,15 +4,11 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
 
 #include <rte_debug.h>
 #include <rte_malloc.h>
 #include <rte_errno.h>
-#include <rte_memory.h>
 #include <rte_vect.h>
 
 #include <rte_rib.h>
diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c
index 0cced97a77..8af4c40919 100644
--- a/lib/fib/rte_fib.c
+++ b/lib/fib/rte_fib.c
@@ -6,11 +6,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_errno.h>
 #include <rte_malloc.h>
-#include <rte_rwlock.h>
 #include <rte_string_fns.h>
 #include <rte_tailq.h>
 
diff --git a/lib/fib/rte_fib.h b/lib/fib/rte_fib.h
index e592d3251a..90f28b7e11 100644
--- a/lib/fib/rte_fib.h
+++ b/lib/fib/rte_fib.h
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 
-#include <rte_compat.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c
index eebee297d6..4b8e22b142 100644
--- a/lib/fib/rte_fib6.c
+++ b/lib/fib/rte_fib6.c
@@ -6,11 +6,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_tailq.h>
 #include <rte_errno.h>
-#include <rte_rwlock.h>
 #include <rte_malloc.h>
 #include <rte_string_fns.h>
 
diff --git a/lib/fib/rte_fib6.h b/lib/fib/rte_fib6.h
index cb133719e1..62a425d9af 100644
--- a/lib/fib/rte_fib6.h
+++ b/lib/fib/rte_fib6.h
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 
-#include <rte_compat.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/fib/trie.c b/lib/fib/trie.c
index 044095bf03..3e780afdaf 100644
--- a/lib/fib/trie.c
+++ b/lib/fib/trie.c
@@ -4,16 +4,11 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
 
 #include <rte_debug.h>
 #include <rte_malloc.h>
 #include <rte_errno.h>
-#include <rte_memory.h>
-#include <rte_vect.h>
 
 #include <rte_rib6.h>
 #include <rte_fib6.h>
diff --git a/lib/fib/trie.h b/lib/fib/trie.h
index 9fd15ae79f..3cf161ae25 100644
--- a/lib/fib/trie.h
+++ b/lib/fib/trie.h
@@ -10,8 +10,6 @@
  * @file
  * RTE IPv6 Longest Prefix Match (LPM)
  */
-#include <rte_prefetch.h>
-#include <rte_branch_prediction.h>
 
 /* @internal Total number of tbl24 entries. */
 #define TRIE_TBL24_NUM_ENT	(1 << 24)
diff --git a/lib/flow_classify/rte_flow_classify.c b/lib/flow_classify/rte_flow_classify.c
index d3ba2ed227..e3667306e5 100644
--- a/lib/flow_classify/rte_flow_classify.c
+++ b/lib/flow_classify/rte_flow_classify.c
@@ -3,12 +3,9 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_compat.h>
 #include <rte_flow_classify.h>
 #include "rte_flow_classify_parse.h"
-#include <rte_flow_driver.h>
 #include <rte_table_acl.h>
-#include <stdbool.h>
 
 static uint32_t unique_id = 1;
 
diff --git a/lib/flow_classify/rte_flow_classify.h b/lib/flow_classify/rte_flow_classify.h
index 82ea92b6a6..39512b6206 100644
--- a/lib/flow_classify/rte_flow_classify.h
+++ b/lib/flow_classify/rte_flow_classify.h
@@ -45,11 +45,7 @@
 
 #include <rte_compat.h>
 #include <rte_common.h>
-#include <rte_ethdev.h>
-#include <rte_ether.h>
 #include <rte_flow.h>
-#include <rte_acl.h>
-#include <rte_table_acl.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/flow_classify/rte_flow_classify_parse.c b/lib/flow_classify/rte_flow_classify_parse.c
index 465330291f..345d129d35 100644
--- a/lib/flow_classify/rte_flow_classify_parse.c
+++ b/lib/flow_classify/rte_flow_classify_parse.c
@@ -4,7 +4,6 @@
 
 #include <rte_flow_classify.h>
 #include "rte_flow_classify_parse.h"
-#include <rte_flow_driver.h>
 
 struct classify_valid_pattern {
 	enum rte_flow_item_type *items;
diff --git a/lib/flow_classify/rte_flow_classify_parse.h b/lib/flow_classify/rte_flow_classify_parse.h
index 365a07bd6d..7943efc0d4 100644
--- a/lib/flow_classify/rte_flow_classify_parse.h
+++ b/lib/flow_classify/rte_flow_classify_parse.h
@@ -6,7 +6,6 @@
 #define _RTE_FLOW_CLASSIFY_PARSE_H_
 
 #include <rte_ethdev.h>
-#include <rte_ether.h>
 #include <rte_flow.h>
 #include <stdbool.h>
 
diff --git a/lib/gpudev/gpudev.c b/lib/gpudev/gpudev.c
index ce92d63257..55a087bfb6 100644
--- a/lib/gpudev/gpudev.c
+++ b/lib/gpudev/gpudev.c
@@ -4,7 +4,6 @@
 
 #include <rte_eal.h>
 #include <rte_tailq.h>
-#include <rte_rwlock.h>
 #include <rte_string_fns.h>
 #include <rte_memzone.h>
 #include <rte_malloc.h>
diff --git a/lib/graph/graph_debug.c b/lib/graph/graph_debug.c
index f8aea16acb..b84412f5dd 100644
--- a/lib/graph/graph_debug.c
+++ b/lib/graph/graph_debug.c
@@ -2,8 +2,6 @@
  * Copyright(C) 2020 Marvell International Ltd.
  */
 
-#include <rte_common.h>
-#include <rte_debug.h>
 
 #include "graph_private.h"
 
diff --git a/lib/graph/graph_ops.c b/lib/graph/graph_ops.c
index 3355953118..20db58d84e 100644
--- a/lib/graph/graph_ops.c
+++ b/lib/graph/graph_ops.c
@@ -5,7 +5,6 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <rte_common.h>
 #include <rte_errno.h>
 
 #include "graph_private.h"
diff --git a/lib/graph/graph_populate.c b/lib/graph/graph_populate.c
index 093512efab..102fd6c29b 100644
--- a/lib/graph/graph_populate.c
+++ b/lib/graph/graph_populate.c
@@ -2,8 +2,6 @@
  * Copyright(C) 2020 Marvell International Ltd.
  */
 
-#include <fnmatch.h>
-#include <stdbool.h>
 
 #include <rte_common.h>
 #include <rte_errno.h>
diff --git a/lib/graph/node.c b/lib/graph/node.c
index 86ec4316f9..79230035a2 100644
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -8,7 +8,6 @@
 
 #include <rte_common.h>
 #include <rte_debug.h>
-#include <rte_eal.h>
 #include <rte_errno.h>
 #include <rte_string_fns.h>
 
diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c
index aff22178e3..7498c66141 100644
--- a/lib/gro/gro_tcp4.c
+++ b/lib/gro/gro_tcp4.c
@@ -4,7 +4,6 @@
 
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
-#include <rte_cycles.h>
 #include <rte_ethdev.h>
 
 #include "gro_tcp4.h"
diff --git a/lib/gro/gro_tcp4.h b/lib/gro/gro_tcp4.h
index bb875a5ef0..212f97a042 100644
--- a/lib/gro/gro_tcp4.h
+++ b/lib/gro/gro_tcp4.h
@@ -5,9 +5,7 @@
 #ifndef _GRO_TCP4_H_
 #define _GRO_TCP4_H_
 
-#include <rte_ip.h>
 #include <rte_tcp.h>
-#include <rte_vxlan.h>
 
 #define INVALID_ARRAY_INDEX 0xffffffffUL
 #define GRO_TCP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL)
diff --git a/lib/gro/gro_udp4.c b/lib/gro/gro_udp4.c
index e78dda7874..dd71135ada 100644
--- a/lib/gro/gro_udp4.c
+++ b/lib/gro/gro_udp4.c
@@ -4,7 +4,6 @@
 
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
-#include <rte_cycles.h>
 #include <rte_ethdev.h>
 
 #include "gro_udp4.h"
diff --git a/lib/gro/gro_udp4.h b/lib/gro/gro_udp4.h
index d38b393f79..6467d7bc3b 100644
--- a/lib/gro/gro_udp4.h
+++ b/lib/gro/gro_udp4.h
@@ -6,8 +6,6 @@
 #define _GRO_UDP4_H_
 
 #include <rte_ip.h>
-#include <rte_udp.h>
-#include <rte_vxlan.h>
 
 #define INVALID_ARRAY_INDEX 0xffffffffUL
 #define GRO_UDP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL)
diff --git a/lib/gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c
index 2005899afe..3be4deb7c7 100644
--- a/lib/gro/gro_vxlan_tcp4.c
+++ b/lib/gro/gro_vxlan_tcp4.c
@@ -4,7 +4,6 @@
 
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
-#include <rte_cycles.h>
 #include <rte_ethdev.h>
 #include <rte_udp.h>
 
diff --git a/lib/gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c
index 4767c910bb..b78a7ae89e 100644
--- a/lib/gro/gro_vxlan_udp4.c
+++ b/lib/gro/gro_vxlan_udp4.c
@@ -4,7 +4,6 @@
 
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
-#include <rte_cycles.h>
 #include <rte_ethdev.h>
 #include <rte_udp.h>
 
diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index 8ca4da67e9..6f7dd4d709 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -3,7 +3,6 @@
  */
 
 #include <rte_malloc.h>
-#include <rte_mbuf.h>
 #include <rte_cycles.h>
 #include <rte_ethdev.h>
 
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index 1191dfd81a..490f94af4b 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -7,7 +7,6 @@
 #include <stdint.h>
 #include <errno.h>
 #include <stdio.h>
-#include <stdarg.h>
 #include <sys/queue.h>
 
 #include <rte_common.h>
@@ -16,14 +15,11 @@
 #include <rte_prefetch.h>
 #include <rte_branch_prediction.h>
 #include <rte_malloc.h>
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
-#include <rte_per_lcore.h>
 #include <rte_errno.h>
 #include <rte_string_fns.h>
 #include <rte_cpuflags.h>
 #include <rte_rwlock.h>
-#include <rte_spinlock.h>
 #include <rte_ring_elem.h>
 #include <rte_compat.h>
 #include <rte_vect.h>
diff --git a/lib/hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c
index 576e8e6662..538b23a403 100644
--- a/lib/hash/rte_fbk_hash.c
+++ b/lib/hash/rte_fbk_hash.c
@@ -4,22 +4,16 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <stdarg.h>
 #include <string.h>
 #include <errno.h>
 
 #include <sys/queue.h>
-#include <rte_memory.h>
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_malloc.h>
 #include <rte_common.h>
-#include <rte_per_lcore.h>
 #include <rte_errno.h>
 #include <rte_string_fns.h>
-#include <rte_cpuflags.h>
 #include <rte_log.h>
-#include <rte_spinlock.h>
 #include <rte_tailq.h>
 
 #include "rte_fbk_hash.h"
diff --git a/lib/hash/rte_fbk_hash.h b/lib/hash/rte_fbk_hash.h
index 9c3a61c1d6..b01126999b 100644
--- a/lib/hash/rte_fbk_hash.h
+++ b/lib/hash/rte_fbk_hash.h
@@ -24,7 +24,6 @@ extern "C" {
 
 #include <string.h>
 
-#include <rte_config.h>
 #include <rte_hash_crc.h>
 #include <rte_jhash.h>
 
diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
index 6847e36f4b..0249883b8d 100644
--- a/lib/hash/rte_thash.c
+++ b/lib/hash/rte_thash.c
@@ -9,7 +9,6 @@
 #include <rte_random.h>
 #include <rte_memcpy.h>
 #include <rte_errno.h>
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
diff --git a/lib/hash/rte_thash.h b/lib/hash/rte_thash.h
index c11ca0d5b8..451f64043a 100644
--- a/lib/hash/rte_thash.h
+++ b/lib/hash/rte_thash.h
@@ -21,7 +21,6 @@ extern "C" {
 
 #include <stdint.h>
 #include <rte_byteorder.h>
-#include <rte_config.h>
 #include <rte_ip.h>
 #include <rte_common.h>
 #include <rte_thash_gfni.h>
diff --git a/lib/ip_frag/rte_ip_frag_common.c b/lib/ip_frag/rte_ip_frag_common.c
index 2c781a6d33..c1de2e81b6 100644
--- a/lib/ip_frag/rte_ip_frag_common.c
+++ b/lib/ip_frag/rte_ip_frag_common.c
@@ -5,7 +5,6 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include <rte_memory.h>
 #include <rte_log.h>
 
 #include "ip_frag_common.h"
diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c
index 2e7739d027..669682a0cf 100644
--- a/lib/ip_frag/rte_ipv4_fragmentation.c
+++ b/lib/ip_frag/rte_ipv4_fragmentation.c
@@ -6,8 +6,6 @@
 #include <errno.h>
 
 #include <rte_memcpy.h>
-#include <rte_mempool.h>
-#include <rte_debug.h>
 #include <rte_ether.h>
 
 #include "ip_frag_common.h"
diff --git a/lib/ipsec/esp_inb.c b/lib/ipsec/esp_inb.c
index 636c850fa6..f159bf7460 100644
--- a/lib/ipsec/esp_inb.c
+++ b/lib/ipsec/esp_inb.c
@@ -4,7 +4,6 @@
 
 #include <rte_ipsec.h>
 #include <rte_esp.h>
-#include <rte_ip.h>
 #include <rte_errno.h>
 #include <rte_cryptodev.h>
 
diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c
index 672e56aba0..6925bb9945 100644
--- a/lib/ipsec/esp_outb.c
+++ b/lib/ipsec/esp_outb.c
@@ -4,7 +4,6 @@
 
 #include <rte_ipsec.h>
 #include <rte_esp.h>
-#include <rte_ip.h>
 #include <rte_udp.h>
 #include <rte_errno.h>
 #include <rte_cryptodev.h>
diff --git a/lib/ipsec/ipsec_sad.c b/lib/ipsec/ipsec_sad.c
index af4b1ce757..7cb492d187 100644
--- a/lib/ipsec/ipsec_sad.c
+++ b/lib/ipsec/ipsec_sad.c
@@ -10,7 +10,6 @@
 #include <rte_hash_crc.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
-#include <rte_rwlock.h>
 #include <rte_tailq.h>
 
 #include "rte_ipsec_sad.h"
diff --git a/lib/ipsec/sa.c b/lib/ipsec/sa.c
index cdb70af0cb..1b673b6a18 100644
--- a/lib/ipsec/sa.c
+++ b/lib/ipsec/sa.c
@@ -7,14 +7,11 @@
 #include <rte_ip.h>
 #include <rte_udp.h>
 #include <rte_errno.h>
-#include <rte_cryptodev.h>
 
 #include "sa.h"
 #include "ipsec_sqn.h"
 #include "crypto.h"
-#include "iph.h"
 #include "misc.h"
-#include "pad.h"
 
 #define MBUF_MAX_L2_LEN		RTE_LEN2MASK(RTE_MBUF_L2_LEN_BITS, uint64_t)
 #define MBUF_MAX_L3_LEN		RTE_LEN2MASK(RTE_MBUF_L3_LEN_BITS, uint64_t)
diff --git a/lib/ipsec/sa.h b/lib/ipsec/sa.h
index 7503587b50..46f9a4df5b 100644
--- a/lib/ipsec/sa.h
+++ b/lib/ipsec/sa.h
@@ -5,7 +5,6 @@
 #ifndef _SA_H_
 #define _SA_H_
 
-#include <rte_rwlock.h>
 
 #define IPSEC_MAX_HDR_SIZE	64
 #define IPSEC_MAX_IV_SIZE	16
diff --git a/lib/jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c
index 9b8fde5d55..af565a14ea 100644
--- a/lib/jobstats/rte_jobstats.c
+++ b/lib/jobstats/rte_jobstats.c
@@ -7,10 +7,7 @@
 #include <errno.h>
 
 #include <rte_string_fns.h>
-#include <rte_errno.h>
 #include <rte_common.h>
-#include <rte_eal.h>
-#include <rte_log.h>
 #include <rte_cycles.h>
 #include <rte_branch_prediction.h>
 
diff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c
index fc8f0e7b5a..7971c56bb4 100644
--- a/lib/kni/rte_kni.c
+++ b/lib/kni/rte_kni.c
@@ -12,7 +12,6 @@
 #include <sys/ioctl.h>
 #include <linux/version.h>
 
-#include <rte_spinlock.h>
 #include <rte_string_fns.h>
 #include <rte_ethdev.h>
 #include <rte_malloc.h>
@@ -20,7 +19,6 @@
 #include <rte_kni.h>
 #include <rte_memzone.h>
 #include <rte_tailq.h>
-#include <rte_rwlock.h>
 #include <rte_eal_memconfig.h>
 #include <rte_kni_common.h>
 #include "rte_kni_fifo.h"
diff --git a/lib/kni/rte_kni.h b/lib/kni/rte_kni.h
index b0eaf46104..b85d3dd32b 100644
--- a/lib/kni/rte_kni.h
+++ b/lib/kni/rte_kni.h
@@ -18,8 +18,6 @@
  */
 
 #include <rte_pci.h>
-#include <rte_memory.h>
-#include <rte_mempool.h>
 #include <rte_ether.h>
 
 #include <rte_kni_common.h>
diff --git a/lib/kvargs/rte_kvargs.c b/lib/kvargs/rte_kvargs.c
index 11f624ef14..c77bb82feb 100644
--- a/lib/kvargs/rte_kvargs.c
+++ b/lib/kvargs/rte_kvargs.c
@@ -8,7 +8,6 @@
 #include <stdbool.h>
 
 #include <rte_os_shim.h>
-#include <rte_string_fns.h>
 
 #include "rte_kvargs.h"
 
diff --git a/lib/latencystats/rte_latencystats.c b/lib/latencystats/rte_latencystats.c
index ab8db7a139..8985a377db 100644
--- a/lib/latencystats/rte_latencystats.c
+++ b/lib/latencystats/rte_latencystats.c
@@ -2,13 +2,9 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdbool.h>
 #include <math.h>
 
 #include <rte_string_fns.h>
-#include <rte_mbuf.h>
 #include <rte_mbuf_dyn.h>
 #include <rte_log.h>
 #include <rte_cycles.h>
diff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c
index 002811f4de..cdcd1b7f9e 100644
--- a/lib/lpm/rte_lpm.c
+++ b/lib/lpm/rte_lpm.c
@@ -6,22 +6,15 @@
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <sys/queue.h>
 
 #include <rte_log.h>
-#include <rte_branch_prediction.h>
 #include <rte_common.h>
-#include <rte_memory.h>        /* for definition of RTE_CACHE_LINE_SIZE */
 #include <rte_malloc.h>
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
-#include <rte_per_lcore.h>
 #include <rte_string_fns.h>
 #include <rte_errno.h>
-#include <rte_rwlock.h>
-#include <rte_spinlock.h>
 #include <rte_tailq.h>
 
 #include "rte_lpm.h"
diff --git a/lib/lpm/rte_lpm.h b/lib/lpm/rte_lpm.h
index 5eb14c1748..eb91960e81 100644
--- a/lib/lpm/rte_lpm.h
+++ b/lib/lpm/rte_lpm.h
@@ -12,13 +12,9 @@
  */
 
 #include <errno.h>
-#include <sys/queue.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <rte_branch_prediction.h>
 #include <rte_byteorder.h>
-#include <rte_config.h>
-#include <rte_memory.h>
 #include <rte_common.h>
 #include <rte_vect.h>
 #include <rte_rcu_qsbr.h>
diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
index 73768fc956..8d21aeddb8 100644
--- a/lib/lpm/rte_lpm6.c
+++ b/lib/lpm/rte_lpm6.c
@@ -4,23 +4,16 @@
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <sys/queue.h>
 
 #include <rte_log.h>
-#include <rte_branch_prediction.h>
 #include <rte_common.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
-#include <rte_per_lcore.h>
 #include <rte_string_fns.h>
 #include <rte_errno.h>
-#include <rte_rwlock.h>
-#include <rte_spinlock.h>
 #include <rte_hash.h>
 #include <assert.h>
 #include <rte_jhash.h>
diff --git a/lib/lpm/rte_lpm6.h b/lib/lpm/rte_lpm6.h
index f96f3372e5..9b07260d5a 100644
--- a/lib/lpm/rte_lpm6.h
+++ b/lib/lpm/rte_lpm6.h
@@ -10,7 +10,6 @@
  */
 
 #include <stdint.h>
-#include <rte_compat.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
index 604d77bbda..87592faccb 100644
--- a/lib/mbuf/rte_mbuf.c
+++ b/lib/mbuf/rte_mbuf.c
@@ -5,28 +5,17 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdint.h>
-#include <stdarg.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <ctype.h>
-#include <sys/queue.h>
 
-#include <rte_compat.h>
 #include <rte_debug.h>
 #include <rte_common.h>
 #include <rte_log.h>
-#include <rte_memory.h>
-#include <rte_launch.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
 #include <rte_branch_prediction.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_mbuf_pool_ops.h>
-#include <rte_string_fns.h>
 #include <rte_hexdump.h>
 #include <rte_errno.h>
 #include <rte_memcpy.h>
diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
index dedf83c38d..9811e8c760 100644
--- a/lib/mbuf/rte_mbuf.h
+++ b/lib/mbuf/rte_mbuf.h
@@ -36,10 +36,8 @@
 #include <rte_common.h>
 #include <rte_config.h>
 #include <rte_mempool.h>
-#include <rte_memory.h>
 #include <rte_prefetch.h>
 #include <rte_branch_prediction.h>
-#include <rte_byteorder.h>
 #include <rte_mbuf_ptype.h>
 #include <rte_mbuf_core.h>
 
diff --git a/lib/mbuf/rte_mbuf_dyn.h b/lib/mbuf/rte_mbuf_dyn.h
index 5e981ac633..865c90f579 100644
--- a/lib/mbuf/rte_mbuf_dyn.h
+++ b/lib/mbuf/rte_mbuf_dyn.h
@@ -68,9 +68,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <sys/types.h>
 
-#include <rte_compat.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c
index f0e87a1412..4c91f4ce85 100644
--- a/lib/mbuf/rte_mbuf_pool_ops.c
+++ b/lib/mbuf/rte_mbuf_pool_ops.c
@@ -3,7 +3,6 @@
  */
 
 #include <string.h>
-#include <rte_compat.h>
 #include <rte_eal.h>
 #include <rte_mbuf.h>
 #include <rte_errno.h>
diff --git a/lib/mbuf/rte_mbuf_pool_ops.h b/lib/mbuf/rte_mbuf_pool_ops.h
index 7ed95a49a4..00cddb83ba 100644
--- a/lib/mbuf/rte_mbuf_pool_ops.h
+++ b/lib/mbuf/rte_mbuf_pool_ops.h
@@ -14,7 +14,6 @@
  * the best mempool ops available.
  */
 
-#include <rte_compat.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/member/rte_member.c b/lib/member/rte_member.c
index 9dd55a5adf..7e1632e6b5 100644
--- a/lib/member/rte_member.c
+++ b/lib/member/rte_member.c
@@ -5,9 +5,7 @@
 #include <string.h>
 
 #include <rte_string_fns.h>
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_errno.h>
 #include <rte_tailq.h>
diff --git a/lib/member/rte_member.h b/lib/member/rte_member.h
index c0689e233e..567ee0c84b 100644
--- a/lib/member/rte_member.h
+++ b/lib/member/rte_member.h
@@ -52,7 +52,6 @@ extern "C" {
 #include <stdint.h>
 
 #include <rte_common.h>
-#include <rte_config.h>
 
 /** The set ID type that stored internally in hash table based set summary. */
 typedef uint16_t member_set_t;
diff --git a/lib/member/rte_member_vbf.c b/lib/member/rte_member_vbf.c
index 8a232bae02..9df4620cff 100644
--- a/lib/member/rte_member_vbf.c
+++ b/lib/member/rte_member_vbf.c
@@ -6,7 +6,6 @@
 #include <string.h>
 
 #include <rte_malloc.h>
-#include <rte_memory.h>
 #include <rte_errno.h>
 #include <rte_log.h>
 
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index c5a699b1d6..de59009baf 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <errno.h>
@@ -19,16 +18,10 @@
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_malloc.h>
-#include <rte_atomic.h>
-#include <rte_launch.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-#include <rte_branch_prediction.h>
 #include <rte_errno.h>
 #include <rte_string_fns.h>
-#include <rte_spinlock.h>
 #include <rte_tailq.h>
 #include <rte_eal_paging.h>
 #include <rte_telemetry.h>
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index 1d3cdf7f22..3ada37cb86 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -34,17 +34,13 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdint.h>
-#include <errno.h>
 #include <inttypes.h>
 
 #include <rte_config.h>
 #include <rte_spinlock.h>
-#include <rte_log.h>
 #include <rte_debug.h>
 #include <rte_lcore.h>
-#include <rte_memory.h>
 #include <rte_branch_prediction.h>
 #include <rte_ring.h>
 #include <rte_memcpy.h>
diff --git a/lib/metrics/rte_metrics.c b/lib/metrics/rte_metrics.c
index e2a0fbeda8..0c7878e65f 100644
--- a/lib/metrics/rte_metrics.c
+++ b/lib/metrics/rte_metrics.c
@@ -3,13 +3,10 @@
  */
 
 #include <string.h>
-#include <sys/queue.h>
 
 #include <rte_common.h>
 #include <rte_string_fns.h>
-#include <rte_malloc.h>
 #include <rte_metrics.h>
-#include <rte_lcore.h>
 #include <rte_memzone.h>
 #include <rte_spinlock.h>
 
diff --git a/lib/net/net_crc_avx512.c b/lib/net/net_crc_avx512.c
index 3740fe3c9d..f6a3ce9bcd 100644
--- a/lib/net/net_crc_avx512.c
+++ b/lib/net/net_crc_avx512.c
@@ -2,11 +2,8 @@
  * Copyright(c) 2020 Intel Corporation
  */
 
-#include <string.h>
 
 #include <rte_common.h>
-#include <rte_branch_prediction.h>
-#include <rte_cpuflags.h>
 
 #include "net_crc.h"
 
diff --git a/lib/net/net_crc_sse.c b/lib/net/net_crc_sse.c
index 053b54b390..dd75845636 100644
--- a/lib/net/net_crc_sse.c
+++ b/lib/net/net_crc_sse.c
@@ -6,7 +6,6 @@
 
 #include <rte_common.h>
 #include <rte_branch_prediction.h>
-#include <rte_cpuflags.h>
 
 #include "net_crc.h"
 
diff --git a/lib/net/rte_arp.c b/lib/net/rte_arp.c
index 9f7eb6b375..22af519586 100644
--- a/lib/net/rte_arp.c
+++ b/lib/net/rte_arp.c
@@ -3,7 +3,6 @@
  */
 
 #include <rte_arp.h>
-#include <rte_byteorder.h>
 
 #define RARP_PKT_SIZE	64
 struct rte_mbuf *
diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h
index 3d9852d9e2..bf8a55ba06 100644
--- a/lib/net/rte_ether.h
+++ b/lib/net/rte_ether.h
@@ -18,7 +18,6 @@ extern "C" {
 #include <stdint.h>
 #include <stdio.h>
 
-#include <rte_memcpy.h>
 #include <rte_random.h>
 #include <rte_mbuf.h>
 #include <rte_byteorder.h>
diff --git a/lib/net/rte_net_crc.c b/lib/net/rte_net_crc.c
index d9a526ab7b..a685f9e7bb 100644
--- a/lib/net/rte_net_crc.c
+++ b/lib/net/rte_net_crc.c
@@ -3,13 +3,11 @@
  */
 
 #include <stddef.h>
-#include <string.h>
 #include <stdint.h>
 
 #include <rte_cpuflags.h>
 #include <rte_common.h>
 #include <rte_net_crc.h>
-#include <rte_eal.h>
 #include <rte_log.h>
 #include <rte_vect.h>
 
diff --git a/lib/node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c
index 13b8b705f0..5294607619 100644
--- a/lib/node/ethdev_ctrl.c
+++ b/lib/node/ethdev_ctrl.c
@@ -2,9 +2,7 @@
  * Copyright(C) 2020 Marvell International Ltd.
  */
 
-#include <rte_debug.h>
 #include <rte_ethdev.h>
-#include <rte_ether.h>
 #include <rte_graph.h>
 
 #include "rte_node_eth_api.h"
diff --git a/lib/node/ethdev_rx.c b/lib/node/ethdev_rx.c
index 4c23961505..a19237b42f 100644
--- a/lib/node/ethdev_rx.c
+++ b/lib/node/ethdev_rx.c
@@ -7,7 +7,6 @@
 #include <rte_ether.h>
 #include <rte_graph.h>
 #include <rte_graph_worker.h>
-#include <rte_mbuf.h>
 
 #include "ethdev_rx_priv.h"
 #include "node_private.h"
diff --git a/lib/node/ethdev_tx.c b/lib/node/ethdev_tx.c
index 075149089f..7d2d72f823 100644
--- a/lib/node/ethdev_tx.c
+++ b/lib/node/ethdev_tx.c
@@ -6,7 +6,6 @@
 #include <rte_ethdev.h>
 #include <rte_graph.h>
 #include <rte_graph_worker.h>
-#include <rte_mbuf.h>
 
 #include "ethdev_tx_priv.h"
 
diff --git a/lib/node/ip4_lookup.c b/lib/node/ip4_lookup.c
index d083a725fc..8bce03d7db 100644
--- a/lib/node/ip4_lookup.c
+++ b/lib/node/ip4_lookup.c
@@ -5,17 +5,12 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 
-#include <rte_debug.h>
 #include <rte_ethdev.h>
 #include <rte_ether.h>
 #include <rte_graph.h>
 #include <rte_graph_worker.h>
 #include <rte_ip.h>
 #include <rte_lpm.h>
-#include <rte_mbuf.h>
-#include <rte_tcp.h>
-#include <rte_udp.h>
-#include <rte_vect.h>
 
 #include "rte_node_ip4_api.h"
 
diff --git a/lib/node/ip4_rewrite.c b/lib/node/ip4_rewrite.c
index 99ecb457ff..34a920df5e 100644
--- a/lib/node/ip4_rewrite.c
+++ b/lib/node/ip4_rewrite.c
@@ -2,16 +2,12 @@
  * Copyright(C) 2020 Marvell International Ltd.
  */
 
-#include <rte_debug.h>
 #include <rte_ethdev.h>
 #include <rte_ether.h>
 #include <rte_graph.h>
 #include <rte_graph_worker.h>
 #include <rte_ip.h>
 #include <rte_malloc.h>
-#include <rte_mbuf.h>
-#include <rte_tcp.h>
-#include <rte_udp.h>
 #include <rte_vect.h>
 
 #include "rte_node_ip4_api.h"
diff --git a/lib/node/pkt_cls.c b/lib/node/pkt_cls.c
index b95454dd72..3e75f2cf78 100644
--- a/lib/node/pkt_cls.c
+++ b/lib/node/pkt_cls.c
@@ -2,10 +2,6 @@
  * Copyright (C) 2020 Marvell.
  */
 
-#include <rte_debug.h>
-#include <rte_ether.h>
-#include <rte_ethdev.h>
-#include <rte_mbuf.h>
 #include <rte_graph.h>
 #include <rte_graph_worker.h>
 
diff --git a/lib/node/pkt_drop.c b/lib/node/pkt_drop.c
index c350013236..1ad7fccd28 100644
--- a/lib/node/pkt_drop.c
+++ b/lib/node/pkt_drop.c
@@ -2,7 +2,6 @@
  * Copyright(C) 2020 Marvell International Ltd.
  */
 
-#include <rte_debug.h>
 #include <rte_graph.h>
 #include <rte_mbuf.h>
 
diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c
index 03edabe73e..5ae96a5bc9 100644
--- a/lib/pcapng/rte_pcapng.c
+++ b/lib/pcapng/rte_pcapng.c
@@ -8,7 +8,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/uio.h>
-#include <sys/utsname.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/lib/pcapng/rte_pcapng.h b/lib/pcapng/rte_pcapng.h
index 8d3fbb1941..7d2697c647 100644
--- a/lib/pcapng/rte_pcapng.h
+++ b/lib/pcapng/rte_pcapng.h
@@ -26,9 +26,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include <rte_compat.h>
-#include <rte_common.h>
 #include <rte_mempool.h>
-#include <rte_ring.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/pci/rte_pci.c b/lib/pci/rte_pci.c
index c91be8b167..355772ff56 100644
--- a/lib/pci/rte_pci.c
+++ b/lib/pci/rte_pci.c
@@ -3,23 +3,10 @@
  * Copyright 2013-2014 6WIND S.A.
  */
 
-#include <string.h>
-#include <inttypes.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <sys/queue.h>
-
-#include <rte_errno.h>
-#include <rte_interrupts.h>
-#include <rte_log.h>
-#include <rte_bus.h>
-#include <rte_eal_paging.h>
-#include <rte_per_lcore.h>
-#include <rte_memory.h>
-#include <rte_eal.h>
-#include <rte_string_fns.h>
-#include <rte_common.h>
+
 #include <rte_debug.h>
 
 #include "rte_pci.h"
diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
index 71cbd441c7..5088157e74 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -17,7 +17,6 @@ extern "C" {
 #endif
 
 #include <stdio.h>
-#include <limits.h>
 #include <inttypes.h>
 #include <sys/types.h>
 
diff --git a/lib/pdump/rte_pdump.c b/lib/pdump/rte_pdump.c
index af450695ec..b3a62df591 100644
--- a/lib/pdump/rte_pdump.c
+++ b/lib/pdump/rte_pdump.c
@@ -2,7 +2,6 @@
  * Copyright(c) 2016-2018 Intel Corporation
  */
 
-#include <rte_memcpy.h>
 #include <rte_mbuf.h>
 #include <rte_ethdev.h>
 #include <rte_lcore.h>
diff --git a/lib/pdump/rte_pdump.h b/lib/pdump/rte_pdump.h
index 6efa0274f2..41c4b7800b 100644
--- a/lib/pdump/rte_pdump.h
+++ b/lib/pdump/rte_pdump.h
@@ -13,8 +13,6 @@
  */
 
 #include <stdint.h>
-#include <rte_mempool.h>
-#include <rte_ring.h>
 #include <rte_bpf.h>
 
 #ifdef __cplusplus
diff --git a/lib/pipeline/rte_pipeline.c b/lib/pipeline/rte_pipeline.c
index f5f397d292..ff86c7cf96 100644
--- a/lib/pipeline/rte_pipeline.c
+++ b/lib/pipeline/rte_pipeline.c
@@ -6,10 +6,6 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_memory.h>
-#include <rte_cycles.h>
-#include <rte_prefetch.h>
-#include <rte_branch_prediction.h>
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
 #include <rte_string_fns.h>
diff --git a/lib/pipeline/rte_port_in_action.c b/lib/pipeline/rte_port_in_action.c
index e3b00df8d2..5818973250 100644
--- a/lib/pipeline/rte_port_in_action.c
+++ b/lib/pipeline/rte_port_in_action.c
@@ -6,9 +6,7 @@
 #include <string.h>
 
 #include <rte_common.h>
-#include <rte_byteorder.h>
 #include <rte_malloc.h>
-#include <rte_memcpy.h>
 
 #include "rte_port_in_action.h"
 
diff --git a/lib/pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h
index 82e62e70a7..ed752ad5eb 100644
--- a/lib/pipeline/rte_swx_ctl.h
+++ b/lib/pipeline/rte_swx_ctl.h
@@ -13,7 +13,6 @@ extern "C" {
  * RTE SWX Pipeline Control
  */
 
-#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -22,7 +21,6 @@ extern "C" {
 
 #include "rte_swx_port.h"
 #include "rte_swx_table.h"
-#include "rte_swx_table_selector.h"
 
 struct rte_swx_pipeline;
 
diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
index 868010303c..8c4670e111 100644
--- a/lib/pipeline/rte_swx_pipeline.c
+++ b/lib/pipeline/rte_swx_pipeline.c
@@ -4,7 +4,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <arpa/inet.h>
 #include <dlfcn.h>
 
 #include <rte_swx_port_ethdev.h>
diff --git a/lib/pipeline/rte_swx_pipeline.h b/lib/pipeline/rte_swx_pipeline.h
index 77141bd341..430e458335 100644
--- a/lib/pipeline/rte_swx_pipeline.h
+++ b/lib/pipeline/rte_swx_pipeline.h
@@ -13,7 +13,6 @@ extern "C" {
  * RTE SWX Pipeline
  */
 
-#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 
diff --git a/lib/pipeline/rte_swx_pipeline_spec.c b/lib/pipeline/rte_swx_pipeline_spec.c
index 07a7580ac8..8165a046ea 100644
--- a/lib/pipeline/rte_swx_pipeline_spec.c
+++ b/lib/pipeline/rte_swx_pipeline_spec.c
@@ -8,7 +8,6 @@
 #include <errno.h>
 
 #include "rte_swx_pipeline.h"
-#include "rte_swx_ctl.h"
 
 #define MAX_LINE_LENGTH RTE_SWX_INSTRUCTION_SIZE
 #define MAX_TOKENS RTE_SWX_INSTRUCTION_TOKENS_MAX
diff --git a/lib/pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c
index ebab2444d3..b1310be565 100644
--- a/lib/pipeline/rte_table_action.c
+++ b/lib/pipeline/rte_table_action.c
@@ -11,12 +11,10 @@
 #include <rte_memcpy.h>
 #include <rte_ether.h>
 #include <rte_ip.h>
-#include <rte_esp.h>
 #include <rte_tcp.h>
 #include <rte_udp.h>
 #include <rte_vxlan.h>
 #include <rte_cryptodev.h>
-#include <cryptodev_pmd.h>
 
 #include "rte_table_action.h"
 
diff --git a/lib/port/rte_port_fd.h b/lib/port/rte_port_fd.h
index e7620ef522..c8cfd9765a 100644
--- a/lib/port/rte_port_fd.h
+++ b/lib/port/rte_port_fd.h
@@ -20,7 +20,6 @@ extern "C" {
 
 #include <stdint.h>
 
-#include <rte_mempool.h>
 #include "rte_port.h"
 
 /** fd_reader port parameters */
diff --git a/lib/port/rte_port_frag.c b/lib/port/rte_port_frag.c
index 8a803fda11..e1f1892176 100644
--- a/lib/port/rte_port_frag.c
+++ b/lib/port/rte_port_frag.c
@@ -3,9 +3,7 @@
  */
 #include <string.h>
 
-#include <rte_ether.h>
 #include <rte_ip_frag.h>
-#include <rte_memory.h>
 
 #include "rte_port_frag.h"
 
diff --git a/lib/port/rte_port_frag.h b/lib/port/rte_port_frag.h
index 74321e4c4c..07060297f6 100644
--- a/lib/port/rte_port_frag.h
+++ b/lib/port/rte_port_frag.h
@@ -29,7 +29,6 @@ extern "C" {
 
 #include <stdint.h>
 
-#include <rte_ring.h>
 
 #include "rte_port.h"
 
diff --git a/lib/port/rte_port_kni.c b/lib/port/rte_port_kni.c
index 7b370f980a..1c7a6cb200 100644
--- a/lib/port/rte_port_kni.c
+++ b/lib/port/rte_port_kni.c
@@ -4,7 +4,6 @@
  */
 #include <string.h>
 
-#include <rte_common.h>
 #include <rte_malloc.h>
 #include <rte_kni.h>
 
diff --git a/lib/port/rte_port_kni.h b/lib/port/rte_port_kni.h
index 9d318af17e..35c6253806 100644
--- a/lib/port/rte_port_kni.h
+++ b/lib/port/rte_port_kni.h
@@ -21,7 +21,6 @@ extern "C" {
 
 #include <stdint.h>
 
-#include <rte_kni.h>
 
 #include "rte_port.h"
 
diff --git a/lib/port/rte_port_ras.c b/lib/port/rte_port_ras.c
index 8508814bb2..e5de57da42 100644
--- a/lib/port/rte_port_ras.c
+++ b/lib/port/rte_port_ras.c
@@ -3,7 +3,6 @@
  */
 #include <string.h>
 
-#include <rte_ether.h>
 #include <rte_ip_frag.h>
 #include <rte_cycles.h>
 #include <rte_log.h>
diff --git a/lib/port/rte_port_ras.h b/lib/port/rte_port_ras.h
index fa5accdc71..ee1d8ae21e 100644
--- a/lib/port/rte_port_ras.h
+++ b/lib/port/rte_port_ras.h
@@ -30,7 +30,6 @@ extern "C" {
 
 #include <stdint.h>
 
-#include <rte_ring.h>
 
 #include "rte_port.h"
 
diff --git a/lib/port/rte_port_ring.h b/lib/port/rte_port_ring.h
index c4f34e22fe..ba609b3436 100644
--- a/lib/port/rte_port_ring.h
+++ b/lib/port/rte_port_ring.h
@@ -26,7 +26,6 @@ extern "C" {
 
 #include <stdint.h>
 
-#include <rte_ring.h>
 
 #include "rte_port.h"
 
diff --git a/lib/port/rte_port_sched.c b/lib/port/rte_port_sched.c
index 1209fc121b..8a7d815ef3 100644
--- a/lib/port/rte_port_sched.c
+++ b/lib/port/rte_port_sched.c
@@ -3,7 +3,6 @@
  */
 #include <string.h>
 
-#include <rte_mbuf.h>
 #include <rte_malloc.h>
 
 #include "rte_port_sched.h"
diff --git a/lib/port/rte_port_source_sink.c b/lib/port/rte_port_source_sink.c
index 79042d13ff..7d73adc1e7 100644
--- a/lib/port/rte_port_source_sink.c
+++ b/lib/port/rte_port_source_sink.c
@@ -5,7 +5,6 @@
 #include <string.h>
 
 #include <rte_mbuf.h>
-#include <rte_mempool.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 
diff --git a/lib/port/rte_swx_port_fd.c b/lib/port/rte_swx_port_fd.c
index aa7315a15a..51bcd3bb7b 100644
--- a/lib/port/rte_swx_port_fd.c
+++ b/lib/port/rte_swx_port_fd.c
@@ -6,7 +6,6 @@
 #include <unistd.h>
 
 #include <rte_mbuf.h>
-#include <rte_malloc.h>
 #include <rte_hexdump.h>
 
 #include "rte_swx_port_fd.h"
diff --git a/lib/port/rte_swx_port_fd.h b/lib/port/rte_swx_port_fd.h
index ecf3349f5f..c1a9200a4f 100644
--- a/lib/port/rte_swx_port_fd.h
+++ b/lib/port/rte_swx_port_fd.h
@@ -16,7 +16,6 @@ extern "C" {
  ***/
 #include <stdint.h>
 
-#include <rte_mempool.h>
 
 #include "rte_swx_port.h"
 
diff --git a/lib/port/rte_swx_port_ring.h b/lib/port/rte_swx_port_ring.h
index 859981f277..dc0ef9247c 100644
--- a/lib/port/rte_swx_port_ring.h
+++ b/lib/port/rte_swx_port_ring.h
@@ -16,7 +16,6 @@ extern "C" {
 
 #include <stdint.h>
 
-#include <rte_ring.h>
 
 #include "rte_swx_port.h"
 
diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c
index 474dd92998..969a9e5aaa 100644
--- a/lib/power/guest_channel.c
+++ b/lib/power/guest_channel.c
@@ -4,9 +4,7 @@
 
 #include <glob.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <signal.h>
 #include <limits.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/lib/power/power_acpi_cpufreq.c b/lib/power/power_acpi_cpufreq.c
index 402ed8c99b..6e57aca535 100644
--- a/lib/power/power_acpi_cpufreq.c
+++ b/lib/power/power_acpi_cpufreq.c
@@ -3,17 +3,10 @@
  */
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <limits.h>
 
 #include <rte_memcpy.h>
-#include <rte_memory.h>
 #include <rte_string_fns.h>
 
 #include "power_acpi_cpufreq.h"
diff --git a/lib/power/power_acpi_cpufreq.h b/lib/power/power_acpi_cpufreq.h
index 41675b9cd9..682fd9278c 100644
--- a/lib/power/power_acpi_cpufreq.h
+++ b/lib/power/power_acpi_cpufreq.h
@@ -10,10 +10,6 @@
  * RTE Power Management via userspace ACPI cpufreq
  */
 
-#include <rte_common.h>
-#include <rte_byteorder.h>
-#include <rte_log.h>
-#include <rte_string_fns.h>
 #include "rte_power.h"
 
 /**
diff --git a/lib/power/power_common.h b/lib/power/power_common.h
index 0b264edfa5..c1c7139276 100644
--- a/lib/power/power_common.h
+++ b/lib/power/power_common.h
@@ -5,7 +5,6 @@
 #ifndef _POWER_COMMON_H_
 #define _POWER_COMMON_H_
 
-#include <inttypes.h>
 
 #include <rte_common.h>
 
diff --git a/lib/power/power_cppc_cpufreq.c b/lib/power/power_cppc_cpufreq.c
index 25185a791c..ef06fbcd9e 100644
--- a/lib/power/power_cppc_cpufreq.c
+++ b/lib/power/power_cppc_cpufreq.c
@@ -4,7 +4,6 @@
  */
 
 #include <rte_memcpy.h>
-#include <rte_memory.h>
 
 #include "power_cppc_cpufreq.h"
 #include "power_common.h"
diff --git a/lib/power/power_cppc_cpufreq.h b/lib/power/power_cppc_cpufreq.h
index 4e73c91b05..f4121b237e 100644
--- a/lib/power/power_cppc_cpufreq.h
+++ b/lib/power/power_cppc_cpufreq.h
@@ -11,10 +11,6 @@
  * RTE Power Management via userspace CPPC cpufreq
  */
 
-#include <rte_common.h>
-#include <rte_byteorder.h>
-#include <rte_log.h>
-#include <rte_string_fns.h>
 #include "rte_power.h"
 
 /**
diff --git a/lib/power/power_kvm_vm.c b/lib/power/power_kvm_vm.c
index ab7d4b8cee..6a8109d449 100644
--- a/lib/power/power_kvm_vm.c
+++ b/lib/power/power_kvm_vm.c
@@ -9,7 +9,6 @@
 #include "rte_power_guest_channel.h"
 #include "guest_channel.h"
 #include "power_kvm_vm.h"
-#include "power_common.h"
 
 #define FD_PATH "/dev/virtio-ports/virtio.serial.port.poweragent"
 
diff --git a/lib/power/power_kvm_vm.h b/lib/power/power_kvm_vm.h
index 9a309a300f..303fcc041b 100644
--- a/lib/power/power_kvm_vm.h
+++ b/lib/power/power_kvm_vm.h
@@ -10,10 +10,6 @@
  * RTE Power Management KVM VM
  */
 
-#include <rte_common.h>
-#include <rte_byteorder.h>
-#include <rte_log.h>
-#include <rte_string_fns.h>
 #include "rte_power.h"
 
 /**
diff --git a/lib/power/power_pstate_cpufreq.c b/lib/power/power_pstate_cpufreq.c
index 86f8a76e46..f4c36179ec 100644
--- a/lib/power/power_pstate_cpufreq.c
+++ b/lib/power/power_pstate_cpufreq.c
@@ -3,20 +3,14 @@
  */
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <signal.h>
 #include <limits.h>
 #include <errno.h>
 #include <inttypes.h>
 
 #include <rte_memcpy.h>
-#include <rte_memory.h>
-#include <rte_string_fns.h>
 
 #include "power_pstate_cpufreq.h"
 #include "power_common.h"
diff --git a/lib/power/power_pstate_cpufreq.h b/lib/power/power_pstate_cpufreq.h
index 3260b32494..7bf64a518c 100644
--- a/lib/power/power_pstate_cpufreq.h
+++ b/lib/power/power_pstate_cpufreq.h
@@ -10,10 +10,6 @@
  * RTE Power Management via Intel Pstate driver
  */
 
-#include <rte_common.h>
-#include <rte_byteorder.h>
-#include <rte_log.h>
-#include <rte_string_fns.h>
 #include "rte_power.h"
 
 /**
diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c
index 3cba56bac9..0a6614be77 100644
--- a/lib/power/rte_power.c
+++ b/lib/power/rte_power.c
@@ -10,7 +10,6 @@
 #include "power_cppc_cpufreq.h"
 #include "power_kvm_vm.h"
 #include "power_pstate_cpufreq.h"
-#include "power_common.h"
 
 enum power_management_env global_default_env = PM_ENV_NOT_SET;
 
diff --git a/lib/power/rte_power.h b/lib/power/rte_power.h
index c5759afa39..47345e26df 100644
--- a/lib/power/rte_power.h
+++ b/lib/power/rte_power.h
@@ -11,9 +11,7 @@
  */
 
 #include <rte_common.h>
-#include <rte_byteorder.h>
 #include <rte_log.h>
-#include <rte_string_fns.h>
 #include <rte_power_guest_channel.h>
 
 #ifdef __cplusplus
diff --git a/lib/power/rte_power_empty_poll.c b/lib/power/rte_power_empty_poll.c
index 2261ce7820..4a4db51247 100644
--- a/lib/power/rte_power_empty_poll.c
+++ b/lib/power/rte_power_empty_poll.c
@@ -5,8 +5,6 @@
 #include <string.h>
 
 #include <rte_lcore.h>
-#include <rte_cycles.h>
-#include <rte_atomic.h>
 #include <rte_malloc.h>
 #include <inttypes.h>
 
diff --git a/lib/rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c
index a6134e76ea..2f0a4f132e 100644
--- a/lib/rawdev/rte_rawdev.c
+++ b/lib/rawdev/rte_rawdev.c
@@ -6,29 +6,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 #include <errno.h>
 #include <stdint.h>
 #include <inttypes.h>
-#include <sys/types.h>
-#include <sys/queue.h>
 
 #include <rte_string_fns.h>
-#include <rte_byteorder.h>
 #include <rte_log.h>
-#include <rte_debug.h>
 #include <rte_dev.h>
-#include <rte_memory.h>
-#include <rte_memcpy.h>
-#include <rte_memzone.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-#include <rte_atomic.h>
-#include <rte_branch_prediction.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
-#include <rte_errno.h>
 #include <rte_telemetry.h>
 
 #include "rte_rawdev.h"
diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
index 7510db2f81..17be93e830 100644
--- a/lib/rcu/rte_rcu_qsbr.c
+++ b/lib/rcu/rte_rcu_qsbr.c
@@ -13,10 +13,6 @@
 #include <rte_log.h>
 #include <rte_memory.h>
 #include <rte_malloc.h>
-#include <rte_eal.h>
-#include <rte_atomic.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
 #include <rte_errno.h>
 #include <rte_ring_elem.h>
 
diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 62a420a785..d81bf5e8db 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -32,11 +32,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
-#include <inttypes.h>
-#include <errno.h>
 #include <rte_common.h>
-#include <rte_memory.h>
-#include <rte_lcore.h>
 #include <rte_debug.h>
 #include <rte_atomic.h>
 #include <rte_ring.h>
diff --git a/lib/regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c
index 04ab713730..02a388bc5d 100644
--- a/lib/regexdev/rte_regexdev.c
+++ b/lib/regexdev/rte_regexdev.c
@@ -5,8 +5,6 @@
 
 #include <string.h>
 
-#include <rte_memory.h>
-#include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_string_fns.h>
 
diff --git a/lib/regexdev/rte_regexdev.h b/lib/regexdev/rte_regexdev.h
index 0bac46cda9..4ba67b0c25 100644
--- a/lib/regexdev/rte_regexdev.h
+++ b/lib/regexdev/rte_regexdev.h
@@ -199,11 +199,8 @@ extern "C" {
 #endif
 
 #include <rte_common.h>
-#include <rte_config.h>
 #include <rte_dev.h>
-#include <rte_errno.h>
 #include <rte_mbuf.h>
-#include <rte_memory.h>
 
 #define RTE_REGEXDEV_NAME_MAX_LEN RTE_DEV_NAME_MAX_LEN
 
diff --git a/lib/reorder/rte_reorder.c b/lib/reorder/rte_reorder.c
index bc0241bfb3..385ee479da 100644
--- a/lib/reorder/rte_reorder.c
+++ b/lib/reorder/rte_reorder.c
@@ -2,7 +2,6 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <inttypes.h>
 #include <string.h>
 
 #include <rte_string_fns.h>
diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c
index 6c29e1c49a..cd9e823068 100644
--- a/lib/rib/rte_rib.c
+++ b/lib/rib/rte_rib.c
@@ -6,12 +6,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_errno.h>
 #include <rte_malloc.h>
 #include <rte_mempool.h>
-#include <rte_rwlock.h>
 #include <rte_string_fns.h>
 #include <rte_tailq.h>
 
diff --git a/lib/rib/rte_rib.h b/lib/rib/rte_rib.h
index bebb30f7d7..c18c4ca594 100644
--- a/lib/rib/rte_rib.h
+++ b/lib/rib/rte_rib.h
@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include <rte_compat.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c
index 70405113b4..042ac1f090 100644
--- a/lib/rib/rte_rib6.c
+++ b/lib/rib/rte_rib6.c
@@ -6,12 +6,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_errno.h>
 #include <rte_malloc.h>
 #include <rte_mempool.h>
-#include <rte_rwlock.h>
 #include <rte_string_fns.h>
 #include <rte_tailq.h>
 
diff --git a/lib/rib/rte_rib6.h b/lib/rib/rte_rib6.h
index 6f532265c6..fa8e9bf732 100644
--- a/lib/rib/rte_rib6.h
+++ b/lib/rib/rte_rib6.h
@@ -15,7 +15,6 @@
  */
 
 #include <rte_memcpy.h>
-#include <rte_compat.h>
 #include <rte_common.h>
 
 #ifdef __cplusplus
diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c
index 6a94a038c4..cddaf6b287 100644
--- a/lib/ring/rte_ring.c
+++ b/lib/ring/rte_ring.c
@@ -8,7 +8,6 @@
  */
 
 #include <stdio.h>
-#include <stdarg.h>
 #include <string.h>
 #include <stdint.h>
 #include <inttypes.h>
@@ -17,19 +16,11 @@
 
 #include <rte_common.h>
 #include <rte_log.h>
-#include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_malloc.h>
-#include <rte_launch.h>
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
-#include <rte_atomic.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-#include <rte_branch_prediction.h>
 #include <rte_errno.h>
 #include <rte_string_fns.h>
-#include <rte_spinlock.h>
 #include <rte_tailq.h>
 
 #include "rte_ring.h"
diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c
index 934e9aee50..cdb7bab697 100644
--- a/lib/sched/rte_pie.c
+++ b/lib/sched/rte_pie.c
@@ -5,8 +5,6 @@
 #include <stdlib.h>
 
 #include "rte_pie.h"
-#include <rte_common.h>
-#include <rte_cycles.h>
 #include <rte_malloc.h>
 
 #ifdef __INTEL_COMPILER
diff --git a/lib/sched/rte_red.h b/lib/sched/rte_red.h
index f5843dab1b..80b43b6da0 100644
--- a/lib/sched/rte_red.h
+++ b/lib/sched/rte_red.h
@@ -18,7 +18,6 @@ extern "C" {
 
 #include <stdint.h>
 #include <limits.h>
-#include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_cycles.h>
 #include <rte_branch_prediction.h>
diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c
index 62b3d2e315..e5c62e3d77 100644
--- a/lib/sched/rte_sched.c
+++ b/lib/sched/rte_sched.c
@@ -7,7 +7,6 @@
 
 #include <rte_common.h>
 #include <rte_log.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
 #include <rte_prefetch.h>
diff --git a/lib/sched/rte_sched.h b/lib/sched/rte_sched.h
index 3c625ba169..5ece64e527 100644
--- a/lib/sched/rte_sched.h
+++ b/lib/sched/rte_sched.h
@@ -56,7 +56,6 @@ extern "C" {
  *
  */
 
-#include <sys/types.h>
 #include <rte_compat.h>
 #include <rte_mbuf.h>
 #include <rte_meter.h>
diff --git a/lib/security/rte_security.c b/lib/security/rte_security.c
index 6e45a03fa0..4f5e4b4d49 100644
--- a/lib/security/rte_security.c
+++ b/lib/security/rte_security.c
@@ -5,10 +5,8 @@
  */
 
 #include <rte_cryptodev.h>
-#include <rte_malloc.h>
 #include <rte_dev.h>
 #include <rte_telemetry.h>
-#include "rte_compat.h"
 #include "rte_security.h"
 #include "rte_security_driver.h"
 
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index b080d10c2c..2a43cbe811 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -23,10 +23,7 @@ extern "C" {
 #include <rte_common.h>
 #include <rte_crypto.h>
 #include <rte_ip.h>
-#include <rte_mbuf.h>
 #include <rte_mbuf_dyn.h>
-#include <rte_memory.h>
-#include <rte_mempool.h>
 
 /** IPSec protocol mode */
 enum rte_security_ipsec_sa_mode {
diff --git a/lib/stack/rte_stack.c b/lib/stack/rte_stack.c
index 56bf2c8d6d..1fabec2bfe 100644
--- a/lib/stack/rte_stack.c
+++ b/lib/stack/rte_stack.c
@@ -6,12 +6,10 @@
 #include <sys/queue.h>
 
 #include <rte_string_fns.h>
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_errno.h>
 #include <rte_malloc.h>
 #include <rte_memzone.h>
-#include <rte_rwlock.h>
 #include <rte_tailq.h>
 
 #include "rte_stack.h"
diff --git a/lib/stack/rte_stack.h b/lib/stack/rte_stack.h
index 321f4cec1a..91fc570767 100644
--- a/lib/stack/rte_stack.h
+++ b/lib/stack/rte_stack.h
@@ -19,7 +19,6 @@
 extern "C" {
 #endif
 
-#include <rte_compat.h>
 #include <rte_debug.h>
 #include <rte_errno.h>
 #include <rte_memzone.h>
diff --git a/lib/table/rte_swx_table_em.c b/lib/table/rte_swx_table_em.c
index 03b28c4c9d..f783cfe282 100644
--- a/lib/table/rte_swx_table_em.c
+++ b/lib/table/rte_swx_table_em.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2020 Intel Corporation
  */
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/table/rte_swx_table_em.h b/lib/table/rte_swx_table_em.h
index 909ada483b..b7423dd060 100644
--- a/lib/table/rte_swx_table_em.h
+++ b/lib/table/rte_swx_table_em.h
@@ -13,7 +13,6 @@ extern "C" {
  * RTE SWX Exact Match Table
  */
 
-#include <stdint.h>
 
 #include <rte_swx_table.h>
 
diff --git a/lib/table/rte_swx_table_learner.c b/lib/table/rte_swx_table_learner.c
index c3c840ff06..15576c2aa3 100644
--- a/lib/table/rte_swx_table_learner.c
+++ b/lib/table/rte_swx_table_learner.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2020 Intel Corporation
  */
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/table/rte_swx_table_learner.h b/lib/table/rte_swx_table_learner.h
index d6ec733655..eb9d7689fd 100644
--- a/lib/table/rte_swx_table_learner.h
+++ b/lib/table/rte_swx_table_learner.h
@@ -22,7 +22,6 @@ extern "C" {
  */
 
 #include <stdint.h>
-#include <sys/queue.h>
 
 #include <rte_compat.h>
 
diff --git a/lib/table/rte_swx_table_selector.c b/lib/table/rte_swx_table_selector.c
index 541ebc2213..ad99f18453 100644
--- a/lib/table/rte_swx_table_selector.c
+++ b/lib/table/rte_swx_table_selector.c
@@ -7,7 +7,6 @@
 #include <errno.h>
 
 #include <rte_common.h>
-#include <rte_prefetch.h>
 
 #include "rte_swx_table_selector.h"
 
diff --git a/lib/table/rte_swx_table_wm.c b/lib/table/rte_swx_table_wm.c
index e260be1062..27a67b47bd 100644
--- a/lib/table/rte_swx_table_wm.c
+++ b/lib/table/rte_swx_table_wm.c
@@ -4,10 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <errno.h>
 
 #include <rte_common.h>
-#include <rte_prefetch.h>
 #include <rte_cycles.h>
 #include <rte_acl.h>
 
diff --git a/lib/table/rte_swx_table_wm.h b/lib/table/rte_swx_table_wm.h
index 9e228f971c..4fd52c0a17 100644
--- a/lib/table/rte_swx_table_wm.h
+++ b/lib/table/rte_swx_table_wm.h
@@ -13,7 +13,6 @@ extern "C" {
  * RTE SWX Wildcard Match Table
  */
 
-#include <stdint.h>
 
 #include <rte_swx_table.h>
 
diff --git a/lib/table/rte_table_acl.c b/lib/table/rte_table_acl.c
index 14d54019f0..179a1da835 100644
--- a/lib/table/rte_table_acl.c
+++ b/lib/table/rte_table_acl.c
@@ -6,13 +6,10 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
 #include "rte_table_acl.h"
-#include <rte_ether.h>
 
 #ifdef RTE_TABLE_STATS_COLLECT
 
diff --git a/lib/table/rte_table_array.c b/lib/table/rte_table_array.c
index 8264c50c27..54a0c42f7d 100644
--- a/lib/table/rte_table_array.c
+++ b/lib/table/rte_table_array.c
@@ -6,8 +6,6 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
diff --git a/lib/table/rte_table_hash_cuckoo.c b/lib/table/rte_table_hash_cuckoo.c
index f024303330..c77eccf527 100644
--- a/lib/table/rte_table_hash_cuckoo.c
+++ b/lib/table/rte_table_hash_cuckoo.c
@@ -5,8 +5,6 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
diff --git a/lib/table/rte_table_hash_ext.c b/lib/table/rte_table_hash_ext.c
index 802a24fe0f..70ea84fa2e 100644
--- a/lib/table/rte_table_hash_ext.c
+++ b/lib/table/rte_table_hash_ext.c
@@ -6,8 +6,6 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
diff --git a/lib/table/rte_table_hash_key16.c b/lib/table/rte_table_hash_key16.c
index c4384b114d..ea8195dc17 100644
--- a/lib/table/rte_table_hash_key16.c
+++ b/lib/table/rte_table_hash_key16.c
@@ -5,8 +5,6 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
diff --git a/lib/table/rte_table_hash_key32.c b/lib/table/rte_table_hash_key32.c
index 3e0031fe1e..87f83ce6f5 100644
--- a/lib/table/rte_table_hash_key32.c
+++ b/lib/table/rte_table_hash_key32.c
@@ -5,8 +5,6 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
diff --git a/lib/table/rte_table_hash_key8.c b/lib/table/rte_table_hash_key8.c
index 34e3ed1af9..7779a9d1a3 100644
--- a/lib/table/rte_table_hash_key8.c
+++ b/lib/table/rte_table_hash_key8.c
@@ -5,8 +5,6 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
diff --git a/lib/table/rte_table_hash_lru.c b/lib/table/rte_table_hash_lru.c
index 5bcdb7ba02..c31acc11cf 100644
--- a/lib/table/rte_table_hash_lru.c
+++ b/lib/table/rte_table_hash_lru.c
@@ -6,8 +6,6 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
diff --git a/lib/table/rte_table_lpm.c b/lib/table/rte_table_lpm.c
index 4dd8289ce5..9de9e8a20d 100644
--- a/lib/table/rte_table_lpm.c
+++ b/lib/table/rte_table_lpm.c
@@ -6,8 +6,6 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_byteorder.h>
 #include <rte_log.h>
diff --git a/lib/table/rte_table_lpm_ipv6.c b/lib/table/rte_table_lpm_ipv6.c
index 4e068d79bf..8fde2c012f 100644
--- a/lib/table/rte_table_lpm_ipv6.c
+++ b/lib/table/rte_table_lpm_ipv6.c
@@ -6,10 +6,7 @@
 #include <stdio.h>
 
 #include <rte_common.h>
-#include <rte_mbuf.h>
-#include <rte_memory.h>
 #include <rte_malloc.h>
-#include <rte_byteorder.h>
 #include <rte_log.h>
 #include <rte_lpm6.h>
 
diff --git a/lib/table/rte_table_stub.c b/lib/table/rte_table_stub.c
index 9ce7be9cec..23d0de5c79 100644
--- a/lib/table/rte_table_stub.c
+++ b/lib/table/rte_table_stub.c
@@ -4,7 +4,6 @@
 
 #include <string.h>
 
-#include <rte_mbuf.h>
 #include <rte_malloc.h>
 
 #include "rte_table_stub.h"
diff --git a/lib/table/rte_table_stub.h b/lib/table/rte_table_stub.h
index 2b40739790..9086e4edcc 100644
--- a/lib/table/rte_table_stub.h
+++ b/lib/table/rte_table_stub.h
@@ -17,7 +17,6 @@ extern "C" {
  *
  ***/
 
-#include <stdint.h>
 
 #include "rte_table.h"
 
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index e5ccfe47f7..c6fd03a5ab 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -8,7 +8,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/stat.h>
-#include <dlfcn.h>
 #endif /* !RTE_EXEC_ENV_WINDOWS */
 
 /* we won't link against libbsd, so just always use DPDKs-specific strlcpy */
diff --git a/lib/telemetry/telemetry_data.h b/lib/telemetry/telemetry_data.h
index adb84a09f1..26aa28e72c 100644
--- a/lib/telemetry/telemetry_data.h
+++ b/lib/telemetry/telemetry_data.h
@@ -5,7 +5,6 @@
 #ifndef _TELEMETRY_DATA_H_
 #define _TELEMETRY_DATA_H_
 
-#include <inttypes.h>
 #include "rte_telemetry.h"
 
 enum tel_container_types {
diff --git a/lib/timer/rte_timer.c b/lib/timer/rte_timer.c
index 6d19ce469b..c51a393e5c 100644
--- a/lib/timer/rte_timer.c
+++ b/lib/timer/rte_timer.c
@@ -2,7 +2,6 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <string.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
@@ -13,18 +12,13 @@
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_eal_memconfig.h>
-#include <rte_per_lcore.h>
 #include <rte_memory.h>
-#include <rte_launch.h>
-#include <rte_eal.h>
 #include <rte_lcore.h>
 #include <rte_branch_prediction.h>
 #include <rte_spinlock.h>
 #include <rte_random.h>
 #include <rte_pause.h>
 #include <rte_memzone.h>
-#include <rte_malloc.h>
-#include <rte_errno.h>
 
 #include "rte_timer.h"
 
diff --git a/lib/vhost/fd_man.c b/lib/vhost/fd_man.c
index 55d4856f9e..1876fada33 100644
--- a/lib/vhost/fd_man.c
+++ b/lib/vhost/fd_man.c
@@ -2,14 +2,8 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/types.h>
 #include <unistd.h>
-#include <string.h>
 
 #include <rte_common.h>
 #include <rte_log.h>
diff --git a/lib/vhost/fd_man.h b/lib/vhost/fd_man.h
index 3ab5cfdd60..6f4499bdfa 100644
--- a/lib/vhost/fd_man.h
+++ b/lib/vhost/fd_man.h
@@ -4,7 +4,6 @@
 
 #ifndef _FD_MAN_H_
 #define _FD_MAN_H_
-#include <stdint.h>
 #include <pthread.h>
 #include <poll.h>
 
diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
index c2f8013cd5..b304339de9 100644
--- a/lib/vhost/socket.c
+++ b/lib/vhost/socket.c
@@ -8,7 +8,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/queue.h>
diff --git a/lib/vhost/vdpa.c b/lib/vhost/vdpa.c
index 6df2230a67..8fa2153023 100644
--- a/lib/vhost/vdpa.c
+++ b/lib/vhost/vdpa.c
@@ -8,7 +8,6 @@
  * Device specific vhost lib
  */
 
-#include <stdbool.h>
 #include <sys/queue.h>
 
 #include <rte_class.h>
diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
index 6bcb716de0..bc88148347 100644
--- a/lib/vhost/vhost.c
+++ b/lib/vhost/vhost.c
@@ -4,7 +4,6 @@
 
 #include <linux/vhost.h>
 #include <linux/virtio_net.h>
-#include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 #ifdef RTE_LIBRTE_VHOST_NUMA
@@ -13,13 +12,10 @@
 #endif
 
 #include <rte_errno.h>
-#include <rte_ethdev.h>
 #include <rte_log.h>
-#include <rte_string_fns.h>
 #include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_vhost.h>
-#include <rte_rwlock.h>
 
 #include "iotlb.h"
 #include "vhost.h"
diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h
index 1c2ee29600..64ec76b80e 100644
--- a/lib/vhost/vhost.h
+++ b/lib/vhost/vhost.h
@@ -17,12 +17,10 @@
 
 #include <rte_log.h>
 #include <rte_ether.h>
-#include <rte_rwlock.h>
 #include <rte_malloc.h>
 #include <rte_dmadev.h>
 
 #include "rte_vhost.h"
-#include "rte_vdpa.h"
 #include "vdpa_driver.h"
 
 #include "rte_vhost_async.h"
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 1d3f89afd8..4f135f1f72 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -27,10 +27,8 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
-#include <assert.h>
 #ifdef RTE_LIBRTE_VHOST_NUMA
 #include <numaif.h>
 #endif
-- 
2.20.1