#include "monster/monster-describer.h"
#include "monster/monster-status.h"
#include "monster/monster-update.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
#include "player/player-damage.h"
#include "spell-kind/spells-launcher.h"
#include "spell-kind/spells-lite.h"
-#include "spell/spells-summon.h"
#include "spell/spell-types.h"
+#include "spell/summon-types.h"
#include "status/temporary-resistance.h"
#include "system/floor-type-definition.h"
#include "target/projection-path-calculator.h"