Merge pull request #863 from GregoryLundberg/GL_cleanup

A lot of little stuff

.gitignore

@@ -95,6 +95,10 @@ Debug
 ReleaseDEBUG
 Debug (fast)
 tags
+/schema_generator*
+/schema_validator*
+/create_images*
+/wesmage*
 
 # build results etc.
 wesnoth_zip

src/actions/advancement.cpp

@@ -16,9 +16,9 @@
  * Fighting.
  */
 
-#include "advancement.hpp"
+#include "actions/advancement.hpp"
 
-#include "vision.hpp"
+#include "actions/vision.hpp"
 
 #include "ai/lua/aspect_advancements.hpp"
 #include "game_display.hpp"

src/actions/attack.cpp

@@ -17,10 +17,10 @@
  * Fighting.
  */
 
-#include "attack.hpp"
+#include "actions/attack.hpp"
 
-#include "advancement.hpp"
-#include "vision.hpp"
+#include "actions/advancement.hpp"
+#include "actions/vision.hpp"
 
 #include "ai/lua/aspect_advancements.hpp"
 #include "attack_prediction.hpp"

src/actions/create.cpp

@@ -17,11 +17,11 @@
  * Recruiting, recalling.
  */
 
-#include "create.hpp"
+#include "actions/create.hpp"
 
-#include "move.hpp"
-#include "undo.hpp"
-#include "vision.hpp"
+#include "actions/move.hpp"
+#include "actions/undo.hpp"
+#include "actions/vision.hpp"
 
 #include "config.hpp"
 #include "config_assign.hpp"

src/actions/heal.cpp

@@ -17,7 +17,7 @@
  * Healing (at start of side turn).
  */
 
-#include "heal.hpp"
+#include "actions/heal.hpp"
 
 #include "game_board.hpp"
 #include "game_display.hpp"

src/actions/move.cpp

@@ -17,10 +17,10 @@
  * Movement.
  */
 
-#include "move.hpp"
+#include "actions/move.hpp"
 
-#include "undo.hpp"
-#include "vision.hpp"
+#include "actions/undo.hpp"
+#include "actions/vision.hpp"
 
 #include "config_assign.hpp"
 #include "game_display.hpp"

src/actions/shroud_clearing_action.cpp

@@ -1,6 +1,6 @@
-#include "shroud_clearing_action.hpp"
+#include "actions/shroud_clearing_action.hpp"
 
-#include "move.hpp" //get_village
+#include "actions/move.hpp" //get_village
 #include "resources.hpp"
 #include "team.hpp"
 #include "log.hpp"

src/actions/undo.cpp

@@ -17,7 +17,7 @@
  * Undoing, redoing.
  */
 
-#include "undo.hpp"
+#include "actions/undo.hpp"
 #include "global.hpp"
 
 #include "game_board.hpp"               // for game_board
@@ -43,15 +43,15 @@
 #include "util.hpp"                     // for bad_lexical_cast (ptr only), etc
 #include "whiteboard/manager.hpp"    // for manager
 
-#include "create.hpp"                   // for find_recall_location, etc
-#include "move.hpp"                   // for get_village
-#include "vision.hpp"           // for clearer_info, etc
-#include "shroud_clearing_action.hpp"
-#include "undo_dismiss_action.hpp"
-#include "undo_move_action.hpp"
-#include "undo_recall_action.hpp"
-#include "undo_recruit_action.hpp"
-#include "undo_update_shroud_action.hpp"
+#include "actions/create.hpp"                   // for find_recall_location, etc
+#include "actions/move.hpp"                   // for get_village
+#include "actions/vision.hpp"           // for clearer_info, etc
+#include "actions/shroud_clearing_action.hpp"
+#include "actions/undo_dismiss_action.hpp"
+#include "actions/undo_move_action.hpp"
+#include "actions/undo_recall_action.hpp"
+#include "actions/undo_recruit_action.hpp"
+#include "actions/undo_update_shroud_action.hpp"
 
 #include <algorithm>                    // for reverse
 #include <cassert>                      // for assert

src/actions/undo_action.cpp

@@ -1,4 +1,4 @@
-#include "undo_action.hpp"
+#include "actions/undo_action.hpp"
 #include "scripting/game_lua_kernel.hpp"
 #include "resources.hpp"
 #include "variable.hpp" // vconfig

src/actions/undo_dismiss_action.cpp

@@ -1,5 +1,5 @@
 #include "game_board.hpp"
-#include "undo_dismiss_action.hpp"
+#include "actions/undo_dismiss_action.hpp"
 #include "resources.hpp"
 #include "team.hpp"
 #include "replay.hpp"

src/actions/undo_move_action.cpp

@@ -1,5 +1,5 @@
-#include "undo_move_action.hpp"
-#include "move.hpp"
+#include "actions/undo_move_action.hpp"
+#include "actions/move.hpp"
 
 #include "resources.hpp"
 #include "replay.hpp"

src/actions/undo_recall_action.cpp

@@ -1,5 +1,5 @@
-#include "undo_recall_action.hpp"
-#include "create.hpp"
+#include "actions/undo_recall_action.hpp"
+#include "actions/create.hpp"
 
 #include "gui/dialogs/transient_message.hpp"
 #include "game_board.hpp"

