diff --git a/openbsc/src/db.c b/openbsc/src/db.c
index 51f94b6..0bb86fe 100644
--- a/openbsc/src/db.c
+++ b/openbsc/src/db.c
@@ -21,6 +21,7 @@
  */
 
 #include <openbsc/gsm_data.h>
+#include <openbsc/gsm_04_11.h>
 #include <openbsc/db.h>
 #include <openbsc/talloc.h>
 
diff --git a/openbsc/src/e1_config.c b/openbsc/src/e1_config.c
index e743132..4a1cbb0 100644
--- a/openbsc/src/e1_config.c
+++ b/openbsc/src/e1_config.c
@@ -8,6 +8,7 @@
 #include <openbsc/trau_frame.h>
 #include <openbsc/trau_mux.h>
 #include <openbsc/misdn.h>
+#include <openbsc/ipaccess.h>
 #include <openbsc/talloc.h>
 
 #define SAPI_L2ML	0
diff --git a/openbsc/src/e1_input.c b/openbsc/src/e1_input.c
index 4bc15e5..b6461df 100644
--- a/openbsc/src/e1_input.c
+++ b/openbsc/src/e1_input.c
@@ -52,6 +52,7 @@
 #include <openbsc/trau_frame.h>
 #include <openbsc/trau_mux.h>
 #include <openbsc/talloc.h>
+#include <openbsc/misdn.h>
 
 #define NUM_E1_TS	32
 
diff --git a/openbsc/src/gsm_04_11.c b/openbsc/src/gsm_04_11.c
index 3f93ffb..f31e3f8 100644
--- a/openbsc/src/gsm_04_11.c
+++ b/openbsc/src/gsm_04_11.c
@@ -46,6 +46,7 @@
 #include <openbsc/transaction.h>
 #include <openbsc/paging.h>
 #include <openbsc/bsc_rll.h>
+#include <openbsc/chan_alloc.h>
 
 #define GSM411_ALLOC_SIZE	1024
 #define GSM411_ALLOC_HEADROOM	128
diff --git a/openbsc/src/transaction.c b/openbsc/src/transaction.c
index 9e7c794..3825de1 100644
--- a/openbsc/src/transaction.c
+++ b/openbsc/src/transaction.c
@@ -31,6 +31,8 @@
 
 static void *tall_trans_ctx;
 
+void _gsm48_cc_trans_free(struct gsm_trans *trans);
+
 struct gsm_trans *trans_find_by_id(struct gsm_subscriber *subscr,
 				   u_int8_t proto, u_int8_t trans_id)
 {
diff --git a/openbsc/src/vty_interface.c b/openbsc/src/vty_interface.c
index 05b0070..1fe65df 100644
--- a/openbsc/src/vty_interface.c
+++ b/openbsc/src/vty_interface.c
@@ -31,6 +31,7 @@
 #include <openbsc/linuxlist.h>
 #include <openbsc/gsm_data.h>
 #include <openbsc/gsm_subscriber.h>
+#include <openbsc/gsm_04_11.h>
 #include <openbsc/e1_input.h>
 #include <openbsc/abis_nm.h>
 #include <openbsc/gsm_utils.h>