diff --git a/src/Battling/Library/DamageLibrary.hpp b/src/Battling/Library/DamageLibrary.hpp
index 10637ec..8b4c1c7 100644
--- a/src/Battling/Library/DamageLibrary.hpp
+++ b/src/Battling/Library/DamageLibrary.hpp
@@ -7,6 +7,7 @@
 namespace CreatureLib::Battling{
     class DamageLibrary {
     public:
+        virtual ~DamageLibrary();
         virtual int GetDamage(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const;
 
         virtual int GetBasePower(ExecutingAttack* attack, Creature* target, uint8_t hitIndex) const;
diff --git a/src/Battling/Models/CreateCreature.cpp b/src/Battling/Models/CreateCreature.cpp
index 1d48890..6d0963c 100644
--- a/src/Battling/Models/CreateCreature.cpp
+++ b/src/Battling/Models/CreateCreature.cpp
@@ -1,5 +1,6 @@
 #include "CreateCreature.hpp"
 #include "../../Core/Exceptions/CreatureException.hpp"
+#include "../Library/BattleLibrary.hpp"
 #include <utility>
 
 using namespace CreatureLib::Battling;
diff --git a/src/Battling/Models/Creature.hpp b/src/Battling/Models/Creature.hpp
index 9852034..4d8149c 100644
--- a/src/Battling/Models/Creature.hpp
+++ b/src/Battling/Models/Creature.hpp
@@ -2,7 +2,8 @@
 #define CREATURELIB_BATTLECREATURE_HPP
 
 #include "../../GenericTemplates.cpp"
-#include "../Library/BattleLibrary.hpp"
+#include "../../Library/CreatureData/CreatureSpecies.hpp"
+#include "../../Library/Items/Item.hpp"
 #include "LearnedAttack.hpp"
 #include "DamageSource.hpp"
 
@@ -10,6 +11,7 @@ namespace CreatureLib::Battling{
     // Forward declare battle class
     class Battle;
     class BattleSide;
+    class BattleLibrary;
 
     class Creature {
         GetProperty(const Library::CreatureSpecies*, Species);