diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index 677b09d719644e3d11c47da7bb1c432c53594fac..612c11a1a5f537f078177f538ff91be607a8aa03 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -386,11 +386,13 @@ install(
     trigger/V0TriggerConfig.h
     unpack/CommonUnpacker.h
     unpack/UnpackMSBase.h
+    global/ParFiles.h
     global/Reco.h
     global/RecoResults.h
     global/RecoResultsInputArchive.h
     global/RecoResultsOutputArchive.h
     global/StorableRecoResults.h
+    qa/Accumulators.h
     qa/Histogram.h
     ca/TrackingChain.h
     ca/TrackingChainConfig.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
diff --git a/analysis/PWGCHA/jpsi/CMakeLists.txt b/analysis/PWGCHA/jpsi/CMakeLists.txt
index 639dfa4961dc2069f49718a36a58e10ef90ae293..d6ad8c48e7daa98555e7ae93906b7b99a4ecd4f9 100644
--- a/analysis/PWGCHA/jpsi/CMakeLists.txt
+++ b/analysis/PWGCHA/jpsi/CMakeLists.txt
@@ -16,11 +16,11 @@ set(SRCS
 IF (SSE_FOUND)
   Message(STATUS "Analysis 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 "Analysis 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)
 
@@ -55,3 +55,12 @@ set(INTERFACE_DEPENDENCIES
   )
 
 generate_cbm_library()
+
+
+# Install file which has no corresponding source file
+install(FILES
+        CbmAnaJpsiCuts.h
+        CbmAnaJpsiKinematicParams.h
+        CbmAnaJpsiUtils.h
+        DESTINATION include
+       )
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
index 6670b69154e55b23d2f3355d32829c3b9b5bf151..e7b6fcdd397d1a7ad32848c89901f7deb224419d 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
@@ -26,12 +26,11 @@
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
 #include "CbmUtils.h"
-
 #include "FairMCPoint.h"
 #include "FairTrackParam.h"
-#include <Logger.h>
+#include "KFParticle/KFParticleTopoReconstructor.h"
 
-#include "KFParticleTopoReconstructor.h"
+#include <Logger.h>
 
 
 // includes of standard c++ classes or ROOT classes
@@ -2040,7 +2039,7 @@ void CbmAnaConversion::AnalysePi0_Reco()
 					cout << "CbmAnaConversion: AnalysePi0_Reco: " << alt5->first << "/" << zwischen->first << "/" << alt3->first << "/" << alt4->first << endl;
 					cout << "CbmAnaConversion: AnalysePi0_Reco: " << alt5->second << "/" << zwischen->second << "/" << alt3->second << "/" << alt4->second << endl;
 					AnalysePi0_Reco_calc(alt5->second, zwischen->second, alt3->second, alt4->second);
-				
+
 				}
 				*/
         check2 = 1;
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
index f59884650eee895abfb20f5f3db8c08a08c1e2d5..b0d08925ac249ec5b84d00e2f7ac617f501687fc 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
@@ -25,9 +25,9 @@
 #include "CbmKFParticleFinderQa.h"
 #include "CbmMCTrack.h"
 #include "CbmVertex.h"
-#include "KFPartMatch.h"
-#include "KFParticle.h"
-#include "KFTopoPerformance.h"
+#include "KFParticle/KFPartMatch.h"
+#include "KFParticle/KFParticle.h"
+#include "KFParticle/KFTopoPerformance.h"
 
 #include <vector>
 
diff --git a/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt b/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt
index cd3e2e097460b6f43c54e1fedca2d04bd0af1ef1..5f6ee0709d4c6020d05116789200f48cc392cd78 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt
@@ -14,11 +14,11 @@ set(SRCS
 IF (SSE_FOUND)
   Message(STATUS "LMVM analysis 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 "LMVM analysis 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)
 
@@ -55,5 +55,11 @@ set(PRIVATE_DEPENDENCIES
 generate_cbm_library()
 
 
-
-
+# Install file which has no corresponding source file
+install(FILES
+        LmvmCand.h
+        LmvmCuts.h
+        LmvmDef.h
+        LmvmKinePar.h
+        DESTINATION include
+       )
diff --git a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
index a072fe0253503bda0b05492f9e9af908e9f5c553..2339745733cdfc99a16fc42e15e2d847695b4c94 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
@@ -47,11 +47,11 @@ set(SRCS
 IF (SSE_FOUND)
   Message(STATUS "Papa 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 "Papa 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)
 
@@ -98,6 +98,7 @@ set(PUBLIC_DEPENDENCIES
 set(PRIVATE_DEPENDENCIES
   CbmMvdBase
   CbmSimBase
+  KFParticle
   KFParticleInterface
   Littrack
   LittrackQA
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairKF.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairKF.cxx
index 63733318a828c6205f85fca5e08ca6a6a20887db..0579a77557a668208b9f8b039f6c7264788d1c3c 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairKF.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairKF.cxx
@@ -17,7 +17,7 @@
 
 #include <TDatabasePDG.h>
 
-#include "KFParticle.h"
+//#include "KFParticle.h"
 #include "PairAnalysisMC.h"
 #include "PairAnalysisTrack.h"
 
@@ -216,7 +216,7 @@ Double_t PairAnalysisPairKF::PsiPair(Double_t /*MagField*/) const
 
   m1[0] = fD1.GetPx();
   m1[1] = fD1.GetPy();
-  m1[2] = fD1.GetPz();  
+  m1[2] = fD1.GetPz();
 
   m2[0] = fD2.GetPx();
   m2[1] = fD2.GetPy();
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairKF.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairKF.h
index 219d3136d672329857ec248494e0586169ed6c0c..91072770e49c846a4f71690bc8a13a1e61e418f9 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairKF.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairKF.h
@@ -14,15 +14,15 @@
 //#                                                           #
 //#############################################################
 
-#include <TLorentzVector.h>
-#include <TMath.h>
-
-#include <KFParticle.h>
-
 #include "PairAnalysisPair.h"
 #include "PairAnalysisTrack.h"
 #include "PairAnalysisTrackRotator.h"
 
+#include <TLorentzVector.h>
+#include <TMath.h>
+
+#include <KFParticle/KFParticle.h>
+
 class CbmVertex;
 class CbmMCTrack;
 
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx
index d30f8ca8ae57de5240a7d12d417b8591fbcd5d35..a6bcdd7e26eab056a3c5cbeb17c74c0caa85be98 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx
@@ -33,13 +33,11 @@
 #include "CbmStsHit.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
-
 #include "FairRootManager.h"
+#include "KFParticle/KFParticle.h"
 
 #include <iostream>
 
-#include "KFParticle.h"
-
 using namespace std;
 
 CbmKresConversionCorrectedPhotons::CbmKresConversionCorrectedPhotons()
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h
index 6cae2e492f0140db53c27709525860834076b731..24f51c1b55ea0bb40dbb743a297ce9c66db334b3 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h
@@ -14,12 +14,11 @@
 #include "CbmRichRingFitterEllipseTau.h"
 #include "CbmStsTrack.h"
 #include "CbmVertex.h"
-
+#include "KFParticle/KFParticle.h"
+#include "LmvmKinePar.h"
 #include "TH2D.h"
-#include <TClonesArray.h>
 
-#include "KFParticle.h"
-#include "LmvmKinePar.h"
+#include <TClonesArray.h>
 
 class CbmRichRingFitterEllipseTau;
 
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
index b0d796531bcdd9ba90429a6d464f3b33060b1c87..7ba42fc0280f64bb0cbdae2fdece891e6cd4e389 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
@@ -33,15 +33,14 @@
 #include "CbmRichRingLight.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
+#include "KFParticle/KFParticle.h"
+#include "KFParticle/KFParticleTopoReconstructor.h"
+#include "LmvmKinePar.h"
 
 #include <FairRootManager.h>
 
 #include <TDirectory.h>
 
-#include "KFParticle.h"
-#include "KFParticleTopoReconstructor.h"
-#include "LmvmKinePar.h"
-
 using namespace std;
 
 CbmKresConversionKF::CbmKresConversionKF()
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
index 41a2bceb9d755c50a005e0e6939f88bd5b113f69..ca33f9d350141d5694fcf6bcc40880d95bad0bae 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
@@ -10,14 +10,13 @@
 #include "CbmKresConversionBG.h"
 #include "CbmMCTrack.h"
 #include "CbmRichRing.h"
+#include "KFParticle/KFParticle.h"
+#include "KFParticle/KFTopoPerformance.h"
 
 #include <TClonesArray.h>
 #include <TH1.h>
 #include <TH2D.h>
 
-#include "KFParticle.h"
-#include "KFTopoPerformance.h"
-
 class CbmRichRingFitterEllipseTau;
 
 using namespace std;
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx
index e2c5714394eae932f45e186910d7e2f1848d23d1..c91f2512c92d34e0e8e2a44b1d5c2c035a92df59 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx
@@ -34,13 +34,11 @@
 #include "CbmStsHit.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
-
 #include "FairRootManager.h"
+#include "KFParticle/KFParticle.h"
 
 #include <iostream>
 
-#include "KFParticle.h"
-
 using namespace std;
 
 CbmKresConversionManual::CbmKresConversionManual()
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.cxx
index f3905c6a8fbde2696654befc55889eca990ec218..13c33c1e42fe6c6bd61cc1518d7cccb599a8b110 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.cxx
@@ -35,15 +35,12 @@
 #include "CbmStsHit.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
-
 #include "FairRootManager.h"
-
+#include "KFParticle/KFParticle.h"
 #include "TDirectory.h"
 
 #include <iostream>
 
-#include "KFParticle.h"
-
 
 using namespace std;
 
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.cxx
index 87bc8a8e475c9c9e0f5ead7527bb45ac063f7d77..5003264087f94791142e3a34325579767ac14060 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.cxx
@@ -35,15 +35,12 @@
 #include "CbmStsHit.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
-
 #include "FairRootManager.h"
-
+#include "KFParticle/KFParticle.h"
 #include "TDirectory.h"
 
 #include <iostream>
 
-#include "KFParticle.h"
-
 
 using namespace std;
 
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.cxx
index e563a5ea2c8066a8cd4e69614f0e14c114bf64bc..09cbc874f25fdfc931618d6a8b1f4c52c3849102 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.cxx
@@ -35,15 +35,12 @@
 #include "CbmStsHit.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
-
 #include "FairRootManager.h"
-
+#include "KFParticle/KFParticle.h"
 #include "TDirectory.h"
 
 #include <iostream>
 
-#include "KFParticle.h"
-
 
 using namespace std;
 
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.cxx
index 784ec3a309bc6e6be2f8b52ca963abdc0e499cab..3e88f32a8a26052db63f7d197f1eace7cbd6fc65 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.cxx
@@ -35,15 +35,12 @@
 #include "CbmStsHit.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
-
 #include "FairRootManager.h"
-
+#include "KFParticle/KFParticle.h"
 #include "TDirectory.h"
 
 #include <iostream>
 
-#include "KFParticle.h"
-
 
 using namespace std;
 
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx
index 383142610a76d2b15ba40c3879dbca93eced3b48..6fa275f7e0b13087264d3ed99e2bc652933bae57 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx
@@ -32,13 +32,11 @@
 #include "CbmStsHit.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
-
 #include "FairRootManager.h"
+#include "KFParticle/KFParticle.h"
 
 #include <iostream>
 
-#include "KFParticle.h"
-
 using namespace std;
 
 CbmKresConversionPhotons::CbmKresConversionPhotons()
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h
index 8b3180e5f6c3055efe16ae47a796d5ccedc9e86d..0659003f1c4b44c6d3e0233d1f7afb46bd36deaa 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h
@@ -13,12 +13,11 @@
 #include "CbmRichRingFitterEllipseTau.h"
 #include "CbmStsTrack.h"
 #include "CbmVertex.h"
-
+#include "KFParticle/KFParticle.h"
+#include "LmvmKinePar.h"
 #include "TH2D.h"
-#include <TClonesArray.h>
 
-#include "KFParticle.h"
-#include "LmvmKinePar.h"
+#include <TClonesArray.h>
 
 class CbmRichRingFitterEllipseTau;
 
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx
index c0093c38b7ed7333693cb59c95e4d0e02ede6f7d..19d6ef5cc09416f2870736259bca3cd37c100e91 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx
@@ -33,15 +33,12 @@
 #include "CbmStsHit.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
-
 #include "FairRootManager.h"
-
+#include "KFParticle/KFParticle.h"
 #include "TDirectory.h"
 
 #include <iostream>
 
-#include "KFParticle.h"
-
 
 using namespace std;
 
diff --git a/analysis/common/analysis_tree_converter/steer/CMakeLists.txt b/analysis/common/analysis_tree_converter/steer/CMakeLists.txt
index 185eafc14d3ce794f4cd564b9300e3df32a39257..51ec7976c8760346064fac01ee991ad76f86aa34 100644
--- a/analysis/common/analysis_tree_converter/steer/CMakeLists.txt
+++ b/analysis/common/analysis_tree_converter/steer/CMakeLists.txt
@@ -1,7 +1,7 @@
 # CMakeList file for library libCbmAtcOfflineSteer
 # F. Linz,     27 October 2023
 
-set(SRCS
+set(NO_DICT_SRCS
   Config.cxx
   Run.cxx
   TaskFactory.cxx
@@ -10,7 +10,7 @@ set(SRCS
 set(INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(LIBRARY_NAME CbmAtConverterSteer)
-set(LINKDEF RootLinkDef.h)
+#set(LINKDEF RootLinkDef.h)
 set(PUBLIC_DEPENDENCIES
   CbmData
   FairRoot::Base
diff --git a/analysis/common/analysis_tree_converter/steer/Run.cxx b/analysis/common/analysis_tree_converter/steer/Run.cxx
index fc5e22e44792242b629226d363e96fc33389aa76..ad5e5beb948413b837210f0911a6a6664487042b 100644
--- a/analysis/common/analysis_tree_converter/steer/Run.cxx
+++ b/analysis/common/analysis_tree_converter/steer/Run.cxx
@@ -231,4 +231,4 @@ namespace cbm::atconverter
 
 }  // namespace cbm::atconverter
 
-ClassImp(cbm::atconverter::Run)
+//ClassImp(cbm::atconverter::Run)
diff --git a/analysis/common/analysis_tree_converter/steer/Run.h b/analysis/common/analysis_tree_converter/steer/Run.h
index 1239afe8d15e52360c98cf7ac3e04ceba3c27912..5ae31bea0567f0f9ce868462569a5c417ddcb619 100644
--- a/analysis/common/analysis_tree_converter/steer/Run.h
+++ b/analysis/common/analysis_tree_converter/steer/Run.h
@@ -159,8 +159,7 @@ namespace cbm::atconverter
     Config fConfig                      = {};
     std::set<ECbmModuleId> fDataPresent = {};
 
-
-    ClassDef(cbm::atconverter::Run, 1);
+    // ClassDef(cbm::atconverter::Run, 1);
   };
 
 }  // namespace cbm::atconverter
diff --git a/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx b/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx
index 94b4db1a0e0f6349cd6cba055a3d114f30274281..b9bde2c271bf64a0d5f02d19ad3ae1a36645542f 100644
--- a/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx
+++ b/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx
@@ -5,7 +5,7 @@
 #include "ATKFParticleFinder.h"
 
 #include "AnalysisTree/Matching.hpp"
-#include "KFParticleTopoReconstructor.h"
+#include "KFParticle/KFParticleTopoReconstructor.h"
 
 void ATKFParticleFinder::InitInput(const std::string& file_name, const std::string& tree_name)
 {
diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
index ca11909b3d371d32014d168d806ad6afc411dc75..e405ab289a5ba7ecf0370ec38b38a486d5c4f7e0 100644
--- a/core/base/CMakeLists.txt
+++ b/core/base/CMakeLists.txt
@@ -55,7 +55,8 @@ set(PRIVATE_DEPENDENCIES
 
 generate_cbm_library()
 
-Install(FILES CbmDigitize.h CbmTrackingDetectorInterfaceBase.h report/CbmReportElement.h utils/CbmEnumArray.h
+Install(FILES CbmDigitize.h CbmReadoutBuffer.h CbmTrackingDetectorInterfaceBase.h report/CbmReportElement.h
+              utils/CbmEnumArray.h
         DESTINATION include
        )
 
diff --git a/core/detectors/rich/CMakeLists.txt b/core/detectors/rich/CMakeLists.txt
index 16526cea17655c6eff5776b0e89ec87460c1e974..73a586a68f8e4dafe997c4b6ed2164332b9547ee 100644
--- a/core/detectors/rich/CMakeLists.txt
+++ b/core/detectors/rich/CMakeLists.txt
@@ -8,14 +8,14 @@ set(SRCS
   CbmRichEventDisplay.cxx
   CbmRichContFact.cxx
   CbmMcbm2018RichPar.cxx
+  CbmRichElectronIdAnn.cxx    # Used/exposed in analysis/PWGDIL/dielectron/conversion/CbmAnaConversionReco.h
+  utils/CbmRichUtil.cxx       # Used/exposed in analysis/PWGDIL/dielectron/papaframework/PairAnalysisVarManager.h
   )
 
 set(NO_DICT_SRCS
-  CbmRichElectronIdAnn.cxx
   CbmRichGeoManager.cxx
   CbmRichDigiMapManager.cxx
   CbmRichMCbmDigiMapManager.cxx
-  utils/CbmRichUtil.cxx
   )
 
 
@@ -28,19 +28,19 @@ ENDIF (SSE_FOUND)
 
 set(LIBRARY_NAME CbmRichBase)
 set(LINKDEF ${LIBRARY_NAME}LinkDef.h)
-set(PUBLIC_DEPENDENCIES 
+set(PUBLIC_DEPENDENCIES
   CbmData
   FairRoot::Base
   FairRoot::ParBase
-  ROOT::Core 
+  ROOT::Core
   CbmBase
-  ROOT::MathCore 
+  ROOT::MathCore
   )
 
-set(PRIVATE_DEPENDENCIES 
-  FairLogger::FairLogger 
-  ROOT::EG 
-  ROOT::Geom 
+set(PRIVATE_DEPENDENCIES
+  FairLogger::FairLogger
+  ROOT::EG
+  ROOT::Geom
   ROOT::Hist
   ROOT::RIO
   ROOT::MLP
@@ -51,6 +51,7 @@ generate_cbm_library()
 
 # Install file which has no corresponding source file
 install(FILES
+        CbmRichPmtType.h
         CbmRichRecGeoPar.h
         DESTINATION include
        )
diff --git a/external/InstallKFParticle.cmake b/external/InstallKFParticle.cmake
index 0e9724197ac86896e3caccb008332bda08d47f39..60b0bc3390312bff7586fe6a2183f1a60e732327 100644
--- a/external/InstallKFParticle.cmake
+++ b/external/InstallKFParticle.cmake
@@ -4,6 +4,9 @@ set(KFPARTICLE_SRC_URL "https://github.com/cbmsw/KFParticle.git")
 set(KFPARTICLE_DESTDIR "${CMAKE_BINARY_DIR}/external/KFPARTICLE-prefix")
 set(KFPARTICLE_TAG     "9b11e3e9da4e0896af80701210d19f7ca69c39d4")
 
+set(KF_MACOS_ARM_PATCH  "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle_applem1.patch")
+set(KF_CLANG_TINY_PATCH "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle_clang_tidy.patch")
+set(KF_INCLUDE_PATCH    "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle_header_install.patch")
 # GIT_TAG is a hash for KFParticle tag cbm/v1.1-1
 if (CMAKE_SYSTEM_NAME MATCHES Darwin AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES arm64)
   download_project_if_needed(PROJECT         kfparticle_source
@@ -11,7 +14,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES arm64
                              GIT_TAG         ${KFPARTICLE_TAG}
                              SOURCE_DIR      ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle
                              TEST_FILE       CMakeLists.txt
-                             PATCH_COMMAND   "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle_applem1.patch"
+                             PATCH_COMMAND   "${KF_MACOS_ARM_PATCH} && ${KF_INCLUDE_PATCH}"
                             )
 else()
   if(BUILD_FOR_TIDY)
@@ -20,7 +23,7 @@ else()
                                GIT_TAG         ${KFPARTICLE_TAG}
                                SOURCE_DIR      ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle
                                TEST_FILE       CMakeLists.txt
-                               PATCH_COMMAND   "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle_clang_tidy.patch"
+                               PATCH_COMMAND   "${KF_CLANG_TINY_PATCH} && ${KF_INCLUDE_PATCH}"
                               )
   else()
     download_project_if_needed(PROJECT         kfparticle_source
@@ -28,6 +31,7 @@ else()
                                GIT_TAG         ${KFPARTICLE_TAG}
                                SOURCE_DIR      ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle
                                TEST_FILE       CMakeLists.txt
+                               PATCH_COMMAND   "${KF_INCLUDE_PATCH}"
                               )
   endif()
 endif()
@@ -37,8 +41,8 @@ If(ProjectUpdated)
   Message("KFParticle source directory was changed so build directory was deleted")
 EndIf()
 
-if(NOT EXISTS ${CMAKE_BINARY_DIR}/include)
-  file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/include)
+if(NOT EXISTS ${CMAKE_BINARY_DIR}/include/KFParticle)
+  file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/include/KFParticle)
 endif()
 
 ExternalProject_Add(KFPARTICLE
@@ -69,7 +73,16 @@ ExternalProject_Add(KFPARTICLE
 add_library(KFParticle SHARED IMPORTED GLOBAL)
 set_target_properties(KFParticle PROPERTIES
   IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}KFParticle${CMAKE_SHARED_LIBRARY_SUFFIX}
-  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/include)
+)
+target_include_directories( KFParticle
+  INTERFACE
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/include/KFParticle
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/KFParticle>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/KFParticlePerformance>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/KFParticleTest>
+)
 target_link_libraries(KFParticle INTERFACE Vc::Vc)
 
 
@@ -81,19 +94,53 @@ Install(FILES ${CMAKE_BINARY_DIR}/lib/${KFPARTICLE_LIBNAME}
         DESTINATION lib
        )
 
-Install(FILES ${CMAKE_BINARY_DIR}/include/KFParticleBase.h
-              ${CMAKE_BINARY_DIR}/include/KFParticle.h
-              ${CMAKE_BINARY_DIR}/include/KFVertex.h
+Install(FILES ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticleBase.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticle.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFVertex.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticleTopoReconstructor.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFTopoPerformance.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFPTrackVector.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFMCTrack.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticleSIMD.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticlePerformanceBase.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFPVEfficiencies.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFMCVertex.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFPartMatch.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticlePVReconstructor.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticleFinder.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticleBaseSIMD.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticleDef.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFPSimdAllocator.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFPTrack.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFPEmcCluster.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticleField.h
+              # Next are copies of those in other folders, needed to load CBM libraries
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFMCParticle.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFPartEfficiencies.h
         DESTINATION include/KFParticle
        )
-Install(FILES ${CMAKE_BINARY_DIR}/include/KFMCParticle.h
-              ${CMAKE_BINARY_DIR}/include/KFPartEfficiencies.h
+# Next are copies of those in other folders, needed exactly at this path to load the KFParticle library
+# => Not completely sure why but it seems that while no path is provided in the KF own includes, the G__KFParticle.cxx
+#    file is generated with these "internal paths", for example at line 37-43
+# ===========================================================
+#    [...]
+#    // Header files passed as explicit arguments
+#    #include "KFParticle/KFParticleBase.h"
+#    #include "KFParticle/KFParticle.h"
+#    #include "KFParticle/KFVertex.h"
+#    #include "KFParticlePerformance/KFPartEfficiencies.h"
+#    #include "KFParticlePerformance/KFMCParticle.h"
+#    #include "KFParticleTest/KFParticleTest.h"
+#    [...]
+# ===========================================================
+Install(FILES ${CMAKE_BINARY_DIR}/include/KFParticle/KFMCParticle.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFPartEfficiencies.h
         DESTINATION include/KFParticlePerformance
        )
-Install(FILES ${CMAKE_BINARY_DIR}/include/KFParticleTest.h
+Install(FILES ${CMAKE_BINARY_DIR}/include/KFParticle/KFParticleTest.h
         DESTINATION include/KFParticleTest
        )
-Install(FILES ${CMAKE_BINARY_DIR}/include/KFPVertex.h
-              ${CMAKE_BINARY_DIR}/include/KFMCCounter.h
+Install(FILES ${CMAKE_BINARY_DIR}/include/KFParticle/KFPVertex.h
+              ${CMAKE_BINARY_DIR}/include/KFParticle/KFMCCounter.h
         DESTINATION include
        )
diff --git a/external/KFParticle_header_install.patch b/external/KFParticle_header_install.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5c8ec406e8b4d3df00dfc8ec8fa7e3be9500b13b
--- /dev/null
+++ b/external/KFParticle_header_install.patch
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dffa254..ec48865 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,6 +35,7 @@ EndIf()
+ Set(INCLUDE_DIRECTORIES
+   ${PROJECT_SOURCE_DIR}/KFParticle
+   ${PROJECT_SOURCE_DIR}/KFParticlePerformance
++  ${PROJECT_SOURCE_DIR}/KFParticleTest
+ )
+ 
+ include(${ROOT_USE_FILE})
+@@ -45,7 +46,7 @@ set(CMAKE_INCLUDE_DIRECTORIES_BEFORE OFF)
+ set(LINK_DIRECTORIES
+   ${ROOT_LIBRARY_DIR}
+ )
+- 
++
+ link_directories( ${LINK_DIRECTORIES})
+ 
+ set (SOURCES
+@@ -137,7 +138,7 @@ Set(NODICT_HEADERS
+   KFParticlePerformance/KFPartMatch.h
+ )
+ 
+-install(FILES ${HEADERS} ${NODICT_HEADERS} DESTINATION include)
++install(FILES ${HEADERS} ${NODICT_HEADERS} DESTINATION include/KFParticle)
+ install(FILES ${CMAKE_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}KFParticle_rdict.pcm DESTINATION lib OPTIONAL)
+ install(FILES ${CMAKE_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}KFParticle.rootmap DESTINATION lib)
+ install(TARGETS KFParticle DESTINATION lib)
+diff --git a/KFLinkDef.h b/KFLinkDef.h
+index d51285b..35afa80 100644
+--- a/KFLinkDef.h
++++ b/KFLinkDef.h
+@@ -10,7 +10,6 @@
+ #pragma link C++ class KFVertex + ;
+ #pragma link C++ class KFPartEfficiencies + ;
+ #pragma link C++ class KFMCParticle + ;
+-#pragma link C++ class KFParticle + ;
+ #pragma link C++ class KFParticleTest + ;
+ 
+ #endif
diff --git a/reco/KF/CbmKFParticleFinder.cxx b/reco/KF/CbmKFParticleFinder.cxx
index 7ffc2dd17b3d360597bb4e435c1ca09c6baa91ca..6e8f840385b6f442625cdcf8b4561bf0128d3f7e 100644
--- a/reco/KF/CbmKFParticleFinder.cxx
+++ b/reco/KF/CbmKFParticleFinder.cxx
@@ -21,8 +21,8 @@
 #include "FairRunAna.h"
 
 //KF Particle headers
-#include "KFPTrackVector.h"
-#include "KFParticleTopoReconstructor.h"
+#include "KFParticle/KFPTrackVector.h"
+#include "KFParticle/KFParticleTopoReconstructor.h"
 
 #include <Logger.h>
 
diff --git a/reco/KF/CbmKFParticleFinderQa.cxx b/reco/KF/CbmKFParticleFinderQa.cxx
index 0755843f8afc1384bfe6e2ebb1819c734388a2dc..d3d50e64ca13c7b459a9a50f73df3554a2986a02 100644
--- a/reco/KF/CbmKFParticleFinderQa.cxx
+++ b/reco/KF/CbmKFParticleFinderQa.cxx
@@ -15,12 +15,12 @@
 #include "CbmTrack.h"
 #include "CbmTrackMatchNew.h"
 #include "FairRunAna.h"
+#include "KFParticleMatch.h"
 
 //KF Particle headers
-#include "KFMCTrack.h"
-#include "KFParticleMatch.h"
-#include "KFParticleTopoReconstructor.h"
-#include "KFTopoPerformance.h"
+#include "KFParticle/KFMCTrack.h"
+#include "KFParticle/KFParticleTopoReconstructor.h"
+#include "KFParticle/KFTopoPerformance.h"
 
 //ROOT headers
 #include "TCanvas.h"
diff --git a/reco/KF/CbmKFParticleInterface.cxx b/reco/KF/CbmKFParticleInterface.cxx
index 51de3abbec8ee94096dd6daf0d17b5802a9b94da..d2a583106fbc042a0394dc477a73591af3d08e69 100644
--- a/reco/KF/CbmKFParticleInterface.cxx
+++ b/reco/KF/CbmKFParticleInterface.cxx
@@ -13,9 +13,9 @@
 #include "CbmStsTrack.h"
 
 //KF Particle headers
-#include "KFPTrackVector.h"
-#include "KFParticle.h"
-#include "KFParticleSIMD.h"
+#include "KFParticle/KFPTrackVector.h"
+#include "KFParticle/KFParticle.h"
+#include "KFParticle/KFParticleSIMD.h"
 
 //ROOT headers
 #include "TClonesArray.h"  //to get arrays from the FairRootManager
diff --git a/reco/KF/CbmKFV0FinderTask.h b/reco/KF/CbmKFV0FinderTask.h
index 274eb4e4df7fc86c293ee186b79b83c756c58a8b..4a7a3fa694809e3b9e34a87bdb9695b42d00ba30 100644
--- a/reco/KF/CbmKFV0FinderTask.h
+++ b/reco/KF/CbmKFV0FinderTask.h
@@ -17,7 +17,7 @@
 #include "CbmKFVertex.h"
 #include "CbmVertex.h"
 #include "FairTask.h"
-#include "KFParticleTopoReconstructor.h"
+#include "KFParticle/KFParticleTopoReconstructor.h"
 
 #include <memory>
 
diff --git a/reco/calibration/CMakeLists.txt b/reco/calibration/CMakeLists.txt
index 29fb9cf1a1f511ca1369f0f028afc1a0c62a30e3..46af0e3e26cfcd1d28ee39eef41ec5416f9db226 100644
--- a/reco/calibration/CMakeLists.txt
+++ b/reco/calibration/CMakeLists.txt
@@ -23,3 +23,11 @@ set(INTERFACE_DEPENDENCIES
   )
 
 generate_cbm_library()
+
+# Install file which has no corresponding source file
+install(FILES
+        CbmOffsetDigiTime.h
+        CbmOffsetDigiTime.tmpl
+        DESTINATION include
+       )
+
diff --git a/reco/detectors/rich/CMakeLists.txt b/reco/detectors/rich/CMakeLists.txt
index b38217bac8c2bb088e46ddd26e77a288c7ad8956..15ccdb5aef70809fc529e5aaf7246ae363aede39 100644
--- a/reco/detectors/rich/CMakeLists.txt
+++ b/reco/detectors/rich/CMakeLists.txt
@@ -139,7 +139,8 @@ generate_cbm_library()
 
 install(FILES
         fitter/CbmRichRingFitterCOP.h fitter/CbmRichRingFitterBase.h
-        fitter/CbmRichRingFitterEllipseBase.h selection/CbmRichRingSelectImpl.h
+        fitter/CbmRichRingFitterEllipseBase.h fitter/CbmRichRingFitterEllipseTau.h
+        selection/CbmRichRingSelectImpl.h
         finder/CbmRichRingFinderHoughImpl.h finder/CbmRichRingFinderData.h
         DESTINATION include
        )
diff --git a/reco/littrack/CMakeLists.txt b/reco/littrack/CMakeLists.txt
index 440f22b87b55d8921babe03efc9026bc0a3a995e..30081168bf30c5a7712adbb676cf117b636b074d 100644
--- a/reco/littrack/CMakeLists.txt
+++ b/reco/littrack/CMakeLists.txt
@@ -52,8 +52,8 @@ set(SRCS
    cbm/base/CbmLitFieldFitter.cxx
    cbm/base/CbmLitToolFactory.cxx
    cbm/base/CbmLitTrackingGeometryConstructor.cxx
-   cbm/reco/CbmLitFindGlobalTracks.cxx 
-   cbm/reco/CbmLitFindGlobalTracksIdeal.cxx 
+   cbm/reco/CbmLitFindGlobalTracks.cxx
+   cbm/reco/CbmLitFindGlobalTracksIdeal.cxx
    cbm/reco/CbmLitFindGlobalTracksParallel.cxx
    cbm/utils/CbmLitConverterParallel.cxx
 )
@@ -185,6 +185,10 @@ install(FILES cbm/base/CbmLitDetectorSetup.h
         DESTINATION include/littrack/cbm/base
        )
 
+install(FILES cbm/qa/mc/CbmLitMCPoint.h
+        DESTINATION include
+       )
+
 install(FILES std/data/CbmLitFitNode.h
               std/data/CbmLitTrackParam.h
               std/data/CbmLitHit.h
diff --git a/reco/offline/steer/CMakeLists.txt b/reco/offline/steer/CMakeLists.txt
index 8ada18e7a344e15764870c872bbcb515dfb848b2..84c367589206572f20151d570ddd1db6268be792 100644
--- a/reco/offline/steer/CMakeLists.txt
+++ b/reco/offline/steer/CMakeLists.txt
@@ -2,7 +2,7 @@
 # V. Friese,     13 May 2023
 
 
-set(SRCS
+set(NO_DICT_SRCS
   Config.cxx
   Run.cxx
   TaskFactory.cxx
@@ -16,7 +16,7 @@ endif()
 
 
 set(LIBRARY_NAME CbmRecoOfflineSteer)
-set(LINKDEF RootLinkDef.h)
+#set(LINKDEF RootLinkDef.h)
 set(PUBLIC_DEPENDENCIES
   AlgoOffline
   CbmData
diff --git a/reco/offline/steer/Run.cxx b/reco/offline/steer/Run.cxx
index af0ac760ee739a0119ec4c2d640a1d32d559fec3..209e7d8e13f17f3acb42c7bc0dfa9a5fed1fb68a 100644
--- a/reco/offline/steer/Run.cxx
+++ b/reco/offline/steer/Run.cxx
@@ -240,4 +240,4 @@ namespace cbm::reco::offline
 
 }  // namespace cbm::reco::offline
 
-ClassImp(cbm::reco::offline::Run)
+//ClassImp(cbm::reco::offline::Run)
diff --git a/reco/offline/steer/Run.h b/reco/offline/steer/Run.h
index 9a47c06022f63158dce364a20ee8cf9a6f3f75f9..697e0eb38565a54bece4d31c27c9127fa82b0ee2 100644
--- a/reco/offline/steer/Run.h
+++ b/reco/offline/steer/Run.h
@@ -152,7 +152,7 @@ namespace cbm::reco::offline
     std::set<ECbmModuleId> fDataPresent = {};
 
 
-    ClassDef(cbm::reco::offline::Run, 1);
+    // ClassDef(cbm::reco::offline::Run, 1);
   };
 
 }  // namespace cbm::reco::offline
diff --git a/sim/detectors/rich/CMakeLists.txt b/sim/detectors/rich/CMakeLists.txt
index 4f767f72e13fd4634bbaa59f86b6076a85e2d214..3c2672bff0e24638fea3c663b87c1d0583c5b88b 100644
--- a/sim/detectors/rich/CMakeLists.txt
+++ b/sim/detectors/rich/CMakeLists.txt
@@ -43,3 +43,10 @@ set(PRIVATE_DEPENDENCIES
   )
 
 generate_cbm_library()
+
+# Install file which has no corresponding source file
+install(FILES
+        geo/RichGeoMaterials.h
+        DESTINATION include
+       )
+
diff --git a/sim/response/steer/CMakeLists.txt b/sim/response/steer/CMakeLists.txt
index 250a00737552303b8b4753377d38b2182a0fdff3..df73c871ceacc6882a537e8c9c154854353d1df7 100644
--- a/sim/response/steer/CMakeLists.txt
+++ b/sim/response/steer/CMakeLists.txt
@@ -1,7 +1,7 @@
 # CMakeList file for library libCbmSimDigitizationSteer
 # F. Linz,     09 January 2024
 
-set(SRCS
+set(NO_DICT_SRCS
   Config.cxx
   Run.cxx
   )
@@ -9,7 +9,7 @@ set(SRCS
 set(INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(LIBRARY_NAME CbmSimDigitizationSteer)
-set(LINKDEF RootLinkDef.h)
+#set(LINKDEF RootLinkDef.h)
 set(PUBLIC_DEPENDENCIES
   CbmData
   FairRoot::Base
diff --git a/sim/response/steer/Run.cxx b/sim/response/steer/Run.cxx
index 1e76e6be65651bbdb4696cdb08fb4df7de3208f9..a44db7c19bc00b4a3c5ccad63147254094369cfa 100644
--- a/sim/response/steer/Run.cxx
+++ b/sim/response/steer/Run.cxx
@@ -176,4 +176,4 @@ namespace cbm::sim::digitization
 
 }  // namespace cbm::sim::digitization
 
-ClassImp(cbm::sim::digitization::Run)
+//ClassImp(cbm::sim::digitization::Run)
diff --git a/sim/response/steer/Run.h b/sim/response/steer/Run.h
index 08ff0a60ec1e3203c7fc664845bfa5b820494c72..053a3c5cfa768add887cef752e675c8d0d29b9a2 100644
--- a/sim/response/steer/Run.h
+++ b/sim/response/steer/Run.h
@@ -122,7 +122,7 @@ namespace cbm::sim::digitization
     Config fConfig = {};
 
 
-    ClassDef(cbm::sim::digitization::Run, 1);
+    // ClassDef(cbm::sim::digitization::Run, 1);
   };
 
 }  // namespace cbm::sim::digitization