diff --git a/Makefile.am b/Makefile.am
index dec7e830..56b7109f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,8 +38,8 @@ ChangeLog:
 files-update:
 	cp -f $(builddir)/src/ocserv-args.c $(srcdir)/src/ocserv-args.c.in
 	cp -f $(builddir)/src/ocserv-args.h $(srcdir)/src/ocserv-args.h.in
-	cp -f $(builddir)/src/ocpasswd/ocpasswd-args.c $(srcdir)/src/ocpasswd/ocpasswd-args.c.in
-	cp -f $(builddir)/src/ocpasswd/ocpasswd-args.h $(srcdir)/src/ocpasswd/ocpasswd-args.h.in
+	cp -f $(builddir)/src/ocpasswd-args.c $(srcdir)/src/ocpasswd/ocpasswd-args.c.in
+	cp -f $(builddir)/src/ocpasswd-args.h $(srcdir)/src/ocpasswd/ocpasswd-args.h.in
 
 files-compare:
 	@echo "*****************************************************************"
@@ -48,8 +48,8 @@ files-compare:
 	@echo "*****************************************************************"
 	cmp $(srcdir)/src/ocserv-args.c.in $(builddir)/src/ocserv-args.c
 	cmp $(srcdir)/src/ocserv-args.h.in $(builddir)/src/ocserv-args.h
-	cmp $(srcdir)/src/ocpasswd/ocpasswd-args.c.in $(builddir)/src/ocpasswd/ocpasswd-args.c
-	cmp $(srcdir)/src/ocpasswd/ocpasswd-args.h.in $(builddir)/src/ocpasswd/ocpasswd-args.h
+	cmp $(srcdir)/src/ocpasswd/ocpasswd-args.c.in $(builddir)/src/ocpasswd-args.c
+	cmp $(srcdir)/src/ocpasswd/ocpasswd-args.h.in $(builddir)/src/ocpasswd-args.h
 
 dist-hook: files-compare ChangeLog
 	mv ChangeLog $(distdir)
diff --git a/configure.ac b/configure.ac
index 7deeae82..3083619a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -497,8 +497,8 @@ AC_SUBST([ROOTGID], [$gid])
 LIBOPTS_CHECK([libopts])
 if test "$NEED_LIBOPTS_DIR" = "true";then
 	dnl create libopts-generated files
