From cc8c7002ea442a9086630800e73d0b16bf822742 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Mon, 15 Aug 2022 23:04:54 +0200
Subject: [PATCH] Cleanup components includes

---
 apps/essimporter/importscpt.hpp         |  1 +
 apps/openmw/mwgui/windowmanagerimp.cpp  |  1 +
 components/bullethelpers/aabb.hpp       |  1 +
 components/compiler/fileparser.hpp      |  1 -
 components/esm3/activespells.hpp        |  1 -
 components/esm3/animationstate.hpp      |  2 +-
 components/esm3/loadcont.hpp            |  1 -
 components/esm3/loadregn.hpp            |  1 -
 components/esm3/loadscpt.hpp            |  1 -
 components/fx/types.hpp                 |  2 --
 components/fx/widgets.hpp               |  1 -
 components/lua_ui/properties.hpp        |  1 +
 components/misc/budgetmeasurement.hpp   |  2 ++
 components/nif/data.hpp                 |  3 +--
 components/nif/physics.hpp              | 13 ++++++++++++-
 components/nifosg/nifloader.hpp         |  2 --
 components/resource/scenemanager.cpp    |  2 ++
 components/sceneutil/osgacontroller.hpp |  6 +++---
 components/stereo/stereomanager.hpp     |  3 ++-
 components/terrain/material.hpp         |  2 --
 components/terrain/view.hpp             |  2 --
 components/terrain/world.hpp            |  1 -
 components/widgets/fontwrapper.hpp      |  4 ++--
 23 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/apps/essimporter/importscpt.hpp b/apps/essimporter/importscpt.hpp
index 15f4fde598..78c6baebe4 100644
--- a/apps/essimporter/importscpt.hpp
+++ b/apps/essimporter/importscpt.hpp
@@ -4,6 +4,7 @@
 #include "importscri.hpp"
 
 #include <components/esm3/loadscpt.hpp>
+#include <components/esm/esmcommon.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index f8adeabffe..42e2cc54d7 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -48,6 +48,7 @@
 #include <components/vfs/manager.hpp>
 
 #include <components/widgets/tags.hpp>
