diff --git a/MQ/unpacker/CbmTbDaqBuffer.cxx b/MQ/unpacker/CbmTbDaqBuffer.cxx
index 3342871f94a2f2ebcfae9ecc5157c3b5cc95211f..e87a841f13592ef83ae3b722ac8683627b8cd656 100644
--- a/MQ/unpacker/CbmTbDaqBuffer.cxx
+++ b/MQ/unpacker/CbmTbDaqBuffer.cxx
@@ -9,7 +9,7 @@
 
 #include "CbmTbDaqBuffer.h"
 
-#include <FairLogger.h>  // for Logger, LOG
+#include <Logger.h>  // for Logger, LOG
 
 #include <boost/any.hpp>
 
diff --git a/algo/evbuild/EventBuilder.h b/algo/evbuild/EventBuilder.h
index bc34137464c139caaba9ccec1e251d72e2e35a18..945fb70f1ea6b133acb0256d1e6be6709af728f6 100644
--- a/algo/evbuild/EventBuilder.h
+++ b/algo/evbuild/EventBuilder.h
@@ -9,8 +9,6 @@
 #include "CbmDigiEvent.h"
 #include "CbmDigiTimeslice.h"
 
-#include <FairLogger.h>
-
 #include <algorithm>
 #include <map>
 #include <vector>
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx
index a4c4e07f0ecefa081857ec6c093edbf5a8f45312..f1c029b8f1e1b55375c3430893473ec5c13b02c5 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx
@@ -14,8 +14,8 @@
 
 #include "CbmAnaTreeContainer.h"
 
-#include <FairLogger.h>
 #include <FairRootManager.h>
+#include <Logger.h>
 
 #include <TBranch.h>
 #include <TChain.h>
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
index ab77b91163c8839c969aa42d0323a85c6300d568..b5c78c2edc244ac8285d8c22f64036148acdc7bf 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
@@ -13,8 +13,8 @@
 
 #include "NicaGeneratorWriteUnigen.h"
 
-#include <FairLogger.h>
 #include <FairTask.h>
+#include <Logger.h>
 
 #include <TTree.h>
 
diff --git a/analysis/common/analysis_tree_converter/CbmConverterTask.h b/analysis/common/analysis_tree_converter/CbmConverterTask.h
index f2d4e24847eafe0947fb8bec2b38caf25f2bc9d1..694d7e3c032e81866f293607c40743f11db9ba21 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterTask.h
+++ b/analysis/common/analysis_tree_converter/CbmConverterTask.h
@@ -7,8 +7,6 @@
 
 #include <CbmLink.h>
 
-#include <FairLogger.h>
-
 #include <map>
 #include <string>
 
diff --git a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
index 37d8d6dcb930cd519e406e1de38826a793a8cdef..f3e24e37ce322596e5355bf691e58cfd372f57c6 100644
--- a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
@@ -10,9 +10,9 @@
 #include "CbmMCDataManager.h"
 #include "CbmMCTrack.h"
 
-#include "FairLogger.h"
 #include "FairMCEventHeader.h"
 #include "FairRootManager.h"
+#include "Logger.h"
 
 #include <TClonesArray.h>
 #include <TDirectory.h>
diff --git a/core/base/utils/CbmFileUtils.cxx b/core/base/utils/CbmFileUtils.cxx
index 0da0247c419f447f6844015516b151c59ae34f70..059fdc5b1ca0dadbce891d0804854a48983098cb 100644
--- a/core/base/utils/CbmFileUtils.cxx
+++ b/core/base/utils/CbmFileUtils.cxx
@@ -4,7 +4,7 @@
 
 #include "CbmFileUtils.h"
 
-#include "FairLogger.h"  // for LOG, info and error
+#include "Logger.h"  // for LOG, info and error
 
 #include "TArchiveFile.h"  // for TArchiveFile
 #include "TFile.h"         // for TFile
diff --git a/core/config/CbmConfigBase.h b/core/config/CbmConfigBase.h
index b35f0f26e51401b93c46fd0dd035fd877a4784c1..8fb0706b5587e7d95b821aee71f99156f875347c 100644
--- a/core/config/CbmConfigBase.h
+++ b/core/config/CbmConfigBase.h
@@ -6,7 +6,7 @@
 
 #include "CbmDefs.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <TSystem.h>
 
@@ -159,8 +159,8 @@ public:
   static void SetLogLevel(const pt::ptree& moduleTree)
   {
     auto logScreenLevel = moduleTree.get_optional<std::string>("logScreenLevel");
-    if (logScreenLevel) FairLogger::GetLogger()->SetLogScreenLevel(logScreenLevel.get().c_str());
+    if (logScreenLevel) fair::Logger::SetConsoleSeverity(logScreenLevel.get().c_str());
     auto logVerbosityLevel = moduleTree.get_optional<std::string>("logVerbosityLevel");
-    if (logVerbosityLevel) FairLogger::GetLogger()->SetLogVerbosityLevel(logVerbosityLevel.get().c_str());
+    if (logVerbosityLevel) fair::Logger::SetVerbosity(logVerbosityLevel.get().c_str());
   }
 };
