2 files changed, 29 insertions, 33 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 342f5fb0698d..478bf255a8a5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1884,7 +1884,11 @@ endef
 
 ifeq ($(SYSTEM_NSS),YES)
 
-define gb_LinkTarget__use_plc4
+define gb_LinkTarget__use_nss3
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DSYSTEM_MOZILLA \
+)
+
 $(call gb_LinkTarget_set_include,$(1),\
     $$(INCLUDE) \
     $(NSS_CFLAGS) \
@@ -1896,6 +1900,11 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+define gb_LinkTarget__use_plc4
+$(call gb_LinkTarget__use_nss3,$(1))
+
+endef
+
 else
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
@@ -1905,6 +1914,21 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
     plc4 \
 ))
 
+define gb_LinkTarget__use_nss3
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/mozilla/nspr \
+	-I$(OUTDIR)/inc/mozilla/nss \
+)
+
+$(call gb_LinkTarget_use_libraries,$(1),\
+	nspr4 \
+	nss3 \
+	smime3 \
+)
+
+endef
+
 define gb_LinkTarget__use_plc4
 $(call gb_LinkTarget_use_libraries,$(1),\
     plc4 \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ebd1f56696ee..e6abe34112e6 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -67,6 +67,10 @@ $(eval $(call gb_Library_add_defs,vcl,\
 
 $(eval $(call gb_Library_use_sdk_api,vcl))
 
+$(eval $(call gb_Library_use_externals,vcl,\
+	nss3 \
+))
+
 $(eval $(call gb_Library_use_libraries,vcl,\
     svl \
     tl \
@@ -83,38 +87,6 @@ $(eval $(call gb_Library_use_libraries,vcl,\
     $(gb_STDLIBS) \
 ))
 
-ifeq ($(SYSTEM_NSS),YES)
-
-$(eval $(call gb_Library_set_include,vcl,\
-	$$(INCLUDE) \
-	$(NSS_CFLAGS) \
-))
-
-$(eval $(call gb_Library_add_defs,vcl,\
-	-DSYSTEM_MOZILLA \
-))
-
-$(eval $(call gb_Library_add_libs,vcl,\
-	$(NSS_LIBS) \
-))
-
-else
-
-$(eval $(call gb_Library_set_include,vcl,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/mozilla/nspr \
-	-I$(OUTDIR)/inc/mozilla/nss \
-))
-
-$(eval $(call gb_Library_use_libraries,vcl,\
-	nspr4 \
-	nss3 \
-	smime3 \
-))
-
-endif # ifeq ($(SYSTEM_NSS),YES)
-
-
 ifneq ($(OS),IOS)
 $(eval $(call gb_Library_use_libraries,vcl,\
     jvmaccess \