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/Yaml.h b/algo/base/yaml/Yaml.h
index 8745bd141637487614d040c39427a6e1b9c2393e..56bd2246e06bf0e067009d85e8091cf1bf892785 100644
--- a/algo/base/yaml/Yaml.h
+++ b/algo/base/yaml/Yaml.h
@@ -3,11 +3,11 @@
    Authors: Felix Weiglhofer [committer] */
 #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>