#include "grid/grid.h"
#include "io/targeting.h"
#include "main/sound-definitions-table.h"
-#include "monster/monster-process.h"
+#include "monster-race/race-flags1.h"
+#include "monster-race/race-flags-resistance.h"
+#include "monster/monster-describer.h"
+#include "monster-floor/monster-summon.h"
+#include "monster-floor/place-monster-types.h"
+#include "monster/monster-info.h"
+#include "monster/monster-processor.h"
#include "monster/monster-status.h"
#include "mspell/monster-spell.h"
#include "mspell/mspell-type.h"
#include "player/player-effects.h"
#include "player/player-status.h"
-#include "spell/spells-launcher.h"
-#include "spell/spells-lite.h"
-#include "spell/spells-neighbor.h"
-#include "spell/spells-sight.h"
+#include "spell-kind/spells-launcher.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
#include "spell/spells-status.h"
#include "spell/spells-summon.h"
-#include "spell/spells-teleport.h"
+#include "spell-kind/spells-teleport.h"
#include "spell/spells-type.h"
#include "util/util.h"
#include "view/display-main-window.h"