diff --git a/configure.ac b/configure.ac
index 5be721f..f1da635 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,9 +44,6 @@
 	libosmoabis.pc
 	libosmotrau.pc
 	include/Makefile
-	include/osmocom/Makefile
-	include/osmocom/abis/Makefile
-	include/osmocom/trau/Makefile
 	src/Makefile
 	src/input/Makefile
 	src/trau/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
index ea38eec..61e6cf5 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,6 @@
 noinst_HEADERS=mISDNif.h internal.h
 
-SUBDIRS=osmocom
+nobase_include_HEADERS = osmocom/abis/ipa.h osmocom/abis/trau_frame.h	\
+ osmocom/abis/ipa_proxy.h osmocom/abis/ipaccess.h osmocom/abis/abis.h	\
+ osmocom/abis/subchan_demux.h osmocom/abis/e1_input.h			\
+ osmocom/abis/lapd.h osmocom/trau/osmo_ortp.h
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
deleted file mode 100644
index a8574ba..0000000
--- a/include/osmocom/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS=abis trau
diff --git a/include/osmocom/abis/Makefile.am b/include/osmocom/abis/Makefile.am
deleted file mode 100644
index 5d47363..0000000
--- a/include/osmocom/abis/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-osmoabis_HEADERS = abis.h		\
-		   e1_input.h		\
-		   lapd.h		\
-		   subchan_demux.h	\
-		   ipa.h		\
-		   ipa_proxy.h		\
-		   ipaccess.h		\
-		   trau_frame.h
-
-osmoabisdir = $(includedir)/osmocom/abis
diff --git a/include/osmocom/trau/Makefile.am b/include/osmocom/trau/Makefile.am
deleted file mode 100644
index d796c7c..0000000
--- a/include/osmocom/trau/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-osmotrau_HEADERS = osmo_ortp.h
-
-osmotraudir = $(includedir)/osmocom/trau