Replace use_internal_api with use_udk_api etc. where appropriate

Change-Id: I5e216ca01830a6568159ee8e9265938667f201a1

22 files changed, 6 insertions, 574 deletions

diff --git a/shell/InternalUnoApi_cmdmail.mk b/shell/InternalUnoApi_cmdmail.mk
deleted file mode 100644
index 212130a91ceb..000000000000
--- a/shell/InternalUnoApi_cmdmail.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,cmdmail))
-
-$(eval $(call gb_InternalUnoApi_use_api,cmdmail,\
-	offapi \
-	udkapi \
-))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,cmdmail,shell/source/cmdmail/cmdmail.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/InternalUnoApi_localebe.mk b/shell/InternalUnoApi_localebe.mk
deleted file mode 100644
index b194c5f42007..000000000000
--- a/shell/InternalUnoApi_localebe.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,localebe))
-
-$(eval $(call gb_InternalUnoApi_use_api,localebe,\
-	offapi \
-	udkapi \
-))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,localebe,shell/source/backends/localebe/localebe.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/InternalUnoApi_macbe.mk b/shell/InternalUnoApi_macbe.mk
deleted file mode 100644
index e0a81b126779..000000000000
--- a/shell/InternalUnoApi_macbe.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,macbe))
-
-$(eval $(call gb_InternalUnoApi_use_api,macbe,\
-	offapi \
-	udkapi \
-))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,macbe,shell/source/backends/macbe/macbe.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/InternalUnoApi_smplmail.mk b/shell/InternalUnoApi_smplmail.mk
deleted file mode 100644
index 67f4263a2622..000000000000
--- a/shell/InternalUnoApi_smplmail.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,smplmail))
-
-$(eval $(call gb_InternalUnoApi_use_api,smplmail,\
-	offapi \
-	udkapi \
-))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,smplmail,shell/source/win32/simplemail/smplmail.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/InternalUnoApi_syssh.mk b/shell/InternalUnoApi_syssh.mk
deleted file mode 100644
index 24001ffe4f7e..000000000000
--- a/shell/InternalUnoApi_syssh.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,syssh))
-
-$(eval $(call gb_InternalUnoApi_use_api,syssh,\
-	offapi \
-	udkapi \
-))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,syssh,shell/source/unix/exec/syssh.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/InternalUnoApi_syssh_win.mk b/shell/InternalUnoApi_syssh_win.mk
deleted file mode 100644
index 0707106fe8a1..000000000000
--- a/shell/InternalUnoApi_syssh_win.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,syssh))
-
-$(eval $(call gb_InternalUnoApi_use_api,syssh,\
-	offapi \
-	udkapi \
-))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,syssh,shell/source/win32/syssh.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/InternalUnoApi_wininetbe.mk b/shell/InternalUnoApi_wininetbe.mk
deleted file mode 100644
index deafb3dc39c5..000000000000
--- a/shell/InternalUnoApi_wininetbe.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,wininetbe))
-
-$(eval $(call gb_InternalUnoApi_use_api,wininetbe,\
-	offapi \
-	udkapi \
-))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,wininetbe,shell/source/backends/wininetbe/wininetbe.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk
index be40b5bd2147..1b74fa595264 100644
--- a/shell/Library_cmdmail.mk
+++ b/shell/Library_cmdmail.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,cmdmail))
 
-$(eval $(call gb_Library_use_internal_api,cmdmail,\
-	cmdmail \
-))
+$(eval $(call gb_Library_use_sdk_api,cmdmail))
 
 $(eval $(call gb_Library_use_libraries,cmdmail,\
 	cppu \
diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk
index 4a5a9740ff67..02cdeb7835a1 100644
--- a/shell/Library_localebe.mk
+++ b/shell/Library_localebe.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,localebe1))
 
-$(eval $(call gb_Library_use_internal_api,localebe1,\
-	localebe \
-))
+$(eval $(call gb_Library_use_sdk_api,localebe1))
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_use_externals,localebe1,\
diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk
index 425124717272..9057373a51a4 100644
--- a/shell/Library_macbe.mk
+++ b/shell/Library_macbe.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Library_Library,macbe1))
 
 $(eval $(call gb_Library_use_sdk_api,macbe1))
 
