#include "io/write-diary.h"
#include "cmd/cmd-dump.h"
#include "cmd/cmd-save.h"
-#include "chest.h"
-#include "trap.h"
+#include "object/chest.h"
+#include "grid/trap.h"
#include "dungeon/dungeon.h"
#include "melee.h"
#include "object/object-hook.h"
#include "monster/monster-status.h"
#include "quest.h"
-#include "artifact.h"
-#include "avatar.h"
+#include "object/artifact.h"
+#include "player/avatar.h"
#include "player/player-status.h"
#include "realm/realm-hex.h"
#include "geometry.h"
#include "wild.h"
-#include "grid.h"
+#include "grid/grid.h"
#include "player/player-move.h"
#include "player/player-effects.h"
#include "player/player-personality.h"
-#include "player-inventory.h"
+#include "inventory/player-inventory.h"
#include "object/object-kind.h"
#include "object/object-broken.h"
#include "object/object-flavor.h"
#include "cmd-basic.h"
#include "dungeon/dungeon-file.h"
-#include "files.h"
+#include "io/files.h"
#include "view/display-main-window.h"
#include "targeting.h"