diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 666caeb82813170038211b7486f271ab8fe2a03e..bb06364f10e3e337e18873aa78ad6a23d085e87a 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -747,6 +747,9 @@ include_directories("${OPENAIR3_DIR}/NAS/COMMON")
 include_directories("${OPENAIR3_DIR}/NAS/COMMON/API/NETWORK")
 include_directories("${OPENAIR3_DIR}/NAS/COMMON/EMM/MSG")
 include_directories("${OPENAIR3_DIR}/NAS/COMMON/ESM/MSG")
+include_directories("${OPENAIR3_DIR}/NAS/UE/ESM")
+include_directories("${OPENAIR3_DIR}/NAS/UE/EMM")
+include_directories("${OPENAIR3_DIR}/NAS/UE/API/USER")
 include_directories("${OPENAIR3_DIR}/NAS/COMMON/IES")
 include_directories("${OPENAIR3_DIR}/NAS/COMMON/UTIL")
 include_directories("${OPENAIR3_DIR}/SECU")
diff --git a/openair2/ENB_APP/enb_config.h b/openair2/ENB_APP/enb_config.h
index 92a2447a3810447d510128a589d39860527cf452..6e89ec8fcca534daffd47c5d9acf43bb459cc5dc 100644
--- a/openair2/ENB_APP/enb_config.h
+++ b/openair2/ENB_APP/enb_config.h
@@ -47,6 +47,7 @@
 #include "RRC/LTE/MESSAGES/SystemInformationBlockType2.h"
 #endif
 #include "RRC/LTE/rrc_defs.h"
+#include <intertask_interface.h>
 
 #define IPV4_STR_ADDR_TO_INT_NWBO(AdDr_StR,NwBo,MeSsAgE ) do {\
             struct in_addr inp;\