-gmod_CPPFLAGS = $(call installed_includes_fn, vppinfra svm)
-gmod_CPPFLAGS += -I/usr/include/apr-1.0
-gmod_LDFLAGS = $(call installed_libs_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, vpp)