diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index d81420fe5b35..be86dd10e663 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
     sfx \
     svl \
     svt \
-    sw \
     tk \
     tl \
     ucbhelper \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b85d36fffb41..99f93021b546 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -108,6 +108,7 @@ gb_EXTRAMERGEDLIBS := \
 # we link all object files from these libraries into one, merged library
 gb_MERGEDLIBS := \
 	avmedia \
+	$(if $(filter $(OS),ANDROID),,basebmp) \
 	basegfx \
 	canvastools \
 	configmgr \
@@ -152,6 +153,9 @@ gb_MERGEDLIBS := \
 	uui \
 	vcl \
 	vclopengl \
+	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+		$(if $(ENABLE_HEADLESS),,vclplug_svp) \
+	) \
 	xmlscript \
 	xo \
 	xstor \