diff --git a/hecl/include/hecl/Blender/Connection.hpp b/hecl/include/hecl/Blender/Connection.hpp
index f2984a90b..d1f2156ad 100644
--- a/hecl/include/hecl/Blender/Connection.hpp
+++ b/hecl/include/hecl/Blender/Connection.hpp
@@ -13,25 +13,29 @@
 #endif
 
 #include <array>
+#include <atomic>
+#include <cstddef>
 #include <cstdint>
 #include <cstdio>
-#include <cfloat>
-#include <string>
 #include <functional>
-#include <iostream>
+#include <memory>
+#include <optional>
+#include <ostream>
+#include <string>
 #include <unordered_map>
-#include <atomic>
+#include <utility>
 #include <variant>
+#include <vector>
 
 #include "hecl/hecl.hpp"
+#include "hecl/Backend.hpp"
 #include "hecl/HMDLMeta.hpp"
 #include "hecl/TypedVariant.hpp"
-#include "hecl/Backend.hpp"
-#include "athena/Types.hpp"
-#include "athena/MemoryWriter.hpp"
-#include <optional>
-#include "Token.hpp"
+
+#include <athena/Types.hpp>
 #include <fmt/ostream.h>
+#include <logvisor/logvisor.hpp>
+#include <xxhash/xxhash.h>
 
 namespace hecl::blender {
 using namespace std::literals;
diff --git a/hecl/lib/Blender/Connection.cpp b/hecl/lib/Blender/Connection.cpp
index 98ddb5e61..d55ee128c 100644
--- a/hecl/lib/Blender/Connection.cpp
+++ b/hecl/lib/Blender/Connection.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <cerrno>
+#include <cfloat>
 #include <chrono>
 #include <cinttypes>
 #include <csignal>
@@ -15,9 +16,11 @@
 #include <hecl/hecl.hpp>
 #include <hecl/Database.hpp>
 #include "hecl/Blender/Connection.hpp"
+#include "hecl/Blender/Token.hpp"
 #include "hecl/SteamFinder.hpp"
 #include "MeshOptimizer.hpp"
 
+#include <athena/MemoryWriter.hpp>
 #include <logvisor/logvisor.hpp>
 
 #if _WIN32
diff --git a/hecl/lib/Blender/HMDL.cpp b/hecl/lib/Blender/HMDL.cpp
index 9d17cad9f..430cc3b7b 100644
--- a/hecl/lib/Blender/HMDL.cpp
+++ b/hecl/lib/Blender/HMDL.cpp
@@ -1,6 +1,9 @@
 #include "hecl/Blender/Connection.hpp"
-#include <cmath>
+
 #include <cfloat>
+#include <cmath>
+
+#include <athena/MemoryWriter.hpp>
 
 #undef min
 #undef max