#include "flavor/object-flavor.h"
#include "floor/floor-mode-changer.h"
#include "floor/floor-object.h"
-#include "floor/floor.h"
#include "game-option/option-types-table.h"
#include "game-option/play-record-options.h"
#include "game-option/special-options.h"
#include "object/object-generator.h"
#include "object/object-kind.h"
#include "perception/object-perception.h"
+#include "player-info/self-info.h"
#include "player/digestion-processor.h"
#include "player/patron.h"
#include "player/player-class.h"
#include "player/player-race-types.h"
#include "player/player-skill.h"
#include "player/player-status.h"
-#include "player/selfinfo.h"
+#include "player/player-status-table.h"
#include "spell-kind/spells-detection.h"
-#include "spell-kind/spells-floor.h"
-#include "spell-kind/spells-perception.h"
#include "spell-kind/spells-sight.h"
#include "spell-kind/spells-teleport.h"
#include "spell/spells-object.h"