diff --git a/Detectors/ITSMFT/ITS/calibration/src/NoiseCalibrator.cxx b/Detectors/ITSMFT/ITS/calibration/src/NoiseCalibrator.cxx
index 5eefb6289ba68..56c10b0eb56ed 100644
--- a/Detectors/ITSMFT/ITS/calibration/src/NoiseCalibrator.cxx
+++ b/Detectors/ITSMFT/ITS/calibration/src/NoiseCalibrator.cxx
@@ -29,7 +29,7 @@ bool NoiseCalibrator::processTimeFrame(gsl::span<const o2::itsmft::CompClusterEx
   static int nTF = 0;
   LOG(INFO) << "Processing TF# " << nTF++;
 
-  auto pattIt = patterns.cbegin();
+  auto pattIt = patterns.begin();
   for (const auto& rof : rofs) {
     auto clustersInFrame = rof.getROFData(clusters);
     for (const auto& c : clustersInFrame) {
diff --git a/Detectors/ITSMFT/ITS/calibration/src/NoiseSlotCalibrator.cxx b/Detectors/ITSMFT/ITS/calibration/src/NoiseSlotCalibrator.cxx
index 4178a0cf275a4..7f0f6335d73c3 100644
--- a/Detectors/ITSMFT/ITS/calibration/src/NoiseSlotCalibrator.cxx
+++ b/Detectors/ITSMFT/ITS/calibration/src/NoiseSlotCalibrator.cxx
@@ -33,7 +33,7 @@ bool NoiseSlotCalibrator::processTimeFrame(gsl::span<const o2::itsmft::CompClust
   auto& slotTF = getSlotForTF(nTF);
   auto& noiseMap = *(slotTF.getContainer());
 
-  auto pattIt = patterns.cbegin();
+  auto pattIt = patterns.begin();
   for (const auto& rof : rofs) {
     auto clustersInFrame = rof.getROFData(clusters);
     for (const auto& c : clustersInFrame) {
diff --git a/Detectors/MUON/MCH/Mapping/Impl3/src/CathodeSegmentationImpl3.cxx b/Detectors/MUON/MCH/Mapping/Impl3/src/CathodeSegmentationImpl3.cxx
index 0c5f7243d4407..56cbcee3e9864 100644
--- a/Detectors/MUON/MCH/Mapping/Impl3/src/CathodeSegmentationImpl3.cxx
+++ b/Detectors/MUON/MCH/Mapping/Impl3/src/CathodeSegmentationImpl3.cxx
@@ -13,6 +13,7 @@
 
 #include "CathodeSegmentationImpl3.h"
 #include "boost/format.hpp"
+#include <boost/geometry.hpp>
 #include "GenDetElemId2SegType.h"
 #include "PadGroup.h"
 #include "PadSize.h"
diff --git a/Detectors/MUON/MCH/Mapping/Impl4/src/CathodeSegmentationImpl4.cxx b/Detectors/MUON/MCH/Mapping/Impl4/src/CathodeSegmentationImpl4.cxx
index 71a3c818643c7..62f6bfdcba9d1 100644
--- a/Detectors/MUON/MCH/Mapping/Impl4/src/CathodeSegmentationImpl4.cxx
+++ b/Detectors/MUON/MCH/Mapping/Impl4/src/CathodeSegmentationImpl4.cxx
@@ -13,6 +13,7 @@
 
 #include "CathodeSegmentationImpl4.h"
 #include "boost/format.hpp"
+#include <boost/geometry.hpp>
 #include "GenDetElemId2SegType.h"
 #include "PadGroup.h"
 #include "PadSize.h"
diff --git a/Detectors/MUON/MCH/PreClustering/include/MCHPreClustering/PreClusterFinder.h b/Detectors/MUON/MCH/PreClustering/include/MCHPreClustering/PreClusterFinder.h
index 53ed4c5378e71..2a18f6ba7895e 100644
--- a/Detectors/MUON/MCH/PreClustering/include/MCHPreClustering/PreClusterFinder.h
+++ b/Detectors/MUON/MCH/PreClustering/include/MCHPreClustering/PreClusterFinder.h
@@ -19,6 +19,7 @@
 #include <cstdint>
 #include <unordered_map>
 #include <vector>
+#include <memory>
 
 #include <gsl/span>