This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/OpenBSC@lists.osmocom.org/.
pablo at gnumonks.org pablo at gnumonks.orgFrom: Pablo Neira Ayuso <pablo at gnumonks.org>
With this patch, we check for the libtalloc version installed
in the system. We don't use our own copy in libosmocore anymore.
This patch also replaces all references to:
#include <osmocom/core/talloc.h>
by:
#include <talloc.h>
I did this with this command:
find ./ -type f -exec sed -i "s/osmocom\/core\/talloc.h/talloc.h/g" {} \;
Make sure you skip .git directory in this replacement, otherwise you'll
get a corrupted git repository.
---
openbsc/configure.ac | 1 +
openbsc/src/gprs/gb_proxy.c | 2 +-
openbsc/src/gprs/gb_proxy_main.c | 2 +-
openbsc/src/gprs/gb_proxy_vty.c | 2 +-
openbsc/src/gprs/gprs_gmm.c | 2 +-
openbsc/src/gprs/gprs_llc.c | 2 +-
openbsc/src/gprs/gprs_llc_vty.c | 2 +-
openbsc/src/gprs/gprs_sgsn.c | 2 +-
openbsc/src/gprs/gprs_sndcp.c | 2 +-
openbsc/src/gprs/gprs_sndcp_vty.c | 2 +-
openbsc/src/gprs/sgsn_libgtp.c | 2 +-
openbsc/src/gprs/sgsn_main.c | 2 +-
openbsc/src/gprs/sgsn_vty.c | 2 +-
openbsc/src/ipaccess/ipaccess-config.c | 2 +-
openbsc/src/ipaccess/ipaccess-firmware.c | 2 +-
openbsc/src/ipaccess/ipaccess-proxy.c | 2 +-
openbsc/src/ipaccess/network_listen.c | 2 +-
openbsc/src/libabis/e1_input.c | 2 +-
openbsc/src/libabis/e1_input_vty.c | 2 +-
openbsc/src/libabis/input/dahdi.c | 2 +-
openbsc/src/libabis/input/hsl.c | 2 +-
openbsc/src/libabis/input/ipaccess.c | 2 +-
openbsc/src/libabis/input/lapd.c | 2 +-
openbsc/src/libabis/input/misdn.c | 2 +-
openbsc/src/libbsc/abis_nm.c | 2 +-
openbsc/src/libbsc/abis_nm_vty.c | 2 +-
openbsc/src/libbsc/abis_om2000.c | 2 +-
openbsc/src/libbsc/abis_om2000_vty.c | 2 +-
openbsc/src/libbsc/abis_rsl.c | 2 +-
openbsc/src/libbsc/bsc_api.c | 2 +-
openbsc/src/libbsc/bsc_init.c | 2 +-
openbsc/src/libbsc/bsc_msc.c | 2 +-
openbsc/src/libbsc/bsc_rll.c | 2 +-
openbsc/src/libbsc/bsc_vty.c | 2 +-
openbsc/src/libbsc/chan_alloc.c | 2 +-
openbsc/src/libbsc/e1_config.c | 2 +-
openbsc/src/libbsc/gsm_subscriber_base.c | 2 +-
openbsc/src/libbsc/handover_decision.c | 2 +-
openbsc/src/libbsc/handover_logic.c | 2 +-
openbsc/src/libbsc/meas_proc.c | 2 +-
openbsc/src/libbsc/paging.c | 2 +-
openbsc/src/libcommon/common_vty.c | 2 +-
openbsc/src/libcommon/debug.c | 2 +-
openbsc/src/libcommon/gsm_data.c | 2 +-
openbsc/src/libcommon/socket.c | 2 +-
openbsc/src/libcommon/talloc_ctx.c | 2 +-
openbsc/src/libgb/gprs_bssgp.c | 2 +-
openbsc/src/libgb/gprs_bssgp_util.c | 2 +-
openbsc/src/libgb/gprs_bssgp_vty.c | 2 +-
openbsc/src/libgb/gprs_ns.c | 2 +-
openbsc/src/libgb/gprs_ns_frgre.c | 2 +-
openbsc/src/libgb/gprs_ns_vty.c | 2 +-
openbsc/src/libmgcp/mgcp_protocol.c | 2 +-
openbsc/src/libmgcp/mgcp_vty.c | 2 +-
openbsc/src/libmsc/db.c | 2 +-
openbsc/src/libmsc/gsm_04_08.c | 2 +-
openbsc/src/libmsc/gsm_04_11.c | 2 +-
openbsc/src/libmsc/gsm_subscriber.c | 2 +-
openbsc/src/libmsc/mncc.c | 2 +-
openbsc/src/libmsc/mncc_builtin.c | 2 +-
openbsc/src/libmsc/mncc_sock.c | 2 +-
openbsc/src/libmsc/sms_queue.c | 2 +-
openbsc/src/libmsc/token_auth.c | 2 +-
openbsc/src/libmsc/transaction.c | 2 +-
openbsc/src/libmsc/vty_interface_layer3.c | 2 +-
openbsc/src/libtrau/rtp_proxy.c | 2 +-
openbsc/src/libtrau/subchan_demux.c | 2 +-
openbsc/src/libtrau/trau_mux.c | 2 +-
openbsc/src/osmo-bsc/osmo_bsc_main.c | 2 +-
openbsc/src/osmo-bsc/osmo_bsc_rf.c | 2 +-
openbsc/src/osmo-bsc/osmo_bsc_sccp.c | 2 +-
openbsc/src/osmo-bsc/osmo_bsc_vty.c | 2 +-
openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 2 +-
openbsc/src/osmo-bsc_nat/bsc_filter.c | 2 +-
openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c | 2 +-
openbsc/src/osmo-bsc_nat/bsc_nat.c | 2 +-
openbsc/src/osmo-bsc_nat/bsc_nat_utils.c | 2 +-
openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 2 +-
openbsc/src/osmo-bsc_nat/bsc_sccp.c | 2 +-
openbsc/src/osmo-bsc_nat/bsc_ussd.c | 2 +-
openbsc/src/osmo-nitb/bsc_hack.c | 2 +-
openbsc/tests/bsc-nat/bsc_nat_test.c | 2 +-
openbsc/tests/mgcp/mgcp_test.c | 2 +-
83 files changed, 83 insertions(+), 82 deletions(-)
diff --git a/openbsc/configure.ac b/openbsc/configure.ac
index 74b3044..ac77d82 100644
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -46,6 +46,7 @@ AM_CONDITIONAL(BUILD_BSC, test "x$osmo_ac_build_bsc" = "xyes")
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0)
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.0)
+PKG_CHECK_MODULES(LIBTALLOC, talloc >= 2.0.1)
dnl checks for header files
AC_HEADER_STDC
diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c
index 1261ccc..b45dd6d 100644
--- a/openbsc/src/gprs/gb_proxy.c
+++ b/openbsc/src/gprs/gb_proxy.c
@@ -29,7 +29,7 @@
#include <sys/stat.h>
#include <arpa/inet.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <openbsc/signal.h>
diff --git a/openbsc/src/gprs/gb_proxy_main.c b/openbsc/src/gprs/gb_proxy_main.c
index 028f989..eae6300 100644
--- a/openbsc/src/gprs/gb_proxy_main.c
+++ b/openbsc/src/gprs/gb_proxy_main.c
@@ -33,7 +33,7 @@
#include <arpa/inet.h>
#include <osmocom/core/application.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/core/rate_ctr.h>
#include <osmocom/core/process.h>
diff --git a/openbsc/src/gprs/gb_proxy_vty.c b/openbsc/src/gprs/gb_proxy_vty.c
index 1aa4ff5..651c106 100644
--- a/openbsc/src/gprs/gb_proxy_vty.c
+++ b/openbsc/src/gprs/gb_proxy_vty.c
@@ -22,7 +22,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/debug.h>
#include <openbsc/gb_proxy.h>
diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c
index 46c4931..69f8086 100644
--- a/openbsc/src/gprs/gprs_gmm.c
+++ b/openbsc/src/gprs/gprs_gmm.c
@@ -35,7 +35,7 @@
#include <osmocom/gsm/tlv.h>
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/core/signal.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/rate_ctr.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c
index f7408ef..8d0ddce 100644
--- a/openbsc/src/gprs/gprs_llc.c
+++ b/openbsc/src/gprs/gprs_llc.c
@@ -25,7 +25,7 @@
#include <osmocom/core/msgb.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/timer.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/gsm_data.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/gprs/gprs_llc_vty.c b/openbsc/src/gprs/gprs_llc_vty.c
index ab52699..3a5803e 100644
--- a/openbsc/src/gprs/gprs_llc_vty.c
+++ b/openbsc/src/gprs/gprs_llc_vty.c
@@ -29,7 +29,7 @@
#include <openbsc/gsm_data.h>
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/core/rate_ctr.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c
index 85f7105..9b29a94 100644
--- a/openbsc/src/gprs/gprs_sgsn.c
+++ b/openbsc/src/gprs/gprs_sgsn.c
@@ -22,7 +22,7 @@
#include <stdint.h>
#include <osmocom/core/linuxlist.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/timer.h>
#include <osmocom/core/rate_ctr.h>
#include <openbsc/gsm_subscriber.h>
diff --git a/openbsc/src/gprs/gprs_sndcp.c b/openbsc/src/gprs/gprs_sndcp.c
index 1307fe5..2404fff 100644
--- a/openbsc/src/gprs/gprs_sndcp.c
+++ b/openbsc/src/gprs/gprs_sndcp.c
@@ -26,7 +26,7 @@
#include <osmocom/core/msgb.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/timer.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/gsm_data.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/gprs/gprs_sndcp_vty.c b/openbsc/src/gprs/gprs_sndcp_vty.c
index 28fdc63..58a77e8 100644
--- a/openbsc/src/gprs/gprs_sndcp_vty.c
+++ b/openbsc/src/gprs/gprs_sndcp_vty.c
@@ -29,7 +29,7 @@
#include <openbsc/gsm_data.h>
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/core/rate_ctr.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/gprs/sgsn_libgtp.c b/openbsc/src/gprs/sgsn_libgtp.c
index f193aa3..8d99169 100644
--- a/openbsc/src/gprs/sgsn_libgtp.c
+++ b/openbsc/src/gprs/sgsn_libgtp.c
@@ -33,7 +33,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/core/rate_ctr.h>
#include <openbsc/gsm_04_08_gprs.h>
diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c
index bfa2e52..1d2d5b7 100644
--- a/openbsc/src/gprs/sgsn_main.c
+++ b/openbsc/src/gprs/sgsn_main.c
@@ -33,7 +33,7 @@
#include <arpa/inet.h>
#include <osmocom/core/application.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/core/rate_ctr.h>
#include <osmocom/core/logging.h>
diff --git a/openbsc/src/gprs/sgsn_vty.c b/openbsc/src/gprs/sgsn_vty.c
index 4c9cf28..9f4d7fe 100644
--- a/openbsc/src/gprs/sgsn_vty.c
+++ b/openbsc/src/gprs/sgsn_vty.c
@@ -22,7 +22,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/utils.h>
#include <osmocom/core/rate_ctr.h>
diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c
index 9d0e2db..d34c93d 100644
--- a/openbsc/src/ipaccess/ipaccess-config.c
+++ b/openbsc/src/ipaccess/ipaccess-config.c
@@ -44,7 +44,7 @@
#include <openbsc/signal.h>
#include <openbsc/debug.h>
#include <openbsc/network_listen.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
static struct gsm_network *gsmnet;
diff --git a/openbsc/src/ipaccess/ipaccess-firmware.c b/openbsc/src/ipaccess/ipaccess-firmware.c
index 6d39107..cdff22c 100644
--- a/openbsc/src/ipaccess/ipaccess-firmware.c
+++ b/openbsc/src/ipaccess/ipaccess-firmware.c
@@ -20,7 +20,7 @@
#include <openbsc/debug.h>
#include <openbsc/ipaccess.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c
index b4d17e2..3c87118 100644
--- a/openbsc/src/ipaccess/ipaccess-proxy.c
+++ b/openbsc/src/ipaccess/ipaccess-proxy.c
@@ -45,7 +45,7 @@
#include <openbsc/debug.h>
#include <openbsc/ipaccess.h>
#include <openbsc/socket.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
/* one instance of an ip.access protocol proxy */
struct ipa_proxy {
diff --git a/openbsc/src/ipaccess/network_listen.c b/openbsc/src/ipaccess/network_listen.c
index a719903..a887bc3 100644
--- a/openbsc/src/ipaccess/network_listen.c
+++ b/openbsc/src/ipaccess/network_listen.c
@@ -28,7 +28,7 @@
#include <arpa/inet.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/timer.h>
#include <osmocom/gsm/rxlev_stat.h>
#include <osmocom/gsm/gsm48_ie.h>
diff --git a/openbsc/src/libabis/e1_input.c b/openbsc/src/libabis/e1_input.c
index 97dcd33..e42a345 100644
--- a/openbsc/src/libabis/e1_input.c
+++ b/openbsc/src/libabis/e1_input.c
@@ -49,7 +49,7 @@
#include <openbsc/subchan_demux.h>
#include <openbsc/trau_frame.h>
#include <openbsc/trau_mux.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/signal.h>
#include <openbsc/misdn.h>
diff --git a/openbsc/src/libabis/e1_input_vty.c b/openbsc/src/libabis/e1_input_vty.c
index b211e81..1595699 100644
--- a/openbsc/src/libabis/e1_input_vty.c
+++ b/openbsc/src/libabis/e1_input_vty.c
@@ -31,7 +31,7 @@
#include <openbsc/e1_input.h>
#include <osmocom/core/utils.h>
#include <osmocom/gsm/gsm_utils.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/vty.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/libabis/input/dahdi.c b/openbsc/src/libabis/input/dahdi.c
index 6f89837..948615b 100644
--- a/openbsc/src/libabis/input/dahdi.c
+++ b/openbsc/src/libabis/input/dahdi.c
@@ -47,7 +47,7 @@
#include <openbsc/subchan_demux.h>
#include <openbsc/e1_input.h>
#include <openbsc/signal.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include "lapd.h"
diff --git a/openbsc/src/libabis/input/hsl.c b/openbsc/src/libabis/input/hsl.c
index c98a22c..5b49d10 100644
--- a/openbsc/src/libabis/input/hsl.c
+++ b/openbsc/src/libabis/input/hsl.c
@@ -54,7 +54,7 @@
#include <openbsc/ipaccess.h>
#include <openbsc/socket.h>
#include <openbsc/signal.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#define HSL_TCP_PORT 2500
#define HSL_PROTO_DEBUG 0xdd
diff --git a/openbsc/src/libabis/input/ipaccess.c b/openbsc/src/libabis/input/ipaccess.c
index cc2a7a0..fe2b8f1 100644
--- a/openbsc/src/libabis/input/ipaccess.c
+++ b/openbsc/src/libabis/input/ipaccess.c
@@ -35,7 +35,7 @@
#include <osmocom/core/select.h>
#include <osmocom/gsm/tlv.h>
#include <osmocom/core/msgb.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/debug.h>
#include <openbsc/gsm_data.h>
#include <openbsc/abis_nm.h>
diff --git a/openbsc/src/libabis/input/lapd.c b/openbsc/src/libabis/input/lapd.c
index d0fab18..edf8c01 100644
--- a/openbsc/src/libabis/input/lapd.c
+++ b/openbsc/src/libabis/input/lapd.c
@@ -37,7 +37,7 @@
#include "lapd.h"
#include <osmocom/core/linuxlist.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/msgb.h>
#include <osmocom/core/timer.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/libabis/input/misdn.c b/openbsc/src/libabis/input/misdn.c
index ab92d61..02bbbd1 100644
--- a/openbsc/src/libabis/input/misdn.c
+++ b/openbsc/src/libabis/input/misdn.c
@@ -41,7 +41,7 @@
#include <osmocom/core/select.h>
#include <osmocom/core/msgb.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/debug.h>
#include <openbsc/gsm_data.h>
#include <openbsc/abis_nm.h>
diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c
index f2220a7..1ccf083 100644
--- a/openbsc/src/libbsc/abis_nm.c
+++ b/openbsc/src/libbsc/abis_nm.c
@@ -39,7 +39,7 @@
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
#include <osmocom/gsm/abis_nm.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/abis_nm.h>
#include <openbsc/misdn.h>
#include <openbsc/signal.h>
diff --git a/openbsc/src/libbsc/abis_nm_vty.c b/openbsc/src/libbsc/abis_nm_vty.c
index bcbc92d..658608d 100644
--- a/openbsc/src/libbsc/abis_nm_vty.c
+++ b/openbsc/src/libbsc/abis_nm_vty.c
@@ -31,7 +31,7 @@
#include <openbsc/gsm_data.h>
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/debug.h>
#include <openbsc/signal.h>
#include <openbsc/abis_nm.h>
diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c
index fd3cf1f..6c9832a 100644
--- a/openbsc/src/libbsc/abis_om2000.c
+++ b/openbsc/src/libbsc/abis_om2000.c
@@ -32,7 +32,7 @@
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/utils.h>
#include <openbsc/gsm_data.h>
diff --git a/openbsc/src/libbsc/abis_om2000_vty.c b/openbsc/src/libbsc/abis_om2000_vty.c
index 704f955..b8bd7c9 100644
--- a/openbsc/src/libbsc/abis_om2000_vty.c
+++ b/openbsc/src/libbsc/abis_om2000_vty.c
@@ -29,7 +29,7 @@
#include <openbsc/gsm_data.h>
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/debug.h>
#include <openbsc/signal.h>
#include <openbsc/abis_om2000.h>
diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index 1001003..78f0535 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -40,7 +40,7 @@
#include <openbsc/rtp_proxy.h>
#include <osmocom/gsm/rsl.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#define RSL_ALLOC_SIZE 1024
#define RSL_ALLOC_HEADROOM 128
diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c
index 70d6413..0cc4e37 100644
--- a/openbsc/src/libbsc/bsc_api.c
+++ b/openbsc/src/libbsc/bsc_api.c
@@ -34,7 +34,7 @@
#include <osmocom/gsm/protocol/gsm_08_08.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#define GSM0808_T10_VALUE 6, 0
diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c
index 378f5ea..621fe87 100644
--- a/openbsc/src/libbsc/bsc_init.c
+++ b/openbsc/src/libbsc/bsc_init.c
@@ -31,7 +31,7 @@
#include <openbsc/paging.h>
#include <openbsc/signal.h>
#include <openbsc/chan_alloc.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/ipaccess.h>
/* global pointer to the gsm network data structure */
diff --git a/openbsc/src/libbsc/bsc_msc.c b/openbsc/src/libbsc/bsc_msc.c
index e9ffce3..6b119ad 100644
--- a/openbsc/src/libbsc/bsc_msc.c
+++ b/openbsc/src/libbsc/bsc_msc.c
@@ -24,7 +24,7 @@
#include <openbsc/ipaccess.h>
#include <osmocom/core/write_queue.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <arpa/inet.h>
#include <sys/socket.h>
diff --git a/openbsc/src/libbsc/bsc_rll.c b/openbsc/src/libbsc/bsc_rll.c
index d12aeee..054cbf3 100644
--- a/openbsc/src/libbsc/bsc_rll.c
+++ b/openbsc/src/libbsc/bsc_rll.c
@@ -23,7 +23,7 @@
#include <errno.h>
#include <openbsc/debug.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/timer.h>
#include <osmocom/core/linuxlist.h>
#include <openbsc/bsc_rll.h>
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index a72ff21..b304077 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -39,7 +39,7 @@
#include <openbsc/chan_alloc.h>
#include <openbsc/meas_rep.h>
#include <openbsc/db.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/vty.h>
#include <openbsc/gprs_ns.h>
#include <openbsc/system_information.h>
diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c
index cfd3874..6cdc5ab 100644
--- a/openbsc/src/libbsc/chan_alloc.c
+++ b/openbsc/src/libbsc/chan_alloc.c
@@ -32,7 +32,7 @@
#include <openbsc/debug.h>
#include <openbsc/signal.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
static int ts_is_usable(struct gsm_bts_trx_ts *ts)
{
diff --git a/openbsc/src/libbsc/e1_config.c b/openbsc/src/libbsc/e1_config.c
index bd6ebba..3809faa 100644
--- a/openbsc/src/libbsc/e1_config.c
+++ b/openbsc/src/libbsc/e1_config.c
@@ -29,7 +29,7 @@
#include <openbsc/trau_mux.h>
#include <openbsc/misdn.h>
#include <openbsc/ipaccess.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/debug.h>
#define SAPI_L2ML 0
diff --git a/openbsc/src/libbsc/gsm_subscriber_base.c b/openbsc/src/libbsc/gsm_subscriber_base.c
index 11afb35..21fd0ef 100644
--- a/openbsc/src/libbsc/gsm_subscriber_base.c
+++ b/openbsc/src/libbsc/gsm_subscriber_base.c
@@ -27,7 +27,7 @@
#include <string.h>
#include <assert.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/gsm_subscriber.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/libbsc/handover_decision.c b/openbsc/src/libbsc/handover_decision.c
index 24c0f79..97326dc 100644
--- a/openbsc/src/libbsc/handover_decision.c
+++ b/openbsc/src/libbsc/handover_decision.c
@@ -29,7 +29,7 @@
#include <openbsc/gsm_data.h>
#include <openbsc/meas_rep.h>
#include <openbsc/signal.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/handover.h>
#include <osmocom/gsm/gsm_utils.h>
diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c
index 0f1582e..ec9c06c 100644
--- a/openbsc/src/libbsc/handover_logic.c
+++ b/openbsc/src/libbsc/handover_logic.c
@@ -37,7 +37,7 @@
#include <openbsc/abis_rsl.h>
#include <openbsc/chan_alloc.h>
#include <openbsc/signal.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/transaction.h>
#include <openbsc/rtp_proxy.h>
diff --git a/openbsc/src/libbsc/meas_proc.c b/openbsc/src/libbsc/meas_proc.c
index 5b97e74..1a60934 100644
--- a/openbsc/src/libbsc/meas_proc.c
+++ b/openbsc/src/libbsc/meas_proc.c
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <errno.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/msgb.h>
#include <openbsc/debug.h>
#include <openbsc/gsm_data.h>
diff --git a/openbsc/src/libbsc/paging.c b/openbsc/src/libbsc/paging.c
index 2dcd3b4..349329c 100644
--- a/openbsc/src/libbsc/paging.c
+++ b/openbsc/src/libbsc/paging.c
@@ -39,7 +39,7 @@
#include <assert.h>
#include <openbsc/paging.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/debug.h>
#include <openbsc/signal.h>
#include <openbsc/abis_rsl.h>
diff --git a/openbsc/src/libcommon/common_vty.c b/openbsc/src/libcommon/common_vty.c
index 5b4b296..b328897 100644
--- a/openbsc/src/libcommon/common_vty.c
+++ b/openbsc/src/libcommon/common_vty.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/vty.h>
#include <openbsc/gsm_data.h>
diff --git a/openbsc/src/libcommon/debug.c b/openbsc/src/libcommon/debug.c
index 1372150..c87b77e 100644
--- a/openbsc/src/libcommon/debug.c
+++ b/openbsc/src/libcommon/debug.c
@@ -27,7 +27,7 @@
#include <time.h>
#include <errno.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/utils.h>
#include <osmocom/core/logging.h>
#include <openbsc/gsm_data.h>
diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c
index 54e7a63..bc4758d 100644
--- a/openbsc/src/libcommon/gsm_data.c
+++ b/openbsc/src/libcommon/gsm_data.c
@@ -27,7 +27,7 @@
#include <netinet/in.h>
#include <osmocom/core/linuxlist.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/gsm/abis_nm.h>
#include <osmocom/core/statistics.h>
diff --git a/openbsc/src/libcommon/socket.c b/openbsc/src/libcommon/socket.c
index ff846aa..a6ad131 100644
--- a/openbsc/src/libcommon/socket.c
+++ b/openbsc/src/libcommon/socket.c
@@ -37,7 +37,7 @@
#include <osmocom/core/msgb.h>
#include <openbsc/debug.h>
#include <openbsc/gsm_data.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
int make_sock(struct osmo_fd *bfd, int proto,
uint32_t ip, uint16_t port, int priv_nr,
diff --git a/openbsc/src/libcommon/talloc_ctx.c b/openbsc/src/libcommon/talloc_ctx.c
index ae6a156..1a0e287 100644
--- a/openbsc/src/libcommon/talloc_ctx.c
+++ b/openbsc/src/libcommon/talloc_ctx.c
@@ -1,4 +1,4 @@
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/gsm_data.h>
extern void *tall_msgb_ctx;
diff --git a/openbsc/src/libgb/gprs_bssgp.c b/openbsc/src/libgb/gprs_bssgp.c
index b74791c..3d3f795 100644
--- a/openbsc/src/libgb/gprs_bssgp.c
+++ b/openbsc/src/libgb/gprs_bssgp.c
@@ -29,7 +29,7 @@
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/rate_ctr.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/libgb/gprs_bssgp_util.c b/openbsc/src/libgb/gprs_bssgp_util.c
index b539323..177c650 100644
--- a/openbsc/src/libgb/gprs_bssgp_util.c
+++ b/openbsc/src/libgb/gprs_bssgp_util.c
@@ -26,7 +26,7 @@
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/debug.h>
#include <openbsc/gsm_data.h>
diff --git a/openbsc/src/libgb/gprs_bssgp_vty.c b/openbsc/src/libgb/gprs_bssgp_vty.c
index a0d74ac..1b3600f 100644
--- a/openbsc/src/libgb/gprs_bssgp_vty.c
+++ b/openbsc/src/libgb/gprs_bssgp_vty.c
@@ -29,7 +29,7 @@
#include <openbsc/gsm_data.h>
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/core/rate_ctr.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/libgb/gprs_ns.c b/openbsc/src/libgb/gprs_ns.c
index dab57e6..acfc695 100644
--- a/openbsc/src/libgb/gprs_ns.c
+++ b/openbsc/src/libgb/gprs_ns.c
@@ -61,7 +61,7 @@
#include <openbsc/gsm_data.h>
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/core/rate_ctr.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/libgb/gprs_ns_frgre.c b/openbsc/src/libgb/gprs_ns_frgre.c
index 3662572..f1068e0 100644
--- a/openbsc/src/libgb/gprs_ns_frgre.c
+++ b/openbsc/src/libgb/gprs_ns_frgre.c
@@ -33,7 +33,7 @@
#include <osmocom/core/select.h>
#include <osmocom/core/msgb.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/socket.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/libgb/gprs_ns_vty.c b/openbsc/src/libgb/gprs_ns_vty.c
index 14d7691..a8d671b 100644
--- a/openbsc/src/libgb/gprs_ns_vty.c
+++ b/openbsc/src/libgb/gprs_ns_vty.c
@@ -29,7 +29,7 @@
#include <openbsc/gsm_data.h>
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/core/rate_ctr.h>
#include <openbsc/debug.h>
diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c
index 1d26850..1186232 100644
--- a/openbsc/src/libmgcp/mgcp_protocol.c
+++ b/openbsc/src/libmgcp/mgcp_protocol.c
@@ -30,7 +30,7 @@
#include <unistd.h>
#include <osmocom/core/msgb.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <openbsc/mgcp.h>
diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c
index 0b7a97e..5592f95 100644
--- a/openbsc/src/libmgcp/mgcp_vty.c
+++ b/openbsc/src/libmgcp/mgcp_vty.c
@@ -22,7 +22,7 @@
*/
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/mgcp.h>
#include <openbsc/mgcp_internal.h>
diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c
index 1ddd3fd..d6c5c19 100644
--- a/openbsc/src/libmsc/db.c
+++ b/openbsc/src/libmsc/db.c
@@ -34,7 +34,7 @@
#include <openbsc/db.h>
#include <openbsc/debug.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/statistics.h>
#include <osmocom/core/rate_ctr.h>
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index a6ed3e8..66990b0 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -55,7 +55,7 @@
#include <osmocom/gsm/gsm0480.h>
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/core/msgb.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/gsm/tlv.h>
void *tall_locop_ctx;
diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index ba72c37..7d3f4b7 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -44,7 +44,7 @@
#include <openbsc/abis_rsl.h>
#include <openbsc/signal.h>
#include <openbsc/db.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/transaction.h>
#include <openbsc/paging.h>
#include <openbsc/bsc_rll.h>
diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c
index f9eebc8..aade355 100644
--- a/openbsc/src/libmsc/gsm_subscriber.c
+++ b/openbsc/src/libmsc/gsm_subscriber.c
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/vty/vty.h>
diff --git a/openbsc/src/libmsc/mncc.c b/openbsc/src/libmsc/mncc.c
index b484772..02772b0 100644
--- a/openbsc/src/libmsc/mncc.c
+++ b/openbsc/src/libmsc/mncc.c
@@ -29,7 +29,7 @@
#include <openbsc/gsm_04_08.h>
#include <openbsc/debug.h>
#include <openbsc/mncc.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/gsm_data.h>
#include <openbsc/transaction.h>
#include <openbsc/rtp_proxy.h>
diff --git a/openbsc/src/libmsc/mncc_builtin.c b/openbsc/src/libmsc/mncc_builtin.c
index 105f1dd..0653ece 100644
--- a/openbsc/src/libmsc/mncc_builtin.c
+++ b/openbsc/src/libmsc/mncc_builtin.c
@@ -30,7 +30,7 @@
#include <openbsc/gsm_04_08.h>
#include <openbsc/debug.h>
#include <openbsc/mncc.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/gsm_data.h>
#include <openbsc/transaction.h>
#include <openbsc/rtp_proxy.h>
diff --git a/openbsc/src/libmsc/mncc_sock.c b/openbsc/src/libmsc/mncc_sock.c
index 5ef9922..f77086d 100644
--- a/openbsc/src/libmsc/mncc_sock.c
+++ b/openbsc/src/libmsc/mncc_sock.c
@@ -29,7 +29,7 @@
#include <sys/socket.h>
#include <sys/un.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
diff --git a/openbsc/src/libmsc/sms_queue.c b/openbsc/src/libmsc/sms_queue.c
index 30fa5f0..cd55a51 100644
--- a/openbsc/src/libmsc/sms_queue.c
+++ b/openbsc/src/libmsc/sms_queue.c
@@ -37,7 +37,7 @@
#include <openbsc/gsm_subscriber.h>
#include <openbsc/signal.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/vty/vty.h>
diff --git a/openbsc/src/libmsc/token_auth.c b/openbsc/src/libmsc/token_auth.c
index cf26ba8..c48af92 100644
--- a/openbsc/src/libmsc/token_auth.c
+++ b/openbsc/src/libmsc/token_auth.c
@@ -20,7 +20,7 @@
*/
#include <stdio.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/signal.h>
#include <openbsc/gsm_data.h>
#include <openbsc/gsm_04_11.h>
diff --git a/openbsc/src/libmsc/transaction.c b/openbsc/src/libmsc/transaction.c
index 8a181b7..225495a 100644
--- a/openbsc/src/libmsc/transaction.c
+++ b/openbsc/src/libmsc/transaction.c
@@ -22,7 +22,7 @@
#include <openbsc/gsm_data.h>
#include <openbsc/mncc.h>
#include <openbsc/debug.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/gsm_subscriber.h>
#include <openbsc/gsm_04_08.h>
#include <openbsc/mncc.h>
diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c
index f31f05b..af224a1 100644
--- a/openbsc/src/libmsc/vty_interface_layer3.c
+++ b/openbsc/src/libmsc/vty_interface_layer3.c
@@ -38,7 +38,7 @@
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/core/utils.h>
#include <openbsc/db.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/signal.h>
#include <openbsc/debug.h>
#include <openbsc/vty.h>
diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c
index 4c5f12e..877e3f6 100644
--- a/openbsc/src/libtrau/rtp_proxy.c
+++ b/openbsc/src/libtrau/rtp_proxy.c
@@ -28,7 +28,7 @@
#include <time.h> /* clock() */
#include <sys/utsname.h> /* uname() */
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/gsm_data.h>
#include <osmocom/core/msgb.h>
#include <osmocom/core/select.h>
diff --git a/openbsc/src/libtrau/subchan_demux.c b/openbsc/src/libtrau/subchan_demux.c
index 740d2ca..173fdb9 100644
--- a/openbsc/src/libtrau/subchan_demux.c
+++ b/openbsc/src/libtrau/subchan_demux.c
@@ -27,7 +27,7 @@
#include <openbsc/subchan_demux.h>
#include <openbsc/trau_frame.h>
#include <openbsc/debug.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/gsm_data.h>
void *tall_tqe_ctx;
diff --git a/openbsc/src/libtrau/trau_mux.c b/openbsc/src/libtrau/trau_mux.c
index b8b90bd..e9fa194 100644
--- a/openbsc/src/libtrau/trau_mux.c
+++ b/openbsc/src/libtrau/trau_mux.c
@@ -28,7 +28,7 @@
#include <openbsc/subchan_demux.h>
#include <openbsc/e1_input.h>
#include <openbsc/debug.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
uint8_t gsm_fr_map[] = {
6, 6, 5, 5, 4, 4, 3, 3,
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c
index 42c74cc..7304f35 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_main.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c
@@ -27,7 +27,7 @@
#include <openbsc/vty.h>
#include <osmocom/core/application.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/process.h>
#include <osmocom/sccp/sccp.h>
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_rf.c b/openbsc/src/osmo-bsc/osmo_bsc_rf.c
index 11cdffe..d858304 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_rf.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_rf.c
@@ -27,7 +27,7 @@
#include <openbsc/osmo_msc_data.h>
#include <openbsc/ipaccess.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/gsm/protocol/gsm_12_21.h>
#include <sys/socket.h>
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c
index f4cdf36..92de835 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c
@@ -27,7 +27,7 @@
#include <openbsc/ipaccess.h>
#include <openbsc/signal.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/gsm/gsm0808.h>
#include <osmocom/gsm/protocol/gsm_08_08.h>
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/openbsc/src/osmo-bsc/osmo_bsc_vty.c
index 0b1698e..417826a 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_vty.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_vty.c
@@ -22,7 +22,7 @@
#include <openbsc/osmo_msc_data.h>
#include <openbsc/vty.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#define IPA_STR "IP.ACCESS specific\n"
diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
index 921fa09..a6bc338 100644
--- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
+++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
@@ -39,7 +39,7 @@
#include <osmocom/core/application.h>
#include <osmocom/core/msgb.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/process.h>
#include <osmocom/core/select.h>
diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c b/openbsc/src/osmo-bsc_nat/bsc_filter.c
index 74a5d19..86bba35 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_filter.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c
@@ -25,7 +25,7 @@
#include <openbsc/ipaccess.h>
#include <openbsc/debug.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/gsm/protocol/gsm_08_08.h>
#include <osmocom/sccp/sccp.h>
diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
index 9ac54da..e393e8a 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
@@ -28,7 +28,7 @@
#include <osmocom/sccp/sccp.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/gsm/gsm0808.h>
#include <osmocom/gsm/protocol/gsm_08_08.h>
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c
index e0eb635..bf5d914 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c
@@ -45,7 +45,7 @@
#include <openbsc/vty.h>
#include <osmocom/core/application.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/process.h>
#include <osmocom/gsm/gsm0808.h>
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
index 4834340..da7c960 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
@@ -30,7 +30,7 @@
#include <openbsc/vty.h>
#include <osmocom/core/linuxlist.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/gsm/gsm0808.h>
#include <osmocom/gsm/protocol/gsm_08_08.h>
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index b5c1cf2..5def87a 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -26,7 +26,7 @@
#include <openbsc/mgcp.h>
#include <openbsc/vty.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/core/rate_ctr.h>
#include <osmocom/core/utils.h>
#include <osmocom/vty/logging.h>
diff --git a/openbsc/src/osmo-bsc_nat/bsc_sccp.c b/openbsc/src/osmo-bsc_nat/bsc_sccp.c
index de6b421..eac7243 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_sccp.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_sccp.c
@@ -25,7 +25,7 @@
#include <osmocom/sccp/sccp.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <string.h>
#include <time.h>
diff --git a/openbsc/src/osmo-bsc_nat/bsc_ussd.c b/openbsc/src/osmo-bsc_nat/bsc_ussd.c
index bbbeead..a46a74e 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_ussd.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_ussd.c
@@ -27,7 +27,7 @@
#include <osmocom/gsm/protocol/gsm_08_08.h>
#include <osmocom/gsm/gsm0480.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/gsm/tlv.h>
#include <osmocom/sccp/sccp.h>
diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/openbsc/src/osmo-nitb/bsc_hack.c
index e548a95..157670d 100644
--- a/openbsc/src/osmo-nitb/bsc_hack.c
+++ b/openbsc/src/osmo-nitb/bsc_hack.c
@@ -35,7 +35,7 @@
#include <osmocom/core/process.h>
#include <openbsc/debug.h>
#include <openbsc/e1_input.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <openbsc/signal.h>
#include <openbsc/osmo_msc.h>
#include <openbsc/sms_queue.h>
diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index d198424..bbb7ad5 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -28,7 +28,7 @@
#include <openbsc/bsc_nat_sccp.h>
#include <osmocom/core/application.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <osmocom/sccp/sccp.h>
#include <osmocom/gsm/protocol/gsm_08_08.h>
diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c
index b7273de..6ec46b4 100644
--- a/openbsc/tests/mgcp/mgcp_test.c
+++ b/openbsc/tests/mgcp/mgcp_test.c
@@ -21,7 +21,7 @@
#include <openbsc/mgcp_internal.h>
#include <osmocom/core/application.h>
-#include <osmocom/core/talloc.h>
+#include <talloc.h>
#include <string.h>
static struct msgb *create_auep1()
--
1.7.2.5