diff --git a/make/cpp.mk b/make/cpp.mk
new file mode 100644
index 00000000..2e832215
--- /dev/null
+++ b/make/cpp.mk
@@ -0,0 +1,2 @@
+include $(MODDIR)/make/tools.mk
+
diff --git a/make/topdir.mk b/make/topdir.mk
index 7a1385ef..d2d07196 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -3,7 +3,7 @@ install: topdir.install
 clean: topdir.clean
 config:
 
-SUBDIRS ?= $(wildcard inst/pre make scripts contrib tools src include lib bin \
+SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc tools include lib bin \
 	util plugins conf config cfg images doc test inst/post)
 
 PROJECT_DESCR = $(TOPDIR)/make/project.conf