diff --git a/kronosnetd/Makefile.am b/kronosnetd/Makefile.am
index bb695e99..0503e726 100644
--- a/kronosnetd/Makefile.am
+++ b/kronosnetd/Makefile.am
@@ -1,91 +1,90 @@
 #
 # Copyright (C) 2010-2015 Red Hat, Inc.  All rights reserved.
 #
 # Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
 #
 # This software licensed under GPL-2.0+, LGPL-2.0+
 #
 
 MAINTAINERCLEANFILES	= Makefile.in kronostnetd.logrotate
 
 include $(top_srcdir)/build-aux/check.mk
 
 EXTRA_DIST		= kronosnetd.logrotate.in kronosnetd.8 knet-keygen.8
 
 noinst_HEADERS		= \
 			  cfg.h \
 			  etherfilter.h \
 			  logging.h \
 			  vty.h \
 			  vty_auth.h \
 			  vty_cli.h \
 			  vty_cli_cmds.h \
 			  vty_utils.h 
 
 kronosnetd_SOURCES	= \
 			  cfg.c \
 			  etherfilter.c \
 			  main.c \
 			  logging.c \
 			  vty.c \
 			  vty_auth.c \
 			  vty_cli.c \
 			  vty_cli_cmds.c \
 			  vty_utils.c
 
 kronosnetd_CPPFLAGS	= \
 			  -I$(top_srcdir)/libtap \
-			  -I$(top_srcdir)/libknet \
-			  -I$(top_srcdir)/common
+			  -I$(top_srcdir)/libknet
 
 kronosnetd_CFLAGS	= $(libqb_CFLAGS)
 
 kronosnetd_LDADD	= \
 			  $(top_builddir)/libknet/libknet.la \
 			  $(top_builddir)/libtap/libtap.la \
 			  $(libqb_LIBS)
 
 knet_keygen_SOURCES	= keygen.c
 
 knet_keygen_CPPFLAGS	= -I$(top_srcdir)/libknet
 
 if BUILD_KRONOSNETD
 
 sbin_PROGRAMS		= kronosnetd \
 			  knet-keygen
 
 dist_man_MANS		= kronosnetd.8 knet-keygen.8
 
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)
 	$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/down.d
 	$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/post-down.d
 	$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/pre-up.d
 	$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/up.d
 	$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/cryptokeys.d
 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(sysconfdir)/logrotate.d
 	$(INSTALL) -m 644 kronosnetd.logrotate $(DESTDIR)/$(sysconfdir)/logrotate.d/kronosnetd
 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(sysconfdir)/pam.d
 	if [ -a $(sysconfdir)/pam.d/password-auth ]; then \
 		cd $(DESTDIR)/$(sysconfdir)/pam.d && \
 			rm -f kronosnetd && \
 			$(LN_S) password-auth kronosnetd; \
 	else \
 		cd $(DESTDIR)/$(sysconfdir)/pam.d && \
 			rm -f kronosnetd && \
 			$(LN_S) passwd kronosnetd; \
 	fi
 
 uninstall-local:
 	rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/cryptokeys.d || :;
 	rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/down.d || :;
 	rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/post-down.d || :;
 	rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/pre-up.d || :;
 	rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/up.d || :;
 	rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR) || :;
 	rm -f $(DESTDIR)/$(sysconfdir)/logrotate.d/kronosnetd
 	rmdir $(DESTDIR)/$(sysconfdir)/logrotate.d || :;
 	rm -f $(DESTDIR)/$(sysconfdir)/pam.d/kronosnetd || :;
 	rmdir $(DESTDIR)/$(sysconfdir)/pam.d || :;
 
 endif
diff --git a/libknet/tests/Makefile.am b/libknet/tests/Makefile.am
index 4758d8c7..308ad78e 100644
--- a/libknet/tests/Makefile.am
+++ b/libknet/tests/Makefile.am
@@ -1,89 +1,88 @@
 #
 # Copyright (C) 2016 Red Hat, Inc.  All rights reserved.
 #
 # Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
 #
 # This software licensed under GPL-2.0+, LGPL-2.0+
 #
 
 MAINTAINERCLEANFILES	= Makefile.in
 
 include $(top_srcdir)/build-aux/check.mk
 include $(top_srcdir)/libknet/tests/api-check.mk
 
 EXTRA_DIST		= \
 			  api-test-coverage \
 			  api-check.mk
 
-AM_CPPFLAGS		= -I$(top_srcdir)/libknet \
-			  -I$(top_srcdir)/common
+AM_CPPFLAGS		= -I$(top_srcdir)/libknet
 
 # override global LIBS that pulls in lots of craft we don't need here
 LIBS			=
 
 LDADD			= $(top_builddir)/libknet/libknet.la
 
 noinst_HEADERS		= \
 			  test-common.h
 
 # the order of those tests is NOT random.
 # some functions can only be tested properly after some dependents
 # API have been validated upfront.
 
 check_PROGRAMS		= \
 			  $(api_checks) \
 			  $(int_checks) \
 			  $(fun_checks)
 
 int_checks		= \
 			  int_crypto_test \
 			  int_timediff_test
 
 fun_checks		=
 
 benchmarks		= \
 			  crypto_bench_test \
 			  knet_bench_test
 
 noinst_PROGRAMS		= \
 			  pckt_test \
 			  $(benchmarks) \
 			  $(check_PROGRAMS)
 
 noinst_SCRIPTS		= \
 			  api-test-coverage
 
 TESTS			= $(check_PROGRAMS)
 
 check-local: check-api-test-coverage
 
 check-api-test-coverage:
 	chmod u+x $(top_srcdir)/libknet/tests/api-test-coverage
 	$(top_srcdir)/libknet/tests/api-test-coverage $(top_srcdir) $(top_builddir)
 
 pckt_test_SOURCES	= pckt_test.c
 
 int_crypto_test_SOURCES = int_crypto.c \
 			  ../crypto.c \
 			  ../nsscrypto.c \
 			  ../logging.c \
 			  test-common.c
 
 int_crypto_test_CFLAGS	= $(nss_CFLAGS)
 
 int_crypto_test_LDFLAGS = $(nss_LIBS)
 
 int_timediff_test_SOURCES = int_timediff.c
 
 crypto_bench_test_SOURCES = crypto_bench.c \
 			    ../crypto.c \
 			    ../nsscrypto.c \
 			    ../logging.c \
 			    test-common.c
 
 crypto_bench_test_CFLAGS  = $(nss_CFLAGS)
 
 crypto_bench_test_LDFLAGS = $(nss_LIBS)
 
 knet_bench_test_SOURCES	= knet_bench.c \
 			  test-common.c