12 files changed, 22 insertions, 26 deletions
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 6d3689848a5f..c31a0b1e84a1 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -78,7 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 	canvas/source/cairo/cairo_textlayout \
 ))
 
-$(call gb_Library_use_external,cairocanvas,cairo)
+$(eval $(call gb_Library_use_external,cairocanvas,cairo))
 
 ifeq ($(OS),WNT)
 
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 5b9bd34c3345..f69281e042bf 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,expwrap,\
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_external,expwrap,expat_utf16)
+$(eval $(call gb_Library_use_external,expwrap,expat_utf16))
 
 $(eval $(call gb_Library_add_exception_objects,expwrap,\
 	sax/source/expatwrap/attrlistimpl \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index f347842967be..d6fe4714daa1 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -47,13 +47,9 @@ $(eval $(call gb_Library_add_linked_libs,fastsax,\
     $(gb_STDLIBS) \
 ))
 
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_add_defs,fastsax,\
-	-DSYSTEM_ZLIB \
-))
-endif
+$(eval $(call gb_Library_use_external,fastsax,zlib))
 
-$(call gb_Library_use_external,fastsax,expat_utf8)
+$(eval $(call gb_Library_use_external,fastsax,expat_utf8))
 
 # re-uses xml2utf object from sax.uno lib (see below)
 $(eval $(call gb_Library_add_exception_objects,fastsax,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index ea6a568da171..b6569b4eecf6 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -74,10 +74,10 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_externals,svt,\
+$(eval $(call gb_Library_use_externals,svt,\
 	icuuc \
     jpeg \
-)
+))
 
 $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/brwbox/brwbox1 \
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 439f171f406b..c86152370c71 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -127,7 +127,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
 ))
 endif
 
-$(call gb_Library_use_external,tl,zlib)
+$(eval $(call gb_Library_use_external,tl,zlib))
 
 ifeq ($(OS),WNT)
 
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 3673218468aa..10ffd6faa639 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -70,10 +70,10 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
 	$(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_externals,desktop_detector,\
+$(eval $(call gb_Library_use_externals,desktop_detector,\
 	icule \
 	icuuc \
-)
+))
 
 $(eval $(call gb_Library_add_exception_objects,desktop_detector,\
     vcl/unx/generic/desktopdetect/desktopdetector \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 08ccec94ed3b..b67e24cdcd99 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -90,10 +90,10 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_externals,vcl,\
+$(eval $(call gb_Library_use_externals,vcl,\
 	icule \
 	icuuc \
-)
+))
 
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_cxxflags,vcl,\
@@ -461,7 +461,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
 ))
 endif
 
-$(call gb_Library_use_external,vcl,graphite)
+$(eval $(call gb_Library_use_external,vcl,graphite))
 endif
 
 ## handle Cairo
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 895afe2680c4..9f7c771ca268 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -62,10 +62,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_externals,vclplug_gen,\
+$(eval $(call gb_Library_use_externals,vclplug_gen,\
 	icule \
 	icuuc \
-)
+))
 
 ifeq ($(SYSTEM_CAIRO),YES)
 $(eval $(call gb_Library_set_ldflags,vclplug_gen,\
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index d9674f03cb8e..b6305fc13582 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -91,10 +91,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_externals,vclplug_gtk,\
+$(eval $(call gb_Library_use_externals,vclplug_gtk,\
 	icule \
 	icuuc \
-)
+))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
     vcl/unx/gtk/a11y/atkaction \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index e4586b8a108b..d72ce2e49118 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -75,10 +75,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
     ICE \
 ))
 
-$(call gb_Library_use_externals,vclplug_kde,\
+$(eval $(call gb_Library_use_externals,vclplug_kde,\
 	icule \
 	icuuc \
-)
+))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
     vcl/unx/kde/kdedata \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index bbc64aabcbdc..19c1b97488a8 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -78,10 +78,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
     ICE \
 ))
 
-$(call gb_Library_use_externals,vclplug_kde4,\
+$(eval $(call gb_Library_use_externals,vclplug_kde4,\
 	icule \
 	icuuc \
-)
+))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
     vcl/unx/kde4/KDEData \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 7616e6c06025..a876915ae342 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -68,10 +68,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_externals,vclplug_svp,\
+$(eval $(call gb_Library_use_externals,vclplug_svp,\
 	icule \
 	icuuc \
-)
+))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
     vcl/unx/headless/svpbmp \