From ab67b0434bff768318bc9b6177588edeac411a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Sat, 18 Dec 2021 16:40:14 +0100
Subject: [PATCH] Havok: Clean up indirect includes

---
 lib/hkStubs/Havok/Common/Base/Memory/Router/hkMemoryRouter.h    | 1 +
 lib/hkStubs/Havok/Common/Base/Object/hkBaseObject.h             | 2 --
 lib/hkStubs/Havok/Common/Base/Object/hkReferencedObject.h       | 1 -
 .../Havok/Common/Base/Thread/Atomic/hkAtomicPrimitives.h        | 2 +-
 lib/hkStubs/Havok/Physics/Collide/Shape/hkpShape.h              | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/hkStubs/Havok/Common/Base/Memory/Router/hkMemoryRouter.h b/lib/hkStubs/Havok/Common/Base/Memory/Router/hkMemoryRouter.h
index bc9db60e..aa34ac5b 100644
--- a/lib/hkStubs/Havok/Common/Base/Memory/Router/hkMemoryRouter.h
+++ b/lib/hkStubs/Havok/Common/Base/Memory/Router/hkMemoryRouter.h
@@ -2,6 +2,7 @@
 
 #include <Havok/Common/Base/Memory/Allocator/Lifo/hkLifoAllocator.h>
 #include <Havok/Common/Base/Memory/Allocator/hkMemoryAllocator.h>
+#include <Havok/Common/Base/Object/hkReferencedObject.h>
 #include <Havok/Common/Base/Thread/Thread/hkThreadLocalData.h>
 #include <type_traits>
 
diff --git a/lib/hkStubs/Havok/Common/Base/Object/hkBaseObject.h b/lib/hkStubs/Havok/Common/Base/Object/hkBaseObject.h
index feb8f474..5089ff85 100644
--- a/lib/hkStubs/Havok/Common/Base/Object/hkBaseObject.h
+++ b/lib/hkStubs/Havok/Common/Base/Object/hkBaseObject.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <Havok/Common/Base/hkBase.h>
-
 class hkBaseObject {
 public:
     virtual ~hkBaseObject() = default;
diff --git a/lib/hkStubs/Havok/Common/Base/Object/hkReferencedObject.h b/lib/hkStubs/Havok/Common/Base/Object/hkReferencedObject.h
index 8fbf51c4..0ee4e253 100644
--- a/lib/hkStubs/Havok/Common/Base/Object/hkReferencedObject.h
+++ b/lib/hkStubs/Havok/Common/Base/Object/hkReferencedObject.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Havok/Common/Base/Memory/Router/hkMemoryRouter.h>
 #include <Havok/Common/Base/Object/hkBaseObject.h>
 #include <Havok/Common/Base/Types/hkBaseDefs.h>
 #include <Havok/Common/Base/Types/hkBaseTypes.h>
diff --git a/lib/hkStubs/Havok/Common/Base/Thread/Atomic/hkAtomicPrimitives.h b/lib/hkStubs/Havok/Common/Base/Thread/Atomic/hkAtomicPrimitives.h
index ba81e7c7..9b536a2d 100644
--- a/lib/hkStubs/Havok/Common/Base/Thread/Atomic/hkAtomicPrimitives.h
+++ b/lib/hkStubs/Havok/Common/Base/Thread/Atomic/hkAtomicPrimitives.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Havok/Common/Base/hkBase.h>
+#include <Havok/Common/Base/Types/hkBaseDefs.h>
 
 namespace hkAtomic {
 
diff --git a/lib/hkStubs/Havok/Physics/Collide/Shape/hkpShape.h b/lib/hkStubs/Havok/Physics/Collide/Shape/hkpShape.h
index fe2923c8..ed5acd02 100644
--- a/lib/hkStubs/Havok/Physics/Collide/Shape/hkpShape.h
+++ b/lib/hkStubs/Havok/Physics/Collide/Shape/hkpShape.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Havok/Common/Base/Object/hkReferencedObject.h>
+#include <Havok/Common/Base/hkBase.h>
 
 class hkpShape : public hkReferencedObject {
 public: