Wed Aug 22 06:13:05 PDT 2012

io/InternalUnoApi_acceptor.mk                       |   32 --
 io/InternalUnoApi_connectr.mk                       |   32 --
 io/InternalUnoApi_stm.mk                            |   32 --
 io/Library_acceptor.mk                              |    4 
 io/Library_connector.mk                             |    4 
 io/Library_streams.mk                               |    4 
 io/Module_io.mk                                     |    3 
 io/source/acceptor/acceptor.xml                     |   59 ----
 io/source/connector/connectr.xml                    |   59 ----
 io/source/stm/stm.xml                               |  295 --------------------
 remotebridges/InternalUnoApi_uuresolver.mk          |   32 --
 remotebridges/Library_uuresolver.mk                 |    4 
 remotebridges/Module_remotebridges.mk               |    1 
 remotebridges/source/unourl_resolver/uuresolver.xml |   55 ---
 shell/InternalUnoApi_cmdmail.mk                     |   37 --
 shell/InternalUnoApi_localebe.mk                    |   37 --
 shell/InternalUnoApi_macbe.mk                       |   37 --
 shell/InternalUnoApi_smplmail.mk                    |   37 --
 shell/InternalUnoApi_syssh.mk                       |   37 --
 shell/InternalUnoApi_syssh_win.mk                   |   37 --
 shell/InternalUnoApi_wininetbe.mk                   |   37 --
 shell/Library_cmdmail.mk                            |    4 
 shell/Library_localebe.mk                           |    4 
 shell/Library_macbe.mk                              |    4 
 shell/Library_smplmail.mk                           |    4 
 shell/Library_syssh.mk                              |    4 
 shell/Library_syssh_win.mk                          |    4 
 shell/Library_wininetbe.mk                          |    4 
 shell/Module_shell.mk                               |    7 
 shell/source/backends/localebe/localebe.xml         |   39 --
 shell/source/backends/macbe/macbe.xml               |   35 --
 shell/source/backends/wininetbe/wininetbe.xml       |   39 --
 shell/source/cmdmail/cmdmail.xml                    |   48 ---
 shell/source/unix/exec/syssh.xml                    |   40 --
 shell/source/win32/simplemail/smplmail.xml          |   42 --
 shell/source/win32/syssh.xml                        |   43 --
 stoc/InternalUnoApi_corefl.mk                       |   32 --
 stoc/InternalUnoApi_insp.mk                         |   32 --
 stoc/InternalUnoApi_inv.mk                          |   32 --
 stoc/InternalUnoApi_invadp.mk                       |   32 --
 stoc/InternalUnoApi_javaloader.mk                   |   32 --
 stoc/InternalUnoApi_jen.mk                          |   32 --
 stoc/InternalUnoApi_namingservice.mk                |   32 --
 stoc/InternalUnoApi_proxyfac.mk                     |   32 --
 stoc/InternalUnoApi_stocserv.mk                     |   32 --
 stoc/Library_introspection.mk                       |    4 
 stoc/Library_invocadapt.mk                          |    4 
 stoc/Library_invocation.mk                          |    4 
 stoc/Library_javaloader.mk                          |    4 
 stoc/Library_javavm.mk                              |    4 
 stoc/Library_namingservice.mk                       |    4 
 stoc/Library_proxyfac.mk                            |    4 
 stoc/Library_reflection.mk                          |    4 
 stoc/Library_stocservices.mk                        |    4 
 stoc/Module_stoc.mk                                 |    9 
 stoc/source/corereflection/corefl.xml               |   60 ----
 stoc/source/inspect/insp.xml                        |   75 -----
 stoc/source/invocation/inv.xml                      |   93 ------
 stoc/source/invocation_adapterfactory/invadp.xml    |   58 ---
 stoc/source/javaloader/javaloader.xml               |   56 ---
 stoc/source/javavm/jen.xml                          |   87 -----
 stoc/source/namingservice/namingservice.xml         |   54 ---
 stoc/source/proxy_factory/proxyfac.xml              |   54 ---
 stoc/source/stocservices/stocserv.xml               |  142 ---------
 64 files changed, 19 insertions(+), 2189 deletions(-)

