diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a7f479..c397e32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.16)
 project(CreatureLib)
 
 # Enable all warnings, and make them error when occurring.
@@ -47,6 +47,7 @@ endif ()
 file(GLOB_RECURSE LIBRARY_SRC_FILES
         "src/*.cpp" "src/*.hpp" "CInterface/*.cpp" "CInterface/*.hpp")
 add_library(CreatureLib SHARED ${LIBRARY_SRC_FILES})
+target_precompile_headers(CreatureLib PUBLIC src/Precompiled.hxx)
 
 # If we are building for Windows we need to set some specific variables.
 if (WINDOWS)
diff --git a/src/Battling/EventHooks/EventDataKind.hpp b/src/Battling/EventHooks/EventDataKind.hpp
index 1455b7f..f9f01f1 100644
--- a/src/Battling/EventHooks/EventDataKind.hpp
+++ b/src/Battling/EventHooks/EventDataKind.hpp
@@ -1,6 +1,5 @@
 #ifndef CREATURELIB_EVENTDATAKIND_HPP
 #define CREATURELIB_EVENTDATAKIND_HPP
-#include <Arbutils/Enum.hpp>
 
 namespace CreatureLib::Battling {
     ENUM(EventDataKind, uint8_t, Damage, Heal, Faint, Switch, TurnStart, TurnEnd, ExperienceGain, Miss, DisplayText,
diff --git a/src/Battling/EventHooks/EventHook.hpp b/src/Battling/EventHooks/EventHook.hpp
index 50d2a05..65b7500 100644
--- a/src/Battling/EventHooks/EventHook.hpp
+++ b/src/Battling/EventHooks/EventHook.hpp
@@ -3,7 +3,6 @@
 
 #include <functional>
 #include <thread>
-#include <vector>
 #include "../../Library/Exceptions/CreatureException.hpp"
 #include "Events/EventData.hpp"
 
diff --git a/src/Battling/EventHooks/Events/EventData.hpp b/src/Battling/EventHooks/Events/EventData.hpp
index 3b75394..90e4942 100644
--- a/src/Battling/EventHooks/Events/EventData.hpp
+++ b/src/Battling/EventHooks/Events/EventData.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_EVENTDATA_HPP
 #define CREATURELIB_EVENTDATA_HPP
 
-#include <Arbutils/Memory/BorrowedPtr.hpp>
 #include "../EventDataKind.hpp"
 
 namespace CreatureLib::Battling {
diff --git a/src/Battling/Flow/ChoiceQueue.cpp b/src/Battling/Flow/ChoiceQueue.cpp
index 43b04ac..cb9f4ee 100644
--- a/src/Battling/Flow/ChoiceQueue.cpp
+++ b/src/Battling/Flow/ChoiceQueue.cpp
@@ -1,5 +1,4 @@
 #include "ChoiceQueue.hpp"
-#include <Arbutils/Assert.hpp>
 
 bool CreatureLib::Battling::ChoiceQueue::MoveCreatureChoiceNext(CreatureLib::Battling::Creature* creature) {
     AssertNotNull(creature)
diff --git a/src/Battling/Flow/ChoiceQueue.hpp b/src/Battling/Flow/ChoiceQueue.hpp
index f2a859c..c3eb184 100644
--- a/src/Battling/Flow/ChoiceQueue.hpp
+++ b/src/Battling/Flow/ChoiceQueue.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_CHOICEQUEUE_HPP
 #define CREATURELIB_CHOICEQUEUE_HPP
 
-#include <Arbutils/Memory/UniquePtrList.hpp>
-#include <utility>
-#include <vector>
 #include "../TurnChoices/BaseTurnChoice.hpp"
 
 namespace CreatureLib::Battling {
diff --git a/src/Battling/Flow/ResolveTarget.hpp b/src/Battling/Flow/ResolveTarget.hpp
index 7916101..91417e7 100644
--- a/src/Battling/Flow/ResolveTarget.hpp
+++ b/src/Battling/Flow/ResolveTarget.hpp
@@ -1,8 +1,5 @@
 #ifndef CREATURELIB_RESOLVETARGET_HPP
 #define CREATURELIB_RESOLVETARGET_HPP
-#include <Arbutils/Collections/List.hpp>
-#include <Arbutils/Memory/BorrowedPtr.hpp>
-#include <vector>
 #include "../../Library/Attacks/AttackTarget.hpp"
 #include "../Models/Battle.hpp"
 #include "../Models/Creature.hpp"
diff --git a/src/Battling/Flow/TurnHandler.cpp b/src/Battling/Flow/TurnHandler.cpp
index b199b76..f8ea093 100644
--- a/src/Battling/Flow/TurnHandler.cpp
+++ b/src/Battling/Flow/TurnHandler.cpp
@@ -1,6 +1,4 @@
 #include "TurnHandler.hpp"
-#include <Arbutils/Assert.hpp>
-#include <unordered_set>
 #include "../EventHooks/EventDataClasses.hpp"
 #include "../History/HistoryElements/AttackUseHistory.hpp"
 #include "../ScriptHandling/ScriptMacros.hpp"
diff --git a/src/Battling/Flow/TurnOrdering.cpp b/src/Battling/Flow/TurnOrdering.cpp
index 7751bfa..637f396 100644
--- a/src/Battling/Flow/TurnOrdering.cpp
+++ b/src/Battling/Flow/TurnOrdering.cpp
@@ -1,5 +1,4 @@
 #include "TurnOrdering.hpp"
-#include <algorithm>
 #include "../Models/Battle.hpp"
 #include "../TurnChoices/AttackTurnChoice.hpp"
 
diff --git a/src/Battling/Flow/TurnOrdering.hpp b/src/Battling/Flow/TurnOrdering.hpp
index 37776b5..048b272 100644
--- a/src/Battling/Flow/TurnOrdering.hpp
+++ b/src/Battling/Flow/TurnOrdering.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_TURNORDERING_HPP
 #define CREATURELIB_TURNORDERING_HPP
 
-#include <Arbutils/Random.hpp>
-#include <memory>
-#include <vector>
 #include "../TurnChoices/BaseTurnChoice.hpp"
 
 namespace CreatureLib::Battling {
diff --git a/src/Battling/History/HistoryElementKind.hpp b/src/Battling/History/HistoryElementKind.hpp
index 923af95..dc54dd6 100644
--- a/src/Battling/History/HistoryElementKind.hpp
+++ b/src/Battling/History/HistoryElementKind.hpp
@@ -1,6 +1,5 @@
 #ifndef CREATURELIB_HISTORYELEMENTKIND_HPP
 #define CREATURELIB_HISTORYELEMENTKIND_HPP
-#include <Arbutils/Enum.hpp>
 
 ENUM(HistoryElementKind, uint8_t, AttackUse)
 #endif // CREATURELIB_HISTORYELEMENTKIND_HPP
diff --git a/src/Battling/History/HistoryElements/HistoryElement.hpp b/src/Battling/History/HistoryElements/HistoryElement.hpp
index 3860baf..1fe2140 100644
--- a/src/Battling/History/HistoryElements/HistoryElement.hpp
+++ b/src/Battling/History/HistoryElements/HistoryElement.hpp
@@ -1,8 +1,8 @@
 #ifndef CREATURELIB_HISTORYELEMENT_HPP
 #define CREATURELIB_HISTORYELEMENT_HPP
 
-#include <Arbutils/Memory/BorrowedPtr.hpp>
 #include "../HistoryElementKind.hpp"
+
 namespace CreatureLib::Battling {
     class HistoryElement {
         friend class HistoryHolder;
diff --git a/src/Battling/History/HistoryHolder.hpp b/src/Battling/History/HistoryHolder.hpp
index f91fcdb..184b984 100644
--- a/src/Battling/History/HistoryHolder.hpp
+++ b/src/Battling/History/HistoryHolder.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_HISTORYHOLDER_HPP
 #define CREATURELIB_HISTORYHOLDER_HPP
 
-#include <cstddef>
-#include <cstdint>
 #include "../../Library/Exceptions/CreatureException.hpp"
 #include "HistoryElements/HistoryElement.hpp"
 
diff --git a/src/Battling/Library/BattleLibrary.cpp b/src/Battling/Library/BattleLibrary.cpp
index 252b98d..212a708 100644
--- a/src/Battling/Library/BattleLibrary.cpp
+++ b/src/Battling/Library/BattleLibrary.cpp
@@ -1,5 +1,4 @@
 #include "BattleLibrary.hpp"
-#include <Arbutils/Assert.hpp>
 
 using namespace CreatureLib::Battling;
 
diff --git a/src/Battling/Library/BattleStatCalculator.cpp b/src/Battling/Library/BattleStatCalculator.cpp
index ceff789..647e375 100644
--- a/src/Battling/Library/BattleStatCalculator.cpp
+++ b/src/Battling/Library/BattleStatCalculator.cpp
@@ -1,5 +1,4 @@
 #include "BattleStatCalculator.hpp"
-#include <Arbutils/Assert.hpp>
 #include "../Models/Creature.hpp"
 
 using namespace CreatureLib;
diff --git a/src/Battling/Library/DamageLibrary.cpp b/src/Battling/Library/DamageLibrary.cpp
index 80bfbb7..cd2e2f4 100644
--- a/src/Battling/Library/DamageLibrary.cpp
+++ b/src/Battling/Library/DamageLibrary.cpp
@@ -1,5 +1,4 @@
 #include "DamageLibrary.hpp"
-#include <Arbutils/Assert.hpp>
 #include "../ScriptHandling/ScriptMacros.hpp"
 
 using namespace CreatureLib::Battling;
diff --git a/src/Battling/Library/ExperienceLibrary.hpp b/src/Battling/Library/ExperienceLibrary.hpp
index 57294dd..072f30d 100644
--- a/src/Battling/Library/ExperienceLibrary.hpp
+++ b/src/Battling/Library/ExperienceLibrary.hpp
@@ -1,7 +1,5 @@
 #ifndef CREATURELIB_EXPERIENCELIBRARY_HPP
 #define CREATURELIB_EXPERIENCELIBRARY_HPP
-#include <Arbutils/Memory/BorrowedPtr.hpp>
-#include <unordered_set>
 
 namespace CreatureLib::Battling {
     class Creature;
diff --git a/src/Battling/Library/MiscLibrary.cpp b/src/Battling/Library/MiscLibrary.cpp
index 170d73e..3ff9ecd 100644
--- a/src/Battling/Library/MiscLibrary.cpp
+++ b/src/Battling/Library/MiscLibrary.cpp
@@ -1,5 +1,4 @@
 #include "MiscLibrary.hpp"
-#include <Arbutils/Assert.hpp>
 #include "../Models/Battle.hpp"
 #include "../TurnChoices/AttackTurnChoice.hpp"
 
diff --git a/src/Battling/Models/Battle.cpp b/src/Battling/Models/Battle.cpp
index 40cba22..c730e89 100644
--- a/src/Battling/Models/Battle.cpp
+++ b/src/Battling/Models/Battle.cpp
@@ -1,6 +1,4 @@
 #include "Battle.hpp"
-#include <Arbutils/Assert.hpp>
-#include <memory>
 #include "../EventHooks/EventDataClasses.hpp"
 #include "../Flow/TurnHandler.hpp"
 #include "../Flow/TurnOrdering.hpp"
diff --git a/src/Battling/Models/Battle.hpp b/src/Battling/Models/Battle.hpp
index 9de3dbd..7f9e8d3 100644
--- a/src/Battling/Models/Battle.hpp
+++ b/src/Battling/Models/Battle.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_BATTLE_HPP
 #define CREATURELIB_BATTLE_HPP
 
-#include <Arbutils/Assert.hpp>
-#include <Arbutils/Collections/List.hpp>
-#include <memory>
 #include "../EventHooks/EventHook.hpp"
 #include "../Flow/ChoiceQueue.hpp"
 #include "../History/HistoryHolder.hpp"
diff --git a/src/Battling/Models/BattleParty.hpp b/src/Battling/Models/BattleParty.hpp
index 672548a..7711dc8 100644
--- a/src/Battling/Models/BattleParty.hpp
+++ b/src/Battling/Models/BattleParty.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_BATTLEPARTY_HPP
 #define CREATURELIB_BATTLEPARTY_HPP
 
-#include <Arbutils/Assert.hpp>
-#include <Arbutils/Collections/List.hpp>
 #include "CreatureIndex.hpp"
 #include "CreatureParty.hpp"
 
diff --git a/src/Battling/Models/BattleResult.hpp b/src/Battling/Models/BattleResult.hpp
index 615e3d9..407d212 100644
--- a/src/Battling/Models/BattleResult.hpp
+++ b/src/Battling/Models/BattleResult.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_BATTLERESULT_HPP
 #define CREATURELIB_BATTLERESULT_HPP
 
-#include <cstdint>
 namespace CreatureLib::Battling {
     class BattleResult {
         bool _conclusiveResult;
diff --git a/src/Battling/Models/BattleSide.cpp b/src/Battling/Models/BattleSide.cpp
index 4ffb906..d963ee4 100644
--- a/src/Battling/Models/BattleSide.cpp
+++ b/src/Battling/Models/BattleSide.cpp
@@ -1,5 +1,4 @@
 #include "BattleSide.hpp"
-#include <algorithm>
 #include "../EventHooks/EventDataClasses.hpp"
 #include "Battle.hpp"
 
diff --git a/src/Battling/Models/BattleSide.hpp b/src/Battling/Models/BattleSide.hpp
index 524ab1c..f52338d 100644
--- a/src/Battling/Models/BattleSide.hpp
+++ b/src/Battling/Models/BattleSide.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_BATTLESIDE_HPP
 #define CREATURELIB_BATTLESIDE_HPP
 
-#include <Arbutils/Assert.hpp>
-#include <Arbutils/Collections/List.hpp>
-#include <vector>
 #include "../TurnChoices/BaseTurnChoice.hpp"
 #include "Creature.hpp"
 
diff --git a/src/Battling/Models/CreateCreature.cpp b/src/Battling/Models/CreateCreature.cpp
index b957fab..999fafa 100644
--- a/src/Battling/Models/CreateCreature.cpp
+++ b/src/Battling/Models/CreateCreature.cpp
@@ -1,8 +1,5 @@
 
 #include "CreateCreature.hpp"
-#include <sstream>
-#include <utility>
-#include "../Library/BattleLibrary.hpp"
 
 using namespace CreatureLib::Battling;
 
diff --git a/src/Battling/Models/CreateCreature.hpp b/src/Battling/Models/CreateCreature.hpp
index fe69c73..919362f 100644
--- a/src/Battling/Models/CreateCreature.hpp
+++ b/src/Battling/Models/CreateCreature.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_CREATECREATURE_HPP
 #define CREATURELIB_CREATECREATURE_HPP
 
-#include <Arbutils/Collections/List.hpp>
 #include "../../Library/DataLibrary.hpp"
 #include "../Library/BattleLibrary.hpp"
 #include "Creature.hpp"
diff --git a/src/Battling/Models/Creature.cpp b/src/Battling/Models/Creature.cpp
index 8c5fd0e..f9ff6f2 100644
--- a/src/Battling/Models/Creature.cpp
+++ b/src/Battling/Models/Creature.cpp
@@ -1,6 +1,4 @@
 #include "Creature.hpp"
-#include <algorithm>
-#include <utility>
 #include "../EventHooks/EventDataClasses.hpp"
 #include "../Models/Battle.hpp"
 #include "../ScriptHandling/ScriptMacros.hpp"
diff --git a/src/Battling/Models/Creature.hpp b/src/Battling/Models/Creature.hpp
index 5d8e4e9..21dbbf6 100644
--- a/src/Battling/Models/Creature.hpp
+++ b/src/Battling/Models/Creature.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_BATTLECREATURE_HPP
 #define CREATURELIB_BATTLECREATURE_HPP
 
-#include <Arbutils/Collections/List.hpp>
-#include <Arbutils/Memory/BorrowedPtr.hpp>
-#include <Arbutils/Memory/UniquePtrList.hpp>
 #include "../../Defines.hpp"
 #include "../../Library/ClampedStatisticSet.hpp"
 #include "../../Library/CreatureData/CreatureSpecies.hpp"
diff --git a/src/Battling/Models/CreatureIndex.hpp b/src/Battling/Models/CreatureIndex.hpp
index 70faaf4..404049d 100644
--- a/src/Battling/Models/CreatureIndex.hpp
+++ b/src/Battling/Models/CreatureIndex.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_CREATUREINDEX_HPP
 #define CREATURELIB_CREATUREINDEX_HPP
 
-#include <cstdint>
 #include "Creature.hpp"
 
 namespace CreatureLib::Battling {
diff --git a/src/Battling/Models/CreatureParty.hpp b/src/Battling/Models/CreatureParty.hpp
index 1871867..0235625 100644
--- a/src/Battling/Models/CreatureParty.hpp
+++ b/src/Battling/Models/CreatureParty.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_CREATUREPARTY_HPP
 #define CREATURELIB_CREATUREPARTY_HPP
 
-#include <Arbutils/Collections/List.hpp>
 #include "Creature.hpp"
 
 namespace CreatureLib::Battling {
diff --git a/src/Battling/Models/DamageSource.hpp b/src/Battling/Models/DamageSource.hpp
index c3b97c7..ab0adb3 100644
--- a/src/Battling/Models/DamageSource.hpp
+++ b/src/Battling/Models/DamageSource.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_DAMAGESOURCE_HPP
 #define CREATURELIB_DAMAGESOURCE_HPP
 
-#include <Arbutils/Enum.hpp>
-#include <cstdint>
-
 namespace CreatureLib::Battling {
     ENUM(DamageSource, uint8_t, AttackDamage);
 }
diff --git a/src/Battling/Models/ExecutingAttack.hpp b/src/Battling/Models/ExecutingAttack.hpp
index 1100d25..5c46e44 100644
--- a/src/Battling/Models/ExecutingAttack.hpp
+++ b/src/Battling/Models/ExecutingAttack.hpp
@@ -1,12 +1,6 @@
 #ifndef CREATURELIB_EXECUTINGATTACK_HPP
 #define CREATURELIB_EXECUTINGATTACK_HPP
 
-#include <Arbutils/Assert.hpp>
-#include <Arbutils/Collections/Dictionary.hpp>
-#include <Arbutils/Collections/List.hpp>
-#include <cstdint>
-#include <unordered_map>
-#include <vector>
 #include "Creature.hpp"
 
 namespace CreatureLib::Battling {
diff --git a/src/Battling/Models/LearnedAttack.cpp b/src/Battling/Models/LearnedAttack.cpp
index 907521c..de74890 100644
--- a/src/Battling/Models/LearnedAttack.cpp
+++ b/src/Battling/Models/LearnedAttack.cpp
@@ -1,5 +1,5 @@
 #include "LearnedAttack.hpp"
-#include <Arbutils/Assert.hpp>
+
 CreatureLib::Battling::LearnedAttack::LearnedAttack(
     const ArbUt::BorrowedPtr<const CreatureLib::Library::AttackData>& attack, uint8_t maxUses,
     AttackLearnMethod learnMethod)
diff --git a/src/Battling/Models/LearnedAttack.hpp b/src/Battling/Models/LearnedAttack.hpp
index 45250c5..531abd8 100644
--- a/src/Battling/Models/LearnedAttack.hpp
+++ b/src/Battling/Models/LearnedAttack.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_LEARNEDATTACK_HPP
 #define CREATURELIB_LEARNEDATTACK_HPP
 
-#include <Arbutils/Memory/BorrowedPtr.hpp>
-#include <memory>
 #include "../../Library/Attacks/AttackData.hpp"
 #include "AttackLearnMethod.hpp"
 
diff --git a/src/Battling/ScriptHandling/Script.hpp b/src/Battling/ScriptHandling/Script.hpp
index 36dd90b..2a93ee3 100644
--- a/src/Battling/ScriptHandling/Script.hpp
+++ b/src/Battling/ScriptHandling/Script.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_SCRIPT_HPP
 #define CREATURELIB_SCRIPT_HPP
 
-#include <Arbutils/Collections/List.hpp>
-#include <Arbutils/StringView.hpp>
 #include "../../Library/EffectParameter.hpp"
 
 namespace CreatureLib::Battling {
diff --git a/src/Battling/ScriptHandling/ScriptAggregator.hpp b/src/Battling/ScriptHandling/ScriptAggregator.hpp
index fdf9680..13af7cd 100644
--- a/src/Battling/ScriptHandling/ScriptAggregator.hpp
+++ b/src/Battling/ScriptHandling/ScriptAggregator.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_SCRIPTAGGREGATOR_HPP
 #define CREATURELIB_SCRIPTAGGREGATOR_HPP
 
-#include <Arbutils/Collections/List.hpp>
 #include "Script.hpp"
 #include "ScriptSet.hpp"
 #include "ScriptWrapper.hpp"
diff --git a/src/Battling/ScriptHandling/ScriptResolver.hpp b/src/Battling/ScriptHandling/ScriptResolver.hpp
index f1a147f..c68067b 100644
--- a/src/Battling/ScriptHandling/ScriptResolver.hpp
+++ b/src/Battling/ScriptHandling/ScriptResolver.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_SCRIPTRESOLVER_HPP
 #define CREATURELIB_SCRIPTRESOLVER_HPP
 
-#include <Arbutils/Enum.hpp>
-#include <string>
 #include "Script.hpp"
 #include "ScriptCategory.hpp"
 
diff --git a/src/Battling/ScriptHandling/ScriptSet.hpp b/src/Battling/ScriptHandling/ScriptSet.hpp
index cf50863..5c3ac32 100644
--- a/src/Battling/ScriptHandling/ScriptSet.hpp
+++ b/src/Battling/ScriptHandling/ScriptSet.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_SCRIPTSET_HPP
 #define CREATURELIB_SCRIPTSET_HPP
 
-#include <Arbutils/Collections/Dictionary.hpp>
-#include <Arbutils/Memory/UniquePtrList.hpp>
 #include <any>
 #include "Script.hpp"
 
diff --git a/src/Battling/ScriptHandling/ScriptWrapper.hpp b/src/Battling/ScriptHandling/ScriptWrapper.hpp
index fa4f34d..84060a8 100644
--- a/src/Battling/ScriptHandling/ScriptWrapper.hpp
+++ b/src/Battling/ScriptHandling/ScriptWrapper.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_SCRIPTWRAPPER_HPP
 #define CREATURELIB_SCRIPTWRAPPER_HPP
 
-#include <memory>
 #include "Script.hpp"
 #include "ScriptSet.hpp"
 
diff --git a/src/Battling/TurnChoices/BaseTurnChoice.hpp b/src/Battling/TurnChoices/BaseTurnChoice.hpp
index 7f14cb4..9ffa6dc 100644
--- a/src/Battling/TurnChoices/BaseTurnChoice.hpp
+++ b/src/Battling/TurnChoices/BaseTurnChoice.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_BASETURNCHOICE_HPP
 #define CREATURELIB_BASETURNCHOICE_HPP
 
-#include <Arbutils/Assert.hpp>
 #include "../ScriptHandling/ScriptSource.hpp"
 #include "TurnChoiceKind.hpp"
 
diff --git a/src/Battling/TurnChoices/TurnChoiceKind.hpp b/src/Battling/TurnChoices/TurnChoiceKind.hpp
index c358aa6..577a6e1 100644
--- a/src/Battling/TurnChoices/TurnChoiceKind.hpp
+++ b/src/Battling/TurnChoices/TurnChoiceKind.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_TURNCHOICEKIND_HPP
 #define CREATURELIB_TURNCHOICEKIND_HPP
 
-#include <cstdint>
-
 namespace CreatureLib::Battling {
     ENUM(TurnChoiceKind, uint8_t, Pass, Attack, Item, Switch, Flee);
 }
diff --git a/src/Defines.hpp b/src/Defines.hpp
index 70a3526..d9102e8 100644
--- a/src/Defines.hpp
+++ b/src/Defines.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_DEFINES_HPP
 #define CREATURELIB_DEFINES_HPP
 
-#include <cstdint>
-
 typedef uint8_t level_int_t;
 
 #endif // CREATURELIB_DEFINES_HPP
diff --git a/src/Library/AttackLibrary.hpp b/src/Library/AttackLibrary.hpp
index 7ae927b..2a2712a 100644
--- a/src/Library/AttackLibrary.hpp
+++ b/src/Library/AttackLibrary.hpp
@@ -1,10 +1,9 @@
 #ifndef CREATURELIB_ATTACKLIBRARY_HPP
 #define CREATURELIB_ATTACKLIBRARY_HPP
 
-#include <string>
-#include <unordered_map>
 #include "Attacks/AttackData.hpp"
 #include "BaseLibrary.hpp"
+
 namespace CreatureLib::Library {
     class AttackLibrary : public BaseLibrary<AttackData> {
     public:
diff --git a/src/Library/Attacks/AttackCategory.hpp b/src/Library/Attacks/AttackCategory.hpp
index 0251254..9ccf7b9 100644
--- a/src/Library/Attacks/AttackCategory.hpp
+++ b/src/Library/Attacks/AttackCategory.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_ATTACKCATEGORY_HPP
 #define CREATURELIB_ATTACKCATEGORY_HPP
 
-#include <Arbutils/Enum.hpp>
-#include <cstdint>
-
 namespace CreatureLib::Library {
     ENUM(AttackCategory, uint8_t, Physical, Magical, Status)
 }
diff --git a/src/Library/Attacks/AttackData.cpp b/src/Library/Attacks/AttackData.cpp
index aad0423..25d2b63 100644
--- a/src/Library/Attacks/AttackData.cpp
+++ b/src/Library/Attacks/AttackData.cpp
@@ -1,5 +1,4 @@
 #include "AttackData.hpp"
-#include <utility>
 
 CreatureLib::Library::AttackData::AttackData(const ArbUt::StringView& name, uint8_t type,
                                              CreatureLib::Library::AttackCategory category, uint8_t power,
diff --git a/src/Library/Attacks/AttackData.hpp b/src/Library/Attacks/AttackData.hpp
index e227794..ebde896 100644
--- a/src/Library/Attacks/AttackData.hpp
+++ b/src/Library/Attacks/AttackData.hpp
@@ -1,10 +1,6 @@
 #ifndef CREATURELIB_ATTACKDATA_HPP
 #define CREATURELIB_ATTACKDATA_HPP
 
-#include <Arbutils/StringView.hpp>
-#include <memory>
-#include <string>
-#include <unordered_set>
 #include "AttackCategory.hpp"
 #include "AttackTarget.hpp"
 #include "SecondaryEffect.hpp"
diff --git a/src/Library/Attacks/AttackTarget.hpp b/src/Library/Attacks/AttackTarget.hpp
index 0f66447..4bb2fb1 100644
--- a/src/Library/Attacks/AttackTarget.hpp
+++ b/src/Library/Attacks/AttackTarget.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_ATTACKTARGET_HPP
 #define CREATURELIB_ATTACKTARGET_HPP
 
-#include <Arbutils/Enum.hpp>
-#include <cstdint>
-
 namespace CreatureLib::Library {
     ENUM(AttackTarget, uint8_t, Adjacent, AdjacentAlly, AdjacentAllySelf, AdjacentOpponent,
 
diff --git a/src/Library/Attacks/SecondaryEffect.hpp b/src/Library/Attacks/SecondaryEffect.hpp
index 9bc82da..48e8a07 100644
--- a/src/Library/Attacks/SecondaryEffect.hpp
+++ b/src/Library/Attacks/SecondaryEffect.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_SECONDARYEFFECT_HPP
 #define CREATURELIB_SECONDARYEFFECT_HPP
 
-#include <Arbutils/Collections/List.hpp>
-#include <Arbutils/StringView.hpp>
 #include <any>
 #include "../EffectParameter.hpp"
 
diff --git a/src/Library/BaseLibrary.hpp b/src/Library/BaseLibrary.hpp
index bbcfcf8..7c97ba4 100644
--- a/src/Library/BaseLibrary.hpp
+++ b/src/Library/BaseLibrary.hpp
@@ -1,15 +1,7 @@
 #ifndef CREATURELIB_BASELIBRARY_HPP
 #define CREATURELIB_BASELIBRARY_HPP
 
-#include <Arbutils/Assert.hpp>
-#include <Arbutils/Collections/Dictionary.hpp>
-#include <Arbutils/Collections/List.hpp>
-#include <Arbutils/Memory/BorrowedPtr.hpp>
 #include <Arbutils/Random.hpp>
-#include <Arbutils/StringView.hpp>
-#include <algorithm>
-#include <memory>
-#include <string>
 
 namespace CreatureLib::Library {
     template <class T> class BaseLibrary {
diff --git a/src/Library/ClampedStatisticSet.hpp b/src/Library/ClampedStatisticSet.hpp
index fe21844..d231919 100644
--- a/src/Library/ClampedStatisticSet.hpp
+++ b/src/Library/ClampedStatisticSet.hpp
@@ -3,6 +3,7 @@
 
 #include "Exceptions/CreatureException.hpp"
 #include "Statistic.hpp"
+
 namespace CreatureLib::Library {
     template <class T, int Min, int Max> class ClampedStatisticSet {
     protected:
diff --git a/src/Library/CreatureData/CreatureSpecies.cpp b/src/Library/CreatureData/CreatureSpecies.cpp
index ccbb0b9..0f73888 100644
--- a/src/Library/CreatureData/CreatureSpecies.cpp
+++ b/src/Library/CreatureData/CreatureSpecies.cpp
@@ -1,6 +1,4 @@
 #include "CreatureSpecies.hpp"
-#include <Arbutils/Assert.hpp>
-#include <utility>
 
 using namespace CreatureLib::Library;
 
diff --git a/src/Library/CreatureData/CreatureSpecies.hpp b/src/Library/CreatureData/CreatureSpecies.hpp
index e915281..e63b1d9 100644
--- a/src/Library/CreatureData/CreatureSpecies.hpp
+++ b/src/Library/CreatureData/CreatureSpecies.hpp
@@ -1,12 +1,6 @@
 #ifndef CREATURELIB_CREATURESPECIES_HPP
 #define CREATURELIB_CREATURESPECIES_HPP
 
-#include <Arbutils/Collections/Dictionary.hpp>
-#include <Arbutils/Memory/BorrowedPtr.hpp>
-#include <Arbutils/StringView.hpp>
-#include <memory>
-#include <string>
-#include <unordered_map>
 #include "../Gender.hpp"
 #include "SpeciesVariant.hpp"
 
diff --git a/src/Library/CreatureData/LearnableAttacks.hpp b/src/Library/CreatureData/LearnableAttacks.hpp
index e905ec4..060322e 100644
--- a/src/Library/CreatureData/LearnableAttacks.hpp
+++ b/src/Library/CreatureData/LearnableAttacks.hpp
@@ -1,12 +1,7 @@
 #ifndef CREATURELIB_LEARNABLEATTACKS_HPP
 #define CREATURELIB_LEARNABLEATTACKS_HPP
 
-#include <Arbutils/Assert.hpp>
-#include <Arbutils/Collections/Dictionary.hpp>
-#include <Arbutils/Collections/List.hpp>
-#include <Arbutils/Memory/BorrowedPtr.hpp>
 #include <Arbutils/Random.hpp>
-#include <unordered_map>
 #include "../../Defines.hpp"
 #include "../Attacks/AttackData.hpp"
 
diff --git a/src/Library/CreatureData/SpeciesVariant.cpp b/src/Library/CreatureData/SpeciesVariant.cpp
index a05350e..17e5507 100644
--- a/src/Library/CreatureData/SpeciesVariant.cpp
+++ b/src/Library/CreatureData/SpeciesVariant.cpp
@@ -1,5 +1,4 @@
 #include "SpeciesVariant.hpp"
-#include <algorithm>
 
 const CreatureLib::Library::TalentIndex
 CreatureLib::Library::SpeciesVariant::GetTalentIndex(const ArbUt::StringView& talent) const {
diff --git a/src/Library/CreatureData/SpeciesVariant.hpp b/src/Library/CreatureData/SpeciesVariant.hpp
index 3f1ad8f..d86d2d4 100644
--- a/src/Library/CreatureData/SpeciesVariant.hpp
+++ b/src/Library/CreatureData/SpeciesVariant.hpp
@@ -1,11 +1,6 @@
 #ifndef CREATURELIB_SPECIESVARIANT_HPP
 #define CREATURELIB_SPECIESVARIANT_HPP
 
-#include <Arbutils/Collections/List.hpp>
-#include <Arbutils/Memory/BorrowedPtr.hpp>
-#include <Arbutils/Random.hpp>
-#include <memory>
-#include <string>
 #include "../StatisticSet.hpp"
 #include "LearnableAttacks.hpp"
 #include "TalentIndex.hpp"
diff --git a/src/Library/CreatureData/TalentIndex.hpp b/src/Library/CreatureData/TalentIndex.hpp
index d911a40..e13438d 100644
--- a/src/Library/CreatureData/TalentIndex.hpp
+++ b/src/Library/CreatureData/TalentIndex.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_TALENTINDEX_HPP
 #define CREATURELIB_TALENTINDEX_HPP
 
-#include <cstdint>
 namespace CreatureLib::Library {
     class TalentIndex {
         bool _secret;
diff --git a/src/Library/EffectParameter.hpp b/src/Library/EffectParameter.hpp
index ba7734b..7b65d8f 100644
--- a/src/Library/EffectParameter.hpp
+++ b/src/Library/EffectParameter.hpp
@@ -1,7 +1,5 @@
 #ifndef CREATURELIB_EFFECTPARAMETER_HPP
 #define CREATURELIB_EFFECTPARAMETER_HPP
-#include <Arbutils/Enum.hpp>
-#include <Arbutils/StringView.hpp>
 #include <variant>
 #include "Exceptions/CreatureException.hpp"
 
diff --git a/src/Library/Exceptions/CreatureException.hpp b/src/Library/Exceptions/CreatureException.hpp
index 5c4c887..5ddb929 100644
--- a/src/Library/Exceptions/CreatureException.hpp
+++ b/src/Library/Exceptions/CreatureException.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_CREATUREEXCEPTION_HPP
 #define CREATURELIB_CREATUREEXCEPTION_HPP
 
-#include <Arbutils/Exception.hpp>
-
 #define try_creature(data, msg)                                                                                        \
     try {                                                                                                              \
         data;                                                                                                          \
diff --git a/src/Library/Gender.hpp b/src/Library/Gender.hpp
index 8dc4e44..d622b8d 100644
--- a/src/Library/Gender.hpp
+++ b/src/Library/Gender.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_GENDER_HPP
 #define CREATURELIB_GENDER_HPP
 
-#include <Arbutils/Enum.hpp>
-#include <cstdint>
-
 namespace CreatureLib::Library {
     /*!
     \brief Might be somewhat controversial nowadays, but as many creature battling games only have two genders, we'll
diff --git a/src/Library/GrowthRates/ExternGrowthRate.hpp b/src/Library/GrowthRates/ExternGrowthRate.hpp
index bb885e0..bfd24de 100644
--- a/src/Library/GrowthRates/ExternGrowthRate.hpp
+++ b/src/Library/GrowthRates/ExternGrowthRate.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_EXTERNGROWTHRATE_HPP
 #define CREATURELIB_EXTERNGROWTHRATE_HPP
 
-#include <Arbutils/Assert.hpp>
 #include "../../Defines.hpp"
 #include "GrowthRate.hpp"
 namespace CreatureLib::Library {
diff --git a/src/Library/GrowthRates/GrowthRateLibrary.hpp b/src/Library/GrowthRates/GrowthRateLibrary.hpp
index e23fe28..5161566 100644
--- a/src/Library/GrowthRates/GrowthRateLibrary.hpp
+++ b/src/Library/GrowthRates/GrowthRateLibrary.hpp
@@ -1,11 +1,6 @@
 #ifndef CREATURELIB_GROWTHRATELIBRARY_HPP
 #define CREATURELIB_GROWTHRATELIBRARY_HPP
 
-#include <Arbutils/StringView.hpp>
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <unordered_map>
 #include "GrowthRate.hpp"
 
 namespace CreatureLib::Library {
diff --git a/src/Library/GrowthRates/LookupGrowthRate.hpp b/src/Library/GrowthRates/LookupGrowthRate.hpp
index 24558f7..1050133 100644
--- a/src/Library/GrowthRates/LookupGrowthRate.hpp
+++ b/src/Library/GrowthRates/LookupGrowthRate.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_LOOKUPGROWTHRATE_HPP
 #define CREATURELIB_LOOKUPGROWTHRATE_HPP
 
-#include <Arbutils/Collections/List.hpp>
 #include "GrowthRate.hpp"
 
 namespace CreatureLib::Library {
diff --git a/src/Library/ItemLibrary.hpp b/src/Library/ItemLibrary.hpp
index ab84bb4..ebe86a1 100644
--- a/src/Library/ItemLibrary.hpp
+++ b/src/Library/ItemLibrary.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_ITEMLIBRARY_HPP
 #define CREATURELIB_ITEMLIBRARY_HPP
 
-#include <string>
-#include <unordered_map>
 #include "BaseLibrary.hpp"
 #include "Items/Item.hpp"
 
diff --git a/src/Library/Items/BattleItemCategory.hpp b/src/Library/Items/BattleItemCategory.hpp
index 0624c93..d39e240 100644
--- a/src/Library/Items/BattleItemCategory.hpp
+++ b/src/Library/Items/BattleItemCategory.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_BATTLEITEMCATEGORY_HPP
 #define CREATURELIB_BATTLEITEMCATEGORY_HPP
 
-#include <Arbutils/Enum.hpp>
-#include <cstdint>
-
 namespace CreatureLib::Library {
     ENUM(BattleItemCategory, uint8_t, None, Healing, StatusHealing, CaptureDevice, MiscBattleItem)
 }
diff --git a/src/Library/Items/Item.hpp b/src/Library/Items/Item.hpp
index 2152e3e..22bc7d4 100644
--- a/src/Library/Items/Item.hpp
+++ b/src/Library/Items/Item.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_ITEM_HPP
 #define CREATURELIB_ITEM_HPP
 
-#include <Arbutils/StringView.hpp>
-#include <string>
-#include <unordered_set>
 #include "BattleItemCategory.hpp"
 #include "ItemCategory.hpp"
 
diff --git a/src/Library/Items/ItemCategory.hpp b/src/Library/Items/ItemCategory.hpp
index 8cd3992..b133b59 100644
--- a/src/Library/Items/ItemCategory.hpp
+++ b/src/Library/Items/ItemCategory.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_ITEMCATEGORY_HPP
 #define CREATURELIB_ITEMCATEGORY_HPP
 
-#include <Arbutils/Enum.hpp>
-#include <cstdint>
-
 namespace CreatureLib::Library {
     ENUM(ItemCategory, uint8_t, MiscItem, CaptureDevice, Medicine, Berry, MoveLearner, VariantChanger, KeyItem, Mail)
 }
diff --git a/src/Library/LibrarySettings.hpp b/src/Library/LibrarySettings.hpp
index 7822ba6..9907672 100644
--- a/src/Library/LibrarySettings.hpp
+++ b/src/Library/LibrarySettings.hpp
@@ -1,7 +1,6 @@
 #ifndef CREATURELIB_LIBRARYSETTINGS_HPP
 #define CREATURELIB_LIBRARYSETTINGS_HPP
 
-#include <cstdint>
 #include "../Defines.hpp"
 
 namespace CreatureLib::Library {
diff --git a/src/Library/SpeciesLibrary.hpp b/src/Library/SpeciesLibrary.hpp
index 0cb57e8..0931eac 100644
--- a/src/Library/SpeciesLibrary.hpp
+++ b/src/Library/SpeciesLibrary.hpp
@@ -1,8 +1,6 @@
 #ifndef CREATURELIB_SPECIESLIBRARY_HPP
 #define CREATURELIB_SPECIESLIBRARY_HPP
 
-#include <string>
-#include <unordered_map>
 #include "BaseLibrary.hpp"
 #include "CreatureData/CreatureSpecies.hpp"
 
diff --git a/src/Library/Statistic.hpp b/src/Library/Statistic.hpp
index ad438f1..323311a 100644
--- a/src/Library/Statistic.hpp
+++ b/src/Library/Statistic.hpp
@@ -1,9 +1,6 @@
 #ifndef CREATURELIB_STATISTIC_HPP
 #define CREATURELIB_STATISTIC_HPP
 
-#include <Arbutils/Enum.hpp>
-#include <cstdint>
-
 namespace CreatureLib::Library {
     ENUM(Statistic, uint8_t, Health, PhysicalAttack, PhysicalDefense, MagicalAttack, MagicalDefense, Speed)
 }
diff --git a/src/Library/StatisticSet.hpp b/src/Library/StatisticSet.hpp
index 8174020..379efe7 100644
--- a/src/Library/StatisticSet.hpp
+++ b/src/Library/StatisticSet.hpp
@@ -1,7 +1,5 @@
 #ifndef CREATURELIB_STATISTICSET_HPP
 #define CREATURELIB_STATISTICSET_HPP
-#include <exception>
-#include <stdint.h>
 #include "Exceptions/CreatureException.hpp"
 #include "Statistic.hpp"
 
diff --git a/src/Library/TypeLibrary.cpp b/src/Library/TypeLibrary.cpp
index b11d102..4780958 100644
--- a/src/Library/TypeLibrary.cpp
+++ b/src/Library/TypeLibrary.cpp
@@ -1,5 +1,4 @@
 #include "TypeLibrary.hpp"
-#include <Arbutils/Assert.hpp>
 
 using namespace CreatureLib::Library;
 
diff --git a/src/Library/TypeLibrary.hpp b/src/Library/TypeLibrary.hpp
index 3efba16..7e65e5b 100644
--- a/src/Library/TypeLibrary.hpp
+++ b/src/Library/TypeLibrary.hpp
@@ -1,12 +1,6 @@
 #ifndef CREATURELIB_TYPELIBRARY_HPP
 #define CREATURELIB_TYPELIBRARY_HPP
 
-#include <Arbutils/Collections/Dictionary.hpp>
-#include <Arbutils/Collections/List.hpp>
-#include <Arbutils/StringView.hpp>
-#include <numeric>
-#include <unordered_set>
-#include <vector>
 #include "Exceptions/CreatureException.hpp"
 
 namespace CreatureLib::Library {