diff --git a/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
index d65f8113d9e..92cdc0090c7 100644
--- a/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
+++ b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
@@ -12,7 +12,6 @@
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/MagneticField/MagneticFieldError.hpp"
 #include "Acts/MagneticField/MagneticFieldProvider.hpp"
-#include "Acts/Utilities/Grid.hpp"
 #include "Acts/Utilities/Interpolation.hpp"
 #include "Acts/Utilities/Result.hpp"
 
diff --git a/Core/include/Acts/MagneticField/MagneticFieldProvider.hpp b/Core/include/Acts/MagneticField/MagneticFieldProvider.hpp
index 068c2ed8e33..44596b73d6e 100644
--- a/Core/include/Acts/MagneticField/MagneticFieldProvider.hpp
+++ b/Core/include/Acts/MagneticField/MagneticFieldProvider.hpp
@@ -13,9 +13,6 @@
 #include "Acts/Utilities/Any.hpp"
 #include "Acts/Utilities/Result.hpp"
 
-#include <array>
-#include <memory>
-
 namespace Acts {
 
 /// @defgroup MagneticField Magnetic field
diff --git a/Core/include/Acts/Material/SurfaceMaterialMapper.hpp b/Core/include/Acts/Material/SurfaceMaterialMapper.hpp
index 305d293542c..1fece817478 100644
--- a/Core/include/Acts/Material/SurfaceMaterialMapper.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterialMapper.hpp
@@ -18,12 +18,9 @@
 #include "Acts/Material/AccumulatedSurfaceMaterial.hpp"
 #include "Acts/Material/ISurfaceMaterial.hpp"
 #include "Acts/Material/MaterialInteraction.hpp"
-#include "Acts/Propagator/MaterialInteractor.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/StraightLineStepper.hpp"
-#include "Acts/Propagator/SurfaceCollector.hpp"
-#include "Acts/Propagator/VolumeCollector.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
@@ -225,4 +222,5 @@ class SurfaceMaterialMapper {
   /// The logging instance
   std::unique_ptr<const Logger> m_logger;
 };
+
 }  // namespace Acts
diff --git a/Core/include/Acts/Navigation/DetectorNavigator.hpp b/Core/include/Acts/Navigation/DetectorNavigator.hpp
index 3bc324e187f..56f588dfb47 100644
--- a/Core/include/Acts/Navigation/DetectorNavigator.hpp
+++ b/Core/include/Acts/Navigation/DetectorNavigator.hpp
@@ -8,24 +8,19 @@
 
 #pragma once
 
-#include "Acts/Definitions/Units.hpp"
 #include "Acts/Detector/Detector.hpp"
 #include "Acts/Detector/DetectorVolume.hpp"
 #include "Acts/Detector/Portal.hpp"
-#include "Acts/Geometry/BoundarySurfaceT.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Geometry/Layer.hpp"
 #include "Acts/Navigation/NavigationState.hpp"
 #include "Acts/Propagator/NavigatorOptions.hpp"
 #include "Acts/Propagator/NavigatorStatistics.hpp"
-#include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
 #include <algorithm>
-#include <iomanip>
-#include <iterator>
 #include <sstream>
 #include <string>
 
diff --git a/Core/include/Acts/Propagator/StraightLineStepper.hpp b/Core/include/Acts/Propagator/StraightLineStepper.hpp
index 1227397fefb..f43728e7802 100644
--- a/Core/include/Acts/Propagator/StraightLineStepper.hpp
+++ b/Core/include/Acts/Propagator/StraightLineStepper.hpp
@@ -32,7 +32,6 @@
 #include "Acts/Utilities/MathHelpers.hpp"
 #include "Acts/Utilities/Result.hpp"
 
-#include <algorithm>
 #include <cmath>
 #include <functional>
 #include <limits>
