#include "util.h"
#include "main/music-definitions-table.h"
-#include "core.h"
+#include "core/system-variables.h"
#include "dungeon/dungeon.h"
-#include "floor.h"
-#include "floor-save.h"
-#include "floor-events.h"
+#include "floor/floor.h"
+#include "floor/floor-save.h"
+#include "floor/floor-events.h"
#include "grid.h"
#include "quest.h"
-#include "monsterrace-hook.h"
-#include "monster.h"
-#include "player-status.h"
-#include "player-personality.h"
+#include "monster/monsterrace-hook.h"
+#include "monster/monster.h"
+#include "player/player-status.h"
+#include "player/player-personality.h"
#include "artifact.h"
#include "feature.h"
#include "world/world.h"