+#include <components/widgets/widgets.hpp>
 
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/frameratelimiter.hpp>
diff --git a/components/bullethelpers/aabb.hpp b/components/bullethelpers/aabb.hpp
index bfa1dd6e4e..c961c1d49a 100644
--- a/components/bullethelpers/aabb.hpp
+++ b/components/bullethelpers/aabb.hpp
@@ -3,6 +3,7 @@
 
 #include <LinearMath/btTransform.h>
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
+#include <BulletCollision/Gimpact/btBoxCollision.h>
 
 inline bool operator==(const btAABB& lhs, const btAABB& rhs)
 {
diff --git a/components/compiler/fileparser.hpp b/components/compiler/fileparser.hpp
index b08ec9cdd3..fa91dc631f 100644
--- a/components/compiler/fileparser.hpp
+++ b/components/compiler/fileparser.hpp
@@ -4,7 +4,6 @@
 #include "parser.hpp"
 #include "scriptparser.hpp"
 #include "locals.hpp"
-#include "literals.hpp"
 
 namespace Compiler
 {
diff --git a/components/esm3/activespells.hpp b/components/esm3/activespells.hpp
index 91b3f495f5..80544b4dbb 100644
--- a/components/esm3/activespells.hpp
+++ b/components/esm3/activespells.hpp
@@ -3,7 +3,6 @@
 
 #include "cellref.hpp"
 #include "components/esm/defs.hpp"
-#include "effectlist.hpp"
 
 #include <string>
 #include <vector>
diff --git a/components/esm3/animationstate.hpp b/components/esm3/animationstate.hpp
index 2a19eff63a..144fabdbf0 100644
--- a/components/esm3/animationstate.hpp
+++ b/components/esm3/animationstate.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <vector>
-#include <stdint.h>
+#include <cstdint>
 
 namespace ESM
 {
diff --git a/components/esm3/loadcont.hpp b/components/esm3/loadcont.hpp
index 0a28a89015..afef72ea80 100644
--- a/components/esm3/loadcont.hpp
+++ b/components/esm3/loadcont.hpp
@@ -4,7 +4,6 @@
 #include <string>
 #include <vector>
 
-#include "components/esm/esmcommon.hpp"
 #include "components/esm/defs.hpp"
 
 namespace ESM
diff --git a/components/esm3/loadregn.hpp b/components/esm3/loadregn.hpp
index 555b5e1b8d..1a771f28e5 100644
--- a/components/esm3/loadregn.hpp
+++ b/components/esm3/loadregn.hpp
@@ -5,7 +5,6 @@
 #include <vector>
 
 #include "components/esm/defs.hpp"
-#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm3/loadscpt.hpp b/components/esm3/loadscpt.hpp
index fdb31ad6a4..b93e0eeb96 100644
--- a/components/esm3/loadscpt.hpp
+++ b/components/esm3/loadscpt.hpp
@@ -5,7 +5,6 @@
 #include <vector>
 
 #include "components/esm/defs.hpp"
-#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/fx/types.hpp b/components/fx/types.hpp
index 16f73115ff..18d730bc98 100644
--- a/components/fx/types.hpp
+++ b/components/fx/types.hpp
@@ -18,8 +18,6 @@
 #include <components/misc/strings/format.hpp>
 #include <components/debug/debuglog.hpp>
 
-#include "pass.hpp"
-
 namespace fx
 {
     namespace Types
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index 23b578ad27..2d80bc71d4 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -11,7 +11,6 @@
 
 #include <components/misc/strings/format.hpp>
 
-#include "technique.hpp"
 #include "types.hpp"
 
 namespace Gui
diff --git a/components/lua_ui/properties.hpp b/components/lua_ui/properties.hpp
index ade25156e3..56dcfa0cf9 100644
--- a/components/lua_ui/properties.hpp
+++ b/components/lua_ui/properties.hpp
@@ -3,6 +3,7 @@
 
 #include <sol/sol.hpp>
 #include <MyGUI_Types.h>
+#include <MyGUI_Colour.h>
 #include <osg/Vec2>
 
 #include <components/lua/luastate.hpp>
diff --git a/components/misc/budgetmeasurement.hpp b/components/misc/budgetmeasurement.hpp
index 3d56477af1..d9ac866975 100644
--- a/components/misc/budgetmeasurement.hpp
+++ b/components/misc/budgetmeasurement.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_COMPONENTS_MISC_BUDGETMEASUREMENT_H
 #define OPENMW_COMPONENTS_MISC_BUDGETMEASUREMENT_H
 
+#include <array>
+#include <cstddef>
 
 namespace Misc
 {
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index f220aae373..73ac0e51d0 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -24,10 +24,9 @@
 #ifndef OPENMW_COMPONENTS_NIF_DATA_HPP
 #define OPENMW_COMPONENTS_NIF_DATA_HPP
 
-#include "base.hpp"
-
 #include "nifkey.hpp"
 #include "niftypes.hpp" // Transformation
+#include "recordptr.hpp"
 
 namespace Nif
 {
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index 613ec0ba43..d5e8564043 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -1,13 +1,24 @@
 #ifndef OPENMW_COMPONENTS_NIF_PHYSICS_HPP
 #define OPENMW_COMPONENTS_NIF_PHYSICS_HPP
 
-#include "base.hpp"
+#include "record.hpp"
+#include "recordptr.hpp"
+
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+#include <osg/Quat>
+
+#include <cstdint>
+#include <vector>
 
 // This header contains certain record definitions
 // specific to Bethesda implementation of Havok physics
 namespace Nif
 {
 
+class NIFStream;
+class NIFFile;
+
 /// Non-record data types
 
 struct bhkWorldObjCInfoProperty
diff --git a/components/nifosg/nifloader.hpp b/components/nifosg/nifloader.hpp
index 8ee6b41674..ddee8031a9 100644
--- a/components/nifosg/nifloader.hpp
+++ b/components/nifosg/nifloader.hpp
@@ -8,8 +8,6 @@
 #include <osg/ref_ptr>
 #include <osg/Referenced>
 
-#include "controller.hpp"
-
 namespace osg
 {
     class Node;
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 1a00e18760..bbbdde68d7 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -21,6 +21,8 @@
 #include <components/debug/debuglog.hpp>
 
 #include <components/nifosg/nifloader.hpp>
+#include <components/nifosg/controller.hpp>
+
 #include <components/nif/niffile.hpp>
 
 #include <components/misc/pathhelpers.hpp>
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index e9ffe2676f..07bf0d68a7 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -6,9 +6,9 @@
 #include <osg/ref_ptr>
 #include <osgAnimation/UpdateMatrixTransform>
 
-#include <components/sceneutil/controller.hpp>
-#include <components/sceneutil/nodecallback.hpp>
-#include <components/sceneutil/keyframe.hpp>
+#include "nodecallback.hpp"
+#include "keyframe.hpp"
+
 #include <components/resource/animation.hpp>
 
 namespace SceneUtil
diff --git a/components/stereo/stereomanager.hpp b/components/stereo/stereomanager.hpp
index 6a873e00f3..815f55f156 100644
--- a/components/stereo/stereomanager.hpp
+++ b/components/stereo/stereomanager.hpp
@@ -10,9 +10,10 @@
 #include <memory>
 #include <array>
 
-#include <components/stereo/types.hpp>
 #include <components/shader/shadermanager.hpp>
 
+#include "types.hpp"
+
 namespace osg
 {
     class FrameBufferObject;
diff --git a/components/terrain/material.hpp b/components/terrain/material.hpp
index d5ef40a29e..975bff2533 100644
--- a/components/terrain/material.hpp
+++ b/components/terrain/material.hpp
@@ -3,8 +3,6 @@
 
 #include <osg/StateSet>
 
-#include "defs.hpp"
-
 namespace osg
 {
     class Texture2D;
diff --git a/components/terrain/view.hpp b/components/terrain/view.hpp
index 1ce0876603..8017e25afd 100644
--- a/components/terrain/view.hpp
+++ b/components/terrain/view.hpp
@@ -1,9 +1,7 @@
 #ifndef COMPONENTS_TERRAIN_VIEW_H
 #define COMPONENTS_TERRAIN_VIEW_H
 
-#include <osg/ref_ptr>
 #include <osg/Referenced>
-#include <osg/Vec3f>
 
 namespace Terrain
 {
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index 85114c32d2..09e8adaef0 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -10,7 +10,6 @@
 
 #include <components/sceneutil/nodecallback.hpp>
 
-#include "defs.hpp"
 #include "cellborder.hpp"
 
 namespace osg
diff --git a/components/widgets/fontwrapper.hpp b/components/widgets/fontwrapper.hpp
index 16ebba3587..122cf20257 100644
--- a/components/widgets/fontwrapper.hpp
+++ b/components/widgets/fontwrapper.hpp
@@ -1,10 +1,10 @@
 #ifndef OPENMW_WIDGETS_WRAPPER_H
 #define OPENMW_WIDGETS_WRAPPER_H
 
-#include "widgets.hpp"
-
 #include <components/settings/settings.hpp>
 
+#include <algorithm>
+
 namespace Gui
 {
     template<class T>