#include "util.h"
#include "effect/effect-characteristics.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
#include "grid.h"
-#include "object-curse.h"
+#include "object/object-curse.h"
#include "quest.h"
#include "realm/realm-hex.h"
-#include "player-move.h"
-#include "player-status.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
#include "monster.h"
#include "monster-spell.h"
#include "spell/spells-type.h"
#include "world/world.h"
#include "realm/realm-song.h"
#include "view/display-main-window.h"
-#include "player-race.h"
-#include "player-class.h"
+#include "player/player-race.h"
+#include "player/player-class.h"
#include "spell/process-effect.h"
#include "spell/spells3.h"