diff --git a/src/lib/libflac/libflac/stream_decoder.c b/src/lib/libflac/libflac/stream_decoder.c
index e2dc94d815a..dfd5809c1a3 100644
--- a/src/lib/libflac/libflac/stream_decoder.c
+++ b/src/lib/libflac/libflac/stream_decoder.c
@@ -38,8 +38,7 @@
 #include <string.h> /* for memset/memcpy() */
 #include <sys/stat.h> /* for stat() */
 #include <sys/types.h> /* for off_t */
-#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
-#if (!defined(_MSC_VER) || _MSC_VER <= 1600) || defined __BORLANDC__ /* @@@ [2G limit] */
+#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ /* @@@ [2G limit] */
 #ifndef fseeko
 #define fseeko fseek
 #endif
@@ -47,7 +46,6 @@
 #define ftello ftell
 #endif
 #endif
-#endif
 #include "flac/assert.h"
 #include "share/alloc.h"
 #include "protected/stream_decoder.h"
diff --git a/src/lib/libflac/libflac/stream_encoder.c b/src/lib/libflac/libflac/stream_encoder.c
index e63e19b5eb0..a23327b500d 100644
--- a/src/lib/libflac/libflac/stream_encoder.c
+++ b/src/lib/libflac/libflac/stream_encoder.c
@@ -38,8 +38,7 @@
 #include <stdlib.h> /* for malloc() */
 #include <string.h> /* for memcpy() */
 #include <sys/types.h> /* for off_t */
-#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
-#if (!defined(_MSC_VER) || _MSC_VER <= 1600) || defined __BORLANDC__ /* @@@ [2G limit] */
+#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ /* @@@ [2G limit] */
 #ifndef fseeko
 #define fseeko fseek
 #endif
@@ -47,7 +46,6 @@
 #define ftello ftell
 #endif
 #endif
-#endif
 #include "flac/assert.h"
 #include "flac/stream_decoder.h"
 #include "share/alloc.h"
diff --git a/src/osd/windows/mame.rc b/src/osd/windows/mame.rc
index 7238ff39764..fa4d28920f5 100644
--- a/src/osd/windows/mame.rc
+++ b/src/osd/windows/mame.rc
@@ -39,9 +39,7 @@
 //
 //============================================================
 
-#define NOWINRES
 #include "windows.h"
-#include "commctrl.h"
 #include "mamevers.rc"
 
 1                       24      MOVEABLE PURE   "mame.man"
diff --git a/src/osd/windows/vconv.c b/src/osd/windows/vconv.c
index e8917d9efd5..1719309c974 100644
--- a/src/osd/windows/vconv.c
+++ b/src/osd/windows/vconv.c
@@ -141,6 +141,7 @@ static const translation_info ld_translate[] =
 	{ 0,		"-mwindows",				"/subsystem:windows" },
 	{ 0,		"-municode",				"" },
 	{ 0,		"-static-libgcc",			"" },
+	{ 0,		"-static-libstdc++",			"" },
 	{ 0,		"-shared",					"/dll" },
 	{ 0 }
 };