diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 6f643aa68..df45b7133 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -12,13 +12,13 @@
 #include "creaturestats.hpp"
 #include "npcstats.hpp"
 
-#include "OgreMath.h"
+#include <OgreMath.h>
 
 namespace
 {
-    static float sgn(float a)
+    static float sgn(Ogre::Radian a)
     {
-        if(a > 0)
+        if(a.valueDegrees() > 0)
             return 1.0;
         return -1.0;
     }
@@ -106,7 +106,7 @@ namespace MWMechanics
             float directionY = dest.mY - start.mY;
             float directionResult = sqrt(directionX * directionX + directionY * directionY);
 
-            zAngle = Ogre::Radian( acos(directionY / directionResult) * sgn(asin(directionX / directionResult)) ).valueDegrees();
+            zAngle = Ogre::Radian( Ogre::Math::ACos(directionY / directionResult) * sgn(Ogre::Math::ASin(directionX / directionResult)) ).valueDegrees();
             // TODO: use movement settings instead of rotating directly
             MWBase::Environment::get().getWorld()->rotateObject(actor, 0, 0, zAngle, false);
 
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index ff266f9ae..18e66d228 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -53,9 +53,9 @@ namespace
         return sqrt(x * x + y * y + z * z);
     }
 
-    static float sgn(float a)
+    static float sgn(Ogre::Radian a)
     {
-        if(a > 0)
+        if(a.valueRadians() > 0)
             return 1.0;
         return -1.0;
     }
@@ -196,7 +196,7 @@ namespace MWMechanics
         float directionY = nextPoint.mY - y;
         float directionResult = sqrt(directionX * directionX + directionY * directionY);
 
-        return Ogre::Radian(acos(directionY / directionResult) * sgn(asin(directionX / directionResult))).valueDegrees();
+        return Ogre::Radian(Ogre::Math::ACos(directionY / directionResult) * sgn(Ogre::Math::ASin(directionX / directionResult))).valueDegrees();
     }
 
     bool PathFinder::checkWaypoint(float x, float y, float z)