#include "object/object-kind-hook.h"
#include "sort.h"
#include "spell/spells-summon.h"
-#include "grid.h"
+#include "grid/grid.h"
#include "floor/floor.h"
#include "floor/floor-events.h"
#include "floor/floor-town.h"
#include "player/player-status.h"
#include "monster/monster-status.h"
#include "view/display-main-window.h"
-#include "feature.h"
+#include "grid/feature.h"
#include "quest.h"
#include "dungeon/dungeon.h"
#include "world/world.h"