diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 14832402b82e..de906d605c53 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -63,7 +63,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 		configmgr \
 		connectivity \
 		cppcanvas \
-		drawinglayercore \
 		drawinglayer \
 		editeng \
 		emfio \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index ab4c3089945a..8bbba842e029 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -28,6 +28,7 @@ MERGE_LIBRARY_LIST := \
 	deploymentmisc \
 	$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
 	$(if $(filter WNT,$(OS)),directx9canvas) \
+	drawinglayercore \
 	drawinglayer \
 	editeng \
 	emfio \