diff --git a/core/detectors/much/CbmMuchTrackingInterface.cxx b/core/detectors/much/CbmMuchTrackingInterface.cxx
index 6aa020b4a9a0a5549b61cbd7093a0d118637d5a6..0e43542eb5026d5bece6d8e08587d7c47fec0f12 100644
--- a/core/detectors/much/CbmMuchTrackingInterface.cxx
+++ b/core/detectors/much/CbmMuchTrackingInterface.cxx
@@ -13,7 +13,7 @@
 
 #include "FairDetector.h"
 #include "FairRunAna.h"
-#include <FairLogger.h>
+#include <Logger.h>
 
 ClassImp(CbmMuchTrackingInterface)
 
diff --git a/core/detectors/psd/CbmPsdContFact.cxx b/core/detectors/psd/CbmPsdContFact.cxx
index b2b51eaf9248b566a40c9ee41b78bce14ad1808f..6383e4d984ade61350112de664b935575814952e 100644
--- a/core/detectors/psd/CbmPsdContFact.cxx
+++ b/core/detectors/psd/CbmPsdContFact.cxx
@@ -16,8 +16,8 @@
 #include "CbmMcbm2018PsdPar.h"  // for CbmMcbm2018PsdPar
 
 #include <FairContFact.h>   // for FairContainer
-#include <FairLogger.h>     // for LOG
 #include <FairRuntimeDb.h>  // for FairRuntimeDb
+#include <Logger.h>         // for LOG
 
 #include <TList.h>    // for TList
 #include <TString.h>  // for TString
diff --git a/core/detectors/rich/CbmRichContFact.cxx b/core/detectors/rich/CbmRichContFact.cxx
index b21142b4d83e193df11e7af46cc007b90fc6e811..73db64eae2fb9391dd2f6babf5e3aac28b31fe9a 100644
--- a/core/detectors/rich/CbmRichContFact.cxx
+++ b/core/detectors/rich/CbmRichContFact.cxx
@@ -16,8 +16,8 @@
 #include "CbmMcbm2018RichPar.h"  // for CbmMcbm2018RichPar
 
 #include <FairContFact.h>   // for FairContainer
-#include <FairLogger.h>     // for LOG
 #include <FairRuntimeDb.h>  // for FairRuntimeDb
+#include <Logger.h>         // for LOG
 
 #include <TList.h>    // for TList
 #include <TString.h>  // for TString
diff --git a/core/detectors/sts/CbmStsTrackingInterface.cxx b/core/detectors/sts/CbmStsTrackingInterface.cxx
index e7605fac0d513efa7ee7c9ec8ca5b6f131d5f4cd..f57a2b520c34739fef7d3341237eb2c4b8a71c36 100644
--- a/core/detectors/sts/CbmStsTrackingInterface.cxx
+++ b/core/detectors/sts/CbmStsTrackingInterface.cxx
@@ -13,7 +13,7 @@
 
 #include "FairDetector.h"
 #include "FairRunAna.h"
-#include <FairLogger.h>
+#include <Logger.h>
 
 ClassImp(CbmStsTrackingInterface)
 
diff --git a/core/detectors/tof/CbmTofTrackingInterface.cxx b/core/detectors/tof/CbmTofTrackingInterface.cxx
index de024d1750ed18ac38d8cdb8848e4a029e37d895..61d5f2e744fb8f50deb6bf4752b9d34bb627b66c 100644
--- a/core/detectors/tof/CbmTofTrackingInterface.cxx
+++ b/core/detectors/tof/CbmTofTrackingInterface.cxx
@@ -17,7 +17,7 @@
 
 #include "FairDetector.h"
 #include "FairRunAna.h"
-#include <FairLogger.h>
+#include <Logger.h>
 
 ClassImp(CbmTofTrackingInterface)
 
diff --git a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx
index c234270691c69aee24000bf55f6f9c36355d85ea..0c00d4103b00e15bc2f9d28f02079bdc59ba8f7a 100644
--- a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx
+++ b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx
@@ -5,8 +5,8 @@
 #include "CbmMcbm2020TrdTshiftPar.h"
 
 // FairRoot
-#include "FairLogger.h"
 #include "FairParamList.h"
+#include "Logger.h"
 
 // ROOT
 #include "THnSparse.h"
diff --git a/core/detectors/trd/CbmTrdTrackingInterface.cxx b/core/detectors/trd/CbmTrdTrackingInterface.cxx
index 1a1722712071dcaf80b5b0fd3d475f4a0933c5b4..00e6a8c0c9e9dc1027f9f3de05f1497b164c7fbe 100644
--- a/core/detectors/trd/CbmTrdTrackingInterface.cxx
+++ b/core/detectors/trd/CbmTrdTrackingInterface.cxx
@@ -13,7 +13,7 @@
 
 #include "FairDetector.h"
 #include "FairRunAna.h"
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include "TGeoManager.h"
 #include "TString.h"
