diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index 66ef46c..f9c87e7 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -848,10 +848,4 @@
 struct gsm_subscriber_connection *subscr_con_allocate(struct gsm_lchan *lchan);
 void subscr_con_free(struct gsm_subscriber_connection *conn);
 
-/* FIXME: this should go some other header file, but there is no good one */
-static inline void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg)
-{
-	msgb_enqueue(&net->upqueue, msg);
-}
-
 #endif
diff --git a/openbsc/include/openbsc/mncc.h b/openbsc/include/openbsc/mncc.h
index 260c257..bd3eb71 100644
--- a/openbsc/include/openbsc/mncc.h
+++ b/openbsc/include/openbsc/mncc.h
@@ -157,5 +157,6 @@
 char *get_mncc_name(int value);
 int int_mncc_recv(struct gsm_network *net, int msg_type, void *arg);
 void mncc_set_cause(struct gsm_mncc *data, int loc, int val);
+void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg);
 
 #endif
diff --git a/openbsc/src/mncc.c b/openbsc/src/mncc.c
index 1c5e21c..103ad76 100644
--- a/openbsc/src/mncc.c
+++ b/openbsc/src/mncc.c
@@ -107,3 +107,8 @@
 	data->cause.location = loc;
 	data->cause.value = val;
 }
+
+void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg)
+{
+	msgb_enqueue(&net->upqueue, msg);
+}