diff --git a/src/bind_eressea.c b/src/bind_eressea.c
index 11c03898d..9f73c4a29 100755
--- a/src/bind_eressea.c
+++ b/src/bind_eressea.c
@@ -3,8 +3,6 @@
 #endif
 #include "bind_eressea.h"
 
-#include <platform.h>
-
 #include "json.h"
 #include "orderfile.h"
 
@@ -16,6 +14,7 @@
 #include <util/language.h>
 
 #include <stream.h>
+#include <stdio.h>
 #include <filestream.h>
 
 
diff --git a/src/bind_faction.c b/src/bind_faction.c
index ac797093d..eae029f4b 100644
--- a/src/bind_faction.c
+++ b/src/bind_faction.c
@@ -18,6 +18,7 @@ without prior permission by the authors of Eressea.
 #include "bind_unit.h"
 #include "bindings.h"
 #include "helpers.h"
+#include "magic.h"
 
 #include <kernel/alliance.h>
 #include <kernel/faction.h>
@@ -29,14 +30,19 @@ without prior permission by the authors of Eressea.
 #include <kernel/race.h>
 #include <kernel/region.h>
 #include <kernel/spellbook.h>
-#include <attributes/key.h>
+#include "kernel/types.h"
 
 #include <util/base36.h>
 #include <util/language.h>
 #include <util/log.h>
 #include <util/macros.h>
+#include <util/message.h>
 #include <util/password.h>
 
+#include "attributes/key.h"
+
+#include <lua.h>
+#include <lauxlib.h>
 #include <tolua.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/bind_gmtool.c b/src/bind_gmtool.c
index 5c08f6e2c..d0a023a5b 100644
--- a/src/bind_gmtool.c
+++ b/src/bind_gmtool.c
@@ -14,6 +14,8 @@
 #include <util/log.h>
 #include <util/macros.h>
 
+#include <lua.h>
+#include <lauxlib.h>
 #include <tolua.h>
 
 #include <string.h>
diff --git a/src/bind_message.c b/src/bind_message.c
index 8eee85bc1..bf82ddd02 100644
--- a/src/bind_message.c
+++ b/src/bind_message.c
@@ -16,14 +16,18 @@
 #include <util/macros.h>
 #include <util/message.h>
 #include <util/nrmessage.h>
+#include <util/variant.h>
 
 /* lua includes */
+#include <lua.h>
 #include <tolua.h>
 
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 
+struct order;
+
 #define E_OK 0
 #define E_INVALID_MESSAGE 1
 #define E_INVALID_PARAMETER_NAME 2
diff --git a/src/bind_monsters.c b/src/bind_monsters.c
index af630bb41..f9aef4a2a 100644
--- a/src/bind_monsters.c
+++ b/src/bind_monsters.c
@@ -2,20 +2,19 @@
 #include <platform.h>
 #endif
 
-#include "spells/shipcurse.h"
 #include "monsters.h"
 
 #include <spells/flyingship.h>
 
 #include <kernel/faction.h>
-#include <kernel/race.h>
 #include <kernel/ship.h>
-#include <kernel/spellbook.h>
 #include <kernel/unit.h>
 
 #include <util/macros.h>
 
+#include <lua.h>
 #include <tolua.h>
+
 #include <stdlib.h>
 
 static int tolua_levitate_ship(lua_State * L)
@@ -62,7 +61,7 @@ static int tolua_spawn_undead(lua_State * L)
     return 0;
 }
 
