-#include "angband.h"
+#include "system/angband.h"
#include "util.h"
#include "io/write-diary.h"
#include "cmd/cmd-dump.h"
#include "patron.h"
#include "cmd-pet.h"
-#include "object-curse.h"
-#include "object-flavor.h"
-#include "monsterrace-hook.h"
-#include "objectkind-hook.h"
-#include "mutation.h"
+#include "object/object-curse.h"
+#include "object/object-flavor.h"
+#include "monster/monsterrace-hook.h"
+#include "object/object-kind-hook.h"
+#include "mutation/mutation.h"
#include "artifact.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-race.h"
-#include "player-class.h"
-#include "player-damage.h"
-
-#include "spells.h"
-#include "spells-summon.h"
-#include "spells-object.h"
-#include "spells-status.h"
-#include "spells-floor.h"
-#include "floor.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-race.h"
+#include "player/player-class.h"
+#include "player/player-damage.h"
+
+#include "spell/spells-type.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-object.h"
+#include "spell/spells-status.h"
+#include "spell/spells-floor.h"
+#include "floor/floor.h"
+#include "spell/spells2.h"
#ifdef JP
/*!