From c06615483439f026679b6aa0ebbe655ca31f45ee Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Tue, 7 Apr 2026 09:34:08 +0200
Subject: [PATCH] Various include fixes/cleanups

Found by clang-tidy
---
 src/command-line-parser.cpp                 |  1 -
 src/expire-tiles.cpp                        | 19 +++++++++----------
 src/gen/canvas.cpp                          |  1 -
 src/gen/raster.cpp                          |  1 -
 src/geom-from-osm.cpp                       |  5 ++++-
 src/geom-pole-of-inaccessibility.cpp        |  1 -
 src/logging.cpp                             |  2 ++
 src/middle-pgsql.cpp                        |  1 -
 src/osmdata.cpp                             |  1 -
 src/output-flex.cpp                         |  6 ------
 src/output-pgsql.cpp                        |  6 ------
 src/output.cpp                              |  3 +--
 src/reprojection-generic-proj6.cpp          |  3 ---
 src/tagtransform-c.cpp                      |  1 -
 src/tagtransform.cpp                        |  3 +--
 src/util.cpp                                |  1 -
 src/wkb.cpp                                 |  1 -
 tests/test-expire-from-geometry.cpp         |  3 ++-
 tests/test-geom-pole-of-inaccessibility.cpp |  3 ---
 tests/test-options-parse.cpp                |  1 -
 tests/test-output-flex-example-configs.cpp  |  1 -
 tests/test-output-pgsql-style-file.cpp      |  3 +--
 tests/test-util.cpp                         |  1 -
 23 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp
index a89370d73..e2a8e0698 100644
--- a/src/command-line-parser.cpp
+++ b/src/command-line-parser.cpp
@@ -15,7 +15,6 @@
 #include "pgsql.hpp"
 #include "projection.hpp"
 #include "reprojection.hpp"
-#include "util.hpp"
 #include "version.hpp"
 
 #include <osmium/util/string.hpp>
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
index 72fa02deb..d9d2b81ec 100644
--- a/src/expire-tiles.cpp
+++ b/src/expire-tiles.cpp
@@ -7,25 +7,24 @@
  * For a full list of authors see the git log.
  */
 
-#include <algorithm>
-#include <cerrno>
-#include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <stdexcept>
-#include <string>
-
 #include "expire-tiles.hpp"
+
 #include "format.hpp"
 #include "geom-functions.hpp"
 #include "options.hpp"
 #include "projection.hpp"
 #include "reprojection.hpp"
-#include "table.hpp"
 #include "tile.hpp"
 #include "wkb.hpp"
 
+#include <algorithm>
+#include <cerrno>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <memory>
+#include <vector>
+
 expire_tiles_t::expire_tiles_t(uint32_t max_zoom,
                                std::shared_ptr<reprojection_t> projection,
                                std::size_t max_tiles_geometry)
diff --git a/src/gen/canvas.cpp b/src/gen/canvas.cpp
index 3f30e7530..8eff65564 100644
--- a/src/gen/canvas.cpp
+++ b/src/gen/canvas.cpp
@@ -9,7 +9,6 @@
 
 #include "canvas.hpp"
 
-#include "hex.hpp"
 #include "raster.hpp"
 #include "tile.hpp"
 
diff --git a/src/gen/raster.cpp b/src/gen/raster.cpp
index 2e22ef978..7eef03255 100644
--- a/src/gen/raster.cpp
+++ b/src/gen/raster.cpp
@@ -11,7 +11,6 @@
 
 #include "canvas.hpp"
 #include "format.hpp"
-#include "pgsql.hpp"
 #include "tile.hpp"
 
 #include <string>
diff --git a/src/geom-from-osm.cpp b/src/geom-from-osm.cpp
index 017a9e1f4..339148300 100644
--- a/src/geom-from-osm.cpp
+++ b/src/geom-from-osm.cpp
@@ -10,8 +10,11 @@
 #include "geom-from-osm.hpp"
 
 #include "geom-area-assembler.hpp"
-#include "osmtypes.hpp"
 
+#include <osmium/memory/buffer.hpp>
+#include <osmium/osm/location.hpp>
+#include <osmium/osm/node.hpp>
+#include <osmium/osm/relation.hpp>
 #include <osmium/osm/way.hpp>
 
 #include <cassert>
diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp
index 0b3a9657f..939696fcc 100644
--- a/src/geom-pole-of-inaccessibility.cpp
+++ b/src/geom-pole-of-inaccessibility.cpp
@@ -15,7 +15,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <iostream>
 #include <queue>
 
 /**
diff --git a/src/logging.cpp b/src/logging.cpp
index b4ecf345c..48bc0eb5a 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -11,6 +11,8 @@
 
 #include <osmium/thread/util.hpp>
 
+#include <ctime>
+
 namespace {
 
 thread_local unsigned int this_thread_num = 0;
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
index c31348395..631ed95aa 100644
--- a/src/middle-pgsql.cpp
+++ b/src/middle-pgsql.cpp
@@ -15,7 +15,6 @@
  * emit the final geometry-enabled output formats
 */
 
-#include <array>
 #include <cassert>
 #include <cstdint>
 #include <cstdlib>
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
index 3f0a5a105..3cc4c6a63 100644
--- a/src/osmdata.cpp
+++ b/src/osmdata.cpp
@@ -7,7 +7,6 @@
  * For a full list of authors see the git log.
  */
 
-#include <algorithm>
 #include <cassert>
 #include <chrono>
 #include <functional>
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
index 5541da3be..8be5af027 100644
--- a/src/output-flex.cpp
+++ b/src/output-flex.cpp
@@ -13,17 +13,14 @@
 #include "debug-output.hpp"
 #include "expire-output.hpp"
 #include "expire-tiles.hpp"
-#include "flex-index.hpp"
 #include "flex-lua-expire-output.hpp"
 #include "flex-lua-geom.hpp"
 #include "flex-lua-index.hpp"
 #include "flex-lua-locator.hpp"
 #include "flex-lua-table.hpp"
-#include "flex-lua-wrapper.hpp"
 #include "flex-write.hpp"
 #include "format.hpp"
 #include "geom-from-osm.hpp"
-#include "geom-functions.hpp"
 #include "logging.hpp"
 #include "lua-init.hpp"
 #include "lua-setup.hpp"
@@ -38,11 +35,8 @@
 #include "reprojection.hpp"
 #include "thread-pool.hpp"
 #include "util.hpp"
-#include "version.hpp"
 #include "wkb.hpp"
 
-#include <osmium/osm/types_from_string.hpp>
-
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
index de1f51275..6b250a696 100644
--- a/src/output-pgsql.cpp
+++ b/src/output-pgsql.cpp
@@ -15,11 +15,7 @@
  * emit the final geometry-enabled output formats
 */
 
-#include <future>
-#include <iostream>
-#include <limits>
 #include <memory>
-#include <stdexcept>
 #include <string>
 
 #include <cassert>
@@ -37,13 +33,11 @@
 #include "options.hpp"
 #include "osmtypes.hpp"
 #include "output-pgsql.hpp"
-#include "pgsql.hpp"
 #include "projection.hpp"
 #include "reprojection.hpp"
 #include "taginfo-impl.hpp"
 #include "tagtransform.hpp"
 #include "util.hpp"
