diff --git a/src/ai/formula/function_table.cpp b/src/ai/formula/function_table.cpp index b64e529eaec0..f5a17de1b5ba 100644 --- a/src/ai/formula/function_table.cpp +++ b/src/ai/formula/function_table.cpp @@ -27,6 +27,7 @@ #include "attack_prediction.hpp" #include "filesystem.hpp" #include "game_board.hpp" +#include "global.hpp" #include "display.hpp" #include "log.hpp" #include "map/label.hpp" diff --git a/src/commandline_argv.cpp b/src/commandline_argv.cpp index a1b78c180f95..8d318d18173a 100644 --- a/src/commandline_argv.cpp +++ b/src/commandline_argv.cpp @@ -15,7 +15,6 @@ #ifdef _WIN32 -#include "global.hpp" #include "serialization/unicode_cast.hpp" #include diff --git a/src/config.hpp b/src/config.hpp index dc3cf8f58a61..3a72515ce5da 100644 --- a/src/config.hpp +++ b/src/config.hpp @@ -29,7 +29,6 @@ #include "config_attribute_value.hpp" #include "exceptions.hpp" -#include "global.hpp" #include #include diff --git a/src/config_attribute_value.hpp b/src/config_attribute_value.hpp index 5609b32401ea..ee012b3ed822 100644 --- a/src/config_attribute_value.hpp +++ b/src/config_attribute_value.hpp @@ -27,7 +27,6 @@ #pragma once -#include "global.hpp" #include "tstring.hpp" #include "utils/variant.hpp" diff --git a/src/exceptions.hpp b/src/exceptions.hpp index c0c922b108f9..4f1c91863f34 100644 --- a/src/exceptions.hpp +++ b/src/exceptions.hpp @@ -14,8 +14,6 @@ #pragma once -#include "global.hpp" - #include #include diff --git a/src/formula/function.cpp b/src/formula/function.cpp index 4cfc5561e1d0..ad6df96cf2c9 100644 --- a/src/formula/function.cpp +++ b/src/formula/function.cpp @@ -19,6 +19,7 @@ #include "formula/debugger.hpp" #include "game_config.hpp" #include "game_display.hpp" +#include "global.hpp" #include "log.hpp" #include diff --git a/src/gettext.cpp b/src/gettext.cpp index 16e6467fa73f..8e0c6d550557 100644 --- a/src/gettext.cpp +++ b/src/gettext.cpp @@ -12,7 +12,6 @@ See the COPYING file for more details. */ -#include "global.hpp" #include "gettext.hpp" #include "log.hpp" #include "filesystem.hpp" diff --git a/src/gui/auxiliary/iterator/walker_grid.cpp b/src/gui/auxiliary/iterator/walker_grid.cpp index c2873c6ffac0..ab0f33aa1674 100644 --- a/src/gui/auxiliary/iterator/walker_grid.cpp +++ b/src/gui/auxiliary/iterator/walker_grid.cpp @@ -16,8 +16,6 @@ #include "gui/auxiliary/iterator/walker_grid.hpp" -#include "global.hpp" - #include namespace gui2 diff --git a/src/gui/auxiliary/iterator/walker_tree_node.cpp b/src/gui/auxiliary/iterator/walker_tree_node.cpp index 8b1882b95410..8ded91618be7 100644 --- a/src/gui/auxiliary/iterator/walker_tree_node.cpp +++ b/src/gui/auxiliary/iterator/walker_tree_node.cpp @@ -16,8 +16,6 @@ #include "gui/auxiliary/iterator/walker_tree_node.hpp" -#include "global.hpp" - #include namespace gui2 diff --git a/src/gui/auxiliary/iterator/walker_widget.cpp b/src/gui/auxiliary/iterator/walker_widget.cpp index 0ddbd7e8e886..f1e0d9baf92a 100644 --- a/src/gui/auxiliary/iterator/walker_widget.cpp +++ b/src/gui/auxiliary/iterator/walker_widget.cpp @@ -16,7 +16,6 @@ #include "gui/auxiliary/iterator/walker_widget.hpp" -#include "global.hpp" #include "gui/widgets/widget.hpp" #include diff --git a/src/hash.hpp b/src/hash.hpp index 6e1ffc2eda36..7118479ac095 100644 --- a/src/hash.hpp +++ b/src/hash.hpp @@ -18,7 +18,6 @@ #include #include -#include "global.hpp" #include "exceptions.hpp" // Not configurable. The size (64) is both hard-, and implicitly-coded in crypt_blowfish diff --git a/src/lexical_cast.hpp b/src/lexical_cast.hpp index 51b2f9188f24..d63f259d0746 100644 --- a/src/lexical_cast.hpp +++ b/src/lexical_cast.hpp @@ -45,7 +45,6 @@ #define __LONG_LONG_SUPPORTED #endif -#include "global.hpp" #include #include diff --git a/src/log.cpp b/src/log.cpp index 67c027699d41..8a071ed87c88 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -28,8 +28,6 @@ #include #include -#include "global.hpp" - namespace { class null_streambuf : public std::streambuf diff --git a/src/log.hpp b/src/log.hpp index a965bdcb7cab..f536a0deec35 100644 --- a/src/log.hpp +++ b/src/log.hpp @@ -44,8 +44,6 @@ #pragma once -#include "global.hpp" - #ifndef __func__ #ifdef __FUNCTION__ #define __func__ __FUNCTION__ diff --git a/src/lua_jailbreak_exception.hpp b/src/lua_jailbreak_exception.hpp index 0880c2b7f8c1..07d478b776c5 100644 --- a/src/lua_jailbreak_exception.hpp +++ b/src/lua_jailbreak_exception.hpp @@ -14,8 +14,6 @@ #pragma once -#include "global.hpp" - /** * Base class for exceptions that want to be thrown 'through' lua. * diff --git a/src/scripting/lua_terrainfilter.cpp b/src/scripting/lua_terrainfilter.cpp index 653dafd10aca..186485855207 100644 --- a/src/scripting/lua_terrainfilter.cpp +++ b/src/scripting/lua_terrainfilter.cpp @@ -15,6 +15,7 @@ #include "scripting/lua_terrainmap.hpp" #include "formatter.hpp" +#include "global.hpp" #include "log.hpp" #include "map/location.hpp" #include "map/map.hpp" diff --git a/src/scripting/lua_terrainmap.cpp b/src/scripting/lua_terrainmap.cpp index aabb0afac29d..23d4650b9c17 100644 --- a/src/scripting/lua_terrainmap.cpp +++ b/src/scripting/lua_terrainmap.cpp @@ -15,6 +15,7 @@ #include "scripting/lua_terrainfilter.hpp" #include "formatter.hpp" +#include "global.hpp" #include "log.hpp" #include "map/location.hpp" #include "map/map.hpp" diff --git a/src/scripting/push_check.hpp b/src/scripting/push_check.hpp index 938932d70908..91b97b7c6f05 100644 --- a/src/scripting/push_check.hpp +++ b/src/scripting/push_check.hpp @@ -16,6 +16,7 @@ #include "scripting/lua_common.hpp" #include "scripting/lua_widget.hpp" +#include "global.hpp" #include "tstring.hpp" #include "map/location.hpp" #include "lua/lauxlib.h" diff --git a/src/sdl/surface.hpp b/src/sdl/surface.hpp index 8328fc53807d..cbcb04f6c747 100644 --- a/src/sdl/surface.hpp +++ b/src/sdl/surface.hpp @@ -13,7 +13,6 @@ #pragma once -#include "global.hpp" #include "utils/const_clone.hpp" #include diff --git a/src/serialization/tokenizer.cpp b/src/serialization/tokenizer.cpp index 4b69c718bcde..671fb7bfe40a 100644 --- a/src/serialization/tokenizer.cpp +++ b/src/serialization/tokenizer.cpp @@ -13,7 +13,6 @@ See the COPYING file for more details. */ -#include "global.hpp" #include "serialization/tokenizer.hpp" #include "wesconfig.h" diff --git a/src/units/abilities.cpp b/src/units/abilities.cpp index f5d0274fb8b9..0a283e3a741d 100644 --- a/src/units/abilities.cpp +++ b/src/units/abilities.cpp @@ -21,6 +21,7 @@ #include "display_context.hpp" #include "font/text_formatting.hpp" #include "game_board.hpp" +#include "global.hpp" #include "lexical_cast.hpp" #include "log.hpp" #include "map/map.hpp" diff --git a/src/utils/general.hpp b/src/utils/general.hpp index 56e08522c04f..81a725982e95 100644 --- a/src/utils/general.hpp +++ b/src/utils/general.hpp @@ -13,8 +13,6 @@ #pragma once -#include "global.hpp" - #include #include #include diff --git a/src/utils/make_enum.hpp b/src/utils/make_enum.hpp index d0e5f6567e47..4204d57f6ce3 100644 --- a/src/utils/make_enum.hpp +++ b/src/utils/make_enum.hpp @@ -77,8 +77,6 @@ #pragma once -#include "global.hpp" - #include #include #include diff --git a/src/utils/name_generator.hpp b/src/utils/name_generator.hpp index 88a4a767fc9f..b2fc4cb5f3c7 100644 --- a/src/utils/name_generator.hpp +++ b/src/utils/name_generator.hpp @@ -14,8 +14,6 @@ #pragma once -#include "global.hpp" - #include #include #include diff --git a/src/utils/scope_exit.hpp b/src/utils/scope_exit.hpp index 84afa1ec0802..21149a8af76a 100644 --- a/src/utils/scope_exit.hpp +++ b/src/utils/scope_exit.hpp @@ -13,8 +13,6 @@ #pragma once -#include "global.hpp" - #include namespace utils { diff --git a/src/utils/shared_reference.hpp b/src/utils/shared_reference.hpp index c7c4b738c130..c7fc08d1337f 100644 --- a/src/utils/shared_reference.hpp +++ b/src/utils/shared_reference.hpp @@ -13,8 +13,6 @@ #pragma once -#include "global.hpp" - #include #include