diff --git a/lib/src/phy/rf/rf_blade_imp.c b/lib/src/phy/rf/rf_blade_imp.c
index 52fca3fcb..888f8a421 100644
--- a/lib/src/phy/rf/rf_blade_imp.c
+++ b/lib/src/phy/rf/rf_blade_imp.c
@@ -15,7 +15,9 @@
 #include <unistd.h>
 
 #include "rf_blade_imp.h"
-#include "srsran/srsran.h"
+#include "srsran/phy/common/timestamp.h"
+#include "srsran/phy/utils/debug.h"
+#include "srsran/phy/utils/vector.h"
 
 #define UNUSED __attribute__((unused))
 #define CONVERT_BUFFER_SIZE (240 * 1024)
diff --git a/lib/src/phy/rf/rf_imp.c b/lib/src/phy/rf/rf_imp.c
index 59f2e6920..8ed99f0c0 100644
--- a/lib/src/phy/rf/rf_imp.c
+++ b/lib/src/phy/rf/rf_imp.c
@@ -14,7 +14,7 @@
 
 #include "rf_dev.h"
 #include "srsran/phy/rf/rf.h"
-#include "srsran/srsran.h"
+#include "srsran/phy/utils/debug.h"
 
 int rf_get_available_devices(char** devnames, int max_strlen)
 {
diff --git a/lib/src/phy/rf/rf_soapy_imp.c b/lib/src/phy/rf/rf_soapy_imp.c
index aa28efe90..ffa282bab 100644
--- a/lib/src/phy/rf/rf_soapy_imp.c
+++ b/lib/src/phy/rf/rf_soapy_imp.c
@@ -17,7 +17,9 @@
 
 #include "rf_helper.h"
 #include "rf_soapy_imp.h"
-#include "srsran/srsran.h"
+#include "srsran/phy/common/phy_common.h"
+#include "srsran/phy/utils/debug.h"
+#include "srsran/phy/utils/vector.h"
 
 #include <SoapySDR/Device.h>
 #include <SoapySDR/Formats.h>
diff --git a/lib/src/phy/rf/rf_uhd_imp.cc b/lib/src/phy/rf/rf_uhd_imp.cc
index bf0e3d1dc..32ca0e25a 100644
--- a/lib/src/phy/rf/rf_uhd_imp.cc
+++ b/lib/src/phy/rf/rf_uhd_imp.cc
@@ -19,7 +19,7 @@
 #include <uhd/usrp/multi_usrp.hpp>
 
 #include "rf_helper.h"
-#include "srsran/srsran.h"
+#include "srsran/phy/utils/debug.h"
 
 #include "rf_uhd_generic.h"
 #include "rf_uhd_imp.h"