diff --git a/.gitignore b/.gitignore
index 3975c4521b..ca58fc0064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ Doxygen
 
 ## ides/editors
 *~
+*.bak
 *.kdev4
 *.swp
 *.swo
diff --git a/apps/openmw/mwrender/videoplayer.cpp b/apps/openmw/mwrender/videoplayer.cpp
index adf20dc633..4209fb9781 100644
--- a/apps/openmw/mwrender/videoplayer.cpp
+++ b/apps/openmw/mwrender/videoplayer.cpp
@@ -385,7 +385,7 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
     }
 
     void open(const std::string&)
-#ifdef _WIN32
+#ifdef _MSC_VER
     { fail(std::string("Invalid call to ")+__FUNCSIG__); }
 #else
     { fail(std::string("Invalid call to ")+__PRETTY_FUNCTION__); }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index be6c0b338f..21780fd5c9 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1,5 +1,5 @@
 #include "worldimp.hpp"
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include <boost/tr1/tr1/unordered_map>
 #elif defined HAVE_UNORDERED_MAP
 #include <unordered_map>
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 35144fe04f..9f31a7f2d5 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -1,7 +1,7 @@
 #ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 #define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include <boost/tr1/tr1/unordered_map>
 #elif defined HAVE_UNORDERED_MAP
 #include <unordered_map>
diff --git a/extern/sdl4ogre/sdlwindowhelper.cpp b/extern/sdl4ogre/sdlwindowhelper.cpp
index f819043cfd..2a54a86369 100644
--- a/extern/sdl4ogre/sdlwindowhelper.cpp
+++ b/extern/sdl4ogre/sdlwindowhelper.cpp
@@ -31,7 +31,11 @@ SDLWindowHelper::SDLWindowHelper (SDL_Window* window, int w, int h,
 #ifdef WIN32
 	case SDL_SYSWM_WINDOWS:
 		// Windows code
+#ifdef __MINGW64__
+		winHandle = Ogre::StringConverter::toString((DWORD_PTR)wmInfo.info.win.window);
+#else
 		winHandle = Ogre::StringConverter::toString((unsigned long)wmInfo.info.win.window);
+#endif /* __MINGW64__ */
 		break;
 #elif __MACOSX__
 	case SDL_SYSWM_COCOA:
diff --git a/libs/platform/string.h b/libs/platform/string.h
index 5368d757cc..7f08765879 100644
--- a/libs/platform/string.h
+++ b/libs/platform/string.h
@@ -9,7 +9,7 @@
 #include <string.h>
 #if (defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1070) || defined(__MINGW32__)
 // need our own implementation of strnlen
-#ifdef __MINGW32__
+#ifdef __MINGW32__ && !__MINGW64__
 static size_t strnlen(const char *s, size_t n)
 {
     const char *p = (const char *)memchr(s, 0, n);