-#include <ncurses.h> /* for endwin() */
-#include "main.h" /* for World struct */
-#include "map.h" /* for Map struct */
-#include "keybindings.h" /* for KeysWinData, KeyBinding structs */
+#include <string.h> /* for strlen() */
+#include <errno.h> /* for errno */
+#include "main.h" /* for world global */
+#include "map.h" /* for Map struct ("free(world.map->cells)") */
+#include "command_db.h" /* for free_command_db() */
+#include "windows.h" /* for free_winmeta_and_endwin() */
+#include "map_objects.h" /* for free_map_objects, free_map_object_defs() */
+#include "misc.h" /* for unload_interface_conf() */
+#include "map_object_actions.h" /* for free_map_object_actions() */
+