diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index 89640eefdc83d1519b7b514405308937fb11d25a..677b09d719644e3d11c47da7bb1c432c53594fac 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -217,7 +217,6 @@ target_include_directories(Algo
 
 target_link_libraries(Algo
   PUBLIC    OnlineData
-            CbmYamlInterface
             KfCore
             CaCore
             ROOT::GenVector
@@ -234,7 +233,8 @@ target_link_libraries(Algo
             external::fles_monitoring
             cppzmq
             poolstl
-  PRIVATE   CbmKFParticleOnlineInterface 
+  PRIVATE   CbmKFParticleOnlineInterface
+  INTERFACE CbmYamlInterface
 )
 target_compile_definitions(Algo PUBLIC NO_ROOT)
 xpu_attach(Algo ${DEVICE_SRCS})
@@ -294,7 +294,6 @@ if (NOT CBM_ONLINE_STANDALONE)
 
   target_link_libraries(AlgoOffline
     PUBLIC    CbmData
-              CbmYamlInterface
               KfCoreOffline
               CaCoreOffline
               ROOT::GenVector
@@ -311,7 +310,8 @@ if (NOT CBM_ONLINE_STANDALONE)
               external::fles_monitoring
               cppzmq
               poolstl
-    PRIVATE   CbmKFParticleOnlineInterface 
+    PRIVATE   CbmKFParticleOnlineInterface
+    INTERFACE CbmYamlInterface
   )
   xpu_attach(AlgoOffline ${DEVICE_SRCS})
 
diff --git a/algo/base/yaml/BaseTypes.h b/algo/base/yaml/BaseTypes.h
index 1a58763e2b5b016f30574883a80b90e396ded45e..1743aace818e77ba8ad33993711f79111a7e1b86 100644
--- a/algo/base/yaml/BaseTypes.h
+++ b/algo/base/yaml/BaseTypes.h
@@ -1,6 +1,8 @@
 /* Copyright (C) 2023 FIAS Frankfurt Institute for Advanced Studies, Frankfurt / Main
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Felix Weiglhofer [committer] */
+#ifndef CBM_YAML_BASETYPES_H
+#define CBM_YAML_BASETYPES_H
 #pragma once
 
 #include "Definitions.h"
@@ -139,3 +141,4 @@ namespace cbm::algo::yaml
 
 
 }  // namespace cbm::algo::yaml
+#endif  // CBM_YAML_BASETYPES_H
diff --git a/algo/base/yaml/CMakeLists.txt b/algo/base/yaml/CMakeLists.txt
index f943052cf1f7d73e4aa6de75e5d3cc374c2381b7..756401d832e849767e03cf1f9b33188c770022b7 100644
--- a/algo/base/yaml/CMakeLists.txt
+++ b/algo/base/yaml/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(INCLUDE_DIRECTORIES
-  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/algo/base  # For "algo/base/yaml/*.h" included as relative "yaml/?????.h" to fit install tree
 )
 
 add_library(CbmYamlInterface INTERFACE)
@@ -10,13 +10,13 @@ target_include_directories(CbmYamlInterface
 
 target_link_libraries(CbmYamlInterface
   INTERFACE GSL
-            xpu 
-            fmt::fmt 
+            xpu
+            fmt::fmt
             external::yaml-cpp
 )
 
 install(
-  FILES 
+  FILES
     BaseTypes.h
     Property.h
     Yaml.h
diff --git a/algo/base/yaml/Property.h b/algo/base/yaml/Property.h
index 644c77bfdc9b284f49180455aad534970f0db23d..223a978542779a9499bb7f95d5b273f5238f4d5c 100644
--- a/algo/base/yaml/Property.h
+++ b/algo/base/yaml/Property.h
@@ -1,6 +1,8 @@
 /* Copyright (C) 2023 FIAS Frankfurt Institute for Advanced Studies, Frankfurt / Main
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Felix Weiglhofer [committer] */
+#ifndef CBM_YAML_PROPERTY_H
+#define CBM_YAML_PROPERTY_H
 #pragma once
 
 #include "Definitions.h"
@@ -82,3 +84,5 @@ namespace cbm::algo::yaml
 #define CBM_YAML_MERGE_PROPERTY()                                                                                      \
  public:                                                                                                               \
   static constexpr bool MergeProperty = true
+
+#endif  // CBM_YAML_PROPERTY_H
diff --git a/algo/base/yaml/Yaml.h b/algo/base/yaml/Yaml.h
index 8745bd141637487614d040c39427a6e1b9c2393e..e5dfa3d33adbe63720b129d52f762028b4f00840 100644
--- a/algo/base/yaml/Yaml.h
+++ b/algo/base/yaml/Yaml.h
@@ -1,13 +1,15 @@
 /* Copyright (C) 2023 FIAS Frankfurt Institute for Advanced Studies, Frankfurt / Main
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Felix Weiglhofer [committer] */
+#ifndef CBM_YAML_YAML_H
+#define CBM_YAML_YAML_H
 #pragma once
 
-#include "BaseTypes.h"
 #include "Definitions.h"
-#include "Property.h"
 #include "compat/Filesystem.h"
 #include "util/EnumDict.h"
+#include "yaml/BaseTypes.h"
+#include "yaml/Property.h"
 
 #include <sstream>
 #include <string_view>
@@ -305,3 +307,5 @@ namespace cbm::algo::yaml
 #define CBM_YAML_INSTANTIATE(type)                                                                                     \
   template type cbm::algo::yaml::Read<type>(const YAML::Node& node);                                                   \
   template std::string cbm::algo::yaml::Dump::operator()<type>(const type& value, int floatPrecision);
+
+#endif  // CBM_YAML_YAML_H
diff --git a/core/qa/CMakeLists.txt b/core/qa/CMakeLists.txt
index f115de3c754e01846f7da67301a72ca007a73a0f..9b022d7bb8905345543b90516b6693cfa36a4ec4 100644
--- a/core/qa/CMakeLists.txt
+++ b/core/qa/CMakeLists.txt
@@ -2,6 +2,7 @@ set(INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}/checker
   ${CMAKE_CURRENT_SOURCE_DIR}/report
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/algo/base  # For "algo/base/yaml/*.h" included as relative "yaml/?????.h" to fit install tree
   )
 
 set(SRCS
@@ -63,6 +64,7 @@ set(PRIVATE_DEPENDENCIES
 
 set(INTERFACE_DEPENDENCIES
   ROOT::Graf
+  CbmYamlInterface
   )
 
 generate_cbm_library()
diff --git a/reco/KF/KFParticleInterface.cmake b/reco/KF/KFParticleInterface.cmake
index 7f594ec0a957851dbba6ef9a8556e3e2a5aece78..a09ae917a16d3b27840b2e1a9282845b3118f8dc 100644
--- a/reco/KF/KFParticleInterface.cmake
+++ b/reco/KF/KFParticleInterface.cmake
@@ -6,6 +6,7 @@ set(INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Interface
   ${CMAKE_CURRENT_SOURCE_DIR}/KFQA
+  ${CMAKE_SOURCE_DIR}/algo/base  # For "algo/base/yaml/*.h" included as relative "yaml/?????.h" to fit install tree
   )
 
 set(SRCS
@@ -43,11 +44,11 @@ EndIf()
 IF (SSE_FOUND)
   Message(STATUS "KFParticleInterface will be compiled with SSE support")
   ADD_DEFINITIONS(-DHAVE_SSE)
-  SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS 
+  SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS
   "-msse -O3")
 ELSE (SSE_FOUND)
   MESSAGE(STATUS "KFParticleInterface will be compiled without SSE support")
-  SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS 
+  SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS
   "-O3")
 ENDIF (SSE_FOUND)
 
@@ -57,7 +58,7 @@ set(LINKDEF ${LIBRARY_NAME}LinkDef.h)
 set(PUBLIC_DEPENDENCIES
   CbmData
   KF
-  FairRoot::Base  
+  FairRoot::Base
   ROOT::Core
   ROOT::Hist
   )
@@ -76,6 +77,7 @@ set(PRIVATE_DEPENDENCIES
 
 set(INTERFACE_DEPENDENCIES
   CbmRecoBase
+  CbmYamlInterface
   )
 
 Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 6f6b1a79af59ad98b7b49317f881c966106838f6..4e0573c8d40ae76c8f6b6ddf826e9fe2f24b3a72 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -16,6 +16,7 @@ set(INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}/L1Algo/utils
   ${CMAKE_CURRENT_SOURCE_DIR}/catools
   ${CMAKE_CURRENT_SOURCE_DIR}/utils
+  ${CMAKE_SOURCE_DIR}/algo/base  # For "algo/base/yaml/*.h" included as relative "yaml/?????.h" to fit install tree
 
 )
 
@@ -174,6 +175,10 @@ set(PRIVATE_DEPENDENCIES
   ROOT::RIO
 )
 
+set(INTERFACE_DEPENDENCIES
+  CbmYamlInterface
+)
+
 generate_cbm_library()
 
 add_dependencies(G__L1 KFPARTICLE)
diff --git a/reco/detectors/tof/CMakeLists.txt b/reco/detectors/tof/CMakeLists.txt
index 02561f15a62f7a7efd0f60ee2eeb71aca86a21f8..42b61bf92c7fae4c20c8523c899308b75779cc6a 100644
--- a/reco/detectors/tof/CMakeLists.txt
+++ b/reco/detectors/tof/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(INCLUDE_DIRECTORIES
-  ${CBMROOT_SOURCE_DIR}/fles/flestools
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/unpack
+  ${CMAKE_SOURCE_DIR}/fles/flestools
   )
 
 
diff --git a/reco/tasks/CMakeLists.txt b/reco/tasks/CMakeLists.txt
index 991210bd39038bfbeb58711f861e2ffef1f1952d..87daab108394cf9ced0fcbe93dfa9a49fd27467d 100644
--- a/reco/tasks/CMakeLists.txt
+++ b/reco/tasks/CMakeLists.txt
@@ -3,7 +3,8 @@
 
 set(INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CBMROOT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/algo       # For "algo/qa/*.h"        included as relative "qa/?????.h"   to fit install tree
+  ${CMAKE_SOURCE_DIR}/algo/base  # For "algo/base/yaml/*.h" included as relative "yaml/?????.h" to fit install tree
   )
 
 set(SRCS
@@ -58,6 +59,7 @@ set(PRIVATE_DEPENDENCIES
 
 set(INTERFACE_DEPENDENCIES
   external::fles_ipc
+  CbmYamlInterface
   )
 
 generate_cbm_library()
diff --git a/reco/tasks/CbmTaskDigiEventQa.cxx b/reco/tasks/CbmTaskDigiEventQa.cxx
index 00c542cf7e60ad54cfde4c668af0c1645d982784..b07b9b49fcaa1b6e38f66ddab156bfd261e44b47 100644
--- a/reco/tasks/CbmTaskDigiEventQa.cxx
+++ b/reco/tasks/CbmTaskDigiEventQa.cxx
@@ -5,7 +5,7 @@
 #include "CbmTaskDigiEventQa.h"
 
 #include "CbmReco.h"  // for CbmRecoConfig
-#include "algo/qa/Histo1D.h"
+#include "qa/Histo1D.h"
 
 #include <FairRunOnline.h>
 #include <Logger.h>
diff --git a/sim/transport/steer/CMakeLists.txt b/sim/transport/steer/CMakeLists.txt
index 09ea11a22f5797cd2e02fb9d27816cf0d9378890..79ea0c3f0a5c5c7aa8763557964c352b5109cb85 100644
--- a/sim/transport/steer/CMakeLists.txt
+++ b/sim/transport/steer/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CBMROOT_SOURCE_DIR}/core/config
+  ${CMAKE_SOURCE_DIR}/core/config
   )
 
 set(SRCS