*/
#include "angband.h"
+#include "main/music-definitions-table.h"
+#include "main/sound-definitions-table.h"
#include "core.h"
-#include "term.h"
+#include "gameterm.h"
#include "io/write-diary.h"
#include "cmd/cmd-dump.h"
#include "player-effects.h"
#include "player-personality.h"
#include "player-inventory.h"
-#include "objectkind.h"
+#include "object/object-kind.h"
#include "object-broken.h"
#include "object-flavor.h"
#include "shoot.h"
#include "dungeon-file.h"
#include "files.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
#include "targeting.h"
#include "world.h"