diff --git a/include/nodejs/node_osrm_support.hpp b/include/nodejs/node_osrm_support.hpp
index 24af5f1b1..f69d8e813 100644
--- a/include/nodejs/node_osrm_support.hpp
+++ b/include/nodejs/node_osrm_support.hpp
@@ -24,7 +24,6 @@
 #include <boost/optional.hpp>
 
 #include <algorithm>
-#include <iostream>
 #include <iterator>
 #include <sstream>
 #include <stdexcept>
diff --git a/include/storage/io.hpp b/include/storage/io.hpp
index a172c660f..21095576e 100644
--- a/include/storage/io.hpp
+++ b/include/storage/io.hpp
@@ -18,6 +18,7 @@
 
 #include <cerrno>
 #include <cstring>
+#include <iostream>
 #include <tuple>
 #include <type_traits>
 
diff --git a/include/util/debug.hpp b/include/util/debug.hpp
index 792c3be42..2f60c369b 100644
--- a/include/util/debug.hpp
+++ b/include/util/debug.hpp
@@ -12,7 +12,7 @@
 #include "util/typedefs.hpp"
 
 #include <iomanip>
-#include <iostream>
+#include <ostream>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/include/util/exception.hpp b/include/util/exception.hpp
index 83800563f..660bae69a 100644
--- a/include/util/exception.hpp
+++ b/include/util/exception.hpp
@@ -30,7 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <array>
 #include <exception>
-#include <iostream>
 #include <string>
 #include <utility>
 
diff --git a/include/util/exception_utils.hpp b/include/util/exception_utils.hpp
index 58c128af0..cb96ff6bd 100644
--- a/include/util/exception_utils.hpp
+++ b/include/util/exception_utils.hpp
@@ -1,6 +1,8 @@
-#ifndef SOURCE_MACROS_HPP
-#define SOURCE_MACROS_HPP
+#ifndef EXCEPTION_UTILS_HPP
+#define EXCEPTION_UTILS_HPP
+
 #include <cstring>
+#include <string>
 
 // Helper macros, don't use these ones
 // STRIP the OSRM_PROJECT_DIR from the front of a filename.  Expected to come
@@ -12,4 +14,4 @@
 // This is the macro to use
 #define SOURCE_REF (OSRM_SOURCE_FILE_ + ":" + std::to_string(__LINE__))
 
-#endif // SOURCE_MACROS_HPP
+#endif // EXCEPTION_UTILS_HPP
diff --git a/include/util/lua_util.hpp b/include/util/lua_util.hpp
index cf006dfa2..75811db1d 100644
--- a/include/util/lua_util.hpp
+++ b/include/util/lua_util.hpp
@@ -10,7 +10,6 @@ extern "C"
 
 #include <boost/filesystem.hpp>
 
-#include <iostream>
 #include <string>
 
 namespace osrm::util
diff --git a/include/util/node_based_graph.hpp b/include/util/node_based_graph.hpp
index b45358fee..cb17b5a22 100644
--- a/include/util/node_based_graph.hpp
+++ b/include/util/node_based_graph.hpp
@@ -9,7 +9,6 @@
 
 #include <tbb/parallel_sort.h>
 
-#include <iostream>
 #include <memory>
 #include <utility>
 
diff --git a/src/benchmarks/packed_vector.cpp b/src/benchmarks/packed_vector.cpp
index 62aa1634d..7049c1852 100644
--- a/src/benchmarks/packed_vector.cpp
+++ b/src/benchmarks/packed_vector.cpp
@@ -5,6 +5,7 @@
 
 #include <algorithm>
 #include <iomanip>
+#include <iostream>
 #include <numeric>
 #include <random>
 #include <string>
diff --git a/src/extractor/compressed_edge_container.cpp b/src/extractor/compressed_edge_container.cpp
index 8504c8d02..916b1d489 100644
--- a/src/extractor/compressed_edge_container.cpp
+++ b/src/extractor/compressed_edge_container.cpp
@@ -9,8 +9,6 @@
 #include <limits>
 #include <string>
 
