diff --git a/configure.in b/configure.in
index b572bf4..ead18f0 100644
--- a/configure.in
+++ b/configure.in
@@ -106,8 +106,9 @@
 	include/osmocom/vty/Makefile
 	include/osmocom/codec/Makefile
 	include/osmocom/crypt/Makefile
-	include/osmocore/Makefile
-	include/osmocore/protocol/Makefile
+	include/osmocom/gsm/Makefile
+	include/osmocom/gsm/protocol/Makefile
+	include/osmocom/core/Makefile
 	include/Makefile
 	src/Makefile
 	src/vty/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
index 185c696..3578a80 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-SUBDIRS = osmocom osmocore
+SUBDIRS = osmocom
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
index ec548fb..21f4f2d 100644
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1,5 +1,5 @@
 if ENABLE_VTY
-SUBDIRS = vty codec crypt
+SUBDIRS = vty codec crypt gsm core
 else
-SUBDIRS = codec crypt
+SUBDIRS = codec crypt gsm core
 endif
diff --git a/include/osmocom/core/Makefile.am b/include/osmocom/core/Makefile.am
new file mode 100644
index 0000000..6109f47
--- /dev/null
+++ b/include/osmocom/core/Makefile.am
@@ -0,0 +1,12 @@
+osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h bits.h \
+		   bitvec.h statistics.h utils.h \
+		   gsmtap.h write_queue.h \
+		   logging.h rate_ctr.h gsmtap_util.h \
+		   plugin.h crc16.h panic.h process.h msgfile.h \
+		   backtrace.h
+
+if ENABLE_TALLOC
+osmocore_HEADERS += talloc.h
+endif
+
+osmocoredir = $(includedir)/osmocom/core
diff --git a/include/osmocore/backtrace.h b/include/osmocom/core/backtrace.h
similarity index 100%
rename from include/osmocore/backtrace.h
rename to include/osmocom/core/backtrace.h
diff --git a/include/osmocore/bits.h b/include/osmocom/core/bits.h
similarity index 100%
rename from include/osmocore/bits.h
rename to include/osmocom/core/bits.h
diff --git a/include/osmocore/bitvec.h b/include/osmocom/core/bitvec.h
similarity index 100%
rename from include/osmocore/bitvec.h
rename to include/osmocom/core/bitvec.h
diff --git a/include/osmocore/crc16.h b/include/osmocom/core/crc16.h
similarity index 100%
rename from include/osmocore/crc16.h
rename to include/osmocom/core/crc16.h
diff --git a/include/osmocore/gsmtap.h b/include/osmocom/core/gsmtap.h
similarity index 100%
rename from include/osmocore/gsmtap.h
rename to include/osmocom/core/gsmtap.h
diff --git a/include/osmocore/gsmtap_util.h b/include/osmocom/core/gsmtap_util.h
similarity index 100%
rename from include/osmocore/gsmtap_util.h
rename to include/osmocom/core/gsmtap_util.h
diff --git a/include/osmocore/linuxlist.h b/include/osmocom/core/linuxlist.h
similarity index 100%
rename from include/osmocore/linuxlist.h
rename to include/osmocom/core/linuxlist.h
diff --git a/include/osmocore/logging.h b/include/osmocom/core/logging.h
similarity index 98%
rename from include/osmocore/logging.h
rename to include/osmocom/core/logging.h
index fd45844..db02940 100644
--- a/include/osmocore/logging.h
+++ b/include/osmocom/core/logging.h
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
 
 #define LOG_MAX_CATEGORY	32
 #define LOG_MAX_CTX		8
diff --git a/include/osmocore/msgb.h b/include/osmocom/core/msgb.h
similarity index 97%
rename from include/osmocore/msgb.h
rename to include/osmocom/core/msgb.h
index c4f4430..57b5d7f 100644
--- a/include/osmocore/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -21,8 +21,8 @@
  */
 
 #include <stdint.h>
-#include "linuxlist.h"
-#include "utils.h"
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/utils.h>
 
 #define MSGB_DEBUG
 
@@ -62,7 +62,7 @@
 extern void msgb_reset(struct msgb *m);
 
 #ifdef MSGB_DEBUG
