diff --git a/AUTHORS b/AUTHORS
index f3c04a00..987a5006 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -79,5 +79,6 @@ Patches also contributed by
     Rosen Penev <rosenp@gmail.com>
     James Le Cuirot <chewi@gentoo.org>
     Frediano Ziglio <freddy77@gmail.com>
+    Stefan Weil <sw@weilnetz.de>
 
    ....send patches to get your name here...
diff --git a/server/jpeg-encoder.c b/server/jpeg-encoder.c
index 716d8d56..fee07105 100644
--- a/server/jpeg-encoder.c
+++ b/server/jpeg-encoder.c
@@ -16,6 +16,11 @@
 */
 #include <config.h>
 
+#ifdef _WIN32
+/* Avoid conflicting types for INT32 */
+#define QGLOBAL_H
+#endif
+
 #include <stdio.h>
 #include <jpeglib.h>
 
diff --git a/server/mjpeg-encoder.c b/server/mjpeg-encoder.c
index 7d2482a6..0110bba7 100644
--- a/server/mjpeg-encoder.c
+++ b/server/mjpeg-encoder.c
@@ -17,6 +17,11 @@
 */
 #include <config.h>
 
+#ifdef _WIN32
+/* Avoid conflicting types for INT32 */
+#define QGLOBAL_H
+#endif
+
 #include <stdio.h>
 #include <inttypes.h>
 #include <jerror.h>