diff --git a/reco/detectors/psd/CMakeLists.txt b/reco/detectors/psd/CMakeLists.txt
index 9d407cd5395b7e2124459452cd24bfc60e25830c..1e1aaff405fa994518f4cfccfdcc9f42dec1db5e 100644
--- a/reco/detectors/psd/CMakeLists.txt
+++ b/reco/detectors/psd/CMakeLists.txt
@@ -1,6 +1,8 @@
 set(INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/unpack
+  
+  ${CMAKE_SOURCE_DIR}/core/detectors/psd
 
   ${CBMDATA_DIR}
   ${CBMDATA_DIR}/global
@@ -8,7 +10,7 @@ set(INCLUDE_DIRECTORIES
   ${CBMDATA_DIR}/psd
   ${CBMDATA_DIR}/raw
   ${CBMBASE_DIR}
-  ${CBMDETECTORBASE_DIR}/psd
+  
 
   ${CBMROOT_SOURCE_DIR}/reco/base
 )
diff --git a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
index 4dd7d2607dc7a6e4c7f3fbdb9985010728aada60..32e74eabc0adad62941530908d766ffe8fc63779 100644
--- a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
+++ b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
@@ -14,9 +14,9 @@
 #include <cstdint>
 #include <numeric>
 
-#include "../../core/detectors/psd/PronyFitter.h"
-#include "raw/PsdGbtReader-v0.00.h"
-#include "raw/PsdGbtReader-v1.00.h"
+#include "PronyFitter.h"
+#include "PsdGbtReader-v0.00.h"
+#include "PsdGbtReader-v1.00.h"
 
 CbmPsdUnpackAlgo::CbmPsdUnpackAlgo() : CbmRecoUnpackAlgo(fgkFlesSubsystemIdTrdR, "CbmPsdUnpackAlgo") {}
 
diff --git a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h
index e1643c7a80c53dfc0f50241264423327975b92a4..9eb2d102b9bf72501150b44e785d482c2185e438 100644
--- a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h
+++ b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h
@@ -21,7 +21,7 @@
 #ifndef CbmPsdUnpackAlgo_H
 #define CbmPsdUnpackAlgo_H
 
-#include "../../core/detectors/psd/CbmMcbm2018PsdPar.h"
+#include "CbmMcbm2018PsdPar.h"
 #include "CbmPsdDigi.h"
 #include "CbmPsdDsp.h"
 #include "CbmRecoUnpackAlgo.tmpl"
diff --git a/reco/detectors/rich/CMakeLists.txt b/reco/detectors/rich/CMakeLists.txt
index 684f371057b99cebde6c29ed16ffcc4aa98f6d7e..4de1bb38d6f2d2ebf449e1096130baa34e72dd27 100644
--- a/reco/detectors/rich/CMakeLists.txt
+++ b/reco/detectors/rich/CMakeLists.txt
@@ -12,7 +12,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/alignment
 ${CMAKE_CURRENT_SOURCE_DIR}/mcbm
 ${CMAKE_CURRENT_SOURCE_DIR}/unpack
 
-${CBMDETECTORBASE_DIR}/rich
+${CBMROOT_SOURCE_DIR}/core/detectors/rich
 
 ${CBMROOT_SOURCE_DIR}/reco/base
 
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h
index 1190677b631f2e540549d8bd0d44c57998cd51e0..566492553b96dd056aa16553e30583941223af04 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h
@@ -21,8 +21,7 @@
 #ifndef CbmRichUnpackAlgo_H
 #define CbmRichUnpackAlgo_H
 
-// #include "CbmMcbm2018RichPar.h"
-#include "../../core/detectors/rich/CbmMcbm2018RichPar.h"
+#include "CbmMcbm2018RichPar.h"
 #include "CbmRecoUnpackAlgo.tmpl"
 #include "CbmRichDigi.h"
 
@@ -33,6 +32,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <iomanip>
 #include <memory>
 #include <utility>
 
diff --git a/reco/steer/CMakeLists.txt b/reco/steer/CMakeLists.txt
index 21669fb81f5764e71b9a698034bb95a58f67cfe2..7b7342484250483a221cdfd7462b5d13e429fbe2 100644
--- a/reco/steer/CMakeLists.txt
+++ b/reco/steer/CMakeLists.txt
@@ -35,13 +35,16 @@ ${CBMROOT_SOURCE_DIR}/core/data
 ${CBMROOT_SOURCE_DIR}/core/data/raw
 ${CBMROOT_SOURCE_DIR}/core/data/base
 ${CBMROOT_SOURCE_DIR}/core/data/psd
-${CBMROOT_SOURCE_DIR}/core/detectors/psd
 ${CBMROOT_SOURCE_DIR}/core/data/rich
 ${CBMROOT_SOURCE_DIR}/core/data/sts
 # ${CBMROOT_SOURCE_DIR}/core/data/tof
 ${CBMROOT_SOURCE_DIR}/core/data/trd
-${CBMROOT_SOURCE_DIR}/core/detectors/trd
 
+${CBMROOT_SOURCE_DIR}/core/detectors/psd
+${CBMROOT_SOURCE_DIR}/core/detectors/rich
+${CBMROOT_SOURCE_DIR}/core/detectors/sts
+# ${CBMROOT_SOURCE_DIR}/core/detectors/tof
+${CBMROOT_SOURCE_DIR}/core/detectors/trd