diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index b7722d1f3..0f85cc3bf 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -1,8 +1,6 @@
 #ifndef MWRENDER_CHARACTERPREVIEW_H
 #define MWRENDER_CHARACTERPREVIEW_H
 
-#include <OgreVector3.h>
-
 #include <osg/ref_ptr>
 
 #include <components/esm/loadnpc.hpp>
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index e15dee532..810fc8b19 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -145,16 +145,6 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
     */
 }
 
-/*
-void CreatureWeaponAnimation::configureAddedObject(NifOgre::ObjectScenePtr object, MWWorld::Ptr ptr, int slot)
-{
-    //Ogre::Vector3 glowColor = getEnchantmentColor(ptr);
-
-    //setRenderProperties(object, RV_Actors, RQG_Main, RQG_Alpha, 0,
-    //                    !ptr.getClass().getEnchantment(ptr).empty(), &glowColor);
-}
-*/
-
 void CreatureWeaponAnimation::attachArrow()
 {
     //WeaponAnimation::attachArrow(mPtr);
@@ -167,14 +157,14 @@ void CreatureWeaponAnimation::releaseArrow()
 
 osg::Vec3f CreatureWeaponAnimation::runAnimation(float duration)
 {
-    /*
-    Ogre::Vector3 ret = Animation::runAnimation(duration);
+    osg::Vec3f ret = Animation::runAnimation(duration);
 
+    /*
     if (mSkelBase)
         pitchSkeleton(mPtr.getRefData().getPosition().rot[0], mSkelBase->getSkeleton());
     */
 
-    return osg::Vec3f();
+    return ret;
 }
 
 }
diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp
index 298dc97bb..716192959 100644
--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@@ -63,9 +63,6 @@ public:
 
     Animation* getAnimation(const MWWorld::Ptr &ptr);
 
-    //Ogre::AxisAlignedBox getDimensions(MWWorld::CellStore*);
-    ///< get a bounding box that encloses all objects in the specified cell
-
     bool removeObject (const MWWorld::Ptr& ptr);
     ///< \return found?
 
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 2f3a87c5b..6b432ae5e 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -799,7 +799,7 @@ void SkyManager::sunDisable()
     mSun->setVisible(false);
 }
 
-void SkyManager::setStormDirection(const Ogre::Vector3 &direction)
+void SkyManager::setStormDirection(const osg::Vec3f &direction)
 {
     mStormDirection = direction;
 }
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index ebf3ee87f..652de28b4 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -59,7 +59,7 @@ namespace MWRender
 
         void setRainSpeed(float speed);
 
-        void setStormDirection(const Ogre::Vector3& direction);
+        void setStormDirection(const osg::Vec3f& direction);
 
         void setSunDirection(const osg::Vec3f& direction);
 
@@ -123,11 +123,11 @@ namespace MWRender
 
         float mRainTimer;
 
-        Ogre::Vector3 mStormDirection;
+        osg::Vec3f mStormDirection;
 
         // remember some settings so we don't have to apply them again if they didnt change
-        Ogre::String mClouds;
-        Ogre::String mNextClouds;
+        std::string mClouds;
+        std::string mNextClouds;
         float mCloudBlendFactor;
         float mCloudOpacity;
         float mCloudSpeed;
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index b37a38353..655e0a073 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -420,7 +420,7 @@ void WeatherManager::update(float duration, bool paused)
 
         mStormDirection = (playerPos - redMountainPos);
         mStormDirection.z() = 0;
-        //mRendering->getSkyManager()->setStormDirection(mStormDirection);
+        mRendering->getSkyManager()->setStormDirection(mStormDirection);
     }
 
     mRendering->configureFog(mResult.mFogDepth, mResult.mFogColor);