diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h
index 06a5dccc0..8a1e4adb5 100644
--- a/include/osmocom/msc/mncc.h
+++ b/include/osmocom/msc/mncc.h
@@ -126,6 +126,9 @@ struct gsm_call {
 #define MNCC_F_SIGNAL		0x2000
 #define MNCC_F_GCR		0x4000
 
+/* UPDATEME when adding new MNCC_F_* entries above */
+#define MNCC_F_ALL		0x7fff
+
 struct gsm_mncc {
 	/* context based information */
 	uint32_t	msg_type;
diff --git a/src/libmsc/mncc.c b/src/libmsc/mncc.c
index f446f98af..24e79a73d 100644
--- a/src/libmsc/mncc.c
+++ b/src/libmsc/mncc.c
@@ -110,8 +110,6 @@ void mncc_set_cause(struct gsm_mncc *data, int loc, int val)
  * MNCC validation code. Move to libosmocore once headers are merged
  ************************************************************************/
 
-#define MNCC_F_ALL 0x7fff
-
 static int check_string_terminated(const char *str, unsigned int size)
 {
 	int i;