diff --git a/.ci/build-win32.sh b/.ci/build-win32.sh
index 019efff6a..9c3b4802b 100755
--- a/.ci/build-win32.sh
+++ b/.ci/build-win32.sh
@@ -2,7 +2,7 @@
 set -e
 
 meson --cross-file=.ci/win32-cross-file.txt win32build --wrap-mode=forcefallback -Dtests=disabled \
-	-Dglib=enabled -Dfreetype=enabled -Dgdi=enabled $@
+	-Dglib=enabled -Dfreetype=enabled -Dgdi=enabled -Dcairo=enabled $@
 ninja -Cwin32build -j8 # building with all the cores won't work fine with CricleCI for some reason
 
 rm -rf win32build/harfbuzz-win32
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index 5e2056b2d..c5ba926e2 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -6,4 +6,7 @@
 /proxy-libintl
 /zlib
 /packagecache
-/google-benchmark
+/benchmark-1.4.1
+/cairo
+/pixman
+/libpng-1.6.35
diff --git a/subprojects/cairo.wrap b/subprojects/cairo.wrap
new file mode 100644
index 000000000..2fd8fb19e
--- /dev/null
+++ b/subprojects/cairo.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory=cairo
+url=https://github.com/ebraminio/cairo.git
+depth=1
+revision=meson
diff --git a/subprojects/libpng.wrap b/subprojects/libpng.wrap
new file mode 100644
index 000000000..30774eb72
--- /dev/null
+++ b/subprojects/libpng.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+directory = libpng-1.6.35
+
+source_url = https://github.com/glennrp/libpng/archive/v1.6.35.tar.gz
+source_filename = libpng-1.6.35.tar.gz
+source_hash = 6d59d6a154ccbb772ec11772cb8f8beb0d382b61e7ccc62435bf7311c9f4b210
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.35/5/get_zip
+patch_filename = libpng-1.6.35-5-wrap.zip
+patch_hash = da42b18e8d75a88615bdbc1c7bbf1f739ae19f63a8e70d96c90bc448326ae6b7
diff --git a/subprojects/pixman.wrap b/subprojects/pixman.wrap
new file mode 100644
index 000000000..ad18e856b
--- /dev/null
+++ b/subprojects/pixman.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+directory=pixman
+url=https://gitlab.freedesktop.org/pixman/pixman
+push-url=git@gitlab.freedesktop.org:pixman/pixman.git
+depth=1
+revision=9b49f4e08751885289333fed652bf5e0f45976b4
diff --git a/subprojects/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap
index 5e1e19a4a..22dd8505c 100644
--- a/subprojects/proxy-libintl.wrap
+++ b/subprojects/proxy-libintl.wrap
@@ -2,4 +2,4 @@
 directory=proxy-libintl
 url=https://github.com/frida/proxy-libintl.git
 depth=1
-revision=0.1
+revision=50bd2525261d44d80533a523873b9344a6d741c5