diff --git a/apps/openmw/mwmechanics/drawstate.hpp b/apps/openmw/mwmechanics/drawstate.hpp
index ded25f8d5d..772086d90a 100644
--- a/apps/openmw/mwmechanics/drawstate.hpp
+++ b/apps/openmw/mwmechanics/drawstate.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_MWMECHANICS_DRAWSTATE_H
 #define GAME_MWMECHANICS_DRAWSTATE_H
 
+#undef DrawState
+
 enum DrawState 
 {
     DrawState_Weapon = 0,
diff --git a/apps/openmw/mwrender/terrainmaterial.cpp b/apps/openmw/mwrender/terrainmaterial.cpp
index 57bea5388e..331bb47e32 100644
--- a/apps/openmw/mwrender/terrainmaterial.cpp
+++ b/apps/openmw/mwrender/terrainmaterial.cpp
@@ -39,6 +39,8 @@ THE SOFTWARE.
 #include <components/settings/settings.hpp>
 #include "renderingmanager.hpp"
 
+#undef far
+
 namespace Ogre
 {
 	//---------------------------------------------------------------------