Various include fixes/cleanups

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>

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)

src/gen/canvas.cpp

@@ -9,7 +9,6 @@
 
 #include "canvas.hpp"
 
-#include "hex.hpp"
 #include "raster.hpp"
 #include "tile.hpp"
 

src/gen/raster.cpp

@@ -11,7 +11,6 @@
 
 #include "canvas.hpp"
 #include "format.hpp"
-#include "pgsql.hpp"
 #include "tile.hpp"
 
 #include <string>

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>

src/geom-pole-of-inaccessibility.cpp

@@ -15,7 +15,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <iostream>
 #include <queue>
 
 /**

src/logging.cpp

@@ -11,6 +11,8 @@
 
 #include <osmium/thread/util.hpp>
 
+#include <ctime>
+
 namespace {
 
 thread_local unsigned int this_thread_num = 0;

src/middle-pgsql.cpp

@@ -15,7 +15,6 @@
  * emit the final geometry-enabled output formats
 */
 
-#include <array>
 #include <cassert>
 #include <cstdint>
 #include <cstdlib>

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>

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>

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 {

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>

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 {

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 {

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,

src/util.cpp

@@ -10,7 +10,6 @@
 #include "util.hpp"
 
 #include <iostream>
-#include <iterator>
 
 #ifdef _WIN32
 #include <windows.h>

src/wkb.cpp

@@ -19,7 +19,6 @@
 #include <stdexcept>
 #include <string>
 #include <string_view>
-#include <utility>
 
 namespace ewkb {
 

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"

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"

tests/test-options-parse.cpp

@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "command-line-parser.hpp"
-#include "taginfo-impl.hpp"
 #include "tagtransform.hpp"
 
 namespace {

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>
 

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")
 {

tests/test-util.cpp

@@ -12,7 +12,6 @@
 #include "util.hpp"
 
 #include <cstring>
-#include <limits>
 #include <string>
 #include <vector>