#include "market/building.h"
#include "init.h"
#include "quest.h"
-#include "trap.h"
+#include "grid/trap.h"
#include "room/rooms.h"
#include "market/store.h"
#include "wild.h"
#include "dungeon/dungeon-file.h"
#include "files.h"
-#include "feature.h"
+#include "grid/feature.h"
#include "floor/floor.h"
#include "floor/floor-town.h"
#include "dungeon/dungeon.h"