-$(eval $(call gb_Library_use_internal_api,macbe1,\
-	macbe \
-))
-
 $(eval $(call gb_Library_use_externals,macbe1,\
 	cocoa \
 	systemconfiguration \
diff --git a/shell/Library_smplmail.mk b/shell/Library_smplmail.mk
index e8658f4923e0..0b4cc0d01590 100644
--- a/shell/Library_smplmail.mk
+++ b/shell/Library_smplmail.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,smplmail))
 
-$(eval $(call gb_Library_use_internal_api,smplmail,\
-	smplmail \
-))
+$(eval $(call gb_Library_use_sdk_api,smplmail))
 
 $(eval $(call gb_Library_use_libraries,smplmail,\
 	advapi32 \
diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk
index 6debc81d3de0..9a08ca481439 100644
--- a/shell/Library_syssh.mk
+++ b/shell/Library_syssh.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,syssh))
 
-$(eval $(call gb_Library_use_internal_api,syssh,\
-	syssh \
-))
+$(eval $(call gb_Library_use_sdk_api,syssh))
 
 $(eval $(call gb_Library_use_libraries,syssh,\
 	cppu \
diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk
index 15e73b296238..61810d714142 100644
--- a/shell/Library_syssh_win.mk
+++ b/shell/Library_syssh_win.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,syssh))
 
-$(eval $(call gb_Library_use_internal_api,syssh,\
-	syssh \
-))
+$(eval $(call gb_Library_use_sdk_api,syssh))
 
 $(eval $(call gb_Library_use_libraries,syssh,\
 	cppu \
diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk
index c6ba04c0a856..9853c2cba6f6 100644
--- a/shell/Library_wininetbe.mk
+++ b/shell/Library_wininetbe.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,wininetbe1))
 
-$(eval $(call gb_Library_use_internal_api,wininetbe1,\
-	wininetbe \
-))
+$(eval $(call gb_Library_use_sdk_api,wininetbe1))
 
 $(eval $(call gb_Library_use_libraries,wininetbe1,\
 	cppu \
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index de1cec2a9fde..f520aea372a7 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Module_Module,shell))
 
 $(eval $(call gb_Module_add_targets,shell,\
-	InternalUnoApi_localebe \
 	Library_desktopbe \
 	Library_localebe \
 ))
@@ -68,9 +67,6 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,shell,\
 	Executable_regsvrex \
 	Executable_senddoc \
-	InternalUnoApi_smplmail \
-	InternalUnoApi_syssh_win \
-	InternalUnoApi_wininetbe \
 	Library_smplmail \
 	Library_syssh_win \
 	Library_wininetbe \
@@ -104,7 +100,6 @@ endif
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,shell,\
-	InternalUnoApi_macbe \
 	Library_macbe \
 ))
 endif
