fix includes

src/scripting/application_lua_kernel.cpp

@@ -28,27 +28,18 @@
 #include "global.hpp"
 
 #include "log.hpp"
-#include "lua/lauxlib.h"
 #include "lua/lua.h"
-#include "lua/lualib.h"
 #include "scripting/lua_api.hpp"
 #include "scripting/lua_common.hpp"
 #include "scripting/lua_game_launcher.hpp"
 #include "scripting/lua_kernel_base.hpp"
 #include "scripting/lua_types.hpp"
 
-#include "log.hpp"
-#include "lua/lauxlib.h"
-#include "lua/lua.h"
-#include "lua/lualib.h"
-
 #ifdef DEBUG_LUA
 #include "scripting/debug_lua.hpp"
 #endif
 
-#include "scripting/lua_api.hpp"
-
-#include <cstring>
+#include <ostream>
 #include <string>
 
 

src/scripting/application_lua_kernel.hpp

@@ -18,9 +18,6 @@
 
 #include "scripting/lua_kernel_base.hpp"
 
-#include <cstring>
-#include <string>
-
 class config;
 class game_launcher;
 

src/scripting/game_lua_kernel.cpp

@@ -40,9 +40,6 @@
 #include "attack_prediction.hpp"        // for combatant
 #include "config.hpp"                   // for config, etc
 #include "display_chat_manager.hpp"	// for clear_chat_messages
-#include "filesystem.hpp"               // for get_wml_location
-#include "filter_context.hpp"
-#include "font.hpp"                     // for LABEL_COLOR
 #include "game_board.hpp"               // for game_board
 #include "game_classification.hpp"      // for game_classification, etc
 #include "game_config.hpp"              // for debug, base_income, etc
@@ -57,7 +54,6 @@
 #include "log.hpp"                      // for LOG_STREAM, logger, etc
 #include "lua/lauxlib.h"                // for luaL_checkinteger, etc
 #include "lua/lua.h"                    // for lua_setfield, etc
-#include "lua/lualib.h"                 // for luaopen_base, luaopen_debug, etc
 #include "make_enum.hpp"                // for operator<<
 #include "map.hpp"                      // for gamemap
 #include "map_label.hpp"
@@ -76,7 +72,6 @@
 #include "scripting/lua_common.hpp"
 #include "scripting/lua_types.hpp"      // for getunitKey, dlgclbkKey, etc
 #include "sdl/utils.hpp"                // for surface
-#include "serialization/string_utils.hpp"  // for string_map
 #include "side_filter.hpp"              // for side_filter
 #include "sound.hpp"                    // for commit_music_changes, etc
 #include "synced_context.hpp"           // for synced_context, etc
@@ -96,6 +91,7 @@
 #include "unit_types.hpp"    // for unit_type_data, unit_types, etc
 #include "util.hpp"                     // for lexical_cast
 #include "variable.hpp"                 // for vconfig, etc
+#include "variable_info.hpp"
 
 #include <boost/bind.hpp>               // for bind_t, bind
 #include <boost/foreach.hpp>            // for auto_any_base, etc

src/scripting/game_lua_kernel.hpp

@@ -28,7 +28,6 @@ namespace ai { class engine_lua; }
 namespace ai { class lua_ai_action_handler; }
 namespace ai { class lua_ai_context; }
 namespace game_events { struct queued_event; }
-struct lua_State;
 
 void extract_preload_scripts(config const &);
 

src/scripting/lua_api.cpp

@@ -15,23 +15,28 @@
 #include "lua_api.hpp"
 #include "lua_types.hpp"
 
-#include "lua/lualib.h"
 #include "lua/lauxlib.h"
+#include "lua/lua.h"                    // for lua_State, lua_settop, etc
+#include "lua_jailbreak_exception.hpp"  // for tlua_jailbreak_exception
 
+#include "chat_events.hpp"              // for chat_handler, etc
 #include "config.hpp"
 #include "display_chat_manager.hpp"
 #include "game_display.hpp"
 #include "log.hpp"
-#include "recall_list_manager.hpp"
+#include "map_location.hpp"             // for map_location
 #include "resources.hpp"
 #include "tstring.hpp"
 #include "unit.hpp"
 #include "unit_map.hpp"
 #include "variable.hpp"
 
-#include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/variant/static_visitor.hpp>
+#include <map>                          // for map<>::key_type
+#include <new>                          // for operator new
+#include <ostream>                      // for operator<<, basic_ostream, etc
+#include <utility>                      // for pair
 
 #include <string>
 

src/scripting/lua_common.cpp

@@ -29,10 +29,15 @@
 #include "lua/lauxlib.h"
 #include "lua/lua.h"
 #include "scripting/lua_api.hpp"
+#include "scripting/lua_types.hpp"      // for gettextKey, tstringKey, etc
+#include "tstring.hpp"                  // for t_string
 #include "variable.hpp" // for vconfig
 
 #include <boost/foreach.hpp>
 #include <cstring>
+#include <iterator>                     // for distance, advance
+#include <new>                          // for operator new
+#include <string>                       // for string, basic_string
 
 namespace lua_common {
 

src/scripting/mapgen_lua_kernel.cpp

@@ -19,12 +19,12 @@
 #include "log.hpp"
 #include "lua/lauxlib.h"
 #include "lua/lua.h"
-#include "lua/lualib.h"
 #include "mt_rng.hpp"
 #include "scripting/lua_api.hpp"
 #include "scripting/lua_common.hpp"
 
-#include <cstring>
+#include <new>
+#include <ostream>
 #include <string>
 #include <boost/bind.hpp>
 

src/scripting/mapgen_lua_kernel.hpp

@@ -19,7 +19,6 @@
 
 class config;
 
-#include <cstring>
 #include <string>
 
 class mapgen_lua_kernel : public lua_kernel_base {

src/variable_info.hpp

@@ -14,6 +14,9 @@
    See the COPYING file for more details.
 */
 
+#ifndef VARIABLE_INFO_HPP
+#define VARIABLE_INFO_HPP
+
 /** Information on a WML variable. */
 #include <string>
 #include "config.hpp"
@@ -109,3 +112,5 @@ typedef non_const_variable_info_3<variable_info_3_detail::vit_throw_if_not_exist
 	this variable accessor is takes a const reference and is guaranteed to not change the config.
 */
 typedef variable_info_3<variable_info_3_detail::vit_const>                            variable_access_const;
+
+#endif