Convert most includes to src/-relative

This excludes includes that need backtrack path specifiers in order to resolve
name clashes.

src/actions/attack.cpp

@@ -21,37 +21,37 @@
 
 #include "vision.hpp"
 
-#include "../ai/lua/unit_advancements_aspect.hpp"
-#include "../attack_prediction.hpp"
-#include "../config_assign.hpp"
-#include "../dialogs.hpp"
-#include "../game_config.hpp"
-#include "../game_display.hpp"
+#include "ai/lua/unit_advancements_aspect.hpp"
+#include "attack_prediction.hpp"
+#include "config_assign.hpp"
+#include "dialogs.hpp"
+#include "game_config.hpp"
+#include "game_display.hpp"
 #include "game_events/manager.hpp"
-#include "../game_events/pump.hpp"
-#include "../game_preferences.hpp"
-#include "../game_data.hpp"
-#include "../gettext.hpp"
-#include "../log.hpp"
-#include "../map.hpp"
-#include "../mouse_handler_base.hpp"
-#include "../play_controller.hpp"
-#include "../random_new.hpp"
-#include "../replay.hpp"
-#include "../resources.hpp"
-#include "../statistics.hpp"
-#include "../synced_checkup.hpp"
-#include "../synced_user_choice.hpp"
-#include "../team.hpp"
-#include "../tod_manager.hpp"
-#include "../unit.hpp"
-#include "../unit_abilities.hpp"
-#include "../unit_animation_component.hpp"
-#include "../unit_display.hpp"
-#include "../unit_helper.hpp"
-#include "../unit_map.hpp"
-#include "../whiteboard/manager.hpp"
-#include "../wml_exception.hpp"
+#include "game_events/pump.hpp"
+#include "game_preferences.hpp"
+#include "game_data.hpp"
+#include "gettext.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "mouse_handler_base.hpp"
+#include "play_controller.hpp"
+#include "random_new.hpp"
+#include "replay.hpp"
+#include "resources.hpp"
+#include "statistics.hpp"
+#include "synced_checkup.hpp"
+#include "synced_user_choice.hpp"
+#include "team.hpp"
+#include "tod_manager.hpp"
+#include "unit.hpp"
+#include "unit_abilities.hpp"
+#include "unit_animation_component.hpp"
+#include "unit_display.hpp"
+#include "unit_helper.hpp"
+#include "unit_map.hpp"
+#include "whiteboard/manager.hpp"
+#include "wml_exception.hpp"
 
 #include <boost/foreach.hpp>
 

src/actions/attack.hpp

@@ -29,8 +29,8 @@ class  unit;
 class  unit_map;
 class  gamemap;
 
-#include "../unit_types.hpp"
-#include "../ai/lua/unit_advancements_aspect.hpp"
+#include "unit_types.hpp"
+#include "ai/lua/unit_advancements_aspect.hpp"
 
 #include <vector>
 

src/actions/create.cpp

@@ -23,33 +23,33 @@
 #include "undo.hpp"
 #include "vision.hpp"
 
-#include "../config.hpp"
-#include "../config_assign.hpp"
-#include "../filter_context.hpp"
-#include "../game_board.hpp"
-#include "../game_display.hpp"
-#include "../game_events/manager.hpp"
-#include "../game_events/pump.hpp"
+#include "config.hpp"
+#include "config_assign.hpp"
+#include "filter_context.hpp"
+#include "game_board.hpp"
+#include "game_display.hpp"
+#include "game_events/manager.hpp"
+#include "game_events/pump.hpp"
 #include "game_state.hpp"
-#include "../game_preferences.hpp"
-#include "../game_data.hpp"
-#include "../gettext.hpp"
-#include "../log.hpp"
-#include "../map.hpp"
-#include "../pathfind/pathfind.hpp"
-#include "../recall_list_manager.hpp"
-#include "../replay.hpp"
-#include "../replay_helper.hpp"
-#include "../resources.hpp"
-#include "../statistics.hpp"
-#include "../synced_checkup.hpp"
-#include "../synced_context.hpp"
-#include "../team.hpp"
-#include "../unit.hpp"
-#include "../unit_display.hpp"
-#include "../unit_filter.hpp"
-#include "../variable.hpp"
-#include "../whiteboard/manager.hpp"
+#include "game_preferences.hpp"
+#include "game_data.hpp"
+#include "gettext.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "pathfind/pathfind.hpp"
+#include "recall_list_manager.hpp"
+#include "replay.hpp"
+#include "replay_helper.hpp"
+#include "resources.hpp"
+#include "statistics.hpp"
+#include "synced_checkup.hpp"
+#include "synced_context.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "unit_display.hpp"
+#include "unit_filter.hpp"
+#include "variable.hpp"
+#include "whiteboard/manager.hpp"
 
 #include <boost/foreach.hpp>
 #include <boost/scoped_ptr.hpp>

src/actions/create.hpp

@@ -28,8 +28,8 @@ class vconfig;
 
 #include "unit_creator.hpp"
 
-#include "../map_location.hpp"
-#include "../unit_ptr.hpp"
+#include "map_location.hpp"
+#include "unit_ptr.hpp"
 
 #include <boost/tuple/tuple.hpp>
 

src/actions/heal.cpp

@@ -19,18 +19,18 @@
 
 #include "heal.hpp"
 
-#include "../game_board.hpp"
-#include "../game_display.hpp"
-#include "../gettext.hpp"
-#include "../log.hpp"
-#include "../map.hpp"
-#include "../play_controller.hpp"
-#include "../resources.hpp"
-#include "../team.hpp"
-#include "../unit.hpp"
-#include "../unit_abilities.hpp"
-#include "../unit_display.hpp"
-#include "../unit_map.hpp"
+#include "game_board.hpp"
+#include "game_display.hpp"
+#include "gettext.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "play_controller.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "unit_abilities.hpp"
+#include "unit_display.hpp"
+#include "unit_map.hpp"
 
 #include <boost/foreach.hpp>
 #include <list>

src/actions/move.cpp

@@ -22,29 +22,29 @@
 #include "undo.hpp"
 #include "vision.hpp"
 
-#include "../config_assign.hpp"
-#include "../game_display.hpp"
+#include "config_assign.hpp"
+#include "game_display.hpp"
 #include "game_events/manager.hpp"
 #include "game_events/pump.hpp"
-#include "../game_preferences.hpp"
-#include "../gettext.hpp"
+#include "game_preferences.hpp"
+#include "gettext.hpp"
 #include "hotkey/hotkey_item.hpp"
 #include "hotkey/hotkey_command.hpp"
-#include "../log.hpp"
-#include "../map.hpp"
-#include "../mouse_handler_base.hpp"
-#include "../pathfind/pathfind.hpp"
-#include "../replay.hpp"
-#include "../replay_helper.hpp"
-#include "../synced_context.hpp"
-#include "../play_controller.hpp"
-#include "../resources.hpp"
-#include "../unit_display.hpp"
-#include "../formula_string_utils.hpp"
-#include "../team.hpp"
-#include "../unit.hpp"
-#include "../unit_animation_component.hpp"
-#include "../whiteboard/manager.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "mouse_handler_base.hpp"
+#include "pathfind/pathfind.hpp"
+#include "replay.hpp"
+#include "replay_helper.hpp"
+#include "synced_context.hpp"
+#include "play_controller.hpp"
+#include "resources.hpp"
+#include "unit_display.hpp"
+#include "formula_string_utils.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "unit_animation_component.hpp"
+#include "whiteboard/manager.hpp"
 
 #include <boost/foreach.hpp>
 #include <deque>

src/actions/move.hpp

@@ -24,7 +24,7 @@ struct map_location;
 class  replay;
 class  unit;
 
-#include "../unit_map.hpp"
+#include "unit_map.hpp"
 
 #include <vector>
 

src/actions/shroud_clearing_action.cpp

@@ -1,13 +1,13 @@
 #include "shroud_clearing_action.hpp"
 
 #include "move.hpp" //get_village
