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

src/CMakeLists.txt

@@ -169,9 +169,18 @@ set (SERVER_SRC ${SERVER_SRC}
 )
 endif(CURSES_FOUND)
 
+find_program(IWYU_PATH NAMES include-what-you-use iwyu)
+if(NOT IWYU_PATH)
+	message(STATUS "Could not find the program include-what-you-use")
+endif()
+
+
 add_library(version STATIC ${VERSION_SRC})
 add_library(game ${ERESSEA_SRC})
 add_executable(eressea ${SERVER_SRC})
+if (IWYU_PATH)
+set_property(TARGET eressea PROPERTY C_INCLUDE_WHAT_YOU_USE ${IWYU_PATH})
+endif(IWYU_PATH)
 target_link_libraries(game version)
 target_link_libraries(eressea
   game

src/gmtool.c

@@ -18,49 +18,37 @@
 
 #include "gmtool.h"
 
-#include <modules/xmas.h>
-#include <modules/gmcmd.h>
-#include <modules/museum.h>
 #include <modules/autoseed.h>
 
 #include "kernel/building.h"
-#include "kernel/calendar.h"
 #include "kernel/faction.h"
 #include "kernel/item.h"
 #include "kernel/plane.h"
-#include "kernel/race.h"
 #include "kernel/region.h"
 #include "kernel/terrainid.h"
 #include "kernel/unit.h"
-#include "kernel/resources.h"
 #include "kernel/save.h"
 #include "kernel/ship.h"
 #include "kernel/terrain.h"
 
-#include <attributes/attributes.h>
-#include <triggers/triggers.h>
-
 #include <util/attrib.h>
 #include <util/base36.h>
 #include <util/lists.h>
-#include <util/log.h>
 #include <util/macros.h>
-#include <util/path.h>
-#include <util/rng.h>
-#include <util/unicode.h>
+#include "util/path.h"
+#include "util/rng.h"
+#include "util/unicode.h"
 
 #include "gmtool_structs.h"
 #include "console.h"
 #include "listbox.h"
-#include "wormhole.h"
 #include "teleport.h"
 
-#include <storage.h>
-#include <lua.h>
-
 #include <assert.h>
 #include <locale.h>
+#include <limits.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 

src/listbox.c

@@ -13,12 +13,10 @@
 #endif
 
 #include <curses.h>
-#include <kernel/config.h>
 
 #include "listbox.h"
 #include "gmtool_structs.h"
 
-#include <util/log.h>
 #include <util/strings.h>
 
 #include <stdlib.h>