10 files changed, 38 insertions, 32 deletions
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 766552e29396..b5e88d2ba1e0 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \
 $(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\
+$(eval $(call gb_CppunitTest_use_system_win32_libs,extensions_test_update,\
 	shell32 \
 	ole32 \
 ))
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 1117bce24681..05bf003cd550 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -67,18 +67,18 @@ $(eval $(call gb_Executable_use_static_libraries,nsplugin,\
 	ooopathutils \
 ))
 
-$(eval $(call gb_Executable_use_libraries,nsplugin,\
-	ws2_32 \
-	shell32 \
-	ole32 \
-	kernel32 \
-	user32 \
-	gdi32 \
-	winspool \
-	comdlg32 \
+$(eval $(call gb_Executable_use_system_win32_libs,nsplugin,\
 	advapi32 \
+	comdlg32 \
+	gdi32 \
+	kernel32 \
+	ole32 \
 	oleaut32 \
+	shell32 \
+	user32 \
 	uuid \
+	winspool \
+	ws2_32 \
 ))
 endif # WNT
 
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index d503cf6bb8cc..3b9c341445af 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,ldapbe2,\
+$(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\
 	wldap32 \
 ))
 else # 0S!=WNT
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 7e8b400d6eb8..6528b3d3c4b7 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -69,18 +69,18 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
 	ooopathutils \
 ))
 
-$(eval $(call gb_Library_use_libraries,npsoplugin,\
-	ws2_32 \
-	shell32 \
-	ole32 \
-	kernel32 \
-	user32 \
-	gdi32 \
-	winspool \
-	comdlg32 \
+$(eval $(call gb_Library_use_system_win32_libs,npsoplugin,\
 	advapi32 \
+	comdlg32 \
+	gdi32 \
+	kernel32 \
+	ole32 \
 	oleaut32 \
+	shell32 \
+	user32 \
 	uuid \
+	winspool \
+	ws2_32 \
 ))
 
 $(eval $(call gb_Library_add_defs,npsoplugin,\
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index 43404503b1dc..d86a604b1b9a 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -43,6 +43,9 @@ $(eval $(call gb_Library_use_libraries,oleautobridge,\
 	cppuhelper \
 	cppu \
 	sal \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\
 	advapi32 \
 	ole32 \
 	oleaut32 \
diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk
index e258e0fa1cc1..c7f1a0152034 100644
--- a/extensions/Library_oleautobridge2.mk
+++ b/extensions/Library_oleautobridge2.mk
@@ -47,6 +47,9 @@ $(eval $(call gb_Library_use_libraries,oleautobridge2,\
 	cppuhelper \
 	cppu \
 	sal \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,oleautobridge2,\
 	advapi32 \
 	ole32 \
 	oleaut32 \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 34b147320771..dc5e6c4f9cde 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -63,10 +63,10 @@ $(eval $(call gb_Library_add_libs,pl,\
 endif # OS=SOLARIS
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_use_libraries,pl,\
-	version \
-	ole32 \
+$(eval $(call gb_Library_use_system_win32_libs,pl,\
 	advapi32 \
+	ole32 \
+	version \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,pl,\
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index 33cccab682fd..733de14eab86 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -54,14 +54,14 @@ $(eval $(call gb_Library_add_ldflags,so_activex,\
 	/DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \
 ))
 
-$(eval $(call gb_Library_use_libraries,so_activex,\
-	uuid \
+$(eval $(call gb_Library_use_system_win32_libs,so_activex,\
 	advapi32 \
+	gdi32 \
 	ole32 \
 	oleaut32 \
-	gdi32 \
-	urlmon \
 	shlwapi \
+	urlmon \
+	uuid \
 ))
 
 ifneq ($(USE_DEBUG_RUNTIME),)
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index 7bcf286cb4f0..9bc43840d8a3 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -57,14 +57,14 @@ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\
 	/DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \
 ))
 
-$(eval $(call gb_Library_use_libraries,so_activex_x64,\
-	uuid \
+$(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\
 	advapi32 \
+	gdi32 \
 	ole32 \
 	oleaut32 \
-	gdi32 \
-	urlmon \
 	shlwapi \
+	urlmon \
+	uuid \
 ))
 
 ifneq ($(USE_DEBUG_RUNTIME),)
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index cd291c8b695d..d03cb0c6060c 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,updchk,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,updchk,\
+$(eval $(call gb_Library_use_system_win32_libs,updchk,\
 	ole32 \
 	shell32 \
 	wininet \