New commits:
commit 6fb127a62e8f6f55b41eb75e5f7c20339886e021
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Aug 22 15:11:52 2012 +0200

    Replace use_internal_api with use_udk_api etc. where appropriate
    
    Change-Id: I5e216ca01830a6568159ee8e9265938667f201a1

diff --git a/io/InternalUnoApi_acceptor.mk b/io/InternalUnoApi_acceptor.mk
deleted file mode 100644
index ddd31d2..0000000
--- a/io/InternalUnoApi_acceptor.mk
+++ /dev/null
@@ -1,32 +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 at 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,acceptor))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,acceptor,io/source/acceptor/acceptor.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/io/InternalUnoApi_connectr.mk b/io/InternalUnoApi_connectr.mk
deleted file mode 100644
index 4896069..0000000
--- a/io/InternalUnoApi_connectr.mk
+++ /dev/null
@@ -1,32 +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 at 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,connectr))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,connectr,io/source/connector/connectr.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/io/InternalUnoApi_stm.mk b/io/InternalUnoApi_stm.mk
deleted file mode 100644
index 723e5fa..0000000
--- a/io/InternalUnoApi_stm.mk
+++ /dev/null
@@ -1,32 +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 at 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,stm))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,stm,io/source/stm/stm.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk
index 4264600..8006224 100644
--- a/io/Library_acceptor.mk
+++ b/io/Library_acceptor.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,acceptor))
 
-$(eval $(call gb_Library_use_internal_api,acceptor,\
-    acceptor \
-))
+$(eval $(call gb_Library_use_udk_api,acceptor))
 
 $(eval $(call gb_Library_use_libraries,acceptor,\
     cppu \
diff --git a/io/Library_connector.mk b/io/Library_connector.mk
index 95a03c0..c2147e7 100644
--- a/io/Library_connector.mk
+++ b/io/Library_connector.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,connector))
 
-$(eval $(call gb_Library_use_internal_api,connector,\
-    connectr \
-))
+$(eval $(call gb_Library_use_udk_api,connector))
 
 $(eval $(call gb_Library_use_libraries,connector,\
     cppu \
diff --git a/io/Library_streams.mk b/io/Library_streams.mk
index 2745bf3..696bc47 100644
--- a/io/Library_streams.mk
+++ b/io/Library_streams.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,streams))
 
