We want gb_STDLIBS here surely?

jvmaccess/Library_jvmaccess.mk

@@ -45,14 +45,9 @@ $(eval $(call gb_Library_add_linked_libs,jvmaccess,\
     cppu \
     sal \
     salhelper \
+	$(gb_STDLIBS) \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,jvmaccess,\
-    advapi32 \
-))
-endif
-
 $(eval $(call gb_Library_add_exception_objects,jvmaccess,\
     jvmaccess/source/classpath \
     jvmaccess/source/unovirtualmachine \

jvmfwk/Library_jvmfwk.mk

@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_api,jvmfwk,\
 $(eval $(call gb_Library_add_linked_libs,jvmfwk,\
     cppuhelper \
     sal \
+	$(gb_STDLIBS) \
 ))
 
 ifeq ($(OS),WNT)

jvmfwk/Library_sunjavaplugin.mk

@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
     cppuhelper \
     sal \
     salhelper \
+	$(gb_STDLIBS) \
 ))
 
 ifeq ($(OS),ANDROID)

unotest/Library_unoexceptionprotector.mk

@@ -38,6 +38,7 @@ $(eval $(call gb_Library_add_linked_libs,unoexceptionprotector,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,unoexceptionprotector,\

unotest/Library_unotest.mk

@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,unotest,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,unotest,\