Remove unused headers.

src/actions.cpp

@@ -17,33 +17,21 @@
  * Recruiting, Fighting.
  */
 
-#include "actions.hpp"
 #include "attack_prediction.hpp"
-#include "game_config.hpp"
-#include "game_errors.hpp"
 #include "game_events.hpp"
 #include "game_preferences.hpp"
-#include "gamestatus.hpp"
 #include "gettext.hpp"
-#include "halo.hpp"
 #include "hotkeys.hpp"
 #include "log.hpp"
 #include "map.hpp"
 #include "menu_events.hpp"
 #include "mouse_handler_base.hpp"
-#include "pathfind.hpp"
-#include "random.hpp"
 #include "replay.hpp"
-#include "sound.hpp"
 #include "statistics.hpp"
 #include "unit_abilities.hpp"
 #include "unit_display.hpp"
 #include "wml_exception.hpp"
-#include "wml_separators.hpp"
-#include "serialization/binary_wml.hpp"
-#include "serialization/parser.hpp"
 
-#include <cassert>
 
 #include <boost/scoped_ptr.hpp>
 

src/addon_checks.cpp

@@ -16,8 +16,6 @@
 #include "global.hpp"
 #include "addon_checks.hpp"
 #include "config.hpp"
-#include <algorithm>
-#include <cstring>
 
 static bool two_dots(char a, char b)
 {

src/addon_management.cpp

@@ -16,8 +16,6 @@
 #include "global.hpp"
 
 #include "addon_management.hpp"
-#include "config.hpp"
-#include "construct_dialog.hpp"
 #include "dialogs.hpp"
 #include "filesystem.hpp"
 #include "foreach.hpp"
@@ -28,17 +26,11 @@
 #include "gui/dialogs/addon_connect.hpp"
 #include "gui/dialogs/message.hpp"
 #include "gui/widgets/window.hpp"
-#include "log.hpp"
 #include "marked-up_text.hpp"
-#include "network.hpp"
 #include "serialization/parser.hpp"
 #include "version.hpp"
 #include "wml_separators.hpp"
 
-#include <algorithm>
-#include <cstring>
-#include <map>
-#include <stdexcept>
 
 #define DEFAULT_CAMPAIGND_PORT				15003
 

src/ai.cpp

@@ -17,37 +17,27 @@
  * Artificial intelligence - The computer commands the enemy.
  */
 
-#include "ai.hpp"
 #include "ai2.hpp"
 #include "ai_dfool.hpp"
 #ifdef HAVE_PYTHON
 //#include "python_ai.hpp"
 #include "ai_python.hpp"
 #endif
-#include "actions.hpp"
 #include "array.hpp"
-#include "callable_objects.hpp"
 #include "dialogs.hpp"
-#include "foreach.hpp"
 #include "formula_ai.hpp"
-#include "game_config.hpp"
 #include "game_events.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
-#include "menu_events.hpp"
 #include "mouse_handler_base.hpp"
 #include "replay.hpp"
 #include "statistics.hpp"
 #include "unit_display.hpp"
-#include "unit.hpp"
-#include "playturn.hpp"
 #include "wml_exception.hpp"
 
-#include <cassert>
 #include <fstream>
 
-#include <boost/scoped_ptr.hpp>
 
 #define DBG_AI LOG_STREAM(debug, ai)
 #define LOG_AI LOG_STREAM(info, ai)

src/ai_attack.cpp

@@ -21,12 +21,9 @@
 
 #include "ai.hpp"
 #include "attack_prediction.hpp"
-#include "game_config.hpp"
-#include "gamestatus.hpp"
 #include "map.hpp"
 #include "log.hpp"
 
-#include <cassert>
 
 #define LOG_AI LOG_STREAM(info, ai)
 #define ERR_AI LOG_STREAM(err, ai)

src/ai_dfool.cpp

@@ -18,9 +18,7 @@
 
 #include "ai_dfool.hpp"
 #include "log.hpp"
-#include "variable.hpp"
 
-#include <set>
 
 namespace dfool {
   void dfool_ai::play_turn(){

src/ai_move.cpp

@@ -15,15 +15,11 @@
 #include "global.hpp"
 
 #include "ai.hpp"
-#include "game_config.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
 #include "map.hpp"
-#include "variable.hpp"
 #include "wml_exception.hpp"
 
-#include <cassert>
-#include <iostream>
 
 #define LOG_AI LOG_STREAM(info, ai)
 #define DBG_AI LOG_STREAM(debug, ai)

src/ai_village.cpp

@@ -24,7 +24,6 @@
 #include "log.hpp"
 #include "map.hpp"
 
-#include <cassert>
 #include <numeric>
 
 #define DBG_AI LOG_STREAM(debug, ai) 

src/astarsearch.cpp

@@ -19,11 +19,7 @@ See the COPYING file for more details.
 #include "log.hpp"
 #include "map.hpp"
 #include "pathfind.hpp"
-#include "util.hpp"
 
-#include <cassert>
-#include <cmath>
-#include <iostream>
 
 #define LOG_PF LOG_STREAM(info, engine)
 #define DBG_PF LOG_STREAM(debug, engine)

src/attack_prediction.cpp

@@ -24,19 +24,12 @@
 
 #include "attack_prediction.hpp"
 
-#include <cassert>
-#include <cstring> // For memset
-#include <vector>
 
 
 // Compile with -O3 -DBENCHMARK for speed testing,
 // -DCHECK for testing correctness
 // (run tools/wesnoth-attack-sim.c --check on output)
 #if defined(BENCHMARK) || defined(CHECK)
-#include <time.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <stdlib.h>
 #endif
 
 #ifdef ATTACK_PREDICTION_DEBUG

src/attack_prediction_display.cpp

@@ -16,17 +16,10 @@
 #include "attack_prediction_display.hpp"
 
 #include "attack_prediction.hpp"
-#include "dialogs.hpp"
-#include "game_events.hpp"
 #include "gettext.hpp"
-#include "log.hpp"
 #include "marked-up_text.hpp"
-#include "show_dialog.hpp"
 #include "unit_abilities.hpp"
-#include "wml_separators.hpp"
-#include "unit_display.hpp"
 
-#include <cstdlib>
 // Conversion routine for both unscatched and damage change percentage.
 static void format_prob(char str_buf[10], const float prob)
 {

src/builder.cpp

@@ -23,11 +23,7 @@
 #include "config.hpp"
 #include "log.hpp"
 #include "map.hpp"
-#include "pathutils.hpp"
-#include "terrain.hpp"
-#include "serialization/string_utils.hpp"
 
-#include <cassert>
 #include <climits>
 
 #define ERR_NG LOG_STREAM(err, engine)

src/callable_objects.cpp

@@ -13,7 +13,6 @@
 
 
 #include "callable_objects.hpp"
-#include "pathutils.hpp"
 
 variant location_callable::get_value(const std::string& key) const
 {

src/campaign_server/campaign_server.cpp

@@ -19,13 +19,9 @@
  * and saves addons under data/.
  */
 
-#include "config.hpp"
 #include "filesystem.hpp"
 #include "log.hpp"
-#include "network.hpp"
 #include "network_worker.hpp"
-#include "util.hpp"
-#include "scoped_resource.hpp"
 #include "serialization/binary_wml.hpp"
 #include "serialization/binary_or_text.hpp"
 #include "serialization/parser.hpp"
@@ -33,24 +29,14 @@
 #include "addon_checks.hpp"
 #include "server/input_stream.hpp"
 
-#include "SDL.h"
 
-#include <iostream>
-#include <map>
-#include <algorithm>	// Required for gcc 4.3.0
 
 #include <boost/iostreams/filter/gzip.hpp>
-#include <cstdio>
-#include <csignal>
 
 // the fork execute is unix specific only tested on Linux quite sure it won't
 // work on Windows not sure which other platforms have a problem with it.
 #if !(defined(_WIN32))
 #include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/types.h>
 #endif
 
 #define LOG_CS lg::err(lg::network, false)

src/cavegen.cpp

@@ -23,9 +23,7 @@
 #include "log.hpp"
 #include "map.hpp"
 #include "pathfind.hpp"
-#include "serialization/string_utils.hpp"
 
-#include <cassert>
 
 #define LOG_NG LOG_STREAM(info, engine)
 

src/clipboard.cpp

@@ -22,9 +22,6 @@
 
 #define CLIPBOARD_FUNCS_DEFINED
 
-#include <X11/Xlib.h>
-#include <unistd.h>
-#include <iostream>
 
 #include "SDL_syswm.h"
 
@@ -372,7 +369,6 @@ std::string copy_from_clipboard(const bool mouse)
 
 #endif
 #ifdef _WIN32
-#include <windows.h>
 
 #define CLIPBOARD_FUNCS_DEFINED
 
@@ -444,7 +440,6 @@ std::string copy_from_clipboard(const bool)
 #endif
 
 #ifdef __BEOS__
-#include <Clipboard.h>
 
 #define CLIPBOARD_FUNCS_DEFINED
 
@@ -483,7 +478,6 @@ std::string copy_from_clipboard(const bool)
 #ifdef __APPLE__
 #define CLIPBOARD_FUNCS_DEFINED
 
-#include <Carbon/Carbon.h>
 
 void copy_to_clipboard(const std::string& text, const bool)
 {

src/color_range.cpp

@@ -20,15 +20,9 @@
 
 #include "game_config.hpp"
 #include "global.hpp"
-#include "color_range.hpp"
 #include "map.hpp"
-#include "serialization/string_utils.hpp"
 
 #include <cassert>
-#include <set>
-#include <string>
-#include <cstring>
-#include <vector>
 
 std::map<Uint32, Uint32> recolor_range(const color_range& new_range, const std::vector<Uint32>& old_rgb){
 	std::map<Uint32, Uint32> map_rgb;

src/config.cpp

@@ -20,14 +20,8 @@
 
 #include "global.hpp"
 
-#include <algorithm>
-#include <sstream>
-#include <string.h>
-#include <ostream>
 #include "config.hpp"
-#include "gettext.hpp"
 #include "log.hpp"
-#include "util.hpp"
 
 #define ERR_CF LOG_STREAM(err, config)
 

src/config_adapter.cpp

@@ -20,15 +20,10 @@
 
 #include "global.hpp"
 
-#include <sstream>
-#include "config_adapter.hpp"
-#include "game_errors.hpp"
 #include "game_preferences.hpp"
 #include "gamestatus.hpp"
-#include "gettext.hpp"
 #include "log.hpp"
 #include "map.hpp"
-#include "team.hpp"
 #include "wml_exception.hpp"
 
 #define LOG_NG LOG_STREAM(info, engine)

src/construct_dialog.cpp

@@ -18,30 +18,13 @@
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
 #include "construct_dialog.hpp"
-#include "config.hpp"
-#include "cursor.hpp"
 #include "display.hpp"
-#include "events.hpp"
 #include "gettext.hpp"
-#include "image.hpp"
-#include "key.hpp"
 #include "sound.hpp"
 #include "log.hpp"
 #include "marked-up_text.hpp"
-#include "thread.hpp"
-#include "language.hpp"
-#include "sdl_utils.hpp"
-#include "tooltips.hpp"
-#include "video.hpp"
-#include "widgets/button.hpp"
-#include "widgets/menu.hpp"
-#include "widgets/progressbar.hpp"
-#include "widgets/textbox.hpp"
 
-#include "SDL_ttf.h"
 
-#include <iostream>
-#include <numeric>
 
 #define ERR_DP LOG_STREAM(err, display)
 #define LOG_DP LOG_STREAM(info, display)

src/cursor.cpp

@@ -20,17 +20,11 @@
 #include "global.hpp"
 
 #include "cursor.hpp"
-#include "game_config.hpp"
 #include "image.hpp"
 #include "preferences_display.hpp"
-#include "scoped_resource.hpp"
-#include "sdl_utils.hpp"
 #include "video.hpp"
 
-#include "SDL.h"
 
-#include <iostream>
-#include <vector>
 
 static bool use_colour_cursors()
 {

src/dialogs.cpp

@@ -20,7 +20,6 @@
 #include "global.hpp"
 
 #include "dialogs.hpp"
-#include "game_errors.hpp"
 #include "game_events.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"
@@ -35,13 +34,10 @@
 #include "minimap.hpp"
 #include "replay.hpp"
 #include "thread.hpp"
-#include "unit.hpp"
 #include "wml_separators.hpp"
 #include "widgets/progressbar.hpp"
 #include "wml_exception.hpp"
 
-#include <assert.h>
-#include <clocale>
 
 //#ifdef _WIN32
 //#include "locale.h"

src/editor2/action.cpp

@@ -18,13 +18,10 @@
  */
 
 #include "action.hpp"
-#include "editor_common.hpp"
 #include "map_context.hpp"
 
 #include "../foreach.hpp"
 
-#include <algorithm>
-#include <memory>
 
 namespace editor2 {
 

src/editor2/brush.cpp

@@ -13,12 +13,10 @@
 */
 
 #include "brush.hpp"
-#include "editor_map.hpp"
 
 #include "../foreach.hpp"
 #include "../pathutils.hpp"
 
-#include <vector>
 
 namespace editor2 {
 

src/editor2/editor_controller.cpp

@@ -13,9 +13,6 @@
 
 #include "action.hpp"
 #include "editor_controller.hpp"
-#include "editor_display.hpp"
-#include "editor_layout.hpp"
-#include "editor_map.hpp"
 #include "editor_palettes.hpp"
 #include "mouse_action.hpp"
 
@@ -23,27 +20,17 @@
 #include "gui/dialogs/editor_generate_map.hpp"
 #include "gui/dialogs/editor_resize_map.hpp"
 #include "gui/dialogs/editor_settings.hpp"
-#include "gui/widgets/button.hpp"
 #include "gui/widgets/window.hpp"
 
 #include "../config_adapter.hpp"
-#include "../construct_dialog.hpp"
-#include "../cursor.hpp"
 #include "../filechooser.hpp"
 #include "../filesystem.hpp"
-#include "../font.hpp"
 #include "../foreach.hpp"
-#include "../gettext.hpp"
-#include "../hotkeys.hpp"
 #include "../map_create.hpp"
 #include "../mapgen.hpp"
-#include "../preferences.hpp"
 #include "../random.hpp"
-#include "../serialization/string_utils.hpp"
 
-#include "SDL.h"
 
-#include <memory>
 
 #include <boost/bind.hpp>
 

src/editor2/editor_display.cpp

@@ -12,11 +12,8 @@
 */
 
 #include "editor_display.hpp"
-#include "editor_common.hpp"
 
-#include "../foreach.hpp"
 
-#include <cassert>
 
 namespace editor2 {
 

src/editor2/editor_layout.cpp

@@ -18,7 +18,6 @@
  */
 
 #include "editor_layout.hpp"
-#include "util.hpp"
 
 
 namespace {

src/editor2/editor_main.cpp

@@ -12,15 +12,9 @@
    See the COPYING file for more details.
 */
 
-#include "action_base.hpp"
-#include "editor_common.hpp"
 #include "editor_controller.hpp"
-#include "editor_main.hpp"
-#include "map_context.hpp"
 
 #include "../construct_dialog.hpp"
-#include "../gettext.hpp"
-#include "../hotkeys.hpp"
 
 #include <boost/algorithm/string/replace.hpp>
 

src/editor2/editor_map.cpp

@@ -18,13 +18,10 @@
 #include "../display.hpp"
 #include "../filesystem.hpp"
 #include "../foreach.hpp"
-#include "../gettext.hpp"
 #include "../map_exception.hpp"
 #include "../pathutils.hpp"
 #include "../wml_exception.hpp"
 
-#include <cassert>
-#include <deque>
 
 
 namespace editor2 {

src/editor2/editor_palettes.cpp

@@ -17,25 +17,13 @@
  * Note: this is a near-straight rip from the old editor.
 */
 
-#include "editor_common.hpp"
 #include "editor_palettes.hpp"
-#include "editor_layout.hpp"
 
-#include "../config.hpp"
-#include "../sdl_utils.hpp"
-#include "../serialization/string_utils.hpp"
 #include "../foreach.hpp"
-#include "../image.hpp"
-#include "../reports.hpp"
 #include "../gettext.hpp"
 #include "../tooltips.hpp"
-#include "../util.hpp"
-#include "../video.hpp"
 
-#include "SDL.h"
-#include "SDL_keysym.h"
 
-#include <cassert>
 
 namespace editor2 {
 

src/editor2/map_context.cpp

@@ -13,17 +13,12 @@
 */
 
 #include "action.hpp"
-#include "editor_map.hpp"
 #include "map_context.hpp"
 
 #include "../display.hpp"
 #include "../filesystem.hpp"
 #include "../foreach.hpp"
-#include "../gettext.hpp"
-#include "../pathutils.hpp"
 
-#include <cassert>
-#include <deque>
 
 
 namespace editor2 {

src/editor2/map_fragment.cpp

@@ -16,8 +16,6 @@
 
 #include "../foreach.hpp"
 
-#include <sstream>
-#include <vector>
 
 namespace editor2 {
 

src/editor2/mouse_action.cpp

@@ -14,14 +14,10 @@
 
 #include "action.hpp"
 #include "brush.hpp"
-#include "editor_common.hpp"
 #include "editor_display.hpp"
 #include "mouse_action.hpp"
 
 #include "../construct_dialog.hpp"
-#include "../foreach.hpp"
-#include "../gettext.hpp"
-#include "../pathutils.hpp"
 
 namespace editor2 {
 

src/filechooser.cpp

@@ -19,12 +19,8 @@
 #include "display.hpp"
 #include "gettext.hpp"
 #include "filechooser.hpp"
-#include "video.hpp"
 #include "widgets/file_menu.hpp"
-#include "filesystem.hpp"
 
-#include <vector>
-#include <string>
 
 namespace dialogs
 {

src/filesystem.cpp

@@ -23,7 +23,6 @@
 // These files may vary from platform to platform, 
 // since these functions are NOT ANSI-conforming functions. 
 // They may have to be altered to port to new platforms
-#include <sys/types.h>
 
 //for mkdir
 #include <sys/stat.h>
@@ -45,23 +44,15 @@ BPath be_path;
 #endif
 
 // for getenv
-#include <cstdlib>
 #include <cerrno>
-#include <string>
-#include <cstring>
-#include <algorithm>
 #include <fstream>
-#include <iostream>
 #include <iomanip>
-#include <sstream>
 #include <set>
 
-#include "wesconfig.h"
 #include "config.hpp"
 #include "filesystem.hpp"
 #include "game_config.hpp"
 #include "log.hpp"
-#include "scoped_resource.hpp"
 #include "loadscreen.hpp"
 
 #define DBG_FS LOG_STREAM(debug, filesystem)

src/floating_textbox.cpp

@@ -16,13 +16,10 @@
 #include "global.hpp"
 
 #include "floating_textbox.hpp"
-#include "font.hpp"
 #include "game_display.hpp"
 #include "game_preferences.hpp"
 #include "log.hpp"
-#include "team.hpp"
 
-#include <ctime>
 
 namespace gui{
 	floating_textbox::floating_textbox() : 

src/font.cpp

@@ -20,23 +20,15 @@
 #include "font.hpp"
 #include "game_config.hpp"
 #include "log.hpp"
-#include "sdl_utils.hpp"
 #include "tooltips.hpp"
 #include "video.hpp"
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
-#include "serialization/string_utils.hpp"
 #include "marked-up_text.hpp"
 
-#include <algorithm>
-#include <cstdio>
-#include <iostream>
 #include <list>
-#include <map>
 #include <set>
-#include <sstream>
 #include <stack>
-#include <string>
 
 #include <fontconfig/fontconfig.h>
 

src/formula.cpp

@@ -12,18 +12,13 @@
 */
 #include "global.hpp"
 
-#include <algorithm>
 #include <boost/lexical_cast.hpp>
-#include <cmath>
 #include <iostream>
 #include <set>
-#include <vector>
 
 //#include "foreach.hpp"
-#include "formula.hpp"
 #include "formula_callable.hpp"
 #include "formula_function.hpp"
-#include "formula_tokenizer.hpp"
 #include "map_utils.hpp"
 
 namespace game_logic

src/formula_ai.cpp

@@ -12,13 +12,10 @@
    See the COPYING file for more details.
 */
 
-#include <boost/regex.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "actions.hpp"
 #include "menu_events.hpp"
 #include "formula_ai.hpp"
-#include "pathutils.hpp"
 #include "log.hpp"
 #include "attack_prediction.hpp"
 

src/formula_function.cpp

@@ -14,17 +14,12 @@
 
 #include "global.hpp"
 
-#include <iostream>
-#include <math.h>
 
 //#include "foreach.hpp"
 #include "callable_objects.hpp"
-#include "formula_callable.hpp"
 #include "formula_function.hpp"
 #include "log.hpp"
-#include "map.hpp"
 
-#include "SDL.h"
 
 #define DBG_NG LOG_STREAM(debug, engine)
 

src/formula_tokenizer.cpp

@@ -12,7 +12,6 @@
 */
 
 #include <sstream>
-#include <iostream>
 
 #include <boost/regex.hpp>
 

src/game_config.cpp

@@ -18,17 +18,11 @@
 #include "log.hpp"
 #include "gettext.hpp"
 #include "game_config.hpp"
-#include "util.hpp"
-#include "serialization/string_utils.hpp"
 #include "wesconfig.h"
 #ifdef HAVE_REVISION
 #include "revision.hpp"
 #endif /* HAVE_REVISION */
 
-#include <cstdlib>
-#include <string>
-#include <sstream>
-#include <ostream>
 
 #define DBG_NG LOG_STREAM(debug, engine)
 #define ERR_NG LOG_STREAM(err, engine)

src/game_display.cpp

@@ -20,37 +20,16 @@
 #include "global.hpp"
 
 #include "actions.hpp"
-#include "cursor.hpp"
-#include "game_display.hpp"
-#include "events.hpp"
-#include "filesystem.hpp"
-#include "font.hpp"
 #include "foreach.hpp"
-#include "game_config.hpp"
-#include "gettext.hpp"
 #include "halo.hpp"
-#include "hotkeys.hpp"
-#include "language.hpp"
 #include "log.hpp"
 #include "map.hpp"
 #include "marked-up_text.hpp"
-#include "minimap.hpp"
 #include "game_preferences.hpp"
 #include "gamestatus.hpp"
-#include "sdl_utils.hpp"
 #include "sound.hpp"
-#include "team.hpp"
-#include "theme.hpp"
-#include "tooltips.hpp"
-#include "unit_display.hpp"
 
-#include "SDL_image.h"
 
-#include <algorithm>
-#include <cassert>
-#include <cmath>
-#include <iostream>
-#include <sstream>
 
 #define ERR_DP LOG_STREAM(err, display)
 #define INFO_DP LOG_STREAM(info, display)

src/game_events.cpp

@@ -18,42 +18,22 @@
  */
 
 #include "global.hpp"
-#include "actions.hpp"
-#include "construct_dialog.hpp"
-#include "game_display.hpp"
 #include "dialogs.hpp"
 #include "foreach.hpp"
-#include "game_errors.hpp"
 #include "game_events.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"
 #include "gui/widgets/spacer.hpp"
 #include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "image.hpp"
-#include "language.hpp"
-#include "log.hpp"
 #include "map.hpp"
 #include "map_exception.hpp"
 #include "menu_events.hpp"
-#include "portrait.hpp"
 #include "replay.hpp"
-#include "serialization/string_utils.hpp"
 #include "sound.hpp"
-#include "team.hpp"
 #include "terrain_filter.hpp"
 #include "unit_display.hpp"
-#include "wml_exception.hpp"
 
-#include "SDL_timer.h"
 
-#include <cassert>
-#include <cstdlib>
-#include <deque>
-#include <iostream>
-#include <iterator>
-#include <set>
-#include <string>
 
 #include <boost/scoped_ptr.hpp>
 

src/game_preferences.cpp

@@ -16,28 +16,16 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "config.hpp"
-#include "filesystem.hpp"
 #include "foreach.hpp"
 #include "game_preferences.hpp"
 #include "gamestatus.hpp"
 #include "gettext.hpp"
-#include "hotkeys.hpp"
 #include "log.hpp"
 #include "map.hpp"
 #include "network.hpp" // ping_timeout
-#include "sound.hpp"
 #include "settings.hpp"
-#include "util.hpp"
-#include "video.hpp" // non_interactive()
 #include "wml_exception.hpp"
-#include "serialization/parser.hpp"
-#include "serialization/string_utils.hpp"
 
-#include <cstdlib>
-#include <iostream>
-#include <iterator>
-#include <sstream>
 
 namespace {
 

src/game_preferences_display.cpp

@@ -15,28 +15,14 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "cursor.hpp"
 #include "display.hpp"
 #include "filesystem.hpp"
 #include "filechooser.hpp"
-#include "game_preferences.hpp"
 #include "gettext.hpp"
-#include "hotkeys.hpp"
-#include "marked-up_text.hpp"
 #include "preferences_display.hpp"
-#include "construct_dialog.hpp"
-#include "video.hpp"
 #include "wml_separators.hpp"
-#include "widgets/button.hpp"
-#include "widgets/label.hpp"
-#include "widgets/menu.hpp"
 #include "widgets/slider.hpp"
-#include "widgets/textbox.hpp"
-#include "scoped_resource.hpp"
-#include "theme.hpp"
 
-#include <vector>
-#include <string>
 
 namespace preferences {
 

src/gamestatus.cpp

@@ -19,35 +19,21 @@
 
 #include "global.hpp"
 
-#include "filesystem.hpp"
-#include "foreach.hpp"
-#include "game_config.hpp"
-#include "game_errors.hpp"
-#include "gamestatus.hpp"
 #include "gettext.hpp"
-#include "language.hpp"
 #include "log.hpp"
 #include "game_preferences.hpp"
 #include "replay.hpp"
 #include "statistics.hpp"
-#include "time_of_day.hpp"
 #include "unit_id.hpp"
 #include "wesconfig.h"
 #include "serialization/binary_or_text.hpp"
 #include "serialization/binary_wml.hpp"
 #include "serialization/parser.hpp"
-#include "serialization/string_utils.hpp"
 #include "wml_exception.hpp"
 
-#include <algorithm>
-#include <cstdio>
-#include <iostream>
-#include <iterator>
-#include <sstream>
 #ifndef _MSC_VER
 #include <sys/time.h>
 #endif
-#include <time.h>
 
 #define DBG_NG lg::debug(lg::engine)
 #define LOG_NG lg::info(lg::engine)

src/generate_report.cpp

@@ -21,20 +21,13 @@
 #include "global.hpp"
 
 #include "actions.hpp"
-#include "game_config.hpp"
 #include "gamestatus.hpp"
 #include "gettext.hpp"
 #include "language.hpp"
 #include "map.hpp"
 #include "marked-up_text.hpp"
-#include "reports.hpp"
 #include "game_preferences.hpp"
 
-#include <cassert>
-#include <ctime>
-#include <map>
-#include <set>
-#include <sstream>
 
 namespace reports {
 

src/gui/dialogs/addon_connect.cpp

@@ -14,13 +14,8 @@
 
 #include "gui/dialogs/addon_connect.hpp"
 
-#include "gui/widgets/widget.hpp"
 #include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "gui/widgets/settings.hpp"
 #include "gui/widgets/text_box.hpp"
-#include "log.hpp"
-#include "wml_exception.hpp"
 
 namespace gui2 {
 

src/gui/dialogs/dialog.cpp

@@ -16,9 +16,6 @@
 
 #include "foreach.hpp"
 #include "gui/dialogs/field.hpp"
-#include "gui/widgets/text.hpp"
-#include "gui/widgets/window.hpp"
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/dialogs/editor_generate_map.cpp

@@ -18,14 +18,7 @@
 
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/label.hpp"
-#include "gui/widgets/widget.hpp"
-#include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "gui/widgets/settings.hpp"
-#include "gui/widgets/text_box.hpp"
-#include "log.hpp"
 #include "mapgen.hpp"
-#include "wml_exception.hpp"
 
 #define ERR_ED LOG_STREAM_INDENT(err, editor)
 

src/gui/dialogs/editor_new_map.cpp

@@ -14,20 +14,7 @@
 
 #include "gui/dialogs/editor_new_map.hpp"
 
-#include "foreach.hpp"
 #include "gui/dialogs/field.hpp"
-#include "gui/widgets/button.hpp"
-#include "gui/widgets/listbox.hpp"
-#include "gui/widgets/settings.hpp"
-#include "gui/widgets/text_box.hpp"
-#include "gui/widgets/slider.hpp"
-#include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "language.hpp"
-#include "log.hpp"
-#include "preferences.hpp"
-#include "video.hpp"
-#include "wml_exception.hpp"
 
 namespace gui2 {
 

src/gui/dialogs/editor_resize_map.cpp

@@ -14,23 +14,11 @@
 
 #include "gui/dialogs/editor_resize_map.hpp"
 
-#include "foreach.hpp"
 #include "gui/dialogs/field.hpp"
 #include "gui/dialogs/helper.hpp"
-#include "gui/widgets/button.hpp"
 #include "gui/widgets/label.hpp"
-#include "gui/widgets/listbox.hpp"
-#include "gui/widgets/settings.hpp"
-#include "gui/widgets/text_box.hpp"
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/slider.hpp"
-#include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "language.hpp"
-#include "log.hpp"
-#include "preferences.hpp"
-#include "video.hpp"
-#include "wml_exception.hpp"
 
 namespace gui2 {
 

src/gui/dialogs/editor_settings.cpp

@@ -19,17 +19,9 @@
 
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/label.hpp"
-#include "gui/widgets/widget.hpp"
-#include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "gui/widgets/settings.hpp"
 #include "gui/widgets/slider.hpp"
-#include "gui/widgets/text_box.hpp"
 #include "gui/widgets/toggle_button.hpp"
 #include "gettext.hpp"
-#include "image.hpp"
-#include "log.hpp"
-#include "wml_exception.hpp"
 
 #define ERR_ED LOG_STREAM_INDENT(err, editor)
 

src/gui/dialogs/language_selection.cpp

@@ -16,14 +16,9 @@
 
 #include "foreach.hpp"
 #include "gui/widgets/listbox.hpp"
-#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
 #include "language.hpp"
-#include "log.hpp"
 #include "preferences.hpp"
-#include "video.hpp"
-#include "wml_exception.hpp"
 
 namespace gui2 {
 

src/gui/dialogs/message.cpp

@@ -16,12 +16,7 @@
 
 #include "gui/widgets/image.hpp"
 #include "gui/widgets/label.hpp"
-#include "gui/widgets/widget.hpp"
 #include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "gui/widgets/settings.hpp"
-#include "gui/widgets/scroll_label.hpp"
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/dialogs/mp_connect.cpp

@@ -15,20 +15,10 @@
 #include "gui/dialogs/mp_connect.hpp"
 
 #include "foreach.hpp"
-#include "game_config.hpp"
 #include "game_preferences.hpp"
-#include "gui/dialogs/dialog.hpp"
 #include "gui/dialogs/field.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/listbox.hpp"
-#include "gui/widgets/widget.hpp"
-#include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "gui/widgets/settings.hpp"
-#include "gui/widgets/text_box.hpp"
-#include "log.hpp"
-#include "video.hpp"
-#include "wml_exception.hpp"
 
 namespace gui2 {
 

src/gui/dialogs/mp_create_game.cpp

@@ -14,25 +14,14 @@
 
 #include "gui/dialogs/mp_create_game.hpp"
 
-#include "filesystem.hpp"
 #include "foreach.hpp"
-#include "game_config.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"
-#include "gui/dialogs/dialog.hpp"
 #include "gui/dialogs/field.hpp"
 #include "gui/dialogs/helper.hpp"
 #include "gui/widgets/listbox.hpp"
 #include "gui/widgets/minimap.hpp"
-#include "gui/widgets/widget.hpp"
-#include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "gui/widgets/settings.hpp"
-#include "gui/widgets/text_box.hpp"
-#include "log.hpp"
 #include "../../settings.hpp"
-#include "video.hpp"
-#include "wml_exception.hpp"
 
 namespace gui2 {
 

src/gui/dialogs/mp_method_selection.cpp

@@ -14,18 +14,10 @@
 
 #include "gui/dialogs/mp_method_selection.hpp"
 
-#include "game_preferences.hpp"
 #include "gui/widgets/listbox.hpp"
-#include "gui/widgets/toggle_button.hpp"
-#include "gui/widgets/widget.hpp"
 #include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "gui/widgets/settings.hpp"
 #include "gui/widgets/text_box.hpp"
-#include "log.hpp"
 #include "multiplayer.hpp"
-#include "video.hpp"
-#include "wml_exception.hpp"
 
 namespace gui2 {
 

src/gui/dialogs/title_screen.cpp

@@ -19,12 +19,7 @@
 #include "gui/dialogs/addon_connect.hpp"
 #include "gui/dialogs/language_selection.hpp"
 #include "gui/widgets/button.hpp"
-#include "gui/widgets/widget.hpp"
 #include "gui/widgets/window.hpp"
-#include "gui/widgets/window_builder.hpp"
-#include "gui/widgets/settings.hpp"
-#include "log.hpp"
-#include "wml_exception.hpp"
 
 #define ERR_CONFIG LOG_STREAM(err, config)
 

src/gui/widgets/button.cpp

@@ -15,7 +15,6 @@
 #include "gui/widgets/button.hpp"
 
 #include "gui/widgets/window.hpp"
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/canvas.cpp

@@ -24,14 +24,9 @@
 #include "gettext.hpp"
 #include "gui/widgets/formula.hpp"
 #include "gui/widgets/helper.hpp"
-#include "log.hpp"
-#include "serialization/parser.hpp"
 #include "../../text.hpp"
-#include "variant.hpp"
 #include "wml_exception.hpp"
 
-#include <algorithm>
-#include <cassert>
 
 namespace gui2 {
 

src/gui/widgets/container.cpp

@@ -14,7 +14,6 @@
 
 #include "gui/widgets/container.hpp"
 
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/control.cpp

@@ -12,11 +12,9 @@
    see the copying file for more details.
 */
 
-#include "gui/widgets/control.hpp"
 
 #include "foreach.hpp"
 #include "gui/widgets/window.hpp"
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/event_handler.cpp

@@ -19,16 +19,9 @@
  * More documentation at the end of the file.
  */
 
-#include "gui/widgets/event_handler.hpp"
 
 #include "clipboard.hpp"
-#include "config.hpp"
-#include "gui/widgets/widget.hpp"
 #include "gui/widgets/window.hpp"
-#include "log.hpp"
-#include "serialization/parser.hpp"
-#include "tstring.hpp"
-#include "variable.hpp"
 
 namespace gui2{
 

src/gui/widgets/grid.cpp

@@ -15,9 +15,7 @@
 #include "gui/widgets/grid.hpp"
 
 #include "foreach.hpp"
-#include "log.hpp"
 
-#include <cassert>
 #include <numeric>
 
 // Disable the size caching for now, it gives problems with the new wrapping

src/gui/widgets/helper.cpp

@@ -14,13 +14,7 @@
 
 #include "gui/widgets/helper.hpp"
 
-#include "formula_callable.hpp"
-#include "gettext.hpp"
 #include "gui/widgets/settings.hpp"
-#include "sdl_utils.hpp"
-#include "serialization/string_utils.hpp"
-#include "tstring.hpp"
-#include "log.hpp"
 
 #include "SDL_ttf.h"
 

src/gui/widgets/image.cpp

@@ -15,7 +15,6 @@
 #include "gui/widgets/image.hpp"
 
 #include "../../image.hpp"
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/label.cpp

@@ -14,7 +14,6 @@
 
 #include "gui/widgets/label.hpp"
 
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/listbox.cpp

@@ -15,14 +15,10 @@
 #include "gui/widgets/listbox.hpp"
 
 #include "foreach.hpp"
-#include "gui/widgets/event_handler.hpp"
-#include "gui/widgets/helper.hpp"
 #include "gui/widgets/scrollbar.hpp"
-#include "gui/widgets/spacer.hpp"
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/toggle_panel.hpp"
 #include "gui/widgets/window.hpp"
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/menubar.cpp

@@ -14,10 +14,6 @@
 
 #include "gui/widgets/menubar.hpp"
 
-#include "foreach.hpp"
-#include "gui/widgets/toggle_button.hpp"
-#include "gui/widgets/toggle_panel.hpp"
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/minimap.cpp

@@ -16,7 +16,6 @@
 
 #include "map.hpp"
 #include "map_exception.hpp"
-#include "log.hpp"
 #include "../../minimap.hpp"
 
 #define ERR_C LOG_STREAM_INDENT(err, config)

src/gui/widgets/panel.cpp

@@ -14,7 +14,6 @@
 
 #include "gui/widgets/panel.hpp"
 
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/scroll_label.cpp

@@ -14,11 +14,9 @@
 
 #include "gui/widgets/scroll_label.hpp"
 
-#include "foreach.hpp"
 #include "gui/widgets/label.hpp"
 #include "gui/widgets/scrollbar.hpp"
 #include "gui/widgets/spacer.hpp"
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/scrollbar.cpp

@@ -16,9 +16,7 @@
 
 #include "foreach.hpp"
 #include "gui/widgets/event_handler.hpp"
-#include "log.hpp"
 
-#include <cassert>
 
 namespace gui2 {
 

src/gui/widgets/settings.cpp

@@ -17,20 +17,13 @@
  * Implementation of settings.hpp.
  */
 
-#include "gui/widgets/settings.hpp"
 
 #include "filesystem.hpp"
 #include "gettext.hpp"
-#include "gui/widgets/helper.hpp"
 #include "gui/widgets/window.hpp"
-#include "log.hpp"
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
-#include "util.hpp"
-#include "video.hpp"
-#include "wml_exception.hpp"
 
-#include <cassert>
 
 namespace gui2 {
 

src/gui/widgets/slider.cpp

@@ -16,9 +16,7 @@
 
 #include "foreach.hpp"
 #include "formatter.hpp"
-#include "log.hpp"
 
-#include <cassert>
 
 namespace gui2 {
 

src/gui/widgets/spacer.cpp

@@ -12,9 +12,7 @@
    see the copying file for more details.
 */
 
-#include "gui/widgets/spacer.hpp"
 
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/text.cpp

@@ -16,8 +16,6 @@
 
 #include "clipboard.hpp"
 #include "gui/widgets/event_handler.hpp"
-#include "log.hpp"
-#include "serialization/string_utils.hpp"
 
 namespace gui2 {
 

src/gui/widgets/text_box.cpp

@@ -17,11 +17,8 @@
 #include "font.hpp"
 #include "foreach.hpp"
 #include "gui/widgets/event_handler.hpp"
-#include "log.hpp"
-#include "serialization/string_utils.hpp"
 #include "game_preferences.hpp"
 
-#include <numeric>
 
 namespace gui2 {
 

src/gui/widgets/toggle_button.cpp

@@ -15,10 +15,8 @@
 #include "gui/widgets/toggle_button.hpp"
 
 #include "foreach.hpp"
-#include "gui/widgets/canvas.hpp"
 #include "gui/widgets/window.hpp"
 
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/toggle_panel.cpp

@@ -16,7 +16,6 @@
 
 #include "foreach.hpp"
 #include "gui/widgets/window.hpp"
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/tooltip.cpp

@@ -12,9 +12,7 @@
    see the copying file for more details.
 */
 
-#include "gui/widgets/tooltip.hpp"
 
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/vertical_scrollbar.cpp

@@ -14,9 +14,7 @@
 
 #include "gui/widgets/vertical_scrollbar.hpp"
 
-#include "log.hpp"
 
-#include <cassert>
 
 namespace gui2 {
 

src/gui/widgets/vertical_scrollbar_container.cpp

@@ -17,9 +17,7 @@
 #include "foreach.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/scrollbar.hpp"
-#include "gui/widgets/widget.hpp"
 #include "gui/widgets/window.hpp"
-#include "log.hpp"
 
 namespace gui2 {
 

src/gui/widgets/widget.cpp

@@ -12,15 +12,9 @@
    see the copying file for more details.
 */
 
-#include "gui/widgets/widget.hpp"
 
-#include "filesystem.hpp"
 #include "gui/widgets/window.hpp"
-#include "log.hpp"
-#include "serialization/parser.hpp"
-#include "serialization/preprocessor.hpp"
 
-#include <cassert>
 
 namespace gui2 {
 

src/gui/widgets/window.cpp

@@ -21,13 +21,10 @@
 
 #include "cursor.hpp"
 #include "font.hpp"
-#include "log.hpp"
 #include "preferences.hpp"
 #include "titlescreen.hpp"
-#include "tstring.hpp"
 #include "video.hpp"
 
-#include <cassert>
 
 namespace gui2{
 

src/gui/widgets/window_builder.cpp

@@ -28,13 +28,8 @@
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/toggle_panel.hpp"
 #include "gui/widgets/vertical_scrollbar.hpp"
-#include "gui/widgets/widget.hpp"
 #include "gui/widgets/window.hpp"
-#include "log.hpp"
-#include "util.hpp"
-#include "wml_exception.hpp"
 
-#include <cassert>
 
 namespace gui2 {
 

src/halo.cpp

@@ -23,15 +23,7 @@
 #include "display.hpp"
 #include "game_preferences.hpp"
 #include "halo.hpp"
-#include "image.hpp"
-#include "sdl_utils.hpp"
-#include "util.hpp"
-#include "video.hpp"
-#include "serialization/string_utils.hpp"
 
-#include <algorithm>
-#include <cassert>
-#include <map>
 
 namespace halo
 {

src/help.cpp

@@ -20,39 +20,18 @@
 #include "global.hpp"
 
 #include "about.hpp"
-#include "cursor.hpp"
-#include "display.hpp"
-#include "events.hpp"
-#include "game_config.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"
 #include "help.hpp"
-#include "image.hpp"
-#include "language.hpp"
 #include "map.hpp"
 #include "marked-up_text.hpp"
 #include "log.hpp"
-#include "sdl_utils.hpp"
 #include "sound.hpp"
-#include "construct_dialog.hpp"
 #include "unit.hpp"
-#include "video.hpp"
 #include "wml_separators.hpp"
 #include "serialization/parser.hpp"
-#include "serialization/string_utils.hpp"
-#include "widgets/button.hpp"
-#include "widgets/menu.hpp"
-#include "widgets/scrollbar.hpp"
-#include "widgets/widget.hpp"
 
-#include <algorithm>
-#include <iostream>
-#include <list>
-#include <locale>
-#include <map>
 #include <queue>
-#include <set>
-#include <sstream>
 
 #define DBG_HELP LOG_STREAM(debug, help)
 #define LOG_HELP LOG_STREAM(info, help)

src/hotkeys.cpp

@@ -16,29 +16,16 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "config.hpp"
 #include "construct_dialog.hpp"
-#include "display.hpp"
-#include "events.hpp"
 #include "hotkeys.hpp"
-#include "game_config.hpp"
-#include "game_errors.hpp"
 #include "gettext.hpp"
 #include "filesystem.hpp"
-#include "foreach.hpp"
 #include "log.hpp"
 #include "menu_events.hpp"
 #include "preferences_display.hpp"
-#include "show_dialog.hpp"
-#include "util.hpp"
-#include "video.hpp"
 #include "wesconfig.h"
 #include "wml_separators.hpp"
-#include "SDL.h"
 
-#include <algorithm>
-#include <cstdlib>
-#include <map>
 
 #define ERR_G LOG_STREAM(err, general)
 #define LOG_G LOG_STREAM(info, general)

src/image.cpp

@@ -19,22 +19,14 @@
 
 #include "global.hpp"
 
-#include "color_range.hpp"
 #include "config.hpp"
 #include "filesystem.hpp"
 #include "game_config.hpp"
 #include "image.hpp"
 #include "log.hpp"
-#include "sdl_utils.hpp"
-#include "util.hpp"
-#include "serialization/string_utils.hpp"
 
 #include "SDL_image.h"
 
-#include <cassert>
-#include <iostream>
-#include <map>
-#include <string>
 
 #define ERR_DP LOG_STREAM(err, display)
 #define INFO_DP LOG_STREAM(info, display)

src/intro.cpp

@@ -21,25 +21,13 @@
 #include "global.hpp"
 
 #include "display.hpp"
-#include "events.hpp"
-#include "game_config.hpp"
 #include "gettext.hpp"
-#include "image.hpp"
-#include "intro.hpp"
-#include "font.hpp"
-#include "key.hpp"
 #include "log.hpp"
 #include "marked-up_text.hpp"
-#include "sdl_utils.hpp"
 #include "sound.hpp"
-#include "video.hpp"
-#include "widgets/button.hpp"
 #include "game_events.hpp"
 #include "language.hpp"
 
-#include <cstdlib>
-#include <sstream>
-#include <vector>
 
 #define LOG_NG LOG_STREAM(info, engine)
 

src/language.cpp

@@ -14,28 +14,15 @@
 
 #include "global.hpp"
 
-#include "config.hpp"
 #include "filesystem.hpp"
 #include "foreach.hpp"
-#include "game_config.hpp"
 #include "gettext.hpp"
 #include "language.hpp"
 #include "log.hpp"
 #include "preferences.hpp"
-#include "util.hpp"
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
-#include "wesconfig.h" //without this DUMMYLOCALES break
 
-#include <algorithm>
-#include <cassert>
-#include <cctype>
-#include <cerrno>
-#include <cstring>
-#include <clocale>
-#include <cstdlib>
-#include <cstring>
-#include <iostream>
 #include <stdexcept>
 
 #include <boost/scoped_array.hpp>

src/leader_list.cpp

@@ -22,9 +22,7 @@
 #include "gettext.hpp"
 #include "leader_list.hpp"
 #include "wml_separators.hpp"
-#include "serialization/string_utils.hpp"
 #include "widgets/combo.hpp"
-#include "widgets/menu.hpp"
 
 const std::string leader_list_manager::random_enemy_picture("units/random-dice.png~RC(magenta>1)");
 

src/loadscreen.cpp

@@ -25,8 +25,6 @@
 #include "gettext.hpp"
 #include "filesystem.hpp"
 
-#include <iostream>
-#include <cassert>
 
 #include <SDL_image.h>
 

src/log.cpp

@@ -25,10 +25,7 @@
 
 #include "log.hpp"
 
-#include <algorithm>
-#include <ctime>
 #include <sstream>
-#include <streambuf>
 
 namespace {
 

src/map.cpp

@@ -19,22 +19,14 @@
 
 #include "global.hpp"
 
-#include "config.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
 #include "map.hpp"
 #include "map_exception.hpp"
 #include "pathfind.hpp"
-#include "serialization/string_utils.hpp"
 #include "serialization/parser.hpp"
 #include "wml_exception.hpp"
 
-#include <algorithm>
-#include <cassert>
-#include <cctype>
-#include <cstdlib>
-#include <iostream>
-#include <sstream>
 
 #define ERR_CF LOG_STREAM(err, config)
 #define LOG_G LOG_STREAM(info, general)

src/map_create.cpp

@@ -16,14 +16,9 @@
 
 #include "cavegen.hpp"
 #include "log.hpp"
-#include "map_create.hpp"
 #include "mapgen_dialog.hpp"
 #include "scoped_resource.hpp"
-#include "serialization/string_utils.hpp"
 
-#include <ostream>
-#include <string>
-#include <vector>
 
 #define ERR_CF LOG_STREAM(err, config)
 

src/map_label.cpp

@@ -15,12 +15,7 @@
 #include "global.hpp"
 
 #include "display.hpp"
-#include "font.hpp"
-#include "language.hpp"
-#include "map_label.hpp"
 
-#include <cassert>
-#include <vector>
 
 namespace {
 	const size_t max_label_size = 32;