*/
#include "angband.h"
-#include "signal-handlers.h"
-#include "term.h"
+#include "io/signal-handlers.h"
+#include "gameterm.h"
#include "util.h"
#include "core.h"
#include "dungeon.h"
-#include "player-race.h"
+#include "player/race-info-table.h"
#include "player-status.h"
#include "player-class.h"
#include "player-personality.h"
#include "player-sex.h"
-#include "uid-checker.h"
+#include "io/uid-checker.h"
#include "files.h"
#include "scores.h"
#include "floor.h"
#include "world.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
#include "report.h"
#include "japanese.h"