#include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
#include "util.h"
#include "main/sound-definitions-table.h"
#include "autopick/autopick-pref-processor.h"
#include "cmd/cmd-draw.h"
#include "cmd/cmd-dump.h"
-#include "dungeon.h"
-#include "floor.h"
+#include "dungeon/dungeon.h"
+#include "floor/floor.h"
#include "grid.h"
#include "monster.h"
#include "monster-status.h"
#include "monster-spell.h"
#include "monster-process.h"
-#include "spells.h"
+#include "spell/spells2.h"
#include "spells-summon.h"
#include "monsterrace-hook.h"
#include "object-curse.h"
#include "player-effects.h"
#include "player-personality.h"
#include "view/display-main-window.h"
-#include "world.h"
+#include "world/world.h"
#include "report.h"
#include "melee.h"