Merge branch 'iwyu' into 'master'

First pass with include-what-you-use

See merge request OpenMW/openmw!2450

apps/esmtool/esmtool.cpp

@@ -3,7 +3,6 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <list>
 #include <map>
 #include <memory>
 #include <optional>

apps/opencs/editor.cpp

@@ -9,14 +9,15 @@
 
 #include <components/debug/debugging.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
-#include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 #include <components/misc/rng.hpp>
-#include <components/misc/strings/conversion.hpp>
 #include <components/nifosg/nifloader.hpp>
 #include <components/settings/settings.hpp>
 
+#include "view/doc/viewmanager.hpp"
+
 #include "model/doc/document.hpp"
 
 #ifdef _WIN32

apps/opencs/editor.hpp

@@ -6,8 +6,6 @@
 #include <boost/interprocess/sync/file_lock.hpp>
 #include <boost/program_options/variables_map.hpp>
 
-#include <QLocalServer>
-#include <QLocalSocket>
 #include <QObject>
 #include <QString>
 
@@ -24,17 +22,24 @@
 #include "view/doc/filedialog.hpp"
 #include "view/doc/newgame.hpp"
 #include "view/doc/startup.hpp"
-#include "view/doc/viewmanager.hpp"
 
 #include "view/prefs/dialogue.hpp"
 
 #include "view/tools/merge.hpp"
 
+class QLocalServer;
+class QLocalSocket;
+
 namespace CSMDoc
 {
     class Document;
 }
 
+namespace CSVDoc
+{
+    class ViewManager;
+}
+
 namespace CS
 {
     class Editor : public QObject

apps/opencs/model/doc/document.cpp

@@ -2,7 +2,6 @@
 
 #include "state.hpp"
 
-#include <cassert>
 #include <filesystem>
 #include <memory>
 #include <utility>

apps/opencs/model/doc/document.hpp

@@ -19,16 +19,12 @@
 #include "runner.hpp"
 #include "saving.hpp"
 
-class QAbstractItemModel;
+class QTextDocument;
 
-namespace Fallback
+namespace CSMTools
 {
-    class Map;
+    class ReportModel;
-}
+    class Search;
-
-namespace VFS
-{
-    class Manager;
 }
 
 namespace ESM
@@ -43,13 +39,9 @@ namespace Files
     struct ConfigurationManager;
 }
 
