diff --git a/src/e1_input.c b/src/e1_input.c
index 7904f61..1d02e47 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -47,6 +47,8 @@
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/abis/subchan_demux.h>
+#include <osmocom/abis/logging.h>
+#include <osmocom/abis/signal.h>
 #include <talloc.h>
 
 #define NUM_E1_TS	32
diff --git a/src/input/hsl.c b/src/input/hsl.c
index 068989b..f00338f 100644
--- a/src/input/hsl.c
+++ b/src/input/hsl.c
@@ -51,6 +51,7 @@
 #include <osmocom/core/logging.h>
 #include <osmocom/abis/ipaccess.h>
 #include <osmocom/core/socket.h>
+#include <osmocom/abis/logging.h>
 #include <talloc.h>
 
 #define HSL_TCP_PORT	2500
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 92819ac..78b2533 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -42,6 +42,7 @@
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/abis/ipaccess.h>
 #include <osmocom/core/socket.h>
+#include <osmocom/abis/logging.h>
 
 #define PRIV_OML 1
 #define PRIV_RSL 2
diff --git a/src/input/lapd.c b/src/input/lapd.c
index c8b777c..6c070e3 100644
--- a/src/input/lapd.c
+++ b/src/input/lapd.c
@@ -43,6 +43,7 @@
 #include <talloc.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/timer.h>
+#include <osmocom/abis/logging.h>
 
 #define SABM_INTERVAL		0, 300000
 
diff --git a/src/input/misdn.c b/src/input/misdn.c
index afa9032..4bc2e4b 100644
--- a/src/input/misdn.c
+++ b/src/input/misdn.c
@@ -46,13 +46,7 @@
 #include <osmocom/core/logging.h>
 #include <osmocom/abis/e1_input.h>
 #include <talloc.h>
-/*#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/abis_nm.h>
-#include <openbsc/abis_rsl.h>
-#include <openbsc/subchan_demux.h>
-#include <openbsc/e1_input.h>
-#include <openbsc/signal.h> */
+#include <osmocom/abis/logging.h>
 
 #define TS1_ALLOC_SIZE	300
 
diff --git a/src/trau_frame.c b/src/trau_frame.c
index bf0dbd4..fc5651d 100644
--- a/src/trau_frame.c
+++ b/src/trau_frame.c
@@ -28,6 +28,7 @@
 #include <osmocom/abis/trau_frame.h>
 #include <osmocom/abis/subchan_demux.h>
 #include <osmocom/core/logging.h>
+#include <osmocom/abis/logging.h>
 
 static uint32_t get_bits(const uint8_t *bitbuf, int offset, int num)
 {