#include "spell/spells3.h"
#include "dungeon/dungeon.h"
#include "floor/floor.h"
-#include "grid.h"
+#include "grid/grid.h"
#include "object/object-kind.h"
#include "object/object-boost.h"
#include "object/object-ego.h"
#include "object/object-curse.h"
#include "object/object-kind-hook.h"
#include "object/artifact.h"
-#include "feature.h"
+#include "grid/feature.h"
#include "player/player-status.h"
#include "player/player-move.h"
#include "player/player-effects.h"