21 files changed, 160 insertions, 279 deletions
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index 900dcbd96072..933c0f7b6e38 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -19,10 +19,12 @@
 
 $(eval $(call gb_Library_Library,solver))
 
-$(if $(ENABLE_COINMP),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/coinmpsolver,services)))
-$(if $(ENABLE_LPSOLVE),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/lpsolvesolver,services)))
+$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/solver,services))
 
-$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/swarmsolver,services))
+$(eval $(call gb_Library_add_componentimpls,solver, \
+    $(if $(ENABLE_COINMP),coinmp) \
+    $(if $(ENABLE_LPSOLVE),lpsolve) \
+))
 
 $(eval $(call gb_Library_use_sdk_api,solver))
 
diff --git a/sccomp/source/solver/lpsolvesolver.component b/sccomp/source/solver/lpsolvesolver.component
deleted file mode 100644
index 76e2f3bbf722..000000000000
--- a/sccomp/source/solver/lpsolvesolver.component
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.Calc.LpsolveSolver"
-      constructor="com_sun_star_comp_Calc_LpsolveSolver_get_implementation">
-    <service name="com.sun.star.sheet.Solver"/>
-  </implementation>
-</component>
diff --git a/sccomp/source/solver/coinmpsolver.component b/sccomp/source/solver/solver.component
index 3ddeeea4af47..496be6628486 100644
--- a/sccomp/source/solver/coinmpsolver.component
+++ b/sccomp/source/solver/solver.component
@@ -6,11 +6,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  -->
-
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Calc.CoinMPSolver"
       constructor="com_sun_star_comp_Calc_CoinMPSolver_get_implementation">
     <service name="com.sun.star.sheet.Solver"/>
+    <optional/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.LpsolveSolver"
+      constructor="com_sun_star_comp_Calc_LpsolveSolver_get_implementation">
+    <service name="com.sun.star.sheet.Solver"/>
+    <optional/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.SwarmSolver"
+      constructor="com_sun_star_comp_Calc_SwarmSolver_get_implementation">
+    <service name="com.sun.star.sheet.Solver"/>
   </implementation>
 </component>
diff --git a/sccomp/source/solver/solver.component.coinmp b/sccomp/source/solver/solver.component.coinmp
new file mode 100644
index 000000000000..1ced6f61be45
--- /dev/null
+++ b/sccomp/source/solver/solver.component.coinmp
@@ -0,0 +1,7 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+com.sun.star.comp.Calc.CoinMPSolver
diff --git a/sccomp/source/solver/solver.component.lpsolve b/sccomp/source/solver/solver.component.lpsolve
new file mode 100644
index 000000000000..3b571fbc324d
--- /dev/null
+++ b/sccomp/source/solver/solver.component.lpsolve
@@ -0,0 +1,7 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+com.sun.star.comp.Calc.LpsolveSolver
diff --git a/sccomp/source/solver/swarmsolver.component b/sccomp/source/solver/swarmsolver.component
deleted file mode 100644
index 0cdd925ee9fd..000000000000
--- a/sccomp/source/solver/swarmsolver.component
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.Calc.SwarmSolver" constructor="com_sun_star_comp_Calc_SwarmSolver_get_implementation">
-    <service name="com.sun.star.sheet.Solver"/>
-  </implementation>
-</component>
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 4f0bcaa54841..5252f2ac8772 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -148,7 +148,9 @@ $(call gb_ComponentTarget_get_target,$(2)) :| \
 	$(call gb_Library_get_target,$(gb_Library__get_name))
 $(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \
 	$(call gb_ComponentTarget_get_clean_target,$(2))
-$(eval $(call gb_Library__get_component_var,$(1)) += $(2))
+
+$(if $(call gb_Library__get_component,$(1)),$(error Can't have multiple component files per library))
+$(eval $(call gb_Library__get_component_var,$(1)) = $(2))
 
 endef
 
@@ -162,6 +164,11 @@ $(call gb_ComponentTarget_add_componentimpl,$(call gb_Library__get_component,$(1
 
 endef
 
+# call gb_Library_add_componentimpls,library,implids
+define gb_Library_add_componentimpls
+$(foreach comp,$(2),$(call gb_Library_add_componentimpl,$(1),$(comp)))
+endef
+
 gb_Library__get_name = $(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1))
 
 gb_Library__get_componentprefix = \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 790be1b1e734..63de3bd1571e 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -22,17 +22,17 @@ $(eval $(call gb_Library_Library,vcl))
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.common,services))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx,services))
+$(eval $(call gb_Library_add_componentimpl,vcl,macosx))
 else ifeq ($(OS),WNT)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows,services))
