-#include "angband.h"
+#include "system/angband.h"
#include "dungeon/dungeon-processor.h"
#include "world/world.h"
-#include "targeting.h"
+#include "io/targeting.h"
#include "core/player-processor.h"
-#include "quest.h"
+#include "dungeon/quest.h"
#include "dungeon/dungeon.h"
#include "io/write-diary.h"
#include "realm/realm-song.h"