src/actions/undo_recruit_action.cpp

@@ -1,5 +1,5 @@
-#include "undo_recruit_action.hpp"
-#include "create.hpp"
+#include "actions/undo_recruit_action.hpp"
+#include "actions/create.hpp"
 
 #include "gui/dialogs/transient_message.hpp"
 #include "game_board.hpp"

src/actions/undo_update_shroud_action.cpp

@@ -1,4 +1,4 @@
-#include "undo_update_shroud_action.hpp"
+#include "actions/undo_update_shroud_action.hpp"
 #include "resources.hpp"
 #include "replay.hpp"
 

src/actions/unit_creator.cpp

@@ -17,9 +17,9 @@
  * Recruiting, recalling.
  */
 
-#include "unit_creator.hpp"
+#include "actions/unit_creator.hpp"
 
-#include "move.hpp" //for actions::get_village
+#include "actions/move.hpp" //for actions::get_village
 
 #include "config.hpp"
 #include "filter_context.hpp"

src/actions/vision.cpp

@@ -17,9 +17,9 @@
  * Sighting.
  */
 
-#include "vision.hpp"
+#include "actions/vision.hpp"
 
-#include "move.hpp"
+#include "actions/move.hpp"
 
 #include "config.hpp"
 #include "game_display.hpp"

src/ai/default/contexts.hpp

@@ -43,7 +43,7 @@ struct target {
 		(BATTLE_AID, "battle aid")
 		(MASS, "mass")
 		(SUPPORT, "support")
-	);
+	)
 
 	target(const map_location& pos, double val, TYPE target_type=TYPE::VILLAGE) : loc(pos), value(val), type(target_type)
 	{}

src/ai/formula/ai.cpp

@@ -52,7 +52,7 @@
 #include "ai/default/contexts.hpp"  // for attack_analysis
 #include "ai/formula/function_table.hpp"           // for ai_function_symbol_table
 #include "ai/game_info.hpp"  // for move_result_ptr, move_map, etc
-#include "candidates.hpp"               // for base_candidate_action, etc
+#include "ai/formula/candidates.hpp"               // for base_candidate_action, etc
 
 #include <cassert>                     // for assert
 #include <ctime>                       // for time

src/ai/lua/core.cpp

@@ -26,7 +26,7 @@
 #include "scripting/game_lua_kernel.hpp"
 #include "scripting/lua_unit.hpp"
 #include "scripting/push_check.hpp"
-#include "lua_object.hpp" // (Nephro)
+#include "ai/lua/lua_object.hpp" // (Nephro)
 
 #include "attack_prediction.hpp"
 #include "game_display.hpp"

src/ai/manager.cpp

@@ -36,7 +36,7 @@
 #include "ai/contexts.hpp"                 // for readonly_context, etc
 #include "ai/default/contexts.hpp"  // for default_ai_context, etc
 #include "game_end_exceptions.hpp" // for ai_end_turn_exception
-#include "game_info.hpp"             // for side_number, engine_ptr, etc
+#include "ai/game_info.hpp"             // for side_number, engine_ptr, etc
 #include "game_config.hpp"              // for debug
 #include "ai/lua/aspect_advancements.hpp"
 #include "ai/registry.hpp"                 // for init

src/desktop/apple_notification.mm

@@ -14,7 +14,7 @@
 
 #ifdef __APPLE__
 
-#include "apple_notification.hpp"
+#include "desktop/apple_notification.hpp"
 
 #import <Foundation/Foundation.h>
 

src/desktop/dbus_notification.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "dbus_notification.hpp"
+#include "desktop/dbus_notification.hpp"
 #include "global.hpp"
 
 #include "filesystem.hpp"

src/desktop/notifications.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "notifications.hpp"
+#include "desktop/notifications.hpp"
 #include "global.hpp"
 
 #include "game_preferences.hpp"
@@ -21,15 +21,15 @@
 #include "video.hpp" //CVideo::get_singleton().window_state()
 
 #ifdef HAVE_LIBDBUS
-#include "dbus_notification.hpp"
+#include "desktop/dbus_notification.hpp"
 #endif
 
 #ifdef __APPLE__
-#include "apple_notification.hpp"
+#include "desktop/apple_notification.hpp"
 #endif
 
 #ifdef _WIN32