-$(eval $(call gb_Library_use_internal_api,streams,\
-    stm \
-))
+$(eval $(call gb_Library_use_udk_api,streams))
 
 $(eval $(call gb_Library_use_libraries,streams,\
     cppu \
diff --git a/io/Module_io.mk b/io/Module_io.mk
index b66e33d..44a4b02 100644
--- a/io/Module_io.mk
+++ b/io/Module_io.mk
@@ -28,9 +28,6 @@
 $(eval $(call gb_Module_Module,io))
 
 $(eval $(call gb_Module_add_targets,io,\
-    InternalUnoApi_acceptor \
-    InternalUnoApi_connectr \
-    InternalUnoApi_stm \
     Library_acceptor \
     Library_connector \
     Library_streams \
diff --git a/io/source/acceptor/acceptor.xml b/io/source/acceptor/acceptor.xml
deleted file mode 100644
index 60589de..0000000
--- a/io/source/acceptor/acceptor.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
--->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   acceptor.uno    </module-name>
-    <component-description>
-        <author> Joerg Budischewski </author>
-        <name>  com.sun.star.comp.io.Acceptor </name>
-        <description>
-            This component allows
-            to accept an connect-attempt from a different process.
-        </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.connection.Acceptor    </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.connection.XAcceptor                  </type>
-        <type>   com.sun.star.connection.XConnectionBroadcaster     </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </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.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </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/io/source/connector/connectr.xml b/io/source/connector/connectr.xml
deleted file mode 100644
index 82d8f16..0000000
--- a/io/source/connector/connectr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
--->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   connector.uno   </module-name>
-    <component-description>
-        <author> Joerg Budischewski </author>
-        <name>  com.sun.star.comp.io.Connector </name>
-        <description>
-            This component allows
-            to establish a connection to another process.
-        </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.connection.Connector   </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.connection.XConnector                         </type>
-        <type>   com.sun.star.connection.XConnectionBroadcaster                         </type>
-        <type>   com.sun.star.io.UnexpectedEOFException                     </type>
-        <type>   com.sun.star.io.WrongFormatException                           </type>
-        <type>   com.sun.star.lang.XComponent                               </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </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.registry.XRegistryKey                         </type>
-        <type>   com.sun.star.registry.XImplementationRegistration          </type>
-        <type>   com.sun.star.test.XSimpleTest                              </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                                 </type>
-        <type>   com.sun.star.uno.XWeak                                 </type>
-        <type>   com.sun.star.uno.XAggregation                              </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> cppuhelper2 </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
diff --git a/io/source/stm/stm.xml b/io/source/stm/stm.xml
deleted file mode 100644
index 154c76e..0000000
--- a/io/source/stm/stm.xml
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
--->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name> streams.uno </module-name>
-
-    <component-description>
-        <author> Joerg Budischewski </author>
-        <name> com.sun.star.comp.io.stm.Pipe </name>
-        <description>
-            This component provides ...
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.Pipe </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.io.XObjectInputStream                 </type>
-        <type>   com.sun.star.io.XObjectOutputStream                </type>
-        <type>   com.sun.star.io.XActiveDataSource                  </type>
-        <type>   com.sun.star.io.XActiveDataSink                    </type>
-        <type>   com.sun.star.io.XMarkableStream                    </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </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.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-    </component-description>
-
-    <component-description>
-        <author> Joerg Budischewski </author>
-        <name> com.sun.star.comp.io.stm.DataInputStream </name>
-        <description>
-            This component provides ...
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.DataInputStream </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.io.XObjectInputStream                 </type>
-        <type>   com.sun.star.io.XObjectOutputStream                </type>
-        <type>   com.sun.star.io.XActiveDataSource                  </type>
-        <type>   com.sun.star.io.XActiveDataSink                    </type>
-        <type>   com.sun.star.io.XMarkableStream                    </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </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.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-    </component-description>
-
-    <component-description>
-        <author> Joerg Budischewski </author>
-        <name> com.sun.star.comp.io.stm.DataOutputStream </name>
-        <description>
-            This component provides ...
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.DataOutputStream </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>  com.sun.star.io.XObjectInputStream                  </type>
-        <type>  com.sun.star.io.XObjectOutputStream                 </type>
-        <type>  com.sun.star.io.XActiveDataSource                   </type>
-        <type>  com.sun.star.io.XActiveDataSink                     </type>
-        <type>  com.sun.star.io.XMarkableStream                     </type>
-        <type>  com.sun.star.io.UnexpectedEOFException              </type>
-        <type>  com.sun.star.io.WrongFormatException                </type>
-        <type>  com.sun.star.lang.XComponent                        </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory              </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.registry.XRegistryKey                  </type>
-        <type>  com.sun.star.registry.XImplementationRegistration   </type>
-        <type>  com.sun.star.test.XSimpleTest                       </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>  com.sun.star.uno.TypeClass                          </type>
-        <type>  com.sun.star.uno.XWeak                              </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
-    </component-description>
-
-    <component-description>
-        <author> Joerg Budischewski </author>
-        <name> com.sun.star.comp.io.stm.ObjectInputStream </name>
-        <description>
-            This component provides ...
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.ObjectInputStream </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>  com.sun.star.io.XObjectInputStream                  </type>
-        <type>  com.sun.star.io.XObjectOutputStream                 </type>
-        <type>  com.sun.star.io.XActiveDataSource                   </type>
-        <type>  com.sun.star.io.XActiveDataSink                     </type>
-        <type>  com.sun.star.io.XMarkableStream                     </type>
-        <type>  com.sun.star.io.UnexpectedEOFException              </type>
-        <type>  com.sun.star.io.WrongFormatException                </type>
-        <type>  com.sun.star.lang.XComponent                        </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory              </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.registry.XRegistryKey                  </type>
-        <type>  com.sun.star.registry.XImplementationRegistration   </type>
-        <type>  com.sun.star.test.XSimpleTest                       </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>  com.sun.star.uno.TypeClass                          </type>
-        <type>  com.sun.star.uno.XWeak                              </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
-    </component-description>
-
-    <component-description>
-        <author> Joerg Budischewski </author>
-        <name> com.sun.star.comp.io.stm.ObjectOutputStream </name>
-        <description>
-            This component provides ...
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.ObjectOutputStream </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.io.XObjectInputStream                 </type>
-        <type>   com.sun.star.io.XObjectOutputStream                </type>
-        <type>   com.sun.star.io.XActiveDataSource                  </type>
-        <type>   com.sun.star.io.XActiveDataSink                    </type>
-        <type>   com.sun.star.io.XMarkableStream                    </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </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.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-    </component-description>
-
-    <component-description>
-        <author> Joerg Budischewski </author>
-        <name> com.sun.star.comp.io.stm.MarkableInputStream </name>
-        <description>
-            This component provides ...
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.MarkableInputStream </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.io.XObjectInputStream                 </type>
-        <type>   com.sun.star.io.XObjectOutputStream                </type>
-        <type>   com.sun.star.io.XActiveDataSource                  </type>
-        <type>   com.sun.star.io.XActiveDataSink                    </type>
-        <type>   com.sun.star.io.XMarkableStream                    </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </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.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-    </component-description>
-
-    <component-description>
-        <author> Joerg Budischewski </author>
-        <name> com.sun.star.comp.io.stm.MarkableOutputStream </name>
-        <description>
-            This component provides ...
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.MarkableOutputStream </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.io.XObjectInputStream                 </type>
-        <type>   com.sun.star.io.XObjectOutputStream                </type>
-        <type>   com.sun.star.io.XActiveDataSource                  </type>
-        <type>   com.sun.star.io.XActiveDataSink                    </type>
-        <type>   com.sun.star.io.XMarkableStream                    </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </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.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-    </component-description>
-
-    <component-description>
-        <author> Joerg Budischewski </author>
-        <name> com.sun.star.comp.stoc.Pump </name>
-        <description>
-            This component provides ...
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.Pump </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>  com.sun.star.io.XConnectable                </type>
-        <type>  com.sun.star.io.XActiveDataSource           </type>
-        <type>  com.sun.star.io.XActiveDataSink             </type>
-        <type>  com.sun.star.io.XActiveDataControl          </type>
-        <type>  com.sun.star.lang.DisposedException         </type>
-        <type>  com.sun.star.lang.XTypeProvider             </type>
-        <type>  com.sun.star.lang.XServiceInfo              </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-        <type>  com.sun.star.registry.XRegistryKey          </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>  com.sun.star.uno.XAggregation               </type>
-        <type>  com.sun.star.uno.XWeak                      </type>
-        <type>  com.sun.star.uno.TypeClass                  </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/remotebridges/InternalUnoApi_uuresolver.mk b/remotebridges/InternalUnoApi_uuresolver.mk
deleted file mode 100644
index 2ac538e..0000000
--- a/remotebridges/InternalUnoApi_uuresolver.mk
+++ /dev/null
@@ -1,32 +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 at 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,uuresolver))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk
index 15fa64e..a289b64 100644
--- a/remotebridges/Library_uuresolver.mk
+++ b/remotebridges/Library_uuresolver.mk
@@ -29,9 +29,7 @@ $(eval $(call gb_Library_Library,uuresolver))
 
 $(eval $(call gb_Library_set_componentfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver))
 
-$(eval $(call gb_Library_use_internal_api,uuresolver,\
-	uuresolver \
-))
+$(eval $(call gb_Library_use_udk_api,uuresolver))
 
 $(eval $(call gb_Library_use_libraries,uuresolver,\
 	cppu \
diff --git a/remotebridges/Module_remotebridges.mk b/remotebridges/Module_remotebridges.mk
index f439df7..98903b8 100644
--- a/remotebridges/Module_remotebridges.mk
+++ b/remotebridges/Module_remotebridges.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Module_Module,remotebridges))
 
 $(eval $(call gb_Module_add_targets,remotebridges,\
-	InternalUnoApi_uuresolver \
 	Library_uuresolver \
 ))
 
diff --git a/remotebridges/source/unourl_resolver/uuresolver.xml b/remotebridges/source/unourl_resolver/uuresolver.xml
deleted file mode 100644
index 6ce208d..0000000
--- a/remotebridges/source/unourl_resolver/uuresolver.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   uuresolver.uno  </module-name>
-    <component-description>
-        <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.bridge.UnoUrlResolver </name>
-        <description>
-            This component allows
-            to retrieve an object reference from another process.
-        </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.bridge.UnoUrlResolver </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.uno.TypeClass                 </type>
-        <type>   com.sun.star.lang.XTypeProvider            </type>
-        <type>   com.sun.star.lang.XServiceInfo             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory    </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory     </type>
-        <type>   com.sun.star.lang.XComponent               </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory </type>
-        <type>  com.sun.star.uno.XComponentContext        </type>
-        <type>   com.sun.star.registry.XRegistryKey         </type>
-        <type>   com.sun.star.connection.XConnector         </type>
-        <type>   com.sun.star.bridge.XBridgeFactory         </type>
-        <type>   com.sun.star.bridge.XUnoUrlResolver        </type>
-        <type>   com.sun.star.uno.XAggregation              </type>
-        <type>   com.sun.star.uno.XWeak                     </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 </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-</module-description>
diff --git a/shell/InternalUnoApi_cmdmail.mk b/shell/InternalUnoApi_cmdmail.mk
deleted file mode 100644
index 212130a..0000000
--- 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 at 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 b194c5f..0000000
--- 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 at 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 e0a81b1..0000000
--- 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 at 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 67f4263..0000000
--- 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 at 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 24001ff..0000000
--- 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 at 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 0707106..0000000
--- 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 at 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 deafb3d..0000000
--- 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 at 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 be40b5b..1b74fa5 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 4a5a974..02cdeb7 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 4251247..9057373 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 e8658f4..0b4cc0d 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 6debc81..9a08ca4 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 15e73b2..61810d7 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 c6ba04c..9853c2c 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 de1cec2..f520aea 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 2d70562..0000000
--- 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 7cee5bb..0000000
--- 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 ac277ce..0000000
--- 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 7d451f1..0000000
--- 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 1b9e28c..0000000
--- 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 20fe919..0000000
--- 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 e1b2a40..0000000
--- 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>
diff --git a/stoc/InternalUnoApi_corefl.mk b/stoc/InternalUnoApi_corefl.mk
deleted file mode 100644
index aee2d28..0000000
--- a/stoc/InternalUnoApi_corefl.mk
+++ /dev/null
@@ -1,32 +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 at 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,corefl))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,corefl,stoc/source/corereflection/corefl.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_insp.mk b/stoc/InternalUnoApi_insp.mk
deleted file mode 100644
index c22eb1d..0000000
--- a/stoc/InternalUnoApi_insp.mk
+++ /dev/null
@@ -1,32 +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 at 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,insp))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,insp,stoc/source/inspect/insp.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_inv.mk b/stoc/InternalUnoApi_inv.mk
deleted file mode 100644
index 169bac6..0000000
--- a/stoc/InternalUnoApi_inv.mk
+++ /dev/null
@@ -1,32 +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 at 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,inv))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,inv,stoc/source/invocation/inv.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_invadp.mk b/stoc/InternalUnoApi_invadp.mk
deleted file mode 100644
index ddc3fdd..0000000
--- a/stoc/InternalUnoApi_invadp.mk
+++ /dev/null
@@ -1,32 +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 at 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,invadp))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,invadp,stoc/source/invocation_adapterfactory/invadp.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_javaloader.mk b/stoc/InternalUnoApi_javaloader.mk
deleted file mode 100644
index 41e1bb2..0000000
--- a/stoc/InternalUnoApi_javaloader.mk
+++ /dev/null
@@ -1,32 +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 at 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,javaloader))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,javaloader,stoc/source/javaloader/javaloader.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_jen.mk b/stoc/InternalUnoApi_jen.mk
deleted file mode 100644
index 13767de..0000000
--- a/stoc/InternalUnoApi_jen.mk
+++ /dev/null
@@ -1,32 +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 at 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,jen))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,jen,stoc/source/javavm/jen.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_namingservice.mk b/stoc/InternalUnoApi_namingservice.mk
deleted file mode 100644
index 16e18c1..0000000
--- a/stoc/InternalUnoApi_namingservice.mk
+++ /dev/null
@@ -1,32 +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 at 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,namingservice))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,namingservice,stoc/source/namingservice/namingservice.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_proxyfac.mk b/stoc/InternalUnoApi_proxyfac.mk
deleted file mode 100644
index c5b5d74..0000000
--- a/stoc/InternalUnoApi_proxyfac.mk
+++ /dev/null
@@ -1,32 +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 at 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,proxyfac))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,proxyfac,stoc/source/proxy_factory/proxyfac.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_stocserv.mk b/stoc/InternalUnoApi_stocserv.mk
deleted file mode 100644
index 00dbbe9..0000000
--- a/stoc/InternalUnoApi_stocserv.mk
+++ /dev/null
@@ -1,32 +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 at 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,stocserv))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,stocserv,stoc/source/stocservices/stocserv.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk
index a6e9a9b..d94330d 100644
--- a/stoc/Library_introspection.mk
+++ b/stoc/Library_introspection.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,introspection))
 
