1056 files changed, 920 insertions, 1700 deletions

diff --git a/Makefile b/Makefile
index 292b0d28..1b75779a 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ endif
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
-DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
+DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
@@ -147,7 +147,7 @@ else
 	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/gcc
 	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/g++
 endif
-	@make -C $(BR) V=$(V) is_build_tool=yes vppapigen-install
+	@make -C $(BR) V=$(V) is_build_tool=yes tools-install
 	@touch $@
 
 bootstrap: $(BR)/.bootstrap.ok
diff --git a/build-data/packages/cavium-dpdk.mk b/build-data/packages/cavium-dpdk.mk
deleted file mode 100644
index ce8ee228..00000000
--- a/build-data/packages/cavium-dpdk.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# Temporary until Cavium upstreams their work
-
-cavium-dpdk_configure =							\
-  src_dir=$(call find_source_fn,$(PACKAGE_SOURCE)) ;			\
-  dst_dir=$(PACKAGE_BUILD_DIR) ;					\
-  tar -C $${src_dir} -cf - . | tar -C $${dst_dir} -xf - ;		\
-  cd $${dst_dir} ;							\
-  : colossal hemorrhoid to configure headroom	;			\
-  if [ x$($(PACKAGE)_configure_args_$(PLATFORM)) = "x" ] ; then		\
-    HR=256 ;								\
-  else									\
-     dpdk_configure_args=$($(PACKAGE)_configure_args_$(PLATFORM)) ;	\
-     if [ $$dpdk_configure_args = "--with-headroom=256" ] ; then	\
-	HR=256 ;							\
-     elif [ $$dpdk_configure_args = "--with-headroom=384" ] ; then	\
-	HR=384 ;							\
-     else								\
-	HR=256 ;							\
-     fi ;								\
-  fi ;									\
-  env HR=$$HR								\
-     spp -o								\
-  $(PACKAGE_BUILD_DIR)/config/common_linuxapp				\
-  $(PACKAGE_BUILD_DIR)/config/common_linuxapp.spp			\
-	;								\
-  env $(CONFIGURE_ENV)							\
-    make config T=arm64-thunderx-linuxapp-gcc RTE_ARCH=arm64		\
-        CC=aarch64-thunderx-linux-gnu-gcc V=0				\
-        RTE_SDK=$(PACKAGE_BUILD_DIR)					\
-        RTE_TARGET=arm-default-linuxapp-gcc
-
-# Note: add e.g. "-O0" to EXTRA_CFLAGS if desired: EXTRA_CFLAGS='-g -O0'
-
-cavium-dpdk_make_args = install T=arm64-thunderx-linuxapp-gcc RTE_ARCH=arm64 \
-        CC=aarch64-thunderx-linux-gnu-gcc V=0				     \
-        RTE_SDK=$(PACKAGE_BUILD_DIR)					     \
-        RTE_TARGET=arm-default-linuxapp-gcc
-
-cavium-dpdk_install =						\
-  src_dir=$(PACKAGE_BUILD_DIR) ;				\
-  dst_dir=$(PACKAGE_INSTALL_DIR) ;				\
-  tar -h -C $${src_dir}/arm64-thunderx-linuxapp-gcc -cf - .	\
-    | tar -C $${dst_dir} -xf - 
-
-# dpdk libraries end up in .../lib not .../lib64. Fix it.
-cavium-dpdk_post_install =							\
-  if [ "$(arch_lib_dir)" != "lib" ] ; then					\
-     mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir) ;				\
-     cd $(PACKAGE_INSTALL_DIR)/lib		     ;				\
-     tar cf - . | ( cd $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir); tar xf - ) ;	\
-  fi 
-
-# nothing to install, all static libraries
-cavium-dpdk_image_include = echo
-
diff --git a/build-data/packages/g2.mk b/build-data/packages/g2.mk
index 258eff1d..9b760e63 100644
--- a/build-data/packages/g2.mk
+++ b/build-data/packages/g2.mk
@@ -1,5 +1,3 @@
-g2_configure_depend = vppinfra-install
+g2_source = src
 
-g2_CPPFLAGS = $(call installed_includes_fn, vppinfra)
-
-g2_LDFLAGS = $(call installed_libs_fn, vppinfra)
+g2_configure_args = --disable-vlib --disable-svm --enable-g2
diff --git a/build-data/packages/gmod.mk b/build-data/packages/gmod.mk
index a6ba42d0..6fa7e0f1 100644
--- a/build-data/packages/gmod.mk
+++ b/build-data/packages/gmod.mk
@@ -1,9 +1,9 @@
-gmod_configure_depend = vppinfra-install svm-install
+gmod_configure_depend = vpp-install
 
 gmod_configure_args = --libdir=$(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/ganglia
 
-gmod_CPPFLAGS = $(call installed_includes_fn, vppinfra svm)
+gmod_CPPFLAGS = $(call installed_includes_fn, vpp)
 gmod_CPPFLAGS += -I/usr/include/apr-1.0 -I/usr/include/apr-1 -I/usr/include
-gmod_LDFLAGS = $(call installed_libs_fn, vppinfra svm)
+gmod_LDFLAGS = $(call installed_libs_fn, vpp)
 
 gmod_image_include = echo $(arch_lib_dir)/ganglia/libgmodvpp.so etc
diff --git a/build-data/packages/perftool.mk b/build-data/packages/perftool.mk
index 300f902b..e582c316 100644
--- a/build-data/packages/perftool.mk
+++ b/build-data/packages/perftool.mk
@@ -1,5 +1,4 @@
-perftool_configure_depend = vppinfra-install
+perftool_source = src
 
-perftool_CPPFLAGS = $(call installed_includes_fn, vppinfra)
+perftool_configure_args = --disable-vlib --disable-svm --enable-perftool
 
-perftool_LDFLAGS = $(call installed_libs_fn, vppinfra)
diff --git a/build-data/packages/plugins.mk b/build-data/packages/plugins.mk
index 44a8e2bd..b4d67a28 100644
--- a/build-data/packages/plugins.mk
+++ b/build-data/packages/plugins.mk
@@ -1,24 +1,13 @@
 plugins_configure_depend = 			\
-    vppinfra-install 				\
-    vlib-api-install 				\
-    vpp-api-test-install 			\
-    vnet-install                                \
-    vlib-install 				\
-    vpp-api-install
+    vpp-api-install				\
+    vpp-install
 
-plugins_CPPFLAGS = $(call installed_includes_fn, 	\
-    vppinfra 					\
-    vlib 					\
-    vnet 					\
-    svm 					\
-    vpp-api-test 				\
-    vlib-api 				\
-    vpp-api)					
+plugins_CPPFLAGS = $(call installed_includes_fn, \
+    vpp  \
+    vpp-api)
 
-plugins_LDFLAGS = $(call installed_libs_fn, 	\
-    vppinfra					\
-    vlib					\
-    vlib-api)
+plugins_LDFLAGS = $(call installed_libs_fn,     \
+    vpp)
 
 ifeq ($($(PLATFORM)_enable_tests),yes)
 plugins_configure_args += --enable-tests
diff --git a/vpp-api/python/README.rst b/build-data/packages/src.mk
index e69de29b..e69de29b 100644
--- a/vpp-api/python/README.rst
+++ b/build-data/packages/src.mk
diff --git a/build-data/packages/svm.mk b/build-data/packages/svm.mk
deleted file mode 100644
index 3971fe82..00000000
--- a/build-data/packages/svm.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-svm_top_srcdir = $(call find_source_fn,svm)
-svm_configure_depend = vppinfra-install
-
-svm_CPPFLAGS = $(call installed_includes_fn, vppinfra)
-svm_LDFLAGS = $(call installed_libs_fn, vppinfra)
diff --git a/build-data/packages/vlib-api-cavium-dpdk.mk b/build-data/packages/vlib-api-cavium-dpdk.mk
deleted file mode 100644
index 7a4fe2cd..00000000
--- a/build-data/packages/vlib-api-cavium-dpdk.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-vlib-api-cavium-dpdk_source = vlib-api
-
-vlib-api-cavium-dpdk_configure_depend = vppinfra-install svm-install vlib-cavium-dpdk-install
-
-vlib-api-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn, vppinfra svm vlib-cavium-dpdk)
-vlib-api-cavium-dpdk_LDFLAGS = $(call installed_libs_fn, vppinfra svm vlib-cavium-dpdk)
diff --git a/build-data/packages/vlib-api.mk b/build-data/packages/vlib-api.mk
deleted file mode 100644
index 29b0d17d..00000000
--- a/build-data/packages/vlib-api.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-vlib-api_configure_depend = vppinfra-install svm-install vlib-install
-
-vlib-api_CPPFLAGS = $(call installed_includes_fn, vppinfra svm vlib)
-vlib-api_LDFLAGS = $(call installed_libs_fn, vppinfra svm vlib)
diff --git a/build-data/packages/vlib-cavium-dpdk.mk b/build-data/packages/vlib-cavium-dpdk.mk
deleted file mode 100644
index 0f2f132d..00000000
--- a/build-data/packages/vlib-cavium-dpdk.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-vlib-cavium-dpdk_source = vlib
-vlib-cavium-dpdk_configure_depend = vppinfra-install cavium-dpdk-install
-
-vlib-cavium-dpdk_configure_args += --with-dpdk
-
-vlib-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn, vppinfra cavium-dpdk)
-vlib-cavium-dpdk_LDFLAGS = $(call installed_libs_fn, vppinfra cavium-dpdk)
diff --git a/build-data/packages/vlib.mk b/build-data/packages/vlib.mk
deleted file mode 100644
index 2172708d..00000000
--- a/build-data/packages/vlib.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-vlib_configure_depend = vppinfra-install
-
-vlib_CPPFLAGS = $(call installed_includes_fn, vppinfra)
-vlib_LDFLAGS = $(call installed_libs_fn, vppinfra)
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-vlib_configure_args += --with-dpdk
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-vlib_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-vlib_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-vlib_configure_depend += dpdk-install
-vlib_CPPFLAGS += $(call installed_includes_fn, dpdk)
-vlib_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
diff --git a/build-data/packages/vnet-cavium-dpdk.mk b/build-data/packages/vnet-cavium-dpdk.mk
deleted file mode 100644
index 4c35b04d..00000000
--- a/build-data/packages/vnet-cavium-dpdk.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-vnet-cavium-dpdk_source = vnet
-
-vnet-cavium-dpdk_configure_depend =		\
-    vppinfra-install				\
-    cavium-dpdk-install				\
-    svm-install					\
-    vlib-api-cavium-dpdk-install		\
-    vlib-cavium-dpdk-install 
-
-
-vnet-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn,	\
-    vppinfra							\
-    cavium-dpdk							\
-    openssl							\
-    svm								\
-    vlib-cavium-dpdk						\
-    vlib-api-cavium-dpdk)
-
-vnet-cavium-dpdk_LDFLAGS = $(call installed_libs_fn,	\
-    vppinfra						\
-    cavium-dpdk						\
-    openssl						\
-    svm							\
-    vlib-cavium-dpdk					\
-    vlib-api-cavium-dpdk)
-
-# Platform dependent configure flags
-vnet-cavium-dpdk_configure_args += $(vnet-cavium-dpdk_configure_args_$(PLATFORM))
-
diff --git a/build-data/packages/vpp-api-test-cavium-dpdk.mk b/build-data/packages/vpp-api-test-cavium-dpdk.mk
deleted file mode 100644
index e352317f..00000000
--- a/build-data/packages/vpp-api-test-cavium-dpdk.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-vpp-api-test-cavium-dpdk_source = vpp-api-test
-
-vpp-api-test-cavium-dpdk_configure_depend =	\
-	vppinfra-install			\
-	cavium-dpdk-install			\
-	svm-install				\
-	vlib-api-cavium-dpdk-install		\
-	vlib-cavium-dpdk-install		\
-	vnet-cavium-dpdk-install		\
-	vpp-cavium-dpdk-install
-
-# 
-vpp-api-test-cavium-dpdk_configure_args = --with-dpdk 
-
-vpp-api-test-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra							\
-	cavium-dpdk							\
-	svm								\
-	vlib-cavium-dpdk						\
-	vlib-api-cavium-dpdk						\
-	vnet-cavium-dpdk						\
-	vpp-cavium-dpdk)
-
-vpp-api-test-cavium-dpdk_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra						\
-	cavium-dpdk						\
-	svm							\
-	vlib-cavium-dpdk					\
-	vlib-api-cavium-dpdk					\
-	vnet-cavium-dpdk					\
-	vpp-cavium-dpdk)
-
diff --git a/build-data/packages/vpp-api-test.mk b/build-data/packages/vpp-api-test.mk
deleted file mode 100644
index c9eae367..00000000
--- a/build-data/packages/vpp-api-test.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-vpp-api-test_configure_depend =			\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install
-
-vpp-api-test_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp)
-
-vpp-api-test_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra					\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp)
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-vpp-api-test_configure_args = --with-dpdk
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-vpp-api-test_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-vpp-api-test_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-vpp-api-test_configure_depend += dpdk-install
-vpp-api-test_CPPFLAGS += $(call installed_includes_fn, dpdk)
-vpp-api-test_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_cryptodev),yes)
-vpp-api-test_configure_args += --with-dpdk-crypto
-endif
-
diff --git a/build-data/packages/vpp-api.mk b/build-data/packages/vpp-api.mk
index 4937023a..d9e8d72e 100644
--- a/build-data/packages/vpp-api.mk
+++ b/build-data/packages/vpp-api.mk
@@ -1,23 +1,9 @@
 vpp-api_configure_depend =			\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
 	vpp-install
 
 vpp-api_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
 	vpp)
 
-vpp-api_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra				\
-	svm					\
-	vlib					\
-	vlib-api)
+vpp-api_LDFLAGS =
 
 vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-8-openjdk-amd64/include
diff --git a/build-data/packages/vpp-cavium-dpdk.mk b/build-data/packages/vpp-cavium-dpdk.mk
deleted file mode 100644
index 704e3a95..00000000
--- a/build-data/packages/vpp-cavium-dpdk.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-vpp-cavium-dpdk_source = vpp
-
-vpp-cavium-dpdk_configure_depend =		\
-	vppinfra-install			\
-	cavium-dpdk-install			\
-	svm-install				\
-	vlib-api-cavium-dpdk-install		\
-	vlib-cavium-dpdk-install		\
-	vnet-cavium-dpdk-install
-
-# Platform dependent configure flags
-vpp-cavium-dpdk_configure_args += $(vpp-cavium-dpdk_configure_args_$(PLATFORM))
-
-vpp-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra						\
-	cavium-dpdk						\
-        openssl							\
-	svm							\
-	vlib-cavium-dpdk					\
-	vlib-api-cavium-dpdk					\
-	vnet-cavium-dpdk)
-
-vpp-cavium-dpdk_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra					\
-	cavium-dpdk					\
-	openssl						\
-	svm						\
-	vlib-cavium-dpdk				\
-	vlib-api-cavium-dpdk				\
-	vnet-cavium-dpdk)
diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index a3d60528..fe68cd82 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -1,11 +1,5 @@
-vpp_configure_depend =				\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
+vpp_source = src
 
-# 
 ifeq ($($(PLATFORM)_dpdk_shared_lib),yes)
 vpp_configure_args = --enable-dpdk-shared
 else
@@ -16,25 +10,8 @@ endif
 vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
 
 
-vpp_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra				\
-	svm					\
-	vlib					\
-	vlib-api				\
-	vnet)
-
-vpp_LDFLAGS = $(call installed_libs_fn,		\
-	vppinfra				\
-	svm					\
-	vlib					\
-	vlib-api				\
-	vnet)
-
-# include & link with openssl only if needed
-ifneq ($($(PLATFORM)_uses_openssl),no)
-vpp_CPPFLAGS += $(call installed_includes_fn, openssl)
-vpp_LDFLAGS += $(call installed_libs_fn, openssl)
-endif
+vpp_CPPFLAGS =
+vpp_LDFLAGS =
 
 ifneq ($($(PLATFORM)_uses_dpdk),no)
 ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
diff --git a/build-data/packages/vppinfra.mk b/build-data/packages/vppinfra.mk
deleted file mode 100644
index 6ca6eb24..00000000
--- a/build-data/packages/vppinfra.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-
-ifeq ($($(PLATFORM)_enable_tests),yes)
-vppinfra_configure_args += --enable-tests
-endif
-
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index a568c7a0..88dd3ed8 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -60,15 +60,15 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	 deb/debian/vpp-dpdk-dev.install ;				\
 									\
 	: bin package needs startup config ; 				\
-	echo ../../vpp/conf/startup.conf /etc/vpp 			\
+	echo ../../src/vpp/conf/startup.conf /etc/vpp 			\
 	   >> deb/debian/vpp.install ;					\
 									\
 	: and sysctl config ; 						\
-	echo ../../vpp/conf/80-vpp.conf /etc/sysctl.d 			\
+	echo ../../src/vpp/conf/80-vpp.conf /etc/sysctl.d 		\
 	   >> deb/debian/vpp.install ;					\
 									\
 	: dev package needs a couple of additions ;			\
-	echo ../build-tool-native/vppapigen/vppapigen /usr/bin		\
+	echo ../build-tool-native/tools/vppapigen /usr/bin		\
 	   >> deb/debian/vpp-dev.install ;				\
 	echo ../../vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin		\
 	   >> deb/debian/vpp-dev.install ;				\
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 97ddc57d..513a4db4 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -29,11 +29,9 @@ vpp_uses_dpdk = yes
 # Uncoment to enable building unit tests
 # vpp_enable_tests = yes
 
-vpp_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \
-	vpp-api gmod plugins
+vpp_root_packages = vpp vpp-api gmod plugins
 
 vpp_configure_args_vpp = --with-dpdk
-vnet_configure_args_vpp = --with-dpdk
 
 # Set these parameters carefully. The vlib_buffer_t is 128 bytes, i.e.
 vlib_configure_args_vpp = --with-pre-data=128
diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk
index ef2ec444..55805d10 100644
--- a/build-data/platforms/vpp_lite.mk
+++ b/build-data/platforms/vpp_lite.mk
@@ -27,8 +27,7 @@ vpp_lite_uses_dpdk = no
 # Uncoment to enable building unit tests
 #vpp_lite_enable_tests = yes
 
-vpp_lite_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \
-	vpp-api gmod
+vpp_lite_root_packages = vpp vpp-api gmod
 
 vlib_configure_args_vpp_lite = --with-pre-data=128
 
diff --git a/build-root/bootstrap.sh b/build-root/bootstrap.sh
index f83734fd..2949c180 100755
--- a/build-root/bootstrap.sh
+++ b/build-root/bootstrap.sh
@@ -45,7 +45,7 @@ cd $wsroot
 
 cd $build_root
 echo Compile native tools
-for tool in vppapigen
+for tool in tools
 do
     make V=0 is_build_tool=yes $tool-install
 done
diff --git a/build-root/packages/src.mk b/build-root/packages/src.mk
new file mode 100644
index 00000000..db48ed58
--- /dev/null
+++ b/build-root/packages/src.mk
@@ -0,0 +1,4 @@
+# nothing
+
+
+
diff --git a/build-root/packages/tools.mk b/build-root/packages/tools.mk
new file mode 100644
index 00000000..506e024b
--- /dev/null
+++ b/build-root/packages/tools.mk
@@ -0,0 +1,3 @@
+tools_source = src
+tools_configure_args = --disable-vlib
+
diff --git a/build-root/packages/vppapigen.mk b/build-root/packages/vppapigen.mk
deleted file mode 100644
index 0d284631..00000000
--- a/build-root/packages/vppapigen.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-vppapigen_configure_depend = vppinfra-install
-
-vppapigen_CPPFLAGS = $(call installed_includes_fn, vppinfra)
-
-vppapigen_LDFLAGS = $(call installed_libs_fn, vppinfra)
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 194d205f..654424c0 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -97,12 +97,10 @@ groupadd -f -r vpp
 mkdir -p -m755 %{buildroot}%{_bindir}
 mkdir -p -m755 %{buildroot}%{_unitdir}
 install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/*/bin/* %{buildroot}%{_bindir}
-install -p -m 755 %{_mu_build_dir}/%{_vpp_build_dir}/vppapigen/vppapigen %{buildroot}%{_bindir}
+install -p -m 755 %{_mu_build_dir}/%{_vpp_build_dir}/tools/vppapigen %{buildroot}%{_bindir}
 
-# core api
+# api
 mkdir -p -m755 %{buildroot}/usr/share/vpp/api
-install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/vpp-api/vpe.api.json %{buildroot}/usr/share/vpp/api
-install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vlib-api/vlibmemory/memclnt.api.json %{buildroot}/usr/share/vpp/api
 
 #
 # configs
@@ -110,8 +108,8 @@ install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vlib-api/vlibmemory/memcl
 mkdir -p -m755 %{buildroot}/etc/vpp
 mkdir -p -m755 %{buildroot}/etc/sysctl.d
 install -p -m 644 %{_mu_build_dir}/rpm/vpp.service %{buildroot}%{_unitdir}
-install -p -m 644 %{_mu_build_dir}/../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
-install -p -m 644 %{_mu_build_dir}/../vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
+install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
+install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
 #
 # libraries
 #
@@ -128,7 +126,7 @@ do
 	( cd %{buildroot}%{_libdir} && 
           ln -fs $file $(echo $file | sed -e 's/\(\.so\)\.[0-9]\+.*/\1/') )
 done
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vnet -type f -name '*.api.json' -print )
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api  -type f -name '*.api.json' -print )
 do
 	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
 done
@@ -178,12 +176,24 @@ do
            %{buildroot}/usr/lib/vpp_plugins/$file
 done
 
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins && find -type f -print)
+do
+        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins/$file \
+           %{buildroot}/usr/lib/vpp_plugins/$file
+done
+
 for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins && find -type f -print)
 do
         install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins/$file \
            %{buildroot}/usr/lib/vpp_api_test_plugins/$file
 done
 
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins && find -type f -print)
+do
+        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins/$file \
+           %{buildroot}/usr/lib/vpp_api_test_plugins/$file
+done
+
 for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/plugins -type f -name '*.api.json' -print )
 do
 	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
diff --git a/build-root/scripts/find-plugins-contents b/build-root/scripts/find-plugins-contents
index a5a52acf..4108f790 100755
--- a/build-root/scripts/find-plugins-contents
+++ b/build-root/scripts/find-plugins-contents
@@ -2,14 +2,14 @@
 
 rm -f $2
 
-for i in ${1}/plugins/lib64/vpp_plugins/*.so; do
+for i in ${1}/{plugins,vpp}/lib64/vpp_plugins/*.so; do
 	echo ../${i} /usr/lib/vpp_plugins >> ${2}
 done
 
-for i in ${1}/plugins/lib64/vpp_api_test_plugins/*.so; do
+for i in ${1}/{plugins,vpp}/lib64/vpp_api_test_plugins/*.so; do
 	echo ../${i} /usr/lib/vpp_api_test_plugins >> ${2}
 done
 
-for i in $(find ${1}/plugins -name *.api.json -type f -print); do
+for i in $(find ${1}/plugins ${1}/vpp/share/vpp/api/plugins/ -name *.api.json -type f -print); do
     echo ../${i} /usr/share/vpp/api/ >> ${2}
 done
diff --git a/build-root/scripts/find-python-api-contents b/build-root/scripts/find-python-api-contents
index 9b390e75..24e8532c 100755
--- a/build-root/scripts/find-python-api-contents
+++ b/build-root/scripts/find-python-api-contents
@@ -2,7 +2,7 @@
 
 rm -f $2
 
-for i in $(find ${1}/vpp-api/lib/python2.7/site-packages/ -type f -print); do
+for i in $(find ${1}/{vpp,vpp-api}/lib/python2.7/site-packages/ -type f -print); do
     echo ../${i} /usr/lib/python2.7/site-packages/vpp_papi >> ${2}
 done
 
diff --git a/gmod/gmod/mod_vpp.c b/gmod/gmod/mod_vpp.c
index 4a1da83c..572f9ef5 100644
--- a/gmod/gmod/mod_vpp.c
+++ b/gmod/gmod/mod_vpp.c
@@ -21,7 +21,7 @@
 #include <vppinfra/clib.h>
 #include <vppinfra/vec.h>
 #include <vppinfra/hash.h>
-#include <svmdb.h>
+#include <svm/svmdb.h>
 #include <errno.h>
 
 mmodule vpp_module;
diff --git a/perftool/Makefile.am b/perftool/Makefile.am
deleted file mode 100644
index ac652aa6..00000000
--- a/perftool/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign
-AM_CFLAGS = -Wall 
-
-bin_PROGRAMS = c2cpel cpelatency cpeldump cpelinreg cpelstate
-
-lib_LTLIBRARIES = libcperf.la
-
-libcperf_la_SOURCES = delsvec.c linreg.c props.c cpel_util.c
-
-TOOL_LIBS = libcperf.la -lvppinfra -lm
-
-c2cpel_SOURCE = c2cpel.c
-c2cpel_LDADD = $(TOOL_LIBS)
-
-cpelatency_SOURCE = cpelatency.c
-cpelatency_LDADD = $(TOOL_LIBS)
-
-cpeldump_SOURCE = cpeldump.c
-cpeldump_LDADD = $(TOOL_LIBS)
-
-cpelinreg_SOURCE = cpelinreg.c
-cpelinreg_LDADD = $(TOOL_LIBS)
-
-cpelstate_SOURCE = cpelstate.c
-cpelstate_LDADD = $(TOOL_LIBS)
-
-
-
-
-
-
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 100f089e..a101e47f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -28,10 +28,6 @@ if ENABLE_sample_PLUGIN
 SUBDIRS += sample-plugin
 endif
 
-if ENABLE_sixrd_PLUGIN
-SUBDIRS += sixrd-plugin
-endif
-
 if ENABLE_ioam_PLUGIN
 SUBDIRS += ioam-plugin
 endif
@@ -44,18 +40,10 @@ if ENABLE_snat_PLUGIN
 SUBDIRS += snat-plugin
 endif
 
-if ENABLE_ila_PLUGIN
-SUBDIRS += ila-plugin
-endif
-
 if ENABLE_lb_PLUGIN
 SUBDIRS += lb-plugin
 endif
 
-if ENABLE_flowperpkt_PLUGIN
-SUBDIRS += flowperpkt-plugin
-endif
-
 if ENABLE_acl_PLUGIN
 SUBDIRS += acl-plugin
 endif
diff --git a/plugins/configure.ac b/plugins/configure.ac
index 6e7d5b8a..9c631634 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -53,12 +53,9 @@ AM_CONDITIONAL(ENABLE_$1_PLUGIN, test "$enable_the_plugin" = "1")
 # SUBDIRS += new-plugin
 # endif
 
-PLUGIN_ENABLED(sixrd)
 PLUGIN_ENABLED(ioam)
 PLUGIN_ENABLED(snat)
-PLUGIN_ENABLED(ila)
 PLUGIN_ENABLED(lb)
-PLUGIN_ENABLED(flowperpkt)
 PLUGIN_ENABLED(acl)
 
 # Disabled plugins, require --enable-XXX-plugin
diff --git a/plugins/flowperpkt-plugin/Makefile.am b/plugins/flowperpkt-plugin/Makefile.am
deleted file mode 100644
index 9354e26f..00000000
--- a/plugins/flowperpkt-plugin/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# Copyright (c) <current-year> <your-organization>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = -module -shared -avoid-version
-
-vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppplugins_LTLIBRARIES = flowperpkt_plugin.la
-vppapitestplugins_LTLIBRARIES = flowperpkt_test_plugin.la
-
-flowperpkt_plugin_la_SOURCES = flowperpkt/flowperpkt.c  \
-        flowperpkt/l2_node.c \
-        flowperpkt/node.c \
-	flowperpkt/flowperpkt_plugin.api.h
-flowperpkt_plugin_la_LDFLAGS = -module
-
-BUILT_SOURCES =					\
-	flowperpkt/flowperpkt.api.h		\
-	flowperpkt/flowperpkt.api.json
-
-SUFFIXES = .api.h .api .api.json
-
-%.api.h: %.api
-	mkdir -p `dirname $@` ; \
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
-	| vppapigen --input - --output $@ --show-name $@
-
-%.api.json: %.api
-	@echo "  JSON APIGEN  " $@ ;				\
-	mkdir -p `dirname $@` ;					\
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
-	| vppapigen --input - --json $@
-
-apidir = $(prefix)/flowperpkt/
-api_DATA = flowperpkt/flowperpkt.api.json
-
-noinst_HEADERS =			\
-  flowperpkt/flowperpkt_all_api_h.h			\
-  flowperpkt/flowperpkt_msg_enum.h			\
-  flowperpkt/flowperpkt.api.h
-
-flowperpkt_test_plugin_la_SOURCES = \
-  flowperpkt/flowperpkt_test.c flowperpkt/flowperpkt_plugin.api.h
-
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
-	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
-
diff --git a/plugins/flowperpkt-plugin/configure.ac b/plugins/flowperpkt-plugin/configure.ac
deleted file mode 100644
index 80546169..00000000
--- a/plugins/flowperpkt-plugin/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-
-AC_INIT(flowperpkt_plugin, 1.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_LIBTOOL
-AC_PROG_CC
-
-AC_OUTPUT([Makefile])
diff --git a/plugins/ila-plugin/configure.ac b/plugins/ila-plugin/configure.ac
deleted file mode 100644
index 56016b4d..00000000
--- a/plugins/ila-plugin/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(ila_plugin, 1.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-AC_PREFIX_DEFAULT([/usr])
-
-AC_PROG_LIBTOOL
-AC_PROG_CC
-
-AC_OUTPUT([Makefile])
diff --git a/plugins/sixrd-plugin/configure.ac b/plugins/sixrd-plugin/configure.ac
deleted file mode 100644
index 3aa4c425..00000000
--- a/plugins/sixrd-plugin/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(sixrd_plugin, 1.0)
-LT_INIT
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-AC_PREFIX_DEFAULT([/usr])
-
-AC_PROG_CC
-
-AC_OUTPUT([Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 00000000..e691a539
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,101 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+###############################################################################
+# Global Defines
+###############################################################################
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+ACLOCAL_AMFLAGS = -I m4
+
+AM_CFLAGS = -Wall
+
+SUBDIRS = .
+SUFFIXES = .api.h .api .api.json
+API_FILES =
+noinst_HEADERS =
+dist_bin_SCRIPTS =
+lib_LTLIBRARIES =
+BUILT_SOURCES =
+
+###############################################################################
+# DPDK
+###############################################################################
+
+if WITH_DPDK
+if ENABLE_DPDK_SHARED
+DPDK_LD_FLAGS = -Wl,--whole-archive,-ldpdk,--no-whole-archive
+else
+DPDK_LD_FLAGS = -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive
+endif
+if WITH_DPDK_CRYPTO
+DPDK_LD_ADD = -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
+endif
+if WITH_DPDK_MLX5_PMD
+DPDK_LD_FLAGS += -libverbs -lmlx5 -lnuma
+endif
+else
+DPDK_LD_FLAGS =
+DPDK_LD_ADD =
+endif
+
+###############################################################################
+# Components
+###############################################################################
+
+include vppinfra.am
+include vppapigen.am
+
+if ENABLE_PERFTOOL
+include perftool.am
+endif
+
+if ENABLE_G2
+include g2.am
+endif
+
+if ENABLE_SVM
+include svm.am
+endif
+
+if ENABLE_VLIB
+include vlib.am
+endif
+
+if ENABLE_SVM
+if ENABLE_VLIB
+include vlib-api.am
+include vnet.am
+include vpp.am
+include vpp-api-test.am
+
+SUBDIRS += vpp-api/python plugins
+
+###############################################################################
+# API
+###############################################################################
+
+include suffix-rules.mk
+
+# Set the suffix list
+apidir = $(prefix)/share/vpp/api/core
+
+api_DATA = \
+	$(patsubst %.api,%.api.json,$(API_FILES))
+
+BUILT_SOURCES += \
+	$(patsubst %.api,%.api.json,$(API_FILES)) \
+	$(patsubst %.api,%.api.h,$(API_FILES))
+
+endif # if ENABLE_VLIB
+endif # if ENABLE_SVM
diff --git a/src/configure.ac b/src/configure.ac
new file mode 100644
index 00000000..f8e4d94f
--- /dev/null
+++ b/src/configure.ac
@@ -0,0 +1,195 @@
+AC_INIT([vpp], [17.04], [vpp-dev@fd.io])
+LT_INIT
+AC_CONFIG_AUX_DIR([.])
+AM_INIT_AUTOMAKE([subdir-objects])
+AM_SILENT_RULES([yes])
+AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile])
+
+AC_PROG_CC
+AM_PROG_AS
+AM_PROG_LIBTOOL
+AC_PROG_YACC
+
+###############################################################################
+# Macros
+###############################################################################
+
+AC_DEFUN([ENABLE_ARG],
+[
+  AC_ARG_ENABLE($1,
+    AC_HELP_STRING(patsubst([--enable-$1],[_],[-]), $2),
+    [enable_$1=yes n_enable_$1=1],
+    [enable_$1=no n_enable_$1=0])
+  AM_CONDITIONAL(m4_toupper(ENABLE_$1), test "$enable_$1" = "yes")
+  m4_append([list_of_enabled], [$1], [, ])
+])
+
+AC_DEFUN([DISABLE_ARG],
+[
+  AC_ARG_ENABLE($1,
+    AC_HELP_STRING(patsubst([--disable-$1],[_],[-]), $2),
+    [enable_$1=no n_enable_$1=0],
+    [enable_$1=yes n_enable_$1=1])
+  AM_CONDITIONAL(m4_toupper(ENABLE_$1), test "$enable_$1" = "yes")
+  m4_append([list_of_enabled], [$1], [, ])
+])
+
+AC_DEFUN([WITH_ARG],
+[
+  AC_ARG_WITH($1,
+    AC_HELP_STRING(patsubst([--with-$1],[_],[-]), $2),
+    [with_$1=yes n_with_$1=1],
+    [with_$1=no n_with_$1=0])
+  AM_CONDITIONAL(m4_toupper(WITH_$1), test "$with_$1" = "yes")
+  m4_append([list_of_with], [$1], [, ])
+])
+
+AC_DEFUN([WITHOUT_ARG],
+[
+  AC_ARG_WITH($1,
+    AC_HELP_STRING(patsubst([--without-$1],[_],[-]), $2),
+    [with_$1=no n_with_$1=0],
+    [with_$1=yes n_with_$1=1])
+  AM_CONDITIONAL(m4_toupper(WITH_$1), test "$with_$1" = "yes")
+  m4_append([list_of_with], [$1], [, ])
+])
+
+AC_DEFUN([PLUGIN_ENABLED],
+[
+   AC_ARG_ENABLE($1_plugin,
+     AC_HELP_STRING([--disable-$1-plugin], [Do not build $1 plugin]),
+       [enable_$1_plugin=no],
+       [enable_$1_plugin=yes ])
+  AM_CONDITIONAL(m4_toupper(ENABLE_$1_PLUGIN), test "$enable_$1_plugin" = "yes")
+  m4_append([list_of_plugins], [$1], [, ])
+])
+
+AC_DEFUN([PLUGIN_DISABLED],
+[
+   AC_ARG_ENABLE($1_plugin,
+     AC_HELP_STRING([--enable-$1-plugin], [Build $1 plugin]),
+       [enable_$1_plugin=yes ],
+       [enable_$1_plugin=no])
+  AM_CONDITIONAL(m4_toupper((ENABLE_$1_PLUGIN), test "$enable_$1_plugin" = "yes")
+  m4_append([list_of_plugins], [$1], [, ])
+])
+
+AC_DEFUN([PRINT_VAL], [ AC_MSG_RESULT(AC_HELP_STRING($1,$2)) ])
+
+###############################################################################
+# configure arguments
+###############################################################################
+
+# --enable-X
+ENABLE_ARG(tests,	[Enable unit tests])
+ENABLE_ARG(dpdk_shared,	[Enable unit tests])
+ENABLE_ARG(perftool,	[Enable perftool])
+ENABLE_ARG(g2,		[Enable g2])
+
+# --disable-X
+DISABLE_ARG(vlib,	[Disable vlib and dependant libs and binaries])
+DISABLE_ARG(svm,	[Disable svm and dependant libs and binaries])
+
+# --with-X
+WITH_ARG(dpdk,		[Use use DPDK])
+WITH_ARG(dpdk_crypto,	[Use DPDK cryptodev])
+WITH_ARG(dpdk_mlx5_pmd,	[Use DPDK with mlx5 PMD])
+
+# --without-X
+WITHOUT_ARG(ipsec,	[Disable IPSec])
+WITHOUT_ARG(ipv6sr,	[Disable IPv6 SR])
+WITHOUT_ARG(apicli,	[Disable binary api CLI])
+
+AC_ARG_WITH(unix,
+            AC_HELP_STRING([--with-unix],[Compile unix version of clib]),
+	    [],
+	    [case $host_os in
+	      darwin* | linux*) with_unix=yes;;
+	      *) with_unix=no;;
+	      esac])
+
+AM_CONDITIONAL(WITH_UNIX, test "$with_unix" = "yes")
+
+AC_ARG_WITH(pre-data,
+            AC_HELP_STRING([--with-pre-data],[Set buffer rewrite space]),
+	    [case $with_pre_data in
+	       128) ;;
+	       256) ;;
+               *) with_pre_data="pre-data-not-set" ;;
+	     esac], [with_pre_data=128])
+
+###############################################################################
+# Substitutions and defines
+###############################################################################
+
+AC_SUBST(PRE_DATA_SIZE,		[$with_pre_data])
+AC_SUBST(APICLI,		[-DVPP_API_TEST_BUILTIN=${n_with_apicli}])
+
+AC_DEFINE_UNQUOTED(DPDK, 		[${n_with_dpdk}])
+AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB,	[${n_enable_dpdk_shared}])
+AC_DEFINE_UNQUOTED(DPDK_CRYPTO,		[${n_with_dpdk_crypto}])
+AC_DEFINE_UNQUOTED(IPSEC,		[${n_with_ipsec}])
+AC_DEFINE_UNQUOTED(IPV6SR,		[${n_with_ipv6sr}])
+
+###############################################################################
+# Dependency checks
+###############################################################################
+
+AM_COND_IF([ENABLE_DPDK_SHARED],
+[
+  AC_CHECK_HEADERS([rte_config.h],
+    [],
+    [AC_MSG_ERROR([DPDK header files not found])],)
+  AC_CHECK_LIB( [dpdk], [rte_eal_init],
+    [],
+    [AC_MSG_ERROR([DPDK shared library not found])],)
+])
+
+AM_COND_IF([ENABLE_G2],
+[
+  PKG_CHECK_MODULES(g2, gtk+-2.0)
+])
+
+###############################################################################
+# Plugins
+###############################################################################
+
+PLUGIN_ENABLED(sixrd)
+PLUGIN_ENABLED(ila)
+PLUGIN_ENABLED(flowperpkt)
+
+###############################################################################
+# Output
+###############################################################################
+
+AC_OUTPUT
+
+AC_MSG_RESULT([==============================================================================])
+PRINT_VAL([version], $PACKAGE $VERSION)
+PRINT_VAL([prefix], ${prefix})
+PRINT_VAL([libdir], ${libdir})
+PRINT_VAL([includedir], ${includedir})
+PRINT_VAL([CFLAGS], ${CFLAGS})
+PRINT_VAL([CPPFLAGS], ${CPPFLAGS})
+PRINT_VAL([LDFLAGS], ${LDFLAGS})
+
+AC_MSG_RESULT([])
+AC_MSG_RESULT([with:])
+m4_foreach([x], m4_dquote(list_of_with), [
+  AC_MSG_RESULT(AC_HELP_STRING(x, m4_join([], [${with_], x, [}])))
+])
+
+AC_MSG_RESULT([])
+AC_MSG_RESULT([enabled:])
+m4_foreach([x], m4_dquote(list_of_enabled), [
+  AC_MSG_RESULT(AC_HELP_STRING(x, m4_join([], [${enable_], x, [}])))
+])
+
+AC_MSG_RESULT([])
+AC_MSG_RESULT([plugins:])
+m4_foreach([x], m4_dquote(list_of_plugins), [
+  AC_MSG_RESULT(AC_HELP_STRING(x, m4_join([], [${enable_], x, [_plugin}])))
+])
+AC_MSG_RESULT([==============================================================================])
+
+
diff --git a/vlib/example/dir.dox b/src/examples/vlib/dir.dox
index d3ac0ee4..d3ac0ee4 100644
--- a/vlib/example/dir.dox
+++ b/src/examples/vlib/dir.dox
diff --git a/vlib/example/main_stub.c b/src/examples/vlib/main_stub.c
index 4d74bd77..4d74bd77 100644
--- a/vlib/example/main_stub.c
+++ b/src/examples/vlib/main_stub.c
diff --git a/vlib/example/mc_test.c b/src/examples/vlib/mc_test.c
index e84a713c..e84a713c 100644
--- a/vlib/example/mc_test.c
+++ b/src/examples/vlib/mc_test.c
diff --git a/vlib/example/plex_test.c b/src/examples/vlib/plex_test.c
index ce0c8ef1..ce0c8ef1 100644
--- a/vlib/example/plex_test.c
+++ b/src/examples/vlib/plex_test.c
diff --git a/g2/Makefile.am b/src/g2.am
index 8457c272..e7965733 100644
--- a/g2/Makefile.am
+++ b/src/g2.am
@@ -11,24 +11,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign
-
-bin_PROGRAMS = g2
-
-AM_CFLAGS = -Wall 
+bin_PROGRAMS += g2
 
 g2_SOURCES =					\
-  clib.c					\
-  cpel.c					\
-  cpel.h					\
-  events.c					\
-  g2.h						\
-  main.c					\
-  menu1.c					\
-  pointsel.c					\
-  props.c					\
-  props.h					\
-  g2version.c					\
-  view1.c
+  tools/g2/clib.c				\
+  tools/g2/cpel.c				\
+  tools/g2/cpel.h				\
+  tools/g2/events.c				\
+  tools/g2/g2.h					\
+  tools/g2/main.c				\
+  tools/g2/menu1.c				\
+  tools/g2/pointsel.c				\
+  tools/g2/props.c				\
+  tools/g2/props.h				\
+  tools/g2/g2version.c				\
+  tools/g2/view1.c
+
+g2_LDADD = $(g2_LIBS) libvppinfra.la -lpthread -lm
 
-g2_LDADD = $(g2_LIBS) -lvppinfra -lpthread -lm
+# vi:syntax=automake
diff --git a/src/perftool.am b/src/perftool.am
new file mode 100644
index 00000000..09f1681a
--- /dev/null
+++ b/src/perftool.am
@@ -0,0 +1,41 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bin_PROGRAMS += c2cpel cpelatency cpeldump cpelinreg cpelstate
+
+lib_LTLIBRARIES += libcperf.la
+
+libcperf_la_SOURCES = \
+  tools/perftool/delsvec.c	\
+  tools/perftool/linreg.c	\
+  tools/perftool/props.c	\
+  tools/perftool/cpel_util.c
+
+PERFTOOL_LIBS = libcperf.la libvppinfra.la -lm
+
+c2cpel_SOURCES = tools/perftool/c2cpel.c
+c2cpel_LDADD = $(PERFTOOL_LIBS)
+
+cpelatency_SOURCES = tools/perftool/cpelatency.c
+cpelatency_LDADD = $(PERFTOOL_LIBS)
+
+cpeldump_SOURCES = tools/perftool/cpeldump.c
+cpeldump_LDADD = $(PERFTOOL_LIBS)
+
+cpelinreg_SOURCES = tools/perftool/cpelinreg.c
+cpelinreg_LDADD = $(PERFTOOL_LIBS)
+
+cpelstate_SOURCES = tools/perftool/cpelstate.c
+cpelstate_LDADD = $(PERFTOOL_LIBS)
+
+# vi:syntax=automake
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
new file mode 100644
index 00000000..ffc4b3ab
--- /dev/null
+++ b/src/plugins/Makefile.am
@@ -0,0 +1,60 @@
+
+# Copyright (c) <current-year> <your-organization>
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+
+AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir}
+AM_LDFLAGS = -module -shared -avoid-version
+SUFFIXES = .api.h .api .api.json
+API_FILES =
+BUILT_SOURCES =
+vppplugins_LTLIBRARIES =
+vppapitestplugins_LTLIBRARIES =
+noinst_HEADERS =
+
+vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
+vpppluginsdir = ${libdir}/vpp_plugins
+
+if ENABLE_FLOWPERPKT_PLUGIN
+include flowperpkt.am
+endif
+
+if ENABLE_ILA_PLUGIN
+include ila.am
+endif
+
+if ENABLE_SIXRD_PLUGIN
+include sixrd.am
+endif
+
+include ../suffix-rules.mk
+
+# Remove *.la files
+install-data-hook:
+	@-(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
+	@-(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
+
+###############################################################################
+# API
+###############################################################################
+
+apidir = $(prefix)/share/vpp/api/plugins
+
+api_DATA = \
+	$(patsubst %.api,%.api.json,$(API_FILES))
+
+BUILT_SOURCES += \
+	$(patsubst %.api,%.api.json,$(API_FILES)) \
+	$(patsubst %.api,%.api.h,$(API_FILES))
+
diff --git a/src/plugins/flowperpkt.am b/src/plugins/flowperpkt.am
new file mode 100644
index 00000000..a400603a
--- /dev/null
+++ b/src/plugins/flowperpkt.am
@@ -0,0 +1,38 @@
+
+# Copyright (c) <current-year> <your-organization>
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vppplugins_LTLIBRARIES += flowperpkt_plugin.la
+vppapitestplugins_LTLIBRARIES += flowperpkt_test_plugin.la
+
+flowperpkt_plugin_la_SOURCES = flowperpkt/flowperpkt.c  \
+        flowperpkt/l2_node.c \
+        flowperpkt/node.c \
+	flowperpkt/flowperpkt_plugin.api.h
+
+BUILT_SOURCES +=				\
+	flowperpkt/flowperpkt.api.h		\
+	flowperpkt/flowperpkt.api.json
+
+noinst_HEADERS +=				\
+  flowperpkt/flowperpkt_all_api_h.h		\
+  flowperpkt/flowperpkt_msg_enum.h		\
+  flowperpkt/flowperpkt.api.h
+
+flowperpkt_test_plugin_la_SOURCES = \
+  flowperpkt/flowperpkt_test.c			\
+  flowperpkt/flowperpkt_plugin.api.h
+
+API_FILES += flowperpkt/flowperpkt.api
+
+# vi:syntax=automake
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.api b/src/plugins/flowperpkt/flowperpkt.api
index fa878f21..fa878f21 100644
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.api
+++ b/src/plugins/flowperpkt/flowperpkt.api
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c b/src/plugins/flowperpkt/flowperpkt.c
index fb71d5b0..fb71d5b0 100644
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c
+++ b/src/plugins/flowperpkt/flowperpkt.c
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.h b/src/plugins/flowperpkt/flowperpkt.h
index 20f6939d..20f6939d 100644
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.h
+++ b/src/plugins/flowperpkt/flowperpkt.h
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_all_api_h.h b/src/plugins/flowperpkt/flowperpkt_all_api_h.h
index 329c375a..329c375a 100644
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_all_api_h.h
+++ b/src/plugins/flowperpkt/flowperpkt_all_api_h.h
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_msg_enum.h b/src/plugins/flowperpkt/flowperpkt_msg_enum.h
index 3177e77a..3177e77a 100644
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_msg_enum.h
+++ b/src/plugins/flowperpkt/flowperpkt_msg_enum.h
diff --git a/plugins/flowperpkt-plugin/flowperpkt_plugin_doc.md b/src/plugins/flowperpkt/flowperpkt_plugin_doc.md
index ed76c45c..ed76c45c 100644
--- a/plugins/flowperpkt-plugin/flowperpkt_plugin_doc.md
+++ b/src/plugins/flowperpkt/flowperpkt_plugin_doc.md
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_test.c b/src/plugins/flowperpkt/flowperpkt_test.c
index 716818ff..716818ff 100644
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_test.c
+++ b/src/plugins/flowperpkt/flowperpkt_test.c
diff --git a/plugins/flowperpkt-plugin/flowperpkt/l2_node.c b/src/plugins/flowperpkt/l2_node.c
index 1c2f681e..1c2f681e 100644
--- a/plugins/flowperpkt-plugin/flowperpkt/l2_node.c
+++ b/src/plugins/flowperpkt/l2_node.c
diff --git a/plugins/flowperpkt-plugin/flowperpkt/node.c b/src/plugins/flowperpkt/node.c
index f77f087d..f77f087d 100644
--- a/plugins/flowperpkt-plugin/flowperpkt/node.c
+++ b/src/plugins/flowperpkt/node.c
diff --git a/plugins/ila-plugin/Makefile.am b/src/plugins/ila.am
index fe785df9..d900f3eb 100644
--- a/plugins/ila-plugin/Makefile.am
+++ b/src/plugins/ila.am
@@ -11,19 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = -module -shared -avoid-version
-
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppplugins_LTLIBRARIES = ila_plugin.la
+vppplugins_LTLIBRARIES += ila_plugin.la
 
 ila_plugin_la_SOURCES = ila/ila.c
 
-noinst_HEADERS = ila/ila.h
+noinst_HEADERS += ila/ila.h
 
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
+# vi:syntax=automake
diff --git a/plugins/ila-plugin/ila/ila.c b/src/plugins/ila/ila.c
index 336f4cf5..336f4cf5 100644
--- a/plugins/ila-plugin/ila/ila.c
+++ b/src/plugins/ila/ila.c
diff --git a/plugins/ila-plugin/ila/ila.h b/src/plugins/ila/ila.h
index 26620983..26620983 100644
--- a/plugins/ila-plugin/ila/ila.h
+++ b/src/plugins/ila/ila.h
diff --git a/plugins/sixrd-plugin/Makefile.am b/src/plugins/sixrd.am
index eb0d806a..0de45088 100644
--- a/plugins/sixrd-plugin/Makefile.am
+++ b/src/plugins/sixrd.am
@@ -11,28 +11,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = -module -shared -avoid-version
-
 libsixrd_plugin_la_SOURCES =			\
 	sixrd/sixrd.c				\
 	sixrd/sixrd_dpo.c			\
 	sixrd/ip4_sixrd.c			\
 	sixrd/ip6_sixrd.c
 
-noinst_HEADERS =				\
+noinst_HEADERS +=				\
 	sixrd/sixrd.h                           \
 	sixrd/sixrd_dpo.h
 
-BUILT_SOURCES =
-
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppplugins_LTLIBRARIES = libsixrd_plugin.la
-
+vppplugins_LTLIBRARIES += libsixrd_plugin.la
 
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
+# vi:syntax=automake
diff --git a/plugins/sixrd-plugin/sixrd/ip4_sixrd.c b/src/plugins/sixrd/ip4_sixrd.c
index 2fb8015d..2fb8015d 100644
--- a/plugins/sixrd-plugin/sixrd/ip4_sixrd.c
+++ b/src/plugins/sixrd/ip4_sixrd.c
diff --git a/plugins/sixrd-plugin/sixrd/ip6_sixrd.c b/src/plugins/sixrd/ip6_sixrd.c
index 36f3fab3..36f3fab3 100644
--- a/plugins/sixrd-plugin/sixrd/ip6_sixrd.c
+++ b/src/plugins/sixrd/ip6_sixrd.c
diff --git a/plugins/sixrd-plugin/sixrd/sixrd.c b/src/plugins/sixrd/sixrd.c
index 66e631a2..66e631a2 100644
--- a/plugins/sixrd-plugin/sixrd/sixrd.c
+++ b/src/plugins/sixrd/sixrd.c
diff --git a/plugins/sixrd-plugin/sixrd/sixrd.h b/src/plugins/sixrd/sixrd.h
index 56714c9e..56714c9e 100644
--- a/plugins/sixrd-plugin/sixrd/sixrd.h
+++ b/src/plugins/sixrd/sixrd.h
diff --git a/plugins/sixrd-plugin/sixrd/sixrd_dpo.c b/src/plugins/sixrd/sixrd_dpo.c
index 88a07935..88a07935 100644
--- a/plugins/sixrd-plugin/sixrd/sixrd_dpo.c
+++ b/src/plugins/sixrd/sixrd_dpo.c
diff --git a/plugins/sixrd-plugin/sixrd/sixrd_dpo.h b/src/plugins/sixrd/sixrd_dpo.h
index 17142288..17142288 100644
--- a/plugins/sixrd-plugin/sixrd/sixrd_dpo.h
+++ b/src/plugins/sixrd/sixrd_dpo.h
diff --git a/vnet/etc/scripts/arp4 b/src/scripts/vnet/arp4
index acb20da3..acb20da3 100644
--- a/vnet/etc/scripts/arp4
+++ b/src/scripts/vnet/arp4
diff --git a/vnet/etc/scripts/arp4-mpls b/src/scripts/vnet/arp4-mpls
index d3d39f3b..d3d39f3b 100644
--- a/vnet/etc/scripts/arp4-mpls
+++ b/src/scripts/vnet/arp4-mpls
diff --git a/vnet/etc/scripts/arp6 b/src/scripts/vnet/arp6
index e6a98935..e6a98935 100644
--- a/vnet/etc/scripts/arp6
+++ b/src/scripts/vnet/arp6
diff --git a/vnet/etc/scripts/bvi b/src/scripts/vnet/bvi
index 2174da0d..2174da0d 100644
--- a/vnet/etc/scripts/bvi
+++ b/src/scripts/vnet/bvi
diff --git a/vnet/etc/scripts/dhcp/dhcpd.conf b/src/scripts/vnet/dhcp/dhcpd.conf
index d4cb3ed7..d4cb3ed7 100644
--- a/vnet/etc/scripts/dhcp/dhcpd.conf
+++ b/src/scripts/vnet/dhcp/dhcpd.conf
diff --git a/vnet/etc/scripts/dhcp/left-ping-target.sh b/src/scripts/vnet/dhcp/left-ping-target.sh
index 2edc2a50..2edc2a50 100644
--- a/vnet/etc/scripts/dhcp/left-ping-target.sh
+++ b/src/scripts/vnet/dhcp/left-ping-target.sh
diff --git a/vnet/etc/scripts/dhcp/leftpeer.conf b/src/scripts/vnet/dhcp/leftpeer.conf
index 458eecf0..458eecf0 100644
--- a/vnet/etc/scripts/dhcp/leftpeer.conf
+++ b/src/scripts/vnet/dhcp/leftpeer.conf
diff --git a/vnet/etc/scripts/icmp b/src/scripts/vnet/icmp
index 1e054e2d..1e054e2d 100644
--- a/vnet/etc/scripts/icmp
+++ b/src/scripts/vnet/icmp
diff --git a/vnet/etc/scripts/icmp6 b/src/scripts/vnet/icmp6
index 2a65acba..2a65acba 100644
--- a/vnet/etc/scripts/icmp6
+++ b/src/scripts/vnet/icmp6
diff --git a/vnet/etc/scripts/ige b/src/scripts/vnet/ige
index 80d045af..80d045af 100644
--- a/vnet/etc/scripts/ige
+++ b/src/scripts/vnet/ige
diff --git a/vnet/etc/scripts/ip6 b/src/scripts/vnet/ip6
index 4f9f3ee5..4f9f3ee5 100644
--- a/vnet/etc/scripts/ip6
+++ b/src/scripts/vnet/ip6
diff --git a/vnet/etc/scripts/ip6-hbh b/src/scripts/vnet/ip6-hbh
index 0c6de47f..0c6de47f 100644
--- a/vnet/etc/scripts/ip6-hbh
+++ b/src/scripts/vnet/ip6-hbh
diff --git a/vnet/etc/scripts/ixge b/src/scripts/vnet/ixge
index 6722b536..6722b536 100644
--- a/vnet/etc/scripts/ixge
+++ b/src/scripts/vnet/ixge
diff --git a/vnet/etc/scripts/l2efpfilter b/src/scripts/vnet/l2efpfilter
index 307b4436..307b4436 100644
--- a/vnet/etc/scripts/l2efpfilter
+++ b/src/scripts/vnet/l2efpfilter
diff --git a/vnet/etc/scripts/l2efpfilter_perf b/src/scripts/vnet/l2efpfilter_perf
index b2f4b490..b2f4b490 100644
--- a/vnet/etc/scripts/l2efpfilter_perf
+++ b/src/scripts/vnet/l2efpfilter_perf
diff --git a/vnet/etc/scripts/l2fib b/src/scripts/vnet/l2fib
index 81ede171..81ede171 100644
--- a/vnet/etc/scripts/l2fib
+++ b/src/scripts/vnet/l2fib
diff --git a/vnet/etc/scripts/l2fib_perf b/src/scripts/vnet/l2fib_perf
index 638317ff..638317ff 100644
--- a/vnet/etc/scripts/l2fib_perf
+++ b/src/scripts/vnet/l2fib_perf
diff --git a/vnet/etc/scripts/l2fib_xc b/src/scripts/vnet/l2fib_xc
index 35d7342b..35d7342b 100644
--- a/vnet/etc/scripts/l2fib_xc
+++ b/src/scripts/vnet/l2fib_xc
diff --git a/vnet/etc/scripts/l2flood b/src/scripts/vnet/l2flood
index 013462ce..013462ce 100644
--- a/vnet/etc/scripts/l2flood
+++ b/src/scripts/vnet/l2flood
diff --git a/vnet/etc/scripts/l2tp b/src/scripts/vnet/l2tp
index 337805aa..337805aa 100644
--- a/vnet/etc/scripts/l2tp
+++ b/src/scripts/vnet/l2tp
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classify b/src/scripts/vnet/leftpeer/leftpeer-classify
index 74285912..74285912 100755
--- a/vnet/etc/scripts/leftpeer/leftpeer-classify
+++ b/src/scripts/vnet/leftpeer/leftpeer-classify
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classify6 b/src/scripts/vnet/leftpeer/leftpeer-classify6
index 6579d50d..6579d50d 100644
--- a/vnet/etc/scripts/leftpeer/leftpeer-classify6
+++ b/src/scripts/vnet/leftpeer/leftpeer-classify6
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classifyl2 b/src/scripts/vnet/leftpeer/leftpeer-classifyl2
index 6be4b1e5..6be4b1e5 100644
--- a/vnet/etc/scripts/leftpeer/leftpeer-classifyl2
+++ b/src/scripts/vnet/leftpeer/leftpeer-classifyl2
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-dhcp b/src/scripts/vnet/leftpeer/leftpeer-dhcp
index c13a8f3a..c13a8f3a 100644
--- a/vnet/etc/scripts/leftpeer/leftpeer-dhcp
+++ b/src/scripts/vnet/leftpeer/leftpeer-dhcp
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf b/src/scripts/vnet/leftpeer/leftpeer-ioam.conf
index 6c1b502c..6c1b502c 100644
--- a/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf
+++ b/src/scripts/vnet/leftpeer/leftpeer-ioam.conf
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf b/src/scripts/vnet/leftpeer/leftpeer-l3vxlan.conf
index a75f9b4c..a75f9b4c 100644
--- a/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf
+++ b/src/scripts/vnet/leftpeer/leftpeer-l3vxlan.conf
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf b/src/scripts/vnet/leftpeer/leftpeer-lisp.conf
index cb3180b7..cb3180b7 100644
--- a/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf
+++ b/src/scripts/vnet/leftpeer/leftpeer-lisp.conf
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf b/src/scripts/vnet/leftpeer/leftpeer-mpls.conf
index 74bce81b..74bce81b 100644
--- a/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf
+++ b/src/scripts/vnet/leftpeer/leftpeer-mpls.conf
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-sr.conf b/src/scripts/vnet/leftpeer/leftpeer-sr.conf
index a7b962d3..a7b962d3 100644
--- a/vnet/etc/scripts/leftpeer/leftpeer-sr.conf
+++ b/src/scripts/vnet/leftpeer/leftpeer-sr.conf
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf b/src/scripts/vnet/leftpeer/leftpeer-vxlan.conf
index d50e8bf4..d50e8bf4 100644
--- a/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf
+++ b/src/scripts/vnet/leftpeer/leftpeer-vxlan.conf
diff --git a/vnet/etc/scripts/leftpeer/leftpeer.script b/src/scripts/vnet/leftpeer/leftpeer.script
index f08c8090..f08c8090 100644
--- a/vnet/etc/scripts/leftpeer/leftpeer.script
+++ b/src/scripts/vnet/leftpeer/leftpeer.script
diff --git a/vnet/etc/scripts/lfib/ip4-to-mpls b/src/scripts/vnet/lfib/ip4-to-mpls
index 85753797..85753797 100644
--- a/vnet/etc/scripts/lfib/ip4-to-mpls
+++ b/src/scripts/vnet/lfib/ip4-to-mpls
diff --git a/vnet/etc/scripts/lfib/mpls-pop-to-mpls b/src/scripts/vnet/lfib/mpls-pop-to-mpls
index 2818ac13..2818ac13 100644
--- a/vnet/etc/scripts/lfib/mpls-pop-to-mpls
+++ b/src/scripts/vnet/lfib/mpls-pop-to-mpls
diff --git a/vnet/etc/scripts/lfib/mpls-to-ip4 b/src/scripts/vnet/lfib/mpls-to-ip4
index 24e235e0..24e235e0 100644
--- a/vnet/etc/scripts/lfib/mpls-to-ip4
+++ b/src/scripts/vnet/lfib/mpls-to-ip4
diff --git a/vnet/etc/scripts/lfib/mpls-to-mpls b/src/scripts/vnet/lfib/mpls-to-mpls
index 497dbab3..497dbab3 100644
--- a/vnet/etc/scripts/lfib/mpls-to-mpls
+++ b/src/scripts/vnet/lfib/mpls-to-mpls
diff --git a/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf b/src/scripts/vnet/mpls-o-ethernet/leftpeer.conf
index dd37b942..dd37b942 100644
--- a/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf
+++ b/src/scripts/vnet/mpls-o-ethernet/leftpeer.conf
diff --git a/vnet/etc/scripts/mpls-o-ethernet/pg b/src/scripts/vnet/mpls-o-ethernet/pg
index ba5397f7..ba5397f7 100644
--- a/vnet/etc/scripts/mpls-o-ethernet/pg
+++ b/src/scripts/vnet/mpls-o-ethernet/pg
diff --git a/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf b/src/scripts/vnet/mpls-o-ethernet/rightpeer.conf
index 7709ce4d..7709ce4d 100644
--- a/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf
+++ b/src/scripts/vnet/mpls-o-ethernet/rightpeer.conf
diff --git a/vnet/etc/scripts/mpls-o-ethernet/single.conf b/src/scripts/vnet/mpls-o-ethernet/single.conf
index 2a25d355..2a25d355 100644
--- a/vnet/etc/scripts/mpls-o-ethernet/single.conf
+++ b/src/scripts/vnet/mpls-o-ethernet/single.conf
diff --git a/vnet/etc/scripts/mpls-o-gre/dhcpd.conf b/src/scripts/vnet/mpls-o-gre/dhcpd.conf
index f0f659cd..f0f659cd 100644
--- a/vnet/etc/scripts/mpls-o-gre/dhcpd.conf
+++ b/src/scripts/vnet/mpls-o-gre/dhcpd.conf
diff --git a/vnet/etc/scripts/mpls-o-gre/leftpeer.conf b/src/scripts/vnet/mpls-o-gre/leftpeer.conf
index 149c70c0..149c70c0 100644
--- a/vnet/etc/scripts/mpls-o-gre/leftpeer.conf
+++ b/src/scripts/vnet/mpls-o-gre/leftpeer.conf
diff --git a/vnet/etc/scripts/mpls-o-gre/rightpeer.conf b/src/scripts/vnet/mpls-o-gre/rightpeer.conf
index b5bb597d..b5bb597d 100644
--- a/vnet/etc/scripts/mpls-o-gre/rightpeer.conf
+++ b/src/scripts/vnet/mpls-o-gre/rightpeer.conf
diff --git a/vnet/etc/scripts/mpls-tunnel b/src/scripts/vnet/mpls-tunnel
index d04b2970..d04b2970 100644
--- a/vnet/etc/scripts/mpls-tunnel
+++ b/src/scripts/vnet/mpls-tunnel
diff --git a/vnet/etc/scripts/pcap b/src/scripts/vnet/pcap
index 692e5f27..692e5f27 100644
--- a/vnet/etc/scripts/pcap
+++ b/src/scripts/vnet/pcap
diff --git a/vnet/etc/scripts/probe4 b/src/scripts/vnet/probe4
index b530e0db..b530e0db 100644
--- a/vnet/etc/scripts/probe4
+++ b/src/scripts/vnet/probe4
diff --git a/vnet/etc/scripts/probe6 b/src/scripts/vnet/probe6
index a5490c90..a5490c90 100644
--- a/vnet/etc/scripts/probe6
+++ b/src/scripts/vnet/probe6
diff --git a/vnet/etc/scripts/rewrite b/src/scripts/vnet/rewrite
index d41b9dbf..d41b9dbf 100644
--- a/vnet/etc/scripts/rewrite
+++ b/src/scripts/vnet/rewrite
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf b/src/scripts/vnet/rightpeer/rightpeer-ioam.conf
index 3e9a8d34..3e9a8d34 100644
--- a/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf
+++ b/src/scripts/vnet/rightpeer/rightpeer-ioam.conf
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf b/src/scripts/vnet/rightpeer/rightpeer-l3vxlan.conf
index abba1ab0..abba1ab0 100644
--- a/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf
+++ b/src/scripts/vnet/rightpeer/rightpeer-l3vxlan.conf
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf b/src/scripts/vnet/rightpeer/rightpeer-lisp.conf
index 961204a3..961204a3 100644
--- a/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf
+++ b/src/scripts/vnet/rightpeer/rightpeer-lisp.conf
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf b/src/scripts/vnet/rightpeer/rightpeer-mpls-l2.conf
index 0ce38583..0ce38583 100644
--- a/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf
+++ b/src/scripts/vnet/rightpeer/rightpeer-mpls-l2.conf
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf b/src/scripts/vnet/rightpeer/rightpeer-mpls.conf
index fc97ba16..fc97ba16 100644
--- a/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf
+++ b/src/scripts/vnet/rightpeer/rightpeer-mpls.conf
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-sr.conf b/src/scripts/vnet/rightpeer/rightpeer-sr.conf
index 0b2a98bb..0b2a98bb 100644
--- a/vnet/etc/scripts/rightpeer/rightpeer-sr.conf
+++ b/src/scripts/vnet/rightpeer/rightpeer-sr.conf
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf b/src/scripts/vnet/rightpeer/rightpeer-vxlan.conf
index bd4c427e..bd4c427e 100644
--- a/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf
+++ b/src/scripts/vnet/rightpeer/rightpeer-vxlan.conf
diff --git a/vnet/etc/scripts/rightpeer/rightpeer.script b/src/scripts/vnet/rightpeer/rightpeer.script
index 153988ce..153988ce 100644
--- a/vnet/etc/scripts/rightpeer/rightpeer.script
+++ b/src/scripts/vnet/rightpeer/rightpeer.script
diff --git a/vnet/etc/scripts/rpf b/src/scripts/vnet/rpf
index 571c6b79..571c6b79 100644
--- a/vnet/etc/scripts/rpf
+++ b/src/scripts/vnet/rpf
diff --git a/vnet/etc/scripts/rtt-test b/src/scripts/vnet/rtt-test
index 5501b99d..5501b99d 100644
--- a/vnet/etc/scripts/rtt-test
+++ b/src/scripts/vnet/rtt-test
diff --git a/vnet/etc/scripts/snat b/src/scripts/vnet/snat
index 87fd699e..87fd699e 100644
--- a/vnet/etc/scripts/snat
+++ b/src/scripts/vnet/snat
diff --git a/vnet/etc/scripts/snat_static b/src/scripts/vnet/snat_static
index 8fe48bff..8fe48bff 100644
--- a/vnet/etc/scripts/snat_static
+++ b/src/scripts/vnet/snat_static
diff --git a/vnet/etc/scripts/snat_static_with_port b/src/scripts/vnet/snat_static_with_port
index f646145a..f646145a 100644
--- a/vnet/etc/scripts/snat_static_with_port
+++ b/src/scripts/vnet/snat_static_with_port
diff --git a/vnet/etc/scripts/source_and_port_range_check b/src/scripts/vnet/source_and_port_range_check
index dce227b4..dce227b4 100644
--- a/vnet/etc/scripts/source_and_port_range_check
+++ b/src/scripts/vnet/source_and_port_range_check
diff --git a/vnet/etc/scripts/speed b/src/scripts/vnet/speed
index d60d671f..d60d671f 100644
--- a/vnet/etc/scripts/speed
+++ b/src/scripts/vnet/speed
diff --git a/vnet/etc/scripts/sr/left-linux-ping.sh b/src/scripts/vnet/sr/left-linux-ping.sh
index 55b83506..55b83506 100755
--- a/vnet/etc/scripts/sr/left-linux-ping.sh
+++ b/src/scripts/vnet/sr/left-linux-ping.sh
diff --git a/vnet/etc/scripts/sr/leftpeer.conf b/src/scripts/vnet/sr/leftpeer.conf
index 9591d968..9591d968 100644
--- a/vnet/etc/scripts/sr/leftpeer.conf
+++ b/src/scripts/vnet/sr/leftpeer.conf
diff --git a/vnet/etc/scripts/sr/right-linux-ping.sh b/src/scripts/vnet/sr/right-linux-ping.sh
index 029368db..029368db 100755
--- a/vnet/etc/scripts/sr/right-linux-ping.sh
+++ b/src/scripts/vnet/sr/right-linux-ping.sh
diff --git a/vnet/etc/scripts/sr/rightpeer.conf b/src/scripts/vnet/sr/rightpeer.conf
index 6da7a7af..6da7a7af 100644
--- a/vnet/etc/scripts/sr/rightpeer.conf
+++ b/src/scripts/vnet/sr/rightpeer.conf
diff --git a/vnet/etc/scripts/sr/srlocal.sh b/src/scripts/vnet/sr/srlocal.sh
index 2f568408..2f568408 100755
--- a/vnet/etc/scripts/sr/srlocal.sh
+++ b/src/scripts/vnet/sr/srlocal.sh
diff --git a/vnet/etc/scripts/srp b/src/scripts/vnet/srp
index 7cc37011..7cc37011 100644
--- a/vnet/etc/scripts/srp
+++ b/src/scripts/vnet/srp
diff --git a/vnet/etc/scripts/tcp b/src/scripts/vnet/tcp
index a2ee8b2d..a2ee8b2d 100644
--- a/vnet/etc/scripts/tcp
+++ b/src/scripts/vnet/tcp
diff --git a/vnet/etc/scripts/tcp-test b/src/scripts/vnet/tcp-test
index 52bfbcdd..52bfbcdd 100644
--- a/vnet/etc/scripts/tcp-test
+++ b/src/scripts/vnet/tcp-test
diff --git a/vnet/etc/scripts/tf-ucs-1 b/src/scripts/vnet/tf-ucs-1
index efa5f2dc..efa5f2dc 100644
--- a/vnet/etc/scripts/tf-ucs-1
+++ b/src/scripts/vnet/tf-ucs-1
diff --git a/vnet/etc/scripts/urpf b/src/scripts/vnet/urpf
index a4d87527..a4d87527 100644
--- a/vnet/etc/scripts/urpf
+++ b/src/scripts/vnet/urpf
diff --git a/vnet/etc/scripts/virl/ip6sr.virl b/src/scripts/vnet/virl/ip6sr.virl
index 5d4d1a0a..5d4d1a0a 100644
--- a/vnet/etc/scripts/virl/ip6sr.virl
+++ b/src/scripts/vnet/virl/ip6sr.virl
diff --git a/vnet/etc/scripts/virl/ip6sr_notes.txt b/src/scripts/vnet/virl/ip6sr_notes.txt
index 5febf2c6..5febf2c6 100644
--- a/vnet/etc/scripts/virl/ip6sr_notes.txt
+++ b/src/scripts/vnet/virl/ip6sr_notes.txt
diff --git a/vnet/etc/scripts/virl/mplsogre.virl b/src/scripts/vnet/virl/mplsogre.virl
index 33dd0329..33dd0329 100644
--- a/vnet/etc/scripts/virl/mplsogre.virl
+++ b/src/scripts/vnet/virl/mplsogre.virl
diff --git a/vnet/etc/scripts/virl/simple.virl b/src/scripts/vnet/virl/simple.virl
index 6033c42c..6033c42c 100644
--- a/vnet/etc/scripts/virl/simple.virl
+++ b/src/scripts/vnet/virl/simple.virl
diff --git a/vnet/etc/scripts/vlan b/src/scripts/vnet/vlan
index 076080a6..076080a6 100644
--- a/vnet/etc/scripts/vlan
+++ b/src/scripts/vnet/vlan
diff --git a/vpp-api-test/scripts/vppctl b/src/scripts/vppctl
index 4fdf03c7..4fdf03c7 100755
--- a/vpp-api-test/scripts/vppctl
+++ b/src/scripts/vppctl
diff --git a/build-data/suffix-rules.mk b/src/suffix-rules.mk
index e3eeb922..e3eeb922 100644
--- a/build-data/suffix-rules.mk
+++ b/src/suffix-rules.mk
diff --git a/svm/Makefile.am b/src/svm.am
index 490e27b3..d91eaa27 100644
--- a/svm/Makefile.am
+++ b/src/svm.am
@@ -11,20 +11,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign
+bin_PROGRAMS += svmtool svmdbtool
 
-bin_PROGRAMS = svmtool svmdbtool
+nobase_include_HEADERS += svm/svm.h svm/ssvm.h svm/svmdb.h
 
-AM_CFLAGS = -Wall
+libsvmdir = ${libdir}
+libsvm_LTLIBRARIES = libsvm.la libsvmdb.la
 
-nobase_include_HEADERS = svm.h ssvm.h svmdb.h
+libsvm_la_SOURCES = svm/svm.c svm/ssvm.c
 
-lib_LTLIBRARIES = libsvm.la libsvmdb.la
+svmtool_SOURCES = svm/svmtool.c
+svmtool_LDADD = libsvm.la libvppinfra.la -lpthread -lrt
 
-libsvm_la_SOURCES = svm.c ssvm.c
+libsvmdb_la_SOURCES = svm/svmdb.c
 
-svmtool_LDADD = libsvm.la -lvppinfra -lpthread -lrt
+svmdbtool_SOURCES = svm/svmdbtool.c
+svmdbtool_LDADD = libsvmdb.la libsvm.la libvppinfra.la -lpthread -lrt
 
-libsvmdb_la_SOURCES = svmdb.c
-
-svmdbtool_LDADD = libsvmdb.la libsvm.la -lvppinfra -lpthread -lrt
+# vi:syntax=automake
diff --git a/svm/dir.dox b/src/svm/dir.dox
index 83246979..83246979 100644
--- a/svm/dir.dox
+++ b/src/svm/dir.dox
diff --git a/svm/persist.c b/src/svm/persist.c
index 023c596b..023c596b 100644
--- a/svm/persist.c
+++ b/src/svm/persist.c
diff --git a/svm/ssvm.c b/src/svm/ssvm.c
index 6f409eb6..6f409eb6 100644
--- a/svm/ssvm.c
+++ b/src/svm/ssvm.c
diff --git a/svm/ssvm.h b/src/svm/ssvm.h
index 9e61b9a0..9e61b9a0 100644
--- a/svm/ssvm.h
+++ b/src/svm/ssvm.h
diff --git a/svm/svm.c b/src/svm/svm.c
index e4ca98e1..e4ca98e1 100644
--- a/svm/svm.c
+++ b/src/svm/svm.c
diff --git a/svm/svm.h b/src/svm/svm.h
index 0b87dbcb..0b87dbcb 100644
--- a/svm/svm.h
+++ b/src/svm/svm.h
diff --git a/svm/svm_test.c b/src/svm/svm_test.c
index ab0b9e24..ab0b9e24 100644
--- a/svm/svm_test.c
+++ b/src/svm/svm_test.c
diff --git a/svm/svmdb.c b/src/svm/svmdb.c
index 03dfe7c3..03dfe7c3 100644
--- a/svm/svmdb.c
+++ b/src/svm/svmdb.c
diff --git a/svm/svmdb.h b/src/svm/svmdb.h
index e02628a0..e02628a0 100644
--- a/svm/svmdb.h
+++ b/src/svm/svmdb.h
diff --git a/svm/svmdbtool.c b/src/svm/svmdbtool.c
index a0af15fc..a0af15fc 100644
--- a/svm/svmdbtool.c
+++ b/src/svm/svmdbtool.c
diff --git a/svm/svmtool.c b/src/svm/svmtool.c
index b3195514..b3195514 100644
--- a/svm/svmtool.c
+++ b/src/svm/svmtool.c
diff --git a/vnet/test/README b/src/tests/vnet/README
index 10579e50..10579e50 100644
--- a/vnet/test/README
+++ b/src/tests/vnet/README
diff --git a/vnet/test/lisp-cp/test_cp_serdes.c b/src/tests/vnet/lisp-cp/test_cp_serdes.c
index 5343d0e4..9d51dc8f 100644
--- a/vnet/test/lisp-cp/test_cp_serdes.c
+++ b/src/tests/vnet/lisp-cp/test_cp_serdes.c
@@ -21,6 +21,10 @@
 #include <vlibapi/api.h>
 #include <vnet/lisp-cp/packets.h>
 
+/* FIXME */
+#include <vlibapi/api_helper_macros.h>
+vpe_api_main_t vpe_api_main;
+
 #define _assert(e)                    \
   error = CLIB_ERROR_ASSERT (e);      \
   if (error)                          \
diff --git a/vnet/test/lisp-cp/test_lisp_types.c b/src/tests/vnet/lisp-cp/test_lisp_types.c
index 8aa9d418..5d910f66 100644
--- a/vnet/test/lisp-cp/test_lisp_types.c
+++ b/src/tests/vnet/lisp-cp/test_lisp_types.c
@@ -18,6 +18,10 @@
 #include <vnet/lisp-cp/lisp_types.h>
 #include <vnet/lisp-cp/lisp_cp_messages.h>
 
+/* FIXME */
+#include <vlibapi/api_helper_macros.h>
+vpe_api_main_t vpe_api_main;
+
 #define _assert(e)                    \
   error = CLIB_ERROR_ASSERT (e);      \
   if (error)                          \
diff --git a/vnet/test/lisp-gpe/test.c b/src/tests/vnet/lisp-gpe/test.c
index dde633ae..dde633ae 100644
--- a/vnet/test/lisp-gpe/test.c
+++ b/src/tests/vnet/lisp-gpe/test.c
diff --git a/vppinfra/tools/dir.dox b/src/tools/elftool/dir.dox
index 40426e04..40426e04 100644
--- a/vppinfra/tools/dir.dox
+++ b/src/tools/elftool/dir.dox
diff --git a/vppinfra/tools/elftool.c b/src/tools/elftool/elftool.c
index d9d3704b..d9d3704b 100644
--- a/vppinfra/tools/elftool.c
+++ b/src/tools/elftool/elftool.c
diff --git a/g2/clib.c b/src/tools/g2/clib.c
index d0cd6195..6454c84d 100644
--- a/g2/clib.c
+++ b/src/tools/g2/clib.c
@@ -107,7 +107,7 @@ int read_clib_file(char *clib_file)
         }
         vec_add2(bound_tracks, btp, 1);
         btp->track = track_code;
-        btp->track_str = t->name;
+        btp->track_str = (u8 *) t->name;
         hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
 
         track_strlen = strlen((char *)btp->track_str);
diff --git a/g2/configure.ac b/src/tools/g2/configure.ac
index c8af7747..c8af7747 100644
--- a/g2/configure.ac
+++ b/src/tools/g2/configure.ac
diff --git a/g2/cpel.c b/src/tools/g2/cpel.c
index 8bcc91e6..8bcc91e6 100644
--- a/g2/cpel.c
+++ b/src/tools/g2/cpel.c
diff --git a/g2/cpel.h b/src/tools/g2/cpel.h
index 73e4aea5..73e4aea5 100644
--- a/g2/cpel.h
+++ b/src/tools/g2/cpel.h
diff --git a/g2/events.c b/src/tools/g2/events.c
index d4333bb0..d4333bb0 100644
--- a/g2/events.c
+++ b/src/tools/g2/events.c
diff --git a/g2/g2.h b/src/tools/g2/g2.h
index 1ab42191..1ab42191 100644
--- a/g2/g2.h
+++ b/src/tools/g2/g2.h
diff --git a/g2/g2version.c b/src/tools/g2/g2version.c
index 4b6f9313..4b6f9313 100644
--- a/g2/g2version.c
+++ b/src/tools/g2/g2version.c
diff --git a/g2/main.c b/src/tools/g2/main.c
index a782e17f..a782e17f 100644
--- a/g2/main.c
+++ b/src/tools/g2/main.c
diff --git a/g2/menu1.c b/src/tools/g2/menu1.c
index fce81fa6..fce81fa6 100644
--- a/g2/menu1.c
+++ b/src/tools/g2/menu1.c
diff --git a/g2/mkversion.c b/src/tools/g2/mkversion.c
index 3523fbe6..3523fbe6 100644
--- a/g2/mkversion.c
+++ b/src/tools/g2/mkversion.c
diff --git a/g2/pointsel.c b/src/tools/g2/pointsel.c
index 018dc213..018dc213 100644
--- a/g2/pointsel.c
+++ b/src/tools/g2/pointsel.c
diff --git a/g2/props.c b/src/tools/g2/props.c
index a23dc050..a23dc050 100644
--- a/g2/props.c
+++ b/src/tools/g2/props.c
diff --git a/g2/props.h b/src/tools/g2/props.h
index 6289941d..6289941d 100644
--- a/g2/props.h
+++ b/src/tools/g2/props.h
diff --git a/g2/view1.c b/src/tools/g2/view1.c
index ec394cc3..ec394cc3 100644
--- a/g2/view1.c
+++ b/src/tools/g2/view1.c
diff --git a/perftool/c2cpel.c b/src/tools/perftool/c2cpel.c
index 38e6fe52..38e6fe52 100644
--- a/perftool/c2cpel.c
+++ b/src/tools/perftool/c2cpel.c
diff --git a/perftool/configure.ac b/src/tools/perftool/configure.ac
index f4a98697..f4a98697 100644
--- a/perftool/configure.ac
+++ b/src/tools/perftool/configure.ac
diff --git a/perftool/cpel.h b/src/tools/perftool/cpel.h
index 0bfb1a68..0bfb1a68 100644
--- a/perftool/cpel.h
+++ b/src/tools/perftool/cpel.h
diff --git a/perftool/cpel_util.c b/src/tools/perftool/cpel_util.c
index 7ee9b6e2..7ee9b6e2 100644
--- a/perftool/cpel_util.c
+++ b/src/tools/perftool/cpel_util.c
diff --git a/perftool/cpel_util.h b/src/tools/perftool/cpel_util.h
index b76f7a4b..b76f7a4b 100644
--- a/perftool/cpel_util.h
+++ b/src/tools/perftool/cpel_util.h
diff --git a/perftool/cpelatency.c b/src/tools/perftool/cpelatency.c
index f40a1fb1..7b87d606 100644
--- a/perftool/cpelatency.c
+++ b/src/tools/perftool/cpelatency.c
@@ -618,7 +618,7 @@ int track_compare_name (const void *arg1, const void *arg2)
 
 void sort_state_statistics(sort_t type, FILE *ofp)
 {
-    int (*compare)(const void *, const void *);
+    int (*compare)(const void *, const void *) = 0;
 
     if (summary_stats_only)
         return;
diff --git a/perftool/cpeldump.c b/src/tools/perftool/cpeldump.c
index 9011bd03..9011bd03 100644
--- a/perftool/cpeldump.c
+++ b/src/tools/perftool/cpeldump.c
diff --git a/perftool/cpelinreg.c b/src/tools/perftool/cpelinreg.c
index 115afad7..115afad7 100644
--- a/perftool/cpelinreg.c
+++ b/src/tools/perftool/cpelinreg.c
diff --git a/perftool/cpelstate.c b/src/tools/perftool/cpelstate.c
index 3fd9ccb9..3fd9ccb9 100644
--- a/perftool/cpelstate.c
+++ b/src/tools/perftool/cpelstate.c
diff --git a/perftool/delsvec.c b/src/tools/perftool/delsvec.c
index 724935d3..724935d3 100644
--- a/perftool/delsvec.c
+++ b/src/tools/perftool/delsvec.c
diff --git a/perftool/linreg.c b/src/tools/perftool/linreg.c
index 084091bb..084091bb 100644
--- a/perftool/linreg.c
+++ b/src/tools/perftool/linreg.c
diff --git a/perftool/new.cpel b/src/tools/perftool/new.cpel
index b0f35958..b0f35958 100644
--- a/perftool/new.cpel
+++ b/src/tools/perftool/new.cpel
diff --git a/perftool/new.elog b/src/tools/perftool/new.elog
index 2d99bb16..2d99bb16 100644
--- a/perftool/new.elog
+++ b/src/tools/perftool/new.elog
diff --git a/perftool/props.c b/src/tools/perftool/props.c
index 84af5b1c..84af5b1c 100644
--- a/perftool/props.c
+++ b/src/tools/perftool/props.c
diff --git a/vppapigen/configure.ac b/src/tools/vppapigen/configure.ac
index 16ad59d2..16ad59d2 100644
--- a/vppapigen/configure.ac
+++ b/src/tools/vppapigen/configure.ac
diff --git a/vppapigen/gram.y b/src/tools/vppapigen/gram.y
index de26af8d..de26af8d 100644
--- a/vppapigen/gram.y
+++ b/src/tools/vppapigen/gram.y
diff --git a/vppapigen/lex.c b/src/tools/vppapigen/lex.c
index e807d46b..733942ad 100644
--- a/vppapigen/lex.c
+++ b/src/tools/vppapigen/lex.c
@@ -26,7 +26,7 @@
 
 #include "lex.h"
 #include "node.h"
-#include "gram.h"
+#include "tools/vppapigen/gram.h"
 
 FILE *ifp, *ofp, *pythonfp, *jsonfp;
 char *vlib_app_name = "vpp";
diff --git a/vppapigen/lex.h b/src/tools/vppapigen/lex.h
index e9b0954c..a0fdc735 100644
--- a/vppapigen/lex.h
+++ b/src/tools/vppapigen/lex.h
@@ -29,7 +29,7 @@ extern int yyparse (void);
 #define YYSTYPE void *
 #endif
 
-#include "gram.h"
+#include "tools/vppapigen/gram.h"
 
 enum lex_state {
     START_STATE = 1,
diff --git a/vppapigen/node.c b/src/tools/vppapigen/node.c
index abb909a1..260c6f2e 100644
--- a/vppapigen/node.c
+++ b/src/tools/vppapigen/node.c
@@ -344,7 +344,7 @@ void node_define_print (node_t *this)
 
 void node_define_generate (node_t *this, enum passid which, FILE *fp)
 {
-    node_t *child, *save_child;
+    node_t *child;
 
     switch(which) {
     case TYPEDEF_PASS:
@@ -945,10 +945,6 @@ YYSTYPE add_defbody (YYSTYPE a1, YYSTYPE a2)
 
 YYSTYPE add_primtype (YYSTYPE a1, YYSTYPE a2, YYSTYPE a3)
 {
-    node_t *np1;
-
-    np1 = (node_t *)a1;
-    
     /* Hook instance to type node */
     deeper (a1, a2);
     if (a3) {
diff --git a/vppapigen/node.h b/src/tools/vppapigen/node.h
index 297d6036..297d6036 100644
--- a/vppapigen/node.h
+++ b/src/tools/vppapigen/node.h
diff --git a/vpp-api-test/vat/api_format.c b/src/vat/api_format.c
index a864ab23..e6c0f244 100644
--- a/vpp-api-test/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -17,7 +17,7 @@
  *------------------------------------------------------------------
  */
 
-#include "vat.h"
+#include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 #include <vlibsocket/api.h>
@@ -30,7 +30,7 @@
 #include <vnet/vxlan-gpe/vxlan_gpe.h>
 #include <vnet/lisp-gpe/lisp_gpe.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 #include <vnet/l2/l2_classify.h>
 #include <vnet/l2/l2_vtr.h>
 #include <vnet/classify/input_acl.h>
@@ -49,23 +49,25 @@
 #include <vnet/policer/policer.h>
 #include <vnet/policer/police.h>
 
+#include "vat/json_format.h"
+
 #include <inttypes.h>
 #include <sys/stat.h>
 
 #define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 /* declare message handlers for each api */
 
 #define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 /* instantiate all the print functions we know about */
 #define vl_print(handle, ...)
 #define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 
 static uword
diff --git a/vpp-api-test/vat/json_format.c b/src/vat/json_format.c
index 6f316d97..6f316d97 100644
--- a/vpp-api-test/vat/json_format.c
+++ b/src/vat/json_format.c
diff --git a/vpp-api-test/vat/json_format.h b/src/vat/json_format.h
index 154fb3df..154fb3df 100644
--- a/vpp-api-test/vat/json_format.h
+++ b/src/vat/json_format.h
diff --git a/vpp-api-test/vat/json_test.c b/src/vat/json_test.c
index 46261694..46261694 100644
--- a/vpp-api-test/vat/json_test.c
+++ b/src/vat/json_test.c
diff --git a/vpp-api-test/vat/main.c b/src/vat/main.c
index 34492e2b..e01d15ec 100644
--- a/vpp-api-test/vat/main.c
+++ b/src/vat/main.c
@@ -18,6 +18,9 @@
 
 vat_main_t vat_main;
 
+#include <vlibapi/api_helper_macros.h>
+vpe_api_main_t vpe_api_main;
+
 void
 vat_suspend (vlib_main_t * vm, f64 interval)
 {
diff --git a/vpp-api-test/vat/plugin.c b/src/vat/plugin.c
index c1cc928c..c1cc928c 100644
--- a/vpp-api-test/vat/plugin.c
+++ b/src/vat/plugin.c
diff --git a/vpp-api-test/vat/plugin.h b/src/vat/plugin.h
index 559ec52f..559ec52f 100644
--- a/vpp-api-test/vat/plugin.h
+++ b/src/vat/plugin.h
diff --git a/vpp-api-test/vat/plugin_api.c b/src/vat/plugin_api.c
index 4e1eb897..4e1eb897 100644
--- a/vpp-api-test/vat/plugin_api.c
+++ b/src/vat/plugin_api.c
diff --git a/vpp-api-test/vat/restart.c b/src/vat/restart.c
index adc63f84..adeee000 100644
--- a/vpp-api-test/vat/restart.c
+++ b/src/vat/restart.c
@@ -23,7 +23,7 @@
 #include <vppinfra/clib.h>
 #include <vppinfra/vec.h>
 #include <vppinfra/hash.h>
-#include <svmdb.h>
+#include <svm/svmdb.h>
 #include <vppinfra/format.h>
 #include <vppinfra/error.h>
 #include <vppinfra/time.h>
diff --git a/vpp-api-test/vat/vat.h b/src/vat/vat.h
index 01f75513..64be2f7f 100644
--- a/vpp-api-test/vat/vat.h
+++ b/src/vat/vat.h
@@ -28,7 +28,7 @@
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 
-#include "json_format.h"
+#include "vat/json_format.h"
 
 #include <vlib/vlib.h>
 
diff --git a/vlib-api/Makefile.am b/src/vlib-api.am
index d9f4a27b..80eb760d 100644
--- a/vlib-api/Makefile.am
+++ b/src/vlib-api.am
@@ -11,12 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-
-lib_LTLIBRARIES = libvlibapi.la libvlibmemory.la libvlibmemoryclient.la \
-	          libvlibsocket.la
+lib_LTLIBRARIES += libvlibapi.la libvlibmemory.la libvlibmemoryclient.la \
+	           libvlibsocket.la
 
 libvlibapi_la_SOURCES = 			\
 	vlibapi/api.h				\
@@ -24,7 +20,7 @@ libvlibapi_la_SOURCES = 			\
 	vlibapi/api_shared.c			\
 	vlibapi/node_serialize.c
 
-nobase_include_HEADERS = vlibapi/api.h vlibapi/api_helper_macros.h
+nobase_include_HEADERS += vlibapi/api.h vlibapi/api_helper_macros.h
 
 libvlibmemory_la_SOURCES =			\
 	vlibmemory/api.h			\
@@ -34,7 +30,7 @@ libvlibmemory_la_SOURCES =			\
 	vlibmemory/vl_memory_api_h.h		\
 	vlibmemory/vl_memory_msg_enum.h		\
 	vlibmemory/unix_shared_memory_queue.c	\
-	vlibmemory/unix_shared_memory_queue.h 
+	vlibmemory/unix_shared_memory_queue.h
 
 libvlibmemoryclient_la_SOURCES = 		\
 	vlibmemory/api.h			\
@@ -44,7 +40,7 @@ libvlibmemoryclient_la_SOURCES = 		\
 	vlibmemory/vl_memory_api_h.h		\
 	vlibmemory/vl_memory_msg_enum.h		\
 	vlibmemory/unix_shared_memory_queue.c	\
-	vlibmemory/unix_shared_memory_queue.h 
+	vlibmemory/unix_shared_memory_queue.h
 
 nobase_include_HEADERS +=			\
 	vlibmemory/api.h			\
@@ -67,18 +63,11 @@ nobase_include_HEADERS +=			\
 	vlibsocket/vl_socket_msg_enum.h		\
 	vlibsocket/sockclnt.api.h
 
-BUILT_SOURCES =					\
+BUILT_SOURCES +=					\
 	vlibsocket/sockclnt.api.h		\
 	vlibmemory/memclnt.api.h		\
 	vlibmemory/memclnt.api.json
 
-SUFFIXES = .api.h .api .api.json
-
-# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk
-# and requires a symbolic link at the top of the vnet source tree
-
-include $(top_srcdir)/suffix-rules.mk
+API_FILES += vlibmemory/memclnt.api
 
-# install the API definition, so we can produce java bindings, etc.
-apidir = $(prefix)/vlibmemory
-api_DATA = vlibmemory/memclnt.api.json
+# vi:syntax=automake
diff --git a/vlib/Makefile.am b/src/vlib.am
index 3da0a3ab..2464076f 100644
--- a/vlib/Makefile.am
+++ b/src/vlib.am
@@ -11,18 +11,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall @DPDK@
+libvlibdir = ${libdir}
+libvlib_LTLIBRARIES = libvlib.la
+libvlib_la_LIBAD = libvppinfra.la
 
-PRE_DATA_SIZE=@PRE_DATA_SIZE@
-
-lib_LTLIBRARIES = libvlib.la
-
-BUILT_SOURCES = vlib/config.h
+BUILT_SOURCES += vlib/config.h
 
 vlib/config.h:
-	echo "#define __PRE_DATA_SIZE" $(PRE_DATA_SIZE) > $@
+	echo "#define __PRE_DATA_SIZE" @PRE_DATA_SIZE@ > $@
 
 libvlib_la_SOURCES =				\
   vlib/buffer.c					\
@@ -45,7 +42,7 @@ libvlib_la_SOURCES =				\
   vlib/threads_cli.c				\
   vlib/trace.c
 
-nobase_include_HEADERS =			\
+nobase_include_HEADERS +=			\
   vlib/buffer_funcs.h				\
   vlib/buffer_node.h				\
   vlib/buffer.h					\
@@ -72,7 +69,7 @@ nobase_include_HEADERS =			\
   vlib/trace.h					\
   vlib/vlib.h
 
-lib_LTLIBRARIES += libvlib_unix.la
+libvlib_LTLIBRARIES += libvlib_unix.la
 
 libvlib_unix_la_SOURCES =			\
   vlib/unix/cj.c				\
@@ -93,12 +90,14 @@ nobase_include_HEADERS +=			\
   vlib/unix/unix.h
     
 if !WITH_DPDK
-noinst_PROGRAMS = vlib_unix 
+noinst_PROGRAMS += vlib_unix
 
 vlib_unix_SOURCES =				\
-  example/main_stub.c				\
-  example/mc_test.c
+  examples/vlib/main_stub.c			\
+  examples/vlib/mc_test.c
 
 vlib_unix_LDADD = libvlib_unix.la libvlib.la \
-	          -lvppinfra -lpthread -lm -ldl -lrt
+	          libvppinfra.la -lpthread -lm -ldl -lrt
 endif
+
+# vi:syntax=automake
diff --git a/vlib/vlib/buffer.c b/src/vlib/buffer.c
index 4bf6d125..4bf6d125 100644
--- a/vlib/vlib/buffer.c
+++ b/src/vlib/buffer.c
diff --git a/vlib/vlib/buffer.h b/src/vlib/buffer.h
index 5f1e62f0..5f1e62f0 100644
--- a/vlib/vlib/buffer.h
+++ b/src/vlib/buffer.h
diff --git a/vlib/vlib/buffer_funcs.h b/src/vlib/buffer_funcs.h
index 75716eca..75716eca 100644
--- a/vlib/vlib/buffer_funcs.h
+++ b/src/vlib/buffer_funcs.h
diff --git a/vlib/vlib/buffer_node.h b/src/vlib/buffer_node.h
index 8a779049..8a779049 100644
--- a/vlib/vlib/buffer_node.h
+++ b/src/vlib/buffer_node.h
diff --git a/vlib/vlib/cli.c b/src/vlib/cli.c
index 2d141115..2d141115 100644
--- a/vlib/vlib/cli.c
+++ b/src/vlib/cli.c
diff --git a/vlib/vlib/cli.h b/src/vlib/cli.h
index 009c7e82..009c7e82 100644
--- a/vlib/vlib/cli.h
+++ b/src/vlib/cli.h
diff --git a/vlib/vlib/cli_funcs.h b/src/vlib/cli_funcs.h
index 78aef73b..78aef73b 100644
--- a/vlib/vlib/cli_funcs.h
+++ b/src/vlib/cli_funcs.h
diff --git a/vlib/vlib/counter.c b/src/vlib/counter.c
index 9f66e04d..9f66e04d 100644
--- a/vlib/vlib/counter.c
+++ b/src/vlib/counter.c
diff --git a/vlib/vlib/counter.h b/src/vlib/counter.h
index a7903206..a7903206 100644
--- a/vlib/vlib/counter.h
+++ b/src/vlib/counter.h
diff --git a/vlib/vlib/defs.h b/src/vlib/defs.h
index ad58bc04..ad58bc04 100644
--- a/vlib/vlib/defs.h
+++ b/src/vlib/defs.h
diff --git a/vlib/vlib/dir.dox b/src/vlib/dir.dox
index 4806e7a9..4806e7a9 100644
--- a/vlib/vlib/dir.dox
+++ b/src/vlib/dir.dox
diff --git a/vlib/vlib/elog_samples.c b/src/vlib/elog_samples.c
index a8c800df..a8c800df 100644
--- a/vlib/vlib/elog_samples.c
+++ b/src/vlib/elog_samples.c
diff --git a/vlib/vlib/error.c b/src/vlib/error.c
index a2c23176..a2c23176 100644
--- a/vlib/vlib/error.c
+++ b/src/vlib/error.c
diff --git a/vlib/vlib/error.h b/src/vlib/error.h
index df2075c3..df2075c3 100644
--- a/vlib/vlib/error.h
+++ b/src/vlib/error.h
diff --git a/vlib/vlib/error_funcs.h b/src/vlib/error_funcs.h
index 1a3602e9..1a3602e9 100644
--- a/vlib/vlib/error_funcs.h
+++ b/src/vlib/error_funcs.h
diff --git a/vlib/vlib/format.c b/src/vlib/format.c
index 79a4d686..79a4d686 100644
--- a/vlib/vlib/format.c
+++ b/src/vlib/format.c
diff --git a/vlib/vlib/format_funcs.h b/src/vlib/format_funcs.h
index f60b8940..f60b8940 100644
--- a/vlib/vlib/format_funcs.h
+++ b/src/vlib/format_funcs.h
diff --git a/vlib/vlib/global_funcs.h b/src/vlib/global_funcs.h
index bbdbdef5..bbdbdef5 100644
--- a/vlib/vlib/global_funcs.h
+++ b/src/vlib/global_funcs.h
diff --git a/vlib/vlib/i2c.c b/src/vlib/i2c.c
index 97f5bb21..97f5bb21 100644
--- a/vlib/vlib/i2c.c
+++ b/src/vlib/i2c.c
diff --git a/vlib/vlib/i2c.h b/src/vlib/i2c.h
index b79bdc75..b79bdc75 100644
--- a/vlib/vlib/i2c.h
+++ b/src/vlib/i2c.h
diff --git a/vlib/vlib/init.c b/src/vlib/init.c
index 8d478451..8d478451 100644
--- a/vlib/vlib/init.c
+++ b/src/vlib/init.c
diff --git a/vlib/vlib/init.h b/src/vlib/init.h
index 4fa5b304..4fa5b304 100644
--- a/vlib/vlib/init.h
+++ b/src/vlib/init.h
diff --git a/vlib/vlib/lex.c b/src/vlib/lex.c
index 1cc8f167..1cc8f167 100644
--- a/vlib/vlib/lex.c
+++ b/src/vlib/lex.c
diff --git a/vlib/vlib/lex.h b/src/vlib/lex.h
index 4ae58f46..4ae58f46 100644
--- a/vlib/vlib/lex.h
+++ b/src/vlib/lex.h
diff --git a/vlib/vlib/main.c b/src/vlib/main.c
index 6c6cad98..6c6cad98 100644
--- a/vlib/vlib/main.c
+++ b/src/vlib/main.c
diff --git a/vlib/vlib/main.h b/src/vlib/main.h
index d9ac1445..d9ac1445 100644
--- a/vlib/vlib/main.h
+++ b/src/vlib/main.h
diff --git a/vlib/vlib/mc.c b/src/vlib/mc.c
index 8fde0913..8fde0913 100644
--- a/vlib/vlib/mc.c
+++ b/src/vlib/mc.c
diff --git a/vlib/vlib/mc.h b/src/vlib/mc.h
index dc95b0e9..dc95b0e9 100644
--- a/vlib/vlib/mc.h
+++ b/src/vlib/mc.h
diff --git a/vlib/vlib/node.c b/src/vlib/node.c
index c419a13a..c419a13a 100644
--- a/vlib/vlib/node.c
+++ b/src/vlib/node.c
diff --git a/vlib/vlib/node.h b/src/vlib/node.h
index b624e9d6..b624e9d6 100644
--- a/vlib/vlib/node.h
+++ b/src/vlib/node.h
diff --git a/vlib/vlib/node_cli.c b/src/vlib/node_cli.c
index 05d0f0b5..05d0f0b5 100644
--- a/vlib/vlib/node_cli.c
+++ b/src/vlib/node_cli.c
diff --git a/vlib/vlib/node_format.c b/src/vlib/node_format.c
index e9dde40f..e9dde40f 100644
--- a/vlib/vlib/node_format.c
+++ b/src/vlib/node_format.c
diff --git a/vlib/vlib/node_funcs.h b/src/vlib/node_funcs.h
index 21167396..21167396 100644
--- a/vlib/vlib/node_funcs.h
+++ b/src/vlib/node_funcs.h
diff --git a/vlib/vlib/parse.c b/src/vlib/parse.c
index 1c4500ce..1c4500ce 100644
--- a/vlib/vlib/parse.c
+++ b/src/vlib/parse.c
diff --git a/vlib/vlib/parse.h b/src/vlib/parse.h
index 036e7447..036e7447 100644
--- a/vlib/vlib/parse.h
+++ b/src/vlib/parse.h
diff --git a/vlib/vlib/parse_builtin.c b/src/vlib/parse_builtin.c
index 0ce716b5..0ce716b5 100644
--- a/vlib/vlib/parse_builtin.c
+++ b/src/vlib/parse_builtin.c
diff --git a/vlib/vlib/pci/linux_pci.c b/src/vlib/pci/linux_pci.c
index f9ee47ac..f9ee47ac 100644
--- a/vlib/vlib/pci/linux_pci.c
+++ b/src/vlib/pci/linux_pci.c
diff --git a/vlib/vlib/pci/pci.c b/src/vlib/pci/pci.c
index 7100064d..7100064d 100644
--- a/vlib/vlib/pci/pci.c
+++ b/src/vlib/pci/pci.c
diff --git a/vlib/vlib/pci/pci.h b/src/vlib/pci/pci.h
index 811a6ff2..811a6ff2 100644
--- a/vlib/vlib/pci/pci.h
+++ b/src/vlib/pci/pci.h
diff --git a/vlib/vlib/pci/pci_config.h b/src/vlib/pci/pci_config.h
index 92e56af6..92e56af6 100644
--- a/vlib/vlib/pci/pci_config.h
+++ b/src/vlib/pci/pci_config.h
diff --git a/vlib/vlib/physmem.h b/src/vlib/physmem.h
index 9e7d52a6..9e7d52a6 100644
--- a/vlib/vlib/physmem.h
+++ b/src/vlib/physmem.h
diff --git a/vlib/vlib/threads.c b/src/vlib/threads.c
index c5e58bc0..c5e58bc0 100644
--- a/vlib/vlib/threads.c
+++ b/src/vlib/threads.c
diff --git a/vlib/vlib/threads.h b/src/vlib/threads.h
index 34ab5be8..34ab5be8 100644
--- a/vlib/vlib/threads.h
+++ b/src/vlib/threads.h
diff --git a/vlib/vlib/threads_cli.c b/src/vlib/threads_cli.c
index ee632279..ee632279 100644
--- a/vlib/vlib/threads_cli.c
+++ b/src/vlib/threads_cli.c
diff --git a/vlib/vlib/trace.c b/src/vlib/trace.c
index dcdb837f..dcdb837f 100644
--- a/vlib/vlib/trace.c
+++ b/src/vlib/trace.c
diff --git a/vlib/vlib/trace.h b/src/vlib/trace.h
index fc0fc5c8..fc0fc5c8 100644
--- a/vlib/vlib/trace.h
+++ b/src/vlib/trace.h
diff --git a/vlib/vlib/trace_funcs.h b/src/vlib/trace_funcs.h
index 5280eae9..5280eae9 100644
--- a/vlib/vlib/trace_funcs.h
+++ b/src/vlib/trace_funcs.h
diff --git a/vlib/vlib/unix/cj.c b/src/vlib/unix/cj.c
index 33ba163a..33ba163a 100644
--- a/vlib/vlib/unix/cj.c
+++ b/src/vlib/unix/cj.c
diff --git a/vlib/vlib/unix/cj.h b/src/vlib/unix/cj.h
index 67626afe..67626afe 100644
--- a/vlib/vlib/unix/cj.h
+++ b/src/vlib/unix/cj.h
diff --git a/vlib/vlib/unix/cli.c b/src/vlib/unix/cli.c
index 69fca6ec..69fca6ec 100644
--- a/vlib/vlib/unix/cli.c
+++ b/src/vlib/unix/cli.c
diff --git a/vlib/vlib/unix/dir.dox b/src/vlib/unix/dir.dox
index 1380fa56..1380fa56 100644
--- a/vlib/vlib/unix/dir.dox
+++ b/src/vlib/unix/dir.dox
diff --git a/vlib/vlib/unix/input.c b/src/vlib/unix/input.c
index 07096ed2..07096ed2 100644
--- a/vlib/vlib/unix/input.c
+++ b/src/vlib/unix/input.c
diff --git a/vlib/vlib/unix/main.c b/src/vlib/unix/main.c
index 562778e0..562778e0 100644
--- a/vlib/vlib/unix/main.c
+++ b/src/vlib/unix/main.c
diff --git a/vlib/vlib/unix/mc_socket.c b/src/vlib/unix/mc_socket.c
index 9c12ad3b..9c12ad3b 100644
--- a/vlib/vlib/unix/mc_socket.c
+++ b/src/vlib/unix/mc_socket.c
diff --git a/vlib/vlib/unix/mc_socket.h b/src/vlib/unix/mc_socket.h
index 273c9ad4..273c9ad4 100644
--- a/vlib/vlib/unix/mc_socket.h
+++ b/src/vlib/unix/mc_socket.h
diff --git a/vlib/vlib/unix/physmem.c b/src/vlib/unix/physmem.c
index 80ab7b9d..80ab7b9d 100644
--- a/vlib/vlib/unix/physmem.c
+++ b/src/vlib/unix/physmem.c
diff --git a/vlib/vlib/unix/physmem.h b/src/vlib/unix/physmem.h
index 5519a7d6..5519a7d6 100644
--- a/vlib/vlib/unix/physmem.h
+++ b/src/vlib/unix/physmem.h
diff --git a/vlib/vlib/unix/plugin.c b/src/vlib/unix/plugin.c
index b3d5be02..b3d5be02 100644
--- a/vlib/vlib/unix/plugin.c
+++ b/src/vlib/unix/plugin.c
diff --git a/vlib/vlib/unix/plugin.h b/src/vlib/unix/plugin.h
index c17053bd..c17053bd 100644
--- a/vlib/vlib/unix/plugin.h
+++ b/src/vlib/unix/plugin.h
diff --git a/vlib/vlib/unix/unix.h b/src/vlib/unix/unix.h
index ea0d417b..ea0d417b 100644
--- a/vlib/vlib/unix/unix.h
+++ b/src/vlib/unix/unix.h
diff --git a/vlib/vlib/unix/util.c b/src/vlib/unix/util.c
index edc3e591..edc3e591 100644
--- a/vlib/vlib/unix/util.c
+++ b/src/vlib/unix/util.c
diff --git a/vlib/vlib/vlib.h b/src/vlib/vlib.h
index b146a49b..b146a49b 100644
--- a/vlib/vlib/vlib.h
+++ b/src/vlib/vlib.h
diff --git a/vlib/vlib/vlib_process_doc.h b/src/vlib/vlib_process_doc.h
index a47c5e4b..a47c5e4b 100644
--- a/vlib/vlib/vlib_process_doc.h
+++ b/src/vlib/vlib_process_doc.h
diff --git a/vlib-api/vlibapi/api.h b/src/vlibapi/api.h
index 62745335..970a0ee0 100644
--- a/vlib-api/vlibapi/api.h
+++ b/src/vlibapi/api.h
@@ -21,7 +21,7 @@
 #define included_api_h
 
 #include <vppinfra/error.h>
-#include <svm.h>
+#include <svm/svm.h>
 #include <vlib/vlib.h>
 #include <vlibmemory/unix_shared_memory_queue.h>
 #include <vlib/unix/unix.h>
diff --git a/vlib-api/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h
index 16f34cfc..16f34cfc 100644
--- a/vlib-api/vlibapi/api_helper_macros.h
+++ b/src/vlibapi/api_helper_macros.h
diff --git a/vlib-api/vlibapi/api_shared.c b/src/vlibapi/api_shared.c
index 6a04fac9..6a04fac9 100644
--- a/vlib-api/vlibapi/api_shared.c
+++ b/src/vlibapi/api_shared.c
diff --git a/vlib-api/vlibapi/node_serialize.c b/src/vlibapi/node_serialize.c
index 4dc1a7d2..4dc1a7d2 100644
--- a/vlib-api/vlibapi/node_serialize.c
+++ b/src/vlibapi/node_serialize.c
diff --git a/vlib-api/vlibmemory/api.h b/src/vlibmemory/api.h
index f1f8bb73..54a0a001 100644
--- a/vlib-api/vlibmemory/api.h
+++ b/src/vlibmemory/api.h
@@ -21,7 +21,7 @@
 #define included_vlibmemory_api_h
 
 #include <vppinfra/error.h>
-#include <svm.h>
+#include <svm/svm.h>
 #include <vlib/vlib.h>
 #include <vlibmemory/unix_shared_memory_queue.h>
 #include <vlib/unix/unix.h>
diff --git a/vlib-api/vlibmemory/memclnt.api b/src/vlibmemory/memclnt.api
index 2f654caf..2f654caf 100644
--- a/vlib-api/vlibmemory/memclnt.api
+++ b/src/vlibmemory/memclnt.api
diff --git a/vlib-api/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c
index 234a0a5a..234a0a5a 100644
--- a/vlib-api/vlibmemory/memory_client.c
+++ b/src/vlibmemory/memory_client.c
diff --git a/vlib-api/vlibmemory/memory_shared.c b/src/vlibmemory/memory_shared.c
index d8d32004..d8d32004 100644
--- a/vlib-api/vlibmemory/memory_shared.c
+++ b/src/vlibmemory/memory_shared.c
diff --git a/vlib-api/vlibmemory/memory_vlib.c b/src/vlibmemory/memory_vlib.c
index 1d40bcb7..1d40bcb7 100644
--- a/vlib-api/vlibmemory/memory_vlib.c
+++ b/src/vlibmemory/memory_vlib.c
diff --git a/vlib-api/vlibmemory/unix_shared_memory_queue.c b/src/vlibmemory/unix_shared_memory_queue.c
index 25d28910..25d28910 100644
--- a/vlib-api/vlibmemory/unix_shared_memory_queue.c
+++ b/src/vlibmemory/unix_shared_memory_queue.c
diff --git a/vlib-api/vlibmemory/unix_shared_memory_queue.h b/src/vlibmemory/unix_shared_memory_queue.h
index f758f17c..f758f17c 100644
--- a/vlib-api/vlibmemory/unix_shared_memory_queue.h
+++ b/src/vlibmemory/unix_shared_memory_queue.h
diff --git a/vlib-api/vlibmemory/vl_memory_api_h.h b/src/vlibmemory/vl_memory_api_h.h
index c1ae79b1..c1ae79b1 100644
--- a/vlib-api/vlibmemory/vl_memory_api_h.h
+++ b/src/vlibmemory/vl_memory_api_h.h
diff --git a/vlib-api/vlibmemory/vl_memory_msg_enum.h b/src/vlibmemory/vl_memory_msg_enum.h
index 974c0c21..974c0c21 100644
--- a/vlib-api/vlibmemory/vl_memory_msg_enum.h
+++ b/src/vlibmemory/vl_memory_msg_enum.h
diff --git a/vlib-api/vlibsocket/api.h b/src/vlibsocket/api.h
index 79c0d08a..79c0d08a 100644
--- a/vlib-api/vlibsocket/api.h
+++ b/src/vlibsocket/api.h
diff --git a/vlib-api/vlibsocket/sock_test.c b/src/vlibsocket/sock_test.c
index 3bded08f..3bded08f 100644
--- a/vlib-api/vlibsocket/sock_test.c
+++ b/src/vlibsocket/sock_test.c
diff --git a/vlib-api/vlibsocket/sockclnt.api b/src/vlibsocket/sockclnt.api
index e0a7505f..e0a7505f 100644
--- a/vlib-api/vlibsocket/sockclnt.api
+++ b/src/vlibsocket/sockclnt.api
diff --git a/vlib-api/vlibsocket/sockclnt_vlib.c b/src/vlibsocket/sockclnt_vlib.c
index e16adfeb..e16adfeb 100644
--- a/vlib-api/vlibsocket/sockclnt_vlib.c
+++ b/src/vlibsocket/sockclnt_vlib.c
diff --git a/vlib-api/vlibsocket/socksvr_vlib.c b/src/vlibsocket/socksvr_vlib.c
index dc8c63eb..dc8c63eb 100644
--- a/vlib-api/vlibsocket/socksvr_vlib.c
+++ b/src/vlibsocket/socksvr_vlib.c
diff --git a/vlib-api/vlibsocket/vl_socket_api_h.h b/src/vlibsocket/vl_socket_api_h.h
index 7fc53cef..7fc53cef 100644
--- a/vlib-api/vlibsocket/vl_socket_api_h.h
+++ b/src/vlibsocket/vl_socket_api_h.h
diff --git a/vlib-api/vlibsocket/vl_socket_msg_enum.h b/src/vlibsocket/vl_socket_msg_enum.h
index cdc61a5b..cdc61a5b 100644
--- a/vlib-api/vlibsocket/vl_socket_msg_enum.h
+++ b/src/vlibsocket/vl_socket_msg_enum.h
diff --git a/vnet/Makefile.am b/src/vnet.am
index adc9043a..03233487 100644
--- a/vnet/Makefile.am
+++ b/src/vnet.am
@@ -11,22 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall -Werror @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @IPV6SR@
-
-API_FILES =
-
 libvnet_la_SOURCES =
 libvnetplugin_la_SOURCES =
-nobase_include_HEADERS =
-noinst_PROGRAMS =
-TESTS =
 
-dpdk_libs =
-if WITH_DPDK
-dpdk_libs += -l:libdpdk.a
-endif
+libvnet_la_LIBAD = libvppinfra.la libvlib.la libsvm.la
 
 ########################################
 # Generic stuff
@@ -451,7 +439,7 @@ test_map_SOURCES =                             \
  vnet/map/test.c
 test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 
-test_map_LDADD = libvnet.la -lvppinfra -lvlib	\
+test_map_LDADD = libvnet.la libvppinfra.la libvlib.la	\
   -lpthread -lvlibmemory -lvlibapi -lvlib_unix	\
   -ldl -lsvm -lrt
 
@@ -574,30 +562,37 @@ nobase_include_HEADERS +=			\
 API_FILES += vnet/lisp-cp/lisp.api
 
 if ENABLE_TESTS
-LDS = -lvppinfra -l:libvlib.a $(dpdk_libs) -l:libvlibmemory.a \
-	-l:libvlibapi.a -l:libsvm.a -lpthread -ldl -lrt -lm -l:libvlib_unix.a
+LDS = \
+  libvppinfra.la \
+  libvnet.la \
+  libvlib.la  \
+  libvlib_unix.la \
+  libsvm.la \
+  libsvmdb.la \
+  libvlibapi.la \
+  libvlibmemory.la \
+  -lpthread -ldl -lrt -lm -lcrypto
 
 TESTS += test_cp_serdes test_lisp_types
 
 test_cp_serdes_SOURCES =			\
- test/lisp-cp/test_cp_serdes.c			\
+ tests/vnet/lisp-cp/test_cp_serdes.c		\
  vnet/lisp-cp/lisp_msg_serdes.c			\
  vnet/lisp-cp/lisp_types.c			\
  vnet/lisp-cp/packets.c				\
  vnet/ip/ip_checksum.c
 
 test_lisp_types_SOURCES =			\
- test/lisp-cp/test_lisp_types.c			\
+ tests/vnet/lisp-cp/test_lisp_types.c		\
  vnet/lisp-cp/lisp_types.c
 
 test_cp_serdes_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_lisp_types_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 
-test_cp_serdes_LDADD = libvnet.la $(LDS)
-test_lisp_types_LDADD = libvnet.la $(LDS)
-
-test_cp_serdes_LDFLAGS = -static
-test_lisp_types_LDFLAGS = -static
+test_cp_serdes_LDFLAGS = $(DPDK_LD_FLAGS)
+test_cp_serdes_LDADD = $(LDS) $(DPDK_LD_ADD)
+test_lisp_types_LDFLAGS = $(DPDK_LD_FLAGS)
+test_lisp_types_LDADD = $(LDS) $(DPDK_LD_ADD)
 endif
 
 ########################################
@@ -628,14 +623,14 @@ API_FILES += vnet/lisp-gpe/lisp_gpe.api
 if ENABLE_TESTS
 TESTS += test_test
 
-test_test_SOURCES = test/lisp-gpe/test.c
+test_test_SOURCES = tests/vnet/lisp-gpe/test.c
 
 test_test_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 
 test_test_LDADD = $(LIBOBJS)
 
 noinst_PROGRAMS += $(TESTS)
-check_PROGRAMS = $(TESTS)
+check_PROGRAMS += $(TESTS)
 endif
 
 ########################################
@@ -962,32 +957,16 @@ libvnetplugin_la_SOURCES +=                    \
 nobase_include_HEADERS +=                      \
   vnet/plugin/plugin.h
 
-lib_LTLIBRARIES = libvnet.la libvnetplugin.la
+libvnetdir = ${libdir}
+libvnet_LTLIBRARIES = libvnet.la libvnetplugin.la
 
 pcap2pg_SOURCES = 				\
   vnet/unix/pcap2pg.c				\
   vnet/unix/pcap.h
 
 pcap2pg_LDFLAGS = -static
-pcap2pg_LDADD = libvnet.la -l:libvppinfra.a -lpthread -lm -ldl
+pcap2pg_LDADD = libvnet.la libvppinfra.la -lpthread libvlibmemory.la -lm -ldl
 
 noinst_PROGRAMS += pcap2pg
 
-# Set the suffix list
-SUFFIXES = .api.h .api .api.json
-
-# install the API definition, so we can produce java bindings, etc.
-
-apidir = $(prefix)/vnet
-
-api_DATA = \
-	$(patsubst %.api,%.api.json,$(API_FILES))
-
-BUILT_SOURCES = \
-	$(patsubst %.api,%.api.json,$(API_FILES)) \
-	$(patsubst %.api,%.api.h,$(API_FILES))
-
-# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk
-# and requires a symbolic link at the top of the vnet source tree
-
-include $(top_srcdir)/suffix-rules.mk
+# vi:syntax=automake
diff --git a/vnet/vnet/adj/adj.c b/src/vnet/adj/adj.c
index e740c4cb..e740c4cb 100644
--- a/vnet/vnet/adj/adj.c
+++ b/src/vnet/adj/adj.c
diff --git a/vnet/vnet/adj/adj.h b/src/vnet/adj/adj.h
index e85625db..e85625db 100644
--- a/vnet/vnet/adj/adj.h
+++ b/src/vnet/adj/adj.h
diff --git a/vnet/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c
index 8d86e2a9..8d86e2a9 100644
--- a/vnet/vnet/adj/adj_glean.c
+++ b/src/vnet/adj/adj_glean.c
diff --git a/vnet/vnet/adj/adj_glean.h b/src/vnet/adj/adj_glean.h
index 640bd2f9..640bd2f9 100644
--- a/vnet/vnet/adj/adj_glean.h
+++ b/src/vnet/adj/adj_glean.h
diff --git a/vnet/vnet/adj/adj_internal.h b/src/vnet/adj/adj_internal.h
index 833bc7c9..833bc7c9 100644
--- a/vnet/vnet/adj/adj_internal.h
+++ b/src/vnet/adj/adj_internal.h
diff --git a/vnet/vnet/adj/adj_l2.c b/src/vnet/adj/adj_l2.c
index 4d2dd708..4d2dd708 100644
--- a/vnet/vnet/adj/adj_l2.c
+++ b/src/vnet/adj/adj_l2.c
diff --git a/vnet/vnet/adj/adj_l2.h b/src/vnet/adj/adj_l2.h
index 3aa1c74b..3aa1c74b 100644
--- a/vnet/vnet/adj/adj_l2.h
+++ b/src/vnet/adj/adj_l2.h
diff --git a/vnet/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c
index 8c6ab5aa..8c6ab5aa 100644
--- a/vnet/vnet/adj/adj_midchain.c
+++ b/src/vnet/adj/adj_midchain.c
diff --git a/vnet/vnet/adj/adj_midchain.h b/src/vnet/adj/adj_midchain.h
index ae414aea..ae414aea 100644
--- a/vnet/vnet/adj/adj_midchain.h
+++ b/src/vnet/adj/adj_midchain.h
diff --git a/vnet/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c
index 1344bb67..1344bb67 100644
--- a/vnet/vnet/adj/adj_nbr.c
+++ b/src/vnet/adj/adj_nbr.c
diff --git a/vnet/vnet/adj/adj_nbr.h b/src/vnet/adj/adj_nbr.h
index 293766b8..293766b8 100644
--- a/vnet/vnet/adj/adj_nbr.h
+++ b/src/vnet/adj/adj_nbr.h
diff --git a/vnet/vnet/adj/adj_rewrite.c b/src/vnet/adj/adj_rewrite.c
index 7d792557..7d792557 100644
--- a/vnet/vnet/adj/adj_rewrite.c
+++ b/src/vnet/adj/adj_rewrite.c
diff --git a/vnet/vnet/adj/adj_rewrite.h b/src/vnet/adj/adj_rewrite.h
index 25e6bba8..25e6bba8 100644
--- a/vnet/vnet/adj/adj_rewrite.h
+++ b/src/vnet/adj/adj_rewrite.h
diff --git a/vnet/vnet/adj/adj_types.h b/src/vnet/adj/adj_types.h
index cf90c084..cf90c084 100644
--- a/vnet/vnet/adj/adj_types.h
+++ b/src/vnet/adj/adj_types.h
diff --git a/vnet/vnet/api_errno.h b/src/vnet/api_errno.h
index 65e3e591..65e3e591 100644
--- a/vnet/vnet/api_errno.h
+++ b/src/vnet/api_errno.h
diff --git a/vnet/vnet/bfd/bfd.api b/src/vnet/bfd/bfd.api
index 5798ee69..5798ee69 100644
--- a/vnet/vnet/bfd/bfd.api
+++ b/src/vnet/bfd/bfd.api
diff --git a/vnet/vnet/bfd/bfd_api.c b/src/vnet/bfd/bfd_api.c
index 126cf29a..126cf29a 100644
--- a/vnet/vnet/bfd/bfd_api.c
+++ b/src/vnet/bfd/bfd_api.c
diff --git a/vnet/vnet/bfd/bfd_api.h b/src/vnet/bfd/bfd_api.h
index cfcd04f3..cfcd04f3 100644
--- a/vnet/vnet/bfd/bfd_api.h
+++ b/src/vnet/bfd/bfd_api.h
diff --git a/vnet/vnet/bfd/bfd_debug.h b/src/vnet/bfd/bfd_debug.h
index 707ebab2..707ebab2 100644
--- a/vnet/vnet/bfd/bfd_debug.h
+++ b/src/vnet/bfd/bfd_debug.h
diff --git a/vnet/vnet/bfd/bfd_doc.md b/src/vnet/bfd/bfd_doc.md
index 1333ed77..1333ed77 100644
--- a/vnet/vnet/bfd/bfd_doc.md
+++ b/src/vnet/bfd/bfd_doc.md
diff --git a/vnet/vnet/bfd/bfd_main.c b/src/vnet/bfd/bfd_main.c
index e25eadfc..e25eadfc 100644
--- a/vnet/vnet/bfd/bfd_main.c
+++ b/src/vnet/bfd/bfd_main.c
diff --git a/vnet/vnet/bfd/bfd_main.h b/src/vnet/bfd/bfd_main.h
index c72ea92a..c72ea92a 100644
--- a/vnet/vnet/bfd/bfd_main.h
+++ b/src/vnet/bfd/bfd_main.h
diff --git a/vnet/vnet/bfd/bfd_protocol.c b/src/vnet/bfd/bfd_protocol.c
index ede9536f..ede9536f 100644
--- a/vnet/vnet/bfd/bfd_protocol.c
+++ b/src/vnet/bfd/bfd_protocol.c
diff --git a/vnet/vnet/bfd/bfd_protocol.h b/src/vnet/bfd/bfd_protocol.h
index cf751b3b..cf751b3b 100644
--- a/vnet/vnet/bfd/bfd_protocol.h
+++ b/src/vnet/bfd/bfd_protocol.h
diff --git a/vnet/vnet/bfd/bfd_udp.c b/src/vnet/bfd/bfd_udp.c
index 3c747d86..3c747d86 100644
--- a/vnet/vnet/bfd/bfd_udp.c
+++ b/src/vnet/bfd/bfd_udp.c
diff --git a/vnet/vnet/bfd/bfd_udp.h b/src/vnet/bfd/bfd_udp.h
index 51f5327b..51f5327b 100644
--- a/vnet/vnet/bfd/bfd_udp.h
+++ b/src/vnet/bfd/bfd_udp.h
diff --git a/vnet/vnet/bfd/dir.dox b/src/vnet/bfd/dir.dox
index ed656b52..ed656b52 100644
--- a/vnet/vnet/bfd/dir.dox
+++ b/src/vnet/bfd/dir.dox
diff --git a/vnet/vnet/buffer.h b/src/vnet/buffer.h
index 7935027f..7935027f 100644
--- a/vnet/vnet/buffer.h
+++ b/src/vnet/buffer.h
diff --git a/vnet/vnet/cdp/cdp.pg b/src/vnet/cdp/cdp.pg
index b6ba1865..b6ba1865 100644
--- a/vnet/vnet/cdp/cdp.pg
+++ b/src/vnet/cdp/cdp.pg
diff --git a/vnet/vnet/cdp/cdp_input.c b/src/vnet/cdp/cdp_input.c
index 3574de68..3574de68 100644
--- a/vnet/vnet/cdp/cdp_input.c
+++ b/src/vnet/cdp/cdp_input.c
diff --git a/vnet/vnet/cdp/cdp_node.c b/src/vnet/cdp/cdp_node.c
index 39ac4a90..39ac4a90 100644
--- a/vnet/vnet/cdp/cdp_node.c
+++ b/src/vnet/cdp/cdp_node.c
diff --git a/vnet/vnet/cdp/cdp_node.h b/src/vnet/cdp/cdp_node.h
index 7028ddca..7028ddca 100644
--- a/vnet/vnet/cdp/cdp_node.h
+++ b/src/vnet/cdp/cdp_node.h
diff --git a/vnet/vnet/cdp/cdp_periodic.c b/src/vnet/cdp/cdp_periodic.c
index de111079..de111079 100644
--- a/vnet/vnet/cdp/cdp_periodic.c
+++ b/src/vnet/cdp/cdp_periodic.c
diff --git a/vnet/vnet/cdp/cdp_protocol.h b/src/vnet/cdp/cdp_protocol.h
index dc6c66d5..dc6c66d5 100644
--- a/vnet/vnet/cdp/cdp_protocol.h
+++ b/src/vnet/cdp/cdp_protocol.h
diff --git a/vnet/vnet/classify/README b/src/vnet/classify/README
index 1ef5ab5a..1ef5ab5a 100644
--- a/vnet/vnet/classify/README
+++ b/src/vnet/classify/README
diff --git a/vnet/vnet/classify/flow_classify.c b/src/vnet/classify/flow_classify.c
index 0a624204..0a624204 100644
--- a/vnet/vnet/classify/flow_classify.c
+++ b/src/vnet/classify/flow_classify.c
diff --git a/vnet/vnet/classify/flow_classify.h b/src/vnet/classify/flow_classify.h
index 3ae04cd7..3ae04cd7 100644
--- a/vnet/vnet/classify/flow_classify.h
+++ b/src/vnet/classify/flow_classify.h
diff --git a/vnet/vnet/classify/flow_classify_node.c b/src/vnet/classify/flow_classify_node.c
index d3261d33..d3261d33 100644
--- a/vnet/vnet/classify/flow_classify_node.c
+++ b/src/vnet/classify/flow_classify_node.c
diff --git a/vnet/vnet/classify/input_acl.c b/src/vnet/classify/input_acl.c
index c446f2d6..c446f2d6 100644
--- a/vnet/vnet/classify/input_acl.c
+++ b/src/vnet/classify/input_acl.c
diff --git a/vnet/vnet/classify/input_acl.h b/src/vnet/classify/input_acl.h
index 7ffc189f..7ffc189f 100644
--- a/vnet/vnet/classify/input_acl.h
+++ b/src/vnet/classify/input_acl.h
diff --git a/vnet/vnet/classify/ip_classify.c b/src/vnet/classify/ip_classify.c
index 44973ae5..44973ae5 100644
--- a/vnet/vnet/classify/ip_classify.c
+++ b/src/vnet/classify/ip_classify.c
diff --git a/vnet/vnet/classify/policer_classify.c b/src/vnet/classify/policer_classify.c
index 569234fb..569234fb 100644
--- a/vnet/vnet/classify/policer_classify.c
+++ b/src/vnet/classify/policer_classify.c
diff --git a/vnet/vnet/classify/policer_classify.h b/src/vnet/classify/policer_classify.h
index 30656444..30656444 100644
--- a/vnet/vnet/classify/policer_classify.h
+++ b/src/vnet/classify/policer_classify.h
diff --git a/vnet/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c
index ce38f9f1..ce38f9f1 100644
--- a/vnet/vnet/classify/vnet_classify.c
+++ b/src/vnet/classify/vnet_classify.c
diff --git a/vnet/vnet/classify/vnet_classify.h b/src/vnet/classify/vnet_classify.h
index d0b896ed..d0b896ed 100644
--- a/vnet/vnet/classify/vnet_classify.h
+++ b/src/vnet/classify/vnet_classify.h
diff --git a/vnet/vnet/config.c b/src/vnet/config.c
index 03189d77..03189d77 100644
--- a/vnet/vnet/config.c
+++ b/src/vnet/config.c
diff --git a/vnet/vnet/config.h b/src/vnet/config.h
index b77a7794..b77a7794 100644
--- a/vnet/vnet/config.h
+++ b/src/vnet/config.h
diff --git a/vnet/vnet/cop/cop.c b/src/vnet/cop/cop.c
index 465d6c97..465d6c97 100644
--- a/vnet/vnet/cop/cop.c
+++ b/src/vnet/cop/cop.c
diff --git a/vnet/vnet/cop/cop.h b/src/vnet/cop/cop.h
index eb5f1dfd..eb5f1dfd 100644
--- a/vnet/vnet/cop/cop.h
+++ b/src/vnet/cop/cop.h
diff --git a/vnet/vnet/cop/ip4_whitelist.c b/src/vnet/cop/ip4_whitelist.c
index d5121e72..d5121e72 100644
--- a/vnet/vnet/cop/ip4_whitelist.c
+++ b/src/vnet/cop/ip4_whitelist.c
diff --git a/vnet/vnet/cop/ip6_whitelist.c b/src/vnet/cop/ip6_whitelist.c
index c2e16ccf..c2e16ccf 100644
--- a/vnet/vnet/cop/ip6_whitelist.c
+++ b/src/vnet/cop/ip6_whitelist.c
diff --git a/vnet/vnet/cop/node1.c b/src/vnet/cop/node1.c
index b448b531..b448b531 100644
--- a/vnet/vnet/cop/node1.c
+++ b/src/vnet/cop/node1.c
diff --git a/vnet/vnet/devices/af_packet/af_packet.api b/src/vnet/devices/af_packet/af_packet.api
index 9fb2a207..9fb2a207 100644
--- a/vnet/vnet/devices/af_packet/af_packet.api
+++ b/src/vnet/devices/af_packet/af_packet.api
diff --git a/vnet/vnet/devices/af_packet/af_packet.c b/src/vnet/devices/af_packet/af_packet.c
index 91c3988b..91c3988b 100644
--- a/vnet/vnet/devices/af_packet/af_packet.c
+++ b/src/vnet/devices/af_packet/af_packet.c
diff --git a/vnet/vnet/devices/af_packet/af_packet.h b/src/vnet/devices/af_packet/af_packet.h
index 19e2523d..19e2523d 100644
--- a/vnet/vnet/devices/af_packet/af_packet.h
+++ b/src/vnet/devices/af_packet/af_packet.h
diff --git a/vnet/vnet/devices/af_packet/af_packet_api.c b/src/vnet/devices/af_packet/af_packet_api.c
index 414c838c..414c838c 100644
--- a/vnet/vnet/devices/af_packet/af_packet_api.c
+++ b/src/vnet/devices/af_packet/af_packet_api.c
diff --git a/vnet/vnet/devices/af_packet/cli.c b/src/vnet/devices/af_packet/cli.c
index 2cbd4152..2cbd4152 100644
--- a/vnet/vnet/devices/af_packet/cli.c
+++ b/src/vnet/devices/af_packet/cli.c
diff --git a/vnet/vnet/devices/af_packet/device.c b/src/vnet/devices/af_packet/device.c
index 1fb4000f..1fb4000f 100644
--- a/vnet/vnet/devices/af_packet/device.c
+++ b/src/vnet/devices/af_packet/device.c
diff --git a/vnet/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c
index 72004320..72004320 100644
--- a/vnet/vnet/devices/af_packet/node.c
+++ b/src/vnet/devices/af_packet/node.c
diff --git a/vnet/vnet/devices/devices.c b/src/vnet/devices/devices.c
index cd4386eb..cd4386eb 100644
--- a/vnet/vnet/devices/devices.c
+++ b/src/vnet/devices/devices.c
diff --git a/vnet/vnet/devices/devices.h b/src/vnet/devices/devices.h
index c46dab90..c46dab90 100644
--- a/vnet/vnet/devices/devices.h
+++ b/src/vnet/devices/devices.h
diff --git a/vnet/vnet/devices/dpdk/cli.c b/src/vnet/devices/dpdk/cli.c
index 538a00fd..538a00fd 100644
--- a/vnet/vnet/devices/dpdk/cli.c
+++ b/src/vnet/devices/dpdk/cli.c
diff --git a/vnet/vnet/devices/dpdk/device.c b/src/vnet/devices/dpdk/device.c
index b22fbf2e..b22fbf2e 100644
--- a/vnet/vnet/devices/dpdk/device.c
+++ b/src/vnet/devices/dpdk/device.c
diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/src/vnet/devices/dpdk/dpdk.h
index d8f378d2..d8f378d2 100644
--- a/vnet/vnet/devices/dpdk/dpdk.h
+++ b/src/vnet/devices/dpdk/dpdk.h
diff --git a/vnet/vnet/devices/dpdk/dpdk_priv.h b/src/vnet/devices/dpdk/dpdk_priv.h
index 0c81dbc3..0c81dbc3 100644
--- a/vnet/vnet/devices/dpdk/dpdk_priv.h
+++ b/src/vnet/devices/dpdk/dpdk_priv.h
diff --git a/vnet/vnet/devices/dpdk/format.c b/src/vnet/devices/dpdk/format.c
index ff7c7a5a..ff7c7a5a 100644
--- a/vnet/vnet/devices/dpdk/format.c
+++ b/src/vnet/devices/dpdk/format.c
diff --git a/vnet/vnet/devices/dpdk/hqos.c b/src/vnet/devices/dpdk/hqos.c
index d68bc48f..d68bc48f 100644
--- a/vnet/vnet/devices/dpdk/hqos.c
+++ b/src/vnet/devices/dpdk/hqos.c
diff --git a/vnet/vnet/devices/dpdk/init.c b/src/vnet/devices/dpdk/init.c
index 693ca985..693ca985 100755
--- a/vnet/vnet/devices/dpdk/init.c
+++ b/src/vnet/devices/dpdk/init.c
diff --git a/vnet/vnet/devices/dpdk/ipsec/cli.c b/src/vnet/devices/dpdk/ipsec/cli.c
index 3b634e03..3b634e03 100644
--- a/vnet/vnet/devices/dpdk/ipsec/cli.c
+++ b/src/vnet/devices/dpdk/ipsec/cli.c
diff --git a/vnet/vnet/devices/dpdk/ipsec/crypto_node.c b/src/vnet/devices/dpdk/ipsec/crypto_node.c
index 7b32704e..7b32704e 100644
--- a/vnet/vnet/devices/dpdk/ipsec/crypto_node.c
+++ b/src/vnet/devices/dpdk/ipsec/crypto_node.c
diff --git a/vnet/vnet/devices/dpdk/ipsec/dir.dox b/src/vnet/devices/dpdk/ipsec/dir.dox
index ffebfc4d..ffebfc4d 100644
--- a/vnet/vnet/devices/dpdk/ipsec/dir.dox
+++ b/src/vnet/devices/dpdk/ipsec/dir.dox
diff --git a/vnet/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md b/src/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md
index 8089696f..8089696f 100644
--- a/vnet/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md
+++ b/src/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md
diff --git a/vnet/vnet/devices/dpdk/ipsec/esp.h b/src/vnet/devices/dpdk/ipsec/esp.h
index 7ef90c49..7ef90c49 100644
--- a/vnet/vnet/devices/dpdk/ipsec/esp.h
+++ b/src/vnet/devices/dpdk/ipsec/esp.h
diff --git a/vnet/vnet/devices/dpdk/ipsec/esp_decrypt.c b/src/vnet/devices/dpdk/ipsec/esp_decrypt.c
index 89ab9f9b..89ab9f9b 100644
--- a/vnet/vnet/devices/dpdk/ipsec/esp_decrypt.c
+++ b/src/vnet/devices/dpdk/ipsec/esp_decrypt.c
diff --git a/vnet/vnet/devices/dpdk/ipsec/esp_encrypt.c b/src/vnet/devices/dpdk/ipsec/esp_encrypt.c
index 10bb4616..10bb4616 100644
--- a/vnet/vnet/devices/dpdk/ipsec/esp_encrypt.c
+++ b/src/vnet/devices/dpdk/ipsec/esp_encrypt.c
diff --git a/vnet/vnet/devices/dpdk/ipsec/ipsec.c b/src/vnet/devices/dpdk/ipsec/ipsec.c
index de253f02..de253f02 100644
--- a/vnet/vnet/devices/dpdk/ipsec/ipsec.c
+++ b/src/vnet/devices/dpdk/ipsec/ipsec.c
diff --git a/vnet/vnet/devices/dpdk/ipsec/ipsec.h b/src/vnet/devices/dpdk/ipsec/ipsec.h
index e6c7498c..e6c7498c 100644
--- a/vnet/vnet/devices/dpdk/ipsec/ipsec.h
+++ b/src/vnet/devices/dpdk/ipsec/ipsec.h
diff --git a/vnet/vnet/devices/dpdk/node.c b/src/vnet/devices/dpdk/node.c
index e541cdbc..e541cdbc 100644
--- a/vnet/vnet/devices/dpdk/node.c
+++ b/src/vnet/devices/dpdk/node.c
diff --git a/vnet/vnet/devices/dpdk/qos_doc.md b/src/vnet/devices/dpdk/qos_doc.md
index 9bd0659d..9bd0659d 100644
--- a/vnet/vnet/devices/dpdk/qos_doc.md
+++ b/src/vnet/devices/dpdk/qos_doc.md
diff --git a/vnet/vnet/devices/netmap/cli.c b/src/vnet/devices/netmap/cli.c
index 68695250..68695250 100644
--- a/vnet/vnet/devices/netmap/cli.c
+++ b/src/vnet/devices/netmap/cli.c
diff --git a/vnet/vnet/devices/netmap/device.c b/src/vnet/devices/netmap/device.c
index 2152824f..2152824f 100644
--- a/vnet/vnet/devices/netmap/device.c
+++ b/src/vnet/devices/netmap/device.c
diff --git a/vnet/vnet/devices/netmap/net_netmap.h b/src/vnet/devices/netmap/net_netmap.h
index fd4253b7..fd4253b7 100644
--- a/vnet/vnet/devices/netmap/net_netmap.h
+++ b/src/vnet/devices/netmap/net_netmap.h
diff --git a/vnet/vnet/devices/netmap/netmap.api b/src/vnet/devices/netmap/netmap.api
index 377ccffd..377ccffd 100644
--- a/vnet/vnet/devices/netmap/netmap.api
+++ b/src/vnet/devices/netmap/netmap.api
diff --git a/vnet/vnet/devices/netmap/netmap.c b/src/vnet/devices/netmap/netmap.c
index 3bdb442d..3bdb442d 100644
--- a/vnet/vnet/devices/netmap/netmap.c
+++ b/src/vnet/devices/netmap/netmap.c
diff --git a/vnet/vnet/devices/netmap/netmap.h b/src/vnet/devices/netmap/netmap.h
index 39a94043..39a94043 100644
--- a/vnet/vnet/devices/netmap/netmap.h
+++ b/src/vnet/devices/netmap/netmap.h
diff --git a/vnet/vnet/devices/netmap/netmap_api.c b/src/vnet/devices/netmap/netmap_api.c
index 9a393b1f..9a393b1f 100644
--- a/vnet/vnet/devices/netmap/netmap_api.c
+++ b/src/vnet/devices/netmap/netmap_api.c
diff --git a/vnet/vnet/devices/netmap/node.c b/src/vnet/devices/netmap/node.c
index 19895e47..19895e47 100644
--- a/vnet/vnet/devices/netmap/node.c
+++ b/src/vnet/devices/netmap/node.c
diff --git a/vnet/vnet/devices/nic/ixge.c b/src/vnet/devices/nic/ixge.c
index d4c4c6b7..d4c4c6b7 100644
--- a/vnet/vnet/devices/nic/ixge.c
+++ b/src/vnet/devices/nic/ixge.c
diff --git a/vnet/vnet/devices/nic/ixge.h b/src/vnet/devices/nic/ixge.h
index a8e652dc..a8e652dc 100644
--- a/vnet/vnet/devices/nic/ixge.h
+++ b/src/vnet/devices/nic/ixge.h
diff --git a/vnet/vnet/devices/nic/sfp.c b/src/vnet/devices/nic/sfp.c
index 9e9c008d..9e9c008d 100644
--- a/vnet/vnet/devices/nic/sfp.c
+++ b/src/vnet/devices/nic/sfp.c
diff --git a/vnet/vnet/devices/nic/sfp.h b/src/vnet/devices/nic/sfp.h
index a1ac7997..a1ac7997 100644
--- a/vnet/vnet/devices/nic/sfp.h
+++ b/src/vnet/devices/nic/sfp.h
diff --git a/vnet/vnet/devices/ssvm/node.c b/src/vnet/devices/ssvm/node.c
index 3a695b1d..3a695b1d 100644
--- a/vnet/vnet/devices/ssvm/node.c
+++ b/src/vnet/devices/ssvm/node.c
diff --git a/vnet/vnet/devices/ssvm/ssvm_eth.c b/src/vnet/devices/ssvm/ssvm_eth.c
index db4fafa9..db4fafa9 100644
--- a/vnet/vnet/devices/ssvm/ssvm_eth.c
+++ b/src/vnet/devices/ssvm/ssvm_eth.c
diff --git a/vnet/vnet/devices/ssvm/ssvm_eth.h b/src/vnet/devices/ssvm/ssvm_eth.h
index ac611f4e..f877df3c 100644
--- a/vnet/vnet/devices/ssvm/ssvm_eth.h
+++ b/src/vnet/devices/ssvm/ssvm_eth.h
@@ -30,7 +30,7 @@
 #include <vnet/pg/pg.h>
 #include <vlibmemory/unix_shared_memory_queue.h>
 
-#include <ssvm.h>
+#include <svm/ssvm.h>
 
 extern vnet_device_class_t ssvm_eth_device_class;
 extern vlib_node_registration_t ssvm_eth_input_node;
diff --git a/vnet/vnet/devices/virtio/dir.dox b/src/vnet/devices/virtio/dir.dox
index 50150799..50150799 100644
--- a/vnet/vnet/devices/virtio/dir.dox
+++ b/src/vnet/devices/virtio/dir.dox
diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/src/vnet/devices/virtio/vhost-user.c
index bde8106c..bde8106c 100644
--- a/vnet/vnet/devices/virtio/vhost-user.c
+++ b/src/vnet/devices/virtio/vhost-user.c
diff --git a/vnet/vnet/devices/virtio/vhost-user.h b/src/vnet/devices/virtio/vhost-user.h
index 3083b614..3083b614 100644
--- a/vnet/vnet/devices/virtio/vhost-user.h
+++ b/src/vnet/devices/virtio/vhost-user.h
diff --git a/vnet/vnet/devices/virtio/vhost_user.api b/src/vnet/devices/virtio/vhost_user.api
index 21e42298..21e42298 100644
--- a/vnet/vnet/devices/virtio/vhost_user.api
+++ b/src/vnet/devices/virtio/vhost_user.api
diff --git a/vnet/vnet/devices/virtio/vhost_user_api.c b/src/vnet/devices/virtio/vhost_user_api.c
index dd517c26..dd517c26 100644
--- a/vnet/vnet/devices/virtio/vhost_user_api.c
+++ b/src/vnet/devices/virtio/vhost_user_api.c
diff --git a/vnet/vnet/dhcp/client.c b/src/vnet/dhcp/client.c
index c352e310..c352e310 100644
--- a/vnet/vnet/dhcp/client.c
+++ b/src/vnet/dhcp/client.c
diff --git a/vnet/vnet/dhcp/client.h b/src/vnet/dhcp/client.h
index d15e686b..d15e686b 100644
--- a/vnet/vnet/dhcp/client.h
+++ b/src/vnet/dhcp/client.h
diff --git a/vnet/vnet/dhcp/packet.h b/src/vnet/dhcp/packet.h
index 267a8eaf..267a8eaf 100644
--- a/vnet/vnet/dhcp/packet.h
+++ b/src/vnet/dhcp/packet.h
diff --git a/vnet/vnet/dhcp/proxy.h b/src/vnet/dhcp/proxy.h
index e12c0d00..e12c0d00 100644
--- a/vnet/vnet/dhcp/proxy.h
+++ b/src/vnet/dhcp/proxy.h
diff --git a/vnet/vnet/dhcp/proxy_error.def b/src/vnet/dhcp/proxy_error.def
index 6aa06eb5..6aa06eb5 100644
--- a/vnet/vnet/dhcp/proxy_error.def
+++ b/src/vnet/dhcp/proxy_error.def
diff --git a/vnet/vnet/dhcp/proxy_node.c b/src/vnet/dhcp/proxy_node.c
index d0d99d7e..d0d99d7e 100644
--- a/vnet/vnet/dhcp/proxy_node.c
+++ b/src/vnet/dhcp/proxy_node.c
diff --git a/vnet/vnet/dhcpv6/packet.h b/src/vnet/dhcpv6/packet.h
index 8634b5d8..8634b5d8 100644
--- a/vnet/vnet/dhcpv6/packet.h
+++ b/src/vnet/dhcpv6/packet.h
diff --git a/vnet/vnet/dhcpv6/proxy.h b/src/vnet/dhcpv6/proxy.h
index 9e18913a..9e18913a 100644
--- a/vnet/vnet/dhcpv6/proxy.h
+++ b/src/vnet/dhcpv6/proxy.h
diff --git a/vnet/vnet/dhcpv6/proxy_error.def b/src/vnet/dhcpv6/proxy_error.def
index 55fa7317..55fa7317 100644
--- a/vnet/vnet/dhcpv6/proxy_error.def
+++ b/src/vnet/dhcpv6/proxy_error.def
diff --git a/vnet/vnet/dhcpv6/proxy_node.c b/src/vnet/dhcpv6/proxy_node.c
index 40df35cd..40df35cd 100644
--- a/vnet/vnet/dhcpv6/proxy_node.c
+++ b/src/vnet/dhcpv6/proxy_node.c
diff --git a/vnet/vnet/dpo/classify_dpo.c b/src/vnet/dpo/classify_dpo.c
index 9e7886c9..9e7886c9 100644
--- a/vnet/vnet/dpo/classify_dpo.c
+++ b/src/vnet/dpo/classify_dpo.c
diff --git a/vnet/vnet/dpo/classify_dpo.h b/src/vnet/dpo/classify_dpo.h
index 48f4b2bf..48f4b2bf 100644
--- a/vnet/vnet/dpo/classify_dpo.h
+++ b/src/vnet/dpo/classify_dpo.h
diff --git a/vnet/vnet/dpo/dpo.c b/src/vnet/dpo/dpo.c
index 688d2892..688d2892 100644
--- a/vnet/vnet/dpo/dpo.c
+++ b/src/vnet/dpo/dpo.c
diff --git a/vnet/vnet/dpo/dpo.h b/src/vnet/dpo/dpo.h
index 1efcbc88..1efcbc88 100644
--- a/vnet/vnet/dpo/dpo.h
+++ b/src/vnet/dpo/dpo.h
diff --git a/vnet/vnet/dpo/drop_dpo.c b/src/vnet/dpo/drop_dpo.c
index 5118d2a4..5118d2a4 100644
--- a/vnet/vnet/dpo/drop_dpo.c
+++ b/src/vnet/dpo/drop_dpo.c
diff --git a/vnet/vnet/dpo/drop_dpo.h b/src/vnet/dpo/drop_dpo.h
index 436df36c..436df36c 100644
--- a/vnet/vnet/dpo/drop_dpo.h
+++ b/src/vnet/dpo/drop_dpo.h
diff --git a/vnet/vnet/dpo/ip_null_dpo.c b/src/vnet/dpo/ip_null_dpo.c
index 22682e4e..22682e4e 100644
--- a/vnet/vnet/dpo/ip_null_dpo.c
+++ b/src/vnet/dpo/ip_null_dpo.c
diff --git a/vnet/vnet/dpo/ip_null_dpo.h b/src/vnet/dpo/ip_null_dpo.h
index 002a2a70..002a2a70 100644
--- a/vnet/vnet/dpo/ip_null_dpo.h
+++ b/src/vnet/dpo/ip_null_dpo.h
diff --git a/vnet/vnet/dpo/load_balance.c b/src/vnet/dpo/load_balance.c
index a244776f..a244776f 100644
--- a/vnet/vnet/dpo/load_balance.c
+++ b/src/vnet/dpo/load_balance.c
diff --git a/vnet/vnet/dpo/load_balance.h b/src/vnet/dpo/load_balance.h
index dc6485e6..dc6485e6 100644
--- a/vnet/vnet/dpo/load_balance.h
+++ b/src/vnet/dpo/load_balance.h
diff --git a/vnet/vnet/dpo/load_balance_map.c b/src/vnet/dpo/load_balance_map.c
index 70ce1bf7..70ce1bf7 100644
--- a/vnet/vnet/dpo/load_balance_map.c
+++ b/src/vnet/dpo/load_balance_map.c
diff --git a/vnet/vnet/dpo/load_balance_map.h b/src/vnet/dpo/load_balance_map.h
index 454bf4b3..454bf4b3 100644
--- a/vnet/vnet/dpo/load_balance_map.h
+++ b/src/vnet/dpo/load_balance_map.h
diff --git a/vnet/vnet/dpo/lookup_dpo.c b/src/vnet/dpo/lookup_dpo.c
index 96fedd27..96fedd27 100644
--- a/vnet/vnet/dpo/lookup_dpo.c
+++ b/src/vnet/dpo/lookup_dpo.c
diff --git a/vnet/vnet/dpo/lookup_dpo.h b/src/vnet/dpo/lookup_dpo.h
index ff283388..ff283388 100644
--- a/vnet/vnet/dpo/lookup_dpo.h
+++ b/src/vnet/dpo/lookup_dpo.h
diff --git a/vnet/vnet/dpo/mpls_label_dpo.c b/src/vnet/dpo/mpls_label_dpo.c
index bbdc9666..bbdc9666 100644
--- a/vnet/vnet/dpo/mpls_label_dpo.c
+++ b/src/vnet/dpo/mpls_label_dpo.c
diff --git a/vnet/vnet/dpo/mpls_label_dpo.h b/src/vnet/dpo/mpls_label_dpo.h
index 89bcb093..89bcb093 100644
--- a/vnet/vnet/dpo/mpls_label_dpo.h
+++ b/src/vnet/dpo/mpls_label_dpo.h
diff --git a/vnet/vnet/dpo/punt_dpo.c b/src/vnet/dpo/punt_dpo.c
index d1661dcc..d1661dcc 100644
--- a/vnet/vnet/dpo/punt_dpo.c
+++ b/src/vnet/dpo/punt_dpo.c
diff --git a/vnet/vnet/dpo/punt_dpo.h b/src/vnet/dpo/punt_dpo.h
index 370547c1..370547c1 100644
--- a/vnet/vnet/dpo/punt_dpo.h
+++ b/src/vnet/dpo/punt_dpo.h
diff --git a/vnet/vnet/dpo/receive_dpo.c b/src/vnet/dpo/receive_dpo.c
index 2b2571c6..2b2571c6 100644
--- a/vnet/vnet/dpo/receive_dpo.c
+++ b/src/vnet/dpo/receive_dpo.c
diff --git a/vnet/vnet/dpo/receive_dpo.h b/src/vnet/dpo/receive_dpo.h
index 2420fd78..2420fd78 100644
--- a/vnet/vnet/dpo/receive_dpo.h
+++ b/src/vnet/dpo/receive_dpo.h
diff --git a/vnet/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c
index b388e778..b388e778 100644
--- a/vnet/vnet/ethernet/arp.c
+++ b/src/vnet/ethernet/arp.c
diff --git a/vnet/vnet/ethernet/arp_packet.h b/src/vnet/ethernet/arp_packet.h
index e762ffa4..e762ffa4 100644
--- a/vnet/vnet/ethernet/arp_packet.h
+++ b/src/vnet/ethernet/arp_packet.h
diff --git a/vnet/vnet/ethernet/dir.dox b/src/vnet/ethernet/dir.dox
index a55a73c0..a55a73c0 100644
--- a/vnet/vnet/ethernet/dir.dox
+++ b/src/vnet/ethernet/dir.dox
diff --git a/vnet/vnet/ethernet/error.def b/src/vnet/ethernet/error.def
index 36679c0c..36679c0c 100644
--- a/vnet/vnet/ethernet/error.def
+++ b/src/vnet/ethernet/error.def
diff --git a/vnet/vnet/ethernet/ethernet.h b/src/vnet/ethernet/ethernet.h
index f88b0cf3..f88b0cf3 100644
--- a/vnet/vnet/ethernet/ethernet.h
+++ b/src/vnet/ethernet/ethernet.h
diff --git a/vnet/vnet/ethernet/format.c b/src/vnet/ethernet/format.c
index 4edef5ad..4edef5ad 100644
--- a/vnet/vnet/ethernet/format.c
+++ b/src/vnet/ethernet/format.c
diff --git a/vnet/vnet/ethernet/init.c b/src/vnet/ethernet/init.c
index 2d20adc9..2d20adc9 100644
--- a/vnet/vnet/ethernet/init.c
+++ b/src/vnet/ethernet/init.c
diff --git a/vnet/vnet/ethernet/interface.c b/src/vnet/ethernet/interface.c
index 1c1f4353..1c1f4353 100644
--- a/vnet/vnet/ethernet/interface.c
+++ b/src/vnet/ethernet/interface.c
diff --git a/vnet/vnet/ethernet/mac_swap.c b/src/vnet/ethernet/mac_swap.c
index c0fec12e..c0fec12e 100644
--- a/vnet/vnet/ethernet/mac_swap.c
+++ b/src/vnet/ethernet/mac_swap.c
diff --git a/vnet/vnet/ethernet/node.c b/src/vnet/ethernet/node.c
index 6d57da31..6d57da31 100755
--- a/vnet/vnet/ethernet/node.c
+++ b/src/vnet/ethernet/node.c
diff --git a/vnet/vnet/ethernet/packet.h b/src/vnet/ethernet/packet.h
index 964cf638..964cf638 100644
--- a/vnet/vnet/ethernet/packet.h
+++ b/src/vnet/ethernet/packet.h
diff --git a/vnet/vnet/ethernet/pg.c b/src/vnet/ethernet/pg.c
index 67ccfcf5..67ccfcf5 100644
--- a/vnet/vnet/ethernet/pg.c
+++ b/src/vnet/ethernet/pg.c
diff --git a/vnet/vnet/ethernet/types.def b/src/vnet/ethernet/types.def
index 643f3152..643f3152 100644
--- a/vnet/vnet/ethernet/types.def
+++ b/src/vnet/ethernet/types.def
diff --git a/vnet/vnet/feature/feature.c b/src/vnet/feature/feature.c
index 032fe784..032fe784 100644
--- a/vnet/vnet/feature/feature.c
+++ b/src/vnet/feature/feature.c
diff --git a/vnet/vnet/feature/feature.h b/src/vnet/feature/feature.h
index b27aaf17..b27aaf17 100644
--- a/vnet/vnet/feature/feature.h
+++ b/src/vnet/feature/feature.h
diff --git a/vnet/vnet/feature/registration.c b/src/vnet/feature/registration.c
index 1deeeef9..1deeeef9 100644
--- a/vnet/vnet/feature/registration.c
+++ b/src/vnet/feature/registration.c
diff --git a/vnet/vnet/fib/fib.c b/src/vnet/fib/fib.c
index 413f93e8..413f93e8 100644
--- a/vnet/vnet/fib/fib.c
+++ b/src/vnet/fib/fib.c
diff --git a/vnet/vnet/fib/fib.h b/src/vnet/fib/fib.h
index 7cf1d136..7cf1d136 100644
--- a/vnet/vnet/fib/fib.h
+++ b/src/vnet/fib/fib.h
diff --git a/vnet/vnet/fib/fib_api.h b/src/vnet/fib/fib_api.h
index f8275317..f8275317 100644
--- a/vnet/vnet/fib/fib_api.h
+++ b/src/vnet/fib/fib_api.h
diff --git a/vnet/vnet/fib/fib_attached_export.c b/src/vnet/fib/fib_attached_export.c
index c389ea43..c389ea43 100644
--- a/vnet/vnet/fib/fib_attached_export.c
+++ b/src/vnet/fib/fib_attached_export.c
diff --git a/vnet/vnet/fib/fib_attached_export.h b/src/vnet/fib/fib_attached_export.h
index fa28a6e1..fa28a6e1 100644
--- a/vnet/vnet/fib/fib_attached_export.h
+++ b/src/vnet/fib/fib_attached_export.h
diff --git a/vnet/vnet/fib/fib_entry.c b/src/vnet/fib/fib_entry.c
index 24b50637..24b50637 100644
--- a/vnet/vnet/fib/fib_entry.c
+++ b/src/vnet/fib/fib_entry.c
diff --git a/vnet/vnet/fib/fib_entry.h b/src/vnet/fib/fib_entry.h
index 44a5f2e6..44a5f2e6 100644
--- a/vnet/vnet/fib/fib_entry.h
+++ b/src/vnet/fib/fib_entry.h
diff --git a/vnet/vnet/fib/fib_entry_cover.c b/src/vnet/fib/fib_entry_cover.c
index 147c5daa..147c5daa 100644
--- a/vnet/vnet/fib/fib_entry_cover.c
+++ b/src/vnet/fib/fib_entry_cover.c
diff --git a/vnet/vnet/fib/fib_entry_cover.h b/src/vnet/fib/fib_entry_cover.h
index fbbbc211..fbbbc211 100644
--- a/vnet/vnet/fib/fib_entry_cover.h
+++ b/src/vnet/fib/fib_entry_cover.h
diff --git a/vnet/vnet/fib/fib_entry_delegate.c b/src/vnet/fib/fib_entry_delegate.c
index a0d45f97..a0d45f97 100644
--- a/vnet/vnet/fib/fib_entry_delegate.c
+++ b/src/vnet/fib/fib_entry_delegate.c
diff --git a/vnet/vnet/fib/fib_entry_delegate.h b/src/vnet/fib/fib_entry_delegate.h
index 6d3a6549..6d3a6549 100644
--- a/vnet/vnet/fib/fib_entry_delegate.h
+++ b/src/vnet/fib/fib_entry_delegate.h
diff --git a/vnet/vnet/fib/fib_entry_src.c b/src/vnet/fib/fib_entry_src.c
index 060fac94..060fac94 100644
--- a/vnet/vnet/fib/fib_entry_src.c
+++ b/src/vnet/fib/fib_entry_src.c
diff --git a/vnet/vnet/fib/fib_entry_src.h b/src/vnet/fib/fib_entry_src.h
index 640c174d..640c174d 100644
--- a/vnet/vnet/fib/fib_entry_src.h
+++ b/src/vnet/fib/fib_entry_src.h
diff --git a/vnet/vnet/fib/fib_entry_src_adj.c b/src/vnet/fib/fib_entry_src_adj.c
index 64f82a73..64f82a73 100644
--- a/vnet/vnet/fib/fib_entry_src_adj.c
+++ b/src/vnet/fib/fib_entry_src_adj.c
diff --git a/vnet/vnet/fib/fib_entry_src_api.c b/src/vnet/fib/fib_entry_src_api.c
index edc8a47b..edc8a47b 100644
--- a/vnet/vnet/fib/fib_entry_src_api.c
+++ b/src/vnet/fib/fib_entry_src_api.c
diff --git a/vnet/vnet/fib/fib_entry_src_default.c b/src/vnet/fib/fib_entry_src_default.c
index 9846cf56..9846cf56 100644
--- a/vnet/vnet/fib/fib_entry_src_default.c
+++ b/src/vnet/fib/fib_entry_src_default.c
diff --git a/vnet/vnet/fib/fib_entry_src_default_route.c b/src/vnet/fib/fib_entry_src_default_route.c
index 9f4e7c36..9f4e7c36 100644
--- a/vnet/vnet/fib/fib_entry_src_default_route.c
+++ b/src/vnet/fib/fib_entry_src_default_route.c
diff --git a/vnet/vnet/fib/fib_entry_src_interface.c b/src/vnet/fib/fib_entry_src_interface.c
index ca04716e..ca04716e 100644
--- a/vnet/vnet/fib/fib_entry_src_interface.c
+++ b/src/vnet/fib/fib_entry_src_interface.c
diff --git a/vnet/vnet/fib/fib_entry_src_lisp.c b/src/vnet/fib/fib_entry_src_lisp.c
index 7f8b91bb..7f8b91bb 100644
--- a/vnet/vnet/fib/fib_entry_src_lisp.c
+++ b/src/vnet/fib/fib_entry_src_lisp.c
diff --git a/vnet/vnet/fib/fib_entry_src_mpls.c b/src/vnet/fib/fib_entry_src_mpls.c
index 14c7310f..14c7310f 100644
--- a/vnet/vnet/fib/fib_entry_src_mpls.c
+++ b/src/vnet/fib/fib_entry_src_mpls.c
diff --git a/vnet/vnet/fib/fib_entry_src_rr.c b/src/vnet/fib/fib_entry_src_rr.c
index ff15c54e..ff15c54e 100644
--- a/vnet/vnet/fib/fib_entry_src_rr.c
+++ b/src/vnet/fib/fib_entry_src_rr.c
diff --git a/vnet/vnet/fib/fib_entry_src_special.c b/src/vnet/fib/fib_entry_src_special.c
index 52a6134e..52a6134e 100644
--- a/vnet/vnet/fib/fib_entry_src_special.c
+++ b/src/vnet/fib/fib_entry_src_special.c
diff --git a/vnet/vnet/fib/fib_internal.h b/src/vnet/fib/fib_internal.h
index 2d980bcc..2d980bcc 100644
--- a/vnet/vnet/fib/fib_internal.h
+++ b/src/vnet/fib/fib_internal.h
diff --git a/vnet/vnet/fib/fib_node.c b/src/vnet/fib/fib_node.c
index db3e22bb..db3e22bb 100644
--- a/vnet/vnet/fib/fib_node.c
+++ b/src/vnet/fib/fib_node.c
diff --git a/vnet/vnet/fib/fib_node.h b/src/vnet/fib/fib_node.h
index 3ad8ee95..3ad8ee95 100644
--- a/vnet/vnet/fib/fib_node.h
+++ b/src/vnet/fib/fib_node.h
diff --git a/vnet/vnet/fib/fib_node_list.c b/src/vnet/fib/fib_node_list.c
index ceb951b4..ceb951b4 100644
--- a/vnet/vnet/fib/fib_node_list.c
+++ b/src/vnet/fib/fib_node_list.c
diff --git a/vnet/vnet/fib/fib_node_list.h b/src/vnet/fib/fib_node_list.h
index 9567b966..9567b966 100644
--- a/vnet/vnet/fib/fib_node_list.h
+++ b/src/vnet/fib/fib_node_list.h
diff --git a/vnet/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c
index 809e3e16..809e3e16 100644
--- a/vnet/vnet/fib/fib_path.c
+++ b/src/vnet/fib/fib_path.c
diff --git a/vnet/vnet/fib/fib_path.h b/src/vnet/fib/fib_path.h
index 91f49d09..91f49d09 100644
--- a/vnet/vnet/fib/fib_path.h
+++ b/src/vnet/fib/fib_path.h
diff --git a/vnet/vnet/fib/fib_path_ext.c b/src/vnet/fib/fib_path_ext.c
index f75b5626..f75b5626 100644
--- a/vnet/vnet/fib/fib_path_ext.c
+++ b/src/vnet/fib/fib_path_ext.c
diff --git a/vnet/vnet/fib/fib_path_ext.h b/src/vnet/fib/fib_path_ext.h
index cf8f8df0..cf8f8df0 100644
--- a/vnet/vnet/fib/fib_path_ext.h
+++ b/src/vnet/fib/fib_path_ext.h
diff --git a/vnet/vnet/fib/fib_path_list.c b/src/vnet/fib/fib_path_list.c
index 5b35e9b8..5b35e9b8 100644
--- a/vnet/vnet/fib/fib_path_list.c
+++ b/src/vnet/fib/fib_path_list.c
diff --git a/vnet/vnet/fib/fib_path_list.h b/src/vnet/fib/fib_path_list.h
index 8bc1b20b..8bc1b20b 100644
--- a/vnet/vnet/fib/fib_path_list.h
+++ b/src/vnet/fib/fib_path_list.h
diff --git a/vnet/vnet/fib/fib_table.c b/src/vnet/fib/fib_table.c
index 76db42d0..76db42d0 100644
--- a/vnet/vnet/fib/fib_table.c
+++ b/src/vnet/fib/fib_table.c
diff --git a/vnet/vnet/fib/fib_table.h b/src/vnet/fib/fib_table.h
index cfec516d..cfec516d 100644
--- a/vnet/vnet/fib/fib_table.h
+++ b/src/vnet/fib/fib_table.h
diff --git a/vnet/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c
index 5083db26..5083db26 100644
--- a/vnet/vnet/fib/fib_test.c
+++ b/src/vnet/fib/fib_test.c
diff --git a/vnet/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c
index b66e7194..b66e7194 100644
--- a/vnet/vnet/fib/fib_types.c
+++ b/src/vnet/fib/fib_types.c
diff --git a/vnet/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h
index 0a15fef1..0a15fef1 100644
--- a/vnet/vnet/fib/fib_types.h
+++ b/src/vnet/fib/fib_types.h
diff --git a/vnet/vnet/fib/fib_urpf_list.c b/src/vnet/fib/fib_urpf_list.c
index 263812ad..263812ad 100644
--- a/vnet/vnet/fib/fib_urpf_list.c
+++ b/src/vnet/fib/fib_urpf_list.c
diff --git a/vnet/vnet/fib/fib_urpf_list.h b/src/vnet/fib/fib_urpf_list.h
index 09f47574..09f47574 100644
--- a/vnet/vnet/fib/fib_urpf_list.h
+++ b/src/vnet/fib/fib_urpf_list.h
diff --git a/vnet/vnet/fib/fib_walk.c b/src/vnet/fib/fib_walk.c
index 938f7b8c..938f7b8c 100644
--- a/vnet/vnet/fib/fib_walk.c
+++ b/src/vnet/fib/fib_walk.c
diff --git a/vnet/vnet/fib/fib_walk.h b/src/vnet/fib/fib_walk.h
index 7413d8a2..7413d8a2 100644
--- a/vnet/vnet/fib/fib_walk.h
+++ b/src/vnet/fib/fib_walk.h
diff --git a/vnet/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c
index f6ebce00..f6ebce00 100644
--- a/vnet/vnet/fib/ip4_fib.c
+++ b/src/vnet/fib/ip4_fib.c
diff --git a/vnet/vnet/fib/ip4_fib.h b/src/vnet/fib/ip4_fib.h
index cf312cdc..cf312cdc 100644
--- a/vnet/vnet/fib/ip4_fib.h
+++ b/src/vnet/fib/ip4_fib.h
diff --git a/vnet/vnet/fib/ip6_fib.c b/src/vnet/fib/ip6_fib.c
index d5b9bdcb..d5b9bdcb 100644
--- a/vnet/vnet/fib/ip6_fib.c
+++ b/src/vnet/fib/ip6_fib.c
diff --git a/vnet/vnet/fib/ip6_fib.h b/src/vnet/fib/ip6_fib.h
index f6af993a..f6af993a 100644
--- a/vnet/vnet/fib/ip6_fib.h
+++ b/src/vnet/fib/ip6_fib.h
diff --git a/vnet/vnet/fib/mpls_fib.c b/src/vnet/fib/mpls_fib.c
index 6a9b1ac2..6a9b1ac2 100644
--- a/vnet/vnet/fib/mpls_fib.c
+++ b/src/vnet/fib/mpls_fib.c
diff --git a/vnet/vnet/fib/mpls_fib.h b/src/vnet/fib/mpls_fib.h
index 93ae4623..93ae4623 100644
--- a/vnet/vnet/fib/mpls_fib.h
+++ b/src/vnet/fib/mpls_fib.h
diff --git a/vnet/vnet/flow/flow_report.c b/src/vnet/flow/flow_report.c
index c78a78a9..c78a78a9 100644
--- a/vnet/vnet/flow/flow_report.c
+++ b/src/vnet/flow/flow_report.c
diff --git a/vnet/vnet/flow/flow_report.h b/src/vnet/flow/flow_report.h
index 4e764377..4e764377 100644
--- a/vnet/vnet/flow/flow_report.h
+++ b/src/vnet/flow/flow_report.h
diff --git a/vnet/vnet/flow/flow_report_classify.c b/src/vnet/flow/flow_report_classify.c
index cb8fe069..cb8fe069 100644
--- a/vnet/vnet/flow/flow_report_classify.c
+++ b/src/vnet/flow/flow_report_classify.c
diff --git a/vnet/vnet/flow/flow_report_classify.h b/src/vnet/flow/flow_report_classify.h
index 77d98b58..77d98b58 100644
--- a/vnet/vnet/flow/flow_report_classify.h
+++ b/src/vnet/flow/flow_report_classify.h
diff --git a/vnet/vnet/flow/ipfix_info_elements.h b/src/vnet/flow/ipfix_info_elements.h
index 5d7e935d..5d7e935d 100644
--- a/vnet/vnet/flow/ipfix_info_elements.h
+++ b/src/vnet/flow/ipfix_info_elements.h
diff --git a/vnet/vnet/flow/ipfix_packet.h b/src/vnet/flow/ipfix_packet.h
index 32979619..32979619 100644
--- a/vnet/vnet/flow/ipfix_packet.h
+++ b/src/vnet/flow/ipfix_packet.h
diff --git a/vnet/vnet/global_funcs.h b/src/vnet/global_funcs.h
index 92a5c04d..92a5c04d 100644
--- a/vnet/vnet/global_funcs.h
+++ b/src/vnet/global_funcs.h
diff --git a/vnet/vnet/gre/error.def b/src/vnet/gre/error.def
index 161ecc1d..161ecc1d 100644
--- a/vnet/vnet/gre/error.def
+++ b/src/vnet/gre/error.def
diff --git a/vnet/vnet/gre/gre.api b/src/vnet/gre/gre.api
index 28f6dbc9..28f6dbc9 100644
--- a/vnet/vnet/gre/gre.api
+++ b/src/vnet/gre/gre.api
diff --git a/vnet/vnet/gre/gre.c b/src/vnet/gre/gre.c
index 0faed13e..0faed13e 100644
--- a/vnet/vnet/gre/gre.c
+++ b/src/vnet/gre/gre.c
diff --git a/vnet/vnet/gre/gre.h b/src/vnet/gre/gre.h
index b6544b9b..b6544b9b 100644
--- a/vnet/vnet/gre/gre.h
+++ b/src/vnet/gre/gre.h
diff --git a/vnet/vnet/gre/gre_api.c b/src/vnet/gre/gre_api.c
index 333838c0..333838c0 100644
--- a/vnet/vnet/gre/gre_api.c
+++ b/src/vnet/gre/gre_api.c
diff --git a/vnet/vnet/gre/interface.c b/src/vnet/gre/interface.c
index d624587d..d624587d 100644
--- a/vnet/vnet/gre/interface.c
+++ b/src/vnet/gre/interface.c
diff --git a/vnet/vnet/gre/node.c b/src/vnet/gre/node.c
index 86f7a6ee..86f7a6ee 100644
--- a/vnet/vnet/gre/node.c
+++ b/src/vnet/gre/node.c
diff --git a/vnet/vnet/gre/packet.h b/src/vnet/gre/packet.h
index cc2ccda9..cc2ccda9 100644
--- a/vnet/vnet/gre/packet.h
+++ b/src/vnet/gre/packet.h
diff --git a/vnet/vnet/gre/pg.c b/src/vnet/gre/pg.c
index cc065d3b..cc065d3b 100644
--- a/vnet/vnet/gre/pg.c
+++ b/src/vnet/gre/pg.c
diff --git a/vnet/vnet/handoff.c b/src/vnet/handoff.c
index 9f3c93b4..9f3c93b4 100644
--- a/vnet/vnet/handoff.c
+++ b/src/vnet/handoff.c
diff --git a/vnet/vnet/handoff.h b/src/vnet/handoff.h
index 815206a9..815206a9 100644
--- a/vnet/vnet/handoff.h
+++ b/src/vnet/handoff.h
diff --git a/vnet/vnet/hdlc/error.def b/src/vnet/hdlc/error.def
index 16e001bb..16e001bb 100644
--- a/vnet/vnet/hdlc/error.def
+++ b/src/vnet/hdlc/error.def
diff --git a/vnet/vnet/hdlc/hdlc.c b/src/vnet/hdlc/hdlc.c
index 174085ac..174085ac 100644
--- a/vnet/vnet/hdlc/hdlc.c
+++ b/src/vnet/hdlc/hdlc.c
diff --git a/vnet/vnet/hdlc/hdlc.h b/src/vnet/hdlc/hdlc.h
index 73b15c2f..73b15c2f 100644
--- a/vnet/vnet/hdlc/hdlc.h
+++ b/src/vnet/hdlc/hdlc.h
diff --git a/vnet/vnet/hdlc/node.c b/src/vnet/hdlc/node.c
index 4fe0296a..4fe0296a 100644
--- a/vnet/vnet/hdlc/node.c
+++ b/src/vnet/hdlc/node.c
diff --git a/vnet/vnet/hdlc/packet.h b/src/vnet/hdlc/packet.h
index 45e5496f..45e5496f 100644
--- a/vnet/vnet/hdlc/packet.h
+++ b/src/vnet/hdlc/packet.h
diff --git a/vnet/vnet/hdlc/pg.c b/src/vnet/hdlc/pg.c
index b8e67022..b8e67022 100644
--- a/vnet/vnet/hdlc/pg.c
+++ b/src/vnet/hdlc/pg.c
diff --git a/vnet/vnet/interface.api b/src/vnet/interface.api
index 752e79c5..752e79c5 100644
--- a/vnet/vnet/interface.api
+++ b/src/vnet/interface.api
diff --git a/vnet/vnet/interface.c b/src/vnet/interface.c
index 78610ed4..78610ed4 100644
--- a/vnet/vnet/interface.c
+++ b/src/vnet/interface.c
diff --git a/vnet/vnet/interface.h b/src/vnet/interface.h
index d42e5fda..d42e5fda 100644
--- a/vnet/vnet/interface.h
+++ b/src/vnet/interface.h
diff --git a/vnet/vnet/interface_api.c b/src/vnet/interface_api.c
index 42fd14ee..42fd14ee 100644
--- a/vnet/vnet/interface_api.c
+++ b/src/vnet/interface_api.c
diff --git a/vnet/vnet/interface_cli.c b/src/vnet/interface_cli.c
index 7dbee867..7dbee867 100644
--- a/vnet/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
diff --git a/vnet/vnet/interface_format.c b/src/vnet/interface_format.c
index b3a30622..b3a30622 100644
--- a/vnet/vnet/interface_format.c
+++ b/src/vnet/interface_format.c
diff --git a/vnet/vnet/interface_funcs.h b/src/vnet/interface_funcs.h
index b84d151c..b84d151c 100644
--- a/vnet/vnet/interface_funcs.h
+++ b/src/vnet/interface_funcs.h
diff --git a/vnet/vnet/interface_output.c b/src/vnet/interface_output.c
index 475b0b93..475b0b93 100644
--- a/vnet/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
diff --git a/vnet/vnet/ip/dir.dox b/src/vnet/ip/dir.dox
index a4eb7337..a4eb7337 100644
--- a/vnet/vnet/ip/dir.dox
+++ b/src/vnet/ip/dir.dox
diff --git a/vnet/vnet/ip/format.c b/src/vnet/ip/format.c
index be1c4fd3..be1c4fd3 100644
--- a/vnet/vnet/ip/format.c
+++ b/src/vnet/ip/format.c
diff --git a/vnet/vnet/ip/format.h b/src/vnet/ip/format.h
index c35f0f4b..c35f0f4b 100644
--- a/vnet/vnet/ip/format.h
+++ b/src/vnet/ip/format.h
diff --git a/vnet/vnet/ip/icmp4.c b/src/vnet/ip/icmp4.c
index c3afff72..c3afff72 100644
--- a/vnet/vnet/ip/icmp4.c
+++ b/src/vnet/ip/icmp4.c
diff --git a/vnet/vnet/ip/icmp4.h b/src/vnet/ip/icmp4.h
index ae805148..ae805148 100644
--- a/vnet/vnet/ip/icmp4.h
+++ b/src/vnet/ip/icmp4.h
diff --git a/vnet/vnet/ip/icmp46_packet.h b/src/vnet/ip/icmp46_packet.h
index a86cbd57..a86cbd57 100644
--- a/vnet/vnet/ip/icmp46_packet.h
+++ b/src/vnet/ip/icmp46_packet.h
diff --git a/vnet/vnet/ip/icmp6.c b/src/vnet/ip/icmp6.c
index 70696d0c..70696d0c 100644
--- a/vnet/vnet/ip/icmp6.c
+++ b/src/vnet/ip/icmp6.c
diff --git a/vnet/vnet/ip/icmp6.h b/src/vnet/ip/icmp6.h
index a426512e..a426512e 100644
--- a/vnet/vnet/ip/icmp6.h
+++ b/src/vnet/ip/icmp6.h
diff --git a/vnet/vnet/ip/igmp_packet.h b/src/vnet/ip/igmp_packet.h
index 503259ec..503259ec 100644
--- a/vnet/vnet/ip/igmp_packet.h
+++ b/src/vnet/ip/igmp_packet.h
diff --git a/vnet/vnet/ip/ip.api b/src/vnet/ip/ip.api
index c811e465..c811e465 100644
--- a/vnet/vnet/ip/ip.api
+++ b/src/vnet/ip/ip.api
diff --git a/vnet/vnet/ip/ip.h b/src/vnet/ip/ip.h
index 02a1a963..02a1a963 100644
--- a/vnet/vnet/ip/ip.h
+++ b/src/vnet/ip/ip.h
diff --git a/vnet/vnet/ip/ip4.h b/src/vnet/ip/ip4.h
index 0331c445..0331c445 100644
--- a/vnet/vnet/ip/ip4.h
+++ b/src/vnet/ip/ip4.h
diff --git a/vnet/vnet/ip/ip46_cli.c b/src/vnet/ip/ip46_cli.c
index ce1ffa62..ce1ffa62 100644
--- a/vnet/vnet/ip/ip46_cli.c
+++ b/src/vnet/ip/ip46_cli.c
diff --git a/vnet/vnet/ip/ip4_error.h b/src/vnet/ip/ip4_error.h
index 95d12ec2..95d12ec2 100644
--- a/vnet/vnet/ip/ip4_error.h
+++ b/src/vnet/ip/ip4_error.h
diff --git a/vnet/vnet/ip/ip4_format.c b/src/vnet/ip/ip4_format.c
index c803e065..c803e065 100644
--- a/vnet/vnet/ip/ip4_format.c
+++ b/src/vnet/ip/ip4_format.c
diff --git a/vnet/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index 6e91b9e9..6e91b9e9 100644
--- a/vnet/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
diff --git a/vnet/vnet/ip/ip4_input.c b/src/vnet/ip/ip4_input.c
index 1cf5e0b8..1cf5e0b8 100644
--- a/vnet/vnet/ip/ip4_input.c
+++ b/src/vnet/ip/ip4_input.c
diff --git a/vnet/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c
index 6e3d0e80..6e3d0e80 100644
--- a/vnet/vnet/ip/ip4_mtrie.c
+++ b/src/vnet/ip/ip4_mtrie.c
diff --git a/vnet/vnet/ip/ip4_mtrie.h b/src/vnet/ip/ip4_mtrie.h
index c0afc2cf..c0afc2cf 100644
--- a/vnet/vnet/ip/ip4_mtrie.h
+++ b/src/vnet/ip/ip4_mtrie.h
diff --git a/vnet/vnet/ip/ip4_packet.h b/src/vnet/ip/ip4_packet.h
index 8da788b4..8da788b4 100644
--- a/vnet/vnet/ip/ip4_packet.h
+++ b/src/vnet/ip/ip4_packet.h
diff --git a/vnet/vnet/ip/ip4_pg.c b/src/vnet/ip/ip4_pg.c
index 9697a3b9..9697a3b9 100644
--- a/vnet/vnet/ip/ip4_pg.c
+++ b/src/vnet/ip/ip4_pg.c
diff --git a/vnet/vnet/ip/ip4_source_and_port_range_check.c b/src/vnet/ip/ip4_source_and_port_range_check.c
index ae836a11..ae836a11 100644
--- a/vnet/vnet/ip/ip4_source_and_port_range_check.c
+++ b/src/vnet/ip/ip4_source_and_port_range_check.c
diff --git a/vnet/vnet/ip/ip4_source_check.c b/src/vnet/ip/ip4_source_check.c
index d461cc88..d461cc88 100644
--- a/vnet/vnet/ip/ip4_source_check.c
+++ b/src/vnet/ip/ip4_source_check.c
diff --git a/vnet/vnet/ip/ip4_test.c b/src/vnet/ip/ip4_test.c
index 45d17113..45d17113 100644
--- a/vnet/vnet/ip/ip4_test.c
+++ b/src/vnet/ip/ip4_test.c
diff --git a/vnet/vnet/ip/ip6.h b/src/vnet/ip/ip6.h
index 586b7c1b..586b7c1b 100644
--- a/vnet/vnet/ip/ip6.h
+++ b/src/vnet/ip/ip6.h
diff --git a/vnet/vnet/ip/ip6_error.h b/src/vnet/ip/ip6_error.h
index a2807169..a2807169 100644
--- a/vnet/vnet/ip/ip6_error.h
+++ b/src/vnet/ip/ip6_error.h
diff --git a/vnet/vnet/ip/ip6_format.c b/src/vnet/ip/ip6_format.c
index 56899b73..56899b73 100644
--- a/vnet/vnet/ip/ip6_format.c
+++ b/src/vnet/ip/ip6_format.c
diff --git a/vnet/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index b5c79552..b5c79552 100644
--- a/vnet/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
diff --git a/vnet/vnet/ip/ip6_hop_by_hop.c b/src/vnet/ip/ip6_hop_by_hop.c
index 3a820b3c..3a820b3c 100644
--- a/vnet/vnet/ip/ip6_hop_by_hop.c
+++ b/src/vnet/ip/ip6_hop_by_hop.c
diff --git a/vnet/vnet/ip/ip6_hop_by_hop.h b/src/vnet/ip/ip6_hop_by_hop.h
index acfaa37e..acfaa37e 100644
--- a/vnet/vnet/ip/ip6_hop_by_hop.h
+++ b/src/vnet/ip/ip6_hop_by_hop.h
diff --git a/vnet/vnet/ip/ip6_hop_by_hop_packet.h b/src/vnet/ip/ip6_hop_by_hop_packet.h
index 543ba8b0..543ba8b0 100644
--- a/vnet/vnet/ip/ip6_hop_by_hop_packet.h
+++ b/src/vnet/ip/ip6_hop_by_hop_packet.h
diff --git a/vnet/vnet/ip/ip6_input.c b/src/vnet/ip/ip6_input.c
index bbc2ceba..bbc2ceba 100644
--- a/vnet/vnet/ip/ip6_input.c
+++ b/src/vnet/ip/ip6_input.c
diff --git a/vnet/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c
index 5a1c9e86..5a1c9e86 100644
--- a/vnet/vnet/ip/ip6_neighbor.c
+++ b/src/vnet/ip/ip6_neighbor.c
diff --git a/vnet/vnet/ip/ip6_neighbor.h b/src/vnet/ip/ip6_neighbor.h
index b2c9f48a..b2c9f48a 100644
--- a/vnet/vnet/ip/ip6_neighbor.h
+++ b/src/vnet/ip/ip6_neighbor.h
diff --git a/vnet/vnet/ip/ip6_packet.h b/src/vnet/ip/ip6_packet.h
index 1e551c8b..1e551c8b 100644
--- a/vnet/vnet/ip/ip6_packet.h
+++ b/src/vnet/ip/ip6_packet.h
diff --git a/vnet/vnet/ip/ip6_pg.c b/src/vnet/ip/ip6_pg.c
index ba1e4ad9..ba1e4ad9 100644
--- a/vnet/vnet/ip/ip6_pg.c
+++ b/src/vnet/ip/ip6_pg.c
diff --git a/vnet/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c
index cd9b7397..cd9b7397 100644
--- a/vnet/vnet/ip/ip_api.c
+++ b/src/vnet/ip/ip_api.c
diff --git a/vnet/vnet/ip/ip_checksum.c b/src/vnet/ip/ip_checksum.c
index 6a9cf657..6a9cf657 100644
--- a/vnet/vnet/ip/ip_checksum.c
+++ b/src/vnet/ip/ip_checksum.c
diff --git a/vnet/vnet/ip/ip_frag.c b/src/vnet/ip/ip_frag.c
index ca062bfd..ca062bfd 100644
--- a/vnet/vnet/ip/ip_frag.c
+++ b/src/vnet/ip/ip_frag.c
diff --git a/vnet/vnet/ip/ip_frag.h b/src/vnet/ip/ip_frag.h
index 348f5a2f..348f5a2f 100644
--- a/vnet/vnet/ip/ip_frag.h
+++ b/src/vnet/ip/ip_frag.h
diff --git a/vnet/vnet/ip/ip_init.c b/src/vnet/ip/ip_init.c
index f7635b35..f7635b35 100644
--- a/vnet/vnet/ip/ip_init.c
+++ b/src/vnet/ip/ip_init.c
diff --git a/vnet/vnet/ip/ip_input_acl.c b/src/vnet/ip/ip_input_acl.c
index b0b52ab1..b0b52ab1 100644
--- a/vnet/vnet/ip/ip_input_acl.c
+++ b/src/vnet/ip/ip_input_acl.c
diff --git a/vnet/vnet/ip/ip_packet.h b/src/vnet/ip/ip_packet.h
index d3f3de77..d3f3de77 100644
--- a/vnet/vnet/ip/ip_packet.h
+++ b/src/vnet/ip/ip_packet.h
diff --git a/vnet/vnet/ip/ip_source_and_port_range_check.h b/src/vnet/ip/ip_source_and_port_range_check.h
index fefe5ff1..fefe5ff1 100644
--- a/vnet/vnet/ip/ip_source_and_port_range_check.h
+++ b/src/vnet/ip/ip_source_and_port_range_check.h
diff --git a/vnet/vnet/ip/lookup.c b/src/vnet/ip/lookup.c
index 734a4cd7..734a4cd7 100644
--- a/vnet/vnet/ip/lookup.c
+++ b/src/vnet/ip/lookup.c
diff --git a/vnet/vnet/ip/lookup.h b/src/vnet/ip/lookup.h
index 3dbd7b3b..3dbd7b3b 100644
--- a/vnet/vnet/ip/lookup.h
+++ b/src/vnet/ip/lookup.h
diff --git a/vnet/vnet/ip/ping.c b/src/vnet/ip/ping.c
index 68dbe759..68dbe759 100644
--- a/vnet/vnet/ip/ping.c
+++ b/src/vnet/ip/ping.c
diff --git a/vnet/vnet/ip/ping.h b/src/vnet/ip/ping.h
index 8f41f45c..8f41f45c 100644
--- a/vnet/vnet/ip/ping.h
+++ b/src/vnet/ip/ping.h
diff --git a/vnet/vnet/ip/ports.def b/src/vnet/ip/ports.def
index cdb754f5..cdb754f5 100644
--- a/vnet/vnet/ip/ports.def
+++ b/src/vnet/ip/ports.def
diff --git a/vnet/vnet/ip/protocols.def b/src/vnet/ip/protocols.def
index 77fab31d..77fab31d 100644
--- a/vnet/vnet/ip/protocols.def
+++ b/src/vnet/ip/protocols.def
diff --git a/vnet/vnet/ip/punt.c b/src/vnet/ip/punt.c
index 9c735128..9c735128 100644
--- a/vnet/vnet/ip/punt.c
+++ b/src/vnet/ip/punt.c
diff --git a/vnet/vnet/ip/punt.h b/src/vnet/ip/punt.h
index 09a9d4c5..09a9d4c5 100644
--- a/vnet/vnet/ip/punt.h
+++ b/src/vnet/ip/punt.h
diff --git a/vnet/vnet/ip/punt_error.def b/src/vnet/ip/punt_error.def
index a76d7e7b..a76d7e7b 100644
--- a/vnet/vnet/ip/punt_error.def
+++ b/src/vnet/ip/punt_error.def
diff --git a/vnet/vnet/ip/tcp_packet.h b/src/vnet/ip/tcp_packet.h
index ed402403..ed402403 100644
--- a/vnet/vnet/ip/tcp_packet.h
+++ b/src/vnet/ip/tcp_packet.h
diff --git a/vnet/vnet/ip/udp.h b/src/vnet/ip/udp.h
index 03c62e0b..03c62e0b 100644
--- a/vnet/vnet/ip/udp.h
+++ b/src/vnet/ip/udp.h
diff --git a/vnet/vnet/ip/udp_error.def b/src/vnet/ip/udp_error.def
index bfdae0ac..bfdae0ac 100644
--- a/vnet/vnet/ip/udp_error.def
+++ b/src/vnet/ip/udp_error.def
diff --git a/vnet/vnet/ip/udp_format.c b/src/vnet/ip/udp_format.c
index abdf561e..abdf561e 100644
--- a/vnet/vnet/ip/udp_format.c
+++ b/src/vnet/ip/udp_format.c
diff --git a/vnet/vnet/ip/udp_init.c b/src/vnet/ip/udp_init.c
index 1241ca4a..1241ca4a 100644
--- a/vnet/vnet/ip/udp_init.c
+++ b/src/vnet/ip/udp_init.c
diff --git a/vnet/vnet/ip/udp_local.c b/src/vnet/ip/udp_local.c
index 13ab6e4f..13ab6e4f 100644
--- a/vnet/vnet/ip/udp_local.c
+++ b/src/vnet/ip/udp_local.c
diff --git a/vnet/vnet/ip/udp_packet.h b/src/vnet/ip/udp_packet.h
index beea3059..beea3059 100644
--- a/vnet/vnet/ip/udp_packet.h
+++ b/src/vnet/ip/udp_packet.h
diff --git a/vnet/vnet/ip/udp_pg.c b/src/vnet/ip/udp_pg.c
index c9d8d38c..c9d8d38c 100644
--- a/vnet/vnet/ip/udp_pg.c
+++ b/src/vnet/ip/udp_pg.c
diff --git a/vnet/vnet/ipsec-gre/dir.dox b/src/vnet/ipsec-gre/dir.dox
index e6ffd10b..e6ffd10b 100644
--- a/vnet/vnet/ipsec-gre/dir.dox
+++ b/src/vnet/ipsec-gre/dir.dox
diff --git a/vnet/vnet/ipsec-gre/error.def b/src/vnet/ipsec-gre/error.def
index d84e8ed1..d84e8ed1 100644
--- a/vnet/vnet/ipsec-gre/error.def
+++ b/src/vnet/ipsec-gre/error.def
diff --git a/vnet/vnet/ipsec-gre/interface.c b/src/vnet/ipsec-gre/interface.c
index 56832ee1..56832ee1 100644
--- a/vnet/vnet/ipsec-gre/interface.c
+++ b/src/vnet/ipsec-gre/interface.c
diff --git a/vnet/vnet/ipsec-gre/ipsec_gre.api b/src/vnet/ipsec-gre/ipsec_gre.api
index 793bca0a..793bca0a 100644
--- a/vnet/vnet/ipsec-gre/ipsec_gre.api
+++ b/src/vnet/ipsec-gre/ipsec_gre.api
diff --git a/vnet/vnet/ipsec-gre/ipsec_gre.c b/src/vnet/ipsec-gre/ipsec_gre.c
index a0b065ac..a0b065ac 100644
--- a/vnet/vnet/ipsec-gre/ipsec_gre.c
+++ b/src/vnet/ipsec-gre/ipsec_gre.c
diff --git a/vnet/vnet/ipsec-gre/ipsec_gre.h b/src/vnet/ipsec-gre/ipsec_gre.h
index a2ca64b6..a2ca64b6 100644
--- a/vnet/vnet/ipsec-gre/ipsec_gre.h
+++ b/src/vnet/ipsec-gre/ipsec_gre.h
diff --git a/vnet/vnet/ipsec-gre/ipsec_gre_api.c b/src/vnet/ipsec-gre/ipsec_gre_api.c
index a7ea1490..a7ea1490 100644
--- a/vnet/vnet/ipsec-gre/ipsec_gre_api.c
+++ b/src/vnet/ipsec-gre/ipsec_gre_api.c
diff --git a/vnet/vnet/ipsec-gre/ipsec_gre_doc.md b/src/vnet/ipsec-gre/ipsec_gre_doc.md
index e1bb9cda..e1bb9cda 100644
--- a/vnet/vnet/ipsec-gre/ipsec_gre_doc.md
+++ b/src/vnet/ipsec-gre/ipsec_gre_doc.md
diff --git a/vnet/vnet/ipsec-gre/node.c b/src/vnet/ipsec-gre/node.c
index d20f248a..d20f248a 100644
--- a/vnet/vnet/ipsec-gre/node.c
+++ b/src/vnet/ipsec-gre/node.c
diff --git a/vnet/vnet/ipsec/esp.h b/src/vnet/ipsec/esp.h
index 50cac806..50cac806 100644
--- a/vnet/vnet/ipsec/esp.h
+++ b/src/vnet/ipsec/esp.h
diff --git a/vnet/vnet/ipsec/esp_decrypt.c b/src/vnet/ipsec/esp_decrypt.c
index e69cd851..e69cd851 100644
--- a/vnet/vnet/ipsec/esp_decrypt.c
+++ b/src/vnet/ipsec/esp_decrypt.c
diff --git a/vnet/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c
index 7b7f9b9c..7b7f9b9c 100644
--- a/vnet/vnet/ipsec/esp_encrypt.c
+++ b/src/vnet/ipsec/esp_encrypt.c
diff --git a/vnet/vnet/ipsec/ikev2.c b/src/vnet/ipsec/ikev2.c
index 5a6c3674..5a6c3674 100644
--- a/vnet/vnet/ipsec/ikev2.c
+++ b/src/vnet/ipsec/ikev2.c
diff --git a/vnet/vnet/ipsec/ikev2.h b/src/vnet/ipsec/ikev2.h
index 723fdde8..723fdde8 100644
--- a/vnet/vnet/ipsec/ikev2.h
+++ b/src/vnet/ipsec/ikev2.h
diff --git a/vnet/vnet/ipsec/ikev2_cli.c b/src/vnet/ipsec/ikev2_cli.c
index 1369c187..1369c187 100644
--- a/vnet/vnet/ipsec/ikev2_cli.c
+++ b/src/vnet/ipsec/ikev2_cli.c
diff --git a/vnet/vnet/ipsec/ikev2_crypto.c b/src/vnet/ipsec/ikev2_crypto.c
index 32927629..32927629 100644
--- a/vnet/vnet/ipsec/ikev2_crypto.c
+++ b/src/vnet/ipsec/ikev2_crypto.c
diff --git a/vnet/vnet/ipsec/ikev2_format.c b/src/vnet/ipsec/ikev2_format.c
index 4d7a007f..4d7a007f 100644
--- a/vnet/vnet/ipsec/ikev2_format.c
+++ b/src/vnet/ipsec/ikev2_format.c
diff --git a/vnet/vnet/ipsec/ikev2_payload.c b/src/vnet/ipsec/ikev2_payload.c
index dd14812b..dd14812b 100644
--- a/vnet/vnet/ipsec/ikev2_payload.c
+++ b/src/vnet/ipsec/ikev2_payload.c
diff --git a/vnet/vnet/ipsec/ikev2_priv.h b/src/vnet/ipsec/ikev2_priv.h
index 9f67ad2a..9f67ad2a 100644
--- a/vnet/vnet/ipsec/ikev2_priv.h
+++ b/src/vnet/ipsec/ikev2_priv.h
diff --git a/vnet/vnet/ipsec/ipsec.api b/src/vnet/ipsec/ipsec.api
index 178bb757..178bb757 100644
--- a/vnet/vnet/ipsec/ipsec.api
+++ b/src/vnet/ipsec/ipsec.api
diff --git a/vnet/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c
index ee85c402..ee85c402 100644
--- a/vnet/vnet/ipsec/ipsec.c
+++ b/src/vnet/ipsec/ipsec.c
diff --git a/vnet/vnet/ipsec/ipsec.h b/src/vnet/ipsec/ipsec.h
index 32c7edfc..32c7edfc 100644
--- a/vnet/vnet/ipsec/ipsec.h
+++ b/src/vnet/ipsec/ipsec.h
diff --git a/vnet/vnet/ipsec/ipsec_api.c b/src/vnet/ipsec/ipsec_api.c
index 30cc5bd2..30cc5bd2 100644
--- a/vnet/vnet/ipsec/ipsec_api.c
+++ b/src/vnet/ipsec/ipsec_api.c
diff --git a/vnet/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c
index 7ab85d4a..7ab85d4a 100644
--- a/vnet/vnet/ipsec/ipsec_cli.c
+++ b/src/vnet/ipsec/ipsec_cli.c
diff --git a/vnet/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c
index 38aed79a..38aed79a 100644
--- a/vnet/vnet/ipsec/ipsec_format.c
+++ b/src/vnet/ipsec/ipsec_format.c
diff --git a/vnet/vnet/ipsec/ipsec_if.c b/src/vnet/ipsec/ipsec_if.c
index a8da046f..a8da046f 100644
--- a/vnet/vnet/ipsec/ipsec_if.c
+++ b/src/vnet/ipsec/ipsec_if.c
diff --git a/vnet/vnet/ipsec/ipsec_if_in.c b/src/vnet/ipsec/ipsec_if_in.c
index db75ab92..db75ab92 100644
--- a/vnet/vnet/ipsec/ipsec_if_in.c
+++ b/src/vnet/ipsec/ipsec_if_in.c
diff --git a/vnet/vnet/ipsec/ipsec_if_out.c b/src/vnet/ipsec/ipsec_if_out.c
index 8f062828..8f062828 100644
--- a/vnet/vnet/ipsec/ipsec_if_out.c
+++ b/src/vnet/ipsec/ipsec_if_out.c
diff --git a/vnet/vnet/ipsec/ipsec_input.c b/src/vnet/ipsec/ipsec_input.c
index 4662c1a1..4662c1a1 100644
--- a/vnet/vnet/ipsec/ipsec_input.c
+++ b/src/vnet/ipsec/ipsec_input.c
diff --git a/vnet/vnet/ipsec/ipsec_output.c b/src/vnet/ipsec/ipsec_output.c
index 97977899..97977899 100644
--- a/vnet/vnet/ipsec/ipsec_output.c
+++ b/src/vnet/ipsec/ipsec_output.c
diff --git a/vnet/vnet/l2/dir.dox b/src/vnet/l2/dir.dox
index 8497a2f6..8497a2f6 100644
--- a/vnet/vnet/l2/dir.dox
+++ b/src/vnet/l2/dir.dox
diff --git a/vnet/vnet/l2/feat_bitmap.c b/src/vnet/l2/feat_bitmap.c
index 6c046467..6c046467 100644
--- a/vnet/vnet/l2/feat_bitmap.c
+++ b/src/vnet/l2/feat_bitmap.c
diff --git a/vnet/vnet/l2/feat_bitmap.h b/src/vnet/l2/feat_bitmap.h
index c6e02ecc..c6e02ecc 100644
--- a/vnet/vnet/l2/feat_bitmap.h
+++ b/src/vnet/l2/feat_bitmap.h
diff --git a/vnet/vnet/l2/l2.api b/src/vnet/l2/l2.api
index 5fce7944..5fce7944 100644
--- a/vnet/vnet/l2/l2.api
+++ b/src/vnet/l2/l2.api
diff --git a/vnet/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c
index ca4f593f..ca4f593f 100644
--- a/vnet/vnet/l2/l2_api.c
+++ b/src/vnet/l2/l2_api.c
diff --git a/vnet/vnet/l2/l2_bd.c b/src/vnet/l2/l2_bd.c
index 22f83d0b..22f83d0b 100644
--- a/vnet/vnet/l2/l2_bd.c
+++ b/src/vnet/l2/l2_bd.c
diff --git a/vnet/vnet/l2/l2_bd.h b/src/vnet/l2/l2_bd.h
index 4bb9bc9b..4bb9bc9b 100644
--- a/vnet/vnet/l2/l2_bd.h
+++ b/src/vnet/l2/l2_bd.h
diff --git a/vnet/vnet/l2/l2_bvi.c b/src/vnet/l2/l2_bvi.c
index f239743a..f239743a 100644
--- a/vnet/vnet/l2/l2_bvi.c
+++ b/src/vnet/l2/l2_bvi.c
diff --git a/vnet/vnet/l2/l2_bvi.h b/src/vnet/l2/l2_bvi.h
index dd1130a6..dd1130a6 100644
--- a/vnet/vnet/l2/l2_bvi.h
+++ b/src/vnet/l2/l2_bvi.h
diff --git a/vnet/vnet/l2/l2_classify.h b/src/vnet/l2/l2_classify.h
index 184187ff..184187ff 100644
--- a/vnet/vnet/l2/l2_classify.h
+++ b/src/vnet/l2/l2_classify.h
diff --git a/vnet/vnet/l2/l2_efp_filter.c b/src/vnet/l2/l2_efp_filter.c
index 2db4dc69..2db4dc69 100644
--- a/vnet/vnet/l2/l2_efp_filter.c
+++ b/src/vnet/l2/l2_efp_filter.c
diff --git a/vnet/vnet/l2/l2_efp_filter.h b/src/vnet/l2/l2_efp_filter.h
index f40851df..f40851df 100644
--- a/vnet/vnet/l2/l2_efp_filter.h
+++ b/src/vnet/l2/l2_efp_filter.h
diff --git a/vnet/vnet/l2/l2_fib.c b/src/vnet/l2/l2_fib.c
index d34836e3..d34836e3 100644
--- a/vnet/vnet/l2/l2_fib.c
+++ b/src/vnet/l2/l2_fib.c
diff --git a/vnet/vnet/l2/l2_fib.h b/src/vnet/l2/l2_fib.h
index 4a2da59b..4a2da59b 100644
--- a/vnet/vnet/l2/l2_fib.h
+++ b/src/vnet/l2/l2_fib.h
diff --git a/vnet/vnet/l2/l2_flood.c b/src/vnet/l2/l2_flood.c
index ed9e5ac2..ed9e5ac2 100644
--- a/vnet/vnet/l2/l2_flood.c
+++ b/src/vnet/l2/l2_flood.c
diff --git a/vnet/vnet/l2/l2_flood.h b/src/vnet/l2/l2_flood.h
index acd7c905..acd7c905 100644
--- a/vnet/vnet/l2/l2_flood.h
+++ b/src/vnet/l2/l2_flood.h
diff --git a/vnet/vnet/l2/l2_fwd.c b/src/vnet/l2/l2_fwd.c
index 710a9d9e..710a9d9e 100644
--- a/vnet/vnet/l2/l2_fwd.c
+++ b/src/vnet/l2/l2_fwd.c
diff --git a/vnet/vnet/l2/l2_fwd.h b/src/vnet/l2/l2_fwd.h
index 3968732d..3968732d 100644
--- a/vnet/vnet/l2/l2_fwd.h
+++ b/src/vnet/l2/l2_fwd.h
diff --git a/vnet/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c
index a104ec9e..a104ec9e 100644
--- a/vnet/vnet/l2/l2_input.c
+++ b/src/vnet/l2/l2_input.c
diff --git a/vnet/vnet/l2/l2_input.h b/src/vnet/l2/l2_input.h
index f3fada6a..f3fada6a 100644
--- a/vnet/vnet/l2/l2_input.h
+++ b/src/vnet/l2/l2_input.h
diff --git a/vnet/vnet/l2/l2_input_acl.c b/src/vnet/l2/l2_input_acl.c
index 104fcd15..104fcd15 100644
--- a/vnet/vnet/l2/l2_input_acl.c
+++ b/src/vnet/l2/l2_input_acl.c
diff --git a/vnet/vnet/l2/l2_input_classify.c b/src/vnet/l2/l2_input_classify.c
index 497df192..497df192 100644
--- a/vnet/vnet/l2/l2_input_classify.c
+++ b/src/vnet/l2/l2_input_classify.c
diff --git a/vnet/vnet/l2/l2_input_vtr.c b/src/vnet/l2/l2_input_vtr.c
index 60a39631..60a39631 100644
--- a/vnet/vnet/l2/l2_input_vtr.c
+++ b/src/vnet/l2/l2_input_vtr.c
diff --git a/vnet/vnet/l2/l2_input_vtr.h b/src/vnet/l2/l2_input_vtr.h
index f248669e..f248669e 100644
--- a/vnet/vnet/l2/l2_input_vtr.h
+++ b/src/vnet/l2/l2_input_vtr.h
diff --git a/vnet/vnet/l2/l2_learn.c b/src/vnet/l2/l2_learn.c
index 7f19f936..7f19f936 100644
--- a/vnet/vnet/l2/l2_learn.c
+++ b/src/vnet/l2/l2_learn.c
diff --git a/vnet/vnet/l2/l2_learn.h b/src/vnet/l2/l2_learn.h
index 5bb1130b..5bb1130b 100644
--- a/vnet/vnet/l2/l2_learn.h
+++ b/src/vnet/l2/l2_learn.h
diff --git a/vnet/vnet/l2/l2_output.c b/src/vnet/l2/l2_output.c
index 953fcb02..953fcb02 100644
--- a/vnet/vnet/l2/l2_output.c
+++ b/src/vnet/l2/l2_output.c
diff --git a/vnet/vnet/l2/l2_output.h b/src/vnet/l2/l2_output.h
index c683b1ad..c683b1ad 100644
--- a/vnet/vnet/l2/l2_output.h
+++ b/src/vnet/l2/l2_output.h
diff --git a/vnet/vnet/l2/l2_output_acl.c b/src/vnet/l2/l2_output_acl.c
index 94a4d66b..94a4d66b 100644
--- a/vnet/vnet/l2/l2_output_acl.c
+++ b/src/vnet/l2/l2_output_acl.c
diff --git a/vnet/vnet/l2/l2_output_classify.c b/src/vnet/l2/l2_output_classify.c
index 27d5eb39..27d5eb39 100644
--- a/vnet/vnet/l2/l2_output_classify.c
+++ b/src/vnet/l2/l2_output_classify.c
diff --git a/vnet/vnet/l2/l2_patch.c b/src/vnet/l2/l2_patch.c
index 5e4691f4..5e4691f4 100644
--- a/vnet/vnet/l2/l2_patch.c
+++ b/src/vnet/l2/l2_patch.c
diff --git a/vnet/vnet/l2/l2_rw.c b/src/vnet/l2/l2_rw.c
index c54509d0..c54509d0 100644
--- a/vnet/vnet/l2/l2_rw.c
+++ b/src/vnet/l2/l2_rw.c
diff --git a/vnet/vnet/l2/l2_rw.h b/src/vnet/l2/l2_rw.h
index 49aa25fb..49aa25fb 100644
--- a/vnet/vnet/l2/l2_rw.h
+++ b/src/vnet/l2/l2_rw.h
diff --git a/vnet/vnet/l2/l2_vtr.c b/src/vnet/l2/l2_vtr.c
index 95a4f157..95a4f157 100644
--- a/vnet/vnet/l2/l2_vtr.c
+++ b/src/vnet/l2/l2_vtr.c
diff --git a/vnet/vnet/l2/l2_vtr.h b/src/vnet/l2/l2_vtr.h
index 893b2272..893b2272 100644
--- a/vnet/vnet/l2/l2_vtr.h
+++ b/src/vnet/l2/l2_vtr.h
diff --git a/vnet/vnet/l2/l2_xcrw.c b/src/vnet/l2/l2_xcrw.c
index 70610a85..70610a85 100644
--- a/vnet/vnet/l2/l2_xcrw.c
+++ b/src/vnet/l2/l2_xcrw.c
diff --git a/vnet/vnet/l2/l2_xcrw.h b/src/vnet/l2/l2_xcrw.h
index ca80aae9..ca80aae9 100644
--- a/vnet/vnet/l2/l2_xcrw.h
+++ b/src/vnet/l2/l2_xcrw.h
diff --git a/vnet/vnet/l2tp/decap.c b/src/vnet/l2tp/decap.c
index e8986935..e8986935 100644
--- a/vnet/vnet/l2tp/decap.c
+++ b/src/vnet/l2tp/decap.c
diff --git a/vnet/vnet/l2tp/encap.c b/src/vnet/l2tp/encap.c
index ed7a9580..ed7a9580 100644
--- a/vnet/vnet/l2tp/encap.c
+++ b/src/vnet/l2tp/encap.c
diff --git a/vnet/vnet/l2tp/l2tp.api b/src/vnet/l2tp/l2tp.api
index 5a5a5a48..5a5a5a48 100644
--- a/vnet/vnet/l2tp/l2tp.api
+++ b/src/vnet/l2tp/l2tp.api
diff --git a/vnet/vnet/l2tp/l2tp.c b/src/vnet/l2tp/l2tp.c
index a4531dab..a4531dab 100644
--- a/vnet/vnet/l2tp/l2tp.c
+++ b/src/vnet/l2tp/l2tp.c
diff --git a/vnet/vnet/l2tp/l2tp.h b/src/vnet/l2tp/l2tp.h
index e7d2892c..e7d2892c 100644
--- a/vnet/vnet/l2tp/l2tp.h
+++ b/src/vnet/l2tp/l2tp.h
diff --git a/vnet/vnet/l2tp/l2tp_api.c b/src/vnet/l2tp/l2tp_api.c
index 88d758c9..88d758c9 100644
--- a/vnet/vnet/l2tp/l2tp_api.c
+++ b/src/vnet/l2tp/l2tp_api.c
diff --git a/vnet/vnet/l2tp/packet.h b/src/vnet/l2tp/packet.h
index 66dfea21..66dfea21 100644
--- a/vnet/vnet/l2tp/packet.h
+++ b/src/vnet/l2tp/packet.h
diff --git a/vnet/vnet/l2tp/pg.c b/src/vnet/l2tp/pg.c
index 1e523d3b..1e523d3b 100644
--- a/vnet/vnet/l2tp/pg.c
+++ b/src/vnet/l2tp/pg.c
diff --git a/vnet/vnet/l3_types.h b/src/vnet/l3_types.h
index 28b0891e..28b0891e 100644
--- a/vnet/vnet/l3_types.h
+++ b/src/vnet/l3_types.h
diff --git a/vnet/vnet/lawful-intercept/lawful_intercept.c b/src/vnet/lawful-intercept/lawful_intercept.c
index ef07a339..ef07a339 100644
--- a/vnet/vnet/lawful-intercept/lawful_intercept.c
+++ b/src/vnet/lawful-intercept/lawful_intercept.c
diff --git a/vnet/vnet/lawful-intercept/lawful_intercept.h b/src/vnet/lawful-intercept/lawful_intercept.h
index 89e699f5..89e699f5 100644
--- a/vnet/vnet/lawful-intercept/lawful_intercept.h
+++ b/src/vnet/lawful-intercept/lawful_intercept.h
diff --git a/vnet/vnet/lawful-intercept/node.c b/src/vnet/lawful-intercept/node.c
index ea0cd8ef..ea0cd8ef 100644
--- a/vnet/vnet/lawful-intercept/node.c
+++ b/src/vnet/lawful-intercept/node.c
diff --git a/vnet/vnet/lisp-cp/control.c b/src/vnet/lisp-cp/control.c
index de048a41..de048a41 100644
--- a/vnet/vnet/lisp-cp/control.c
+++ b/src/vnet/lisp-cp/control.c
diff --git a/vnet/vnet/lisp-cp/control.h b/src/vnet/lisp-cp/control.h
index e89c6fd6..e89c6fd6 100644
--- a/vnet/vnet/lisp-cp/control.h
+++ b/src/vnet/lisp-cp/control.h
diff --git a/vnet/vnet/lisp-cp/gid_dictionary.c b/src/vnet/lisp-cp/gid_dictionary.c
index d238124e..d238124e 100644
--- a/vnet/vnet/lisp-cp/gid_dictionary.c
+++ b/src/vnet/lisp-cp/gid_dictionary.c
diff --git a/vnet/vnet/lisp-cp/gid_dictionary.h b/src/vnet/lisp-cp/gid_dictionary.h
index c5aaf8cb..c5aaf8cb 100644
--- a/vnet/vnet/lisp-cp/gid_dictionary.h
+++ b/src/vnet/lisp-cp/gid_dictionary.h
diff --git a/vnet/vnet/lisp-cp/lisp.api b/src/vnet/lisp-cp/lisp.api
index 20c17aa3..20c17aa3 100644
--- a/vnet/vnet/lisp-cp/lisp.api
+++ b/src/vnet/lisp-cp/lisp.api
diff --git a/vnet/vnet/lisp-cp/lisp_api.c b/src/vnet/lisp-cp/lisp_api.c
index d3fc4627..d3fc4627 100644
--- a/vnet/vnet/lisp-cp/lisp_api.c
+++ b/src/vnet/lisp-cp/lisp_api.c
diff --git a/vnet/vnet/lisp-cp/lisp_cp_dpo.c b/src/vnet/lisp-cp/lisp_cp_dpo.c
index 185b07a2..185b07a2 100644
--- a/vnet/vnet/lisp-cp/lisp_cp_dpo.c
+++ b/src/vnet/lisp-cp/lisp_cp_dpo.c
diff --git a/vnet/vnet/lisp-cp/lisp_cp_dpo.h b/src/vnet/lisp-cp/lisp_cp_dpo.h
index f0f3fae8..f0f3fae8 100644
--- a/vnet/vnet/lisp-cp/lisp_cp_dpo.h
+++ b/src/vnet/lisp-cp/lisp_cp_dpo.h
diff --git a/vnet/vnet/lisp-cp/lisp_cp_messages.h b/src/vnet/lisp-cp/lisp_cp_messages.h
index 278f60e1..278f60e1 100644
--- a/vnet/vnet/lisp-cp/lisp_cp_messages.h
+++ b/src/vnet/lisp-cp/lisp_cp_messages.h
diff --git a/vnet/vnet/lisp-cp/lisp_msg_serdes.c b/src/vnet/lisp-cp/lisp_msg_serdes.c
index eee1885c..eee1885c 100644
--- a/vnet/vnet/lisp-cp/lisp_msg_serdes.c
+++ b/src/vnet/lisp-cp/lisp_msg_serdes.c
diff --git a/vnet/vnet/lisp-cp/lisp_msg_serdes.h b/src/vnet/lisp-cp/lisp_msg_serdes.h
index d794eff6..d794eff6 100644
--- a/vnet/vnet/lisp-cp/lisp_msg_serdes.h
+++ b/src/vnet/lisp-cp/lisp_msg_serdes.h
diff --git a/vnet/vnet/lisp-cp/lisp_types.c b/src/vnet/lisp-cp/lisp_types.c
index 5ab4a5eb..5ab4a5eb 100644
--- a/vnet/vnet/lisp-cp/lisp_types.c
+++ b/src/vnet/lisp-cp/lisp_types.c
diff --git a/vnet/vnet/lisp-cp/lisp_types.h b/src/vnet/lisp-cp/lisp_types.h
index ac58b894..ac58b894 100644
--- a/vnet/vnet/lisp-cp/lisp_types.h
+++ b/src/vnet/lisp-cp/lisp_types.h
diff --git a/vnet/vnet/lisp-cp/packets.c b/src/vnet/lisp-cp/packets.c
index 3a4f421b..3a4f421b 100644
--- a/vnet/vnet/lisp-cp/packets.c
+++ b/src/vnet/lisp-cp/packets.c
diff --git a/vnet/vnet/lisp-cp/packets.h b/src/vnet/lisp-cp/packets.h
index 212a1d78..212a1d78 100644
--- a/vnet/vnet/lisp-cp/packets.h
+++ b/src/vnet/lisp-cp/packets.h
diff --git a/vnet/vnet/lisp-gpe/decap.c b/src/vnet/lisp-gpe/decap.c
index 637d4a74..637d4a74 100644
--- a/vnet/vnet/lisp-gpe/decap.c
+++ b/src/vnet/lisp-gpe/decap.c
diff --git a/vnet/vnet/lisp-gpe/dir.dox b/src/vnet/lisp-gpe/dir.dox
index afa6da9a..afa6da9a 100644
--- a/vnet/vnet/lisp-gpe/dir.dox
+++ b/src/vnet/lisp-gpe/dir.dox
diff --git a/vnet/vnet/lisp-gpe/interface.c b/src/vnet/lisp-gpe/interface.c
index 3288b241..3288b241 100644
--- a/vnet/vnet/lisp-gpe/interface.c
+++ b/src/vnet/lisp-gpe/interface.c
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.api b/src/vnet/lisp-gpe/lisp_gpe.api
index 3956b97d..3956b97d 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe.api
+++ b/src/vnet/lisp-gpe/lisp_gpe.api
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.c b/src/vnet/lisp-gpe/lisp_gpe.c
index fbda8687..fbda8687 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe.c
+++ b/src/vnet/lisp-gpe/lisp_gpe.c
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.h b/src/vnet/lisp-gpe/lisp_gpe.h
index bb0f788b..bb0f788b 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe.h
+++ b/src/vnet/lisp-gpe/lisp_gpe.h
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.c b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
index 8c96a25c..8c96a25c 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.h b/src/vnet/lisp-gpe/lisp_gpe_adjacency.h
index adc3acae..adc3acae 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.h
+++ b/src/vnet/lisp-gpe/lisp_gpe_adjacency.h
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_api.c b/src/vnet/lisp-gpe/lisp_gpe_api.c
index 176ded50..176ded50 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_api.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_api.c
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_error.def b/src/vnet/lisp-gpe/lisp_gpe_error.def
index 415fada7..415fada7 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_error.def
+++ b/src/vnet/lisp-gpe/lisp_gpe_error.def
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.c b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
index 26a93a87..26a93a87 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.h b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
index f7923671..f7923671 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
+++ b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_packet.h b/src/vnet/lisp-gpe/lisp_gpe_packet.h
index 62ac9bd7..62ac9bd7 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_packet.h
+++ b/src/vnet/lisp-gpe/lisp_gpe_packet.h
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.c b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c
index 5b69bd15..5b69bd15 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.h b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h
index ad942f41..ad942f41 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.h
+++ b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tenant.c b/src/vnet/lisp-gpe/lisp_gpe_tenant.c
index 6abb7731..6abb7731 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_tenant.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_tenant.c
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tenant.h b/src/vnet/lisp-gpe/lisp_gpe_tenant.h
index 5db7dde8..5db7dde8 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_tenant.h
+++ b/src/vnet/lisp-gpe/lisp_gpe_tenant.h
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.c b/src/vnet/lisp-gpe/lisp_gpe_tunnel.c
index e4e59707..e4e59707 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_tunnel.c
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.h b/src/vnet/lisp-gpe/lisp_gpe_tunnel.h
index 333d2882..333d2882 100644
--- a/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.h
+++ b/src/vnet/lisp-gpe/lisp_gpe_tunnel.h
diff --git a/vnet/vnet/lisp-gpe/rfc.txt b/src/vnet/lisp-gpe/rfc.txt
index 5e3da150..5e3da150 100644
--- a/vnet/vnet/lisp-gpe/rfc.txt
+++ b/src/vnet/lisp-gpe/rfc.txt
diff --git a/vnet/vnet/llc/llc.c b/src/vnet/llc/llc.c
index 975207b6..975207b6 100644
--- a/vnet/vnet/llc/llc.c
+++ b/src/vnet/llc/llc.c
diff --git a/vnet/vnet/llc/llc.h b/src/vnet/llc/llc.h
index 0b85f5d8..0b85f5d8 100644
--- a/vnet/vnet/llc/llc.h
+++ b/src/vnet/llc/llc.h
diff --git a/vnet/vnet/llc/node.c b/src/vnet/llc/node.c
index 60b5c134..60b5c134 100644
--- a/vnet/vnet/llc/node.c
+++ b/src/vnet/llc/node.c
diff --git a/vnet/vnet/llc/pg.c b/src/vnet/llc/pg.c
index ad18a4b0..ad18a4b0 100644
--- a/vnet/vnet/llc/pg.c
+++ b/src/vnet/llc/pg.c
diff --git a/vnet/vnet/lldp/dir.dox b/src/vnet/lldp/dir.dox
index 6aa45f70..6aa45f70 100644
--- a/vnet/vnet/lldp/dir.dox
+++ b/src/vnet/lldp/dir.dox
diff --git a/vnet/vnet/lldp/lldp_cli.c b/src/vnet/lldp/lldp_cli.c
index 45f688c5..45f688c5 100644
--- a/vnet/vnet/lldp/lldp_cli.c
+++ b/src/vnet/lldp/lldp_cli.c
diff --git a/vnet/vnet/lldp/lldp_doc.md b/src/vnet/lldp/lldp_doc.md
index bac480a5..bac480a5 100644
--- a/vnet/vnet/lldp/lldp_doc.md
+++ b/src/vnet/lldp/lldp_doc.md
diff --git a/vnet/vnet/lldp/lldp_input.c b/src/vnet/lldp/lldp_input.c
index 762743d0..762743d0 100644
--- a/vnet/vnet/lldp/lldp_input.c
+++ b/src/vnet/lldp/lldp_input.c
diff --git a/vnet/vnet/lldp/lldp_node.c b/src/vnet/lldp/lldp_node.c
index acaa5e10..acaa5e10 100644
--- a/vnet/vnet/lldp/lldp_node.c
+++ b/src/vnet/lldp/lldp_node.c
diff --git a/vnet/vnet/lldp/lldp_node.h b/src/vnet/lldp/lldp_node.h
index 477ca7dc..477ca7dc 100644
--- a/vnet/vnet/lldp/lldp_node.h
+++ b/src/vnet/lldp/lldp_node.h
diff --git a/vnet/vnet/lldp/lldp_output.c b/src/vnet/lldp/lldp_output.c
index 6cb26270..6cb26270 100644
--- a/vnet/vnet/lldp/lldp_output.c
+++ b/src/vnet/lldp/lldp_output.c
diff --git a/vnet/vnet/lldp/lldp_protocol.h b/src/vnet/lldp/lldp_protocol.h
index e641b26e..e641b26e 100644
--- a/vnet/vnet/lldp/lldp_protocol.h
+++ b/src/vnet/lldp/lldp_protocol.h
diff --git a/vnet/vnet/map/examples/gen-rules.py b/src/vnet/map/examples/gen-rules.py
index 7964aa9a..7964aa9a 100755
--- a/vnet/vnet/map/examples/gen-rules.py
+++ b/src/vnet/map/examples/gen-rules.py
diff --git a/vnet/vnet/map/examples/health_check.c b/src/vnet/map/examples/health_check.c
index 5f0d85fe..5f0d85fe 100644
--- a/vnet/vnet/map/examples/health_check.c
+++ b/src/vnet/map/examples/health_check.c
diff --git a/vnet/vnet/map/examples/test_map.py b/src/vnet/map/examples/test_map.py
index 21388d49..21388d49 100755
--- a/vnet/vnet/map/examples/test_map.py
+++ b/src/vnet/map/examples/test_map.py
diff --git a/vnet/vnet/map/gen-rules.py b/src/vnet/map/gen-rules.py
index 533a8e23..533a8e23 100755
--- a/vnet/vnet/map/gen-rules.py
+++ b/src/vnet/map/gen-rules.py
diff --git a/vnet/vnet/map/ip4_map.c b/src/vnet/map/ip4_map.c
index 9fd10f62..9fd10f62 100644
--- a/vnet/vnet/map/ip4_map.c
+++ b/src/vnet/map/ip4_map.c
diff --git a/vnet/vnet/map/ip4_map_t.c b/src/vnet/map/ip4_map_t.c
index 15974d8a..15974d8a 100644
--- a/vnet/vnet/map/ip4_map_t.c
+++ b/src/vnet/map/ip4_map_t.c
diff --git a/vnet/vnet/map/ip6_map.c b/src/vnet/map/ip6_map.c
index d2945059..d2945059 100644
--- a/vnet/vnet/map/ip6_map.c
+++ b/src/vnet/map/ip6_map.c
diff --git a/vnet/vnet/map/ip6_map_t.c b/src/vnet/map/ip6_map_t.c
index eb3996c2..eb3996c2 100644
--- a/vnet/vnet/map/ip6_map_t.c
+++ b/src/vnet/map/ip6_map_t.c
diff --git a/vnet/vnet/map/map.api b/src/vnet/map/map.api
index 4e4be85e..4e4be85e 100644
--- a/vnet/vnet/map/map.api
+++ b/src/vnet/map/map.api
diff --git a/vnet/vnet/map/map.c b/src/vnet/map/map.c
index aeec6a94..aeec6a94 100644
--- a/vnet/vnet/map/map.c
+++ b/src/vnet/map/map.c
diff --git a/vnet/vnet/map/map.h b/src/vnet/map/map.h
index f446b739..f446b739 100644
--- a/vnet/vnet/map/map.h
+++ b/src/vnet/map/map.h
diff --git a/vnet/vnet/map/map_api.c b/src/vnet/map/map_api.c
index 7febeb3d..7febeb3d 100644
--- a/vnet/vnet/map/map_api.c
+++ b/src/vnet/map/map_api.c
diff --git a/vnet/vnet/map/map_doc.md b/src/vnet/map/map_doc.md
index 17f3c511..17f3c511 100644
--- a/vnet/vnet/map/map_doc.md
+++ b/src/vnet/map/map_doc.md
diff --git a/vnet/vnet/map/map_dpo.c b/src/vnet/map/map_dpo.c
index df2b5fa4..df2b5fa4 100644
--- a/vnet/vnet/map/map_dpo.c
+++ b/src/vnet/map/map_dpo.c
diff --git a/vnet/vnet/map/map_dpo.h b/src/vnet/map/map_dpo.h
index be510dba..be510dba 100644
--- a/vnet/vnet/map/map_dpo.h
+++ b/src/vnet/map/map_dpo.h
diff --git a/vnet/vnet/map/test.c b/src/vnet/map/test.c
index f3c893a7..f3c893a7 100644
--- a/vnet/vnet/map/test.c
+++ b/src/vnet/map/test.c
diff --git a/vnet/vnet/mcast/mcast.c b/src/vnet/mcast/mcast.c
index 55be89ae..55be89ae 100644
--- a/vnet/vnet/mcast/mcast.c
+++ b/src/vnet/mcast/mcast.c
diff --git a/vnet/vnet/mcast/mcast.h b/src/vnet/mcast/mcast.h
index 96e51442..96e51442 100644
--- a/vnet/vnet/mcast/mcast.h
+++ b/src/vnet/mcast/mcast.h
diff --git a/vnet/vnet/mcast/mcast_test.c b/src/vnet/mcast/mcast_test.c
index be80c9fc..be80c9fc 100644
--- a/vnet/vnet/mcast/mcast_test.c
+++ b/src/vnet/mcast/mcast_test.c
diff --git a/vnet/vnet/misc.c b/src/vnet/misc.c
index 4c8c4cad..4c8c4cad 100644
--- a/vnet/vnet/misc.c
+++ b/src/vnet/misc.c
diff --git a/vnet/vnet/mpls/error.def b/src/vnet/mpls/error.def
index de8b9665..de8b9665 100644
--- a/vnet/vnet/mpls/error.def
+++ b/src/vnet/mpls/error.def
diff --git a/vnet/vnet/mpls/interface.c b/src/vnet/mpls/interface.c
index 692a2d1e..692a2d1e 100644
--- a/vnet/vnet/mpls/interface.c
+++ b/src/vnet/mpls/interface.c
diff --git a/vnet/vnet/mpls/mpls.c b/src/vnet/mpls/mpls.c
index 0e610e17..0e610e17 100644
--- a/vnet/vnet/mpls/mpls.c
+++ b/src/vnet/mpls/mpls.c
diff --git a/vnet/vnet/mpls/mpls.h b/src/vnet/mpls/mpls.h
index b6fdbce7..b6fdbce7 100644
--- a/vnet/vnet/mpls/mpls.h
+++ b/src/vnet/mpls/mpls.h
diff --git a/vnet/vnet/mpls/mpls_features.c b/src/vnet/mpls/mpls_features.c
index a7593c55..a7593c55 100644
--- a/vnet/vnet/mpls/mpls_features.c
+++ b/src/vnet/mpls/mpls_features.c
diff --git a/vnet/vnet/mpls/mpls_lookup.c b/src/vnet/mpls/mpls_lookup.c
index 2d34cbde..2d34cbde 100644
--- a/vnet/vnet/mpls/mpls_lookup.c
+++ b/src/vnet/mpls/mpls_lookup.c
diff --git a/vnet/vnet/mpls/mpls_output.c b/src/vnet/mpls/mpls_output.c
index 8292a0cb..8292a0cb 100644
--- a/vnet/vnet/mpls/mpls_output.c
+++ b/src/vnet/mpls/mpls_output.c
diff --git a/vnet/vnet/mpls/mpls_tunnel.c b/src/vnet/mpls/mpls_tunnel.c
index 8d1e30a3..8d1e30a3 100644
--- a/vnet/vnet/mpls/mpls_tunnel.c
+++ b/src/vnet/mpls/mpls_tunnel.c
diff --git a/vnet/vnet/mpls/mpls_tunnel.h b/src/vnet/mpls/mpls_tunnel.h
index ee56c0fc..ee56c0fc 100644
--- a/vnet/vnet/mpls/mpls_tunnel.h
+++ b/src/vnet/mpls/mpls_tunnel.h
diff --git a/vnet/vnet/mpls/mpls_types.h b/src/vnet/mpls/mpls_types.h
index d7c629df..d7c629df 100644
--- a/vnet/vnet/mpls/mpls_types.h
+++ b/src/vnet/mpls/mpls_types.h
diff --git a/vnet/vnet/mpls/node.c b/src/vnet/mpls/node.c
index 18100912..18100912 100644
--- a/vnet/vnet/mpls/node.c
+++ b/src/vnet/mpls/node.c
diff --git a/vnet/vnet/mpls/packet.h b/src/vnet/mpls/packet.h
index bc67445b..bc67445b 100644
--- a/vnet/vnet/mpls/packet.h
+++ b/src/vnet/mpls/packet.h
diff --git a/vnet/vnet/mpls/pg.c b/src/vnet/mpls/pg.c
index 6ff86e32..6ff86e32 100644
--- a/vnet/vnet/mpls/pg.c
+++ b/src/vnet/mpls/pg.c
diff --git a/vnet/vnet/osi/node.c b/src/vnet/osi/node.c
index 12075aa8..12075aa8 100644
--- a/vnet/vnet/osi/node.c
+++ b/src/vnet/osi/node.c
diff --git a/vnet/vnet/osi/osi.c b/src/vnet/osi/osi.c
index 34c867f1..34c867f1 100644
--- a/vnet/vnet/osi/osi.c
+++ b/src/vnet/osi/osi.c
diff --git a/vnet/vnet/osi/osi.h b/src/vnet/osi/osi.h
index ee21f0c3..ee21f0c3 100644
--- a/vnet/vnet/osi/osi.h
+++ b/src/vnet/osi/osi.h
diff --git a/vnet/vnet/osi/pg.c b/src/vnet/osi/pg.c
index c87a869b..c87a869b 100644
--- a/vnet/vnet/osi/pg.c
+++ b/src/vnet/osi/pg.c
diff --git a/vnet/vnet/pg/cli.c b/src/vnet/pg/cli.c
index f5896b43..f5896b43 100644
--- a/vnet/vnet/pg/cli.c
+++ b/src/vnet/pg/cli.c
diff --git a/vnet/vnet/pg/edit.c b/src/vnet/pg/edit.c
index cb4d070f..cb4d070f 100644
--- a/vnet/vnet/pg/edit.c
+++ b/src/vnet/pg/edit.c
diff --git a/vnet/vnet/pg/edit.h b/src/vnet/pg/edit.h
index 3bfdad57..3bfdad57 100644
--- a/vnet/vnet/pg/edit.h
+++ b/src/vnet/pg/edit.h
diff --git a/vnet/vnet/pg/example.script b/src/vnet/pg/example.script
index 0e29b9ec..0e29b9ec 100644
--- a/vnet/vnet/pg/example.script
+++ b/src/vnet/pg/example.script
diff --git a/vnet/vnet/pg/init.c b/src/vnet/pg/init.c
index 631be25e..631be25e 100644
--- a/vnet/vnet/pg/init.c
+++ b/src/vnet/pg/init.c
diff --git a/vnet/vnet/pg/input.c b/src/vnet/pg/input.c
index e15faeb8..e15faeb8 100644
--- a/vnet/vnet/pg/input.c
+++ b/src/vnet/pg/input.c
diff --git a/vnet/vnet/pg/output.c b/src/vnet/pg/output.c
index 3d1f2660..3d1f2660 100644
--- a/vnet/vnet/pg/output.c
+++ b/src/vnet/pg/output.c
diff --git a/vnet/vnet/pg/pg.h b/src/vnet/pg/pg.h
index a4027834..a4027834 100644
--- a/vnet/vnet/pg/pg.h
+++ b/src/vnet/pg/pg.h
diff --git a/vnet/vnet/pg/stream.c b/src/vnet/pg/stream.c
index 1ed7189f..1ed7189f 100644
--- a/vnet/vnet/pg/stream.c
+++ b/src/vnet/pg/stream.c
diff --git a/vnet/vnet/pipeline.h b/src/vnet/pipeline.h
index a4aa5cf5..a4aa5cf5 100644
--- a/vnet/vnet/pipeline.h
+++ b/src/vnet/pipeline.h
diff --git a/vnet/vnet/plugin/p1.c b/src/vnet/plugin/p1.c
index 3102ecce..3102ecce 100644
--- a/vnet/vnet/plugin/p1.c
+++ b/src/vnet/plugin/p1.c
diff --git a/vnet/vnet/plugin/plugin.h b/src/vnet/plugin/plugin.h
index a14a5932..a14a5932 100644
--- a/vnet/vnet/plugin/plugin.h
+++ b/src/vnet/plugin/plugin.h
diff --git a/vnet/vnet/policer/node_funcs.c b/src/vnet/policer/node_funcs.c
index 1f4997ff..1f4997ff 100644
--- a/vnet/vnet/policer/node_funcs.c
+++ b/src/vnet/policer/node_funcs.c
diff --git a/vnet/vnet/policer/police.h b/src/vnet/policer/police.h
index 34bcf9ca..34bcf9ca 100644
--- a/vnet/vnet/policer/police.h
+++ b/src/vnet/policer/police.h
diff --git a/vnet/vnet/policer/policer.c b/src/vnet/policer/policer.c
index 290a6af5..290a6af5 100644
--- a/vnet/vnet/policer/policer.c
+++ b/src/vnet/policer/policer.c
diff --git a/vnet/vnet/policer/policer.h b/src/vnet/policer/policer.h
index 8e2d7c79..8e2d7c79 100644
--- a/vnet/vnet/policer/policer.h
+++ b/src/vnet/policer/policer.h
diff --git a/vnet/vnet/policer/xlate.c b/src/vnet/policer/xlate.c
index 74a6eb23..74a6eb23 100644
--- a/vnet/vnet/policer/xlate.c
+++ b/src/vnet/policer/xlate.c
diff --git a/vnet/vnet/policer/xlate.h b/src/vnet/policer/xlate.h
index 16742f80..16742f80 100644
--- a/vnet/vnet/policer/xlate.h
+++ b/src/vnet/policer/xlate.h
diff --git a/vnet/vnet/ppp/error.def b/src/vnet/ppp/error.def
index ba645408..ba645408 100644
--- a/vnet/vnet/ppp/error.def
+++ b/src/vnet/ppp/error.def
diff --git a/vnet/vnet/ppp/node.c b/src/vnet/ppp/node.c
index 4f1f6a71..4f1f6a71 100644
--- a/vnet/vnet/ppp/node.c
+++ b/src/vnet/ppp/node.c
diff --git a/vnet/vnet/ppp/packet.h b/src/vnet/ppp/packet.h
index cab9743d..cab9743d 100644
--- a/vnet/vnet/ppp/packet.h
+++ b/src/vnet/ppp/packet.h
diff --git a/vnet/vnet/ppp/pg.c b/src/vnet/ppp/pg.c
index 0b46ccb9..0b46ccb9 100644
--- a/vnet/vnet/ppp/pg.c
+++ b/src/vnet/ppp/pg.c
diff --git a/vnet/vnet/ppp/ppp.c b/src/vnet/ppp/ppp.c
index a0eefbad..a0eefbad 100644
--- a/vnet/vnet/ppp/ppp.c
+++ b/src/vnet/ppp/ppp.c
diff --git a/vnet/vnet/ppp/ppp.h b/src/vnet/ppp/ppp.h
index fdc205b6..fdc205b6 100644
--- a/vnet/vnet/ppp/ppp.h
+++ b/src/vnet/ppp/ppp.h
diff --git a/vnet/vnet/replication.c b/src/vnet/replication.c
index 561c86cd..561c86cd 100644
--- a/vnet/vnet/replication.c
+++ b/src/vnet/replication.c
diff --git a/vnet/vnet/replication.h b/src/vnet/replication.h
index 5dc554c9..5dc554c9 100644
--- a/vnet/vnet/replication.h
+++ b/src/vnet/replication.h
diff --git a/vnet/vnet/rewrite.c b/src/vnet/rewrite.c
index 53d548bc..53d548bc 100644
--- a/vnet/vnet/rewrite.c
+++ b/src/vnet/rewrite.c
diff --git a/vnet/vnet/rewrite.h b/src/vnet/rewrite.h
index 00c1efbd..00c1efbd 100644
--- a/vnet/vnet/rewrite.h
+++ b/src/vnet/rewrite.h
diff --git a/vnet/vnet/snap/node.c b/src/vnet/snap/node.c
index 884ff324..884ff324 100644
--- a/vnet/vnet/snap/node.c
+++ b/src/vnet/snap/node.c
diff --git a/vnet/vnet/snap/pg.c b/src/vnet/snap/pg.c
index aad125f3..aad125f3 100644
--- a/vnet/vnet/snap/pg.c
+++ b/src/vnet/snap/pg.c
diff --git a/vnet/vnet/snap/snap.c b/src/vnet/snap/snap.c
index 64482bfc..64482bfc 100644
--- a/vnet/vnet/snap/snap.c
+++ b/src/vnet/snap/snap.c
diff --git a/vnet/vnet/snap/snap.h b/src/vnet/snap/snap.h
index dbba15bf..dbba15bf 100644
--- a/vnet/vnet/snap/snap.h
+++ b/src/vnet/snap/snap.h
diff --git a/vnet/vnet/span/node.c b/src/vnet/span/node.c
index 50d642c2..50d642c2 100644
--- a/vnet/vnet/span/node.c
+++ b/src/vnet/span/node.c
diff --git a/vnet/vnet/span/span.api b/src/vnet/span/span.api
index 4babdd83..4babdd83 100644
--- a/vnet/vnet/span/span.api
+++ b/src/vnet/span/span.api
diff --git a/vnet/vnet/span/span.c b/src/vnet/span/span.c
index 7b5816c7..7b5816c7 100644
--- a/vnet/vnet/span/span.c
+++ b/src/vnet/span/span.c
diff --git a/vnet/vnet/span/span.h b/src/vnet/span/span.h
index a98b010b..a98b010b 100644
--- a/vnet/vnet/span/span.h
+++ b/src/vnet/span/span.h
diff --git a/vnet/vnet/span/span.md b/src/vnet/span/span.md
index ee3f814f..ee3f814f 100644
--- a/vnet/vnet/span/span.md
+++ b/src/vnet/span/span.md
diff --git a/vnet/vnet/span/span_api.c b/src/vnet/span/span_api.c
index b4565663..b4565663 100644
--- a/vnet/vnet/span/span_api.c
+++ b/src/vnet/span/span_api.c
diff --git a/vnet/vnet/sr/dir.dox b/src/vnet/sr/dir.dox
index a98b202c..a98b202c 100644
--- a/vnet/vnet/sr/dir.dox
+++ b/src/vnet/sr/dir.dox
diff --git a/vnet/vnet/sr/examples/sr_multicastmap.script b/src/vnet/sr/examples/sr_multicastmap.script
index 20bf7dc0..20bf7dc0 100644
--- a/vnet/vnet/sr/examples/sr_multicastmap.script
+++ b/src/vnet/sr/examples/sr_multicastmap.script
diff --git a/vnet/vnet/sr/rfc_draft_05.txt b/src/vnet/sr/rfc_draft_05.txt
index bc41c181..bc41c181 100644
--- a/vnet/vnet/sr/rfc_draft_05.txt
+++ b/src/vnet/sr/rfc_draft_05.txt
diff --git a/vnet/vnet/sr/sr.c b/src/vnet/sr/sr.c
index 5d0275d9..5d0275d9 100644
--- a/vnet/vnet/sr/sr.c
+++ b/src/vnet/sr/sr.c
diff --git a/vnet/vnet/sr/sr.h b/src/vnet/sr/sr.h
index 610b3699..610b3699 100644
--- a/vnet/vnet/sr/sr.h
+++ b/src/vnet/sr/sr.h
diff --git a/vnet/vnet/sr/sr_error.def b/src/vnet/sr/sr_error.def
index 62d021fd..62d021fd 100644
--- a/vnet/vnet/sr/sr_error.def
+++ b/src/vnet/sr/sr_error.def
diff --git a/vnet/vnet/sr/sr_fix_dst_error.def b/src/vnet/sr/sr_fix_dst_error.def
index 48fe7af6..48fe7af6 100644
--- a/vnet/vnet/sr/sr_fix_dst_error.def
+++ b/src/vnet/sr/sr_fix_dst_error.def
diff --git a/vnet/vnet/sr/sr_packet.h b/src/vnet/sr/sr_packet.h
index 179b94c2..179b94c2 100644
--- a/vnet/vnet/sr/sr_packet.h
+++ b/src/vnet/sr/sr_packet.h
diff --git a/vnet/vnet/sr/sr_replicate.c b/src/vnet/sr/sr_replicate.c
index 5f9de504..5f9de504 100644
--- a/vnet/vnet/sr/sr_replicate.c
+++ b/src/vnet/sr/sr_replicate.c
diff --git a/vnet/vnet/srp/format.c b/src/vnet/srp/format.c
index a0250cc9..a0250cc9 100644
--- a/vnet/vnet/srp/format.c
+++ b/src/vnet/srp/format.c
diff --git a/vnet/vnet/srp/interface.c b/src/vnet/srp/interface.c
index d427cc3c..d427cc3c 100644
--- a/vnet/vnet/srp/interface.c
+++ b/src/vnet/srp/interface.c
diff --git a/vnet/vnet/srp/node.c b/src/vnet/srp/node.c
index 897be254..897be254 100644
--- a/vnet/vnet/srp/node.c
+++ b/src/vnet/srp/node.c
diff --git a/vnet/vnet/srp/packet.h b/src/vnet/srp/packet.h
index 96dab648..96dab648 100644
--- a/vnet/vnet/srp/packet.h
+++ b/src/vnet/srp/packet.h
diff --git a/vnet/vnet/srp/pg.c b/src/vnet/srp/pg.c
index 54f1a3bb..54f1a3bb 100644
--- a/vnet/vnet/srp/pg.c
+++ b/src/vnet/srp/pg.c
diff --git a/vnet/vnet/srp/srp.h b/src/vnet/srp/srp.h
index 5288ebe4..5288ebe4 100644
--- a/vnet/vnet/srp/srp.h
+++ b/src/vnet/srp/srp.h
diff --git a/vnet/vnet/unix/gdb_funcs.c b/src/vnet/unix/gdb_funcs.c
index cfb4b247..cfb4b247 100644
--- a/vnet/vnet/unix/gdb_funcs.c
+++ b/src/vnet/unix/gdb_funcs.c
diff --git a/vnet/vnet/unix/pcap.c b/src/vnet/unix/pcap.c
index bba225f7..bba225f7 100644
--- a/vnet/vnet/unix/pcap.c
+++ b/src/vnet/unix/pcap.c
diff --git a/vnet/vnet/unix/pcap.h b/src/vnet/unix/pcap.h
index 6aaf32be..6aaf32be 100644
--- a/vnet/vnet/unix/pcap.h
+++ b/src/vnet/unix/pcap.h
diff --git a/vnet/vnet/unix/pcap2pg.c b/src/vnet/unix/pcap2pg.c
index 217a61f4..217a61f4 100644
--- a/vnet/vnet/unix/pcap2pg.c
+++ b/src/vnet/unix/pcap2pg.c
diff --git a/vnet/vnet/unix/tap.api b/src/vnet/unix/tap.api
index 9b16eadb..9b16eadb 100644
--- a/vnet/vnet/unix/tap.api
+++ b/src/vnet/unix/tap.api
diff --git a/vnet/vnet/unix/tap_api.c b/src/vnet/unix/tap_api.c
index 99b79ba2..99b79ba2 100644
--- a/vnet/vnet/unix/tap_api.c
+++ b/src/vnet/unix/tap_api.c
diff --git a/vnet/vnet/unix/tapcli.c b/src/vnet/unix/tapcli.c
index 9862a2bd..9862a2bd 100644
--- a/vnet/vnet/unix/tapcli.c
+++ b/src/vnet/unix/tapcli.c
diff --git a/vnet/vnet/unix/tapcli.h b/src/vnet/unix/tapcli.h
index fcd82dbf..fcd82dbf 100644
--- a/vnet/vnet/unix/tapcli.h
+++ b/src/vnet/unix/tapcli.h
diff --git a/vnet/vnet/unix/tuntap.c b/src/vnet/unix/tuntap.c
index 4a5dd676..4a5dd676 100644
--- a/vnet/vnet/unix/tuntap.c
+++ b/src/vnet/unix/tuntap.c
diff --git a/vnet/vnet/unix/tuntap.h b/src/vnet/unix/tuntap.h
index d7f96cae..d7f96cae 100644
--- a/vnet/vnet/unix/tuntap.h
+++ b/src/vnet/unix/tuntap.h
diff --git a/vnet/vnet/vnet.h b/src/vnet/vnet.h
index 5a8ae858..5a8ae858 100644
--- a/vnet/vnet/vnet.h
+++ b/src/vnet/vnet.h
diff --git a/vnet/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h
index 1b4d6c45..1b4d6c45 100644
--- a/vnet/vnet/vnet_all_api_h.h
+++ b/src/vnet/vnet_all_api_h.h
diff --git a/vnet/vnet/vnet_msg_enum.h b/src/vnet/vnet_msg_enum.h
index 9899471e..9899471e 100644
--- a/vnet/vnet/vnet_msg_enum.h
+++ b/src/vnet/vnet_msg_enum.h
diff --git a/vnet/vnet/vxlan-gpe/decap.c b/src/vnet/vxlan-gpe/decap.c
index 22ab4b62..22ab4b62 100644
--- a/vnet/vnet/vxlan-gpe/decap.c
+++ b/src/vnet/vxlan-gpe/decap.c
diff --git a/vnet/vnet/vxlan-gpe/dir.dox b/src/vnet/vxlan-gpe/dir.dox
index c154733b..c154733b 100644
--- a/vnet/vnet/vxlan-gpe/dir.dox
+++ b/src/vnet/vxlan-gpe/dir.dox
diff --git a/vnet/vnet/vxlan-gpe/encap.c b/src/vnet/vxlan-gpe/encap.c
index 3a486e56..3a486e56 100644
--- a/vnet/vnet/vxlan-gpe/encap.c
+++ b/src/vnet/vxlan-gpe/encap.c
diff --git a/vnet/vnet/vxlan-gpe/vxlan-gpe-rfc.txt b/src/vnet/vxlan-gpe/vxlan-gpe-rfc.txt
index 35cee50f..35cee50f 100644
--- a/vnet/vnet/vxlan-gpe/vxlan-gpe-rfc.txt
+++ b/src/vnet/vxlan-gpe/vxlan-gpe-rfc.txt
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.api b/src/vnet/vxlan-gpe/vxlan_gpe.api
index 6c6973f8..6c6973f8 100644
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe.api
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.api
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c
index b97510c4..b97510c4 100644
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe.c
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.c
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.h b/src/vnet/vxlan-gpe/vxlan_gpe.h
index 1b4bc44e..1b4bc44e 100644
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe.h
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.h
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe_api.c b/src/vnet/vxlan-gpe/vxlan_gpe_api.c
index 012a41da..012a41da 100644
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe_api.c
+++ b/src/vnet/vxlan-gpe/vxlan_gpe_api.c
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe_error.def b/src/vnet/vxlan-gpe/vxlan_gpe_error.def
index 9cf1b1cb..9cf1b1cb 100644
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe_error.def
+++ b/src/vnet/vxlan-gpe/vxlan_gpe_error.def
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe_packet.h b/src/vnet/vxlan-gpe/vxlan_gpe_packet.h
index ec3c2e58..ec3c2e58 100644
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe_packet.h
+++ b/src/vnet/vxlan-gpe/vxlan_gpe_packet.h
diff --git a/vnet/vnet/vxlan/decap.c b/src/vnet/vxlan/decap.c
index 73e50ffe..73e50ffe 100644
--- a/vnet/vnet/vxlan/decap.c
+++ b/src/vnet/vxlan/decap.c
diff --git a/vnet/vnet/vxlan/dir.dox b/src/vnet/vxlan/dir.dox
index 31a9e2b6..31a9e2b6 100644
--- a/vnet/vnet/vxlan/dir.dox
+++ b/src/vnet/vxlan/dir.dox
diff --git a/vnet/vnet/vxlan/encap.c b/src/vnet/vxlan/encap.c
index 5b63064a..5b63064a 100644
--- a/vnet/vnet/vxlan/encap.c
+++ b/src/vnet/vxlan/encap.c
diff --git a/vnet/vnet/vxlan/vxlan.api b/src/vnet/vxlan/vxlan.api
index 048220fb..048220fb 100644
--- a/vnet/vnet/vxlan/vxlan.api
+++ b/src/vnet/vxlan/vxlan.api
diff --git a/vnet/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c
index abf0182f..abf0182f 100644
--- a/vnet/vnet/vxlan/vxlan.c
+++ b/src/vnet/vxlan/vxlan.c
diff --git a/vnet/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h
index 7605d94a..7605d94a 100644
--- a/vnet/vnet/vxlan/vxlan.h
+++ b/src/vnet/vxlan/vxlan.h
diff --git a/vnet/vnet/vxlan/vxlan_api.c b/src/vnet/vxlan/vxlan_api.c
index 6c9cbd79..6c9cbd79 100644
--- a/vnet/vnet/vxlan/vxlan_api.c
+++ b/src/vnet/vxlan/vxlan_api.c
diff --git a/vnet/vnet/vxlan/vxlan_error.def b/src/vnet/vxlan/vxlan_error.def
index 17f90595..17f90595 100644
--- a/vnet/vnet/vxlan/vxlan_error.def
+++ b/src/vnet/vxlan/vxlan_error.def
diff --git a/vnet/vnet/vxlan/vxlan_packet.h b/src/vnet/vxlan/vxlan_packet.h
index 5f93a36f..5f93a36f 100644
--- a/vnet/vnet/vxlan/vxlan_packet.h
+++ b/src/vnet/vxlan/vxlan_packet.h
diff --git a/src/vpp-api-test.am b/src/vpp-api-test.am
new file mode 100644
index 00000000..fe25f6e1
--- /dev/null
+++ b/src/vpp-api-test.am
@@ -0,0 +1,64 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+libvatplugin_la_SOURCES = \
+  vat/plugin_api.c
+
+lib_LTLIBRARIES += libvatplugin.la
+
+bin_PROGRAMS += vpp_api_test vpp_json_test vpp_restart
+
+vpp_api_test_SOURCES = \
+  vat/api_format.c 	\
+  vat/main.c		\
+  vat/plugin.c		\
+  vat/vat.h		\
+  vat/json_format.h	\
+  vat/json_format.c
+
+vpp_json_test_SOURCES = \
+  vat/json_format.h	\
+  vat/json_format.c	\
+  vat/json_test.c
+
+vpp_api_test_LDFLAGS = $(DPDK_LD_FLAGS)
+vpp_api_test_LDADD = \
+  libvlib.la \
+  libvlib_unix.la \
+  libvlibmemoryclient.la		\
+  libsvm.la				\
+  libvatplugin.la			\
+  libvppinfra.la 			\
+  libvlibapi.la				\
+  libvlibmemory.la			\
+  libvnet.la \
+  $(DPDK_LD_ADD)			\
+  -lpthread -lm -lrt -ldl -lcrypto
+
+vpp_json_test_LDADD = libvppinfra.la -lm
+
+nobase_include_HEADERS += \
+  vat/vat.h 		\
+  vat/json_format.h
+
+vpp_restart_SOURCES =  \
+  vat/restart.c
+vpp_restart_LDADD = \
+  libsvmdb.la				\
+  libsvm.la				\
+  libvppinfra.la			\
+  -lpthread -lrt
+
+dist_bin_SCRIPTS += scripts/vppctl
+
+# vi:syntax=automake
diff --git a/vpp-api/python/Makefile.am b/src/vpp-api/python/Makefile.am
index 2a578464..b8ca1530 100644
--- a/vpp-api/python/Makefile.am
+++ b/src/vpp-api/python/Makefile.am
@@ -11,15 +11,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign subdir-objects
+AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir}
 
 BUILT_SOURCES =
 bin_PROGRAMS =
 CLEANFILES =
 lib_LTLIBRARIES =
-noinst_PROGRAMS = test_pneum
+noinst_PROGRAMS =
 nobase_include_HEADERS = pneum/pneum.h
 
 #
@@ -27,8 +27,13 @@ nobase_include_HEADERS = pneum/pneum.h
 #
 lib_LTLIBRARIES += libpneum.la
 libpneum_la_SOURCES = pneum/pneum.c
-libpneum_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread \
-                     -lm -lrt
+libpneum_la_LIBADD = \
+  $(top_builddir)/libvppinfra.la \
+  $(top_builddir)/libvlibmemoryclient.la \
+  $(top_builddir)/libvlibapi.la \
+  $(top_builddir)/libsvm.la \
+  -lpthread -lm -lrt
+
 libpneum_la_LDFLAGS = -module
 libpneum_la_CPPFLAGS =
 
@@ -38,14 +43,18 @@ install-exec-local:
 	mkdir -p $(prefix)/lib/python2.7/site-packages; 		\
 	PYTHONUSERBASE=$(prefix)					\
 	python setup.py build_ext -L $(prefix)/lib64 \
-	-I $(prefix)/../vppinfra/include/ install --user
+	-I $(prefix)/include/ install --user
 
 #
 # Test client
 #
 noinst_PROGRAMS += test_pneum
 test_pneum_SOURCES = pneum/pneum.c pneum/test_pneum.c
-test_pneum_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread \
-                   -lm -lrt
+test_pneum_LDADD = \
+  $(top_builddir)/libvppinfra.la \
+  $(top_builddir)/libvlibmemoryclient.la \
+  $(top_builddir)/libvlibapi.la \
+  $(top_builddir)/libsvm.la \
+  -lpthread -lm -lrt
 
 
diff --git a/src/vpp-api/python/README.rst b/src/vpp-api/python/README.rst
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/vpp-api/python/README.rst
diff --git a/vpp-api/python/pneum/pneum.c b/src/vpp-api/python/pneum/pneum.c
index 6918cc9b..b805f04b 100644
--- a/vpp-api/python/pneum/pneum.c
+++ b/src/vpp-api/python/pneum/pneum.c
@@ -31,16 +31,16 @@
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 
 #include "pneum.h"
 
 #define vl_typedefs             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 vlib_main_t vlib_global_main;
diff --git a/vpp-api/python/pneum/pneum.h b/src/vpp-api/python/pneum/pneum.h
index a347bd25..a347bd25 100644
--- a/vpp-api/python/pneum/pneum.h
+++ b/src/vpp-api/python/pneum/pneum.h
diff --git a/vpp-api/python/pneum/test_pneum.c b/src/vpp-api/python/pneum/test_pneum.c
index e873114f..0d55b8a9 100644
--- a/vpp-api/python/pneum/test_pneum.c
+++ b/src/vpp-api/python/pneum/test_pneum.c
@@ -36,13 +36,13 @@
 #include <vlibmemory/api.h>
 #include <vnet/ip/ip.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 #include <signal.h>
 #include <setjmp.h>
 #include "pneum.h"
 
 #define vl_typedefs             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h> 
+#include <vpp/api/vpe_all_api_h.h> 
 #undef vl_typedefs
 
 /* we are not linking with vlib */
diff --git a/vpp-api/python/setup.cfg b/src/vpp-api/python/setup.cfg
index d645be77..d645be77 100644
--- a/vpp-api/python/setup.cfg
+++ b/src/vpp-api/python/setup.cfg
diff --git a/vpp-api/python/setup.py b/src/vpp-api/python/setup.py
index 99a0147a..99a0147a 100644
--- a/vpp-api/python/setup.py
+++ b/src/vpp-api/python/setup.py
diff --git a/vpp-api/python/tests/test_cli.py b/src/vpp-api/python/tests/test_cli.py
index 66fb6943..66fb6943 100755
--- a/vpp-api/python/tests/test_cli.py
+++ b/src/vpp-api/python/tests/test_cli.py
diff --git a/vpp-api/python/tests/test_modules.py b/src/vpp-api/python/tests/test_modules.py
index fdcd092c..fdcd092c 100755
--- a/vpp-api/python/tests/test_modules.py
+++ b/src/vpp-api/python/tests/test_modules.py
diff --git a/vpp-api/python/tests/test_papi.py b/src/vpp-api/python/tests/test_papi.py
index 8cbbfc59..8cbbfc59 100755
--- a/vpp-api/python/tests/test_papi.py
+++ b/src/vpp-api/python/tests/test_papi.py
diff --git a/vpp-api/python/tests/test_version.py b/src/vpp-api/python/tests/test_version.py
index de39cc24..de39cc24 100755
--- a/vpp-api/python/tests/test_version.py
+++ b/src/vpp-api/python/tests/test_version.py
diff --git a/vpp-api/python/tests/test_vpp_papi2.py b/src/vpp-api/python/tests/test_vpp_papi2.py
index f45f791e..f45f791e 100755
--- a/vpp-api/python/tests/test_vpp_papi2.py
+++ b/src/vpp-api/python/tests/test_vpp_papi2.py
diff --git a/vpp-api/python/vpp_papi/__init__.py b/src/vpp-api/python/vpp_papi/__init__.py
index 6688ffb8..6688ffb8 100644
--- a/vpp-api/python/vpp_papi/__init__.py
+++ b/src/vpp-api/python/vpp_papi/__init__.py
diff --git a/vpp-api/python/vpp_papi/pneum_wrap.c b/src/vpp-api/python/vpp_papi/pneum_wrap.c
index 5763707b..5763707b 100644
--- a/vpp-api/python/vpp_papi/pneum_wrap.c
+++ b/src/vpp-api/python/vpp_papi/pneum_wrap.c
diff --git a/vpp-api/python/vpp_papi/vpp_papi.py b/src/vpp-api/python/vpp_papi/vpp_papi.py
index 6b6b79fd..6b6b79fd 100644
--- a/vpp-api/python/vpp_papi/vpp_papi.py
+++ b/src/vpp-api/python/vpp_papi/vpp_papi.py
diff --git a/src/vpp.am b/src/vpp.am
new file mode 100644
index 00000000..a02206f8
--- /dev/null
+++ b/src/vpp.am
@@ -0,0 +1,159 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bin_PROGRAMS += bin/vpp
+
+bin_vpp_SOURCES =				\
+  vpp/vnet/main.c				\
+  vpp/app/vpe_cli.c				\
+  vpp/app/version.c				\
+  vpp/oam/oam.c					\
+  vpp/stats/stats.c
+
+bin_vpp_SOURCES +=				\
+  vpp/api/api.c					\
+  vpp/api/custom_dump.c				\
+  vpp/api/json_format.c
+
+if WITH_APICLI
+  bin_vpp_SOURCES +=				\
+  vpp/api/api_format.c				\
+  vpp/api/api_main.c
+endif
+
+# comment out to disable stats upload to gmond
+
+bin_vpp_CFLAGS = @APICLI@
+bin_vpp_SOURCES +=				\
+  vpp/api/gmon.c
+
+nobase_include_HEADERS +=			\
+  vpp/api/vpe_all_api_h.h			\
+  vpp/api/vpe_msg_enum.h			\
+  vpp/api/vpe.api.h
+
+API_FILES += vpp/api/vpe.api
+
+BUILT_SOURCES += vpp/app/version.h
+
+vpp/app/version.o:	vpp/app/version.h
+
+.PHONY:	vpp/app/version.h
+
+vpp/app/version.h:
+	@echo "  VERSION " $@
+	@echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
+	@echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
+	@echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
+	@echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" 	>> $@
+	@echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
+
+# Generate a plugin configuration script. Misconfiguring a
+# plugin can cause very subtle problems.
+
+bin_SCRIPTS = vpp_plugin_configure
+
+BUILT_SOURCES += vpp_plugin_configure
+
+.PHONY: vpp_plugin_configure
+
+if WITH_DPDK
+PLUGIN_DPDK_ARG="--with-dpdk"
+else
+PLUGIN_DPDK_ARG=""
+endif
+
+vpp_plugin_configure:
+	@echo "PLUGIN CONFIGURE " $@ 
+	@echo "#!/bin/bash" > $@
+	@echo " " >> $@
+	@echo "set +eu" >> $@
+	@echo " " >> $@
+	@echo "if [ -f ./configure ] ; then" >> $@
+	@echo "    CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ./configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@
+	@echo "else" >> $@
+	@echo "    if [ -f ../configure ] ; then" >> $@
+	@echo "        CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ../configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@
+	@echo "    else" >> $@
+	@echo "        echo Couldnt find ./configure or ../configure " >> $@
+	@echo "        exit 1" >> $@
+	@echo "    fi" >> $@
+	@echo "fi" >> $@
+
+bin_vpp_LDADD = \
+  libvlibapi.la \
+  libvlibmemory.la \
+  libvlib_unix.la \
+  libvlib.la \
+  libvnet.la \
+  libsvm.la \
+  libsvmdb.la \
+  libvnetplugin.la \
+  -lrt
+
+bin_vpp_LDFLAGS = $(DPDK_LD_FLAGS)
+bin_vpp_LDADD += libvppinfra.la -lm -lpthread -ldl $(DPDK_LD_ADD)
+
+if WITH_IPV6SR
+  bin_vpp_LDADD += -lcrypto
+endif
+
+noinst_PROGRAMS += bin/test_client
+
+bin_test_client_SOURCES = \
+  vpp/api/test_client.c
+
+bin_test_client_LDADD = \
+  libvlibmemoryclient.la \
+  libvlibapi.la \
+  libsvm.la \
+  libvppinfra.la \
+  -lpthread -lm -lrt
+
+noinst_PROGRAMS += bin/test_client bin/test_ha
+
+bin_test_ha_SOURCES = \
+  vpp/api/test_ha.c
+
+bin_test_ha_LDADD = \
+  libvlibmemoryclient.la \
+  libvlibapi.la \
+  libsvmdb.la \
+  libsvm.la \
+  libvppinfra.la \
+  -lpthread -lm -lrt
+
+noinst_PROGRAMS += bin/summary_stats_client
+
+bin_summary_stats_client_SOURCES = \
+  vpp/api/summary_stats_client.c
+
+bin_summary_stats_client_LDADD = \
+  libvlibmemoryclient.la \
+  libvlibapi.la \
+  libsvm.la \
+  libvppinfra.la \
+  -lpthread -lm -lrt
+
+bin_PROGRAMS += bin/vpp_get_metrics
+
+bin_vpp_get_metrics_SOURCES = \
+  vpp/api/vpp_get_metrics.c
+
+bin_vpp_get_metrics_LDADD = \
+  libsvmdb.la \
+  libsvm.la \
+  libvppinfra.la \
+  -lpthread -lm -lrt
+
+# vi:syntax=automake
diff --git a/vpp/vpp-api/api.c b/src/vpp/api/api.c
index 01022608..6289249c 100644
--- a/vpp/vpp-api/api.c
+++ b/src/vpp/api/api.c
@@ -90,14 +90,15 @@
 #include <vnet/devices/dpdk/dpdk.h>
 #endif
 
-#include <stats/stats.h>
-#include <oam/oam.h>
+#include <vpp/stats/stats.h>
+#include <vpp/oam/oam.h>
+
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ethernet/arp_packet.h>
 #include <vnet/interface.h>
 #include <vnet/l2/l2_fib.h>
 #include <vnet/l2/l2_bd.h>
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 #include <vnet/span/span.h>
 #include <vnet/fib/ip6_fib.h>
 #include <vnet/fib/ip4_fib.h>
@@ -108,15 +109,15 @@
 #include <vnet/dpo/classify_dpo.h>
 #include <vnet/dpo/ip_null_dpo.h>
 #define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 #define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 /* instantiate all the print functions we know about */
 #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
 #define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 #include <vlibapi/api_helper_macros.h>
 #define foreach_vpe_api_msg                                             \
@@ -4899,7 +4900,7 @@ VLIB_CLI_COMMAND (show_ip_arp_nd_events, static) = {
 /* *INDENT-ON* */
 
 #define vl_msg_name_crc_list
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_msg_name_crc_list
 
 static void
diff --git a/src/vpp/api/api_format.c b/src/vpp/api/api_format.c
new file mode 120000
index 00000000..cec72cc0
--- /dev/null
+++ b/src/vpp/api/api_format.c
@@ -0,0 +1 @@
+../../vat/api_format.c
\ No newline at end of file
diff --git a/vpp/vpp-api/api_main.c b/src/vpp/api/api_main.c
index db532061..db532061 100644
--- a/vpp/vpp-api/api_main.c
+++ b/src/vpp/api/api_main.c
diff --git a/vpp/vpp-api/custom_dump.c b/src/vpp/api/custom_dump.c
index bfebf49f..1964533e 100644
--- a/vpp/vpp-api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -37,20 +37,20 @@
 #include <vlibmemory/api.h>
 #include <vnet/lisp-cp/lisp_types.h>
 
-#include <stats/stats.h>
-#include <oam/oam.h>
+#include <vpp/stats/stats.h>
+#include <vpp/oam/oam.h>
 
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/l2/l2_vtr.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 
 #define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
diff --git a/vpp/vpp-api/gmon.c b/src/vpp/api/gmon.c
index e5cb1271..20deb6a2 100644
--- a/vpp/vpp-api/gmon.c
+++ b/src/vpp/api/gmon.c
@@ -42,7 +42,7 @@
 #include <vlib/unix/unix.h>
 #include <vnet/api_errno.h>
 
-#include <svmdb.h>
+#include <svm/svmdb.h>
 
 typedef struct
 {
diff --git a/vpp/vpp-api/json_format.c b/src/vpp/api/json_format.c
index 63454b87..63454b87 100644
--- a/vpp/vpp-api/json_format.c
+++ b/src/vpp/api/json_format.c
diff --git a/vpp/vpp-api/json_format.h b/src/vpp/api/json_format.h
index 154fb3df..154fb3df 100644
--- a/vpp/vpp-api/json_format.h
+++ b/src/vpp/api/json_format.h
diff --git a/vpp/vpp-api/summary_stats_client.c b/src/vpp/api/summary_stats_client.c
index 54e16669..03999567 100644
--- a/vpp/vpp-api/summary_stats_client.c
+++ b/src/vpp/api/summary_stats_client.c
@@ -49,7 +49,7 @@
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 
 #include <vnet/ip/ip.h>
 
@@ -57,17 +57,17 @@
 #define f64_print(a,b)
 
 #define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 /* instantiate all the print functions we know about */
 #define vl_print(handle, ...)
 #define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 
 vl_shmem_hdr_t *shmem_hdr;
diff --git a/vpp/vpp-api/test_client.c b/src/vpp/api/test_client.c
index e0d7054a..5c568950 100644
--- a/vpp/vpp-api/test_client.c
+++ b/src/vpp/api/test_client.c
@@ -47,7 +47,7 @@
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 
 #include <vnet/ip/ip.h>
 #include <vnet/interface.h>
@@ -56,17 +56,17 @@
 #define f64_print(a,b)
 
 #define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 /* instantiate all the print functions we know about */
 #define vl_print(handle, ...)
 #define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 
 vl_shmem_hdr_t *shmem_hdr;
@@ -1509,7 +1509,7 @@ done:
 
 #undef vl_api_version
 #define vl_api_version(n,v) static u32 vpe_api_version = v;
-#include <vpp-api/vpe.api.h>
+#include <vpp/api/vpe.api.h>
 #undef vl_api_version
 
 void
diff --git a/vpp/vpp-api/test_ha.c b/src/vpp/api/test_ha.c
index 91364d8b..3264d5f9 100644
--- a/vpp/vpp-api/test_ha.c
+++ b/src/vpp/api/test_ha.c
@@ -46,10 +46,10 @@
 #include <vlib/unix/unix.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <svm.h>
-#include <svmdb.h>
+#include <svm/svm.h>
+#include <svm/svmdb.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 
 #include <vnet/ip/ip.h>
 
@@ -57,17 +57,17 @@
 #define f64_print(a,b)
 
 #define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 /* instantiate all the print functions we know about */
 #define vl_print(handle, ...)
 #define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 
 vl_shmem_hdr_t *shmem_hdr;
diff --git a/src/vpp/api/vat.h b/src/vpp/api/vat.h
new file mode 120000
index 00000000..3adbdbae
--- /dev/null
+++ b/src/vpp/api/vat.h
@@ -0,0 +1 @@
+../../vat/vat.h
\ No newline at end of file
diff --git a/vpp/vpp-api/vpe.api b/src/vpp/api/vpe.api
index abd0e8f1..abd0e8f1 100644
--- a/vpp/vpp-api/vpe.api
+++ b/src/vpp/api/vpe.api
diff --git a/vpp/vpp-api/vpe_all_api_h.h b/src/vpp/api/vpe_all_api_h.h
index 98717eaa..397cd807 100644
--- a/vpp/vpp-api/vpe_all_api_h.h
+++ b/src/vpp/api/vpe_all_api_h.h
@@ -26,7 +26,7 @@
 #undef included_from_layer_3
 
 /* Include the current layer (third) vpp API definition layer */
-#include <vpp-api/vpe.api.h>
+#include <vpp/api/vpe.api.h>
 
 /*
  * fd.io coding-style-patch-verification: ON
diff --git a/vpp/vpp-api/vpe_msg_enum.h b/src/vpp/api/vpe_msg_enum.h
index 1da3ec0c..4fcc1c8c 100644
--- a/vpp/vpp-api/vpe_msg_enum.h
+++ b/src/vpp/api/vpe_msg_enum.h
@@ -21,7 +21,7 @@
 typedef enum
 {
   VL_ILLEGAL_MESSAGE_ID = 0,
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
   VL_MSG_FIRST_AVAILABLE,
 } vl_msg_id_t;
 #undef vl_msg_id
diff --git a/vpp/vpp-api/vpp_get_metrics.c b/src/vpp/api/vpp_get_metrics.c
index bbfa605a..3474133d 100644
--- a/vpp/vpp-api/vpp_get_metrics.c
+++ b/src/vpp/api/vpp_get_metrics.c
@@ -44,7 +44,7 @@
 #include <vlib/unix/unix.h>
 #include <vnet/api_errno.h>
 
-#include <svmdb.h>
+#include <svm/svmdb.h>
 
 svmdb_client_t *c;
 volatile int signal_received;
diff --git a/vpp/app/l2t.c b/src/vpp/app/l2t.c
index 45dd2807..45dd2807 100644
--- a/vpp/app/l2t.c
+++ b/src/vpp/app/l2t.c
diff --git a/vpp/app/l2t_l2.c b/src/vpp/app/l2t_l2.c
index 07d30d9a..07d30d9a 100644
--- a/vpp/app/l2t_l2.c
+++ b/src/vpp/app/l2t_l2.c
diff --git a/vpp/app/sticky_hash.c b/src/vpp/app/sticky_hash.c
index 5569c677..5569c677 100644
--- a/vpp/app/sticky_hash.c
+++ b/src/vpp/app/sticky_hash.c
diff --git a/vpp/app/version.c b/src/vpp/app/version.c
index f8840811..60844c98 100644
--- a/vpp/app/version.c
+++ b/src/vpp/app/version.c
@@ -14,7 +14,7 @@
  */
 #include <vlib/vlib.h>
 #include <vppinfra/cpu.h>
-#include <app/version.h>
+#include <vpp/app/version.h>
 
 #if DPDK > 0
 #include <rte_version.h>
diff --git a/vpp/app/vpe_cli.c b/src/vpp/app/vpe_cli.c
index a26bf71f..a26bf71f 100644
--- a/vpp/app/vpe_cli.c
+++ b/src/vpp/app/vpe_cli.c
diff --git a/vpp/conf/80-vpp.conf b/src/vpp/conf/80-vpp.conf
index 8fdf184c..8fdf184c 100644
--- a/vpp/conf/80-vpp.conf
+++ b/src/vpp/conf/80-vpp.conf
diff --git a/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
index bce00202..bce00202 100644
--- a/vpp/conf/startup.conf
+++ b/src/vpp/conf/startup.conf
diff --git a/vpp/conf/startup.uiopcigeneric.conf b/src/vpp/conf/startup.uiopcigeneric.conf
index 03a89dff..03a89dff 100644
--- a/vpp/conf/startup.uiopcigeneric.conf
+++ b/src/vpp/conf/startup.uiopcigeneric.conf
diff --git a/vpp/oam/oam.c b/src/vpp/oam/oam.c
index 8bf46cda..07e17b64 100644
--- a/vpp/oam/oam.c
+++ b/src/vpp/oam/oam.c
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <oam/oam.h>
+#include <vpp/oam/oam.h>
 
 #if DPDK > 0
 #include <vnet/devices/dpdk/dpdk.h>
diff --git a/vpp/oam/oam.h b/src/vpp/oam/oam.h
index f6af9788..f6af9788 100644
--- a/vpp/oam/oam.h
+++ b/src/vpp/oam/oam.h
diff --git a/vpp/stats/stats.c b/src/vpp/stats/stats.c
index c46e2d5a..391e02f6 100644
--- a/vpp/stats/stats.c
+++ b/src/vpp/stats/stats.c
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <stats/stats.h>
+#include <vpp/stats/stats.h>
 #include <signal.h>
 #include <vlib/threads.h>
 #include <vnet/fib/fib_entry.h>
@@ -25,23 +25,23 @@ stats_main_t stats_main;
 
 #include <vnet/ip/ip.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 
 #define f64_endian(a)
 #define f64_print(a,b)
 
 #define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 /* instantiate all the print functions we know about */
 #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
 #define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 
 #define foreach_stats_msg                               \
diff --git a/vpp/stats/stats.h b/src/vpp/stats/stats.h
index 118115be..118115be 100644
--- a/vpp/stats/stats.h
+++ b/src/vpp/stats/stats.h
diff --git a/vpp/vnet/main.c b/src/vpp/vnet/main.c
index 56790fda..e4695e1e 100644
--- a/vpp/vnet/main.c
+++ b/src/vpp/vnet/main.c
@@ -19,7 +19,7 @@
 #include <vnet/plugin/plugin.h>
 #include <vnet/ethernet/ethernet.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 
 #if DPDK
 #include <vnet/devices/dpdk/dpdk.h>
@@ -124,7 +124,8 @@ main (int argc, char *argv[])
   void vlib_set_get_handoff_structure_cb (void *cb);
 
 #if __x86_64__
-  const char *msg = "ERROR: This binary requires CPU with %s extensions.\n";
+  CLIB_UNUSED (const char *msg)
+    = "ERROR: This binary requires CPU with %s extensions.\n";
 #define _(a,b)                                  \
     if (!clib_cpu_supports_ ## a ())            \
       {                                         \
diff --git a/vppapigen/Makefile.am b/src/vppapigen.am
index 16a48736..083ee537 100644
--- a/vppapigen/Makefile.am
+++ b/src/vppapigen.am
@@ -11,19 +11,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign
+bin_PROGRAMS += vppapigen
 
-bin_PROGRAMS = vppapigen
-bin_SCRIPTS =
+BUILT_SOURCES += tools/vppapigen/gram.h
 
-BUILT_SOURCES = gram.h
-
-gram.h: gram.y
-	$(YACC) -d @srcdir@/gram.y
-	mv y.tab.h gram.h
+tools/vppapigen/gram.h: tools/vppapigen/gram.y
+	$(YACC) -d @srcdir@/tools/vppapigen/gram.y
+	mv y.tab.h tools/vppapigen/gram.h
 	rm y.tab.c
 
-vppapigen_SOURCES = gram.y lex.c node.c
-vppapigen_CPPFLAGS =
-vppapigen_LDADD = -lvppinfra
+vppapigen_SOURCES = tools/vppapigen/gram.y tools/vppapigen/lex.c tools/vppapigen/node.c
+vppapigen_LDADD = libvppinfra.la
 vppapigen_LDFLAGS = -static
+
+# vi:syntax=automake
diff --git a/vppinfra/Makefile.am b/src/vppinfra.am
index 6183cd7a..836c7213 100644
--- a/vppinfra/Makefile.am
+++ b/src/vppinfra.am
@@ -10,12 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CPPFLAGS = -Wall -Werror
+libvppinfradir = ${libdir}
 
 if WITH_UNIX
-  lib_LTLIBRARIES = libvppinfra.la
+  libvppinfra_LTLIBRARIES = libvppinfra.la
 endif
 
 lib_LIBRARIES =
@@ -270,6 +269,8 @@ libvppinfra_la_SOURCES =			\
 
 bin_PROGRAMS = elftool
 
-elftool_SOURCES = tools/elftool.c
+elftool_SOURCES = tools/elftool/elftool.c
 elftool_CPPFLAGS = $(AM_CPPFLAGS)
 elftool_LDADD = libvppinfra.la -lpthread -lrt -lm
+
+# vi:syntax=automake
diff --git a/vppinfra/README b/src/vppinfra/README
index 579696b6..579696b6 100644
--- a/vppinfra/README
+++ b/src/vppinfra/README
diff --git a/vppinfra/vppinfra/anneal.c b/src/vppinfra/anneal.c
index 35d10946..35d10946 100644
--- a/vppinfra/vppinfra/anneal.c
+++ b/src/vppinfra/anneal.c
diff --git a/vppinfra/vppinfra/anneal.h b/src/vppinfra/anneal.h
index 148d38ba..148d38ba 100644
--- a/vppinfra/vppinfra/anneal.h
+++ b/src/vppinfra/anneal.h
diff --git a/vppinfra/vppinfra/asm_mips.h b/src/vppinfra/asm_mips.h
index 7c9e6958..7c9e6958 100644
--- a/vppinfra/vppinfra/asm_mips.h
+++ b/src/vppinfra/asm_mips.h
diff --git a/vppinfra/vppinfra/asm_x86.c b/src/vppinfra/asm_x86.c
index 16e41c24..16e41c24 100644
--- a/vppinfra/vppinfra/asm_x86.c
+++ b/src/vppinfra/asm_x86.c
diff --git a/vppinfra/vppinfra/asm_x86.h b/src/vppinfra/asm_x86.h
index dacef617..dacef617 100644
--- a/vppinfra/vppinfra/asm_x86.h
+++ b/src/vppinfra/asm_x86.h
diff --git a/vppinfra/vppinfra/backtrace.c b/src/vppinfra/backtrace.c
index bbfb792c..bbfb792c 100644
--- a/vppinfra/vppinfra/backtrace.c
+++ b/src/vppinfra/backtrace.c
diff --git a/vppinfra/vppinfra/bihash_24_8.h b/src/vppinfra/bihash_24_8.h
index 353f06bf..353f06bf 100644
--- a/vppinfra/vppinfra/bihash_24_8.h
+++ b/src/vppinfra/bihash_24_8.h
diff --git a/vppinfra/vppinfra/bihash_8_8.h b/src/vppinfra/bihash_8_8.h
index a0d6df2e..a0d6df2e 100644
--- a/vppinfra/vppinfra/bihash_8_8.h
+++ b/src/vppinfra/bihash_8_8.h
diff --git a/vppinfra/vppinfra/bihash_doc.h b/src/vppinfra/bihash_doc.h
index e6ab9db6..e6ab9db6 100644
--- a/vppinfra/vppinfra/bihash_doc.h
+++ b/src/vppinfra/bihash_doc.h
diff --git a/vppinfra/vppinfra/bihash_template.c b/src/vppinfra/bihash_template.c
index 4b0b4257..4b0b4257 100644
--- a/vppinfra/vppinfra/bihash_template.c
+++ b/src/vppinfra/bihash_template.c
diff --git a/vppinfra/vppinfra/bihash_template.h b/src/vppinfra/bihash_template.h
index f70190c6..f70190c6 100644
--- a/vppinfra/vppinfra/bihash_template.h
+++ b/src/vppinfra/bihash_template.h
diff --git a/vppinfra/vppinfra/bitmap.h b/src/vppinfra/bitmap.h
index 9e1ae493..9e1ae493 100644
--- a/vppinfra/vppinfra/bitmap.h
+++ b/src/vppinfra/bitmap.h
diff --git a/vppinfra/vppinfra/bitops.h b/src/vppinfra/bitops.h
index ab91b8ae..ab91b8ae 100644
--- a/vppinfra/vppinfra/bitops.h
+++ b/src/vppinfra/bitops.h
diff --git a/vppinfra/vppinfra/byte_order.h b/src/vppinfra/byte_order.h
index b263538c..b263538c 100644
--- a/vppinfra/vppinfra/byte_order.h
+++ b/src/vppinfra/byte_order.h
diff --git a/vppinfra/vppinfra/cache.h b/src/vppinfra/cache.h
index 8e1f9483..8e1f9483 100644
--- a/vppinfra/vppinfra/cache.h
+++ b/src/vppinfra/cache.h
diff --git a/vppinfra/vppinfra/clib.h b/src/vppinfra/clib.h
index 0386c756..0386c756 100644
--- a/vppinfra/vppinfra/clib.h
+++ b/src/vppinfra/clib.h
diff --git a/vppinfra/vppinfra/cpu.c b/src/vppinfra/cpu.c
index a26d5c9a..a26d5c9a 100644
--- a/vppinfra/vppinfra/cpu.c
+++ b/src/vppinfra/cpu.c
diff --git a/vppinfra/vppinfra/cpu.h b/src/vppinfra/cpu.h
index 9c149f3f..9c149f3f 100644
--- a/vppinfra/vppinfra/cpu.h
+++ b/src/vppinfra/cpu.h
diff --git a/vppinfra/vppinfra/dir.dox b/src/vppinfra/dir.dox
index 440c44e8..440c44e8 100644
--- a/vppinfra/vppinfra/dir.dox
+++ b/src/vppinfra/dir.dox
diff --git a/vppinfra/vppinfra/dlist.h b/src/vppinfra/dlist.h
index 7d09b2bb..7d09b2bb 100644
--- a/vppinfra/vppinfra/dlist.h
+++ b/src/vppinfra/dlist.h
diff --git a/vppinfra/vppinfra/elf.c b/src/vppinfra/elf.c
index 84d6282f..931fbccc 100644
--- a/vppinfra/vppinfra/elf.c
+++ b/src/vppinfra/elf.c
@@ -1219,7 +1219,7 @@ elf_get_section_contents_with_starting_address (elf_main_t * em,
 						uword elt_size,
 						u32 * section_index_result)
 {
-  elf_section_t *s;
+  elf_section_t *s = 0;
   clib_error_t *error;
 
   error = elf_get_section_by_start_address (em, start_address, &s);
@@ -1273,7 +1273,7 @@ elf_parse_dynamic (elf_main_t * em)
 
       case ELF_DYNAMIC_ENTRY_SYMBOL_TABLE:
 	{
-	  elf_section_t *s;
+	  elf_section_t *s = 0;
 	  clib_error_t *error;
 
 	  error = elf_get_section_by_start_address (em, e->data, &s);
@@ -1947,7 +1947,7 @@ error:
 clib_error_t *
 elf_delete_named_section (elf_main_t * em, char *section_name)
 {
-  elf_section_t *s;
+  elf_section_t *s = 0;
   clib_error_t *error;
 
   error = elf_get_section_by_name (em, section_name, &s);
diff --git a/vppinfra/vppinfra/elf.h b/src/vppinfra/elf.h
index 008ea284..008ea284 100644
--- a/vppinfra/vppinfra/elf.h
+++ b/src/vppinfra/elf.h
diff --git a/vppinfra/vppinfra/elf_clib.c b/src/vppinfra/elf_clib.c
index 7bb72ee3..7bb72ee3 100644
--- a/vppinfra/vppinfra/elf_clib.c
+++ b/src/vppinfra/elf_clib.c
diff --git a/vppinfra/vppinfra/elf_clib.h b/src/vppinfra/elf_clib.h
index 25b928c2..25b928c2 100644
--- a/vppinfra/vppinfra/elf_clib.h
+++ b/src/vppinfra/elf_clib.h
diff --git a/vppinfra/vppinfra/elog.c b/src/vppinfra/elog.c
index e9f06d09..e9f06d09 100644
--- a/vppinfra/vppinfra/elog.c
+++ b/src/vppinfra/elog.c
diff --git a/vppinfra/vppinfra/elog.h b/src/vppinfra/elog.h
index 9756fb83..9756fb83 100644
--- a/vppinfra/vppinfra/elog.h
+++ b/src/vppinfra/elog.h
diff --git a/vppinfra/vppinfra/error.c b/src/vppinfra/error.c
index 2722fb7b..2722fb7b 100644
--- a/vppinfra/vppinfra/error.c
+++ b/src/vppinfra/error.c
diff --git a/vppinfra/vppinfra/error.h b/src/vppinfra/error.h
index 63d73af3..63d73af3 100644
--- a/vppinfra/vppinfra/error.h
+++ b/src/vppinfra/error.h
diff --git a/vppinfra/vppinfra/error_bootstrap.h b/src/vppinfra/error_bootstrap.h
index 3416c2f9..3416c2f9 100644
--- a/vppinfra/vppinfra/error_bootstrap.h
+++ b/src/vppinfra/error_bootstrap.h
diff --git a/vppinfra/vppinfra/fheap.c b/src/vppinfra/fheap.c
index 13692456..13692456 100644
--- a/vppinfra/vppinfra/fheap.c
+++ b/src/vppinfra/fheap.c
diff --git a/vppinfra/vppinfra/fheap.h b/src/vppinfra/fheap.h
index 6d4965f1..6d4965f1 100644
--- a/vppinfra/vppinfra/fheap.h
+++ b/src/vppinfra/fheap.h
diff --git a/vppinfra/vppinfra/fifo.c b/src/vppinfra/fifo.c
index 5b4c76d1..5b4c76d1 100644
--- a/vppinfra/vppinfra/fifo.c
+++ b/src/vppinfra/fifo.c
diff --git a/vppinfra/vppinfra/fifo.h b/src/vppinfra/fifo.h
index b0b35e25..b0b35e25 100644
--- a/vppinfra/vppinfra/fifo.h
+++ b/src/vppinfra/fifo.h
diff --git a/vppinfra/vppinfra/format.c b/src/vppinfra/format.c
index 78e52e9a..78e52e9a 100644
--- a/vppinfra/vppinfra/format.c
+++ b/src/vppinfra/format.c
diff --git a/vppinfra/vppinfra/format.h b/src/vppinfra/format.h
index bc0d6d15..bc0d6d15 100644
--- a/vppinfra/vppinfra/format.h
+++ b/src/vppinfra/format.h
diff --git a/vppinfra/vppinfra/graph.c b/src/vppinfra/graph.c
index 98a29046..98a29046 100644
--- a/vppinfra/vppinfra/graph.c
+++ b/src/vppinfra/graph.c
diff --git a/vppinfra/vppinfra/graph.h b/src/vppinfra/graph.h
index 1c26118f..1c26118f 100644
--- a/vppinfra/vppinfra/graph.h
+++ b/src/vppinfra/graph.h
diff --git a/vppinfra/vppinfra/hash.c b/src/vppinfra/hash.c
index 062ad882..062ad882 100644
--- a/vppinfra/vppinfra/hash.c
+++ b/src/vppinfra/hash.c
diff --git a/vppinfra/vppinfra/hash.h b/src/vppinfra/hash.h
index 3f0efaa7..3f0efaa7 100644
--- a/vppinfra/vppinfra/hash.h
+++ b/src/vppinfra/hash.h
diff --git a/vppinfra/vppinfra/heap.c b/src/vppinfra/heap.c
index 2a5fb5c8..2a5fb5c8 100644
--- a/vppinfra/vppinfra/heap.c
+++ b/src/vppinfra/heap.c
diff --git a/vppinfra/vppinfra/heap.h b/src/vppinfra/heap.h
index 8c1aae46..8c1aae46 100644
--- a/vppinfra/vppinfra/heap.h
+++ b/src/vppinfra/heap.h
diff --git a/vppinfra/vppinfra/longjmp.S b/src/vppinfra/longjmp.S
index d4dd4c7d..d4dd4c7d 100644
--- a/vppinfra/vppinfra/longjmp.S
+++ b/src/vppinfra/longjmp.S
diff --git a/vppinfra/vppinfra/longjmp.h b/src/vppinfra/longjmp.h
index 8d83203e..8d83203e 100644
--- a/vppinfra/vppinfra/longjmp.h
+++ b/src/vppinfra/longjmp.h
diff --git a/vppinfra/vppinfra/macros.c b/src/vppinfra/macros.c
index ce4cc9bc..ce4cc9bc 100644
--- a/vppinfra/vppinfra/macros.c
+++ b/src/vppinfra/macros.c
diff --git a/vppinfra/vppinfra/macros.h b/src/vppinfra/macros.h
index 5c2e7033..5c2e7033 100644
--- a/vppinfra/vppinfra/macros.h
+++ b/src/vppinfra/macros.h
diff --git a/vppinfra/vppinfra/math.h b/src/vppinfra/math.h
index 48f8c0f4..48f8c0f4 100644
--- a/vppinfra/vppinfra/math.h
+++ b/src/vppinfra/math.h
diff --git a/vppinfra/vppinfra/md5.c b/src/vppinfra/md5.c
index 9ac1efc7..9ac1efc7 100644
--- a/vppinfra/vppinfra/md5.c
+++ b/src/vppinfra/md5.c
diff --git a/vppinfra/vppinfra/md5.h b/src/vppinfra/md5.h
index 52123886..52123886 100644
--- a/vppinfra/vppinfra/md5.h
+++ b/src/vppinfra/md5.h
diff --git a/vppinfra/vppinfra/mem.h b/src/vppinfra/mem.h
index 1260eab2..1260eab2 100644
--- a/vppinfra/vppinfra/mem.h
+++ b/src/vppinfra/mem.h
diff --git a/vppinfra/vppinfra/mem_mheap.c b/src/vppinfra/mem_mheap.c
index 9b2af520..9b2af520 100644
--- a/vppinfra/vppinfra/mem_mheap.c
+++ b/src/vppinfra/mem_mheap.c
diff --git a/vppinfra/vppinfra/memcheck.h b/src/vppinfra/memcheck.h
index 44db3a8a..44db3a8a 100644
--- a/vppinfra/vppinfra/memcheck.h
+++ b/src/vppinfra/memcheck.h
diff --git a/vppinfra/vppinfra/memcpy_avx.h b/src/vppinfra/memcpy_avx.h
index e3feb76b..e3feb76b 100644
--- a/vppinfra/vppinfra/memcpy_avx.h
+++ b/src/vppinfra/memcpy_avx.h
diff --git a/vppinfra/vppinfra/memcpy_sse3.h b/src/vppinfra/memcpy_sse3.h
index 4fc48c86..4fc48c86 100644
--- a/vppinfra/vppinfra/memcpy_sse3.h
+++ b/src/vppinfra/memcpy_sse3.h
diff --git a/vppinfra/vppinfra/mhash.c b/src/vppinfra/mhash.c
index c917e164..c917e164 100644
--- a/vppinfra/vppinfra/mhash.c
+++ b/src/vppinfra/mhash.c
diff --git a/vppinfra/vppinfra/mhash.h b/src/vppinfra/mhash.h
index 102adf4e..102adf4e 100644
--- a/vppinfra/vppinfra/mhash.h
+++ b/src/vppinfra/mhash.h
diff --git a/vppinfra/vppinfra/mheap.c b/src/vppinfra/mheap.c
index b8828f9e..b8828f9e 100644
--- a/vppinfra/vppinfra/mheap.c
+++ b/src/vppinfra/mheap.c
diff --git a/vppinfra/vppinfra/mheap.h b/src/vppinfra/mheap.h
index 5b7cdfba..5b7cdfba 100644
--- a/vppinfra/vppinfra/mheap.h
+++ b/src/vppinfra/mheap.h
diff --git a/vppinfra/vppinfra/mheap_bootstrap.h b/src/vppinfra/mheap_bootstrap.h
index 4b21051b..4b21051b 100644
--- a/vppinfra/vppinfra/mheap_bootstrap.h
+++ b/src/vppinfra/mheap_bootstrap.h
diff --git a/vppinfra/vppinfra/mod_test_hash.c b/src/vppinfra/mod_test_hash.c
index b3fa676d..b3fa676d 100644
--- a/vppinfra/vppinfra/mod_test_hash.c
+++ b/src/vppinfra/mod_test_hash.c
diff --git a/vppinfra/vppinfra/os.h b/src/vppinfra/os.h
index a5c74f8c..a5c74f8c 100644
--- a/vppinfra/vppinfra/os.h
+++ b/src/vppinfra/os.h
diff --git a/vppinfra/vppinfra/pfhash.c b/src/vppinfra/pfhash.c
index 3b9fa8f3..3b9fa8f3 100644
--- a/vppinfra/vppinfra/pfhash.c
+++ b/src/vppinfra/pfhash.c
diff --git a/vppinfra/vppinfra/pfhash.h b/src/vppinfra/pfhash.h
index e054c668..e054c668 100644
--- a/vppinfra/vppinfra/pfhash.h
+++ b/src/vppinfra/pfhash.h
diff --git a/vppinfra/vppinfra/phash.c b/src/vppinfra/phash.c
index 14da5225..14da5225 100644
--- a/vppinfra/vppinfra/phash.c
+++ b/src/vppinfra/phash.c
diff --git a/vppinfra/vppinfra/phash.h b/src/vppinfra/phash.h
index 746a0fdd..746a0fdd 100644
--- a/vppinfra/vppinfra/phash.h
+++ b/src/vppinfra/phash.h
diff --git a/vppinfra/vppinfra/pipeline.h b/src/vppinfra/pipeline.h
index 5a9799b4..5a9799b4 100644
--- a/vppinfra/vppinfra/pipeline.h
+++ b/src/vppinfra/pipeline.h
diff --git a/vppinfra/vppinfra/pool.h b/src/vppinfra/pool.h
index e1c89e0a..e1c89e0a 100644
--- a/vppinfra/vppinfra/pool.h
+++ b/src/vppinfra/pool.h
diff --git a/vppinfra/vppinfra/ptclosure.c b/src/vppinfra/ptclosure.c
index cda873ef..cda873ef 100644
--- a/vppinfra/vppinfra/ptclosure.c
+++ b/src/vppinfra/ptclosure.c
diff --git a/vppinfra/vppinfra/ptclosure.h b/src/vppinfra/ptclosure.h
index ee1609a1..ee1609a1 100644
--- a/vppinfra/vppinfra/ptclosure.h
+++ b/src/vppinfra/ptclosure.h
diff --git a/vppinfra/vppinfra/qhash.c b/src/vppinfra/qhash.c
index f4e38c4a..f4e38c4a 100644
--- a/vppinfra/vppinfra/qhash.c
+++ b/src/vppinfra/qhash.c
diff --git a/vppinfra/vppinfra/qhash.h b/src/vppinfra/qhash.h
index 9dbbd971..9dbbd971 100644
--- a/vppinfra/vppinfra/qhash.h
+++ b/src/vppinfra/qhash.h
diff --git a/vppinfra/vppinfra/qsort.c b/src/vppinfra/qsort.c
index 2faa5897..2faa5897 100644
--- a/vppinfra/vppinfra/qsort.c
+++ b/src/vppinfra/qsort.c
diff --git a/vppinfra/vppinfra/random.c b/src/vppinfra/random.c
index fa5bcc8c..fa5bcc8c 100644
--- a/vppinfra/vppinfra/random.c
+++ b/src/vppinfra/random.c
diff --git a/vppinfra/vppinfra/random.h b/src/vppinfra/random.h
index 5c139d05..5c139d05 100644
--- a/vppinfra/vppinfra/random.h
+++ b/src/vppinfra/random.h
diff --git a/vppinfra/vppinfra/random_buffer.c b/src/vppinfra/random_buffer.c
index df036980..df036980 100644
--- a/vppinfra/vppinfra/random_buffer.c
+++ b/src/vppinfra/random_buffer.c
diff --git a/vppinfra/vppinfra/random_buffer.h b/src/vppinfra/random_buffer.h
index eb318548..eb318548 100644
--- a/vppinfra/vppinfra/random_buffer.h
+++ b/src/vppinfra/random_buffer.h
diff --git a/vppinfra/vppinfra/random_isaac.c b/src/vppinfra/random_isaac.c
index 6f00fc32..6f00fc32 100644
--- a/vppinfra/vppinfra/random_isaac.c
+++ b/src/vppinfra/random_isaac.c
diff --git a/vppinfra/vppinfra/random_isaac.h b/src/vppinfra/random_isaac.h
index 803fbd62..803fbd62 100644
--- a/vppinfra/vppinfra/random_isaac.h
+++ b/src/vppinfra/random_isaac.h
diff --git a/vppinfra/vppinfra/serialize.c b/src/vppinfra/serialize.c
index 5d401a08..5d401a08 100644
--- a/vppinfra/vppinfra/serialize.c
+++ b/src/vppinfra/serialize.c
diff --git a/vppinfra/vppinfra/serialize.h b/src/vppinfra/serialize.h
index 6cc2372e..6cc2372e 100644
--- a/vppinfra/vppinfra/serialize.h
+++ b/src/vppinfra/serialize.h
diff --git a/vppinfra/vppinfra/slist.c b/src/vppinfra/slist.c
index 892517bb..892517bb 100644
--- a/vppinfra/vppinfra/slist.c
+++ b/src/vppinfra/slist.c
diff --git a/vppinfra/vppinfra/slist.h b/src/vppinfra/slist.h
index a7c77e27..a7c77e27 100644
--- a/vppinfra/vppinfra/slist.h
+++ b/src/vppinfra/slist.h
diff --git a/vppinfra/vppinfra/smp.c b/src/vppinfra/smp.c
index 8ac19960..8ac19960 100644
--- a/vppinfra/vppinfra/smp.c
+++ b/src/vppinfra/smp.c
diff --git a/vppinfra/vppinfra/smp.h b/src/vppinfra/smp.h
index 7e703b3d..7e703b3d 100644
--- a/vppinfra/vppinfra/smp.h
+++ b/src/vppinfra/smp.h
diff --git a/vppinfra/vppinfra/smp_fifo.c b/src/vppinfra/smp_fifo.c
index bb74064d..bb74064d 100644
--- a/vppinfra/vppinfra/smp_fifo.c
+++ b/src/vppinfra/smp_fifo.c
diff --git a/vppinfra/vppinfra/smp_fifo.h b/src/vppinfra/smp_fifo.h
index c74a77c8..c74a77c8 100644
--- a/vppinfra/vppinfra/smp_fifo.h
+++ b/src/vppinfra/smp_fifo.h
diff --git a/vppinfra/vppinfra/socket.c b/src/vppinfra/socket.c
index 99b353fc..99b353fc 100644
--- a/vppinfra/vppinfra/socket.c
+++ b/src/vppinfra/socket.c
diff --git a/vppinfra/vppinfra/socket.h b/src/vppinfra/socket.h
index 08e22e7e..08e22e7e 100644
--- a/vppinfra/vppinfra/socket.h
+++ b/src/vppinfra/socket.h
diff --git a/vppinfra/vppinfra/sparse_vec.h b/src/vppinfra/sparse_vec.h
index ec8f0a1c..ec8f0a1c 100644
--- a/vppinfra/vppinfra/sparse_vec.h
+++ b/src/vppinfra/sparse_vec.h
diff --git a/vppinfra/vppinfra/std-formats.c b/src/vppinfra/std-formats.c
index ac98f999..ac98f999 100644
--- a/vppinfra/vppinfra/std-formats.c
+++ b/src/vppinfra/std-formats.c
diff --git a/vppinfra/vppinfra/string.c b/src/vppinfra/string.c
index ba21e7b3..ba21e7b3 100644
--- a/vppinfra/vppinfra/string.c
+++ b/src/vppinfra/string.c
diff --git a/vppinfra/vppinfra/string.h b/src/vppinfra/string.h
index 69a99a3f..69a99a3f 100644
--- a/vppinfra/vppinfra/string.h
+++ b/src/vppinfra/string.h
diff --git a/vppinfra/vppinfra/test_bihash_template.c b/src/vppinfra/test_bihash_template.c
index c505bd83..c505bd83 100644
--- a/vppinfra/vppinfra/test_bihash_template.c
+++ b/src/vppinfra/test_bihash_template.c
diff --git a/vppinfra/vppinfra/test_dlist.c b/src/vppinfra/test_dlist.c
index c5535c85..c5535c85 100644
--- a/vppinfra/vppinfra/test_dlist.c
+++ b/src/vppinfra/test_dlist.c
diff --git a/vppinfra/vppinfra/test_elf.c b/src/vppinfra/test_elf.c
index 84fe0776..84fe0776 100644
--- a/vppinfra/vppinfra/test_elf.c
+++ b/src/vppinfra/test_elf.c
diff --git a/vppinfra/vppinfra/test_elog.c b/src/vppinfra/test_elog.c
index 89905adb..89905adb 100644
--- a/vppinfra/vppinfra/test_elog.c
+++ b/src/vppinfra/test_elog.c
diff --git a/vppinfra/vppinfra/test_fifo.c b/src/vppinfra/test_fifo.c
index 45392bc3..45392bc3 100644
--- a/vppinfra/vppinfra/test_fifo.c
+++ b/src/vppinfra/test_fifo.c
diff --git a/vppinfra/vppinfra/test_format.c b/src/vppinfra/test_format.c
index cc95a00e..cc95a00e 100644
--- a/vppinfra/vppinfra/test_format.c
+++ b/src/vppinfra/test_format.c
diff --git a/vppinfra/vppinfra/test_hash.c b/src/vppinfra/test_hash.c
index 94110ab6..94110ab6 100644
--- a/vppinfra/vppinfra/test_hash.c
+++ b/src/vppinfra/test_hash.c
diff --git a/vppinfra/vppinfra/test_heap.c b/src/vppinfra/test_heap.c
index 3d5171bf..3d5171bf 100644
--- a/vppinfra/vppinfra/test_heap.c
+++ b/src/vppinfra/test_heap.c
diff --git a/vppinfra/vppinfra/test_longjmp.c b/src/vppinfra/test_longjmp.c
index 2415c4f0..2415c4f0 100644
--- a/vppinfra/vppinfra/test_longjmp.c
+++ b/src/vppinfra/test_longjmp.c
diff --git a/vppinfra/vppinfra/test_macros.c b/src/vppinfra/test_macros.c
index de8f2c49..de8f2c49 100644
--- a/vppinfra/vppinfra/test_macros.c
+++ b/src/vppinfra/test_macros.c
diff --git a/vppinfra/vppinfra/test_md5.c b/src/vppinfra/test_md5.c
index 4be6f964..4be6f964 100644
--- a/vppinfra/vppinfra/test_md5.c
+++ b/src/vppinfra/test_md5.c
diff --git a/vppinfra/vppinfra/test_mheap.c b/src/vppinfra/test_mheap.c
index 6bc36b89..6bc36b89 100644
--- a/vppinfra/vppinfra/test_mheap.c
+++ b/src/vppinfra/test_mheap.c
diff --git a/vppinfra/vppinfra/test_pfhash.c b/src/vppinfra/test_pfhash.c
index ddbdbb34..ddbdbb34 100644
--- a/vppinfra/vppinfra/test_pfhash.c
+++ b/src/vppinfra/test_pfhash.c
diff --git a/vppinfra/vppinfra/test_phash.c b/src/vppinfra/test_phash.c
index 9ed2ac7b..9ed2ac7b 100644
--- a/vppinfra/vppinfra/test_phash.c
+++ b/src/vppinfra/test_phash.c
diff --git a/vppinfra/vppinfra/test_pool.c b/src/vppinfra/test_pool.c
index 67a5e50a..67a5e50a 100644
--- a/vppinfra/vppinfra/test_pool.c
+++ b/src/vppinfra/test_pool.c
diff --git a/vppinfra/vppinfra/test_pool_iterate.c b/src/vppinfra/test_pool_iterate.c
index 27ce4bb3..27ce4bb3 100644
--- a/vppinfra/vppinfra/test_pool_iterate.c
+++ b/src/vppinfra/test_pool_iterate.c
diff --git a/vppinfra/vppinfra/test_ptclosure.c b/src/vppinfra/test_ptclosure.c
index be7d51df..be7d51df 100644
--- a/vppinfra/vppinfra/test_ptclosure.c
+++ b/src/vppinfra/test_ptclosure.c
diff --git a/vppinfra/vppinfra/test_qhash.c b/src/vppinfra/test_qhash.c
index fdbf0bbe..fdbf0bbe 100644
--- a/vppinfra/vppinfra/test_qhash.c
+++ b/src/vppinfra/test_qhash.c
diff --git a/vppinfra/vppinfra/test_random.c b/src/vppinfra/test_random.c
index 49759eac..49759eac 100644
--- a/vppinfra/vppinfra/test_random.c
+++ b/src/vppinfra/test_random.c
diff --git a/vppinfra/vppinfra/test_random_isaac.c b/src/vppinfra/test_random_isaac.c
index 337d30dd..337d30dd 100644
--- a/vppinfra/vppinfra/test_random_isaac.c
+++ b/src/vppinfra/test_random_isaac.c
diff --git a/vppinfra/vppinfra/test_serialize.c b/src/vppinfra/test_serialize.c
index e00eec32..e00eec32 100644
--- a/vppinfra/vppinfra/test_serialize.c
+++ b/src/vppinfra/test_serialize.c
diff --git a/vppinfra/vppinfra/test_slist.c b/src/vppinfra/test_slist.c
index 3c3cbf73..3c3cbf73 100644
--- a/vppinfra/vppinfra/test_slist.c
+++ b/src/vppinfra/test_slist.c
diff --git a/vppinfra/vppinfra/test_socket.c b/src/vppinfra/test_socket.c
index 0b05467a..0b05467a 100644
--- a/vppinfra/vppinfra/test_socket.c
+++ b/src/vppinfra/test_socket.c
diff --git a/vppinfra/vppinfra/test_time.c b/src/vppinfra/test_time.c
index 63cfeac5..63cfeac5 100644
--- a/vppinfra/vppinfra/test_time.c
+++ b/src/vppinfra/test_time.c
diff --git a/vppinfra/vppinfra/test_timing_wheel.c b/src/vppinfra/test_timing_wheel.c
index 0ce15ad8..0ce15ad8 100644
--- a/vppinfra/vppinfra/test_timing_wheel.c
+++ b/src/vppinfra/test_timing_wheel.c
diff --git a/vppinfra/vppinfra/test_vec.c b/src/vppinfra/test_vec.c
index f0497ac6..f0497ac6 100644
--- a/vppinfra/vppinfra/test_vec.c
+++ b/src/vppinfra/test_vec.c
diff --git a/vppinfra/vppinfra/test_vec.h b/src/vppinfra/test_vec.h
index 28e8e2a0..28e8e2a0 100644
--- a/vppinfra/vppinfra/test_vec.h
+++ b/src/vppinfra/test_vec.h
diff --git a/vppinfra/vppinfra/test_vhash.c b/src/vppinfra/test_vhash.c
index 7293fdde..7293fdde 100644
--- a/vppinfra/vppinfra/test_vhash.c
+++ b/src/vppinfra/test_vhash.c
diff --git a/vppinfra/vppinfra/test_zvec.c b/src/vppinfra/test_zvec.c
index 874fdefa..874fdefa 100644
--- a/vppinfra/vppinfra/test_zvec.c
+++ b/src/vppinfra/test_zvec.c
diff --git a/vppinfra/vppinfra/time.c b/src/vppinfra/time.c
index 2bdb9da4..2bdb9da4 100644
--- a/vppinfra/vppinfra/time.c
+++ b/src/vppinfra/time.c
diff --git a/vppinfra/vppinfra/time.h b/src/vppinfra/time.h
index 3b89cf78..3b89cf78 100644
--- a/vppinfra/vppinfra/time.h
+++ b/src/vppinfra/time.h
diff --git a/vppinfra/vppinfra/timer.c b/src/vppinfra/timer.c
index 0221cb74..0221cb74 100644
--- a/vppinfra/vppinfra/timer.c
+++ b/src/vppinfra/timer.c
diff --git a/vppinfra/vppinfra/timer.h b/src/vppinfra/timer.h
index 764103f7..764103f7 100644
--- a/vppinfra/vppinfra/timer.h
+++ b/src/vppinfra/timer.h
diff --git a/vppinfra/vppinfra/timing_wheel.c b/src/vppinfra/timing_wheel.c
index 4c8a2c58..4c8a2c58 100644
--- a/vppinfra/vppinfra/timing_wheel.c
+++ b/src/vppinfra/timing_wheel.c
diff --git a/vppinfra/vppinfra/timing_wheel.h b/src/vppinfra/timing_wheel.h
index 7daea994..7daea994 100644
--- a/vppinfra/vppinfra/timing_wheel.h
+++ b/src/vppinfra/timing_wheel.h
diff --git a/vppinfra/vppinfra/types.h b/src/vppinfra/types.h
index f87bb48c..f87bb48c 100644
--- a/vppinfra/vppinfra/types.h
+++ b/src/vppinfra/types.h
diff --git a/vppinfra/vppinfra/unformat.c b/src/vppinfra/unformat.c
index ac8b7ddc..ac8b7ddc 100644
--- a/vppinfra/vppinfra/unformat.c
+++ b/src/vppinfra/unformat.c
diff --git a/vppinfra/vppinfra/unix-formats.c b/src/vppinfra/unix-formats.c
index a4c81ca2..a4c81ca2 100644
--- a/vppinfra/vppinfra/unix-formats.c
+++ b/src/vppinfra/unix-formats.c
diff --git a/vppinfra/vppinfra/unix-kelog.c b/src/vppinfra/unix-kelog.c
index 88428ee8..88428ee8 100644
--- a/vppinfra/vppinfra/unix-kelog.c
+++ b/src/vppinfra/unix-kelog.c
diff --git a/vppinfra/vppinfra/unix-misc.c b/src/vppinfra/unix-misc.c
index 2928369d..2928369d 100644
--- a/vppinfra/vppinfra/unix-misc.c
+++ b/src/vppinfra/unix-misc.c
diff --git a/vppinfra/vppinfra/unix.h b/src/vppinfra/unix.h
index 29114cfe..29114cfe 100644
--- a/vppinfra/vppinfra/unix.h
+++ b/src/vppinfra/unix.h
diff --git a/vppinfra/unix_error.def b/src/vppinfra/unix_error.def
index 76633dbb..76633dbb 100644
--- a/vppinfra/unix_error.def
+++ b/src/vppinfra/unix_error.def
diff --git a/vppinfra/vppinfra/valgrind.h b/src/vppinfra/valgrind.h
index e74d7e82..e74d7e82 100644
--- a/vppinfra/vppinfra/valgrind.h
+++ b/src/vppinfra/valgrind.h
diff --git a/vppinfra/vppinfra/vec.c b/src/vppinfra/vec.c
index 2d7ae1d4..2d7ae1d4 100644
--- a/vppinfra/vppinfra/vec.c
+++ b/src/vppinfra/vec.c
diff --git a/vppinfra/vppinfra/vec.h b/src/vppinfra/vec.h
index eed96d6b..eed96d6b 100644
--- a/vppinfra/vppinfra/vec.h
+++ b/src/vppinfra/vec.h
diff --git a/vppinfra/vppinfra/vec_bootstrap.h b/src/vppinfra/vec_bootstrap.h
index 3b8c7707..3b8c7707 100644
--- a/vppinfra/vppinfra/vec_bootstrap.h
+++ b/src/vppinfra/vec_bootstrap.h
diff --git a/vppinfra/vppinfra/vector.c b/src/vppinfra/vector.c
index 68b4fdc2..68b4fdc2 100644
--- a/vppinfra/vppinfra/vector.c
+++ b/src/vppinfra/vector.c
diff --git a/vppinfra/vppinfra/vector.h b/src/vppinfra/vector.h
index 491e7cfe..491e7cfe 100644
--- a/vppinfra/vppinfra/vector.h
+++ b/src/vppinfra/vector.h
diff --git a/vppinfra/vppinfra/vector_altivec.h b/src/vppinfra/vector_altivec.h
index 0e9de820..0e9de820 100644
--- a/vppinfra/vppinfra/vector_altivec.h
+++ b/src/vppinfra/vector_altivec.h
diff --git a/vppinfra/vppinfra/vector_funcs.h b/src/vppinfra/vector_funcs.h
index db09de0f..db09de0f 100644
--- a/vppinfra/vppinfra/vector_funcs.h
+++ b/src/vppinfra/vector_funcs.h
diff --git a/vppinfra/vppinfra/vector_iwmmxt.h b/src/vppinfra/vector_iwmmxt.h
index 8e662045..8e662045 100644
--- a/vppinfra/vppinfra/vector_iwmmxt.h
+++ b/src/vppinfra/vector_iwmmxt.h
diff --git a/vppinfra/vppinfra/vector_neon.h b/src/vppinfra/vector_neon.h
index cea52759..cea52759 100644
--- a/vppinfra/vppinfra/vector_neon.h
+++ b/src/vppinfra/vector_neon.h
diff --git a/vppinfra/vppinfra/vector_sse2.h b/src/vppinfra/vector_sse2.h
index f782e8fd..f782e8fd 100644
--- a/vppinfra/vppinfra/vector_sse2.h
+++ b/src/vppinfra/vector_sse2.h
diff --git a/vppinfra/vppinfra/vhash.c b/src/vppinfra/vhash.c
index f9dac0d9..f9dac0d9 100644
--- a/vppinfra/vppinfra/vhash.c
+++ b/src/vppinfra/vhash.c
diff --git a/vppinfra/vppinfra/vhash.h b/src/vppinfra/vhash.h
index 5ab42292..5ab42292 100644
--- a/vppinfra/vppinfra/vhash.h
+++ b/src/vppinfra/vhash.h
diff --git a/vppinfra/vppinfra/vm_linux_kernel.h b/src/vppinfra/vm_linux_kernel.h
index fd9e6148..fd9e6148 100644
--- a/vppinfra/vppinfra/vm_linux_kernel.h
+++ b/src/vppinfra/vm_linux_kernel.h
diff --git a/vppinfra/vppinfra/vm_standalone.h b/src/vppinfra/vm_standalone.h
index 2cd431bc..2cd431bc 100644
--- a/vppinfra/vppinfra/vm_standalone.h
+++ b/src/vppinfra/vm_standalone.h
diff --git a/vppinfra/vppinfra/vm_unix.h b/src/vppinfra/vm_unix.h
index 07e86516..07e86516 100644
--- a/vppinfra/vppinfra/vm_unix.h
+++ b/src/vppinfra/vm_unix.h
diff --git a/vppinfra/vppinfra/xxhash.h b/src/vppinfra/xxhash.h
index ea1e21bf..ea1e21bf 100644
--- a/vppinfra/vppinfra/xxhash.h
+++ b/src/vppinfra/xxhash.h
diff --git a/vppinfra/vppinfra/xy.h b/src/vppinfra/xy.h
index fb562161..fb562161 100644
--- a/vppinfra/vppinfra/xy.h
+++ b/src/vppinfra/xy.h
diff --git a/vppinfra/vppinfra/zvec.c b/src/vppinfra/zvec.c
index d062e5f7..d062e5f7 100644
--- a/vppinfra/vppinfra/zvec.c
+++ b/src/vppinfra/zvec.c
diff --git a/vppinfra/vppinfra/zvec.h b/src/vppinfra/zvec.h
index 7d35a3fe..7d35a3fe 100644
--- a/vppinfra/vppinfra/zvec.h
+++ b/src/vppinfra/zvec.h
diff --git a/svm/configure.ac b/svm/configure.ac
deleted file mode 100644
index 40b09606..00000000
--- a/svm/configure.ac
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_INIT(svm, 1.0)
-LT_INIT
-AM_INIT_AUTOMAKE
-
-AM_SILENT_RULES([yes])
-
-AC_OUTPUT([Makefile])
diff --git a/vlib-api/configure.ac b/vlib-api/configure.ac
deleted file mode 100644
index f0aa3083..00000000
--- a/vlib-api/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(vlibapi, 1.0)
-LT_INIT
-AM_INIT_AUTOMAKE
-
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_OUTPUT([Makefile])
diff --git a/vlib-api/suffix-rules.mk b/vlib-api/suffix-rules.mk
deleted file mode 120000
index f6098400..00000000
--- a/vlib-api/suffix-rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-../build-data/suffix-rules.mk
\ No newline at end of file
diff --git a/vlib/.gitignore b/vlib/.gitignore
deleted file mode 100644
index b25c15b8..00000000
--- a/vlib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/vlib/configure.ac b/vlib/configure.ac
deleted file mode 100644
index f7079e64..00000000
--- a/vlib/configure.ac
+++ /dev/null
@@ -1,25 +0,0 @@
-AC_INIT(vlib, 1.1)
-LT_INIT
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_ARG_WITH(dpdk,
-            AC_HELP_STRING([--with-dpdk],[Use DPDK]),
-            [with_dpdk=1],
-            [with_dpdk=0])
-
-AC_ARG_WITH(pre-data,
-            AC_HELP_STRING([--with-pre-data],[Set buffer rewrite space]),
-	    [case $with_pre_data in
-	       128) ;;
-	       256) ;;
-               *) with_pre_data="pre-data-not-set" ;;
-	     esac], [with_pre_data=128])
-
-AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
-AC_SUBST(DPDK,[-DDPDK=${with_dpdk}])
-AC_SUBST(PRE_DATA_SIZE,[$with_pre_data])
-
-AC_OUTPUT([Makefile])
diff --git a/vlib/dir.dox b/vlib/dir.dox
deleted file mode 100644
index 99027f6c..00000000
--- a/vlib/dir.dox
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Doxygen directory documentation */
-/**
-@dir
-@brief VLIB application library.
-*/
diff --git a/vnet/.gitignore b/vnet/.gitignore
deleted file mode 100644
index b25c15b8..00000000
--- a/vnet/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/vnet/configure.ac b/vnet/configure.ac
deleted file mode 100644
index 6a5281b0..00000000
--- a/vnet/configure.ac
+++ /dev/null
@@ -1,49 +0,0 @@
-AC_INIT(vnet, 1.1)
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_HEADERS(config/config.h)
-LT_INIT
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_ARG_WITH(dpdk,
-            AC_HELP_STRING([--with-dpdk],[Use DPDK]),
-            [with_dpdk=1],
-            [with_dpdk=0])
-
-AC_ARG_WITH(dpdk_crypto,
-            AC_HELP_STRING([--with-dpdk-crypto],[Use DPDK cryptodev]),
-            [with_dpdk_crypto=1],
-            [with_dpdk_crypto=0])
-
-AC_ARG_WITH(ipsec,
-            AC_HELP_STRING([--without-ipsec],[Disable ipsec]),
-            [with_ipsec=0],
-            [with_ipsec=1])
-
-AC_ARG_WITH(ipv6sr,
-            AC_HELP_STRING([--without-ipv6sr],[Disable ipv6sr]),
-            [with_ipv6sr=0],
-            [with_ipv6sr=1])
-
-AC_ARG_ENABLE(tests,
-              AC_HELP_STRING([--enable-tests], [Build unit tests]),
-              [enable_tests=1],
-              [enable_tests=0])
-
-AM_CONDITIONAL(WITH_DPDK_CRYPTO, test "$with_dpdk_crypto" = "1")
-AC_SUBST(DPDK_CRYPTO,[-DDPDK_CRYPTO=${with_dpdk_crypto}])
-
-AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
-AC_SUBST(DPDK,[-DDPDK=${with_dpdk}])
-
-AM_CONDITIONAL(WITH_IPSEC, test "$with_ipsec" = "1")
-AC_SUBST(IPSEC,[-DIPSEC=${with_ipsec}])
-
-AM_CONDITIONAL(WITH_IPV6SR, test "$with_ipv6sr" = "1")
-AC_SUBST(IPV6SR,[-DIPV6SR=${with_ipv6sr}])
-
-AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "1")
-
-AC_OUTPUT([Makefile])
diff --git a/vnet/suffix-rules.mk b/vnet/suffix-rules.mk
deleted file mode 120000
index f6098400..00000000
--- a/vnet/suffix-rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-../build-data/suffix-rules.mk
\ No newline at end of file
diff --git a/vpp-api-test/Makefile.am b/vpp-api-test/Makefile.am
deleted file mode 100644
index 27466fad..00000000
--- a/vpp-api-test/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall @Q_PLATFORM_DEFINE@ @Q_PLATFORM_PLUGPATH@ @DPDK@ @DPDK_CRYPTO@
-
-libvatplugin_la_SOURCES = \
-  vat/plugin_api.c
-
-lib_LTLIBRARIES = libvatplugin.la	
-
-bin_PROGRAMS = vpp_api_test vpp_json_test vpp_restart
-
-vpp_api_test_SOURCES = vat/api_format.c vat/main.c vat/plugin.c vat/vat.h vat/json_format.h vat/json_format.c
-vpp_json_test_SOURCES = vat/json_format.h vat/json_format.c vat/json_test.c
-
-vpp_api_test_LDADD = -lvlibmemoryclient -lvlibapi -lsvm \
-	-lvppinfra -lpthread -lm \
-	-lrt -ldl libvatplugin.la
-vpp_json_test_LDADD = -lvppinfra -lm
-nobase_include_HEADERS = vat/vat.h vat/json_format.h
-
-vpp_restart_SOURCES = vat/restart.c
-vpp_restart_LDADD = -lsvmdb -lsvm -lvppinfra -lpthread -lrt
-
-dist_bin_SCRIPTS = scripts/vppctl
diff --git a/vpp-api-test/configure.ac b/vpp-api-test/configure.ac
deleted file mode 100644
index cf0af125..00000000
--- a/vpp-api-test/configure.ac
+++ /dev/null
@@ -1,40 +0,0 @@
-AC_INIT(vpp-api-test, 1.0)
-LT_INIT
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_ARG_WITH(q-plugin-prefix,
-            AC_HELP_STRING([--with-q-plugin-prefix],[vlib plugin prefix]),
-       	    [case $with_q_plugin_prefix in
-	       *) ;;
-             esac])
-
-AC_ARG_WITH(q-platform,
-            AC_HELP_STRING([--with-q-platform],[Build version for given platform (qnative)]),
-	    [case $with_q_platform in
-	       qnative) ;;
-               vpp) with_q_platform=vpp;;
-	       *) with_q_platform=qnative;;
-	     esac])
-
-AC_ARG_WITH(dpdk,
-            AC_HELP_STRING([--with-dpdk],[Use DPDK]),
-            [with_dpdk=1],
-            [with_dpdk=0])
-
-AC_ARG_WITH(dpdk_crypto,
-            AC_HELP_STRING([--with-dpdk-crypto],[Use DPDK cryptodev]),
-            [with_dpdk_crypto=1],
-            [with_dpdk_crypto=0])
-
-AC_SUBST(Q_PLATFORM_DEFINE,[-DQ_PLATFORM_${with_q_platform}])
-AC_SUBST(Q_PLATFORM_PLUGPATH,[-DQ_PLUGIN_PREFIX=${with_q_plugin_prefix}])
-AC_SUBST(DPDK,[-DDPDK=${with_dpdk}])
-AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
-AC_SUBST(DPDK_CRYPTO,[-DDPDK_CRYPTO=${with_dpdk_crypto}])
-AM_CONDITIONAL(WITH_DPDK_CRYPTO, test "$with_dpdk_crypto" = "1")
-
-
-AC_OUTPUT([Makefile])
diff --git a/vpp-api/Makefile.am b/vpp-api/Makefile.am
index 1812b637..b50522ef 100644
--- a/vpp-api/Makefile.am
+++ b/vpp-api/Makefile.am
@@ -1,2 +1,4 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = python java
+SUBDIRS = java
+
+# vi:syntax=automake
diff --git a/vpp-api/configure.ac b/vpp-api/configure.ac
index 3d7bf251..278041c7 100644
--- a/vpp-api/configure.ac
+++ b/vpp-api/configure.ac
@@ -7,7 +7,6 @@ AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 
-AC_OUTPUT([python/Makefile])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am
index 92b8c264..b0551965 100644
--- a/vpp-api/java/Makefile.am
+++ b/vpp-api/java/Makefile.am
@@ -84,8 +84,7 @@ packagedir_jvpp_core = io/fd/vpp/jvpp/core
 BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h
 
 JSON_FILES = \
-	$(prefix)/../vpp/vpp-api/vpe.api.json \
-	$(wildcard $(prefix)/../vnet/vnet/*.api.json)
+	$(wildcard $(prefix)/../vpp/share/vpp/api/core/*.api.json)
 
 jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h:		\
     jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h	\
diff --git a/vpp-api/java/jvpp-core/jvpp_core.c b/vpp-api/java/jvpp-core/jvpp_core.c
index 107fa788..ef4cb8e3 100644
--- a/vpp-api/java/jvpp-core/jvpp_core.c
+++ b/vpp-api/java/jvpp-core/jvpp_core.c
@@ -15,18 +15,18 @@
 
 #include <vnet/vnet.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 #define vl_typedefs             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 #define vl_print(handle, ...)
 #define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 
 #include <vnet/api_errno.h>
diff --git a/vpp-api/java/jvpp-registry/jvpp_registry.c b/vpp-api/java/jvpp-registry/jvpp_registry.c
index 7e199b81..cbd5e0ab 100644
--- a/vpp-api/java/jvpp-registry/jvpp_registry.c
+++ b/vpp-api/java/jvpp-registry/jvpp_registry.c
@@ -16,7 +16,7 @@
 #include <vnet/vnet.h>
 
 #define vl_api_version(n,v) static u32 vpe_api_version = (v);
-#include <vpp-api/vpe.api.h>
+#include <vpp/api/vpe.api.h>
 #undef vl_api_version
 
 
@@ -25,19 +25,19 @@
 #include "io_fd_vpp_jvpp_VppJNIConnection.h"
 #include "io_fd_vpp_jvpp_JVppRegistryImpl.h"
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 #define vl_typedefs             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 /* instantiate all the print functions we know about */
 #define vl_print(handle, ...)
 #define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 
 vlib_main_t vlib_global_main;
diff --git a/vpp-api/java/jvpp/gen/jvpp_gen.py b/vpp-api/java/jvpp/gen/jvpp_gen.py
index b1cd84c4..5f8df2a9 100755
--- a/vpp-api/java/jvpp/gen/jvpp_gen.py
+++ b/vpp-api/java/jvpp/gen/jvpp_gen.py
@@ -30,6 +30,8 @@ from jvppgen import jvpp_impl_gen
 from jvppgen import jvpp_c_gen
 from jvppgen import util
 
+blacklist = [ "memclnt.api", "flowperpkt.api" ]
+
 # Invocation:
 # ~/Projects/vpp/vpp-api/jvpp/gen$ mkdir -p java/io/fd/vpp/jvpp && cd java/io/fd/vpp/jvpp
 # ~/Projects/vpp/vpp-api/jvpp/gen/java/io/fd/vpp/jvpp$ ../../../../jvpp_gen.py -idefs_api_vpp_papi.py
@@ -55,6 +57,9 @@ print "plugin_name %s" % plugin_name
 cfg = {}
 
 for inputfile in args.inputfiles:
+    if any(substring in inputfile for substring in blacklist):
+        print "WARNING: Imput file %s blacklisted" % inputfile
+        continue
     _cfg = json.load(open(inputfile, 'r'))
     if 'types' in cfg:
         cfg['types'].extend(_cfg['types'])
diff --git a/vpp/Makefile.am b/vpp/Makefile.am
deleted file mode 100644
index 25d72749..00000000
--- a/vpp/Makefile.am
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @VCGN@ @IPV6SR@ @APICLI@
-
-noinst_PROGRAMS = 
-BUILT_SOURCES =
-bin_PROGRAMS = 
-CLEANFILES = 
-
-bin_PROGRAMS += vpp
-
-vpp_SOURCES =					\
-  vnet/main.c					\
-  app/vpe_cli.c					\
-  app/version.c					\
-  oam/oam.c					\
-  stats/stats.c
-
-vpp_SOURCES +=					\
-  vpp-api/api.c					\
-  vpp-api/custom_dump.c				\
-  vpp-api/json_format.c
-
-if WITH_APICLI
-  vpp_SOURCES +=				\
-  vpp-api/api_format.c				\
-  vpp-api/api_main.c				
-endif
-
-
-# comment out to disable stats upload to gmond 
-
-vpp_SOURCES +=					\
-  vpp-api/gmon.c	
-
-nobase_include_HEADERS =			\
-  vpp-api/vpe_all_api_h.h			\
-  vpp-api/vpe_msg_enum.h			\
-  vpp-api/vpe.api.h
-
-# install the API definition, so we can produce java bindings, etc.
-
-apidir = $(prefix)/vpp-api
-api_DATA = vpp-api/vpe.api.json
-
-BUILT_SOURCES += vpp-api/vpe.api.h app/version.h vpp-api/vpe.api.json
-
-app/version.o:	app/version.h
-
-.PHONY:	app/version.h
-
-app/version.h:
-	@echo "  VERSION " $@ 
-	@echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
-	@echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
-	@echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
-	@echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" 	>> $@
-	@echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
-
-# Generate a plugin configuration script. Misconfiguring a
-# plugin can cause very subtle problems.
-
-bin_SCRIPTS = vpp_plugin_configure
-
-BUILT_SOURCES += vpp_plugin_configure
-
-.PHONY: vpp_plugin_configure
-
-if WITH_DPDK
-PLUGIN_DPDK_ARG="--with-dpdk"
-else
-PLUGIN_DPDK_ARG=""
-endif
-
-vpp_plugin_configure:
-	@echo "PLUGIN CONFIGURE " $@ 
-	@echo "#!/bin/bash" > $@
-	@echo " " >> $@
-	@echo "set +eu" >> $@
-	@echo " " >> $@
-	@echo "if [ -f ./configure ] ; then" >> $@
-	@echo "    CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ./configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@
-	@echo "else" >> $@
-	@echo "    if [ -f ../configure ] ; then" >> $@
-	@echo "        CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ../configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@
-	@echo "    else" >> $@
-	@echo "        echo Couldnt find ./configure or ../configure " >> $@
-	@echo "        exit 1" >> $@
-	@echo "    fi" >> $@
-	@echo "fi" >> $@
-
-vpp_LDADD = -lvlibapi -lvlibmemory  -lvlib_unix -lvlib
-
-vpp_LDADD += -lvnet
-
-vpp_LDADD += -lsvm -lsvmdb -lrt
-
-vpp_LDADD += -lvnetplugin
-
-if WITH_DPDK
-vpp_LDFLAGS = -Wl,--whole-archive
-if ENABLE_DPDK_SHARED
-vpp_LDFLAGS += -ldpdk
-else
-vpp_LDFLAGS += -l:libdpdk.a
-endif
-vpp_LDFLAGS += -Wl,--no-whole-archive
-if WITH_DPDK_CRYPTO
-vpp_LDADD += -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
-endif
-if WITH_DPDK_MLX5_PMD
-vpp_LDFLAGS += -libverbs -lmlx5 -lnuma
-endif
-endif
-
-vpp_LDADD += -lvppinfra -lm -lpthread -ldl
-
-if WITH_IPV6SR
-  vpp_LDADD += -lcrypto
-endif
-
-# Set the suffix list
-SUFFIXES = .api.h .api .api.json
-
-# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk
-# and requires a symbolic link at the top of the vpp source tree
-
-include $(top_srcdir)/suffix-rules.mk
-
-noinst_PROGRAMS += test_client
-
-test_client_SOURCES = vpp-api/test_client.c
-test_client_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
-	-lpthread -lm -lrt
-
-noinst_PROGRAMS += test_client test_ha
-
-test_ha_SOURCES = vpp-api/test_ha.c
-test_ha_LDADD = -lvlibmemoryclient -lvlibapi -lsvmdb -lsvm -lvppinfra \
-		-lpthread -lm -lrt
-
-
-noinst_PROGRAMS += summary_stats_client
-
-summary_stats_client_SOURCES = vpp-api/summary_stats_client.c
-summary_stats_client_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
-	-lpthread -lm -lrt
-
-bin_PROGRAMS += vpp_get_metrics
-
-vpp_get_metrics_SOURCES = vpp-api/vpp_get_metrics.c
-vpp_get_metrics_LDADD = -lsvmdb -lsvm -lvppinfra \
-		-lpthread -lm -lrt
diff --git a/vpp/configure.ac b/vpp/configure.ac
deleted file mode 100644
index 8c333fd1..00000000
--- a/vpp/configure.ac
+++ /dev/null
@@ -1,80 +0,0 @@
-AC_INIT(vpp, 1.1)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_ARG_WITH(dpdk,
-            AC_HELP_STRING([--with-dpdk],[Use DPDK]),
-            [with_dpdk=1],
-            [with_dpdk=0])
-
-AC_ARG_WITH(dpdk_crypto,
-            AC_HELP_STRING([--with-dpdk-crypto],[Use DPDK cryptodev]),
-            [with_dpdk_crypto=1],
-            [with_dpdk_crypto=0])
-
-AC_ARG_WITH(dpdk_mlx5_pmd,
-            AC_HELP_STRING([--with-dpdk-mlx5-pmd],[Use Mellanox ConnetxX-4 DPDK PMD]),
-            [with_dpdk_mlx5_pmd=1],
-            [with_dpdk_mlx5_pmd=0])
-
-AC_ARG_ENABLE(dpdk-shared,
-              AC_HELP_STRING([--enable-dpdk-shared],[Link with DPDK shared lib]),
-              [enable_dpdk_shared=1],
-              [enable_dpdk_shared=0])
-
-AC_ARG_WITH(ipsec,
-            AC_HELP_STRING([--without-ipsec],[Disable ipsec]),
-            [with_ipsec=0],
-            [with_ipsec=1])
-
-AC_ARG_WITH(vcgn,
-            AC_HELP_STRING([--without-vcgn],[Disable vcgn]),
-            [with_vcgn=0],
-            [with_vcgn=1])
-
-AC_ARG_WITH(ipv6sr,
-            AC_HELP_STRING([--without-ipv6sr],[Disable ipv6sr]),
-            [with_ipv6sr=0],
-            [with_ipv6sr=1])
-
-AC_ARG_WITH(apicli,
-            AC_HELP_STRING([--without-apicli],[Disable binary api CLI]),
-            [with_apicli=0],
-            [with_apicli=1])
-
-AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
-AM_CONDITIONAL(ENABLE_DPDK_SHARED, test "$enable_dpdk_shared" = "1")
-AC_SUBST(DPDK,["-DDPDK=${with_dpdk} -DDPDK_SHARED_LIB=${enable_dpdk_shared}"])
-AM_CONDITIONAL(WITH_DPDK_CRYPTO, test "$with_dpdk_crypto" = "1")
-AC_SUBST(DPDK_CRYPTO,[-DDPDK_CRYPTO=${with_dpdk_crypto}])
-AM_CONDITIONAL(WITH_DPDK_MLX5_PMD, test "$with_dpdk_mlx5_pmd" = "1")
-
-AM_COND_IF(
-	[ENABLE_DPDK_SHARED],
-	[
-		AC_CHECK_HEADERS(
-			[rte_config.h],
-			[], [AC_MSG_ERROR([DPDK header files not found])],
-		)
-		AC_CHECK_LIB(
-			[dpdk], [rte_eal_init],
-			[], [AC_MSG_ERROR([DPDK shared library not found])],
-		)
-	],
-)
-
-AM_CONDITIONAL(WITH_IPSEC, test "$with_ipsec" = "1")
-AC_SUBST(IPSEC,[-DIPSEC=${with_ipsec}])
-
-AM_CONDITIONAL(WITH_VCGN, test "$with_vcgn" = "1")
-AC_SUBST(VCGN,[-DVCGN=${with_vcgn}])
-
-AM_CONDITIONAL(WITH_IPV6SR, test "$with_ipv6sr" = "1")
-AC_SUBST(IPV6SR,[-DIPV6SR=${with_ipv6sr}])
-
-AM_CONDITIONAL(WITH_APICLI, test "$with_apicli" = "1")
-AC_SUBST(APICLI,[-DVPP_API_TEST_BUILTIN=${with_apicli}])
-
-AC_OUTPUT([Makefile])
diff --git a/vpp/suffix-rules.mk b/vpp/suffix-rules.mk
deleted file mode 120000
index f6098400..00000000
--- a/vpp/suffix-rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-../build-data/suffix-rules.mk
\ No newline at end of file
diff --git a/vpp/vpp-api/api_format.c b/vpp/vpp-api/api_format.c
deleted file mode 120000
index f37e6575..00000000
--- a/vpp/vpp-api/api_format.c
+++ /dev/null
@@ -1 +0,0 @@
-../../vpp-api-test/vat/api_format.c
\ No newline at end of file
diff --git a/vpp/vpp-api/vat.h b/vpp/vpp-api/vat.h
deleted file mode 120000
index b7a00e90..00000000
--- a/vpp/vpp-api/vat.h
+++ /dev/null
@@ -1 +0,0 @@
-../../vpp-api-test/vat/vat.h
\ No newline at end of file
diff --git a/vppinfra/.gitignore b/vppinfra/.gitignore
deleted file mode 100644
index b25c15b8..00000000
--- a/vppinfra/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/vppinfra/INSTALL b/vppinfra/INSTALL
deleted file mode 100644
index 23e5f25d..00000000
--- a/vppinfra/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/vppinfra/Make.defs b/vppinfra/Make.defs
deleted file mode 100644
index dcb51e16..00000000
--- a/vppinfra/Make.defs
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright (c) 2001, 2002 Eliot Dresselhaus
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-#  The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# Basic toolchain defines.
-CC = $(CROSS_COMPILE)gcc
-LD = $(CROSS_COMPILE)ld
-AR = $(CROSS_COMPILE)ar
-RANLIB = $(CROSS_COMPILE)ranlib
-INSTALL = install
-
-ifneq ($(origin CROSS_COMPILE), undefined)
-  IS_CROSS_COMPILE=yes
-endif
-
-CLIB_ARCH = $(shell $(CC) -dumpmachine)
-
-# Where to get linux kernel includes.
-# By default get linux includes from /usr/include/linux...
-KERNEL_PREFIX ?= /usr
-
-# Where to find compiler include directory (since we may
-# be using -nostdinc).
-CC_PREFIX = $(shell dirname `$(CC) --print-libgcc-file-name`)
-
-# Where to get LIBC includes for cross compiles
-LIBC_PREFIX ?= $(CC_PREFIX)/../../../../$(CLIB_ARCH)
-
-# Where to find CLIB includes/libraries for cross compiles
-CLIB_PREFIX ?= /usr/local/$(CLIB_ARCH)
-
-OBJ = $(CLIB_ARCH).o
-SHARED_OBJ = shared.$(OBJ)
-KERNEL_OBJ = kernel.$(OBJ)
-MODULE_OBJ = module.$(OBJ)
-
-DEP = $(CLIB_ARCH).d
-SHARED_DEP = shared.$(DEP)
-KERNEL_DEP = kernel.$(DEP)
-
-STATIC_LIB = $(CLIB_ARCH).a
-SHARED_LIB = $(CLIB_ARCH).so
-KERNEL_LIB = kernel.$(CLIB_ARCH).a
-
-STATIC_CFLAGS = $(DEFAULT_CFLAGS)
-SHARED_CFLAGS = $(STATIC_CFLAGS) -fPIC
-
-# Compile flags common to user/kernel
-CLIB_COMMON_CFLAGS += -Wall
-
-DEBUG ?= no
-ifeq ($(DEBUG),yes)
-	COPTS ?= -g -O0
-	CLIB_COMMON_CFLAGS += -DDEBUG
-else
-	COPTS ?= -O2
-endif
-
-CLIB_COMMON_CFLAGS += $(COPTS) 
-
-CLIB_USER_CFLAGS = $(CLIB_COMMON_CFLAGS)
-
-ifeq ($(IS_CROSS_COMPILE),yes)
-  CLIB_USER_CFLAGS += -nostdinc
-  CLIB_USER_CFLAGS += -idirafter $(CC_PREFIX)/include
-  CLIB_USER_CFLAGS += -idirafter $(KERNEL_PREFIX)/include
-  CLIB_USER_CFLAGS += -idirafter $(LIBC_PREFIX)/include
-  CLIB_COMMON_CFLAGS += -idirafter $(CLIB_PREFIX)/include
-endif
-
-STATIC_CFLAGS = $(CLIB_USER_CFLAGS)
-SHARED_CFLAGS = $(STATIC_CFLAGS) -fPIC
-
-%.$(SHARED_OBJ): %.c
-	$(CC) -c $(SHARED_CFLAGS) -o $@ $<
-
-%.$(OBJ): %.c
-	$(CC) -c $(STATIC_CFLAGS) -o $@ $<
-
-# Kernel version of clib
-
-CLIB_KERNEL_CFLAGS = $(CLIB_COMMON_CFLAGS)
-
-CLIB_KERNEL_CFLAGS += -nostdinc
-CLIB_KERNEL_CFLAGS += -idirafter $(CC_PREFIX)/include
-CLIB_KERNEL_CFLAGS += -idirafter $(KERNEL_PREFIX)/include
-
-# Kernel always uses mheap allocator (no malloc)
-CLIB_KERNEL_CFLAGS += -DCLIB_MEM_MHEAP
-
-CLIB_KERNEL_CFLAGS += -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB
-
-CLIB_KERNEL_CFLAGS += -fno-common -fomit-frame-pointer -fno-strict-aliasing
-
-ifeq ($(findstring mips,$(CLIB_ARCH)),mips)
-  CLIB_KERNEL_CFLAGS += -G0 \
-	-mno-abicalls -fno-pic -mlong-calls \
-	-mcpu=r8000 -mips2 -Wa,--trap 
-endif
-
-%.$(KERNEL_OBJ): %.c
-	$(CC) $(CLIB_KERNEL_CFLAGS) -c -o $@ $<
-
-# Dependencies
-%.$(DEP): %.c
-	$(CC) $(CLIB_USER_CFLAGS) -c -M $< | sed -e s/.o:/.$(OBJ):/ > $@
-
-%.$(SHARED_DEP): %.c
-	$(CC) $(CLIB_USER_CFLAGS) -c -M $< | sed -e s/.o:/.$(SHARED_OBJ):/ > $@
-
-%.$(KERNEL_DEP): %.c
-	$(CC) $(CLIB_KERNEL_CFLAGS) -c -M $< | sed -e s/.o:/.$(KERNEL_OBJ):/ > $@
diff --git a/vppinfra/configure.ac b/vppinfra/configure.ac
deleted file mode 100644
index 88939383..00000000
--- a/vppinfra/configure.ac
+++ /dev/null
@@ -1,52 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_INIT(libvppinfra,1.0,)
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_HEADERS(config/config.h)
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([gnu no-dist-gzip dist-bzip2])
-AM_SILENT_RULES([yes])
-
-# Checks for programs.
-AC_PROG_CC
-AM_PROG_AS
-AM_PROG_LIBTOOL
-
-######################################################################
-
-dnl ------------
-dnl Check CFLAGS, CC
-dnl ------------
-AC_ARG_WITH(cc,
-	    AC_HELP_STRING([--with-cc],[Set CC for use as C compiler.]),
-	    [CC="$with_cc"])
-
-AC_ARG_WITH(cflags,
-	    AC_HELP_STRING([--with-cflags],[Set CFLAGS for use by C compiler.]),
-	    [CFLAGS="$with_cflags"])
-
-AC_ARG_WITH(ldflags,
-	    AC_HELP_STRING([--with-ldflags],[Set LDFLAGS for linking.]),
-	    [LDFLAGS="$with_ldflags"])
-
-######################################################################
-
-AC_ARG_ENABLE(tests,
-              AC_HELP_STRING([--enable-tests],[Enable unit tests]),
-              [enable_tests=1],
-              [enable_tests=0])
-
-AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "1")
-
-AC_ARG_WITH(unix,
-            AC_HELP_STRING([--with-unix],[Compile unix version of clib]),
-	    [],
-	    [case $host_os in
-	      darwin* | linux*) with_unix=yes;;
-	      *) with_unix=no;;
-	      esac])
-
-AM_CONDITIONAL(WITH_UNIX, test "$with_unix" = "yes")
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/vppinfra/dir.dox b/vppinfra/dir.dox
deleted file mode 100644
index dee0cd9c..00000000
--- a/vppinfra/dir.dox
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** @dir
- * @brief VPP infrastructure library and tools.
- */
diff --git a/vppinfra/mkinstalldirs b/vppinfra/mkinstalldirs
deleted file mode 100755
index d2d5f21b..00000000
--- a/vppinfra/mkinstalldirs
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here