Merge pull request #1513 from joto/include-fixes

lonvia · web-flow · commit b1a634a0ed3c · 2021-05-30T18:23:39.000+02:00
Include cleanups/fixes
diff --git a/src/db-check.cpp b/src/db-check.cpp
@@ -8,11 +8,15 @@
  */
 
 #include "db-check.hpp"
+#include "format.hpp"
 #include "logging.hpp"
+#include "options.hpp"
 #include "pgsql.hpp"
 #include "version.hpp"
 
+#include <cstdlib>
 #include <stdexcept>
+#include <string>
 
 /**
  * Check whether the table with the specified name exists in the specified
diff --git a/src/db-check.hpp b/src/db-check.hpp
@@ -10,7 +10,7 @@
  * For a full list of authors see the git log.
  */
 
-#include "options.hpp"
+class options_t;
 
 /**
  * Get settings from the database and check that minimum requirements for
diff --git a/src/db-copy.hpp b/src/db-copy.hpp
@@ -17,6 +17,7 @@
 #include <mutex>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include "osmtypes.hpp"
diff --git a/src/dependency-manager.hpp b/src/dependency-manager.hpp
@@ -16,6 +16,7 @@
 
 #include <cassert>
 #include <memory>
+#include <utility>
 
 class middle_t;
 
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
@@ -8,11 +8,12 @@
  */
 
 #include "flex-table-column.hpp"
+#include "format.hpp"
 
 #include <algorithm>
 #include <array>
 #include <cctype>
-#include <cstring>
+#include <cstdlib>
 #include <stdexcept>
 #include <utility>
 
diff --git a/src/flex-table-column.hpp b/src/flex-table-column.hpp
@@ -10,9 +10,7 @@
  * For a full list of authors see the git log.
  */
 
-#include "format.hpp"
-#include "reprojection.hpp"
-
+#include <cassert>
 #include <cstdint>
 #include <string>
 
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
@@ -14,7 +14,6 @@
 #include "util.hpp"
 
 #include <cassert>
-#include <stdexcept>
 #include <string>
 
 char const *type_to_char(osmium::item_type type) noexcept
diff --git a/src/geom.cpp b/src/geom.cpp
@@ -14,7 +14,9 @@
 #include <osmium/osm/way.hpp>
 
 #include <algorithm>
+#include <cmath>
 #include <iterator>
