diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index 5eff2e5606eb1168612012299dcf42894acace4f..89640eefdc83d1519b7b514405308937fb11d25a 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -350,11 +350,13 @@ install(DIRECTORY detectors/sts TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY detectors/tof TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY detectors/trd TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY detectors/trd2d TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY detectors/rich TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY ca/qa TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY qa TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY qa/unpack TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY ca TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY kfp TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY evbuild TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 
 
 install(
@@ -368,6 +370,22 @@ install(
     base/System.h
     base/PartitionedVector.h
     base/PartitionedSpan.h
+    base/DigiData.h
+    base/PODVector.h
+    base/AlgoTraits.h
+    base/AuxDigiData.h
+    base/BuildInfo.h
+    base/Exceptions.h
+    base/MainConfig.h
+    evselector/DigiEventSelector.h
+    evselector/DigiEventSelectorConfig.h
+    trigger/DigiTriggerConfig.h
+    trigger/HitMultTrigger.h
+    trigger/TimeClusterTrigger.h
+    trigger/V0Trigger.h
+    trigger/V0TriggerConfig.h
+    unpack/CommonUnpacker.h
+    unpack/UnpackMSBase.h
     global/Reco.h
     global/RecoResults.h
     global/RecoResultsInputArchive.h
@@ -376,6 +394,8 @@ install(
     qa/Histogram.h
     ca/TrackingChain.h
     ca/TrackingChainConfig.h
+    ca/TrackingDefs.h
+    ca/TrackingSetup.h
     # NOTE: SZh 20.11.2023:
     #       The ca/qa directory depends on the online qa classes, so for now it has to be a part of the Algo library.
     ca/qa/CaQa.h
diff --git a/reco/kfnew/CMakeLists.txt b/reco/kfnew/CMakeLists.txt
index 1bb0e057ea82fb3ab1cea07a2ec4d51bb5bf29aa..27de5b3eaf64cfabcb3f81c974233c543081d9d0 100644
--- a/reco/kfnew/CMakeLists.txt
+++ b/reco/kfnew/CMakeLists.txt
@@ -78,6 +78,7 @@ install(
     CbmKfTrackingSetupBuilder.h
     CbmKfUtil.h
     CbmKfTarget.h
+    CbmKfTrackFitter.h
   DESTINATION
     include/
 )
diff --git a/reco/tasks/CbmTaskBuildEvents.h b/reco/tasks/CbmTaskBuildEvents.h
index b4529cc47c35cfea2d6cc1bd1a9763a5736aaa51..843a599823b78a9d31519eb7a7a8b59e6811c03e 100644
--- a/reco/tasks/CbmTaskBuildEvents.h
+++ b/reco/tasks/CbmTaskBuildEvents.h
@@ -10,7 +10,7 @@
 #include "CbmDigiTimeslice.h"
 #include "DigiEventSelector.h"
 #include "DigiEventSelectorConfig.h"
-#include "EventBuilder.h"
+#include "evbuild/EventBuilder.h"
 
 #include <FairTask.h>
 
diff --git a/reco/tasks/CbmTaskDigiEventQa.h b/reco/tasks/CbmTaskDigiEventQa.h
index c0d01bf32b5557ce9356df21d7921a210289b5a3..bf21dd5ca520c88612347494f9d7ed8ba3794191 100644
--- a/reco/tasks/CbmTaskDigiEventQa.h
+++ b/reco/tasks/CbmTaskDigiEventQa.h
@@ -7,15 +7,14 @@
 
 #include "CbmDefs.h"
 #include "CbmDigiEvent.h"
-#include "algo/evbuild/Config.h"
-#include "algo/qa/DigiEventQa.h"
-#include "algo/qa/Histo1D.h"
+#include "evbuild/Config.h"
+#include "qa/DigiEventQa.h"
+#include "qa/Histo1D.h"
 
 #include <FairTask.h>
 
 #include <vector>
 
-
 class TH1D;
 
 /** @class CbmTaskDigiEventQa
diff --git a/reco/tasks/CbmTaskUnpack.h b/reco/tasks/CbmTaskUnpack.h
index c091dd2873c62b087bc130309801813065f25ba3..ba79d2203f5dc5846bab759d5bfb07417e6a1517 100644
--- a/reco/tasks/CbmTaskUnpack.h
+++ b/reco/tasks/CbmTaskUnpack.h
@@ -20,9 +20,9 @@ namespace cbm
 #endif
 
 #include "AlgoTraits.h"
-#include "EventBuilder.h"
 #include "ParFiles.h"
 #include "bmon/Unpack.h"
+#include "evbuild/EventBuilder.h"
 #include "much/Unpack.h"
 #include "rich/Unpack.h"
 #include "sts/Unpack.h"