#include "angband.h"
#include "util.h"
#include "main/sound-definitions-table.h"
-#include "world.h"
+#include "world/world.h"
#include "gameterm.h"
#include "object.h"
#include "io/write-diary.h"
#include "cmd/cmd-dump.h"
#include "cmd/cmd-spell.h"
-#include "spells.h"
+#include "spell/spells3.h"
#include "dungeon.h"
#include "floor.h"
#include "grid.h"