-#include "angband.h"
+#include "system/angband.h"
#include "floor/floor.h"
#include "floor/floor-save.h"
#include "floor/floor-generate.h"
-#include "grid.h"
+#include "grid/grid.h"
#include "dungeon/dungeon.h"
-#include "rooms.h"
+#include "room/rooms.h"
#include "quest.h"
-#include "object-hook.h"
+#include "object/object-hook.h"
#include "world/world.h"
-#include "player-effects.h"
-#include "object.h"
-#include "artifact.h"
+#include "player/player-effects.h"
+#include "object/object.h"
+#include "object/artifact.h"
#include "object/object-kind.h"
-#include "trap.h"
+#include "grid/trap.h"
#include "effect/spells-effect-util.h"
#include "effect/effect-characteristics.h"