diff --git a/Makefile.am b/Makefile.am
index b3663ba..4347807 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,15 +4,6 @@
 SUBDIRS = \
 	include \
 	src \
-	src/vty \
-	src/codec \
-	src/gsm \
-	src/coding \
-	src/gb \
-	src/ctrl \
-	src/sim \
-	src/pseudotalloc \
-	src/usb \
 	utils \
 	tapset \
 	tests \
@@ -90,8 +81,8 @@
 
 $(top_builddir)/doc/libosmocore.tag.prep: $(top_builddir)/Doxyfile.core \
 		$(top_srcdir)/include/osmocom/core/*.h \
-		$(top_srcdir)/src/*.[hc] \
-		$(top_srcdir)/src/crcXXgen.c.tpl \
+		$(top_srcdir)/src/core/*.[hc] \
+		$(top_srcdir)/src/core/crcXXgen.c.tpl \
 		$(top_srcdir)/src/pseudotalloc/*.[hc]
 	rm -rf $(top_builddir)/doc/core; mkdir -p $(top_builddir)/doc/core
 	rm -rf $(top_builddir)/doc/libosmocore.map