+$(eval $(call gb_Library_add_componentimpl,vcl,windows))
 else ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android,services))
+$(eval $(call gb_Library_add_componentimpl,vcl,android))
 else ifeq ($(OS),iOS)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios,services))
+$(eval $(call gb_Library_add_componentimpl,vcl,ios))
 else ifeq ($(DISABLE_GUI),TRUE)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.headless,services))
+$(eval $(call gb_Library_add_componentimpl,vcl,headless))
 else
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx,services))
+$(eval $(call gb_Library_add_componentimpl,vcl,unx))
 endif
 
 $(eval $(call gb_Library_set_precompiled_header,vcl,vcl/inc/pch/precompiled_vcl))
diff --git a/vcl/vcl.android.component b/vcl/vcl.android.component
deleted file mode 100644
index d59855a7342e..000000000000
--- a/vcl/vcl.android.component
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.datatransfer.VCLGenericClipboard"
-    constructor="vcl_SystemClipboard_get_implementation">
-    <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
-  </implementation>
-  <implementation name="com.sun.star.frame.VCLSessionManagerClient"
-    constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation">
-    <service name="com.sun.star.frame.SessionManagerClient"/>
-  </implementation>
-  <implementation name="vcl::FontIdentificator"
-    constructor="vcl_FontIdentificator_get_implementation">
-    <service name="com.sun.star.awt.FontIdentificator"/>
-  </implementation>
-</component>
diff --git a/vcl/vcl.common.component b/vcl/vcl.common.component
index 2665a136afcc..3069a1c79d19 100644
--- a/vcl/vcl.common.component
+++ b/vcl/vcl.common.component
@@ -18,21 +18,72 @@
 -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
+    prefix="vcl" xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.datatransfer.dnd.OleDragSource_V1">
+    <service name="com.sun.star.datatransfer.dnd.OleDragSource"/>
+    <optional/>
+  </implementation>
+  <implementation name="com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1">
+    <service name="com.sun.star.datatransfer.dnd.OleDropTarget"/>
+    <optional/>
+  </implementation>
+  <implementation name="com.sun.star.comp.graphic.GraphicMapper"
+      constructor="com_sun_star_comp_graphic_GraphicMapper_get_implementation">
+    <service name="com.sun.star.graphic.GraphicMapper"/>
+  </implementation>
   <implementation name="com.sun.star.comp.graphic.GraphicProvider"
       constructor="com_sun_star_comp_graphic_GraphicProvider_get_implementation">
     <service name="com.sun.star.graphic.GraphicProvider"/>
   </implementation>
+  <implementation name="com.sun.star.datatransfer.clipboard.AquaClipboard"
+      constructor="vcl_SystemClipboard_get_implementation">
+    <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
+    <optional/>
+  </implementation>
+  <implementation name="com.sun.star.datatransfer.clipboard.iOSClipboard"
+      constructor="vcl_SystemClipboard_get_implementation">
+    <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
+    <optional/>
+  </implementation>
+  <implementation name="com.sun.star.datatransfer.dnd.XdndDropTarget">
+    <service name="com.sun.star.datatransfer.dnd.X11DropTarget"/>
+    <optional/>
+  </implementation>
+  <implementation name="com.sun.star.datatransfer.dnd.XdndSupport">
+    <service name="com.sun.star.datatransfer.dnd.X11DragSource"/>
+    <optional/>
+  </implementation>
+  <implementation name="com.sun.star.datatransfer.MimeCntTypeFactory"
+      constructor="dtrans_CMimeContentTypeFactory_get_implementation">
+    <service name="com.sun.star.datatransfer.MimeContentTypeFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.datatransfer.VCLGenericClipboard"
+      constructor="vcl_SystemClipboard_get_implementation">
+    <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
+    <optional/>
+  </implementation>
+  <implementation name="com.sun.star.datatransfer.X11ClipboardSupport"
+      constructor="vcl_SystemClipboard_get_implementation">
+    <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
+    <optional/>
+  </implementation>
+  <implementation name="com.sun.star.frame.VCLSessionManagerClient"
+      constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation">
+    <service name="com.sun.star.frame.SessionManagerClient"/>
+    <optional/>
+  </implementation>
   <implementation name="com.sun.star.graphic.GraphicObject"
       constructor="com_sun_star_graphic_GraphicObject_get_implementation">
     <service name="com.sun.star.graphic.GraphicObject"/>
   </implementation>
