diff --git a/CMakeLists.txt b/CMakeLists.txt
index b69f85d748fea9ee362144ae8bfb1bb99e672eab..40d3181bd3886af7cea7b1f875c08304f0e2e92a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -283,6 +283,7 @@ SET(ROOT_INCLUDE_PATH ${ROOT_INCLUDE_PATH} "${GEANT3_INCLUDE_DIR}")
 Set(BASE_INCLUDE_DIRECTORIES
 ${BASE_INCLUDE_DIRECTORIES}
 ${SYSTEM_INCLUDE_DIRECTORIES}
+${FAIRLOGGER_INCLUDE_DIR}
 )
 
 # Set the library version in the main CMakeLists.txt
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
index 30d47d9a7d6167ee7cf48302af4c0485cc77e4e8..472b0da7ceaaa821538c7a1382b7fc4a123b90bc 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
@@ -10,11 +10,7 @@
 #include "CbmFormatMsHeaderPrintout.h"
 #include "CbmMcbm2018HodoPar.h"
 
-#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/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx
index 9fc564a7b49dd92de9df92770d72b918f723aecd..fff275550ab3a9320a5d22204699e9923f572c85 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx
@@ -10,11 +10,7 @@
 #include "CbmFormatMsHeaderPrintout.h"
 #include "CbmMcbm2018MuchPar.h"
 
-#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/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
index 5f04d4351500621313ae327634bfa061e29fda9a..6061e880616aa18d3ddb811fdc03c885b75dd3d1 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
@@ -12,11 +12,7 @@
 #include "CbmMcbm2018PsdPar.h"
 #include "CbmPsdAddress.h"
 
-#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/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
index 7a6a7ff692159f3fb91f090e5c4fd0c7f5957591..f01bdc155e083c4fb7296c787dd07ab918d88e61 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
@@ -62,8 +62,8 @@ fullTimeCorr = (T - AZ0R) - (AC2R-AC0R) + MSidx
 // ROOT
 #include <TCanvas.h>
 #include <TList.h>
-// FairRoot
-#include <FairLogger.h>
+// FairLogger
+#include <Logger.h>
 
 // CbmRoot
 #include "CbmMcbm2018RichPar.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx
index f86ae58ccac47a3092a0287909739ea8f50bb4ca..522d71c65a4fc54bed5bbe12b3efcdb443721758 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx
@@ -10,13 +10,8 @@
 #include "CbmFormatMsHeaderPrintout.h"
 #include "CbmMcbm2018StsPar.h"
 
-#include "FairLogger.h"
-#include "FairRootManager.h"
-#include "FairRun.h"
-#include "FairRunOnline.h"
-#include "FairRuntimeDb.h"
+#include <Logger.h>
 
-//#include "TProfile2D.h"
 #include "TCanvas.h"
 #include "TH1.h"
 #include "TH2.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
index 144f2c87025a52df1b03d32e6fe6d15237104ffe..d4f3bdfc9763fe1904879201920554f63fa3ea64 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
@@ -13,11 +13,7 @@
 #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/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
index 0ea5097f92627ea2065e5f6b4ea1592f195ccbd9..19b5bce3e126d4694d0f0dda8aee3eabde269008 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
@@ -4,10 +4,7 @@
 #include "CbmTrdParModDigi.h"
 #include "CbmTrdParSpadic.h"
 
-#include "FairLogger.h"
-#include "FairParAsciiFileIo.h"
-#include "FairRun.h"
-#include "FairRuntimeDb.h"
+#include <Logger.h>
 
 #include "TH2I.h"
 #include "TObjString.h"