-$(eval $(call gb_Library_use_internal_api,introspection,\
-    insp \
-))
+$(eval $(call gb_Library_use_udk_api,introspection))
 
 $(eval $(call gb_Library_use_libraries,introspection,\
     cppu \
diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk
index ff6e3ec..fc9cb72 100644
--- a/stoc/Library_invocadapt.mk
+++ b/stoc/Library_invocadapt.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,invocadapt))
 
-$(eval $(call gb_Library_use_internal_api,invocadapt,\
-    invadp \
-))
+$(eval $(call gb_Library_use_udk_api,invocadapt))
 
 $(eval $(call gb_Library_use_libraries,invocadapt,\
     cppu \
diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk
index 040463d..00288eb 100644
--- a/stoc/Library_invocation.mk
+++ b/stoc/Library_invocation.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,invocation))
 
-$(eval $(call gb_Library_use_internal_api,invocation,\
-    inv \
-))
+$(eval $(call gb_Library_use_udk_api,invocation))
 
 $(eval $(call gb_Library_use_libraries,invocation,\
     cppu \
diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
index 0822e4a..816bb62 100644
--- a/stoc/Library_javaloader.mk
+++ b/stoc/Library_javaloader.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,javaloader))
 
-$(eval $(call gb_Library_use_internal_api,javaloader,\
-    javaloader \
-))
+$(eval $(call gb_Library_use_udk_api,javaloader))
 
 $(eval $(call gb_Library_use_libraries,javaloader,\
     cppu \
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index 1934799..edf394e 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,javavm))
 