-namespace CSMWorld
-{
-    class ResourcesManager;
-}
-
 namespace CSMDoc
 {
+    struct Message;
     class Document : public QObject
     {
         Q_OBJECT

apps/opencs/model/doc/documentmanager.hpp

@@ -7,17 +7,11 @@
 #include <QObject>
 #include <QThread>
 
-#include <components/fallback/fallback.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>
 
 #include "loader.hpp"
 
-namespace VFS
-{
-    class Manager;
-}
-
 namespace Files
 {
     struct ConfigurationManager;

apps/opencs/model/doc/loader.cpp

@@ -2,7 +2,7 @@
 
 #include <components/files/conversion.hpp>
 
-#include <iostream>
+#include <QTimer>
 
 #include "../tools/reportmodel.hpp"
 

apps/opencs/model/doc/loader.hpp

@@ -5,9 +5,10 @@
 
 #include <QMutex>
 #include <QObject>
-#include <QTimer>
 #include <QWaitCondition>
 
+class QTimer;
+
 namespace CSMDoc
 {
     class Document;

apps/opencs/model/doc/operation.cpp

@@ -1,6 +1,5 @@
 #include "operation.hpp"
 
-#include <string>
 #include <vector>
 
 #include <QTimer>

apps/opencs/model/doc/operation.hpp

@@ -1,18 +1,13 @@
 #ifndef CSM_DOC_OPERATION_H
 #define CSM_DOC_OPERATION_H
 
-#include <map>
 #include <vector>
 
 #include <QObject>
-#include <QTimer>
 
 #include "messages.hpp"
 
-namespace CSMWorld
+class QTimer;
-{
-    class UniversalId;
-}
 
 namespace CSMDoc
 {

apps/opencs/model/doc/operationholder.hpp

@@ -6,11 +6,6 @@
 
 #include "messages.hpp"
 
-namespace CSMWorld
-{
-    class UniversalId;
-}
-
 namespace CSMDoc
 {
     class Operation;

apps/opencs/model/doc/runner.cpp

@@ -2,8 +2,11 @@
 
 #include <utility>
 
+#if defined(Q_OS_MAC)
 #include <QCoreApplication>
 #include <QDir>
+#endif
+
 #include <QTemporaryFile>
 #include <QTextStream>
 

apps/opencs/model/doc/runner.hpp

@@ -62,8 +62,6 @@ namespace CSMDoc
         void readyReadStandardOutput();
     };
 
-    class Operation;
-
     /// \brief Watch for end of save operation and restart or stop runner
     class SaveWatcher : public QObject
     {

apps/opencs/model/doc/stage.hpp

@@ -1,9 +1,6 @@
 #ifndef CSM_DOC_STAGE_H
 #define CSM_DOC_STAGE_H
 
-#include <string>
-#include <vector>
-
 #include "messages.hpp"
 
 class QString;

apps/opencs/model/filter/leafnode.hpp

@@ -1,7 +1,7 @@
 #ifndef CSM_FILTER_LEAFNODE_H
 #define CSM_FILTER_LEAFNODE_H
 
-#include <memory>
+#include <vector>
 
 #include "node.hpp"
 

apps/opencs/model/filter/parser.hpp

@@ -1,7 +1,16 @@
 #ifndef CSM_FILTER_PARSER_H
 #define CSM_FILTER_PARSER_H
 
-#include "node.hpp"
+#include <memory>
+#include <string>
+namespace CSMFilter
+{
+    class Node;
+}
+namespace CSMFilter
+{
+    struct Token;
+}
 
 namespace CSMWorld
 {

apps/opencs/model/prefs/modifiersetting.cpp

@@ -5,13 +5,15 @@
 #include <QLabel>
 #include <QMouseEvent>
 #include <QPushButton>
-#include <QWidget>
 
 #include <components/settings/settings.hpp>
 
 #include "shortcutmanager.hpp"
 #include "state.hpp"
 
+class QObject;
+class QWidget;
+
 namespace CSMPrefs
 {
     ModifierSetting::ModifierSetting(Category* parent, QMutex* mutex, const std::string& key, const std::string& label)

apps/opencs/model/prefs/modifiersetting.hpp

@@ -1,15 +1,17 @@
 #ifndef CSM_PREFS_MODIFIERSETTING_H
 #define CSM_PREFS_MODIFIERSETTING_H
 
-#include <QKeySequence>
-
 #include "setting.hpp"
 
+class QMutex;
+class QObject;
+class QWidget;
 class QEvent;
 class QPushButton;
 
 namespace CSMPrefs
 {
+    class Category;
     class ModifierSetting : public Setting
     {
         Q_OBJECT

apps/opencs/model/prefs/state.cpp

@@ -1,7 +1,6 @@
 
 #include "state.hpp"
 
-#include <algorithm>
 #include <sstream>
 #include <stdexcept>
 
@@ -13,6 +12,7 @@
 #include "intsetting.hpp"
 #include "modifiersetting.hpp"
 #include "shortcutsetting.hpp"
+#include "stringsetting.hpp"
 
 CSMPrefs::State* CSMPrefs::State::sThis = nullptr;
 

apps/opencs/model/prefs/state.hpp

@@ -13,9 +13,7 @@
 
 #include "category.hpp"
 #include "enumsetting.hpp"
-#include "setting.hpp"
 #include "shortcutmanager.hpp"
-#include "stringsetting.hpp"
 
 class QColor;
 
@@ -27,6 +25,8 @@ namespace CSMPrefs
     class ColourSetting;
     class ShortcutSetting;
     class ModifierSetting;
+    class Setting;
+    class StringSetting;
 
     /// \brief User settings state
     ///

apps/opencs/view/filter/editwidget.hpp

@@ -4,7 +4,6 @@
 #include <QLineEdit>
 #include <QPalette>
 
-#include "../../model/filter/node.hpp"
 #include "../../model/filter/parser.hpp"
 
 class QModelIndex;

apps/opencs/view/filter/filterbox.hpp

@@ -5,12 +5,14 @@
 
 #include <QWidget>
 
-#include "../../model/filter/node.hpp"
+namespace CSMFilter
-#include "../../model/world/universalid.hpp"
+{
-
+    class Node;
+}
 namespace CSMWorld
 {
     class Data;
+    class UniversalId;
 }
 
 namespace CSVFilter

apps/opencs/view/filter/recordfilterbox.hpp

@@ -3,7 +3,10 @@
 
 #include <QWidget>
 
-#include "../../model/filter/node.hpp"
+namespace CSMFilter
+{
+    class Node;
+}
 
 namespace CSMWorld
 {

apps/opencs/view/prefs/dialogue.hpp

@@ -4,7 +4,6 @@
 #include <QMainWindow>
 
 class QSplitter;
-class QListWidget;
 class QStackedWidget;
 class QListWidgetItem;
 

apps/opencs/view/render/cell.cpp

@@ -1,8 +1,17 @@
 #include "cell.hpp"
 
-#include <osg/Group>
+#include <set>
-#include <osg/PositionAttitudeTransform>
+#include <type_traits>
+#include <utility>
 
+#include <osg/Callback>
+#include <osg/Group>
+#include <osg/Node>
+#include <osg/NodeVisitor>
+#include <osg/PositionAttitudeTransform>
+#include <osg/Referenced>
+
+#include <components/esm/defs.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadland.hpp>
 #include <components/misc/strings/lower.hpp>
@@ -20,6 +29,18 @@
 #include "pathgrid.hpp"
 #include "terrainstorage.hpp"
 
+#include <apps/opencs/model/world/cell.hpp>
+#include <apps/opencs/model/world/cellcoordinates.hpp>
+#include <apps/opencs/model/world/columns.hpp>
+#include <apps/opencs/model/world/data.hpp>
+#include <apps/opencs/model/world/idcollection.hpp>
+#include <apps/opencs/model/world/land.hpp>
+#include <apps/opencs/model/world/record.hpp>
+#include <apps/opencs/model/world/ref.hpp>
+#include <apps/opencs/model/world/refcollection.hpp>
+#include <apps/opencs/model/world/universalid.hpp>
+#include <apps/opencs/view/render/tagbase.hpp>
+
 namespace CSVRender
 {
     class CellNodeContainer : public osg::Referenced

apps/opencs/view/render/pathgrid.cpp

@@ -6,7 +6,6 @@
 #include <osg/Geometry>
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Vec3>
 
 #include <components/sceneutil/pathgridutil.hpp>
 

apps/opencs/view/render/terrainstorage.cpp

@@ -2,6 +2,21 @@
 
 #include <components/esm3terrain/storage.hpp>
 
+#include <algorithm>
+#include <apps/opencs/model/world/data.hpp>
+#include <apps/opencs/model/world/idcollection.hpp>
+#include <apps/opencs/model/world/land.hpp>
+#include <apps/opencs/model/world/landtexture.hpp>
+#include <apps/opencs/model/world/record.hpp>
+#include <components/resource/resourcesystem.hpp>
+#include <iterator>
+#include <math.h>
+#include <memory>
+#include <osg/Vec4ub>
+#include <stdexcept>
+#include <stdlib.h>
+#include <string>
+
 namespace CSVRender
 {
     TerrainStorage::TerrainStorage(const CSMWorld::Data& data)

apps/opencs/view/render/terrainstorage.hpp

@@ -3,9 +3,19 @@
 
 #include <array>
 
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadltex.hpp>
 #include <components/esm3terrain/storage.hpp>
+#include <osg/ref_ptr>
 
-#include "../../model/world/data.hpp"
+namespace CSMWorld
+{
+    class Data;
+}
+namespace osg
+{
+    class Vec4ub;
+}
 
 namespace CSVRender
 {

apps/opencs/view/tools/merge.cpp

@@ -9,7 +9,6 @@
 #include <QSplitter>
 #include <QVBoxLayout>
 
-#include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 
 #include "../../model/doc/document.hpp"

apps/opencs/view/tools/reportsubview.hpp

@@ -2,9 +2,9 @@
 #define CSV_TOOLS_REPORTSUBVIEW_H
 
 #include "../doc/subview.hpp"
+#include <apps/opencs/model/world/universalid.hpp>
 
-class QTableView;
+class QObject;
-class QModelIndex;
 
 namespace CSMDoc
 {

apps/opencs/view/tools/searchsubview.hpp

@@ -7,9 +7,6 @@
 
 #include "searchbox.hpp"
 
-class QTableView;
-class QModelIndex;
-
 namespace CSMDoc
 {
     class Document;

apps/opencs/view/world/creator.cpp

@@ -1,5 +1,7 @@
 #include "creator.hpp"
 
+#include <MyGUI_TextIterator.h>
+
 #include <stdexcept>
 
 CSVWorld::Creator::~Creator() {}

apps/openmw/mwclass/creature.cpp

@@ -1,6 +1,7 @@
 #include "creature.hpp"
 
-#include <components/debug/debuglog.hpp>
+#include <MyGUI_TextIterator.h>
+
 #include <components/esm3/creaturestate.hpp>
 #include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadcrea.hpp>

apps/openmw/mwclass/creature.hpp

@@ -1,8 +1,6 @@
 #ifndef GAME_MWCLASS_CREATURE_H
 #define GAME_MWCLASS_CREATURE_H
 
-#include <MyGUI_TextIterator.h>
-
 #include "../mwworld/registeredclass.hpp"
 
 #include "actor.hpp"

apps/openmw/mwgui/postprocessorhud.cpp

@@ -1,9 +1,20 @@
 #include "postprocessorhud.hpp"
 
+#include <MyGUI_Align.h>
 #include <MyGUI_Button.h>
+#include <MyGUI_Delegate.h>
+#include <MyGUI_EditBox.h>
+#include <MyGUI_EventPair.h>
 #include <MyGUI_FactoryManager.h>
+#include <MyGUI_Gui.h>
+#include <MyGUI_InputManager.h>
+#include <MyGUI_Macros.h>
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_TabItem.h>
+#include <MyGUI_UString.h>
+#include <MyGUI_Widget.h>
+#include <MyGUI_WidgetDefines.h>
+#include <MyGUI_WidgetInput.h>
 #include <MyGUI_Window.h>
 
 #include <components/fx/technique.hpp>

apps/openmw/mwphysics/actor.cpp

@@ -1,6 +1,5 @@
 #include "actor.hpp"
 
-#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btCylinderShape.h>
 
 #include <components/debug/debuglog.hpp>

apps/openmw/mwphysics/actor.hpp

@@ -8,12 +8,10 @@
 
 #include <components/detournavigator/collisionshapetype.hpp>
 
-#include <LinearMath/btTransform.h>
 #include <osg/Quat>
 #include <osg/Vec3f>
 
 class btCollisionShape;
-class btCollisionObject;
 class btCollisionWorld;
 class btConvexShape;
 

apps/openmw/mwphysics/movementsolver.cpp

@@ -2,7 +2,6 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
-#include <BulletCollision/CollisionShapes/btCollisionShape.h>
 #include <BulletCollision/CollisionShapes/btConvexShape.h>
 
 #include <components/esm3/loadgmst.hpp>
@@ -11,9 +10,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/refdata.hpp"
 
 #include "actor.hpp"
 #include "collisiontype.hpp"

apps/openmw/mwphysics/movementsolver.hpp

@@ -5,8 +5,6 @@
 
 #include <components/misc/constants.hpp>
 
-#include "../mwworld/ptr.hpp"
-
 class btCollisionWorld;
 
 namespace MWWorld

apps/openmw/mwphysics/mtphysics.cpp

@@ -17,7 +17,6 @@
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/movement.hpp"
 
 #include "../mwrender/bulletdebugdraw.hpp"
 

apps/openmw/mwphysics/mtphysics.hpp

@@ -7,7 +7,6 @@
 #include <shared_mutex>
 #include <thread>
 #include <unordered_set>
-#include <variant>
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 

apps/openmw/mwphysics/object.hpp

@@ -7,7 +7,6 @@
 #include <osg/Node>
 
 #include <map>
-#include <memory>
 #include <mutex>
 
 namespace Resource
@@ -15,9 +14,6 @@ namespace Resource
     class BulletShapeInstance;
 }
 
-class btCollisionObject;
-class btVector3;
-
 namespace MWPhysics
 {
     class PhysicsTaskScheduler;

apps/openmw/mwphysics/physicssystem.hpp

@@ -1,7 +1,6 @@
 #ifndef OPENMW_MWPHYSICS_PHYSICSSYSTEM_H
 #define OPENMW_MWPHYSICS_PHYSICSSYSTEM_H
 
-#include <algorithm>
 #include <array>
 #include <functional>
 #include <map>

apps/openmw/mwphysics/projectile.cpp

@@ -4,8 +4,6 @@
 
 #include <components/misc/convert.hpp>
 
-#include "../mwworld/class.hpp"
-
 #include "actor.hpp"
 #include "collisiontype.hpp"
 #include "mtphysics.hpp"

apps/openmw/mwphysics/projectile.hpp

@@ -18,11 +18,6 @@ namespace osg
     class Vec3f;
 }
 
-namespace Resource
-{
-    struct BulletShape;
-}
-
 namespace MWPhysics
 {
     class PhysicsTaskScheduler;

apps/openmw/mwphysics/projectileconvexcallback.cpp

@@ -1,12 +1,8 @@
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 
-#include "../mwworld/class.hpp"
-
-#include "actor.hpp"
 #include "collisiontype.hpp"
 #include "projectile.hpp"
 #include "projectileconvexcallback.hpp"
-#include "ptrholder.hpp"
 
 namespace MWPhysics
 {

apps/wizard/componentselectionpage.cpp

@@ -1,6 +1,5 @@
 #include "componentselectionpage.hpp"
 
-#include <QDebug>
 #include <QMessageBox>
 #include <QPushButton>
 
@@ -128,8 +127,6 @@ bool Wizard::ComponentSelectionPage::validatePage()
     QStringList components(field(QLatin1String("installation.components")).toStringList());
     QString path(field(QLatin1String("installation.path")).toString());
 
-    //    qDebug() << components << path << mWizard->mInstallations[path];
-
     if (field(QLatin1String("installation.retailDisc")).toBool() == false)
     {
         if (components.contains(QLatin1String("Tribunal")) && !components.contains(QLatin1String("Bloodmoon")))

apps/wizard/existinginstallationpage.hpp

@@ -3,8 +3,6 @@
 
 #include "ui_existinginstallationpage.h"
 
-#include <components/config/gamesettings.hpp>
-
 namespace Wizard
 {
     class MainWizard;

apps/wizard/installationpage.hpp

@@ -5,18 +5,21 @@
 
 #include <QWizardPage>
 
-#include "inisettings.hpp"
 #include "ui_installationpage.h"
 #include "unshield/unshieldworker.hpp"
-#include <components/config/gamesettings.hpp>
+
+namespace Config
+{
+    class GameSettings;
+}
 
 class QThread;
+class QObject;
+class QWidget;
 
 namespace Wizard
 {
     class MainWizard;
-    class IniSettings;
-    class UnshieldWorker;
 
     class InstallationPage : public QWizardPage, private Ui::InstallationPage
     {

apps/wizard/languageselectionpage.cpp

@@ -2,8 +2,6 @@
 
 #include "mainwizard.hpp"
 
-#include <QDebug>
-
 Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent)
     : QWizardPage(parent)
 {

apps/wizard/mainwizard.cpp

@@ -6,7 +6,6 @@
 #include <QMessageBox>
 #include <QTextCodec>
 
-#include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 
 #include "componentselectionpage.hpp"

apps/wizard/unshield/unshieldworker.hpp

@@ -10,8 +10,6 @@
 
 #include "../inisettings.hpp"
 
-#include <components/config/gamesettings.hpp>
-
 namespace Wizard
 {
     enum Component

apps/wizard/utils/componentlistwidget.cpp

@@ -1,7 +1,5 @@
 #include "componentlistwidget.hpp"
 
-#include <QDebug>
-
 ComponentListWidget::ComponentListWidget(QWidget* parent)
     : QListWidget(parent)
 {

components/bsa/compressedbsafile.cpp

@@ -27,7 +27,6 @@
 #include <cassert>
 #include <filesystem>
 #include <fstream>
-#include <stdexcept>
 
 #include <lz4frame.h>
 

components/esm/common.cpp

@@ -1,4 +1,5 @@
-#include "sstream"
+#include <cstdint>
+#include <string>
 
 namespace ESM
 {

components/fx/lexer.cpp

@@ -1,20 +1,14 @@
 #include "lexer.hpp"
 
-#include <array>
+#include <cctype>
-#include <cmath>
+#include <cstdlib>
-#include <cstdint>
-#include <exception>
 #include <optional>
 #include <string>
 #include <string_view>
-#include <variant>
 
+#include <components/fx/lexer_types.hpp>
 #include <components/misc/strings/format.hpp>
 
-#include <components/debug/debuglog.hpp>
-
-#include "types.hpp"
-
 namespace fx
 {
     namespace Lexer

components/fx/lexer.hpp

@@ -1,16 +1,11 @@
 #ifndef OPENMW_COMPONENTS_FX_LEXER_H
 #define OPENMW_COMPONENTS_FX_LEXER_H
 
-#include <cstdint>
+#include <cstddef>
 #include <optional>
 #include <stdexcept>
 #include <string>
 #include <string_view>
-#include <variant>
-
-#include <osg/Vec2f>
-#include <osg/Vec3f>
-#include <osg/Vec4f>
 
 #include "lexer_types.hpp"
 

components/fx/pass.hpp

@@ -2,18 +2,21 @@
 #define OPENMW_COMPONENTS_FX_PASS_H
 
 #include <array>
-#include <cstdint>
 #include <optional>
 #include <string>
+#include <string_view>
 #include <unordered_set>
 
 #include <osg/BlendEquation>
 #include <osg/BlendFunc>
-#include <osg/Program>
 #include <osg/Shader>
-#include <osg/State>
+#include <osg/Vec4f>
-#include <osg/Texture2D>
+#include <osg/ref_ptr>
-#include <osg/Timer>
+
+namespace osg
+{
+    class StateSet;
+}
 
 namespace fx
 {

components/fx/technique.cpp

@@ -4,7 +4,6 @@
 #include <string>
 #include <utility>
 
-#include <osg/CullStack>
 #include <osg/Texture1D>
 #include <osg/Texture2D>
 #include <osg/Texture3D>
@@ -15,7 +14,6 @@
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/resource/imagemanager.hpp>
-#include <components/sceneutil/util.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/vfs/manager.hpp>
 

components/fx/technique.hpp

@@ -5,20 +5,13 @@
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <variant>
 #include <vector>
 
 #include <osg/BlendEquation>
 #include <osg/BlendFunc>
 #include <osg/FrameBufferObject>
-#include <osg/Node>
-#include <osg/Program>
-#include <osg/Shader>
 #include <osg/StateSet>
 #include <osg/Texture2D>
-#include <osg/Vec2f>
-#include <osg/Vec3f>
-#include <osg/Vec4f>
 
 #include "lexer.hpp"
 #include "pass.hpp"

components/fx/widgets.hpp

@@ -2,15 +2,24 @@
 #define OPENMW_COMPONENTS_FX_WIDGETS_H
 
 #include <MyGUI_Button.h>
-#include <MyGUI_Gui.h>
+#include <MyGUI_Delegate.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_MouseButton.h>
+#include <MyGUI_RTTI.h>
+#include <MyGUI_TextBox.h>
+#include <MyGUI_Widget.h>
+
+#include <algorithm>
+#include <components/fx/widgets.hpp>
+#include <components/misc/strings/format.hpp>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include <osg/Vec2f>
 #include <osg/Vec3f>
 #include <osg/Vec4f>
 
-#include <components/misc/strings/format.hpp>
-
 #include "types.hpp"
 
 namespace Gui

components/nif/niffile.cpp

@@ -1,7 +1,6 @@
 #include "niffile.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/files/conversion.hpp>
 #include <components/files/hash.hpp>
 
 #include <algorithm>

components/nif/node.cpp

@@ -1,6 +1,6 @@
 #include "node.hpp"
 
-#include <components/misc/algorithm.hpp>
+#include <components/misc/strings/algorithm.hpp>
 
 #include "data.hpp"
 #include "exception.hpp"

components/nif/physics.hpp

@@ -17,7 +17,7 @@ namespace Nif
 {
 
     class NIFStream;
-    struct NIFFile;
+    class Reader;
 
     /// Non-record data types
 

components/nifosg/nifloader.hpp

@@ -2,12 +2,14 @@
 #define OPENMW_COMPONENTS_NIFOSG_LOADER
 
 #include <components/nif/niffile.hpp>
-#include <components/sceneutil/keyframe.hpp>
-#include <components/sceneutil/textkeymap.hpp>
 
-#include <osg/Referenced>
 #include <osg/ref_ptr>
 
+namespace SceneUtil
+{
+    class KeyframeHolder;
+}
+
 namespace osg
 {
     class Node;

components/resource/scenemanager.hpp

@@ -1,13 +1,10 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_SCENEMANAGER_H
 #define OPENMW_COMPONENTS_RESOURCE_SCENEMANAGER_H
 
-#include <map>
 #include <memory>
 #include <mutex>
 #include <string>
 
-#include <osg/Node>
-#include <osg/Texture2D>
 #include <osg/Texture>
 #include <osg/ref_ptr>
 
@@ -16,6 +13,20 @@
 #include <components/sceneutil/lightmanager.hpp>
 #include <filesystem>
 
+namespace VFS
+{
+    class Manager;
+}
+
+namespace osg
+{
+    class Group;
+    class Node;
+    class Program;
+    class State;
+    class Stats;
+}
+
 namespace Resource
 {
     class ImageManager;
@@ -28,11 +39,6 @@ namespace osgUtil
     class IncrementalCompileOperation;
 }
 
-namespace osgDB
-{
-    class SharedStateManager;
-}
-
 namespace Shader
 {
     class ShaderManager;

components/sceneutil/color.cpp

@@ -3,11 +3,6 @@
 #include <algorithm>
 #include <array>
 
-#include <SDL_opengl_glext.h>
-
-#include <components/debug/debuglog.hpp>
-#include <components/settings/settings.hpp>
-
 namespace SceneUtil
 {
 

components/sceneutil/extradata.hpp

@@ -1,10 +1,7 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_EXTRADATA_H
 #define OPENMW_COMPONENTS_RESOURCE_EXTRADATA_H
 
-#include <array>
-
 #include <osg/NodeVisitor>
-#include <osg/StateAttribute>
 
 namespace Resource
 {

components/sceneutil/lightmanager.cpp

@@ -14,6 +14,7 @@
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/shader/shadermanager.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/hash.hpp>

components/sceneutil/lightmanager.hpp

@@ -11,16 +11,9 @@
 #include <osg/NodeVisitor>
 #include <osg/observer_ptr>
 
-#include <components/shader/shadermanager.hpp>
-
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/settings/settings.hpp>
 
-namespace osgUtil
-{
-    class CullVisitor;
-}
-
 namespace SceneUtil
 {
     class LightBuffer;

components/sceneutil/rtt.cpp

@@ -1,17 +1,13 @@
 #include "rtt.hpp"
 #include "util.hpp"
 
-#include <osg/Node>
-#include <osg/NodeVisitor>
 #include <osg/Texture2D>
 #include <osg/Texture2DArray>
 #include <osgUtil/CullVisitor>
 
-#include <components/debug/debuglog.hpp>
 #include <components/sceneutil/color.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/nodecallback.hpp>
-#include <components/settings/settings.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
 

components/sceneutil/rtt.hpp

@@ -10,7 +10,6 @@ namespace osg
 {
     class Texture2D;
     class Texture2DArray;
-    class Camera;
 }
 
 namespace osgUtil
@@ -20,8 +19,6 @@ namespace osgUtil
 
 namespace SceneUtil
 {
-    class CreateTextureViewsCallback;
-
     /// @brief Implements per-view RTT operations.
     /// @par With a naive RTT implementation, subsequent views of multiple views will overwrite the results of the
     /// previous views, leading to

components/sceneutil/unrefqueue.cpp

@@ -1,5 +1,7 @@
 #include "unrefqueue.hpp"
 
+#include <components/sceneutil/workqueue.hpp>
+
 namespace SceneUtil
 {
     namespace

components/sceneutil/unrefqueue.hpp

@@ -1,8 +1,6 @@
 #ifndef OPENMW_COMPONENTS_UNREFQUEUE_H
 #define OPENMW_COMPONENTS_UNREFQUEUE_H
 
-#include "workqueue.hpp"
-
 #include <osg/Referenced>
 #include <osg/ref_ptr>
 

components/sceneutil/util.hpp

@@ -1,9 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SCENEUTIL_UTIL_H
 #define OPENMW_COMPONENTS_SCENEUTIL_UTIL_H
 
-#include <osg/BoundingSphere>
 #include <osg/Camera>
-#include <osg/Matrix>
+#include <osg/Matrixf>
 #include <osg/Texture2D>
 #include <osg/Vec4f>
 

components/sceneutil/workqueue.hpp

@@ -6,9 +6,10 @@
 
 #include <atomic>
 #include <condition_variable>
+#include <deque>
 #include <mutex>
-#include <queue>
 #include <thread>
+#include <vector>
 
 namespace SceneUtil
 {

components/settings/settings.hpp

@@ -3,8 +3,6 @@
 
 #include "categories.hpp"
 
-#include <map>
-#include <set>
 #include <string>
 #include <string_view>
 #include <vector>

components/shader/shadervisitor.cpp

@@ -22,7 +22,6 @@
 #include <components/misc/osguservalues.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/resource/imagemanager.hpp>
-#include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 #include <components/sceneutil/riggeometryosgaextension.hpp>

components/shader/shadervisitor.hpp

@@ -1,11 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SHADERVISITOR_H
 #define OPENMW_COMPONENTS_SHADERVISITOR_H
 
-#include <array>
-
 #include <osg/NodeVisitor>
 #include <osg/Program>
-#include <osg/Texture2D>
 
 namespace Resource
 {

components/to_utf8/to_utf8.cpp

@@ -2,8 +2,9 @@
 
 #include <algorithm>
 #include <cassert>
+#include <ios>
+#include <iterator>
 #include <stdexcept>
-#include <vector>
 
 #include <components/debug/debuglog.hpp>
 

components/to_utf8/to_utf8.hpp

@@ -4,7 +4,7 @@
 #include <cstring>
 #include <string>
 #include <string_view>
-#include <vector>
+#include <utility>
 
 namespace ToUTF8
 {

components/vfs/bsaarchive.cpp

@@ -1,7 +1,6 @@
 #include "bsaarchive.hpp"
 
 #include <algorithm>
-#include <istream>
 #include <memory>
 
 namespace VFS

components/vfs/manager.cpp

@@ -1,10 +1,8 @@
 #include "manager.hpp"
 
 #include <algorithm>
-#include <istream>
 #include <stdexcept>
 
-#include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/lower.hpp>