General: Include necessary includes

Ensures all necessary includes are included and also removes headers
that aren't necessary

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;

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 "hecl/SystemChar.hpp"
-#include "athena/MemoryReader.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

hecl/include/hecl/CVar.hpp

@@ -1,10 +1,12 @@
 #pragma once
 
-#include <string>
 #include <functional>
-#include <athena/Types.hpp>
+#include <string>
-#include <athena/Global.hpp>
+#include <vector>
+
 #include <athena/DNAYaml.hpp>
+#include <athena/Global.hpp>
+#include <athena/Types.hpp>
 
 namespace hecl {
 namespace DNACVAR {

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

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 {

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);

hecl/include/hecl/Compilers.hpp

@@ -1,9 +1,14 @@
 #pragma once
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+
-#include "boo/graphicsdev/GL.hpp"
+#include <cstddef>
-#include "boo/graphicsdev/Vulkan.hpp"
+#include <memory>
-#include "boo/graphicsdev/D3D.hpp"
+#include <utility>
-#include "boo/graphicsdev/Metal.hpp"
+
+#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 {
 

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 <boo/System.hpp>
-#include "logvisor/logvisor.hpp"
+#include <logvisor/logvisor.hpp>
+
+namespace boo {
+class IWindow;
+
+enum class EModifierKey;
+enum class ESpecialKey;
+
+struct IGraphicsCommandQueue;
+} // namespace boo
 
 namespace hecl {
 class CVarManager;

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
 

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 {
 

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 {
 

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 {
 

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"

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
 

hecl/include/hecl/Runtime.hpp

@@ -1,8 +1,12 @@
 #pragma once
 
-#include "hecl.hpp"
+#include <cstddef>
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include <memory>
-#include <unordered_map>
+
+#include "hecl/SystemChar.hpp"
+
+#include <boo/BooObject.hpp>
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 namespace hecl {
 struct HMDLMeta;

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

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 {
 

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 {
 

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;
+class Token;
-struct Mesh;
+
-struct Material;
+struct Action;
+struct Actor;
+struct Armature;
+struct Bone;
 struct ColMesh;
-struct World;
 struct Light;
 struct MapArea;
 struct MapUniverse;
-struct Actor;
+struct Material;
-struct Armature;
-struct Action;
-struct Bone;
-struct PathMesh;
 struct Matrix3f;
 struct Matrix4f;
+struct Mesh;
+struct PathMesh;
 struct PoolSkinIndex;
+struct World;
 
 extern class Token SharedBlenderToken;
 } // namespace blender

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"
 

hecl/lib/Blender/HMDL.cpp

@@ -2,6 +2,8 @@
 
 #include <cfloat>
 #include <cmath>
+#include <cstddef>
+#include <vector>
 
 #include <athena/MemoryWriter.hpp>
 

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 {
 

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 {
 

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 {

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;

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;

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

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>
 

hecl/lib/Console.cpp

@@ -1,12 +1,18 @@
-
 #include <hecl/Console.hpp>
 
-#include "hecl/Console.hpp"
+#include <cstdio>
-#include "hecl/CVarManager.hpp"
+#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;

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"

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 {

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");

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);

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

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");

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");