3 files changed, 21 insertions, 19 deletions
diff --git a/Repository.mk b/Repository.mk
index ac24a618c509..d781001334f6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -101,13 +101,6 @@ endif
 
 endif
 
-ifeq ($(ENABLE_NSPLUGIN),YES)
-$(eval $(call gb_Helper_register_executables,OOO,\
-    nsplugin \
-))
-
-endif
-
 ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Helper_register_executables,OOO,\
     pluginapp.bin \
@@ -115,6 +108,14 @@ $(eval $(call gb_Helper_register_executables,OOO,\
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     pl \
 ))
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Helper_register_executables,OOO,\
+    nsplugin \
+))
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+    npsoplugin \
+))
+endif
 endif # WITH_MOZILLA
 
 
@@ -324,7 +325,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     log_uno \
     mcnttype \
     neon \
-    npsoplugin \
     package2 \
     reg \
     scriptframe \
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index a94eee6a6322..1010e63524a0 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -76,16 +76,8 @@ endif # DISABLE_ATL
 
 endif # WNT
 
-ifeq ($(ENABLE_NSPLUGIN),YES)
-$(eval $(call gb_Module_add_targets,extensions,\
-	Executable_nsplugin \
-	Library_npsoplugin \
-	WinResTarget_npsoplugin \
-))
-
-endif
-
 ifeq ($(WITH_MOZILLA),YES)
+
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_pl \
 ))
@@ -95,9 +87,16 @@ ifneq ($(GUIBASE),aqua)
 $(eval $(call gb_Module_add_targets,extensions,\
 	Executable_pluginapp.bin \
 ))
+endif
+endif
 
-endif # GUIBASE!=aqua
-endif # GUI=UNX
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Module_add_targets,extensions,\
+	Executable_nsplugin \
+	Library_npsoplugin \
+	WinResTarget_npsoplugin \
+))
+endif
 
 endif # WITH_MOZILLA=YES
 
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index 6c658d222f52..63393d5fd26b 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Module_Module,np_sdk))
 
+ifeq ($(WITH_MOZILLA),YES)
+
 $(eval $(call gb_Module_add_targets,np_sdk,\
 	Package_inc \
 ))
@@ -35,6 +37,7 @@ ifeq ($(ENABLE_NSPLUGIN),YES)
 $(eval $(call gb_Module_add_targets,np_sdk,\
 	StaticLibrary_nputils \
 ))
+endif
 
 endif