Remove redundant includes

apps/openmw/engine.cpp

@@ -37,7 +37,6 @@
 #include "mwgui/windowmanagerimp.hpp"
 
 #include "mwscript/scriptmanagerimp.hpp"
-#include "mwscript/extensions.hpp"
 #include "mwscript/interpretercontext.hpp"
 
 #include "mwsound/soundmanagerimp.hpp"

apps/openmw/mwclass/activator.cpp

@@ -5,7 +5,6 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/cellstore.hpp"

apps/openmw/mwclass/actor.cpp

@@ -4,7 +4,6 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"

apps/openmw/mwclass/apparatus.cpp

@@ -3,11 +3,9 @@
 #include <components/esm/loadappa.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionalchemy.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwphysics/physicssystem.hpp"

apps/openmw/mwclass/armor.cpp

@@ -9,7 +9,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"

apps/openmw/mwclass/clothing.cpp

@@ -7,7 +7,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"

apps/openmw/mwclass/container.cpp

@@ -6,7 +6,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/ptr.hpp"

apps/openmw/mwclass/door.cpp

@@ -7,10 +7,8 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/nullaction.hpp"
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/actionteleport.hpp"
 #include "../mwworld/actiondoor.hpp"

apps/openmw/mwclass/ingredient.cpp

@@ -7,7 +7,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwphysics/physicssystem.hpp"

apps/openmw/mwclass/light.cpp

@@ -5,20 +5,16 @@
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/nullaction.hpp"
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwphysics/physicssystem.hpp"
-#include "../mwworld/customdata.hpp"
 
 #include "../mwgui/tooltips.hpp"
 

apps/openmw/mwclass/lockpick.cpp

@@ -4,11 +4,9 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"

apps/openmw/mwclass/misc.cpp

@@ -7,7 +7,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwphysics/physicssystem.hpp"

apps/openmw/mwclass/potion.cpp

@@ -7,11 +7,9 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionapply.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/containerstore.hpp"
 #include "../mwphysics/physicssystem.hpp"
 #include "../mwworld/nullaction.hpp"
 

apps/openmw/mwclass/probe.cpp

@@ -4,11 +4,9 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"

apps/openmw/mwclass/repair.cpp

@@ -3,14 +3,11 @@
 #include <components/esm/loadrepa.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwphysics/physicssystem.hpp"
-#include "../mwworld/nullaction.hpp"
 #include "../mwworld/actionrepair.hpp"
 
 #include "../mwgui/tooltips.hpp"

apps/openmw/mwclass/weapon.cpp

@@ -10,7 +10,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -1,9 +1,6 @@
 #include "dialoguemanagerimp.hpp"
 
-#include <cctype>
-#include <cstdlib>
 #include <algorithm>
-#include <iterator>
 #include <list>
 
 #include <components/debug/debuglog.hpp>

apps/openmw/mwdialogue/scripttest.cpp

@@ -15,7 +15,6 @@
 #include <components/compiler/streamerrorhandler.hpp>
 #include <components/compiler/scanner.hpp>
 #include <components/compiler/locals.hpp>
-#include <components/compiler/output.hpp>
 #include <components/compiler/scriptparser.hpp>
 
 #include "filter.hpp"

apps/openmw/mwdialogue/selectwrapper.cpp

@@ -1,9 +1,6 @@
 #include "selectwrapper.hpp"
 
-#include <cctype>
-
 #include <stdexcept>
-#include <algorithm>
 #include <sstream>
 #include <iterator>
 

apps/openmw/mwgui/container.cpp

@@ -6,7 +6,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/class.hpp"
@@ -18,7 +17,6 @@
 #include "inventorywindow.hpp"
 
 #include "itemview.hpp"
-#include "itemwidget.hpp"
 #include "inventoryitemmodel.hpp"
 #include "containeritemmodel.hpp"
 #include "sortfilteritemmodel.hpp"

apps/openmw/mwgui/containeritemmodel.cpp

