Merge branch 'develop' of https://github.com/ennorehling/eressea.git

src/console.c

@@ -5,13 +5,12 @@
 
 /* lua includes */
 #include <lua.h>
+#include <luaconf.h>
 #include <lauxlib.h>
-#include <lualib.h>
 
 /* libc includes */
 #include <assert.h>
 #include <signal.h>
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 

src/helpers.c

@@ -17,26 +17,21 @@ without prior permission by the authors of Eressea.
 #include "helpers.h"
 #include "vortex.h"
 #include "alchemy.h"
+#include "magic.h"
 
 #include <util/attrib.h>
-#include <util/base36.h>
 #include <util/event.h>
 #include <util/functions.h>
 #include <util/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/parser.h>
-#include <util/resolve.h>
+#include <util/variant.h>
 
-#include <kernel/callbacks.h>
 #include <kernel/config.h>
 #include <kernel/callbacks.h>
-#include <kernel/faction.h>
 #include <kernel/spell.h>
-#include <kernel/race.h>
-#include <kernel/resources.h>
 #include <kernel/unit.h>
-#include <kernel/building.h>
 #include <kernel/item.h>
 #include <kernel/region.h>
 
@@ -46,8 +41,10 @@ without prior permission by the authors of Eressea.
 #include <lua.h>
 
 #include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+struct order;
 
 static int
 lua_giveitem(unit * s, unit * d, const item_type * itype, int n, struct order *ord)

src/helpers.h

@@ -14,8 +14,6 @@ without prior permission by the authors of Eressea.
 extern "C" {
 #endif
 
-    struct lua_State;
-
     void register_tolua_helpers(void);
 
 #ifdef __cplusplus