diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index 677b09d719644e3d11c47da7bb1c432c53594fac..5cc62745d1d5453ac02811af8d3ca9b86c08236a 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -386,6 +386,7 @@ install(
     trigger/V0TriggerConfig.h
     unpack/CommonUnpacker.h
     unpack/UnpackMSBase.h
+    global/ParFiles.h
     global/Reco.h
     global/RecoResults.h
     global/RecoResultsInputArchive.h
diff --git a/algo/kfp/KfpV0FinderChain.h b/algo/kfp/KfpV0FinderChain.h
index 95f10ebbab5e8c6c6086e8ce00d5a1c3ad4fa2ab..42580e745655688c52ab38da66eb4f71ab393da6 100644
--- a/algo/kfp/KfpV0FinderChain.h
+++ b/algo/kfp/KfpV0FinderChain.h
@@ -11,8 +11,8 @@
 
 #include "CbmEventTriggers.h"
 #include "PODVector.h"
-#include "base/SubChain.h"
-#include "global/RecoResults.h"
+#include "RecoResults.h"
+#include "SubChain.h"
 #include "kfp/KfpV0Finder.h"
 #include "kfp/KfpV0FinderMonitor.h"
 #include "kfp/KfpV0FinderQa.h"
diff --git a/algo/qa/QaData.h b/algo/qa/QaData.h
index 8c66c445a9d75279d702a2f20e9933bb05aecb3a..d8ed2717929074cb95941eab53366fa63614ef22 100644
--- a/algo/qa/QaData.h
+++ b/algo/qa/QaData.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "AlgoFairloggerCompat.h"
-#include "base/HistogramSender.h"
+#include "HistogramSender.h"
 #include "qa/CanvasConfig.h"
 #include "qa/HistogramContainer.h"
 #include "qa/TaskProperties.h"
diff --git a/algo/qa/QaManager.h b/algo/qa/QaManager.h
index ab7e397c5f49ce92fd4c445b850d763022001fe2..93d587eb390d014d7a65974af7df93d005097019 100644
--- a/algo/qa/QaManager.h
+++ b/algo/qa/QaManager.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "base/HistogramSender.h"
-#include "base/SubChain.h"
+#include "HistogramSender.h"
+#include "SubChain.h"
 #include "qa/QaData.h"
 
 namespace cbm::algo::qa