From 4db2f069a7bfa60abf94fe08fec071ae0a286072 Mon Sep 17 00:00:00 2001
From: Chris Beck <render787@gmail.com>
Date: Wed, 25 Jun 2014 00:10:29 -0400
Subject: [PATCH] fixup some includes

---
 src/ai/composite/goal.cpp | 27 ++++++++++++++++-----------
 src/ai/composite/goal.hpp | 25 +++++++++++++++++--------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/ai/composite/goal.cpp b/src/ai/composite/goal.cpp
index 72623db260c4..3c0eb8d10c13 100644
--- a/src/ai/composite/goal.cpp
+++ b/src/ai/composite/goal.cpp
@@ -18,21 +18,26 @@
  */
 
 #include "goal.hpp"
+#include "global.hpp"
+
+#include "ai/default/contexts.hpp"
+#include "ai/lua/core.hpp"
+#include "ai/lua/lua_object.hpp"
+#include "ai/manager.hpp"
+#include "log.hpp"
+#include "map_location.hpp"
+#include "resources.hpp"
+#include "scripting/lua.hpp"
+#include "team.hpp"
+#include "terrain_filter.hpp"
+#include "unit.hpp"
+#include "unit_map.hpp"
 #include "wml_exception.hpp"
-#include "../lua/core.hpp"
-#include "../manager.hpp"
-#include "../../log.hpp"
-#include "../lua/lua_object.hpp"
-#include "../../resources.hpp"
-#include "../../scripting/lua.hpp"
-#include "../../terrain_filter.hpp"
-#include "../../unit.hpp"
-#include "../../unit_map.hpp"
-#include "../../team.hpp"
-#include "../../variable.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>
+#include <set>
+#include <sstream>
 
 namespace ai {
 
diff --git a/src/ai/composite/goal.hpp b/src/ai/composite/goal.hpp
index 04d3da4811d4..54126fa0acc7 100644
--- a/src/ai/composite/goal.hpp
+++ b/src/ai/composite/goal.hpp
@@ -26,20 +26,29 @@
 #pragma warning(disable:4250)
 #endif
 
-//included for 'target' markers
-#include "../default/contexts.hpp"
-
 #include "component.hpp"
 
-#include <stack>
-#include <deque>
+#include "global.hpp"
+
+#include "ai/default/contexts.hpp"
+#include "ai/game_info.hpp"
+#include "config.hpp"
+
+#include <boost/shared_ptr.hpp>
+#include <iterator>
+#include <map>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 class terrain_filter;
+namespace ai { class lua_ai_action_handler; }
+namespace ai { class lua_ai_context; }
+namespace ai { struct target; }
 
-namespace ai {
 
-class lua_ai_context;
-class lua_ai_action_handler;
+namespace ai {
 
 class goal : public readonly_context_proxy, public component {
 public: