From 843753da14d6551ce8ac9c9526d2223e0364ceb5 Mon Sep 17 00:00:00 2001 From: elsid Date: Sat, 8 Oct 2022 12:36:45 +0200 Subject: [PATCH] Remove unused includes --- apps/bulletobjecttool/main.cpp | 1 - apps/essimporter/importnpcc.hpp | 2 -- apps/essimporter/importplayer.hpp | 2 -- apps/essimporter/importsplm.h | 1 - apps/launcher/advancedpage.cpp | 3 --- apps/launcher/datafilespage.cpp | 1 - apps/launcher/settingspage.cpp | 2 -- apps/launcher/utils/cellnameloader.cpp | 1 - apps/mwiniimporter/importer.cpp | 1 - apps/opencs/model/filter/parser.cpp | 1 - apps/opencs/model/world/commands.cpp | 1 - .../world/landtexturetableproxymodel.cpp | 2 -- apps/opencs/view/doc/subview.cpp | 2 -- apps/opencs/view/render/cameracontroller.cpp | 2 -- apps/opencs/view/render/editmode.cpp | 1 - .../view/render/pagedworldspacewidget.cpp | 1 - apps/opencs/view/render/pathgridmode.cpp | 1 - .../view/render/pathgridselectionmode.cpp | 2 -- apps/opencs/view/render/terrainselection.cpp | 3 --- .../view/render/unpagedworldspacewidget.cpp | 1 - .../view/widget/scenetoolshapebrush.cpp | 1 - apps/opencs/view/world/dialoguesubview.cpp | 2 -- apps/opencs/view/world/referencecreator.cpp | 1 - apps/opencs/view/world/scenesubview.cpp | 1 - apps/opencs/view/world/startscriptcreator.cpp | 1 - apps/opencs/view/world/util.cpp | 2 -- apps/openmw/mwgui/bookwindow.cpp | 1 - apps/openmw/mwgui/dialogue.cpp | 2 -- apps/openmw/mwgui/itemview.cpp | 2 -- apps/openmw/mwgui/journalbooks.cpp | 1 - apps/openmw/mwgui/mapwindow.cpp | 1 - apps/openmw/mwgui/messagebox.cpp | 1 - apps/openmw/mwgui/recharge.cpp | 3 --- apps/openmw/mwgui/scrollwindow.cpp | 1 - apps/openmw/mwgui/spellbuyingwindow.cpp | 2 -- apps/openmw/mwgui/spellicons.cpp | 1 - apps/openmw/mwgui/statswatcher.cpp | 2 -- apps/openmw/mwgui/statswindow.cpp | 1 - apps/openmw/mwgui/travelwindow.cpp | 1 - apps/openmw/mwgui/widgets.cpp | 1 - apps/openmw/mwgui/windowmanagerimp.cpp | 1 - apps/openmw/mwinput/keyboardmanager.cpp | 2 -- apps/openmw/mwinput/mousemanager.cpp | 1 - apps/openmw/mwlua/luabindings.hpp | 2 -- apps/openmw/mwlua/types/types.hpp | 1 - apps/openmw/mwlua/userdataserializer.cpp | 1 - apps/openmw/mwmechanics/activespells.cpp | 2 -- apps/openmw/mwmechanics/aicast.cpp | 1 - apps/openmw/mwmechanics/aifollow.cpp | 1 - apps/openmw/mwmechanics/aipursue.cpp | 1 - apps/openmw/mwmechanics/aisequence.cpp | 1 - apps/openmw/mwmechanics/aitravel.cpp | 2 -- apps/openmw/mwmechanics/alchemy.cpp | 1 - apps/openmw/mwmechanics/enchanting.cpp | 1 - apps/openmw/mwmechanics/objects.cpp | 1 - apps/openmw/mwmechanics/obstacle.cpp | 1 - apps/openmw/mwmechanics/spellcasting.cpp | 6 ------ apps/openmw/mwmechanics/spelleffects.cpp | 1 - apps/openmw/mwmechanics/spellpriority.cpp | 2 -- apps/openmw/mwmechanics/spells.cpp | 2 -- apps/openmw/mwmechanics/summoning.cpp | 2 -- apps/openmw/mwmechanics/summoning.hpp | 2 -- .../closestnotmerayresultcallback.cpp | 3 --- .../deepestnotmecontacttestresultcallback.cpp | 3 --- apps/openmw/mwphysics/mtphysics.cpp | 3 ++- apps/openmw/mwphysics/physicssystem.cpp | 5 ----- apps/openmw/mwrender/bulletdebugdraw.cpp | 1 - apps/openmw/mwrender/camera.cpp | 3 --- apps/openmw/mwrender/characterpreview.cpp | 1 - apps/openmw/mwrender/creatureanimation.cpp | 7 ------- apps/openmw/mwrender/globalmap.cpp | 1 - apps/openmw/mwrender/localmap.cpp | 1 - apps/openmw/mwrender/npcanimation.cpp | 9 -------- apps/openmw/mwrender/objectpaging.cpp | 1 - apps/openmw/mwrender/pathgrid.cpp | 1 - apps/openmw/mwrender/pingpongcanvas.cpp | 1 - apps/openmw/mwrender/pingpongcull.cpp | 1 - apps/openmw/mwrender/postprocessor.cpp | 3 --- apps/openmw/mwrender/renderingmanager.cpp | 1 - apps/openmw/mwrender/sky.cpp | 2 -- apps/openmw/mwrender/skyutil.cpp | 3 --- apps/openmw/mwrender/water.cpp | 4 ---- apps/openmw/mwrender/weaponanimation.cpp | 1 - apps/openmw/mwscript/animationextensions.cpp | 1 - apps/openmw/mwscript/compilercontext.cpp | 21 +++++++++++++++++-- apps/openmw/mwscript/containerextensions.cpp | 2 -- apps/openmw/mwscript/globalscripts.cpp | 1 - apps/openmw/mwscript/interpretercontext.cpp | 1 - apps/openmw/mwscript/statsextensions.cpp | 2 -- apps/openmw/mwscript/userextensions.cpp | 1 - apps/openmw/mwsound/efx.h | 1 - apps/openmw/mwsound/loudness.cpp | 3 +-- apps/openmw/mwsound/movieaudiofactory.cpp | 1 - apps/openmw/mwstate/statemanagerimp.cpp | 1 - apps/openmw/mwworld/actionapply.cpp | 5 ----- apps/openmw/mwworld/actioneat.cpp | 2 -- apps/openmw/mwworld/actionequip.cpp | 3 --- apps/openmw/mwworld/actionread.cpp | 1 - apps/openmw/mwworld/actionrepair.cpp | 1 - apps/openmw/mwworld/cells.cpp | 1 - apps/openmw/mwworld/cellstore.cpp | 1 - apps/openmw/mwworld/containerstore.cpp | 2 -- apps/openmw/mwworld/inventorystore.cpp | 6 ------ apps/openmw/mwworld/livecellref.cpp | 1 - apps/openmw/mwworld/projectilemanager.cpp | 2 -- apps/openmw/mwworld/refdata.cpp | 1 - apps/openmw/mwworld/worldimp.cpp | 1 - .../detournavigator/gettilespositions.cpp | 1 - .../detournavigator/navigator.cpp | 1 - .../detournavigator/navmeshdb.cpp | 1 - .../detournavigator/navmeshtilescache.cpp | 4 ---- .../detournavigator/recastmeshbuilder.cpp | 4 ---- .../detournavigator/recastmeshobject.cpp | 1 - .../detournavigator/settingsutils.cpp | 1 - .../tilecachedrecastmeshmanager.cpp | 1 - apps/openmw_test_suite/esm/variant.cpp | 1 - apps/openmw_test_suite/files/hash.cpp | 1 - components/bullethelpers/collisionobject.hpp | 2 -- components/config/gamesettings.cpp | 2 -- components/config/launchersettings.cpp | 2 -- components/detournavigator/debug.cpp | 2 -- .../findrandompointaroundcircle.cpp | 2 -- components/detournavigator/makenavmesh.cpp | 6 ------ components/detournavigator/navigatorimpl.cpp | 1 - .../detournavigator/navmeshcacheitem.cpp | 2 -- components/detournavigator/recastmesh.hpp | 1 - .../detournavigator/recastmeshbuilder.cpp | 1 - .../detournavigator/recastmeshobject.cpp | 2 -- .../tilecachedrecastmeshmanager.hpp | 2 -- components/esm/format.cpp | 3 +-- components/esm3/fogstate.cpp | 2 -- components/esm3/loaddial.cpp | 2 -- components/esm3/loadmgef.cpp | 1 - components/esm3/loadskil.cpp | 1 - components/esm3/loadtes3.cpp | 1 - components/esm4/loaddial.hpp | 1 - components/esm4/loadinfo.hpp | 1 - components/esmloader/load.cpp | 1 - components/fontloader/fontloader.cpp | 2 -- components/fx/parse_constants.hpp | 2 -- components/fx/pass.cpp | 1 - components/fx/stateupdater.cpp | 1 - components/lua_ui/widget.cpp | 4 ---- components/misc/coordinateconverter.hpp | 1 - components/misc/resourcehelpers.cpp | 1 - components/misc/rng.cpp | 2 -- components/nifbullet/bulletnifloader.cpp | 1 - components/nifosg/controller.hpp | 1 - components/nifosg/particle.cpp | 1 - components/resource/foreachbulletobject.cpp | 2 -- components/resource/foreachbulletobject.hpp | 1 - components/resource/stats.cpp | 2 -- components/sceneutil/attach.cpp | 3 --- components/sceneutil/extradata.cpp | 3 --- components/sceneutil/keyframe.hpp | 1 - components/sceneutil/osgacontroller.cpp | 1 - components/sceneutil/util.cpp | 1 - components/stereo/frustum.cpp | 8 ------- components/stereo/frustum.hpp | 2 -- components/stereo/stereomanager.cpp | 4 ---- components/terrain/terraingrid.cpp | 1 - components/terrain/world.hpp | 2 -- 162 files changed, 23 insertions(+), 290 deletions(-) diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp index 4169ef271a..c22dc15305 100644 --- a/apps/bulletobjecttool/main.cpp +++ b/apps/bulletobjecttool/main.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include diff --git a/apps/essimporter/importnpcc.hpp b/apps/essimporter/importnpcc.hpp index 1cc355b06c..762add1906 100644 --- a/apps/essimporter/importnpcc.hpp +++ b/apps/essimporter/importnpcc.hpp @@ -1,8 +1,6 @@ #ifndef OPENMW_ESSIMPORT_NPCC_H #define OPENMW_ESSIMPORT_NPCC_H -#include - #include #include "importinventory.hpp" diff --git a/apps/essimporter/importplayer.hpp b/apps/essimporter/importplayer.hpp index 252202ccf2..0fb820cb64 100644 --- a/apps/essimporter/importplayer.hpp +++ b/apps/essimporter/importplayer.hpp @@ -4,9 +4,7 @@ #include #include -#include #include -#include namespace ESM { diff --git a/apps/essimporter/importsplm.h b/apps/essimporter/importsplm.h index 6c31363e4a..8187afb131 100644 --- a/apps/essimporter/importsplm.h +++ b/apps/essimporter/importsplm.h @@ -2,7 +2,6 @@ #define OPENMW_ESSIMPORT_IMPORTSPLM_H #include -#include #include namespace ESM diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp index 6f0a8dc52f..d017d3aebe 100644 --- a/apps/launcher/advancedpage.cpp +++ b/apps/launcher/advancedpage.cpp @@ -9,9 +9,6 @@ #include #include -#include -#include -#include #include "utils/openalutil.hpp" diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp index 1584798238..7a1a863978 100644 --- a/apps/launcher/datafilespage.cpp +++ b/apps/launcher/datafilespage.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include "utils/profilescombobox.hpp" #include "utils/textinputdialog.hpp" diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp index d65b8732a6..ea4531cac6 100644 --- a/apps/launcher/settingspage.cpp +++ b/apps/launcher/settingspage.cpp @@ -5,10 +5,8 @@ #include #include -#include #include -#include "datafilespage.hpp" #include "utils/textinputdialog.hpp" using namespace Process; diff --git a/apps/launcher/utils/cellnameloader.cpp b/apps/launcher/utils/cellnameloader.cpp index 2f2bddbfb5..717a61bd2b 100644 --- a/apps/launcher/utils/cellnameloader.cpp +++ b/apps/launcher/utils/cellnameloader.cpp @@ -1,6 +1,5 @@ #include "cellnameloader.hpp" -#include #include QSet CellNameLoader::getCellNames(QStringList& contentPaths) diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp index e00f0f0c1f..958a5ef705 100644 --- a/apps/mwiniimporter/importer.cpp +++ b/apps/mwiniimporter/importer.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp index dc7a359680..32b683f910 100644 --- a/apps/opencs/model/filter/parser.cpp +++ b/apps/opencs/model/filter/parser.cpp @@ -8,7 +8,6 @@ #include "../world/columns.hpp" #include "../world/data.hpp" -#include "../world/idcollection.hpp" #include "andnode.hpp" #include "booleannode.hpp" diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp index 52e746cd23..c50df8731f 100644 --- a/apps/opencs/model/world/commands.cpp +++ b/apps/opencs/model/world/commands.cpp @@ -8,7 +8,6 @@ #include #include "cellcoordinates.hpp" -#include "idcollection.hpp" #include "idtable.hpp" #include "idtree.hpp" #include "nestedtablewrapper.hpp" diff --git a/apps/opencs/model/world/landtexturetableproxymodel.cpp b/apps/opencs/model/world/landtexturetableproxymodel.cpp index b1249c5580..4929b25eab 100644 --- a/apps/opencs/model/world/landtexturetableproxymodel.cpp +++ b/apps/opencs/model/world/landtexturetableproxymodel.cpp @@ -1,7 +1,5 @@ #include "landtexturetableproxymodel.hpp" -#include "idtable.hpp" - namespace CSMWorld { LandTextureTableProxyModel::LandTextureTableProxyModel(QObject* parent) diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp index 30d9661ff2..d47234b3a0 100644 --- a/apps/opencs/view/doc/subview.cpp +++ b/apps/opencs/view/doc/subview.cpp @@ -1,7 +1,5 @@ #include "subview.hpp" -#include "view.hpp" - #include #include diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp index 87ba7e58f3..14c8218ef6 100644 --- a/apps/opencs/view/render/cameracontroller.cpp +++ b/apps/opencs/view/render/cameracontroller.cpp @@ -16,8 +16,6 @@ #include "../../model/prefs/shortcut.hpp" -#include "scenewidget.hpp" - namespace CSVRender { diff --git a/apps/opencs/view/render/editmode.cpp b/apps/opencs/view/render/editmode.cpp index cdca3b1e46..5aa10aef88 100644 --- a/apps/opencs/view/render/editmode.cpp +++ b/apps/opencs/view/render/editmode.cpp @@ -1,6 +1,5 @@ #include "editmode.hpp" -#include "tagbase.hpp" #include "worldspacewidget.hpp" CSVRender::WorldspaceWidget& CSVRender::EditMode::getWorldspaceWidget() diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp index 97ff1a9788..a32189b80c 100644 --- a/apps/opencs/view/render/pagedworldspacewidget.cpp +++ b/apps/opencs/view/render/pagedworldspacewidget.cpp @@ -13,7 +13,6 @@ #include "../widget/scenetoolmode.hpp" #include "../widget/scenetooltoggle2.hpp" -#include "cameracontroller.hpp" #include "cellarrow.hpp" #include "editmode.hpp" #include "mask.hpp" diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp index b5a94fe0e4..6a4ba40bdb 100644 --- a/apps/opencs/view/render/pathgridmode.cpp +++ b/apps/opencs/view/render/pathgridmode.cpp @@ -7,7 +7,6 @@ #include "../../model/prefs/state.hpp" #include "../../model/world/commandmacro.hpp" -#include "../../model/world/commands.hpp" #include "../widget/scenetoolbar.hpp" diff --git a/apps/opencs/view/render/pathgridselectionmode.cpp b/apps/opencs/view/render/pathgridselectionmode.cpp index 77a232b4e8..82906c927b 100644 --- a/apps/opencs/view/render/pathgridselectionmode.cpp +++ b/apps/opencs/view/render/pathgridselectionmode.cpp @@ -4,8 +4,6 @@ #include #include "../../model/world/commandmacro.hpp" -#include "../../model/world/commands.hpp" -#include "../../model/world/idtable.hpp" #include "pathgrid.hpp" #include "worldspacewidget.hpp" diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp index b8ef4bad0d..655606e7a0 100644 --- a/apps/opencs/view/render/terrainselection.cpp +++ b/apps/opencs/view/render/terrainselection.cpp @@ -7,9 +7,6 @@ #include -#include "../../model/world/columnimp.hpp" -#include "../../model/world/idtable.hpp" - #include "cell.hpp" #include "worldspacewidget.hpp" diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp index 98c8231cae..1ba45a0bf8 100644 --- a/apps/opencs/view/render/unpagedworldspacewidget.cpp +++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp @@ -8,7 +8,6 @@ #include "../../model/world/data.hpp" #include "../../model/world/idtable.hpp" -#include "../../model/world/tablemimedata.hpp" #include "../widget/scenetooltoggle2.hpp" diff --git a/apps/opencs/view/widget/scenetoolshapebrush.cpp b/apps/opencs/view/widget/scenetoolshapebrush.cpp index 8674cd1a0a..474fef28c9 100644 --- a/apps/opencs/view/widget/scenetoolshapebrush.cpp +++ b/apps/opencs/view/widget/scenetoolshapebrush.cpp @@ -21,7 +21,6 @@ #include "../../model/doc/document.hpp" #include "../../model/prefs/state.hpp" -#include "../../model/world/commands.hpp" CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString& title, QWidget* parent) : QGroupBox(title, parent) diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp index 7e2b39571d..a828a923c8 100644 --- a/apps/opencs/view/world/dialoguesubview.cpp +++ b/apps/opencs/view/world/dialoguesubview.cpp @@ -20,7 +20,6 @@ #include "../../model/doc/document.hpp" #include "../../model/world/columnbase.hpp" #include "../../model/world/columns.hpp" -#include "../../model/world/commands.hpp" #include "../../model/world/idtable.hpp" #include "../../model/world/idtree.hpp" #include "../../model/world/nestedtableproxymodel.hpp" @@ -34,7 +33,6 @@ #include "nestedtable.hpp" #include "recordbuttonbar.hpp" -#include "recordstatusdelegate.hpp" #include "tablebottombox.hpp" #include "util.hpp" /* diff --git a/apps/opencs/view/world/referencecreator.cpp b/apps/opencs/view/world/referencecreator.cpp index 334f140fcc..08d6e766b8 100644 --- a/apps/opencs/view/world/referencecreator.cpp +++ b/apps/opencs/view/world/referencecreator.cpp @@ -5,7 +5,6 @@ #include "../../model/doc/document.hpp" #include "../../model/world/columns.hpp" -#include "../../model/world/commandmacro.hpp" #include "../../model/world/commands.hpp" #include "../../model/world/data.hpp" #include "../../model/world/idcompletionmanager.hpp" diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp index 2316596675..b52658b608 100644 --- a/apps/opencs/view/world/scenesubview.cpp +++ b/apps/opencs/view/world/scenesubview.cpp @@ -19,7 +19,6 @@ #include "../widget/scenetoolbar.hpp" #include "../widget/scenetoolmode.hpp" #include "../widget/scenetoolrun.hpp" -#include "../widget/scenetooltoggle.hpp" #include "../widget/scenetooltoggle2.hpp" #include "creator.hpp" diff --git a/apps/opencs/view/world/startscriptcreator.cpp b/apps/opencs/view/world/startscriptcreator.cpp index 2bbb25933e..f8552e39d6 100644 --- a/apps/opencs/view/world/startscriptcreator.cpp +++ b/apps/opencs/view/world/startscriptcreator.cpp @@ -5,7 +5,6 @@ #include "../../model/doc/document.hpp" #include "../../model/world/columns.hpp" -#include "../../model/world/commands.hpp" #include "../../model/world/data.hpp" #include "../../model/world/idcompletionmanager.hpp" #include "../../model/world/idtable.hpp" diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp index 36d22a8fa0..d1ddbe1d89 100644 --- a/apps/opencs/view/world/util.cpp +++ b/apps/opencs/view/world/util.cpp @@ -11,8 +11,6 @@ #include #include "../../model/world/commanddispatcher.hpp" -#include "../../model/world/commands.hpp" -#include "../../model/world/tablemimedata.hpp" #include "../widget/coloreditor.hpp" #include "../widget/droplineedit.hpp" diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp index 56b76836e2..ee6f12ffb3 100644 --- a/apps/openmw/mwgui/bookwindow.cpp +++ b/apps/openmw/mwgui/bookwindow.cpp @@ -7,7 +7,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/actorutil.hpp" diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 1b36e42992..a07d261437 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -28,7 +27,6 @@ #include "bookpage.hpp" #include "textcolours.hpp" -#include "tooltips.hpp" #include "journalbooks.hpp" // to_utf8_span diff --git a/apps/openmw/mwgui/itemview.cpp b/apps/openmw/mwgui/itemview.cpp index 760fc650d6..e959847867 100644 --- a/apps/openmw/mwgui/itemview.cpp +++ b/apps/openmw/mwgui/itemview.cpp @@ -7,8 +7,6 @@ #include #include -#include "../mwworld/class.hpp" - #include "itemmodel.hpp" #include "itemwidget.hpp" diff --git a/apps/openmw/mwgui/journalbooks.cpp b/apps/openmw/mwgui/journalbooks.cpp index f16491f2d5..286c3ab830 100644 --- a/apps/openmw/mwgui/journalbooks.cpp +++ b/apps/openmw/mwgui/journalbooks.cpp @@ -3,7 +3,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include #include #include "textcolours.hpp" diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp index e963fef05e..fe728b3965 100644 --- a/apps/openmw/mwgui/mapwindow.cpp +++ b/apps/openmw/mwgui/mapwindow.cpp @@ -31,7 +31,6 @@ #include "../mwrender/localmap.hpp" #include "confirmationdialog.hpp" -#include "tooltips.hpp" #include diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp index 1b8fa8b1f8..49d474c826 100644 --- a/apps/openmw/mwgui/messagebox.cpp +++ b/apps/openmw/mwgui/messagebox.cpp @@ -10,7 +10,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/inputmanager.hpp" -#include "../mwbase/soundmanager.hpp" #include "../mwbase/windowmanager.hpp" namespace MWGui diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp index 8fc0328a0b..9d2275255b 100644 --- a/apps/openmw/mwgui/recharge.cpp +++ b/apps/openmw/mwgui/recharge.cpp @@ -4,8 +4,6 @@ #include -#include - #include #include "../mwbase/environment.hpp" @@ -13,7 +11,6 @@ #include "../mwbase/world.hpp" #include "../mwworld/class.hpp" -#include "../mwworld/containerstore.hpp" #include "../mwworld/esmstore.hpp" #include "../mwmechanics/actorutil.hpp" diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp index 99cec7eb1c..80151b49d2 100644 --- a/apps/openmw/mwgui/scrollwindow.cpp +++ b/apps/openmw/mwgui/scrollwindow.cpp @@ -7,7 +7,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/actorutil.hpp" diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp index b0a58ddc02..bb6586bda4 100644 --- a/apps/openmw/mwgui/spellbuyingwindow.cpp +++ b/apps/openmw/mwgui/spellbuyingwindow.cpp @@ -4,8 +4,6 @@ #include #include -#include - #include #include diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp index be59dfb171..058c89da6a 100644 --- a/apps/openmw/mwgui/spellicons.cpp +++ b/apps/openmw/mwgui/spellicons.cpp @@ -16,7 +16,6 @@ #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwworld/inventorystore.hpp" #include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/creaturestats.hpp" diff --git a/apps/openmw/mwgui/statswatcher.cpp b/apps/openmw/mwgui/statswatcher.cpp index 1318173a60..00c9c61ed1 100644 --- a/apps/openmw/mwgui/statswatcher.cpp +++ b/apps/openmw/mwgui/statswatcher.cpp @@ -8,11 +8,9 @@ #include "../mwbase/world.hpp" #include "../mwmechanics/npcstats.hpp" -#include "../mwmechanics/spellutil.hpp" #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwworld/inventorystore.hpp" #include diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp index 988577613c..b4d83ad9a7 100644 --- a/apps/openmw/mwgui/statswindow.cpp +++ b/apps/openmw/mwgui/statswindow.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp index 506c2123db..5fea9b019b 100644 --- a/apps/openmw/mwgui/travelwindow.cpp +++ b/apps/openmw/mwgui/travelwindow.cpp @@ -6,7 +6,6 @@ #include #include -#include #include "../mwbase/environment.hpp" #include "../mwbase/mechanicsmanager.hpp" diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp index a6a5299289..64c03f6700 100644 --- a/apps/openmw/mwgui/widgets.cpp +++ b/apps/openmw/mwgui/widgets.cpp @@ -19,7 +19,6 @@ #include "../mwworld/esmstore.hpp" -#include "controllers.hpp" #include "ustring.hpp" namespace MWGui::Widgets diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index f41f6a4a79..3cd18f97bd 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -47,7 +47,6 @@ #include #include -#include #include diff --git a/apps/openmw/mwinput/keyboardmanager.cpp b/apps/openmw/mwinput/keyboardmanager.cpp index 97d46c1796..6b1daf4500 100644 --- a/apps/openmw/mwinput/keyboardmanager.cpp +++ b/apps/openmw/mwinput/keyboardmanager.cpp @@ -11,8 +11,6 @@ #include "../mwbase/luamanager.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwworld/player.hpp" - #include "actions.hpp" #include "bindingsmanager.hpp" diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp index a8938f07a2..113d7c07b9 100644 --- a/apps/openmw/mwinput/mousemanager.cpp +++ b/apps/openmw/mwinput/mousemanager.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp index 88ff7d67e5..67455db29c 100644 --- a/apps/openmw/mwlua/luabindings.hpp +++ b/apps/openmw/mwlua/luabindings.hpp @@ -1,9 +1,7 @@ #ifndef MWLUA_LUABINDINGS_H #define MWLUA_LUABINDINGS_H -#include #include -#include #include #include "context.hpp" diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp index f4446b09c9..eb2d0f25e6 100644 --- a/apps/openmw/mwlua/types/types.hpp +++ b/apps/openmw/mwlua/types/types.hpp @@ -4,7 +4,6 @@ #include #include -#include #include "../context.hpp" diff --git a/apps/openmw/mwlua/userdataserializer.cpp b/apps/openmw/mwlua/userdataserializer.cpp index 9640a05625..38d29a42ef 100644 --- a/apps/openmw/mwlua/userdataserializer.cpp +++ b/apps/openmw/mwlua/userdataserializer.cpp @@ -1,7 +1,6 @@ #include "userdataserializer.hpp" #include -#include #include "object.hpp" diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp index faeda92a93..138747e9d4 100644 --- a/apps/openmw/mwmechanics/activespells.cpp +++ b/apps/openmw/mwmechanics/activespells.cpp @@ -5,13 +5,11 @@ #include #include -#include #include #include #include -#include #include #include diff --git a/apps/openmw/mwmechanics/aicast.cpp b/apps/openmw/mwmechanics/aicast.cpp index 91876f2f04..9170ee9b57 100644 --- a/apps/openmw/mwmechanics/aicast.cpp +++ b/apps/openmw/mwmechanics/aicast.cpp @@ -9,7 +9,6 @@ #include "../mwworld/class.hpp" #include "aicombataction.hpp" -#include "creaturestats.hpp" #include "steering.hpp" namespace MWMechanics diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp index 60659687ed..fbce10bebf 100644 --- a/apps/openmw/mwmechanics/aifollow.cpp +++ b/apps/openmw/mwmechanics/aifollow.cpp @@ -11,7 +11,6 @@ #include "../mwworld/class.hpp" #include "creaturestats.hpp" -#include "movement.hpp" #include "steering.hpp" namespace diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp index fa4f901494..22b28d697d 100644 --- a/apps/openmw/mwmechanics/aipursue.cpp +++ b/apps/openmw/mwmechanics/aipursue.cpp @@ -11,7 +11,6 @@ #include "actorutil.hpp" #include "creaturestats.hpp" -#include "movement.hpp" namespace MWMechanics { diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp index ded72c7406..1cd499dc7e 100644 --- a/apps/openmw/mwmechanics/aisequence.cpp +++ b/apps/openmw/mwmechanics/aisequence.cpp @@ -15,7 +15,6 @@ #include "aifollow.hpp" #include "aipackage.hpp" #include "aipursue.hpp" -#include "aistate.hpp" #include "aitravel.hpp" #include "aiwander.hpp" diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp index 0ebfe911d1..01187c98e7 100644 --- a/apps/openmw/mwmechanics/aitravel.cpp +++ b/apps/openmw/mwmechanics/aitravel.cpp @@ -2,14 +2,12 @@ #include -#include #include #include "../mwbase/environment.hpp" #include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/world.hpp" -#include "../mwworld/cellstore.hpp" #include "../mwworld/class.hpp" #include "creaturestats.hpp" diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp index fdff3cf2ed..fe2d1861ae 100644 --- a/apps/openmw/mwmechanics/alchemy.cpp +++ b/apps/openmw/mwmechanics/alchemy.cpp @@ -17,7 +17,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" -#include "../mwworld/cellstore.hpp" #include "../mwworld/class.hpp" #include "../mwworld/containerstore.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp index bb8b78fa99..b9c12a6097 100644 --- a/apps/openmw/mwmechanics/enchanting.cpp +++ b/apps/openmw/mwmechanics/enchanting.cpp @@ -8,7 +8,6 @@ #include "../mwworld/class.hpp" #include "../mwworld/containerstore.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwworld/manualref.hpp" #include "../mwbase/environment.hpp" #include "../mwbase/mechanicsmanager.hpp" diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp index a6f9727965..ab981dd459 100644 --- a/apps/openmw/mwmechanics/objects.cpp +++ b/apps/openmw/mwmechanics/objects.cpp @@ -8,7 +8,6 @@ #include "../mwbase/world.hpp" #include "character.hpp" -#include "movement.hpp" namespace MWMechanics { diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp index a17703a642..ae06c05dc9 100644 --- a/apps/openmw/mwmechanics/obstacle.cpp +++ b/apps/openmw/mwmechanics/obstacle.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp index db92629dbc..ed312d8ce4 100644 --- a/apps/openmw/mwmechanics/spellcasting.cpp +++ b/apps/openmw/mwmechanics/spellcasting.cpp @@ -14,22 +14,16 @@ #include "../mwbase/windowmanager.hpp" #include "../mwbase/world.hpp" -#include "../mwworld/actionteleport.hpp" -#include "../mwworld/cellstore.hpp" #include "../mwworld/class.hpp" #include "../mwworld/containerstore.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwworld/inventorystore.hpp" -#include "../mwworld/player.hpp" #include "../mwrender/animation.hpp" #include "actorutil.hpp" -#include "aifollow.hpp" #include "creaturestats.hpp" #include "spelleffects.hpp" #include "spellutil.hpp" -#include "summoning.hpp" #include "weapontype.hpp" namespace MWMechanics diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp index c9de5bd1b9..dd5d8756b7 100644 --- a/apps/openmw/mwmechanics/spelleffects.cpp +++ b/apps/openmw/mwmechanics/spelleffects.cpp @@ -2,7 +2,6 @@ #include -#include #include #include #include diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp index 2a09ed03f4..2eb076f24d 100644 --- a/apps/openmw/mwmechanics/spellpriority.cpp +++ b/apps/openmw/mwmechanics/spellpriority.cpp @@ -7,10 +7,8 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/world.hpp" -#include "../mwworld/cellstore.hpp" #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" #include "../mwworld/inventorystore.hpp" diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp index 21769e776b..a0ea241fb9 100644 --- a/apps/openmw/mwmechanics/spells.cpp +++ b/apps/openmw/mwmechanics/spells.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include @@ -15,7 +14,6 @@ #include "actorutil.hpp" #include "creaturestats.hpp" -#include "magiceffects.hpp" #include "stat.hpp" namespace MWMechanics diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp index 7bd6851e37..7bc7344012 100644 --- a/apps/openmw/mwmechanics/summoning.cpp +++ b/apps/openmw/mwmechanics/summoning.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include @@ -12,7 +11,6 @@ #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwworld/inventorystore.hpp" #include "../mwworld/manualref.hpp" #include "../mwrender/animation.hpp" diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp index 62a5c725a3..2fb2eac693 100644 --- a/apps/openmw/mwmechanics/summoning.hpp +++ b/apps/openmw/mwmechanics/summoning.hpp @@ -4,8 +4,6 @@ #include #include -#include - namespace MWWorld { class Ptr; diff --git a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp index b39603a767..30a42bc3b8 100644 --- a/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp +++ b/apps/openmw/mwphysics/closestnotmerayresultcallback.cpp @@ -5,10 +5,7 @@ #include -#include "../mwworld/class.hpp" - #include "collisiontype.hpp" -#include "ptrholder.hpp" namespace MWPhysics { diff --git a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp b/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp index 773eaf7ff1..766ca79796 100644 --- a/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp +++ b/apps/openmw/mwphysics/deepestnotmecontacttestresultcallback.cpp @@ -4,10 +4,7 @@ #include -#include "../mwworld/class.hpp" - #include "collisiontype.hpp" -#include "ptrholder.hpp" namespace MWPhysics { diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp index da35752ae0..0ef69084ba 100644 --- a/apps/openmw/mwphysics/mtphysics.cpp +++ b/apps/openmw/mwphysics/mtphysics.cpp @@ -1,3 +1,5 @@ +#include "mtphysics.hpp" + #include #include #include @@ -28,7 +30,6 @@ #include "actor.hpp" #include "contacttestwrapper.h" #include "movementsolver.hpp" -#include "mtphysics.hpp" #include "object.hpp" #include "physicssystem.hpp" #include "projectile.hpp" diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp index 360a79360d..a9de8dedc1 100644 --- a/apps/openmw/mwphysics/physicssystem.cpp +++ b/apps/openmw/mwphysics/physicssystem.cpp @@ -23,11 +23,8 @@ #include #include #include -#include -#include // FindRecIndexVisitor #include #include -#include #include #include "../mwbase/environment.hpp" @@ -57,8 +54,6 @@ #include "mtphysics.hpp" #include "object.hpp" #include "projectile.hpp" -#include "projectileconvexcallback.hpp" -#include "trace.h" namespace { diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp index 3fd71d21ec..6b045ccda4 100644 --- a/apps/openmw/mwrender/bulletdebugdraw.cpp +++ b/apps/openmw/mwrender/bulletdebugdraw.cpp @@ -21,7 +21,6 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" namespace MWRender { diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp index 1fe49f0f0f..d562abe682 100644 --- a/apps/openmw/mwrender/camera.cpp +++ b/apps/openmw/mwrender/camera.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" @@ -15,9 +14,7 @@ #include "../mwworld/ptr.hpp" #include "../mwworld/refdata.hpp" -#include "../mwmechanics/drawstate.hpp" #include "../mwmechanics/movement.hpp" -#include "../mwmechanics/npcstats.hpp" #include "../mwphysics/raycasting.hpp" diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp index 7d74d3cfc6..73c86add29 100644 --- a/apps/openmw/mwrender/characterpreview.cpp +++ b/apps/openmw/mwrender/characterpreview.cpp @@ -27,7 +27,6 @@ #include #include -#include "../mwbase/world.hpp" #include "../mwworld/class.hpp" #include "../mwworld/inventorystore.hpp" diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp index 9175cb0f04..a724da1f71 100644 --- a/apps/openmw/mwrender/creatureanimation.cpp +++ b/apps/openmw/mwrender/creatureanimation.cpp @@ -5,20 +5,13 @@ #include #include #include -#include -#include #include -#include #include #include -#include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" - #include "../mwmechanics/weapontype.hpp" #include "../mwworld/class.hpp" -#include "../mwworld/esmstore.hpp" namespace MWRender { diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp index 1d6b881127..d2e79d8af1 100644 --- a/apps/openmw/mwrender/globalmap.cpp +++ b/apps/openmw/mwrender/globalmap.cpp @@ -24,7 +24,6 @@ #include "../mwworld/esmstore.hpp" -#include "util.hpp" #include "vismask.hpp" namespace diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp index f9a14e5239..1da98c483c 100644 --- a/apps/openmw/mwrender/localmap.cpp +++ b/apps/openmw/mwrender/localmap.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp index a0f6cd2b57..a83d0bf3dd 100644 --- a/apps/openmw/mwrender/npcanimation.cpp +++ b/apps/openmw/mwrender/npcanimation.cpp @@ -13,20 +13,14 @@ #include -#include #include -#include -#include #include #include -#include #include #include #include -#include #include #include -#include #include #include @@ -35,7 +29,6 @@ #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" #include "../mwworld/inventorystore.hpp" -#include "../mwworld/player.hpp" #include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/npcstats.hpp" @@ -46,11 +39,9 @@ #include "../mwbase/soundmanager.hpp" #include "../mwbase/world.hpp" -#include "camera.hpp" #include "postprocessor.hpp" #include "renderbin.hpp" #include "rotatecontroller.hpp" -#include "util.hpp" #include "vismask.hpp" namespace diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp index 77bf4097a0..f28b13b9b3 100644 --- a/apps/openmw/mwrender/objectpaging.cpp +++ b/apps/openmw/mwrender/objectpaging.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp index 9ad25bb3b3..115ab80560 100644 --- a/apps/openmw/mwrender/pathgrid.cpp +++ b/apps/openmw/mwrender/pathgrid.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone diff --git a/apps/openmw/mwrender/pingpongcanvas.cpp b/apps/openmw/mwrender/pingpongcanvas.cpp index 3276b7addc..da1997b5fb 100644 --- a/apps/openmw/mwrender/pingpongcanvas.cpp +++ b/apps/openmw/mwrender/pingpongcanvas.cpp @@ -1,6 +1,5 @@ #include "pingpongcanvas.hpp" -#include #include #include #include diff --git a/apps/openmw/mwrender/pingpongcull.cpp b/apps/openmw/mwrender/pingpongcull.cpp index 4e36c51932..aa9ad9e673 100644 --- a/apps/openmw/mwrender/pingpongcull.cpp +++ b/apps/openmw/mwrender/pingpongcull.cpp @@ -9,7 +9,6 @@ #include #include -#include "pingpongcanvas.hpp" #include "postprocessor.hpp" namespace MWRender diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp index 2c1b72c97d..ebaa0b3464 100644 --- a/apps/openmw/mwrender/postprocessor.cpp +++ b/apps/openmw/mwrender/postprocessor.cpp @@ -15,10 +15,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -27,7 +25,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwgui/postprocessorhud.hpp" diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index c8763df743..0262adad39 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -58,7 +58,6 @@ #include "../mwworld/class.hpp" #include "../mwworld/groundcoverstore.hpp" -#include "../mwgui/loadingscreen.hpp" #include "../mwgui/postprocessorhud.hpp" #include "../mwmechanics/actorutil.hpp" diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp index 87dfe49999..af0b161ee1 100644 --- a/apps/openmw/mwrender/sky.cpp +++ b/apps/openmw/mwrender/sky.cpp @@ -23,7 +23,6 @@ #include #include -#include #include #include @@ -35,7 +34,6 @@ #include "renderbin.hpp" #include "skyutil.hpp" -#include "util.hpp" #include "vismask.hpp" namespace diff --git a/apps/openmw/mwrender/skyutil.cpp b/apps/openmw/mwrender/skyutil.cpp index 9f0d0ec54c..347b40a7a4 100644 --- a/apps/openmw/mwrender/skyutil.cpp +++ b/apps/openmw/mwrender/skyutil.cpp @@ -33,9 +33,6 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" - -#include "../mwworld/weather.hpp" #include "renderbin.hpp" #include "vismask.hpp" diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp index 21a4e6cd9b..513b0eb261 100644 --- a/apps/openmw/mwrender/water.cpp +++ b/apps/openmw/mwrender/water.cpp @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -44,11 +43,8 @@ #include "../mwworld/cellstore.hpp" -#include "../mwbase/environment.hpp" - #include "renderbin.hpp" #include "ripplesimulation.hpp" -#include "util.hpp" #include "vismask.hpp" namespace MWRender diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp index e2ce27f23d..63f1b5ad47 100644 --- a/apps/openmw/mwrender/weaponanimation.cpp +++ b/apps/openmw/mwrender/weaponanimation.cpp @@ -14,7 +14,6 @@ #include "../mwworld/inventorystore.hpp" #include "../mwmechanics/combat.hpp" -#include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/weapontype.hpp" #include "animation.hpp" diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp index caef3e0e88..32d7e46527 100644 --- a/apps/openmw/mwscript/animationextensions.cpp +++ b/apps/openmw/mwscript/animationextensions.cpp @@ -12,7 +12,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/mechanicsmanager.hpp" -#include "interpretercontext.hpp" #include "ref.hpp" namespace MWScript diff --git a/apps/openmw/mwscript/compilercontext.cpp b/apps/openmw/mwscript/compilercontext.cpp index d817b93a23..01f2ea73be 100644 --- a/apps/openmw/mwscript/compilercontext.cpp +++ b/apps/openmw/mwscript/compilercontext.cpp @@ -3,9 +3,26 @@ #include "../mwworld/esmstore.hpp" #include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include "../mwbase/environment.hpp" #include "../mwbase/scriptmanager.hpp" diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp index c9ef6785b6..925cba1502 100644 --- a/apps/openmw/mwscript/containerextensions.cpp +++ b/apps/openmw/mwscript/containerextensions.cpp @@ -22,8 +22,6 @@ #include "../mwbase/windowmanager.hpp" #include "../mwbase/world.hpp" -#include "../mwclass/container.hpp" - #include "../mwworld/action.hpp" #include "../mwworld/class.hpp" #include "../mwworld/containerstore.hpp" diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp index 158fc5305b..f081229b75 100644 --- a/apps/openmw/mwscript/globalscripts.cpp +++ b/apps/openmw/mwscript/globalscripts.cpp @@ -7,7 +7,6 @@ #include #include -#include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" #include "../mwbase/environment.hpp" diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp index 30eae77529..f07de289a7 100644 --- a/apps/openmw/mwscript/interpretercontext.cpp +++ b/apps/openmw/mwscript/interpretercontext.cpp @@ -18,7 +18,6 @@ #include "../mwworld/action.hpp" #include "../mwworld/cellstore.hpp" #include "../mwworld/class.hpp" -#include "../mwworld/containerstore.hpp" #include "../mwmechanics/npcstats.hpp" diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp index 754d0e1d7b..e0ffec3c5f 100644 --- a/apps/openmw/mwscript/statsextensions.cpp +++ b/apps/openmw/mwscript/statsextensions.cpp @@ -6,7 +6,6 @@ #include "../mwworld/esmstore.hpp" -#include #include #include #include @@ -28,7 +27,6 @@ #include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/npcstats.hpp" -#include "../mwmechanics/spellcasting.hpp" #include "ref.hpp" diff --git a/apps/openmw/mwscript/userextensions.cpp b/apps/openmw/mwscript/userextensions.cpp index c7dbb46061..91e04e5f1a 100644 --- a/apps/openmw/mwscript/userextensions.cpp +++ b/apps/openmw/mwscript/userextensions.cpp @@ -1,6 +1,5 @@ #include "userextensions.hpp" -#include #include #include diff --git a/apps/openmw/mwsound/efx.h b/apps/openmw/mwsound/efx.h index 83c827f885..718a9f79df 100644 --- a/apps/openmw/mwsound/efx.h +++ b/apps/openmw/mwsound/efx.h @@ -2,7 +2,6 @@ #define AL_EFX_H #include "al.h" -#include "alc.h" #ifdef __cplusplus extern "C" diff --git a/apps/openmw/mwsound/loudness.cpp b/apps/openmw/mwsound/loudness.cpp index 6a5c14730f..b1c1a3f2af 100644 --- a/apps/openmw/mwsound/loudness.cpp +++ b/apps/openmw/mwsound/loudness.cpp @@ -1,11 +1,10 @@ #include "loudness.hpp" #include +#include #include #include -#include "soundmanagerimp.hpp" - namespace MWSound { diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp index b770a9ffcc..8b77ff3f9d 100644 --- a/apps/openmw/mwsound/movieaudiofactory.cpp +++ b/apps/openmw/mwsound/movieaudiofactory.cpp @@ -6,7 +6,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/soundmanager.hpp" -#include "sound.hpp" #include "sound_decoder.hpp" namespace MWSound diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp index 2f29771eef..68c29252f4 100644 --- a/apps/openmw/mwstate/statemanagerimp.cpp +++ b/apps/openmw/mwstate/statemanagerimp.cpp @@ -33,7 +33,6 @@ #include "../mwworld/cellstore.hpp" #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" -#include "../mwworld/player.hpp" #include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/npcstats.hpp" diff --git a/apps/openmw/mwworld/actionapply.cpp b/apps/openmw/mwworld/actionapply.cpp index a05d29bc59..fd33322a4a 100644 --- a/apps/openmw/mwworld/actionapply.cpp +++ b/apps/openmw/mwworld/actionapply.cpp @@ -2,11 +2,6 @@ #include "class.hpp" -#include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" - -#include "../mwworld/containerstore.hpp" - #include "../mwmechanics/actorutil.hpp" namespace MWWorld diff --git a/apps/openmw/mwworld/actioneat.cpp b/apps/openmw/mwworld/actioneat.cpp index e7921bf4e6..b77fe146ef 100644 --- a/apps/openmw/mwworld/actioneat.cpp +++ b/apps/openmw/mwworld/actioneat.cpp @@ -2,8 +2,6 @@ #include -#include "../mwworld/containerstore.hpp" - #include "../mwmechanics/actorutil.hpp" #include "class.hpp" diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp index 352a8fa2b5..666811936d 100644 --- a/apps/openmw/mwworld/actionequip.cpp +++ b/apps/openmw/mwworld/actionequip.cpp @@ -5,11 +5,8 @@ #include "../mwmechanics/actorutil.hpp" -#include - #include "class.hpp" #include "inventorystore.hpp" -#include "player.hpp" namespace MWWorld { diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp index 52ca77c528..518ec9219b 100644 --- a/apps/openmw/mwworld/actionread.cpp +++ b/apps/openmw/mwworld/actionread.cpp @@ -12,7 +12,6 @@ #include "class.hpp" #include "esmstore.hpp" -#include "player.hpp" namespace MWWorld { diff --git a/apps/openmw/mwworld/actionrepair.cpp b/apps/openmw/mwworld/actionrepair.cpp index 132587cc3e..4d5ec2b2ec 100644 --- a/apps/openmw/mwworld/actionrepair.cpp +++ b/apps/openmw/mwworld/actionrepair.cpp @@ -2,7 +2,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/actorutil.hpp" namespace MWWorld diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp index 9c1fc97f30..7fd7cc149d 100644 --- a/apps/openmw/mwworld/cells.cpp +++ b/apps/openmw/mwworld/cells.cpp @@ -13,7 +13,6 @@ #include "../mwbase/world.hpp" #include "cellstore.hpp" -#include "containerstore.hpp" #include "esmstore.hpp" namespace diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp index c4430fbc2a..a93377bca4 100644 --- a/apps/openmw/mwworld/cellstore.cpp +++ b/apps/openmw/mwworld/cellstore.cpp @@ -51,7 +51,6 @@ #include "class.hpp" #include "containerstore.hpp" -#include "esmloader.hpp" #include "esmstore.hpp" #include "ptr.hpp" diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp index 1124267caa..36e214d7f3 100644 --- a/apps/openmw/mwworld/containerstore.cpp +++ b/apps/openmw/mwworld/containerstore.cpp @@ -13,8 +13,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" -#include "../mwmechanics/actorutil.hpp" -#include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/levelledlist.hpp" #include "../mwmechanics/recharge.hpp" diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp index 78d4a460cf..bcaf4aec04 100644 --- a/apps/openmw/mwworld/inventorystore.cpp +++ b/apps/openmw/mwworld/inventorystore.cpp @@ -3,19 +3,13 @@ #include #include -#include #include -#include -#include #include "../mwbase/environment.hpp" -#include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/world.hpp" #include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/npcstats.hpp" -#include "../mwmechanics/spellresistance.hpp" -#include "../mwmechanics/spellutil.hpp" #include "../mwmechanics/weapontype.hpp" #include "class.hpp" diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp index fd5343ba96..9a6ec1d66f 100644 --- a/apps/openmw/mwworld/livecellref.cpp +++ b/apps/openmw/mwworld/livecellref.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include #include diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp index 1bcc8e7560..6292fa3234 100644 --- a/apps/openmw/mwworld/projectilemanager.cpp +++ b/apps/openmw/mwworld/projectilemanager.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include @@ -40,7 +39,6 @@ #include "../mwbase/world.hpp" #include "../mwmechanics/actorutil.hpp" -#include "../mwmechanics/aipackage.hpp" #include "../mwmechanics/combat.hpp" #include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/spellcasting.hpp" diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp index 8dd65361ee..ac9a035a6d 100644 --- a/apps/openmw/mwworld/refdata.cpp +++ b/apps/openmw/mwworld/refdata.cpp @@ -3,7 +3,6 @@ #include #include -#include "cellstore.hpp" #include "customdata.hpp" #include "../mwbase/environment.hpp" diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 026440d254..1a547e9387 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -78,7 +78,6 @@ #include "../mwphysics/actor.hpp" #include "../mwphysics/collisiontype.hpp" -#include "../mwphysics/constants.hpp" #include "../mwphysics/object.hpp" #include "../mwphysics/physicssystem.hpp" diff --git a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp index 31ec70fc33..fb32022010 100644 --- a/apps/openmw_test_suite/detournavigator/gettilespositions.cpp +++ b/apps/openmw_test_suite/detournavigator/gettilespositions.cpp @@ -1,4 +1,3 @@ -#include #include #include diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp index c8b07b715a..66971843b7 100644 --- a/apps/openmw_test_suite/detournavigator/navigator.cpp +++ b/apps/openmw_test_suite/detournavigator/navigator.cpp @@ -2,7 +2,6 @@ #include "settings.hpp" #include -#include #include #include #include diff --git a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp index 40d66e072f..4cf88f5711 100644 --- a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp +++ b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp @@ -1,7 +1,6 @@ #include "generate.hpp" #include -#include #include diff --git a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp index 6cd3b506d9..3bd3deba65 100644 --- a/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp +++ b/apps/openmw_test_suite/detournavigator/navmeshtilescache.cpp @@ -1,13 +1,9 @@ #include "generate.hpp" -#include "operators.hpp" -#include #include #include -#include #include #include -#include #include diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp index 8405513354..89a097820d 100644 --- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp +++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp @@ -1,11 +1,7 @@ #include "operators.hpp" -#include -#include #include #include -#include -#include #include #include diff --git a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp b/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp index 40d26a9fa0..402b2fe80c 100644 --- a/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp +++ b/apps/openmw_test_suite/detournavigator/recastmeshobject.cpp @@ -1,4 +1,3 @@ -#include "operators.hpp" #include #include diff --git a/apps/openmw_test_suite/detournavigator/settingsutils.cpp b/apps/openmw_test_suite/detournavigator/settingsutils.cpp index 31fb8b5fbb..9faa03b075 100644 --- a/apps/openmw_test_suite/detournavigator/settingsutils.cpp +++ b/apps/openmw_test_suite/detournavigator/settingsutils.cpp @@ -1,4 +1,3 @@ -#include "operators.hpp" #include diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp index 54ca8dda3a..f88a7c5aa0 100644 --- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp +++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp @@ -1,4 +1,3 @@ -#include "operators.hpp" #include #include diff --git a/apps/openmw_test_suite/esm/variant.cpp b/apps/openmw_test_suite/esm/variant.cpp index 2a59bf5ea6..3a97d2fe37 100644 --- a/apps/openmw_test_suite/esm/variant.cpp +++ b/apps/openmw_test_suite/esm/variant.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include diff --git a/apps/openmw_test_suite/files/hash.cpp b/apps/openmw_test_suite/files/hash.cpp index 3daf663735..475d166052 100644 --- a/apps/openmw_test_suite/files/hash.cpp +++ b/apps/openmw_test_suite/files/hash.cpp @@ -1,5 +1,4 @@ #include -#include #include #include diff --git a/components/bullethelpers/collisionobject.hpp b/components/bullethelpers/collisionobject.hpp index 7aad534cf1..92b9db39d6 100644 --- a/components/bullethelpers/collisionobject.hpp +++ b/components/bullethelpers/collisionobject.hpp @@ -1,8 +1,6 @@ #ifndef OPENMW_COMPONENTS_BULLETHELPERS_COLLISIONOBJECT_H #define OPENMW_COMPONENTS_BULLETHELPERS_COLLISIONOBJECT_H -#include - #include #include #include diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp index c720d6314f..6f4fa3f0f7 100644 --- a/components/config/gamesettings.cpp +++ b/components/config/gamesettings.cpp @@ -6,9 +6,7 @@ #include #include -#include #include -#include const char Config::GameSettings::sArchiveKey[] = "fallback-archive"; const char Config::GameSettings::sContentKey[] = "content"; diff --git a/components/config/launchersettings.cpp b/components/config/launchersettings.cpp index 743ff56c3a..804f374584 100644 --- a/components/config/launchersettings.cpp +++ b/components/config/launchersettings.cpp @@ -7,8 +7,6 @@ #include -#include -#include #include const char Config::LauncherSettings::sCurrentContentListKey[] = "Profiles/currentprofile"; diff --git a/components/detournavigator/debug.cpp b/components/detournavigator/debug.cpp index f0098cc29c..020fd202ec 100644 --- a/components/detournavigator/debug.cpp +++ b/components/detournavigator/debug.cpp @@ -6,8 +6,6 @@ #include "tilespositionsrange.hpp" #include "version.hpp" -#include - #include #include diff --git a/components/detournavigator/findrandompointaroundcircle.cpp b/components/detournavigator/findrandompointaroundcircle.cpp index c39042edd5..731b2b9226 100644 --- a/components/detournavigator/findrandompointaroundcircle.cpp +++ b/components/detournavigator/findrandompointaroundcircle.cpp @@ -2,8 +2,6 @@ #include "findsmoothpath.hpp" #include "settings.hpp" -#include - #include #include diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp index 30fdb21ef3..9c0531fc42 100644 --- a/components/detournavigator/makenavmesh.cpp +++ b/components/detournavigator/makenavmesh.cpp @@ -14,17 +14,11 @@ #include "settingsutils.hpp" #include "sharednavmesh.hpp" -#include -#include -#include - #include #include #include #include -#include - #include #include #include diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp index 69ad1797a8..b973747c9c 100644 --- a/components/detournavigator/navigatorimpl.cpp +++ b/components/detournavigator/navigatorimpl.cpp @@ -2,7 +2,6 @@ #include "settingsutils.hpp" #include "stats.hpp" -#include #include #include #include diff --git a/components/detournavigator/navmeshcacheitem.cpp b/components/detournavigator/navmeshcacheitem.cpp index 51fee2c21b..388ede272e 100644 --- a/components/detournavigator/navmeshcacheitem.cpp +++ b/components/detournavigator/navmeshcacheitem.cpp @@ -4,8 +4,6 @@ #include "navmeshtileview.hpp" #include "tileposition.hpp" -#include - #include #include diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp index f809c7866e..ac487d3b68 100644 --- a/components/detournavigator/recastmesh.hpp +++ b/components/detournavigator/recastmesh.hpp @@ -5,7 +5,6 @@ #include "objecttransform.hpp" #include "version.hpp" -#include #include #include diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp index c0d7873c78..1684e3e542 100644 --- a/components/detournavigator/recastmeshbuilder.cpp +++ b/components/detournavigator/recastmeshbuilder.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include diff --git a/components/detournavigator/recastmeshobject.cpp b/components/detournavigator/recastmeshobject.cpp index 827bb5806a..a4bd877429 100644 --- a/components/detournavigator/recastmeshobject.cpp +++ b/components/detournavigator/recastmeshobject.cpp @@ -1,7 +1,5 @@ #include "recastmeshobject.hpp" -#include - #include #include diff --git a/components/detournavigator/tilecachedrecastmeshmanager.hpp b/components/detournavigator/tilecachedrecastmeshmanager.hpp index 326d8a2a26..22c1fb649b 100644 --- a/components/detournavigator/tilecachedrecastmeshmanager.hpp +++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp @@ -12,8 +12,6 @@ #include "tileposition.hpp" #include "version.hpp" -#include - #include #include #include diff --git a/components/esm/format.cpp b/components/esm/format.cpp index 7ed109a580..aa869ab998 100644 --- a/components/esm/format.cpp +++ b/components/esm/format.cpp @@ -1,7 +1,6 @@ #include "format.hpp" -#include - +#include #include #include diff --git a/components/esm3/fogstate.cpp b/components/esm3/fogstate.cpp index 20f46e4f5f..270d710cbe 100644 --- a/components/esm3/fogstate.cpp +++ b/components/esm3/fogstate.cpp @@ -8,8 +8,6 @@ #include #include -#include "savedgame.hpp" - namespace ESM { namespace diff --git a/components/esm3/loaddial.cpp b/components/esm3/loaddial.cpp index b1f1136648..c8ac1b40c3 100644 --- a/components/esm3/loaddial.cpp +++ b/components/esm3/loaddial.cpp @@ -1,7 +1,5 @@ #include "loaddial.hpp" -#include - #include "esmreader.hpp" #include "esmwriter.hpp" diff --git a/components/esm3/loadmgef.cpp b/components/esm3/loadmgef.cpp index 1de8066b9c..b3a3c09bae 100644 --- a/components/esm3/loadmgef.cpp +++ b/components/esm3/loadmgef.cpp @@ -2,7 +2,6 @@ #include -#include "components/esm/defs.hpp" #include "esmreader.hpp" #include "esmwriter.hpp" diff --git a/components/esm3/loadskil.cpp b/components/esm3/loadskil.cpp index 7154ae3265..b38d131811 100644 --- a/components/esm3/loadskil.cpp +++ b/components/esm3/loadskil.cpp @@ -2,7 +2,6 @@ #include -#include "components/esm/defs.hpp" #include "esmreader.hpp" #include "esmwriter.hpp" diff --git a/components/esm3/loadtes3.cpp b/components/esm3/loadtes3.cpp index a44b2ffd0e..1a8eb8ef21 100644 --- a/components/esm3/loadtes3.cpp +++ b/components/esm3/loadtes3.cpp @@ -1,6 +1,5 @@ #include "loadtes3.hpp" -#include "components/esm/defs.hpp" #include "components/esm/esmcommon.hpp" #include "esmreader.hpp" #include "esmwriter.hpp" diff --git a/components/esm4/loaddial.hpp b/components/esm4/loaddial.hpp index d073e0baff..6883db915d 100644 --- a/components/esm4/loaddial.hpp +++ b/components/esm4/loaddial.hpp @@ -31,7 +31,6 @@ #include #include -#include "dialogue.hpp" // DialType #include "formid.hpp" namespace ESM4 diff --git a/components/esm4/loadinfo.hpp b/components/esm4/loadinfo.hpp index 0ba27be25e..af87b9f96e 100644 --- a/components/esm4/loadinfo.hpp +++ b/components/esm4/loadinfo.hpp @@ -30,7 +30,6 @@ #include #include -#include "dialogue.hpp" // DialType #include "formid.hpp" #include "script.hpp" // TargetCondition diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp index 0f66c4a4a4..ab5129e0f6 100644 --- a/components/esmloader/load.cpp +++ b/components/esmloader/load.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp index c54d60ef23..b5a4c48ad0 100644 --- a/components/fontloader/fontloader.cpp +++ b/components/fontloader/fontloader.cpp @@ -21,10 +21,8 @@ #include -#include #include -#include #include #include diff --git a/components/fx/parse_constants.hpp b/components/fx/parse_constants.hpp index 3c9e3b59c8..2434287643 100644 --- a/components/fx/parse_constants.hpp +++ b/components/fx/parse_constants.hpp @@ -9,8 +9,6 @@ #include #include -#include - #include "technique.hpp" namespace fx diff --git a/components/fx/pass.cpp b/components/fx/pass.cpp index 3117364b30..7cd54f8dbc 100644 --- a/components/fx/pass.cpp +++ b/components/fx/pass.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include "stateupdater.hpp" diff --git a/components/fx/stateupdater.cpp b/components/fx/stateupdater.cpp index 3bcc967172..42f290eadf 100644 --- a/components/fx/stateupdater.cpp +++ b/components/fx/stateupdater.cpp @@ -3,7 +3,6 @@ #include #include -#include #include namespace fx diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp index ba4463a198..177a25add5 100644 --- a/components/lua_ui/widget.cpp +++ b/components/lua_ui/widget.cpp @@ -3,10 +3,6 @@ #include #include -#include "text.hpp" -#include "textedit.hpp" -#include "window.hpp" - namespace LuaUi { WidgetExtension::WidgetExtension() diff --git a/components/misc/coordinateconverter.hpp b/components/misc/coordinateconverter.hpp index 0750c2221b..16e5f30a4f 100644 --- a/components/misc/coordinateconverter.hpp +++ b/components/misc/coordinateconverter.hpp @@ -1,7 +1,6 @@ #ifndef OPENMW_COMPONENTS_MISC_COORDINATECONVERTER_H #define OPENMW_COMPONENTS_MISC_COORDINATECONVERTER_H -#include #include #include #include diff --git a/components/misc/resourcehelpers.cpp b/components/misc/resourcehelpers.cpp index dc58828360..33c4a0d988 100644 --- a/components/misc/resourcehelpers.cpp +++ b/components/misc/resourcehelpers.cpp @@ -10,7 +10,6 @@ #include #include -#include #include namespace diff --git a/components/misc/rng.cpp b/components/misc/rng.cpp index c1ed4ed95b..8da61b12a2 100644 --- a/components/misc/rng.cpp +++ b/components/misc/rng.cpp @@ -4,8 +4,6 @@ #include #include -#include - namespace Misc::Rng { static Generator sGenerator; diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp index fa3a8def6a..56f59451fa 100644 --- a/components/nifbullet/bulletnifloader.cpp +++ b/components/nifbullet/bulletnifloader.cpp @@ -21,7 +21,6 @@ #include #include -#include namespace { diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp index 373f43aed5..7666fdeb3f 100644 --- a/components/nifosg/controller.hpp +++ b/components/nifosg/controller.hpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp index 126e7b7560..2700b7eb93 100644 --- a/components/nifosg/particle.cpp +++ b/components/nifosg/particle.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include diff --git a/components/resource/foreachbulletobject.cpp b/components/resource/foreachbulletobject.cpp index b7434df3a2..d96f3ee078 100644 --- a/components/resource/foreachbulletobject.cpp +++ b/components/resource/foreachbulletobject.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -12,7 +11,6 @@ #include #include #include -#include #include #include diff --git a/components/resource/foreachbulletobject.hpp b/components/resource/foreachbulletobject.hpp index 6329bdabc1..fe39a8ed8c 100644 --- a/components/resource/foreachbulletobject.hpp +++ b/components/resource/foreachbulletobject.hpp @@ -2,7 +2,6 @@ #define OPENMW_COMPONENTS_RESOURCE_FOREACHBULLETOBJECT_H #include -#include #include #include diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp index 5ef1bf3e9a..2bddff5cfd 100644 --- a/components/resource/stats.cpp +++ b/components/resource/stats.cpp @@ -14,8 +14,6 @@ #include #include -#include - #include namespace Resource diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp index 819834b0a6..bc3844ed8d 100644 --- a/components/sceneutil/attach.cpp +++ b/components/sceneutil/attach.cpp @@ -9,9 +9,6 @@ #include #include -#include -#include - #include #include diff --git a/components/sceneutil/extradata.cpp b/components/sceneutil/extradata.cpp index 850c2f883b..e36efbad9c 100644 --- a/components/sceneutil/extradata.cpp +++ b/components/sceneutil/extradata.cpp @@ -11,11 +11,8 @@ #include #include #include -#include #include -#include - namespace SceneUtil { void ProcessExtraDataVisitor::setupSoftEffect(osg::Node& node, float size, bool falloff) diff --git a/components/sceneutil/keyframe.hpp b/components/sceneutil/keyframe.hpp index 9e44f2ad7b..3ea862d213 100644 --- a/components/sceneutil/keyframe.hpp +++ b/components/sceneutil/keyframe.hpp @@ -5,7 +5,6 @@ #include -#include #include #include diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp index 87fac9c6e7..06b693a6ca 100644 --- a/components/sceneutil/osgacontroller.cpp +++ b/components/sceneutil/osgacontroller.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include #include diff --git a/components/sceneutil/util.cpp b/components/sceneutil/util.cpp index 17e4aa9008..7b921d15f4 100644 --- a/components/sceneutil/util.cpp +++ b/components/sceneutil/util.cpp @@ -14,7 +14,6 @@ #include #include -#include namespace SceneUtil { diff --git a/components/stereo/frustum.cpp b/components/stereo/frustum.cpp index 54f2cb723f..e99402e179 100644 --- a/components/stereo/frustum.cpp +++ b/components/stereo/frustum.cpp @@ -1,5 +1,4 @@ #include "multiview.hpp" -#include "stereomanager.hpp" #include #include @@ -16,14 +15,7 @@ #include #include -#include - -#include -#include #include -#include -#include -#include #include diff --git a/components/stereo/frustum.hpp b/components/stereo/frustum.hpp index e1cc03dc4c..c3abdd87d2 100644 --- a/components/stereo/frustum.hpp +++ b/components/stereo/frustum.hpp @@ -11,8 +11,6 @@ #include #include -#include - namespace osg { class FrameBufferObject; diff --git a/components/stereo/stereomanager.cpp b/components/stereo/stereomanager.cpp index 55e11d35aa..f8e24cfc07 100644 --- a/components/stereo/stereomanager.cpp +++ b/components/stereo/stereomanager.cpp @@ -17,14 +17,10 @@ #include #include -#include #include -#include #include #include -#include -#include #include diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp index c59756a835..fb4b49dbfe 100644 --- a/components/terrain/terraingrid.cpp +++ b/components/terrain/terraingrid.cpp @@ -6,7 +6,6 @@ #include #include "chunkmanager.hpp" -#include "compositemaprenderer.hpp" #include "heightcull.hpp" #include "storage.hpp" #include "view.hpp" diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp index 04665118b3..e5ade45c27 100644 --- a/components/terrain/world.hpp +++ b/components/terrain/world.hpp @@ -8,8 +8,6 @@ #include #include -#include - #include "cellborder.hpp" namespace osg