diff --git a/core/qa/CbmQaHist.h b/core/qa/CbmQaHist.h
index 5f838c0a55301de5d4408e83641ba6a78b7e1084..546e573b2567547faec4ae3fed1593919174e070 100644
--- a/core/qa/CbmQaHist.h
+++ b/core/qa/CbmQaHist.h
@@ -12,7 +12,7 @@
 
 #include "CbmQaCanvas.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <TFitResultPtr.h>
 #include <TPaveStats.h>
diff --git a/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx b/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
index 0fa600f9d00af6da6cc83bd0257ad3a02ca5c129..1716143ea135798d4e2c11e96d7e56517486c54d 100644
--- a/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
@@ -8,9 +8,9 @@
 #include "CbmStsDigi.h"
 #include "CbmStsHit.h"
 
-#include "FairLogger.h"
 #include "FairRootManager.h"
 #include "FairRunOnline.h"
+#include "Logger.h"
 
 #include "TClonesArray.h"
 #include "TFile.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx
index 97405255517c03f9faeaeda1afd9b99101293833..1abaf45326aa2760bd7c03ae07cf63a8abf83ad0 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx
@@ -12,11 +12,11 @@
 #include "CbmMcbm2018MuchPar.h"
 
 // // FairRoot
-#include "FairLogger.h"
 #include "FairRootManager.h"
 #include "FairRun.h"
 #include "FairRunOnline.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 //
 // // Root
 #include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx
index b14d25d7d095182c4e81e9fde55aaa2802f19b20..0c3d30b662c7e7181603be1799e76d02edd75c97 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx
@@ -7,12 +7,12 @@
 #include "CbmMcbm2018MonitorAlgoMuchLite.h"
 #include "CbmMcbm2018MuchPar.h"
 
-#include "FairLogger.h"
 #include "FairParGenericSet.h"
 #include "FairRootManager.h"
 #include "FairRun.h"
 #include "FairRunOnline.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 
 #include "TCanvas.h"
 #include "THttpServer.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
index dcf90bc7367fc07ebc4c3bcd28a49adb6f44ad74..aa40909ea95b83a616cab488a388563c17f0d0ce 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
@@ -17,11 +17,11 @@
 #include "CbmTofAddress.h"
 #include "CbmTofDetectorId_v14a.h"  // in cbmdata/tof
 
-#include "FairLogger.h"
 #include "FairRootManager.h"
 #include "FairRun.h"
 #include "FairRunOnline.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 
 #include "TCanvas.h"
 #include "TH1.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx b/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx
index 882c01784c7a536064ba149758cf8fd34e0de435..ff9f624413204b090fab74932c7b6819ce5fd76a 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx
@@ -14,12 +14,12 @@
 #include "CbmMcbm2018TofPar.h"
 #include "CbmMcbmSpillFindAlgo.h"
 
-#include "FairLogger.h"
 #include "FairParGenericSet.h"
 #include "FairRootManager.h"
 #include "FairRun.h"
 #include "FairRunOnline.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 
 #include "TCanvas.h"
 #include "THttpServer.h"
diff --git a/mvd/CbmMvdTrackingInterface.cxx b/mvd/CbmMvdTrackingInterface.cxx
index 7714dc6143c2081a8603dc6ed0cd8161a499c20d..dbc09eb3927af49be8ac0738bacf54c697a7d7bc 100644
--- a/mvd/CbmMvdTrackingInterface.cxx
+++ b/mvd/CbmMvdTrackingInterface.cxx
@@ -13,7 +13,7 @@
 
 #include "FairDetector.h"
 #include "FairRunAna.h"
-#include <FairLogger.h>
+#include <Logger.h>
 
 ClassImp(CbmMvdTrackingInterface)
 
diff --git a/reco/KF/CbmTrackingDetectorInterfaceInit.cxx b/reco/KF/CbmTrackingDetectorInterfaceInit.cxx
index 25fdaceb7ceee72e7a1fc9d3f29159580a93981b..ad27b0b6688e4b0915d38ad51705cb8b2d33065e 100644
--- a/reco/KF/CbmTrackingDetectorInterfaceInit.cxx
+++ b/reco/KF/CbmTrackingDetectorInterfaceInit.cxx
@@ -18,8 +18,6 @@
 #include "CbmTofTrackingInterface.h"
 #include "CbmTrdTrackingInterface.h"
 
-#include <FairLogger.h>
-
 ClassImp(CbmTrackingDetectorInterfaceInit)
 
   CbmTrackingDetectorInterfaceInit* CbmTrackingDetectorInterfaceInit::fpInstance = nullptr;
diff --git a/reco/KF/Interface/CbmPVFinderKF.cxx b/reco/KF/Interface/CbmPVFinderKF.cxx
index 0adca96f472c03e7d7f26ac6b88265de654c6806..f98d4ecdacbc1d3a3c5f5186076dfa4c56d6fb6a 100644
--- a/reco/KF/Interface/CbmPVFinderKF.cxx
+++ b/reco/KF/Interface/CbmPVFinderKF.cxx
@@ -10,8 +10,6 @@
 #include "CbmKFVertex.h"
 #include "CbmStsTrack.h"
 
