diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 0aeae0903c8f..8e94c0518a1d 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -231,9 +231,9 @@ $(eval $(call repositorymodule_serialize,\
 	$(call gb_Helper_optional,DESKTOP,swui) \
 	sw sd \
 	$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
-	writerfilter cui chartcontroller chartcore \
+	writerfilter cui \
 	$(if $(MERGELIBS), merged, \
-		 oox svx svxcore xo sfx fwk svt vcl) \
+		 chartcontroller chartcore oox svx svxcore xo sfx fwk svt vcl) \
 ))
 endif
 endif # !$(DISABLE_DYNLOADING)
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index be37fe3752fc..2763929de360 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -18,6 +18,8 @@ gb_MERGE_LIBRARY_LIST := \
 	basegfx \
 	canvasfactory \
 	canvastools \
+	chartcontroller \
+	chartcore \
 	comphelper \
 	configmgr \
 	cppcanvas \