#include "angband.h"
#include "core.h"
#include "util.h"
+#include "main/sound-definitions-table.h"
-#include "realm-song.h"
-#include "autopick.h"
+#include "realm/realm-song.h"
+#include "autopick/autopick.h"
#include "dungeon.h"
#include "floor.h"
#include "melee.h"
#include "player-move.h"
#include "player-status.h"
#include "player-effects.h"
+#include "player-race.h"
#include "player-class.h"
#include "player-inventory.h"
#include "player-personality.h"
#include "monster-status.h"
#include "object-hook.h"
#include "object-flavor.h"
-#include "spells.h"
+#include "spell/spells-type.h"
#include "cmd-basic.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
#include "world.h"
-#include "objectkind.h"
-#include "autopick.h"
+#include "object/object-kind.h"
+#include "autopick/autopick.h"
#include "targeting.h"
travel_type travel;