11 files changed, 22 insertions, 11 deletions
diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk
index 9e185e155544..c0adf2735b6f 100644
--- a/vcl/Executable_kdefilepicker.mk
+++ b/vcl/Executable_kdefilepicker.mk
@@ -33,9 +33,10 @@ $(eval $(call gb_Executable_add_defs,kdefilepicker,\
 
 $(eval $(call gb_Executable_use_libraries,kdefilepicker,\
 	sal \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,kdefilepicker))
+
 $(eval $(call gb_Executable_add_libs,kdefilepicker,\
 	$(KDE_LIBS) \
 	-lkio -lX11 \
diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk
index a92bb5ede1cb..7458f4197b2c 100644
--- a/vcl/Executable_tdefilepicker.mk
+++ b/vcl/Executable_tdefilepicker.mk
@@ -42,9 +42,10 @@ $(eval $(call gb_Executable_set_include,tdefilepicker,\
 
 $(eval $(call gb_Executable_use_libraries,tdefilepicker,\
 	sal \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,tdefilepicker))
+
 $(eval $(call gb_Executable_add_libs,tdefilepicker,\
 	$(TDE_LIBS) \
 	-lkio -lX11 \
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 91438e9c2d54..af8578988c34 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -59,9 +59,10 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\
     Xext \
     SM \
     ICE \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,desktop_detector))
+
 $(eval $(call gb_Library_use_externals,desktop_detector,\
 	icule \
 	icuuc \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index df68439c72c1..a7ee6ca8e3d9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -85,9 +85,10 @@ $(eval $(call gb_Library_use_libraries,vcl,\
     sal \
     xmlreader \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,vcl))
+
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_use_libraries,vcl,\
     objc \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 88e997b0c7a8..0261c036465b 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\
     Xext \
     SM \
     ICE \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,vclplug_gen))
+
 $(eval $(call gb_Library_use_externals,vclplug_gen,\
 	cairo \
 	icule \
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 4684aa18f474..2d3b46eaa686 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
     Xext \
     SM \
     ICE \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk))
+
 $(eval $(call gb_Library_use_externals,vclplug_gtk,\
 	dbus \
 	gtk \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 187773c6b719..138904a0a004 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -73,9 +73,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
     Xext \
     SM \
     ICE \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk3))
+
 $(eval $(call gb_Library_use_externals,vclplug_gtk3,\
 	dbus \
 ))
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 5f405cc6f47a..7aa5ee5e230b 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -62,9 +62,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\
     Xext \
     SM \
     ICE \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde))
+
 $(eval $(call gb_Library_use_externals,vclplug_kde,\
 	icule \
 	icuuc \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 057ea274354a..3fbb80319a80 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\
     Xext \
     SM \
     ICE \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde4))
+
 $(eval $(call gb_Library_use_externals,vclplug_kde4,\
 	icule \
 	icuuc \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index f859b1ef4104..63c9d725af73 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\
     jvmaccess \
     cppu \
     sal \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,vclplug_svp))
+
 $(eval $(call gb_Library_use_externals,vclplug_svp,\
 	icule \
 	icuuc \
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index b698cb45552f..5e61c6315d7a 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -67,9 +67,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\
     Xext \
     SM \
     ICE \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,vclplug_tde))
+
 $(eval $(call gb_Library_use_externals,vclplug_tde,\
 	icule \
 	icuuc \