#include "quest.h"
#include "files.h"
#include "core.h"
-#include "world.h"
+#include "core/angband-version.h"
+#include "core/stuff-handler.h"
+#include "core/special-internal-keys.h"
+#include "core/player-processor.h"
+#include "world/world.h"
#include "gameterm.h"
#ifdef WINDOWS
#include <locale.h>
#include "z-term.h"
#include "save.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
/*
* Available graphic modes