-#include <osmocore/panic.h>
+#include <osmocom/core/panic.h>
 #define MSGB_ABORT(msg, fmt, args ...) do {		\
 	osmo_panic("msgb(%p): " fmt, msg, ## args);	\
 	} while(0)
diff --git a/include/osmocore/msgfile.h b/include/osmocom/core/msgfile.h
similarity index 100%
rename from include/osmocore/msgfile.h
rename to include/osmocom/core/msgfile.h
diff --git a/include/osmocore/panic.h b/include/osmocom/core/panic.h
similarity index 100%
rename from include/osmocore/panic.h
rename to include/osmocom/core/panic.h
diff --git a/include/osmocore/plugin.h b/include/osmocom/core/plugin.h
similarity index 100%
rename from include/osmocore/plugin.h
rename to include/osmocom/core/plugin.h
diff --git a/include/osmocore/process.h b/include/osmocom/core/process.h
similarity index 100%
rename from include/osmocore/process.h
rename to include/osmocom/core/process.h
diff --git a/include/osmocore/rate_ctr.h b/include/osmocom/core/rate_ctr.h
similarity index 97%
rename from include/osmocore/rate_ctr.h
rename to include/osmocom/core/rate_ctr.h
index f887d9a..dba573d 100644
--- a/include/osmocore/rate_ctr.h
+++ b/include/osmocom/core/rate_ctr.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
 
 #define RATE_CTR_INTV_NUM	4
 
diff --git a/include/osmocore/select.h b/include/osmocom/core/select.h
similarity index 92%
rename from include/osmocore/select.h
rename to include/osmocom/core/select.h
index 2d8b3ec..5ca21c3 100644
--- a/include/osmocore/select.h
+++ b/include/osmocom/core/select.h
@@ -1,7 +1,7 @@
 #ifndef _BSC_SELECT_H
 #define _BSC_SELECT_H
 
-#include "linuxlist.h"
+#include <osmocom/core/linuxlist.h>
 
 #define BSC_FD_READ	0x0001
 #define BSC_FD_WRITE	0x0002
diff --git a/include/osmocore/signal.h b/include/osmocom/core/signal.h
similarity index 100%
rename from include/osmocore/signal.h
rename to include/osmocom/core/signal.h
diff --git a/include/osmocore/statistics.h b/include/osmocom/core/statistics.h
similarity index 100%
rename from include/osmocore/statistics.h
rename to include/osmocom/core/statistics.h
diff --git a/include/osmocore/talloc.h b/include/osmocom/core/talloc.h
similarity index 100%
rename from include/osmocore/talloc.h
rename to include/osmocom/core/talloc.h
diff --git a/include/osmocore/timer.h b/include/osmocom/core/timer.h
similarity index 97%
rename from include/osmocore/timer.h
rename to include/osmocom/core/timer.h
index fee888b..1966478 100644
--- a/include/osmocore/timer.h
+++ b/include/osmocom/core/timer.h
@@ -23,7 +23,7 @@
 
 #include <sys/time.h>
 
