diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h
index 7d8e439cd4..d43c222a24 100644
--- a/openair1/PHY/defs_nr_UE.h
+++ b/openair1/PHY/defs_nr_UE.h
@@ -109,6 +109,7 @@
 #include "PHY/NR_UE_TRANSPORT/dci_nr.h"
 #include <pthread.h>
 #include "sdr/COMMON/common_lib.h"
+#include "NR_IF_Module.h"
 
 /// Context data structure for gNB subframe processing
 typedef struct {
@@ -644,8 +645,6 @@ typedef struct NR_UL_TIME_ALIGNMENT {
   uint8_t          tag_id;
 } NR_UL_TIME_ALIGNMENT_t;
 
-#include "NR_IF_Module.h"
-
 /// Top-level PHY Data Structure for UE
 typedef struct {
   /// \brief Module ID indicator for this instance
diff --git a/openair2/PHY_INTERFACE/IF_Module.h b/openair2/PHY_INTERFACE/IF_Module.h
index 2444bd9ae0..d446c23938 100644
--- a/openair2/PHY_INTERFACE/IF_Module.h
+++ b/openair2/PHY_INTERFACE/IF_Module.h
@@ -38,6 +38,8 @@
 #include "nfapi_interface.h"
 #include "platform_types.h"
 #include <common/utils/threadPool/thread-pool.h>
+#include <sdr/COMMON/common_lib.h>
+
 
 #define MAX_NUM_DL_PDU 100
 #define MAX_NUM_UL_PDU 100
@@ -134,7 +136,6 @@ typedef struct {
     int CC_id;
     nfapi_config_request_t *cfg;
 } PHY_Config_t;
-#include <sdr/COMMON/common_lib.h>
 
 typedef struct IF_Module_s{
 //define the function pointer