-#include "angband.h"
+#include "system/angband.h"
#include "core/stuff-handler.h"
#include "util.h"
#include "io/write-diary.h"
#include "cmd/cmd-dump.h"
#include "floor/floor.h"
-#include "grid.h"
+#include "grid/grid.h"
#include "melee.h"
#include "sort.h"
-#include "player-move.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-skill.h"
-#include "player-class.h"
-#include "player-damage.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-skill.h"
+#include "player/player-class.h"
+#include "player/player-damage.h"
#include "object/object-hook.h"
-#include "monster.h"
-#include "monster-status.h"
+#include "monster/monster.h"
+#include "monster/monster-status.h"
#include "cmd-pet.h"
#include "cmd-basic.h"
#include "view/display-main-window.h"