diff --git a/openbsc/src/nat/bsc_filter.c b/openbsc/src/nat/bsc_filter.c
index 891d455..8f79f00 100644
--- a/openbsc/src/nat/bsc_filter.c
+++ b/openbsc/src/nat/bsc_filter.c
@@ -22,11 +22,11 @@
  */
 
 #include <openbsc/bsc_nat.h>
-#include <openbsc/bssap.h>
 #include <openbsc/ipaccess.h>
 #include <openbsc/debug.h>
 
 #include <osmocore/talloc.h>
+#include <osmocore/protocol/gsm_08_08.h>
 
 #include <sccp/sccp.h>
 
diff --git a/openbsc/src/nat/bsc_mgcp_utils.c b/openbsc/src/nat/bsc_mgcp_utils.c
index 5d77c2b..5d24acf 100644
--- a/openbsc/src/nat/bsc_mgcp_utils.c
+++ b/openbsc/src/nat/bsc_mgcp_utils.c
@@ -21,7 +21,6 @@
 
 #include <openbsc/bsc_nat.h>
 #include <openbsc/gsm_data.h>
-#include <openbsc/bssap.h>
 #include <openbsc/debug.h>
 #include <openbsc/mgcp.h>
 #include <openbsc/mgcp_internal.h>
@@ -30,6 +29,7 @@
 
 #include <osmocore/talloc.h>
 #include <osmocore/gsm0808.h>
+#include <osmocore/protocol/gsm_08_08.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/openbsc/src/nat/bsc_nat.c b/openbsc/src/nat/bsc_nat.c
index 53b8882..303cd78 100644
--- a/openbsc/src/nat/bsc_nat.c
+++ b/openbsc/src/nat/bsc_nat.c
@@ -39,7 +39,6 @@
 #include <openbsc/debug.h>
 #include <openbsc/bsc_msc.h>
 #include <openbsc/bsc_nat.h>
-#include <openbsc/bssap.h>
 #include <openbsc/ipaccess.h>
 #include <openbsc/abis_nm.h>
 #include <openbsc/telnet_interface.h>
@@ -47,7 +46,7 @@
 #include <osmocore/gsm0808.h>
 #include <osmocore/talloc.h>
 
-#include <vty/vty.h>
+#include <osmocore/protocol/gsm_08_08.h>
 
 #include <sccp/sccp.h>
 
diff --git a/openbsc/src/nat/bsc_nat_utils.c b/openbsc/src/nat/bsc_nat_utils.c
index 9fc057d..eed7f3a 100644
--- a/openbsc/src/nat/bsc_nat_utils.c
+++ b/openbsc/src/nat/bsc_nat_utils.c
@@ -24,7 +24,6 @@
 
 #include <openbsc/bsc_nat.h>
 #include <openbsc/gsm_data.h>
-#include <openbsc/bssap.h>
 #include <openbsc/debug.h>
 #include <openbsc/ipaccess.h>
 
@@ -32,6 +31,8 @@
 #include <osmocore/talloc.h>
 #include <osmocore/gsm0808.h>
 
+#include <osmocore/protocol/gsm_08_08.h>
+
 #include <sccp/sccp.h>
 
 #include <netinet/in.h>