diff --git a/CYGWIN-PATCHES/configure.sh b/CYGWIN-PATCHES/configure.sh
new file mode 100644
index 0000000..6b878dc
--- /dev/null
+++ b/CYGWIN-PATCHES/configure.sh
@@ -0,0 +1,4 @@
+ #./configure --extra-cflags="-DWEOF=((wint_t)-1)" --prefix=/usr --enable-static --disable-asm --enable-gpl --enable-nonfree --enable-libx264 --enable-libx265 --enable-libfreetype --enable-libfribidi --enable-libspeex --enable-libssh --enable-libvorbis --enable-libtheora --enable-libspeex --enable-libxcb --enable-libxml2 --enable-opengl --enable-openssl --enable-openal --enable-libaom --enable-libfdk-aac --enable-libmp3lame --enable-libopus --enable-libsoxr --enable-libvpx --enable-libvpx --disable-large-tests --disable-doc --ld=g++
+# The extra-cflags shouldn't be needed once the cygwin patch is used
+ ../configure --prefix=/usr --enable-static --disable-asm --enable-gpl --enable-nonfree --enable-libx264 --enable-libx265 --enable-libfreetype --enable-libfribidi --enable-libspeex --enable-libssh --enable-libvorbis --enable-libtheora --enable-libspeex --enable-libxcb --enable-libxml2 --enable-opengl --enable-openssl --enable-openal --enable-libaom --enable-libfdk-aac --enable-libmp3lame --enable-libopus --enable-libsoxr --enable-libvpx --enable-libvpx --disable-large-tests --disable-doc --ld=g++
+
diff --git a/libavcodec/mf_utils.h b/libavcodec/mf_utils.h
index d514723..a711fc6 100644
--- a/libavcodec/mf_utils.h
+++ b/libavcodec/mf_utils.h
@@ -29,6 +29,7 @@
 // mf*.h headers below indirectly include strmif.h.)
 #include <icodecapi.h>
 #else
+#include <wchar.h>
 #include <dshow.h>
 // Older versions of mingw-w64 need codecapi.h explicitly included, while newer
 // ones include it implicitly from dshow.h (via uuids.h).
diff --git a/libavdevice/dshow_enummediatypes.c b/libavdevice/dshow_enummediatypes.c
index 4cb7057..a351856 100644
--- a/libavdevice/dshow_enummediatypes.c
+++ b/libavdevice/dshow_enummediatypes.c
@@ -25,6 +25,7 @@ DECLARE_QUERYINTERFACE(enummediatypes, DShowEnumMediaTypes,
     { {&IID_IUnknown,0}, {&IID_IEnumMediaTypes,0} })
 DECLARE_ADDREF(enummediatypes, DShowEnumMediaTypes)
 DECLARE_RELEASE(enummediatypes, DShowEnumMediaTypes)
+DEFINE_GUID(ff_GUID_NULL, 0x00000000,0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00);
 
 long WINAPI ff_dshow_enummediatypes_Next(DShowEnumMediaTypes *this, unsigned long n,
                          AM_MEDIA_TYPE **types, unsigned long *fetched)
@@ -34,7 +35,7 @@ long WINAPI ff_dshow_enummediatypes_Next(DShowEnumMediaTypes *this, unsigned lon
     if (!types)
         return E_POINTER;
     if (!this->pos && n == 1) {
-        if (!IsEqualGUID(&this->type.majortype, &GUID_NULL)) {
+        if (!IsEqualGUID(&this->type.majortype, &ff_GUID_NULL)) {
             AM_MEDIA_TYPE *type = av_malloc(sizeof(AM_MEDIA_TYPE));
             if (!type)
                 return E_OUTOFMEMORY;
@@ -89,7 +90,7 @@ static int ff_dshow_enummediatypes_Setup(DShowEnumMediaTypes *this, const AM_MED
     SETVTBL(vtbl, enummediatypes, Clone);
 
     if (!type) {
-        this->type.majortype = GUID_NULL;
+        this->type.majortype = ff_GUID_NULL;
     } else {
         ff_copy_dshow_media_type(&this->type, type);
     }
diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h
index 90f0824..4867025 100644
--- a/libavutil/wchar_filename.h
+++ b/libavutil/wchar_filename.h
@@ -19,7 +19,7 @@
 #ifndef AVUTIL_WCHAR_FILENAME_H
 #define AVUTIL_WCHAR_FILENAME_H
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__CYGWIN__)
 #include <windows.h>
 #include "mem.h"