-#include "windows_tray_notification.hpp"
+#include "desktop/windows_tray_notification.hpp"
 #endif
 
 namespace desktop {

src/desktop/windows_tray_notification.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "windows_tray_notification.hpp"
+#include "desktop/windows_tray_notification.hpp"
 
 #include <SDL_syswm.h>
 

src/editor/action/mouse/mouse_action.cpp

@@ -16,7 +16,7 @@
 #include "editor/action/action.hpp"
 #include "editor/toolkit/brush.hpp"
 #include "editor/editor_display.hpp"
-#include "mouse_action.hpp"
+#include "editor/action/mouse/mouse_action.hpp"
 
 #include "gettext.hpp"
 #include "gui/dialogs/editor/set_starting_position.hpp"

src/editor/action/mouse/mouse_action_item.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "mouse_action_item.hpp"
+#include "editor/action/mouse/mouse_action_item.hpp"
 #include "editor/action/action_item.hpp"
 
 #include "editor/editor_display.hpp"

src/editor/action/mouse/mouse_action_map_label.cpp

@@ -13,7 +13,7 @@
 */
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "mouse_action_map_label.hpp"
+#include "editor/action/mouse/mouse_action_map_label.hpp"
 #include "editor/action/action_label.hpp"
 
 #include "editor/editor_display.hpp"

src/editor/action/mouse/mouse_action_select.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "mouse_action_select.hpp"
+#include "editor/action/mouse/mouse_action_select.hpp"
 #include "editor/action/action_select.hpp"
 
 #include "editor/editor_display.hpp"

src/editor/action/mouse/mouse_action_unit.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "mouse_action_unit.hpp"
+#include "editor/action/mouse/mouse_action_unit.hpp"
 #include "editor/action/action_unit.hpp"
 
 #include "editor/editor_display.hpp"

src/editor/action/mouse/mouse_action_village.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "mouse_action_village.hpp"
+#include "editor/action/mouse/mouse_action_village.hpp"
 #include "editor/action/action_village.hpp"
 
 #include "editor/editor_display.hpp"

src/editor/controller/editor_controller.cpp

@@ -20,7 +20,7 @@
 #include "editor/action/action.hpp"
 #include "editor/action/action_unit.hpp"
 #include "editor/action/action_select.hpp"
-#include "editor_controller.hpp"
+#include "editor/controller/editor_controller.hpp"
 
 #include "editor/palette/terrain_palettes.hpp"
 #include "editor/palette/location_palette.hpp"

src/editor/editor_display.cpp

@@ -13,7 +13,7 @@
 */
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "editor_display.hpp"
+#include "editor/editor_display.hpp"
 #include "reports.hpp"
 #include "terrain/builder.hpp"
 #include "units/map.hpp"

src/editor/editor_main.cpp

@@ -13,7 +13,7 @@
 */
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "controller/editor_controller.hpp"
+#include "editor/controller/editor_controller.hpp"
 
 #include "gettext.hpp"
 #include "filesystem.hpp"

src/editor/map/context_manager.cpp

@@ -16,7 +16,7 @@
 #include "resources.hpp"
 #include "team.hpp"
 
-#include "context_manager.hpp"
+#include "editor/map/context_manager.hpp"
 #include "display.hpp"
 #include "filesystem.hpp"
 #include "formula/string_utils.hpp"
@@ -24,7 +24,7 @@
 #include "gettext.hpp"
 #include "generators/map_create.hpp"
 #include "generators/map_generator.hpp"
-#include "map_context.hpp"
+#include "editor/map/map_context.hpp"
 
 #include "editor/action/action.hpp"
 #include "editor/controller/editor_controller.hpp"

src/editor/map/editor_map.cpp

@@ -14,7 +14,7 @@
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
 #include "editor/action/action_base.hpp"
-#include "editor_map.hpp"
+#include "editor/map/editor_map.hpp"
 #include "formula/string_utils.hpp"
 
 #include "display.hpp"

src/editor/map/map_context.cpp

@@ -15,7 +15,7 @@
 
 #include "editor/action/action.hpp"
 #include "editor/editor_preferences.hpp"
-#include "map_context.hpp"
+#include "editor/map/map_context.hpp"
 
 #include "config_assign.hpp"
 #include "display.hpp"

src/editor/map/map_fragment.cpp

@@ -13,7 +13,7 @@
 */
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "map_fragment.hpp"
+#include "editor/map/map_fragment.hpp"
 
 #include "util.hpp"
 

src/editor/palette/editor_palettes.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "editor_palettes.hpp"
+#include "editor/palette/editor_palettes.hpp"
 
 #include "gettext.hpp"
 #include "font/standard_colors.hpp"

src/editor/palette/item_palette.cpp

@@ -18,7 +18,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "item_palette.hpp"
+#include "editor/palette/item_palette.hpp"
 #include "gettext.hpp"
 
 #include <string>

src/editor/palette/location_palette.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "location_palette.hpp"
+#include "editor/palette/location_palette.hpp"
 
 #include "gettext.hpp"
 #include "font/marked-up_text.hpp"

src/editor/palette/palette_manager.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "palette_manager.hpp"
+#include "editor/palette/palette_manager.hpp"
 #include "widgets/widget.hpp"
 
 #include "tooltips.hpp"

src/editor/palette/terrain_palettes.cpp

@@ -18,7 +18,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "terrain_palettes.hpp"
+#include "editor/palette/terrain_palettes.hpp"
 
 #include "gettext.hpp"
 #include "formula/string_utils.hpp"

src/editor/palette/tristate_button.cpp

@@ -16,7 +16,7 @@
 
 #include "global.hpp"
 
-#include "tristate_button.hpp"
+#include "editor/palette/tristate_button.hpp"
 
 #include "font/constants.hpp"
 #include "font/sdl_ttf.hpp"

src/editor/palette/unit_palette.cpp

@@ -18,7 +18,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "unit_palette.hpp"
+#include "editor/palette/unit_palette.hpp"
 
 #include "gettext.hpp"
 

src/editor/toolkit/brush.cpp

@@ -13,7 +13,7 @@
 */
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
-#include "brush.hpp"
+#include "editor/toolkit/brush.hpp"
 #include "editor/editor_common.hpp"
 
 #include "pathutils.hpp"

src/editor/toolkit/editor_toolkit.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "editor_toolkit.hpp"
+#include "editor/toolkit/editor_toolkit.hpp"
 #include "config.hpp"
 
 #include "editor/action/mouse/mouse_action.hpp"

src/font/constants.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "constants.hpp"
+#include "font/constants.hpp"
 
 namespace font {
 

src/font/font_config.cpp

@@ -12,10 +12,10 @@
    See the COPYING file for more details.
 */
 
-#include "font_config.hpp"
-#include "font_description.hpp"
+#include "font/font_config.hpp"
+#include "font/font_description.hpp"
 #include "font/error.hpp"
-#include "sdl_ttf.hpp"
+#include "font/sdl_ttf.hpp"
 
 #include "config.hpp"
 #include "log.hpp"

src/font/sdl_ttf.cpp

@@ -12,13 +12,13 @@
    See the COPYING file for more details.
 */
 
-#include "sdl_ttf.hpp"
+#include "font/sdl_ttf.hpp"
 
 #include "font/error.hpp"
-#include "font_config.hpp"
-#include "font_id.hpp"
-#include "text_cache.hpp"
-#include "text_surface.hpp"
+#include "font/font_config.hpp"
+#include "font/font_id.hpp"
+#include "font/text_cache.hpp"
+#include "font/text_surface.hpp"
 
 #include "filesystem.hpp"
 #include "game_config.hpp"

src/font/standard_colors.cpp

@@ -12,9 +12,9 @@
  * See the COPYING file for more details.
  */
 
-#include "standard_colors.hpp"
+#include "font/standard_colors.hpp"
 
-#include <sdl/utils.hpp>
+#include "sdl/utils.hpp"
 
 namespace font {
 	const SDL_Color NORMAL_COLOR = {0xDD,0xDD,0xDD,0},

src/font/text.cpp

@@ -14,15 +14,15 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "text.hpp"
+#include "font/text.hpp"
 
-#include "font_config.hpp"
+#include "font/font_config.hpp"
 
-#include "pango/escape.hpp"
-#include "pango/font.hpp"
-#include "pango/hyperlink.hpp"
-#include "pango/iter.hpp"
-#include "pango/stream_ops.hpp"
+#include "font/pango/escape.hpp"
+#include "font/pango/font.hpp"
+#include "font/pango/hyperlink.hpp"
+#include "font/pango/iter.hpp"
+#include "font/pango/stream_ops.hpp"
 
 #include "gettext.hpp"
 #include "gui/widgets/helper.hpp"

src/font/text_cache.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "text_cache.hpp"
+#include "font/text_cache.hpp"
 
 namespace font {
 

src/font/text_surface.cpp

@@ -12,9 +12,9 @@
    See the COPYING file for more details.
 */
 
-#include "text_surface.hpp"
+#include "font/text_surface.hpp"
 
-#include "sdl_ttf.hpp"
+#include "font/sdl_ttf.hpp"
 
 #include "sdl/utils.hpp"
 

src/game_events/action_wml.cpp

@@ -19,10 +19,10 @@
  */
 
 #include "global.hpp"
-#include "action_wml.hpp"
-#include "conditional_wml.hpp"
-#include "manager.hpp"
-#include "pump.hpp"
+#include "game_events/action_wml.hpp"
+#include "game_events/conditional_wml.hpp"
+#include "game_events/manager.hpp"
+#include "game_events/pump.hpp"
 
 #include "actions/attack.hpp"
 #include "actions/create.hpp"

src/game_events/conditional_wml.cpp

@@ -18,7 +18,7 @@
  */
 
 #include "global.hpp"
-#include "conditional_wml.hpp"
+#include "game_events/conditional_wml.hpp"
 
 #include "config.hpp"
 #include "game_board.hpp"

src/game_events/entity_location.cpp

@@ -18,7 +18,7 @@
  */
 
 #include "global.hpp"
-#include "entity_location.hpp"
+#include "game_events/entity_location.hpp"
 
 #include "resources.hpp"
 #include "units/unit.hpp"

src/game_events/handlers.cpp

@@ -19,11 +19,11 @@
  */
 
 #include "global.hpp"
-#include "handlers.hpp"
-#include "manager.hpp"
-#include "manager_impl.hpp"
-#include "menu_item.hpp"
-#include "pump.hpp"
+#include "game_events/handlers.hpp"
+#include "game_events/manager.hpp"
+#include "game_events/manager_impl.hpp"
+#include "game_events/menu_item.hpp"
+#include "game_events/pump.hpp"
 
 #include "formula/string_utils.hpp"
 #include "game_data.hpp"

src/game_events/manager.cpp

@@ -16,10 +16,10 @@
 
 #include "game_events/manager.hpp"
 
-#include "handlers.hpp"
-#include "manager_impl.hpp"
-#include "menu_item.hpp"
-#include "pump.hpp"
+#include "game_events/handlers.hpp"
+#include "game_events/manager_impl.hpp"
+#include "game_events/menu_item.hpp"
+#include "game_events/pump.hpp"
 
 #include "filter_context.hpp"
 #include "formula/string_utils.hpp"

src/game_events/menu_item.cpp

@@ -17,14 +17,14 @@
  * Definitions for a class that implements WML-defined (right-click) menu items.
  */
 
-#include "menu_item.hpp"
+#include "game_events/menu_item.hpp"
 
 #include "global.hpp"
 
-#include "conditional_wml.hpp"
-#include "handlers.hpp"
-#include "manager.hpp"
-#include "pump.hpp"
+#include "game_events/conditional_wml.hpp"
+#include "game_events/handlers.hpp"
+#include "game_events/manager.hpp"
+#include "game_events/pump.hpp"
 
 #include "actions/undo.hpp"
 #include "game_config.hpp"

src/game_events/pump.cpp

@@ -19,10 +19,10 @@
  */
 
 #include "global.hpp"
-#include "pump.hpp"
-#include "conditional_wml.hpp"
-#include "handlers.hpp"
-#include "manager.hpp"
+#include "game_events/pump.hpp"
+#include "game_events/conditional_wml.hpp"
+#include "game_events/handlers.hpp"
+#include "game_events/manager.hpp"
 
 #include "display_chat_manager.hpp"
 #include "game_config.hpp"

src/game_events/wmi_container.cpp

@@ -18,9 +18,9 @@
  */
 
 #include "global.hpp"
-#include "wmi_container.hpp"
-#include "handlers.hpp"
-#include "menu_item.hpp"
+#include "game_events/wmi_container.hpp"
+#include "game_events/handlers.hpp"
+#include "game_events/menu_item.hpp"
 #include "resources.hpp"
 #include "play_controller.hpp"
 

src/game_initialization/configure_engine.cpp

@@ -1,4 +1,4 @@
-#include "configure_engine.hpp"
+#include "game_initialization/configure_engine.hpp"
 #include "formula/string_utils.hpp"
 #include "game_config_manager.hpp"
 #include "mp_game_settings.hpp"

src/game_initialization/connect_engine.cpp

@@ -11,7 +11,7 @@
 
    See the COPYING file for more details.
 */
-#include "connect_engine.hpp"
+#include "game_initialization/connect_engine.hpp"
 
 #include "ai/configuration.hpp"
 #include "config_assign.hpp"
@@ -20,12 +20,11 @@
 #include "gettext.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
-#include "multiplayer_ui.hpp"
-#include "mp_game_utils.hpp"
+#include "game_initialization/multiplayer_ui.hpp"
+#include "game_initialization/mp_game_utils.hpp"
 #include "mt_rng.hpp"
-#include "playcampaign.hpp"
+#include "game_initialization/playcampaign.hpp"
 #include "tod_manager.hpp"
-#include "multiplayer_ui.hpp" // For get_color_string
 #include "wesnothd_connection.hpp"
 
 #include <stdlib.h>

src/game_initialization/create_engine.cpp

@@ -11,9 +11,9 @@
 
    See the COPYING file for more details.
 */
-#include "create_engine.hpp"
+#include "game_initialization/create_engine.hpp"
 
-#include "depcheck.hpp"
+#include "game_initialization/depcheck.hpp"
 #include "config_assign.hpp"
 #include "game_config_manager.hpp"
 #include "game_launcher.hpp"

src/game_initialization/depcheck.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "depcheck.hpp"
+#include "game_initialization/depcheck.hpp"
 
 #include <algorithm>
 

src/game_initialization/flg_manager.cpp

@@ -11,7 +11,7 @@
 
    See the COPYING file for more details.
 */
-#include "flg_manager.hpp"
+#include "game_initialization/flg_manager.hpp"
 
 #include "config.hpp"
 #include "formula/string_utils.hpp"

src/game_initialization/mp_game_utils.cpp

@@ -11,7 +11,7 @@
 
    See the COPYING file for more details.
 */
-#include "mp_game_utils.hpp"
+#include "game_initialization/mp_game_utils.hpp"
 
 #include "carryover.hpp"
 #include "config.hpp"
@@ -21,7 +21,7 @@
 #include "game_config_manager.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
-#include "mp_options.hpp"
+#include "game_initialization/mp_options.hpp"
 #include "savegame.hpp"
 #include "units/id.hpp"
 #include "wesnothd_connection_error.hpp"

src/game_initialization/mp_options.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "mp_options.hpp"
+#include "game_initialization/mp_options.hpp"
 #include "font/standard_colors.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/find_widget.hpp"

src/game_initialization/multiplayer.cpp

@@ -11,7 +11,7 @@
 
    See the COPYING file for more details.
 */
-#include "multiplayer.hpp"
+#include "game_initialization/multiplayer.hpp"
 
 #include "addon/manager.hpp" // for get_installed_addons
 #include "config_assign.hpp"
@@ -34,18 +34,18 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "hash.hpp"
-#include "lobby_reload_request_exception.hpp"
+#include "game_initialization/lobby_reload_request_exception.hpp"
 #include "log.hpp"
 #include "generators/map_create.hpp"
-#include "mp_game_utils.hpp"
-#include "multiplayer_configure.hpp"
-#include "configure_engine.hpp"
-#include "multiplayer_connect.hpp"
-#include "multiplayer_create.hpp"
+#include "game_initialization/mp_game_utils.hpp"
+#include "game_initialization/multiplayer_configure.hpp"
+#include "game_initialization/configure_engine.hpp"
+#include "game_initialization/multiplayer_connect.hpp"
+#include "game_initialization/multiplayer_create.hpp"
 #include "multiplayer_error_codes.hpp"
-#include "multiplayer_wait.hpp"
-#include "multiplayer_lobby.hpp"
-#include "playcampaign.hpp"
+#include "game_initialization/multiplayer_wait.hpp"
+#include "game_initialization/multiplayer_lobby.hpp"
+#include "game_initialization/playcampaign.hpp"
 #include "settings.hpp"
 #include "scripting/plugins/context.hpp"
 #include "sdl/rect.hpp"

src/game_initialization/multiplayer_configure.cpp

@@ -26,7 +26,7 @@
 #include "gui/dialogs/transient_message.hpp"
 #include "minimap.hpp"
 #include "mp_game_settings.hpp"
-#include "multiplayer_configure.hpp"
+#include "game_initialization/multiplayer_configure.hpp"
 #include "filesystem.hpp"
 #include "log.hpp"
 #include "saved_game.hpp"

src/game_initialization/multiplayer_connect.cpp

@@ -16,7 +16,7 @@
  * @file
  * Prepare to join a multiplayer-game.
  */
-#include "multiplayer_connect.hpp"
+#include "game_initialization/multiplayer_connect.hpp"
 
 #include "ai/configuration.hpp"
 #include "construct_dialog.hpp"

src/game_initialization/multiplayer_create.cpp

@@ -35,7 +35,7 @@
 #include "gui/dialogs/transient_message.hpp"
 #include "gui/widgets/window.hpp"
 #include "minimap.hpp"
-#include "multiplayer_create.hpp"
+#include "game_initialization/multiplayer_create.hpp"
 #include "filesystem.hpp"
 #include "savegame.hpp"
 #include "saved_game.hpp"

src/game_initialization/multiplayer_lobby.cpp

@@ -29,13 +29,13 @@
 #include "map/map.hpp"
 #include "font/marked-up_text.hpp"
 #include "minimap.hpp"
-#include "multiplayer_lobby.hpp"
+#include "game_initialization/multiplayer_lobby.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/old_markup.hpp"
 #include "gui/dialogs/message.hpp" // for gui2::show_message
 #include "gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp"
 #include "gui/widgets/window.hpp" // for gui2::window::OK
-#include "lobby_reload_request_exception.hpp"
+#include "game_initialization/lobby_reload_request_exception.hpp"
 #include "log.hpp"
 #include "sound.hpp"
 #include "wml_exception.hpp"

src/game_initialization/multiplayer_ui.cpp

@@ -27,9 +27,9 @@
 #include "log.hpp"
 #include "font/marked-up_text.hpp"
 #include "menu_events.hpp"
-#include "multiplayer.hpp"
-#include "multiplayer_ui.hpp"
-#include "multiplayer_lobby.hpp" //needed for dynamic cast when implementing the lobby_sounds preference
+#include "game_initialization/multiplayer.hpp"
+#include "game_initialization/multiplayer_ui.hpp"
+#include "game_initialization/multiplayer_lobby.hpp" //needed for dynamic cast when implementing the lobby_sounds preference
 #include "mp_ui_alerts.hpp"
 #include "wml_separators.hpp"
 #include "formula/string_utils.hpp"

src/game_initialization/multiplayer_wait.cpp

@@ -26,8 +26,8 @@
 #include "log.hpp"
 #include "font/marked-up_text.hpp"
 #include "font/standard_colors.hpp"
-#include "mp_game_utils.hpp"
-#include "multiplayer_wait.hpp"
+#include "game_initialization/mp_game_utils.hpp"
+#include "game_initialization/multiplayer_wait.hpp"
 #include "statistics.hpp"
 #include "saved_game.hpp"
 #include "mp_ui_alerts.hpp"

src/game_initialization/playcampaign.cpp

@@ -20,7 +20,7 @@
 
 #include "global.hpp"
 
-#include "playcampaign.hpp"
+#include "game_initialization/playcampaign.hpp"
 
 #include "carryover.hpp"
 #include "game_config.hpp"
@@ -36,9 +36,9 @@
 #include "log.hpp"
 #include "map/map.hpp"
 #include "map/exception.hpp"
-#include "mp_game_utils.hpp"
-#include "multiplayer.hpp"
-#include "connect_engine.hpp"
+#include "game_initialization/mp_game_utils.hpp"
+#include "game_initialization/multiplayer.hpp"
+#include "game_initialization/connect_engine.hpp"
 #include "gettext.hpp"
 #include "resources.hpp"
 #include "savegame.hpp"

src/game_initialization/singleplayer.cpp

@@ -11,7 +11,7 @@
    See the COPYING file for more details.
 */
 
-#include "singleplayer.hpp"
+#include "game_initialization/singleplayer.hpp"
 #include "config.hpp"
 #include "config_assign.hpp"
 #include "game_config_manager.hpp"
@@ -19,11 +19,11 @@
 #include "gui/dialogs/message.hpp"
 #include "gui/dialogs/sp_options_configure.hpp"
 #include "gui/widgets/window.hpp"
-#include "multiplayer.hpp"
-#include "multiplayer_configure.hpp"
-#include "multiplayer_connect.hpp"
-#include "multiplayer_ui.hpp"
-#include "playcampaign.hpp"
+#include "game_initialization/multiplayer.hpp"
+#include "game_initialization/multiplayer_configure.hpp"
+#include "game_initialization/multiplayer_connect.hpp"
+#include "game_initialization/multiplayer_ui.hpp"
+#include "game_initialization/playcampaign.hpp"
 #include "wml_exception.hpp"
 
 static lg::log_domain log_engine("engine");

src/generators/cave_map_generator.cpp

@@ -19,7 +19,7 @@
 
 #include "global.hpp"
 
-#include "cave_map_generator.hpp"
+#include "generators/cave_map_generator.hpp"
 #include "config_assign.hpp"
 #include "log.hpp"
 #include "map/map.hpp"

src/generators/default_map_generator.cpp

@@ -16,10 +16,10 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "default_map_generator.hpp"
+#include "generators/default_map_generator.hpp"
 
 #include "gui/dialogs/editor/generator_settings.hpp"
-#include "default_map_generator_job.hpp"
+#include "generators/default_map_generator_job.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
 #include "map/map.hpp"

src/generators/default_map_generator_job.cpp

@@ -19,14 +19,14 @@
 
 #include "global.hpp"
 
-#include "default_map_generator_job.hpp"
+#include "generators/default_map_generator_job.hpp"
 #include "formula/string_utils.hpp"
 #include "game_config_manager.hpp"
 #include "gettext.hpp"
 #include "language.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
-#include "map_generator.hpp" // mapgen_exception
+#include "generators/map_generator.hpp" // mapgen_exception
 #include "pathfind/pathfind.hpp"
 #include "pathutils.hpp"
 #include "util.hpp"

src/generators/lua_map_generator.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "lua_map_generator.hpp"
+#include "generators/lua_map_generator.hpp"
 
 #include "config.hpp"
 #include "game_errors.hpp"

src/generators/map_create.cpp

@@ -13,7 +13,7 @@
 */
 
 #include "global.hpp"
-#include "map_create.hpp"
+#include "generators/map_create.hpp"
 
 #include "generators/cave_map_generator.hpp"
 #include "generators/default_map_generator.hpp"

src/generators/map_generator.cpp

@@ -18,7 +18,7 @@
  */
 
 #include "global.hpp"
-#include "map_generator.hpp"
+#include "generators/map_generator.hpp"
 
 #include "config.hpp"
 #include "gettext.hpp"

src/gui/dialogs/label_settings.cpp

@@ -13,7 +13,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "label_settings.hpp"
+#include "gui/dialogs/label_settings.hpp"
 
 #include <vector>
 #include "utils/functional.hpp"
@@ -38,7 +38,7 @@ namespace gui2
 {
 namespace dialogs
 {
-REGISTER_DIALOG(label_settings);
+REGISTER_DIALOG(label_settings)
 
 label_settings::label_settings(display_context& dc) : viewer(dc) {
 	const std::vector<std::string>& all_categories = resources::screen->labels().all_categories();

src/gui/dialogs/preferences_dialog.cpp

@@ -246,7 +246,7 @@ template<typename W>
 static void disable_widget_on_toggle(window& window, widget& w, const std::string& id)
 {
 	find_widget<W>(&window, id, false).set_active(dynamic_cast<selectable_item&>(w).get_value_bool());
-};
+}
 
 /**
  * Sets up states and callbacks for each of the widgets

src/gui/dialogs/select_orb_colors.cpp

@@ -13,7 +13,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "select_orb_colors.hpp"
+#include "gui/dialogs/select_orb_colors.hpp"
 
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/auxiliary/iterator/walker.hpp"
@@ -33,7 +33,7 @@ namespace gui2
 {
 namespace dialogs
 {
-REGISTER_DIALOG(select_orb_colors);
+REGISTER_DIALOG(select_orb_colors)
 
 select_orb_colors::select_orb_colors()
 	: show_unmoved_(preferences::show_unmoved_orb())

src/gui/widgets/control.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "control.hpp"
+#include "gui/widgets/control.hpp"
 
 #include "formula/string_utils.hpp"
 #include "gui/auxiliary/iterator/walker_widget.hpp"

src/gui/widgets/image.cpp

@@ -16,7 +16,7 @@
 
 #include "gui/widgets/image.hpp"
 
-#include "../../image.hpp" // We want the file in src/
+#include "gui/widgets/../../image.hpp" // We want the file in src/
 
 #include "gui/core/widget_definition.hpp"
 #include "gui/core/window_builder.hpp"

src/gui/widgets/listbox.hpp

@@ -256,7 +256,7 @@ public:
 			[f](int lhs, int rhs) { return f(lhs) < f(rhs); },
 			[f](int lhs, int rhs) { return f(lhs) > f(rhs); }
 		}});
-	};
+	}
 
 	enum SORT_ORDER {
 		SORT_NONE,

src/gui/widgets/minimap.cpp

@@ -24,7 +24,7 @@
 #include "map/map.hpp"
 #include "map/exception.hpp"
 #include "terrain/type_data.hpp"
-#include "../../minimap.hpp" // We want the file in src/
+#include "gui/widgets/../../minimap.hpp" // We want the file in src/
 
 #include "utils/functional.hpp"
 

src/help/help.cpp

@@ -20,7 +20,7 @@
 #define GETTEXT_DOMAIN "wesnoth-help"
 
 #include "global.hpp"
-#include "help.hpp"
+#include "help/help.hpp"
 
 #include "config.hpp"                   // for config, etc
 #include "events.hpp"                   // for raise_draw_event, pump, etc
@@ -28,8 +28,8 @@
 #include "game_preferences.hpp"
 #include "gettext.hpp"                  // for _
 #include "gui/dialogs/transient_message.hpp"
-#include "help_browser.hpp"             // for help_browser
-#include "help_impl.hpp"                // for hidden_symbol, toplevel, etc
+#include "help/help_browser.hpp"             // for help_browser
+#include "help/help_impl.hpp"                // for hidden_symbol, toplevel, etc
 #include "key.hpp"                      // for CKey
 #include "log.hpp"                      // for LOG_STREAM, log_domain
 #include "sdl/utils.hpp"                // for surface

src/help/help_browser.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "help_browser.hpp"
+#include "help/help_browser.hpp"
 #include <iostream>                     // for operator<<, basic_ostream, etc
 #include <SDL_mouse.h>                  // for SDL_GetMouseState, etc
 #include "cursor.hpp"                   // for set, CURSOR_TYPE::HYPERLINK, etc
@@ -20,7 +20,7 @@
 #include "gettext.hpp"                  // for _
 #include "gui/dialogs/transient_message.hpp"
 #include "help/help_text_area.hpp"      // for help_text_area
-#include "help_impl.hpp"                // for find_topic, hidden_symbol, etc
+#include "help/help_impl.hpp"                // for find_topic, hidden_symbol, etc
 #include "key.hpp"                      // for CKey
 #include "log.hpp"                      // for log_scope
 #include "sdl/rect.hpp"

src/help/help_button.cpp

@@ -12,9 +12,9 @@
    See the COPYING file for more details.
 */
 
-#include "help_button.hpp"
+#include "help/help_button.hpp"
 
-#include "help.hpp"
+#include "help/help.hpp"
 #include "gettext.hpp"
 #include "config.hpp"
 

src/help/help_impl.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "help_impl.hpp"
+#include "help/help_impl.hpp"
 
 #include "about.hpp"                    // for get_text
 #include "display.hpp"                  // for display
@@ -21,7 +21,7 @@
 #include "game_config_manager.hpp"      // for game_config_manager
 #include "game_preferences.hpp"         // for encountered_terrains, etc
 #include "gettext.hpp"                  // for _, gettext, N_
-#include "help_topic_generators.hpp"
+#include "help/help_topic_generators.hpp"
 #include "hotkey/hotkey_command.hpp"    // for is_scope_active, etc
 #include "image.hpp"                    // for get_image, locator
 #include "log.hpp"                      // for LOG_STREAM, logger, etc

src/help/help_menu.cpp

@@ -12,10 +12,10 @@
    See the COPYING file for more details.
 */
 
-#include "help_menu.hpp"
+#include "help/help_menu.hpp"
 
 #include "game_config.hpp"              // for menu_contract, menu_expand
-#include "help_impl.hpp"                // for section, topic, topic_list, etc
+#include "help/help_impl.hpp"                // for section, topic, topic_list, etc
 #include "sound.hpp"                    // for play_UI_sound
 #include "wml_separators.hpp"           // for IMG_TEXT_SEPARATOR, etc
 

src/help/help_text_area.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "help_text_area.hpp"
+#include "help/help_text_area.hpp"
 
 #include "config.hpp"                   // for config, etc
 #include "game_config.hpp"              // for debug

src/help/help_topic_generators.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "help_topic_generators.hpp"
+#include "help/help_topic_generators.hpp"
 
 #include "font/sdl_ttf.hpp"             // for line_width
 #include "game_config.hpp"              // for debug, menu_contract, etc

src/hotkey/command_executor.cpp

@@ -12,8 +12,8 @@
    See the COPYING file for more details.
 */
 
-#include "command_executor.hpp"
-#include "hotkey_item.hpp"
+#include "hotkey/command_executor.hpp"
+#include "hotkey/hotkey_item.hpp"
 
 #include "gui/dialogs/lua_interpreter.hpp"
 #include "gui/dialogs/message.hpp"

src/hotkey/hotkey_command.cpp

@@ -15,8 +15,8 @@
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
 #include "gettext.hpp"
-#include "hotkey_command.hpp"
-#include "hotkey_item.hpp"
+#include "hotkey/hotkey_command.hpp"
+#include "hotkey/hotkey_item.hpp"
 #include "config.hpp"
 #include "preferences.hpp"
 #include "log.hpp"

src/hotkey/hotkey_item.cpp

@@ -14,8 +14,8 @@
 
 
 #include "log.hpp"
-#include "hotkey_item.hpp"
-#include "hotkey_command.hpp"
+#include "hotkey/hotkey_item.hpp"
+#include "hotkey/hotkey_command.hpp"
 #include "config.hpp"
 
 #define GETTEXT_DOMAIN "wesnoth-lib"