-#include <FairLogger.h>
-
 #include "TClonesArray.h"
 
 #include "math.h"
diff --git a/reco/L1/CbmCaPerformance.cxx b/reco/L1/CbmCaPerformance.cxx
index 989c6a1e0916d5bf5606dabe3ae01afa2e43b45b..f9e4110cc5761d4245ed6e8c522d14be71234d71 100644
--- a/reco/L1/CbmCaPerformance.cxx
+++ b/reco/L1/CbmCaPerformance.cxx
@@ -13,8 +13,8 @@
 #include "CbmL1.h"  // for L1DetectorID
 #include "CbmMCDataManager.h"
 
-#include "FairLogger.h"
 #include "FairRootManager.h"
+#include "Logger.h"
 
 #include <cassert>
 #include <stdexcept>  // for std::logic_error
diff --git a/reco/L1/L1Algo/L1Array.h b/reco/L1/L1Algo/L1Array.h
index d2754a9773e5652a560c54fb48569b14c9b5ce84..ed8fd640d36323f7eafe23170d15b0a0d5d5abbe 100644
--- a/reco/L1/L1Algo/L1Array.h
+++ b/reco/L1/L1Algo/L1Array.h
@@ -5,7 +5,7 @@
 #ifndef L1Array_h
 #define L1Array_h 1
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <array>
 #include <string>
diff --git a/reco/L1/L1Algo/L1Assert.h b/reco/L1/L1Algo/L1Assert.h
index a5e03567c5a262725f26f81d3b693a757c5c16c2..97f4fc8b39a1a7dbd913950ff68b10e7effe1e33 100644
--- a/reco/L1/L1Algo/L1Assert.h
+++ b/reco/L1/L1Algo/L1Assert.h
@@ -20,7 +20,7 @@
 #ifndef L1Assert_h
 #define L1Assert_h 1
 
-#include "FairLogger.h"
+#include "Logger.h"
 
 #if defined(NDEBUG) || defined(L1_NO_ASSERT)  // TODO: Do we need to add FAST_CODE here? (S.Zharko)
 #define L1ASSERT(LEVEL, COND)
diff --git a/reco/L1/L1Algo/L1BaseStationInfo.cxx b/reco/L1/L1Algo/L1BaseStationInfo.cxx
index 0592d84b0d067df8a576403c0b7fca4f16b54eef..6165bc78174371309a5aa7e80db1945681cc2cc2 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.cxx
+++ b/reco/L1/L1Algo/L1BaseStationInfo.cxx
@@ -14,7 +14,7 @@
  ***********************************************************************************************************/
 
 // FairRoot
-#include <FairLogger.h>
+#include <Logger.h>
 
 // L1Algo core
 #include "L1Assert.h"
diff --git a/reco/L1/L1Algo/L1CAIteration.h b/reco/L1/L1Algo/L1CAIteration.h
index a6e3d59f0360f8f44bd00f6ee50e23619ad17fcb..199d93a408ae98acd313a266ba8616f4b49be9ad 100644
--- a/reco/L1/L1Algo/L1CAIteration.h
+++ b/reco/L1/L1Algo/L1CAIteration.h
@@ -12,7 +12,7 @@
 #ifndef L1CAIteration_h
 #define L1CAIteration_h 1
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <boost/serialization/access.hpp>
 #include <boost/serialization/string.hpp>
diff --git a/reco/L1/L1Algo/L1MaterialInfo.cxx b/reco/L1/L1Algo/L1MaterialInfo.cxx
index c02b993a702403f0f81bbf4eecbd9583be332423..442ba6a87d98b2fe8e7c346235675348f9c172e0 100644
--- a/reco/L1/L1Algo/L1MaterialInfo.cxx
+++ b/reco/L1/L1Algo/L1MaterialInfo.cxx
@@ -4,7 +4,7 @@
 
 #include "L1MaterialInfo.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <iomanip>
 #include <sstream>
diff --git a/reco/L1/L1Algo/L1ObjectInitController.h b/reco/L1/L1Algo/L1ObjectInitController.h
index 353ca0a2f251ea411b26ae6cb47794c70a3fcfa2..ac9a141849c76d2908fcf191f4039cc92efe11be 100644
--- a/reco/L1/L1Algo/L1ObjectInitController.h
+++ b/reco/L1/L1Algo/L1ObjectInitController.h
@@ -9,7 +9,7 @@
 /// @author Sergei Zharko
 /// @date   22.02.2022
 
-#include "FairLogger.h"
+#include "Logger.h"
 
 #include <bitset>
 #include <cassert>
diff --git a/reco/L1/L1Algo/L1Parameters.cxx b/reco/L1/L1Algo/L1Parameters.cxx
index 78b3aebc776cdd77e0e7e1ca77dba61a871b21fa..3bd33def768c1e827a66705926286626fa5fde6d 100644
--- a/reco/L1/L1Algo/L1Parameters.cxx
+++ b/reco/L1/L1Algo/L1Parameters.cxx
@@ -9,7 +9,7 @@
 
 #include "L1Parameters.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <iomanip>
 
