diff --git a/src/config_win32.h b/src/config_win32.h
index 608762feb..da0ec2bed 100644
--- a/src/config_win32.h
+++ b/src/config_win32.h
@@ -43,13 +43,14 @@
  * $Revision: 1.1 $
  * $Date: 2007/11/08 09:48:59 $
  */
-#define _WIN32_WINNT 0x0600
 #ifdef __MINGW32__
 #ifndef _CONFIG_WIN32_H
 #define _CONFIG_WIN32_H
 
 // define compatibility version
-#define __MSVCRT_VERSION__ 0x7000
+#ifndef __MSVCRT_VERSION__
+#define __MSVCRT_VERSION__ 0x700
+#endif
 
 #include <assert.h>
 #include <process.h>
@@ -63,10 +64,10 @@
 
 // 0x0501 is Win XP, 0x0502 2003 Server, 0x0600 Win Vista and Win 7 is 0x0601
 #ifndef WINVER
-#define WINVER 0x0600
+#define WINVER 0x0601
 #endif /* WINVER */
 #ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
+#define _WIN32_WINNT 0x0601
 #endif /* _WIN32_WINNT */
 
 #define WIN32_LEAN_AND_MEAN
@@ -264,8 +265,6 @@ void ShowMessage(int level, char *msg);
 #define inet_pton InetPtonA
 #define inet_ntop InetNtopA
 
-#endif 
-
 #if _M_IX86_FP == 2
 #undef __SSE2__
 #define __SSE2__
@@ -281,4 +280,6 @@ void ShowMessage(int level, char *msg);
 #define ATTRIBUTE(a) __attribute__((a))
 #endif
 
+#endif // defined _CONFIG_WIN32_H
+
 #endif // defined __MINGW32__
diff --git a/src/utils/h264_stream.c b/src/utils/h264_stream.c
index 7a960ac96..6833ac839 100644
--- a/src/utils/h264_stream.c
+++ b/src/utils/h264_stream.c
@@ -20,16 +20,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "config_unix.h"
 #include "config_win32.h"
 #endif // defined HAVE_CONFIG_H
 
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "debug.h"
 #include "h264_stream.h"
 
diff --git a/src/video_capture/file.c b/src/video_capture/file.c
index 7cedda001..4bae18902 100644
--- a/src/video_capture/file.c
+++ b/src/video_capture/file.c
@@ -254,7 +254,7 @@ static void *vidcap_file_worker(void *state) {
                 }
                 CHECK_FF(ret, FAIL_WORKER); // check the retval of av_read_frame for error other than EOF
 
-                log_msg(LOG_LEVEL_DEBUG, MOD_NAME "received %s packet, ID %d, pos %" PRId64" , size %d\n",
+                log_msg(LOG_LEVEL_DEBUG, MOD_NAME "received %s packet, ID %d, pos %" PRId64 ", size %d\n",
                                 av_get_media_type_string(
                                         s->fmt_ctx->streams[pkt.stream_index]->codecpar->codec_type),
                                 pkt.stream_index, pkt.pos, pkt.size);