From 8cee306a2724e38666bec5099e9c05a2a9a35489 Mon Sep 17 00:00:00 2001
From: Chris Beck <render787@gmail.com>
Date: Wed, 25 Jun 2014 01:38:36 -0400
Subject: [PATCH] fixup includes in ai/manager.?pp

---
 src/ai/manager.cpp | 43 ++++++++++++++++++++++++++++++-------------
 src/ai/manager.hpp | 33 ++++++++++++++++++---------------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/ai/manager.cpp b/src/ai/manager.cpp
index af84c38e858..d65ced3db2e 100644
--- a/src/ai/manager.cpp
+++ b/src/ai/manager.cpp
@@ -17,26 +17,43 @@
  * @file
  */
 
-#include "composite/ai.hpp"
-#include "configuration.hpp"
-#include "contexts.hpp"
-#include "default/ai.hpp"
 #include "manager.hpp"
-#include "formula/ai.hpp"
-#include "registry.hpp"
+
+#include "../config.hpp"             // for config, etc
 #include "../game_events/pump.hpp"
+#include "../generic_event.hpp"      // for generic_event, etc
 #include "../log.hpp"
+#include "../map_location.hpp"       // for map_location
 #include "../serialization/string_utils.hpp"
-#include "composite/component.hpp"
 
-#include <boost/foreach.hpp>
+#include "composite/ai.hpp"             // for ai_composite
+#include "composite/component.hpp"      // for component_manager
+#include "composite/engine.hpp"         // for engine
+#include "configuration.hpp"            // for configuration
+#include "contexts.hpp"                 // for readonly_context, etc
+#include "default/contexts.hpp"  // for default_ai_context, etc
+#include "game_info.hpp"             // for side_number, engine_ptr, etc
+#include "game_config.hpp"              // for debug
+#include "game_errors.hpp"              // for game_error
+#include "interface.hpp"  // for ai_factory, etc
+#include "lua/unit_advancements_aspect.hpp"
+#include "registry.hpp"                 // for init
+#include "util.hpp"                     // for lexical_cast
 
-#include <map>
-#include <stack>
-#include <vector>
-#include "composite/engine.hpp"
 
-#include "SDL.h"
+#include <algorithm>                    // for min
+#include <boost/foreach.hpp>            // for auto_any_base, etc
+#include <cassert>                     // for assert
+#include <cstddef>                     // for NULL
+#include <iterator>                     // for reverse_iterator, etc
+#include <map>                          // for _Rb_tree_iterator, etc
+#include <ostream>                      // for operator<<, basic_ostream, etc
+#include <set>                          // for set
+#include <stack>                        // for stack
+#include <utility>                      // for pair, make_pair
+#include <vector>                       // for vector, allocator, etc
+
+#include "SDL_timer.h"
 
 namespace ai {
 
diff --git a/src/ai/manager.hpp b/src/ai/manager.hpp
index dfdc0813396..72beb4fe335 100644
--- a/src/ai/manager.hpp
+++ b/src/ai/manager.hpp
@@ -22,27 +22,30 @@
 #ifndef AI_MANAGER_HPP_INCLUDED
 #define AI_MANAGER_HPP_INCLUDED
 
-#include "../config.hpp"
-#include "../generic_event.hpp"
+#include "../config.hpp"                // for config, etc
+#include "../global.hpp"
+#include "game_info.hpp"                // for side_number, ai_ptr
 
-#include "game_info.hpp"
+#include <boost/shared_ptr.hpp>         // for shared_ptr
+#include <deque>                        // for deque
+#include <map>                          // for map, map<>::value_compare
+#include <stack>                        // for stack
+#include <string>                       // for string
 
-#include <stack>
-#include <deque>
+namespace ai { class ai_composite; }  // lines 45-45
+namespace ai { class ai_context; }  // lines 42-42
+namespace ai { class component; }  // lines 43-43
+namespace ai { class default_ai_context; }  // lines 41-41
+namespace ai { class interface; }  // lines 36-36
+namespace ai { class readonly_context; }  // lines 39-39
+namespace ai { class readwrite_context; }  // lines 40-40
+namespace ai { class side_context; }  // lines 38-38
+namespace events { class generic_event; }
+namespace events { class observer; }
 
 
 namespace ai {
 
-class interface;
-
-class side_context;
-class readonly_context;
-class readwrite_context;
-class default_ai_context;
-class ai_context;
-class component;
-
-class ai_composite;
 typedef boost::shared_ptr<ai_composite> composite_ai_ptr;
 
 /**