#include "core/player-update-types.h"
#include "core/window-redrawer.h"
#include "floor/floor-object.h"
-#include "floor/floor.h"
#include "game-option/disturbance-options.h"
#include "main/sound-definitions-table.h"
#include "main/sound-of-music.h"
#include "object/object-kind.h"
#include "perception/object-perception.h"
#include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
#include "player/player-class.h"
#include "player/player-status.h"
#include "player/special-defense-types.h"
#include "status/shape-changer.h"
#include "sv-definition/sv-other-types.h"
#include "sv-definition/sv-rod-types.h"
-#include "target/targeting.h"
+#include "target/target-getter.h"
#include "term/screen-processor.h"
#include "view/display-messages.h"