diff --git a/vcl/CustomTarget_nativecode.mk b/vcl/CustomTarget_nativecode.mk
index 115b0a7adb87..f424a2170dca 100644
--- a/vcl/CustomTarget_nativecode.mk
+++ b/vcl/CustomTarget_nativecode.mk
@@ -13,6 +13,6 @@ fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
 fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-code.cxx
 
 $(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir
-	$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core) > $@
+	$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core -g draw) > $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index abe36dd38989..8892b86c015a 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -10,6 +10,9 @@
 
 fuzzer_externals = \
     boost_headers \
+    orcus \
+    orcus-parser \
+    boost_filesystem \
     curl \
     harfbuzz \
     graphite \
@@ -35,6 +38,10 @@ fuzzer_externals = \
     zlib \
 
 fuzzer_libraries = \
+    sdfilt \
+    sd \
+    sdd \
+    icg \
     basctl \
     avmedia \
     basegfx \
@@ -68,6 +75,10 @@ fuzzer_libraries = \
     svt \
     svx \
     svxcore \
+    emboleobj \
+    svgfilter \
+    svgio \
+    animcore \
     tk \
     tl \
     ucb1 \