diff --git a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
index 455deb1eac..fd392ceae8 100644
--- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
@@ -31,14 +31,20 @@
 */
 
 #include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
-#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
-#include "common/ran_context.h"
+#include "PHY/defs_common.h"
+#include "common/platform_constants.h"
+#include "common/utils/T/T.h"
 #include "executables/softmodem-common.h"
-#include "nfapi/oai_integration/vendor_ext.h" 
 #include "nfapi/oai_integration/gnb_ind_vars.h"
-#include "openair2/PHY_INTERFACE/queue_t.h"
+#include "nfapi/oai_integration/vendor_ext.h"
+#include "nfapi_interface.h"
 #include "openair2/NR_PHY_INTERFACE/nr_sched_response.h"
+#include "openair2/PHY_INTERFACE/queue_t.h"
+#include "utils.h"
 
 #define MAX_IF_MODULES 100
 
diff --git a/openair2/NR_PHY_INTERFACE/NR_IF_Module.h b/openair2/NR_PHY_INTERFACE/NR_IF_Module.h
index 82ccdb782f..261ead1ba0 100644
--- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.h
+++ b/openair2/NR_PHY_INTERFACE/NR_IF_Module.h
@@ -35,9 +35,8 @@
 
 #include <pthread.h>
 #include <stdint.h>
+#include "assertions.h"
 #include "nfapi_nr_interface_scf.h"
-#include "common/platform_constants.h"
-#include "common/platform_types.h"
 
 #define MAX_NUM_DL_PDU 100
 #define MAX_NUM_UL_PDU 100
diff --git a/openair2/NR_PHY_INTERFACE/nr_sched_response.c b/openair2/NR_PHY_INTERFACE/nr_sched_response.c
index 17b6c56c29..9c66b21536 100644
--- a/openair2/NR_PHY_INTERFACE/nr_sched_response.c
+++ b/openair2/NR_PHY_INTERFACE/nr_sched_response.c
@@ -38,10 +38,10 @@
  */
 
 #include "nr_sched_response.h"
-
 #include <pthread.h>
+#include <stdbool.h>
 #include <stdlib.h>
-
+#include "NR_PHY_INTERFACE/NR_IF_Module.h"
 #include "common/utils/LOG/log.h"
 #include "common/utils/assertions.h"