diff --git a/Core/src/MagneticField/SolenoidBField.cpp b/Core/src/MagneticField/SolenoidBField.cpp
index 6fefe017b38..44cb12d3403 100644
--- a/Core/src/MagneticField/SolenoidBField.cpp
+++ b/Core/src/MagneticField/SolenoidBField.cpp
@@ -10,7 +10,6 @@
 
 #include "Acts/Utilities/VectorHelpers.hpp"
 
-#include <algorithm>
 #include <cmath>
 #include <numbers>
 
diff --git a/Core/src/Propagator/SympyStepper.cpp b/Core/src/Propagator/SympyStepper.cpp
index d55c073a851..b209d395a42 100644
--- a/Core/src/Propagator/SympyStepper.cpp
+++ b/Core/src/Propagator/SympyStepper.cpp
@@ -12,7 +12,6 @@
 #include "Acts/Propagator/detail/SympyJacobianEngine.hpp"
 
 #include <cmath>
-#include <cstdint>
 
 #include "codegen/sympy_stepper_math.hpp"
 
diff --git a/Core/src/Vertexing/HelicalTrackLinearizer.cpp b/Core/src/Vertexing/HelicalTrackLinearizer.cpp
index e42bc9d0aad..bc12feacbcb 100644
--- a/Core/src/Vertexing/HelicalTrackLinearizer.cpp
+++ b/Core/src/Vertexing/HelicalTrackLinearizer.cpp
@@ -9,7 +9,6 @@
 #include "Acts/Vertexing/HelicalTrackLinearizer.hpp"
 
 #include "Acts/Propagator/PropagatorOptions.hpp"
-#include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/Utilities/MathHelpers.hpp"
 #include "Acts/Vertexing/LinearizerTrackParameters.hpp"
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootBFieldWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootBFieldWriter.hpp
index a8685f809c9..109fbf7888e 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootBFieldWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootBFieldWriter.hpp
@@ -8,29 +8,19 @@
 
 #pragma once
 
-#include "Acts/Definitions/Units.hpp"
 #include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
 #include "Acts/Utilities/Logger.hpp"
-#include "ActsExamples/Framework/ProcessCode.hpp"
 
 #include <array>
 #include <cstddef>
-#include <ios>
 #include <memory>
-#include <mutex>
 #include <optional>
-#include <sstream>
-#include <stdexcept>
 #include <string>
 
 #include <TFile.h>
 #include <TTree.h>
 #include <boost/optional.hpp>
 