@@ -120,8 +115,6 @@ ifeq ($(GUI),UNX)
 $(eval $(call gb_Module_add_targets,shell,\
 	Executable_gnome_open_url \
 	Executable_uri_encode \
-	InternalUnoApi_cmdmail \
-	InternalUnoApi_syssh \
 	Library_cmdmail \
 	Library_syssh \
 	Package_scripts \
diff --git a/shell/source/backends/localebe/localebe.xml b/shell/source/backends/localebe/localebe.xml
deleted file mode 100644
index 2d7056242892..000000000000
--- a/shell/source/backends/localebe/localebe.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>localebe1</module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>com.sun.star.comp.configuration.backend.LocaleBackend</name>
-        <description> The  </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.comp.configuration.backend.LocaleBackend</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.beans.Optional</type>
-        <type>com.sun.star.beans.XPropertySet</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
-        <type>com.sun.star.configuration.backend.XLayerHandler</type>
-        <type>com.sun.star.configuration.backend.XSingleLayerStratum</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XMultiServiceFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XSingleServiceFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>
diff --git a/shell/source/backends/macbe/macbe.xml b/shell/source/backends/macbe/macbe.xml
deleted file mode 100644
index 7cee5bb14de5..000000000000
--- a/shell/source/backends/macbe/macbe.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>macbe</module-name>
-    <component-description>
-        <author> Pavel Janík </author>
-        <name>com.sun.star.comp.configuration.backend.MacOSXBackend</name>
-        <description> The  </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.comp.configuration.backend.MacOSXBackend</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
-        <type>com.sun.star.configuration.backend.XLayerHandler</type>
-        <type>com.sun.star.configuration.backend.XSingleLayerStratum</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>
diff --git a/shell/source/backends/wininetbe/wininetbe.xml b/shell/source/backends/wininetbe/wininetbe.xml
deleted file mode 100644
index ac277ce50307..000000000000
--- a/shell/source/backends/wininetbe/wininetbe.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>wininetbe</module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>com.sun.star.comp.configuration.backend.Win32Backend</name>
-        <description> The  </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.comp.configuration.backend.Win32Backend</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.beans.Optional</type>
-        <type>com.sun.star.beans.XPropertySet</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
-        <type>com.sun.star.configuration.backend.XLayerHandler</type>
-        <type>com.sun.star.configuration.backend.XSingleLayerStratum</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XMultiServiceFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XSingleServiceFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>
diff --git a/shell/source/cmdmail/cmdmail.xml b/shell/source/cmdmail/cmdmail.xml
deleted file mode 100644
index 7d451f1c9952..000000000000
--- a/shell/source/cmdmail/cmdmail.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   cmdmail </module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>com.sun.star.comp.system.SimpleCommandMail</name>
-        <description>
-            A generic implementation of a SimpleCommandMail service.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>  c++ </language>
-        <status value="beta"/>
-        <supported-service> com.sun.star.system.SimpleCommandMail </supported-service>
-        <service-dependency>...</service-dependency>
-        <type>  com.sun.star.system.XSimpleMailClient   </type>
-        <type>  com.sun.star.system.XSimpleMailClientSupplier   </type>
-        <type>  com.sun.star.system.XSimpleMailMessage      </type>
-        <type>  com.sun.star.system.SimpleMailClientFlags   </type>
-        <type>  com.sun.star.lang.XEventListener            </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory   </type>
-        <type>  com.sun.star.lang.XServiceInfo              </type>
-        <type>  com.sun.star.lang.XTypeProvider             </type>
-        <type>  com.sun.star.lang.IllegalArgumentException  </type>
-        <type>  com.sun.star.lang.XComponent                </type>
-        <type>  com.sun.star.uno.DeploymentException        </type>
-        <type>  com.sun.star.uno.RuntimeException           </type>
-        <type>  com.sun.star.uno.TypeClass                  </type>
-        <type>  com.sun.star.uno.XWeak                      </type>
-        <type>  com.sun.star.uno.XAggregation               </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.registry.XRegistryKey          </type>
-        <type>  com.sun.star.container.XNameAccess          </type>
-        <type>  com.sun.star.container.XSet                 </type>
-        <type>  com.sun.star.beans.PropertyValue            </type>
-        <type>  com.sun.star.beans.XPropertySet             </type>
-        <type>  com.sun.star.uri.ExternalUriReferenceTranslator </type>
-        <type>  com.sun.star.uri.XExternalUriReferenceTranslator </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper       </project-build-dependency>
-    <project-build-dependency>  cppu             </project-build-dependency>
-    <project-build-dependency>  sal              </project-build-dependency>
-    <runtime-module-dependency> cppuhelper$(COM) </runtime-module-dependency>
-    <runtime-module-dependency> cppu3            </runtime-module-dependency>
-    <runtime-module-dependency> sal3             </runtime-module-dependency>
-</module-description>
diff --git a/shell/source/unix/exec/syssh.xml b/shell/source/unix/exec/syssh.xml
deleted file mode 100644
index 1b9e28c37fe8..000000000000
--- a/shell/source/unix/exec/syssh.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>syssh</module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>com.sun.star.comp.system.SystemShellExecute</name>
-        <description> The unix implementation of a SystemShellExecute service. </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.system.SystemShellExecute</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.system.XSystemShellExecute</type>
-        <type>com.sun.star.system.SystemShellExecuteException</type>
-        <type>com.sun.star.system.SystemShellExecuteFlags</type>
-        <type>com.sun.star.lang.IllegalArgumentException</type>
-        <type>com.sun.star.lang.XMultiServiceFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XSingleServiceFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.uno.DeploymentException</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.uri.ExternalUriReferenceTranslator</type>
-        <type>com.sun.star.uri.UriReferenceFactory</type>
-        <type>com.sun.star.util.XMacroExpander</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>
diff --git a/shell/source/win32/simplemail/smplmail.xml b/shell/source/win32/simplemail/smplmail.xml
deleted file mode 100644
index 20fe919b9027..000000000000
--- a/shell/source/win32/simplemail/smplmail.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   smplmail    </module-name>
-    <component-description>
-        <author> Tino Rachui </author>
-        <name>com.sun.star.comp.system.SimpleSystemMail</name>
-        <description>
-    The win32 implementation of a SimpleSystemMail service.
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>  c++ </language>
-        <status value="beta"/>
-        <supported-service> com.sun.star.system.SimpleSystemMail </supported-service>
-        <service-dependency>...</service-dependency>
-        <type>  com.sun.star.system.XSimpleMailClient   </type>
-        <type>  com.sun.star.system.XSimpleMailClientSupplier   </type>
-        <type>  com.sun.star.system.XSimpleMailMessage      </type>
-        <type>  com.sun.star.system.SimpleMailClientFlags   </type>
-        <type>  com.sun.star.lang.DisposedException         </type>
-        <type>  com.sun.star.lang.EventObject               </type>
-        <type>  com.sun.star.lang.XComponent                </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory   </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-        <type>  com.sun.star.lang.XServiceInfo              </type>
-        <type>  com.sun.star.lang.XTypeProvider             </type>
-        <type>  com.sun.star.lang.IllegalArgumentException  </type>
-        <type>  com.sun.star.uno.TypeClass                  </type>
-        <type>  com.sun.star.uno.XWeak                      </type>
-        <type>  com.sun.star.uno.XAggregation               </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.registry.XRegistryKey          </type>
-        <type>  com.sun.star.container.XSet                 </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
diff --git a/shell/source/win32/syssh.xml b/shell/source/win32/syssh.xml
deleted file mode 100644
index e1b2a40021ed..000000000000
--- a/shell/source/win32/syssh.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   syssh   </module-name>
-    <component-description>
-        <author> Tino Rachui </author>
-        <name>com.sun.star.comp.system.SystemShellExecute</name>
-        <description>
-    The win32 implementation of a SystemShellExecute service.
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>  c++ </language>
-        <status value="beta"/>
-        <supported-service> com.sun.star.system.SystemShellExecute </supported-service>
-        <service-dependency>...</service-dependency>
-        <type>  com.sun.star.system.XSystemShellExecute </type>
-        <type>  com.sun.star.system.SystemShellExecuteException </type>
-        <type>  com.sun.star.system.SystemShellExecuteFlags </type>
-        <type>  com.sun.star.lang.DisposedException         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory   </type>
-        <type>  com.sun.star.lang.XServiceInfo              </type>
-        <type>  com.sun.star.lang.XTypeProvider             </type>
-        <type>  com.sun.star.lang.XComponent                </type>
-        <type>  com.sun.star.lang.EventObject               </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.lang.IllegalArgumentException  </type>
-        <type>  com.sun.star.uno.DeploymentException        </type>
-        <type>  com.sun.star.uno.TypeClass                  </type>
-        <type>  com.sun.star.uno.XWeak                      </type>
-        <type>  com.sun.star.uno.XAggregation               </type>
-        <type>  com.sun.star.uri.UriReferenceFactory        </type>
-        <type>  com.sun.star.registry.XRegistryKey          </type>
-        <type>  com.sun.star.container.XSet                 </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>