#include "cmd/cmd-dump.h"
#include "cmd/cmd-save.h"
#include "object/chest.h"
-#include "trap.h"
+#include "grid/trap.h"
#include "dungeon/dungeon.h"
#include "melee.h"
#include "object/object-hook.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"