-#include "../resources.hpp"
-#include "../team.hpp"
-#include "../log.hpp"
-#include "../unit_display.hpp"
-#include "../game_board.hpp"
-#include "../map.hpp"
-#include "../play_controller.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "log.hpp"
+#include "unit_display.hpp"
+#include "game_board.hpp"
+#include "map.hpp"
+#include "play_controller.hpp"
 
 namespace actions {
 void shroud_clearing_action::return_village()

src/actions/shroud_clearing_action.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "vision.hpp"
-#include "../map_location.hpp"
-#include "../unit_ptr.hpp"
+#include "map_location.hpp"
+#include "unit_ptr.hpp"
 
 #include <boost/noncopyable.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>

src/actions/undo.cpp

@@ -20,28 +20,28 @@
 #include "undo.hpp"
 #include "global.hpp"
 
-#include "../game_board.hpp"               // for game_board
-#include "../game_display.hpp"          // for game_display
-#include "../log.hpp"                   // for LOG_STREAM, logger, etc
-#include "../map.hpp"                      // for gamemap
-#include "../map_location.hpp"  // for map_location, operator<<, etc
-#include "../mouse_handler_base.hpp"       // for command_disabler
-#include "../recall_list_manager.hpp"   // for recall_list_manager
-#include "../replay.hpp"                // for recorder, replay
-#include "../replay_helper.hpp"         // for replay_helper
-#include "../resources.hpp"             // for screen, teams, units, etc
-#include "../statistics.hpp"               // for un_recall_unit, etc
-#include "../synced_context.hpp"        // for set_scontext_synced
-#include "../team.hpp"                  // for team
-#include "../unit.hpp"                  // for unit
-#include "../unit_animation_component.hpp"
-#include "../unit_display.hpp"          // for move_unit
-#include "../unit_id.hpp"
-#include "../unit_map.hpp"              // for unit_map, etc
-#include "../unit_ptr.hpp"      // for unit_const_ptr, unit_ptr
-#include "../unit_types.hpp"               // for unit_type, unit_type_data, etc
-#include "../util.hpp"                     // for bad_lexical_cast (ptr only), etc
-#include "../whiteboard/manager.hpp"    // for manager
+#include "game_board.hpp"               // for game_board
+#include "game_display.hpp"          // for game_display
+#include "log.hpp"                   // for LOG_STREAM, logger, etc
+#include "map.hpp"                      // for gamemap
+#include "map_location.hpp"  // for map_location, operator<<, etc
+#include "mouse_handler_base.hpp"       // for command_disabler
+#include "recall_list_manager.hpp"   // for recall_list_manager
+#include "replay.hpp"                // for recorder, replay
+#include "replay_helper.hpp"         // for replay_helper
+#include "resources.hpp"             // for screen, teams, units, etc
+#include "statistics.hpp"               // for un_recall_unit, etc
+#include "synced_context.hpp"        // for set_scontext_synced
+#include "team.hpp"                  // for team
+#include "unit.hpp"                  // for unit
+#include "unit_animation_component.hpp"
+#include "unit_display.hpp"          // for move_unit
+#include "unit_id.hpp"
+#include "unit_map.hpp"              // for unit_map, etc
+#include "unit_ptr.hpp"      // for unit_const_ptr, unit_ptr
+#include "unit_types.hpp"               // for unit_type, unit_type_data, etc
+#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

src/actions/undo.hpp

@@ -21,8 +21,8 @@
 #define ACTIONS_UNDO_H_INCLUDED
 
 #include "vision.hpp"
-#include "../map_location.hpp"
-#include "../unit_ptr.hpp"
+#include "map_location.hpp"
+#include "unit_ptr.hpp"
 #include "undo_action.hpp"
 
 #include <boost/noncopyable.hpp>

src/actions/undo_action.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "vision.hpp"
-#include "../map_location.hpp"
-#include "../unit_ptr.hpp"
-#include "../synced_context.hpp"
+#include "map_location.hpp"
+#include "unit_ptr.hpp"
+#include "synced_context.hpp"
 
 #include <boost/noncopyable.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>

src/actions/undo_dismiss_action.cpp

@@ -1,7 +1,7 @@
 #include "undo_dismiss_action.hpp"
-#include "../resources.hpp"
-#include "../team.hpp"
-#include "../replay.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "replay.hpp"
 
 namespace actions
 {

src/actions/undo_dismiss_action.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "undo_action.hpp"
-#include "../unit_ptr.hpp"
-#include "../unit.hpp"
+#include "unit_ptr.hpp"
+#include "unit.hpp"
 
 namespace actions
 {

src/actions/undo_move_action.cpp

@@ -1,16 +1,16 @@
 #include "undo_move_action.hpp"
 #include "move.hpp"
 
-#include "../resources.hpp"
-#include "../team.hpp"
-#include "../replay.hpp"
-#include "../unit_map.hpp"
-#include "../unit_animation_component.hpp"
-#include "../log.hpp"
-#include "../game_display.hpp"
-#include "../unit_display.hpp"
-#include "../game_board.hpp"
-#include "../map.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "replay.hpp"
+#include "unit_map.hpp"
+#include "unit_animation_component.hpp"
+#include "log.hpp"
+#include "game_display.hpp"
+#include "unit_display.hpp"
+#include "game_board.hpp"
+#include "map.hpp"
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)

src/actions/undo_move_action.hpp

@@ -2,8 +2,8 @@
 
 #include "undo_action.hpp"
 #include "shroud_clearing_action.hpp"
-#include "../unit_ptr.hpp"
-#include "../unit.hpp"
+#include "unit_ptr.hpp"
+#include "unit.hpp"
 
 namespace actions
 {

src/actions/undo_recall_action.cpp

@@ -2,13 +2,13 @@
 #include "create.hpp"
 
 #include "gui/dialogs/transient_message.hpp"
-#include "../resources.hpp"
-#include "../team.hpp"
-#include "../replay.hpp"
-#include "../unit_map.hpp"
-#include "../statistics.hpp"
-#include "../log.hpp"
-#include "../game_display.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "replay.hpp"
+#include "unit_map.hpp"
+#include "statistics.hpp"
+#include "log.hpp"
+#include "game_display.hpp"
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)

src/actions/undo_recall_action.hpp

@@ -2,8 +2,8 @@
 
 #include "undo_action.hpp"
 #include "shroud_clearing_action.hpp"
-#include "../unit_ptr.hpp"
-#include "../unit.hpp"
+#include "unit_ptr.hpp"
+#include "unit.hpp"
 
 namespace actions
 {

src/actions/undo_recruit_action.cpp

@@ -2,13 +2,13 @@
 #include "create.hpp"
 
 #include "gui/dialogs/transient_message.hpp"
-#include "../resources.hpp"
-#include "../team.hpp"
-#include "../replay.hpp"
-#include "../unit_map.hpp"
-#include "../statistics.hpp"
-#include "../log.hpp"
-#include "../game_display.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "replay.hpp"
+#include "unit_map.hpp"
+#include "statistics.hpp"
+#include "log.hpp"
+#include "game_display.hpp"
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)

src/actions/undo_recruit_action.hpp

@@ -2,8 +2,8 @@
 
 #include "undo_action.hpp"
 #include "shroud_clearing_action.hpp"
-#include "../unit_ptr.hpp"
-#include "../unit.hpp"
+#include "unit_ptr.hpp"
+#include "unit.hpp"
 
 namespace actions
 {

src/actions/undo_update_shroud_action.cpp

@@ -1,7 +1,7 @@
 #include "undo_update_shroud_action.hpp"
-#include "../resources.hpp"
-#include "../team.hpp"
-#include "../replay.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "replay.hpp"
 
 namespace actions
 {

src/actions/undo_update_shroud_action.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "undo_action.hpp"
-#include "../unit_ptr.hpp"
-#include "../unit.hpp"
+#include "unit_ptr.hpp"
+#include "unit.hpp"
 
 namespace actions
 {

src/actions/unit_creator.cpp

@@ -21,24 +21,24 @@
 
 #include "move.hpp" //for actions::get_village
 
-#include "../config.hpp"
-#include "../filter_context.hpp"
-#include "../game_board.hpp"
-#include "../game_events/manager.hpp"
-#include "../game_events/pump.hpp"
-#include "../game_preferences.hpp"
-#include "../game_data.hpp" // for resources::gamedata conversion variable_set
-#include "../gettext.hpp"
-#include "../log.hpp"
-#include "../map.hpp"
-#include "../pathfind/pathfind.hpp"
-#include "../resources.hpp" // for resources::screen, resources::gamedata
-#include "../team.hpp" //for team
-#include "../unit.hpp" // for unit
-#include "../unit_display.hpp" // for unit_display
-#include "../variable.hpp" // for vconfig
+#include "config.hpp"
+#include "filter_context.hpp"
+#include "game_board.hpp"
+#include "game_events/manager.hpp"
+#include "game_events/pump.hpp"
+#include "game_preferences.hpp"
+#include "game_data.hpp" // for resources::gamedata conversion variable_set
+#include "gettext.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "pathfind/pathfind.hpp"
+#include "resources.hpp" // for resources::screen, resources::gamedata
+#include "team.hpp" //for team
+#include "unit.hpp" // for unit
+#include "unit_display.hpp" // for unit_display
+#include "variable.hpp" // for vconfig
 
-#include "../game_display.hpp" // for resources::screen
+#include "game_display.hpp" // for resources::screen
 
 #include <boost/foreach.hpp>
 #include <boost/scoped_ptr.hpp>

src/actions/unit_creator.hpp

@@ -26,7 +26,7 @@ class vconfig;
 class game_board;
 class unit;
 
-#include "../map_location.hpp"
+#include "map_location.hpp"
 
 class unit_creator
 {

src/actions/vision.cpp

@@ -21,19 +21,19 @@
 
 #include "move.hpp"
 
-#include "../config.hpp"
-#include "../game_display.hpp"
+#include "config.hpp"
+#include "game_display.hpp"
 #include "game_events/manager.hpp"
-#include "../game_events/pump.hpp"
-#include "../log.hpp"
-#include "../map.hpp"
-#include "../map_label.hpp"
-#include "../map_location.hpp"
-#include "../pathfind/pathfind.hpp"
-#include "../play_controller.hpp"
-#include "../resources.hpp"
-#include "../team.hpp"
-#include "../unit.hpp"
+#include "game_events/pump.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "map_label.hpp"
+#include "map_location.hpp"
+#include "pathfind/pathfind.hpp"
+#include "play_controller.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "unit.hpp"
 
 #include <boost/foreach.hpp>
 

src/actions/vision.hpp

@@ -20,7 +20,7 @@
 #ifndef ACTIONS_VISION_H_INCLUDED
 #define ACTIONS_VISION_H_INCLUDED
 
-#include "../movetype.hpp"
+#include "movetype.hpp"
 
 struct map_location;
 class  team;

src/ai/actions.cpp

@@ -36,22 +36,22 @@
 #include "manager.hpp"
 #include "simulated_actions.hpp"
 
-#include "../actions/attack.hpp"
-#include "../actions/create.hpp"
-#include "../attack_prediction.hpp"
-#include "../game_preferences.hpp"
-#include "../log.hpp"
-#include "../mouse_handler_base.hpp"
-#include "../pathfind/teleport.hpp"
-#include "../play_controller.hpp"
-#include "../playsingle_controller.hpp"
-#include "../recall_list_manager.hpp"
-#include "../replay_helper.hpp"
-#include "../resources.hpp"
-#include "../synced_context.hpp"
-#include "../team.hpp"
-#include "../unit.hpp"
-#include "../unit_ptr.hpp"
+#include "actions/attack.hpp"
+#include "actions/create.hpp"
+#include "attack_prediction.hpp"
+#include "game_preferences.hpp"
+#include "log.hpp"
+#include "mouse_handler_base.hpp"
+#include "pathfind/teleport.hpp"
+#include "play_controller.hpp"
+#include "playsingle_controller.hpp"
+#include "recall_list_manager.hpp"
+#include "replay_helper.hpp"
+#include "resources.hpp"
+#include "synced_context.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "unit_ptr.hpp"
 
 namespace ai {
 

src/ai/actions.hpp

@@ -22,9 +22,9 @@
 
 #include "game_info.hpp"
 
-#include "../actions/move.hpp"
+#include "actions/move.hpp"
 #include "lua/unit_advancements_aspect.hpp"
-#include "../unit_ptr.hpp"
+#include "unit_ptr.hpp"
 
 namespace pathfind {
 struct plain_route;

src/ai/akihara/recruitment.cpp

@@ -21,19 +21,19 @@
 #include <boost/foreach.hpp>
 #include <map>
 
-#include "../../actions/attack.hpp"
-#include "../../attack_prediction.hpp"
-#include "../../game_board.hpp"
-#include "../../resources.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../team.hpp"
-#include "../../unit.hpp"
-#include "../../unit_display.hpp"
-#include "../../unit_map.hpp"
-#include "../../unit_types.hpp"
-#include "../composite/rca.hpp"
-#include "../default/ai.hpp"
+#include "actions/attack.hpp"
+#include "attack_prediction.hpp"
+#include "game_board.hpp"
+#include "resources.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "unit_display.hpp"
+#include "unit_map.hpp"
+#include "unit_types.hpp"
+#include "ai/composite/rca.hpp"
+#include "ai/default/ai.hpp"
 
 #include "recruitment.hpp"
 

src/ai/akihara/recruitment.hpp

@@ -20,8 +20,8 @@
 #ifndef AI_AKIHARA_RECRUITMENT_HPP_INCLUDED
 #define AI_AKIHARA_RECRUITMENT_HPP_INCLUDED
 
-#include "../composite/rca.hpp"
-#include "../../team.hpp"
+#include "ai/composite/rca.hpp"
+#include "team.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/ai/composite/ai.cpp

@@ -24,9 +24,9 @@
 #include "goal.hpp"
 #include "property_handler.hpp"
 #include "stage.hpp"
-#include "../manager.hpp"
-#include "../../actions/attack.hpp"
-#include "../../log.hpp"
+#include "ai/manager.hpp"
+#include "actions/attack.hpp"
+#include "log.hpp"
 
 #include <boost/bind.hpp>
 #include "utils/boost_function_guarded.hpp"

src/ai/composite/ai.hpp

@@ -21,7 +21,7 @@
 #define AI_COMPOSITE_AI_HPP_INCLUDED
 
 #include "contexts.hpp"
-#include "../interface.hpp"
+#include "ai/interface.hpp"
 #include "component.hpp"
 
 #ifdef _MSC_VER

src/ai/composite/aspect.cpp

@@ -17,8 +17,8 @@
  */
 
 #include "aspect.hpp"
-#include "../manager.hpp"
-#include "../../log.hpp"
+#include "ai/manager.hpp"
+#include "log.hpp"
 
 namespace ai {
 

src/ai/composite/aspect.hpp

@@ -21,11 +21,11 @@
 
 #include "property_handler.hpp"
 #include "value_translator.hpp"
-#include "../lua/lua_object.hpp"
-#include "../lua/core.hpp"
-#include "../../scripting/game_lua_kernel.hpp"
+#include "ai/lua/lua_object.hpp"
+#include "ai/lua/core.hpp"
+#include "scripting/game_lua_kernel.hpp"
 
-#include "../../log.hpp"
+#include "log.hpp"
 
 #include <boost/bind.hpp>
 #include <boost/pointer_cast.hpp>

src/ai/composite/component.cpp

@@ -20,11 +20,11 @@
 #include "component.hpp"
 #include "engine.hpp"
 #include "property_handler.hpp"
-#include "../../config.hpp"
-#include "../../log.hpp"
-#include "../../unit.hpp"
+#include "config.hpp"
+#include "log.hpp"
+#include "unit.hpp"
 
-#include "../formula/ai.hpp"
+#include "ai/formula/ai.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/regex.hpp>

src/ai/composite/contexts.hpp

@@ -21,7 +21,7 @@
 #ifndef AI_COMPOSITE_CONTEXTS_HPP_INCLUDED
 #define AI_COMPOSITE_CONTEXTS_HPP_INCLUDED
 
-#include "../default/contexts.hpp"
+#include "ai/default/contexts.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/ai/composite/engine.cpp

@@ -20,7 +20,7 @@
 #include "engine.hpp"
 #include "contexts.hpp"
 
-#include "../../log.hpp"
+#include "log.hpp"
 
 namespace ai {
 

src/ai/composite/engine.hpp

@@ -22,7 +22,7 @@
 #define AI_COMPOSITE_ENGINE_HPP_INCLUDED
 
 #include "component.hpp"
-#include "../contexts.hpp"
+#include "ai/contexts.hpp"
 
 #include <algorithm>
 #include <iterator>

src/ai/composite/engine_default.cpp

@@ -23,7 +23,7 @@
 #include "engine_default.hpp"
 #include "rca.hpp"
 #include "stage.hpp"
-#include "../../log.hpp"
+#include "log.hpp"
 
 namespace ai {
 

src/ai/composite/engine_fai.cpp

@@ -20,12 +20,12 @@
 #include "ai.hpp"
 #include "engine_fai.hpp"
 #include "rca.hpp"
-#include "../formula/ai.hpp"
-#include "../formula/candidates.hpp"
-#include "../formula/stage_side_formulas.hpp"
-#include "../formula/stage_unit_formulas.hpp"
-#include "../../log.hpp"
-#include "../../unit.hpp"
+#include "ai/formula/ai.hpp"
+#include "ai/formula/candidates.hpp"
+#include "ai/formula/stage_side_formulas.hpp"
+#include "ai/formula/stage_unit_formulas.hpp"
+#include "log.hpp"
+#include "unit.hpp"
 
 namespace ai {
 

src/ai/composite/engine_lua.cpp

@@ -24,16 +24,16 @@
 #include "stage.hpp"
 #include "aspect.hpp"
 
-#include "../gamestate_observer.hpp"
+#include "ai/gamestate_observer.hpp"
 
-#include "../../log.hpp"
-#include "../../resources.hpp"
-#include "../lua/core.hpp"
-#include "../lua/lua_object.hpp"
-#include "../../scripting/game_lua_kernel.hpp"
-#include "../../util.hpp"
-#include "../../unit.hpp"
-#include "../../unit_map.hpp"
+#include "log.hpp"
+#include "resources.hpp"
+#include "ai/lua/core.hpp"
+#include "ai/lua/lua_object.hpp"
+#include "scripting/game_lua_kernel.hpp"
+#include "util.hpp"
+#include "unit.hpp"
+#include "unit_map.hpp"
 
 
 namespace ai {

src/ai/composite/rca.cpp

@@ -20,7 +20,7 @@
 #include "ai.hpp"
 #include "engine.hpp"
 #include "rca.hpp"
-#include "../../log.hpp"
+#include "log.hpp"
 
 namespace ai {
 

src/ai/composite/stage.cpp

@@ -20,10 +20,10 @@
 #include "ai.hpp"
 #include "engine.hpp"
 #include "stage.hpp"
-#include "../contexts.hpp"
-#include "../../log.hpp"
-#include "../../resources.hpp"
-#include "../../tod_manager.hpp"
+#include "ai/contexts.hpp"
+#include "log.hpp"
+#include "resources.hpp"
+#include "tod_manager.hpp"
 #include <map>
 #include <string>
 

src/ai/composite/value_translator.hpp

@@ -22,12 +22,12 @@
 #include "engine.hpp"
 #include "stage.hpp"
 
-#include "../manager.hpp"
-#include "../../terrain_filter.hpp"
-#include "../../util.hpp"
-#include "../../serialization/string_utils.hpp"
-#include "../../resources.hpp"
-#include "../lua/unit_advancements_aspect.hpp"
+#include "ai/manager.hpp"
+#include "terrain_filter.hpp"
+#include "util.hpp"
+#include "serialization/string_utils.hpp"
+#include "resources.hpp"
+#include "ai/lua/unit_advancements_aspect.hpp"
 
 namespace ai {
 

src/ai/configuration.cpp

@@ -20,11 +20,11 @@
 
 #include "configuration.hpp"
 
-#include "../filesystem.hpp"
-#include "../log.hpp"
-#include "../serialization/parser.hpp"
-#include "../serialization/preprocessor.hpp"
-#include "../team.hpp"
+#include "filesystem.hpp"
+#include "log.hpp"
+#include "serialization/parser.hpp"
+#include "serialization/preprocessor.hpp"
+#include "team.hpp"
 #include "wml_exception.hpp"
 
 #include <boost/foreach.hpp>

src/ai/configuration.hpp

@@ -20,7 +20,7 @@
 #ifndef AI_CONFIGURATION_HPP_INCLUDED
 #define AI_CONFIGURATION_HPP_INCLUDED
 
-#include "../config.hpp"
+#include "config.hpp"
 #include "game_info.hpp"
 
 namespace ai {

src/ai/contexts.hpp

@@ -25,11 +25,11 @@
 
 #include "global.hpp"
 
-#include "../config.hpp"                // for config
-#include "../game_errors.hpp"
-#include "../generic_event.hpp"         // for observer
-#include "../unit_ptr.hpp"              // for unit_ptr
-#include "../map_location.hpp"       // for map_location
+#include "config.hpp"                // for config
+#include "game_errors.hpp"
+#include "generic_event.hpp"         // for observer
+#include "unit_ptr.hpp"              // for unit_ptr
+#include "map_location.hpp"       // for map_location
 
 #include <map>                          // for map, map<>::value_compare
 #include <set>                          // for set

src/ai/default/ai.cpp

@@ -19,25 +19,25 @@
 
 #include "ai.hpp"
 
-#include "../actions.hpp"
-#include "../manager.hpp"
-#include "../formula/ai.hpp"
+#include "ai/actions.hpp"
+#include "ai/manager.hpp"
+#include "ai/formula/ai.hpp"
 
-#include "../../array.hpp"
-#include "../../game_board.hpp"
+#include "array.hpp"
+#include "game_board.hpp"
 #include "game_events/manager.hpp"
-#include "../../game_events/pump.hpp"
-#include "../../game_classification.hpp"
-#include "../../log.hpp"
-#include "../../mouse_handler_base.hpp"
-#include "../../recall_list_manager.hpp"
-#include "../../resources.hpp"
-#include "../../terrain_filter.hpp"
-#include "../../unit.hpp"
-#include "../../unit_display.hpp"
-#include "../../wml_exception.hpp"
+#include "game_events/pump.hpp"
+#include "game_classification.hpp"
+#include "log.hpp"
+#include "mouse_handler_base.hpp"
+#include "recall_list_manager.hpp"
+#include "resources.hpp"
+#include "terrain_filter.hpp"
+#include "unit.hpp"
+#include "unit_display.hpp"
+#include "wml_exception.hpp"
 
-#include "../../pathfind/pathfind.hpp"
+#include "pathfind/pathfind.hpp"
 
 #include <boost/foreach.hpp>
 

src/ai/default/ai.hpp

@@ -17,8 +17,8 @@
 #ifndef AI_DEFAULT_AI_HPP_INCLUDED
 #define AI_DEFAULT_AI_HPP_INCLUDED
 
-#include "../interface.hpp"
-#include "../composite/stage.hpp"
+#include "ai/interface.hpp"
+#include "ai/composite/stage.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/ai/default/attack.cpp

@@ -17,18 +17,18 @@
  * Calculate & analyze attacks of the default ai
  */
 
-#include "../../global.hpp"
+#include "global.hpp"
 
 #include "ai.hpp"
-#include "../manager.hpp"
+#include "ai/manager.hpp"
 
-#include "../../actions/attack.hpp"
-#include "../../attack_prediction.hpp"
-#include "../../game_config.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../team.hpp"
-#include "../../unit.hpp"
+#include "actions/attack.hpp"
+#include "attack_prediction.hpp"
+#include "game_config.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "team.hpp"
+#include "unit.hpp"
 
 static lg::log_domain log_ai("ai/attack");
 #define LOG_AI LOG_STREAM(info, log_ai)

src/ai/default/contexts.cpp

@@ -20,14 +20,14 @@
 
 #include "contexts.hpp"
 
-#include "../../game_board.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../resources.hpp"
-#include "../../team.hpp"
-#include "../../unit.hpp"
-#include "../composite/goal.hpp"
-#include "../../pathfind/pathfind.hpp"
+#include "game_board.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "ai/composite/goal.hpp"
+#include "pathfind/pathfind.hpp"
 
 static lg::log_domain log_ai("ai/general");
 #define DBG_AI LOG_STREAM(debug, log_ai)

src/ai/default/contexts.hpp

@@ -20,7 +20,7 @@
 #ifndef AI_DEFAULT_CONTEXTS_HPP_INCLUDED
 #define AI_DEFAULT_CONTEXTS_HPP_INCLUDED
 
-#include "../contexts.hpp"
+#include "ai/contexts.hpp"
 #include "formula_callable.hpp"
 
 #ifdef _MSC_VER

src/ai/formula/ai.cpp

@@ -20,31 +20,31 @@
 #include "ai.hpp"
 #include "global.hpp"
 
-#include "../../callable_objects.hpp"   // for unit_callable, etc
-#include "../../chat_events.hpp"              // for chat_handler, etc
-#include "../../display_chat_manager.hpp"
-#include "../../formula_function.hpp"         // for formula_expression
-#include "../../game_board.hpp"         // for game_board
-#include "../../game_display.hpp"       // for game_display
-#include "../../log.hpp"                // for LOG_STREAM, logger, etc
-#include "../../map.hpp"                      // for gamemap
-#include "../../menu_events.hpp"
-#include "../../pathfind/pathfind.hpp"  // for plain_route, etc
-#include "../../pathfind/teleport.hpp"  // for get_teleport_locations, etc
-#include "../../recall_list_manager.hpp"      // for recall_list_manager
-#include "../../resources.hpp"          // for gameboard, teams, units, etc
-#include "../../serialization/string_utils.hpp"  // for split
-#include "../../team.hpp"                     // for team
-#include "../../terrain_filter.hpp"     // for terrain_filter
-#include "../../time_of_day.hpp"              // for time_of_day
-#include "../../tod_manager.hpp"        // for tod_manager
-#include "../../tstring.hpp"                  // for t_string, operator+
-#include "../../unit.hpp"               // for unit
-#include "../../unit_formula_manager.hpp"  // for unit_formula_manager
-#include "../../unit_ptr.hpp"                 // for unit_ptr
-#include "../../unit_types.hpp"
-#include "../../formula.hpp"  // for formula_error, formula, etc
-#include "../../map_location.hpp"  // for map_location, etc
+#include "callable_objects.hpp"   // for unit_callable, etc
+#include "chat_events.hpp"              // for chat_handler, etc
+#include "display_chat_manager.hpp"
+#include "formula_function.hpp"         // for formula_expression
+#include "game_board.hpp"         // for game_board
+#include "game_display.hpp"       // for game_display
+#include "log.hpp"                // for LOG_STREAM, logger, etc
+#include "map.hpp"                      // for gamemap
+#include "menu_events.hpp"
+#include "pathfind/pathfind.hpp"  // for plain_route, etc
+#include "pathfind/teleport.hpp"  // for get_teleport_locations, etc
+#include "recall_list_manager.hpp"      // for recall_list_manager
+#include "resources.hpp"          // for gameboard, teams, units, etc
+#include "serialization/string_utils.hpp"  // for split
+#include "team.hpp"                     // for team
+#include "terrain_filter.hpp"     // for terrain_filter
+#include "time_of_day.hpp"              // for time_of_day
+#include "tod_manager.hpp"        // for tod_manager
+#include "tstring.hpp"                  // for t_string, operator+
+#include "unit.hpp"               // for unit
+#include "unit_formula_manager.hpp"  // for unit_formula_manager
+#include "unit_ptr.hpp"                 // for unit_ptr
+#include "unit_types.hpp"
+#include "formula.hpp"  // for formula_error, formula, etc
+#include "map_location.hpp"  // for map_location, etc
 #include "ai/actions.hpp"               // for recall_result, etc
 #include "ai/manager.hpp"               // for manager
 #include "ai/composite/contexts.hpp"

src/ai/formula/callable_objects.cpp

@@ -13,10 +13,10 @@
 */
 
 #include "ai.hpp"
-#include "../../attack_prediction.hpp"
-#include "../../game_board.hpp"
+#include "attack_prediction.hpp"
+#include "game_board.hpp"
 #include "callable_objects.hpp"
-#include "../../resources.hpp"
+#include "resources.hpp"
 
 
 namespace game_logic {

src/ai/formula/callable_objects.hpp

@@ -15,11 +15,11 @@
 #ifndef FORMULA_AI_CALLABLE_OBJECTS_HPP_INCLUDED
 #define	FORMULA_AI_CALLABLE_OBJECTS_HPP_INCLUDED
 
-#include "../game_info.hpp"
-#include "../../actions/attack.hpp"
-#include "../../callable_objects.hpp"
-#include "../../formula.hpp"
-#include "../../formula_callable.hpp"
+#include "ai/game_info.hpp"
+#include "actions/attack.hpp"
+#include "../../callable_objects.hpp" // We want the file in src/
+#include "formula.hpp"
+#include "formula_callable.hpp"
 
 namespace ai {
 	class formula_ai;

src/ai/formula/candidates.cpp

@@ -19,8 +19,8 @@
 
 #include "ai.hpp"
 #include "candidates.hpp"
-#include "../../log.hpp"
-#include "../../resources.hpp"
+#include "log.hpp"
+#include "resources.hpp"
 
 #include <boost/foreach.hpp>
 

src/ai/formula/function_table.cpp

@@ -24,19 +24,19 @@
 
 #include "ai/default/contexts.hpp"
 
-#include "../../attack_prediction.hpp"
-#include "../../filesystem.hpp"
-#include "../../game_board.hpp"
-#include "../../display.hpp"
-#include "../../log.hpp"
-#include "../../map_label.hpp"
-#include "../../pathfind/teleport.hpp"
-#include "../../replay.hpp"
-#include "../../resources.hpp"
-#include "../../terrain_filter.hpp"
-#include "../../unit.hpp"
-#include "../../pathfind/pathfind.hpp"
-#include "../../unit_types.hpp"
+#include "attack_prediction.hpp"
+#include "filesystem.hpp"
+#include "game_board.hpp"
+#include "display.hpp"
+#include "log.hpp"
+#include "map_label.hpp"
+#include "pathfind/teleport.hpp"
+#include "replay.hpp"
+#include "resources.hpp"
+#include "terrain_filter.hpp"
+#include "unit.hpp"
+#include "pathfind/pathfind.hpp"
+#include "unit_types.hpp"
 
 #include <boost/foreach.hpp>
 

src/ai/formula/stage_side_formulas.cpp

@@ -21,9 +21,9 @@
 #include "stage_side_formulas.hpp"
 #include "ai.hpp"
 
-#include "../../formula.hpp"
-#include "../../formula_function.hpp"
-#include "../../log.hpp"
+#include "formula.hpp"
+#include "formula_function.hpp"
+#include "log.hpp"
 #include <boost/lexical_cast.hpp>
 
 static lg::log_domain log_ai("ai/stage/side_formulas");

src/ai/formula/stage_side_formulas.hpp

@@ -21,8 +21,8 @@
 #ifndef AI_FORMULA_STAGE_SIDE_FORMULAS_HPP_INCLUDED
 #define AI_FORMULA_STAGE_SIDE_FORMULAS_HPP_INCLUDED
 
-#include "../composite/stage.hpp"
-#include "../../formula_fwd.hpp"
+#include "ai/composite/stage.hpp"
+#include "formula_fwd.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/ai/formula/stage_unit_formulas.cpp

@@ -21,12 +21,12 @@
 #include "stage_unit_formulas.hpp"
 #include "ai.hpp"
 
-#include "../../formula.hpp"
-#include "../../formula_function.hpp"
-#include "../../log.hpp"
-#include "../../resources.hpp"
-#include "../../unit.hpp"
-#include "../../unit_formula_manager.hpp"
+#include "formula.hpp"
+#include "formula_function.hpp"
+#include "log.hpp"
+#include "resources.hpp"
+#include "unit.hpp"
+#include "unit_formula_manager.hpp"
 #include <boost/lexical_cast.hpp>
 
 static lg::log_domain log_formula_ai("ai/stage/unit_formulas");

src/ai/formula/stage_unit_formulas.hpp

@@ -21,7 +21,7 @@
 #ifndef AI_FORMULA_STAGE_UNIT_FORMULAS_HPP_INCLUDED
 #define AI_FORMULA_STAGE_UNIT_FORMULAS_HPP_INCLUDED
 
-#include "../composite/stage.hpp"
+#include "ai/composite/stage.hpp"
 
 
 #ifdef _MSC_VER

src/ai/game_info.hpp

@@ -21,7 +21,7 @@
 #define AI_GAME_INFO_HPP_INCLUDED
 
 #include <boost/shared_ptr.hpp>
-#include "../map_location.hpp"
+#include "map_location.hpp"
 namespace pathfind {
     struct paths;
 }

src/ai/gamestate_observer.hpp

@@ -20,7 +20,7 @@
 #ifndef AI_GAMESTATE_OBSERVER_HPP_INCLUDED
 #define AI_GAMESTATE_OBSERVER_HPP_INCLUDED
 
-#include "../generic_event.hpp"
+#include "generic_event.hpp"
 
 namespace ai {
 

src/ai/interface.hpp

@@ -25,8 +25,8 @@
 #include <map>                          // for map, map<>::value_compare
 #include <string>                       // for string, basic_string, etc
 #include <utility>                      // for make_pair, pair
-#include "../savegame_config.hpp"       // for savegame_config
-#include "../config.hpp"             // for config
+#include "savegame_config.hpp"       // for savegame_config
+#include "config.hpp"             // for config
 #include "ai/game_info.hpp"             // for ai_ptr, side_number
 namespace ai { class ai_context; }
 

src/ai/lua/core.cpp

@@ -22,24 +22,24 @@
 #include <cstring>
 
 #include "core.hpp"
-#include "../../scripting/game_lua_kernel.hpp"
-#include "../../scripting/lua_api.hpp"
-#include "../../scripting/push_check.hpp"
+#include "scripting/game_lua_kernel.hpp"
+#include "scripting/lua_api.hpp"
+#include "scripting/push_check.hpp"
 #include "lua_object.hpp" // (Nephro)
 
-#include "../../attack_prediction.hpp"
-#include "../../game_display.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../pathfind/pathfind.hpp"
-#include "../../play_controller.hpp"
-#include "../../resources.hpp"
-#include "../../terrain_translation.hpp"
-#include "../../terrain_filter.hpp"
-#include "../../unit.hpp"
-#include "../actions.hpp"
-#include "../composite/engine_lua.hpp"
-#include "../composite/contexts.hpp"
+#include "attack_prediction.hpp"
+#include "game_display.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "pathfind/pathfind.hpp"
+#include "play_controller.hpp"
+#include "resources.hpp"
+#include "terrain_translation.hpp"
+#include "terrain_filter.hpp"
+#include "unit.hpp"
+#include "ai/actions.hpp"
+#include "ai/composite/engine_lua.hpp"
+#include "ai/composite/contexts.hpp"
 
 #include "lua/lualib.h"
 #include "lua/lauxlib.h"

src/ai/lua/lua_object.hpp

@@ -21,15 +21,15 @@
 #ifndef LUA_OBJECT_HPP_INCLUDED
 #define LUA_OBJECT_HPP_INCLUDED
 
-#include "../../config.hpp"
-#include "../../lua/lua.h"
-#include "../../map_location.hpp"
-#include "../../resources.hpp"
-#include "../../scripting/lua_api.hpp"
-#include "../../scripting/lua_common.hpp"
-#include "../../terrain_filter.hpp"
-#include "../../variable.hpp"
-#include "../default/contexts.hpp"
+#include "config.hpp"
+#include "lua/lua.h"
+#include "map_location.hpp"
+#include "resources.hpp"
+#include "scripting/lua_api.hpp"
+#include "scripting/lua_common.hpp"
+#include "terrain_filter.hpp"
+#include "variable.hpp"
+#include "ai/default/contexts.hpp"
 #include "unit_advancements_aspect.hpp"
 
 #include <boost/shared_ptr.hpp>

src/ai/lua/unit_advancements_aspect.cpp

@@ -15,13 +15,13 @@
 #include "unit_advancements_aspect.hpp"
 #include "global.hpp"
 
-#include "../../log.hpp"                // for LOG_STREAM, logger, etc
-#include "../../lua/lauxlib.h"                // for luaL_ref, LUA_REFNIL
-#include "../../lua/lua.h"                    // for lua_isstring, etc
-#include "../../map_location.hpp"             // for map_location
-#include "../../serialization/string_utils.hpp"  // for split
-#include "../../unit.hpp"
-#include "../../unit_map.hpp"    // for unit_map::const_iterator, etc
+#include "log.hpp"                // for LOG_STREAM, logger, etc
+#include "lua/lauxlib.h"                // for luaL_ref, LUA_REFNIL
+#include "lua/lua.h"                    // for lua_isstring, etc
+#include "map_location.hpp"             // for map_location
+#include "serialization/string_utils.hpp"  // for split
+#include "unit.hpp"
+#include "unit_map.hpp"    // for unit_map::const_iterator, etc
 
 #include <cstddef>                     // for NULL
 #include <ostream>                      // for operator<<, basic_ostream, etc

src/ai/lua/unit_advancements_aspect.hpp

@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-#include "../../unit_map.hpp"
+#include "unit_map.hpp"
 
 struct lua_State;
 

src/ai/manager.cpp

@@ -19,14 +19,14 @@
 
 #include "manager.hpp"
 
-#include "../config.hpp"             // for config, etc
+#include "config.hpp"             // for config, etc
 #include "game_events/manager.hpp"
-#include "../game_events/pump.hpp"
-#include "../generic_event.hpp"      // for generic_event, etc
-#include "../log.hpp"
-#include "../map_location.hpp"       // for map_location
-#include "../resources.hpp"
-#include "../serialization/string_utils.hpp"
+#include "game_events/pump.hpp"
+#include "generic_event.hpp"      // for generic_event, etc
+#include "log.hpp"
+#include "map_location.hpp"       // for map_location
+#include "resources.hpp"
+#include "serialization/string_utils.hpp"
 
 #include "composite/ai.hpp"             // for ai_composite
 #include "composite/component.hpp"      // for component_manager

src/ai/manager.hpp

@@ -22,8 +22,8 @@
 #ifndef AI_MANAGER_HPP_INCLUDED
 #define AI_MANAGER_HPP_INCLUDED
 
-#include "../config.hpp"                // for config, etc
-#include "../global.hpp"
+#include "config.hpp"                // for config, etc
+#include "global.hpp"
 #include "game_info.hpp"                // for side_number, ai_ptr
 
 #include <boost/shared_ptr.hpp>         // for shared_ptr

src/ai/recruitment/recruitment.cpp

@@ -20,28 +20,28 @@
 
 #include "recruitment.hpp"
 
-#include "../actions.hpp"
-#include "../composite/rca.hpp"
-#include "../manager.hpp"
-#include "../../actions/attack.hpp"
-#include "../../attack_prediction.hpp"
-#include "../../filter_context.hpp"
-#include "../../game_board.hpp"
-#include "../../game_display.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../map_label.hpp"
-#include "../../pathfind/pathfind.hpp"
-#include "../../pathutils.hpp"
-#include "../../resources.hpp"
-#include "../../team.hpp"
-#include "../../tod_manager.hpp"
-#include "../../unit_filter.hpp"
-#include "../../unit_map.hpp"
-#include "../../unit_types.hpp"
-#include "../../util.hpp"
-#include "../../variable.hpp"
-#include "../../wml_exception.hpp"
+#include "ai/actions.hpp"
+#include "ai/composite/rca.hpp"
+#include "ai/manager.hpp"
+#include "actions/attack.hpp"
+#include "attack_prediction.hpp"
+#include "filter_context.hpp"
+#include "game_board.hpp"
+#include "game_display.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "map_label.hpp"
+#include "pathfind/pathfind.hpp"
+#include "pathutils.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "tod_manager.hpp"
+#include "unit_filter.hpp"
+#include "unit_map.hpp"
+#include "unit_types.hpp"
+#include "util.hpp"
+#include "variable.hpp"
+#include "wml_exception.hpp"
 
 #include <boost/foreach.hpp>
 #include <boost/scoped_ptr.hpp>

src/ai/recruitment/recruitment.hpp

@@ -21,9 +21,9 @@
 #ifndef AI_DEFAULT_RECRUITMENT_HPP_INCLUDED
 #define AI_DEFAULT_RECRUITMENT_HPP_INCLUDED
 
-#include "../composite/rca.hpp"
-#include "../../unit.hpp"
-#include "../../unit_map.hpp"
+#include "ai/composite/rca.hpp"
+#include "unit.hpp"
+#include "unit_map.hpp"
 
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>

src/ai/registry.cpp

@@ -20,8 +20,8 @@
 #include "registry.hpp"
 #include "global.hpp"
 
-#include "../config.hpp"             // for config, operator<<
-#include "../terrain_filter.hpp"  // for terrain_filter
+#include "config.hpp"             // for config, operator<<
+#include "terrain_filter.hpp"  // for terrain_filter
 #include "ai/composite/engine.hpp"      // for register_engine_factory
 #include "ai/composite/stage.hpp"       // for ministage, idle_stage, etc
 #include "ai/composite/rca.hpp"

src/ai/simulated_actions.cpp

@@ -19,17 +19,17 @@
 
 #include "simulated_actions.hpp"
 
-#include "../game_board.hpp"
-#include "../game_config.hpp"
-#include "../log.hpp"
-#include "../map.hpp"
-#include "../recall_list_manager.hpp"
-#include "../resources.hpp"
-#include "../team.hpp"
-#include "../unit.hpp"
-#include "../unit_helper.hpp"
-#include "../unit_ptr.hpp"
-#include "../unit_types.hpp"
+#include "game_board.hpp"
+#include "game_config.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "recall_list_manager.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "unit_helper.hpp"
+#include "unit_ptr.hpp"
+#include "unit_types.hpp"
 
 namespace ai {
 

src/ai/testing.cpp

@@ -18,14 +18,14 @@
  */
 #include "manager.hpp"
 #include "testing.hpp"
-#include "../log.hpp"
-#include "../game_board.hpp"
-#include "../replay.hpp"
-#include "../util.hpp"
-#include "../resources.hpp"
-#include "../team.hpp"
-#include "../unit.hpp"
-#include "../tod_manager.hpp"
+#include "log.hpp"
+#include "game_board.hpp"
+#include "replay.hpp"
+#include "util.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "tod_manager.hpp"
 
 static lg::log_domain log_ai_testing("ai/testing");
 #define DBG_AI_TESTING LOG_STREAM(debug, log_ai_testing)

src/ai/testing.hpp

@@ -20,7 +20,7 @@
 #ifndef AI_TESTING_HPP_INCLUDED
 #define AI_TESTING_HPP_INCLUDED
 
-#include "../global.hpp"
+#include "global.hpp"
 
 #include <vector>
 

src/ai/testing/aspect_attacks.cpp

@@ -19,17 +19,17 @@
 
 #include "aspect_attacks.hpp"
 
-#include "../manager.hpp"
-#include "../../actions/attack.hpp"
-#include "../../game_board.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../team.hpp"
-#include "../../tod_manager.hpp"
-#include "../../resources.hpp"
-#include "../../unit.hpp"
-#include "../../pathfind/pathfind.hpp"
-#include "../../unit_filter.hpp"
+#include "ai/manager.hpp"
+#include "actions/attack.hpp"
+#include "game_board.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "team.hpp"
+#include "tod_manager.hpp"
+#include "resources.hpp"
+#include "unit.hpp"
+#include "pathfind/pathfind.hpp"
+#include "unit_filter.hpp"
 
 namespace ai {
 

src/ai/testing/aspect_attacks.hpp

@@ -20,8 +20,8 @@
 #ifndef AI_TESTING_ASPECT_ATTACKS_HPP_INCLUDED
 #define AI_TESTING_ASPECT_ATTACKS_HPP_INCLUDED
 
-#include "../composite/aspect.hpp"
-#include "../interface.hpp"
+#include "ai/composite/aspect.hpp"
+#include "ai/interface.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/ai/testing/ca.cpp

@@ -18,21 +18,21 @@
  */
 
 #include "ca.hpp"
-#include "../actions.hpp"
-#include "../manager.hpp"
-#include "../composite/engine.hpp"
-#include "../composite/rca.hpp"
-#include "../composite/stage.hpp"
-#include "../../game_board.hpp"
-#include "../../game_classification.hpp"
-#include "../../game_data.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../resources.hpp"
-#include "../../team.hpp"
-#include "../../unit.hpp"
-#include "../../pathfind/pathfind.hpp"
-#include "../../pathfind/teleport.hpp"
+#include "ai/actions.hpp"
+#include "ai/manager.hpp"
+#include "ai/composite/engine.hpp"
+#include "ai/composite/rca.hpp"
+#include "ai/composite/stage.hpp"
+#include "game_board.hpp"
+#include "game_classification.hpp"
+#include "game_data.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "pathfind/pathfind.hpp"
+#include "pathfind/teleport.hpp"
 
 #include <boost/foreach.hpp>
 

src/ai/testing/ca.hpp

@@ -21,9 +21,9 @@
 #ifndef AI_TESTING_CA_HPP_INCLUDED
 #define AI_TESTING_CA_HPP_INCLUDED
 
-#include "../../unit_map.hpp"
+#include "unit_map.hpp"
 
-#include "../composite/rca.hpp"
+#include "ai/composite/rca.hpp"
 
 
 #ifdef _MSC_VER

src/ai/testing/ca_global_fallback.cpp

@@ -19,19 +19,19 @@
 
 #include "ca_global_fallback.hpp"
 
-#include "../composite/ai.hpp"
+#include "ai/composite/ai.hpp"
 
-#include "../../game_display.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../map_label.hpp"
-#include "../../replay.hpp"
-#include "../../resources.hpp"
-#include "../../sdl/utils.hpp"
-#include "../../team.hpp"
-#include "../../terrain_filter.hpp"
-#include "../../tod_manager.hpp"
-#include "../../unit.hpp"
+#include "game_display.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "map_label.hpp"
+#include "replay.hpp"
+#include "resources.hpp"
+#include "sdl/utils.hpp"
+#include "team.hpp"
+#include "terrain_filter.hpp"
+#include "tod_manager.hpp"
+#include "unit.hpp"
 
 #include <boost/foreach.hpp>
 

src/ai/testing/ca_global_fallback.hpp

@@ -20,9 +20,9 @@
 #ifndef AI_TESTING_CA_TESTING_GLOBAL_FALLBACK_HPP_INCLUDED
 #define AI_TESTING_CA_TESTING_GLOBAL_FALLBACK_HPP_INCLUDED
 
-#include "../composite/rca.hpp"
+#include "ai/composite/rca.hpp"
 
-#include "../../unit_map.hpp"
+#include "unit_map.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/ai/testing/ca_testing_move_to_targets.cpp

@@ -19,16 +19,16 @@
 
 #include "ca_testing_move_to_targets.hpp"
 
-#include "../composite/ai.hpp"
-#include "../actions.hpp"
-#include "../../game_board.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../resources.hpp"
-#include "../../team.hpp"
-#include "../../unit.hpp"
-#include "../../terrain_filter.hpp"
-#include "../../pathfind/pathfind.hpp"
+#include "ai/composite/ai.hpp"
+#include "ai/actions.hpp"
+#include "game_board.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "terrain_filter.hpp"
+#include "pathfind/pathfind.hpp"
 
 #include <deque>
 

src/ai/testing/ca_testing_move_to_targets.hpp

@@ -20,9 +20,9 @@
 #ifndef AI_TESTING_CA_TESTING_MOVE_TO_TARGETS_HPP_INCLUDED
 #define AI_TESTING_CA_TESTING_MOVE_TO_TARGETS_HPP_INCLUDED
 
-#include "../composite/rca.hpp"
+#include "ai/composite/rca.hpp"
 
-#include "../../unit_map.hpp"
+#include "unit_map.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/ai/testing/ca_testing_recruitment.cpp

@@ -18,20 +18,20 @@
 */
 
 #include "ca_testing_recruitment.hpp"
-#include "../actions.hpp"
-#include "../manager.hpp"
-#include "../composite/engine.hpp"
-#include "../composite/rca.hpp"
-#include "../composite/stage.hpp"
-#include "../../game_board.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../resources.hpp"
-#include "../../team.hpp"
-#include "../../unit.hpp"
-#include "../../unit_types.hpp"
-#include "../../wml_exception.hpp"
-#include "../../pathfind/pathfind.hpp"
+#include "ai/actions.hpp"
+#include "ai/manager.hpp"
+#include "ai/composite/engine.hpp"
+#include "ai/composite/rca.hpp"
+#include "ai/composite/stage.hpp"
+#include "game_board.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "resources.hpp"
+#include "team.hpp"
+#include "unit.hpp"
+#include "unit_types.hpp"
+#include "wml_exception.hpp"
+#include "pathfind/pathfind.hpp"
 
 #include <boost/foreach.hpp>
 

src/ai/testing/ca_testing_recruitment.hpp

@@ -20,9 +20,9 @@
 #ifndef AI_TESTING_CA_TESTING_RECRUITMENT_HPP_INCLUDED
 #define AI_TESTING_CA_TESTING_RECRUITMENT_HPP_INCLUDED
 
-#include "../composite/rca.hpp"
+#include "ai/composite/rca.hpp"
 
-#include "../../unit_map.hpp"
+#include "unit_map.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/ai/testing/stage_fallback.cpp

@@ -19,10 +19,10 @@
 
 #include "stage_fallback.hpp"
 
-#include "../configuration.hpp"
-#include "../manager.hpp"
-#include "../composite/ai.hpp"
-#include "../../log.hpp"
+#include "ai/configuration.hpp"
+#include "ai/manager.hpp"
+#include "ai/composite/ai.hpp"
+#include "log.hpp"
 
 namespace ai {
 

src/ai/testing/stage_fallback.hpp

@@ -20,8 +20,8 @@
 #ifndef AI_TESTING_STAGE_FALLBACK_HPP_INCLUDED
 #define AI_TESTING_STAGE_FALLBACK_HPP_INCLUDED
 
-#include "../composite/stage.hpp"
-#include "../interface.hpp"
+#include "ai/composite/stage.hpp"
+#include "ai/interface.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/ai/testing/stage_rca.cpp

@@ -19,12 +19,12 @@
 
 #include "stage_rca.hpp"
 
-#include "../manager.hpp"
-#include "../composite/ai.hpp"
-#include "../composite/engine.hpp"
-#include "../composite/property_handler.hpp"
-#include "../gamestate_observer.hpp"
-#include "../../log.hpp"
+#include "ai/manager.hpp"
+#include "ai/composite/ai.hpp"
+#include "ai/composite/engine.hpp"
+#include "ai/composite/property_handler.hpp"
+#include "ai/gamestate_observer.hpp"
+#include "log.hpp"
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>

src/ai/testing/stage_rca.hpp

@@ -20,8 +20,8 @@
 #ifndef AI_TESTING_STAGE_RCA_HPP_INCLUDED
 #define AI_TESTING_STAGE_RCA_HPP_INCLUDED
 
-#include "../composite/rca.hpp"
-#include "../composite/stage.hpp"
+#include "ai/composite/rca.hpp"
+#include "ai/composite/stage.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)

src/ai/testing/stage_sf_with_rca.cpp

@@ -20,21 +20,21 @@
 
 #include "stage_sf_with_rca.hpp"
 
-#include "../manager.hpp"
-#include "../composite/ai.hpp"
-#include "../composite/engine.hpp"
-#include "../composite/property_handler.hpp"
-#include "../gamestate_observer.hpp"
-#include "../../actions/attack.hpp"
-#include "../../actions/heal.hpp"
-#include "../../config.hpp"
-#include "../../game_board.hpp"
-#include "../../log.hpp"
-#include "../../map.hpp"
-#include "../../resources.hpp"
-#include "../../tod_manager.hpp"
-#include "../../team.hpp"
-#include "../../unit.hpp"
+#include "ai/manager.hpp"
+#include "ai/composite/ai.hpp"
+#include "ai/composite/engine.hpp"
+#include "ai/composite/property_handler.hpp"
+#include "ai/gamestate_observer.hpp"
+#include "actions/attack.hpp"
+#include "actions/heal.hpp"
+#include "config.hpp"
+#include "game_board.hpp"
+#include "log.hpp"
+#include "map.hpp"
+#include "resources.hpp"
+#include "tod_manager.hpp"
+#include "team.hpp"
+#include "unit.hpp"
 
 #include <boost/bind.hpp>
 #include "SDL.h"

src/ai/testing/stage_sf_with_rca.hpp

@@ -22,9 +22,9 @@
 #define AI_TESTING_STAGE_SF_WITH_RCA_HPP_INCLUDED
 
 #include "stage_rca.hpp"
-#include "../composite/stage.hpp"
+#include "ai/composite/stage.hpp"
 
-#include "../../unit_map.hpp"
+#include "unit_map.hpp"
 
 #include <queue>
 

src/editor/action/action.hpp

@@ -27,7 +27,7 @@
 #define EDITOR_ACTION_HPP
 
 #include "editor/action/action_base.hpp"
-#include "../map/map_fragment.hpp"
+#include "editor/map/map_fragment.hpp"
 
 namespace editor {
 

src/editor/action/action_base.hpp

@@ -27,7 +27,7 @@
 #ifndef EDITOR_ACTION_BASE_HPP_INCLUDED
 #define EDITOR_ACTION_BASE_HPP_INCLUDED
 
-#include "../editor_common.hpp"
+#include "editor/editor_common.hpp"
 
 namespace editor {
 

src/editor/action/action_item.hpp

@@ -29,8 +29,8 @@
 #include "editor/action/action.hpp"
 #include "overlay.hpp"
 
-//#include "../../item_types.hpp"
-//#include "../../item.hpp"
+//#include "item_types.hpp"
+//#include "item.hpp"
 
 
 namespace editor {

src/editor/action/action_label.hpp

@@ -28,8 +28,8 @@
 
 #include "editor/action/action.hpp"
 
-#include "../../map.hpp"
-#include "../../map_label.hpp"
+#include "map.hpp"
+#include "map_label.hpp"
 
 
 namespace editor {

src/editor/action/action_unit.cpp

@@ -24,8 +24,8 @@
 
 #include "editor/map/map_context.hpp"
 
-#include "../../unit.hpp"
-#include "../../unit_animation_component.hpp"
+#include "unit.hpp"
+#include "unit_animation_component.hpp"
 
 #include <boost/scoped_ptr.hpp>
 

src/editor/action/action_unit.hpp

@@ -28,8 +28,8 @@
 
 #include "editor/action/action.hpp"
 
-#include "../../unit_types.hpp"
-#include "../../unit.hpp"
+#include "unit_types.hpp"
+#include "unit.hpp"
 
 
 namespace editor {

src/editor/action/mouse/mouse_action.cpp

@@ -15,7 +15,7 @@
 
 #include "editor/action/action.hpp"
 #include "editor/toolkit/brush.hpp"
-#include "../../editor_display.hpp"
+#include "editor/editor_display.hpp"
 #include "mouse_action.hpp"
 
 #include "gettext.hpp"

src/editor/action/mouse/mouse_action_item.cpp

@@ -15,9 +15,9 @@
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
 #include "mouse_action_item.hpp"
-#include "../action_item.hpp"
+#include "editor/action/action_item.hpp"
 
-#include "../../editor_display.hpp"
+#include "editor/editor_display.hpp"
 //#include "gui/dialogs/item_create.hpp"
 #include "tooltips.hpp"
 #include "gettext.hpp"