diff --git a/srsue/hdr/phy/scell/async_scell_recv.h b/srsue/hdr/phy/scell/async_scell_recv.h
index 9b6a0dd38..3fa450f3e 100644
--- a/srsue/hdr/phy/scell/async_scell_recv.h
+++ b/srsue/hdr/phy/scell/async_scell_recv.h
@@ -22,25 +22,12 @@
 #ifndef SRSUE_ASYNCH_SCELL_RECV_H
 #define SRSUE_ASYNCH_SCELL_RECV_H
 
-#include <pthread.h>
-
-#include "srslte/common/log.h"
-#include "srslte/common/thread_pool.h"
-#include "srslte/common/threads.h"
-#include "srslte/common/tti_sync_cv.h"
-#include "srslte/interfaces/ue_interfaces.h"
-#include "srslte/radio/radio.h"
-#include "srslte/srslte.h"
+#include <srslte/common/log.h>
+#include <srslte/common/threads.h>
+#include <srslte/radio/radio.h>
+#include <srslte/srslte.h>
+
 #include "srsue/hdr/phy/phy_common.h"
-#include "srsue/hdr/phy/prach.h"
-
-#include <cassert>
-#include <cstdio>
-#include <fstream>
-#include <functional>
-#include <iostream>
-#include <memory>
-#include <vector>
 
 namespace srsue {
 namespace scell {
diff --git a/srsue/hdr/phy/scell/intra_measure.h b/srsue/hdr/phy/scell/intra_measure.h
index 115560d54..66564ac00 100644
--- a/srsue/hdr/phy/scell/intra_measure.h
+++ b/srsue/hdr/phy/scell/intra_measure.h
@@ -23,9 +23,10 @@
 
 #include <srslte/common/log.h>
 #include <srslte/common/threads.h>
+#include <srslte/common/tti_sync_cv.h>
 #include <srslte/srslte.h>
 
-#include <srsue/hdr/phy/scell/scell_recv.h>
+#include "scell_recv.h"
 
 namespace srsue {
 namespace scell {
diff --git a/srsue/hdr/phy/scell/scell_recv.h b/srsue/hdr/phy/scell/scell_recv.h
index 486b4b96d..bc244c49a 100644
--- a/srsue/hdr/phy/scell/scell_recv.h
+++ b/srsue/hdr/phy/scell/scell_recv.h
@@ -22,10 +22,9 @@
 #ifndef SRSUE_SCELL_RECV_H
 #define SRSUE_SCELL_RECV_H
 
-#include <srslte/common/tti_sync_cv.h>
 #include <srslte/srslte.h>
 
-#include <srsue/hdr/phy/scell/measure.h>
+#include "measure.h"
 
 namespace srsue {
 namespace scell {