diff --git a/src/e1_input.c b/src/e1_input.c
index d806766..8a4e1b9 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -44,20 +44,10 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/logging.h>
 #include <osmocom/core/signal.h>
-//#include <openbsc/debug.h>
-//#include <openbsc/gsm_data.h>
-#include <osmocom/gsm/abis/e1_input.h>
-//#include <openbsc/abis_nm.h>
-//#include <openbsc/abis_rsl.h>
+#include <osmocom/abis/e1_input.h>
 #include <osmocom/core/linuxlist.h>
-#include <osmocom/gsm/abis/subchan_demux.h>
-//#include <openbsc/trau_frame.h>
-//#include <openbsc/trau_mux.h>
+#include <osmocom/abis/subchan_demux.h>
 #include <talloc.h>
-//#include <openbsc/signal.h>
-//#include <openbsc/misdn.h>
-
-//#include "../../bscconfig.h"
 
 #define NUM_E1_TS	32
 
diff --git a/src/input/dahdi.c b/src/input/dahdi.c
index a431a3a..ba8ce02 100644
--- a/src/input/dahdi.c
+++ b/src/input/dahdi.c
@@ -22,8 +22,6 @@
  *
  */
 
-//#include "../../../bscconfig.h"
-
 #ifdef HAVE_DAHDI_USER_H
 
 #include <stdio.h>
diff --git a/src/input/hsl.c b/src/input/hsl.c
index 211768c..689698c 100644
--- a/src/input/hsl.c
+++ b/src/input/hsl.c
@@ -47,19 +47,10 @@
 #include <osmocom/core/select.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/core/msgb.h>
-#include <osmocom/gsm/abis/e1_input.h>
+#include <osmocom/abis/e1_input.h>
 #include <osmocom/core/logging.h>
 #include <osmocom/gsm/protocol/ipaccess.h>
 #include <osmocom/core/socket.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/ipaccess.h>
-#include <openbsc/socket.h>
-#include <openbsc/signal.h> */
 #include <talloc.h>
 
 #define HSL_TCP_PORT	2500
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 9894920..40d69b6 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -39,18 +39,9 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/logging.h>
 #include <talloc.h>
-#include <osmocom/gsm/abis/e1_input.h>
-#include <osmocom/gsm/abis/ipaccess.h>
+#include <osmocom/abis/e1_input.h>
+#include <osmocom/abis/ipaccess.h>
 #include <osmocom/core/socket.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/ipaccess.h>
-#include <openbsc/socket.h>
-#include <openbsc/signal.h> */
 
 #define PRIV_OML 1
 #define PRIV_RSL 2
diff --git a/src/input/lapd.c b/src/input/lapd.c
index 060edb6..c8b777c 100644
--- a/src/input/lapd.c
+++ b/src/input/lapd.c
@@ -43,7 +43,6 @@
 #include <talloc.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/timer.h>
-//#include <openbsc/debug.h>
 
 #define SABM_INTERVAL		0, 300000
 
diff --git a/src/input/misdn.c b/src/input/misdn.c
index 45d5e06..c97169a 100644
--- a/src/input/misdn.c
+++ b/src/input/misdn.c
@@ -44,7 +44,7 @@
 #include <osmocom/core/select.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/logging.h>
-#include <osmocom/gsm/abis/e1_input.h>
+#include <osmocom/abis/e1_input.h>
 #include <talloc.h>
 /*#include <openbsc/debug.h>
 #include <openbsc/gsm_data.h>
diff --git a/src/subchan_demux.c b/src/subchan_demux.c
index 6ff66bc..73efd31 100644
--- a/src/subchan_demux.c
+++ b/src/subchan_demux.c
@@ -26,11 +26,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include <osmocom/gsm/abis/subchan_demux.h>
-#include <osmocom/gsm/abis/trau_frame.h>
-//#include <openbsc/debug.h>
+#include <osmocom/abis/subchan_demux.h>
+#include <osmocom/abis/trau_frame.h>
 #include <talloc.h>
-//#include <openbsc/gsm_data.h>
 
 void *tall_tqe_ctx;
 
diff --git a/src/trau_frame.c b/src/trau_frame.c
index b884bf3..bf0dbd4 100644
--- a/src/trau_frame.c
+++ b/src/trau_frame.c
@@ -25,10 +25,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include <osmocom/gsm/abis/trau_frame.h>
-#include <osmocom/gsm/abis/subchan_demux.h>
+#include <osmocom/abis/trau_frame.h>
+#include <osmocom/abis/subchan_demux.h>
 #include <osmocom/core/logging.h>
-//#include <openbsc/debug.h>
 
 static uint32_t get_bits(const uint8_t *bitbuf, int offset, int num)
 {