-#include "wildcmp.hpp"
 #include "wkb.hpp"
 
 namespace {
diff --git a/src/output.cpp b/src/output.cpp
index c02b9179c..bae4f3634 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -16,8 +16,7 @@
 #include "output-null.hpp"
 #include "output-pgsql.hpp"
 
-#include <stdexcept>
-#include <string>
+#include <memory>
 #include <utility>
 
 std::shared_ptr<output_t>
diff --git a/src/reprojection-generic-proj6.cpp b/src/reprojection-generic-proj6.cpp
index febfbe1a3..e2b444e44 100644
--- a/src/reprojection-generic-proj6.cpp
+++ b/src/reprojection-generic-proj6.cpp
@@ -1,9 +1,6 @@
 #include "format.hpp"
 #include "reprojection.hpp"
 
-#include <osmium/geom/coordinates.hpp>
-#include <osmium/geom/util.hpp>
-
 #include <proj.h>
 
 namespace {
diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp
index ca2cfad84..bfbd7fe37 100644
--- a/src/tagtransform-c.cpp
+++ b/src/tagtransform-c.cpp
@@ -14,7 +14,6 @@
 #include "options.hpp"
 #include "taginfo-impl.hpp"
 #include "tagtransform-c.hpp"
-#include "util.hpp"
 #include "wildcmp.hpp"
 
 namespace {
diff --git a/src/tagtransform.cpp b/src/tagtransform.cpp
index 6a2c9b807..477c434c9 100644
--- a/src/tagtransform.cpp
+++ b/src/tagtransform.cpp
@@ -14,8 +14,7 @@
 #include "tagtransform-c.hpp"
 #include "tagtransform-lua.hpp"
 
-#include <stdexcept>
-#include <utility>
+#include <memory>
 
 std::unique_ptr<tagtransform_t>
 tagtransform_t::make_tagtransform(options_t const *options,
diff --git a/src/util.cpp b/src/util.cpp
index a9193454a..f45ffbb34 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -10,7 +10,6 @@
 #include "util.hpp"
 
 #include <iostream>
-#include <iterator>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/src/wkb.cpp b/src/wkb.cpp
index 629bb4d59..794a16a75 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -19,7 +19,6 @@
 #include <stdexcept>
 #include <string>
 #include <string_view>
-#include <utility>
 
 namespace ewkb {
 
diff --git a/tests/test-expire-from-geometry.cpp b/tests/test-expire-from-geometry.cpp
index 1cdb4206a..49ff65b40 100644
--- a/tests/test-expire-from-geometry.cpp
+++ b/tests/test-expire-from-geometry.cpp
@@ -9,8 +9,9 @@
 
 #include <catch.hpp>
 
-#include <random>
+#include <memory>
 #include <set>
+#include <utility>
 
 #include "expire-tiles.hpp"
 #include "projection.hpp"
diff --git a/tests/test-geom-pole-of-inaccessibility.cpp b/tests/test-geom-pole-of-inaccessibility.cpp
index c05017a2e..e70aea868 100644
--- a/tests/test-geom-pole-of-inaccessibility.cpp
+++ b/tests/test-geom-pole-of-inaccessibility.cpp
@@ -9,9 +9,6 @@
 
 #include <catch.hpp>
 
-#include "common-buffer.hpp"
-
-#include "geom-from-osm.hpp"
 #include "geom-functions.hpp"
 #include "geom-output.hpp"
 #include "geom-pole-of-inaccessibility.hpp"
diff --git a/tests/test-options-parse.cpp b/tests/test-options-parse.cpp
index 71d4e7f8f..cf632d120 100644
--- a/tests/test-options-parse.cpp
+++ b/tests/test-options-parse.cpp
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "command-line-parser.hpp"
-#include "taginfo-impl.hpp"
 #include "tagtransform.hpp"
 
 namespace {
diff --git a/tests/test-output-flex-example-configs.cpp b/tests/test-output-flex-example-configs.cpp
index 7775a5c27..7518aee6a 100644
--- a/tests/test-output-flex-example-configs.cpp
+++ b/tests/test-output-flex-example-configs.cpp
@@ -11,7 +11,6 @@
 
 #include "common-import.hpp"
 #include "common-options.hpp"
-#include "format.hpp"
 
 #include <osmium/util/string.hpp>
 
diff --git a/tests/test-output-pgsql-style-file.cpp b/tests/test-output-pgsql-style-file.cpp
index e0d06d17f..4851a30fa 100644
--- a/tests/test-output-pgsql-style-file.cpp
+++ b/tests/test-output-pgsql-style-file.cpp
@@ -9,8 +9,7 @@
 
 #include <catch.hpp>
 
-#include "common-import.hpp"
-#include "common-options.hpp"
+#include "taginfo-impl.hpp"
 
 TEST_CASE("Parse default style file")
 {
diff --git a/tests/test-util.cpp b/tests/test-util.cpp
index e64ce5aff..40ea8e517 100644
--- a/tests/test-util.cpp
+++ b/tests/test-util.cpp
@@ -12,7 +12,6 @@
 #include "util.hpp"
 
 #include <cstring>
-#include <limits>
 #include <string>
 #include <vector>