diff --git a/algo/base/Options.cxx b/algo/base/Options.cxx
index 85b256b6c9c955b309384ae433735e4315b14cdd..ea9ecace39cfe29f8fff9cec2161871e9f08c569 100644
--- a/algo/base/Options.cxx
+++ b/algo/base/Options.cxx
@@ -27,7 +27,7 @@ namespace std
   }
 }  // namespace std
 
-
+#ifndef CBM_ONLINE_USE_FAIRLOGGER
 void validate(boost::any& v, const std::vector<std::string>& values, severity_level*, int)
 {
 
@@ -46,6 +46,7 @@ void validate(boost::any& v, const std::vector<std::string>& values, severity_le
 
   v = it->second;
 }
+#endif  // Not CBM_ONLINE_USE_FAIRLOGGER
 
 Options::Options(int argc, char** argv)
 {
@@ -67,8 +68,10 @@ Options::Options(int argc, char** argv)
       "write results to file")
     ("device,d", po::value(&fDevice)->default_value("cpu")->value_name("<device>"),
       "select device (cpu, cuda0, cuda1, hip0, ...)")
+#ifndef CBM_ONLINE_USE_FAIRLOGGER
     ("log-level,l", po::value(&fLogLevel)->default_value(info)->value_name("<level>"),
       "set log level (debug, info, warning, error, fatal)")
+#endif  // Not CBM_ONLINE_USE_FAIRLOGGER
     ("monitor,m", po::value(&fMonitorUri)->value_name("<uri>")->implicit_value("file:cout"),
       "URI specifying monitor output (e.g. file:/tmp/monitor.txt, influx1:login:8086:cbmreco_status). Prints to cout when no argument is given. Monitor is disabled when flag is not set.")
     ("histogram", po::value(&fHistogramUri)->value_name("<uri>"), "URI to specify histogram server")
diff --git a/algo/base/Options.h b/algo/base/Options.h
index b5247796c644dc24ba7702ac4ddc1712937b461d..5a9d232fcac8b006b54cfc0ab3f4cdbe5b62a535 100644
--- a/algo/base/Options.h
+++ b/algo/base/Options.h
@@ -4,9 +4,9 @@
 #ifndef CBM_ALGO_BASE_OPTIONS_H
 #define CBM_ALGO_BASE_OPTIONS_H
 
+#include "AlgoFairloggerCompat.h"
 #include "Definitions.h"
 #include "compat/Filesystem.h"
-#include "log.hpp"
 #include "util/ProfilingLevel.h"
 
 #include <set>
@@ -25,7 +25,9 @@ namespace cbm::algo
     fs::path ParamsDir() const { return fParamsDir; }
     const std::string& InputLocator() const { return fInputLocator; }
     fs::path OutputFile() const { return fOutputFile; }
+#ifndef CBM_ONLINE_USE_FAIRLOGGER
     severity_level LogLevel() const { return fLogLevel; }
+#endif  // Not CBM_ONLINE_USE_FAIRLOGGER
     fs::path LogFile() const { return fLogFile; }
     const std::string& Device() const { return fDevice; }
     const std::string& MonitorUri() const { return fMonitorUri; }
@@ -70,7 +72,9 @@ namespace cbm::algo
     std::string fParamsDir;  // TODO: can we make this a std::path?
     std::string fInputLocator;
     std::string fOutputFile;
+#ifndef CBM_ONLINE_USE_FAIRLOGGER
     severity_level fLogLevel;
+#endif  // Not CBM_ONLINE_USE_FAIRLOGGER
     std::string fLogFile;
     std::string fDevice;
     std::string fMonitorUri;
diff --git a/algo/base/util/MemoryLogger.cxx b/algo/base/util/MemoryLogger.cxx
index 61c4777219bf5e59e732abbe0fc80559a9199822..ac50ef9f8bcbfd7a467c31ccf73329c4cfb74247 100644
--- a/algo/base/util/MemoryLogger.cxx
+++ b/algo/base/util/MemoryLogger.cxx
@@ -4,10 +4,9 @@
 
 #include "MemoryLogger.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "System.h"
 
-#include <log.hpp>
-
 using namespace cbm::algo;
 
 template<typename T>
diff --git a/algo/data/sts/LandauTable.cxx b/algo/data/sts/LandauTable.cxx
index 6192a145419cc938c4ab5c30b435bf4487abf54e..7d466c38ee9e0417585b1a85bf53f02ec528d64f 100644
--- a/algo/data/sts/LandauTable.cxx
+++ b/algo/data/sts/LandauTable.cxx
@@ -3,7 +3,7 @@
    Authors: Felix Weiglhofer [committer] */
 #include "LandauTable.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 #include <fstream>
 
diff --git a/algo/detectors/bmon/ReadoutConfig.cxx b/algo/detectors/bmon/ReadoutConfig.cxx
index 975e8206f3475e7bee141e204157e16b329fba91..dc8c325b6e1ba12ba7de05bb3dae1b8a374f89a9 100644
--- a/algo/detectors/bmon/ReadoutConfig.cxx
+++ b/algo/detectors/bmon/ReadoutConfig.cxx
@@ -4,13 +4,13 @@
 
 #include "ReadoutConfig.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "CbmTofAddress.h"
 #include "Exceptions.h"
 #include "gDpbMessv100.h"
 
 #include <bitset>
 #include <iomanip>
-#include <log.hpp>
 
 #include <fmt/format.h>
 
diff --git a/algo/detectors/bmon/Unpack.cxx b/algo/detectors/bmon/Unpack.cxx
index 165098afeabc7b3f1ba265d84ad33e4a700534a8..36dbc050e181bde29ac6142366641774cc6ccb7b 100644
--- a/algo/detectors/bmon/Unpack.cxx
+++ b/algo/detectors/bmon/Unpack.cxx
@@ -4,7 +4,7 @@
 
 #include "Unpack.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 using namespace cbm::algo::bmon;
 using fles::Subsystem;
diff --git a/algo/detectors/bmon/UnpackMS.cxx b/algo/detectors/bmon/UnpackMS.cxx
index dde62ac44fee08b03b1fbb5f0913a9d08f809216..4841b63c756230f96d737536f5e97b5e0d1b871b 100644
--- a/algo/detectors/bmon/UnpackMS.cxx
+++ b/algo/detectors/bmon/UnpackMS.cxx
@@ -4,9 +4,10 @@
 
 #include "UnpackMS.h"
 
+#include "AlgoFairloggerCompat.h"
+
 #include <cassert>
 #include <cmath>
-#include <log.hpp>
 #include <sstream>
 #include <utility>
 #include <vector>
diff --git a/algo/detectors/much/Unpack.cxx b/algo/detectors/much/Unpack.cxx
index 45f78ba06f8f091fa0e648cc8e95ba063a3a9793..4cc5efd443e1d8d433d5714406c47ab8a65bfe1f 100644
--- a/algo/detectors/much/Unpack.cxx
+++ b/algo/detectors/much/Unpack.cxx
@@ -4,7 +4,7 @@
 
 #include "Unpack.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 using namespace cbm::algo::much;
 using fles::Subsystem;
diff --git a/algo/detectors/rich/Unpack.cxx b/algo/detectors/rich/Unpack.cxx
index efbb1e7ca598ebc929687b76bbcf90c07b5a86b2..3fb2dd4f502c4c3a5a3fbc063ec28bae6d2548ab 100644
--- a/algo/detectors/rich/Unpack.cxx
+++ b/algo/detectors/rich/Unpack.cxx
@@ -4,7 +4,7 @@
 
 #include "Unpack.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 using namespace cbm::algo::rich;
 using fles::Subsystem;
diff --git a/algo/detectors/sts/HitfinderChain.cxx b/algo/detectors/sts/HitfinderChain.cxx
index d999d96290e2cd93fa278034b15797513a39ea9e..6f65f4621226d13ed49c230d14bb5fe4958712ea 100644
--- a/algo/detectors/sts/HitfinderChain.cxx
+++ b/algo/detectors/sts/HitfinderChain.cxx
@@ -4,11 +4,11 @@
 
 #include "HitfinderChain.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "Exceptions.h"
 #include "PODVector.h"
 #include "compat/OpenMP.h"
 
-#include <log.hpp>
 #include <numeric>
 
 using namespace cbm::algo;
@@ -76,7 +76,13 @@ sts::HitfinderChain::Result sts::HitfinderChain::operator()(gsl::span<const CbmS
   // 3. Copy digis into flat array with offsets per module
   FlattenDigis(digis, digiMap);
 
-  if (Opts().LogLevel() == trace) EnsureDigiOffsets(digiMap);
+#ifdef CBM_ONLINE_USE_FAIRLOGGER
+  if (fair::Logger::GetConsoleSeverity() == fair::Severity::trace) {
+#else
+  if (Opts().LogLevel() == trace) {
+#endif  // CBM_ONLINE_USE_FAIRLOGGER
+    EnsureDigiOffsets(digiMap);
+  }
 
   xpu::queue queue;
 
@@ -123,7 +129,11 @@ sts::HitfinderChain::Result sts::HitfinderChain::operator()(gsl::span<const CbmS
 
   queue.launch<SortDigis>(xpu::n_blocks(nModuleSides));
   xpu::k_add_bytes<SortDigis>(nDigisTotal * sizeof(CbmStsDigi));
+#ifdef CBM_ONLINE_USE_FAIRLOGGER
+  if (fair::Logger::GetConsoleSeverity() == fair::Severity::trace) {
+#else
   if (Opts().LogLevel() == trace) {
+#endif  // CBM_ONLINE_USE_FAIRLOGGER
     L_(trace) << "Ensuring STS digis are sorted...";
     queue.copy(hfc.digisPerModule, xpu::d2h);
     queue.copy(hfc.digiOffsetPerModule, xpu::d2h);
@@ -143,7 +153,11 @@ sts::HitfinderChain::Result sts::HitfinderChain::operator()(gsl::span<const CbmS
     queue.launch<CreateClusters>(xpu::n_threads(nDigisTotal));
     xpu::k_add_bytes<CreateClusters>(nDigisTotal * sizeof(CbmStsDigi));
   }
+#ifdef CBM_ONLINE_USE_FAIRLOGGER
+  if (fair::Logger::GetConsoleSeverity() == fair::Severity::trace) {
+#else
   if (Opts().LogLevel() == trace) {
+#endif  // CBM_ONLINE_USE_FAIRLOGGER
     L_(trace) << "Ensuring STS channel offsets correct...";
     xpu::buffer_prop propsOffset{hfc.channelOffsetPerModule};
     std::vector<u32> channelOffsetPerModule;
@@ -200,7 +214,11 @@ sts::HitfinderChain::Result sts::HitfinderChain::operator()(gsl::span<const CbmS
     // TODO: Make number of streams configurable
     hits = SplitHitsIntoStreams(hits, 100);
     SortHitsWithinPartition(hits);
+#ifdef CBM_ONLINE_USE_FAIRLOGGER
+    if (fair::Logger::GetConsoleSeverity() == fair::Severity::trace) {
+#else
     if (Opts().LogLevel() == trace) {
+#endif  // CBM_ONLINE_USE_FAIRLOGGER
       EnsureHitsSorted(hits);
     }
   }
diff --git a/algo/detectors/sts/ReadoutConfig.cxx b/algo/detectors/sts/ReadoutConfig.cxx
index df7c74355d4630c243d8318fa4edb290e02eb688..b9728265044ca0bc97bc8a00789975e3f79c6855 100644
--- a/algo/detectors/sts/ReadoutConfig.cxx
+++ b/algo/detectors/sts/ReadoutConfig.cxx
@@ -3,10 +3,10 @@
    Authors: Volker Friese [committer], Felix Weiglhofer */
 #include "ReadoutConfig.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "CbmStsAddress.h"
 #include "ChannelMaskSet.h"
 #include "Exceptions.h"
-#include "log.hpp"
 
 #include <cassert>
 #include <iomanip>
diff --git a/algo/detectors/sts/TrackingInterface.cxx b/algo/detectors/sts/TrackingInterface.cxx
index fad68ead46f0add9509b57b26272df92646fa4fe..0aedb2b958eaa0936406b503d80607b642ca8f4d 100644
--- a/algo/detectors/sts/TrackingInterface.cxx
+++ b/algo/detectors/sts/TrackingInterface.cxx
@@ -9,8 +9,8 @@
 
 #include "TrackingInterface.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "CbmStsAddress.h"
-#include "log.hpp"
 
 using cbm::algo::sts::TrackingInterface;
 
diff --git a/algo/detectors/sts/Unpack.cxx b/algo/detectors/sts/Unpack.cxx
index 44bb67928fcbfb27814dbe97331ae428b46d582c..d224f0d4f0b329627d467bd28832c2587b1de100 100644
--- a/algo/detectors/sts/Unpack.cxx
+++ b/algo/detectors/sts/Unpack.cxx
@@ -4,7 +4,7 @@
 
 #include "Unpack.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 using namespace cbm::algo::sts;
 using fles::Subsystem;
diff --git a/algo/detectors/sts/UnpackMS.cxx b/algo/detectors/sts/UnpackMS.cxx
index e71541e3f6a3f2e5f975a230a55a9b378c36fe8e..ad00258b2e62224a9cc2bd53a2e4f9c34795c9bb 100644
--- a/algo/detectors/sts/UnpackMS.cxx
+++ b/algo/detectors/sts/UnpackMS.cxx
@@ -4,8 +4,8 @@
 
 #include "UnpackMS.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "StsXyterMessage.h"
-#include "log.hpp"
 
 #include <cassert>
 #include <cmath>
diff --git a/algo/detectors/tof/Calibrate.cxx b/algo/detectors/tof/Calibrate.cxx
index d61d500ee1ec3fb645c39674663dc7c9eff7f97c..382ead10819368ba80bc91caac8246e75f2d30a4 100644
--- a/algo/detectors/tof/Calibrate.cxx
+++ b/algo/detectors/tof/Calibrate.cxx
@@ -4,7 +4,7 @@
 
 #include "Calibrate.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 #include "util/TimingsFormat.h"
 
 #include <chrono>
diff --git a/algo/detectors/tof/Hitfind.cxx b/algo/detectors/tof/Hitfind.cxx
index 64c84e533c5e67f183c6a7c18bf54e4d6d737b6c..119db83b1a43a26b37db80abe1e919ec39953f00 100644
--- a/algo/detectors/tof/Hitfind.cxx
+++ b/algo/detectors/tof/Hitfind.cxx
@@ -4,8 +4,8 @@
 
 #include "Hitfind.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "compat/OpenMP.h"
-#include "log.hpp"
 #include "util/TimingsFormat.h"
 
 #include <chrono>
diff --git a/algo/detectors/tof/ReadoutConfig.cxx b/algo/detectors/tof/ReadoutConfig.cxx
index 4b807c5106cf6078b01639ac88f8b30d2465a859..29eb2570dadc1932f3ee29fb82de771e2d75cf21 100644
--- a/algo/detectors/tof/ReadoutConfig.cxx
+++ b/algo/detectors/tof/ReadoutConfig.cxx
@@ -4,13 +4,13 @@
 
 #include "ReadoutConfig.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "CbmTofAddress.h"
 #include "Exceptions.h"
 #include "gDpbMessv100.h"
 
 #include <bitset>
 #include <iomanip>
-#include <log.hpp>
 
 using namespace std;
 
diff --git a/algo/detectors/tof/TrackingInterface.cxx b/algo/detectors/tof/TrackingInterface.cxx
index 69db5638f0bef9bc9835aa621cd7e500268b839e..0ed55e50960946c34f359d1b6401ecce0038caca 100644
--- a/algo/detectors/tof/TrackingInterface.cxx
+++ b/algo/detectors/tof/TrackingInterface.cxx
@@ -9,11 +9,11 @@
 
 #include "TrackingInterface.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "CbmTofAddress.h"
 #include "HitfindSetup.h"
 #include "ParFiles.h"
 #include "fmt/format.h"
-#include "log.hpp"
 
 using cbm::algo::tof::HitfindSetup;
 using cbm::algo::tof::TrackingInterface;
diff --git a/algo/detectors/tof/Unpack.cxx b/algo/detectors/tof/Unpack.cxx
index 7d566cfeb2066aa5ba288f462ab1e94b85c83362..1969e4e6a1755dcd6f9b4d4b197978e67f564ab5 100644
--- a/algo/detectors/tof/Unpack.cxx
+++ b/algo/detectors/tof/Unpack.cxx
@@ -4,7 +4,7 @@
 
 #include "Unpack.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 using namespace cbm::algo::tof;
 using fles::Subsystem;
diff --git a/algo/detectors/trd/Cluster2D.cxx b/algo/detectors/trd/Cluster2D.cxx
index b5e409c0041b20328231f00fffb0515df3dee573..19d6d2dcecdf1c511bf6b357c4ce183e5365e8ea 100644
--- a/algo/detectors/trd/Cluster2D.cxx
+++ b/algo/detectors/trd/Cluster2D.cxx
@@ -4,8 +4,8 @@
 
 #include "Cluster2D.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "CbmTrdDigi.h"
-#include "log.hpp"
 
 #include <cmath>
 
@@ -45,17 +45,17 @@ namespace cbm::algo::trd
   {
     /** Extend basic functionality of Cluster2D::AddDigi() for the case of 2D.
  * If chT < 0 use the basic functionality [default].
- * 
+ *
  * For the 2D the parameters are intergpreted as follows
  * chT : tilted paired channel [default 0x0fffffff]
  * chR : rectangular paired channel
  * dt  : offset in clks of the prompt signal
  *
  * if chT and chR positive the (chT, chR) are interpreted as the 2 channels
- * of the digi specific to the 2D version. The following specific cases 
- * can be distinguished : 
+ * of the digi specific to the 2D version. The following specific cases
+ * can be distinguished :
  *  - ch == 0 : no data, cluster signal sequence terminator
- *  - ch == -ch : no data, channel masked in HW 
+ *  - ch == -ch : no data, channel masked in HW
  */
 
     if (chT == 0xffff) {  // basic functionality for rectangular pads
diff --git a/algo/detectors/trd/HitFactory2D.cxx b/algo/detectors/trd/HitFactory2D.cxx
index 8e21bb28412f4bf2a6930c53bc55dba6de040b3c..2c93cc1ad7a60ebf918a489ed21997b8c3aa1cb7 100644
--- a/algo/detectors/trd/HitFactory2D.cxx
+++ b/algo/detectors/trd/HitFactory2D.cxx
@@ -4,7 +4,7 @@
 
 #include "HitFactory2D.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 #include <numeric>
 
diff --git a/algo/detectors/trd/HitFinder2D.cxx b/algo/detectors/trd/HitFinder2D.cxx
index 67f7a15c202c9193bbd0f74ed0e2389630ac4397..bff16859141b26132dc93482a6aef528b3ecea30 100644
--- a/algo/detectors/trd/HitFinder2D.cxx
+++ b/algo/detectors/trd/HitFinder2D.cxx
@@ -4,7 +4,7 @@
 
 #include "HitFinder2D.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 #include <numeric>
 
diff --git a/algo/detectors/trd/HitMerger2D.cxx b/algo/detectors/trd/HitMerger2D.cxx
index aa2cdefc5ff0409a9c45f068a17772f86cd88dd0..fc4e4a55d52340830ab9b21aa324a338bf03b0c2 100644
--- a/algo/detectors/trd/HitMerger2D.cxx
+++ b/algo/detectors/trd/HitMerger2D.cxx
@@ -4,7 +4,7 @@
 
 #include "HitMerger2D.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 #include <functional>
 #include <numeric>
diff --git a/algo/detectors/trd/Hitfind.cxx b/algo/detectors/trd/Hitfind.cxx
index 0320962a7a179155ca1ee0234eaa0609a2faec14..d0cb3f36cdc8e1655ab1426934ca9cd64fa9b219 100644
--- a/algo/detectors/trd/Hitfind.cxx
+++ b/algo/detectors/trd/Hitfind.cxx
@@ -4,8 +4,8 @@
 
 #include "Hitfind.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "compat/OpenMP.h"
-#include "log.hpp"
 #include "util/TimingsFormat.h"
 
 #include <chrono>
diff --git a/algo/detectors/trd/TrackingInterface.cxx b/algo/detectors/trd/TrackingInterface.cxx
index 7b119cb64d96faaae286794f32a74e90af339de5..97d67f8085fadf737b195e05e8c679f533e381f5 100644
--- a/algo/detectors/trd/TrackingInterface.cxx
+++ b/algo/detectors/trd/TrackingInterface.cxx
@@ -9,8 +9,8 @@
 
 #include "TrackingInterface.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "CbmTrdAddress.h"
-#include "log.hpp"
 
 using cbm::algo::trd::TrackingInterface;
 
diff --git a/algo/detectors/trd/Unpack.cxx b/algo/detectors/trd/Unpack.cxx
index 55eec70197cf9b5b7f422c854a9860f4b317633c..6e037ec986960b3713ebdd81233deb720812ff5f 100644
--- a/algo/detectors/trd/Unpack.cxx
+++ b/algo/detectors/trd/Unpack.cxx
@@ -4,7 +4,7 @@
 
 #include "Unpack.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 using namespace cbm::algo::trd;
 using fles::Subsystem;
diff --git a/algo/detectors/trd/UnpackMS.cxx b/algo/detectors/trd/UnpackMS.cxx
index 40fdd3be35e925dcd9dfbed534b57f2c79558e74..41310caaa2d241fa498ee8f4f215e86405127045 100644
--- a/algo/detectors/trd/UnpackMS.cxx
+++ b/algo/detectors/trd/UnpackMS.cxx
@@ -4,9 +4,10 @@
 
 #include "UnpackMS.h"
 
+#include "AlgoFairloggerCompat.h"
+
 #include <algorithm>
 #include <cassert>
-#include <log.hpp>
 #include <vector>
 
 using std::unique_ptr;
diff --git a/algo/detectors/trd2d/Unpack.cxx b/algo/detectors/trd2d/Unpack.cxx
index cc6b25977dc79ad4b7802d666921d6316b9af47f..ef628a177d65b674e0dd9979fb6eefc0d55787d8 100644
--- a/algo/detectors/trd2d/Unpack.cxx
+++ b/algo/detectors/trd2d/Unpack.cxx
@@ -4,7 +4,7 @@
 
 #include "Unpack.h"
 
-#include "log.hpp"
+#include "AlgoFairloggerCompat.h"
 
 using namespace cbm::algo::trd2d;
 using fles::Subsystem;
diff --git a/algo/global/Reco.cxx b/algo/global/Reco.cxx
index 96063d31866e1a179eaee06f035598df5050aed9..003f1c592ee5177b0250705680e538c6c57485dd 100644
--- a/algo/global/Reco.cxx
+++ b/algo/global/Reco.cxx
@@ -3,6 +3,7 @@
    Authors: Felix Weiglhofer [committer], P.-A. Loizeau */
 #include "Reco.h"
 
+#include "AlgoFairloggerCompat.h"
 #include "AuxDigiData.h"
 #include "BuildInfo.h"
 #include "CbmDigiEvent.h"
@@ -19,7 +20,6 @@
 #include "ca/core/data/CaTrack.h"
 #include "compat/OpenMP.h"
 #include "evbuild/Config.h"
-#include "log.hpp"
 #include "much/Unpack.h"
 #include "rich/Unpack.h"
 #include "sts/ChannelMaskSet.h"
diff --git a/algo/qa/CanvasConfig.cxx b/algo/qa/CanvasConfig.cxx
index 653e33c5471da955d5d468caf3d7abc086d347bd..322b082f75fbb91f592f4cf6efaad010fdf62203 100644
--- a/algo/qa/CanvasConfig.cxx
+++ b/algo/qa/CanvasConfig.cxx
@@ -9,7 +9,8 @@
 
 #include "CanvasConfig.h"
 
-#include <log.hpp>
+#include "AlgoFairloggerCompat.h"
+
 #include <sstream>
 
 using cbm::algo::qa::CanvasConfig;
diff --git a/algo/qa/PadConfig.cxx b/algo/qa/PadConfig.cxx
index 93cdc8741be8a79c81136d4d493c66881d4e039b..bd157e04ead76b1c970e9ec55e08e8049264665f 100644
--- a/algo/qa/PadConfig.cxx
+++ b/algo/qa/PadConfig.cxx
@@ -9,7 +9,8 @@
 
 #include "PadConfig.h"
 
-#include <log.hpp>
+#include "AlgoFairloggerCompat.h"
+
 #include <sstream>
 
 using cbm::algo::qa::PadConfig;
diff --git a/algo/qa/QaData.h b/algo/qa/QaData.h
index b8347363368de0f8ba2a7fdce3ed98aeab23fd69..0c87df69c5ff5eb5ffcc0664b8a0454358814b56 100644
--- a/algo/qa/QaData.h
+++ b/algo/qa/QaData.h
@@ -9,13 +9,13 @@
 
 #pragma once
 
+#include "AlgoFairloggerCompat.h"
 #include "CanvasConfig.h"
 #include "HistogramContainer.h"
 #include "HistogramSender.h"
 
 #include <boost/serialization/forward_list.hpp>
 
-#include <log.hpp>
 #include <memory>
 #include <string_view>
 #include <type_traits>
diff --git a/algo/unpack/CommonUnpacker.cxx b/algo/unpack/CommonUnpacker.cxx
index 6f0f871816f914cdf35c15e9a48db3d32581188d..9dc30db5792c2883a5f38a0ddfd24dcc91a9ec3b 100644
--- a/algo/unpack/CommonUnpacker.cxx
+++ b/algo/unpack/CommonUnpacker.cxx
@@ -3,8 +3,6 @@
    Authors: Felix Weiglhofer [committer], Dominik Smith */
 #include "CommonUnpacker.h"
 
-#include "log.hpp"
-
 using namespace cbm::algo;
 
 detail::MSData::MSData(const fles::Timeslice& ts, fles::Subsystem subsystem, gsl::span<u16> legalEqIds)
diff --git a/algo/unpack/CommonUnpacker.h b/algo/unpack/CommonUnpacker.h
index e9a36522486896ec1ff6073572f9d848cbf94917..3db3952e782feee53bcbc62c353b867f8287eb01 100644
--- a/algo/unpack/CommonUnpacker.h
+++ b/algo/unpack/CommonUnpacker.h
@@ -3,6 +3,7 @@
    Authors: Felix Weiglhofer [committer], Dominik Smith */
 #pragma once
 
+#include "AlgoFairloggerCompat.h"
 #include "Definitions.h"
 #include "PODVector.h"
 #include "Timeslice.hpp"
@@ -13,7 +14,6 @@
 
 #include <cstdint>
 #include <gsl/span>
-#include <log.hpp>
 #include <map>
 #include <vector>