diff --git a/win32/deps/fontconfig/fc-arch.vcxproj b/win32/deps/fontconfig/fc-arch.vcxproj
index db3bd130..c9c0f620 100644
--- a/win32/deps/fontconfig/fc-arch.vcxproj
+++ b/win32/deps/fontconfig/fc-arch.vcxproj
@@ -49,15 +49,19 @@
+
+
+
+
diff --git a/win32/deps/fontconfig/fc-cache.vcxproj b/win32/deps/fontconfig/fc-cache.vcxproj
index cd797845..ca5c32d5 100644
--- a/win32/deps/fontconfig/fc-cache.vcxproj
+++ b/win32/deps/fontconfig/fc-cache.vcxproj
@@ -49,15 +49,19 @@
+
+
+
+
diff --git a/win32/deps/fontconfig/fc-case.vcxproj b/win32/deps/fontconfig/fc-case.vcxproj
index 9e0be5cb..9a3eec0b 100644
--- a/win32/deps/fontconfig/fc-case.vcxproj
+++ b/win32/deps/fontconfig/fc-case.vcxproj
@@ -49,15 +49,19 @@
+
+
+
+
diff --git a/win32/deps/fontconfig/fc-cat.vcxproj b/win32/deps/fontconfig/fc-cat.vcxproj
index 3f437e14..a7cb1421 100644
--- a/win32/deps/fontconfig/fc-cat.vcxproj
+++ b/win32/deps/fontconfig/fc-cat.vcxproj
@@ -49,15 +49,19 @@
+
+
+
+
diff --git a/win32/deps/fontconfig/fc-glyphname.vcxproj b/win32/deps/fontconfig/fc-glyphname.vcxproj
index 5eafd898..ffd28040 100644
--- a/win32/deps/fontconfig/fc-glyphname.vcxproj
+++ b/win32/deps/fontconfig/fc-glyphname.vcxproj
@@ -49,15 +49,19 @@
+
+
+
+
diff --git a/win32/deps/fontconfig/fc-lang.vcxproj b/win32/deps/fontconfig/fc-lang.vcxproj
index 0ad15bdd..48cad5b5 100644
--- a/win32/deps/fontconfig/fc-lang.vcxproj
+++ b/win32/deps/fontconfig/fc-lang.vcxproj
@@ -49,15 +49,19 @@
+
+
+
+
diff --git a/win32/deps/fontconfig/fc-list.vcxproj b/win32/deps/fontconfig/fc-list.vcxproj
index da649389..d67cb3f5 100644
--- a/win32/deps/fontconfig/fc-list.vcxproj
+++ b/win32/deps/fontconfig/fc-list.vcxproj
@@ -49,15 +49,19 @@
+
+
+
+
diff --git a/win32/deps/fontconfig/fc-match.vcxproj b/win32/deps/fontconfig/fc-match.vcxproj
index ff88751b..563b97b8 100644
--- a/win32/deps/fontconfig/fc-match.vcxproj
+++ b/win32/deps/fontconfig/fc-match.vcxproj
@@ -49,15 +49,19 @@
+
+
+
+
diff --git a/win32/deps/fontconfig/fontconfig.patch b/win32/deps/fontconfig/fontconfig.patch
new file mode 100644
index 00000000..b3a0880d
--- /dev/null
+++ b/win32/deps/fontconfig/fontconfig.patch
@@ -0,0 +1,130 @@
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-cache/fc-cache.c fontconfig-2.8.0/fc-cache/fc-cache.c
+--- fontconfig-2.8.0.orig/fc-cache/fc-cache.c 2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-cache/fc-cache.c 2012-10-02 08:35:20 +0000
+@@ -36,7 +36,9 @@
+ #include
+ #include
+ #include
++#ifndef WIN32
+ #include
++#endif
+ #include
+ #include
+ #include
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-cat/fc-cat.c fontconfig-2.8.0/fc-cat/fc-cat.c
+--- fontconfig-2.8.0.orig/fc-cat/fc-cat.c 2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-cat/fc-cat.c 2012-10-02 08:35:37 +0000
+@@ -36,7 +36,9 @@
+ #include
+ #include
+ #include
++#ifndef WIN32
+ #include
++#endif
+ #include
+ #include
+ #include
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-list/fc-list.c fontconfig-2.8.0/fc-list/fc-list.c
+--- fontconfig-2.8.0.orig/fc-list/fc-list.c 2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-list/fc-list.c 2012-10-02 08:35:52 +0000
+@@ -24,7 +24,9 @@
+
+ #include
+ #include
++#ifndef WIN32
+ #include
++#endif
+ #include
+ #include
+ #ifdef HAVE_CONFIG_H
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-match/fc-match.c fontconfig-2.8.0/fc-match/fc-match.c
+--- fontconfig-2.8.0.orig/fc-match/fc-match.c 2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-match/fc-match.c 2012-10-02 08:36:04 +0000
+@@ -33,7 +33,9 @@
+
+ #include
+ #include
++#ifndef WIN32
+ #include
++#endif
+ #include
+ #include
+
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-query/fc-query.c fontconfig-2.8.0/fc-query/fc-query.c
+--- fontconfig-2.8.0.orig/fc-query/fc-query.c 2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-query/fc-query.c 2012-10-02 08:36:09 +0000
+@@ -36,7 +36,9 @@
+ #include
+ #include
+ #include
++#ifndef WIN32
+ #include
++#endif
+ #include
+ #include
+
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fc-scan/fc-scan.c fontconfig-2.8.0/fc-scan/fc-scan.c
+--- fontconfig-2.8.0.orig/fc-scan/fc-scan.c 2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/fc-scan/fc-scan.c 2012-10-02 08:36:21 +0000
+@@ -36,7 +36,9 @@
+ #include
+ #include
+ #include
++#ifndef WIN32
+ #include
++#endif
+ #include
+ #include
+
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/fontconfig/fontconfig.h fontconfig-2.8.0/fontconfig/fontconfig.h
+--- fontconfig-2.8.0.orig/fontconfig/fontconfig.h 2009-11-18 23:49:23 +0000
++++ fontconfig-2.8.0/fontconfig/fontconfig.h 2012-10-02 08:36:37 +0000
+@@ -27,7 +27,9 @@
+
+ #include
+ #include
++#ifndef WIN32
+ #include
++#endif
+ #include
+
+ #if defined(__GNUC__) && (__GNUC__ >= 4)
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/src/fcatomic.c fontconfig-2.8.0/src/fcatomic.c
+--- fontconfig-2.8.0.orig/src/fcatomic.c 2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/src/fcatomic.c 2012-10-02 08:36:59 +0000
+@@ -51,7 +51,9 @@
+ #include
+ #include
+ #include
++#ifndef WIN32
+ #include
++#endif
+ #include
+ #include
+
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/src/fccache.c fontconfig-2.8.0/src/fccache.c
+--- fontconfig-2.8.0.orig/src/fccache.c 2009-11-16 17:24:52 +0000
++++ fontconfig-2.8.0/src/fccache.c 2012-10-02 08:39:46 +0000
+@@ -30,7 +30,9 @@
+ #include
+ #include
+ #if defined(HAVE_MMAP) || defined(__CYGWIN__)
++#ifndef WIN32
+ # include
++#endif
+ # include
+ #elif defined(_WIN32)
+ # define _WIN32_WINNT 0x0500
+diff -ruN --strip-trailing-cr fontconfig-2.8.0.orig/src/fcint.h fontconfig-2.8.0/src/fcint.h
+--- fontconfig-2.8.0.orig/src/fcint.h 2009-11-16 22:46:18 +0000
++++ fontconfig-2.8.0/src/fcint.h 2012-10-02 08:38:33 +0000
+@@ -41,7 +41,9 @@
+ #include
+ #include
+ #include
++#ifndef WIN32
+ #include
++#endif
+ #include
+ #include
+ #include
diff --git a/win32/deps/fontconfig/fontconfig.props b/win32/deps/fontconfig/fontconfig.props
index a96aa703..9bad8bd8 100644
--- a/win32/deps/fontconfig/fontconfig.props
+++ b/win32/deps/fontconfig/fontconfig.props
@@ -6,6 +6,7 @@
..\build\$(Platform)\include
+ WIN32;%(PreprocessorDefinitions)