rename include/openbsc to include/osmocom/msc

Change-Id: I1f96a1285bbd1b4607614856bca935d5c26e2da9

76 files changed, 41 insertions, 38 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 677eec3aa..9d963a024 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = \
-	openbsc \
+	osmocom \
 	$(NULL)
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
new file mode 100644
index 000000000..4d8063711
--- /dev/null
+++ b/include/osmocom/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	msc \
+	$(NULL)
diff --git a/include/openbsc/Makefile.am b/include/osmocom/msc/Makefile.am
index 6e7aa384b..6e7aa384b 100644
--- a/include/openbsc/Makefile.am
+++ b/include/osmocom/msc/Makefile.am
diff --git a/include/openbsc/a_iface.h b/include/osmocom/msc/a_iface.h
index 149f1c71e..a49ede25e 100644
--- a/include/openbsc/a_iface.h
+++ b/include/osmocom/msc/a_iface.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <openbsc/a_reset.h>
+#include <osmocom/msc/a_reset.h>
 
 /* A struct to keep a context information about the BSCs we are associated with */
 struct bsc_context {
diff --git a/include/openbsc/a_iface_bssap.h b/include/osmocom/msc/a_iface_bssap.h
index 237c618fd..237c618fd 100644
--- a/include/openbsc/a_iface_bssap.h
+++ b/include/osmocom/msc/a_iface_bssap.h
diff --git a/include/openbsc/a_reset.h b/include/osmocom/msc/a_reset.h
index 7aaab0620..7aaab0620 100644
--- a/include/openbsc/a_reset.h
+++ b/include/osmocom/msc/a_reset.h
diff --git a/include/openbsc/abis_nm.h b/include/osmocom/msc/abis_nm.h
index db2a659e4..25819626e 100644
--- a/include/openbsc/abis_nm.h
+++ b/include/osmocom/msc/abis_nm.h
@@ -26,7 +26,7 @@
 #include <osmocom/gsm/abis_nm.h>
 #include <osmocom/gsm/protocol/gsm_12_21.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 
 /* max number of attributes represented as 3GPP TS 52.021 §9.4.62 SW Description array */
 #define MAX_BTS_ATTR 5
diff --git a/include/openbsc/abis_om2000.h b/include/osmocom/msc/abis_om2000.h
index b093a0350..b093a0350 100644
--- a/include/openbsc/abis_om2000.h
+++ b/include/osmocom/msc/abis_om2000.h
diff --git a/include/openbsc/abis_rsl.h b/include/osmocom/msc/abis_rsl.h
index f983fceec..f983fceec 100644
--- a/include/openbsc/abis_rsl.h
+++ b/include/osmocom/msc/abis_rsl.h
diff --git a/include/openbsc/arfcn_range_encode.h b/include/osmocom/msc/arfcn_range_encode.h
index 7ec710c33..7ec710c33 100644
--- a/include/openbsc/arfcn_range_encode.h
+++ b/include/osmocom/msc/arfcn_range_encode.h
diff --git a/include/openbsc/auth.h b/include/osmocom/msc/auth.h
index b314bbf19..b314bbf19 100644
--- a/include/openbsc/auth.h
+++ b/include/osmocom/msc/auth.h
diff --git a/include/openbsc/bsc_api.h b/include/osmocom/msc/bsc_api.h
index 40068d6ef..40068d6ef 100644
--- a/include/openbsc/bsc_api.h
+++ b/include/osmocom/msc/bsc_api.h
diff --git a/include/openbsc/bsc_msc.h b/include/osmocom/msc/bsc_msc.h
index 380eb17c1..d649f76cd 100644
--- a/include/openbsc/bsc_msc.h
+++ b/include/osmocom/msc/bsc_msc.h
@@ -25,7 +25,7 @@
 #include <osmocom/core/write_queue.h>
 #include <osmocom/core/timer.h>
 #include <osmocom/sigtran/sccp_sap.h>
-#include <openbsc/a_reset.h>
+#include <osmocom/msc/a_reset.h>
 
 #include <netinet/in.h>
 
diff --git a/include/openbsc/bsc_msc_data.h b/include/osmocom/msc/bsc_msc_data.h
index 4a283d165..4a283d165 100644
--- a/include/openbsc/bsc_msc_data.h
+++ b/include/osmocom/msc/bsc_msc_data.h
diff --git a/include/openbsc/bsc_msg_filter.h b/include/osmocom/msc/bsc_msg_filter.h
index a9dedf43c..a9dedf43c 100644
--- a/include/openbsc/bsc_msg_filter.h
+++ b/include/osmocom/msc/bsc_msg_filter.h
diff --git a/include/openbsc/bsc_rll.h b/include/osmocom/msc/bsc_rll.h
index 729ba6037..93c80e7a9 100644
--- a/include/openbsc/bsc_rll.h
+++ b/include/osmocom/msc/bsc_rll.h
@@ -1,7 +1,7 @@
 #ifndef _BSC_RLL_H
 #define _BSC_RLL_H
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 
 enum bsc_rllr_ind {
 	BSC_RLLR_IND_EST_CONF,
diff --git a/include/openbsc/bss.h b/include/osmocom/msc/bss.h
index 9f16bf7d7..090433420 100644
--- a/include/openbsc/bss.h
+++ b/include/osmocom/msc/bss.h
@@ -1,7 +1,7 @@
 #ifndef _BSS_H_
 #define _BSS_H_
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 
 struct msgb;
 
diff --git a/include/openbsc/bts_ipaccess_nanobts_omlattr.h b/include/osmocom/msc/bts_ipaccess_nanobts_omlattr.h
index bc7860b2d..bc7860b2d 100644
--- a/include/openbsc/bts_ipaccess_nanobts_omlattr.h
+++ b/include/osmocom/msc/bts_ipaccess_nanobts_omlattr.h
diff --git a/include/openbsc/chan_alloc.h b/include/osmocom/msc/chan_alloc.h
index 7388e14c5..7388e14c5 100644
--- a/include/openbsc/chan_alloc.h
+++ b/include/osmocom/msc/chan_alloc.h
diff --git a/include/openbsc/common.h b/include/osmocom/msc/common.h
index d91b3d39e..d91b3d39e 100644
--- a/include/openbsc/common.h
+++ b/include/osmocom/msc/common.h
diff --git a/include/openbsc/common_bsc.h b/include/osmocom/msc/common_bsc.h
index 796038323..821298cbf 100644
--- a/include/openbsc/common_bsc.h
+++ b/include/osmocom/msc/common_bsc.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <openbsc/common_cs.h>
+#include <osmocom/msc/common_cs.h>
 
 struct gsm_network *bsc_network_init(void *ctx,
 				     uint16_t country_code,
diff --git a/include/openbsc/common_cs.h b/include/osmocom/msc/common_cs.h
index 6dc956f80..6dc956f80 100644
--- a/include/openbsc/common_cs.h
+++ b/include/osmocom/msc/common_cs.h
diff --git a/include/openbsc/crc24.h b/include/osmocom/msc/crc24.h
index 756638c03..756638c03 100644
--- a/include/openbsc/crc24.h
+++ b/include/osmocom/msc/crc24.h
diff --git a/include/openbsc/ctrl.h b/include/osmocom/msc/ctrl.h
index c5ac21092..c5ac21092 100644
--- a/include/openbsc/ctrl.h
+++ b/include/osmocom/msc/ctrl.h
diff --git a/include/openbsc/db.h b/include/osmocom/msc/db.h
index 988c9bd6e..988c9bd6e 100644
--- a/include/openbsc/db.h
+++ b/include/osmocom/msc/db.h
diff --git a/include/openbsc/debug.h b/include/osmocom/msc/debug.h
index 65e197d52..65e197d52 100644
--- a/include/openbsc/debug.h
+++ b/include/osmocom/msc/debug.h
diff --git a/include/openbsc/e1_config.h b/include/osmocom/msc/e1_config.h
index 538c0b09d..ac5fbb1e4 100644
--- a/include/openbsc/e1_config.h
+++ b/include/osmocom/msc/e1_config.h
@@ -1,7 +1,7 @@
 #ifndef _E1_CONFIG_H
 #define _E1_CONFIG_H
 
-#include <openbsc/gsm_data_shared.h>
+#include <osmocom/msc/gsm_data_shared.h>
 
 int e1_reconfig_ts(struct gsm_bts_trx_ts *ts);
 int e1_reconfig_trx(struct gsm_bts_trx *trx);
diff --git a/include/openbsc/gsm_04_08.h b/include/osmocom/msc/gsm_04_08.h
index ca251b00b..c99fc86aa 100644
--- a/include/openbsc/gsm_04_08.h
+++ b/include/osmocom/msc/gsm_04_08.h
@@ -5,7 +5,7 @@
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 
-#include <openbsc/meas_rep.h>
+#include <osmocom/msc/meas_rep.h>
 
 struct msgb;
 struct gsm_bts;
diff --git a/include/openbsc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h
index 3305e3e61..3305e3e61 100644
--- a/include/openbsc/gsm_04_11.h
+++ b/include/osmocom/msc/gsm_04_11.h
diff --git a/include/openbsc/gsm_04_14.h b/include/osmocom/msc/gsm_04_14.h
index 3cdbe0469..3cdbe0469 100644
--- a/include/openbsc/gsm_04_14.h
+++ b/include/osmocom/msc/gsm_04_14.h
diff --git a/include/openbsc/gsm_04_80.h b/include/osmocom/msc/gsm_04_80.h
index d65f640bc..d65f640bc 100644
--- a/include/openbsc/gsm_04_80.h
+++ b/include/osmocom/msc/gsm_04_80.h
diff --git a/include/openbsc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 88a4f1067..9343c3195 100644
--- a/include/openbsc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -14,9 +14,9 @@
 #include <osmocom/crypt/auth.h>
 #include <osmocom/sigtran/sccp_sap.h>
 
-#include <openbsc/common.h>
-#include <openbsc/rest_octets.h>
-#include <openbsc/common_cs.h>
+#include <osmocom/msc/common.h>
+#include <osmocom/msc/rest_octets.h>
+#include <osmocom/msc/common_cs.h>
 #include <osmocom/legacy_mgcp/mgcpgw_client.h>
 
 
diff --git a/include/openbsc/gsm_data_shared.h b/include/osmocom/msc/gsm_data_shared.h
index bed46d254..5028a269d 100644
--- a/include/openbsc/gsm_data_shared.h
+++ b/include/osmocom/msc/gsm_data_shared.h
@@ -24,7 +24,7 @@
 #include <osmocom/gsm/lapdm.h>
 #endif
 
-#include <openbsc/common_cs.h>
+#include <osmocom/msc/common_cs.h>
 
 /* 16 is the max. number of SI2quater messages according to 3GPP TS 44.018 Table 10.5.2.33b.1:
    4-bit index is used (2#1111 = 10#15) */
diff --git a/include/openbsc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h
index d88e32aa7..6b0e3da42 100644
--- a/include/openbsc/gsm_subscriber.h
+++ b/include/osmocom/msc/gsm_subscriber.h
@@ -6,7 +6,7 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/gsm/protocol/gsm_23_003.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 
 #define GSM_NAME_LENGTH 160
 
diff --git a/include/openbsc/gsup_client.h b/include/osmocom/msc/gsup_client.h
index 4a25490f6..3d1dce078 100644
--- a/include/openbsc/gsup_client.h
+++ b/include/osmocom/msc/gsup_client.h
@@ -23,7 +23,7 @@
 
 #include <osmocom/core/timer.h>
 
-#include <openbsc/oap_client.h>
+#include <osmocom/msc/oap_client.h>
 
 #define GSUP_CLIENT_RECONNECT_INTERVAL 10
 #define GSUP_CLIENT_PING_INTERVAL 20
diff --git a/include/openbsc/gtphub.h b/include/osmocom/msc/gtphub.h
index 9cb7605f8..d7b6f1b9e 100644
--- a/include/openbsc/gtphub.h
+++ b/include/osmocom/msc/gtphub.h
@@ -28,7 +28,7 @@
 #include <osmocom/core/timer.h>
 #include <osmocom/core/rate_ctr.h>
 
-#include <openbsc/gprs_sgsn.h>
+#include <osmocom/msc/gprs_sgsn.h>
 
 
 /* support */
diff --git a/include/openbsc/handover.h b/include/osmocom/msc/handover.h
index 3fe71a28b..3fe71a28b 100644
--- a/include/openbsc/handover.h
+++ b/include/osmocom/msc/handover.h
diff --git a/include/openbsc/handover_decision.h b/include/osmocom/msc/handover_decision.h
index 81078b05d..81078b05d 100644
--- a/include/openbsc/handover_decision.h
+++ b/include/osmocom/msc/handover_decision.h
diff --git a/include/openbsc/ipaccess.h b/include/osmocom/msc/ipaccess.h
index 82e89c27d..82e89c27d 100644
--- a/include/openbsc/ipaccess.h
+++ b/include/osmocom/msc/ipaccess.h
diff --git a/include/openbsc/iu_dummy.h b/include/osmocom/msc/iu_dummy.h
index d5e142801..d5e142801 100644
--- a/include/openbsc/iu_dummy.h
+++ b/include/osmocom/msc/iu_dummy.h
diff --git a/include/openbsc/iucs.h b/include/osmocom/msc/iucs.h
index b7d60645d..b7d60645d 100644
--- a/include/openbsc/iucs.h
+++ b/include/osmocom/msc/iucs.h
diff --git a/include/openbsc/iucs_ranap.h b/include/osmocom/msc/iucs_ranap.h
index c2ff5f90e..c2ff5f90e 100644
--- a/include/openbsc/iucs_ranap.h
+++ b/include/osmocom/msc/iucs_ranap.h
diff --git a/include/openbsc/meas_feed.h b/include/osmocom/msc/meas_feed.h
index f77ee075f..02b7d95b4 100644
--- a/include/openbsc/meas_feed.h
+++ b/include/osmocom/msc/meas_feed.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include <openbsc/meas_rep.h>
+#include <osmocom/msc/meas_rep.h>
 
 struct meas_feed_hdr {
 	uint8_t msg_type;
diff --git a/include/openbsc/meas_rep.h b/include/osmocom/msc/meas_rep.h
index b0c03f0bb..b0c03f0bb 100644
--- a/include/openbsc/meas_rep.h
+++ b/include/osmocom/msc/meas_rep.h
diff --git a/include/openbsc/misdn.h b/include/osmocom/msc/misdn.h
index 9851ad32c..9851ad32c 100644
--- a/include/openbsc/misdn.h
+++ b/include/osmocom/msc/misdn.h
diff --git a/include/openbsc/mncc.h b/include/osmocom/msc/mncc.h
index 881e0418e..881e0418e 100644
--- a/include/openbsc/mncc.h
+++ b/include/osmocom/msc/mncc.h
diff --git a/include/openbsc/mncc_int.h b/include/osmocom/msc/mncc_int.h
index 213ce1414..213ce1414 100644
--- a/include/openbsc/mncc_int.h
+++ b/include/osmocom/msc/mncc_int.h
diff --git a/include/openbsc/msc_ifaces.h b/include/osmocom/msc/msc_ifaces.h
index a1071ae9b..d46dfe9b3 100644
--- a/include/openbsc/msc_ifaces.h
+++ b/include/osmocom/msc/msc_ifaces.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <osmocom/core/msgb.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 
 /* These are the interfaces of the MSC layer towards (from?) the BSC and RNC,
  * i.e. in the direction towards the mobile device (MS aka UE).
diff --git a/include/openbsc/network_listen.h b/include/osmocom/msc/network_listen.h
index 67d1f4ef7..05fbb2fec 100644
--- a/include/openbsc/network_listen.h
+++ b/include/osmocom/msc/network_listen.h
@@ -2,7 +2,7 @@
 #define _OPENBSC_NWL_H
 
 #include <stdint.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 
 void ipac_nwl_init(void);
 
diff --git a/include/openbsc/oap_client.h b/include/osmocom/msc/oap_client.h
index 80c86d5d6..80c86d5d6 100644
--- a/include/openbsc/oap_client.h
+++ b/include/osmocom/msc/oap_client.h
diff --git a/include/openbsc/openbscdefines.h b/include/osmocom/msc/openbscdefines.h
index c6ac153b8..c6ac153b8 100644
--- a/include/openbsc/openbscdefines.h
+++ b/include/osmocom/msc/openbscdefines.h
diff --git a/include/openbsc/osmo_bsc.h b/include/osmocom/msc/osmo_bsc.h
index 5ebea5079..5ebea5079 100644
--- a/include/openbsc/osmo_bsc.h
+++ b/include/osmocom/msc/osmo_bsc.h
diff --git a/include/openbsc/osmo_bsc_grace.h b/include/osmocom/msc/osmo_bsc_grace.h
index 5a81cd137..6232ffda1 100644
--- a/include/openbsc/osmo_bsc_grace.h
+++ b/include/osmocom/msc/osmo_bsc_grace.h
@@ -21,8 +21,8 @@
 #ifndef OSMO_BSC_GRACE_H
 #define OSMO_BSC_GRACE_H
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/signal.h>
+#include <osmocom/msc/gsm_data.h>
+#include <osmocom/msc/signal.h>
 
 struct bsc_msc_data;
 
diff --git a/include/openbsc/osmo_bsc_reset.h b/include/osmocom/msc/osmo_bsc_reset.h
index 578f763e6..578f763e6 100644
--- a/include/openbsc/osmo_bsc_reset.h
+++ b/include/osmocom/msc/osmo_bsc_reset.h
diff --git a/include/openbsc/osmo_bsc_rf.h b/include/osmocom/msc/osmo_bsc_rf.h
index 19ccd080d..a81ebd710 100644
--- a/include/openbsc/osmo_bsc_rf.h
+++ b/include/osmocom/msc/osmo_bsc_rf.h
@@ -1,7 +1,7 @@
 #ifndef OSMO_BSC_RF
 #define OSMO_BSC_RF
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 #include <osmocom/core/write_queue.h>
 #include <osmocom/core/timer.h>
 
diff --git a/include/openbsc/osmo_bsc_sigtran.h b/include/osmocom/msc/osmo_bsc_sigtran.h
index fbcfcb3fc..7015edbc4 100644
--- a/include/openbsc/osmo_bsc_sigtran.h
+++ b/include/osmocom/msc/osmo_bsc_sigtran.h
@@ -20,8 +20,8 @@
 
 #pragma once
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/bsc_msc_data.h>
+#include <osmocom/msc/gsm_data.h>
+#include <osmocom/msc/bsc_msc_data.h>
 
 /* Allocate resources to make a new connection oriented sigtran connection
  * (not the connection ittself!) */
diff --git a/include/openbsc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h
index cdfd27f11..5f4713ee8 100644
--- a/include/openbsc/osmo_msc.h
+++ b/include/osmocom/msc/osmo_msc.h
@@ -6,7 +6,7 @@
 #include <osmocom/core/fsm.h>
 #include <osmocom/gsm/gsup.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 
 #include "bsc_api.h"
 
diff --git a/include/openbsc/osmux.h b/include/osmocom/msc/osmux.h
index f3ea72a85..f3ea72a85 100644
--- a/include/openbsc/osmux.h
+++ b/include/osmocom/msc/osmux.h
diff --git a/include/openbsc/paging.h b/include/osmocom/msc/paging.h
index 049da1402..b856dcd2e 100644
--- a/include/openbsc/paging.h
+++ b/include/osmocom/msc/paging.h
@@ -26,7 +26,7 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/timer.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 
 /**
  * A pending paging request
diff --git a/include/openbsc/rest_octets.h b/include/osmocom/msc/rest_octets.h
index 49a231296..49857b7c5 100644
--- a/include/openbsc/rest_octets.h
+++ b/include/osmocom/msc/rest_octets.h
@@ -2,7 +2,7 @@
 #define _REST_OCTETS_H
 
 #include <stdbool.h>
-#include <openbsc/gsm_04_08.h>
+#include <osmocom/msc/gsm_04_08.h>
 #include <osmocom/gsm/sysinfo.h>
 
 /* generate SI1 rest octets */
diff --git a/include/openbsc/rrlp.h b/include/osmocom/msc/rrlp.h
index c89402a2d..c89402a2d 100644
--- a/include/openbsc/rrlp.h
+++ b/include/osmocom/msc/rrlp.h
diff --git a/include/openbsc/rs232.h b/include/osmocom/msc/rs232.h
index 61187ca62..61187ca62 100644
--- a/include/openbsc/rs232.h
+++ b/include/osmocom/msc/rs232.h
diff --git a/include/openbsc/rtp_proxy.h b/include/osmocom/msc/rtp_proxy.h
index 52ffefd27..3cd8cac24 100644
--- a/include/openbsc/rtp_proxy.h
+++ b/include/osmocom/msc/rtp_proxy.h
@@ -27,7 +27,7 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/select.h>
 
-#include <openbsc/mncc.h>
+#include <osmocom/msc/mncc.h>
 
 #define RTP_PT_GSM_FULL 3
 #define RTP_PT_GSM_HALF 96
diff --git a/include/openbsc/signal.h b/include/osmocom/msc/signal.h
index 49f86d612..14c76f828 100644
--- a/include/openbsc/signal.h
+++ b/include/osmocom/msc/signal.h
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 
 #include <osmocom/core/signal.h>
 
diff --git a/include/openbsc/silent_call.h b/include/osmocom/msc/silent_call.h
index 5fec77b73..5fec77b73 100644
--- a/include/openbsc/silent_call.h
+++ b/include/osmocom/msc/silent_call.h
diff --git a/include/openbsc/slhc.h b/include/osmocom/msc/slhc.h
index cd5a47cf4..cd5a47cf4 100644
--- a/include/openbsc/slhc.h
+++ b/include/osmocom/msc/slhc.h
diff --git a/include/openbsc/smpp.h b/include/osmocom/msc/smpp.h
index bcdac8f0b..bcdac8f0b 100644
--- a/include/openbsc/smpp.h
+++ b/include/osmocom/msc/smpp.h
diff --git a/include/openbsc/sms_queue.h b/include/osmocom/msc/sms_queue.h
index 2a8bd5850..2a8bd5850 100644
--- a/include/openbsc/sms_queue.h
+++ b/include/osmocom/msc/sms_queue.h
diff --git a/include/openbsc/socket.h b/include/osmocom/msc/socket.h
index 0fd85f104..0fd85f104 100644
--- a/include/openbsc/socket.h
+++ b/include/osmocom/msc/socket.h
diff --git a/include/openbsc/system_information.h b/include/osmocom/msc/system_information.h
index 71bea2660..854b7e3ce 100644
--- a/include/openbsc/system_information.h
+++ b/include/osmocom/msc/system_information.h
@@ -3,7 +3,7 @@
 
 #include <osmocom/gsm/sysinfo.h>
 
-#include <openbsc/arfcn_range_encode.h>
+#include <osmocom/msc/arfcn_range_encode.h>
 
 struct gsm_bts;
 
diff --git a/include/openbsc/transaction.h b/include/osmocom/msc/transaction.h
index 4930fbd32..272fb3b2e 100644
--- a/include/openbsc/transaction.h
+++ b/include/osmocom/msc/transaction.h
@@ -1,11 +1,11 @@
 #ifndef _TRANSACT_H
 #define _TRANSACT_H
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/gsm_subscriber.h>
+#include <osmocom/msc/gsm_data.h>
+#include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/core/linuxlist.h>
-#include <openbsc/gsm_04_11.h>
-#include <openbsc/mncc.h>
+#include <osmocom/msc/gsm_04_11.h>
+#include <osmocom/msc/mncc.h>
 #include <osmocom/gsm/gsm0411_smc.h>
 #include <osmocom/gsm/gsm0411_smr.h>
 
diff --git a/include/openbsc/trau_mux.h b/include/osmocom/msc/trau_mux.h
index 75c359b56..08863bfea 100644
--- a/include/openbsc/trau_mux.h
+++ b/include/osmocom/msc/trau_mux.h
@@ -29,8 +29,8 @@
  */
 
 #include <stdint.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/mncc.h>
+#include <osmocom/msc/gsm_data.h>
+#include <osmocom/msc/mncc.h>
 
 struct decoded_trau_frame;
 
diff --git a/include/openbsc/trau_upqueue.h b/include/osmocom/msc/trau_upqueue.h
index ecc765843..ecc765843 100644
--- a/include/openbsc/trau_upqueue.h
+++ b/include/osmocom/msc/trau_upqueue.h
diff --git a/include/openbsc/ussd.h b/include/osmocom/msc/ussd.h
index 266546811..266546811 100644
--- a/include/openbsc/ussd.h
+++ b/include/osmocom/msc/ussd.h
diff --git a/include/openbsc/vlr.h b/include/osmocom/msc/vlr.h
index 619971a52..e9afde33d 100644
--- a/include/openbsc/vlr.h
+++ b/include/osmocom/msc/vlr.h
@@ -7,9 +7,9 @@
 #include <osmocom/gsm/protocol/gsm_23_003.h>
 #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
 #include <osmocom/gsm/gsm23003.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/msc/gsm_data.h>
 // for GSM_NAME_LENGTH
-#include <openbsc/gsm_subscriber.h>
+#include <osmocom/msc/gsm_subscriber.h>
 
 struct log_target;
 
diff --git a/include/openbsc/vty.h b/include/osmocom/msc/vty.h
index f7056016c..f7056016c 100644
--- a/include/openbsc/vty.h
+++ b/include/osmocom/msc/vty.h