diff --git a/CMakeLists.txt b/CMakeLists.txt
index be2849adc2..b5dcdbb470 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,7 +209,8 @@ find_path (UUID_INCLUDE_DIR uuid/uuid.h)
 include_directories(${UUID_INCLUDE_DIR})
 endif (WIN32)
 if (MSVC10)
-set(PLATFORM_INCLUDE_DIR "")
+    set(PLATFORM_INCLUDE_DIR "")
+    add_definitions(-DMYGUI_DONT_REPLACE_NULLPTR)
 endif()
 
 # Dependencies
diff --git a/apps/openmw/mwgui/layouts.cpp b/apps/openmw/mwgui/layouts.cpp
index 581a5a576e..40910e3134 100644
--- a/apps/openmw/mwgui/layouts.cpp
+++ b/apps/openmw/mwgui/layouts.cpp
@@ -55,8 +55,8 @@ StatsWindow::StatsWindow (MWWorld::Environment& environment)
 
     for (int i = 0; i < ESM::Skill::Length; ++i)
     {
-        skillValues.insert(std::pair<int, MWMechanics::Stat<float> >(i, MWMechanics::Stat<float>()));
-        skillWidgetMap.insert(std::pair<int, MyGUI::StaticTextPtr>(i, nullptr));
+        skillValues.insert(std::make_pair(i, MWMechanics::Stat<float>()));
+        skillWidgetMap.insert(std::make_pair(i, nullptr));
     }
 
     MyGUI::WindowPtr t = static_cast<MyGUI::WindowPtr>(mMainWidget);
diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp
index 456849ed37..47743f985a 100644
--- a/apps/openmw/mwgui/review.cpp
+++ b/apps/openmw/mwgui/review.cpp
@@ -81,8 +81,8 @@ ReviewDialog::ReviewDialog(MWWorld::Environment& environment)
 
     for (int i = 0; i < ESM::Skill::Length; ++i)
     {
-        skillValues.insert(std::pair<int, MWMechanics::Stat<float> >(i, MWMechanics::Stat<float>()));
-        skillWidgetMap.insert(std::pair<int, MyGUI::StaticTextPtr>(i, nullptr));
+        skillValues.insert(std::make_pair(i, MWMechanics::Stat<float>()));
+        skillWidgetMap.insert(std::make_pair(i, nullptr));
     }
 
     static_cast<MyGUI::WindowPtr>(mMainWidget)->eventWindowChangeCoord = MyGUI::newDelegate(this, &ReviewDialog::onWindowResize);
diff --git a/libs/platform/strings.h b/libs/platform/strings.h
index fd917065dd..c0fbb1a1b2 100644
--- a/libs/platform/strings.h
+++ b/libs/platform/strings.h
@@ -6,7 +6,7 @@
 // For GCC, just use strings.h (this applies to mingw too)
 #if defined(__GNUC__)
 #    include <strings.h>
-#elif defined(MSVC)
+#elif defined(MSVC) || defined(_MSC_VER)
 #    pragma warning(disable: 4996)
 #    define strcasecmp stricmp
 #    define snprintf _snprintf