-  <implementation name="com.sun.star.comp.graphic.GraphicMapper"
-      constructor="com_sun_star_comp_graphic_GraphicMapper_get_implementation">
-    <service name="com.sun.star.graphic.GraphicMapper"/>
+  <implementation name="org.libreoffice.uitest.UITest"
+      constructor="UITest_get_implementation">
+    <service name="com.sun.star.ui.test.UITest"/>
+    <optional/>
   </implementation>
-  <implementation name="com.sun.star.datatransfer.MimeCntTypeFactory"
-    constructor="dtrans_CMimeContentTypeFactory_get_implementation">
-    <service name="com.sun.star.datatransfer.MimeContentTypeFactory"/>
+  <implementation name="vcl::FontIdentificator"
+      constructor="vcl_FontIdentificator_get_implementation">
+    <service name="com.sun.star.awt.FontIdentificator"/>
+    <optional/>
   </implementation>
 </component>
diff --git a/vcl/vcl.common.component.android b/vcl/vcl.common.component.android
new file mode 100644
index 000000000000..6f03bb105089
--- /dev/null
+++ b/vcl/vcl.common.component.android
@@ -0,0 +1,9 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+com.sun.star.datatransfer.VCLGenericClipboard
+com.sun.star.frame.VCLSessionManagerClient
+vcl::FontIdentificator
diff --git a/vcl/vcl.common.component.headless b/vcl/vcl.common.component.headless
new file mode 100644
index 000000000000..4300832e94b2
--- /dev/null
+++ b/vcl/vcl.common.component.headless
@@ -0,0 +1,8 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+com.sun.star.frame.VCLSessionManagerClient
+vcl::FontIdentificator
diff --git a/vcl/vcl.common.component.ios b/vcl/vcl.common.component.ios
new file mode 100644
index 000000000000..a9c21bd5b80b
--- /dev/null
+++ b/vcl/vcl.common.component.ios
@@ -0,0 +1,9 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+com.sun.star.datatransfer.clipboard.iOSClipboard
+com.sun.star.frame.VCLSessionManagerClient
+vcl::FontIdentificator
diff --git a/vcl/vcl.common.component.macosx b/vcl/vcl.common.component.macosx
new file mode 100644
index 000000000000..bc990c02f0a6
--- /dev/null
+++ b/vcl/vcl.common.component.macosx
@@ -0,0 +1,12 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+com.sun.star.comp.datatransfer.dnd.OleDragSource_V1
+com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1
+com.sun.star.datatransfer.clipboard.AquaClipboard
+com.sun.star.frame.VCLSessionManagerClient
+org.libreoffice.uitest.UITest
+vcl::FontIdentificator
diff --git a/vcl/vcl.common.component.unx b/vcl/vcl.common.component.unx
new file mode 100644
index 000000000000..bd2e44569a1d
--- /dev/null
+++ b/vcl/vcl.common.component.unx
@@ -0,0 +1,12 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+com.sun.star.datatransfer.dnd.XdndDropTarget
+com.sun.star.datatransfer.dnd.XdndSupport
+com.sun.star.datatransfer.X11ClipboardSupport
+com.sun.star.frame.VCLSessionManagerClient
+org.libreoffice.uitest.UITest
+vcl::FontIdentificator
diff --git a/vcl/vcl.common.component.windows b/vcl/vcl.common.component.windows
new file mode 100644
index 000000000000..5df902ffc6e8
--- /dev/null
+++ b/vcl/vcl.common.component.windows
@@ -0,0 +1,9 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+com.sun.star.frame.VCLSessionManagerClient
+org.libreoffice.uitest.UITest
+vcl::FontIdentificator
diff --git a/vcl/vcl.headless.component b/vcl/vcl.headless.component
deleted file mode 100644
index 6cda44e416e2..000000000000
--- a/vcl/vcl.headless.component
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.frame.VCLSessionManagerClient"
-    constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation">
-    <service name="com.sun.star.frame.SessionManagerClient"/>
-  </implementation>
-  <implementation name="vcl::FontIdentificator"
-    constructor="vcl_FontIdentificator_get_implementation">
-    <service name="com.sun.star.awt.FontIdentificator"/>
-  </implementation>
-</component>
diff --git a/vcl/vcl.ios.component b/vcl/vcl.ios.component
deleted file mode 100644
index 21f73b70e705..000000000000
--- a/vcl/vcl.ios.component
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.datatransfer.clipboard.iOSClipboard"
-    constructor="vcl_SystemClipboard_get_implementation">
-    <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
-  </implementation>
-  <implementation name="com.sun.star.frame.VCLSessionManagerClient"
-    constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation">
-    <service name="com.sun.star.frame.SessionManagerClient"/>
-  </implementation>
-  <implementation name="vcl::FontIdentificator"
-    constructor="vcl_FontIdentificator_get_implementation">
-    <service name="com.sun.star.awt.FontIdentificator"/>
-  </implementation>
-</component>
diff --git a/vcl/vcl.macosx.component b/vcl/vcl.macosx.component
deleted file mode 100644
index 3ae39a371909..000000000000
--- a/vcl/vcl.macosx.component
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="vcl" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.datatransfer.dnd.OleDragSource_V1">
-    <service name="com.sun.star.datatransfer.dnd.OleDragSource"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1">
-    <service name="com.sun.star.datatransfer.dnd.OleDropTarget"/>
-  </implementation>
-  <implementation name="com.sun.star.datatransfer.clipboard.AquaClipboard"
-    constructor="vcl_SystemClipboard_get_implementation">
-    <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
-  </implementation>
-  <implementation name="com.sun.star.frame.VCLSessionManagerClient"
-    constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation">
-    <service name="com.sun.star.frame.SessionManagerClient"/>
-  </implementation>
-  <implementation name="vcl::FontIdentificator"
-    constructor="vcl_FontIdentificator_get_implementation">
-    <service name="com.sun.star.awt.FontIdentificator"/>
-  </implementation>
-  <implementation name="org.libreoffice.uitest.UITest"
-      constructor="UITest_get_implementation">
-    <service name="com.sun.star.ui.test.UITest"/>
-  </implementation>
-</component>
diff --git a/vcl/vcl.unx.component b/vcl/vcl.unx.component
deleted file mode 100644
index 30506b721155..000000000000
--- a/vcl/vcl.unx.component
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="vcl" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.datatransfer.X11ClipboardSupport"
-    constructor="vcl_SystemClipboard_get_implementation">
-    <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
-  </implementation>
-  <implementation name="com.sun.star.datatransfer.dnd.XdndDropTarget">
-    <service name="com.sun.star.datatransfer.dnd.X11DropTarget"/>
-  </implementation>
-  <implementation name="com.sun.star.datatransfer.dnd.XdndSupport">
-    <service name="com.sun.star.datatransfer.dnd.X11DragSource"/>
-  </implementation>
-  <implementation name="com.sun.star.frame.VCLSessionManagerClient"
-    constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation">
-    <service name="com.sun.star.frame.SessionManagerClient"/>
-  </implementation>
-  <implementation name="vcl::FontIdentificator"
-    constructor="vcl_FontIdentificator_get_implementation">
-    <service name="com.sun.star.awt.FontIdentificator"/>
-  </implementation>
-  <implementation name="org.libreoffice.uitest.UITest"
-      constructor="UITest_get_implementation">
-    <service name="com.sun.star.ui.test.UITest"/>
-  </implementation>
-</component>
diff --git a/vcl/vcl.windows.component b/vcl/vcl.windows.component
deleted file mode 100644
index a818ad075c9d..000000000000
--- a/vcl/vcl.windows.component
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.frame.VCLSessionManagerClient"
-    constructor="com_sun_star_frame_VCLSessionManagerClient_get_implementation">
-    <service name="com.sun.star.frame.SessionManagerClient"/>
-  </implementation>
-  <implementation name="vcl::FontIdentificator"
-    constructor="vcl_FontIdentificator_get_implementation">
-    <service name="com.sun.star.awt.FontIdentificator"/>
-  </implementation>
-  <implementation name="org.libreoffice.uitest.UITest"
-      constructor="UITest_get_implementation">
-    <service name="com.sun.star.ui.test.UITest"/>
-  </implementation>
-</component>