diff --git a/lib/include/srslte/interfaces/phy_interface_types.h b/lib/include/srslte/interfaces/phy_interface_types.h
index 21dc82036..1f3f6d19b 100644
--- a/lib/include/srslte/interfaces/phy_interface_types.h
+++ b/lib/include/srslte/interfaces/phy_interface_types.h
@@ -13,7 +13,7 @@
 #ifndef SRSLTE_PHY_INTERFACE_TYPES_H
 #define SRSLTE_PHY_INTERFACE_TYPES_H
 
-#include "srslte/phy/phch/prach.h"
+#include "srslte/srslte.h"
 
 /// Common types defined by the PHY layer.
 
diff --git a/lib/include/srslte/upper/rlc_am_base.h b/lib/include/srslte/upper/rlc_am_base.h
index 2a7d91243..c81842ef1 100644
--- a/lib/include/srslte/upper/rlc_am_base.h
+++ b/lib/include/srslte/upper/rlc_am_base.h
@@ -32,4 +32,11 @@ bool rlc_am_is_control_pdu(byte_buffer_t* pdu);
 
 } // namespace srslte
 
+namespace srsue {
+
+class pdcp_interface_rlc;
+class rrc_interface_rlc;
+
+} // namespace srsue
+
 #endif // SRSLTE_RLC_AM_BASE_H
diff --git a/lib/include/srslte/upper/rlc_am_lte.h b/lib/include/srslte/upper/rlc_am_lte.h
index 9a1f4665c..c6e24c5b1 100644
--- a/lib/include/srslte/upper/rlc_am_lte.h
+++ b/lib/include/srslte/upper/rlc_am_lte.h
@@ -27,13 +27,6 @@
 #include <list>
 #include <map>
 
-namespace srsue {
-
-class pdcp_interface_rlc;
-class rrc_interface_rlc;
-
-} // namespace srsue
-
 namespace srslte {
 
 #undef RLC_AM_BUFFER_DEBUG
diff --git a/srsue/hdr/phy/sfn_sync.h b/srsue/hdr/phy/sfn_sync.h
index 1e2e6c2c1..884ccbe13 100644
--- a/srsue/hdr/phy/sfn_sync.h
+++ b/srsue/hdr/phy/sfn_sync.h
@@ -19,7 +19,7 @@
 
 namespace srsue {
 
-class phy_args_t;
+struct phy_args_t;
 
 // Class to synchronize system frame number
 class sfn_sync
diff --git a/srsue/test/phy/scell_search_test.cc b/srsue/test/phy/scell_search_test.cc
index 8454d8e71..a7274fcdc 100644
--- a/srsue/test/phy/scell_search_test.cc
+++ b/srsue/test/phy/scell_search_test.cc
@@ -12,16 +12,14 @@
 
 #include "srslte/interfaces/phy_interface_types.h"
 #include "srslte/srslog/srslog.h"
+#include "srsue/hdr/phy/scell/intra_measure.h"
 #include <boost/program_options.hpp>
 #include <boost/program_options/parsers.hpp>
 #include <iostream>
 #include <map>
 #include <memory>
 #include <srslte/common/string_helpers.h>
-#include <srslte/phy/channel/channel.h>
 #include <srslte/phy/utils/random.h>
-#include <srslte/srslte.h>
-#include <srsue/hdr/phy/scell/intra_measure.h>
 #include <vector>
 
 // Common execution parameters