diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index afe34218e4..7b846cb975 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -806,7 +806,7 @@ namespace MWMechanics
 
     void AiWander::SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos)
     {
-        float distanceToClosestNode = FLT_MAX;
+        float distanceToClosestNode = std::numeric_limits<float>::max();
         unsigned int index = 0;
         for (unsigned int counterThree = 0; counterThree < mAllowedNodes.size(); counterThree++)
         {
diff --git a/apps/openmw/mwmechanics/autocalcspell.cpp b/apps/openmw/mwmechanics/autocalcspell.cpp
index e4b1438260..b798ff5dce 100644
--- a/apps/openmw/mwmechanics/autocalcspell.cpp
+++ b/apps/openmw/mwmechanics/autocalcspell.cpp
@@ -1,6 +1,7 @@
 #include "autocalcspell.hpp"
 
 #include <climits>
+#include <limits>
 
 #include "../mwworld/esmstore.hpp"
 
@@ -181,7 +182,7 @@ namespace MWMechanics
 
     void calcWeakestSchool (const ESM::Spell* spell, const int* actorSkills, int& effectiveSchool, float& skillTerm)
     {
-        float minChance = FLT_MAX;
+        float minChance = std::numeric_limits<float>::max();
 
         const ESM::EffectList& effects = spell->mEffects;
         for (std::vector<ESM::ENAMstruct>::const_iterator it = effects.mList.begin(); it != effects.mList.end(); ++it)
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 9013d32699..f53badbf46 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -1,4 +1,5 @@
 #include "pathfinding.hpp"
+#include <limits>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
@@ -53,13 +54,13 @@ namespace
     {
         assert(grid && !grid->mPoints.empty());
 
-        float closestDistanceBetween = distanceSquared(grid->mPoints[0], pos);
-        float closestDistanceReachable = closestDistanceBetween;
+        float closestDistanceBetween = std::numeric_limits<float>::max();
+        float closestDistanceReachable = std::numeric_limits<float>::max();
         int closestIndex = 0;
         int closestReachableIndex = 0;
         // TODO: if this full scan causes performance problems mapping pathgrid
         //       points to a quadtree may help
-        for(unsigned int counter = 1; counter < grid->mPoints.size(); counter++)
+        for(unsigned int counter = 0; counter < grid->mPoints.size(); counter++)
         {
             float potentialDistBetween = distanceSquared(grid->mPoints[counter], pos);
             if (potentialDistBetween < closestDistanceReachable)
@@ -78,7 +79,7 @@ namespace
             }
         }
 
-        // invariant: start and endpoint must be connected
+        // post-condition: start and endpoint must be connected
         assert(cell->isPointConnected(start, closestReachableIndex));
 
         // AiWander has logic that depends on whether a path was created, deleting
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index b98bf9f96f..99625e90a3 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -1,6 +1,7 @@
 #include "spellcasting.hpp"
 
 #include <cfloat>
+#include <limits>
 
 #include <boost/format.hpp>
 
@@ -92,7 +93,7 @@ namespace MWMechanics
         if (stats.getMagicEffects().get(ESM::MagicEffect::Silence).getMagnitude())
             return 0;
 
-        float y = FLT_MAX;
+        float y = std::numeric_limits<float>::max();
         float lowestSkill = 0;
 
         for (std::vector<ESM::ENAMstruct>::const_iterator it = spell->mEffects.mList.begin(); it != spell->mEffects.mList.end(); ++it)
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index bac8fca6cb..f4b8aa451e 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1,6 +1,7 @@
 #include "renderingmanager.hpp"
 
 #include <stdexcept>
+#include <limits>
 
 #include <osg/Light>
 #include <osg/LightModel>
@@ -383,7 +384,7 @@ namespace MWRender
             if (mFogDepth == 0.f)
             {
                 mStateUpdater->setFogStart(0.f);
-                mStateUpdater->setFogEnd(FLT_MAX);
+                mStateUpdater->setFogEnd(std::numeric_limits<float>::max());
             }
             else
             {
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index aa444cb144..5b2624f4cf 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2654,8 +2654,8 @@ namespace MWWorld
 
         MWRender::RenderingManager::RayResult result2 = mRendering->castRay(origin, dest, true, true);
 
-        float dist1 = FLT_MAX;
-        float dist2 = FLT_MAX;
+        float dist1 = std::numeric_limits<float>::max();
+        float dist2 = std::numeric_limits<float>::max();
 
         if (result1.mHit)
             dist1 = (origin - result1.mHitPos).length();
@@ -2848,7 +2848,7 @@ namespace MWWorld
 
     MWWorld::Ptr World::getClosestMarkerFromExteriorPosition( const osg::Vec3f& worldPos, const std::string &id ) {
         MWWorld::Ptr closestMarker;
-        float closestDistance = FLT_MAX;
+        float closestDistance = std::numeric_limits<float>::max();
 
         std::vector<MWWorld::Ptr> markers;
         mCells.getExteriorPtrs(id, markers);