#include "battle/Monster.h"
#include "battle/PartyLayout.h"
#include "battle/Resources.h"
-#include "battle/Stats.h"
+#include "common/Hero.h"
#include "common/Ikari.h"
#include "common/Inventory.h"
#include "common/Item.h"
#include "common/Spell.h"
+#include "common/Stats.h"
#include "geometry/Vector.h"
#include "graphics/ComplexAnimation.h"
#include "graphics/Font.h"
using app::Arguments;
using app::Input;
using battle::BattleState;
-using battle::Hero;
using battle::Monster;
using battle::PartyLayout;
-using battle::Stats;
+using common::Hero;
using common::Ikari;
using common::Inventory;
using common::Item;
using common::Spell;
+using common::Stats;
using geometry::Vector;
using graphics::ComplexAnimation;
using graphics::Font;