#include "system/angband.h"
#include "core/stuff-handler.h"
-#include "util.h"
+#include "util/util.h"
#include "main/sound-definitions-table.h"
#include "cmd/cmd-spell.h"
#include "io/write-diary.h"
#include "cmd/cmd-dump.h"
-#include "selfinfo.h"
+#include "player/selfinfo.h"
#include "spell/technic-info-table.h"
#include "spell/spells2.h"
#include "spell/spells3.h"
#include "spell/spells-summon.h"
#include "realm/realm-hex.h"
-#include "mind.h"
+#include "mind/mind.h"
#include "player/avatar.h"
#include "player/player-damage.h"
#include "player/player-status.h"