diff --git a/.travis.yml b/.travis.yml
index 608d437164..7326bddde0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,22 @@ language: generic
 
 matrix:
   include:
+    - compiler: mingw-x86
+      addons:
+        apt:
+          packages:
+            - g++-mingw-w64-i686
+            - mingw-w64-x86-64-dev
+      script:
+        - CROSS_COMPILE=i686-w64-mingw32- ./configure --disable-d3d9 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
+    - compiler: mingw-x64
+      addons:
+        apt:
+          packages:
+            - g++-mingw-w64-x86-64
+            - mingw-w64-x86-64-dev
+      script:
+        - CROSS_COMPILE=x86_64-w64-mingw32- ./configure --disable-d3d9 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
     - compiler: gcc
     - compiler: clang
       addons:
diff --git a/Makefile.common b/Makefile.common
index e52f65f28f..3ea1828a9c 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1337,6 +1337,7 @@ ifeq ($(HAVE_ZLIB), 1)
    DEFINES += -DHAVE_ZLIB
    HAVE_COMPRESSION = 1
    ifeq ($(HAVE_BUILTINZLIB), 1)
+      INCLUDE_DIRS += -I$(LIBRETRO_COMM_DIR)/include/compat
       DEFINES += -DWANT_ZLIB
    else
       LIBS += -lz
diff --git a/libretro-common/formats/libchdr/chd.c b/libretro-common/formats/libchdr/chd.c
index 08650d1030..bdce2ebf57 100644
--- a/libretro-common/formats/libchdr/chd.c
+++ b/libretro-common/formats/libchdr/chd.c
@@ -46,9 +46,9 @@
 #include <libchdr/cdrom.h>
 #include <libchdr/flac.h>
 #include <libchdr/huffman.h>
-#include "zlib.h"
-#include "LzmaEnc.h"
-#include "LzmaDec.h"
+#include <zlib.h>
+#include <LzmaEnc.h>
+#include <LzmaDec.h>
 #include <retro_inline.h>
 
 #define TRUE 1