+#include <tuple>
 
 namespace geom {
 
diff --git a/src/geom.hpp b/src/geom.hpp
@@ -22,8 +22,11 @@
 #include <osmium/osm/node_ref_list.hpp>
 #include <osmium/memory/buffer.hpp>
 
+#include <algorithm>
+#include <cassert>
 #include <initializer_list>
 #include <ostream>
+#include <utility>
 #include <vector>
 
 namespace geom {
diff --git a/src/input.hpp b/src/input.hpp
@@ -27,7 +27,6 @@
 #include "osmtypes.hpp"
 
 class osmdata_t;
-class progress_display_t;
 
 struct type_id_version
 {
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
@@ -17,6 +17,7 @@ extern "C"
 }
 
 #include <cassert>
+#include <stdexcept>
 
 // The lua_getextraspace() function is only available from Lua 5.3. For
 // earlier versions we fall back to storing the context pointer in the
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
@@ -19,10 +19,10 @@
 #include <unordered_map>
 
 #include <cassert>
-#include <cstdio>
 #include <cstdlib>
-#include <cstring>
 #include <functional>
+#include <memory>
+#include <utility>
 
 #include <osmium/builder/osm_object_builder.hpp>
 #include <osmium/memory/buffer.hpp>
@@ -31,6 +31,7 @@
 #include "format.hpp"
 #include "logging.hpp"
 #include "middle-pgsql.hpp"
+#include "node-locations.hpp"
 #include "node-persistent-cache.hpp"
 #include "options.hpp"
 #include "osmtypes.hpp"
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
@@ -24,11 +24,12 @@
 
 #include "db-copy-mgr.hpp"
 #include "middle.hpp"
-#include "node-locations.hpp"
-#include "node-persistent-cache.hpp"
-#include "options.hpp"
 #include "pgsql.hpp"
 
+class node_locations_t;
+class node_persistent_cache;
+class options_t;
+
 class middle_query_pgsql_t : public middle_query_t
 {
 public:
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
@@ -13,7 +13,6 @@
 
 #include <osmium/builder/osm_object_builder.hpp>
 #include <osmium/util/delta.hpp>
-#include <osmium/util/string.hpp>
 
 // Workaround: This must be included before buffer_string.hpp due to a missing
 // include in the upstream code. https://github.com/mapbox/protozero/pull/104
@@ -22,9 +21,7 @@
 #include <protozero/buffer_string.hpp>
 #include <protozero/varint.hpp>
 
-#include <algorithm>
 #include <cassert>
-#include <limits>
 #include <memory>
 
 middle_ram_t::middle_ram_t(std::shared_ptr<thread_pool_t> thread_pool,
diff --git a/src/middle-ram.hpp b/src/middle-ram.hpp
@@ -10,9 +10,9 @@
  * For a full list of authors see the git log.
  */
 
-#include "logging.hpp"
 #include "middle.hpp"
 #include "node-locations.hpp"
+#include "osmtypes.hpp"
 #include "ordered-index.hpp"
 
 #include <osmium/index/nwr_array.hpp>
@@ -25,6 +25,7 @@
 #include <utility>
 
 class options_t;
+class thread_pool_t;
 
 /**
  * Implementation of middle for importing small to medium sized files into a
diff --git a/src/node-locations.cpp b/src/node-locations.cpp
@@ -9,8 +9,6 @@
 
 #include "node-locations.hpp"
 
-#include <osmium/osm/location.hpp>
-
 // Workaround: This must be included before buffer_string.hpp due to a missing
 // include in the upstream code. https://github.com/mapbox/protozero/pull/104
 #include <protozero/config.hpp>
@@ -19,7 +17,6 @@
 #include <protozero/varint.hpp>
 
 #include <cassert>
-#include <limits>
 
 bool node_locations_t::set(osmid_t id, osmium::Location location)
 {
diff --git a/src/node-locations.hpp b/src/node-locations.hpp
@@ -13,13 +13,13 @@
 #include "ordered-index.hpp"
 #include "osmtypes.hpp"
 
+#include <osmium/osm/location.hpp>
 #include <osmium/util/delta.hpp>
 
-#include <array>
 #include <cstddef>
+#include <cstdint>
 #include <limits>
 #include <string>
-#include <utility>
 
 /**
  * Node locations storage. This implementation encodes ids and locations
diff --git a/src/options.hpp b/src/options.hpp
@@ -12,6 +12,7 @@
 
 #include <osmium/osm/box.hpp>
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/ordered-index.cpp b/src/ordered-index.cpp
@@ -10,6 +10,7 @@
 #include "ordered-index.hpp"
 
 #include <algorithm>
+#include <cassert>
 
 void ordered_index_t::add(osmid_t id, std::size_t offset)
 {
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
@@ -8,21 +8,21 @@
  */
 
 #include "db-check.hpp"
-#include "format.hpp"
+#include "dependency-manager.hpp"
 #include "input.hpp"
 #include "logging.hpp"
 #include "middle.hpp"
 #include "options.hpp"
 #include "osmdata.hpp"
 #include "output.hpp"
-#include "reprojection.hpp"
 #include "util.hpp"
 #include "version.hpp"
 
 #include <osmium/util/memory.hpp>
 
 #include <exception>
 #include <memory>
+#include <utility>
 
 static void run(options_t const &options)
 {
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
@@ -8,6 +8,7 @@
  */
 
 #include <algorithm>
+#include <cassert>
 #include <chrono>
 #include <functional>
 #include <future>
@@ -23,7 +24,6 @@
 #include "options.hpp"
 #include "osmdata.hpp"
 #include "output.hpp"
-#include "thread-pool.hpp"
 #include "util.hpp"
 
 osmdata_t::osmdata_t(std::unique_ptr<dependency_manager_t> dependency_manager,
diff --git a/src/osmdata.hpp b/src/osmdata.hpp
@@ -19,6 +19,7 @@
  */
 
 #include <memory>
+#include <string>
 
 #include <osmium/fwd.hpp>
 #include <osmium/handler.hpp>
diff --git a/src/osmium-builder.cpp b/src/osmium-builder.cpp
@@ -7,9 +7,7 @@
  * For a full list of authors see the git log.
  */
 
-#include <algorithm>
 #include <cassert>
-#include <tuple>
 #include <vector>
 
 #include <osmium/area/geom_assembler.hpp>
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
@@ -7,7 +7,9 @@
  * For a full list of authors see the git log.
  */
 
+#include "db-copy.hpp"
 #include "expire-tiles.hpp"
+#include "format.hpp"
 #include "geom-transform.hpp"
 #include "logging.hpp"
 #include "lua-init.hpp"
@@ -18,6 +20,7 @@
 #include "output-flex.hpp"
 #include "pgsql.hpp"
 #include "reprojection.hpp"
+#include "thread-pool.hpp"
 #include "util.hpp"
 #include "version.hpp"
 #include "wkb.hpp"
@@ -34,7 +37,6 @@ extern "C"
 #include <rapidjson/writer.h>
 
 #include <cassert>
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <limits>
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
@@ -10,16 +10,11 @@
  * For a full list of authors see the git log.
  */
 
-#include "db-copy.hpp"
 #include "expire-tiles.hpp"
 #include "flex-table-column.hpp"
 #include "flex-table.hpp"
-#include "format.hpp"
-#include "geom-transform.hpp"
 #include "osmium-builder.hpp"
 #include "output.hpp"
-#include "table.hpp"
-#include "tagtransform.hpp"
 
 #include <osmium/index/id_set.hpp>
 #include <osmium/osm/item_type.hpp>
@@ -35,6 +30,12 @@ extern "C"
 #include <utility>
 #include <vector>
 
+class db_copy_thread_t;
+class db_deleter_by_type_and_id_t;
+class geom_transform_t;
+class options_t;
+class thread_pool_t;
+
 using idset_t = osmium::index::IdSetSmall<osmid_t>;
 
 /**
diff --git a/src/output-gazetteer.cpp b/src/output-gazetteer.cpp
@@ -13,7 +13,6 @@
 #include "osmtypes.hpp"
 #include "output-gazetteer.hpp"
 #include "pgsql.hpp"
-#include "wkb.hpp"
 
 #include <cstring>
 #include <memory>
diff --git a/src/output-gazetteer.hpp b/src/output-gazetteer.hpp
@@ -11,15 +11,20 @@
  */
 
 #include <memory>
+#include <utility>
 
 #include <osmium/memory/buffer.hpp>
 
-#include "db-copy-mgr.hpp"
 #include "gazetteer-style.hpp"
 #include "osmium-builder.hpp"
 #include "osmtypes.hpp"
 #include "output.hpp"
 
+class db_copy_thread_t;
+class thread_pool_t;
+
+struct middle_query_t;
+
 class output_gazetteer_t : public output_t
 {
     output_gazetteer_t(output_gazetteer_t const *other,
diff --git a/src/output-null.cpp b/src/output-null.cpp
@@ -8,7 +8,6 @@
  */
 
 #include "output-null.hpp"
-#include "osmtypes.hpp"
 
 std::shared_ptr<output_t>
 output_null_t::clone(std::shared_ptr<middle_query_t> const &mid,
diff --git a/src/output.cpp b/src/output.cpp
diff --git a/src/output.hpp b/src/output.hpp
diff --git a/src/pgsql-helper.cpp b/src/pgsql-helper.cpp
diff --git a/src/pgsql-helper.hpp b/src/pgsql-helper.hpp
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
diff --git a/src/table.cpp b/src/table.cpp
diff --git a/src/tagtransform.cpp b/src/tagtransform.cpp
diff --git a/src/tagtransform.hpp b/src/tagtransform.hpp
diff --git a/src/thread-pool.cpp b/src/thread-pool.cpp
diff --git a/src/thread-pool.hpp b/src/thread-pool.hpp
diff --git a/src/util.cpp b/src/util.cpp
diff --git a/src/util.hpp b/src/util.hpp
diff --git a/tests/test-domain-matcher.cpp b/tests/test-domain-matcher.cpp
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`#include "osmtypes.hpp"`
`28`	`28`
`29`	`29`	`class osmdata_t;`
`30`		`-class progress_display_t;`
`31`	`30`
`32`	`31`	`struct type_id_version`
`33`	`32`	`{`