diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am
index dbbc0c651..fc4f5978c 100644
--- a/include/osmocom/sgsn/Makefile.am
+++ b/include/osmocom/sgsn/Makefile.am
@@ -21,6 +21,7 @@ noinst_HEADERS = \
 	gprs_sndcp_xid.h \
 	gprs_subscriber.h \
 	gprs_utils.h \
+	gtp.h \
 	gtphub.h \
 	gtp_ggsn.h \
 	gtp_mme.h \
diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
index a979e682b..034aebcbb 100644
--- a/include/osmocom/sgsn/gprs_sgsn.h
+++ b/include/osmocom/sgsn/gprs_sgsn.h
@@ -460,9 +460,6 @@ struct gsm_auth_tuple *sgsn_auth_get_tuple(struct sgsn_mm_ctx *mmctx,
 /* Called on subscriber data updates */
 void sgsn_update_subscriber_data(struct sgsn_mm_ctx *mmctx);
 
-struct sgsn_instance;
-int sgsn_gtp_init(struct sgsn_instance *sgi);
-
 void sgsn_rate_ctr_init();
 
 #endif /* _GPRS_SGSN_H */
diff --git a/include/osmocom/sgsn/gtp.h b/include/osmocom/sgsn/gtp.h
new file mode 100644
index 000000000..85a50d3b7
--- /dev/null
+++ b/include/osmocom/sgsn/gtp.h
@@ -0,0 +1,5 @@
+#pragma once
+
+struct sgsn_instance;
+
+int sgsn_gtp_init(struct sgsn_instance *sgi);
diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c
index 362e7aaca..3ad0881a4 100644
--- a/src/sgsn/sgsn_main.c
+++ b/src/sgsn/sgsn_main.c
@@ -65,6 +65,7 @@
 #include <osmocom/sgsn/gprs_ns.h>
 #include <osmocom/sgsn/gprs_bssgp.h>
 #include <osmocom/sgsn/gprs_subscriber.h>
+#include <osmocom/sgsn/gtp.h>
 
 #include <osmocom/ctrl/control_if.h>
 #include <osmocom/ctrl/ports.h>