-#include "linuxlist.h"
+#include <osmocom/core/linuxlist.h>
 
 /**
  * Timer management:
diff --git a/include/osmocore/utils.h b/include/osmocom/core/utils.h
similarity index 100%
rename from include/osmocore/utils.h
rename to include/osmocom/core/utils.h
diff --git a/include/osmocore/write_queue.h b/include/osmocom/core/write_queue.h
similarity index 100%
rename from include/osmocore/write_queue.h
rename to include/osmocom/core/write_queue.h
diff --git a/include/osmocom/crypt/gprs_cipher.h b/include/osmocom/crypt/gprs_cipher.h
index 3e514ec..3051071 100644
--- a/include/osmocom/crypt/gprs_cipher.h
+++ b/include/osmocom/crypt/gprs_cipher.h
@@ -1,7 +1,7 @@
 #ifndef _GPRS_CIPHER_H
 #define _GPRS_CIPHER_H
 
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
 
 #define GSM0464_CIPH_MAX_BLOCK	1523
 
diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am
new file mode 100644
index 0000000..8685fc9
--- /dev/null
+++ b/include/osmocom/gsm/Makefile.am
@@ -0,0 +1,6 @@
+osmogsm_HEADERS = comp128.h gsm0808.h gsm48_ie.h mncc.h rxlev_stat.h \
+		  gsm0480.h gsm48.h gsm_utils.h rsl.h tlv.h
+
+SUBDIRS = protocol
+
+osmogsmdir = $(includedir)/osmocom/gsm
diff --git a/include/osmocore/comp128.h b/include/osmocom/gsm/comp128.h
similarity index 100%
rename from include/osmocore/comp128.h
rename to include/osmocom/gsm/comp128.h
diff --git a/include/osmocore/gsm0480.h b/include/osmocom/gsm/gsm0480.h
similarity index 84%
rename from include/osmocore/gsm0480.h
rename to include/osmocom/gsm/gsm0480.h
index b504332..d6626d6 100644
--- a/include/osmocore/gsm0480.h
+++ b/include/osmocom/gsm/gsm0480.h
@@ -1,9 +1,9 @@
 #ifndef gsm0480_h
 #define gsm0480_h
 
-#include "msgb.h"
-#include "protocol/gsm_04_08.h"
-#include "protocol/gsm_04_80.h"
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_80.h>
 
 #define MAX_LEN_USSD_STRING	31
 
diff --git a/include/osmocore/gsm0808.h b/include/osmocom/gsm/gsm0808.h
similarity index 100%
rename from include/osmocore/gsm0808.h
rename to include/osmocom/gsm/gsm0808.h
diff --git a/include/osmocore/gsm48.h b/include/osmocom/gsm/gsm48.h
similarity index 90%
rename from include/osmocore/gsm48.h
rename to include/osmocom/gsm/gsm48.h
index ffe0399..1e9403b 100644
--- a/include/osmocore/gsm48.h
+++ b/include/osmocom/gsm/gsm48.h
@@ -1,9 +1,9 @@
 #ifndef _OSMOCORE_GSM48_H
 #define _OSMOCORE_GSM48_H
 
-#include <osmocore/tlv.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/gsm48_ie.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/gsm48_ie.h>
 
 /* A parsed GPRS routing area */
 struct gprs_ra_id {
diff --git a/include/osmocore/gsm48_ie.h b/include/osmocom/gsm/gsm48_ie.h
similarity index 96%
rename from include/osmocore/gsm48_ie.h
rename to include/osmocom/gsm/gsm48_ie.h
index fa66159..f4fce25 100644
--- a/include/osmocore/gsm48_ie.h
+++ b/include/osmocom/gsm/gsm48_ie.h
@@ -5,10 +5,10 @@
 #include <string.h>
 #include <errno.h>
 
-#include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
-#include <osmocore/mncc.h>
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/mncc.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 
 /* decode a 'called/calling/connect party BCD number' as in 10.5.4.7 */
 int gsm48_decode_bcd_number(char *output, int output_len,
diff --git a/include/osmocore/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h
similarity index 100%
rename from include/osmocore/gsm_utils.h
rename to include/osmocom/gsm/gsm_utils.h
diff --git a/include/osmocore/mncc.h b/include/osmocom/gsm/mncc.h
similarity index 100%
rename from include/osmocore/mncc.h
rename to include/osmocom/gsm/mncc.h
diff --git a/include/osmocom/gsm/protocol/Makefile.am b/include/osmocom/gsm/protocol/Makefile.am
new file mode 100644
index 0000000..8483f10
--- /dev/null
+++ b/include/osmocom/gsm/protocol/Makefile.am
@@ -0,0 +1,6 @@
+osmogsm_proto_HEADERS = gsm_03_41.h \
+			gsm_04_08.h gsm_04_11.h gsm_04_12.h gsm_04_80.h \
+			gsm_08_08.h gsm_08_58.h \
+			gsm_12_21.h
+
+osmogsm_protodir = $(includedir)/osmocom/gsm/protocol
diff --git a/include/osmocore/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h
similarity index 100%
rename from include/osmocore/protocol/gsm_03_41.h
rename to include/osmocom/gsm/protocol/gsm_03_41.h
diff --git a/include/osmocore/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h
similarity index 100%
rename from include/osmocore/protocol/gsm_04_08.h
rename to include/osmocom/gsm/protocol/gsm_04_08.h
diff --git a/include/osmocore/protocol/gsm_04_11.h b/include/osmocom/gsm/protocol/gsm_04_11.h
similarity index 100%
rename from include/osmocore/protocol/gsm_04_11.h
rename to include/osmocom/gsm/protocol/gsm_04_11.h
diff --git a/include/osmocore/protocol/gsm_04_12.h b/include/osmocom/gsm/protocol/gsm_04_12.h
similarity index 100%
rename from include/osmocore/protocol/gsm_04_12.h
rename to include/osmocom/gsm/protocol/gsm_04_12.h
diff --git a/include/osmocore/protocol/gsm_04_80.h b/include/osmocom/gsm/protocol/gsm_04_80.h
similarity index 100%
rename from include/osmocore/protocol/gsm_04_80.h
rename to include/osmocom/gsm/protocol/gsm_04_80.h
diff --git a/include/osmocore/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h
similarity index 100%
rename from include/osmocore/protocol/gsm_08_08.h
rename to include/osmocom/gsm/protocol/gsm_08_08.h
diff --git a/include/osmocore/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h
similarity index 100%
rename from include/osmocore/protocol/gsm_08_58.h
rename to include/osmocom/gsm/protocol/gsm_08_58.h
diff --git a/include/osmocore/protocol/gsm_12_21.h b/include/osmocom/gsm/protocol/gsm_12_21.h
similarity index 99%
rename from include/osmocore/protocol/gsm_12_21.h
rename to include/osmocom/gsm/protocol/gsm_12_21.h
index 9cae45d..b8b00f3 100644
--- a/include/osmocore/protocol/gsm_12_21.h
+++ b/include/osmocom/gsm/protocol/gsm_12_21.h
@@ -24,7 +24,7 @@
  */
 
 #include <stdint.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 
 /* generic header in front of every OML message according to TS 08.59 */
 struct abis_om_hdr {
diff --git a/include/osmocore/rsl.h b/include/osmocom/gsm/rsl.h
similarity index 94%
rename from include/osmocore/rsl.h
rename to include/osmocom/gsm/rsl.h
index 54d6703..7e46330 100644
--- a/include/osmocore/rsl.h
+++ b/include/osmocom/gsm/rsl.h
@@ -2,8 +2,8 @@
 #define _OSMOCORE_RSL_H
 
 #include <stdint.h>
-#include <osmocore/utils.h>
-#include <osmocore/protocol/gsm_08_58.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/protocol/gsm_08_58.h>
 
 void rsl_init_rll_hdr(struct abis_rsl_rll_hdr *dh, uint8_t msg_type);
 
diff --git a/include/osmocore/rxlev_stat.h b/include/osmocom/gsm/rxlev_stat.h
similarity index 100%
rename from include/osmocore/rxlev_stat.h
rename to include/osmocom/gsm/rxlev_stat.h
diff --git a/include/osmocore/tlv.h b/include/osmocom/gsm/tlv.h
similarity index 99%
rename from include/osmocore/tlv.h
rename to include/osmocom/gsm/tlv.h
index 7bda9f9..552af2b 100644
--- a/include/osmocore/tlv.h
+++ b/include/osmocom/gsm/tlv.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
 
 /* Terminology / wording
 		tag	length		value	(in bits)
diff --git a/include/osmocom/vty/telnet_interface.h b/include/osmocom/vty/telnet_interface.h
index 444e649..0c034e4 100644
--- a/include/osmocom/vty/telnet_interface.h
+++ b/include/osmocom/vty/telnet_interface.h
@@ -21,8 +21,8 @@
 #ifndef TELNET_INTERFACE_H
 #define TELNET_INTERFACE_H
 
-#include <osmocore/logging.h>
-#include <osmocore/select.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/select.h>
 
 #include <osmocom/vty/vty.h>
 
diff --git a/include/osmocore/Makefile.am b/include/osmocore/Makefile.am
deleted file mode 100644
index b65589a..0000000
--- a/include/osmocore/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h bits.h \
-		   tlv.h bitvec.h comp128.h statistics.h gsm_utils.h utils.h \
-		   gsmtap.h write_queue.h rsl.h gsm48.h rxlev_stat.h mncc.h \
-		   gsm48_ie.h logging.h gsm0808.h rate_ctr.h gsmtap_util.h \
-		   plugin.h crc16.h panic.h process.h gsm0480.h msgfile.h \
-		   backtrace.h
-
-if ENABLE_TALLOC
-osmocore_HEADERS += talloc.h
-endif
-
-osmocoredir = $(includedir)/osmocore
-
-SUBDIRS = protocol
diff --git a/include/osmocore/protocol/Makefile.am b/include/osmocore/protocol/Makefile.am
deleted file mode 100644
index 03a4849..0000000
--- a/include/osmocore/protocol/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-osmocore_proto_HEADERS = gsm_03_41.h \
-			 gsm_04_08.h gsm_04_11.h gsm_04_12.h gsm_04_80.h \
-			 gsm_08_08.h gsm_08_58.h \
-			 gsm_12_21.h
-
-osmocore_protodir = $(includedir)/osmocore/protocol
diff --git a/src/backtrace.c b/src/backtrace.c
index 4239445..ecd6b9c 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/utils.h>
 #include "config.h"
 
 #ifdef HAVE_EXECINFO_H
diff --git a/src/bits.c b/src/bits.c
index fcdf5cc..ff5d176 100644
--- a/src/bits.c
+++ b/src/bits.c
@@ -1,7 +1,7 @@
 
 #include <stdint.h>
 
-#include <osmocore/bits.h>
+#include <osmocom/core/bits.h>
 
 /* convert unpacked bits to packed bits, return length in bytes */
 int osmo_ubit2pbit(pbit_t *out, const ubit_t *in, unsigned int num_bits)
diff --git a/src/bitvec.c b/src/bitvec.c
index 95d78a5..4984af2 100644
--- a/src/bitvec.c
+++ b/src/bitvec.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include <osmocore/bitvec.h>
+#include <osmocom/core/bitvec.h>
 
 #define BITNUM_FROM_COMP(byte, bit)	((byte*8)+bit)
 
diff --git a/src/crc16.c b/src/crc16.c
index 8ac8031..3a0d0dd 100644
--- a/src/crc16.c
+++ b/src/crc16.c
@@ -8,7 +8,7 @@
  * Version 2. See the file COPYING for more details.
  */
 
-#include <osmocore/crc16.h>
+#include <osmocom/core/crc16.h>
 
 /** CRC table for the CRC-16. The poly is 0x8005 (x^16 + x^15 + x^2 + 1) */
 uint16_t const crc16_table[256] = {
diff --git a/src/gsm/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c
index 6174bd7..0ff85e2 100644
--- a/src/gsm/gprs_cipher_core.c
+++ b/src/gsm/gprs_cipher_core.c
@@ -23,9 +23,9 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/plugin.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/plugin.h>
 
 #include <osmocom/crypt/gprs_cipher.h>
 
diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c
index b6b345c..b9b3ed9 100644
--- a/src/gsm/gsm0480.c
+++ b/src/gsm/gsm0480.c
@@ -22,13 +22,13 @@
  *
  */
 
-#include <osmocore/gsm0480.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm0480.h>
+#include <osmocom/gsm/gsm_utils.h>
 
-#include <osmocore/logging.h>
+#include <osmocom/core/logging.h>
 
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/protocol/gsm_04_80.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_80.h>
 
 #include <string.h>
 
diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c
index dc450cc..1640adc 100644
--- a/src/gsm/gsm0808.c
+++ b/src/gsm/gsm0808.c
@@ -18,9 +18,9 @@
  *
  */
 
-#include <osmocore/gsm0808.h>
-#include <osmocore/protocol/gsm_08_08.h>
-#include <osmocore/gsm48.h>
+#include <osmocom/gsm/gsm0808.h>
+#include <osmocom/gsm/protocol/gsm_08_08.h>
+#include <osmocom/gsm/gsm48.h>
 
 #include <arpa/inet.h>
 
diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c
index daec4f3..436bf14 100644
--- a/src/gsm/gsm48.c
+++ b/src/gsm/gsm48.c
@@ -28,11 +28,11 @@
 
 #include <arpa/inet.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/tlv.h>
-#include <osmocore/gsm48.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/gsm48.h>
 
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 
 const struct tlv_definition gsm48_att_tlvdef = {
 	.def = {
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 0e27088..efcf281 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -27,12 +27,12 @@
 #include <string.h>
 #include <errno.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
-#include <osmocore/mncc.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/gsm48_ie.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/mncc.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/gsm48_ie.h>
 
 static const char bcd_num_digits[] = {
 	'0', '1', '2', '3', '4', '5', '6', '7',
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
index 54a13ad..377705d 100644
--- a/src/gsm/gsm_utils.c
+++ b/src/gsm/gsm_utils.c
@@ -23,8 +23,8 @@
  */
 
 //#include <openbsc/gsm_data.h>
-#include <osmocore/utils.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -33,7 +33,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "../config.h"
+#include "../../config.h"
 
 /* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet
  * Greek symbols at hex positions 0x10 and 0x12-0x1a
diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c
index 3bfeffb..12ac0cf 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <osmocore/tlv.h>
-#include <osmocore/rsl.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/rsl.h>
 
 #define RSL_ALLOC_SIZE		200
 #define RSL_ALLOC_HEADROOM	56
diff --git a/src/gsm/rxlev_stat.c b/src/gsm/rxlev_stat.c
index b474aaa..626aaff 100644
--- a/src/gsm/rxlev_stat.c
+++ b/src/gsm/rxlev_stat.c
@@ -27,8 +27,8 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include <osmocore/bitvec.h>
-#include <osmocore/rxlev_stat.h>
+#include <osmocom/core/bitvec.h>
+#include <osmocom/gsm/rxlev_stat.h>
 
 int bitvec_find_bit_pos(const struct bitvec *bv, unsigned int n, enum bit_value val)
 {
diff --git a/src/gsm/tlv_parser.c b/src/gsm/tlv_parser.c
index bbef7a9..1e4c6b5 100644
--- a/src/gsm/tlv_parser.c
+++ b/src/gsm/tlv_parser.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdint.h>
-#include <osmocore/utils.h>
-#include <osmocore/tlv.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/tlv.h>
 
 struct tlv_definition tvlv_att_def;
 
diff --git a/src/gsmtap_util.c b/src/gsmtap_util.c
index abee4da..6d02d58 100644
--- a/src/gsmtap_util.c
+++ b/src/gsmtap_util.c
@@ -24,13 +24,13 @@
 
 #ifdef HAVE_SYS_SELECT_H
 
-#include <osmocore/gsmtap_util.h>
-#include <osmocore/logging.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/gsmtap.h>
-#include <osmocore/msgb.h>
-#include <osmocore/rsl.h>
-#include <osmocore/select.h>
+#include <osmocom/core/gsmtap_util.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/gsmtap.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/select.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/rsl.h>
 
 #include <arpa/inet.h>
 #include <sys/socket.h>
diff --git a/src/logging.c b/src/logging.c
index 89ca6ce..653c80d 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -34,9 +34,9 @@
 #include <time.h>
 #include <errno.h>
 
-#include <osmocore/talloc.h>
-#include <osmocore/utils.h>
-#include <osmocore/logging.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/logging.h>
 
 #include <osmocom/vty/logging.h>	/* for LOGGING_STR. */
 
diff --git a/src/logging_syslog.c b/src/logging_syslog.c
index b558fc0..4f043b1 100644
--- a/src/logging_syslog.c
+++ b/src/logging_syslog.c
@@ -33,9 +33,9 @@
 #include <strings.h>
 #endif
 
-#include <osmocore/talloc.h>
-#include <osmocore/utils.h>
-#include <osmocore/logging.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/logging.h>
 
 static const int logp2syslog_level(unsigned int level)
 {
diff --git a/src/msgb.c b/src/msgb.c
index 12a839a..8672006 100644
--- a/src/msgb.c
+++ b/src/msgb.c
@@ -24,9 +24,9 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
 //#include <openbsc/gsm_data.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 //#include <openbsc/debug.h>
 
 void *tall_msgb_ctx;
diff --git a/src/msgfile.c b/src/msgfile.c
index 68f0581..ec4434a 100644
--- a/src/msgfile.c
+++ b/src/msgfile.c
@@ -21,8 +21,8 @@
  *
  */
 
-#include <osmocore/msgfile.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/msgfile.h>
+#include <osmocom/core/talloc.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/panic.c b/src/panic.c
index 21e8fd5..588a5fe 100644
--- a/src/panic.c
+++ b/src/panic.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <osmocore/gsm_utils.h>
-#include <osmocore/panic.h>
-#include <osmocore/backtrace.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/panic.h>
+#include <osmocom/core/backtrace.h>
 
 #include "../config.h"
 
diff --git a/src/plugin.c b/src/plugin.c
index 3ba2d43..4924e95 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <limits.h>
 
-#include <osmocore/plugin.h>
+#include <osmocom/core/plugin.h>
 
 int plugin_load_all(const char *directory)
 {
diff --git a/src/rate_ctr.c b/src/rate_ctr.c
index 80ef55b..dd56e80 100644
--- a/src/rate_ctr.c
+++ b/src/rate_ctr.c
@@ -23,11 +23,11 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/talloc.h>
-#include <osmocore/timer.h>
-#include <osmocore/rate_ctr.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/rate_ctr.h>
 
 static LLIST_HEAD(rate_ctr_groups);
 
diff --git a/src/select.c b/src/select.c
index 5aa2beb..adf3619 100644
--- a/src/select.c
+++ b/src/select.c
@@ -22,9 +22,9 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include <osmocore/select.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/timer.h>
+#include <osmocom/core/select.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/timer.h>
 
 #include "../config.h"
 
diff --git a/src/signal.c b/src/signal.c
index c7ca86c..bb5c38e 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -18,9 +18,9 @@
  *
  */
 
-#include <osmocore/signal.h>
-#include <osmocore/talloc.h>
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/signal.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/linuxlist.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/statistics.c b/src/statistics.c
index 34e6a40..183005d 100644
--- a/src/statistics.c
+++ b/src/statistics.c
@@ -23,9 +23,9 @@
 
 #include <sys/types.h>
 
-#include <osmocore/linuxlist.h>
-#include <osmocore/talloc.h>
-#include <osmocore/statistics.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/statistics.h>
 
 static LLIST_HEAD(counters);
 
diff --git a/src/talloc.c b/src/talloc.c
index 98c2ee0..60d7927 100644
--- a/src/talloc.c
+++ b/src/talloc.c
@@ -55,7 +55,7 @@
 #define __USE_GNU
 #include <string.h>
 #undef __USE_GNU
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 #define MIN(x,y) ((x) < (y) ? (x) : (y))
 #endif /* not _TALLOC_SAMBA3 */
 
diff --git a/src/timer.c b/src/timer.c
index 37d7d16..9b2dd9e 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -20,7 +20,7 @@
 
 #include <assert.h>
 #include <string.h>
-#include <osmocore/timer.h>
+#include <osmocom/core/timer.h>
 
 static LLIST_HEAD(timer_list);
 static struct timeval s_nearest_time;
diff --git a/src/utils.c b/src/utils.c
index 354fce5..af1829c 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include <osmocore/utils.h>
+#include <osmocom/core/utils.h>
 
 static char namebuf[255];
 const char *get_value_string(const struct value_string *vs, uint32_t val)
diff --git a/src/vty/buffer.c b/src/vty/buffer.c
index a5655b9..e385f9f 100644
--- a/src/vty/buffer.c
+++ b/src/vty/buffer.c
@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <sys/uio.h>
 
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/vty/buffer.h>
 #include <osmocom/vty/vty.h>
 
diff --git a/src/vty/command.c b/src/vty/command.c
index 0f65224..5dc1dd4 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -38,7 +38,7 @@
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define CONFIGFILE_MASK 022
 
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index 1b356c9..4cab22a 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -24,9 +24,9 @@
 
 #include "../../config.h"
 
-#include <osmocore/talloc.h>
-#include <osmocore/logging.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/utils.h>
 
 //#include <openbsc/vty.h>
 
diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c
index 098fa2e..0d45d61 100644
--- a/src/vty/telnet_interface.c
+++ b/src/vty/telnet_interface.c
@@ -25,9 +25,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <osmocore/msgb.h>
-#include <osmocore/talloc.h>
-#include <osmocore/logging.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/logging.h>
 
 #include <osmocom/vty/telnet_interface.h>
 #include <osmocom/vty/buffer.h>
diff --git a/src/vty/utils.c b/src/vty/utils.c
index e163526..7797e62 100644
--- a/src/vty/utils.c
+++ b/src/vty/utils.c
@@ -23,10 +23,10 @@
 #include <stdint.h>
 #include <inttypes.h>
 
-#include <osmocore/linuxlist.h>
-#include <osmocore/talloc.h>
-#include <osmocore/timer.h>
-#include <osmocore/rate_ctr.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/rate_ctr.h>
 
 #include <osmocom/vty/vty.h>
 
diff --git a/src/vty/vector.c b/src/vty/vector.c
index 0343163..4012f24 100644
--- a/src/vty/vector.c
+++ b/src/vty/vector.c
@@ -24,7 +24,7 @@
 
 #include <osmocom/vty/vector.h>
 #include <osmocom/vty/vty.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 #include <memory.h>
 
 void *tall_vty_vec_ctx;
diff --git a/src/vty/vty.c b/src/vty/vty.c
index c1a9b3a..a1f0304 100644
--- a/src/vty/vty.c
+++ b/src/vty/vty.c
@@ -16,7 +16,7 @@
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/buffer.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define SYSCONFDIR "/usr/local/etc"
 
diff --git a/src/write_queue.c b/src/write_queue.c
index 7295569..0642aad 100644
--- a/src/write_queue.c
+++ b/src/write_queue.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include <osmocore/write_queue.h>
+#include <osmocom/core/write_queue.h>
 
 int write_queue_bfd_cb(struct bsc_fd *fd, unsigned int what)
 {
diff --git a/tests/msgfile/msgfile_test.c b/tests/msgfile/msgfile_test.c
index a82ac51..4637cea 100644
--- a/tests/msgfile/msgfile_test.c
+++ b/tests/msgfile/msgfile_test.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <osmocore/msgfile.h>
+#include <osmocom/core/msgfile.h>
 
 #include <stdio.h>
 
diff --git a/tests/sms/sms_test.c b/tests/sms/sms_test.c
index 9d87b5b..f5d82b9 100644
--- a/tests/sms/sms_test.c
+++ b/tests/sms/sms_test.c
@@ -23,9 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <osmocore/msgb.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/utils.h>
 
 struct test_case {
 	const uint8_t *input;
diff --git a/tests/smscb/smscb_test.c b/tests/smscb/smscb_test.c
index 627d5a1..e10e12d 100644
--- a/tests/smscb/smscb_test.c
+++ b/tests/smscb/smscb_test.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include <osmocore/protocol/gsm_03_41.h>
+#include <osmocom/gsm/protocol/gsm_03_41.h>
 
 #include <stdio.h>
 
diff --git a/tests/timer/timer_test.c b/tests/timer/timer_test.c
index 1b458d8..30b08ad 100644
--- a/tests/timer/timer_test.c
+++ b/tests/timer/timer_test.c
@@ -20,8 +20,8 @@
 
 #include <stdio.h>
 
-#include <osmocore/timer.h>
-#include <osmocore/select.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/select.h>
 
 #include "../../config.h"
 
diff --git a/tests/ussd/ussd_test.c b/tests/ussd/ussd_test.c
index bddbbcb..6d2a8c9 100644
--- a/tests/ussd/ussd_test.c
+++ b/tests/ussd/ussd_test.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <osmocore/gsm0480.h>
+#include <osmocom/gsm/gsm0480.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>