aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am2
-rw-r--r--include/osmocom/Makefile.am3
-rw-r--r--include/osmocom/bsc/Makefile.am (renamed from include/openbsc/Makefile.am)0
-rw-r--r--include/osmocom/bsc/a_reset.h (renamed from include/openbsc/a_reset.h)0
-rw-r--r--include/osmocom/bsc/abis_nm.h (renamed from include/openbsc/abis_nm.h)2
-rw-r--r--include/osmocom/bsc/abis_om2000.h (renamed from include/openbsc/abis_om2000.h)0
-rw-r--r--include/osmocom/bsc/abis_rsl.h (renamed from include/openbsc/abis_rsl.h)0
-rw-r--r--include/osmocom/bsc/arfcn_range_encode.h (renamed from include/openbsc/arfcn_range_encode.h)0
-rw-r--r--include/osmocom/bsc/auth.h (renamed from include/openbsc/auth.h)0
-rw-r--r--include/osmocom/bsc/bsc_api.h (renamed from include/openbsc/bsc_api.h)0
-rw-r--r--include/osmocom/bsc/bsc_msc.h (renamed from include/openbsc/bsc_msc.h)2
-rw-r--r--include/osmocom/bsc/bsc_msc_data.h (renamed from include/openbsc/bsc_msc_data.h)0
-rw-r--r--include/osmocom/bsc/bsc_msg_filter.h (renamed from include/openbsc/bsc_msg_filter.h)0
-rw-r--r--include/osmocom/bsc/bsc_nat.h (renamed from include/openbsc/bsc_nat.h)0
-rw-r--r--include/osmocom/bsc/bsc_nat_callstats.h (renamed from include/openbsc/bsc_nat_callstats.h)0
-rw-r--r--include/osmocom/bsc/bsc_nat_sccp.h (renamed from include/openbsc/bsc_nat_sccp.h)0
-rw-r--r--include/osmocom/bsc/bsc_rll.h (renamed from include/openbsc/bsc_rll.h)2
-rw-r--r--include/osmocom/bsc/bsc_subscriber.h (renamed from include/openbsc/bsc_subscriber.h)0
-rw-r--r--include/osmocom/bsc/bss.h (renamed from include/openbsc/bss.h)2
-rw-r--r--include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h (renamed from include/openbsc/bts_ipaccess_nanobts_omlattr.h)0
-rw-r--r--include/osmocom/bsc/chan_alloc.h (renamed from include/openbsc/chan_alloc.h)0
-rw-r--r--include/osmocom/bsc/common.h (renamed from include/openbsc/common.h)0
-rw-r--r--include/osmocom/bsc/common_bsc.h (renamed from include/openbsc/common_bsc.h)2
-rw-r--r--include/osmocom/bsc/common_cs.h (renamed from include/openbsc/common_cs.h)0
-rw-r--r--include/osmocom/bsc/crc24.h (renamed from include/openbsc/crc24.h)0
-rw-r--r--include/osmocom/bsc/ctrl.h (renamed from include/openbsc/ctrl.h)0
-rw-r--r--include/osmocom/bsc/debug.h (renamed from include/openbsc/debug.h)0
-rw-r--r--include/osmocom/bsc/e1_config.h (renamed from include/openbsc/e1_config.h)2
-rw-r--r--include/osmocom/bsc/gsm_04_08_utils.h (renamed from include/openbsc/gsm_04_08_utils.h)0
-rw-r--r--include/osmocom/bsc/gsm_04_80.h (renamed from include/openbsc/gsm_04_80.h)0
-rw-r--r--include/osmocom/bsc/gsm_data.h (renamed from include/openbsc/gsm_data.h)6
-rw-r--r--include/osmocom/bsc/gsm_data_shared.h (renamed from include/openbsc/gsm_data_shared.h)4
-rw-r--r--include/osmocom/bsc/gsm_subscriber.h (renamed from include/openbsc/gsm_subscriber.h)2
-rw-r--r--include/osmocom/bsc/handover.h (renamed from include/openbsc/handover.h)0
-rw-r--r--include/osmocom/bsc/handover_decision.h (renamed from include/openbsc/handover_decision.h)0
-rw-r--r--include/osmocom/bsc/ipaccess.h (renamed from include/openbsc/ipaccess.h)0
-rw-r--r--include/osmocom/bsc/iu_dummy.h (renamed from include/openbsc/iu_dummy.h)0
-rw-r--r--include/osmocom/bsc/meas_feed.h (renamed from include/openbsc/meas_feed.h)2
-rw-r--r--include/osmocom/bsc/meas_rep.h (renamed from include/openbsc/meas_rep.h)0
-rw-r--r--include/osmocom/bsc/misdn.h (renamed from include/openbsc/misdn.h)0
-rw-r--r--include/osmocom/bsc/mncc.h (renamed from include/openbsc/mncc.h)0
-rw-r--r--include/osmocom/bsc/mncc_int.h (renamed from include/openbsc/mncc_int.h)0
-rw-r--r--include/osmocom/bsc/msc_ifaces.h (renamed from include/openbsc/msc_ifaces.h)2
-rw-r--r--include/osmocom/bsc/nat_rewrite_trie.h (renamed from include/openbsc/nat_rewrite_trie.h)0
-rw-r--r--include/osmocom/bsc/network_listen.h (renamed from include/openbsc/network_listen.h)2
-rw-r--r--include/osmocom/bsc/openbscdefines.h (renamed from include/openbsc/openbscdefines.h)0
-rw-r--r--include/osmocom/bsc/osmo_bsc.h (renamed from include/openbsc/osmo_bsc.h)0
-rw-r--r--include/osmocom/bsc/osmo_bsc_grace.h (renamed from include/openbsc/osmo_bsc_grace.h)4
-rw-r--r--include/osmocom/bsc/osmo_bsc_reset.h (renamed from include/openbsc/osmo_bsc_reset.h)0
-rw-r--r--include/osmocom/bsc/osmo_bsc_rf.h (renamed from include/openbsc/osmo_bsc_rf.h)2
-rw-r--r--include/osmocom/bsc/osmo_bsc_sigtran.h (renamed from include/openbsc/osmo_bsc_sigtran.h)4
-rw-r--r--include/osmocom/bsc/osmo_msc.h (renamed from include/openbsc/osmo_msc.h)2
-rw-r--r--include/osmocom/bsc/osmux.h (renamed from include/openbsc/osmux.h)0
-rw-r--r--include/osmocom/bsc/paging.h (renamed from include/openbsc/paging.h)4
-rw-r--r--include/osmocom/bsc/pcu_if.h (renamed from include/openbsc/pcu_if.h)0
-rw-r--r--include/osmocom/bsc/pcuif_proto.h (renamed from include/openbsc/pcuif_proto.h)0
-rw-r--r--include/osmocom/bsc/rest_octets.h (renamed from include/openbsc/rest_octets.h)0
-rw-r--r--include/osmocom/bsc/rrlp.h (renamed from include/openbsc/rrlp.h)0
-rw-r--r--include/osmocom/bsc/rs232.h (renamed from include/openbsc/rs232.h)0
-rw-r--r--include/osmocom/bsc/rtp_proxy.h (renamed from include/openbsc/rtp_proxy.h)2
-rw-r--r--include/osmocom/bsc/sgsn.h (renamed from include/openbsc/sgsn.h)6
-rw-r--r--include/osmocom/bsc/signal.h (renamed from include/openbsc/signal.h)2
-rw-r--r--include/osmocom/bsc/silent_call.h (renamed from include/openbsc/silent_call.h)0
-rw-r--r--include/osmocom/bsc/smpp.h (renamed from include/openbsc/smpp.h)0
-rw-r--r--include/osmocom/bsc/sms_queue.h (renamed from include/openbsc/sms_queue.h)0
-rw-r--r--include/osmocom/bsc/socket.h (renamed from include/openbsc/socket.h)0
-rw-r--r--include/osmocom/bsc/system_information.h (renamed from include/openbsc/system_information.h)2
-rw-r--r--include/osmocom/bsc/transaction.h (renamed from include/openbsc/transaction.h)6
-rw-r--r--include/osmocom/bsc/trau_mux.h (renamed from include/openbsc/trau_mux.h)4
-rw-r--r--include/osmocom/bsc/trau_upqueue.h (renamed from include/openbsc/trau_upqueue.h)0
-rw-r--r--include/osmocom/bsc/ussd.h (renamed from include/openbsc/ussd.h)0
-rw-r--r--include/osmocom/bsc/vty.h (renamed from include/openbsc/vty.h)0
72 files changed, 38 insertions, 35 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 3234e6265..740e0887e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = \
- openbsc \
+ osmocom \
$(NULL)
noinst_HEADERS = \
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
new file mode 100644
index 000000000..cf24c62a6
--- /dev/null
+++ b/include/osmocom/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+ bsc \
+ $(NULL)
diff --git a/include/openbsc/Makefile.am b/include/osmocom/bsc/Makefile.am
index 3b8dbdf12..3b8dbdf12 100644
--- a/include/openbsc/Makefile.am
+++ b/include/osmocom/bsc/Makefile.am
diff --git a/include/openbsc/a_reset.h b/include/osmocom/bsc/a_reset.h
index 7aaab0620..7aaab0620 100644
--- a/include/openbsc/a_reset.h
+++ b/include/osmocom/bsc/a_reset.h
diff --git a/include/openbsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h
index db2a659e4..34f16a953 100644
--- a/include/openbsc/abis_nm.h
+++ b/include/osmocom/bsc/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/bsc/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/bsc/abis_om2000.h
index b093a0350..b093a0350 100644
--- a/include/openbsc/abis_om2000.h
+++ b/include/osmocom/bsc/abis_om2000.h
diff --git a/include/openbsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h
index f983fceec..f983fceec 100644
--- a/include/openbsc/abis_rsl.h
+++ b/include/osmocom/bsc/abis_rsl.h
diff --git a/include/openbsc/arfcn_range_encode.h b/include/osmocom/bsc/arfcn_range_encode.h
index 7ec710c33..7ec710c33 100644
--- a/include/openbsc/arfcn_range_encode.h
+++ b/include/osmocom/bsc/arfcn_range_encode.h
diff --git a/include/openbsc/auth.h b/include/osmocom/bsc/auth.h
index b314bbf19..b314bbf19 100644
--- a/include/openbsc/auth.h
+++ b/include/osmocom/bsc/auth.h
diff --git a/include/openbsc/bsc_api.h b/include/osmocom/bsc/bsc_api.h
index 6ee05629f..6ee05629f 100644
--- a/include/openbsc/bsc_api.h
+++ b/include/osmocom/bsc/bsc_api.h
diff --git a/include/openbsc/bsc_msc.h b/include/osmocom/bsc/bsc_msc.h
index 380eb17c1..ceaea531a 100644
--- a/include/openbsc/bsc_msc.h
+++ b/include/osmocom/bsc/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/bsc/a_reset.h>
#include <netinet/in.h>
diff --git a/include/openbsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h
index 4a283d165..4a283d165 100644
--- a/include/openbsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
diff --git a/include/openbsc/bsc_msg_filter.h b/include/osmocom/bsc/bsc_msg_filter.h
index a9dedf43c..a9dedf43c 100644
--- a/include/openbsc/bsc_msg_filter.h
+++ b/include/osmocom/bsc/bsc_msg_filter.h
diff --git a/include/openbsc/bsc_nat.h b/include/osmocom/bsc/bsc_nat.h
index 452daf2ab..452daf2ab 100644
--- a/include/openbsc/bsc_nat.h
+++ b/include/osmocom/bsc/bsc_nat.h
diff --git a/include/openbsc/bsc_nat_callstats.h b/include/osmocom/bsc/bsc_nat_callstats.h
index 64f9bfc0a..64f9bfc0a 100644
--- a/include/openbsc/bsc_nat_callstats.h
+++ b/include/osmocom/bsc/bsc_nat_callstats.h
diff --git a/include/openbsc/bsc_nat_sccp.h b/include/osmocom/bsc/bsc_nat_sccp.h
index 082466408..082466408 100644
--- a/include/openbsc/bsc_nat_sccp.h
+++ b/include/osmocom/bsc/bsc_nat_sccp.h
diff --git a/include/openbsc/bsc_rll.h b/include/osmocom/bsc/bsc_rll.h
index 729ba6037..3afe4a8f3 100644
--- a/include/openbsc/bsc_rll.h
+++ b/include/osmocom/bsc/bsc_rll.h
@@ -1,7 +1,7 @@
#ifndef _BSC_RLL_H
#define _BSC_RLL_H
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
enum bsc_rllr_ind {
BSC_RLLR_IND_EST_CONF,
diff --git a/include/openbsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h
index 324734f9a..324734f9a 100644
--- a/include/openbsc/bsc_subscriber.h
+++ b/include/osmocom/bsc/bsc_subscriber.h
diff --git a/include/openbsc/bss.h b/include/osmocom/bsc/bss.h
index 9f16bf7d7..b12487d02 100644
--- a/include/openbsc/bss.h
+++ b/include/osmocom/bsc/bss.h
@@ -1,7 +1,7 @@
#ifndef _BSS_H_
#define _BSS_H_
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
struct msgb;
diff --git a/include/openbsc/bts_ipaccess_nanobts_omlattr.h b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h
index bc7860b2d..bc7860b2d 100644
--- a/include/openbsc/bts_ipaccess_nanobts_omlattr.h
+++ b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h
diff --git a/include/openbsc/chan_alloc.h b/include/osmocom/bsc/chan_alloc.h
index 7388e14c5..7388e14c5 100644
--- a/include/openbsc/chan_alloc.h
+++ b/include/osmocom/bsc/chan_alloc.h
diff --git a/include/openbsc/common.h b/include/osmocom/bsc/common.h
index d91b3d39e..d91b3d39e 100644
--- a/include/openbsc/common.h
+++ b/include/osmocom/bsc/common.h
diff --git a/include/openbsc/common_bsc.h b/include/osmocom/bsc/common_bsc.h
index 796038323..08394e989 100644
--- a/include/openbsc/common_bsc.h
+++ b/include/osmocom/bsc/common_bsc.h
@@ -1,7 +1,7 @@
#pragma once
#include <stdint.h>
-#include <openbsc/common_cs.h>
+#include <osmocom/bsc/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/bsc/common_cs.h
index 09a4b0224..09a4b0224 100644
--- a/include/openbsc/common_cs.h
+++ b/include/osmocom/bsc/common_cs.h
diff --git a/include/openbsc/crc24.h b/include/osmocom/bsc/crc24.h
index 756638c03..756638c03 100644
--- a/include/openbsc/crc24.h
+++ b/include/osmocom/bsc/crc24.h
diff --git a/include/openbsc/ctrl.h b/include/osmocom/bsc/ctrl.h
index c5ac21092..c5ac21092 100644
--- a/include/openbsc/ctrl.h
+++ b/include/osmocom/bsc/ctrl.h
diff --git a/include/openbsc/debug.h b/include/osmocom/bsc/debug.h
index 65e197d52..65e197d52 100644
--- a/include/openbsc/debug.h
+++ b/include/osmocom/bsc/debug.h
diff --git a/include/openbsc/e1_config.h b/include/osmocom/bsc/e1_config.h
index 538c0b09d..909e3cc8a 100644
--- a/include/openbsc/e1_config.h
+++ b/include/osmocom/bsc/e1_config.h
@@ -1,7 +1,7 @@
#ifndef _E1_CONFIG_H
#define _E1_CONFIG_H
-#include <openbsc/gsm_data_shared.h>
+#include <osmocom/bsc/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_utils.h b/include/osmocom/bsc/gsm_04_08_utils.h
index 625f173ca..625f173ca 100644
--- a/include/openbsc/gsm_04_08_utils.h
+++ b/include/osmocom/bsc/gsm_04_08_utils.h
diff --git a/include/openbsc/gsm_04_80.h b/include/osmocom/bsc/gsm_04_80.h
index d65f640bc..d65f640bc 100644
--- a/include/openbsc/gsm_04_80.h
+++ b/include/osmocom/bsc/gsm_04_80.h
diff --git a/include/openbsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 74970b92e..ef041d665 100644
--- a/include/openbsc/gsm_data.h
+++ b/include/osmocom/bsc/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/bsc/common.h>
+#include <osmocom/bsc/rest_octets.h>
+#include <osmocom/bsc/common_cs.h>
#include <osmocom/legacy_mgcp/mgcpgw_client.h>
diff --git a/include/openbsc/gsm_data_shared.h b/include/osmocom/bsc/gsm_data_shared.h
index bef450430..6ce571edd 100644
--- a/include/openbsc/gsm_data_shared.h
+++ b/include/osmocom/bsc/gsm_data_shared.h
@@ -24,8 +24,8 @@
#include <osmocom/gsm/lapdm.h>
#endif
-#include <openbsc/common_cs.h>
-#include <openbsc/meas_rep.h>
+#include <osmocom/bsc/common_cs.h>
+#include <osmocom/bsc/meas_rep.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/bsc/gsm_subscriber.h
index d88e32aa7..ca66d47a9 100644
--- a/include/openbsc/gsm_subscriber.h
+++ b/include/osmocom/bsc/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/bsc/gsm_data.h>
#define GSM_NAME_LENGTH 160
diff --git a/include/openbsc/handover.h b/include/osmocom/bsc/handover.h
index 3fe71a28b..3fe71a28b 100644
--- a/include/openbsc/handover.h
+++ b/include/osmocom/bsc/handover.h
diff --git a/include/openbsc/handover_decision.h b/include/osmocom/bsc/handover_decision.h
index 81078b05d..81078b05d 100644
--- a/include/openbsc/handover_decision.h
+++ b/include/osmocom/bsc/handover_decision.h
diff --git a/include/openbsc/ipaccess.h b/include/osmocom/bsc/ipaccess.h
index 82e89c27d..82e89c27d 100644
--- a/include/openbsc/ipaccess.h
+++ b/include/osmocom/bsc/ipaccess.h
diff --git a/include/openbsc/iu_dummy.h b/include/osmocom/bsc/iu_dummy.h
index d5e142801..d5e142801 100644
--- a/include/openbsc/iu_dummy.h
+++ b/include/osmocom/bsc/iu_dummy.h
diff --git a/include/openbsc/meas_feed.h b/include/osmocom/bsc/meas_feed.h
index f77ee075f..55bce098e 100644
--- a/include/openbsc/meas_feed.h
+++ b/include/osmocom/bsc/meas_feed.h
@@ -3,7 +3,7 @@
#include <stdint.h>
-#include <openbsc/meas_rep.h>
+#include <osmocom/bsc/meas_rep.h>
struct meas_feed_hdr {
uint8_t msg_type;
diff --git a/include/openbsc/meas_rep.h b/include/osmocom/bsc/meas_rep.h
index b0c03f0bb..b0c03f0bb 100644
--- a/include/openbsc/meas_rep.h
+++ b/include/osmocom/bsc/meas_rep.h
diff --git a/include/openbsc/misdn.h b/include/osmocom/bsc/misdn.h
index 9851ad32c..9851ad32c 100644
--- a/include/openbsc/misdn.h
+++ b/include/osmocom/bsc/misdn.h
diff --git a/include/openbsc/mncc.h b/include/osmocom/bsc/mncc.h
index 881e0418e..881e0418e 100644
--- a/include/openbsc/mncc.h
+++ b/include/osmocom/bsc/mncc.h
diff --git a/include/openbsc/mncc_int.h b/include/osmocom/bsc/mncc_int.h
index 213ce1414..213ce1414 100644
--- a/include/openbsc/mncc_int.h
+++ b/include/osmocom/bsc/mncc_int.h
diff --git a/include/openbsc/msc_ifaces.h b/include/osmocom/bsc/msc_ifaces.h
index a1071ae9b..dadb82800 100644
--- a/include/openbsc/msc_ifaces.h
+++ b/include/osmocom/bsc/msc_ifaces.h
@@ -1,7 +1,7 @@
#pragma once
#include <osmocom/core/msgb.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/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/nat_rewrite_trie.h b/include/osmocom/bsc/nat_rewrite_trie.h
index 0571099c6..0571099c6 100644
--- a/include/openbsc/nat_rewrite_trie.h
+++ b/include/osmocom/bsc/nat_rewrite_trie.h
diff --git a/include/openbsc/network_listen.h b/include/osmocom/bsc/network_listen.h
index 67d1f4ef7..68d07093d 100644
--- a/include/openbsc/network_listen.h
+++ b/include/osmocom/bsc/network_listen.h
@@ -2,7 +2,7 @@
#define _OPENBSC_NWL_H
#include <stdint.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
void ipac_nwl_init(void);
diff --git a/include/openbsc/openbscdefines.h b/include/osmocom/bsc/openbscdefines.h
index c6ac153b8..c6ac153b8 100644
--- a/include/openbsc/openbscdefines.h
+++ b/include/osmocom/bsc/openbscdefines.h
diff --git a/include/openbsc/osmo_bsc.h b/include/osmocom/bsc/osmo_bsc.h
index 5ebea5079..5ebea5079 100644
--- a/include/openbsc/osmo_bsc.h
+++ b/include/osmocom/bsc/osmo_bsc.h
diff --git a/include/openbsc/osmo_bsc_grace.h b/include/osmocom/bsc/osmo_bsc_grace.h
index 5a81cd137..b7950ce50 100644
--- a/include/openbsc/osmo_bsc_grace.h
+++ b/include/osmocom/bsc/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/bsc/gsm_data.h>
+#include <osmocom/bsc/signal.h>
struct bsc_msc_data;
diff --git a/include/openbsc/osmo_bsc_reset.h b/include/osmocom/bsc/osmo_bsc_reset.h
index 578f763e6..578f763e6 100644
--- a/include/openbsc/osmo_bsc_reset.h
+++ b/include/osmocom/bsc/osmo_bsc_reset.h
diff --git a/include/openbsc/osmo_bsc_rf.h b/include/osmocom/bsc/osmo_bsc_rf.h
index 19ccd080d..56ac980ca 100644
--- a/include/openbsc/osmo_bsc_rf.h
+++ b/include/osmocom/bsc/osmo_bsc_rf.h
@@ -1,7 +1,7 @@
#ifndef OSMO_BSC_RF
#define OSMO_BSC_RF
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/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/bsc/osmo_bsc_sigtran.h
index fbcfcb3fc..89649036e 100644
--- a/include/openbsc/osmo_bsc_sigtran.h
+++ b/include/osmocom/bsc/osmo_bsc_sigtran.h
@@ -20,8 +20,8 @@
#pragma once
-#include <openbsc/gsm_data.h>
-#include <openbsc/bsc_msc_data.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/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/bsc/osmo_msc.h
index cdfd27f11..c08cb26b1 100644
--- a/include/openbsc/osmo_msc.h
+++ b/include/osmocom/bsc/osmo_msc.h
@@ -6,7 +6,7 @@
#include <osmocom/core/fsm.h>
#include <osmocom/gsm/gsup.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
#include "bsc_api.h"
diff --git a/include/openbsc/osmux.h b/include/osmocom/bsc/osmux.h
index f3ea72a85..f3ea72a85 100644
--- a/include/openbsc/osmux.h
+++ b/include/osmocom/bsc/osmux.h
diff --git a/include/openbsc/paging.h b/include/osmocom/bsc/paging.h
index 7dd8500ac..e917772a7 100644
--- a/include/openbsc/paging.h
+++ b/include/osmocom/bsc/paging.h
@@ -26,8 +26,8 @@
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/timer.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/bsc_subscriber.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/bsc_subscriber.h>
/**
* A pending paging request
diff --git a/include/openbsc/pcu_if.h b/include/osmocom/bsc/pcu_if.h
index 1f398b4aa..1f398b4aa 100644
--- a/include/openbsc/pcu_if.h
+++ b/include/osmocom/bsc/pcu_if.h
diff --git a/include/openbsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h
index eb28d66bc..eb28d66bc 100644
--- a/include/openbsc/pcuif_proto.h
+++ b/include/osmocom/bsc/pcuif_proto.h
diff --git a/include/openbsc/rest_octets.h b/include/osmocom/bsc/rest_octets.h
index 374b1ba10..374b1ba10 100644
--- a/include/openbsc/rest_octets.h
+++ b/include/osmocom/bsc/rest_octets.h
diff --git a/include/openbsc/rrlp.h b/include/osmocom/bsc/rrlp.h
index c89402a2d..c89402a2d 100644
--- a/include/openbsc/rrlp.h
+++ b/include/osmocom/bsc/rrlp.h
diff --git a/include/openbsc/rs232.h b/include/osmocom/bsc/rs232.h
index 61187ca62..61187ca62 100644
--- a/include/openbsc/rs232.h
+++ b/include/osmocom/bsc/rs232.h
diff --git a/include/openbsc/rtp_proxy.h b/include/osmocom/bsc/rtp_proxy.h
index 52ffefd27..918420ce5 100644
--- a/include/openbsc/rtp_proxy.h
+++ b/include/osmocom/bsc/rtp_proxy.h
@@ -27,7 +27,7 @@
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/select.h>
-#include <openbsc/mncc.h>
+#include <osmocom/bsc/mncc.h>
#define RTP_PT_GSM_FULL 3
#define RTP_PT_GSM_HALF 96
diff --git a/include/openbsc/sgsn.h b/include/osmocom/bsc/sgsn.h
index f371dc695..f71b6491a 100644
--- a/include/openbsc/sgsn.h
+++ b/include/osmocom/bsc/sgsn.h
@@ -5,9 +5,9 @@
#include <osmocom/core/msgb.h>
#include <osmocom/crypt/gprs_cipher.h>
#include <osmocom/gprs/gprs_ns.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/oap_client.h>
-#include <openbsc/common.h>
+#include <osmocom/bsc/gprs_sgsn.h>
+#include <osmocom/bsc/oap_client.h>
+#include <osmocom/bsc/common.h>
#include <ares.h>
diff --git a/include/openbsc/signal.h b/include/osmocom/bsc/signal.h
index 49f86d612..feab246c2 100644
--- a/include/openbsc/signal.h
+++ b/include/osmocom/bsc/signal.h
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <errno.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/bsc/gsm_data.h>
#include <osmocom/core/signal.h>
diff --git a/include/openbsc/silent_call.h b/include/osmocom/bsc/silent_call.h
index 5fec77b73..5fec77b73 100644
--- a/include/openbsc/silent_call.h
+++ b/include/osmocom/bsc/silent_call.h
diff --git a/include/openbsc/smpp.h b/include/osmocom/bsc/smpp.h
index bcdac8f0b..bcdac8f0b 100644
--- a/include/openbsc/smpp.h
+++ b/include/osmocom/bsc/smpp.h
diff --git a/include/openbsc/sms_queue.h b/include/osmocom/bsc/sms_queue.h
index 2a8bd5850..2a8bd5850 100644
--- a/include/openbsc/sms_queue.h
+++ b/include/osmocom/bsc/sms_queue.h
diff --git a/include/openbsc/socket.h b/include/osmocom/bsc/socket.h
index 0fd85f104..0fd85f104 100644
--- a/include/openbsc/socket.h
+++ b/include/osmocom/bsc/socket.h
diff --git a/include/openbsc/system_information.h b/include/osmocom/bsc/system_information.h
index 71bea2660..29f639dca 100644
--- a/include/openbsc/system_information.h
+++ b/include/osmocom/bsc/system_information.h
@@ -3,7 +3,7 @@
#include <osmocom/gsm/sysinfo.h>
-#include <openbsc/arfcn_range_encode.h>
+#include <osmocom/bsc/arfcn_range_encode.h>
struct gsm_bts;
diff --git a/include/openbsc/transaction.h b/include/osmocom/bsc/transaction.h
index 1e93fffda..5465548ea 100644
--- a/include/openbsc/transaction.h
+++ b/include/osmocom/bsc/transaction.h
@@ -1,10 +1,10 @@
#ifndef _TRANSACT_H
#define _TRANSACT_H
-#include <openbsc/gsm_data.h>
-#include <openbsc/gsm_subscriber.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/gsm_subscriber.h>
#include <osmocom/core/linuxlist.h>
-#include <openbsc/mncc.h>
+#include <osmocom/bsc/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/bsc/trau_mux.h
index 75c359b56..eeceff5cc 100644
--- a/include/openbsc/trau_mux.h
+++ b/include/osmocom/bsc/trau_mux.h
@@ -29,8 +29,8 @@
*/
#include <stdint.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/mncc.h>
+#include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/mncc.h>
struct decoded_trau_frame;
diff --git a/include/openbsc/trau_upqueue.h b/include/osmocom/bsc/trau_upqueue.h
index ecc765843..ecc765843 100644
--- a/include/openbsc/trau_upqueue.h
+++ b/include/osmocom/bsc/trau_upqueue.h
diff --git a/include/openbsc/ussd.h b/include/osmocom/bsc/ussd.h
index 266546811..266546811 100644
--- a/include/openbsc/ussd.h
+++ b/include/osmocom/bsc/ussd.h
diff --git a/include/openbsc/vty.h b/include/osmocom/bsc/vty.h
index f7056016c..f7056016c 100644
--- a/include/openbsc/vty.h
+++ b/include/osmocom/bsc/vty.h