-        AC_CONFIG_LINKS([src/ocpasswd/ocpasswd-args.c:src/ocpasswd/ocpasswd-args.c.in
-			 src/ocpasswd/ocpasswd-args.h:src/ocpasswd/ocpasswd-args.h.in
+        AC_CONFIG_LINKS([src/ocpasswd-args.c:src/ocpasswd/ocpasswd-args.c.in
+			 src/ocpasswd-args.h:src/ocpasswd/ocpasswd-args.h.in
 			 src/ocserv-args.c:src/ocserv-args.c.in
 			 src/ocserv-args.h:src/ocserv-args.h.in])
 	AC_SUBST([AUTOGEN], [:])
@@ -512,12 +512,6 @@ AC_CONFIG_FILES([
 	Makefile
 	src/version.inc
 	src/Makefile
-	src/occtl/Makefile
-	src/ocpasswd/Makefile
-	src/ccan/Makefile
-	src/common/Makefile
-	src/pcl/Makefile
-	src/protobuf/Makefile
 	doc/Makefile
 	gl/Makefile
 	tests/docker-ocserv/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index f394446e..3c9390b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = ccan common
-
 include common.mk
 
 AM_CPPFLAGS += -I$(srcdir)/../gl/ -I$(builddir)/../gl/ \
@@ -9,12 +7,14 @@ AM_CPPFLAGS += -I$(srcdir)/../gl/ -I$(builddir)/../gl/ \
 	$(LIBREADLINE_CFLAGS) $(CODE_COVERAGE_CFLAGS) \
 	$(LIBTALLOC_CFLAGS) $(LIBDBUS_CFLAGS) $(LIBOATH_CFLAGS) \
 	$(LIBKRB5_CFLAGS) $(LIBTASN1_CFLAGS) $(RADCLI_CFLAGS)
+	$(LIBNL3_CFLAGS)/
 
 BUILT_SOURCES = ocserv-args.c ocserv-args.h ipc.pb-c.c ipc.pb-c.h \
 	http-heads.h kkdcp_asn1_tab.c ctl.pb-c.c ctl.pb-c.h
 
 EXTRA_DIST = version.inc.in version.inc ocserv-args.c.in ocserv-args.h.in \
-	ipc.proto ctl.proto http-heads.gperf common.mk ocserv-fw
+	ipc.proto ctl.proto http-heads.gperf common.mk ocserv-fw occtl/occtl-args.def
+	
 
 sbin_PROGRAMS = ocserv
 bin_SCRIPTS = ocserv-fw
@@ -67,7 +67,7 @@ if LOCAL_HTTP_PARSER
 HTTP_PARSER_SOURCES = http-parser/http_parser.c http-parser/http_parser.h
 endif
 
-ocserv_LDADD = ../gl/libgnu.a $(NEEDED_LIBOPTS) libcmd-ocserv.a ccan/libccan.a common/libcommon.a
+ocserv_LDADD = ../gl/libgnu.a $(NEEDED_LIBOPTS) libcmd-ocserv.a libccan.a libcommon.a
 ocserv_LDADD += $(LIBGNUTLS_LIBS) $(PAM_LIBS) $(LIBUTIL) \
 	$(LIBSECCOMP) $(LIBWRAP) $(LIBCRYPT) $(NEEDED_HTTP_PARSER_LIBS) \
 	$(NEEDED_LIBPROTOBUF_LIBS) $(LIBSYSTEMD) $(LIBTALLOC_LIBS) \
@@ -77,20 +77,6 @@ ocserv_LDADD += $(LIBGNUTLS_LIBS) $(PAM_LIBS) $(LIBUTIL) \
 	$(CODE_COVERAGE_LDFLAGS)
 
 
-if PCL
-ocserv_LDADD += $(PCL_LIBS)
-else
-ocserv_LDADD += pcl/libpcl.a
-SUBDIRS += pcl
-AM_CPPFLAGS += -I$(srcdir)/pcl/
-endif
-
-if LOCAL_PROTOBUF_C
-SUBDIRS += protobuf
-endif
-
-SUBDIRS += occtl ocpasswd
-
 ocserv_SOURCES += main-ctl-unix.c
 
 libipc_a_SOURCES=ctl.pb-c.c ctl.pb-c.h ipc.pb-c.h ipc.pb-c.c
@@ -111,13 +97,89 @@ http-heads.h: $(srcdir)/http-heads.gperf
 kkdcp_asn1_tab.c: $(srcdir)/kkdcp.asn
 	-asn1Parser $^ $@
 
-ccan/libccan.a:
-	cd ccan && $(MAKE) $(AM_MAKEFLAGS) libccan.a
-
-common/libcommon.a:
-	cd common && $(MAKE) $(AM_MAKEFLAGS) libcommon.a
-
-.PHONY: ccan/libccan.a common/libcommon.a
-
 clean-local:
 	rm -f *.stamp
+
+# Occtl
+
+bin_PROGRAMS = occtl/occtl
+
+occtl_occtl_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/occtl $(LIBNL3_CFLAGS)/
+occtl_occtl_SOURCES = occtl/occtl.c occtl/pager.c occtl/occtl.h occtl/time.c occtl/cache.c \
+	occtl/ip-cache.c occtl/nl.c occtl/ctl.h occtl/print.c occtl/json.c occtl/json.h \
+	occtl/hex.c occtl/hex.h occtl/unix.c
+occtl_occtl_LDADD = ../gl/libgnu.a libcommon.a $(LIBREADLINE_LIBS) \
+	$(LIBNL3_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) $(LIBTALLOC_LIBS) libccan.a \
+	libipc.a $(NEEDED_LIBPROTOBUF_LIBS) $(CODE_COVERAGE_LDFLAGS) \
+	$(LIBNETTLE_LIBS)
+
+# Ocpasswd
+
+EXTRA_DIST += ocpasswd/ocpasswd-args.def ocpasswd/ocpasswd-args.c.in ocpasswd/ocpasswd-args.h.in
+
+BUILT_SOURCES += ocpasswd-args.c ocpasswd-args.h
+
+bin_PROGRAMS += ocpasswd/ocpasswd
+
+noinst_LIBRARIES += libcmd-ocpasswd.a
+libcmd_ocpasswd_a_SOURCES = ocpasswd/ocpasswd-args.def ocpasswd-args.c ocpasswd-args.h
+
+ocpasswd_ocpasswd_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ocpasswd
+ocpasswd_ocpasswd_SOURCES = ocpasswd/ocpasswd.c
+ocpasswd_ocpasswd_LDADD = ../gl/libgnu.a $(NEEDED_LIBOPTS) libcmd-ocpasswd.a
+ocpasswd_ocpasswd_LDADD += $(LIBGNUTLS_LIBS) $(LIBCRYPT) $(CODE_COVERAGE_LDFLAGS) \
+	$(LIBNETTLE_LIBS)
+
+ocpasswd-args.stamp: $(srcdir)/ocpasswd/ocpasswd-args.def $(builddir)/version.inc
+	$(AUTOGEN) $<
+	touch $@
+ocpasswd-args.h: ocpasswd-args.stamp
+ocpasswd-args.c: ocpasswd-args.stamp
+
+
+# libcommon
+# Files common to ocserv and occtl.
+libcommon_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/common
+libcommon_a_SOURCES=common/common.c common/common.h common/system.c common/system.h \
+	common/cloexec.c common/cloexec.h common/base64-helper.c common/base64-helper.h
+libcommon_a_LIBS = ../gl/libgnu.a $(NEEDED_LIBPROTOBUF_LIBS)
+noinst_LIBRARIES += libcommon.a
+
+
+# libccan
+EXTRA_DIST += ccan/licenses/BSD-MIT ccan/licenses/CC0 ccan/licenses/LGPL-2.1
+
+noinst_LIBRARIES += libccan.a
+libccan_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ccan
+libccan_a_SOURCES = ccan/build_assert/build_assert.h ccan/check_type/check_type.h \
+	ccan/container_of/container_of.h ccan/hash/hash.c ccan/hash/hash.h \
+	ccan/htable/htable.c ccan/htable/htable.h ccan/htable/htable_type.h \
+	ccan/list/list.c ccan/list/list.h
+
+if LOCAL_TALLOC
+libccan_a_SOURCES += ccan/talloc/talloc.c ccan/talloc/talloc.h ccan/compiler/compiler.h \
+	ccan/typesafe_cb/typesafe_cb.h
+endif
+
+# libpcl
+if PCL
+ocserv_LDADD += $(PCL_LIBS)
+else
+ocserv_LDADD += libpcl.a
+AM_CPPFLAGS += -I$(srcdir)/pcl/
+
+noinst_LIBRARIES += libpcl.a
+
+libpcl_a_CPPFLAGS = -I$(srcdir)/pcl -I$(builddir)/../
+libpcl_a_SOURCES = pcl/pcl.c pcl/pcl_version.c pcl/pcl_private.c \
+	pcl/pcl_config.h pcl/pcl.h pcl/pcl_private.h
+
+endif
+
+
+if LOCAL_PROTOBUF_C
+noinst_LIBRARIES += libprotobuf.a
+
+libprotobuf_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/protobuf/
+libprotobuf_a_SOURCES = protobuf/protobuf-c/protobuf-c.c  protobuf/protobuf-c/protobuf-c.h
+endif
diff --git a/src/ccan/Makefile.am b/src/ccan/Makefile.am
deleted file mode 100644
index 886b9b7a..00000000
--- a/src/ccan/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AM_CPPFLAGS =  -I$(srcdir)/ -I$(builddir)/../ -I$(srcdir)/../
-
-EXTRA_DIST = licenses/BSD-MIT licenses/CC0 licenses/LGPL-2.1
-
-noinst_LIBRARIES = libccan.a
-libccan_a_SOURCES = build_assert/build_assert.h check_type/check_type.h \
-	container_of/container_of.h hash/hash.c hash/hash.h \
-	htable/htable.c htable/htable.h htable/htable_type.h \
-	list/list.c list/list.h
-
-if LOCAL_TALLOC
-libccan_a_SOURCES += talloc/talloc.c talloc/talloc.h compiler/compiler.h \
-	typesafe_cb/typesafe_cb.h
-endif
diff --git a/src/common.mk b/src/common.mk
index 4da0cc7f..3b278c2b 100644
--- a/src/common.mk
+++ b/src/common.mk
@@ -19,7 +19,7 @@ endif
 
 if LOCAL_PROTOBUF_C
 AM_CPPFLAGS += -I$(top_builddir)/src/protobuf/
-NEEDED_LIBPROTOBUF_LIBS = $(top_builddir)/src/protobuf/libprotobuf.a
+NEEDED_LIBPROTOBUF_LIBS = libprotobuf.a
 else
 NEEDED_LIBPROTOBUF_LIBS = $(LIBPROTOBUF_C_LIBS)
 endif
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
deleted file mode 100644
index 790ca648..00000000
--- a/src/common/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include ../common.mk
-
-AM_CPPFLAGS += -I$(srcdir)/../../gl/ -I$(builddir)/../../gl/ \
-	-I$(srcdir)/ -I$(srcdir)/../ -I$(builddir)/../../ -I$(srcdir)/../../ \
-	-I$(builddir)/../ $(LIBPROTOBUF_C_CFLAGS) $(LIBTALLOC_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS)
-
-# Files common to ocserv and occtl.
-libcommon_a_SOURCES=common.c common.h system.c system.h \
-	cloexec.c cloexec.h base64-helper.c base64-helper.h
-libcommon_a_LIBS = ../../gl/libgnu.a $(NEEDED_LIBPROTOBUF_LIBS)
-noinst_LIBRARIES = libcommon.a
-
-
diff --git a/src/occtl/Makefile.am b/src/occtl/Makefile.am
deleted file mode 100644
index 381412cf..00000000
--- a/src/occtl/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-include ../common.mk
-
-AM_CPPFLAGS += -I$(srcdir)/../../gl/ -I$(builddir)/../../gl/ \
-	-I$(srcdir)/ -I$(srcdir)/../ -I$(builddir)/../../ -I$(builddir)/../ \
-	$(LIBNL3_CFLAGS) $(LIBPROTOBUF_C_CFLAGS) $(LIBTALLOC_CFLAGS) \
-	-I$(srcdir)/../common/ -I$(builddir)/../common/ $(CODE_COVERAGE_CFLAGS)
-
-EXTRA_DIST = occtl-args.def
-
-bin_PROGRAMS = occtl
-
-occtl_SOURCES = occtl.c pager.c occtl.h time.c cache.c ip-cache.c \
-	nl.c ctl.h print.c json.c json.h hex.c hex.h
-occtl_LDADD = ../../gl/libgnu.a ../common/libcommon.a $(LIBREADLINE_LIBS) \
-	$(LIBNL3_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) $(LIBTALLOC_LIBS) ../ccan/libccan.a \
-	../libipc.a $(NEEDED_LIBPROTOBUF_LIBS) $(CODE_COVERAGE_LDFLAGS) \
-	$(LIBNETTLE_LIBS)
-
-occtl_SOURCES += unix.c
-
-../libipc.a:
-	cd .. && $(MAKE) $(AM_MAKEFLAGS) libipc.a
-
-../ccan/libccan.a:
-	cd ../ccan && $(MAKE) $(AM_MAKEFLAGS) libccan.a
-
-../common/libcommon.a:
-	cd ../common && $(MAKE) $(AM_MAKEFLAGS) libcommon.a
-
-$(top_srcdir)/src/protobuf/libprotobuf.a:
-	cd ../protobuf && $(MAKE) $(AM_MAKEFLAGS) libprotobuf.a
-
-.PHONY: ../libipc.a ../ccan/libccan.a ../common/libcommon.a
diff --git a/src/ocpasswd/Makefile.am b/src/ocpasswd/Makefile.am
deleted file mode 100644
index 90bbb907..00000000
--- a/src/ocpasswd/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-include ../common.mk
-
-AM_CPPFLAGS += -I$(srcdir)/../../gl/ -I$(builddir)/../../gl/ \
-	-I$(srcdir)/ -I$(srcdir)/../ -I$(builddir)/../../ \
-	-I$(builddir) $(LIBTALLOC_CFLAGS) $(LIBOPTS_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS) $(LIBGNUTLS_CFLAGS)
-
-
-EXTRA_DIST = ocpasswd-args.def ocpasswd-args.c.in ocpasswd-args.h.in
-
-BUILT_SOURCES = ocpasswd-args.c ocpasswd-args.h
-
-bin_PROGRAMS = ocpasswd
-
-noinst_LIBRARIES = libcmd-ocpasswd.a
-libcmd_ocpasswd_a_SOURCES = ocpasswd-args.def ocpasswd-args.c ocpasswd-args.h
-
-ocpasswd_SOURCES = ocpasswd.c
-ocpasswd_LDADD = ../../gl/libgnu.a $(NEEDED_LIBOPTS) libcmd-ocpasswd.a
-ocpasswd_LDADD += $(LIBGNUTLS_LIBS) $(LIBCRYPT) $(CODE_COVERAGE_LDFLAGS) \
-	$(LIBNETTLE_LIBS)
-
-ocpasswd-args.stamp: $(srcdir)/ocpasswd-args.def $(builddir)/../version.inc
-	$(AUTOGEN) $<
-	touch $@
-ocpasswd-args.h: ocpasswd-args.stamp
-ocpasswd-args.c: ocpasswd-args.stamp
-
-clean-local:
-	rm -f ocpasswd-args.stamp
diff --git a/src/pcl/Makefile.am b/src/pcl/Makefile.am
deleted file mode 100644
index 2fa9b89d..00000000
--- a/src/pcl/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AM_CPPFLAGS = -I$(srcdir)/../gl/ -I$(builddir)/../gl/ \
-	-I$(srcdir)/ -I$(builddir)/../../
-
-noinst_LIBRARIES = libpcl.a
-libpcl_a_SOURCES = pcl.c pcl_version.c pcl_private.c \
-	pcl_config.h pcl.h pcl_private.h
-
diff --git a/src/protobuf/Makefile.am b/src/protobuf/Makefile.am
deleted file mode 100644
index 523067f4..00000000
--- a/src/protobuf/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AM_CPPFLAGS = -I$(srcdir)/../gl/ -I$(builddir)/../gl/ \
-	-I$(srcdir)/ -I$(builddir)/../../
-
-noinst_LIBRARIES = libprotobuf.a
-libprotobuf_a_SOURCES = protobuf-c/protobuf-c.c  protobuf-c/protobuf-c.h
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a66fd999..8b1a9ee1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -51,6 +51,7 @@ endif
 AM_CPPFLAGS += \
 	$(LIBOPTS_CFLAGS) \
 	$(LIBTALLOC_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	-I$(top_srcdir)/src/ \
 	-I$(top_builddir)/src/ \
 	-I$(top_srcdir)/src/common/ \
@@ -60,41 +61,43 @@ AM_CPPFLAGS += \
 	-I$(top_srcdir)/ \
 	-I$(top_builddir)/
 
+LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/libccan.a $(CODE_COVERAGE_LDFLAGS)
+
 kkdcp_parsing_SOURCES = kkdcp-parsing.c
-kkdcp_parsing_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+kkdcp_parsing_LDADD = $(LDADD)
 
 json_escape_SOURCES = json-escape.c
-json_escape_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+json_escape_LDADD = $(LDADD)
 
 url_escape_SOURCES = url-escape.c
-url_escape_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+url_escape_LDADD = $(LDADD)
 
 html_escape_SOURCES = html-escape.c
-html_escape_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+html_escape_LDADD = $(LDADD)
 
 ipv4_prefix_SOURCES = ipv4-prefix.c
-ipv4_prefix_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+ipv4_prefix_LDADD = $(LDADD)
 
 ban_ips_CPPFLAGS = $(AM_CPPFLAGS) -DDISABLE_LOGS
 ban_ips_SOURCES = ban-ips.c
-ban_ips_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+ban_ips_LDADD = $(LDADD)
 
 str_test_SOURCES = str-test.c
-str_test_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+str_test_LDADD = $(LDADD)
 
 str_test2_SOURCES = str-test2.c
-str_test2_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+str_test2_LDADD = $(LDADD)
 
 ipv6_prefix_SOURCES = ipv6-prefix.c
-ipv6_prefix_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+ipv6_prefix_LDADD = $(LDADD)
 
 human_addr_CPPFLAGS = $(AM_CPPFLAGS) 
 human_addr_SOURCES = human_addr.c
-human_addr_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+human_addr_LDADD = $(LDADD)
 
-valid_hostname_LDADD = ../gl/libgnu.a
+valid_hostname_LDADD = $(LDADD)
 
-port_parsing_LDADD = ../gl/libgnu.a $(LIBTALLOC_LIBS) ../src/ccan/libccan.a
+port_parsing_LDADD = $(LDADD)
 
 check_PROGRAMS = str-test str-test2 ipv4-prefix ipv6-prefix kkdcp-parsing json-escape ban-ips \
 	port-parsing human_addr valid-hostname url-escape html-escape