diff --git a/configure.ac b/configure.ac
index 7dfb266b..acef6f6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,9 +136,9 @@ AC_OUTPUT(
     libosmo-sccp.pc
     libosmo-mtp.pc
     libosmo-xua.pc
-    include/sccp/Makefile
-    include/mtp/Makefile
     include/osmocom/Makefile
+    include/osmocom/sccp/Makefile
+    include/osmocom/mtp/Makefile
     include/osmocom/sigtran/Makefile
     include/Makefile
     src/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
index 7cd4b57f..3578a80e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-SUBDIRS = sccp mtp osmocom
+SUBDIRS = osmocom
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
index 7e86a4b4..c4535f3e 100644
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1 +1 @@
-SUBDIRS = sigtran
+SUBDIRS = mtp sccp sigtran
diff --git a/include/mtp/Makefile.am b/include/osmocom/mtp/Makefile.am
similarity index 100%
rename from include/mtp/Makefile.am
rename to include/osmocom/mtp/Makefile.am
diff --git a/include/mtp/mtp_level3.h b/include/osmocom/mtp/mtp_level3.h
similarity index 100%
rename from include/mtp/mtp_level3.h
rename to include/osmocom/mtp/mtp_level3.h
diff --git a/include/mtp/mtp_pcap.h b/include/osmocom/mtp/mtp_pcap.h
similarity index 100%
rename from include/mtp/mtp_pcap.h
rename to include/osmocom/mtp/mtp_pcap.h
diff --git a/include/sccp/Makefile.am b/include/osmocom/sccp/Makefile.am
similarity index 100%
rename from include/sccp/Makefile.am
rename to include/osmocom/sccp/Makefile.am
diff --git a/include/sccp/sccp.h b/include/osmocom/sccp/sccp.h
similarity index 100%
rename from include/sccp/sccp.h
rename to include/osmocom/sccp/sccp.h
diff --git a/include/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h
similarity index 100%
rename from include/sccp/sccp_types.h
rename to include/osmocom/sccp/sccp_types.h
diff --git a/src/mtp_pcap.c b/src/mtp_pcap.c
index e83e6f70..a59efc53 100644
--- a/src/mtp_pcap.c
+++ b/src/mtp_pcap.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include <mtp/mtp_pcap.h>
+#include <osmocom/mtp/mtp_pcap.h>
 
 #include <sys/time.h>
 
diff --git a/src/sccp.c b/src/sccp.c
index a15a84b8..8c3641c3 100644
--- a/src/sccp.c
+++ b/src/sccp.c
@@ -31,7 +31,7 @@
 #include <osmocom/core/logging.h>
 #include <osmocom/gsm/tlv.h>
 
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
 
 // Unassigned debug area
 static int DSCCP = 0;
diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index 2f5b687b..f68f9a97 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/logging.h>
 #include <osmocom/sigtran/sccp_sap.h>
diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c
index e4dbae6c..db67660d 100644
--- a/src/sccp_sclc.c
+++ b/src/sccp_sclc.c
@@ -56,7 +56,7 @@
 
 #include <osmocom/sigtran/sccp_sap.h>
 #include <osmocom/sigtran/protocol/sua.h>
-#include <sccp/sccp_types.h>
+#include <osmocom/sccp/sccp_types.h>
 
 #include "xua_internal.h"
 #include "sccp_internal.h"
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index 8138e435..fbbad493 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -56,7 +56,7 @@
 
 #include <osmocom/sigtran/sccp_sap.h>
 #include <osmocom/sigtran/protocol/sua.h>
-#include <sccp/sccp_types.h>
+#include <osmocom/sccp/sccp_types.h>
 
 #include "xua_internal.h"
 #include "sccp_internal.h"
diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c
index 9005dc7f..db492990 100644
--- a/src/sccp_scrc.c
+++ b/src/sccp_scrc.c
@@ -25,7 +25,7 @@
 #include <osmocom/core/logging.h>
 #include <osmocom/core/msgb.h>
 
-#include <sccp/sccp_types.h>
+#include <osmocom/sccp/sccp_types.h>
 #include <osmocom/sigtran/osmo_ss7.h>
 #include <osmocom/sigtran/sccp_sap.h>
 #include <osmocom/sigtran/sccp_helpers.h>
diff --git a/tests/mtp/mtp_parse_test.c b/tests/mtp/mtp_parse_test.c
index 75650a3c..92c34ca6 100644
--- a/tests/mtp/mtp_parse_test.c
+++ b/tests/mtp/mtp_parse_test.c
@@ -1,5 +1,5 @@
 /* MTP Layer3 parsing tests */
-#include <mtp/mtp_level3.h>
+#include <osmocom/mtp/mtp_level3.h>
 
 #include <arpa/inet.h>
 
diff --git a/tests/sccp/sccp_test.c b/tests/sccp/sccp_test.c
index ed485bc9..ba9ff7af 100644
--- a/tests/sccp/sccp_test.c
+++ b/tests/sccp/sccp_test.c
@@ -31,7 +31,7 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/utils.h>
 
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
 
 #define MIN(x, y) ((x) < (y) ? (x) : (y))