14 files changed, 14 insertions, 10 deletions
diff --git a/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c b/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c
index 39442b6215f..99ba3295d44 100644
--- a/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c
+++ b/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 
+#include <vnet/ethernet/ethernet.h>
 #include <ioam/analyse/ioam_analyse.h>
 #include <ioam/export-common/ioam_export.h>
 #include <ioam/analyse/ip6/ip6_ioam_analyse.h>
diff --git a/src/plugins/ioam/analyse/ip6/node.c b/src/plugins/ioam/analyse/ip6/node.c
index 2568e305b39..ef35d0a9134 100644
--- a/src/plugins/ioam/analyse/ip6/node.c
+++ b/src/plugins/ioam/analyse/ip6/node.c
@@ -16,6 +16,7 @@
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
 #include <vppinfra/error.h>
+#include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip.h>
 #include <ioam/export-common/ioam_export.h>
 #include <ioam/encap/ip6_ioam_trace.h>
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
index 618278c6093..7d66bd45849 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
@@ -17,6 +17,7 @@
  */
 #include <vnet/api_errno.h>
 #include <vppinfra/pool.h>
+#include <vnet/ethernet/ethernet.h>
 #include <ioam/export-common/ioam_export.h>
 
 static vlib_node_registration_t vxlan_gpe_ioam_export_process_node;
diff --git a/src/plugins/ioam/export/ioam_export_thread.c b/src/plugins/ioam/export/ioam_export_thread.c
index 5f1d964355a..be1a2be3f1a 100644
--- a/src/plugins/ioam/export/ioam_export_thread.c
+++ b/src/plugins/ioam/export/ioam_export_thread.c
@@ -17,6 +17,7 @@
  */
 #include <vnet/api_errno.h>
 #include <vppinfra/pool.h>
+#include <vnet/ethernet/ethernet.h>
 #include <ioam/export-common/ioam_export.h>
 
 static vlib_node_registration_t ioam_export_process_node;
diff --git a/src/plugins/ioam/export/node.c b/src/plugins/ioam/export/node.c
index 9b61c902ecf..3aeac0b4d32 100644
--- a/src/plugins/ioam/export/node.c
+++ b/src/plugins/ioam/export/node.c
@@ -16,6 +16,7 @@
 #include <vnet/vnet.h>
 #include <vnet/pg/pg.h>
 #include <vppinfra/error.h>
+#include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
 #include <ioam/export-common/ioam_export.h>
diff --git a/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export_thread.c b/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export_thread.c
index c5dd1bc1130..54dc01bc021 100644
--- a/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export_thread.c
+++ b/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export_thread.c
@@ -17,6 +17,7 @@
  */
 #include <vnet/api_errno.h>
 #include <vppinfra/pool.h>
+#include <vnet/ethernet/ethernet.h>
 #include <ioam/export-common/ioam_export.h>
 
 static vlib_node_registration_t nsh_md2_ioam_export_process_node;
diff --git a/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_node.c b/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_node.c
index f2910c3d9fb..6b1627b6493 100644
--- a/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_node.c
+++ b/src/plugins/nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_node.c
@@ -16,6 +16,7 @@
 #include <vnet/vnet.h>
 #include <vnet/pg/pg.h>
 #include <vppinfra/error.h>
+#include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip.h>
 #include <nsh/nsh.h>
 #include <nsh/nsh_packet.h>
diff --git a/src/vnet/classify/flow_classify.c b/src/vnet/classify/flow_classify.c
index 941a030f640..afdadc66235 100644
--- a/src/vnet/classify/flow_classify.c
+++ b/src/vnet/classify/flow_classify.c
@@ -12,6 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <vnet/feature/feature.h>
 #include <vnet/classify/flow_classify.h>
 
 flow_classify_main_t flow_classify_main;
diff --git a/src/vnet/classify/vnet_classify.h b/src/vnet/classify/vnet_classify.h
index 986e0a68674..620ef9a1052 100644
--- a/src/vnet/classify/vnet_classify.h
+++ b/src/vnet/classify/vnet_classify.h
@@ -15,17 +15,7 @@
 #ifndef __included_vnet_classify_h__
 #define __included_vnet_classify_h__
 
-#include <stdarg.h>
-
-#include <vlib/vlib.h>
 #include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vlib/cli.h>
 #include <vnet/api_errno.h>	/* for API error numbers */
 
 #include <vppinfra/error.h>
diff --git a/src/vnet/dhcp/dhcp6_client_common_dp.c b/src/vnet/dhcp/dhcp6_client_common_dp.c
index d9e1fc7e2cc..7ca3b61defb 100644
--- a/src/vnet/dhcp/dhcp6_client_common_dp.c
+++ b/src/vnet/dhcp/dhcp6_client_common_dp.c
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 
+#include <vnet/ethernet/ethernet.h>
 #include <vnet/dhcp/dhcp6_client_common_dp.h>
 #include <vnet/dhcp/dhcp6_ia_na_client_dp.h>
 #include <vnet/dhcp/dhcp6_pd_client_dp.h>
diff --git a/src/vnet/l2/l2_input.h b/src/vnet/l2/l2_input.h
index 677186bbdf3..0e1e98f883d 100644
--- a/src/vnet/l2/l2_input.h
+++ b/src/vnet/l2/l2_input.h
@@ -21,6 +21,7 @@
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
 #include <vnet/l2/l2_bd.h>
+#include <vnet/ethernet/ethernet.h>
 #include <vnet/ethernet/packet.h>
 #include <vnet/ip/ip.h>
 
diff --git a/src/vnet/l2/l2_vtr.h b/src/vnet/l2/l2_vtr.h
index f6454bf1eac..1cd9209973b 100644
--- a/src/vnet/l2/l2_vtr.h
+++ b/src/vnet/l2/l2_vtr.h
@@ -20,6 +20,7 @@
 
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
+#include <vnet/ethernet/ethernet.h>
 #include <vnet/ethernet/packet.h>
 #include <vnet/l2/l2_vtr.h>
 
diff --git a/src/vnet/lisp-cp/lisp_types.c b/src/vnet/lisp-cp/lisp_types.c
index 5691933f972..cc2b1b2516f 100644
--- a/src/vnet/lisp-cp/lisp_types.c
+++ b/src/vnet/lisp-cp/lisp_types.c
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 
+#include <vnet/ethernet/ethernet.h>
 #include <vnet/lisp-cp/lisp_types.h>
 
 static u16 gid_address_put_no_vni (u8 * b, gid_address_t * gid);
diff --git a/src/vnet/lldp/lldp_cli.c b/src/vnet/lldp/lldp_cli.c
index 4680292317f..5f63e4a2e4f 100644
--- a/src/vnet/lldp/lldp_cli.c
+++ b/src/vnet/lldp/lldp_cli.c
@@ -18,6 +18,7 @@
  * @brief LLDP CLI handling
  *
  */
+#include <vnet/ethernet/ethernet.h>
 #include <vnet/lisp-cp/lisp_types.h>
 #include <vnet/lldp/lldp.h>
 #include <vnet/lldp/lldp_node.h>