fixup includes of lua ai headers

wesnoth · Jun 25, 2014 · c6988fd · c6988fd
1 parent 39b48db
commit c6988fd
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 20 deletions.
diff --git a/src/ai/lua/lua_object.hpp b/src/ai/lua/lua_object.hpp
@@ -21,18 +21,22 @@
 #ifndef LUA_OBJECT_HPP_INCLUDED
 #define LUA_OBJECT_HPP_INCLUDED
 
-#include <string>
-#include <vector>
-#include <boost/shared_ptr.hpp>
-
-#include "lua/lualib.h"
+#include "../../config.hpp"
+#include "../../lua/lua.h"
+#include "../../map_location.hpp"
+#include "../../resources.hpp"
 #include "../../scripting/lua_api.hpp"
-#include "config.hpp"
+#include "../../terrain_filter.hpp"
+#include "../../variable.hpp"
 #include "../default/contexts.hpp"
-#include "terrain_filter.hpp"
-#include "resources.hpp"
 #include "unit_advancements_aspect.hpp"
 
+#include <boost/shared_ptr.hpp>
+#include <iterator>
+#include <string>
+#include <vector>
+
+
 namespace ai {
 
 

diff --git a/src/ai/lua/unit_advancements_aspect.cpp b/src/ai/lua/unit_advancements_aspect.cpp
@@ -13,19 +13,23 @@
 */
 
 #include "unit_advancements_aspect.hpp"
-#include "../../log.hpp"
-#include "lua/lualib.h"
-#include "lua/lauxlib.h"
-#include <string>
-#include <vector>
-
-#include "scripting/lua.hpp"
-#include "scripting/lua_api.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 "../../map.hpp"
+#include "../../unit_map.hpp"    // for unit_map::const_iterator, etc
+
+#include <cstddef>                     // for NULL
+#include <ostream>                      // for operator<<, basic_ostream, etc
+#include <string>                       // for string, char_traits, etc
+#include <vector>                       // for vector
+
+struct lua_State;
+
 
 
 static lg::log_domain log_ai_engine_lua("ai/engine/lua");

diff --git a/src/ai/lua/unit_advancements_aspect.hpp b/src/ai/lua/unit_advancements_aspect.hpp
@@ -18,9 +18,9 @@
 #include <string>
 #include <vector>
 
-#include "lua/lualib.h"
 #include "../../unit_map.hpp"
-#include "../../config.hpp"
+
+struct lua_State;
 
 namespace ai {