#include "floor/floor.h"
#include "io/targeting.h"
#include "main/sound-definitions-table.h"
-#include "monster/place-monster-types.h"
+#include "monster-floor/monster-summon.h"
+#include "monster-floor/place-monster-types.h"
#include "mutation/mutation.h"
#include "player/avatar.h"
#include "player/player-damage.h"
#include "player/player-effects.h"
-#include "spell/spells-type.h"
#include "spell-kind/earthquake.h"
#include "spell-kind/spells-floor.h"
#include "spell-kind/spells-genocide.h"