diff --git a/CInterface/Core.hpp b/CInterface/Core.hpp
index 4d5ce25..4fedb99 100644
--- a/CInterface/Core.hpp
+++ b/CInterface/Core.hpp
@@ -1,6 +1,7 @@
 #ifndef PKMNLIB_CORE_HPP
 #define PKMNLIB_CORE_HPP
 
+#include <Arbutils/Exception.hpp>
 #include <cstring>
 #include <exception>
 #include <string>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 620c13c..f53018a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,6 @@ endif ()
 
 file(GLOB_RECURSE CORE_SRC_FILES ${FILE_SOURCE})
 add_library(pkmnLib ${LIBTYPE} ${CORE_SRC_FILES})
-target_precompile_headers(pkmnLib PUBLIC src/Precompiled.hxx)
 # Enable all warnings, and make them error when occurring.
 target_compile_options(pkmnLib PRIVATE -Wall -Wextra -Werror)
 
diff --git a/src/Library/Evolutions/EvolutionData.hpp b/src/Library/Evolutions/EvolutionData.hpp
index 79562d8..747e0a4 100644
--- a/src/Library/Evolutions/EvolutionData.hpp
+++ b/src/Library/Evolutions/EvolutionData.hpp
@@ -1,6 +1,7 @@
 #ifndef PKMNLIB_EVOLUTIONDATA_HPP
 #define PKMNLIB_EVOLUTIONDATA_HPP
 
+#include <Arbutils/Memory/Memory.hpp>
 #include <CreatureLib/Library/EffectParameter.hpp>
 #include <CreatureLib/Library/Gender.hpp>
 #include "../TimeOfDay.hpp"
diff --git a/src/Library/Natures/NatureLibrary.hpp b/src/Library/Natures/NatureLibrary.hpp
index 3b07118..7119134 100644
--- a/src/Library/Natures/NatureLibrary.hpp
+++ b/src/Library/Natures/NatureLibrary.hpp
@@ -1,6 +1,7 @@
 #ifndef PKMNLIB_NATURELIBRARY_HPP
 #define PKMNLIB_NATURELIBRARY_HPP
 
+#include <Arbutils/Memory/Memory.hpp>
 #include <Arbutils/Random.hpp>
 #include <CreatureLib/Library/Exceptions/CreatureException.hpp>
 #include "Nature.hpp"
diff --git a/src/Precompiled.hxx b/src/Precompiled.hxx
deleted file mode 100644
index 68b2191..0000000
--- a/src/Precompiled.hxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef PKMNLIB_PRECOMPILED_HXX
-#define PKMNLIB_PRECOMPILED_HXX
-
-#include <CreatureLib/Precompiled.hxx>
-
-#endif // PKMNLIB_PRECOMPILED_HXX
diff --git a/src/ScriptResolving/AngelScript/AngelScriptMetadata.hpp b/src/ScriptResolving/AngelScript/AngelScriptMetadata.hpp
index 97a9397..4af8bb7 100644
--- a/src/ScriptResolving/AngelScript/AngelScriptMetadata.hpp
+++ b/src/ScriptResolving/AngelScript/AngelScriptMetadata.hpp
@@ -1,5 +1,8 @@
 #ifndef PKMNLIB_ANGELSCRIPTMETADATA_HPP
 #define PKMNLIB_ANGELSCRIPTMETADATA_HPP
+#include <Arbutils/Collections/Dictionary.hpp>
+#include <Arbutils/String/StringView.hpp>
+#include <string>
 
 class AngelscriptMetadata {
 public:
diff --git a/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp b/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp
index f51a41a..e3bf760 100644
--- a/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp
+++ b/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp
@@ -2,6 +2,7 @@
 #define PKMNLIB_ANGELSCRIPTTYPEINFO_HPP
 
 #define ANGELSCRIPT_DLL_LIBRARY_IMPORT
+#include <Arbutils/Collections/Dictionary.hpp>
 #include <CreatureLib/Library/Exceptions/CreatureException.hpp>
 #include <angelscript.h>
 
@@ -72,11 +73,11 @@ public:
     const FunctionInfo& Get##name() const { return __##name; }
 
 private:
-    FunctionInfo InitializeGetOwner(){
+    FunctionInfo InitializeGetOwner() {
         auto t = _type;
-        while (t != nullptr){
+        while (t != nullptr) {
             auto val = t->GetMethodByDecl("ref@& GetOwner()", true);
-            if (val != nullptr){
+            if (val != nullptr) {
                 return FunctionInfo{.Exists = true, .Function = val};
             }
             t = t->GetBaseType();
@@ -85,6 +86,7 @@ private:
     }
 
     FunctionInfo __GetOwner = InitializeGetOwner();
+
 public:
     const FunctionInfo& GetGetOwner() const { return __GetOwner; }
 
diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp
index 7d6c537..ff44d7c 100644
--- a/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp
+++ b/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp
@@ -1,4 +1,5 @@
 #include "BasicScriptClass.hpp"
+#include <Arbutils/Ensure.hpp>
 
 void BasicScriptClass::Register(asIScriptEngine* engine) {
     // As far as I am aware at the moment you can't create an abstract class with virtual members through the
diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/ConstString.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/ConstString.cpp
index 1cf0c6e..e73bb9b 100644
--- a/src/ScriptResolving/AngelScript/TypeRegistry/ConstString.cpp
+++ b/src/ScriptResolving/AngelScript/TypeRegistry/ConstString.cpp
@@ -1,4 +1,6 @@
 #include "ConstString.hpp"
+#include <Arbutils/StringView.hpp>
+#include <Arbutils/Ensure.hpp>
 
 static void ConstructConstString(void* self) { new (self) ArbUt::StringView(); }
 static void ConstructConstStringFromStd(void* self, const std::string& s) {
diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterEffectParameter.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterEffectParameter.cpp
index a206f80..a9d0d4e 100644
--- a/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterEffectParameter.cpp
+++ b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterEffectParameter.cpp
@@ -1,4 +1,5 @@
 #include "RegisterEffectParameter.hpp"
+#include <Arbutils/Ensure.hpp>
 #include <CreatureLib/Library/EffectParameter.hpp>
 
 static CreatureLib::Library::EffectParameter* Ref_Factory() { return new CreatureLib::Library::EffectParameter(); }
diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp
index e762c0e..cb014c8 100644
--- a/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp
+++ b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp
@@ -1,4 +1,5 @@
 #include "RegisterGrowthRateTypes.hpp"
+#include <Arbutils/Ensure.hpp>
 #include <CreatureLib/Library/GrowthRates/GrowthRate.hpp>
 #include <CreatureLib/Library/GrowthRates/GrowthRateLibrary.hpp>
 
diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/NativeArray.hpp b/src/ScriptResolving/AngelScript/TypeRegistry/NativeArray.hpp
index 3120cd5..a770efd 100644
--- a/src/ScriptResolving/AngelScript/TypeRegistry/NativeArray.hpp
+++ b/src/ScriptResolving/AngelScript/TypeRegistry/NativeArray.hpp
@@ -1,6 +1,8 @@
 #ifndef PKMNLIB_NATIVEARRAY_HPP
 #define PKMNLIB_NATIVEARRAY_HPP
 
+#include <Arbutils/Ensure.hpp>
+#include <CreatureLib/Defines.hpp>
 #include <angelscript.h>
 #include <atomic>
 
diff --git a/tests/ScriptTests/MetadataTests.cpp b/tests/ScriptTests/MetadataTests.cpp
index 11129ff..9ac469e 100644
--- a/tests/ScriptTests/MetadataTests.cpp
+++ b/tests/ScriptTests/MetadataTests.cpp
@@ -1,4 +1,5 @@
 #ifdef TESTS_BUILD
+#include <Arbutils/StringView.hpp>
 #include "../../extern/doctest.hpp"
 #include "../../src/ScriptResolving/AngelScript/AngelScriptMetadata.hpp"