-void bind_monsters(struct lua_State *L)
+void bind_monsters(lua_State *L)
 {
     tolua_module(L, NULL, 0);
     tolua_beginmodule(L, NULL);
diff --git a/src/bind_order.c b/src/bind_order.c
index 407e29037..dd38f4adb 100644
--- a/src/bind_order.c
+++ b/src/bind_order.c
@@ -8,6 +8,7 @@
 #include <util/macros.h>
 
 /* lua includes */
+#include <lua.h>
 #include <tolua.h>
 
 #include <stdlib.h>
diff --git a/src/bind_region.c b/src/bind_region.c
index b49ceb078..3b0e7f3a3 100644
--- a/src/bind_region.c
+++ b/src/bind_region.c
@@ -8,38 +8,37 @@
 #include "bind_building.h"
 
 #include "teleport.h"
+#include "direction.h"
 
+#include <kernel/building.h>
 #include <kernel/calendar.h>
-#include <kernel/config.h>
 #include <kernel/curse.h>
 #include <kernel/region.h>
 #include <kernel/resources.h>
 #include <kernel/unit.h>
-#include <kernel/region.h>
 #include <kernel/item.h>
-#include <kernel/build.h>
-#include <kernel/building.h>
 #include <kernel/ship.h>
 #include <kernel/plane.h>
 #include <kernel/terrain.h>
 #include <kernel/messages.h>
-#include <modules/autoseed.h>
-#include <attributes/key.h>
-#include <attributes/racename.h>
 
 #include <util/attrib.h>
 #include <util/base36.h>
-#include <util/language.h>
 #include <util/log.h>
 #include <util/macros.h>
+#include <util/message.h>
 #include <util/strings.h>
 
-#include <critbit.h>
+#include <attributes/key.h>
+#include <attributes/racename.h>
 
+#include <lua.h>
+#include <lauxlib.h>
 #include <tolua.h>
 
 #include <assert.h>
 #include <string.h>
+#include <stdbool.h>
 #include <stdlib.h>
 
 static int tolua_region_count_msg_type(lua_State *L) {
diff --git a/src/bind_storage.c b/src/bind_storage.c
index e1339312c..aa7935312 100644
--- a/src/bind_storage.c
+++ b/src/bind_storage.c
@@ -11,16 +11,13 @@
 #include <util/macros.h>
 
 #include <storage.h>
-#include <stream.h>
-#include <filestream.h>
-#include <binarystore.h>
 
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 #include <errno.h>
 
+#include <lua.h>
 #include <tolua.h>
 
 static int tolua_storage_create(lua_State * L)
diff --git a/src/bind_unit.c b/src/bind_unit.c
index fddcd5608..9f6c39163 100644
--- a/src/bind_unit.c
+++ b/src/bind_unit.c
@@ -5,15 +5,22 @@
 #include "bind_unit.h"
 #include "alchemy.h"
 #include "bindings.h"
-#include "move.h"
 #include "reports.h"
 #include "guard.h"
+#include "magic.h"
+#include "skill.h"
 
-/*  attributes includes */
-#include <attributes/racename.h>
-#include <attributes/key.h>
+/*  util includes */
+#include <util/attrib.h>
+#include <util/base36.h>
+#include <util/event.h>
+#include <util/log.h>
+#include <util/macros.h>
+#include "util/variant.h"
 
 /*  kernel includes */
+#include "kernel/skills.h"
+#include "kernel/types.h"
 #include <kernel/building.h>
 #include <kernel/config.h>
 #include <kernel/curse.h>
@@ -31,21 +38,20 @@
 #include <kernel/spell.h>
 #include <kernel/unit.h>
 
-/*  util includes */
-#include <util/attrib.h>
-#include <util/base36.h>
-#include <util/event.h>
-#include <util/lists.h>
-#include <util/log.h>
-#include <util/macros.h>
+/*  attributes includes */
+#include <attributes/racename.h>
+#include <attributes/key.h>
 
 #include <selist.h>
 
+#include <lauxlib.h>
+#include <lua.h>
 #include <tolua.h>
 
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <limits.h>
 
diff --git a/src/bindings.c b/src/bindings.c
index bdf03afdf..60519260a 100755
--- a/src/bindings.c
+++ b/src/bindings.c
@@ -4,30 +4,38 @@
 
 #include "bindings.h"
 
+#include "magic.h"
+#include "skill.h"
+#include "helpers.h"
+#include "console.h"
+#include "reports.h"
+#include "study.h"
+#include "summary.h"
+#include "teleport.h"
+#include "laws.h"
+
 #include "kernel/calendar.h"
 #include "kernel/config.h"
 #include "kernel/alliance.h"
 #include "kernel/building.h"
+#include "kernel/build.h"
 #include "kernel/curse.h"
 #include "kernel/unit.h"
 #include "kernel/terrain.h"
 #include "kernel/messages.h"
-#include "kernel/region.h"
-#include "kernel/building.h"
 #include "kernel/plane.h"
-#include "kernel/race.h"
-#include "kernel/item.h"
-#include "kernel/order.h"
-#include "kernel/ship.h"
-#include "kernel/faction.h"
+#include "kernel/region.h"
 #include "kernel/save.h"
+#include "kernel/ship.h"
 #include "kernel/spell.h"
+#include "kernel/types.h"
+#include "kernel/item.h"
+#include "kernel/faction.h"
 #include "kernel/spellbook.h"
 #include "races/races.h"
 
 #include "bind_unit.h"
 #include "bind_storage.h"
-#include "bind_building.h"
 #include "bind_message.h"
 #include "bind_building.h"
 #include "bind_faction.h"
@@ -36,42 +44,31 @@
 #include "bind_gmtool.h"
 #include "bind_region.h"
 
-#include "helpers.h"
-#include "console.h"
-#include "reports.h"
-#include "study.h"
-#include "economy.h"
-#include "summary.h"
-#include "teleport.h"
-#include "laws.h"
-#include "monsters.h"
-#include "market.h"
-
 #include <modules/score.h>
-#include <attributes/key.h>
 
 #include <util/attrib.h>
 #include <util/base36.h>
 #include <util/language.h>
-#include <util/lists.h>
 #include <util/log.h>
 #include <util/macros.h>
-#include <util/nrmessage.h>
+#include <util/message.h>
 #include <util/rand.h>
 #include <util/rng.h>
 
 #include <selist.h>
-#include <storage.h>
 
-#include <iniparser.h>
+#include <dictionary.h>
 #include <tolua.h>
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 
-#include <time.h>
-#include <errno.h>
 #include <assert.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define TOLUA_PKG(NAME) void tolua_##NAME##_open(lua_State * L)
 
diff --git a/src/gmtool.c b/src/gmtool.c
index 48a51d354..e4eefd337 100644
--- a/src/gmtool.c
+++ b/src/gmtool.c
@@ -22,7 +22,6 @@
 
 #include "kernel/building.h"
 #include "kernel/faction.h"
-#include "kernel/item.h"
 #include "kernel/plane.h"
 #include "kernel/region.h"
 #include "kernel/terrainid.h"
@@ -45,7 +44,6 @@
 #include "teleport.h"
 
 #include <assert.h>
-#include <locale.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/src/listbox.c b/src/listbox.c
index cd7118da7..4aa00adaf 100644
--- a/src/listbox.c
+++ b/src/listbox.c
@@ -19,6 +19,7 @@
 
 #include <util/strings.h>
 
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>