diff --git a/reco/L1/L1Algo/L1Station.cxx b/reco/L1/L1Algo/L1Station.cxx
index 17fa68f124c30d2534c2fcd404ff90cbac8c2376..8c3bf9905b81e9885afc61cba01c1d79cef0cb54 100644
--- a/reco/L1/L1Algo/L1Station.cxx
+++ b/reco/L1/L1Algo/L1Station.cxx
@@ -4,7 +4,7 @@
 
 #include "L1Station.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <iomanip>
 #include <sstream>
diff --git a/reco/L1/L1Algo/L1Utils.h b/reco/L1/L1Algo/L1Utils.h
index 1fb299955b0a714fcc025b65e6c2d2ba9c1745c1..bd1b798ab9c0545d14901a3520566f86b9f36bc8 100644
--- a/reco/L1/L1Algo/L1Utils.h
+++ b/reco/L1/L1Algo/L1Utils.h
@@ -10,7 +10,7 @@
 #ifndef L1Utils_h
 #define L1Utils_h 1
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <chrono>
 #include <iomanip>
diff --git a/reco/L1/L1Algo/L1Vector.h b/reco/L1/L1Algo/L1Vector.h
index 5e5654afb86681f17d9b6cf3fed514b47eb36cef..5c77cd0b1dde9e9fa82005366510529a8b8d47d7 100644
--- a/reco/L1/L1Algo/L1Vector.h
+++ b/reco/L1/L1Algo/L1Vector.h
@@ -12,7 +12,7 @@
 
 #include "L1Def.h"
 #ifndef FAST_CODE
-#include <FairLogger.h>
+#include <Logger.h>
 #endif
 #include <boost/serialization/access.hpp>
 #include <boost/serialization/base_object.hpp>
diff --git a/reco/L1/L1Algo/utils/L1AlgoDraw.h b/reco/L1/L1Algo/utils/L1AlgoDraw.h
index 2bcdf5d419be8139d82a23ec5b3c500586dee249..be548cad4d1682eed89fff167b3ca42b0af7ddd8 100644
--- a/reco/L1/L1Algo/utils/L1AlgoDraw.h
+++ b/reco/L1/L1Algo/utils/L1AlgoDraw.h
@@ -5,6 +5,8 @@
 #ifndef L1AlgoDraw_h
 #define L1AlgoDraw_h 1
 
+#include <TString.h>
+
 #include <map>
 #include <vector>
 
diff --git a/reco/L1/qa/CbmTrackingInputQaSts.cxx b/reco/L1/qa/CbmTrackingInputQaSts.cxx
index 1728c0cd49793aefde062bb5428b65585e4f000a..9070e14be5d35e083f5db9b911070a920a5f2e94 100644
--- a/reco/L1/qa/CbmTrackingInputQaSts.cxx
+++ b/reco/L1/qa/CbmTrackingInputQaSts.cxx
@@ -23,7 +23,7 @@
 #include "CbmStsTrackingInterface.h"  // Communicate via tracking detector interface
 #include "CbmTimeSlice.h"
 
-#include "FairLogger.h"
+#include "Logger.h"
 
 #include "TClonesArray.h"
 #include "TDatabasePDG.h"
diff --git a/reco/base/CbmRecoUnpackConfig.tmpl b/reco/base/CbmRecoUnpackConfig.tmpl
index 7072c5fc68fa1d6850a11c5ad9845e90fce3e39b..54b9935aacd2d73cf073dc9856164718e8ad2990 100644
--- a/reco/base/CbmRecoUnpackConfig.tmpl
+++ b/reco/base/CbmRecoUnpackConfig.tmpl
@@ -21,7 +21,6 @@
 
 #include "CbmRecoUnpackAlgo.tmpl"
 
-#include <FairLogger.h>
 //#include <FairParAsciiFileIo.h>
 #include <FairRootManager.h>
 #include <Logger.h>
diff --git a/reco/base/CbmUnpackTask.tmpl b/reco/base/CbmUnpackTask.tmpl
index 2c22de882e31fbf32dc45e2c9c2fc6ed705b57e5..f7e47f8ded001a1f662a177da177001d00c85524 100644
--- a/reco/base/CbmUnpackTask.tmpl
+++ b/reco/base/CbmUnpackTask.tmpl
@@ -8,12 +8,12 @@
 /// CbmRoot (+externals) headers
 
 /// FairRoot headers
-#include <FairLogger.h>
 #include <FairRootManager.h>
 #include <FairRun.h>
 #include <FairRuntimeDb.h>
 #include <FairRunOnline.h>
 #include <FairParGenericSet.h>
+#include <Logger.h>
 
 /// Fairsoft (Root, Boost, ...) headers
 #include <THttpServer.h>
