#include "angband.h"
#include "core.h"
#include "util.h"
-#include "autopick.h"
-#include "term.h"
+#include "main/sound-definitions-table.h"
+#include "gameterm.h"
#include "selfinfo.h"
#include "cmd-activate.h"
#include "player-class.h"
#include "player-personality.h"
#include "monster.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
#include "spells.h"
-#include "objectkind.h"
-#include "autopick.h"
+#include "object/object-kind.h"
+#include "autopick/autopick.h"
#include "targeting.h"
#include "snipe.h"
#include "player-race.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
#include "player-inventory.h"
/*!