#include "angband.h"
#include "util.h"
+#include "main/sound-definitions-table.h"
#include "io/write-diary.h"
#include "cmd/cmd-dump.h"
#include "feature.h"
#include "player-status.h"
#include "grid.h"
-#include "spells.h"
-#include "floor.h"
+#include "spell/spells-type.h"
+#include "effect/effect-characteristics.h"
#include "floor-save.h"
#include "init.h"
#include "files.h"
#include "dungeon.h"
#include "world.h"
+#include "spell/process-effect.h"
static s16b normal_traps[MAX_NORMAL_TRAPS];