Merge branch 'cleanup_includes' into 'master'

Cleanup includes See merge request OpenMW/openmw!3203
2 years ago · a755fa0f34
parent 81f8d16982 f6fce5ee15
commit a755fa0f34
67 changed files with 2 additions and 96 deletions
--- a/apps/launcher/importpage.cpp
+++ b/apps/launcher/importpage.cpp
@ -8,8 +8,6 @@
 #include <components/files/configurationmanager.hpp>
 #include <components/files/qtconversion.hpp>

-#include "utils/textinputdialog.hpp"
-
 using namespace Process;

 Launcher::ImportPage::ImportPage(const Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings,
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@ -10,7 +10,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/cellstore.hpp"
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@ -8,7 +8,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/cellstore.hpp"
--- a/apps/openmw/mwclass/esm4base.cpp
+++ b/apps/openmw/mwclass/esm4base.cpp
@ -14,8 +14,6 @@
 #include "../mwphysics/physicssystem.hpp"
 #include "../mwworld/ptr.hpp"

-#include "classmodel.hpp"
-
 namespace MWClass
 {
    void ESM4Impl::insertObjectRendering(
--- a/apps/openmw/mwclass/light4.cpp
+++ b/apps/openmw/mwclass/light4.cpp
@ -1,10 +1,7 @@
 #include "light4.hpp"
-#include "classmodel.hpp"

-#include "../mwphysics/physicssystem.hpp"
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
-#include "../mwworld/cellstore.hpp"
 #include "../mwworld/ptr.hpp"

 #include <components/esm4/loadligh.hpp>
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@ -1,13 +1,9 @@
 #ifndef GAME_MWCLASS_STATIC_H
 #define GAME_MWCLASS_STATIC_H

-#include "../mwgui/tooltips.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/registeredclass.hpp"

-#include "classmodel.hpp"
-
-#include "../mwgui/ustring.hpp"
 #include <MyGUI_TextIterator.h>

 namespace MWClass
--- a/apps/openmw/mwdialogue/hypertextparser.cpp
+++ b/apps/openmw/mwdialogue/hypertextparser.cpp
@ -1,7 +1,6 @@
 #include <components/esm3/loaddial.hpp>

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/store.hpp"
--- a/apps/openmw/mwdialogue/quest.cpp
+++ b/apps/openmw/mwdialogue/quest.cpp
@ -7,7 +7,6 @@
 #include "../mwworld/esmstore.hpp"

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 namespace MWDialogue
 {
--- a/apps/openmw/mwdialogue/scripttest.cpp
+++ b/apps/openmw/mwdialogue/scripttest.cpp
@ -6,7 +6,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/scriptmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwscript/compilercontext.hpp"

--- a/apps/openmw/mwdialogue/topic.cpp
+++ b/apps/openmw/mwdialogue/topic.cpp
@ -1,7 +1,6 @@
 #include "topic.hpp"

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/esmstore.hpp"

--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@ -25,7 +25,6 @@
 #include "../mwbase/luamanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
--- a/apps/openmw/mwgui/itemchargeview.cpp
+++ b/apps/openmw/mwgui/itemchargeview.cpp
@ -10,7 +10,6 @@
 #include <components/esm3/loadench.hpp>

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwmechanics/spellutil.hpp"

--- a/apps/openmw/mwgui/merchantrepair.cpp
+++ b/apps/openmw/mwgui/merchantrepair.cpp
@ -9,7 +9,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@ -15,7 +15,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwrender/characterpreview.hpp"
 #include "../mwworld/esmstore.hpp"

--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@ -8,7 +8,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@ -10,7 +10,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@ -14,7 +14,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@ -8,7 +8,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/spellutil.hpp"
--- a/apps/openmw/mwgui/statswatcher.cpp
+++ b/apps/openmw/mwgui/statswatcher.cpp
@ -5,7 +5,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwmechanics/npcstats.hpp"

--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@ -15,7 +15,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwmechanics/magiceffects.hpp"

--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@ -16,14 +16,11 @@

 #include "../mwworld/class.hpp"
 #include "../mwworld/globals.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/player.hpp"

 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/npcstats.hpp"

-#include "../mwgui/messagebox.hpp"
-
 #include "actions.hpp"
 #include "bindingsmanager.hpp"

--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@ -11,9 +11,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
-
-#include "../mwworld/player.hpp"

 #include "actions.hpp"

--- a/apps/openmw/mwinput/controlswitch.cpp
+++ b/apps/openmw/mwinput/controlswitch.cpp
@ -9,8 +9,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

-#include "../mwworld/player.hpp"
-
 namespace MWInput
 {
    ControlSwitch::ControlSwitch()
--- a/apps/openmw/mwinput/sensormanager.cpp
+++ b/apps/openmw/mwinput/sensormanager.cpp
@ -2,12 +2,6 @@

 #include <components/debug/debuglog.hpp>

-#include "../mwbase/environment.hpp"
-#include "../mwbase/inputmanager.hpp"
-#include "../mwbase/world.hpp"
-
-#include "../mwworld/player.hpp"
-
 namespace MWInput
 {
    SensorManager::SensorManager()
--- a/apps/openmw/mwinput/sensormanager.hpp
+++ b/apps/openmw/mwinput/sensormanager.hpp
@ -1,6 +1,8 @@
 #ifndef MWINPUT_MWSENSORMANAGER_H
 #define MWINPUT_MWSENSORMANAGER_H

+#include <array>
+
 #include <SDL_sensor.h>

 #include <osg/Matrixf>
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@ -1,4 +1,3 @@
-#include "luabindings.hpp"

 #include <components/lua/luastate.hpp>
 #include <components/lua/utilpackage.hpp>
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@ -6,7 +6,6 @@
 #include "../mwworld/cellstore.hpp"

 #include "types/types.hpp"
-#include "worldview.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@ -16,7 +16,6 @@
 #include "../mwworld/ptr.hpp"

 #include "context.hpp"
-#include "worldview.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@ -23,7 +23,6 @@

 #include "../mwrender/postprocessor.hpp"

-#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/scene.hpp"
--- a/apps/openmw/mwlua/magicbindings.cpp
+++ b/apps/openmw/mwlua/magicbindings.cpp
@ -10,15 +10,12 @@
 #include <components/resource/resourcesystem.hpp>

 #include "../mwbase/environment.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwmechanics/activespells.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/magiceffects.hpp"
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellutil.hpp"
-#include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"

@ -26,7 +23,6 @@
 #include "luamanagerimp.hpp"
 #include "object.hpp"
 #include "objectvariant.hpp"
-#include "worldview.hpp"

 namespace MWLua
 {
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@ -15,7 +15,6 @@
 #include "../mwworld/scene.hpp"

 #include "../mwrender/renderingmanager.hpp"
-#include "../mwrender/vismask.hpp"

 #include "../mwmechanics/creaturestats.hpp"

--- a/apps/openmw/mwlua/types/door.cpp
+++ b/apps/openmw/mwlua/types/door.cpp
@ -9,9 +9,6 @@

 #include <apps/openmw/mwworld/esmstore.hpp>

-#include "../luabindings.hpp"
-#include "../worldview.hpp"
-
 namespace sol
 {
    template <>
--- a/apps/openmw/mwlua/types/item.cpp
+++ b/apps/openmw/mwlua/types/item.cpp
@ -1,5 +1,3 @@
-#include "../luabindings.hpp"
-#include "../worldview.hpp"

 #include "types.hpp"

--- a/apps/openmw/mwlua/types/lockable.cpp
+++ b/apps/openmw/mwlua/types/lockable.cpp
@ -7,9 +7,6 @@

 #include <apps/openmw/mwworld/esmstore.hpp>

-#include "../luabindings.hpp"
-#include "../worldview.hpp"
-
 namespace MWLua
 {

--- a/apps/openmw/mwmechanics/aibreathe.cpp
+++ b/apps/openmw/mwmechanics/aibreathe.cpp
@ -1,7 +1,6 @@
 #include "aibreathe.hpp"

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
--- a/apps/openmw/mwmechanics/autocalcspell.cpp
+++ b/apps/openmw/mwmechanics/autocalcspell.cpp
@ -11,7 +11,6 @@
 #include "../mwworld/esmstore.hpp"

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "spellutil.hpp"

--- a/apps/openmw/mwmechanics/inventory.hpp
+++ b/apps/openmw/mwmechanics/inventory.hpp
@ -2,7 +2,6 @@
 #define OPENMW_MWMECHANICS_INVENTORY_H

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/esmstore.hpp"

--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@ -11,7 +11,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/esmstore.hpp"

--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@ -16,7 +16,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 MWMechanics::NpcStats::NpcStats()
    : mDisposition(0)
--- a/apps/openmw/mwmechanics/setbaseaisetting.hpp
+++ b/apps/openmw/mwmechanics/setbaseaisetting.hpp
@ -4,7 +4,6 @@
 #include <string>

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/esmstore.hpp"

--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@ -9,7 +9,6 @@
 #include "spells.hpp"

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/esmstore.hpp"

--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@ -8,7 +8,6 @@
 #include <components/misc/convert.hpp>

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/esmstore.hpp"

--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@ -20,7 +20,6 @@
 #include <components/esm3/globalmap.hpp>

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/esmstore.hpp"

--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@ -27,7 +27,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/cellstore.hpp"

--- a/apps/openmw/mwrender/terrainstorage.cpp
+++ b/apps/openmw/mwrender/terrainstorage.cpp
@ -1,7 +1,6 @@
 #include "terrainstorage.hpp"

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwworld/esmstore.hpp"

 #include "landmanager.hpp"
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@ -10,7 +10,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
-#include "../mwbase/luamanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@ -9,7 +9,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/scriptmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/esmstore.hpp"

--- a/apps/openmw/mwsound/regionsoundselector.cpp
+++ b/apps/openmw/mwsound/regionsoundselector.cpp
@ -8,7 +8,6 @@
 #include <numeric>

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwworld/esmstore.hpp"

 namespace MWSound
--- a/apps/openmw/mwsound/sound_buffer.cpp
+++ b/apps/openmw/mwsound/sound_buffer.cpp
@ -1,7 +1,6 @@
 #include "sound_buffer.hpp"

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwworld/esmstore.hpp"

 #include <components/debug/debuglog.hpp>
--- a/apps/openmw/mwworld/actionapply.cpp
+++ b/apps/openmw/mwworld/actionapply.cpp
@ -2,8 +2,6 @@

 #include "class.hpp"

-#include "../mwmechanics/actorutil.hpp"
-
 namespace MWWorld
 {
    ActionApply::ActionApply(const Ptr& object, const ESM::RefId& id)
--- a/apps/openmw/mwworld/actionread.cpp
+++ b/apps/openmw/mwworld/actionread.cpp
@ -6,7 +6,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/npcstats.hpp"
--- a/apps/openmw/mwworld/actionsoulgem.cpp
+++ b/apps/openmw/mwworld/actionsoulgem.cpp
@ -5,7 +5,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwmechanics/actorutil.hpp"

--- a/apps/openmw/mwworld/datetimemanager.cpp
+++ b/apps/openmw/mwworld/datetimemanager.cpp
@ -3,10 +3,8 @@
 #include <components/l10n/manager.hpp>

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "duration.hpp"
-#include "esmstore.hpp"
 #include "globals.hpp"
 #include "timestamp.hpp"

--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@ -6,7 +6,6 @@
 #include <components/esm3/inventorystate.hpp>

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/npcstats.hpp"
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@ -9,7 +9,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/luamanager.hpp"
-#include "../mwbase/world.hpp"

 #include "class.hpp"
 #include "esmstore.hpp"
--- a/apps/openmw/mwworld/magiceffects.cpp
+++ b/apps/openmw/mwworld/magiceffects.cpp
@ -11,7 +11,6 @@
 #include <components/esm3/npcstate.hpp>

 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwmechanics/magiceffects.hpp"

--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@ -14,9 +14,7 @@
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/rng.hpp>

-#include "../mwbase/environment.hpp"
 #include "../mwworld/cell.hpp"
-#include "../mwworld/worldimp.hpp"

 namespace
 {
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@ -1,5 +1,4 @@
 #include "gamesettings.hpp"
-#include "launchersettings.hpp"

 #include <QDir>
 #include <QRegularExpression>
--- a/components/esm3/aisequence.hpp
+++ b/components/esm3/aisequence.hpp
@ -5,7 +5,6 @@
 #include <string>
 #include <vector>

-#include "components/esm/defs.hpp"
 #include "components/esm/refid.hpp"
 #include "components/esm/util.hpp"

--- a/components/esm3/cellref.hpp
+++ b/components/esm3/cellref.hpp
@ -3,9 +3,7 @@

 #include <string>

-#include "components/esm/common.hpp"
 #include "components/esm/defs.hpp"
-#include "components/esm/esmcommon.hpp"
 #include "components/esm/refid.hpp"

 namespace ESM
--- a/components/esm3/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
@ -1,7 +1,6 @@
 #include "esmreader.hpp"

 #include "readerscache.hpp"
-#include "savedgame.hpp"

 #include <components/esm3/cellid.hpp>
 #include <components/esm3/loadcell.hpp>
--- a/components/esm3/loadweap.hpp
+++ b/components/esm3/loadweap.hpp
@ -4,7 +4,6 @@
 #include <string>

 #include "components/esm/refid.hpp"
-#include "loadskil.hpp"

 namespace ESM
 {
--- a/components/esm3/variant.cpp
+++ b/components/esm3/variant.cpp
@ -5,8 +5,6 @@
 #include "esmreader.hpp"
 #include "variantimp.hpp"

-#include "components/esm/defs.hpp"
-
 namespace ESM
 {
    namespace
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@ -11,7 +11,6 @@

 #include "lightcontroller.hpp"
 #include "lightmanager.hpp"
-#include "util.hpp"
 #include "visitor.hpp"

 namespace
--- a/components/settings/categories/hud.hpp
+++ b/components/settings/categories/hud.hpp
@ -1,7 +1,6 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_HUD_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_HUD_H

-#include "components/settings/sanitizerimpl.hpp"
 #include "components/settings/settingvalue.hpp"

 #include <osg/Math>
--- a/components/settings/categories/models.hpp
+++ b/components/settings/categories/models.hpp
@ -1,7 +1,6 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MODELS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MODELS_H

-#include "components/settings/sanitizerimpl.hpp"
 #include "components/settings/settingvalue.hpp"

 #include <osg/Math>
--- a/components/settings/categories/stereo.hpp
+++ b/components/settings/categories/stereo.hpp
@ -1,7 +1,6 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREO_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREO_H

-#include "components/settings/sanitizerimpl.hpp"
 #include "components/settings/settingvalue.hpp"

 #include <osg/Math>