diff --git a/reco/calibration/CbmOffsetDigiTime.tmpl b/reco/calibration/CbmOffsetDigiTime.tmpl
index 3724843ca4a567bb40b813fbbdbdeeb4c1abfe73..1fa3830615cf17ba9624d5793a4a10fc8544a254 100644
--- a/reco/calibration/CbmOffsetDigiTime.tmpl
+++ b/reco/calibration/CbmOffsetDigiTime.tmpl
@@ -8,9 +8,9 @@
 /// CbmRoot (+externals) headers
 
 /// FairRoot headers
-#include "FairLogger.h"
 #include "FairRootManager.h"
 #include "FairRunOnline.h"
+#include "Logger.h"
 
 /// Fairsoft (Root, Boost, ...) headers
 
diff --git a/reco/detectors/much/unpack/CbmMuchUnpackConfig.h b/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
index 810b137774fd71b955df563e0143b43757404fde..cc6454696fd64adf13e23469de15e47e99bc4246 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
+++ b/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
@@ -21,9 +21,6 @@
 #include "CbmMuchUnpackMonitor.h"
 #include "CbmRecoUnpackConfig.tmpl"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h b/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h
index 19fcf860720db4389e63520f773410e1b6a8d743..907f2bd11f5920350434b2db1abbea2d91a15454 100644
--- a/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h
+++ b/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h
@@ -22,9 +22,6 @@
 #include "CbmPsdUnpackAlgo.h"
 #include "CbmRecoUnpackConfig.tmpl"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackConfig.h b/reco/detectors/rich/unpack/CbmRichUnpackConfig.h
index 9ddff96f43d1a4fbceb2848975c63de7ea56f239..28b2b8d09f6e6b584ed2401bc7f957ea119dcf83 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackConfig.h
+++ b/reco/detectors/rich/unpack/CbmRichUnpackConfig.h
@@ -23,9 +23,6 @@
 #include "CbmRichUnpackAlgoBase.h"
 #include "CbmRichUnpackMonitor.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackConfig.h b/reco/detectors/sts/unpack/CbmStsUnpackConfig.h
index 7a66125201507d22e44e609957f10e110d3ee2d9..9a96221525dc303a1c7c78c61b685c41d08d0b88 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackConfig.h
+++ b/reco/detectors/sts/unpack/CbmStsUnpackConfig.h
@@ -25,9 +25,6 @@
 #include "CbmStsUnpackAlgo.h"
 #include "CbmStsUnpackMonitor.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/tof/CbmTofExtendTracks.cxx b/reco/detectors/tof/CbmTofExtendTracks.cxx
index ea1b341b4311289c7a351a46d9664145faf2d3dd..794ac2eb9539e194ba3f9915eecd3a7603bc505e 100644
--- a/reco/detectors/tof/CbmTofExtendTracks.cxx
+++ b/reco/detectors/tof/CbmTofExtendTracks.cxx
@@ -31,11 +31,11 @@
 #include "CbmTofTrackletTools.h"
 #include "CbmVertex.h"
 
-#include "FairLogger.h"
 #include "FairRootFileSink.h"
 #include "FairRootManager.h"
 #include "FairRunAna.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 
 #include "TClonesArray.h"
 #include "TDirectory.h"
diff --git a/reco/detectors/tof/CbmTofHitMaker.cxx b/reco/detectors/tof/CbmTofHitMaker.cxx
index cf8beb1b240e57d1e172efcb257dd86be90f4bc0..d37137748293e48d89d5a19a453ca752a12af7c4 100644
--- a/reco/detectors/tof/CbmTofHitMaker.cxx
+++ b/reco/detectors/tof/CbmTofHitMaker.cxx
@@ -40,11 +40,11 @@
 
 // FAIR classes and includes
 #include "FairEventHeader.h"
-#include "FairLogger.h"
 #include "FairRootFileSink.h"
 #include "FairRootManager.h"
 #include "FairRunAna.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 
 // ROOT Classes and includes
 #include "TClonesArray.h"
diff --git a/reco/detectors/tof/unpack/CbmBmonUnpackConfig.h b/reco/detectors/tof/unpack/CbmBmonUnpackConfig.h
index 5d1f2ff0282504fbd218eff76c2f49a9d053242a..4b779d122a45970a5d13fd5de9e47e4ea1702619 100644
--- a/reco/detectors/tof/unpack/CbmBmonUnpackConfig.h
+++ b/reco/detectors/tof/unpack/CbmBmonUnpackConfig.h
@@ -23,9 +23,6 @@
 #include "CbmTofUnpackAlgo.h"
 #include "CbmTofUnpackConfig.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackConfig.h b/reco/detectors/tof/unpack/CbmTofUnpackConfig.h
index 0d5aecbaa25c779ae8bc005bdffc064d0f94062e..baa76c4d203c96b67c95a7f2a526aeb2614a5200 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackConfig.h
+++ b/reco/detectors/tof/unpack/CbmTofUnpackConfig.h
@@ -24,9 +24,6 @@
 #include "CbmTofUnpackAlgo.h"
 #include "CbmTofUnpackMonitor.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/trd/CbmTrdModuleRec2D.cxx b/reco/detectors/trd/CbmTrdModuleRec2D.cxx
