Merge branch 'cleanup_components_includes' into 'master'

Cleanup components includes

See merge request OpenMW/openmw!2287

apps/essimporter/importscpt.hpp

@@ -4,6 +4,7 @@
 #include "importscri.hpp"
 
 #include <components/esm3/loadscpt.hpp>
+#include <components/esm/esmcommon.hpp>
 
 namespace ESM
 {

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>

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

components/compiler/fileparser.hpp

@@ -4,7 +4,6 @@
 #include "parser.hpp"
 #include "scriptparser.hpp"
 #include "locals.hpp"
-#include "literals.hpp"
 
 namespace Compiler
 {

components/esm3/activespells.hpp

@@ -3,7 +3,6 @@
 
 #include "cellref.hpp"
 #include "components/esm/defs.hpp"
-#include "effectlist.hpp"
 
 #include <string>
 #include <vector>

components/esm3/animationstate.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 #include <vector>
-#include <stdint.h>
+#include <cstdint>
 
 namespace ESM
 {

components/esm3/loadcont.hpp

@@ -4,7 +4,6 @@
 #include <string>
 #include <vector>
 
-#include "components/esm/esmcommon.hpp"
 #include "components/esm/defs.hpp"
 
 namespace ESM

components/esm3/loadregn.hpp

@@ -5,7 +5,6 @@
 #include <vector>
 
 #include "components/esm/defs.hpp"
-#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {

components/esm3/loadscpt.hpp

@@ -5,7 +5,6 @@
 #include <vector>
 
 #include "components/esm/defs.hpp"
-#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {

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

components/fx/widgets.hpp

@@ -11,7 +11,6 @@
 
 #include <components/misc/strings/format.hpp>
 
-#include "technique.hpp"
 #include "types.hpp"
 
 namespace Gui

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>

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
 {

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
 {

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

components/nifosg/nifloader.hpp

@@ -8,8 +8,6 @@
 #include <osg/ref_ptr>
 #include <osg/Referenced>
 
-#include "controller.hpp"
-
 namespace osg
 {
     class Node;

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>

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

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;

components/terrain/material.hpp

@@ -3,8 +3,6 @@
 
 #include <osg/StateSet>
 
-#include "defs.hpp"
-
 namespace osg
 {
     class Texture2D;

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
 {

components/terrain/world.hpp

@@ -10,7 +10,6 @@
 
 #include <components/sceneutil/nodecallback.hpp>
 
-#include "defs.hpp"
 #include "cellborder.hpp"
 
 namespace osg

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>