From 04893d8b42ff4bc0b34c1d7ce12013b4001fddbc Mon Sep 17 00:00:00 2001
From: Zegeri <zegeridp@gmail.com>
Date: Mon, 24 Sep 2018 18:20:06 +0200
Subject: [PATCH] Fix Clang's more sensitive header order and forward
 declarations

---
 src/utils/xrMiscMath/vector3d_ext.cpp         |  2 +-
 src/xrAICore/AISpaceBase.cpp                  |  2 +-
 src/xrAICore/Components/problem_solver.h      |  2 -
 .../Components/problem_solver_inline.h        |  4 ++
 .../bloodsucker/bloodsucker_state_manager.cpp |  2 +-
 .../ai/monsters/dog/dog_state_manager.cpp     |  2 +-
 .../states/monster_state_rest_idle_inline.h   |  2 +
 src/xrGame/aimers_base.h                      |  1 +
 src/xrGame/debug_text_tree.h                  | 42 +++++++++----------
 src/xrGame/memory_manager.h                   |  3 +-
 src/xrGame/space_restriction_bridge.h         |  3 +-
 src/xrPhysics/ActorCameraCollision.cpp        |  4 +-
 src/xrPhysics/PhysicsExternalCommon.h         |  1 +
 13 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/utils/xrMiscMath/vector3d_ext.cpp b/src/utils/xrMiscMath/vector3d_ext.cpp
index 2bc1a6dceef..5a2baadc08f 100644
--- a/src/utils/xrMiscMath/vector3d_ext.cpp
+++ b/src/utils/xrMiscMath/vector3d_ext.cpp
@@ -1,6 +1,6 @@
 #include "pch.hpp"
-#include "xrCore/_vector3d_ext.h"
 #include "xrCommon/math_funcs_inline.h"