-namespace Acts {
-class InterpolatedMagneticField;
-}  // namespace Acts
-
 namespace ActsExamples {
 
 /// @class RootBFieldWriter
diff --git a/Examples/Io/Root/src/RootBFieldWriter.cpp b/Examples/Io/Root/src/RootBFieldWriter.cpp
index 894636d61c9..bb1d2f2e3b7 100644
--- a/Examples/Io/Root/src/RootBFieldWriter.cpp
+++ b/Examples/Io/Root/src/RootBFieldWriter.cpp
@@ -10,7 +10,6 @@
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
 
@@ -30,9 +29,6 @@ namespace ActsExamples {
 void RootBFieldWriter::run(const Config& config,
                            std::unique_ptr<const Acts::Logger> p_logger) {
   // Set up (local) logging
-  // @todo Remove dangerous using declaration once the logger macro
-  // tolerates it
-  using namespace Acts;
   ACTS_LOCAL_LOGGER(std::move(p_logger))
 
   Acts::MagneticFieldContext bFieldContext;
@@ -179,7 +175,7 @@ void RootBFieldWriter::run(const Config& config,
         for (std::size_t k = 0; k < nBinsZ; k++) {
           double raw_z = minZ + k * stepZ;
           Acts::Vector3 position(raw_x, raw_y, raw_z);
-          Vector3 bField = config.bField->getFieldUnchecked(position);
+          Acts::Vector3 bField = config.bField->getFieldUnchecked(position);
 
           x = raw_x / Acts::UnitConstants::mm;
           y = raw_y / Acts::UnitConstants::mm;
@@ -268,7 +264,7 @@ void RootBFieldWriter::run(const Config& config,
         z = raw_z / Acts::UnitConstants::mm;
         r = raw_r / Acts::UnitConstants::mm;
         Bz = bField.z() / Acts::UnitConstants::T;
-        Br = VectorHelpers::perp(bField) / Acts::UnitConstants::T;
+        Br = Acts::VectorHelpers::perp(bField) / Acts::UnitConstants::T;
         outputTree->Fill();
       }  // for R
     }  // for z
@@ -278,4 +274,5 @@ void RootBFieldWriter::run(const Config& config,
   ACTS_INFO("Closing and Writing ROOT output File : " << config.fileName);
   outputTree->Write();
 }
+
 }  // namespace ActsExamples
diff --git a/Examples/Python/src/MagneticField.cpp b/Examples/Python/src/MagneticField.cpp
index 15463386402..93d69f1a4b8 100644
--- a/Examples/Python/src/MagneticField.cpp
+++ b/Examples/Python/src/MagneticField.cpp
@@ -26,7 +26,6 @@
 #include <stdexcept>
 #include <string>
 #include <tuple>
-#include <type_traits>
 #include <utility>
 
 #include <pybind11/pybind11.h>
diff --git a/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp b/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp
index f6d8486e054..d7afdd11555 100644
--- a/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp
@@ -15,8 +15,6 @@
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Utilities/Result.hpp"
 
-#include <utility>
-
 namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 
diff --git a/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp b/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
index 1671aa7a429..9e246b6c326 100644
--- a/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
@@ -11,22 +11,17 @@
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/MagneticField/MagneticFieldProvider.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 #include "Acts/Utilities/Axis.hpp"
 #include "Acts/Utilities/AxisFwd.hpp"
 #include "Acts/Utilities/Grid.hpp"
 #include "Acts/Utilities/Result.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
-#include "Acts/Utilities/detail/grid_helper.hpp"
 
 #include <array>
 #include <cstddef>
-#include <functional>
 #include <optional>
-#include <tuple>
 #include <utility>
-#include <vector>
 
 using Acts::VectorHelpers::perp;
 
diff --git a/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp b/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
index 885e9ee59ec..05d2fb6dd8b 100644
--- a/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
@@ -16,7 +16,6 @@
 #include "Acts/Utilities/Result.hpp"
 
 #include <cstddef>
-#include <fstream>
 
 using namespace Acts::UnitLiterals;
 
diff --git a/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp b/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp
index e8171faf004..46cfdcc9065 100644
--- a/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp
@@ -10,7 +10,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Definitions/Direction.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/EventData/GenericCurvilinearTrackParameters.hpp"
@@ -23,25 +22,19 @@
 #include "Acts/Propagator/MaterialInteractor.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
-#include "Acts/Propagator/StandardAborters.hpp"
 #include "Acts/Propagator/SurfaceCollector.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 #include "Acts/Utilities/Result.hpp"
 
-#include <algorithm>
-#include <array>
 #include <cmath>
 #include <cstdint>
-#include <map>
 #include <memory>
 #include <numbers>
 #include <optional>
 #include <random>
-#include <tuple>
 #include <utility>
-#include <vector>
 
 namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
diff --git a/Tests/UnitTests/Core/Utilities/BFieldMapUtilsTests.cpp b/Tests/UnitTests/Core/Utilities/BFieldMapUtilsTests.cpp
index 5dd21ff38de..e175e23466c 100644
--- a/Tests/UnitTests/Core/Utilities/BFieldMapUtilsTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/BFieldMapUtilsTests.cpp
@@ -19,7 +19,6 @@
 #include <array>
 #include <cstddef>
 #include <random>
-#include <utility>
 #include <vector>
 
 namespace bdata = boost::unit_test::data;