diff --git a/openair2/COMMON/commonDef.h b/openair2/COMMON/commonDef.h
index 64216b009465119c56e0d357dab48875b7c4be08..e9f769db5555246ecf24aa1ffa6c2ded2e8e799c 100644
--- a/openair2/COMMON/commonDef.h
+++ b/openair2/COMMON/commonDef.h
@@ -314,15 +314,6 @@ typedef struct {
  */
 #define TAI_LIST_T(SIZE) struct {Byte_t n_tais; tai_t tai[SIZE];}
 
-/*
- * User notification callback, executed whenever a change of data with
- * respect of network information (e.g. network registration and/or
- * location change, new PLMN becomes available) is notified by the
- * EPS Mobility Management sublayer
- */
-typedef int (*emm_indication_callback_t) (Stat_t, tac_t, ci_t, AcT_t,
-    const char*, size_t);
-
 typedef enum eps_protocol_discriminator_e {
   /* Protocol discriminator identifier for EPS Mobility Management */
   EPS_MOBILITY_MANAGEMENT_MESSAGE =   0x7,
diff --git a/openair3/NAS/UE/EMM/emm_main.h b/openair3/NAS/UE/EMM/emm_main.h
index b985f806a5a638daa9615ae8c45bd1227095b087..01c293b98ff335dd973f8327e2ae6439ba73b9ec 100755
--- a/openair3/NAS/UE/EMM/emm_main.h
+++ b/openair3/NAS/UE/EMM/emm_main.h
@@ -57,6 +57,15 @@ Description Defines the EPS Mobility Management procedure call manager,
 /************************  G L O B A L    T Y P E S  ************************/
 /****************************************************************************/
 
+/*
+ * User notification callback, executed whenever a change of data with
+ * respect of network information (e.g. network registration and/or
+ * location change, new PLMN becomes available) is notified by the
+ * EPS Mobility Management sublayer
+ */
+typedef int (*emm_indication_callback_t) (Stat_t, tac_t, ci_t, AcT_t,
+    const char*, size_t);
+
 /****************************************************************************/
 /********************  G L O B A L    V A R I A B L E S  ********************/
 /****************************************************************************/
diff --git a/openair3/NAS/UE/nas_proc.h b/openair3/NAS/UE/nas_proc.h
index 666c97f6dc799a33edc5eb5d0dad06d7a601e679..f1f6a107483fdfcd88628d5e571ef4046937d530 100755
--- a/openair3/NAS/UE/nas_proc.h
+++ b/openair3/NAS/UE/nas_proc.h
@@ -47,6 +47,7 @@ Description NAS procedure call manager
 
 #include "commonDef.h"
 #include "networkDef.h"
+#include "emm_main.h"
 
 /****************************************************************************/
 /*********************  G L O B A L    C O N S T A N T S  *******************/
diff --git a/openair3/NAS/UE/nas_user.h b/openair3/NAS/UE/nas_user.h
index 24603f31609780c0e0b7e0a6cccb5a484425ba37..3a989c09ee68c6e431ef18dc407bc9fe33fadd0d 100644
--- a/openair3/NAS/UE/nas_user.h
+++ b/openair3/NAS/UE/nas_user.h
@@ -47,6 +47,7 @@ Description NAS procedure functions triggered by the user
 
 #include "commonDef.h"
 #include "networkDef.h"
+#include "emm_main.h"
 
 /****************************************************************************/
 /*********************  G L O B A L    C O N S T A N T S  *******************/