3 files changed, 4 insertions, 31 deletions
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 4293ced781f2..b44eacf91f45 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
     tl \
     ucbhelper \
     utl \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_linked_system_libs,fsstorage,\
@@ -80,14 +81,6 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
     msvcrt \
     user32 \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,fsstorage,\
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
-))
 endif
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 654f394f6176..50fc8be48012 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -48,13 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
     stl \
     ucbhelper \
     utl \
-))
-
-$(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\
-    icuuc \
-    dl \
-    m \
-    pthread \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\
@@ -70,20 +64,11 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
     mingw32 \
     $(gb_MINGW_LIBGCC) \
     uwinapi \
-    moldname \
     mingwex \
     kernel32 \
     msvcrt \
-    user32 \
-))
-else
-$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
 ))
 endif
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 605280eefe16..67912fb1dc43 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
     ucbhelper \
     utl \
     vos3 \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_linked_system_libs,svl,\
@@ -182,13 +183,7 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
 ))
 else
 $(eval $(call gb_Library_add_linked_libs,svl,\
-    advapi32 \
-    kernel32 \
-    gdi32 \
-    msvcrt \
-    shell32 \
     user32 \
-    uwinapi \
 ))
 endif
 else