diff --git a/include/internal.h b/include/internal.h
index 7d0b151..9d16722 100644
--- a/include/internal.h
+++ b/include/internal.h
@@ -12,61 +12,4 @@
 struct msgb *ipaccess_read_msg(struct osmo_fd *bfd, int *error);
 void ipaccess_prepend_header(struct msgb *msg, int proto);
 
-/* things I don't know what to do with yet. */
-
-/* from include/openbsc/signal.h, we need SS_INPUT and S_GLOBAL_SHUTDOWN. */
-enum signal_subsystems {
-	SS_PAGING,
-	SS_SMS,
-	SS_ABISIP,
-	SS_NM,
-	SS_LCHAN,
-	SS_SUBSCR,
-	SS_SCALL,
-	SS_GLOBAL,
-	SS_CHALLOC,
-	SS_NS,
-	SS_IPAC_NWL,
-	SS_RF,
-	SS_MSC,
-	SS_HO,
-	SS_INPUT,
-};
-
-enum signal_global {
-	S_GLOBAL_SHUTDOWN,
-	S_GLOBAL_BTS_CLOSE_OM,
-};
-
-/* from include/openbsc/debug.h */
-enum {
-        DRLL,
-        DCC,
-        DMM,
-        DRR,
-        DRSL,
-        DNM,
-        DMNCC,
-        DSMS,
-        DPAG,
-        DMEAS,
-        DMI,
-        DMIB,
-        DMUX,
-        DINP,
-        DSCCP,
-        DMSC,
-        DMGCP,
-        DHO,
-        DDB,
-        DREF,
-        DGPRS,
-        DNS,
-        DBSSGP,
-        DLLC,
-        DSNDCP,
-        DNAT,
-        Debug_LastEntry,
-};
-
 #endif
diff --git a/include/osmocom/abis/logging.h b/include/osmocom/abis/logging.h
new file mode 100644
index 0000000..c3cac11
--- /dev/null
+++ b/include/osmocom/abis/logging.h
@@ -0,0 +1,16 @@
+#ifndef _OSMO_ABIS_LOGGING_H_
+#define _OSMO_ABIS_LOGGING_H_
+
+#include <osmocom/core/logging.h>
+
+/* logging subsystems. */
+enum {
+	DINP	= OSMO_LOG_SS_ABIS_RESERVED,
+	DMUX,
+	DMI,
+	DMIB,
+	DRSL,
+	DNM,
+};
+
+#endif
diff --git a/include/osmocom/abis/signal.h b/include/osmocom/abis/signal.h
new file mode 100644
index 0000000..cf5ad55
--- /dev/null
+++ b/include/osmocom/abis/signal.h
@@ -0,0 +1,17 @@
+#ifndef _OSMO_ABIS_SIGNAL_H_
+#define _OSMO_ABIS_SIGNAL_H_
+
+#include <osmocom/core/signal.h>
+
+/* signal subsystems. */
+enum {
+	SS_GLOBAL		= OSMO_SIGNAL_SS_ABIS_RESERVED,
+	SS_INPUT,
+};
+
+/* signal types. */
+enum {
+	S_GLOBAL_SHUTDOWN	= OSMO_SIGNAL_T_ABIS_RESERVED,
+};
+
+#endif
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)
 {