+#include "xrCore/_vector3d_ext.h"
 
 float dotproduct(const Fvector& v1, const Fvector& v2)
 {
diff --git a/src/xrAICore/AISpaceBase.cpp b/src/xrAICore/AISpaceBase.cpp
index 308981a5284..65c5578acba 100644
--- a/src/xrAICore/AISpaceBase.cpp
+++ b/src/xrAICore/AISpaceBase.cpp
@@ -2,8 +2,8 @@
 #include "AISpaceBase.hpp"
 #include "Navigation/game_graph.h"
 #include "Navigation/level_graph.h"
-#include "Navigation/graph_engine.h"
 #include "Navigation/PatrolPath/patrol_path_storage.h"
+#include "Navigation/graph_engine.h"
 
 AISpaceBase::AISpaceBase() { GEnv.AISpace = this; }
 AISpaceBase::~AISpaceBase()
diff --git a/src/xrAICore/Components/problem_solver.h b/src/xrAICore/Components/problem_solver.h
index e34ac21449e..82c82c2e7bb 100644
--- a/src/xrAICore/Components/problem_solver.h
+++ b/src/xrAICore/Components/problem_solver.h
@@ -11,8 +11,6 @@
 #include "xrCore/Containers/AssociativeVector.hpp"
 #include "Common/object_broker.h"
 
-class CGraphEngine;
-
 template <typename _operator_condition, typename _condition_state, typename _operator, typename _condition_evaluator,
     typename _operator_id_type, bool _reverse_search = false, typename _operator_ptr = _operator*,
     typename _condition_evaluator_ptr = _condition_evaluator*>
diff --git a/src/xrAICore/Components/problem_solver_inline.h b/src/xrAICore/Components/problem_solver_inline.h
index 032cb8dab2d..55dfc491fce 100644
--- a/src/xrAICore/Components/problem_solver_inline.h
+++ b/src/xrAICore/Components/problem_solver_inline.h
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#ifndef AI_COMPILER
+#include "xrAICore/Navigation/graph_engine.h"
+#endif
+
 #define TEMPLATE_SPECIALIZATION                                                                                  \
     template <typename _operator_condition, typename _operator, typename _condition_state,                       \
         typename _condition_evaluator, typename _operator_id_type, bool _reverse_search, typename _operator_ptr, \
diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_state_manager.cpp b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_state_manager.cpp
index 43d28cdc50f..62586cecf3a 100644
--- a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_state_manager.cpp
+++ b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_state_manager.cpp
@@ -7,8 +7,8 @@
 #include "ai/monsters/control_movement_base.h"
 #include "ai/monsters/control_path_builder_base.h"
 
-#include "ai/monsters/states/monster_state_rest.h"
 #include "ai/monsters/states/monster_state_attack.h"
+#include "ai/monsters/states/monster_state_rest.h"
 #include "ai/monsters/states/monster_state_panic.h"
 #include "ai/monsters/states/monster_state_eat.h"
 #include "ai/monsters/states/monster_state_hear_int_sound.h"
diff --git a/src/xrGame/ai/monsters/dog/dog_state_manager.cpp b/src/xrGame/ai/monsters/dog/dog_state_manager.cpp
index 8a3b1114716..fb93a604020 100644
--- a/src/xrGame/ai/monsters/dog/dog_state_manager.cpp
+++ b/src/xrGame/ai/monsters/dog/dog_state_manager.cpp
@@ -5,10 +5,10 @@
 #include "ai/monsters/control_direction_base.h"
 #include "ai/monsters/control_movement_base.h"
 #include "ai/monsters/control_path_builder_base.h"
-#include "ai/monsters/states/monster_state_hitted.h"
 #include "ai/monsters/states/monster_state_controlled.h"
 #include "ai/monsters/states/monster_state_help_sound.h"
 #include "ai/monsters/states/monster_state_hear_int_sound.h"
+#include "ai/monsters/states/monster_state_hitted.h"
 #include "ai/monsters/group_states/group_state_attack.h"
 #include "ai/monsters/group_states/group_state_rest.h"
 #include "ai/monsters/group_states/group_state_eat.h"
diff --git a/src/xrGame/ai/monsters/states/monster_state_rest_idle_inline.h b/src/xrGame/ai/monsters/states/monster_state_rest_idle_inline.h
index 007fb654df7..a382d3dc05a 100644
--- a/src/xrGame/ai/monsters/states/monster_state_rest_idle_inline.h
+++ b/src/xrGame/ai/monsters/states/monster_state_rest_idle_inline.h
@@ -5,6 +5,8 @@
 #include "state_custom_action.h"
 #include "cover_point.h"
 #include "ai/monsters/monster_cover_manager.h"
+#include "ai/monsters/ai_monster_squad.h"
+#include "ai/monsters/ai_monster_squad_manager.h"
 
 #define TEMPLATE_SPECIALIZATION \
     template <typename _Object\
diff --git a/src/xrGame/aimers_base.h b/src/xrGame/aimers_base.h
index e4bc2d04fb5..bae0590e203 100644
--- a/src/xrGame/aimers_base.h
+++ b/src/xrGame/aimers_base.h
@@ -10,6 +10,7 @@
 #define AIMERS_BASE_H_INCLUDED
 
 #include "Include/xrRender/animation_motion.h"
+#include "animation_movement_controller.h"
 #include "Common/Noncopyable.hpp"
 
 class CGameObject;
diff --git a/src/xrGame/debug_text_tree.h b/src/xrGame/debug_text_tree.h
index fc7670785fa..88631bb74b7 100644
--- a/src/xrGame/debug_text_tree.h
+++ b/src/xrGame/debug_text_tree.h
@@ -9,6 +9,27 @@
 #ifndef AI_DEBUG_TEXT_TREE_H_INCLUDED
 #define AI_DEBUG_TEXT_TREE_H_INCLUDED
 
+IC xr_string __cdecl make_xrstr(pcstr format, ...)
+{
+    va_list args;
+    va_start(args, format);
+
+    char temp[4096];
+    vsprintf(temp, format, args);
+
+    va_end(args);
+    return xr_string(temp);
+}
+
+IC xr_string __cdecl make_xrstr(bool b) { return b ? "+" : "-"; }
+IC xr_string __cdecl make_xrstr(float f) { return make_xrstr("%f", f); }
+IC xr_string __cdecl make_xrstr(s32 d) { return make_xrstr("%i", d); }
+IC xr_string __cdecl make_xrstr(u32 d) { return make_xrstr("%u", d); }
+IC xr_string __cdecl make_xrstr(s64 d) { return make_xrstr("%i", d); }
+IC xr_string __cdecl make_xrstr(u64 d) { return make_xrstr("%u", d); }
+IC xr_string __cdecl make_xrstr(Fvector3 v) { return make_xrstr("[%f][%f][%f]", v.x, v.y, v.z); }
+IC xr_string __cdecl make_xrstr(const xr_string& s) { return s; }
+
 namespace debug
 {
 class text_tree
@@ -79,25 +100,4 @@ void log_text_tree(text_tree& tree);
 #include "debug_text_tree_inline.h"
 
 } // namespace debug
-
-IC xr_string __cdecl make_xrstr(pcstr format, ...)
-{
-    va_list args;
-    va_start(args, format);
-
-    char temp[4096];
-    vsprintf(temp, format, args);
-
-    va_end(args);
-    return xr_string(temp);
-}
-
-IC xr_string __cdecl make_xrstr(bool b) { return b ? "+" : "-"; }
-IC xr_string __cdecl make_xrstr(float f) { return make_xrstr("%f", f); }
-IC xr_string __cdecl make_xrstr(s32 d) { return make_xrstr("%i", d); }
-IC xr_string __cdecl make_xrstr(u32 d) { return make_xrstr("%u", d); }
-IC xr_string __cdecl make_xrstr(s64 d) { return make_xrstr("%i", d); }
-IC xr_string __cdecl make_xrstr(u64 d) { return make_xrstr("%u", d); }
-IC xr_string __cdecl make_xrstr(Fvector3 v) { return make_xrstr("[%f][%f][%f]", v.x, v.y, v.z); }
-IC xr_string __cdecl make_xrstr(const xr_string& s) { return s; }
 #endif // defined(AI_DEBUG_TEXT_TREE_H_INCLUDED)
diff --git a/src/xrGame/memory_manager.h b/src/xrGame/memory_manager.h
index eb0b08229d8..e19e5a7bef8 100644
--- a/src/xrGame/memory_manager.h
+++ b/src/xrGame/memory_manager.h
@@ -8,10 +8,11 @@
 
 #pragma once
 
+#include "enemy_manager.h"
+
 class CVisualMemoryManager;
 class CSoundMemoryManager;
 class CHitMemoryManager;
-class CEnemyManager;
 class CItemManager;
 class CDangerManager;
 class CCustomMonster;
diff --git a/src/xrGame/space_restriction_bridge.h b/src/xrGame/space_restriction_bridge.h
index d9ba55c6ee4..3294c966d40 100644
--- a/src/xrGame/space_restriction_bridge.h
+++ b/src/xrGame/space_restriction_bridge.h
@@ -9,8 +9,7 @@
 #pragma once
 
 #include "restriction_space.h"
-
-class CSpaceRestrictionBase;
+#include "space_restriction_base.h"
 
 class CSpaceRestrictionBridge : public RestrictionSpace::CTimeIntrusiveBase
 {
diff --git a/src/xrPhysics/ActorCameraCollision.cpp b/src/xrPhysics/ActorCameraCollision.cpp
index 40be6d19bff..cda06105bf5 100644
--- a/src/xrPhysics/ActorCameraCollision.cpp
+++ b/src/xrPhysics/ActorCameraCollision.cpp
@@ -5,13 +5,13 @@
 #include "xrEngine/CameraBase.h"
 #include "xrEngine/GameMtlLib.h"
 
-#include "PHWorld.h"
-#include "PHCollideValidator.h"
 #include "PHShell.h"
 #include "matrix_utils.h"
 #include "IPhysicsShellHolder.h"
 #include "xrEngine/xr_object.h" //--#SM+#--
 #include "GeometryBits.h"
+#include "PHWorld.h"
+#include "PHCollideValidator.h"
 
 #ifdef DEBUG
 #include "debug_output.h"
diff --git a/src/xrPhysics/PhysicsExternalCommon.h b/src/xrPhysics/PhysicsExternalCommon.h
index 6fff96bf9d4..adc423c0d13 100644
--- a/src/xrPhysics/PhysicsExternalCommon.h
+++ b/src/xrPhysics/PhysicsExternalCommon.h
@@ -5,6 +5,7 @@
 #include "xrPhysics/xrPhysics.h"
 #include "xrCore/_types.h"
 #include "xrCore/_matrix.h"
+#include "MathUtils.h"
 
 struct dContactGeom;
 struct dContact;