diff --git a/hecl/include/hecl/Backend.hpp b/hecl/include/hecl/Backend.hpp
index 13ac4e3b3..264051942 100644
--- a/hecl/include/hecl/Backend.hpp
+++ b/hecl/include/hecl/Backend.hpp
@@ -1,6 +1,13 @@
 #pragma once
 
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include <cstddef>
+#include <cstdint>
+#include <string_view>
+#include <vector>
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <xxhash/xxhash.h>
 
 namespace hecl::Backend {
 struct ExtensionSlot;
diff --git a/hecl/include/hecl/Blender/SDNARead.hpp b/hecl/include/hecl/Blender/SDNARead.hpp
index 55334223c..f905743e7 100644
--- a/hecl/include/hecl/Blender/SDNARead.hpp
+++ b/hecl/include/hecl/Blender/SDNARead.hpp
@@ -1,10 +1,19 @@
 #pragma once
-#include "hecl/hecl.hpp"
+
+#include <functional>
+#include <vector>
+
 #include "hecl/FourCC.hpp"
-#include "athena/DNA.hpp"
-#include "athena/MemoryReader.hpp"
+#include "hecl/SystemChar.hpp"
+
+#include <athena/DNA.hpp>
+
+namespace athena::io {
+class MemoryReader;
+}
 
 namespace hecl::blender {
+enum class BlendType;
 
 struct SDNABlock : public athena::io::DNA<athena::Little> {
   AT_DECL_DNA
diff --git a/hecl/include/hecl/CVar.hpp b/hecl/include/hecl/CVar.hpp
index 29095b4fd..cf114ece5 100644
--- a/hecl/include/hecl/CVar.hpp
+++ b/hecl/include/hecl/CVar.hpp
@@ -1,10 +1,12 @@
 #pragma once
 
-#include <string>
 #include <functional>
-#include <athena/Types.hpp>
-#include <athena/Global.hpp>
+#include <string>
+#include <vector>
+
 #include <athena/DNAYaml.hpp>
+#include <athena/Global.hpp>
+#include <athena/Types.hpp>
 
 namespace hecl {
 namespace DNACVAR {
diff --git a/hecl/include/hecl/CVarCommons.hpp b/hecl/include/hecl/CVarCommons.hpp
index 026177b95..43087d06b 100644
--- a/hecl/include/hecl/CVarCommons.hpp
+++ b/hecl/include/hecl/CVarCommons.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CVarManager.hpp"
+#include <algorithm>
+#include <cstdint>
+#include <string>
+
+#include "hecl/CVarManager.hpp"
 
 #undef min
 #undef max
diff --git a/hecl/include/hecl/CVarManager.hpp b/hecl/include/hecl/CVarManager.hpp
index 2bc0f6e64..e07efaf6a 100644
--- a/hecl/include/hecl/CVarManager.hpp
+++ b/hecl/include/hecl/CVarManager.hpp
@@ -1,8 +1,11 @@
 #pragma once
 
+#include <memory>
+#include <string>
 #include <unordered_map>
 #include <vector>
-#include "CVar.hpp"
+
+#include "hecl/CVar.hpp"
 #include "hecl/SystemChar.hpp"
 
 namespace hecl {
diff --git a/hecl/include/hecl/ClientProcess.hpp b/hecl/include/hecl/ClientProcess.hpp
index 6ff691129..e557c422b 100644
--- a/hecl/include/hecl/ClientProcess.hpp
+++ b/hecl/include/hecl/ClientProcess.hpp
@@ -1,15 +1,25 @@
 #pragma once
 
-#include "hecl.hpp"
-#include "Database.hpp"
-#include "boo/ThreadLocalPtr.hpp"
-#include "hecl/Blender/Token.hpp"
-#include <list>
-#include <thread>
-#include <mutex>
 #include <condition_variable>
+#include <cstddef>
+#include <functional>
+#include <list>
+#include <memory>
+#include <mutex>
+#include <thread>
+
+#include "hecl/Blender/Token.hpp"
+#include "hecl/hecl.hpp"
+#include "hecl/SystemChar.hpp"
+
+#include <boo/ThreadLocalPtr.hpp>
+
+namespace hecl::Database {
+class IDataSpec;
+}
 
 namespace hecl {
+class MultiProgressPrinter;
 
 extern int CpuCountOverride;
 void SetCpuCountOverride(int argc, const SystemChar** argv);
diff --git a/hecl/include/hecl/Compilers.hpp b/hecl/include/hecl/Compilers.hpp
index 7c714eb75..0bf8e1359 100644
--- a/hecl/include/hecl/Compilers.hpp
+++ b/hecl/include/hecl/Compilers.hpp
@@ -1,9 +1,14 @@
 #pragma once
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "boo/graphicsdev/GL.hpp"
-#include "boo/graphicsdev/Vulkan.hpp"
-#include "boo/graphicsdev/D3D.hpp"
-#include "boo/graphicsdev/Metal.hpp"
+
+#include <cstddef>
+#include <memory>
+#include <utility>
+
+#include <boo/graphicsdev/D3D.hpp>
+#include <boo/graphicsdev/GL.hpp>
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+#include <boo/graphicsdev/Metal.hpp>
+#include <boo/graphicsdev/Vulkan.hpp>
 
 namespace hecl {
 
diff --git a/hecl/include/hecl/Console.hpp b/hecl/include/hecl/Console.hpp
index ab2e95b12..6aec7142f 100644
--- a/hecl/include/hecl/Console.hpp
+++ b/hecl/include/hecl/Console.hpp
@@ -1,11 +1,21 @@
 #pragma once
 
+#include <functional>
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <functional>
-#include "boo/IWindow.hpp"
-#include "logvisor/logvisor.hpp"
+
+#include <boo/System.hpp>
+#include <logvisor/logvisor.hpp>
+
+namespace boo {
+class IWindow;
+
+enum class EModifierKey;
+enum class ESpecialKey;
+
+struct IGraphicsCommandQueue;
+} // namespace boo
 
 namespace hecl {
 class CVarManager;
diff --git a/hecl/include/hecl/Database.hpp b/hecl/include/hecl/Database.hpp
index 5f7dee115..995caa051 100644
--- a/hecl/include/hecl/Database.hpp
+++ b/hecl/include/hecl/Database.hpp
@@ -3,17 +3,15 @@
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
-#include <cstdio>
 #include <functional>
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <unordered_set>
 #include <vector>
 
-#include <logvisor/logvisor.hpp>
+#include "hecl/hecl.hpp"
 
-#include "hecl.hpp"
+#include <logvisor/logvisor.hpp>
 
 #define RUNTIME_ORIGINAL_IDS 0
 
diff --git a/hecl/include/hecl/FourCC.hpp b/hecl/include/hecl/FourCC.hpp
index 26ba12ad6..6007a9d29 100644
--- a/hecl/include/hecl/FourCC.hpp
+++ b/hecl/include/hecl/FourCC.hpp
@@ -3,7 +3,9 @@
 #include <cstdint>
 #include <cstddef>
 #include <string>
-#include "athena/DNA.hpp"
+
+#include <athena/DNA.hpp>
+#include <logvisor/logvisor.hpp>
 
 namespace hecl {
 
diff --git a/hecl/include/hecl/HMDLMeta.hpp b/hecl/include/hecl/HMDLMeta.hpp
index d82ff12db..3159688dc 100644
--- a/hecl/include/hecl/HMDLMeta.hpp
+++ b/hecl/include/hecl/HMDLMeta.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "hecl/hecl.hpp"
-#include "athena/DNA.hpp"
+#include <athena/DNA.hpp>
 
 namespace hecl {
 
diff --git a/hecl/include/hecl/MultiProgressPrinter.hpp b/hecl/include/hecl/MultiProgressPrinter.hpp
index 5e5014793..0eb9b508a 100644
--- a/hecl/include/hecl/MultiProgressPrinter.hpp
+++ b/hecl/include/hecl/MultiProgressPrinter.hpp
@@ -1,7 +1,18 @@
 #pragma once
 
-#include "hecl.hpp"
+#include <cstdint>
+#include <mutex>
 #include <thread>
+#include <vector>
+
+#include "hecl/SystemChar.hpp"
+
+#if _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <Windows.h>
+#endif
 
 namespace hecl {
 
diff --git a/hecl/include/hecl/Pipeline.hpp b/hecl/include/hecl/Pipeline.hpp
index c1e99005d..39e9e8dd4 100644
--- a/hecl/include/hecl/Pipeline.hpp
+++ b/hecl/include/hecl/Pipeline.hpp
@@ -1,9 +1,16 @@
 #pragma once
 
-#include <type_traits>
 #include <cassert>
+#include <cstdint>
+#include <memory>
+#include <type_traits>
+#include <unordered_map>
+
 #include "hecl/hecl.hpp"
-#include "PipelineBase.hpp"
+#include "hecl/PipelineBase.hpp"
+
+#include <boo/BooObject.hpp>
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 /* CMake-curated rep classes for the application */
 #include "ApplicationReps.hpp"
diff --git a/hecl/include/hecl/PipelineBase.hpp b/hecl/include/hecl/PipelineBase.hpp
index 235f1723f..b1a62d4e7 100644
--- a/hecl/include/hecl/PipelineBase.hpp
+++ b/hecl/include/hecl/PipelineBase.hpp
@@ -1,6 +1,15 @@
 #pragma once
-#include "Compilers.hpp"
-#include "../extern/boo/xxhash/xxhash.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <string_view>
+#include <type_traits>
+#include <vector>
+
+#include "hecl/Compilers.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+#include <xxhash/xxhash.h>
 
 #define HECL_RUNTIME 1
 
diff --git a/hecl/include/hecl/Runtime.hpp b/hecl/include/hecl/Runtime.hpp
index 47690a4d4..54b7469c2 100644
--- a/hecl/include/hecl/Runtime.hpp
+++ b/hecl/include/hecl/Runtime.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
-#include "hecl.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include <unordered_map>
+#include <cstddef>
+#include <memory>
+
+#include "hecl/SystemChar.hpp"
+
+#include <boo/BooObject.hpp>
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 namespace hecl {
 struct HMDLMeta;
diff --git a/hecl/include/hecl/TypedVariant.hpp b/hecl/include/hecl/TypedVariant.hpp
index 5eae4b1a8..6841332b7 100644
--- a/hecl/include/hecl/TypedVariant.hpp
+++ b/hecl/include/hecl/TypedVariant.hpp
@@ -1,7 +1,10 @@
 #pragma once
-#include <variant>
+
 #include <cassert>
-#include "athena/DNA.hpp"
+#include <type_traits>
+#include <variant>
+
+#include <athena/DNA.hpp>
 
 /*
  * The TypedVariant system is a type-safe union implementation capable of selecting
diff --git a/hecl/include/hecl/UniformBufferPool.hpp b/hecl/include/hecl/UniformBufferPool.hpp
index 61c6dea09..b2a2f117e 100644
--- a/hecl/include/hecl/UniformBufferPool.hpp
+++ b/hecl/include/hecl/UniformBufferPool.hpp
@@ -1,10 +1,16 @@
 #pragma once
 
-#include <boo/boo.hpp>
-#include <vector>
-#include <cstdlib>
 #include <atomic>
-#include "BitVector.hpp"
+#include <cstdint>
+#include <cstdlib>
+#include <memory>
+#include <type_traits>
+#include <vector>
+
+#include "hecl/BitVector.hpp"
+
+#include <boo/BooObject.hpp>
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 namespace hecl {
 
diff --git a/hecl/include/hecl/VertexBufferPool.hpp b/hecl/include/hecl/VertexBufferPool.hpp
index feb8e6ec0..fa71fc3ba 100644
--- a/hecl/include/hecl/VertexBufferPool.hpp
+++ b/hecl/include/hecl/VertexBufferPool.hpp
@@ -1,10 +1,17 @@
 #pragma once
 
-#include <boo/boo.hpp>
-#include <vector>
-#include <cstdlib>
 #include <atomic>
-#include "BitVector.hpp"
+#include <cassert>
+#include <cstdint>
+#include <cstdlib>
+#include <memory>
+#include <type_traits>
+#include <vector>
+
+#include "hecl/BitVector.hpp"
+
+#include <boo/BooObject.hpp>
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 namespace hecl {
 
diff --git a/hecl/include/hecl/hecl.hpp b/hecl/include/hecl/hecl.hpp
index 28a0ba3c8..bba02fa7f 100644
--- a/hecl/include/hecl/hecl.hpp
+++ b/hecl/include/hecl/hecl.hpp
@@ -62,26 +62,27 @@ struct DataSpecEntry;
 namespace blender {
 enum class BlendType { None, Mesh, ColMesh, Actor, Area, World, MapArea, MapUniverse, Frame, PathMesh };
 
+class ANIMOutStream;
 class Connection;
-class Token;
 class DataStream;
 class PyOutStream;
-class ANIMOutStream;
-struct Mesh;
-struct Material;
+class Token;
+
+struct Action;
+struct Actor;
+struct Armature;
+struct Bone;
 struct ColMesh;
-struct World;
 struct Light;
 struct MapArea;
 struct MapUniverse;
-struct Actor;
-struct Armature;
-struct Action;
-struct Bone;
-struct PathMesh;
+struct Material;
 struct Matrix3f;
 struct Matrix4f;
+struct Mesh;
+struct PathMesh;
 struct PoolSkinIndex;
+struct World;
 
 extern class Token SharedBlenderToken;
 } // namespace blender
diff --git a/hecl/lib/Blender/Connection.cpp b/hecl/lib/Blender/Connection.cpp
index 9e63544d9..905efb67b 100644
--- a/hecl/lib/Blender/Connection.cpp
+++ b/hecl/lib/Blender/Connection.cpp
@@ -13,10 +13,10 @@
 #include <thread>
 #include <tuple>
 
-#include <hecl/hecl.hpp>
-#include <hecl/Database.hpp>
 #include "hecl/Blender/Connection.hpp"
 #include "hecl/Blender/Token.hpp"
+#include "hecl/Database.hpp"
+#include "hecl/hecl.hpp"
 #include "hecl/SteamFinder.hpp"
 #include "MeshOptimizer.hpp"
 
diff --git a/hecl/lib/Blender/HMDL.cpp b/hecl/lib/Blender/HMDL.cpp
index 430cc3b7b..b44f55e6b 100644
--- a/hecl/lib/Blender/HMDL.cpp
+++ b/hecl/lib/Blender/HMDL.cpp
@@ -2,6 +2,8 @@
 
 #include <cfloat>
 #include <cmath>
+#include <cstddef>
+#include <vector>
 
 #include <athena/MemoryWriter.hpp>
 
diff --git a/hecl/lib/Blender/MeshOptimizer.cpp b/hecl/lib/Blender/MeshOptimizer.cpp
index f14068735..93ec4883e 100644
--- a/hecl/lib/Blender/MeshOptimizer.cpp
+++ b/hecl/lib/Blender/MeshOptimizer.cpp
@@ -1,7 +1,11 @@
 #include "MeshOptimizer.hpp"
-#include <numeric>
+
+#include <algorithm>
 #include <cfloat>
+#include <climits>
 #include <cmath>
+#include <numeric>
+#include <unordered_set>
 
 namespace hecl::blender {
 
diff --git a/hecl/lib/Blender/MeshOptimizer.hpp b/hecl/lib/Blender/MeshOptimizer.hpp
index 704c2b275..af8e4bb3a 100644
--- a/hecl/lib/Blender/MeshOptimizer.hpp
+++ b/hecl/lib/Blender/MeshOptimizer.hpp
@@ -1,6 +1,14 @@
 #pragma once
+
+#include <algorithm>
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 #include "hecl/Blender/Connection.hpp"
-#include <unordered_set>
 
 namespace hecl::blender {
 
diff --git a/hecl/lib/Blender/SDNARead.cpp b/hecl/lib/Blender/SDNARead.cpp
index d75d859d9..4bdcb9128 100644
--- a/hecl/lib/Blender/SDNARead.cpp
+++ b/hecl/lib/Blender/SDNARead.cpp
@@ -1,5 +1,13 @@
 #include "hecl/Blender/SDNARead.hpp"
-#include "athena/FileReader.hpp"
+
+#include <cstring>
+#include <string>
+
+#include "hecl/hecl.hpp"
+
+#include <athena/FileReader.hpp>
+#include <athena/MemoryReader.hpp>
+
 #include <zlib.h>
 
 namespace hecl::blender {
diff --git a/hecl/lib/CVar.cpp b/hecl/lib/CVar.cpp
index 9d2bfc81c..9e55967b1 100644
--- a/hecl/lib/CVar.cpp
+++ b/hecl/lib/CVar.cpp
@@ -1,10 +1,11 @@
-#include "hecl/hecl.hpp"
-#include "hecl/CVar.hpp"
+#include "hecl/CVar.hpp"
+
+#include <sstream>
+
 #include "hecl/CVarManager.hpp"
+#include "hecl/hecl.hpp"
 
 #include <athena/Utility.hpp>
-#include <algorithm>
-#include <sstream>
 
 namespace hecl {
 extern CVar* com_developer;
diff --git a/hecl/lib/CVarManager.cpp b/hecl/lib/CVarManager.cpp
index 94fc0379f..14938e5c3 100644
--- a/hecl/lib/CVarManager.cpp
+++ b/hecl/lib/CVarManager.cpp
@@ -1,13 +1,16 @@
 #include "hecl/CVarManager.hpp"
-#include "hecl/Console.hpp"
-#include <athena/FileWriter.hpp>
-#include <athena/Utility.hpp>
-#include <hecl/Runtime.hpp>
-#include <hecl/hecl.hpp>
+
 #include <algorithm>
 #include <memory>
 #include <regex>
 
+#include "hecl/Console.hpp"
+#include "hecl/hecl.hpp"
+#include "hecl/Runtime.hpp"
+
+#include <athena/FileWriter.hpp>
+#include <athena/Utility.hpp>
+
 namespace hecl {
 
 CVar* com_developer = nullptr;
diff --git a/hecl/lib/ClientProcess.cpp b/hecl/lib/ClientProcess.cpp
index ccda39f3b..ed8298a7d 100644
--- a/hecl/lib/ClientProcess.cpp
+++ b/hecl/lib/ClientProcess.cpp
@@ -1,9 +1,14 @@
 #include "hecl/ClientProcess.hpp"
-#include "hecl/Database.hpp"
-#include "athena/FileReader.hpp"
+
+#include <algorithm>
+
 #include "hecl/Blender/Connection.hpp"
+#include "hecl/Database.hpp"
 #include "hecl/MultiProgressPrinter.hpp"
-#include "boo/IApplication.hpp"
+
+#include <athena/FileReader.hpp>
+#include <boo/IApplication.hpp>
+#include <logvisor/logvisor.hpp>
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
diff --git a/hecl/lib/Compilers.cpp b/hecl/lib/Compilers.cpp
index 549537bc1..61a507a5d 100644
--- a/hecl/lib/Compilers.cpp
+++ b/hecl/lib/Compilers.cpp
@@ -1,4 +1,8 @@
 #include "hecl/Compilers.hpp"
+
+#include <cstring>
+#include <utility>
+
 #include <boo/graphicsdev/GLSLMacros.hpp>
 #include <logvisor/logvisor.hpp>
 
diff --git a/hecl/lib/Console.cpp b/hecl/lib/Console.cpp
index 75947efc2..3e678626f 100644
--- a/hecl/lib/Console.cpp
+++ b/hecl/lib/Console.cpp
@@ -1,12 +1,18 @@
-
 #include <hecl/Console.hpp>
 
-#include "hecl/Console.hpp"
-#include "hecl/CVarManager.hpp"
+#include <cstdio>
+#include <functional>
+#include <string>
+#include <vector>
+
 #include "hecl/CVar.hpp"
+#include "hecl/CVarManager.hpp"
 #include "hecl/hecl.hpp"
-#include "boo/graphicsdev/IGraphicsCommandQueue.hpp"
-#include "athena/Utility.hpp"
+
+#include <athena/Utility.hpp>
+#include <boo/IWindow.hpp>
+#include <boo/graphicsdev/IGraphicsCommandQueue.hpp>
+#include <logvisor/logvisor.hpp>
 
 namespace hecl {
 Console* Console::m_instance = nullptr;
diff --git a/hecl/lib/MultiProgressPrinter.cpp b/hecl/lib/MultiProgressPrinter.cpp
index 90a149e1b..fadcf7fa6 100644
--- a/hecl/lib/MultiProgressPrinter.cpp
+++ b/hecl/lib/MultiProgressPrinter.cpp
@@ -1,5 +1,10 @@
 #include "hecl/MultiProgressPrinter.hpp"
 
+#include <algorithm>
+#include <cstdio>
+
+#include "hecl/hecl.hpp"
+
 #define BOLD "\033[1m"
 #define NORMAL "\033[0m"
 #define PREV_LINE "\r\033[{:d}A"
diff --git a/hecl/lib/Pipeline.cpp b/hecl/lib/Pipeline.cpp
index 7f2aed739..71bee706a 100644
--- a/hecl/lib/Pipeline.cpp
+++ b/hecl/lib/Pipeline.cpp
@@ -1,5 +1,6 @@
 #include "hecl/Pipeline.hpp"
-#include "athena/FileReader.hpp"
+
+#include <athena/FileReader.hpp>
 #include <zlib.h>
 
 namespace hecl {
diff --git a/hecl/lib/Project.cpp b/hecl/lib/Project.cpp
index 57b167399..45c776427 100644
--- a/hecl/lib/Project.cpp
+++ b/hecl/lib/Project.cpp
@@ -2,6 +2,7 @@
 #include <cerrno>
 #include <cstdio>
 #include <cstring>
+#include <string>
 #include <system_error>
 
 #if _WIN32
@@ -9,11 +10,13 @@
 #include <unistd.h>
 #endif
 
+#include "hecl/ClientProcess.hpp"
 #include "hecl/Database.hpp"
 #include "hecl/Blender/Connection.hpp"
-#include "hecl/ClientProcess.hpp"
 #include "hecl/MultiProgressPrinter.hpp"
 
+#include <logvisor/logvisor.hpp>
+
 namespace hecl::Database {
 
 logvisor::Module LogModule("hecl::Database");
diff --git a/hecl/lib/ProjectPath.cpp b/hecl/lib/ProjectPath.cpp
index 0eca7f826..ddca3ae3f 100644
--- a/hecl/lib/ProjectPath.cpp
+++ b/hecl/lib/ProjectPath.cpp
@@ -1,7 +1,10 @@
 #include "hecl/hecl.hpp"
-#include "hecl/Database.hpp"
+
 #include <regex>
 
+#include "hecl/Database.hpp"
+#include "hecl/FourCC.hpp"
+
 namespace hecl {
 static const SystemRegex regPATHCOMP(_SYS_STR("[/\\\\]*([^/\\\\]+)"), SystemRegex::ECMAScript | SystemRegex::optimize);
 static const SystemRegex regDRIVELETTER(_SYS_STR("^([^/]*)/"), SystemRegex::ECMAScript | SystemRegex::optimize);
diff --git a/hecl/lib/Runtime/FileStoreManager.cpp b/hecl/lib/Runtime/FileStoreManager.cpp
index 2cb2a9760..bd828e4cb 100644
--- a/hecl/lib/Runtime/FileStoreManager.cpp
+++ b/hecl/lib/Runtime/FileStoreManager.cpp
@@ -1,5 +1,9 @@
 #include "hecl/Runtime.hpp"
-#include "logvisor/logvisor.hpp"
+
+#include "hecl/hecl.hpp"
+
+#include <logvisor/logvisor.hpp>
+
 #if _WIN32
 #include <ShlObj.h>
 #endif
diff --git a/hecl/lib/Runtime/HMDL_RT.cpp b/hecl/lib/Runtime/HMDL_RT.cpp
index 05295c3e0..5695a03d1 100644
--- a/hecl/lib/Runtime/HMDL_RT.cpp
+++ b/hecl/lib/Runtime/HMDL_RT.cpp
@@ -1,6 +1,9 @@
 #include "hecl/HMDLMeta.hpp"
+
 #include "hecl/Runtime.hpp"
+
 #include <athena/MemoryReader.hpp>
+#include <logvisor/logvisor.hpp>
 
 namespace hecl::Runtime {
 static logvisor::Module HMDL_Log("HMDL");
diff --git a/hecl/lib/WideStringConvert.cpp b/hecl/lib/WideStringConvert.cpp
index 8572b2dde..987b65a09 100644
--- a/hecl/lib/WideStringConvert.cpp
+++ b/hecl/lib/WideStringConvert.cpp
@@ -1,5 +1,5 @@
+#include <logvisor/logvisor.hpp>
 #include <utf8proc.h>
-#include "hecl/hecl.hpp"
 
 namespace hecl {
 static logvisor::Module Log("hecl-wsconv");