X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fvlib.h;h=36f8a361abc384f3c66d05e3052773ab8efb0f68;hb=ba9cb1ba377b2ec7b2876822d73db848e7fa6754;hp=b146a49b7f2d93f4717f3a42903c0257de634c7c;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vlib/vlib.h b/src/vlib/vlib.h
index b146a49b7f2..36f8a361abc 100644
--- a/src/vlib/vlib.h
+++ b/src/vlib/vlib.h
@@ -42,37 +42,40 @@
 
 #include <vppinfra/clib.h>
 #include <vppinfra/elf_clib.h>
+#include <vppinfra/callback.h>
 
 /* Generic definitions. */
 #include <vlib/defs.h>
 
 /* Forward declarations of structs to avoid circular dependencies. */
 struct vlib_main_t;
+struct vlib_global_main_t;
+typedef u32 vlib_log_class_t;
 
 /* All includes in alphabetical order. */
+#include <vlib/physmem.h>
 #include <vlib/buffer.h>
 #include <vlib/cli.h>
 #include <vlib/counter.h>
 #include <vlib/error.h>
 #include <vlib/init.h>
-#include <vlib/mc.h>
 #include <vlib/node.h>
-#include <vlib/physmem.h>
+#include <vlib/punt.h>
 #include <vlib/trace.h>
+#include <vlib/log.h>
 
 /* Main include depends on other vlib/ includes so we put it last. */
 #include <vlib/main.h>
 
 /* Inline/extern function declarations. */
 #include <vlib/threads.h>
+#include <vlib/physmem_funcs.h>
 #include <vlib/buffer_funcs.h>
-#include <vlib/cli_funcs.h>
 #include <vlib/error_funcs.h>
 #include <vlib/format_funcs.h>
 #include <vlib/node_funcs.h>
 #include <vlib/trace_funcs.h>
 #include <vlib/global_funcs.h>
-
 #include <vlib/buffer_node.h>
 
 #endif /* included_vlib_h */