Lots of header files compile-time distanglement.

Author: tamlin-mike

src/Include/xrRender/DebugRender.h

@@ -1,11 +1,16 @@
-#ifndef DebugRender_included
-#define DebugRender_included
 #pragma once
 
 #ifdef DEBUG
 
+#include "xrCore/_types.h"
 #include "DebugShader.h"
 
+// fwd. decl.
+template <class T> struct _vector3;
+using Fvector = _vector3<float>;
+template <class T> struct _matrix;
+using Fmatrix = _matrix<float>;
+
 class IDebugRender
 {
 public:
@@ -47,5 +52,3 @@ class IDebugRender
 };
 
 #endif // DEBUG
-
-#endif //	DebugRender_included

src/Include/xrRender/DebugShader.h

@@ -1,10 +1,6 @@
-#ifndef DebugShader_included
-#define DebugShader_included
 #pragma once
 
 #include "FactoryPtr.h"
 #include "UIShader.h"
 
-typedef FactoryPtr<IUIShader> debug_shader;
-
-#endif //	DebugShader_included
+using debug_shader = FactoryPtr<IUIShader>;

src/Include/xrRender/UIRender.h

@@ -1,8 +1,16 @@
 #ifndef UIRender_included
 #define UIRender_included
 #pragma once
+#include "xrCore/_types.h"
 
+// fwd. decl.
 class IUIShader;
+template <class T> struct _rect;
+using Irect = _rect<int>;
+template <class T> struct _vector2;
+using Fvector2 = _vector2<float>;
+template <class T> struct _matrix;
+using Fmatrix = _matrix<float>;
 
 class IUIRender
 {

src/xrAICore/Components/operator_condition.h

@@ -7,6 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include "xrCore/_types.h"
+#include "xrCommon/inlining_macros.h"
 
 template <typename _condition_type, typename _value_type>
 class COperatorConditionAbstract

src/xrAICore/Navigation/PathManagers/path_manager_params_straight_line.h

@@ -7,6 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include "xrCore/_vector3d.h"
 
 template <typename _dist_type, typename _index_type, typename _iteration_type>
 struct SStraightLineParams : public SBaseParameters<_dist_type, _index_type, _iteration_type>

src/xrAICore/Navigation/data_storage_binary_heap.h

@@ -7,6 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include "xrCore/_types.h"
 
 struct CDataStorageBinaryHeap
 {

src/xrAICore/Navigation/vertex_path.h

@@ -7,6 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include "xrCore/_types.h"
+#include "xrCommon/xr_vector.h"
 
 template <bool EuclidianHeuristics = true>
 struct CVertexPath

src/xrCDB/xrCDB.h

@@ -3,6 +3,8 @@
 #include "xrCore/Threading/Lock.hpp" // XXX: Remove from header. Put in .cpp.
 #include "Common/Noncopyable.hpp"
 #include "xrCore/math_constants.h"
+#include "xrCore/_vector3d.h"
+#include "xrCommon/xr_vector.h"
 
 // forward declarations
 class CFrustum;

src/xrCDB/xr_collide_defs.h

@@ -1,6 +1,10 @@
 #pragma once
 
+#include <algorithm>
+
 #include "xrCDB.h"
+#include "xrCore/_vector3d.h"
+#include "xrCore/_matrix.h"
 
 class IGameObject;
 namespace collide

src/xrCore/FixedVector.h

@@ -1,5 +1,7 @@
 #pragma once
 #include "xrCore/_types.h"
+#include "xrCore/xrDebug_macros.h"
+#include "xrCore/xrMemory.h"
 
 // deprecated, use xr_array instead
 template <class T, std::size_t dim>