index 5c4bf685f53ea3b230e3fb9c1425f953c30014c5..837d67caf584019b26dcae6dd3e625dffd230d2d 100644
--- a/reco/detectors/trd/CbmTrdModuleRec2D.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRec2D.cxx
@@ -12,7 +12,7 @@
 #include "CbmTrdHit.h"
 #include "CbmTrdParModDigi.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <TClonesArray.h>
 #include <TF1.h>
diff --git a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx
index 73a5277f8d3cfc85119446a7e084df7ddc102dec..353b087984c8e6d5503c44cb3b69fbc9f2828a19 100644
--- a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx
+++ b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx
@@ -6,7 +6,7 @@
 
 #include "CbmTrdSpadic.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <RtypesCore.h>
 #include <TFile.h>
diff --git a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.cxx b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.cxx
index c267400bc1a5f068f591bc1bb7236854517fed9e..bff1dea27ec46eeb777250abd8c6fe79a7a6c534 100644
--- a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.cxx
+++ b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.cxx
@@ -4,7 +4,7 @@
 
 #include "CbmTrdRawToDigiMaxAdcR.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <algorithm>
 #include <iostream>
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h b/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h
index 0a8e96d553d9e56a9d5ed9447041123477577481..0d81b49c3f5adea464f577f81f31b756476d88fa 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h
@@ -25,9 +25,6 @@
 #include "CbmTrdUnpackAlgoBaseR.h"
 #include "CbmTrdUnpackMonitor.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h b/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h
index 25540834f5e8354512269fec2e0e74df7b6961fb..bd3888642adab60e77f834ae0e75e7c84160864f 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h
@@ -25,9 +25,6 @@
 #include "CbmTrdUnpackFaspAlgo.h"
 #include "CbmTrdUnpackFaspMonitor.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
index fbee4665eed81ee682748b27a993076708f01b21..b4753a87423c4b4c8b8a3a3c7f21ba6302d89ec3 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
@@ -17,9 +17,9 @@
 #include "TimesliceMetaData.h"
 
 /// FAIRROOT headers
-#include <FairLogger.h>
 #include <FairRootManager.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 /// FAIRSOFT headers (geant, boost, ...)
 #include <TCanvas.h>
diff --git a/reco/eventbuilder/digis/CbmEvbuildRawAlgo.cxx b/reco/eventbuilder/digis/CbmEvbuildRawAlgo.cxx
index 2b848786e7e1dd523e1cf21a9d1393d87a2e9d28..b54e0f7f84a70280d2faa80190cee51cd8034661 100644
--- a/reco/eventbuilder/digis/CbmEvbuildRawAlgo.cxx
+++ b/reco/eventbuilder/digis/CbmEvbuildRawAlgo.cxx
@@ -17,9 +17,9 @@
 #include "TimesliceMetaData.h"
 
 /// FAIRROOT headers
-#include <FairLogger.h>
 #include <FairRootManager.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 /// FAIRSOFT headers (geant, boost, ...)
 #include <TCanvas.h>
diff --git a/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx b/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx
index db6fbc07c3e48569ed5ebe1f37c93c2b19dff916..81485a8cf031af234f542ebb6935096683ea33c9 100644
--- a/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx
+++ b/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx
@@ -7,9 +7,9 @@
 #include "CbmDigiManager.h"
 #include "CbmRawEvent.h"
 
-#include <FairLogger.h>
 #include <FairRootManager.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 #include <TClonesArray.h>
 #include <TFile.h>
diff --git a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
index 35a7e39ad46f1b0f75744130dabfa31275c4a79a..788478c65ab24c14a40c0c795cf432f9a2d4010a 100644
--- a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
@@ -10,9 +10,9 @@
 #include "CbmModuleList.h"
 #include "CbmSeedFinderSlidingWindow.h"
 
-#include <FairLogger.h>
 #include <FairRootManager.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 #include <TClonesArray.h>
 #include <TFile.h>
diff --git a/reco/tasks/CbmReco.cxx b/reco/tasks/CbmReco.cxx
index e9b7065bb74672f4d39827e0ed9b709d1e0f74a3..0c19981f42ddad99cd793bcb0790504f90ab625d 100644
--- a/reco/tasks/CbmReco.cxx
+++ b/reco/tasks/CbmReco.cxx
@@ -12,10 +12,10 @@
 #include "CbmTsEventHeader.h"
 
 #include <FairFileSource.h>
-#include <FairLogger.h>
 #include <FairRootFileSink.h>
 #include <FairRunAna.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 #include <THttpServer.h>
 #include <TRootSniffer.h>
diff --git a/reco/tasks/CbmTaskBuildEvents.cxx b/reco/tasks/CbmTaskBuildEvents.cxx
index d5fb029fb6c29b95affe5e03b7b8f99ee9185842..7ade6189079bd38721e23760e79c7e99f091b2f0 100644
--- a/reco/tasks/CbmTaskBuildEvents.cxx
+++ b/reco/tasks/CbmTaskBuildEvents.cxx
@@ -9,7 +9,7 @@
 #include "CbmDigiTimeslice.h"
 #include "CbmModuleList.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <TStopwatch.h>
 
diff --git a/reco/tasks/CbmTaskDigiEventQa.cxx b/reco/tasks/CbmTaskDigiEventQa.cxx
index 5574c4aaaca0a02cc64062048d8c6f87d8e489fb..e7218cd3c03f007db1c610ba1d2fba6ec199bb39 100644
--- a/reco/tasks/CbmTaskDigiEventQa.cxx
+++ b/reco/tasks/CbmTaskDigiEventQa.cxx
@@ -10,8 +10,8 @@
 #include "CbmModuleList.h"
 #include "CbmReco.h"  // for CbmRecoConfig
 
-#include <FairLogger.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 #include <TH1F.h>
 #include <THttpServer.h>
diff --git a/reco/tasks/CbmTaskMakeRecoEvents.cxx b/reco/tasks/CbmTaskMakeRecoEvents.cxx
index e2876f4954118614e50eff49cc3d396a24c8eb57..a07b32d9d57362557d57236c1207e2475c053bbf 100644
--- a/reco/tasks/CbmTaskMakeRecoEvents.cxx
+++ b/reco/tasks/CbmTaskMakeRecoEvents.cxx
@@ -8,7 +8,7 @@
 #include "CbmDefs.h"
 #include "CbmEvent.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <TClonesArray.h>
 #include <TStopwatch.h>
diff --git a/reco/tasks/CbmTaskTriggerDigi.cxx b/reco/tasks/CbmTaskTriggerDigi.cxx
index 9e339010c12c323a8c6d131c9baf43242b4dca34..6b6303244a1b6cc109c0016016eb977e56dd4569 100644
--- a/reco/tasks/CbmTaskTriggerDigi.cxx
+++ b/reco/tasks/CbmTaskTriggerDigi.cxx
@@ -15,7 +15,7 @@
 #include "CbmTofDigi.h"
 #include "CbmTrdDigi.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include "TimeClusterTrigger.h"
 
diff --git a/reco/tasks/CbmTaskUnpack.cxx b/reco/tasks/CbmTaskUnpack.cxx
index ef821c48de5cd61fcf6359f0605fd07531a7886d..034167b09f3025cb4634db54dde1d1ab9db040aa 100644
--- a/reco/tasks/CbmTaskUnpack.cxx
+++ b/reco/tasks/CbmTaskUnpack.cxx
@@ -14,8 +14,8 @@
 
 #include "MicrosliceDescriptor.hpp"
 
-#include <FairLogger.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 #include <TStopwatch.h>
 
diff --git a/sim/detectors/rich/geo/RichGeoCreator.cxx b/sim/detectors/rich/geo/RichGeoCreator.cxx
index d283a67526e72171ff6f310658595c4c44ea3175..43b64db7531ab59554597bebb0014891fc95a76b 100644
--- a/sim/detectors/rich/geo/RichGeoCreator.cxx
+++ b/sim/detectors/rich/geo/RichGeoCreator.cxx
@@ -4,7 +4,7 @@
 
 #include "RichGeoCreator.h"
 
-#include "FairLogger.h"
+#include "Logger.h"
 
 #include "TGeoArb8.h"
 #include "TGeoBBox.h"
diff --git a/sim/detectors/rich/geo/RichGeoMaterials.h b/sim/detectors/rich/geo/RichGeoMaterials.h
index 25f91a32bf98ebe2e3d09fe7c5a2c0ea62ce557b..fb6845c2539ac636e2f5e48449d598dc7b0c1a76 100644
--- a/sim/detectors/rich/geo/RichGeoMaterials.h
+++ b/sim/detectors/rich/geo/RichGeoMaterials.h
@@ -10,7 +10,7 @@
 #include "FairGeoLoader.h"
 #include "FairGeoMedia.h"
 #include "FairGeoMedium.h"
-#include "FairLogger.h"
+#include "Logger.h"
 
 #include "TGeoManager.h"
 #include "TGeoMedium.h"
diff --git a/sim/transport/generators/CbmBeamGenerator.cxx b/sim/transport/generators/CbmBeamGenerator.cxx
index f39dbba2ad27e9f0adf045ede55fc1bcbfbe5c94..f01f014c2725a5af3f21ebf8b7f6af339a1a4edf 100644
--- a/sim/transport/generators/CbmBeamGenerator.cxx
+++ b/sim/transport/generators/CbmBeamGenerator.cxx
@@ -12,10 +12,10 @@
 
 #include "CbmEventGenerator.h"
 
-#include "FairLogger.h"
 #include "FairMCEventHeader.h"
 #include "FairPrimaryGenerator.h"
 #include "FairRunSim.h"
+#include "Logger.h"
 
 #include "TFile.h"
 #include "TRandom.h"