-$(eval $(call gb_Library_use_internal_api,javavm,\
-    jen \
-))
+$(eval $(call gb_Library_use_udk_api,javavm))
 
 $(eval $(call gb_Library_use_libraries,javavm,\
     cppu \
diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk
index dcd7261..10debb0 100644
--- a/stoc/Library_namingservice.mk
+++ b/stoc/Library_namingservice.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,namingservice))
 
-$(eval $(call gb_Library_use_internal_api,namingservice,\
-    namingservice \
-))
+$(eval $(call gb_Library_use_udk_api,namingservice))
 
 $(eval $(call gb_Library_use_libraries,namingservice,\
     cppu \
diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk
index a2efdc2..6e13d58 100644
--- a/stoc/Library_proxyfac.mk
+++ b/stoc/Library_proxyfac.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,proxyfac))
 
-$(eval $(call gb_Library_use_internal_api,proxyfac,\
-    proxyfac \
-))
+$(eval $(call gb_Library_use_udk_api,proxyfac))
 
 $(eval $(call gb_Library_use_libraries,proxyfac,\
     cppu \
diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk
index 34a5fe6..2d383e5 100644
--- a/stoc/Library_reflection.mk
+++ b/stoc/Library_reflection.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,reflection))
 
-$(eval $(call gb_Library_use_internal_api,reflection,\
-    corefl \
-))
+$(eval $(call gb_Library_use_udk_api,reflection))
 
 $(eval $(call gb_Library_use_libraries,reflection,\
     cppu \
diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk
index d5741e6..02a9ecf 100644
--- a/stoc/Library_stocservices.mk
+++ b/stoc/Library_stocservices.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Library_set_include,stocservices,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_internal_api,stocservices,\
-    stocserv \
-))
+$(eval $(call gb_Library_use_udk_api,stocservices))
 
 $(eval $(call gb_Library_use_libraries,stocservices,\
     cppu \
diff --git a/stoc/Module_stoc.mk b/stoc/Module_stoc.mk
index cce68dd..a6d3181 100644
--- a/stoc/Module_stoc.mk
+++ b/stoc/Module_stoc.mk
@@ -29,15 +29,6 @@ $(eval $(call gb_Module_Module,stoc))
 
 $(eval $(call gb_Module_add_targets,stoc,\
     InternalUnoApi_bootstrap \
-    InternalUnoApi_corefl \
-    InternalUnoApi_insp \
-    InternalUnoApi_inv \
-    InternalUnoApi_invadp \
-    InternalUnoApi_javaloader \
-    InternalUnoApi_jen \
-    InternalUnoApi_namingservice \
-    InternalUnoApi_proxyfac \
-    InternalUnoApi_stocserv \
     Library_bootstrap \
     Library_introspection \
     Library_invocadapt \
diff --git a/stoc/source/corereflection/corefl.xml b/stoc/source/corereflection/corefl.xml
deleted file mode 100644
index 18b1744..0000000
--- a/stoc/source/corereflection/corefl.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   corereflection.uno  </module-name>
-    <component-description>
-        <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.CoreReflection   </name>
-        <description>
-The service provides reflection and access to all uno types
-(interfaces, structs, enums, ...).
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.reflection.CoreReflection  </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>com.sun.star.lang.DisposedException</type>
-        <type>  com.sun.star.reflection.XTypeDescription        </type>
-        <type>  com.sun.star.reflection.XIdlReflection          </type>
-        <type>  com.sun.star.reflection.XIdlClass               </type>
-        <type>  com.sun.star.reflection.XIdlField2              </type>
-        <type>  com.sun.star.container.XHierarchicalNameAccess  </type>
-        <type>  com.sun.star.lang.XComponent                    </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory                       </type>
-        <type>  com.sun.star.lang.XMultiComponentFactory                        </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.lang.WrappedTargetRuntimeException </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XComponentContext              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </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/stoc/source/inspect/insp.xml b/stoc/source/inspect/insp.xml
deleted file mode 100644
index 91afca8..0000000
--- a/stoc/source/inspect/insp.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   introspection.uno   </module-name>
-    <component-description>
-        <author> Juergen Schmidt </author>
-        <name>  com.sun.star.comp.stoc.Introspection    </name>
-        <description>
-    This component implements XIntrospection. The method XIntrospection::inspect(any object)
-    returns an XIntrospectionAccess that provides information about the methods, properties
-    and listeners supported by the inspected object. Matching pairs of getName/setName()
-    methods will also be offered as property "Name".
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.beans.Introspection    </supported-service>
-        <service-dependency>    com.sun.star.reflection.CoreReflection  </service-dependency>
-        <type>com.sun.star.lang.DisposedException</type>
-        <type>  com.sun.star.beans.XIntrospection               </type>
-        <type>  com.sun.star.beans.XIntrospectionAccess         </type>
-        <type>  com.sun.star.beans.XPropertySet                 </type>
-        <type>  com.sun.star.beans.XFastPropertySet             </type>
-        <type>  com.sun.star.beans.XMaterialHolder              </type>
-        <type>  com.sun.star.beans.XExactName                   </type>
-        <type>  com.sun.star.beans.PropertyAttribute            </type>
-        <type>  com.sun.star.beans.PropertyConcept              </type>
-        <type>  com.sun.star.beans.MethodConcept                </type>
-        <type>  com.sun.star.lang.XEventListener                </type>
-        <type>  com.sun.star.lang.XInitialization               </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XComponent                </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.DeploymentException                    </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.container.XEnumerationAccess       </type>
-        <type>  com.sun.star.container.XNameContainer           </type>
-        <type>  com.sun.star.container.XIndexContainer          </type>
-        <type>  com.sun.star.reflection.XIdlReflection          </type>
-        <type>  com.sun.star.reflection.XIdlClass               </type>
-        <type>  com.sun.star.reflection.XIdlField2              </type>
-        <type>  com.sun.star.reflection.XIdlArray               </type>
-        <type>  com.sun.star.reflection.FieldAccessMode         </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/stoc/source/invocation/inv.xml b/stoc/source/invocation/inv.xml
deleted file mode 100644
index 397be45..0000000

... etc. - the rest is truncated
