diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 30a3c79..d3cb7d8 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -36,12 +36,6 @@
 
 #define tmsi_from_string(str) strtoul(str, NULL, 10)
 
-struct msgb;
-typedef int gsm_cbfn(unsigned int hooknum,
-		     unsigned int event,
-		     struct msgb *msg,
-		     void *data, void *param);
-
 enum {
 	MSC_CTR_LOC_UPDATE_TYPE_ATTACH,
 	MSC_CTR_LOC_UPDATE_TYPE_NORMAL,
diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h
index f8d8ef0..2051067 100644
--- a/include/osmocom/msc/gsm_subscriber.h
+++ b/include/osmocom/msc/gsm_subscriber.h
@@ -9,6 +9,10 @@
 #include <osmocom/msc/gsm_data.h>
 
 struct ran_conn;
+struct msgb;
+
+typedef int gsm_cbfn(unsigned int hooknum, unsigned int event, struct msgb *msg,
+		     void *data, void *param);
 
 /*
  * Struct for pending channel requests. This is managed in the