-#include <iostream>
-
 namespace osrm::extractor
 {
 
diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp
index 634395457..c4394dbaa 100644
--- a/src/extractor/extractor.cpp
+++ b/src/extractor/extractor.cpp
@@ -50,7 +50,6 @@
 #include <atomic>
 #include <bitset>
 #include <chrono>
-#include <iostream>
 #include <memory>
 #include <thread>
 #include <tuple>
diff --git a/src/partitioner/bisection_graph_view.cpp b/src/partitioner/bisection_graph_view.cpp
index f5f35b4f9..61ce7687f 100644
--- a/src/partitioner/bisection_graph_view.cpp
+++ b/src/partitioner/bisection_graph_view.cpp
@@ -1,6 +1,5 @@
 #include "partitioner/bisection_graph_view.hpp"
 
-#include <iostream>
 #include <iterator>
 
 #include <boost/assert.hpp>
diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp
index 65f422a31..d3e2041e5 100644
--- a/src/storage/storage.cpp
+++ b/src/storage/storage.cpp
@@ -31,7 +31,6 @@
 #include <cstdint>
 
 #include <fstream>
-#include <iostream>
 #include <iterator>
 #include <new>
 #include <string>
diff --git a/src/storage/storage_config.cpp b/src/storage/storage_config.cpp
index 40ca707a6..219304bd1 100644
--- a/src/storage/storage_config.cpp
+++ b/src/storage/storage_config.cpp
@@ -3,6 +3,9 @@
 #include "util/exception_utils.hpp"
 #include <boost/algorithm/string/case_conv.hpp>
 
+#include <istream>
+#include <string>
+
 namespace osrm::storage
 {
 std::istream &operator>>(std::istream &in, FeatureDataset &datasets)
diff --git a/src/tools/extract.cpp b/src/tools/extract.cpp
index 0fc615c49..77964727b 100644
--- a/src/tools/extract.cpp
+++ b/src/tools/extract.cpp
@@ -9,6 +9,7 @@
 
 #include <cstdlib>
 #include <exception>
+#include <iostream>
 #include <new>
 #include <thread>
 
diff --git a/src/util/coordinate.cpp b/src/util/coordinate.cpp
index 11e76074c..09509b804 100644
--- a/src/util/coordinate.cpp
+++ b/src/util/coordinate.cpp
@@ -1,16 +1,8 @@
-#include "util/coordinate_calculation.hpp"
-
-#ifndef NDEBUG
-#include "util/log.hpp"
-#endif
 #include "osrm/coordinate.hpp"
 
-#ifndef NDEBUG
-#include <bitset>
-#endif
-#include <iomanip>
-#include <iostream>
-#include <limits>
+#include "util/coordinate_calculation.hpp"
+
+#include <cstdint>
 
 namespace osrm::util
 {
diff --git a/src/util/exception.cpp b/src/util/exception.cpp
index a4146f289..2471b4895 100644
--- a/src/util/exception.cpp
+++ b/src/util/exception.cpp
@@ -1,7 +1,5 @@
 #include "util/exception.hpp"
 
-#include <utility>
-
 // This function exists to 'anchor' the class, and stop the compiler from
 // copying vtable and RTTI info into every object file that includes
 // this header. (Caught by -Wweak-vtables under Clang.)
diff --git a/src/util/guidance/turn_lanes.cpp b/src/util/guidance/turn_lanes.cpp
index c4594ecf9..e44dca9d5 100644
--- a/src/util/guidance/turn_lanes.cpp
+++ b/src/util/guidance/turn_lanes.cpp
@@ -1,11 +1,7 @@
 #include "util/guidance/turn_lanes.hpp"
 
-#include <algorithm>
-#include <iostream>
 #include <tuple>
 
-#include <boost/assert.hpp>
-
 namespace osrm::util::guidance
 {
 LaneTuple::LaneTuple() : lanes_in_turn(0), first_lane_from_the_right(INVALID_LANEID)