diff --git a/openair2/COMMON/networkDef.h b/openair2/COMMON/networkDef.h
index c52a58a527e32faaaa187bb6c976f76a3feb3cf7..42c812baada0127cc8c15c2ad014863f7bbc5523 100644
--- a/openair2/COMMON/networkDef.h
+++ b/openair2/COMMON/networkDef.h
@@ -252,13 +252,6 @@ typedef struct {
   network_pkf_t* pkf[NET_PACKET_FILTER_MAX];
 } network_tft_t;
 
-/*
- * User notification callback, executed whenever a change of status with
- * respect of PDN connection or EPS bearer context is notified by the EPS
- * Session Management sublayer
- */
-typedef int (*esm_indication_callback_t) (int, network_pdn_state_t);
-
 /****************************************************************************/
 /********************  G L O B A L    V A R I A B L E S  ********************/
 /****************************************************************************/
diff --git a/openair3/NAS/UE/API/USER/user_api.c b/openair3/NAS/UE/API/USER/user_api.c
index 9c2364629276e16338711ae481a8f9e601b7fe9d..dd5b5758f1fad084d675b2939614350e18f999b8 100644
--- a/openair3/NAS/UE/API/USER/user_api.c
+++ b/openair3/NAS/UE/API/USER/user_api.c
@@ -48,6 +48,7 @@ Description     Implements the API used by the NAS layer running in the UE
 #include "at_command.h"
 #include "at_response.h"
 #include "at_error.h"
+#include "esm_ebr.h"
 
 #include "user_indication.h"
 
diff --git a/openair3/NAS/UE/ESM/esm_ebr.h b/openair3/NAS/UE/ESM/esm_ebr.h
index dd586319564a15e986e708cb54fe5a942a22a39f..af31e95676a46e70c9d407a9366dddcf447dc963 100644
--- a/openair3/NAS/UE/ESM/esm_ebr.h
+++ b/openair3/NAS/UE/ESM/esm_ebr.h
@@ -42,6 +42,7 @@ Description Defines functions used to handle state of EPS bearer contexts
 #include "OctetString.h"
 
 #include "networkDef.h"
+#include "esmData.h"
 
 #include "nas_timer.h"
 
@@ -56,6 +57,13 @@ Description Defines functions used to handle state of EPS bearer contexts
 /************************  G L O B A L    T Y P E S  ************************/
 /****************************************************************************/
 
+/*
+ * User notification callback, executed whenever a change of status with
+ * respect of PDN connection or EPS bearer context is notified by the EPS
+ * Session Management sublayer
+ */
+typedef int (*esm_indication_callback_t) (int, network_pdn_state_t);
+
 /****************************************************************************/
 /********************  G L O B A L    V A R I A B L E S  ********************/
 /****************************************************************************/
diff --git a/openair3/NAS/UE/ESM/esm_main.h b/openair3/NAS/UE/ESM/esm_main.h
index d7346fdb0898c491595485e90e32137ecbf430b3..d6fed970f06a2ad265a6a502b6350a598e5a9621 100644
--- a/openair3/NAS/UE/ESM/esm_main.h
+++ b/openair3/NAS/UE/ESM/esm_main.h
@@ -41,6 +41,7 @@ Description Defines the EPS Session Management procedure call manager,
 #define __ESM_MAIN_H__
 
 #include "networkDef.h"
+#include "esm_ebr.h"
 
 /****************************************************************************/
 /*********************  G L O B A L    C O N S T A N T S  *******************/
diff --git a/openair3/NAS/UE/nas_proc.h b/openair3/NAS/UE/nas_proc.h
index c66f2177febe166130f7ef140cdb0bee90d99018..bf8e286cc70cdb5bf72447f4d91db5a24ca9ad9f 100644
--- a/openair3/NAS/UE/nas_proc.h
+++ b/openair3/NAS/UE/nas_proc.h
@@ -41,6 +41,7 @@ Description NAS procedure call manager
 #include "commonDef.h"
 #include "networkDef.h"
 #include "emm_main.h"
+#include "esm_ebr.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 584c7532f094ab48236d764daab32a3950b67c1b..9cb7561816a00a704058dc99c8716510910c5371 100644
--- a/openair3/NAS/UE/nas_user.h
+++ b/openair3/NAS/UE/nas_user.h
@@ -41,6 +41,7 @@ Description NAS procedure functions triggered by the user
 #include "commonDef.h"
 #include "networkDef.h"
 #include "emm_main.h"
+#include "esm_ebr.h"
 
 /****************************************************************************/
 /*********************  G L O B A L    C O N S T A N T S  *******************/