include: reorganize headers file to include/osmocom/[gsm|core]

This patch moves all GSM-specific definitions to include/osmocom/gsm.
Moreover, the headers in include/osmocore/ have been moved to
include/osmocom/core.

This has been proposed by Harald Welte and Sylvain Munaunt.

Tested with `make distcheck'.

Signed-off-by: Pablo Neira Ayuso <pablo@gnumonks.org>

configure.in

@@ -106,8 +106,9 @@ AC_OUTPUT(
 	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

include/Makefile.am

@@ -1 +1 @@
-SUBDIRS = osmocom osmocore
+SUBDIRS = osmocom

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

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

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

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 struct msgb *msgb_dequeue(struct llist_head *queue);
 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)

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
 

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

include/osmocom/core/timer.h

@@ -23,7 +23,7 @@
 
 #include <sys/time.h>
 
-#include "linuxlist.h"
+#include <osmocom/core/linuxlist.h>
 
 /**
  * Timer management:

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
 

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

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
 

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 {

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,

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

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 {

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);
 

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)

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>
 

include/osmocore/Makefile.am

@@ -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

include/osmocore/protocol/Makefile.am

@@ -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

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

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)

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)
 

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] = {

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>
 

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>
 

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>
 

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 = {

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',

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

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

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)
 {

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;
 

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>

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. */
 

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)
 {

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;

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>

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"
 

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)
 {

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);
 

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"
 

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>

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);
 

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 */
 

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;

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)

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>
 

src/vty/command.c

@@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define CONFIGFILE_MASK 022
 

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>
 

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>

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>
 

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;

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"
 

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)
 {

tests/msgfile/msgfile_test.c

@@ -19,7 +19,7 @@
  *
  */
 
-#include <osmocore/msgfile.h>
+#include <osmocom/core/msgfile.h>
 
 #include <stdio.h>
 

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;

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>
 

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"
 

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>