@@ -13,8 +13,6 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwmechanics/actorutil.hpp"
-
 namespace
 {
 

apps/openmw/mwgui/formatting.cpp

@@ -4,14 +4,12 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_ImageBox.h>
-#include <MyGUI_FontManager.h>
 
 // correctBookartPath
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/predicate.hpp>
 
 #include <components/debug/debuglog.hpp>
 #include <components/interpreter/defines.hpp>

apps/openmw/mwgui/hud.cpp

@@ -25,7 +25,6 @@
 #include "itemmodel.hpp"
 #include "draganddrop.hpp"
 
-#include "itemmodel.hpp"
 #include "itemwidget.hpp"
 
 namespace MWGui

apps/openmw/mwgui/itemmodel.cpp

@@ -1,13 +1,9 @@
 #include "itemmodel.hpp"
 
-#include <set>
-
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/store.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 

apps/openmw/mwgui/journalbooks.cpp

@@ -1,7 +1,5 @@
 #include "journalbooks.hpp"
 
-#include <MyGUI_LanguageManager.h>
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 

apps/openmw/mwgui/journalwindow.cpp

@@ -1,6 +1,5 @@
 #include "journalwindow.hpp"
 
-#include <sstream>
 #include <set>
 #include <stack>
 #include <string>

apps/openmw/mwgui/levelupdialog.cpp

@@ -12,7 +12,6 @@
 #include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"

apps/openmw/mwgui/timeadvancer.cpp

@@ -1,8 +1,5 @@
 #include "timeadvancer.hpp"
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
 namespace MWGui
 {
     TimeAdvancer::TimeAdvancer(float delay)

apps/openmw/mwgui/windowbase.cpp

@@ -3,8 +3,6 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_RenderManager.h>
 
-#include <components/settings/settings.hpp>
-
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -1,13 +1,11 @@
 #include "windowmanagerimp.hpp"
 
 #include <cassert>
-#include <iterator>
 
 #include <osgViewer/Viewer>
 
 #include <MyGUI_UString.h>
 #include <MyGUI_IPointer.h>
-#include <MyGUI_ResourceImageSetPointer.h>
 #include <MyGUI_TextureUtility.h>
 #include <MyGUI_FactoryManager.h>
 #include <MyGUI_LanguageManager.h>
@@ -38,7 +36,6 @@
 #include <components/translation/translation.hpp>
 
 #include <components/myguiplatform/myguiplatform.hpp>
-#include <components/myguiplatform/myguidatamanager.hpp>
 #include <components/myguiplatform/myguirendermanager.hpp>
 #include <components/myguiplatform/additivelayer.hpp>
 #include <components/myguiplatform/scalinglayer.hpp>
@@ -47,8 +44,6 @@
 
 #include <components/widgets/tags.hpp>
 
-#include <components/sdlutil/sdlcursormanager.hpp>
-
 #include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/inputmanager.hpp"

apps/openmw/mwmechanics/aiactivate.cpp

@@ -8,7 +8,6 @@
 #include "../mwworld/class.hpp"
 
 #include "creaturestats.hpp"
-#include "steering.hpp"
 #include "movement.hpp"
 
 namespace MWMechanics

apps/openmw/mwmechanics/aicast.cpp

@@ -8,7 +8,6 @@
 
 #include "aicombataction.hpp"
 #include "creaturestats.hpp"
-#include "spellcasting.hpp"
 #include "steering.hpp"
 
 MWMechanics::AiCast::AiCast(const std::string& targetId, const std::string& spellId, bool manualSpell)

apps/openmw/mwmechanics/aicombat.cpp

@@ -15,15 +15,12 @@
 #include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwrender/animation.hpp"
-
 #include "pathgrid.hpp"
 #include "creaturestats.hpp"
 #include "steering.hpp"
 #include "movement.hpp"
 #include "character.hpp"
 #include "aicombataction.hpp"
-#include "combat.hpp"
 #include "coordinateconverter.hpp"
 #include "actorutil.hpp"
 

apps/openmw/mwmechanics/aiescort.cpp

@@ -11,7 +11,6 @@
 #include "../mwworld/cellstore.hpp"
 
 #include "creaturestats.hpp"
-#include "steering.hpp"
 #include "movement.hpp"
 
 /*

apps/openmw/mwmechanics/aipackage.cpp

@@ -1,7 +1,5 @@
 #include "aipackage.hpp"
 
-#include <cmath>
-
 #include <components/esm/loadcell.hpp>
 #include <components/esm/loadland.hpp>
 #include <components/esm/loadmgef.hpp>

apps/openmw/mwmechanics/aipursue.cpp

@@ -1,7 +1,6 @@
 #include "aipursue.hpp"
 
 #include <components/esm/aisequence.hpp>
-#include <components/esm/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwmechanics/aisequence.cpp

@@ -5,7 +5,6 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm/aisequence.hpp>
 
-#include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
 #include "aipackage.hpp"

apps/openmw/mwmechanics/aitravel.cpp

@@ -1,7 +1,6 @@
 #include "aitravel.hpp"
 
 #include <components/esm/aisequence.hpp>
-#include <components/esm/loadcell.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -10,7 +9,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 
-#include "steering.hpp"
 #include "movement.hpp"
 #include "creaturestats.hpp"
 

apps/openmw/mwmechanics/alchemy.cpp

@@ -1,7 +1,6 @@
 #include "alchemy.hpp"
 
 #include <cassert>
-#include <cstdlib>
 #include <cmath>
 
 #include <algorithm>

apps/openmw/mwmechanics/magiceffects.cpp

@@ -1,7 +1,5 @@
 #include "magiceffects.hpp"
 
-#include <cstdlib>
-
 #include <stdexcept>
 
 #include <components/esm/effectlist.hpp>

apps/openmw/mwmechanics/mechanicsmanagerimp.cpp

@@ -21,7 +21,6 @@
 
 #include "aicombat.hpp"
 #include "aipursue.hpp"
-#include "aitravel.hpp"
 #include "spellcasting.hpp"
 #include "autocalcspell.hpp"
 #include "npcstats.hpp"

apps/openmw/mwmechanics/npcstats.cpp

@@ -9,7 +9,6 @@
 #include <components/esm/loadfact.hpp>
 #include <components/esm/npcstats.hpp>
 
-#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"

apps/openmw/mwmechanics/obstacle.cpp

@@ -1,9 +1,7 @@
 #include "obstacle.hpp"
 
-#include <components/esm/loadcell.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 

apps/openmw/mwmechanics/repair.cpp

@@ -6,7 +6,6 @@
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/containerstore.hpp"

apps/openmw/mwmechanics/security.cpp

@@ -8,7 +8,6 @@
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "creaturestats.hpp"

apps/openmw/mwmechanics/spellcasting.cpp

@@ -23,7 +23,6 @@
 #include "../mwworld/inventorystore.hpp"
 
 #include "../mwrender/animation.hpp"
-#include "../mwrender/vismask.hpp"
 
 #include "npcstats.hpp"
 #include "actorutil.hpp"

apps/openmw/mwmechanics/spellpriority.cpp

@@ -12,12 +12,10 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/actionequip.hpp"
 #include "../mwworld/cellstore.hpp"
 
 #include "creaturestats.hpp"
 #include "spellcasting.hpp"
-#include "combat.hpp"
 
 namespace
 {

apps/openmw/mwmechanics/spells.cpp

@@ -1,7 +1,5 @@
 #include "spells.hpp"
 
-#include <cstdlib>
-
 #include <components/esm/loadspel.hpp>
 #include <components/esm/spellstate.hpp>
 #include <components/misc/rng.hpp>

apps/openmw/mwmechanics/weaponpriority.cpp

@@ -1,7 +1,6 @@
 #include "weaponpriority.hpp"
 
 #include <components/esm/loadench.hpp>
-#include <components/esm/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwphysics/object.cpp

@@ -6,8 +6,6 @@
 #include <components/resource/bulletshape.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
-#include <osg/Object>
-
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>

apps/openmw/mwphysics/physicssystem.cpp

@@ -1,15 +1,7 @@
 #include "physicssystem.hpp"
 
-#include <stdexcept>
-#include <unordered_map>
-#include <fstream>
-#include <array>
-
-#include <boost/optional.hpp>
-
 #include <osg/Group>
 
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btConeShape.h>
 #include <BulletCollision/CollisionShapes/btSphereShape.h>
 #include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
@@ -21,12 +13,6 @@
 
 #include <LinearMath/btQuickprof.h>
 
-#include <DetourCommon.h>
-#include <DetourNavMesh.h>
-#include <DetourNavMeshBuilder.h>
-#include <DetourNavMeshQuery.h>
-#include <Recast.h>
-
 #include <components/nifbullet/bulletnifloader.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/bulletshapemanager.hpp>
@@ -50,9 +36,6 @@
 
 #include "../mwrender/bulletdebugdraw.hpp"
 
-#include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
-
 #include "../mwworld/class.hpp"
 
 #include "collisiontype.hpp"

apps/openmw/mwphysics/trace.cpp

@@ -1,7 +1,5 @@
 #include "trace.h"
 
-#include <map>
-
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 #include <BulletCollision/CollisionShapes/btConvexShape.h>
 

apps/openmw/mwrender/npcanimation.cpp

@@ -19,7 +19,6 @@
 #include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/skeleton.hpp>
-#include <components/sceneutil/lightmanager.hpp>
 
 #include <components/settings/settings.hpp>
 

apps/openmw/mwrender/objects.hpp

@@ -2,7 +2,6 @@
 #define GAME_RENDER_OBJECTS_H
 
 #include <map>
-#include <memory>
 #include <string>
 
 #include <osg/ref_ptr>

apps/openmw/mwrender/pathgrid.cpp

@@ -6,14 +6,12 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/Group>
 
-#include <components/esm/loadstat.hpp>
 #include <components/esm/loadpgrd.hpp>
 #include <components/sceneutil/pathgridutil.hpp>
 
 #include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone
 #include "../mwbase/environment.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwmechanics/pathfinding.hpp"

apps/openmw/mwrender/pathgrid.hpp

@@ -4,7 +4,6 @@
 #include <utility>
 
 #include <vector>
-#include <string>
 #include <map>
 
 #include <osg/ref_ptr>

apps/openmw/mwrender/renderingmanager.cpp

@@ -1,6 +1,5 @@
 #include "renderingmanager.hpp"
 
-#include <stdexcept>
 #include <limits>
 #include <cstdlib>
 

apps/openmw/mwrender/renderingmanager.hpp

@@ -13,6 +13,7 @@
 #include "rendermode.hpp"
 
 #include <deque>
+#include <memory>
 
 namespace osg
 {

apps/openmw/mwrender/sky.hpp

@@ -4,7 +4,6 @@
 #include <string>
 #include <memory>
 #include <vector>
-#include <iostream>
 
 #include <osg/ref_ptr>
 #include <osg/Vec4f>

apps/openmw/mwscript/animationextensions.cpp

@@ -3,7 +3,6 @@
 #include <stdexcept>
 #include <limits>
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>

apps/openmw/mwscript/cellextensions.cpp

@@ -4,7 +4,6 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>

apps/openmw/mwscript/consoleextensions.cpp

@@ -1,11 +1,6 @@
 #include "consoleextensions.hpp"
 
-#include <components/compiler/extensions.hpp>
-#include <components/compiler/opcodes.hpp>
-
 #include <components/interpreter/interpreter.hpp>
-#include <components/interpreter/runtime.hpp>
-#include <components/interpreter/opcodes.hpp>
 
 namespace MWScript
 {

apps/openmw/mwscript/containerextensions.cpp

@@ -8,7 +8,6 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
@@ -22,14 +21,13 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/actionequip.hpp"
+#include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
-#include "interpretercontext.hpp"
 #include "ref.hpp"
 
 namespace MWScript

apps/openmw/mwscript/globalscripts.cpp

@@ -1,7 +1,5 @@
 #include "globalscripts.hpp"
 
-#include <cassert>
-
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/esm/esmwriter.hpp>

apps/openmw/mwscript/guiextensions.cpp

@@ -1,6 +1,5 @@
 #include "guiextensions.hpp"
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>

apps/openmw/mwscript/interpretercontext.cpp

@@ -4,8 +4,6 @@
 #include <stdexcept>
 #include <sstream>
 
-#include <components/interpreter/types.hpp>
-
 #include <components/compiler/locals.hpp>
 
 #include <components/esm/cellid.hpp>
@@ -18,6 +16,7 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
 
+#include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/containerstore.hpp"

apps/openmw/mwscript/interpretercontext.hpp

@@ -4,7 +4,6 @@
 #include <components/interpreter/context.hpp>
 
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/action.hpp"
 
 namespace MWSound
 {

apps/openmw/mwscript/locals.cpp

@@ -13,8 +13,6 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include <iostream>
-
 namespace MWScript
 {
     void Locals::ensure (const std::string& scriptName)

apps/openmw/mwscript/miscextensions.cpp

@@ -2,7 +2,6 @@
 
 #include <cstdlib>
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 #include <components/compiler/locals.hpp>
 

apps/openmw/mwscript/skyextensions.cpp

@@ -2,7 +2,6 @@
 
 #include <algorithm>
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>

apps/openmw/mwscript/soundextensions.cpp

@@ -1,6 +1,5 @@
-#include "extensions.hpp"
+#include "soundextensions.hpp"
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>

apps/openmw/mwscript/statsextensions.cpp

@@ -14,7 +14,6 @@
 #include <components/interpreter/opcodes.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -27,7 +26,6 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
-#include "interpretercontext.hpp"
 #include "ref.hpp"
 
 namespace

apps/openmw/mwscript/transformationextensions.cpp

@@ -4,7 +4,6 @@
 
 #include <components/esm/loadcell.hpp>
 
-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
 #include <components/interpreter/interpreter.hpp>
@@ -18,7 +17,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 

apps/openmw/mwsound/movieaudiofactory.cpp

@@ -1,7 +1,5 @@
 #include "movieaudiofactory.hpp"
 
-#include <iostream>
-
 #include <extern/osg-ffmpeg-videoplayer/audiodecoder.hpp>
 #include <extern/osg-ffmpeg-videoplayer/videostate.hpp>
 

apps/openmw/mwsound/openal_output.cpp

@@ -1,5 +1,4 @@
 #include <algorithm>
-#include <stdexcept>
 #include <cstring>
 #include <vector>
 #include <memory>

apps/openmw/mwstate/character.cpp

@@ -1,5 +1,6 @@
 #include "character.hpp"
 
+#include <cctype>
 #include <sstream>
 
 #include <boost/filesystem.hpp>

apps/openmw/mwstate/charactermanager.cpp

@@ -1,5 +1,6 @@
 #include "charactermanager.hpp"
 
+#include <cctype>
 #include <sstream>
 
 #include <boost/filesystem.hpp>
@@ -58,7 +59,7 @@ MWState::Character* MWState::CharacterManager::createCharacter(const std::string
     // The character name is user-supplied, so we need to escape the path
     for (std::string::const_iterator it = name.begin(); it != name.end(); ++it)
     {
-        if (isalnum(*it)) // Ignores multibyte characters and non alphanumeric characters
+        if (std::isalnum(*it)) // Ignores multibyte characters and non alphanumeric characters
             stream << *it;
         else
             stream << "_";

apps/openmw/mwstate/statemanagerimp.cpp

@@ -32,7 +32,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/inventorystore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"

apps/openmw/mwworld/actionrepair.cpp

@@ -3,7 +3,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwworld/player.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
 namespace MWWorld

apps/openmw/mwworld/cellpreloader.cpp

@@ -10,9 +10,7 @@
 #include <components/resource/keyframemanager.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
-#include <components/nifosg/nifloader.hpp>
 #include <components/terrain/world.hpp>
-#include <components/esmterrain/storage.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
 #include <components/esm/loadcell.hpp>
 

apps/openmw/mwworld/cells.cpp

@@ -11,7 +11,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
-#include "class.hpp"
 #include "esmstore.hpp"
 #include "containerstore.hpp"
 #include "cellstore.hpp"

apps/openmw/mwworld/class.cpp

@@ -20,7 +20,6 @@
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/magiceffects.hpp"
 
 namespace MWWorld
 {

apps/openmw/mwworld/contentloader.hpp

@@ -1,7 +1,6 @@
 #ifndef CONTENTLOADER_HPP
 #define CONTENTLOADER_HPP
 
-#include <iosfwd>
 #include <boost/filesystem/path.hpp>
 #include <MyGUI_TextIterator.h>
 

apps/openmw/mwworld/inventorystore.cpp

@@ -12,9 +12,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/windowmanager.hpp"
-
-#include "../mwgui/inventorywindow.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellcasting.hpp"

apps/openmw/mwworld/player.cpp

@@ -15,7 +15,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwmechanics/movement.hpp"

apps/openmw/mwworld/projectilemanager.cpp

@@ -34,7 +34,6 @@
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/aipackage.hpp"
 
-#include "../mwrender/effectmanager.hpp"
 #include "../mwrender/animation.hpp"
 #include "../mwrender/vismask.hpp"
 #include "../mwrender/renderingmanager.hpp"

apps/openmw/mwworld/scene.cpp

@@ -4,7 +4,6 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 
 #include <components/debug/debuglog.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>

apps/openmw/mwworld/weather.cpp

@@ -4,7 +4,6 @@
 
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
-#include <components/esm/savedgame.hpp>
 #include <components/esm/weatherstate.hpp>
 
 #include "../mwbase/environment.hpp"

apps/openmw/mwworld/worldimp.cpp

@@ -35,7 +35,6 @@
 #include "../mwbase/scriptmanager.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/movement.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/spellcasting.hpp"
 #include "../mwmechanics/levelledlist.hpp"
@@ -48,7 +47,6 @@
 #include "../mwrender/camera.hpp"
 #include "../mwrender/vismask.hpp"
 
-#include "../mwscript/interpretercontext.hpp"
 #include "../mwscript/globalscripts.hpp"
 
 #include "../mwclass/door.hpp"

components/compiler/locals.cpp

@@ -1,6 +1,5 @@
 #include "locals.hpp"
 
-#include <cassert>
 #include <stdexcept>
 #include <algorithm>
 #include <ostream>

components/compiler/parser.cpp

@@ -1,9 +1,5 @@
 #include "parser.hpp"
 
-#include <cctype>
-#include <algorithm>
-#include <iterator>
-
 #include "errorhandler.hpp"
 #include "exception.hpp"
 #include "scanner.hpp"

components/compiler/scanner.cpp

@@ -3,7 +3,6 @@
 #include <cassert>
 #include <cctype>
 #include <sstream>
-#include <algorithm>
 #include <iterator>
 
 #include "exception.hpp"

components/contentselector/view/combobox.cpp

@@ -1,7 +1,4 @@
-#include <QRegExpValidator>
-#include <QLineEdit>
 #include <QString>
-#include <QApplication>
 #include <QKeyEvent>
 
 #include "combobox.hpp"

components/contentselector/view/contentselector.cpp

@@ -8,10 +8,7 @@
 #include <QContextMenuEvent>
 
 #include <QClipboard>
-#include <QGridLayout>
-#include <QMessageBox>
 #include <QModelIndex>
-#include <QDir>
 
 ContentSelectorView::ContentSelector::ContentSelector(QWidget *parent) :
     QObject(parent)

components/detournavigator/asyncnavmeshupdater.cpp

@@ -5,8 +5,6 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <iostream>
-
 namespace
 {
     using DetourNavigator::ChangeType;

components/detournavigator/makenavmesh.cpp

@@ -7,7 +7,6 @@
 #include "settings.hpp"
 #include "settingsutils.hpp"
 #include "sharednavmesh.hpp"
-#include "settingsutils.hpp"
 #include "flags.hpp"
 #include "navmeshtilescache.hpp"
 

components/detournavigator/navmeshmanager.cpp

@@ -5,14 +5,9 @@
 #include "makenavmesh.hpp"
 #include "navmeshcacheitem.hpp"
 #include "settings.hpp"
-#include "sharednavmesh.hpp"
 
 #include <DetourNavMesh.h>
 
-#include <BulletCollision/CollisionShapes/btConcaveShape.h>
-
-#include <iostream>
-
 namespace
 {
     using DetourNavigator::ChangeType;

components/detournavigator/navmeshtilescache.cpp

@@ -1,8 +1,6 @@
 #include "navmeshtilescache.hpp"
 #include "exceptions.hpp"
 
-#include <iostream>
-
 namespace DetourNavigator
 {
     namespace

components/detournavigator/recastmeshmanager.cpp

@@ -1,6 +1,5 @@
 #include "recastmeshmanager.hpp"
 
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 
 namespace DetourNavigator

components/detournavigator/recastmeshobject.cpp

@@ -5,7 +5,6 @@
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
 #include <cassert>
-#include <numeric>
 
 namespace DetourNavigator
 {