3520 files changed, 15626 insertions, 66681 deletions

diff --git a/.gitignore b/.gitignore
index e9cb034c1..441f77934 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,18 @@
 # backup and temporary files
 *~
 .*.sw[op]
+.gitattributes
 
 # the build directories
 /*/unxlng??
 /*/unxlng??.pro
 /*/wntmsc???
 /*/wntmsc???.pro
+/*/wntgcc?
+/*/wntgcc?.pro
 /*/unxmac??.pro
 /*/unxmac??
+/*/unxios?
+/*/unxios?.pro
+/*/unxand?
+/*/unxand?.pro
diff --git a/binaryurp/prj/build.lst b/binaryurp/prj/build.lst
index 230b323f0..2681035e1 100644
--- a/binaryurp/prj/build.lst
+++ b/binaryurp/prj/build.lst
@@ -1,3 +1,3 @@
-bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offuh sal salhelper stlport NULL
+bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper stlport NULL
 bu binaryurp\source nmake - all bu_source NULL
 bu binaryurp\qa nmake - all bu_qa bu_source NULL
diff --git a/binaryurp/prj/d.lst b/binaryurp/prj/d.lst
index 48ebd3be8..af6a9d474 100644
--- a/binaryurp/prj/d.lst
+++ b/binaryurp/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\binaryurp.uno.dll %_DEST%\bin%_EXT%\binaryurp.uno.dll
-..\%__SRC%\lib\binaryurp.uno.dylib %_DEST%\lib%_EXT%\binaryurp.uno.dylib
-..\%__SRC%\lib\binaryurp.uno.so %_DEST%\lib%_EXT%\binaryurp.uno.so
-..\%__SRC%\misc\binaryurp.component %_DEST%\xml%_EXT%\binaryurp.component
+..\%__SRC%\bin\binaryurp.uno.dll %_DEST%\bin\binaryurp.uno.dll
+..\%__SRC%\lib\binaryurp.uno.dylib %_DEST%\lib\binaryurp.uno.dylib
+..\%__SRC%\lib\binaryurp.uno.so %_DEST%\lib\binaryurp.uno.so
+..\%__SRC%\misc\binaryurp.component %_DEST%\xml\binaryurp.component
diff --git a/binaryurp/qa/makefile.mk b/binaryurp/qa/makefile.mk
index 14b80c86c..9725c19ab 100644
--- a/binaryurp/qa/makefile.mk
+++ b/binaryurp/qa/makefile.mk
@@ -33,6 +33,11 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 DLLPRE =
diff --git a/binaryurp/qa/test-cache.cxx b/binaryurp/qa/test-cache.cxx
index f9a3946c0..87c364cad 100644
--- a/binaryurp/qa/test-cache.cxx
+++ b/binaryurp/qa/test-cache.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,3 +83,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx
index 3d3c1795a..81689d09b 100644
--- a/binaryurp/qa/test-unmarshal.cxx
+++ b/binaryurp/qa/test-unmarshal.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,3 +111,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx
index c5b8b1a3c..c8c8a4c63 100644
--- a/binaryurp/source/binaryany.cxx
+++ b/binaryurp/source/binaryany.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,3 +97,5 @@ void * BinaryAny::getValue(css::uno::TypeDescription const & type) const
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/binaryany.hxx b/binaryurp/source/binaryany.hxx
index 4dd6112b5..ccebaa93a 100644
--- a/binaryurp/source/binaryany.hxx
+++ b/binaryurp/source/binaryany.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index dcf77662c..b4fced38d 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -976,3 +977,5 @@ void Bridge::terminateWhenUnused(bool unused) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index 73e32aac0..cf281f2fe 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -285,3 +286,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 16bd9cf1b..9421371c5 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -224,9 +225,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
         pImplName, pServiceManager, pRegistryKey, services);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
-component_getImplementationEnvironment(
-    char const ** ppEnvTypeName, uno_Environment **)
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index af6499d61..2ab14fd3d 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -142,3 +143,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx
index 118b8a07b..8a4a4b578 100644
--- a/binaryurp/source/cache.hxx
+++ b/binaryurp/source/cache.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,3 +133,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/currentcontext.cxx b/binaryurp/source/currentcontext.cxx
index aed9640d8..8fa748de5 100644
--- a/binaryurp/source/currentcontext.cxx
+++ b/binaryurp/source/currentcontext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,5 @@ void set(css::uno::UnoInterfaceReference const & value) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/currentcontext.hxx b/binaryurp/source/currentcontext.hxx
index 558d9ac04..dabd92c20 100644
--- a/binaryurp/source/currentcontext.hxx
+++ b/binaryurp/source/currentcontext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,5 @@ void set(com::sun::star::uno::UnoInterfaceReference const & value);
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/incomingreply.hxx b/binaryurp/source/incomingreply.hxx
index 654542f70..08bf89735 100644
--- a/binaryurp/source/incomingreply.hxx
+++ b/binaryurp/source/incomingreply.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ struct IncomingReply: private boost::noncopyable {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index 646a868f6..f869c958c 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -131,6 +132,11 @@ void IncomingRequest::execute() const {
     }
 }
 
+static size_t size_t_round(size_t val)
+{
+    return (val + (sizeof(size_t)-1)) & ~(sizeof(size_t)-1);
+}
+
 bool IncomingRequest::execute_throw(
     BinaryAny * returnValue, std::vector< BinaryAny > * outArguments) const
 {
@@ -228,10 +234,10 @@ bool IncomingRequest::execute_throw(
                                     mtd->pParams[j].pTypeRef));
                         } else {
                             outBufs.push_back(
-                                std::vector< char >(
+                                std::vector< char >(size_t_round(
                                     css::uno::TypeDescription(
                                         mtd->pParams[j].pTypeRef).
-                                    get()->nSize));
+                                    get()->nSize)));
                             p = &outBufs.back()[0];
                         }
                         args.push_back(p);
@@ -246,7 +252,10 @@ bool IncomingRequest::execute_throw(
                 OSL_ASSERT(false); // this cannot happen
                 break;
             }
-            std::vector< char > retBuf(retType.is() ? retType.get()->nSize : 0);
+            size_t nSize = 0;
+            if (retType.is())
+                nSize = size_t_round(retType.get()->nSize);
+            std::vector< char > retBuf(nSize);
             uno_Any exc;
             uno_Any * pexc = &exc;
             (*object_.get()->pDispatcher)(
@@ -298,3 +307,5 @@ bool IncomingRequest::execute_throw(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/incomingrequest.hxx b/binaryurp/source/incomingrequest.hxx
index ead7067f8..d1d940bd2 100644
--- a/binaryurp/source/incomingrequest.hxx
+++ b/binaryurp/source/incomingrequest.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/lessoperators.cxx b/binaryurp/source/lessoperators.cxx
index 354118625..316b9d123 100644
--- a/binaryurp/source/lessoperators.cxx
+++ b/binaryurp/source/lessoperators.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ bool operator <(ByteSequence const & left, ByteSequence const & right) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/lessoperators.hxx b/binaryurp/source/lessoperators.hxx
index 014f0f4d5..1fa0e9222 100644
--- a/binaryurp/source/lessoperators.hxx
+++ b/binaryurp/source/lessoperators.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,5 @@ bool operator <(ByteSequence const & left, ByteSequence const & right);
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index ce520382e..e679ee1dd 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -312,3 +313,5 @@ void Marshal::writeMemberValues(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/marshal.hxx b/binaryurp/source/marshal.hxx
index a922ec100..917a41484 100644
--- a/binaryurp/source/marshal.hxx
+++ b/binaryurp/source/marshal.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/outgoingrequest.hxx b/binaryurp/source/outgoingrequest.hxx
index 7fe67bf96..159a48747 100644
--- a/binaryurp/source/outgoingrequest.hxx
+++ b/binaryurp/source/outgoingrequest.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,5 @@ struct OutgoingRequest {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/outgoingrequests.cxx b/binaryurp/source/outgoingrequests.cxx
index 388b77554..9ea180810 100644
--- a/binaryurp/source/outgoingrequests.cxx
+++ b/binaryurp/source/outgoingrequests.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,5 @@ void OutgoingRequests::pop(rtl::ByteSequence const & tid) throw () {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/outgoingrequests.hxx b/binaryurp/source/outgoingrequests.hxx
index 92ee622bf..c8cefa00f 100644
--- a/binaryurp/source/outgoingrequests.hxx
+++ b/binaryurp/source/outgoingrequests.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index 876199e7b..3d97e19e0 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -258,3 +259,5 @@ bool Proxy::isProxy(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx
index c67ab4eb5..6843eeb4a 100644
--- a/binaryurp/source/proxy.hxx
+++ b/binaryurp/source/proxy.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index f622fb5b0..d305bafb7 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -551,3 +552,5 @@ rtl::ByteSequence Reader::getTid(Unmarshal & unmarshal, bool newTid) const {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/reader.hxx b/binaryurp/source/reader.hxx
index 37d0b9462..3fb2fe3af 100644
--- a/binaryurp/source/reader.hxx
+++ b/binaryurp/source/reader.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx
index ef7ed4d71..fb87f8c34 100644
--- a/binaryurp/source/readerstate.hxx
+++ b/binaryurp/source/readerstate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ struct ReaderState: private boost::noncopyable {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/specialfunctionids.hxx b/binaryurp/source/specialfunctionids.hxx
index a2a59791b..bb3913f6c 100644
--- a/binaryurp/source/specialfunctionids.hxx
+++ b/binaryurp/source/specialfunctionids.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,5 @@ enum SpecialFunctionIds {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index 62f8683e3..490954eac 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -561,3 +562,5 @@ void Unmarshal::readMemberValues(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx
index 33a4aafec..5d0019c17 100644
--- a/binaryurp/source/unmarshal.hxx
+++ b/binaryurp/source/unmarshal.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,3 +105,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 97a60157e..c01c56c78 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -474,3 +475,5 @@ void Writer::sendMessage(std::vector< unsigned char > const & buffer) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/writer.hxx b/binaryurp/source/writer.hxx
index fe5dba2cc..60d097e87 100644
--- a/binaryurp/source/writer.hxx
+++ b/binaryurp/source/writer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -183,3 +184,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/writerstate.hxx b/binaryurp/source/writerstate.hxx
index cbb0208ba..794369fd4 100644
--- a/binaryurp/source/writerstate.hxx
+++ b/binaryurp/source/writerstate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,5 @@ struct WriterState: private boost::noncopyable {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/prj/d.lst b/bridges/prj/d.lst
index becaa7283..a8d03e1f2 100644
--- a/bridges/prj/d.lst
+++ b/bridges/prj/d.lst
@@ -1,11 +1,11 @@
-..\%__SRC%\lib\libjava_uno* %_DEST%\lib%_EXT%\libjava_uno*
-..\%__SRC%\bin\java_uno* %_DEST%\bin%_EXT%\java_uno*
-..\%__SRC%\class\java_uno*.jar %_DEST%\bin%_EXT%\java_uno*.jar
+..\%__SRC%\lib\libjava_uno* %_DEST%\lib\libjava_uno*
+..\%__SRC%\bin\java_uno* %_DEST%\bin\java_uno*
+..\%__SRC%\class\java_uno*.jar %_DEST%\bin\java_uno*.jar
 
-..\%__SRC%\bin\msci_uno.* %_DEST%\bin%_EXT%\msci_uno.*
-..\%__SRC%\bin\mscx_uno.* %_DEST%\bin%_EXT%\mscx_uno.*
-..\%__SRC%\bin\gcc3_uno.dll %_DEST%\bin%_EXT%\gcc3_uno.dll
-..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib%_EXT%\libgcc2_uno.*
-..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib%_EXT%\libgcc3_uno.*
-..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin%_EXT%\gcc3_uno.*
-..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*
+..\%__SRC%\bin\msci_uno.* %_DEST%\bin\msci_uno.*
+..\%__SRC%\bin\mscx_uno.* %_DEST%\bin\mscx_uno.*
+..\%__SRC%\bin\gcc3_uno.dll %_DEST%\bin\gcc3_uno.dll
+..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib\libgcc2_uno.*
+..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib\libgcc3_uno.*
+..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin\gcc3_uno.*
+..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib\libsunpro5_uno.*
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx
deleted file mode 100644
index be2afdec3..000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx
+++ /dev/null
@@ -1,528 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <sal/alloca.h>
-#include <stdio.h>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <uno/data.h>
-#include <typelib/typedescription.hxx>
-
-#include "bridges/cpp_uno/shared/bridge.hxx"
-#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
-#include "bridges/cpp_uno/shared/types.hxx"
-#include "bridges/cpp_uno/shared/vtablefactory.hxx"
-
-#include "share.hxx"
-
-using namespace ::com::sun::star::uno;
-
-namespace
-{
-
-//==================================================================================================
-static typelib_TypeClass cpp2uno_call(
-    bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
-    const typelib_TypeDescription * pMemberTypeDescr,
-    typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void ** pCallStack,
-    sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-    // pCallStack: ret, [return ptr], this, params
-    char * pCppStack = (char *)(pCallStack +1);
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    if (pReturnTypeRef)
-        TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-    
-    void * pUnoReturn = 0;
-    void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-    
-    if (pReturnTypeDescr)
-    {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-        {
-            pUnoReturn = pRegisterReturn; // direct way for simple types
-        }
-        else // complex return via ptr (pCppReturn)
-        {
-            pCppReturn = *(void **)pCppStack;
-            pCppStack += sizeof(void *);
-            
-            pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
-                              pReturnTypeDescr )
-                          ? alloca( pReturnTypeDescr->nSize )
-                          : pCppReturn); // direct way
-        }
-    }
-    // pop this
-    pCppStack += sizeof( void* );
-
-    // stack space
-    OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-    // parameters
-    void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-    void ** pCppArgs = pUnoArgs + nParams;
-    // indizes of values this have to be converted (interface conversion cpp<=>uno)
-    sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-    
-    sal_Int32 nTempIndizes   = 0;
-    
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut
-            && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
-            // value
-        {
-            pCppArgs[nPos] = pCppStack;
-            pUnoArgs[nPos] = pCppStack;
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                pCppStack += sizeof(sal_Int32); // extra long
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            pCppArgs[nPos] = *(void **)pCppStack;
-
-            if (! rParam.bIn) // is pure out
-            {
-                // uno out is unconstructed mem!
-                pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-                pTempIndizes[nTempIndizes] = nPos;
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (bridges::cpp_uno::shared::relatesToInterfaceType(
-                         pParamTypeDescr ))
-            {
-                uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                                        *(void **)pCppStack, pParamTypeDescr,
-                                        pThis->getBridge()->getCpp2Uno() );
-                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                pUnoArgs[nPos] = *(void **)pCppStack;
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-    
-    // ExceptionHolder
-    uno_Any aUnoExc = {0}; // Any will be constructed by callee
-    uno_Any * pUnoExc = &aUnoExc;
-
-    // invoke uno dispatch call
-    (*pThis->getUnoI()->pDispatcher)(
-        pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-#if OSL_DEBUG_LEVEL > 1
-    if (pUnoExc != NULL)
-        fprintf( stderr, ">cpp2uno_call pUnoExc %x\n", pUnoExc);
-#endif
-
-    // in case an exception occurred...
-    if (pUnoExc)
-    {
-        // destruct temporary in/inout params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            
-            if (pParams[nIndex].bIn) // is in/inout => was constructed
-                uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-        }
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-        
-        CPPU_CURRENT_NAMESPACE::raiseException(
-            &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-            // has to destruct the any
-        // is here for dummy
-        return typelib_TypeClass_VOID;
-    }
-    else // else no exception occurred...
-    {
-        // temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-            
-            if (pParams[nIndex].bOut) // inout/out
-            {
-                // convert and assign
-                uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-                uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-            }
-            // destroy temp uno param
-            uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-            
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return
-        if (pCppReturn) // has complex return
-        {
-            if (pUnoReturn != pCppReturn) // needs reconversion
-            {
-                uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-                // destroy temp uno return
-                uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-            }
-            // complex return ptr is set to eax
-            *(void **)pRegisterReturn = pCppReturn;
-        }
-        if (pReturnTypeDescr)
-        {
-            typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-            return eRet;
-        }
-        else
-            return typelib_TypeClass_VOID;
-    }
-}
-
-
-//==================================================================================================
-static typelib_TypeClass cpp_mediate(
-    sal_Int32 nFunctionIndex,
-    sal_Int32 nVtableOffset,
-    void ** pCallStack,
-    sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-    OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-    
-    // pCallStack: ret adr, [ret *], this, params
-    void * pThis;
-    if( nFunctionIndex & 0x80000000 )
-    {
-        nFunctionIndex &= 0x7fffffff;
-        pThis = pCallStack[2];
-    }
-    else
-    {
-        pThis = pCallStack[1];
-    }
-    pThis = static_cast< char * >(pThis) - nVtableOffset;
-    bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
-        = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
-            pThis);
-    
-    typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-    
-    OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-    if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-    {
-        throw RuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
-            (XInterface *)pThis );
-    }
-    
-    // determine called method
-    sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
-    OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-
-    TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-    
-    typelib_TypeClass eRet;
-    switch (aMemberDescr.get()->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
-        {
-            // is GET method
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-                0, 0, // no params
-                pCallStack, pRegisterReturn );
-        }
-        else
-        {
-            // is SET method
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn		= sal_True;
-            aParam.bOut		= sal_False;
-            
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                0, // indicates void return
-                1, &aParam,
-                pCallStack, pRegisterReturn );
-        }
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        // is METHOD
-        switch (nFunctionIndex)
-        {
-        case 1: // acquire()
-            pCppI->acquireProxy(); // non virtual call!
-            eRet = typelib_TypeClass_VOID;
-            break;
-        case 2: // release()
-            pCppI->releaseProxy(); // non virtual call!
-            eRet = typelib_TypeClass_VOID;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-            if (pTD)
-            {
-                XInterface * pInterface = 0;
-                (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
-                    pCppI->getBridge()->getCppEnv(),
-                    (void **)&pInterface, pCppI->getOid().pData,
-                    (typelib_InterfaceTypeDescription *)pTD );
-            
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-                        &pInterface, pTD, cpp_acquire );
-                    pInterface->release();
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *(void **)pRegisterReturn = pCallStack[1];
-                    eRet = typelib_TypeClass_ANY;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-                pCallStack, pRegisterReturn );
-        }
-        break;
-    }
-    default:
-    {
-        throw RuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
-            (XInterface *)pThis );
-        // is here for dummy
-        eRet = typelib_TypeClass_VOID;
-    }
-    }
-
-    return eRet;
-}
-
-//==================================================================================================
-/**
- * is called on incoming vtable calls
- * (called by asm snippets)
- */
-static void cpp_vtable_call(
-    int nFunctionIndex, int nVtableOffset, void** pCallStack )
-    __attribute__((regparm(3)));
-
-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
-{
-    volatile long nRegReturn[2];
-    typelib_TypeClass aType = cpp_mediate(
-        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
-    
-    switch( aType )
-    {
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-            __asm__( "movl %1, %%edx\n\t"
-                     "movl %0, %%eax\n"
-                     : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-            break;
-        case typelib_TypeClass_FLOAT:
-            __asm__( "flds %0\n\t"
-                     "fstp %%st(0)\n\t"
-                     "flds %0\n"
-                     : : "m"(*(float *)nRegReturn) );
-            break;
-        case typelib_TypeClass_DOUBLE:
-            __asm__( "fldl %0\n\t"
-                     "fstp %%st(0)\n\t"
-                     "fldl %0\n"
-                     : : "m"(*(double *)nRegReturn) );
-            break;
-// 		case typelib_TypeClass_UNSIGNED_SHORT:
-// 		case typelib_TypeClass_SHORT:
-// 			__asm__( "movswl %0, %%eax\n"
-// 					 : : "m"(nRegReturn) );
-// 		break;
-        default:
-            __asm__( "movl %0, %%eax\n"
-                     : : "m"(nRegReturn[0]) );
-            break;
-    }
-}
-
-
-//==================================================================================================
-int const codeSnippetSize = 20;
-
-unsigned char * codeSnippet(
-    unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
-    bool simpleRetType)
-{
-    if (!simpleRetType) {
-        functionIndex |= 0x80000000;
-    }
-    unsigned char * p = code;
-    OSL_ASSERT(sizeof (sal_Int32) == 4);
-    // mov function_index, %eax:
-    *p++ = 0xB8;
-    *reinterpret_cast< sal_Int32 * >(p) = functionIndex;
-    p += sizeof (sal_Int32);
-    // mov vtable_offset, %edx:
-    *p++ = 0xBA;
-    *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-    p += sizeof (sal_Int32);
-    // mov %esp, %ecx:
-    *p++ = 0x89;
-    *p++ = 0xE1;
-    // jmp cpp_vtable_call:
-    *p++ = 0xE9;
-    *reinterpret_cast< sal_Int32 * >(p)
-        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-    p += sizeof (sal_Int32);
-    OSL_ASSERT(p - code <= codeSnippetSize);
-    return code + codeSnippetSize;
-}
-
-}
-
-struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
-{
-    return static_cast< Slot * >(block) + 2;
-}
-
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
-    sal_Int32 slotCount)
-{
-    return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
-}
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::initializeBlock(
-    void * block, sal_Int32 slotCount)
-{
-    Slot * slots = mapBlockToVtable(block);
-    slots[-2].fn = 0;
-    slots[-1].fn = 0;
-    return slots + slotCount;
-}
-
-unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
-    typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
-    sal_Int32 functionCount, sal_Int32 vtableOffset)
-{
-    (*slots) -= functionCount;
-    Slot * s = *slots;
-    for (sal_Int32 i = 0; i < type->nMembers; ++i) {
-        typelib_TypeDescription * member = 0;
-        TYPELIB_DANGER_GET(&member, type->ppMembers[i]);
-        OSL_ASSERT(member != 0);
-        switch (member->eTypeClass) {
-        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-            // Getter:
-            (s++)->fn = code;
-            code = codeSnippet(
-                code, functionOffset++, vtableOffset,
-                bridges::cpp_uno::shared::isSimpleType(
-                    reinterpret_cast<
-                    typelib_InterfaceAttributeTypeDescription * >(
-                        member)->pAttributeTypeRef));
-            // Setter:
-            if (!reinterpret_cast<
-                typelib_InterfaceAttributeTypeDescription * >(
-                    member)->bReadOnly)
-            {
-                (s++)->fn = code;
-                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-            }
-            break;
-
-        case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
-            code = codeSnippet(
-                code, functionOffset++, vtableOffset,
-                bridges::cpp_uno::shared::isSimpleType(
-                    reinterpret_cast<
-                    typelib_InterfaceMethodTypeDescription * >(
-                        member)->pReturnTypeRef));
-            break;
-
-        default:
-            OSL_ASSERT(false);
-            break;
-        }
-        TYPELIB_DANGER_RELEASE(member);
-    }
-    return code;
-}
-
-void bridges::cpp_uno::shared::VtableFactory::flushCode(
-    unsigned char const *, unsigned char const *)
-{}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/defs/gcc3_uno.def b/bridges/source/cpp_uno/gcc3_os2_intel/defs/gcc3_uno.def
deleted file mode 100644
index d6b247ec9..000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/defs/gcc3_uno.def
+++ /dev/null
@@ -1,915 +0,0 @@
-LIBRARY	  gcc3_uno INITINSTANCE TERMINSTANCE
-DATA MULTIPLE
-DESCRIPTION	'StarView 3.00  680 '
-EXPORTS
-_GetVersionInfo
-_component_canUnload
-_uno_initEnvironment
-_uno_ext_getMapping
-
-;lmax=20
-;smax=_component_canUnload
-
-;__ZTIN4test19TestBridgeExceptionE
-
-__ZTIN10comphelper18OPropertyContainerE
-__ZTIN10comphelper24OPropertyContainerHelperE
-__ZTIN10comphelper25OPropertyArrayUsageHelperIN9configmgr22OConfigurationProviderEEE
-__ZTIN3com3sun4star13configuration17XTemplateInstanceE
-__ZTIN3com3sun4star13configuration18XTemplateContainerE
-__ZTIN3com3sun4star13configuration29InvalidBootstrapFileExceptionE
-__ZTIN3com3sun4star13configuration29MissingBootstrapFileExceptionE
-__ZTIN3com3sun4star13configuration31InstallationIncompleteExceptionE
-__ZTIN3com3sun4star13configuration32CannotLoadConfigurationExceptionE
-__ZTIN3com3sun4star13configuration7backend13XLayerHandlerE
-__ZTIN3com3sun4star13configuration7backend14XSchemaHandlerE
-__ZTIN3com3sun4star13configuration7backend14XUpdateHandlerE
-__ZTIN3com3sun4star13configuration7backend15XCompositeLayerE
-__ZTIN3com3sun4star13configuration7backend15XSchemaSupplierE
-__ZTIN3com3sun4star13configuration7backend15XUpdatableLayerE
-__ZTIN3com3sun4star13configuration7backend16XBackendEntitiesE
-__ZTIN3com3sun4star13configuration7backend18XMultiLayerStratumE
-__ZTIN3com3sun4star13configuration7backend21BackendSetupExceptionE
-__ZTIN3com3sun4star13configuration7backend22BackendAccessExceptionE
-__ZTIN3com3sun4star13configuration7backend22CannotConnectExceptionE
-__ZTIN3com3sun4star13configuration7backend22MalformedDataExceptionE
-__ZTIN3com3sun4star13configuration7backend23ConnectionLostExceptionE
-__ZTIN3com3sun4star13configuration7backend23XBackendChangesListenerE
-__ZTIN3com3sun4star13configuration7backend23XBackendChangesNotifierE
-__ZTIN3com3sun4star13configuration7backend24StratumCreationExceptionE
-__ZTIN3com3sun4star13configuration7backend24XVersionedSchemaSupplierE
-__ZTIN3com3sun4star13configuration7backend29AuthenticationFailedExceptionE
-__ZTIN3com3sun4star13configuration7backend33InsufficientAccessRightsExceptionE
-__ZTIN3com3sun4star13configuration7backend39InvalidAuthenticationMechanismExceptionE
-__ZTIN3com3sun4star13configuration7backend6XLayerE
-__ZTIN3com3sun4star13configuration7backend7XSchemaE
-__ZTIN3com3sun4star13configuration7backend8XBackendE
-__ZTIN3com3sun4star2io11IOExceptionE
-__ZTIN3com3sun4star2io12XInputStreamE
-__ZTIN3com3sun4star2io13XOutputStreamE
-__ZTIN3com3sun4star2io15XActiveDataSinkE
-__ZTIN3com3sun4star2io16XDataInputStreamE
-__ZTIN3com3sun4star2io17XActiveDataSourceE
-__ZTIN3com3sun4star2io20WrongFormatExceptionE
-__ZTIN3com3sun4star2io21NotConnectedExceptionE
-__ZTIN3com3sun4star2io22UnexpectedEOFExceptionE
-__ZTIN3com3sun4star2io27BufferSizeExceededExceptionE
-__ZTIN3com3sun4star3uno10XInterfaceE
-__ZTIN3com3sun4star3uno15XCurrentContextE
-__ZTIN3com3sun4star3uno16RuntimeExceptionE
-__ZTIN3com3sun4star3uno17XComponentContextE
-__ZTIN3com3sun4star3uno5XWeakE
-__ZTIN3com3sun4star3uno9ExceptionE
-__ZTIN3com3sun4star3xml3sax12SAXExceptionE
-__ZTIN3com3sun4star3xml3sax14XAttributeListE
-__ZTIN3com3sun4star3xml3sax16XDocumentHandlerE
-;__ZTIN3com3sun4star4l
-__ZTIN3com3sun4star4lang10XComponentE
-__ZTIN3com3sun4star4lang10XUnoTunnelE
-__ZTIN3com3sun4star4lang12XLocalizableE
-__ZTIN3com3sun4star4lang12XServiceInfoE
-__ZTIN3com3sun4star4lang13XTypeProviderE
-__ZTIN3com3sun4star4lang14XEventListenerE
-__ZTIN3com3sun4star4lang15XInitializationE
-__ZTIN3com3sun4star4lang17DisposedExceptionE
-__ZTIN3com3sun4star4lang18NoSupportExceptionE
-__ZTIN3com3sun4star4lang20NullPointerExceptionE
-__ZTIN3com3sun4star4lang20XMultiServiceFactoryE
-__ZTIN3com3sun4star4lang21XSingleServiceFactoryE
-__ZTIN3com3sun4star4lang22IllegalAccessExceptionE
-__ZTIN3com3sun4star4lang22WrappedTargetExceptionE
-__ZTIN3com3sun4star4lang23XSingleComponentFactoryE
-__ZTIN3com3sun4star4lang24IllegalArgumentExceptionE
-__ZTIN3com3sun4star4lang29ServiceNotRegisteredExceptionE
-__ZTIN3com3sun4star4lang29WrappedTargetRuntimeExceptionE
-__ZTIN3com3sun4star4task17XInteractionAbortE
-__ZTIN3com3sun4star4task17XInteractionRetryE
-__ZTIN3com3sun4star4task19XInteractionApproveE
-__ZTIN3com3sun4star4task19XInteractionRequestE
-__ZTIN3com3sun4star4task22XInteractionDisapproveE
-__ZTIN3com3sun4star4task24XInteractionContinuationE
-__ZTIN3com3sun4star4util10XFlushableE
-__ZTIN3com3sun4star4util12XRefreshableE
-__ZTIN3com3sun4star4util12XTimeStampedE
-__ZTIN3com3sun4star4util13XChangesBatchE
-__ZTIN3com3sun4star4util13XStringEscapeE
-__ZTIN3com3sun4star4util16XChangesNotifierE
-__ZTIN3com3sun4star5beans10XExactNameE
-__ZTIN3com3sun4star5beans12XPropertySetE
-__ZTIN3com3sun4star5beans14XPropertyStateE
-__ZTIN3com3sun4star5beans16XFastPropertySetE
-__ZTIN3com3sun4star5beans16XPropertySetInfoE
-__ZTIN3com3sun4star5beans17XMultiPropertySetE
-__ZTIN3com3sun4star5beans18XPropertyWithStateE
-__ZTIN3com3sun4star5beans20XMultiPropertyStatesE
-__ZTIN3com3sun4star5beans21PropertyVetoExceptionE
-__ZTIN3com3sun4star5beans24UnknownPropertyExceptionE
-__ZTIN3com3sun4star5beans24XHierarchicalPropertySetE
-__ZTIN3com3sun4star5beans29XMultiHierarchicalPropertySetE
-__ZTIN3com3sun4star5beans9XPropertyE
-__ZTIN3com3sun4star6script22CannotConvertExceptionE
-__ZTIN3com3sun4star8registry12XRegistryKeyE
-__ZTIN3com3sun4star8registry15XSimpleRegistryE
-__ZTIN3com3sun4star8registry21InvalidValueExceptionE
-__ZTIN3com3sun4star8registry22MergeConflictExceptionE
-__ZTIN3com3sun4star8registry24InvalidRegistryExceptionE
-__ZTIN3com3sun4star9container10XContainerE
-__ZTIN3com3sun4star9container11XNameAccessE
-__ZTIN3com3sun4star9container12XNameReplaceE
-__ZTIN3com3sun4star9container14XElementAccessE
-__ZTIN3com3sun4star9container14XNameContainerE
-__ZTIN3com3sun4star9container17XHierarchicalNameE
-__ZTIN3com3sun4star9container21ElementExistExceptionE
-__ZTIN3com3sun4star9container22NoSuchElementExceptionE
-__ZTIN3com3sun4star9container23XHierarchicalNameAccessE
-__ZTIN3com3sun4star9container6XChildE
-__ZTIN3com3sun4star9container6XNamedE
-__ZTIN3vos10IReferenceE
-__ZTIN3vos10OReferenceE
-__ZTIN3vos6OTimerE
-__ZTIN3vos7OObjectE
-__ZTIN3vos7OThreadE
-__ZTIN3vos9IRunnableE
-__ZTIN4cppu11ImplHelper2IN3com3sun4star8registry15XSimpleRegistryENS3_4util10XFlushableEEE
-__ZTIN4cppu11ImplHelper4IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XLocalizableENS3_4util12XRefreshableENS7_10XFlushableEEE
-__ZTIN4cppu11ImplHelper6IN3com3sun4star5beans12XPropertySetENS4_17XMultiPropertySetENS4_24XHierarchicalPropertySetENS4_29XMultiHierarchicalPropertySetENS4_14XPropertyStateENS4_20XMultiPropertyStatesEEE
-__ZTIN4cppu11ImplHelper6IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyEEE
-__ZTIN4cppu11ImplHelper9IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyENS9_16XPropertySetInfoENS3_13configuration18XTemplateCo!_yPkJc2
-__ZTIN4cppu11OWeakObjectE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend13XLayerHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend14XSchemaHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend15XCompositeLayerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend23XBackendChangesListenerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io13XOutputStreamEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io16XDataInputStreamEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3uno15XCurrentContextEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax14XAttributeListEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax16XDocumentHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang14XEventListenerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang23XSingleComponentFactoryEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionAbortEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionRetryEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionApproveEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionRequestEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task22XInteractionDisapproveEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star5beans16XPropertySetInfoEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star8registry12XRegistryKeyEEE
-__ZTIN4cppu15WeakImplHelper2IN3com3sun4star13configuration7backend13XLayerHandlerENS5_6XLayerEEE
-__ZTIN4cppu15WeakImplHelper2IN3com3sun4star3uno15XCurrentContextENS3_4lang10XUnoTunnelEEE
-__ZTIN4cppu15WeakImplHelper3IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_13configuration7backend14XUpdateHandlerEEE
-__ZTIN4cppu15WeakImplHelper3IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang12XServiceInfoEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend6XLayerEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend7XSchemaEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io17XActiveDataSourceENS3_13configuration7backend13XLayerHandlerEEE
-__ZTIN4cppu15WeakImplHelper5IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableEEE
-__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang10XComponentENS7_12XServiceInfoENS3_13configuration17XTemplateInstanceENS7_10XUnoTunnelEEE
-__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableENS6_13XChangesBatchEEE
-__ZTIN4cppu18OPropertySetHelperE
-__ZTIN4cppu22ImplInheritanceHelper1IN9configmgr7localbe16LocalStratumBaseEN3com3sun4star13configuration7backend18XMultiLayerStratumEEE
-__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend6XLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu22ImplInheritanceHelper3IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS8_15XCompositeLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu24WeakComponentImplHelper1IN3com3sun4star4lang12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper2IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star13configuration7backend24XVersionedSchemaSupplierENS3_4lang15XInitializationENS7_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star3uno17XComponentContextENS4_15XCurrentContextENS3_4lang12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star4lang15XInitializationENS3_13configuration7backend16XBackendEntitiesENS4_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend15XSchemaSupplierENS5_18XMultiLayerStratumENS5_16XBackendEntitiesENS3_4lang15XInitializationENS9_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_15XSchemaSupplierENS3_4lang15XInitializationENS9_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper7IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_24XVersionedSchemaSupplierENS5_23XBackendChangesNotifierENS5_23XBackendChangesListenerENS3_4lang15XInitializationEN!_7c1rO0
-__ZTIN4cppu27WeakComponentImplHelperBaseE
-__ZTIN9configmgr10BasicGroupE
-__ZTIN9configmgr10IInterfaceE
-__ZTIN9configmgr10NodeActionE
-__ZTIN9configmgr10RefcountedE
-__ZTIN9configmgr10RemoveNodeE
-__ZTIN9configmgr10SearchNodeE
-__ZTIN9configmgr11NoncopyableE
-__ZTIN9configmgr11TreeManagerE
-__ZTIN9configmgr11TreeUpdaterE
-__ZTIN9configmgr11ValueChangeE
-__ZTIN9configmgr12CollectNamesE
-__ZTIN9configmgr12ITreeManagerE
-__ZTIN9configmgr12ONameCreatorE
-__ZTIN9configmgr12OPathCreatorINS_13configuration12AbsolutePathEEE
-__ZTIN9configmgr12OPathCreatorINS_13configuration12RelativePathEEE
-__ZTIN9configmgr13BasicValueSetE
-__ZTIN9configmgr13configuration100_GLOBAL__N__ZN9configmgr13configuration12TemplateName18makeSimpleTypeNameERKN3com3sun4star3uno4TypeE12TypeDetectorE
-__ZTIN9configmgr13configuration11InvalidNameE
-__ZTIN9configmgr13configuration11NodeVisitorE
-__ZTIN9configmgr13configuration11SetNodeImplE
-__ZTIN9configmgr13configuration12TypeMismatchE
-__ZTIN9configmgr13configuration13GroupNodeImplE
-__ZTIN9configmgr13configuration14SetNodeVisitorE
-__ZTIN9configmgr13configuration15ValueMemberNode12DeferredImplE
-__ZTIN9configmgr13configuration18GroupMemberVisitorE
-__ZTIN9configmgr13configuration19ConstraintViolationE
-__ZTIN9configmgr13configuration19DeferredSetNodeImplE
-__ZTIN9configmgr13configuration19WrappedUnoExceptionE
-__ZTIN9configmgr13configuration21DeferredGroupNodeImplE
-__ZTIN9configmgr13configuration21TemplateProvider_ImplE
-__ZTIN9configmgr13configuration28SpecialTemplateProvider_ImplE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv15CollectValueIDsE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv17SetVisitorAdapterE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv19GroupVisitorAdapterE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv21FindNonDefaultElementE
-__ZTIN9configmgr13configuration88_GLOBAL__N__ZN9configmgr13configuration17GroupUpdateHelperC2ERKNS0_4TreeERKNS0_7NodeRefE13NodeDefaulterE
-__ZTIN9configmgr13configuration8NodeImplE
-__ZTIN9configmgr13configuration8TemplateE
-__ZTIN9configmgr13configuration9ExceptionE
-__ZTIN9configmgr13INodeListenerE
-__ZTIN9configmgr13OInnerSetInfoE
-__ZTIN9configmgr13OMergeChangesE
-__ZTIN9configmgr13OProviderImplE
-__ZTIN9configmgr13PWMutexHolderE
-__ZTIN9configmgr13SubtreeChangeE
-__ZTIN9configmgr14BasicSetAccessE
-__ZTIN9configmgr14OStripDefaultsE
-__ZTIN9configmgr15BasicSetElementE
-__ZTIN9configmgr15IConfigListenerE
-__ZTIN9configmgr15OInnerGroupInfoE
-__ZTIN9configmgr15ProviderFactoryE
-__ZTIN9configmgr15ProviderWrapperE
-__ZTIN9configmgr16BasicGroupAccessE
-__ZTIN9configmgr16BasicPropertySetE
-__ZTIN9configmgr16BasicRootElementE
-__ZTIN9configmgr16BootstrapContextE
-__ZTIN9configmgr16ChangeTreeActionE
-__ZTIN9configmgr16ComponentContextE
-__ZTIN9configmgr16IDefaultProviderE
-__ZTIN9configmgr16ITemplateManagerE
-__ZTIN9configmgr16NodeModificationE
-__ZTIN9configmgr16OMergeRemoveNodeE
-__ZTIN9configmgr16OPropagateLevelsE
-__ZTIN9configmgr16UnoContextTunnel6TunnelE
-__ZTIN9configmgr17AttributeListImplE
-__ZTIN9configmgr17BasicInnerElementE
-__ZTIN9configmgr17CacheClientAccessE
-__ZTIN9configmgr17ExtendedCacheDataE
-__ZTIN9configmgr17OInnerGroupUpdateE
-__ZTIN9configmgr17OMergeValueChangeE
-__ZTIN9configmgr17TemplateCacheDataE
-__ZTIN9configmgr18BasicUpdateElementE
-__ZTIN9configmgr18CacheLoadingAccessE
-__ZTIN9configmgr18DisposingForwarderE
-__ZTIN9configmgr18IConfigBroadcasterE
-__ZTIN9configmgr18IConfigTreeManagerE
-__ZTIN9configmgr18OSetElementSetInfoE
-__ZTIN9configmgr19OInnerTreeSetUpdateE
-__ZTIN9configmgr19ORootElementSetInfoE
-__ZTIN9configmgr20OCacheWriteScheduler5TimerE
-__ZTIN9configmgr20OInnerValueSetUpdateE
-__ZTIN9configmgr20OMergeTreeChangeListE
-__ZTIN9configmgr20OSetElementGroupInfoE
-__ZTIN9configmgr20ServiceComponentImplE
-__ZTIN9configmgr21ORootElementGroupInfoE
-__ZTIN9configmgr21OTreeDisposeScheduler5TimerE
-__ZTIN9configmgr21SubtreeChangeReferrerE
-__ZTIN9configmgr22ChangeTreeModificationE
-__ZTIN9configmgr22IConfigDefaultProviderE
-__ZTIN9configmgr22IConfigTemplateManagerE
-__ZTIN9configmgr22OConfigurationProviderE
-__ZTIN9configmgr22OConfigurationRegistryE
-__ZTIN9configmgr22OSetElementGroupUpdateE
-__ZTIN9configmgr23ConfigChangeBroadcasterE
-__ZTIN9configmgr23IDefaultableTreeManagerE
-__ZTIN9configmgr23ORootElementGroupUpdateE
-__ZTIN9configmgr24OSetElementTreeSetUpdateE
-__ZTIN9configmgr25OConfigurationRegistryKeyE
-__ZTIN9configmgr25ORootElementTreeSetUpdateE
-__ZTIN9configmgr25OSetElementValueSetUpdateE
-__ZTIN9configmgr26OProviderDisposingListenerE
-__ZTIN9configmgr26ORootElementValueSetUpdateE
-__ZTIN9configmgr3xml11BasicParserE
-__ZTIN9configmgr3xml11LayerWriterE
-__ZTIN9configmgr3xml13ElementParser12BadValueTypeE
-__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend6XLayerEEE
-__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend7XSchemaEEE
-__ZTIN9configmgr3xml13WriterServiceIN3com3sun4star13configuration7backend13XLayerHandlerEEE
-__ZTIN9configmgr3xml18LayerParserServiceE
-__ZTIN9configmgr3xml19SchemaParserServiceE
-__ZTIN9configmgr4data10SetVisitorE
-__ZTIN9configmgr4data11NodeVisitorE
-__ZTIN9configmgr4data11TreeSegment4ImplE
-__ZTIN9configmgr4data15TreeNodeBuilder12LinkSetNodesE
-__ZTIN9configmgr4data20BasicDataTreeBuilderE
-__ZTIN9configmgr4data21ConvertingNodeBuilderE
-__ZTIN9configmgr4data21DataTreeDefaultMergerE
-__ZTIN9configmgr4data22CopyingDataTreeBuilder18ElementListBuilderE
-__ZTIN9configmgr4data22CopyingDataTreeBuilderE
-__ZTIN9configmgr4data24ConvertingSubnodeBuilderE
-__ZTIN9configmgr4data25ConvertingDataTreeBuilder18ElementListBuilderE
-__ZTIN9configmgr4data25ConvertingDataTreeBuilderE
-__ZTIN9configmgr4view12ViewStrategyE
-__ZTIN9configmgr4view18DirectViewStrategyE
-__ZTIN9configmgr4view20ReadOnlyViewStrategyE
-__ZTIN9configmgr5INodeE
-__ZTIN9configmgr6ChangeE
-__ZTIN9configmgr6memory11HeapManagerE
-__ZTIN9configmgr6memory14SimpleHeapLockE
-__ZTIN9configmgr6memory21SimpleHeapManagerBaseE
-__ZTIN9configmgr6memory25SimpleCheckingHeapManagerE
-__ZTIN9configmgr6memory8DataLockE
-__ZTIN9configmgr7AddNodeE
-__ZTIN9configmgr7backend10NodeUpdateE
-__ZTIN9configmgr7backend11NamedUpdateE
-__ZTIN9configmgr7backend11NodeReplaceE
-__ZTIN9configmgr7backend11PropertyAddE
-__ZTIN9configmgr7backend12ResultHolderINS0_12NodeInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend12ResultHolderINS0_16TemplateInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend12ResultHolderINS0_17ComponentInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend13BackendAccessE
-__ZTIN9configmgr7backend13ElementUpdateE
-__ZTIN9configmgr7backend13PropertyResetE
-__ZTIN9configmgr7backend13SchemaBuilderE
-__ZTIN9configmgr7backend13UpdateServiceE
-__ZTIN9configmgr7backend14PropertyUpdateE
-__ZTIN9configmgr7backend15CacheControllerE
-__ZTIN9configmgr7backend16NodeModificationE
-__ZTIN9configmgr7backend17BasicUpdateMergerE
-__ZTIN9configmgr7backend17BinaryReader_ImplE
-__ZTIN9configmgr7backend17INodeDataListenerE
-__ZTIN9configmgr7backend17INodeDataProviderE
-__ZTIN9configmgr7backend17LayerMergeHandlerE
-__ZTIN9configmgr7backend17LayerUpdateMergerE
-__ZTIN9configmgr7backend18BasicImportHandlerE
-__ZTIN9configmgr7backend18BinaryWriteHandlerE
-__ZTIN9configmgr7backend18ImportMergeHandlerE
-__ZTIN9configmgr7backend18LayerUpdateHandlerE
-__ZTIN9configmgr7backend19ICachedDataListenerE
-__ZTIN9configmgr7backend19ICachedDataNotifierE
-__ZTIN9configmgr7backend19ICachedDataProviderE
-__ZTIN9configmgr7backend19IDirectDataProviderE
-__ZTIN9configmgr7backend19IMergedDataProviderE
-__ZTIN9configmgr7backend19INodeUpdateProviderE
-__ZTIN9configmgr7backend19LayerDefaultRemoverE
-__ZTIN9configmgr7backend19MultiStratumBackendE
-__ZTIN9configmgr7backend20IDefaultDataProviderE
-__ZTIN9configmgr7backend20SingleBackendAdapterE
-__ZTIN9configmgr7backend21BackendChangeNotifierE
-__ZTIN9configmgr7backend21IDataProviderMetaDataE
-__ZTIN9configmgr7backend21ITemplateDataProviderE
-__ZTIN9configmgr7backend21OInvalidateTreeThreadE
-__ZTIN9configmgr7backend22CacheChangeMulticasterE
-__ZTIN9configmgr7backend22IComponentDataProviderE
-__ZTIN9configmgr7backend8NodeDropE
-__ZTIN9configmgr7localbe16LocalStratumBaseE
-__ZTIN9configmgr7localbe17LocalMultiStratumE
-__ZTIN9configmgr7localbe18FlatLocalFileLayerE
-__ZTIN9configmgr7localbe18LocalSingleBackendE
-__ZTIN9configmgr7localbe19BasicLocalFileLayerE
-__ZTIN9configmgr7localbe19LayerPropertyHelperE
-__ZTIN9configmgr7localbe19LocalSchemaSupplierE
-__ZTIN9configmgr7localbe20SimpleLocalFileLayerE
-__ZTIN9configmgr7localbe23CompositeLocalFileLayerE
-__ZTIN9configmgr7localbe23LocalStratumMutexHolderE
-__ZTIN9configmgr7localbe27FullCompositeLocalFileLayerE
-__ZTIN9configmgr7localbe28BasicCompositeLocalFileLayerE
-__ZTIN9configmgr7SubtreeE
-__ZTIN9configmgr8BasicSetE
-__ZTIN9configmgr8ISubtreeE
-__ZTIN9configmgr8OOptionsE
-__ZTIN9configmgr9apihelper15BroadcasterBaseE
-__ZTIN9configmgr9apihelper17PropertySetHelperE
-__ZTIN9configmgr9apihelper18InteractionRequestE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionAbortEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionRetryEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task19XInteractionApproveEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task22XInteractionDisapproveEEE
-__ZTIN9configmgr9apihelper24SimpleInteractionRequestE
-__ZTIN9configmgr9apihelper31ConfigurationInteractionHandler7ContextE
-__ZTIN9configmgr9CacheDataE
-__ZTIN9configmgr9configapi10NodeAccessE
-__ZTIN9configmgr9configapi10SetElementE
-__ZTIN9configmgr9configapi11ApiTreeImpl16ComponentAdapterE
-__ZTIN9configmgr9configapi11Broadcaster4ImplE
-__ZTIN9configmgr9configapi11NodeElementE
-__ZTIN9configmgr9configapi11OSetElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi11RootElementE
-__ZTIN9configmgr9configapi11TreeElementE
-__ZTIN9configmgr9configapi12InnerElementE
-__ZTIN9configmgr9configapi13NodeSetAccessE
-__ZTIN9configmgr9configapi13OInnerElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi14ObjectRegistryE
-__ZTIN9configmgr9configapi15ApiRootTreeImpl12NodeListenerE
-__ZTIN9configmgr9configapi15NodeGroupAccessE
-__ZTIN9configmgr9configapi16OReadRootElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi16OReadRootElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi17CollectPropertiesE
-__ZTIN9configmgr9configapi17NodeSetInfoAccessE
-__ZTIN9configmgr9configapi17NodeTreeSetAccessE
-__ZTIN9configmgr9configapi17UpdateRootElementE
-__ZTIN9configmgr9configapi18NodeValueSetAccessE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi19NodeGroupInfoAccessE
-__ZTIN9configmgr9configapi19NodePropertySetInfoE
-__ZTIN9configmgr9configapi19UpdateObjectFactoryE
-__ZTIN9configmgr9configapi21ReadOnlyObjectFactoryE
-__ZTIN9configmgr9configapi7FactoryE
-__ZTIN9configmgr9configapi8internal15SearchExactNameE
-__ZTIN9configmgr9OProviderE
-__ZTIN9configmgr9ValueNodeE
-__ZTIN9salhelper21SimpleReferenceObjectE
-;__ZTISt9bad_alloc
-;__ZTISt9exception
-
-
-IMPORTS
-__ZTIN10comphelper18OPropertyContainerE=configmg.__ZTIN10comphelper18OPropertyContainerE
-__ZTIN10comphelper24OPropertyContainerHelperE=configmg.__ZTIN10comphelper24OPropertyContainerHelperE
-__ZTIN10comphelper25OPropertyArrayUsageHelperIN9configmgr22OConfigurationProviderEEE=configmg.__ZTIN10comphelper25OPropertyArrayUsageHelperIN9configmgr22OConfigurationProviderEEE
-__ZTIN3com3sun4star13configuration17XTemplateInstanceE=configmg.__ZTIN3com3sun4star13configuration17XTemplateInstanceE
-__ZTIN3com3sun4star13configuration18XTemplateContainerE=configmg.__ZTIN3com3sun4star13configuration18XTemplateContainerE
-__ZTIN3com3sun4star13configuration29InvalidBootstrapFileExceptionE=configmg.__ZTIN3com3sun4star13configuration29InvalidBootstrapFileExceptionE
-__ZTIN3com3sun4star13configuration29MissingBootstrapFileExceptionE=configmg.__ZTIN3com3sun4star13configuration29MissingBootstrapFileExceptionE
-__ZTIN3com3sun4star13configuration31InstallationIncompleteExceptionE=configmg.__ZTIN3com3sun4star13configuration31InstallationIncompleteExceptionE
-__ZTIN3com3sun4star13configuration32CannotLoadConfigurationExceptionE=configmg.__ZTIN3com3sun4star13configuration32CannotLoadConfigurationExceptionE
-__ZTIN3com3sun4star13configuration7backend13XLayerHandlerE=configmg.__ZTIN3com3sun4star13configuration7backend13XLayerHandlerE
-__ZTIN3com3sun4star13configuration7backend14XLayerImporterE=configmg.__ZTIN3com3sun4star13configuration7backend14XLayerImporterE
-__ZTIN3com3sun4star13configuration7backend14XSchemaHandlerE=configmg.__ZTIN3com3sun4star13configuration7backend14XSchemaHandlerE
-__ZTIN3com3sun4star13configuration7backend14XUpdateHandlerE=configmg.__ZTIN3com3sun4star13configuration7backend14XUpdateHandlerE
-__ZTIN3com3sun4star13configuration7backend15XCompositeLayerE=configmg.__ZTIN3com3sun4star13configuration7backend15XCompositeLayerE
-__ZTIN3com3sun4star13configuration7backend15XSchemaSupplierE=configmg.__ZTIN3com3sun4star13configuration7backend15XSchemaSupplierE
-__ZTIN3com3sun4star13configuration7backend15XUpdatableLayerE=configmg.__ZTIN3com3sun4star13configuration7backend15XUpdatableLayerE
-__ZTIN3com3sun4star13configuration7backend16XBackendEntitiesE=configmg.__ZTIN3com3sun4star13configuration7backend16XBackendEntitiesE
-__ZTIN3com3sun4star13configuration7backend18XMultiLayerStratumE=configmg.__ZTIN3com3sun4star13configuration7backend18XMultiLayerStratumE
-__ZTIN3com3sun4star13configuration7backend19XSingleLayerStratumE=configmg.__ZTIN3com3sun4star13configuration7backend19XSingleLayerStratumE
-__ZTIN3com3sun4star13configuration7backend21BackendSetupExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend21BackendSetupExceptionE
-__ZTIN3com3sun4star13configuration7backend22BackendAccessExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend22BackendAccessExceptionE
-__ZTIN3com3sun4star13configuration7backend22CannotConnectExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend22CannotConnectExceptionE
-__ZTIN3com3sun4star13configuration7backend22MalformedDataExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend22MalformedDataExceptionE
-__ZTIN3com3sun4star13configuration7backend23ConnectionLostExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend23ConnectionLostExceptionE
-__ZTIN3com3sun4star13configuration7backend23XBackendChangesListenerE=configmg.__ZTIN3com3sun4star13configuration7backend23XBackendChangesListenerE
-__ZTIN3com3sun4star13configuration7backend23XBackendChangesNotifierE=configmg.__ZTIN3com3sun4star13configuration7backend23XBackendChangesNotifierE
-__ZTIN3com3sun4star13configuration7backend24StratumCreationExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend24StratumCreationExceptionE
-__ZTIN3com3sun4star13configuration7backend24XVersionedSchemaSupplierE=configmg.__ZTIN3com3sun4star13configuration7backend24XVersionedSchemaSupplierE
-__ZTIN3com3sun4star13configuration7backend29AuthenticationFailedExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend29AuthenticationFailedExceptionE
-__ZTIN3com3sun4star13configuration7backend33InsufficientAccessRightsExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend33InsufficientAccessRightsExceptionE
-__ZTIN3com3sun4star13configuration7backend39InvalidAuthenticationMechanismExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend39InvalidAuthenticationMechanismExceptionE
-__ZTIN3com3sun4star13configuration7backend6XLayerE=configmg.__ZTIN3com3sun4star13configuration7backend6XLayerE
-__ZTIN3com3sun4star13configuration7backend7XSchemaE=configmg.__ZTIN3com3sun4star13configuration7backend7XSchemaE
-__ZTIN3com3sun4star13configuration7backend8XBackendE=configmg.__ZTIN3com3sun4star13configuration7backend8XBackendE
-__ZTIN3com3sun4star2io11IOExceptionE=configmg.__ZTIN3com3sun4star2io11IOExceptionE
-__ZTIN3com3sun4star2io12XInputStreamE=configmg.__ZTIN3com3sun4star2io12XInputStreamE
-__ZTIN3com3sun4star2io13XOutputStreamE=configmg.__ZTIN3com3sun4star2io13XOutputStreamE
-__ZTIN3com3sun4star2io15XActiveDataSinkE=configmg.__ZTIN3com3sun4star2io15XActiveDataSinkE
-__ZTIN3com3sun4star2io16XDataInputStreamE=configmg.__ZTIN3com3sun4star2io16XDataInputStreamE
-__ZTIN3com3sun4star2io17XActiveDataSourceE=configmg.__ZTIN3com3sun4star2io17XActiveDataSourceE
-__ZTIN3com3sun4star2io20WrongFormatExceptionE=configmg.__ZTIN3com3sun4star2io20WrongFormatExceptionE
-__ZTIN3com3sun4star2io21NotConnectedExceptionE=configmg.__ZTIN3com3sun4star2io21NotConnectedExceptionE
-__ZTIN3com3sun4star2io22UnexpectedEOFExceptionE=configmg.__ZTIN3com3sun4star2io22UnexpectedEOFExceptionE
-__ZTIN3com3sun4star2io27BufferSizeExceededExceptionE=configmg.__ZTIN3com3sun4star2io27BufferSizeExceededExceptionE
-__ZTIN3com3sun4star3uno10XInterfaceE=configmg.__ZTIN3com3sun4star3uno10XInterfaceE
-__ZTIN3com3sun4star3uno15XCurrentContextE=configmg.__ZTIN3com3sun4star3uno15XCurrentContextE
-;__ZTIN3com3sun4star3uno16RuntimeExceptionE=configmg.__ZTIN3com3sun4star3uno16RuntimeExceptionE
-__ZTIN3com3sun4star3uno17XComponentContextE=configmg.__ZTIN3com3sun4star3uno17XComponentContextE
-__ZTIN3com3sun4star3uno5XWeakE=configmg.__ZTIN3com3sun4star3uno5XWeakE
-;__ZTIN3com3sun4star3uno9ExceptionE=configmg.__ZTIN3com3sun4star3uno9ExceptionE
-__ZTIN3com3sun4star3xml3sax12SAXExceptionE=configmg.__ZTIN3com3sun4star3xml3sax12SAXExceptionE
-__ZTIN3com3sun4star3xml3sax14XAttributeListE=configmg.__ZTIN3com3sun4star3xml3sax14XAttributeListE
-__ZTIN3com3sun4star3xml3sax16XDocumentHandlerE=configmg.__ZTIN3com3sun4star3xml3sax16XDocumentHandlerE
-__ZTIN3com3sun4star4lang10XComponentE=configmg.__ZTIN3com3sun4star4lang10XComponentE
-__ZTIN3com3sun4star4lang10XUnoTunnelE=configmg.__ZTIN3com3sun4star4lang10XUnoTunnelE
-__ZTIN3com3sun4star4lang12XLocalizableE=configmg.__ZTIN3com3sun4star4lang12XLocalizableE
-__ZTIN3com3sun4star4lang12XServiceInfoE=configmg.__ZTIN3com3sun4star4lang12XServiceInfoE
-__ZTIN3com3sun4star4lang13XTypeProviderE=configmg.__ZTIN3com3sun4star4lang13XTypeProviderE
-__ZTIN3com3sun4star4lang14XEventListenerE=configmg.__ZTIN3com3sun4star4lang14XEventListenerE
-__ZTIN3com3sun4star4lang15XInitializationE=configmg.__ZTIN3com3sun4star4lang15XInitializationE
-__ZTIN3com3sun4star4lang17DisposedExceptionE=configmg.__ZTIN3com3sun4star4lang17DisposedExceptionE
-__ZTIN3com3sun4star4lang18NoSupportExceptionE=configmg.__ZTIN3com3sun4star4lang18NoSupportExceptionE
-__ZTIN3com3sun4star4lang20NullPointerExceptionE=configmg.__ZTIN3com3sun4star4lang20NullPointerExceptionE
-__ZTIN3com3sun4star4lang20XMultiServiceFactoryE=configmg.__ZTIN3com3sun4star4lang20XMultiServiceFactoryE
-__ZTIN3com3sun4star4lang21XSingleServiceFactoryE=configmg.__ZTIN3com3sun4star4lang21XSingleServiceFactoryE
-__ZTIN3com3sun4star4lang22IllegalAccessExceptionE=configmg.__ZTIN3com3sun4star4lang22IllegalAccessExceptionE
-__ZTIN3com3sun4star4lang22WrappedTargetExceptionE=configmg.__ZTIN3com3sun4star4lang22WrappedTargetExceptionE
-__ZTIN3com3sun4star4lang23XSingleComponentFactoryE=configmg.__ZTIN3com3sun4star4lang23XSingleComponentFactoryE
-__ZTIN3com3sun4star4lang24IllegalArgumentExceptionE=configmg.__ZTIN3com3sun4star4lang24IllegalArgumentExceptionE
-__ZTIN3com3sun4star4lang29ServiceNotRegisteredExceptionE=configmg.__ZTIN3com3sun4star4lang29ServiceNotRegisteredExceptionE
-__ZTIN3com3sun4star4lang29WrappedTargetRuntimeExceptionE=configmg.__ZTIN3com3sun4star4lang29WrappedTargetRuntimeExceptionE
-__ZTIN3com3sun4star4task17XInteractionAbortE=configmg.__ZTIN3com3sun4star4task17XInteractionAbortE
-__ZTIN3com3sun4star4task17XInteractionRetryE=configmg.__ZTIN3com3sun4star4task17XInteractionRetryE
-__ZTIN3com3sun4star4task19XInteractionApproveE=configmg.__ZTIN3com3sun4star4task19XInteractionApproveE
-__ZTIN3com3sun4star4task19XInteractionRequestE=configmg.__ZTIN3com3sun4star4task19XInteractionRequestE
-__ZTIN3com3sun4star4task22XInteractionDisapproveE=configmg.__ZTIN3com3sun4star4task22XInteractionDisapproveE
-__ZTIN3com3sun4star4task24XInteractionContinuationE=configmg.__ZTIN3com3sun4star4task24XInteractionContinuationE
-__ZTIN3com3sun4star4task4XJobE=configmg.__ZTIN3com3sun4star4task4XJobE
-__ZTIN3com3sun4star4util10XFlushableE=configmg.__ZTIN3com3sun4star4util10XFlushableE
-__ZTIN3com3sun4star4util12XRefreshableE=configmg.__ZTIN3com3sun4star4util12XRefreshableE
-__ZTIN3com3sun4star4util12XTimeStampedE=configmg.__ZTIN3com3sun4star4util12XTimeStampedE
-__ZTIN3com3sun4star4util13XChangesBatchE=configmg.__ZTIN3com3sun4star4util13XChangesBatchE
-__ZTIN3com3sun4star4util13XStringEscapeE=configmg.__ZTIN3com3sun4star4util13XStringEscapeE
-__ZTIN3com3sun4star4util16XChangesNotifierE=configmg.__ZTIN3com3sun4star4util16XChangesNotifierE
-__ZTIN3com3sun4star5beans10XExactNameE=configmg.__ZTIN3com3sun4star5beans10XExactNameE
-__ZTIN3com3sun4star5beans12XPropertySetE=configmg.__ZTIN3com3sun4star5beans12XPropertySetE
-__ZTIN3com3sun4star5beans14XPropertyStateE=configmg.__ZTIN3com3sun4star5beans14XPropertyStateE
-__ZTIN3com3sun4star5beans16XFastPropertySetE=configmg.__ZTIN3com3sun4star5beans16XFastPropertySetE
-__ZTIN3com3sun4star5beans16XPropertySetInfoE=configmg.__ZTIN3com3sun4star5beans16XPropertySetInfoE
-__ZTIN3com3sun4star5beans17XMultiPropertySetE=configmg.__ZTIN3com3sun4star5beans17XMultiPropertySetE
-__ZTIN3com3sun4star5beans18XPropertyWithStateE=configmg.__ZTIN3com3sun4star5beans18XPropertyWithStateE
-__ZTIN3com3sun4star5beans20XMultiPropertyStatesE=configmg.__ZTIN3com3sun4star5beans20XMultiPropertyStatesE
-__ZTIN3com3sun4star5beans21PropertyVetoExceptionE=configmg.__ZTIN3com3sun4star5beans21PropertyVetoExceptionE
-__ZTIN3com3sun4star5beans24UnknownPropertyExceptionE=configmg.__ZTIN3com3sun4star5beans24UnknownPropertyExceptionE
-__ZTIN3com3sun4star5beans24XHierarchicalPropertySetE=configmg.__ZTIN3com3sun4star5beans24XHierarchicalPropertySetE
-__ZTIN3com3sun4star5beans25XPropertiesChangeListenerE=configmg.__ZTIN3com3sun4star5beans25XPropertiesChangeListenerE
-__ZTIN3com3sun4star5beans29XMultiHierarchicalPropertySetE=configmg.__ZTIN3com3sun4star5beans29XMultiHierarchicalPropertySetE
-__ZTIN3com3sun4star5beans9XPropertyE=configmg.__ZTIN3com3sun4star5beans9XPropertyE
-__ZTIN3com3sun4star6script22CannotConvertExceptionE=configmg.__ZTIN3com3sun4star6script22CannotConvertExceptionE
-__ZTIN3com3sun4star8registry12XRegistryKeyE=configmg.__ZTIN3com3sun4star8registry12XRegistryKeyE
-__ZTIN3com3sun4star8registry15XSimpleRegistryE=configmg.__ZTIN3com3sun4star8registry15XSimpleRegistryE
-__ZTIN3com3sun4star8registry21InvalidValueExceptionE=configmg.__ZTIN3com3sun4star8registry21InvalidValueExceptionE
-__ZTIN3com3sun4star8registry22MergeConflictExceptionE=configmg.__ZTIN3com3sun4star8registry22MergeConflictExceptionE
-__ZTIN3com3sun4star8registry24InvalidRegistryExceptionE=configmg.__ZTIN3com3sun4star8registry24InvalidRegistryExceptionE
-__ZTIN3com3sun4star9container10XContainerE=configmg.__ZTIN3com3sun4star9container10XContainerE
-__ZTIN3com3sun4star9container11XNameAccessE=configmg.__ZTIN3com3sun4star9container11XNameAccessE
-__ZTIN3com3sun4star9container12XNameReplaceE=configmg.__ZTIN3com3sun4star9container12XNameReplaceE
-__ZTIN3com3sun4star9container14XElementAccessE=configmg.__ZTIN3com3sun4star9container14XElementAccessE
-__ZTIN3com3sun4star9container14XNameContainerE=configmg.__ZTIN3com3sun4star9container14XNameContainerE
-__ZTIN3com3sun4star9container17XHierarchicalNameE=configmg.__ZTIN3com3sun4star9container17XHierarchicalNameE
-__ZTIN3com3sun4star9container21ElementExistExceptionE=configmg.__ZTIN3com3sun4star9container21ElementExistExceptionE
-__ZTIN3com3sun4star9container22NoSuchElementExceptionE=configmg.__ZTIN3com3sun4star9container22NoSuchElementExceptionE
-__ZTIN3com3sun4star9container23XHierarchicalNameAccessE=configmg.__ZTIN3com3sun4star9container23XHierarchicalNameAccessE
-__ZTIN3com3sun4star9container6XChildE=configmg.__ZTIN3com3sun4star9container6XChildE
-__ZTIN3com3sun4star9container6XNamedE=configmg.__ZTIN3com3sun4star9container6XNamedE
-__ZTIN3vos10IReferenceE=configmg.__ZTIN3vos10IReferenceE
-__ZTIN3vos10OReferenceE=configmg.__ZTIN3vos10OReferenceE
-__ZTIN3vos6OTimerE=configmg.__ZTIN3vos6OTimerE
-__ZTIN3vos7OObjectE=configmg.__ZTIN3vos7OObjectE
-__ZTIN3vos7OThreadE=configmg.__ZTIN3vos7OThreadE
-__ZTIN3vos9IRunnableE=configmg.__ZTIN3vos9IRunnableE
-__ZTIN4cppu11ImplHelper2IN3com3sun4star8registry15XSimpleRegistryENS3_4util10XFlushableEEE=configmg.__ZTIN4cppu11ImplHelper2IN3com3sun4star8registry15XSimpleRegistryENS3_4util10XFlushableEEE
-__ZTIN4cppu11ImplHelper4IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XLocalizableENS3_4util12XRefreshableENS7_10XFlushableEEE=configmg.__ZTIN4cppu11ImplHelper4IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XLocalizableENS3_4util12XRefreshableENS7_10XFlushableEEE
-__ZTIN4cppu11ImplHelper6IN3com3sun4star5beans12XPropertySetENS4_17XMultiPropertySetENS4_24XHierarchicalPropertySetENS4_29XMultiHierarchicalPropertySetENS4_14XPropertyStateENS4_20XMultiPropertyStatesEEE=configmg.__ZTIN4cppu11ImplHelper6IN3com3sun4star5beans12XPropertySetENS4_17XMultiPropertySetENS4_24XHierarchicalPropertySetENS4_29XMultiHierarchicalPropertySetENS4_14XPropertyStateENS4_20XMultiPropertyStatesEEE
-__ZTIN4cppu11ImplHelper6IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyEEE=configmg.__ZTIN4cppu11ImplHelper6IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyEEE
-__ZTIN4cppu11ImplHelper9IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyENS9_16XPropertySetInfoENS3_13configuration18XTemplateCo!_yPkJc2=configmg.__ZTIN4cppu11ImplHelper9IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyENS9_16XPropertySetInfoENS3_13configuration18XTemplateCo!_yPkJc2
-__ZTIN4cppu11OWeakObjectE=configmg.__ZTIN4cppu11OWeakObjectE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend13XLayerHandlerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend13XLayerHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend14XSchemaHandlerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend14XSchemaHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend15XCompositeLayerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend15XCompositeLayerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend23XBackendChangesListenerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend23XBackendChangesListenerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend6XLayerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend6XLayerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io12XInputStreamEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io12XInputStreamEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io13XOutputStreamEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io13XOutputStreamEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io16XDataInputStreamEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io16XDataInputStreamEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3uno15XCurrentContextEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3uno15XCurrentContextEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax14XAttributeListEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax14XAttributeListEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax16XDocumentHandlerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax16XDocumentHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang14XEventListenerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang14XEventListenerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang23XSingleComponentFactoryEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang23XSingleComponentFactoryEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionAbortEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionAbortEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionRetryEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionRetryEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionApproveEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionApproveEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionRequestEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionRequestEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task22XInteractionDisapproveEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task22XInteractionDisapproveEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star5beans16XPropertySetInfoEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star5beans16XPropertySetInfoEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star8registry12XRegistryKeyEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star8registry12XRegistryKeyEEE
-__ZTIN4cppu15WeakImplHelper2IN3com3sun4star13configuration7backend13XLayerHandlerENS5_6XLayerEEE=configmg.__ZTIN4cppu15WeakImplHelper2IN3com3sun4star13configuration7backend13XLayerHandlerENS5_6XLayerEEE
-__ZTIN4cppu15WeakImplHelper2IN3com3sun4star3uno15XCurrentContextENS3_4lang10XUnoTunnelEEE=configmg.__ZTIN4cppu15WeakImplHelper2IN3com3sun4star3uno15XCurrentContextENS3_4lang10XUnoTunnelEEE
-__ZTIN4cppu15WeakImplHelper2IN3com3sun4star4task4XJobENS3_4lang12XServiceInfoEEE=configmg.__ZTIN4cppu15WeakImplHelper2IN3com3sun4star4task4XJobENS3_4lang12XServiceInfoEEE
-__ZTIN4cppu15WeakImplHelper3IN3com3sun4star13configuration7backend14XLayerImporterENS3_4lang15XInitializationENS7_12XServiceInfoEEE=configmg.__ZTIN4cppu15WeakImplHelper3IN3com3sun4star13configuration7backend14XLayerImporterENS3_4lang15XInitializationENS7_12XServiceInfoEEE
-__ZTIN4cppu15WeakImplHelper3IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_13configuration7backend14XUpdateHandlerEEE=configmg.__ZTIN4cppu15WeakImplHelper3IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_13configuration7backend14XUpdateHandlerEEE
-__ZTIN4cppu15WeakImplHelper3IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang12XServiceInfoEEE=configmg.__ZTIN4cppu15WeakImplHelper3IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang12XServiceInfoEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend6XLayerEEE=configmg.__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend6XLayerEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend7XSchemaEEE=configmg.__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend7XSchemaEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io17XActiveDataSourceENS3_13configuration7backend13XLayerHandlerEEE=configmg.__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io17XActiveDataSourceENS3_13configuration7backend13XLayerHandlerEEE
-__ZTIN4cppu15WeakImplHelper5IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableEEE=configmg.__ZTIN4cppu15WeakImplHelper5IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableEEE
-__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang10XComponentENS7_12XServiceInfoENS3_13configuration17XTemplateInstanceENS7_10XUnoTunnelEEE=configmg.__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang10XComponentENS7_12XServiceInfoENS3_13configuration17XTemplateInstanceENS7_10XUnoTunnelEEE
-__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableENS6_13XChangesBatchEEE=configmg.__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableENS6_13XChangesBatchEEE
-__ZTIN4cppu18OPropertySetHelperE=configmg.__ZTIN4cppu18OPropertySetHelperE
-__ZTIN4cppu22ImplInheritanceHelper1IN9configmgr7localbe16LocalStratumBaseEN3com3sun4star13configuration7backend18XMultiLayerStratumEEE=configmg.__ZTIN4cppu22ImplInheritanceHelper1IN9configmgr7localbe16LocalStratumBaseEN3com3sun4star13configuration7backend18XMultiLayerStratumEEE
-__ZTIN4cppu22ImplInheritanceHelper1IN9configmgr7localbe16LocalStratumBaseEN3com3sun4star13configuration7backend19XSingleLayerStratumEEE=configmg.__ZTIN4cppu22ImplInheritanceHelper1IN9configmgr7localbe16LocalStratumBaseEN3com3sun4star13configuration7backend19XSingleLayerStratumEEE
-__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS6_4util12XTimeStampedEEE=configmg.__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend6XLayerENS6_4util12XTimeStampedEEE=configmg.__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend6XLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu22ImplInheritanceHelper3IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS8_15XCompositeLayerENS6_4util12XTimeStampedEEE=configmg.__ZTIN4cppu22ImplInheritanceHelper3IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS8_15XCompositeLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu24WeakComponentImplHelper1IN3com3sun4star4lang12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper1IN3com3sun4star4lang12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper2IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper2IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star13configuration7backend24XVersionedSchemaSupplierENS3_4lang15XInitializationENS7_12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star13configuration7backend24XVersionedSchemaSupplierENS3_4lang15XInitializationENS7_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star3uno17XComponentContextENS4_15XCurrentContextENS3_4lang12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star3uno17XComponentContextENS4_15XCurrentContextENS3_4lang12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star4lang15XInitializationENS3_13configuration7backend16XBackendEntitiesENS4_12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star4lang15XInitializationENS3_13configuration7backend16XBackendEntitiesENS4_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend15XSchemaSupplierENS5_18XMultiLayerStratumENS5_16XBackendEntitiesENS3_4lang15XInitializationENS9_12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend15XSchemaSupplierENS5_18XMultiLayerStratumENS5_16XBackendEntitiesENS3_4lang15XInitializationENS9_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_15XSchemaSupplierENS3_4lang15XInitializationENS9_12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_15XSchemaSupplierENS3_4lang15XInitializationENS9_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper7IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_24XVersionedSchemaSupplierENS5_23XBackendChangesNotifierENS5_23XBackendChangesListenerENS3_4lang15XInitializationEN!_7c1rO0=configmg.__ZTIN4cppu24WeakComponentImplHelper7IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_24XVersionedSchemaSupplierENS5_23XBackendChangesNotifierENS5_23XBackendChangesListenerENS3_4lang15XInitializationEN!_7c1rO0
-__ZTIN4cppu27WeakComponentImplHelperBaseE=configmg.__ZTIN4cppu27WeakComponentImplHelperBaseE
-__ZTIN9configmgr10BasicGroupE=configmg.__ZTIN9configmgr10BasicGroupE
-__ZTIN9configmgr10IInterfaceE=configmg.__ZTIN9configmgr10IInterfaceE
-__ZTIN9configmgr10NodeActionE=configmg.__ZTIN9configmgr10NodeActionE
-__ZTIN9configmgr10RefcountedE=configmg.__ZTIN9configmgr10RefcountedE
-__ZTIN9configmgr10RemoveNodeE=configmg.__ZTIN9configmgr10RemoveNodeE
-__ZTIN9configmgr10SearchNodeE=configmg.__ZTIN9configmgr10SearchNodeE
-__ZTIN9configmgr11ApplyUpdateE=configmg.__ZTIN9configmgr11ApplyUpdateE
-__ZTIN9configmgr11NoncopyableE=configmg.__ZTIN9configmgr11NoncopyableE
-__ZTIN9configmgr11TreeManagerE=configmg.__ZTIN9configmgr11TreeManagerE
-__ZTIN9configmgr11TreeUpdaterE=configmg.__ZTIN9configmgr11TreeUpdaterE
-__ZTIN9configmgr11ValueChangeE=configmg.__ZTIN9configmgr11ValueChangeE
-__ZTIN9configmgr12AdjustUpdateE=configmg.__ZTIN9configmgr12AdjustUpdateE
-__ZTIN9configmgr12CollectNamesE=configmg.__ZTIN9configmgr12CollectNamesE
-__ZTIN9configmgr12ITreeManagerE=configmg.__ZTIN9configmgr12ITreeManagerE
-__ZTIN9configmgr12ONameCreatorE=configmg.__ZTIN9configmgr12ONameCreatorE
-__ZTIN9configmgr12OPathCreatorINS_13configuration12AbsolutePathEEE=configmg.__ZTIN9configmgr12OPathCreatorINS_13configuration12AbsolutePathEEE
-__ZTIN9configmgr12OPathCreatorINS_13configuration12RelativePathEEE=configmg.__ZTIN9configmgr12OPathCreatorINS_13configuration12RelativePathEEE
-__ZTIN9configmgr13BasicValueSetE=configmg.__ZTIN9configmgr13BasicValueSetE
-__ZTIN9configmgr13INodeListenerE=configmg.__ZTIN9configmgr13INodeListenerE
-__ZTIN9configmgr13OInnerSetInfoE=configmg.__ZTIN9configmgr13OInnerSetInfoE
-__ZTIN9configmgr13OMergeChangesE=configmg.__ZTIN9configmgr13OMergeChangesE
-__ZTIN9configmgr13OProviderImplE=configmg.__ZTIN9configmgr13OProviderImplE
-__ZTIN9configmgr13PWMutexHolderE=configmg.__ZTIN9configmgr13PWMutexHolderE
-__ZTIN9configmgr13SubtreeChangeE=configmg.__ZTIN9configmgr13SubtreeChangeE
-__ZTIN9configmgr13configuration100_GLOBAL__N__ZN9configmgr13configuration12TemplateName18makeSimpleTypeNameERKN3com3sun4star3uno4TypeE12TypeDetectorE=configmg.__ZTIN9configmgr13configuration100_GLOBAL__N__ZN9configmgr13configuration12TemplateName18makeSimpleTypeNameERKN3com3sun4star3uno4TypeE12TypeDetectorE
-__ZTIN9configmgr13configuration11InvalidNameE=configmg.__ZTIN9configmgr13configuration11InvalidNameE
-__ZTIN9configmgr13configuration11NodeVisitorE=configmg.__ZTIN9configmgr13configuration11NodeVisitorE
-__ZTIN9configmgr13configuration11SetNodeImplE=configmg.__ZTIN9configmgr13configuration11SetNodeImplE
-__ZTIN9configmgr13configuration12RootTreeImplE=configmg.__ZTIN9configmgr13configuration12RootTreeImplE
-__ZTIN9configmgr13configuration12SetResetImplE=configmg.__ZTIN9configmgr13configuration12SetResetImplE
-__ZTIN9configmgr13configuration12TypeMismatchE=configmg.__ZTIN9configmgr13configuration12TypeMismatchE
-__ZTIN9configmgr13configuration13GroupNodeImplE=configmg.__ZTIN9configmgr13configuration13GroupNodeImplE
-__ZTIN9configmgr13configuration13SetChangeImplE=configmg.__ZTIN9configmgr13configuration13SetChangeImplE
-__ZTIN9configmgr13configuration13SetInsertImplE=configmg.__ZTIN9configmgr13configuration13SetInsertImplE
-__ZTIN9configmgr13configuration13SetRemoveImplE=configmg.__ZTIN9configmgr13configuration13SetRemoveImplE
-__ZTIN9configmgr13configuration14CollectChangesE=configmg.__ZTIN9configmgr13configuration14CollectChangesE
-__ZTIN9configmgr13configuration14NodeChangeImplE=configmg.__ZTIN9configmgr13configuration14NodeChangeImplE
-__ZTIN9configmgr13configuration14SetNodeVisitorE=configmg.__ZTIN9configmgr13configuration14SetNodeVisitorE
-__ZTIN9configmgr13configuration14SetReplaceImplE=configmg.__ZTIN9configmgr13configuration14SetReplaceImplE
-__ZTIN9configmgr13configuration14ValueResetImplE=configmg.__ZTIN9configmgr13configuration14ValueResetImplE
-__ZTIN9configmgr13configuration15ElementTreeImplE=configmg.__ZTIN9configmgr13configuration15ElementTreeImplE
-__ZTIN9configmgr13configuration15TreeImplBuilderE=configmg.__ZTIN9configmgr13configuration15TreeImplBuilderE
-__ZTIN9configmgr13configuration15ValueChangeImplE=configmg.__ZTIN9configmgr13configuration15ValueChangeImplE
-__ZTIN9configmgr13configuration15ValueMemberNode12DeferredImplE=configmg.__ZTIN9configmgr13configuration15ValueMemberNode12DeferredImplE
-__ZTIN9configmgr13configuration16ValueReplaceImplE=configmg.__ZTIN9configmgr13configuration16ValueReplaceImplE
-__ZTIN9configmgr13configuration18GroupMemberVisitorE=configmg.__ZTIN9configmgr13configuration18GroupMemberVisitorE
-__ZTIN9configmgr13configuration19ConstraintViolationE=configmg.__ZTIN9configmgr13configuration19ConstraintViolationE
-__ZTIN9configmgr13configuration19DeferredSetNodeImplE=configmg.__ZTIN9configmgr13configuration19DeferredSetNodeImplE
-__ZTIN9configmgr13configuration19WrappedUnoExceptionE=configmg.__ZTIN9configmgr13configuration19WrappedUnoExceptionE
-__ZTIN9configmgr13configuration20DefaultProviderProxyE=configmg.__ZTIN9configmgr13configuration20DefaultProviderProxyE
-__ZTIN9configmgr13configuration20SetElementChangeImplE=configmg.__ZTIN9configmgr13configuration20SetElementChangeImplE
-__ZTIN9configmgr13configuration20ValueElementNodeImplE=configmg.__ZTIN9configmgr13configuration20ValueElementNodeImplE
-__ZTIN9configmgr13configuration21DeferredGroupNodeImplE=configmg.__ZTIN9configmgr13configuration21DeferredGroupNodeImplE
-__ZTIN9configmgr13configuration21TemplateProvider_ImplE=configmg.__ZTIN9configmgr13configuration21TemplateProvider_ImplE
-__ZTIN9configmgr13configuration28SpecialTemplateProvider_ImplE=configmg.__ZTIN9configmgr13configuration28SpecialTemplateProvider_ImplE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv15CollectValueIDsE=configmg.__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv15CollectValueIDsE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv17SetVisitorAdapterE=configmg.__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv17SetVisitorAdapterE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv19GroupVisitorAdapterE=configmg.__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv19GroupVisitorAdapterE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv21FindNonDefaultElementE=configmg.__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv21FindNonDefaultElementE
-__ZTIN9configmgr13configuration88_GLOBAL__N__ZN9configmgr13configuration17GroupUpdateHelperC2ERKNS0_4TreeERKNS0_7NodeRefE13NodeDefaulterE=configmg.__ZTIN9configmgr13configuration88_GLOBAL__N__ZN9configmgr13configuration17GroupUpdateHelperC2ERKNS0_4TreeERKNS0_7NodeRefE13NodeDefaulterE
-__ZTIN9configmgr13configuration8NodeImplE=configmg.__ZTIN9configmgr13configuration8NodeImplE
-__ZTIN9configmgr13configuration8TemplateE=configmg.__ZTIN9configmgr13configuration8TemplateE
-__ZTIN9configmgr13configuration8TreeImplE=configmg.__ZTIN9configmgr13configuration8TreeImplE
-__ZTIN9configmgr13configuration9ExceptionE=configmg.__ZTIN9configmgr13configuration9ExceptionE
-__ZTIN9configmgr14BasicSetAccessE=configmg.__ZTIN9configmgr14BasicSetAccessE
-__ZTIN9configmgr14ONodeConverterE=configmg.__ZTIN9configmgr14ONodeConverterE
-__ZTIN9configmgr14OStripDefaultsE=configmg.__ZTIN9configmgr14OStripDefaultsE
-__ZTIN9configmgr15BasicSetElementE=configmg.__ZTIN9configmgr15BasicSetElementE
-__ZTIN9configmgr15IConfigListenerE=configmg.__ZTIN9configmgr15IConfigListenerE
-__ZTIN9configmgr15OInnerGroupInfoE=configmg.__ZTIN9configmgr15OInnerGroupInfoE
-__ZTIN9configmgr15ProviderFactoryE=configmg.__ZTIN9configmgr15ProviderFactoryE
-__ZTIN9configmgr15ProviderWrapperE=configmg.__ZTIN9configmgr15ProviderWrapperE
-__ZTIN9configmgr16BasicGroupAccessE=configmg.__ZTIN9configmgr16BasicGroupAccessE
-__ZTIN9configmgr16BasicPropertySetE=configmg.__ZTIN9configmgr16BasicPropertySetE
-__ZTIN9configmgr16BasicRootElementE=configmg.__ZTIN9configmgr16BasicRootElementE
-__ZTIN9configmgr16BootstrapContextE=configmg.__ZTIN9configmgr16BootstrapContextE
-__ZTIN9configmgr16ChangeTreeActionE=configmg.__ZTIN9configmgr16ChangeTreeActionE
-__ZTIN9configmgr16ComponentContextE=configmg.__ZTIN9configmgr16ComponentContextE
-__ZTIN9configmgr16IDefaultProviderE=configmg.__ZTIN9configmgr16IDefaultProviderE
-__ZTIN9configmgr16ITemplateManagerE=configmg.__ZTIN9configmgr16ITemplateManagerE
-__ZTIN9configmgr16NodeModificationE=configmg.__ZTIN9configmgr16NodeModificationE
-__ZTIN9configmgr16OMergeRemoveNodeE=configmg.__ZTIN9configmgr16OMergeRemoveNodeE
-__ZTIN9configmgr16OPropagateLevelsE=configmg.__ZTIN9configmgr16OPropagateLevelsE
-__ZTIN9configmgr16UnoContextTunnel6TunnelE=configmg.__ZTIN9configmgr16UnoContextTunnel6TunnelE
-__ZTIN9configmgr17AttributeListImplE=configmg.__ZTIN9configmgr17AttributeListImplE
-__ZTIN9configmgr17BasicInnerElementE=configmg.__ZTIN9configmgr17BasicInnerElementE
-__ZTIN9configmgr17CacheClientAccessE=configmg.__ZTIN9configmgr17CacheClientAccessE
-__ZTIN9configmgr17ExtendedCacheDataE=configmg.__ZTIN9configmgr17ExtendedCacheDataE
-__ZTIN9configmgr17ExtendedCacheLineE=configmg.__ZTIN9configmgr17ExtendedCacheLineE
-__ZTIN9configmgr17OInnerGroupUpdateE=configmg.__ZTIN9configmgr17OInnerGroupUpdateE
-__ZTIN9configmgr17OMergeValueChangeE=configmg.__ZTIN9configmgr17OMergeValueChangeE
-__ZTIN9configmgr17TemplateCacheDataE=configmg.__ZTIN9configmgr17TemplateCacheDataE
-__ZTIN9configmgr18BasicUpdateElementE=configmg.__ZTIN9configmgr18BasicUpdateElementE
-__ZTIN9configmgr18CacheLoadingAccessE=configmg.__ZTIN9configmgr18CacheLoadingAccessE
-__ZTIN9configmgr18DisposingForwarderE=configmg.__ZTIN9configmgr18DisposingForwarderE
-__ZTIN9configmgr18IConfigBroadcasterE=configmg.__ZTIN9configmgr18IConfigBroadcasterE
-__ZTIN9configmgr18IConfigTreeManagerE=configmg.__ZTIN9configmgr18IConfigTreeManagerE
-__ZTIN9configmgr18OSetElementSetInfoE=configmg.__ZTIN9configmgr18OSetElementSetInfoE
-__ZTIN9configmgr19OInnerTreeSetUpdateE=configmg.__ZTIN9configmgr19OInnerTreeSetUpdateE
-__ZTIN9configmgr19ORootElementSetInfoE=configmg.__ZTIN9configmgr19ORootElementSetInfoE
-__ZTIN9configmgr20OCacheWriteScheduler5TimerE=configmg.__ZTIN9configmgr20OCacheWriteScheduler5TimerE
-__ZTIN9configmgr20OChangeActionCounterE=configmg.__ZTIN9configmgr20OChangeActionCounterE
-__ZTIN9configmgr20OCreateSubtreeActionE=configmg.__ZTIN9configmgr20OCreateSubtreeActionE
-__ZTIN9configmgr20OInnerValueSetUpdateE=configmg.__ZTIN9configmgr20OInnerValueSetUpdateE
-__ZTIN9configmgr20OMergeTreeChangeListE=configmg.__ZTIN9configmgr20OMergeTreeChangeListE
-__ZTIN9configmgr20OSetElementGroupInfoE=configmg.__ZTIN9configmgr20OSetElementGroupInfoE
-__ZTIN9configmgr20ServiceComponentImplE=configmg.__ZTIN9configmgr20ServiceComponentImplE
-__ZTIN9configmgr21ORootElementGroupInfoE=configmg.__ZTIN9configmgr21ORootElementGroupInfoE
-__ZTIN9configmgr21OSLInputStreamWrapperE=configmg.__ZTIN9configmgr21OSLInputStreamWrapperE
-__ZTIN9configmgr21OTreeDisposeScheduler5TimerE=configmg.__ZTIN9configmgr21OTreeDisposeScheduler5TimerE
-__ZTIN9configmgr21SubtreeChangeReferrerE=configmg.__ZTIN9configmgr21SubtreeChangeReferrerE
-__ZTIN9configmgr22ChangeTreeModificationE=configmg.__ZTIN9configmgr22ChangeTreeModificationE
-__ZTIN9configmgr22IConfigDefaultProviderE=configmg.__ZTIN9configmgr22IConfigDefaultProviderE
-__ZTIN9configmgr22IConfigTemplateManagerE=configmg.__ZTIN9configmgr22IConfigTemplateManagerE
-__ZTIN9configmgr22OConfigurationProviderE=configmg.__ZTIN9configmgr22OConfigurationProviderE
-__ZTIN9configmgr22OConfigurationRegistryE=configmg.__ZTIN9configmgr22OConfigurationRegistryE
-__ZTIN9configmgr22OSLOutputStreamWrapperE=configmg.__ZTIN9configmgr22OSLOutputStreamWrapperE
-__ZTIN9configmgr22OSetElementGroupUpdateE=configmg.__ZTIN9configmgr22OSetElementGroupUpdateE
-__ZTIN9configmgr23ConfigChangeBroadcasterE=configmg.__ZTIN9configmgr23ConfigChangeBroadcasterE
-__ZTIN9configmgr23IDefaultableTreeManagerE=configmg.__ZTIN9configmgr23IDefaultableTreeManagerE
-__ZTIN9configmgr23ORootElementGroupUpdateE=configmg.__ZTIN9configmgr23ORootElementGroupUpdateE
-__ZTIN9configmgr24OSetElementTreeSetUpdateE=configmg.__ZTIN9configmgr24OSetElementTreeSetUpdateE
-__ZTIN9configmgr25OConfigurationRegistryKeyE=configmg.__ZTIN9configmgr25OConfigurationRegistryKeyE
-__ZTIN9configmgr25ORootElementTreeSetUpdateE=configmg.__ZTIN9configmgr25ORootElementTreeSetUpdateE
-__ZTIN9configmgr25OSetElementValueSetUpdateE=configmg.__ZTIN9configmgr25OSetElementValueSetUpdateE
-__ZTIN9configmgr26OConfigurationProviderImplE=configmg.__ZTIN9configmgr26OConfigurationProviderImplE
-__ZTIN9configmgr26OProviderDisposingListenerE=configmg.__ZTIN9configmgr26OProviderDisposingListenerE
-__ZTIN9configmgr26ORootElementValueSetUpdateE=configmg.__ZTIN9configmgr26ORootElementValueSetUpdateE
-__ZTIN9configmgr26PropertiesFilteredNotifierE=configmg.__ZTIN9configmgr26PropertiesFilteredNotifierE
-__ZTIN9configmgr28ForwardTreeDifferenceBuilderE=configmg.__ZTIN9configmgr28ForwardTreeDifferenceBuilderE
-__ZTIN9configmgr29BackwardTreeDifferenceBuilderE=configmg.__ZTIN9configmgr29BackwardTreeDifferenceBuilderE
-__ZTIN9configmgr29OSLInputBufferedStreamWrapperE=configmg.__ZTIN9configmgr29OSLInputBufferedStreamWrapperE
-__ZTIN9configmgr3xml11BasicParserE=configmg.__ZTIN9configmgr3xml11BasicParserE
-__ZTIN9configmgr3xml11LayerParserE=configmg.__ZTIN9configmgr3xml11LayerParserE
-__ZTIN9configmgr3xml11LayerWriterE=configmg.__ZTIN9configmgr3xml11LayerWriterE
-__ZTIN9configmgr3xml12SchemaParserE=configmg.__ZTIN9configmgr3xml12SchemaParserE
-__ZTIN9configmgr3xml13ElementParser12BadValueTypeE=configmg.__ZTIN9configmgr3xml13ElementParser12BadValueTypeE
-__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend6XLayerEEE=configmg.__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend6XLayerEEE
-__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend7XSchemaEEE=configmg.__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend7XSchemaEEE
-__ZTIN9configmgr3xml13WriterServiceIN3com3sun4star13configuration7backend13XLayerHandlerEEE=configmg.__ZTIN9configmgr3xml13WriterServiceIN3com3sun4star13configuration7backend13XLayerHandlerEEE
-__ZTIN9configmgr3xml18LayerParserServiceE=configmg.__ZTIN9configmgr3xml18LayerParserServiceE
-__ZTIN9configmgr3xml19SchemaParserServiceE=configmg.__ZTIN9configmgr3xml19SchemaParserServiceE
-__ZTIN9configmgr4data10SetVisitorE=configmg.__ZTIN9configmgr4data10SetVisitorE
-__ZTIN9configmgr4data11NodeVisitorE=configmg.__ZTIN9configmgr4data11NodeVisitorE
-__ZTIN9configmgr4data11TreeSegment4ImplE=configmg.__ZTIN9configmgr4data11TreeSegment4ImplE
-__ZTIN9configmgr4data15TreeNodeBuilder12LinkSetNodesE=configmg.__ZTIN9configmgr4data15TreeNodeBuilder12LinkSetNodesE
-__ZTIN9configmgr4data20BasicDataTreeBuilderE=configmg.__ZTIN9configmgr4data20BasicDataTreeBuilderE
-__ZTIN9configmgr4data21ConvertingNodeBuilderE=configmg.__ZTIN9configmgr4data21ConvertingNodeBuilderE
-__ZTIN9configmgr4data21DataTreeDefaultMergerE=configmg.__ZTIN9configmgr4data21DataTreeDefaultMergerE
-__ZTIN9configmgr4data22CopyingDataTreeBuilder18ElementListBuilderE=configmg.__ZTIN9configmgr4data22CopyingDataTreeBuilder18ElementListBuilderE
-__ZTIN9configmgr4data22CopyingDataTreeBuilderE=configmg.__ZTIN9configmgr4data22CopyingDataTreeBuilderE
-__ZTIN9configmgr4data24ConvertingSubnodeBuilderE=configmg.__ZTIN9configmgr4data24ConvertingSubnodeBuilderE
-__ZTIN9configmgr4data25ConvertingDataTreeBuilder18ElementListBuilderE=configmg.__ZTIN9configmgr4data25ConvertingDataTreeBuilder18ElementListBuilderE
-__ZTIN9configmgr4data25ConvertingDataTreeBuilderE=configmg.__ZTIN9configmgr4data25ConvertingDataTreeBuilderE
-__ZTIN9configmgr4view11NodeFactoryE=configmg.__ZTIN9configmgr4view11NodeFactoryE
-__ZTIN9configmgr4view12ViewStrategyE=configmg.__ZTIN9configmgr4view12ViewStrategyE
-__ZTIN9configmgr4view18DirectViewStrategyE=configmg.__ZTIN9configmgr4view18DirectViewStrategyE
-__ZTIN9configmgr4view20DeferredViewStrategyE=configmg.__ZTIN9configmgr4view20DeferredViewStrategyE
-__ZTIN9configmgr4view20ReadOnlyViewStrategyE=configmg.__ZTIN9configmgr4view20ReadOnlyViewStrategyE
-__ZTIN9configmgr4view72_GLOBAL__N__ZNK9configmgr4view12ViewStrategy13checkInstanceERKNS0_4TreeE19GroupMemberDispatchE=configmg.__ZTIN9configmgr4view72_GLOBAL__N__ZNK9configmgr4view12ViewStrategy13checkInstanceERKNS0_4TreeE19GroupMemberDispatchE
-__ZTIN9configmgr5INodeE=configmg.__ZTIN9configmgr5INodeE
-__ZTIN9configmgr6ChangeE=configmg.__ZTIN9configmgr6ChangeE
-__ZTIN9configmgr6memory11HeapManagerE=configmg.__ZTIN9configmgr6memory11HeapManagerE
-__ZTIN9configmgr6memory14SimpleHeapLockE=configmg.__ZTIN9configmgr6memory14SimpleHeapLockE
-__ZTIN9configmgr6memory21SimpleHeapManagerBaseE=configmg.__ZTIN9configmgr6memory21SimpleHeapManagerBaseE
-__ZTIN9configmgr6memory25SimpleCheckingHeapManagerE=configmg.__ZTIN9configmgr6memory25SimpleCheckingHeapManagerE
-__ZTIN9configmgr6memory8DataLockE=configmg.__ZTIN9configmgr6memory8DataLockE
-__ZTIN9configmgr7AddNodeE=configmg.__ZTIN9configmgr7AddNodeE
-__ZTIN9configmgr7SubtreeE=configmg.__ZTIN9configmgr7SubtreeE
-__ZTIN9configmgr7backend10EmptyLayerE=configmg.__ZTIN9configmgr7backend10EmptyLayerE
-__ZTIN9configmgr7backend10NodeUpdateE=configmg.__ZTIN9configmgr7backend10NodeUpdateE
-__ZTIN9configmgr7backend11NamedUpdateE=configmg.__ZTIN9configmgr7backend11NamedUpdateE
-__ZTIN9configmgr7backend11NodeReplaceE=configmg.__ZTIN9configmgr7backend11NodeReplaceE
-__ZTIN9configmgr7backend11PropertyAddE=configmg.__ZTIN9configmgr7backend11PropertyAddE
-__ZTIN9configmgr7backend12ResultHolderINS0_12NodeInstanceEE10RCInstanceE=configmg.__ZTIN9configmgr7backend12ResultHolderINS0_12NodeInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend12ResultHolderINS0_16TemplateInstanceEE10RCInstanceE=configmg.__ZTIN9configmgr7backend12ResultHolderINS0_16TemplateInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend12ResultHolderINS0_17ComponentInstanceEE10RCInstanceE=configmg.__ZTIN9configmgr7backend12ResultHolderINS0_17ComponentInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend13BackendAccessE=configmg.__ZTIN9configmgr7backend13BackendAccessE
-__ZTIN9configmgr7backend13ElementUpdateE=configmg.__ZTIN9configmgr7backend13ElementUpdateE
-__ZTIN9configmgr7backend13ImportServiceE=configmg.__ZTIN9configmgr7backend13ImportServiceE
-__ZTIN9configmgr7backend13PropertyResetE=configmg.__ZTIN9configmgr7backend13PropertyResetE
-__ZTIN9configmgr7backend13SchemaBuilderE=configmg.__ZTIN9configmgr7backend13SchemaBuilderE
-__ZTIN9configmgr7backend13UpdateServiceE=configmg.__ZTIN9configmgr7backend13UpdateServiceE
-__ZTIN9configmgr7backend14PropertyUpdateE=configmg.__ZTIN9configmgr7backend14PropertyUpdateE
-__ZTIN9configmgr7backend15CacheControllerE=configmg.__ZTIN9configmgr7backend15CacheControllerE
-__ZTIN9configmgr7backend16NodeModificationE=configmg.__ZTIN9configmgr7backend16NodeModificationE
-__ZTIN9configmgr7backend16UpdateDispatcherE=configmg.__ZTIN9configmgr7backend16UpdateDispatcherE
-__ZTIN9configmgr7backend17BasicUpdateMergerE=configmg.__ZTIN9configmgr7backend17BasicUpdateMergerE
-__ZTIN9configmgr7backend17BinaryReader_ImplE=configmg.__ZTIN9configmgr7backend17BinaryReader_ImplE
-__ZTIN9configmgr7backend17CopyImportServiceE=configmg.__ZTIN9configmgr7backend17CopyImportServiceE
-__ZTIN9configmgr7backend17INodeDataListenerE=configmg.__ZTIN9configmgr7backend17INodeDataListenerE
-__ZTIN9configmgr7backend17INodeDataProviderE=configmg.__ZTIN9configmgr7backend17INodeDataProviderE
-__ZTIN9configmgr7backend17LayerMergeHandlerE=configmg.__ZTIN9configmgr7backend17LayerMergeHandlerE
-__ZTIN9configmgr7backend17LayerUpdateMergerE=configmg.__ZTIN9configmgr7backend17LayerUpdateMergerE
-__ZTIN9configmgr7backend17RequireEmptyLayerE=configmg.__ZTIN9configmgr7backend17RequireEmptyLayerE
-__ZTIN9configmgr7backend18BasicImportHandlerE=configmg.__ZTIN9configmgr7backend18BasicImportHandlerE
-__ZTIN9configmgr7backend18BinaryWriteHandlerE=configmg.__ZTIN9configmgr7backend18BinaryWriteHandlerE
-__ZTIN9configmgr7backend18ImportMergeHandlerE=configmg.__ZTIN9configmgr7backend18ImportMergeHandlerE
-__ZTIN9configmgr7backend18LayerUpdateHandlerE=configmg.__ZTIN9configmgr7backend18LayerUpdateHandlerE
-__ZTIN9configmgr7backend18MergeImportServiceE=configmg.__ZTIN9configmgr7backend18MergeImportServiceE
-__ZTIN9configmgr7backend19ICachedDataListenerE=configmg.__ZTIN9configmgr7backend19ICachedDataListenerE
-__ZTIN9configmgr7backend19ICachedDataNotifierE=configmg.__ZTIN9configmgr7backend19ICachedDataNotifierE
-__ZTIN9configmgr7backend19ICachedDataProviderE=configmg.__ZTIN9configmgr7backend19ICachedDataProviderE
-__ZTIN9configmgr7backend19IDirectDataProviderE=configmg.__ZTIN9configmgr7backend19IDirectDataProviderE
-__ZTIN9configmgr7backend19IMergedDataProviderE=configmg.__ZTIN9configmgr7backend19IMergedDataProviderE
-__ZTIN9configmgr7backend19INodeUpdateProviderE=configmg.__ZTIN9configmgr7backend19INodeUpdateProviderE
-__ZTIN9configmgr7backend19LayerDefaultRemoverE=configmg.__ZTIN9configmgr7backend19LayerDefaultRemoverE
-__ZTIN9configmgr7backend19MultiStratumBackendE=configmg.__ZTIN9configmgr7backend19MultiStratumBackendE
-__ZTIN9configmgr7backend20IDefaultDataProviderE=configmg.__ZTIN9configmgr7backend20IDefaultDataProviderE
-__ZTIN9configmgr7backend20SingleBackendAdapterE=configmg.__ZTIN9configmgr7backend20SingleBackendAdapterE
-__ZTIN9configmgr7backend21BackendChangeNotifierE=configmg.__ZTIN9configmgr7backend21BackendChangeNotifierE
-__ZTIN9configmgr7backend21BackendStrataListenerE=configmg.__ZTIN9configmgr7backend21BackendStrataListenerE
-__ZTIN9configmgr7backend21IDataProviderMetaDataE=configmg.__ZTIN9configmgr7backend21IDataProviderMetaDataE
-__ZTIN9configmgr7backend21ITemplateDataProviderE=configmg.__ZTIN9configmgr7backend21ITemplateDataProviderE
-__ZTIN9configmgr7backend21OInvalidateTreeThreadE=configmg.__ZTIN9configmgr7backend21OInvalidateTreeThreadE
-__ZTIN9configmgr7backend22CacheChangeMulticasterE=configmg.__ZTIN9configmgr7backend22CacheChangeMulticasterE
-__ZTIN9configmgr7backend22IComponentDataProviderE=configmg.__ZTIN9configmgr7backend22IComponentDataProviderE
-__ZTIN9configmgr7backend8NodeDropE=configmg.__ZTIN9configmgr7backend8NodeDropE
-__ZTIN9configmgr7localbe16LocalDataStratumE=configmg.__ZTIN9configmgr7localbe16LocalDataStratumE
-__ZTIN9configmgr7localbe16LocalStratumBaseE=configmg.__ZTIN9configmgr7localbe16LocalStratumBaseE
-__ZTIN9configmgr7localbe17LocalMultiStratumE=configmg.__ZTIN9configmgr7localbe17LocalMultiStratumE
-__ZTIN9configmgr7localbe17LocalOutputStreamE=configmg.__ZTIN9configmgr7localbe17LocalOutputStreamE
-__ZTIN9configmgr7localbe18FlatLocalFileLayerE=configmg.__ZTIN9configmgr7localbe18FlatLocalFileLayerE
-__ZTIN9configmgr7localbe18LocalSingleBackendE=configmg.__ZTIN9configmgr7localbe18LocalSingleBackendE
-__ZTIN9configmgr7localbe18LocalSingleStratumE=configmg.__ZTIN9configmgr7localbe18LocalSingleStratumE
-__ZTIN9configmgr7localbe19BasicLocalFileLayerE=configmg.__ZTIN9configmgr7localbe19BasicLocalFileLayerE
-__ZTIN9configmgr7localbe19LayerPropertyHelperE=configmg.__ZTIN9configmgr7localbe19LayerPropertyHelperE
-__ZTIN9configmgr7localbe19LocalSchemaSupplierE=configmg.__ZTIN9configmgr7localbe19LocalSchemaSupplierE
-__ZTIN9configmgr7localbe20LocalReadonlyStratumE=configmg.__ZTIN9configmgr7localbe20LocalReadonlyStratumE
-__ZTIN9configmgr7localbe20LocalResourceStratumE=configmg.__ZTIN9configmgr7localbe20LocalResourceStratumE
-__ZTIN9configmgr7localbe20SimpleLocalFileLayerE=configmg.__ZTIN9configmgr7localbe20SimpleLocalFileLayerE
-__ZTIN9configmgr7localbe22LocalDataImportServiceE=configmg.__ZTIN9configmgr7localbe22LocalDataImportServiceE
-__ZTIN9configmgr7localbe22LocalSingleStratumBaseE=configmg.__ZTIN9configmgr7localbe22LocalSingleStratumBaseE
-__ZTIN9configmgr7localbe23CompositeLocalFileLayerE=configmg.__ZTIN9configmgr7localbe23CompositeLocalFileLayerE
-__ZTIN9configmgr7localbe23LocalStratumMutexHolderE=configmg.__ZTIN9configmgr7localbe23LocalStratumMutexHolderE
-__ZTIN9configmgr7localbe27FullCompositeLocalFileLayerE=configmg.__ZTIN9configmgr7localbe27FullCompositeLocalFileLayerE
-__ZTIN9configmgr7localbe28BasicCompositeLocalFileLayerE=configmg.__ZTIN9configmgr7localbe28BasicCompositeLocalFileLayerE
-__ZTIN9configmgr7localbe28LocalHierarchyBrowserServiceE=configmg.__ZTIN9configmgr7localbe28LocalHierarchyBrowserServiceE
-__ZTIN9configmgr8BasicSetE=configmg.__ZTIN9configmgr8BasicSetE
-__ZTIN9configmgr8ISubtreeE=configmg.__ZTIN9configmgr8ISubtreeE
-__ZTIN9configmgr8OOptionsE=configmg.__ZTIN9configmgr8OOptionsE
-__ZTIN9configmgr9CacheDataE=configmg.__ZTIN9configmgr9CacheDataE
-__ZTIN9configmgr9CacheLineE=configmg.__ZTIN9configmgr9CacheLineE
-__ZTIN9configmgr9OProviderE=configmg.__ZTIN9configmgr9OProviderE
-__ZTIN9configmgr9ValueNodeE=configmg.__ZTIN9configmgr9ValueNodeE
-__ZTIN9configmgr9apihelper15BroadcasterBaseE=configmg.__ZTIN9configmgr9apihelper15BroadcasterBaseE
-__ZTIN9configmgr9apihelper17PropertySetHelperE=configmg.__ZTIN9configmgr9apihelper17PropertySetHelperE
-__ZTIN9configmgr9apihelper18InteractionRequestE=configmg.__ZTIN9configmgr9apihelper18InteractionRequestE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionAbortEEE=configmg.__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionAbortEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionRetryEEE=configmg.__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionRetryEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task19XInteractionApproveEEE=configmg.__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task19XInteractionApproveEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task22XInteractionDisapproveEEE=configmg.__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task22XInteractionDisapproveEEE
-__ZTIN9configmgr9apihelper24SimpleInteractionRequestE=configmg.__ZTIN9configmgr9apihelper24SimpleInteractionRequestE
-__ZTIN9configmgr9apihelper31ConfigurationInteractionHandler7ContextE=configmg.__ZTIN9configmgr9apihelper31ConfigurationInteractionHandler7ContextE
-__ZTIN9configmgr9configapi10NodeAccessE=configmg.__ZTIN9configmgr9configapi10NodeAccessE
-__ZTIN9configmgr9configapi10SetElementE=configmg.__ZTIN9configmgr9configapi10SetElementE
-__ZTIN9configmgr9configapi11ApiTreeImpl16ComponentAdapterE=configmg.__ZTIN9configmgr9configapi11ApiTreeImpl16ComponentAdapterE
-__ZTIN9configmgr9configapi11Broadcaster4ImplE=configmg.__ZTIN9configmgr9configapi11Broadcaster4ImplE
-__ZTIN9configmgr9configapi11NodeElementE=configmg.__ZTIN9configmgr9configapi11NodeElementE
-__ZTIN9configmgr9configapi11OSetElementINS0_15NodeGroupAccessEEE=configmg.__ZTIN9configmgr9configapi11OSetElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_17NodeSetInfoAccessEEE=configmg.__ZTIN9configmgr9configapi11OSetElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_17NodeTreeSetAccessEEE=configmg.__ZTIN9configmgr9configapi11OSetElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_18NodeValueSetAccessEEE=configmg.__ZTIN9configmgr9configapi11OSetElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_19NodeGroupInfoAccessEEE=configmg.__ZTIN9configmgr9configapi11OSetElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi11RootElementE=configmg.__ZTIN9configmgr9configapi11RootElementE
-__ZTIN9configmgr9configapi11TreeElementE=configmg.__ZTIN9configmgr9configapi11TreeElementE
-__ZTIN9configmgr9configapi12InnerElementE=configmg.__ZTIN9configmgr9configapi12InnerElementE
-__ZTIN9configmgr9configapi12NotifierImplE=configmg.__ZTIN9configmgr9configapi12NotifierImplE
-__ZTIN9configmgr9configapi13NodeSetAccessE=configmg.__ZTIN9configmgr9configapi13NodeSetAccessE
-__ZTIN9configmgr9configapi13OInnerElementINS0_15NodeGroupAccessEEE=configmg.__ZTIN9configmgr9configapi13OInnerElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeSetInfoAccessEEE=configmg.__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeTreeSetAccessEEE=configmg.__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_18NodeValueSetAccessEEE=configmg.__ZTIN9configmgr9configapi13OInnerElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_19NodeGroupInfoAccessEEE=configmg.__ZTIN9configmgr9configapi13OInnerElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi14ObjectRegistryE=configmg.__ZTIN9configmgr9configapi14ObjectRegistryE
-__ZTIN9configmgr9configapi15ApiRootTreeImpl12NodeListenerE=configmg.__ZTIN9configmgr9configapi15ApiRootTreeImpl12NodeListenerE
-__ZTIN9configmgr9configapi15NodeGroupAccessE=configmg.__ZTIN9configmgr9configapi15NodeGroupAccessE
-__ZTIN9configmgr9configapi16CollectNodeNamesE=configmg.__ZTIN9configmgr9configapi16CollectNodeNamesE
-__ZTIN9configmgr9configapi16OReadRootElementINS0_17NodeSetInfoAccessEEE=configmg.__ZTIN9configmgr9configapi16OReadRootElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi16OReadRootElementINS0_19NodeGroupInfoAccessEEE=configmg.__ZTIN9configmgr9configapi16OReadRootElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi17CollectPropertiesE=configmg.__ZTIN9configmgr9configapi17CollectPropertiesE
-__ZTIN9configmgr9configapi17NodeSetInfoAccessE=configmg.__ZTIN9configmgr9configapi17NodeSetInfoAccessE
-__ZTIN9configmgr9configapi17NodeTreeSetAccessE=configmg.__ZTIN9configmgr9configapi17NodeTreeSetAccessE
-__ZTIN9configmgr9configapi17UpdateRootElementE=configmg.__ZTIN9configmgr9configapi17UpdateRootElementE
-__ZTIN9configmgr9configapi18NodeValueSetAccessE=configmg.__ZTIN9configmgr9configapi18NodeValueSetAccessE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_15NodeGroupAccessEEE=configmg.__ZTIN9configmgr9configapi18OUpdateRootElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_17NodeTreeSetAccessEEE=configmg.__ZTIN9configmgr9configapi18OUpdateRootElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_18NodeValueSetAccessEEE=configmg.__ZTIN9configmgr9configapi18OUpdateRootElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi19CollectPropertyInfoE=configmg.__ZTIN9configmgr9configapi19CollectPropertyInfoE
-__ZTIN9configmgr9configapi19NodeGroupInfoAccessE=configmg.__ZTIN9configmgr9configapi19NodeGroupInfoAccessE
-__ZTIN9configmgr9configapi19NodePropertySetInfoE=configmg.__ZTIN9configmgr9configapi19NodePropertySetInfoE
-__ZTIN9configmgr9configapi19UpdateObjectFactoryE=configmg.__ZTIN9configmgr9configapi19UpdateObjectFactoryE
-__ZTIN9configmgr9configapi21ReadOnlyObjectFactoryE=configmg.__ZTIN9configmgr9configapi21ReadOnlyObjectFactoryE
-__ZTIN9configmgr9configapi7FactoryE=configmg.__ZTIN9configmgr9configapi7FactoryE
-__ZTIN9configmgr9configapi8internal15SearchExactNameE=configmg.__ZTIN9configmgr9configapi8internal15SearchExactNameE
-__ZTIN9salhelper21SimpleReferenceObjectE=configmg.__ZTIN9salhelper21SimpleReferenceObjectE
-
-EXPORTS
-__ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE
-__ZTIN3com3sun4star3ucb22InteractiveIOExceptionE
-__ZTIN3com3sun4star4task28ClassifiedInteractionRequestE
-__ZTIN3com3sun4star3ucb18NameClashExceptionE
-__ZTIN3com3sun4star3ucb27UnsupportedCommandExceptionE
-IMPORTS
-__ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE=ucpfile1.__ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE
-__ZTIN3com3sun4star3ucb22InteractiveIOExceptionE=ucpfile1.__ZTIN3com3sun4star3ucb22InteractiveIOExceptionE
-__ZTIN3com3sun4star4task28ClassifiedInteractionRequestE=ucpfile1.__ZTIN3com3sun4star4task28ClassifiedInteractionRequestE
-__ZTIN3com3sun4star3ucb18NameClashExceptionE=ucpfile1.__ZTIN3com3sun4star3ucb18NameClashExceptionE
-__ZTIN3com3sun4star3ucb27UnsupportedCommandExceptionE=ucpfile1.__ZTIN3com3sun4star3ucb27UnsupportedCommandExceptionE
-
-EXPORTS
-__ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE
-IMPORTS
-__ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE=ucb1.__ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
deleted file mode 100644
index 40effb910..000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
+++ /dev/null
@@ -1,351 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <stdio.h>
-#include <dlfcn.h>
-#include <cxxabi.h>
-#include <boost/unordered_map.hpp>
-
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/diagnose.h>
-#include <osl/mutex.hxx>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <typelib/typedescription.hxx>
-#include <uno/any2.h>
-
-#include "share.hxx"
-
-#ifdef TEST
-#include "test/TestBridgeException.hpp"
-#endif
-
-using namespace ::std;
-using namespace ::osl;
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::__cxxabiv1;
-
-//==================================================================================================
-//YD static handle to this dll, to allow rtti symbol lookup
-static	void*	hmod;
-
-//==================================================================================================
-//YD required to run test programs, because exe cannot export symbols!
-#ifdef TEST
-using namespace ::test;
-
-void dymmy_TestBridgeException() throw( ::test::TestBridgeException)
-{
-   throw TestBridgeException();
-}
-#endif
-
-//==================================================================================================
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-void dummy_can_throw_anything( char const * )
-{
-}
-
-//==================================================================================================
-static OUString toUNOname( char const * p ) SAL_THROW( () )
-{
-#if OSL_DEBUG_LEVEL > 1
-    char const * start = p;
-#endif
-
-    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
-    OUStringBuffer buf( 64 );
-    OSL_ASSERT( 'N' == *p );
-    ++p; // skip N
-
-    while ('E' != *p)
-    {
-        // read chars count
-        long n = (*p++ - '0');
-        while ('0' <= *p && '9' >= *p)
-        {
-            n *= 10;
-            n += (*p++ - '0');
-        }
-        buf.appendAscii( p, n );
-        p += n;
-        if ('E' != *p)
-            buf.append( (sal_Unicode)'.' );
-    }
-
-#if OSL_DEBUG_LEVEL > 1
-    OUString ret( buf.makeStringAndClear() );
-    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-    return ret;
-#else
-    return buf.makeStringAndClear();
-#endif
-}
-
-//==================================================================================================
-class RTTI
-{
-    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
-
-    Mutex m_mutex;
-    t_rtti_map m_rttis;
-    t_rtti_map m_generatedRttis;
-
-    //void * m_hApp;
-
-public:
-    RTTI() SAL_THROW( () );
-    ~RTTI() SAL_THROW( () );
-
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-};
-//__________________________________________________________________________________________________
-RTTI::RTTI() SAL_THROW( () )
-//    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-{
-}
-//__________________________________________________________________________________________________
-RTTI::~RTTI() SAL_THROW( () )
-{
-//    dlclose( m_hApp );
-}
-
-//__________________________________________________________________________________________________
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-{
-    type_info * rtti = NULL;
-
-    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
-    MutexGuard guard( m_mutex );
-    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-    if (iFind == m_rttis.end())
-    {
-        // RTTI symbol
-        OStringBuffer buf( 64 );
-        buf.append( RTL_CONSTASCII_STRINGPARAM("__ZTIN") );
-        sal_Int32 index = 0;
-        do
-        {
-            OUString token( unoName.getToken( 0, '.', index ) );
-            buf.append( token.getLength() );
-            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-            buf.append( c_token );
-        }
-        while (index >= 0);
-        buf.append( 'E' );
-
-        OString symName( buf.makeStringAndClear() );
-        //rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-    if (hmod == NULL)
-        hmod = dlopen( "gcc3_uno.dll", 0);
-
-    if (hmod)
-            rtti = (type_info *)dlsym( hmod, symName.getStr() );
-
-        if (rtti)
-        {
-            pair< t_rtti_map::iterator, bool > insertion(
-                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-        }
-        else
-        {
-            // try to lookup the symbol in the generated rtti map
-            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-            if (iFind == m_generatedRttis.end())
-            {
-                // we must generate it !
-                // symbol and rtti-name is nearly identical,
-                // the symbol is prefixed with __ZTI
-                char const * rttiName = symName.getStr() +5;
-#if OSL_DEBUG_LEVEL > 1
-                fprintf( stderr,"generated rtti for %s\n", rttiName );
-#endif
-                if (pTypeDescr->pBaseTypeDescription)
-                {
-                    // ensure availability of base
-                    type_info * base_rtti = getRTTI(
-                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-                    rtti = new __si_class_type_info(
-                        strdup( rttiName ), (__class_type_info *)base_rtti );
-                }
-                else
-                {
-                    // this class has no base class
-                    rtti = new __class_type_info( strdup( rttiName ) );
-                }
-
-                pair< t_rtti_map::iterator, bool > insertion(
-                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-            }
-            else // taking already generated rtti
-            {
-                rtti = iFind->second;
-            }
-        }
-    }
-    else
-    {
-        rtti = iFind->second;
-    }
-
-    return rtti;
-}
-
-//--------------------------------------------------------------------------------------------------
-static void deleteException( void * pExc )
-{
-    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-    typelib_TypeDescription * pTD = 0;
-    OUString unoName( toUNOname( header->exceptionType->name() ) );
-    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-    if (pTD)
-    {
-        ::uno_destructData( pExc, pTD, cpp_release );
-        ::typelib_typedescription_release( pTD );
-    }
-}
-
-//==================================================================================================
-void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-{
-#if OSL_DEBUG_LEVEL > 1
-    OString cstr(
-        OUStringToOString(
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
-#endif
-    void * pCppExc;
-    type_info * rtti;
-
-    {
-    // construct cpp exception object
-    typelib_TypeDescription * pTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-    OSL_ASSERT( pTypeDescr );
-    if (! pTypeDescr)
-    {
-        throw RuntimeException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
-    }
-
-    pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-    ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
-    // destruct uno exception
-    ::uno_any_destruct( pUnoExc, 0 );
-    // avoiding locked counts
-    static RTTI * s_rtti = 0;
-    if (! s_rtti)
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if (! s_rtti)
-        {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
-            static RTTI rtti_data;
-            s_rtti = &rtti_data;
-#endif
-        }
-    }
-    rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-    TYPELIB_DANGER_RELEASE( pTypeDescr );
-    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-    if (! rtti)
-    {
-        throw RuntimeException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
-    }
-    }
-
-    __cxa_throw( pCppExc, rtti, deleteException );
-}
-
-//==================================================================================================
-void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
-{
-    if (! header)
-    {
-        RuntimeException aRE(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
-            Reference< XInterface >() );
-        Type const & rType = ::getCppuType( &aRE );
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-#if OSL_DEBUG_LEVEL > 0
-        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_FAIL( cstr.getStr() );
-#endif
-        return;
-    }
-
-    typelib_TypeDescription * pExcTypeDescr = 0;
-    OUString unoName( toUNOname( header->exceptionType->name() ) );
-#if OSL_DEBUG_LEVEL > 1
-    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
-#endif
-    typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-    if (0 == pExcTypeDescr)
-    {
-        RuntimeException aRE(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
-            Reference< XInterface >() );
-        Type const & rType = ::getCppuType( &aRE );
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-#if OSL_DEBUG_LEVEL > 0
-        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_FAIL( cstr.getStr() );
-#endif
-    }
-    else
-    {
-        // construct uno exception any
-        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-        typelib_typedescription_release( pExcTypeDescr );
-    }
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk
deleted file mode 100644
index 641eef166..000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-NO_BSYMBOLIC=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOS2Igcc3"
-
-.IF "$(cppu_no_leak)" == ""
-CFLAGS += -DLEAK_STATIC_DATA
-.ENDIF
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
-    $(SLO)$/except.obj		\
-    $(SLO)$/cpp2uno.obj		\
-    $(SLO)$/uno2cpp.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=defs$/gcc3_uno.def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
-    $(CPPULIB)			\
-    $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/share.hxx b/bridges/source/cpp_uno/gcc3_os2_intel/share.hxx
deleted file mode 100644
index e4a6b379a..000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/share.hxx
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "uno/mapping.h"
-
-#include <typeinfo>
-#include <exception>
-#include <cstddef>
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-void dummy_can_throw_anything( char const * );
-
-// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-
-struct _Unwind_Exception
-{
-    unsigned exception_class __attribute__((__mode__(__DI__)));
-    void * exception_cleanup;
-    unsigned private_1 __attribute__((__mode__(__word__)));
-    unsigned private_2 __attribute__((__mode__(__word__)));
-} __attribute__((__aligned__));
-
-struct __cxa_exception
-{ 
-    ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *); 
-    
-    ::std::unexpected_handler unexpectedHandler;
-    ::std::terminate_handler terminateHandler;
-    
-    __cxa_exception *nextException;
-    
-    int handlerCount;
-    
-    int handlerSwitchValue;
-    const unsigned char *actionRecord;
-    const unsigned char *languageSpecificData;
-    void *catchTemp;
-    void *adjustedPtr;
-    
-    _Unwind_Exception unwindHeader;
-};    
-
-extern "C" void *__cxa_allocate_exception(
-    std::size_t thrown_size ) throw();
-extern "C" void __cxa_throw (
-    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-
-struct __cxa_eh_globals
-{
-    __cxa_exception *caughtExceptions;
-    unsigned int uncaughtExceptions;
-};
-extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-
-// -----
-
-//==================================================================================================
-void raiseException(
-    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-//==================================================================================================
-void fillUnoException(
-    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx
deleted file mode 100644
index 9bb7eeb66..000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx
+++ /dev/null
@@ -1,454 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <malloc.h>
-#include <sal/alloca.h>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <uno/data.h>
-
-#include "bridges/cpp_uno/shared/bridge.hxx"
-#include "bridges/cpp_uno/shared/types.hxx"
-#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
-#include "bridges/cpp_uno/shared/vtables.hxx"
-
-#include "share.hxx"
-
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-
-namespace
-{
-
-//==================================================================================================
-// The call instruction within the asm section of callVirtualMethod may throw
-// exceptions.  So that the compiler handles this correctly, it is important
-// that (a) callVirtualMethod might call dummy_can_throw_anything (although this
-// never happens at runtime), which in turn can throw exceptions, and (b)
-// callVirtualMethod is not inlined at its call site (so that any exceptions are
-// caught which are thrown from the instruction calling callVirtualMethod):
-static void callVirtualMethod(
-    void * pAdjustedThisPtr,
-    sal_Int32 nVtableIndex,
-    void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
-    sal_Int32 * pStackLongs,
-    sal_Int32 nStackLongs );
-// __attribute__((noinline));
-
-//==================================================================================================
-static void callVirtualMethod(
-    void * pAdjustedThisPtr,
-    sal_Int32 nVtableIndex,
-    void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
-    sal_Int32 * pStackLongs,
-    sal_Int32 nStackLongs )
-{
-    // parameter list is mixed list of * and values
-    // reference parameters are pointers
-    
-    OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" );
-    OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-    OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-    
-    // never called
-    if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
-
-     /* figure out the address of the function we need to invoke */
-     unsigned long * mfunc;        // actual function to be invoked
-     int off;                      // offset used to find function
-     void (*ptr)();
-     off = nVtableIndex; 
-     off = off * 4;                         // 4 bytes per slot
-     mfunc = *((unsigned long **)pAdjustedThisPtr);    // get the address of the vtable
-     mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset 
-     mfunc = *((unsigned long **)mfunc);                 // the function is stored at the address
-     ptr = (void (*)())mfunc;
-
-    volatile long edx = 0, eax = 0; // for register returns
-    void * stackptr;
-    asm volatile (
-        "mov   %%esp, %6\n\t"
-        // copy values
-        "mov   %0, %%eax\n\t"
-        "mov   %%eax, %%edx\n\t"
-        "dec   %%edx\n\t"
-        "shl   $2, %%edx\n\t"
-        "add   %1, %%edx\n"
-        "Lcopy:\n\t"
-        "pushl 0(%%edx)\n\t"
-        "sub   $4, %%edx\n\t"
-        "dec   %%eax\n\t"
-        "jne   Lcopy\n\t"
-    :
-        : "m"(nStackLongs), "m"(pStackLongs), "m"(pAdjustedThisPtr),
-          "m"(nVtableIndex), "m"(eax), "m"(edx), "m"(stackptr)
-        : "eax", "edx" );
-
-    (*ptr)();
-
-    asm volatile (
-        // save return registers
-         "mov   %%eax, %4\n\t"
-         "mov   %%edx, %5\n\t"
-        // cleanup stack
-        "mov   %6, %%esp\n\t"
-        :
-        : "m"(nStackLongs), "m"(pStackLongs), "m"(pAdjustedThisPtr),
-          "m"(nVtableIndex), "m"(eax), "m"(edx), "m"(stackptr)
-        : "eax", "edx" );
-    switch( eReturnType )
-    {
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-            ((long*)pRegisterReturn)[1] = edx;
-        case typelib_TypeClass_LONG:
-        case typelib_TypeClass_UNSIGNED_LONG:
-        case typelib_TypeClass_CHAR:
-        case typelib_TypeClass_ENUM:
-            ((long*)pRegisterReturn)[0] = eax;
-            break;
-        case typelib_TypeClass_SHORT:
-        case typelib_TypeClass_UNSIGNED_SHORT:
-            *(unsigned short*)pRegisterReturn = eax;
-            break;
-        case typelib_TypeClass_BOOLEAN:
-        case typelib_TypeClass_BYTE:
-            *(unsigned char*)pRegisterReturn = eax;
-            break;
-        case typelib_TypeClass_FLOAT:
-            asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-            break;
-        case typelib_TypeClass_DOUBLE:
-            asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-            break;
-    }
-}
-
-//================================================================================================== 
-static void cpp_call(
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
-    bridges::cpp_uno::shared::VtableSlot aVtableSlot,
-    typelib_TypeDescriptionReference * pReturnTypeRef,
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-{
-      // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack		=
-          (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart	= pCppStack;
-    
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-    OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-    
-    void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-    
-    if (pReturnTypeDescr)
-    {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-        {
-            pCppReturn = pUnoReturn; // direct way for simple types
-        }
-        else
-        {
-            // complex return via ptr
-            pCppReturn = *(void **)pCppStack
-                = (bridges::cpp_uno::shared::relatesToInterfaceType(
-                       pReturnTypeDescr )
-                   ? alloca( pReturnTypeDescr->nSize )
-                   : pUnoReturn); // direct way
-            pCppStack += sizeof(void *);
-        }
-    }
-    // push this
-    void * pAdjustedThisPtr = reinterpret_cast< void ** >(pThis->getCppI())
-        + aVtableSlot.offset;
-    *(void**)pCppStack = pAdjustedThisPtr;
-    pCppStack += sizeof( void* );
-
-    // stack space
-    OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-    // args
-    void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-    // indizes of values this have to be converted (interface conversion cpp<=>uno)
-    sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-    
-    sal_Int32 nTempIndizes   = 0;
-    
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-        
-        if (!rParam.bOut
-            && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
-        {
-            uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-                                    pThis->getBridge()->getUno2Cpp() );
-            
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                pCppStack += sizeof(sal_Int32); // extra long
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            if (! rParam.bIn) // is pure out
-            {
-                // cpp out is constructed mem, uno out is not!
-                uno_constructData(
-                    *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pParamTypeDescr );
-                pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (bridges::cpp_uno::shared::relatesToInterfaceType(
-                         pParamTypeDescr ))
-            {
-                uno_copyAndConvertData(
-                    *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pUnoArgs[nPos], pParamTypeDescr,
-                    pThis->getBridge()->getUno2Cpp() );
-                
-                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-
-    try
-    {
-        OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-        callVirtualMethod(
-            pAdjustedThisPtr, aVtableSlot.index,
-            pCppReturn, pReturnTypeDescr->eTypeClass,
-            (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occurred...
-        *ppUnoExc = 0;
-        
-        // reconvert temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-            
-            if (pParams[nIndex].bIn)
-            {
-                if (pParams[nIndex].bOut) // inout
-                {
-                    uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-                    uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-                                            pThis->getBridge()->getCpp2Uno() );
-                }
-            }
-            else // pure out
-            {
-                uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-                                        pThis->getBridge()->getCpp2Uno() );
-            }
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-            
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return value
-        if (pCppReturn && pUnoReturn != pCppReturn)
-        {
-            uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-                                    pThis->getBridge()->getCpp2Uno() );
-            uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-        }
-    }
-     catch (...)
-     {
-          // fill uno exception
-        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-        
-        // temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-        }
-        // return type
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-    }
-}
-
-}
-
-namespace bridges { namespace cpp_uno { namespace shared {
-
-void unoInterfaceProxyDispatch(
-    uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-    void * pReturn, void * pArgs[], uno_Any ** ppException )
-{
-    // is my surrogate
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-        = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-    typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-    
-    switch (pMemberDescr->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        VtableSlot aVtableSlot(
-            getVtableSlot(
-                reinterpret_cast<
-                    typelib_InterfaceAttributeTypeDescription const * >(
-                        pMemberDescr)));
-        if (pReturn)
-        {
-            // dependent dispatch
-            cpp_call(
-                pThis, aVtableSlot,
-                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-                0, 0, // no params
-                pReturn, pArgs, ppException );
-        }
-        else
-        {
-            // is SET
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn		= sal_True;
-            aParam.bOut		= sal_False;
-
-            typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-            OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-            typelib_typedescriptionreference_new(
-                &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-            
-            // dependent dispatch
-            aVtableSlot.index += 1; // get, then set method
-            cpp_call(
-                pThis, aVtableSlot,
-                pReturnTypeRef,
-                1, &aParam,
-                pReturn, pArgs, ppException );
-            
-            typelib_typedescriptionreference_release( pReturnTypeRef );
-        }
-        
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        VtableSlot aVtableSlot(
-            getVtableSlot(
-                reinterpret_cast<
-                    typelib_InterfaceMethodTypeDescription const * >(
-                        pMemberDescr)));
-        switch (aVtableSlot.index)
-        {
-            // standard calls
-        case 1: // acquire uno interface
-            (*pUnoI->acquire)( pUnoI );
-            *ppException = 0;
-            break;
-        case 2: // release uno interface
-            (*pUnoI->release)( pUnoI );
-            *ppException = 0;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-            if (pTD)
-            {
-                uno_Interface * pInterface = 0;
-                (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
-                    pThis->pBridge->getUnoEnv(),
-                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-            
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pReturn ),
-                        &pInterface, pTD, 0 );
-                    (*pInterface->release)( pInterface );
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *ppException = 0;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            // dependent dispatch
-            cpp_call(
-                pThis, aVtableSlot,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-                pReturn, pArgs, ppException );
-        }
-        break;
-    }
-    default:
-    {
-        ::com::sun::star::uno::RuntimeException aExc(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-        
-        Type const & rExcType = ::getCppuType( &aExc );
-        // binary identical null reference
-        ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-    }
-    }
-}
-
-} } }
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index c8caf16ff..58f51a239 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -267,7 +267,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
 
-    typelib_TypeClass eRet;
+    typelib_TypeClass eRet = typelib_TypeClass_VOID;
     switch (aMemberDescr.get()->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -353,8 +353,6 @@ static typelib_TypeClass __cdecl cpp_mediate(
         throw RuntimeException(
             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("no member description found!") ),
             (XInterface *)pThis );
-        // is here for dummy
-        eRet = typelib_TypeClass_VOID;
     }
     }
 
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 294b525ae..874a54289 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -29,11 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_bridges.hxx"
 
-#if defined OS2
-#define INCL_DOS
-#define INCL_DOSMISC
-#endif
-
 #include "bridges/cpp_uno/shared/vtablefactory.hxx"
 
 #include "guardedarray.hxx"
@@ -68,10 +63,6 @@
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
-#elif defined SAL_OS2
-#define INCL_DOS
-#define INCL_DOSMISC
-#include <os2.h>
 #else
 #error Unsupported platform
 #endif
@@ -92,10 +83,6 @@ extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
     SYSTEM_INFO info;
     GetSystemInfo(&info);
     pagesize = info.dwPageSize;
-#elif defined(SAL_OS2)
-    ULONG ulPageSize;
-    DosQuerySysInfo(QSV_PAGE_SIZE, QSV_PAGE_SIZE, &ulPageSize, sizeof(ULONG));
-    pagesize = (sal_Size)ulPageSize;
 #else
 #error Unsupported platform
 #endif
@@ -115,9 +102,6 @@ extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
     }
 #elif defined SAL_W32
     p = VirtualAlloc(0, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-#elif defined(SAL_OS2)
-    p = 0;
-    DosAllocMem( &p, n, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY);
 #endif
     if (p != 0) {
         *size = n;
@@ -133,8 +117,6 @@ extern "C" void SAL_CALL freeExec(
 #elif defined SAL_W32
     (void) size; // unused
     VirtualFree(address, 0, MEM_RELEASE);
-#elif defined(SAL_OS2)
-    (void) DosFreeMem( address);
 #endif
 }
 
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index 1b46e369b..f0d450713 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -510,15 +510,7 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
     return static_cast< cppu::OWeakObject * >(new Service(context));
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, uno_Environment **)
-{
-    if (envTypeName != 0) {
-        *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-    }
-}
-
-extern "C" void * SAL_CALL component_getFactory(char const * implName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName,
                                                 void * serviceManager, void *) {
     void * p = 0;
     if (serviceManager != 0) {
diff --git a/bridges/test/java_uno/equals/TestEquals.java b/bridges/test/java_uno/equals/TestEquals.java
index b2d134914..948c88412 100644
--- a/bridges/test/java_uno/equals/TestEquals.java
+++ b/bridges/test/java_uno/equals/TestEquals.java
@@ -71,7 +71,7 @@ public final class TestEquals {
     }
 
     private static String toFileUrl(String path) throws MalformedURLException {
-        String url = new File(path).toURL().toString();
+        String url = new File(path).toURI().toURL().toString();
         String prefix = "file:/";
         if (url.startsWith(prefix)
             && (url.length() == prefix.length()
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index 4788a023c..8f6833610 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -162,13 +162,7 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
     return static_cast< cppu::OWeakObject * >(new Service(rContext));
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    sal_Char const ** pEnvTypeName, uno_Environment **)
-{
-    *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName,
                                                 void * pServiceManager, void *)
 {
     void * pFactory = 0;
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index 24b4e9d49..a16aebf47 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -163,17 +163,11 @@ cppu::ImplementationEntry entries[] = {
 
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, uno_Environment **)
-{
-    *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index 60553a5dd..dc5745e59 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -127,17 +127,11 @@ cppu::ImplementationEntry entries[] = {
 
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, uno_Environment **)
-{
-    *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/nativethreadpool/version.map b/bridges/test/java_uno/nativethreadpool/version.map
index 39c961bdf..85cba0029 100644
--- a/bridges/test/java_uno/nativethreadpool/version.map
+++ b/bridges/test/java_uno/nativethreadpool/version.map
@@ -28,8 +28,6 @@
 UDK_3_0_0 {
     global:
         component_getFactory;
-        component_getImplementationEnvironment;
-
     local:
         *;
 };
diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst
index c9ac99cf9..a46a8297d 100644
--- a/cli_ure/prj/build.lst
+++ b/cli_ure/prj/build.lst
@@ -1,4 +1,4 @@
-ure     cli_ure :       cppu cppuhelper sal codemaker stoc udkapi bridges NULL
+ure     cli_ure :       cppu cppuhelper sal DESKTOP:codemaker stoc udkapi bridges NULL
 ure	cli_ure						usr1	-	all	ure_mkout NULL
 ure	cli_ure\inc					nmake   -   all   ure_inc NULL
 ure	cli_ure\version				nmake   -   all   ure_source_version ure_inc NULL
diff --git a/cli_ure/prj/d.lst b/cli_ure/prj/d.lst
index 261bb2c35..dff5e2558 100644
--- a/cli_ure/prj/d.lst
+++ b/cli_ure/prj/d.lst
@@ -1,13 +1,13 @@
-..\%__SRC%\bin\climaker.exe %_DEST%\bin%_EXT%\climaker.exe
-..\%__SRC%\bin\climaker.pdb %_DEST%\bin%_EXT%\climaker.pdb
-..\%__SRC%\bin\climaker.exe.config %_DEST%\bin%_EXT%\climaker.exe.config
+..\%__SRC%\bin\climaker.exe %_DEST%\bin\climaker.exe
+..\%__SRC%\bin\climaker.pdb %_DEST%\bin\climaker.pdb
+..\%__SRC%\bin\climaker.exe.config %_DEST%\bin\climaker.exe.config
 
-..\%__SRC%\bin\cli_*.dll %_DEST%\bin%_EXT%\cli_*.dll
-..\%__SRC%\bin\cli_*.pdb %_DEST%\bin%_EXT%\cli_*.pdb
-..\%__SRC%\bin\cli_*.config %_DEST%\bin%_EXT%\cli_*.config
-..\%__SRC%\bin\policy*.dll %_DEST%\bin%_EXT%\policy*.dll
-..\%__SRC%\bin\cli_uno.* %_DEST%\bin%_EXT%\cli_uno.*
+..\%__SRC%\bin\cli_*.dll %_DEST%\bin\cli_*.dll
+..\%__SRC%\bin\cli_*.pdb %_DEST%\bin\cli_*.pdb
+..\%__SRC%\bin\cli_*.config %_DEST%\bin\cli_*.config
+..\%__SRC%\bin\policy*.dll %_DEST%\bin\policy*.dll
+..\%__SRC%\bin\cli_uno.* %_DEST%\bin\cli_uno.*
 
-..\%__SRC%\bin\cliuno.snk %_DEST%\bin%_EXT%\cliuno.snk
+..\%__SRC%\bin\cliuno.snk %_DEST%\bin\cliuno.snk
 
-..\%__SRC%\bin\cliureversion.mk %_DEST%\bin%_EXT%\cliureversion.mk
\ No newline at end of file
+..\%__SRC%\bin\cliureversion.mk %_DEST%\bin\cliureversion.mk
\ No newline at end of file
diff --git a/codemaker/codemaker.pmk b/codemaker/codemaker.pmk
index 976c162e7..cf06407ea 100755
--- a/codemaker/codemaker.pmk
+++ b/codemaker/codemaker.pmk
@@ -25,11 +25,7 @@
 #
 #*************************************************************************
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
-
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 CODEMAKERLIBDEPN=codemaker.lib
 COMMONCPPLIBDEPN=commoncpp.lib
 COMMONJAVALIBDEPN=commonjava.lib
diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx
index a9afe9934..4295fc86b 100644
--- a/codemaker/inc/codemaker/options.hxx
+++ b/codemaker/inc/codemaker/options.hxx
@@ -65,14 +65,9 @@ public:
     sal_Bool				isValid(const ::rtl::OString& option);
     const ::rtl::OString	getOption(const ::rtl::OString& option)
         throw( IllegalArgument );
-    const OptionMap& 		getOptions();
-
-    const ::rtl::OString 	getInputFile(sal_uInt16 index)
-        throw( IllegalArgument );
 
     const StringVector& getInputFiles();
 
-    ::rtl::OString getExtraInputFile(sal_uInt16 index) const throw( IllegalArgument );
     inline sal_uInt16 getNumberOfExtraInputFiles() const
         { return (sal_uInt16)m_extra_input_files.size(); }	
     inline const StringVector& getExtraInputFiles() const
diff --git a/codemaker/prj/build.lst b/codemaker/prj/build.lst
index a0fa864eb..1202fd2ef 100644
--- a/codemaker/prj/build.lst
+++ b/codemaker/prj/build.lst
@@ -1,4 +1,4 @@
-cm	codemaker	:	udkapi NULL
+cm	codemaker	:	registry NULL
 cm	codemaker								usr1	-	all	cm_mkout NULL
 cm	codemaker\inc							nmake	-	all	cm_inc NULL
 cm	codemaker\prj							get		-	all	cm_prj NULL
diff --git a/codemaker/prj/d.lst b/codemaker/prj/d.lst
index 62b56b948..6965d315e 100644
--- a/codemaker/prj/d.lst
+++ b/codemaker/prj/d.lst
@@ -1,14 +1,14 @@
-..\%__SRC%\bin\cppumaker.exe %_DEST%\bin%_EXT%\cppumaker.exe
-..\%__SRC%\bin\cppumaker.pdb %_DEST%\bin%_EXT%\cppumaker.pdb
-..\%__SRC%\bin\javamaker.exe %_DEST%\bin%_EXT%\javamaker.exe
-..\%__SRC%\bin\javamaker.pdb %_DEST%\bin%_EXT%\javamaker.pdb
+..\%__SRC%\bin\cppumaker.exe %_DEST%\bin\cppumaker.exe
+..\%__SRC%\bin\cppumaker.pdb %_DEST%\bin\cppumaker.pdb
+..\%__SRC%\bin\javamaker.exe %_DEST%\bin\javamaker.exe
+..\%__SRC%\bin\javamaker.pdb %_DEST%\bin\javamaker.pdb
 
-..\inc\codemaker\*.h %_DEST%\inc%_EXT%\codemaker\*.h
-..\inc\codemaker\*.hxx %_DEST%\inc%_EXT%\codemaker\*.hxx
+..\inc\codemaker\*.h %_DEST%\inc\codemaker\*.h
+..\inc\codemaker\*.hxx %_DEST%\inc\codemaker\*.hxx
 
-..\%__SRC%\bin\cppumaker %_DEST%\bin%_EXT%\cppumaker
-..\%__SRC%\bin\javamaker %_DEST%\bin%_EXT%\javamaker
+..\%__SRC%\bin\cppumaker %_DEST%\bin\cppumaker
+..\%__SRC%\bin\javamaker %_DEST%\bin\javamaker
 
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%\i*.lib
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\lib\i*.lib %_DEST%\lib\i*.lib
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index e3f690fe8..6e76543a9 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -35,7 +35,7 @@
 #include "osl/file.hxx"
 
 #include <string.h>
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 
 #include <direct.h>
@@ -152,7 +152,7 @@ OString createFileNameFromType( const OString& destination,
             continue;
         }
 
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
         if (mkdir((char*)nameBuffer.getStr(), 0777) == -1)
 #else
         if (mkdir((char*)nameBuffer.getStr()) == -1)
diff --git a/codemaker/source/codemaker/makefile.mk b/codemaker/source/codemaker/makefile.mk
index 515d36579..fb458fb6f 100644
--- a/codemaker/source/codemaker/makefile.mk
+++ b/codemaker/source/codemaker/makefile.mk
@@ -43,9 +43,7 @@ SLOFILES = \
     $(SLO)$/codemaker.obj
 
 LIB1TARGET=$(LB)$/$(TARGET).lib
-.IF "$(GUI)" != "OS2"
 LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-.ENDIF
 LIB1OBJFILES=$(SLOFILES)
 
 .INCLUDE: target.mk
diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx
index 1909dd427..c6ab6b865 100644
--- a/codemaker/source/codemaker/options.cxx
+++ b/codemaker/source/codemaker/options.cxx
@@ -64,38 +64,9 @@ const OString Options::getOption(const OString& option)
     }
 }
 
-const OptionMap& Options::getOptions()
-{
-    return m_options;	
-}	
-
-const OString Options::getInputFile(sal_uInt16 index)
-    throw( IllegalArgument )
-{
-    if (index < m_inputFiles.size())
-    {
-        return m_inputFiles[index];		
-    } else
-    {
-        throw IllegalArgument("index is out of bound.");
-    }
-}	
-
 const StringVector& Options::getInputFiles()
 {
     return m_inputFiles;	
 }	
     
-OString Options::getExtraInputFile(sal_uInt16 index) const
-    throw( IllegalArgument )
-{
-    if (index < m_extra_input_files.size())
-    {
-        return m_extra_input_files[index];		
-    } else
-    {
-        throw IllegalArgument("index is out of bound.");
-    }
-}	
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx
index 0b28e4d46..408d9477b 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -62,7 +62,7 @@ sal_Int32 TypeManager::release()
     {
         delete m_pImpl;
     }
-    return refCount;;
+    return refCount;
 }
 
 sal_Bool TypeManager::isBaseType(const ::rtl::OString& name)
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 5994a08cb..c4f6ed28d 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -363,6 +363,7 @@ void CppuType::addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes)
     const
 {
     //TODO: Only include what is really needed
+    includes.addRtlInstanceHxx();
     includes.addOslMutexHxx();
     includes.addType();
     if (m_typeMgr.getTypeClass(m_typeName) == RT_TYPE_INTERFACE) {
@@ -593,16 +594,21 @@ void CppuType::dumpNormalGetCppuType(FileStream& o)
 
 void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
 {
-    dumpGetCppuTypePreamble(o);
-
-    o << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n";
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceOpen(o, m_typeName, false);
+    else
+        o << "namespace cppu { ";
+    o << " namespace detail {\n\n";
 
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
+    OString sType = m_typeName.copy(m_typeName.lastIndexOf('/') + 1);
+    OString sStaticTypeClass = "the" + sType + "Type";
+    o << indent() << "struct " << sStaticTypeClass << " : public rtl::StaticWithInit< ::com::sun::star::uno::Type, " << sStaticTypeClass << " >\n";
+    o << indent() << "{\n";
     inc();
-    o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
-
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
+    o << indent() << "::com::sun::star::uno::Type operator()() const\n";
+    o << indent() << "{\n";
     inc();
+
     o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\""
       << m_typeName.replace('/', '.') << "\") );\n\n";
 
@@ -679,8 +685,8 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
     } else {
         o << indent() << count << ",\n" << indent() << "0 );\n\n";
     }
-
     dec();
+
     o << indent()
       << ("typelib_typedescription_register( (typelib_TypeDescription**)&pTD"
           " );\n\n");
@@ -688,15 +694,24 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
     o << indent() << "typelib_typedescription_release( pTD );\n"
       << indent() << "// End inline typedescription generation\n\n";
 
-    o << indent() << "static ::com::sun::star::uno::Type the_staticType( "
+    o << indent() << "::com::sun::star::uno::Type the_staticType( "
       << getTypeClass(m_typeName) << ", sTypeName );\n";
-    o << indent() << "the_pType = &the_staticType;\n";
+    o << indent() << "return the_staticType;\n";
 
     dec();
     o << indent() << "}\n";
     dec();
-    o << indent() << "}\n\n";
-    o << indent() << "return *the_pType;\n";
+    o << indent() << "};\n\n";
+
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceClose(o, m_typeName, false);
+    else
+        o << " }";
+
+    o << " }\n\n";
+
+    dumpGetCppuTypePreamble(o);
+    o  << indent() << "return detail::" << sStaticTypeClass << "::get();\n";
     dumpGetCppuTypePostamble(o);
 }
 
@@ -1519,15 +1534,20 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o)
 
 void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
 {
-    dumpGetCppuTypePreamble(o);
-
-    o << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n";
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceOpen(o, m_typeName, false);
+    else
+        o << "namespace cppu { ";
+    o << " namespace detail {\n\n";
 
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
+    OString sType = m_typeName.copy(m_typeName.lastIndexOf('/') + 1);
+    OString sStaticTypeClass = "the" + sType + "Type";
+    o << indent() << "struct " << sStaticTypeClass << " : public rtl::StaticWithInit< ::com::sun::star::uno::Type, " << sStaticTypeClass << " >\n";
+    o << indent() << "{\n";
     inc();
-    o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
+    o << indent() << "::com::sun::star::uno::Type operator()() const\n";
+    o << indent() << "{\n";
 
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
     inc();
     o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\""
       << m_typeName.replace('/', '.') << "\") );\n\n";
@@ -1599,9 +1619,38 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
       << ("typelib_typedescription_release( (typelib_TypeDescription*)pTD"
           " );\n\n");
 
-    o << indent() << "static ::com::sun::star::uno::Type the_staticType( "
+    o << indent() << "::com::sun::star::uno::Type the_staticType( "
       << getTypeClass(m_typeName) << ", sTypeName );\n";
-    o << indent() << "the_pType = &the_staticType;\n";
+
+    o << indent() << "return the_staticType;\n";
+
+    dec();
+
+    o << indent() << "}\n";
+    dec();
+    o << indent() << "};\n\n";
+
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceClose(o, m_typeName, false);
+    else
+        o << " }";
+    o << " }\n\n";
+
+    dumpGetCppuTypePreamble(o);
+    o  << indent() << "const ::com::sun::star::uno::Type &rRet = detail::" << sStaticTypeClass << "::get();\n";
+
+    o << indent() << "// End inline typedescription generation\n";
+
+    o  << indent() << "static bool bInitStarted = false;\n";
+    o  << indent() << "if (!bInitStarted)\n";
+    o  << indent() << "{\n";
+    inc();
+    o  << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
+    o  << indent() << "if (!bInitStarted)\n";
+    o  << indent() << "{\n";
+    inc();
+    o  << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n";
+    o  << indent() << "bInitStarted = true;\n";
 
     StringSet   aTypes;
     // type for RuntimeException is always needed
@@ -1619,14 +1668,18 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
         dumpCppuMethods(o, index);
     }
 
-    o << indent() << "// End inline typedescription generation\n";
-
     dec();
-    o << indent() << "}\n";
+    o  << indent() << "}\n";
+    dec();
+    o  << indent() << "}\n";
+    o  << indent() << "else\n";
+    o  << indent() << "{\n";
+    inc();
+    o  << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n";
     dec();
-    o << indent() << "}\n\n"
-      << indent() << "return *the_pType;\n";
+    o  << indent() << "}\n";
 
+    o  << indent() << "return rRet;\n";
     dumpGetCppuTypePostamble(o);
 }
 
@@ -1835,6 +1888,10 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index)
             inc();
             o << indent() << "::rtl::OUString sAttributeType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\"" 
               << fieldType.replace('/', '.') << "\") );\n";
+
+            o << indent() << "::rtl::OUString sAttributeName" << i << "( RTL_CONSTASCII_USTRINGPARAM(\""
+              << scope.replace('/', '.') << "::" << fieldName << "\") );\n";
+
             sal_Int32 getExceptions = dumpAttributeExceptionTypeNames(
                 o, "get", name, RT_MODE_ATTRIBUTE_GET);
             sal_Int32 setExceptions = dumpAttributeExceptionTypeNames(
@@ -1877,6 +1934,7 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
     if (m_hasMethods)
     {
         o << "\n" << indent() << "typelib_InterfaceMethodTypeDescription * pMethod = 0;\n";
+        OString             scope = m_typeName.replace('/', '.');
 
         for (sal_uInt16 i=0; i < methodCount; i++)
         {
@@ -1946,6 +2004,9 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
             
             o << indent() << "::rtl::OUString sReturnType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\"" 
               << returnType.replace('/', '.') << "\") );\n";
+            o << indent() << "::rtl::OUString sMethodName" << i <<
+                "( RTL_CONSTASCII_USTRINGPARAM(\""
+              << scope.replace('/', '.') << "::" << methodName << "\") );\n";
             o << indent() << "typelib_typedescription_newInterfaceMethod( &pMethod,\n";
             inc();
             o << indent() << absoluteIndex++ << ", ";
@@ -1953,6 +2014,7 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
                 o << "sal_True,\n";
             else				
                 o << "sal_False,\n";
+
             o << indent() << "sMethodName" << i << ".pData,\n";
             o << indent() << "(typelib_TypeClass)" << getTypeClass(returnType) 
               << ", sReturnType" << i << ".pData,\n";
@@ -2370,8 +2432,6 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o)
 {
     o << "\n#ifdef SAL_W32\n"
       << "#   pragma pack(push, 8)\n"					   
-      << "#elif defined(SAL_OS2)\n"
-      << "#   pragma pack(8)\n"
       << "#endif\n\n";
 
     OSL_ASSERT(!isPolymorphic() || m_reader.getSuperTypeCount() == 0); //TODO
@@ -2448,8 +2508,6 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o)
 
     o << "#ifdef SAL_W32\n"
       << "#   pragma pack(pop)\n"
-      << "#elif defined(SAL_OS2)\n"
-      << "#   pragma pack()\n"
       << "#endif\n\n";
 
     return sal_True;
@@ -2785,14 +2843,30 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) {
     dumpGetCppuTypePostamble(out);
 }
 
-void StructureType::dumpComprehensiveGetCppuType(FileStream & out) {
-    dumpGetCppuTypePreamble(out);
-    out << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n"
-        << indent() << "if (the_pType == 0) {\n";
+void StructureType::dumpComprehensiveGetCppuType(FileStream & out)
+{
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceOpen(out, m_typeName, false);
+    else
+        out << "namespace cppu { ";
+    out << " namespace detail {\n\n";
+
+    OString sType = m_typeName.copy(m_typeName.lastIndexOf('/') + 1);
+    OString sStaticTypeClass = "the" + sType + "Type";
+    out << indent();
+    if (isPolymorphic())
+        dumpTemplateHead(out);
+    out << "struct " << sStaticTypeClass << " : public rtl::StaticWithInit< ::com::sun::star::uno::Type, ";
+    out << sStaticTypeClass;
+    if (isPolymorphic())
+        dumpTemplateParameters(out);
+    out << " >\n";
+
+    out << indent() << "{\n";
     inc();
-    out << indent()
-        << "::osl::MutexGuard the_guard(::osl::Mutex::getGlobalMutex());\n"
-        << indent() << "if (the_pType == 0) {\n";
+    out << indent() << "::com::sun::star::uno::Type operator()() const\n";
+    out << indent() << "{\n";
+
     inc();
     if (isPolymorphic()) {
         out << indent() << "::rtl::OUStringBuffer the_buffer;\n" << indent()
@@ -2916,18 +2990,26 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) {
     out << ", " << fields << ", the_members);\n";
     out << indent() << "::typelib_typedescription_register(&the_newType);\n";
     out << indent() << "::typelib_typedescription_release(the_newType);\n";
-    out << indent() << "static ::com::sun::star::uno::Type the_staticType("
+
+    out << indent() << "::com::sun::star::uno::Type the_staticType("
         << getTypeClass(m_typeName) << ", the_name);\n";
-    out << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n";
-    out << indent() << "the_pType = &the_staticType;\n";
+    out << indent() << "return the_staticType;\n";
     dec();
     out << indent() << "}\n";
     dec();
-    out << indent() << "} else {\n";
-    inc();
-    out << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n";
-    dec();
-    out << indent() << "}\n" << indent() << "return *the_pType;\n";
+    out << indent() << "};\n";
+
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceClose(out, m_typeName, false);
+    else
+        out << " }";
+    out << " }\n\n";
+
+    dumpGetCppuTypePreamble(out);
+    out  << indent() << "return detail::" << sStaticTypeClass;
+    if (isPolymorphic())
+        dumpTemplateParameters(out);
+    out  << "::get();\n";
     dumpGetCppuTypePostamble(out);
 }
 
@@ -3021,7 +3103,7 @@ void StructureType::addComprehensiveGetCppuTypeIncludes(
 {
     includes.addType();
     includes.addCppuUnotypeHxx();
-    includes.addOslDoublecheckedlockingH();
+    includes.addRtlInstanceHxx();
     includes.addOslMutexHxx();
     includes.addRtlUstringH();
     includes.addRtlUstringHxx();
@@ -3588,15 +3670,20 @@ void EnumType::dumpNormalGetCppuType(FileStream& o)
 
 void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
 {
-    dumpGetCppuTypePreamble(o);
-
-    o << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n";
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceOpen(o, m_typeName, false);
+    else
+        o << "namespace cppu { ";
+    o << " namespace detail {\n\n";
 
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
+    OString sType = m_typeName.copy(m_typeName.lastIndexOf('/') + 1);
+    OString sStaticTypeClass = "the" + sType + "Type";
+    o << indent() << "struct " << sStaticTypeClass << " : public rtl::StaticWithInit< ::com::sun::star::uno::Type, " << sStaticTypeClass << " >\n";
+    o << indent() << "{\n";
     inc();
-    o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
+    o << indent() << "::com::sun::star::uno::Type operator()() const\n";
+    o << indent() << "{\n";
 
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
     inc();
     o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\"" 
       << m_typeName.replace('/', '.') << "\") );\n\n";
@@ -3648,16 +3735,23 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
     o << indent() << "typelib_typedescription_release( pTD );\n"
       << indent() << "// End inline typedescription generation\n\n";
 
-    o << indent() << "static ::com::sun::star::uno::Type the_staticType( "
+    o << indent() << "::com::sun::star::uno::Type the_staticType( "
       << getTypeClass(m_typeName) << ", sTypeName );\n";
-    o << indent() << "the_pType = &the_staticType;\n";
+    o << indent() << "return the_staticType;\n";
  
     dec();
     o << indent() << "}\n";
     dec();
-    o << indent() << "}\n\n"
-      << indent() << "return *the_pType;\n";
+    o << indent() << "};\n\n";
 
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceClose(o, m_typeName, false);
+    else
+        o << " }";
+    o << " }\n\n";
+
+    dumpGetCppuTypePreamble(o);
+    o  << indent() << "return detail::" << sStaticTypeClass << "::get();\n";
     dumpGetCppuTypePostamble(o);
 }
 
diff --git a/codemaker/source/cppumaker/includes.cxx b/codemaker/source/cppumaker/includes.cxx
index 10e58a243..52baf2297 100644
--- a/codemaker/source/cppumaker/includes.cxx
+++ b/codemaker/source/cppumaker/includes.cxx
@@ -60,6 +60,7 @@ Includes::Includes(
     m_includeRtlTextencH(false), m_includeRtlUstrbufHxx(false),
     m_includeRtlUstringH(false),
     m_includeRtlUstringHxx(dependencies.hasStringDependency()),
+    m_includeRtlInstanceHxx(false),
     m_includeSalTypesH(
         dependencies.hasBooleanDependency() || dependencies.hasByteDependency()
         || dependencies.hasShortDependency()
@@ -250,6 +251,10 @@ void Includes::dump(FileStream & out, rtl::OString const * companionHdl) {
         dumpEmptyLineBeforeFirst(out, &first);
         out << ("#include \"rtl/ustring.hxx\"\n");
     }
+    if (m_includeRtlInstanceHxx) {
+        dumpEmptyLineBeforeFirst(out, &first);
+        out << "#include \"rtl/instance.hxx\"\n";
+    }
     if (m_includeSalTypesH) {
         dumpEmptyLineBeforeFirst(out, &first);
         out << "#include \"sal/types.h\"\n";
diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx
index 3d209bfdf..50caac0db 100644
--- a/codemaker/source/cppumaker/includes.hxx
+++ b/codemaker/source/cppumaker/includes.hxx
@@ -61,6 +61,7 @@ public:
     void addRtlUstrbufHxx() { m_includeRtlUstrbufHxx = true; }
     void addRtlUstringH() { m_includeRtlUstringH = true; }
     void addRtlUstringHxx() { m_includeRtlUstringHxx = true; }
+    void addRtlInstanceHxx() { m_includeRtlInstanceHxx = true; }
     void addSalTypesH() { m_includeSalTypesH = true; }
     void addTypelibTypeclassH() { m_includeTypelibTypeclassH = true; }
     void addTypelibTypedescriptionH()
@@ -94,6 +95,7 @@ private:
     bool m_includeRtlUstrbufHxx;
     bool m_includeRtlUstringH;
     bool m_includeRtlUstringHxx;
+    bool m_includeRtlInstanceHxx;
     bool m_includeSalTypesH;
     bool m_includeTypelibTypeclassH;
     bool m_includeTypelibTypedescriptionH;
diff --git a/codemaker/source/cppumaker/makefile.mk b/codemaker/source/cppumaker/makefile.mk
index a3ff38c4c..c05773e41 100644
--- a/codemaker/source/cppumaker/makefile.mk
+++ b/codemaker/source/cppumaker/makefile.mk
@@ -36,6 +36,12 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 .INCLUDE : settings.mk
+
+.IF "$(OS)" == "IOS"
+all:
+    @echo No build-time tools for this platform
+.ENDIF
+
 .INCLUDE : $(PRJ)$/codemaker.pmk
 
 # --- Files --------------------------------------------------------
diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx
index 4f6f6755c..bd9d9b7e0 100644
--- a/codemaker/source/javamaker/classfile.cxx
+++ b/codemaker/source/javamaker/classfile.cxx
@@ -90,11 +90,6 @@ void write(FileStream & file, void const * buffer, sal_uInt64 size) {
     }
 }
 
-void writeU1(FileStream & file, sal_uInt8 data) {
-    unsigned char buf[] = { static_cast< unsigned char >(data) };
-    write(file, &buf, sizeof buf);
-}
-
 void writeU2(FileStream & file, sal_uInt16 data) {
     unsigned char buf[] = {
         static_cast< unsigned char >(data >> 8),
diff --git a/codemaker/source/javamaker/makefile.mk b/codemaker/source/javamaker/makefile.mk
index 297f35bd0..cf8a29858 100644
--- a/codemaker/source/javamaker/makefile.mk
+++ b/codemaker/source/javamaker/makefile.mk
@@ -37,6 +37,12 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
+
+.IF "$(OS)" == "IOS"
+all:
+    @echo No build-time tools for this platform
+.ENDIF
+
 .INCLUDE : $(PRJ)$/codemaker.pmk
 
 # --- Files --------------------------------------------------------
diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h
index c188261d2..3494e6635 100644
--- a/cppu/inc/typelib/typedescription.h
+++ b/cppu/inc/typelib/typedescription.h
@@ -42,8 +42,6 @@ struct _typelib_TypeDescription;
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 /** Holds a weak reference to a type description.
@@ -560,7 +558,7 @@ typedef struct _typelib_Union_Init
     typelib_TypeDescriptionReference* pTypeRef;
 } typelib_Union_Init;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
diff --git a/cppu/inc/typelib/uik.h b/cppu/inc/typelib/uik.h
index d8ed652e4..63992ac0a 100644
--- a/cppu/inc/typelib/uik.h
+++ b/cppu/inc/typelib/uik.h
@@ -32,8 +32,6 @@
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 /** Binary typelib uik struct.  Internally not used anymore.
@@ -47,7 +45,7 @@ typedef struct _typelib_Uik
     sal_uInt32	m_Data5;
 } typelib_Uik;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #	pragma pack(pop)
 #endif
 
diff --git a/cppu/inc/uno/any2.h b/cppu/inc/uno/any2.h
index a42121341..a770630f2 100644
--- a/cppu/inc/uno/any2.h
+++ b/cppu/inc/uno/any2.h
@@ -38,8 +38,6 @@ extern "C"
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 struct _typelib_TypeDescriptionReference;
@@ -63,7 +61,7 @@ typedef struct _uno_Any
     void * pReserved;
 } uno_Any;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
diff --git a/cppu/inc/uno/dispatcher.h b/cppu/inc/uno/dispatcher.h
index 42bde5e8c..eefe18196 100644
--- a/cppu/inc/uno/dispatcher.h
+++ b/cppu/inc/uno/dispatcher.h
@@ -64,8 +64,6 @@ typedef void (SAL_CALL * uno_DispatchMethod)(
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 /** The binary C uno interface description.
@@ -87,7 +85,7 @@ typedef struct _uno_Interface
     uno_DispatchMethod pDispatcher;
 } uno_Interface;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h
index e362ce7a6..e7987936c 100644
--- a/cppu/inc/uno/environment.h
+++ b/cppu/inc/uno/environment.h
@@ -43,8 +43,6 @@ struct _typelib_InterfaceTypeDescription;
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 /** The binary specification of an UNO environment.
@@ -256,7 +254,7 @@ typedef struct _uno_ExtEnvironment
     
 } uno_ExtEnvironment;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
diff --git a/cppu/inc/uno/mapping.h b/cppu/inc/uno/mapping.h
index 99f8598d9..1a342b574 100644
--- a/cppu/inc/uno/mapping.h
+++ b/cppu/inc/uno/mapping.h
@@ -66,8 +66,6 @@ typedef void (SAL_CALL * uno_MapInterfaceFunc)(
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 /** This is the binary specification of a mapping.
@@ -87,7 +85,7 @@ typedef struct _uno_Mapping
     uno_MapInterfaceFunc mapInterface;
 } uno_Mapping;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst
index 0af8b3019..f55bffde8 100644
--- a/cppu/prj/build.lst
+++ b/cppu/prj/build.lst
@@ -1,4 +1,4 @@
-cu	cppu	:	sal salhelper offuh BOOST:boost NULL
+cu	cppu	:	sal salhelper offapi BOOST:boost NULL
 cu	cppu							usr1	-	all	cu_mkout NULL
 cu	cppu\inc						nmake	-	all	cu_inc NULL
 cu	cppu\source\uno					nmake	-	all	cu_uno cu_inc NULL
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index 411a51cf2..87ff91471 100644
--- a/cppu/prj/d.lst
+++ b/cppu/prj/d.lst
@@ -1,74 +1,74 @@
-mkdir: %_DEST%\inc%_EXT%\cppu
-mkdir: %_DEST%\inc%_EXT%\cppu\helper\purpenv
-mkdir: %_DEST%\inc%_EXT%\com
-mkdir: %_DEST%\inc%_EXT%\com\sun
-mkdir: %_DEST%\inc%_EXT%\com\sun\star
-mkdir: %_DEST%\inc%_EXT%\com\sun\star\uno
-mkdir: %_DEST%\inc%_EXT%\typelib
-mkdir: %_DEST%\inc%_EXT%\uno
+mkdir: %_DEST%\inc\cppu
+mkdir: %_DEST%\inc\cppu\helper\purpenv
+mkdir: %_DEST%\inc\com
+mkdir: %_DEST%\inc\com\sun
+mkdir: %_DEST%\inc\com\sun\star
+mkdir: %_DEST%\inc\com\sun\star\uno
+mkdir: %_DEST%\inc\typelib
+mkdir: %_DEST%\inc\uno
 
-..\inc\cppu\macros.hxx %_DEST%\inc%_EXT%\cppu\macros.hxx
-..\inc\cppu\unotype.hxx %_DEST%\inc%_EXT%\cppu\unotype.hxx
+..\inc\cppu\macros.hxx %_DEST%\inc\cppu\macros.hxx
+..\inc\cppu\unotype.hxx %_DEST%\inc\cppu\unotype.hxx
 
-..\inc\com\sun\star\uno\Reference.h %_DEST%\inc%_EXT%\com\sun\star\uno\Reference.h
-..\inc\com\sun\star\uno\Reference.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Reference.hxx
-..\inc\com\sun\star\uno\Type.h %_DEST%\inc%_EXT%\com\sun\star\uno\Type.h
-..\inc\com\sun\star\uno\Type.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Type.hxx
-..\inc\com\sun\star\uno\Any.h %_DEST%\inc%_EXT%\com\sun\star\uno\Any.h
-..\inc\com\sun\star\uno\Any.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Any.hxx
-..\inc\com\sun\star\uno\Sequence.h %_DEST%\inc%_EXT%\com\sun\star\uno\Sequence.h
-..\inc\com\sun\star\uno\Sequence.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Sequence.hxx
-..\inc\com\sun\star\uno\genfunc.h %_DEST%\inc%_EXT%\com\sun\star\uno\genfunc.h
-..\inc\com\sun\star\uno\genfunc.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\genfunc.hxx
+..\inc\com\sun\star\uno\Reference.h %_DEST%\inc\com\sun\star\uno\Reference.h
+..\inc\com\sun\star\uno\Reference.hxx %_DEST%\inc\com\sun\star\uno\Reference.hxx
+..\inc\com\sun\star\uno\Type.h %_DEST%\inc\com\sun\star\uno\Type.h
+..\inc\com\sun\star\uno\Type.hxx %_DEST%\inc\com\sun\star\uno\Type.hxx
+..\inc\com\sun\star\uno\Any.h %_DEST%\inc\com\sun\star\uno\Any.h
+..\inc\com\sun\star\uno\Any.hxx %_DEST%\inc\com\sun\star\uno\Any.hxx
+..\inc\com\sun\star\uno\Sequence.h %_DEST%\inc\com\sun\star\uno\Sequence.h
+..\inc\com\sun\star\uno\Sequence.hxx %_DEST%\inc\com\sun\star\uno\Sequence.hxx
+..\inc\com\sun\star\uno\genfunc.h %_DEST%\inc\com\sun\star\uno\genfunc.h
+..\inc\com\sun\star\uno\genfunc.hxx %_DEST%\inc\com\sun\star\uno\genfunc.hxx
 
-..\inc\typelib\typeclass.h %_DEST%\inc%_EXT%\typelib\typeclass.h
-..\inc\typelib\typedescription.h %_DEST%\inc%_EXT%\typelib\typedescription.h
-..\inc\typelib\typedescription.hxx %_DEST%\inc%_EXT%\typelib\typedescription.hxx
-..\inc\typelib\uik.h %_DEST%\inc%_EXT%\typelib\uik.h
+..\inc\typelib\typeclass.h %_DEST%\inc\typelib\typeclass.h
+..\inc\typelib\typedescription.h %_DEST%\inc\typelib\typedescription.h
+..\inc\typelib\typedescription.hxx %_DEST%\inc\typelib\typedescription.hxx
+..\inc\typelib\uik.h %_DEST%\inc\typelib\uik.h
 
-..\inc\uno\dispatcher.h %_DEST%\inc%_EXT%\uno\dispatcher.h
-..\inc\uno\dispatcher.hxx %_DEST%\inc%_EXT%\uno\dispatcher.hxx
-..\inc\uno\any2.h %_DEST%\inc%_EXT%\uno\any2.h
-..\inc\uno\sequence2.h %_DEST%\inc%_EXT%\uno\sequence2.h
-..\inc\uno\data.h %_DEST%\inc%_EXT%\uno\data.h
-..\inc\uno\lbnames.h %_DEST%\inc%_EXT%\uno\lbnames.h
-..\inc\uno\environment.h %_DEST%\inc%_EXT%\uno\environment.h
-..\inc\uno\environment.hxx %_DEST%\inc%_EXT%\uno\environment.hxx
-..\inc\uno\mapping.h %_DEST%\inc%_EXT%\uno\mapping.h
-..\inc\uno\mapping.hxx %_DEST%\inc%_EXT%\uno\mapping.hxx
-..\inc\uno\threadpool.h %_DEST%\inc%_EXT%\uno\threadpool.h
-..\inc\uno\current_context.h %_DEST%\inc%_EXT%\uno\current_context.h
-..\inc\uno\current_context.hxx %_DEST%\inc%_EXT%\uno\current_context.hxx
-..\inc\uno\cuno.h %_DEST%\inc%_EXT%\uno\cuno.h
-..\inc\uno\EnvDcp.h              %_DEST%\inc%_EXT%\uno\EnvDcp.h
-..\inc\uno\Enterable.h           %_DEST%\inc%_EXT%\uno\Enterable.h
+..\inc\uno\dispatcher.h %_DEST%\inc\uno\dispatcher.h
+..\inc\uno\dispatcher.hxx %_DEST%\inc\uno\dispatcher.hxx
+..\inc\uno\any2.h %_DEST%\inc\uno\any2.h
+..\inc\uno\sequence2.h %_DEST%\inc\uno\sequence2.h
+..\inc\uno\data.h %_DEST%\inc\uno\data.h
+..\inc\uno\lbnames.h %_DEST%\inc\uno\lbnames.h
+..\inc\uno\environment.h %_DEST%\inc\uno\environment.h
+..\inc\uno\environment.hxx %_DEST%\inc\uno\environment.hxx
+..\inc\uno\mapping.h %_DEST%\inc\uno\mapping.h
+..\inc\uno\mapping.hxx %_DEST%\inc\uno\mapping.hxx
+..\inc\uno\threadpool.h %_DEST%\inc\uno\threadpool.h
+..\inc\uno\current_context.h %_DEST%\inc\uno\current_context.h
+..\inc\uno\current_context.hxx %_DEST%\inc\uno\current_context.hxx
+..\inc\uno\cuno.h %_DEST%\inc\uno\cuno.h
+..\inc\uno\EnvDcp.h              %_DEST%\inc\uno\EnvDcp.h
+..\inc\uno\Enterable.h           %_DEST%\inc\uno\Enterable.h
 
-..\inc\cppu\EnvDcp.hxx           %_DEST%\inc%_EXT%\cppu\EnvDcp.hxx
-..\inc\cppu\Enterable.hxx        %_DEST%\inc%_EXT%\cppu\Enterable.hxx
-..\inc\cppu\EnvGuards.hxx        %_DEST%\inc%_EXT%\cppu\EnvGuards.hxx
-..\inc\cppu\FreeReference.hxx    %_DEST%\inc%_EXT%\cppu\FreeReference.hxx
-..\inc\cppu\Map.hxx              %_DEST%\inc%_EXT%\cppu\Map.hxx
-..\inc\cppu\Shield.hxx           %_DEST%\inc%_EXT%\cppu\Shield.hxx
+..\inc\cppu\EnvDcp.hxx           %_DEST%\inc\cppu\EnvDcp.hxx
+..\inc\cppu\Enterable.hxx        %_DEST%\inc\cppu\Enterable.hxx
+..\inc\cppu\EnvGuards.hxx        %_DEST%\inc\cppu\EnvGuards.hxx
+..\inc\cppu\FreeReference.hxx    %_DEST%\inc\cppu\FreeReference.hxx
+..\inc\cppu\Map.hxx              %_DEST%\inc\cppu\Map.hxx
+..\inc\cppu\Shield.hxx           %_DEST%\inc\cppu\Shield.hxx
 
-..\inc\cppu\helper\purpenv\Environment.hxx  %_DEST%\inc%_EXT%\cppu\helper\purpenv\Environment.hxx
-..\inc\cppu\helper\purpenv\Mapping.hxx      %_DEST%\inc%_EXT%\cppu\helper\purpenv\Mapping.hxx
+..\inc\cppu\helper\purpenv\Environment.hxx  %_DEST%\inc\cppu\helper\purpenv\Environment.hxx
+..\inc\cppu\helper\purpenv\Mapping.hxx      %_DEST%\inc\cppu\helper\purpenv\Mapping.hxx
 
-..\%__SRC%\lib\icppu.lib %_DEST%\lib%_EXT%\icppu.lib
-..\%__SRC%\bin\cppu* %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\icppu.lib %_DEST%\lib\icppu.lib
+..\%__SRC%\bin\cppu* %_DEST%\bin\*
+..\%__SRC%\lib\libuno_cppu.* %_DEST%\lib\*
 
-..\%__SRC%\lib\ipurpenvhelper*        %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\purpe*.dll     %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\ipurpenvhelper*        %_DEST%\lib\*
+..\%__SRC%\bin\purpe*.dll     %_DEST%\bin\*
+..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib\*
 
-..\%__SRC%\bin\unsafe_u*.dll    %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libunsafe_uno_uno.*    %_DEST%\lib%_EXT%\*
+..\%__SRC%\bin\unsafe_u*.dll    %_DEST%\bin\*
+..\%__SRC%\lib\libunsafe_uno_uno.*    %_DEST%\lib\*
 
-..\%__SRC%\bin\affine_u*.dll   %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libaffine_uno_uno.*   %_DEST%\lib%_EXT%\*
+..\%__SRC%\bin\affine_u*.dll   %_DEST%\bin\*
+..\%__SRC%\lib\libaffine_uno_uno.*   %_DEST%\lib\*
 
-..\%__SRC%\bin\log_u*.dll   %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\liblog_uno_uno.*   %_DEST%\lib%_EXT%\*
+..\%__SRC%\bin\log_u*.dll   %_DEST%\bin\*
+..\%__SRC%\lib\liblog_uno_uno.*   %_DEST%\lib\*
 
 linklib: libuno_cppu.*.*
 linklib: libuno_purpenvhelper*.*.*
diff --git a/cppu/qa/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk
index 1dd1a4bac..accda46fc 100644
--- a/cppu/qa/cppumaker/makefile.mk
+++ b/cppu/qa/cppumaker/makefile.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-PRJ := ..$/..
+PRJ := ../..
 PRJNAME := cppu
 TARGET := test_cppumaker
 
@@ -33,14 +33,19 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+	@echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 DLLPRE = # no leading "lib" on .so files
 
-INCPRE += $(MISC)$/$(TARGET)$/inc
+INCPRE += $(MISC)/$(TARGET)/inc
 
 SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_cppumaker.obj
+SHL1OBJS = $(SLO)/test_cppumaker.obj
 SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
@@ -52,21 +57,21 @@ SLOFILES = $(SHL1OBJS)
 
 ALLTAR: test
 
-$(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag
+$(SHL1OBJS): $(MISC)/$(TARGET).cppumaker.flag
 
-$(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb
-    - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc
-    $(CPPUMAKER) \
-        -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< $(SOLARBINDIR)$/udkapi.rdb
-    $(TOUCH) $@
+$(MISC)/$(TARGET).cppumaker.flag: $(MISC)/$(TARGET).rdb
+	- $(MKDIRHIER) $(MISC)/$(TARGET)/inc
+	$(CPPUMAKER) \
+	    -O$(MISC)/$(TARGET)/inc -BUCR -C $< $(SOLARBINDIR)/udkapi.rdb
+	$(TOUCH) $@
 
-$(MISC)$/$(TARGET).rdb: $(MISC)$/$(TARGET)$/types.urd
-    - rm $@
-    $(REGMERGE) $@ /UCR $<
+$(MISC)/$(TARGET).rdb: $(MISC)/$(TARGET)/types.urd
+	- rm -f $@
+	$(REGMERGE) $@ /UCR $<
 
-$(MISC)$/$(TARGET)$/types.urd: types.idl
-    - $(MKDIR) $(MISC)$/$(TARGET)
-    $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
+$(MISC)/$(TARGET)/types.urd: types.idl
+	- $(MKDIR) $(MISC)/$(TARGET)
+	$(IDLC) -O$(MISC)/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
 
 test .PHONY: $(SHL1TARGETN)
-    $(CPPUNITTESTER) $<
+	$(CPPUNITTESTER) $<
diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index 1db4ed9ee..6d9d87935 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -33,6 +33,11 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX+=$(CPPUNIT_CFLAGS)
 
 DLLPRE=# no leading "lib" on .so files
diff --git a/cppu/source/helper/purpenv/export.mk b/cppu/source/helper/purpenv/export.mk
index 7e5e9d04d..004787e4f 100644
--- a/cppu/source/helper/purpenv/export.mk
+++ b/cppu/source/helper/purpenv/export.mk
@@ -4,10 +4,6 @@ NAMEpurpenv_helper := uno_purpenvhelper$(COMID)
 
 purpenv_helper_LIB := -l$(NAMEpurpenv_helper)
 
-.ELIF "$(GUI)"=="OS2"
-NAMEpurpenv_helper := purpeh$(UDK_MAJOR)
-purpenv_helper_LIB := i$(NAMEpurpenv_helper)
-
 .ELSE
 NAMEpurpenv_helper := purpenvhelper$(UDK_MAJOR)$(COMID)
 .IF "$(COM)"=="GCC"
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index 31653fda3..64dcd31f4 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -70,8 +70,6 @@ void SAL_CALL typelib_typedescriptionreference_getByName(
 
 #ifdef SAL_W32
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(8)
 #endif
 
 /**
@@ -95,8 +93,6 @@ struct AlignSize_Impl
 
 #ifdef SAL_W32
 #pragma pack(pop)
-#elif defined(SAL_OS2)
-#pragma pack()
 #endif
 
 // the value of the maximal alignment 
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index c5c5f53db..f87d8a68b 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -62,8 +62,6 @@ using ::rtl::OString;
 
 #ifdef SAL_W32
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(8)
 #endif
 
 /**
@@ -87,8 +85,6 @@ struct AlignSize_Impl
 
 #ifdef SAL_W32
 #pragma pack(pop)
-#elif defined(SAL_OS2)
-#pragma pack()
 #endif
 
 // the value of the maximal alignment
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 5dcb9831b..af4ab7b52 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -356,12 +356,10 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 4)
 #endif
 
 #if defined(INTEL) \
-    && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2) \
+    && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) \
         || defined(NETBSD) || defined(OPENBSD)) || defined(MACOSX) || defined(DRAGONFLY) \
         || defined(__SUNPRO_CC) && defined(SOLARIS))
 #define MAX_ALIGNMENT_4
@@ -597,8 +595,6 @@ BinaryCompatible_Impl::BinaryCompatible_Impl()
 
 #ifdef SAL_W32
 #	pragma pack(pop)
-#elif defined(SAL_OS2)
-#	pragma pack()
 #endif
 
 static BinaryCompatible_Impl aTest;
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 331662c7f..0cbc96214 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -825,14 +825,14 @@ extern "C" void SAL_CALL uno_dumpEnvironmentByName(
     }
 }
 
-//------------------------------------------------------------------------------
-inline static const OUString & unoenv_getStaticOIdPart()
+namespace
 {
-    static OUString * s_pStaticOidPart = 0;
-    if (! s_pStaticOidPart)
+    class makeOIdPart
     {
-        ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() );
-        if (! s_pStaticOidPart)
+    private:
+        OUString m_sOidPart;
+    public:
+        makeOIdPart()
         {
             ::rtl::OUStringBuffer aRet( 64 );
             aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM("];") );
@@ -856,11 +856,18 @@ inline static const OUString & unoenv_getStaticOIdPart()
             for ( sal_Int32 i = 0; i < 16; ++i )
                 aRet.append( (sal_Int32)ar[i], 16 );
 
-            static OUString s_aStaticOidPart( aRet.makeStringAndClear() );
-            s_pStaticOidPart = &s_aStaticOidPart;
+            m_sOidPart = aRet.makeStringAndClear();
         }
-    }
-    return *s_pStaticOidPart;
+        const OUString& getOIdPart() const { return m_sOidPart; }
+    };
+
+    class theStaticOIdPart : public rtl::Static<makeOIdPart, theStaticOIdPart> {};
+}
+
+//------------------------------------------------------------------------------
+inline static const OUString & unoenv_getStaticOIdPart()
+{
+    return theStaticOIdPart::get().getOIdPart();
 }
 
 extern "C"
diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx
index 718241555..305716ada 100644
--- a/cppu/source/uno/loadmodule.cxx
+++ b/cppu/source/uno/loadmodule.cxx
@@ -41,6 +41,9 @@
 namespace cppu { namespace detail {
 
 ::oslModule loadModule(rtl::OUString const & name) {
+#ifdef IOS
+    return NULL;
+#else
     rtl::OUStringBuffer b;
 #if defined SAL_DLLPREFIX
     b.appendAscii(RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX));
@@ -51,6 +54,7 @@ namespace cppu { namespace detail {
         reinterpret_cast< oslGenericFunction >(&loadModule),
         b.makeStringAndClear().pData,
         SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY);
+#endif
 }
 
 } }
diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk
index f01351648..8c6d6944e 100644
--- a/cppu/util/extra.mk
+++ b/cppu/util/extra.mk
@@ -44,13 +44,7 @@ SHL3TARGET  := unsafe_uno_uno
 SHL3IMPLIB  := i$(SHL3TARGET)
 SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB) 
 SHL3OBJS    := $(SLO)$/UnsafeBridge.obj
-.IF "$(GUI)"=="OS2"
-SHL3VERSIONMAP=unsafe_os2.map
-SHL3DEF=$(MISC)$/$(SHL3TARGET).def
-DEF3NAME=$(SHL3TARGET)
-.ELSE
 SHL3DEF     := empty.def
-.ENDIF
 SHL3OBJS    := $(SLO)$/UnsafeBridge.obj
 SHL3RPATH   := URELIB
 
@@ -58,13 +52,7 @@ SHL4TARGET  := affine_uno_uno
 SHL4IMPLIB  := i$(SHL4TARGET)
 SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB) 
 SHL4OBJS    := $(SLO)$/AffineBridge.obj
-.IF "$(GUI)"=="OS2"
-SHL4VERSIONMAP=unsafe_os2.map
-SHL4DEF=$(MISC)$/$(SHL4TARGET).def
-DEF4NAME=$(SHL4TARGET)
-.ELSE
 SHL4DEF     := empty.def
-.ENDIF
 SHL4OBJS    := $(SLO)$/AffineBridge.obj
 SHL4RPATH   := URELIB
 
@@ -74,13 +62,7 @@ SHL5IMPLIB  := i$(SHL5TARGET)
 SHL5STDLIBS := $(purpenv_helper_LIB) $(SALLIB) $(CPPULIB)
 SHL5OBJS    := $(SLO)$/LogBridge.obj
                 
-.IF "$(GUI)"=="OS2"
-SHL5VERSIONMAP=unsafe_os2.map
-SHL5DEF=$(MISC)$/$(SHL5TARGET).def
-DEF5NAME=LogMapping.def
-.ELSE
 SHL5DEF     := empty.def
-.ENDIF
 SHL5RPATH   := URELIB
 
 # --- Targets ------------------------------------------------------
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index 8d1003bd4..0c09a1bda 100644
--- a/cppu/util/makefile.mk
+++ b/cppu/util/makefile.mk
@@ -50,7 +50,7 @@ SHL1LIBS= \
     $(SLB)$/cppu_threadpool.lib	\
     $(SLB)$/cppu_cppu.lib
 
-.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)" == "WNT"
 SHL1TARGET=$(TARGET)$(UDK_MAJOR)
 .ELSE
 SHL1TARGET= uno_$(TARGET)
@@ -59,7 +59,11 @@ SHL1TARGET= uno_$(TARGET)
 SHL1STDLIBS = $(SALLIB)
 
 SHL1DEPN=
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB=i$(TARGET)
+.ELSE
+SHL1IMPLIB=uno_$(TARGET)
+.ENDIF
 .IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 .ENDIF
@@ -74,8 +78,6 @@ SHL2TARGET  := $(NAMEpurpenv_helper)
 DEF2NAME    := $(SHL2TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
 SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map
-.ELIF "$(GUI)"=="OS2"
-SHL2VERSIONMAP:=uno_purpenvhelperwntgcc.map
 .ELIF "$(COMNAME)"=="mscx"
 SHL2VERSIONMAP:=$(SHL2TARGET)X.map
 .ELSE
@@ -89,19 +91,10 @@ SHL2OBJS    := \
     $(SLO)$/helper_purpenv_Environment.obj 	\
     $(SLO)$/helper_purpenv_Mapping.obj      \
     $(SLO)$/helper_purpenv_Proxy.obj
-
+SHL2DEPN=$(SHL1TARGETN)
 
 # --- Targets ------------------------------------------------------
-
-.PHONY: ALLTAR
-
-
-ALLTAR:   $(SHL2TARGETN)
-    $(MAKE) $(MAKECMDGOALS) -f extra.mk
-
-
 .INCLUDE :	target.mk
 
-
-$(SHL2TARGETN): $(SHL1TARGETN)
-
+ALLTAR:
+	$(MAKE) $(MAKECMDGOALS) -f extra.mk
diff --git a/cppu/util/makefile.pmk b/cppu/util/makefile.pmk
index c1259ddf4..95e83db6d 100644
--- a/cppu/util/makefile.pmk
+++ b/cppu/util/makefile.pmk
@@ -26,7 +26,3 @@
 #*************************************************************************
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
-
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
diff --git a/cppuhelper/inc/cppuhelper/shlib.hxx b/cppuhelper/inc/cppuhelper/shlib.hxx
index a092ce34a..ebbc1e1d9 100644
--- a/cppuhelper/inc/cppuhelper/shlib.hxx
+++ b/cppuhelper/inc/cppuhelper/shlib.hxx
@@ -42,7 +42,7 @@ namespace cppu
     (e.g. xxx.dll).  You can give parameter rPath to force lookup of the library in a specific
     directory.  The resulting path of the library will be checked against environment variable
     CPLD_ACCESSPATH if set.
-    
+
     @param rLibName name of the library
     @param rPath optional path
     @param rImplName implementation to be retrieved from the library
@@ -60,6 +60,32 @@ SAL_CALL loadSharedLibComponentFactory(
     ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > const & xKey )
     SAL_THROW( (::com::sun::star::loader::CannotActivateFactoryException) );
 
+/** Loads a shared library component and gets the factory out of it.  You can give either a
+    fully qualified libname or single lib name.  The libname need not be pre/postfixed
+    (e.g. xxx.dll).  You can give parameter rPath to force lookup of the library in a specific
+    directory.  The resulting path of the library will be checked against environment variable
+    CPLD_ACCESSPATH if set. An optional 'prefix' parameter is used to determine the symbol
+    name of the entry point in the library.
+
+    @param rLibName name of the library
+    @param rPath optional path
+    @param rImplName implementation to be retrieved from the library
+    @param xMgr service manager to be provided to the component
+    @param xKey registry key to be provided to the component
+    @param rPrefix optional component prefix
+    @return
+    factory instance (::com::sun::star::lang::XSingleComponentFactory or
+    ::com::sun::star::lang::XSingleComponentFactory)
+*/
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+SAL_CALL loadSharedLibComponentFactory(
+    ::rtl::OUString const & rLibName, ::rtl::OUString const & rPath,
+    ::rtl::OUString const & rImplName,
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & xMgr,
+    ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > const & xKey,
+    ::rtl::OUString const & rPrefix )
+    SAL_THROW( (::com::sun::star::loader::CannotActivateFactoryException) );
+
 /** Invokes component_writeInfo() function of specified component library.  You can give either
     a fully qualified libname or single lib name. The libname need not be pre/postfixed
     (e.g. xxx.dll).  You can give parameter rPath to force lookup of the library in a specific
diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst
index 4ff92edfa..570a34560 100644
--- a/cppuhelper/prj/build.lst
+++ b/cppuhelper/prj/build.lst
@@ -1,4 +1,4 @@
-ch	cppuhelper	:	BOOST:boost LIBXSLT:libxslt codemaker cppu offuh NULL
+ch	cppuhelper	:	BOOST:boost LIBXSLT:libxslt DESKTOP:codemaker cppu offapi NULL
 ch	cppuhelper								usr1	-	all	ch_mkout NULL
 ch	cppuhelper\inc							nmake	-	all	ch_include NULL
 ch	cppuhelper\source						nmake	-	all	ch_source ch_unotypes ch_include NULL
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst
index 0707a7609..c26529d07 100644
--- a/cppuhelper/prj/d.lst
+++ b/cppuhelper/prj/d.lst
@@ -1,74 +1,74 @@
-mkdir: %_DEST%\inc%_EXT%\cppuhelper
+mkdir: %_DEST%\inc\cppuhelper
 
-..\inc\cppuhelper\implbase.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase.hxx
-..\inc\cppuhelper\implbase_ex.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase_ex.hxx
-..\inc\cppuhelper\implbase_ex_pre.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase_ex_pre.hxx
-..\inc\cppuhelper\implbase_ex_post.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase_ex_post.hxx
-..\inc\cppuhelper\implbase1.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase1.hxx
-..\inc\cppuhelper\implbase2.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase2.hxx
-..\inc\cppuhelper\implbase3.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase3.hxx
-..\inc\cppuhelper\implbase4.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase4.hxx
-..\inc\cppuhelper\implbase5.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase5.hxx
-..\inc\cppuhelper\implbase6.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase6.hxx
-..\inc\cppuhelper\implbase7.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase7.hxx
-..\inc\cppuhelper\implbase8.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase8.hxx
-..\inc\cppuhelper\implbase9.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase9.hxx
-..\inc\cppuhelper\implbase10.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase10.hxx
-..\inc\cppuhelper\implbase11.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase11.hxx
-..\inc\cppuhelper\implbase12.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase12.hxx
+..\inc\cppuhelper\implbase.hxx %_DEST%\inc\cppuhelper\implbase.hxx
+..\inc\cppuhelper\implbase_ex.hxx %_DEST%\inc\cppuhelper\implbase_ex.hxx
+..\inc\cppuhelper\implbase_ex_pre.hxx %_DEST%\inc\cppuhelper\implbase_ex_pre.hxx
+..\inc\cppuhelper\implbase_ex_post.hxx %_DEST%\inc\cppuhelper\implbase_ex_post.hxx
+..\inc\cppuhelper\implbase1.hxx %_DEST%\inc\cppuhelper\implbase1.hxx
+..\inc\cppuhelper\implbase2.hxx %_DEST%\inc\cppuhelper\implbase2.hxx
+..\inc\cppuhelper\implbase3.hxx %_DEST%\inc\cppuhelper\implbase3.hxx
+..\inc\cppuhelper\implbase4.hxx %_DEST%\inc\cppuhelper\implbase4.hxx
+..\inc\cppuhelper\implbase5.hxx %_DEST%\inc\cppuhelper\implbase5.hxx
+..\inc\cppuhelper\implbase6.hxx %_DEST%\inc\cppuhelper\implbase6.hxx
+..\inc\cppuhelper\implbase7.hxx %_DEST%\inc\cppuhelper\implbase7.hxx
+..\inc\cppuhelper\implbase8.hxx %_DEST%\inc\cppuhelper\implbase8.hxx
+..\inc\cppuhelper\implbase9.hxx %_DEST%\inc\cppuhelper\implbase9.hxx
+..\inc\cppuhelper\implbase10.hxx %_DEST%\inc\cppuhelper\implbase10.hxx
+..\inc\cppuhelper\implbase11.hxx %_DEST%\inc\cppuhelper\implbase11.hxx
+..\inc\cppuhelper\implbase12.hxx %_DEST%\inc\cppuhelper\implbase12.hxx
 
-..\inc\cppuhelper\compbase.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase.hxx
-..\inc\cppuhelper\compbase_ex.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase_ex.hxx
-..\inc\cppuhelper\compbase1.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase1.hxx
-..\inc\cppuhelper\compbase2.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase2.hxx
-..\inc\cppuhelper\compbase3.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase3.hxx
-..\inc\cppuhelper\compbase4.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase4.hxx
-..\inc\cppuhelper\compbase5.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase5.hxx
-..\inc\cppuhelper\compbase6.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase6.hxx
-..\inc\cppuhelper\compbase7.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase7.hxx
-..\inc\cppuhelper\compbase8.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase8.hxx
-..\inc\cppuhelper\compbase9.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase9.hxx
-..\inc\cppuhelper\compbase10.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase10.hxx
-..\inc\cppuhelper\compbase11.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase11.hxx
-..\inc\cppuhelper\compbase12.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase12.hxx
+..\inc\cppuhelper\compbase.hxx %_DEST%\inc\cppuhelper\compbase.hxx
+..\inc\cppuhelper\compbase_ex.hxx %_DEST%\inc\cppuhelper\compbase_ex.hxx
+..\inc\cppuhelper\compbase1.hxx %_DEST%\inc\cppuhelper\compbase1.hxx
+..\inc\cppuhelper\compbase2.hxx %_DEST%\inc\cppuhelper\compbase2.hxx
+..\inc\cppuhelper\compbase3.hxx %_DEST%\inc\cppuhelper\compbase3.hxx
+..\inc\cppuhelper\compbase4.hxx %_DEST%\inc\cppuhelper\compbase4.hxx
+..\inc\cppuhelper\compbase5.hxx %_DEST%\inc\cppuhelper\compbase5.hxx
+..\inc\cppuhelper\compbase6.hxx %_DEST%\inc\cppuhelper\compbase6.hxx
+..\inc\cppuhelper\compbase7.hxx %_DEST%\inc\cppuhelper\compbase7.hxx
+..\inc\cppuhelper\compbase8.hxx %_DEST%\inc\cppuhelper\compbase8.hxx
+..\inc\cppuhelper\compbase9.hxx %_DEST%\inc\cppuhelper\compbase9.hxx
+..\inc\cppuhelper\compbase10.hxx %_DEST%\inc\cppuhelper\compbase10.hxx
+..\inc\cppuhelper\compbase11.hxx %_DEST%\inc\cppuhelper\compbase11.hxx
+..\inc\cppuhelper\compbase12.hxx %_DEST%\inc\cppuhelper\compbase12.hxx
 
-..\inc\cppuhelper\shlib.hxx %_DEST%\inc%_EXT%\cppuhelper\shlib.hxx
-..\inc\cppuhelper\basemutex.hxx %_DEST%\inc%_EXT%\cppuhelper\basemutex.hxx
-..\inc\cppuhelper\bootstrap.hxx %_DEST%\inc%_EXT%\cppuhelper\bootstrap.hxx
-..\inc\cppuhelper\exc_hlp.hxx %_DEST%\inc%_EXT%\cppuhelper\exc_hlp.hxx
-..\inc\cppuhelper\typeprovider.hxx %_DEST%\inc%_EXT%\cppuhelper\typeprovider.hxx
-..\inc\cppuhelper\factory.hxx %_DEST%\inc%_EXT%\cppuhelper\factory.hxx
-..\inc\cppuhelper\component_context.hxx %_DEST%\inc%_EXT%\cppuhelper\component_context.hxx
-..\inc\cppuhelper\interfacecontainer.hxx %_DEST%\inc%_EXT%\cppuhelper\interfacecontainer.hxx
-..\inc\cppuhelper\interfacecontainer.h %_DEST%\inc%_EXT%\cppuhelper\interfacecontainer.h
-..\inc\cppuhelper\component.hxx %_DEST%\inc%_EXT%\cppuhelper\component.hxx
-..\inc\cppuhelper\propshlp.hxx %_DEST%\inc%_EXT%\cppuhelper\propshlp.hxx
-..\inc\cppuhelper\proptypehlp.hxx %_DEST%\inc%_EXT%\cppuhelper\proptypehlp.hxx
-..\inc\cppuhelper\propertysetmixin.hxx %_DEST%\inc%_EXT%\cppuhelper\propertysetmixin.hxx
-..\inc\cppuhelper\proptypehlp.h %_DEST%\inc%_EXT%\cppuhelper\proptypehlp.h
-..\inc\cppuhelper\stdidlclass.hxx %_DEST%\inc%_EXT%\cppuhelper\stdidlclass.hxx
-..\inc\cppuhelper\weak.hxx %_DEST%\inc%_EXT%\cppuhelper\weak.hxx
-..\inc\cppuhelper\weakagg.hxx %_DEST%\inc%_EXT%\cppuhelper\weakagg.hxx
-..\inc\cppuhelper\queryinterface.hxx %_DEST%\inc%_EXT%\cppuhelper\queryinterface.hxx
-..\inc\cppuhelper\weakref.hxx %_DEST%\inc%_EXT%\cppuhelper\weakref.hxx
-..\inc\cppuhelper\servicefactory.hxx %_DEST%\inc%_EXT%\cppuhelper\servicefactory.hxx
-..\inc\cppuhelper\implementationentry.hxx %_DEST%\inc%_EXT%\cppuhelper\implementationentry.hxx
-..\inc\cppuhelper\access_control.hxx %_DEST%\inc%_EXT%\cppuhelper\access_control.hxx
-..\inc\cppuhelper\unourl.hxx %_DEST%\inc%_EXT%\cppuhelper\unourl.hxx
+..\inc\cppuhelper\shlib.hxx %_DEST%\inc\cppuhelper\shlib.hxx
+..\inc\cppuhelper\basemutex.hxx %_DEST%\inc\cppuhelper\basemutex.hxx
+..\inc\cppuhelper\bootstrap.hxx %_DEST%\inc\cppuhelper\bootstrap.hxx
+..\inc\cppuhelper\exc_hlp.hxx %_DEST%\inc\cppuhelper\exc_hlp.hxx
+..\inc\cppuhelper\typeprovider.hxx %_DEST%\inc\cppuhelper\typeprovider.hxx
+..\inc\cppuhelper\factory.hxx %_DEST%\inc\cppuhelper\factory.hxx
+..\inc\cppuhelper\component_context.hxx %_DEST%\inc\cppuhelper\component_context.hxx
+..\inc\cppuhelper\interfacecontainer.hxx %_DEST%\inc\cppuhelper\interfacecontainer.hxx
+..\inc\cppuhelper\interfacecontainer.h %_DEST%\inc\cppuhelper\interfacecontainer.h
+..\inc\cppuhelper\component.hxx %_DEST%\inc\cppuhelper\component.hxx
+..\inc\cppuhelper\propshlp.hxx %_DEST%\inc\cppuhelper\propshlp.hxx
+..\inc\cppuhelper\proptypehlp.hxx %_DEST%\inc\cppuhelper\proptypehlp.hxx
+..\inc\cppuhelper\propertysetmixin.hxx %_DEST%\inc\cppuhelper\propertysetmixin.hxx
+..\inc\cppuhelper\proptypehlp.h %_DEST%\inc\cppuhelper\proptypehlp.h
+..\inc\cppuhelper\stdidlclass.hxx %_DEST%\inc\cppuhelper\stdidlclass.hxx
+..\inc\cppuhelper\weak.hxx %_DEST%\inc\cppuhelper\weak.hxx
+..\inc\cppuhelper\weakagg.hxx %_DEST%\inc\cppuhelper\weakagg.hxx
+..\inc\cppuhelper\queryinterface.hxx %_DEST%\inc\cppuhelper\queryinterface.hxx
+..\inc\cppuhelper\weakref.hxx %_DEST%\inc\cppuhelper\weakref.hxx
+..\inc\cppuhelper\servicefactory.hxx %_DEST%\inc\cppuhelper\servicefactory.hxx
+..\inc\cppuhelper\implementationentry.hxx %_DEST%\inc\cppuhelper\implementationentry.hxx
+..\inc\cppuhelper\access_control.hxx %_DEST%\inc\cppuhelper\access_control.hxx
+..\inc\cppuhelper\unourl.hxx %_DEST%\inc\cppuhelper\unourl.hxx
 
-..\%__SRC%\bin\cppuh*.dll %_DEST%\bin%_EXT%\cppuh*.dll
-..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib%_EXT%\*
+..\%__SRC%\bin\cppuh*.dll %_DEST%\bin\cppuh*.dll
+..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib\*
 
-..\%__SRC%\lib\libuno_cppuhelper*.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_cppuhelper*.* %_DEST%\lib\*
 
-..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\cppuhelper*.lib %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib\*
+..\%__SRC%\lib\cppuhelper*.lib %_DEST%\lib\*
 
-..\source\unorc %_DEST%\bin%_EXT%\uno.ini
-..\source\unorc %_DEST%\lib%_EXT%\unorc
+..\source\unorc %_DEST%\bin\uno.ini
+..\source\unorc %_DEST%\lib\unorc
 
-..\inc\cppuhelper\findsofficepath.h %_DEST%\inc%_EXT%\cppuhelper\findsofficepath.h
-..\%__SRC%\obj\findsofficepath.o %_DEST%\lib%_EXT%\findsofficepath.o
-..\%__SRC%\obj\findsofficepath.obj %_DEST%\lib%_EXT%\findsofficepath.obj
+..\inc\cppuhelper\findsofficepath.h %_DEST%\inc\cppuhelper\findsofficepath.h
+..\%__SRC%\obj\findsofficepath.o %_DEST%\lib\findsofficepath.o
+..\%__SRC%\obj\findsofficepath.obj %_DEST%\lib\findsofficepath.obj
 
 linklib: libuno_cppuhelper*.*.*
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk
index 6f3476aa4..5284f4b08 100644
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ b/cppuhelper/qa/ifcontainer/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index d013941a4..9f72fb181 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -411,23 +411,16 @@ css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
 
 cppu::ImplementationEntry entries[] = {
     { &create, &getImplementationName, &getSupportedServiceNames,
-      &cppu::createSingleComponentFactory, 0, 0 }, 
+      &cppu::createSingleComponentFactory, 0, 0 },
     { 0, 0, 0, 0, 0, 0 } };
 
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL mixin_component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, uno_Environment **)
-{
-    *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index 04aa2479c..384e2b047 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -41,6 +41,11 @@ my_components = $(TARGET).cpp $(TARGET).java
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 .IF "$(OS)" == "WNT"
 my_file = file:///
 .ELSE
@@ -61,7 +66,6 @@ DEF1NAME = $(SHL1TARGET)
 
 SHL2TARGET = $(TARGET).uno
 SHL2OBJS = $(SLO)/comp_propertysetmixin.obj
-SHL2VERSIONMAP = $(SOLARENV)/src/component.map
 SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL2IMPLIB = i$(SHL2TARGET)
 SH21RPATH = NONE
diff --git a/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component b/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component
index a654e0758..1ae646e98 100644
--- a/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component
+++ b/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="mixin"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="test.cppuhelper.propertysetmixin.comp.CppSupplier">
     <service name="test.cppuhelper.propertysetmixin.CppSupplier"/>
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
index 4e46dd088..f48b724ee 100644
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk
index 5116886b6..789550497 100644
--- a/cppuhelper/qa/weak/makefile.mk
+++ b/cppuhelper/qa/weak/makefile.mk
@@ -33,6 +33,11 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 DLLPRE = # no leading "lib" on .so files
 
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 144394ca9..914061327 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -352,14 +352,6 @@ Reference< registry::XSimpleRegistry > nestRegistries(
         }
         catch(registry::InvalidRegistryException & invalidRegistryException)
         {
-            if (! optional)
-            {
-                // if a registry was explicitly given, the exception shall fly
-                if( ! bFallenBack )
-                    throw;
-            }
-
-            (void) invalidRegistryException;
 #if OSL_DEBUG_LEVEL > 1
             OString rdb_name_tmp = OUStringToOString(
                 rdb_name, RTL_TEXTENCODING_ASCII_US );
@@ -369,6 +361,14 @@ Reference< registry::XSimpleRegistry > nestRegistries(
                 "warning: couldn't open %s cause of %s",
                 rdb_name_tmp.getStr(), message_dbg.getStr() );
 #endif
+            if (! optional)
+            {
+                // if a registry was explicitly given, the exception shall fly
+                if( ! bFallenBack )
+                    throw;
+            }
+
+            (void) invalidRegistryException;
         }
     }
     while(index != -1 && csl_rdbs.getLength()); // are there more rdbs in list?
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 60e039b7b..8f4b1c4d4 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -861,8 +861,6 @@ extern "C" { static void s_createComponentContext_v(va_list * pParam)
         xContext = xDelegate;
     }
 
-    delete[] pEntries;
-
     *ppContext = pTarget2curr->mapInterface(xContext.get(), ::getCppuType(&xContext));
 }}
 
@@ -892,6 +890,7 @@ Reference< XComponentContext > SAL_CALL createComponentContext(
     void * mapped_delegate = curr2source.mapInterface(xDelegate.get(), ::getCppuType(&xDelegate));
     XComponentContext * pXComponentContext = NULL;
     source_env.invoke(s_createComponentContext_v, mapped_entries, nEntries, mapped_delegate, &pXComponentContext, &source2curr);
+    delete[] mapped_entries;
 
     return Reference<XComponentContext>(pXComponentContext, SAL_NO_ACQUIRE);
 }
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 8bf50f481..4db1888a2 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cppuhelper.hxx"
 
+#include "rtl/instance.hxx"
 #include "osl/diagnose.h"
 #include "osl/doublecheckedlocking.h"
 #include "osl/mutex.hxx"
@@ -58,8 +59,6 @@ struct ExceptionThrower : public uno_Interface, XExceptionThrower
 {
     inline ExceptionThrower();
     
-public:
-    static ExceptionThrower * get();
     static inline Type const & getCppuType()
     {
         return ::getCppuType(
@@ -188,23 +187,7 @@ inline ExceptionThrower::ExceptionThrower()
     uno_Interface::pDispatcher = ExceptionThrower_dispatch;
 }
 
-//______________________________________________________________________________
-ExceptionThrower * ExceptionThrower::get()
-{
-    ExceptionThrower * s_pThrower = 0;
-    if (s_pThrower == 0)
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        static ExceptionThrower s_thrower;
-        OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-        s_pThrower = &s_thrower;
-    }
-    else
-    {
-        OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-    }
-    return s_pThrower;
-}
+class theExceptionThrower : public rtl::Static<ExceptionThrower, theExceptionThrower> {};
 
 } // anonymous namespace
 
@@ -234,7 +217,7 @@ void SAL_CALL throwException( Any const & exc ) SAL_THROW( (Exception) )
     Reference< XExceptionThrower > xThrower;
     uno2cpp.mapInterface(
         reinterpret_cast< void ** >( &xThrower ),
-        static_cast< uno_Interface * >( ExceptionThrower::get() ),
+        static_cast< uno_Interface * >( &theExceptionThrower::get() ),
         ExceptionThrower::getCppuType() );
     OSL_ASSERT( xThrower.is() );
     xThrower->throwException( exc );
@@ -265,7 +248,7 @@ Any SAL_CALL getCaughtException()
     UnoInterfaceReference unoI;
     cpp2uno.mapInterface(
         reinterpret_cast< void ** >( &unoI.m_pUnoI ),
-        static_cast< XExceptionThrower * >( ExceptionThrower::get() ), pTD );
+        static_cast< XExceptionThrower * >( &theExceptionThrower::get() ), pTD );
     OSL_ASSERT( unoI.is() );
 
     typelib_TypeDescription * pMemberTD = 0;
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 89ef69171..f86fd3263 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -31,10 +31,13 @@
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <cppuhelper/weak.hxx>
+#include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/shlib.hxx>
 #include <cppuhelper/typeprovider.hxx>
+#include <rtl/instance.hxx>
 #include <rtl/unload.h>
 
 #include "cppuhelper/propshlp.hxx"
@@ -421,20 +424,16 @@ Sequence< Type > OFactoryComponentHelper::getTypes()
     return Sequence< Type >( ar, m_fptr ? 4 : 3 );
 }
 
+namespace
+{
+    class theOFactoryComponentHelperImplementationId :
+        public rtl::Static<OImplementationId, theOFactoryComponentHelperImplementationId>{};
+}
+
 Sequence< sal_Int8 > OFactoryComponentHelper::getImplementationId()
     throw (::com::sun::star::uno::RuntimeException)
 {
-    static OImplementationId * pId = 0;
-    if (! pId)
-    {
-        MutexGuard aGuard( Mutex::getGlobalMutex() );
-        if (! pId)
-        {
-            static OImplementationId aId;
-            pId = &aId;
-        }
-    }
-    return pId->getImplementationId();
+    return theOFactoryComponentHelperImplementationId::get().getImplementationId();
 }
 
 // XSingleServiceFactory
@@ -835,6 +834,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
     OUString aActivatorUrl;
     OUString aActivatorName;
     OUString aLocation;
+    OUString aPrefix;
 
     Reference<XRegistryKey > xActivatorKey = xImplementationKey->openKey(
         OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) );
@@ -850,6 +850,15 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
             OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/LOCATION") ) );
         if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII )
             aLocation = xLocationKey->getAsciiValue();
+
+        Reference<XRegistryKey > xPrefixKey = xImplementationKey->openKey(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/PREFIX") ) );
+        if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII )
+        {
+            aPrefix = xPrefixKey->getAsciiValue();
+            if( aPrefix.getLength() != 0 )
+                aPrefix = aPrefix + OUSTR("_");
+        }
     }
     else
     {
@@ -884,6 +893,17 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
         Reference<XInterface > x = xSMgr->createInstance( aActivatorName );
         Reference<XImplementationLoader > xLoader( x, UNO_QUERY );
         Reference<XInterface > xMF;
+        if( aActivatorName == OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary") ) )
+        {
+            try
+            {
+                return loadSharedLibComponentFactory( bootstrap_expandUri( aLocation ), OUString(),  aImplementationName, xSMgr, xImplementationKey, aPrefix );
+            }
+            catch ( IllegalArgumentException & e )
+            {
+                throw RuntimeException( e.Message, e.Context );
+            }
+        }
         if (xLoader.is())
         {
             xFactory = xLoader->activate( aImplementationName, aActivatorUrl, aLocation, xImplementationKey );
diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map
index 0aee99691..47983baa3 100644
--- a/cppuhelper/source/gcc3.map
+++ b/cppuhelper/source/gcc3.map
@@ -158,6 +158,7 @@ _ZN4cppu28createSingleComponentFactoryEPFN3com3sun4star3uno9ReferenceINS3_10XInt
 _ZN4cppu29WeakComponentImplHelper_queryERKN3com3sun4star3uno4TypeEPNS_10class_dataEPvPNS_27WeakComponentImplHelperBaseE;
 _ZN4cppu29installTypeDescriptionManagerERKN3com3sun4star3uno9ReferenceINS2_9container23XHierarchicalNameAccessEEE;
 _ZN4cppu29loadSharedLibComponentFactoryERKN3rtl8OUStringES3_S3_RKN3com3sun4star3uno9ReferenceINS6_4lang20XMultiServiceFactoryEEERKNS8_INS6_8registry12XRegistryKeyEEE;
+_ZN4cppu29loadSharedLibComponentFactoryERKN3rtl8OUStringES3_S3_RKN3com3sun4star3uno9ReferenceINS6_4lang20XMultiServiceFactoryEEERKNS8_INS6_8registry12XRegistryKeyEEES3_;
 _ZN4cppu30ImplHelper_getImplementationIdEPNS_10class_dataE;
 _ZN4cppu30WeakAggComponentImplHelperBase14queryInterfaceERKN3com3sun4star3uno4TypeE;
 _ZN4cppu30WeakAggComponentImplHelperBase16addEventListenerERKN3com3sun4star3uno9ReferenceINS3_4lang14XEventListenerEEE;
diff --git a/cppuhelper/source/gcc3os2.map b/cppuhelper/source/gcc3os2.map
index 2c3bd2d64..dba4c89a3 100644
--- a/cppuhelper/source/gcc3os2.map
+++ b/cppuhelper/source/gcc3os2.map
@@ -158,6 +158,7 @@ _ZN4cppu28createSingleComponentFactoryEPFN3com3sun4star3uno9ReferenceINS3_10XInt
 _ZN4cppu29WeakComponentImplHelper_queryERKN3com3sun4star3uno4TypeEPNS_10class_dataEPvPNS_27WeakComponentImplHelperBaseE;
 _ZN4cppu29installTypeDescriptionManagerERKN3com3sun4star3uno9ReferenceINS2_9container23XHierarchicalNameAccessEEE;
 _ZN4cppu29loadSharedLibComponentFactoryERKN3rtl8OUStringES3_S3_RKN3com3sun4star3uno9ReferenceINS6_4lang20XMultiServiceFactoryEEERKNS8_INS6_8registry12XRegistryKeyEEE;
+_ZN4cppu29loadSharedLibComponentFactoryERKN3rtl8OUStringES3_S3_RKN3com3sun4star3uno9ReferenceINS6_4lang20XMultiServiceFactoryEEERKNS8_INS6_8registry12XRegistryKeyEEES3_;
 _ZN4cppu30ImplHelper_getImplementationIdEPNS_10class_dataE;
 _ZN4cppu30WeakAggComponentImplHelperBase14queryInterfaceERKN3com3sun4star3uno4TypeE;
 _ZN4cppu30WeakAggComponentImplHelperBase16addEventListenerERKN3com3sun4star3uno9ReferenceINS3_4lang14XEventListenerEEE;
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index c2b481f7f..77d0c469c 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -31,6 +31,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <osl/diagnose.h>
+#include <rtl/instance.hxx>
 #include <rtl/uuid.h>
 
 #include <com/sun/star/lang/XComponent.hpp>
@@ -41,22 +42,17 @@ using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+namespace
+{
+    class theImplHelperInitMutex : public rtl::Static<Mutex, theImplHelperInitMutex>{};
+}
+
 namespace cppu
 {
 //==================================================================================================
 Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () )
 {
-    static Mutex * s_pMutex = 0;
-    if (! s_pMutex)
-    {
-        MutexGuard aGuard( Mutex::getGlobalMutex() );
-        if (! s_pMutex)
-        {
-            static Mutex s_aMutex;
-            s_pMutex = & s_aMutex;
-        }
-    }
-    return * s_pMutex;
+    return theImplHelperInitMutex::get();
 }
 
 // ClassDataBase
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index 2d642d5c6..7a9440c74 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -419,7 +419,7 @@ static t_type2ptr::iterator findType(t_type2ptr *pMap, const Type & rKey )
     {
         if (iter->first == rKey)
             break;
-        iter++;
+        ++iter;
     }
     return iter;
 }
@@ -532,7 +532,7 @@ static t_long2ptr::iterator findLong(t_long2ptr *pMap, sal_Int32 nKey )
     {
         if (iter->first == nKey)
             break;
-        iter++;
+        ++iter;
     }
     return iter;
 }
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 38dc08b8a..db74d3697 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -73,22 +73,30 @@ rtl::OUString expandMacros(rtl::OUString const & text) {
 
 namespace
 {
-inline OUString s_impl_name() { return OUSTR(IMPL_NAME); }
-static Sequence< OUString > const & s_get_service_names()
+
+class ImplNames
 {
-    static Sequence< OUString > const * s_pnames = 0;
-    if (! s_pnames)
+private:
+    Sequence<OUString> m_aNames;
+public:
+    ImplNames() : m_aNames(2)
     {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if (! s_pnames)
-        {
-            static Sequence< OUString > s_names( 2 );
-            s_names[ 0 ] = OUSTR(SERVICE_NAME_A);
-            s_names[ 1 ] = OUSTR(SERVICE_NAME_B);
-            s_pnames = &s_names;
-        }
+        m_aNames[0] = OUSTR(SERVICE_NAME_A);
+        m_aNames[1] = OUSTR(SERVICE_NAME_B);
     }
-    return *s_pnames;
+    const Sequence<OUString>& getNames() const { return m_aNames; }
+};
+
+class theImplNames : public rtl::Static<ImplNames, theImplNames> {};
+
+inline OUString s_impl_name()
+{
+    return OUSTR(IMPL_NAME);
+}
+
+inline Sequence< OUString > const & s_get_service_names()
+{
+    return theImplNames::get().getNames();
 }
 
 typedef ::cppu::WeakComponentImplHelper2<
@@ -98,6 +106,7 @@ struct mutex_holder
 {
     Mutex m_mutex;
 };
+
 class Bootstrap_MacroExpander : public mutex_holder, public t_uno_impl
 {
 protected:
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk
index cd742b9a0..f10548282 100755
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
@@ -37,7 +37,7 @@ USE_DEFFILE=TRUE
 # without "-L" (light) switch
 BOOTSTRAP_SERVICE=TRUE
 
-.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
+.IF "$(OS)" != "WNT"
 UNIXVERSIONNAMES=UDK
 .ENDIF # WNT
 
@@ -149,9 +149,6 @@ OBJFILES = $(OBJ)$/findsofficepath.obj
 
 .IF "$(GUI)" == "WNT"
 SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
-.ELIF "$(GUI)" == "OS2"
-SHL1TARGET=cppuh
-SHL1TARGET=cppuh$(UDK_MAJOR)
 .ELSE
 SHL1TARGET=uno_$(TARGET)$(COMID)
 .ENDIF
@@ -165,7 +162,11 @@ SHL1STDLIBS += $(ADVAPI32LIB)
 .ENDIF
 
 SHL1DEPN=
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB=i$(TARGET)
+.ELSE
+SHL1IMPLIB=uno_$(TARGET)$(COMID)
+.ENDIF
 SHL1OBJS = $(SLOFILES)
 SHL1RPATH=URELIB
 
@@ -179,8 +180,6 @@ SHL1VERSIONMAP=msvc_win32_intel.map
 SHL1VERSIONMAP=msvc_win32_x86_64.map
 .ELIF "$(COMNAME)"=="sunpro5"
 SHL1VERSIONMAP=cc5_solaris_sparc.map
-.ELIF "$(GUI)$(COMNAME)"=="OS2gcc3"
-SHL1VERSIONMAP=gcc3os2.map
 .ELIF "$(COMNAME)"=="gcc3"
 SHL1VERSIONMAP=gcc3.map
 .ENDIF
diff --git a/cppuhelper/source/msvc_win32_intel.map b/cppuhelper/source/msvc_win32_intel.map
index 7069276e2..fef204f36 100644
--- a/cppuhelper/source/msvc_win32_intel.map
+++ b/cppuhelper/source/msvc_win32_intel.map
@@ -125,6 +125,7 @@ GetVersionInfo;
 ??0OWeakObject@cppu@@QAE@XZ;
 ?installTypeDescriptionManager@cppu@@YAEABV?$Reference@VXHierarchicalNameAccess@container@star@sun@com@@@uno@star@sun@com@@@Z;
 ?loadSharedLibComponentFactory@cppu@@YA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@00ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
+?loadSharedLibComponentFactory@cppu@@YA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@00ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@0@Z;
 ?createComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PBUContextEntry_Init@1@JABV23456@@Z;
 ?bootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@3456@ABVOUString@rtl@@@Z;
 ?createNestedRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@@Z;
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 596d401e6..0e703e17e 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -1107,11 +1107,9 @@ void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW( () )
     {
         if(  pProperties[i-1].Name >= pProperties[i].Name )
         {
-#ifndef OS2 // YD disabled, too many troubles with debug builds!
             if (bSorted) {
                 OSL_FAIL( "Property array is not sorted" );
             }
-#endif
             // not sorted
             qsort( aInfos.getArray(), nElements, sizeof( Property ),
                     compare_Property_Impl );
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 0f75bd837..a97945431 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -35,6 +35,7 @@
 #include "osl/module.hxx"
 #include "rtl/unload.h"
 #include "rtl/ustrbuf.hxx"
+#include "rtl/instance.hxx"
 #include "uno/environment.h"
 #include "uno/mapping.hxx"
 #include "cppuhelper/factory.hxx"
@@ -71,21 +72,20 @@ static inline void out( const OUString & r ) throw ()
 }
 #endif
 
-//------------------------------------------------------------------------------
-static const ::std::vector< OUString > * getAccessDPath() SAL_THROW( () )
+namespace
 {
-    static ::std::vector< OUString > * s_p = 0;
-    static bool s_bInit = false;
-
-    if (! s_bInit)
+    class buildAccessDPath
     {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-        if (! s_bInit)
+    private:
+        ::std::vector< OUString > m_aAccessDPath;
+        bool m_bCPLD_ACCESSPATHSet;
+    public:
+        buildAccessDPath() : m_bCPLD_ACCESSPATHSet(false)
         {
             const char * pEnv = ::getenv( "CPLD_ACCESSPATH" );
             if (pEnv)
             {
-                static ::std::vector< OUString > s_v;
+                m_bCPLD_ACCESSPATHSet = true;
 
                 OString aEnv( pEnv );
                 sal_Int32 nIndex = 0;
@@ -100,34 +100,39 @@ static const ::std::vector< OUString > * getAccessDPath() SAL_THROW( () )
                     {
                         OSL_ASSERT(false);
                     }
-                    s_v.push_back( aFileUrl );
+                    m_aAccessDPath.push_back( aFileUrl );
                 } while( nIndex != -1 );
-#if OSL_DEBUG_LEVEL > 1
+    #if OSL_G_LEVEL > 1
                 out( "> cpld: acknowledged following access path(s): \"" );
-                ::std::vector< OUString >::const_iterator iPos( s_v.begin() );
-                while (iPos != s_v.end())
+                ::std::vector< OUString >::const_iterator iPos( m_aAccessDPath.begin() );
+                while (iPos != m_aAccessDPath.end())
                 {
                     out( *iPos );
                     ++iPos;
-                    if (iPos != s_v.end())
+                    if (iPos != m_aAccessDPath.end())
                         out( ";" );
                 }
                 out( "\"\n" );
-#endif
-                s_p = & s_v;
+    #endif
             }
             else
             {
                 // no access path env set
-#if OSL_DEBUG_LEVEL > 1
+    #if OSL_G_LEVEL > 1
                 out( "=> no CPLD_ACCESSPATH set.\n" );
-#endif
+    #endif
             }
-            s_bInit = true;
         }
-    }
+        ::std::vector< OUString >* getAccessDPath() { return m_bCPLD_ACCESSPATHSet ? &m_aAccessDPath : NULL; }
+    };
 
-    return s_p;
+    class theAccessDPath : public rtl::Static<buildAccessDPath, theAccessDPath> {};
+}
+
+//------------------------------------------------------------------------------
+static const ::std::vector< OUString > * getAccessDPath() SAL_THROW( () )
+{
+    return theAccessDPath::get().getAccessDPath();
 }
 
 //------------------------------------------------------------------------------
@@ -265,18 +270,16 @@ static OUString makeComponentPath(
 }
 
 //==============================================================================
-static OUString getLibEnv(OUString         const & aModulePath,
-                          oslModule                lib, 
-                          uno::Environment       * pEnv, 
+static OUString getLibEnv(oslModule                lib,
+                          uno::Environment       * pEnv,
                           OUString               * pSourceEnv_name,
                           uno::Environment const & cTargetEnv,
-                          OUString         const & cImplName = OUString())
+                          OUString         const & cImplName = OUString(),
+                          OUString         const & rPrefix = OUString())
 {
-    OUString aExcMsg;
-
     sal_Char const * pEnvTypeName = NULL;
 
-    OUString aGetEnvNameExt = OUSTR(COMPONENT_GETENVEXT);
+    OUString aGetEnvNameExt = rPrefix + OUSTR(COMPONENT_GETENVEXT);
     component_getImplementationEnvironmentExtFunc pGetImplEnvExt = 
         (component_getImplementationEnvironmentExtFunc)osl_getFunctionSymbol(lib, aGetEnvNameExt.pData);
 
@@ -287,22 +290,17 @@ static OUString getLibEnv(OUString         const & aModulePath,
     }
     else
     {
-        OUString aGetEnvName = OUSTR(COMPONENT_GETENV);
+        OUString aGetEnvName = rPrefix + OUSTR(COMPONENT_GETENV);
         component_getImplementationEnvironmentFunc pGetImplEnv = 
             (component_getImplementationEnvironmentFunc)osl_getFunctionSymbol( 
                 lib, aGetEnvName.pData );
         if (pGetImplEnv)
             pGetImplEnv(&pEnvTypeName, (uno_Environment **)pEnv);
 
-        else
-        {
-            aExcMsg = aModulePath;
-            aExcMsg += OUSTR(": cannot get symbol: ");
-            aExcMsg += aGetEnvName;
-            aExcMsg += OUSTR("- nor: ");
-        }
+        else // this symbol used to be mandatory, but is no longer
+            pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
-    
+
     if (!pEnv->is() && pEnvTypeName)
     {
         *pSourceEnv_name = OUString::createFromAscii(pEnvTypeName);
@@ -320,12 +318,10 @@ static OUString getLibEnv(OUString         const & aModulePath,
                     *pSourceEnv_name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":log"));
                     break;
                 }
-            } while( nIndex != -1 );            
+            } while( nIndex != -1 );
         }
-        
     }
-
-    return aExcMsg;
+    return OUString();
 }
 
 extern "C" {static void s_getFactory(va_list * pParam) 
@@ -339,6 +335,7 @@ extern "C" {static void s_getFactory(va_list * pParam)
     *ppSSF = pSym(pImplName->getStr(), pSMgr, pKey);
 }}
 
+/* For backwards compatibility */
 Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
     OUString const & rLibName, OUString const & rPath,
     OUString const & rImplName,
@@ -346,6 +343,17 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
     Reference< registry::XRegistryKey > const & xKey )
     SAL_THROW( (loader::CannotActivateFactoryException) )
 {
+    return loadSharedLibComponentFactory( rLibName, rPath, rImplName, xMgr, xKey, rtl::OUString() );
+}
+
+Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
+    OUString const & rLibName, OUString const & rPath,
+    OUString const & rImplName,
+    Reference< lang::XMultiServiceFactory > const & xMgr,
+    Reference< registry::XRegistryKey > const & xKey,
+    OUString const & rPrefix )
+    SAL_THROW( (loader::CannotActivateFactoryException) )
+{
     OUString aModulePath( makeComponentPath( rLibName, rPath ) );
     if (! checkAccessPath( &aModulePath ))
     {
@@ -371,10 +379,10 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
 
     OUString aEnvTypeName;
 
-    OUString aExcMsg = getLibEnv(aModulePath, lib, &env, &aEnvTypeName, currentEnv, rImplName);
+    OUString aExcMsg = getLibEnv(lib, &env, &aEnvTypeName, currentEnv, rImplName, rPrefix);
     if (!aExcMsg.getLength())
     {
-        OUString aGetFactoryName = OUSTR(COMPONENT_GETFACTORY);
+        OUString aGetFactoryName = rPrefix + OUSTR(COMPONENT_GETFACTORY);
         oslGenericFunction pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData );
         if (pSym != 0)
         {
@@ -517,7 +525,7 @@ void SAL_CALL writeSharedLibComponentInfo(
     uno::Environment env;
     
     OUString aEnvTypeName;
-    OUString aExcMsg = getLibEnv(aModulePath, lib, &env, &aEnvTypeName, currentEnv);
+    OUString aExcMsg = getLibEnv(lib, &env, &aEnvTypeName, currentEnv);
     if (!aExcMsg.getLength())
     {
         OUString aWriteInfoName = OUSTR(COMPONENT_WRITEINFO);
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index e1073d1d4..735f7eefe 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -227,12 +227,6 @@ static struct ImplementationEntry g_entries[] =
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 sal_Bool SAL_CALL component_writeInfo(
     void * pServiceManager, void * pRegistryKey )
 {
@@ -240,7 +234,7 @@ sal_Bool SAL_CALL component_writeInfo(
         pServiceManager, pRegistryKey, g_entries );
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper(
@@ -273,7 +267,7 @@ SAL_IMPLEMENT_MAIN()
         OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.bootstrap.theTestComponent0") ) >>= x );
         
         ::fprintf( stderr, "> registering service...\n");
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
         OUString libName( OUSTR("cfg_test.dll") );
 #elif defined(SAL_UNX)
         OUString libName( OUSTR("libcfg_test.so") );
diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk
index 2746b3f07..7a67d6690 100644
--- a/cppuhelper/test/makefile.mk
+++ b/cppuhelper/test/makefile.mk
@@ -127,7 +127,7 @@ TYPES:=test.A;test.BA;test.CA;test.DBA;test.E;test.FE;test.G;test.H;test.I
 HELPERTYPES:=com.sun.star.uno.XReference;com.sun.star.uno.XAdapter;com.sun.star.uno.XAggregation;com.sun.star.uno.XWeak;com.sun.star.lang.XComponent;com.sun.star.lang.XTypeProvider;com.sun.star.lang.XEventListener;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.registry.XRegistryKey;com.sun.star.lang.XInitialization;com.sun.star.lang.XServiceInfo;com.sun.star.loader.XImplementationLoader;com.sun.star.lang.IllegalAccessException;com.sun.star.beans.XVetoableChangeListener;com.sun.star.beans.XPropertySet;com.sun.star.uno.XComponentContext
 FACTORYTYPES:=com.sun.star.lang.XComponent;com.sun.star.registry.XSimpleRegistry;com.sun.star.lang.XInitialization;com.sun.star.lang.XMultiServiceFactory;com.sun.star.loader.XImplementationLoader;com.sun.star.registry.XImplementationRegistration;com.sun.star.container.XSet;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XMultiComponentFactory
 
-.IF "$(OS)" == "WNT" || "$(OS)" == "OS2"
+.IF "$(OS)" == "WNT"
 UNO_PATH := $(SOLARBINDIR)
 UNO_OUT := $(OUT)$/bin
 EXT_SO  := .dll
diff --git a/cpputools/prj/build.lst b/cpputools/prj/build.lst
index ca820871b..72aed9e66 100644
--- a/cpputools/prj/build.lst
+++ b/cpputools/prj/build.lst
@@ -1,4 +1,4 @@
-pt	cpputools	:	cppuhelper offuh LIBXML2:libxml2 NULL
+pt	cpputools	:	cppuhelper offapi LIBXML2:libxml2 NULL
 pt	cpputools								usr1	-	all	pt_mkout NULL
 pt	cpputools\prj							get		-	all	pt_prj NULL
 pt	cpputools\source\registercomponent		nmake	-	all	pt_regcomp NULL
diff --git a/cpputools/prj/d.lst b/cpputools/prj/d.lst
index 14de5e78a..de4f3e560 100644
--- a/cpputools/prj/d.lst
+++ b/cpputools/prj/d.lst
@@ -1,10 +1,10 @@
-..\%__SRC%\bin\regcomp.exe %_DEST%\bin%_EXT%\regcomp.exe
-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp
-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp.bin
-..\%__SRC%\bin\uno.exe %_DEST%\bin%_EXT%\uno.exe
-..\%__SRC%\bin\uno %_DEST%\bin%_EXT%\uno
-..\%__SRC%\bin\uno %_DEST%\bin%_EXT%\uno.bin
-..\%__SRC%\bin\regsingleton.exe %_DEST%\bin%_EXT%\regsingleton.exe
-..\%__SRC%\bin\regsingleton %_DEST%\bin%_EXT%\regsingleton
-..\%__SRC%\bin\sp2bv.exe %_DEST%\bin%_EXT%\sp2bv.exe
-..\%__SRC%\bin\sp2bv %_DEST%\bin%_EXT%\sp2bv
+..\%__SRC%\bin\regcomp.exe %_DEST%\bin\regcomp.exe
+..\%__SRC%\bin\regcomp %_DEST%\bin\regcomp
+..\%__SRC%\bin\regcomp %_DEST%\bin\regcomp.bin
+..\%__SRC%\bin\uno.exe %_DEST%\bin\uno.exe
+..\%__SRC%\bin\uno %_DEST%\bin\uno
+..\%__SRC%\bin\uno %_DEST%\bin\uno.bin
+..\%__SRC%\bin\regsingleton.exe %_DEST%\bin\regsingleton.exe
+..\%__SRC%\bin\regsingleton %_DEST%\bin\regsingleton
+..\%__SRC%\bin\sp2bv.exe %_DEST%\bin\sp2bv.exe
+..\%__SRC%\bin\sp2bv %_DEST%\bin\sp2bv
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 7b1f4d3b1..82da5d758 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -738,7 +738,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
             }
         }
 
-        if (aReadOnlyRegistries.size() > 0 ||
+        if ((!aReadOnlyRegistries.empty()) ||
             aReadWriteRegistry.getLength() > 0)
         {   
             //#### create registry #############################################
diff --git a/idlc/prj/d.lst b/idlc/prj/d.lst
index edd0ecb33..8f617ceb2 100644
--- a/idlc/prj/d.lst
+++ b/idlc/prj/d.lst
@@ -1,7 +1,7 @@
-..\%__SRC%\bin\idlc.exe %_DEST%\bin%_EXT%\idlc.exe
-..\%__SRC%\bin\idlc.pdb %_DEST%\bin%_EXT%\idlc.pdb
-..\%__SRC%\bin\idlcpp.exe %_DEST%\bin%_EXT%\idlcpp.exe
-..\%__SRC%\bin\idlcpp.pdb %_DEST%\bin%_EXT%\idlcpp.pdb
+..\%__SRC%\bin\idlc.exe %_DEST%\bin\idlc.exe
+..\%__SRC%\bin\idlc.pdb %_DEST%\bin\idlc.pdb
+..\%__SRC%\bin\idlcpp.exe %_DEST%\bin\idlcpp.exe
+..\%__SRC%\bin\idlcpp.pdb %_DEST%\bin\idlcpp.pdb
 
-..\%__SRC%\bin\idlc %_DEST%\bin%_EXT%\idlc
-..\%__SRC%\bin\idlcpp %_DEST%\bin%_EXT%\idlcpp
+..\%__SRC%\bin\idlc %_DEST%\bin\idlc
+..\%__SRC%\bin\idlcpp %_DEST%\bin\idlcpp
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 79f6c6288..87f52c1ff 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -785,13 +785,14 @@ AstExprValue* AstExpression::coerce(ExprType t, sal_Bool bAssign)
             break;
     }
 
+    AstExprValue* const coerced(coerce_value(copy, t));
+    if (!coerced)
+        delete copy;
+
     if (bAssign)
-    {
-        m_exprValue = coerce_value(copy, t);
-        return m_exprValue;
-    }
-    
-    return coerce_value(copy, t);
+        m_exprValue = coerced;
+
+    return coerced;
 }
 
 void AstExpression::evaluate(EvalKind ek)
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index ca6c5df66..604e62ba0 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -36,7 +36,7 @@
 #include <osl/thread.h>
 #include <osl/file.hxx>
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #endif
 
@@ -150,7 +150,7 @@ OString makeTempName(const OString& prefix)
     if ( uTmpPath.getLength() )
         tmpPath = OUStringToOString(uTmpPath, RTL_TEXTENCODING_UTF8);
 
-#if defined(SAL_W32) || defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_W32) || defined(SAL_UNX)
 
     OSL_ASSERT( sizeof(tmpFilePattern) > ( strlen(tmpPath)
                                            + RTL_CONSTASCII_LENGTH(
@@ -300,22 +300,7 @@ sal_Int32 compileFile(const OString * pathname)
             idlc()->getOptions()->getProgramName().getStr(), cmdFileName.getStr());
           exit(99);
     }
-#ifdef SAL_OS2_00
-      char* tok = strtok( (char*)cppArgs.getStr(), " \t\n\r");
-      while( tok) {
-         if (tok[strlen(tok)-1] == '\"') 
-            tok[strlen(tok)-1] = '\0';
-         if (*tok == '\"') 
-            memcpy( tok, tok+1, strlen(tok));
-         if (strlen(tok)>0) {
-            fputs(tok, pCmdFile);
-            fputc('\n', pCmdFile);
-         }
-         tok = strtok( NULL, " \t\n\r");
-      }
-#else
     fprintf(pCmdFile, "%s", cppArgs.getStr());
-#endif
     fclose(pCmdFile);
 
     OUString cmdArg(RTL_CONSTASCII_USTRINGPARAM("@"));
@@ -330,7 +315,7 @@ sal_Int32 compileFile(const OString * pathname)
     sal_Int32 idx= cpp.lastIndexOf(OUString( RTL_CONSTASCII_USTRINGPARAM("idlc")) );
      cpp = cpp.copy(0, idx);
     
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
      cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("idlcpp.exe"));
 #else
     cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("idlcpp"));
diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx
index 5633ddb36..823a44399 100644
--- a/idlc/source/idlcproduce.cxx
+++ b/idlc/source/idlcproduce.cxx
@@ -34,7 +34,7 @@
 #include <osl/file.hxx>
 #include <osl/thread.h>
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #include <direct.h>
 #include <errno.h>
@@ -80,7 +80,7 @@ static sal_Bool checkOutputPath(const OString& completeName)
 
         if ( buffer.getLength() > 0 && nIndex != -1 )
         {
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
             if (mkdir((char*)buffer.getStr(), 0777) == -1)
 #else
             if (mkdir((char*)buffer.getStr()) == -1)
diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk
index 879090d15..0f4232fea 100644
--- a/idlc/source/makefile.mk
+++ b/idlc/source/makefile.mk
@@ -35,13 +35,8 @@ LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 INCPRE=$(MISC)
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
-
 # --- Settings -----------------------------------------------------
 
-
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
diff --git a/idlc/source/preproc/include.c b/idlc/source/preproc/include.c
index 48e1a3813..861793f6d 100644
--- a/idlc/source/preproc/include.c
+++ b/idlc/source/preproc/include.c
@@ -47,11 +47,7 @@ Wraplist wraplist[NINCLUDE];
 void
     doinclude(Tokenrow * trp, int depth, int import)
 {
-#ifdef OS2
-    char fname[_MAX_PATH], iname[_MAX_PATH];
-#else
     char fname[PATH_MAX], iname[PATH_MAX];
-#endif
     Includelist *ip;
     int angled, len, fd, i;
 
diff --git a/idlc/source/preproc/macro.c b/idlc/source/preproc/macro.c
index fcfdd4494..c32e0a960 100644
--- a/idlc/source/preproc/macro.c
+++ b/idlc/source/preproc/macro.c
@@ -47,11 +47,7 @@ void
     Nlist *np;
     Source *s;
     Tokenrow *def, *args;
-#ifdef OS2
-    static uchar location[(_MAX_PATH + 8) * NINC], *cp;
-#else
     static uchar location[(PATH_MAX + 8) * NINC], *cp;
-#endif
     tp = trp->tp + 1;
     if (tp >= trp->lp || tp->type != NAME)
     {
diff --git a/idlc/source/preproc/makefile.mk b/idlc/source/preproc/makefile.mk
index e6aa457e8..721a5cd3e 100644
--- a/idlc/source/preproc/makefile.mk
+++ b/idlc/source/preproc/makefile.mk
@@ -64,8 +64,10 @@ APP1OBJS=$(OBJ)$/cpp.obj
 APP1LIBS= $(LB)$/idlcpp.lib
 
 .IF "$(HAVE_GETOPT)" != "YES"
-.IF "$(GUI)" == "WNT"
+.IF "$(GUI)$(COM)" == "WNTMSC"
 APP1STDLIBS=gnu_getopt.lib
+.ELIF "$(GUI)$(COM)" == "WNTGCC"
+APP1STDLIBS=-lgnu_getopt
 .ENDIF
 .ENDIF
 
diff --git a/io/prj/build.lst b/io/prj/build.lst
index f2be62d2a..eab94bf8c 100644
--- a/io/prj/build.lst
+++ b/io/prj/build.lst
@@ -1,4 +1,4 @@
-io	io	: LIBXSLT:libxslt rdbmaker NULL
+io	io	: LIBXSLT:libxslt DESKTOP:rdbmaker NULL
 io	io										usr1	-	all	io_mkout NULL
 io	io\inc									nmake	-	all	io_inc NULL
 io	io\source\acceptor						nmake	-	all	io_acceptor io_connector io_inc NULL
diff --git a/io/prj/d.lst b/io/prj/d.lst
index eaadf64db..40eb9ab13 100644
--- a/io/prj/d.lst
+++ b/io/prj/d.lst
@@ -1,12 +1,12 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*
-..\source\acceptor\acceptor.xml %_DEST%\xml%_EXT%\acceptor.uno.xml
-..\source\connector\connectr.xml %_DEST%\xml%_EXT%\connector.uno.xml
-..\source\stm\stm.xml %_DEST%\xml%_EXT%\streams.uno.xml
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
-..\%__SRC%\misc\acceptor.component %_DEST%\xml%_EXT%\acceptor.component
-..\%__SRC%\misc\connector.component %_DEST%\xml%_EXT%\connector.component
-..\%__SRC%\misc\streams.component %_DEST%\xml%_EXT%\streams.component
-..\%__SRC%\misc\textinstream.component %_DEST%\xml%_EXT%\textinstream.component
-..\%__SRC%\misc\textoutstream.component %_DEST%\xml%_EXT%\textoutstream.component
+..\%__SRC%\bin\*.dll %_DEST%\bin\*
+..\%__SRC%\bin\*.rdb %_DEST%\rdb\*
+..\source\acceptor\acceptor.xml %_DEST%\xml\acceptor.uno.xml
+..\source\connector\connectr.xml %_DEST%\xml\connector.uno.xml
+..\source\stm\stm.xml %_DEST%\xml\streams.uno.xml
+..\%__SRC%\lib\*.so %_DEST%\lib\*
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*
+..\%__SRC%\misc\acceptor.component %_DEST%\xml\acceptor.component
+..\%__SRC%\misc\connector.component %_DEST%\xml\connector.component
+..\%__SRC%\misc\streams.component %_DEST%\xml\streams.component
+..\%__SRC%\misc\textinstream.component %_DEST%\xml\textinstream.component
+..\%__SRC%\misc\textoutstream.component %_DEST%\xml\textoutstream.component
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 6cfbcff1c..c157bc171 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -172,10 +172,10 @@ OUString OTextInputStream::readLine(  )
     return implReadString( aDummySeq, sal_True, sal_True );
 }
 
-OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool ) 
+OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter )
         throw(IOException, RuntimeException)
 {
-    return implReadString( Delimiters, sal_True, sal_False );
+    return implReadString( Delimiters, bRemoveDelimiter, sal_False );
 }
 
 sal_Bool OTextInputStream::isEOF() 
@@ -458,18 +458,9 @@ OUString TextInputStream_getImplementationName()
 
 Sequence< OUString > TextInputStream_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+    return seqNames;
 }
 
 OUString OTextInputStream::getImplementationName() throw()
@@ -516,13 +507,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index 82bf8f039..6ea4d3f5b 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -255,18 +255,9 @@ OUString TextOutputStream_getImplementationName() SAL_THROW(  () )
 
 Sequence< OUString > TextOutputStream_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+    return seqNames;
 }
 
 OUString OTextOutputStream::getImplementationName() throw()
@@ -314,13 +305,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 838f61e7d..8d1c1a69e 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -301,18 +301,9 @@ namespace io_acceptor
 
     Sequence< OUString > acceptor_getSupportedServiceNames()
     {
-        static Sequence < OUString > *pNames = 0;
-        if( ! pNames )
-        {
-            MutexGuard guard( Mutex::getGlobalMutex() );
-            if( !pNames )
-            {
-                static Sequence< OUString > seqNames(1);
-                seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
-                pNames = &seqNames;
-            }
-        }
-        return *pNames;
+        Sequence< OUString > seqNames(1);
+        seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
+        return seqNames;
     }
 
         OUString OAcceptor::getImplementationName() throw()
@@ -361,13 +352,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index c2a57c003..4d86512bb 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -204,18 +204,9 @@ namespace stoc_connector
 
     Sequence< OUString > connector_getSupportedServiceNames()
     {
-        static Sequence < OUString > *pNames = 0;
-        if( ! pNames )
-        {
-            MutexGuard guard( Mutex::getGlobalMutex() );
-            if( !pNames )
-            {
-                static Sequence< OUString > seqNames(1);
-                seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
-                pNames = &seqNames;
-            }
-        }
-        return *pNames;
+        Sequence< OUString > seqNames(1);
+        seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
+        return seqNames;
     }
 
     OUString connector_getImplementationName()
@@ -273,13 +264,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
index a8230b390..283439ff8 100644
--- a/io/source/stm/factreg.cxx
+++ b/io/source/stm/factreg.cxx
@@ -105,13 +105,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
     
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/test/stm/exports.dxp b/io/test/stm/exports.dxp
index ce95ae0f8..86214860d 100644
--- a/io/test/stm/exports.dxp
+++ b/io/test/stm/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
 component_getFactory
-component_writeInfo
\ No newline at end of file
+component_writeInfo
diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx
index 99f0b960d..804b5630f 100644
--- a/io/test/stm/testfactreg.cxx
+++ b/io/test/stm/testfactreg.cxx
@@ -47,13 +47,6 @@ using namespace ::com::sun::star::lang;
 extern "C"
 {
 
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-
 sal_Bool SAL_CALL component_writeInfo(
     void * pServiceManager, void * pRegistryKey )
 {
@@ -128,7 +121,7 @@ sal_Bool SAL_CALL component_writeInfo(
     return sal_False;
 }
 
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pRet = 0;
diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx
index 5786d17e6..9d715327c 100644
--- a/io/test/testcomponent.cxx
+++ b/io/test/testcomponent.cxx
@@ -108,7 +108,7 @@ int main (int argc, char **argv)
         sTestName = "test";
         sTestName += argv[2];
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
         OUString aDllName = OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US );
 #else
         OUString aDllName(RTL_CONSTASCII_USTRINGPARAM("lib"));
diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx
index f8fdf35c1..d44a4b23e 100644
--- a/io/test/testconnection.cxx
+++ b/io/test/testconnection.cxx
@@ -179,11 +179,7 @@ void testConnection( const OUString &sConnectionDescription  ,
 }
 
 
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int __cdecl main( int argc, char * argv[] )
-#endif
+int SAL_CALL main( int argc, char * argv[] )
 {	
     Reference< XMultiServiceFactory > xMgr(
         createRegistryServiceFactory( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")) ) );
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index d954f0368..3156bbabb 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -163,7 +163,7 @@ public class Bootstrap {
     
     /** Bootstraps the initial component context from a native UNO installation.
         
-        @see cppuhelper/defaultBootstrap_InitialComponentContext()
+        @see "cppuhelper/defaultBootstrap_InitialComponentContext()"
     */
     static public final XComponentContext defaultBootstrap_InitialComponentContext()
         throws Exception
@@ -177,7 +177,7 @@ public class Bootstrap {
         @param bootstrap_parameters
                bootstrap parameters (maybe null)
                
-        @see cppuhelper/defaultBootstrap_InitialComponentContext()
+        @see "cppuhelper/defaultBootstrap_InitialComponentContext()"
     */
     static public final XComponentContext defaultBootstrap_InitialComponentContext(
         String ini_file, Hashtable bootstrap_parameters )
diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
index 34d523a60..590c6251f 100644
--- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
+++ b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
@@ -39,7 +39,7 @@ import com.sun.star.registry.XRegistryKey;
  * service.
  * <p>
  * @see         com.sun.star.loader.SharedLibrary
- * @see         com.sun.star.comp.servicemanager.ServiceManager
+ * @see         "com.sun.star.comp.servicemanager.ServiceManager"
  * @see			com.sun.star.lang.ServiceManager
  */
 public class SharedLibraryLoader {
diff --git a/javaunohelper/prj/d.lst b/javaunohelper/prj/d.lst
index d58290843..15e14f6c4 100644
--- a/javaunohelper/prj/d.lst
+++ b/javaunohelper/prj/d.lst
@@ -1,7 +1,7 @@
-..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar
-..\%__SRC%\bin\juh*.dll %_DEST%\bin%_EXT%\juh*.dll
-..\%__SRC%\lib\libjuh*.so %_DEST%\lib%_EXT%\libjuh*.so
-..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib%_EXT%\libjuh*.dylib
-..\%__SRC%\misc\juh.component %_DEST%\xml%_EXT%\juh.component
+..\%__SRC%\class\juh.jar %_DEST%\bin\juh.jar
+..\%__SRC%\bin\juh*.dll %_DEST%\bin\juh*.dll
+..\%__SRC%\lib\libjuh*.so %_DEST%\lib\libjuh*.so
+..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib\libjuh*.dylib
+..\%__SRC%\misc\juh.component %_DEST%\xml\juh.component
 
-..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin%_EXT%\juh_src.zip
+..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin\juh_src.zip
diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
index 23516fef0..44edff876 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
@@ -108,7 +108,7 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
         com.sun.star.uno.RuntimeException
     {
         boolean hasName = sName.length() != 0;
-        Object context = hasName ? (Object) sName : (Object) new UniqueToken();
+        Object context = hasName ? sName : new UniqueToken();
             // UnoRuntime.getBridgeByName internally uses context.toString() to
             // distinguish bridges, so the result of
             // new UniqueToken().toString() might clash with an explicit
@@ -128,7 +128,7 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
             }
         }
 
-        XBridge xBridge = null;
+        XBridge xBridge;
 
         try {
             IBridge iBridge = UnoRuntime.getBridgeByName("java", context, "remote", context, hasName ? new Object[]{sProtocol, aConnection, anInstanceProvider, sName} : new Object[]{sProtocol, aConnection, anInstanceProvider});
diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/jurt/com/sun/star/comp/connections/PipedConnection.java
index 719e24b15..251035035 100644
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/jurt/com/sun/star/comp/connections/PipedConnection.java
@@ -139,7 +139,7 @@ public class PipedConnection implements XConnection {
 
             if(_closed) throw new com.sun.star.io.IOException("connection has been closed");
 
-            int bytes = 0;
+            int bytes  ;
 
             if(_out < _in) {
                 bytes = Math.min(aData.length - bytesWritten, _in - _out - 1);
diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java b/jurt/com/sun/star/comp/loader/FactoryHelper.java
index 4bd6ef595..dc11c3d4f 100644
--- a/jurt/com/sun/star/comp/loader/FactoryHelper.java
+++ b/jurt/com/sun/star/comp/loader/FactoryHelper.java
@@ -413,10 +413,7 @@ public class FactoryHelper {
                     _implementationId[2]= (byte)((hash >>> 16) & 0xff);
                     _implementationId[3]= (byte)((hash >>>24) & 0xff);
 
-                    for (int i= 0; i < nNameLength; i++)
-                    {
-                        _implementationId[4 + i]= arName[i];
-                    }                   
+                    System.arraycopy(arName, 0, _implementationId, 4, nNameLength);
                 }
             }
             return _implementationId;
@@ -453,7 +450,7 @@ public class FactoryHelper {
         XSingleServiceFactory xSingleServiceFactory = null;
 
         try {
-            Field serviceName = null;
+            Field serviceName  ;
 
             try {
                 serviceName = implClass.getField("__serviceName");
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java
index 2fec17bfe..b0af62995 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -265,7 +265,7 @@ public class JavaLoader implements XImplementationLoader,
         locationUrl = expand_url( locationUrl );
         
         Object returnObject  = null;
-        Class clazz = null;
+        Class clazz  ;
         
         DEBUG("try to get factory for " + implementationName);
         
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index 63029c0ec..d8c8d6963 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -187,7 +187,7 @@ public class ServiceManager implements XMultiServiceFactory,
                     Class clazz = Class.forName( newImpls[i] );
                     
                     Class[] methodClassParam = { String.class, XMultiServiceFactory.class, XRegistryKey.class };
-                    java.lang.reflect.Method getFactoryMeth = null;
+                    java.lang.reflect.Method getFactoryMeth  ;
                     try {
                         getFactoryMeth = clazz.getMethod("__getServiceFactory", methodClassParam);
                     }
@@ -233,7 +233,7 @@ public class ServiceManager implements XMultiServiceFactory,
     public void initialize( Object args[] ) 
                 throws 	com.sun.star.uno.Exception, 
                         com.sun.star.uno.RuntimeException {
-        XSimpleRegistry xSimpleRegistry = null;
+        XSimpleRegistry xSimpleRegistry  ;
         try {
             xSimpleRegistry = (XSimpleRegistry) args[0];
             if (xSimpleRegistry != null)
@@ -462,9 +462,9 @@ public class ServiceManager implements XMultiServiceFactory,
                 XEventListener listener = (XEventListener) enumer.nextElement();
                 listener.disposing(new com.sun.star.lang.EventObject(this));
             }
+            eventListener.removeAllElements();
         }
-        
-        eventListener.removeAllElements();
+
         factoriesByServiceNames.clear();        
         factoriesByImplNames.clear();
     }
@@ -526,13 +526,10 @@ public class ServiceManager implements XMultiServiceFactory,
                 throw new com.sun.star.uno.RuntimeException("The parameter must not been null");
             
             XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, object);
-            
-            if (xServiceInfo != null) {
-                return UnoRuntime.areSame(factoriesByImplNames.get(xServiceInfo.getImplementationName()), object);
-            }   
+
+        return xServiceInfo != null && UnoRuntime.areSame(factoriesByImplNames.get(xServiceInfo.getImplementationName()), object);
         
-        return false;
-    }
+        }
 
     /**
      * Adds a <code>SingleServiceFactory</code> to the <code>ServiceManager</code>.
@@ -567,7 +564,7 @@ public class ServiceManager implements XMultiServiceFactory,
         
             
         String[] serviceNames = xServiceInfo.getSupportedServiceNames();
-        java.util.Vector vec = null;
+        java.util.Vector vec  ;
             
         for (int i=0; i<serviceNames.length; i++) {                
             if ( !factoriesByServiceNames.containsKey( serviceNames[i] ) ) {
@@ -688,7 +685,7 @@ public class ServiceManager implements XMultiServiceFactory,
     public XEnumeration createContentEnumeration( String serviceName )
                 throws com.sun.star.uno.RuntimeException
     {
-        XEnumeration enumer = null;
+        XEnumeration enumer  ;
         
         java.util.Vector serviceList = (java.util.Vector) factoriesByServiceNames.get(serviceName);
         
@@ -724,11 +721,10 @@ public class ServiceManager implements XMultiServiceFactory,
     {
         for (int i=0; i<supportedServiceNames.length; i++)
             if (supportedServiceNames[i].equals( serviceName )) return true;
-            
-        if (getImplementationName().equals( serviceName )) return true;
+
+        return getImplementationName().equals(serviceName);
         
-        return false;
-    }
+        }
     
     /**
      * Supplies list of all supported services. 
@@ -781,11 +777,9 @@ public class ServiceManager implements XMultiServiceFactory,
         public boolean hasMoreElements() 
                 throws com.sun.star.uno.RuntimeException 
         {
-            if (enumeration != null)
-                return enumeration.hasMoreElements();
+            return enumeration != null && enumeration.hasMoreElements();
                 
-            return false;
-        }
+            }
     
         /**
          * Returns the next element of the enumeration. If no further elements
@@ -858,11 +852,10 @@ class ServiceManagerFactory implements 	XServiceInfo, XSingleComponentFactory, X
     {
         for ( int i=0; i<ServiceManager.supportedServiceNames.length; i++ )
             if ( ServiceManager.supportedServiceNames[i].equals(serviceName) ) return true;
+
+        return getImplementationName().equals(serviceName);
         
-        if ( getImplementationName().equals(serviceName) ) return true;
-        
-        return false;
-    }
+        }
 
     /**
      * Returns all service names which are supported by <code>ServiceManager</code>.
diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
index 7b8dce558..9a94dd21f 100644
--- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
+++ b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
@@ -71,9 +71,9 @@ public class UrlResolver {
         }
 
         public Object resolve(/*IN*/String dcp) throws NoConnectException, ConnectionSetupException, IllegalArgumentException, com.sun.star.uno.RuntimeException {
-            String conDcp = null;
-            String protDcp = null;
-            String rootOid = null;
+            String conDcp  ;
+            String protDcp  ;
+            String rootOid  ;
             
             if(dcp.indexOf(';') == -1) {// use old style
                 conDcp = dcp;
@@ -96,8 +96,8 @@ public class UrlResolver {
                 rootOid = dcp.trim().trim();
             }
 
-            Object rootObject = null;
-            XBridgeFactory xBridgeFactory= null;
+            Object rootObject  ;
+            XBridgeFactory xBridgeFactory ;
             try {
                 xBridgeFactory = UnoRuntime.queryInterface(XBridgeFactory.class, 
                                                                           _xMultiServiceFactory.createInstance("com.sun.star.bridge.BridgeFactory"));
@@ -107,7 +107,7 @@ public class UrlResolver {
             XBridge xBridge = xBridgeFactory.getBridge(conDcp + ";" + protDcp);
             
             if(xBridge == null) {
-                Object connector= null;
+                Object connector ;
                 try {
                     connector = _xMultiServiceFactory.createInstance("com.sun.star.connection.Connector");
                 } catch (com.sun.star.uno.Exception e) {
diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
index ea5057365..b2c82d88b 100644
--- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
+++ b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
@@ -82,7 +82,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
         _bFirstRead = true;
 
         // get pipe name from pipe descriptor
-        String aPipeName = null;
+        String aPipeName  ;
         StringTokenizer aTokenizer = new StringTokenizer( description, "," );
         if ( aTokenizer.hasMoreTokens() ) 
         {
diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
index 3d766389b..1f733b9d7 100644
--- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
+++ b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
@@ -149,7 +149,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
         bytes[0] = new byte[nBytesToRead];
 
         try {
-            int count = 0;
+            int count  ;
 
             do {
                 count = _inputStream.read(bytes[0], read_bytes, nBytesToRead - read_bytes);
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
index fd7fefdad..273705c39 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
@@ -113,9 +113,8 @@ final class ProxyFactory {
             throws Throwable
         {
             if (method.equals(METHOD_EQUALS) || method.equals(METHOD_IS_SAME)) {
-                return new Boolean(
-                    args[0] != null
-                    && oid.equals(UnoRuntime.generateOid(args[0])));
+                return Boolean.valueOf(args[0] != null
+                        && oid.equals(UnoRuntime.generateOid(args[0])));
             } else if (method.equals(METHOD_HASH_CODE)) {
                 return new Integer(oid.hashCode());
             } else if (method.equals(METHOD_TO_STRING)) {
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
index 9ba019199..d62914746 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
@@ -50,7 +50,7 @@ class XConnectionInputStream_Adapter extends InputStream {
 
     public int read() throws IOException {
 
-        int len = 0;
+        int len  ;
 
         try {
             len = _xConnection.read(_bytes, 1);
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
index 388f5bc08..cb2a0733e 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
@@ -60,7 +60,7 @@ class XConnectionOutputStream_Adapter extends OutputStream {
     }
 
     public void write(byte[] b, int off, int len) throws IOException {
-        byte bytes[] = null;
+        byte bytes[]  ;
 
         if(off == 0 && len == b.length)
             bytes = b;
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index e3513c7b0..3429f2fab 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -623,8 +623,6 @@ public class java_remote_bridge
 
         checkDisposed();
 
-        boolean goThroughThreadPool = false;
-
         ThreadId threadId = _iThreadPool.getThreadId();
         Object handle = _iThreadPool.attach(threadId);
         try {
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
index 36a0720ea..e622db067 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
@@ -91,7 +91,7 @@ final class Unmarshal {
 
     public ThreadId readThreadId() {
         int len = readCompressedNumber();
-        byte[] data = null;
+        byte[] data  ;
         ThreadId id = null;
         if (len != 0) {
             data = new byte[len];
diff --git a/jurt/com/sun/star/lib/util/UrlToFileMapper.java b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
index c356e8410..9319dd417 100644
--- a/jurt/com/sun/star/lib/util/UrlToFileMapper.java
+++ b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
@@ -145,7 +145,7 @@ public final class UrlToFileMapper {
                 try {
                     enc = (String) urlEncoderEncode.invoke(
                         null,
-                        new Object[] { new Character(c).toString(), "UTF-8" });
+                        new Object[] {Character.toString(c), "UTF-8" });
                 } catch (IllegalAccessException e) {
                     throw new RuntimeException("This cannot happen: " + e);
                 } catch (InvocationTargetException e) {
diff --git a/jurt/prj/d.lst b/jurt/prj/d.lst
index 499812e28..3459df62b 100644
--- a/jurt/prj/d.lst
+++ b/jurt/prj/d.lst
@@ -1,8 +1,8 @@
-..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar
-..\%__SRC%\bin\jpipe.dll %_DEST%\bin%_EXT%\jpipe.dll
-..\%__SRC%\bin\jpipx.dll %_DEST%\bin%_EXT%\jpipx.dll
-..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so
-..\%__SRC%\lib\libjpipe.jnilib %_DEST%\lib%_EXT%\libjpipe.jnilib
-..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib%_EXT%\libjpipe*.jnilib
+..\%__SRC%\class\jurt.jar %_DEST%\bin\jurt.jar
+..\%__SRC%\bin\jpipe.dll %_DEST%\bin\jpipe.dll
+..\%__SRC%\bin\jpipx.dll %_DEST%\bin\jpipx.dll
+..\%__SRC%\lib\libjpipe*.so %_DEST%\lib\libjpipe*.so
+..\%__SRC%\lib\libjpipe.jnilib %_DEST%\lib\libjpipe.jnilib
+..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib\libjpipe*.jnilib
 
-..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip
+..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin\jurt_src.zip
diff --git a/jurt/source/pipe/wrapper/wrapper.c b/jurt/source/pipe/wrapper/wrapper.c
index 0db29e492..2d9489995 100644
--- a/jurt/source/pipe/wrapper/wrapper.c
+++ b/jurt/source/pipe/wrapper/wrapper.c
@@ -30,7 +30,7 @@
 
 #include <stddef.h>
 
-#include <Windows.h>
+#include <windows.h>
 
 #include "jni.h"
 #include "sal/types.h"
diff --git a/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java b/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java
index 723d2e0d0..6c5ca0659 100644
--- a/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java
+++ b/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java
@@ -42,7 +42,7 @@ public final class NativeLibraryLoader_Test extends ComplexTestCase {
         File subdir = new File(dir, "with space");
         File file1 = new File(subdir, "file");
 
-        String fileUrl = dir.toURL().toString();
+        String fileUrl = dir.toURI().toURL().toString();
         if (!fileUrl.endsWith("/")) {
             fileUrl += "/";
         }
@@ -64,7 +64,7 @@ public final class NativeLibraryLoader_Test extends ComplexTestCase {
         File subdir = new File(dir, "with space");
         File file1 = new File(subdir, "file");
 
-        String fileUrl = dir.toURL().toString();
+        String fileUrl = dir.toURI().toURL().toString();
         if (!fileUrl.endsWith("/")) {
             fileUrl += "/";
         }
diff --git a/jvmaccess/prj/build.lst b/jvmaccess/prj/build.lst
index 73d99c7e0..723c0a6ec 100644
--- a/jvmaccess/prj/build.lst
+++ b/jvmaccess/prj/build.lst
@@ -1,4 +1,4 @@
-jv jvmaccess : offuh ridljar cppu sal salhelper NULL
+jv jvmaccess : offapi ridljar cppu sal salhelper NULL
 jv jvmaccess usr1 - all jv_mkout NULL
 jv jvmaccess\source nmake - all jv_source NULL
 jv jvmaccess\util nmake - all jv_util jv_source NULL
diff --git a/jvmaccess/prj/d.lst b/jvmaccess/prj/d.lst
index 303e1e92a..56d9e8326 100644
--- a/jvmaccess/prj/d.lst
+++ b/jvmaccess/prj/d.lst
@@ -1,8 +1,8 @@
-mkdir: %_DEST%\inc%_EXT%\jvmaccess
-..\inc\jvmaccess\classpath.hxx %_DEST%\inc%_EXT%\jvmaccess\classpath.hxx
-..\inc\jvmaccess\unovirtualmachine.hxx %_DEST%\inc%_EXT%\jvmaccess\unovirtualmachine.hxx
-..\inc\jvmaccess\virtualmachine.hxx %_DEST%\inc%_EXT%\jvmaccess\virtualmachine.hxx
-..\%__SRC%\bin\jvmacces*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib
-..\%__SRC%\lib\libjvmaccess*.*.* %_DEST%\lib%_EXT%\*
+mkdir: %_DEST%\inc\jvmaccess
+..\inc\jvmaccess\classpath.hxx %_DEST%\inc\jvmaccess\classpath.hxx
+..\inc\jvmaccess\unovirtualmachine.hxx %_DEST%\inc\jvmaccess\unovirtualmachine.hxx
+..\inc\jvmaccess\virtualmachine.hxx %_DEST%\inc\jvmaccess\virtualmachine.hxx
+..\%__SRC%\bin\jvmacces*.dll %_DEST%\bin\*
+..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib\ijvmaccess.lib
+..\%__SRC%\lib\libjvmaccess*.* %_DEST%\lib\*
 linklib: libjvmaccess*.*.*
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk
index a1d8536c6..1d6106f8f 100644
--- a/jvmaccess/util/makefile.mk
+++ b/jvmaccess/util/makefile.mk
@@ -31,7 +31,7 @@ TARGET = $(PRJNAME)
 
 ENABLE_EXCEPTIONS = TRUE
 
-.IF "$(OS)" != "WNT" && "$(OS)" != "OS2"
+.IF "$(OS)" != "WNT"
 UNIXVERSIONNAMES = UDK
 .ENDIF # WNT
 
@@ -43,7 +43,11 @@ SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID)
 SHL1TARGET = $(TARGET)$(COMID)
 .ENDIF # UNIXVERSIONNAMES
 
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB = i$(TARGET)
+.ELSE
+SHL1IMPLIB = $(TARGET)$(COMID)
+.ENDIF
 SHL1LIBS = $(SLB)$/$(TARGET).lib
 SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB)
 .IF "$(OS)" == "WNT"
diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
index 36e8e8d6c..88afdb33f 100755
--- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk
+++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
@@ -50,8 +50,6 @@ $(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_mac
 .ENDIF
 .ELIF "$(GUI)"=="WNT"
     -$(COPY) javavendors_wnt.xml $(BIN)$/javavendors.xml	
-.ELIF "$(GUI)"=="OS2"
-    -$(COPY) javavendors_os2.xml $(BIN)$/javavendors.xml	
 .ELSE
     @echo Unsupported platform.
 .ENDIF
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
index 76fd7c973..5b09a6795 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
@@ -59,10 +59,10 @@ SHL1TARGET=	$(UNOCOMPONENT1)
 
 
 SHL1STDLIBS= \
-        $(CPPULIB) \
         $(CPPUHELPER) \
-        $(SALLIB) \
-        $(SALHELPERLIB)
+        $(CPPULIB) \
+        $(SALHELPERLIB) \
+        $(SALLIB)
         
 
 .IF "$(GUI)" == "WNT"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 9277b3194..cd73609b0 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -48,7 +48,7 @@ Reference<VendorBase> OtherInfo::createInstance()
 char const* const* OtherInfo::getJavaExePaths(int * size)
 {
     static char const * ar[] = {
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
         "bin/java.exe",
         "jre/bin/java.exe"
 #elif UNX
@@ -68,10 +68,6 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
         "/bin/hotspot/jvm.dll",
         "/bin/classic/jvm.dll",
     "/bin/jrockit/jvm.dll"
-#elif defined(OS2)
-        "/bin/classic/jvm.dll",
-        "/bin/client/jvm.dll",
-        "/bin/hotspot/jvm.dll"
 #elif UNX
 #ifdef MACOSX
         "/../../../../../Frameworks/JavaVM.framework/JavaVM"  //as of  1.6.0_22
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index b46d527e2..56e865fe2 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -51,7 +51,7 @@ Reference<VendorBase> SunInfo::createInstance()
 char const* const* SunInfo::getJavaExePaths(int * size)
 {
     static char const * ar[] = {
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
         "java.exe",
         "bin/java.exe",
         "jre/bin/java.exe"
@@ -74,8 +74,6 @@ char const* const* SunInfo::getRuntimePaths(int * size)
         "/bin/classic/jvm.dll",
         // The 64-bit JRE has the jvm in bin/server
         "/bin/server/jvm.dll"
-#elif defined(OS2)
-        "/bin/classic/jvm.dll",
 #elif UNX
         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 4cf5244e2..7026893da 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -39,6 +39,7 @@
 #include "rtl/byteseq.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/instance.hxx"
+#include <salhelper/linkhelper.hxx>
 #include "boost/scoped_array.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
 #include <utility>
@@ -59,6 +60,7 @@
 #include "sunjre.hxx"
 #include "vendorlist.hxx"
 #include "diagnostics.h"
+
 using namespace osl;
 using namespace std;
 
@@ -490,7 +492,7 @@ bool getJavaProps(const OUString & exePath,
         props.push_back(std::make_pair(sKey, sVal));
     }
 
-    if (rs != FileHandleReader::RESULT_ERROR && props.size()>0)
+    if (rs != FileHandleReader::RESULT_ERROR && !props.empty())
         ret = true;
 
     //process error stream data
@@ -649,7 +651,7 @@ bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome)
 
 void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
 {
-    if(vec.size() == 0)
+    if(vec.empty())
         return;
     int size= vec.size() - 1;
     int cIter= 0;
@@ -694,7 +696,7 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
                 vec.at(j)= less;
             }
         }
-        cIter++;
+        ++cIter;
     }
 }
 
@@ -821,32 +823,20 @@ bool getJREInfoByPath(const rtl::OUString& path,
 OUString resolveDirPath(const OUString & path)
 {
     OUString ret;
-    OUString sResolved;
-    //getAbsoluteFileURL also resolves links
-    if (File::getAbsoluteFileURL(
-            OUSTR("file:///"), path, sResolved) != File::E_None)
-        return OUString();
-
-    //check if this is a valid path and if it is a directory
-    DirectoryItem item;
-    if (DirectoryItem::get(sResolved, item) == File::E_None)
+    salhelper::LinkResolver aResolver(osl_FileStatus_Mask_Type |
+                                       osl_FileStatus_Mask_FileURL);
+    if (aResolver.fetchFileStatus(path) == osl::FileBase::E_None)
     {
-        FileStatus status(FileStatusMask_Type |
-                          FileStatusMask_LinkTargetURL |
-                          FileStatusMask_FileURL);
-        
-        if (item.getFileStatus(status) == File::E_None
-            && status.getFileType() == FileStatus::Directory)
+        //check if this is a directory
+        if (aResolver.m_aStatus.getFileType() == FileStatus::Directory)
         {
 #ifndef JVM_ONE_PATH_CHECK
-            ret = sResolved;
+            ret = aResolver.m_aStatus.getFileURL();
 #else
             ret = path;
 #endif
         }
     }
-    else
-        return OUString();
     return ret;
 }
 /** Checks if the path is a file. If it is a link to a file than
@@ -855,32 +845,20 @@ OUString resolveDirPath(const OUString & path)
 OUString resolveFilePath(const OUString & path)
 {
     OUString ret;
-    OUString sResolved;
-
-    if (File::getAbsoluteFileURL(
-            OUSTR("file:///"), path, sResolved) != File::E_None)
-        return OUString();
-
-    //check if this is a valid path to a file or and if it is a link
-    DirectoryItem item;
-    if (DirectoryItem::get(sResolved, item) == File::E_None)
+    salhelper::LinkResolver aResolver(osl_FileStatus_Mask_Type |
+                                       osl_FileStatus_Mask_FileURL);
+    if (aResolver.fetchFileStatus(path) == osl::FileBase::E_None)
     {
-        FileStatus status(FileStatusMask_Type |
-                          FileStatusMask_LinkTargetURL |
-                          FileStatusMask_FileURL);
-        if (item.getFileStatus(status) == File::E_None
-            && status.getFileType() == FileStatus::Regular)
+        //check if this is a file
+        if (aResolver.m_aStatus.getFileType() == FileStatus::Regular)
         {
 #ifndef JVM_ONE_PATH_CHECK
-            ret = sResolved;
+            ret = aResolver.m_aStatus.getFileURL();
 #else
             ret = path;
 #endif
-        }                    
+        }
     }
-    else
-        return OUString();
-    
     return ret;
 }
 
@@ -1022,7 +1000,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
             break;
     }
 
-    if (props.size() == 0)
+    if (props.empty())
         return rtl::Reference<VendorBase>();
     
     //find java.vendor property
@@ -1157,7 +1135,7 @@ bool makeDriveLetterSame(OUString * fileURL)
     DirectoryItem item;
     if (DirectoryItem::get(*fileURL, item) == File::E_None)
     {
-        FileStatus status(FileStatusMask_FileURL);
+        FileStatus status(osl_FileStatus_Mask_FileURL);
         if (item.getFileStatus(status) == File::E_None)
         {
             *fileURL = status.getFileURL();
@@ -1246,7 +1224,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
                     File::RC errNext = File::E_None;
                     while( (errNext = aCollectionDir.getNextItem(curIt)) == File::E_None)
                     {
-                        FileStatus aStatus(FileStatusMask_FileURL);
+                        FileStatus aStatus(osl_FileStatus_Mask_FileURL);
                         File::RC errStatus = File::E_None;
                         if ((errStatus = curIt.getFileStatus(aStatus)) != File::E_None)
                         {
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index a0c7ced9e..d8b155b95 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -76,7 +76,7 @@ VendorBase::VendorBase(): m_bAccessibility(false)
 char const* const * VendorBase::getJavaExePaths(int* size)
 {
     static char const * ar[] = {
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
         "java.exe",
         "bin/java.exe"
 #elif UNX
diff --git a/jvmfwk/prj/build.lst b/jvmfwk/prj/build.lst
index bd09aae41..1a8d67401 100644
--- a/jvmfwk/prj/build.lst
+++ b/jvmfwk/prj/build.lst
@@ -1,4 +1,4 @@
-jvmf jvmfwk : cppu cppuhelper sal LIBXML2:libxml2 NULL
+jvmf jvmfwk : cppu cppuhelper sal comphelper LIBXML2:libxml2 NULL
 jvmf jvmfwk\inc nmake - all jvmf_inc NULL
 jvmf jvmfwk\source nmake - all jvmf_framework jvmf_inc NULL
 jvmf jvmfwk\plugins\sunmajor\pluginlib nmake - all jvmf_sunmajorlib jvmf_inc NULL
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst
index 770523841..09bc295dd 100644
--- a/jvmfwk/prj/d.lst
+++ b/jvmfwk/prj/d.lst
@@ -1,22 +1,22 @@
-mkdir: %_DEST%\inc%_EXT%\jvmfwk
-..\inc\jvmfwk\framework.h %_DEST%\inc%_EXT%\jvmfwk\framework.h
-..\inc\jvmfwk\vendorplugin.h %_DEST%\inc%_EXT%\jvmfwk\vendorplugin.h
-..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib%_EXT%\ijvmfwk.lib
-..\%__SRC%\lib\libjvmfwk.*.* %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib%_EXT%\*
-..\%__SRC%\class\JREProperties.class  %_DEST%\bin%_EXT%\JREProperties.class
-..\%__SRC%\class\JREProperties.class  %_DEST%\lib%_EXT%\JREProperties.class
-..\%__SRC%\bin\javaldx %_DEST%\bin%_EXT%\javaldx
-..\source\javasettingsunopkginstall.xml %_DEST%\bin%_EXT%\javasettingsunopkginstall.xml
-..\%__SRC%\bin\javavendors.xml %_DEST%\bin%_EXT%\javavendors.xml
-..\%__SRC%\bin\javavendors.xml %_DEST%\lib%_EXT%\javavendors.xml
-..\%__SRC%\bin\jvmfwk3rc %_DEST%\lib%_EXT%\jvmfwk3rc
-..\%__SRC%\bin\jvmfwk3.ini %_DEST%\bin%_EXT%\jvmfwk3.ini
-..\%__SRC%\bin\sunjavapluginrc %_DEST%\lib%_EXT%\sunjavapluginrc
-..\%__SRC%\bin\sunjavaplugin.ini %_DEST%\bin%_EXT%\sunjavaplugin.ini
+mkdir: %_DEST%\inc\jvmfwk
+..\inc\jvmfwk\framework.h %_DEST%\inc\jvmfwk\framework.h
+..\inc\jvmfwk\vendorplugin.h %_DEST%\inc\jvmfwk\vendorplugin.h
+..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib\ijvmfwk.lib
+..\%__SRC%\lib\libjvmfwk.* %_DEST%\lib\*
+..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\*
+..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\*
+..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\*
+..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib\*
+..\%__SRC%\class\JREProperties.class  %_DEST%\bin\JREProperties.class
+..\%__SRC%\class\JREProperties.class  %_DEST%\lib\JREProperties.class
+..\%__SRC%\bin\javaldx %_DEST%\bin\javaldx
+..\source\javasettingsunopkginstall.xml %_DEST%\bin\javasettingsunopkginstall.xml
+..\%__SRC%\bin\javavendors.xml %_DEST%\bin\javavendors.xml
+..\%__SRC%\bin\javavendors.xml %_DEST%\lib\javavendors.xml
+..\%__SRC%\bin\jvmfwk3rc %_DEST%\lib\jvmfwk3rc
+..\%__SRC%\bin\jvmfwk3.ini %_DEST%\bin\jvmfwk3.ini
+..\%__SRC%\bin\sunjavapluginrc %_DEST%\lib\sunjavapluginrc
+..\%__SRC%\bin\sunjavaplugin.ini %_DEST%\bin\sunjavaplugin.ini
 
 linklib: libjvmfwk.*.*
 linklib: libjvmfwk*.dylib.*.*.*
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 5ba370fa1..085a3e1d7 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -750,9 +750,9 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const
     if (File::E_None == rc)
     {
         ::osl::FileStatus stat(
-            FileStatusMask_Validate
-            | FileStatusMask_CreationTime
-            | FileStatusMask_ModifyTime);
+            osl_FileStatus_Mask_Validate
+            | osl_FileStatus_Mask_CreationTime
+            | osl_FileStatus_Mask_ModifyTime);
         File::RC rc_stat = item.getFileStatus(stat);
         if (File::E_None == rc_stat)
         {
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index f7beee14c..b646f61b7 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -802,7 +802,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
             if (plerr == JFW_PLUGIN_E_NONE)
             {
                 //check if the vendor of the found JRE is supported
-                if (vecVendors.size() == 0)
+                if (vecVendors.empty())
                 {
                     //vendor does not matter
                     *ppInfo = pInfo;
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index ed38b574b..5a7bf1c24 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -330,7 +330,7 @@ jfw::FileStatus checkFileURL(const rtl::OUString & sURL)
     File::RC rc_item = DirectoryItem::get(sURL, item);
     if (File::E_None == rc_item)
     {
-        osl::FileStatus status(FileStatusMask_Validate);
+        osl::FileStatus status(osl_FileStatus_Mask_Validate);
         
         File::RC rc_stat = item.getFileStatus(status);
         if (File::E_None == rc_stat)
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index d44ff28d8..94c0afc0d 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -60,7 +60,7 @@ xmlXPathObject* CXPathObjectPtr::operator ->()
 {
     return _object;
 }
-CXPathObjectPtr::operator xmlXPathObject*()
+CXPathObjectPtr::operator xmlXPathObject*() const
 {
     return _object;
 }
@@ -92,7 +92,7 @@ xmlXPathContext* CXPathContextPtr::operator ->()
     return _object;
 }
 
-CXPathContextPtr::operator xmlXPathContext*()
+CXPathContextPtr::operator xmlXPathContext*() const
 {
     return _object;
 }
@@ -124,7 +124,7 @@ xmlDoc* CXmlDocPtr::operator ->()
     return _object;
 }
 
-CXmlDocPtr::operator xmlDoc*()
+CXmlDocPtr::operator xmlDoc*() const
 {
     return _object;
 }
@@ -159,7 +159,7 @@ CXmlCharPtr & CXmlCharPtr::operator = (xmlChar* pObj)
     return *this;
 }
 
-CXmlCharPtr::operator xmlChar*()
+CXmlCharPtr::operator xmlChar*() const
 {
     return _object;
 }
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index c102d6b6e..c1ac47423 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -49,7 +49,7 @@ public:
      */
     CXPathObjectPtr & operator = (xmlXPathObject* pObj);
     xmlXPathObject* operator -> ();
-    operator xmlXPathObject* ();
+    operator xmlXPathObject* () const;
 };
 
 //===========================================================
@@ -65,7 +65,7 @@ public:
     CXPathContextPtr & operator = (xmlXPathContextPtr pObj);
     ~CXPathContextPtr();
     xmlXPathContext* operator -> ();
-    operator xmlXPathContext* ();
+    operator xmlXPathContext* () const;
 };
 
 //===========================================================
@@ -84,7 +84,7 @@ public:
     CXmlDocPtr & operator = (xmlDoc* pObj);
     ~CXmlDocPtr();
     xmlDoc* operator -> ();
-    operator xmlDoc* ();
+    operator xmlDoc* () const;
 };
 
 //===========================================================
@@ -100,8 +100,7 @@ public:
     CXmlCharPtr(const ::rtl::OUString &);
     ~CXmlCharPtr();
     CXmlCharPtr & operator = (xmlChar* pObj);
-//    xmlChar* operator -> ();
-    operator xmlChar* ();
+    operator xmlChar* () const;
     operator ::rtl::OUString ();
     operator ::rtl::OString ();
 };
diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk
index d43a31bc6..76ae22de6 100644
--- a/jvmfwk/source/makefile.mk
+++ b/jvmfwk/source/makefile.mk
@@ -31,7 +31,7 @@ FRAMEWORKLIB=jvmfwk
 TARGET = $(FRAMEWORKLIB)
 ENABLE_EXCEPTIONS = TRUE
 
-.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
+.IF "$(OS)" != "WNT"
 UNIXVERSIONNAMES = UDK
 .ENDIF # WNT
 
@@ -58,7 +58,11 @@ SHL1TARGET = $(FRAMEWORKLIB)
 .ENDIF # UNIXVERSIONNAMES
 
 SHL1DEPN=
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB = i$(FRAMEWORKLIB)
+.ELSE
+SHL1IMPLIB = $(FRAMEWORKLIB)
+.ENDIF
 SHL1LIBS = $(SLB)$/$(TARGET).lib
 SHL1STDLIBS = $(CPPUHELPERLIB) $(SALLIB) $(LIBXML2LIB)
 SHL1RPATH = URELIB
@@ -73,7 +77,7 @@ DEF1NAME = $(SHL1TARGET)
 
 .IF "$(GUI)"=="UNX"
 RCFILE=$(BIN)$/jvmfwk3rc
-.ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.ELIF "$(GUI)"=="WNT"
 RCFILE=$(BIN)$/jvmfwk3.ini
 .END
 
diff --git a/offapi/com/sun/star/deployment/test/makefile.mk b/offapi/Makefile
index 2c0030249..a79aff831 100644
--- a/offapi/com/sun/star/deployment/test/makefile.mk
+++ b/offapi/Makefile
@@ -25,17 +25,14 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..$/..
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-PRJNAME = api
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-TARGET = cssdeploymenttest
-PACKAGE = com$/sun$/star$/deployment$/test
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-      SmoketestCommandEnvironment.idl
-
-.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
+# vim: set noet sw=4 ts=4:
diff --git a/offapi/util/target.pmk b/offapi/Module_offapi.mk
index 5d9a389b2..76d56c30b 100644
--- a/offapi/util/target.pmk
+++ b/offapi/Module_offapi.mk
@@ -25,9 +25,14 @@
 #
 #*************************************************************************
 
-$(OUT)$/misc$/$(TARGET).idls: makefile.mk
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
 
-ALLTAR: $(OUT)$/misc$/$(TARGET).idls
+$(eval $(call gb_Module_Module,offapi))
 
+$(eval $(call gb_Module_add_targets,offapi,\
+	UnoApi_offapi \
+	UnoApi_types \
+	Package_offapi_idl \
+	Package_offapi_inc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/offapi/Package_offapi_idl.mk b/offapi/Package_offapi_idl.mk
new file mode 100644
index 000000000..5dd2bcc82
--- /dev/null
+++ b/offapi/Package_offapi_idl.mk
@@ -0,0 +1,29 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_UnoApiTarget_autopackage_idl,offapi))
+
diff --git a/offapi/Package_offapi_inc.mk b/offapi/Package_offapi_inc.mk
new file mode 100644
index 000000000..0197ccd09
--- /dev/null
+++ b/offapi/Package_offapi_inc.mk
@@ -0,0 +1,29 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_UnoApiTarget_autopackage_inc,offapi))
+
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
new file mode 100644
index 000000000..a34cca9af
--- /dev/null
+++ b/offapi/UnoApi_offapi.mk
@@ -0,0 +1,3761 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi))
+
+$(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\
+    udkapi \
+))
+
+$(eval $(call gb_UnoApiTarget_set_include,offapi,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/offapi \
+	-I$(OUTDIR)/idl \
+))
+
+$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,\
+    offapi/com/sun/star/animations/TargetPropertiesCreator \
+    offapi/com/sun/star/awt/AsyncCallback \
+    offapi/com/sun/star/awt/ContainerWindowProvider \
+    offapi/com/sun/star/awt/DialogProvider \
+    offapi/com/sun/star/awt/DialogProvider2 \
+    offapi/com/sun/star/awt/UnoControlDialogModelProvider \
+    offapi/com/sun/star/awt/grid/DefaultGridDataModel \
+    offapi/com/sun/star/awt/grid/SortableGridDataModel \
+    offapi/com/sun/star/awt/tab/UnoControlTabPageModel \
+    offapi/com/sun/star/awt/tree/MutableTreeDataModel \
+    offapi/com/sun/star/awt/tree/MutableTreeNode \
+    offapi/com/sun/star/awt/tree/TreeControl \
+    offapi/com/sun/star/chart2/data/DatabaseDataProvider \
+    offapi/com/sun/star/configuration/Update \
+    offapi/com/sun/star/deployment/ExtensionManager \
+    offapi/com/sun/star/deployment/PackageInformationProvider \
+    offapi/com/sun/star/deployment/PackageRegistryBackend \
+    offapi/com/sun/star/deployment/UpdateInformationProvider \
+    offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment \
+    offapi/com/sun/star/deployment/thePackageManagerFactory \
+    offapi/com/sun/star/deployment/ui/LicenseDialog \
+    offapi/com/sun/star/deployment/ui/PackageManagerDialog \
+    offapi/com/sun/star/deployment/ui/UpdateRequiredDialog \
+    offapi/com/sun/star/document/DocumentProperties \
+    offapi/com/sun/star/document/DocumentRevisionListPersistence \
+    offapi/com/sun/star/drawing/SlideRenderer \
+    offapi/com/sun/star/drawing/SlideSorter \
+    offapi/com/sun/star/drawing/framework/BasicPaneFactory \
+    offapi/com/sun/star/drawing/framework/BasicToolBarFactory \
+    offapi/com/sun/star/drawing/framework/BasicViewFactory \
+    offapi/com/sun/star/drawing/framework/Configuration \
+    offapi/com/sun/star/drawing/framework/ConfigurationController \
+    offapi/com/sun/star/drawing/framework/ModuleController \
+    offapi/com/sun/star/drawing/framework/ResourceId \
+    offapi/com/sun/star/embed/DocumentCloser \
+    offapi/com/sun/star/embed/InstanceLocker \
+    offapi/com/sun/star/embed/OLESimpleStorage \
+    offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel \
+    offapi/com/sun/star/form/runtime/FormOperations \
+    offapi/com/sun/star/graphic/GraphicObject \
+    offapi/com/sun/star/inspection/DefaultHelpProvider \
+    offapi/com/sun/star/inspection/GenericPropertyHandler \
+    offapi/com/sun/star/inspection/ObjectInspector \
+    offapi/com/sun/star/inspection/ObjectInspectorModel \
+    offapi/com/sun/star/inspection/StringRepresentation \
+    offapi/com/sun/star/linguistic2/Proofreader \
+    offapi/com/sun/star/linguistic2/ProofreadingIterator \
+    offapi/com/sun/star/logging/ConsoleHandler \
+    offapi/com/sun/star/logging/CsvLogFormatter \
+    offapi/com/sun/star/logging/DocumentIOLogRing \
+    offapi/com/sun/star/logging/FileHandler \
+    offapi/com/sun/star/logging/LoggerPool \
+    offapi/com/sun/star/logging/PlainTextFormatter \
+    offapi/com/sun/star/logging/SimpleLogRing \
+    offapi/com/sun/star/mail/MailMessage \
+    offapi/com/sun/star/mail/MailServiceProvider \
+    offapi/com/sun/star/media/Manager \
+    offapi/com/sun/star/oooimprovement/Core \
+    offapi/com/sun/star/oooimprovement/CoreController \
+    offapi/com/sun/star/presentation/SlideShow \
+    offapi/com/sun/star/presentation/TransitionFactory \
+    offapi/com/sun/star/rdf/BlankNode \
+    offapi/com/sun/star/rdf/Literal \
+    offapi/com/sun/star/rdf/Repository \
+    offapi/com/sun/star/rdf/URI \
+    offapi/com/sun/star/rendering/Canvas \
+    offapi/com/sun/star/rendering/CanvasFactory \
+    offapi/com/sun/star/rendering/MtfRenderer \
+    offapi/com/sun/star/report/FixedLine \
+    offapi/com/sun/star/report/FixedText \
+    offapi/com/sun/star/report/FormatCondition \
+    offapi/com/sun/star/report/FormattedField \
+    offapi/com/sun/star/report/Function \
+    offapi/com/sun/star/report/Group \
+    offapi/com/sun/star/report/Groups \
+    offapi/com/sun/star/report/ImageControl \
+    offapi/com/sun/star/report/ReportControlFormat \
+    offapi/com/sun/star/report/ReportControlModel \
+    offapi/com/sun/star/report/ReportDefinition \
+    offapi/com/sun/star/report/Section \
+    offapi/com/sun/star/report/Shape \
+    offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel \
+    offapi/com/sun/star/resource/OfficeResourceLoader \
+    offapi/com/sun/star/resource/StringResource \
+    offapi/com/sun/star/resource/StringResourceWithLocation \
+    offapi/com/sun/star/resource/StringResourceWithStorage \
+    offapi/com/sun/star/script/DocumentDialogLibraryContainer \
+    offapi/com/sun/star/script/DocumentScriptLibraryContainer \
+    offapi/com/sun/star/script/provider/ScriptURIHelper \
+    offapi/com/sun/star/script/vba/VBAEventProcessor \
+    offapi/com/sun/star/script/vba/VBAMacroResolver \
+    offapi/com/sun/star/sdb/DataAccessDescriptorFactory \
+    offapi/com/sun/star/sdb/DatabaseInteractionHandler \
+    offapi/com/sun/star/sdb/InteractionHandler \
+    offapi/com/sun/star/sdb/application/CopyTableWizard \
+    offapi/com/sun/star/sdbc/ConnectionPool \
+    offapi/com/sun/star/security/CertificateContainer \
+    offapi/com/sun/star/security/SerialNumberAdapter \
+    offapi/com/sun/star/sheet/ExternalDocLink \
+    offapi/com/sun/star/sheet/ExternalDocLinks \
+    offapi/com/sun/star/sheet/ExternalSheetCache \
+    offapi/com/sun/star/sheet/FilterFormulaParser \
+    offapi/com/sun/star/sheet/FormulaOpCodeMapper \
+    offapi/com/sun/star/sheet/Solver \
+    offapi/com/sun/star/smarttags/SmartTagAction \
+    offapi/com/sun/star/smarttags/SmartTagRecognizer \
+    offapi/com/sun/star/task/InteractionRequestStringResolver \
+    offapi/com/sun/star/task/OfficeRestartManager \
+    offapi/com/sun/star/task/PasswordContainerInteractionHandler \
+    offapi/com/sun/star/ucb/CommandEnvironment \
+    offapi/com/sun/star/ui/GlobalAcceleratorConfiguration \
+    offapi/com/sun/star/ui/WindowContentFactory \
+    offapi/com/sun/star/ui/dialogs/Wizard \
+    offapi/com/sun/star/util/JobManager \
+    offapi/com/sun/star/util/UriAbbreviation \
+    offapi/com/sun/star/xml/sax/FastShapeContextHandler \
+    offapi/com/sun/star/xml/sax/FastTokenHandler \
+))
+
+$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,\
+    offapi/com/sun/star/accessibility/AccessBridge \
+    offapi/com/sun/star/accessibility/Accessible \
+    offapi/com/sun/star/accessibility/AccessibleContext \
+    offapi/com/sun/star/auth/SSOExceptions \
+    offapi/com/sun/star/auth/SSOManagerFactory \
+    offapi/com/sun/star/auth/SSOPasswordCache \
+    offapi/com/sun/star/awt/AccessibleButton \
+    offapi/com/sun/star/awt/AccessibleCheckBox \
+    offapi/com/sun/star/awt/AccessibleComboBox \
+    offapi/com/sun/star/awt/AccessibleDropDownComboBox \
+    offapi/com/sun/star/awt/AccessibleDropDownListBox \
+    offapi/com/sun/star/awt/AccessibleEdit \
+    offapi/com/sun/star/awt/AccessibleFixedText \
+    offapi/com/sun/star/awt/AccessibleIconChoiceControl \
+    offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry \
+    offapi/com/sun/star/awt/AccessibleList \
+    offapi/com/sun/star/awt/AccessibleListBox \
+    offapi/com/sun/star/awt/AccessibleListBoxList \
+    offapi/com/sun/star/awt/AccessibleListItem \
+    offapi/com/sun/star/awt/AccessibleMenu \
+    offapi/com/sun/star/awt/AccessibleMenuBar \
+    offapi/com/sun/star/awt/AccessibleMenuItem \
+    offapi/com/sun/star/awt/AccessibleMenuSeparator \
+    offapi/com/sun/star/awt/AccessiblePopupMenu \
+    offapi/com/sun/star/awt/AccessibleRadioButton \
+    offapi/com/sun/star/awt/AccessibleScrollBar \
+    offapi/com/sun/star/awt/AccessibleStatusBar \
+    offapi/com/sun/star/awt/AccessibleStatusBarItem \
+    offapi/com/sun/star/awt/AccessibleTabBar \
+    offapi/com/sun/star/awt/AccessibleTabBarPage \
+    offapi/com/sun/star/awt/AccessibleTabBarPageList \
+    offapi/com/sun/star/awt/AccessibleTabControl \
+    offapi/com/sun/star/awt/AccessibleTabPage \
+    offapi/com/sun/star/awt/AccessibleTextField \
+    offapi/com/sun/star/awt/AccessibleToolBox \
+    offapi/com/sun/star/awt/AccessibleToolBoxItem \
+    offapi/com/sun/star/awt/AccessibleTreeListBox \
+    offapi/com/sun/star/awt/AccessibleTreeListBoxEntry \
+    offapi/com/sun/star/awt/AccessibleWindow \
+    offapi/com/sun/star/awt/AnimatedImagesControl \
+    offapi/com/sun/star/awt/AnimatedImagesControlModel \
+    offapi/com/sun/star/awt/RoadmapItem \
+    offapi/com/sun/star/awt/SpinningProgressControlModel \
+    offapi/com/sun/star/awt/TabController \
+    offapi/com/sun/star/awt/TabControllerModel \
+    offapi/com/sun/star/awt/Toolkit \
+    offapi/com/sun/star/awt/UnoControl \
+    offapi/com/sun/star/awt/UnoControlButton \
+    offapi/com/sun/star/awt/UnoControlButtonModel \
+    offapi/com/sun/star/awt/UnoControlCheckBox \
+    offapi/com/sun/star/awt/UnoControlCheckBoxModel \
+    offapi/com/sun/star/awt/UnoControlComboBox \
+    offapi/com/sun/star/awt/UnoControlComboBoxModel \
+    offapi/com/sun/star/awt/UnoControlContainer \
+    offapi/com/sun/star/awt/UnoControlContainerModel \
+    offapi/com/sun/star/awt/UnoControlCurrencyField \
+    offapi/com/sun/star/awt/UnoControlCurrencyFieldModel \
+    offapi/com/sun/star/awt/UnoControlDateField \
+    offapi/com/sun/star/awt/UnoControlDateFieldModel \
+    offapi/com/sun/star/awt/UnoControlDialog \
+    offapi/com/sun/star/awt/UnoControlDialogElement \
+    offapi/com/sun/star/awt/UnoControlDialogModel \
+    offapi/com/sun/star/awt/UnoControlEdit \
+    offapi/com/sun/star/awt/UnoControlEditModel \
+    offapi/com/sun/star/awt/UnoControlFileControl \
+    offapi/com/sun/star/awt/UnoControlFileControlModel \
+    offapi/com/sun/star/awt/UnoControlFixedHyperlink \
+    offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel \
+    offapi/com/sun/star/awt/UnoControlFixedLine \
+    offapi/com/sun/star/awt/UnoControlFixedLineModel \
+    offapi/com/sun/star/awt/UnoControlFixedText \
+    offapi/com/sun/star/awt/UnoControlFixedTextModel \
+    offapi/com/sun/star/awt/UnoControlFormattedField \
+    offapi/com/sun/star/awt/UnoControlFormattedFieldModel \
+    offapi/com/sun/star/awt/UnoControlGroupBox \
+    offapi/com/sun/star/awt/UnoControlGroupBoxModel \
+    offapi/com/sun/star/awt/UnoControlImageControl \
+    offapi/com/sun/star/awt/UnoControlImageControlModel \
+    offapi/com/sun/star/awt/UnoControlListBox \
+    offapi/com/sun/star/awt/UnoControlListBoxModel \
+    offapi/com/sun/star/awt/UnoControlModel \
+    offapi/com/sun/star/awt/UnoControlNumericField \
+    offapi/com/sun/star/awt/UnoControlNumericFieldModel \
+    offapi/com/sun/star/awt/UnoControlPatternField \
+    offapi/com/sun/star/awt/UnoControlPatternFieldModel \
+    offapi/com/sun/star/awt/UnoControlProgressBar \
+    offapi/com/sun/star/awt/UnoControlProgressBarModel \
+    offapi/com/sun/star/awt/UnoControlRadioButton \
+    offapi/com/sun/star/awt/UnoControlRadioButtonModel \
+    offapi/com/sun/star/awt/UnoControlRoadmap \
+    offapi/com/sun/star/awt/UnoControlRoadmapModel \
+    offapi/com/sun/star/awt/UnoControlScrollBar \
+    offapi/com/sun/star/awt/UnoControlScrollBarModel \
+    offapi/com/sun/star/awt/UnoControlSimpleAnimation \
+    offapi/com/sun/star/awt/UnoControlSimpleAnimationModel \
+    offapi/com/sun/star/awt/UnoControlSpinButton \
+    offapi/com/sun/star/awt/UnoControlSpinButtonModel \
+    offapi/com/sun/star/awt/UnoControlThrobber \
+    offapi/com/sun/star/awt/UnoControlThrobberModel \
+    offapi/com/sun/star/awt/UnoControlTimeField \
+    offapi/com/sun/star/awt/UnoControlTimeFieldModel \
+    offapi/com/sun/star/awt/XLayoutFlowContainer \
+    offapi/com/sun/star/awt/grid/UnoControlGrid \
+    offapi/com/sun/star/awt/grid/UnoControlGridModel \
+    offapi/com/sun/star/awt/tab/UnoControlTabPage \
+    offapi/com/sun/star/awt/tab/UnoControlTabPageContainer \
+    offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel \
+    offapi/com/sun/star/awt/tree/TreeControlModel \
+    offapi/com/sun/star/chart/AccessibleChartDocumentView \
+    offapi/com/sun/star/chart/AccessibleChartElement \
+    offapi/com/sun/star/chart/AreaDiagram \
+    offapi/com/sun/star/chart/BarDiagram \
+    offapi/com/sun/star/chart/BubbleDiagram \
+    offapi/com/sun/star/chart/Chart3DBarProperties \
+    offapi/com/sun/star/chart/ChartArea \
+    offapi/com/sun/star/chart/ChartAxis \
+    offapi/com/sun/star/chart/ChartAxisXSupplier \
+    offapi/com/sun/star/chart/ChartAxisYSupplier \
+    offapi/com/sun/star/chart/ChartAxisZSupplier \
+    offapi/com/sun/star/chart/ChartData \
+    offapi/com/sun/star/chart/ChartDataArray \
+    offapi/com/sun/star/chart/ChartDataPointProperties \
+    offapi/com/sun/star/chart/ChartDataRowProperties \
+    offapi/com/sun/star/chart/ChartDocument \
+    offapi/com/sun/star/chart/ChartGrid \
+    offapi/com/sun/star/chart/ChartLegend \
+    offapi/com/sun/star/chart/ChartLine \
+    offapi/com/sun/star/chart/ChartPieSegmentProperties \
+    offapi/com/sun/star/chart/ChartStatistics \
+    offapi/com/sun/star/chart/ChartTableAddressSupplier \
+    offapi/com/sun/star/chart/ChartTitle \
+    offapi/com/sun/star/chart/ChartTwoAxisXSupplier \
+    offapi/com/sun/star/chart/ChartTwoAxisYSupplier \
+    offapi/com/sun/star/chart/Diagram \
+    offapi/com/sun/star/chart/Dim3DDiagram \
+    offapi/com/sun/star/chart/DonutDiagram \
+    offapi/com/sun/star/chart/FilledNetDiagram \
+    offapi/com/sun/star/chart/LineDiagram \
+    offapi/com/sun/star/chart/NetDiagram \
+    offapi/com/sun/star/chart/PieDiagram \
+    offapi/com/sun/star/chart/StackableDiagram \
+    offapi/com/sun/star/chart/StockDiagram \
+    offapi/com/sun/star/chart/XYDiagram \
+    offapi/com/sun/star/chart2/XFastPropertyState \
+    offapi/com/sun/star/configuration/AccessRootElement \
+    offapi/com/sun/star/configuration/AdministrationProvider \
+    offapi/com/sun/star/configuration/ConfigurationAccess \
+    offapi/com/sun/star/configuration/ConfigurationProvider \
+    offapi/com/sun/star/configuration/ConfigurationRegistry \
+    offapi/com/sun/star/configuration/ConfigurationUpdateAccess \
+    offapi/com/sun/star/configuration/DefaultProvider \
+    offapi/com/sun/star/configuration/GroupAccess \
+    offapi/com/sun/star/configuration/GroupElement \
+    offapi/com/sun/star/configuration/GroupUpdate \
+    offapi/com/sun/star/configuration/HierarchyAccess \
+    offapi/com/sun/star/configuration/HierarchyElement \
+    offapi/com/sun/star/configuration/PropertyHierarchy \
+    offapi/com/sun/star/configuration/SetAccess \
+    offapi/com/sun/star/configuration/SetElement \
+    offapi/com/sun/star/configuration/SetUpdate \
+    offapi/com/sun/star/configuration/SimpleSetAccess \
+    offapi/com/sun/star/configuration/SimpleSetUpdate \
+    offapi/com/sun/star/configuration/UpdateRootElement \
+    offapi/com/sun/star/configuration/backend/Backend \
+    offapi/com/sun/star/configuration/backend/BackendAdapter \
+    offapi/com/sun/star/configuration/backend/CopyImporter \
+    offapi/com/sun/star/configuration/backend/DataImporter \
+    offapi/com/sun/star/configuration/backend/HierarchyBrowser \
+    offapi/com/sun/star/configuration/backend/Importer \
+    offapi/com/sun/star/configuration/backend/InteractionHandler \
+    offapi/com/sun/star/configuration/backend/Layer \
+    offapi/com/sun/star/configuration/backend/LayerDescriber \
+    offapi/com/sun/star/configuration/backend/LayerFilter \
+    offapi/com/sun/star/configuration/backend/LayerUpdateMerger \
+    offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum \
+    offapi/com/sun/star/configuration/backend/LdapSingleBackend \
+    offapi/com/sun/star/configuration/backend/LdapSingleStratum \
+    offapi/com/sun/star/configuration/backend/LocalDataImporter \
+    offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser \
+    offapi/com/sun/star/configuration/backend/LocalSchemaSupplier \
+    offapi/com/sun/star/configuration/backend/LocalSingleBackend \
+    offapi/com/sun/star/configuration/backend/LocalSingleStratum \
+    offapi/com/sun/star/configuration/backend/MergeImporter \
+    offapi/com/sun/star/configuration/backend/MultiLayerStratum \
+    offapi/com/sun/star/configuration/backend/MultiStratumBackend \
+    offapi/com/sun/star/configuration/backend/OfflineBackend \
+    offapi/com/sun/star/configuration/backend/OnlineBackend \
+    offapi/com/sun/star/configuration/backend/PlatformBackend \
+    offapi/com/sun/star/configuration/backend/Schema \
+    offapi/com/sun/star/configuration/backend/SchemaSupplier \
+    offapi/com/sun/star/configuration/backend/SingleBackend \
+    offapi/com/sun/star/configuration/backend/SingleBackendAdapter \
+    offapi/com/sun/star/configuration/backend/SingleLayerStratum \
+    offapi/com/sun/star/configuration/backend/SystemIntegration \
+    offapi/com/sun/star/configuration/backend/UpdatableLayer \
+    offapi/com/sun/star/configuration/backend/xml/LayerParser \
+    offapi/com/sun/star/configuration/backend/xml/LayerWriter \
+    offapi/com/sun/star/configuration/backend/xml/SchemaParser \
+    offapi/com/sun/star/configuration/bootstrap/BootstrapContext \
+    offapi/com/sun/star/datatransfer/DataFormatTranslator \
+    offapi/com/sun/star/datatransfer/MimeContentTypeFactory \
+    offapi/com/sun/star/datatransfer/clipboard/ClipboardManager \
+    offapi/com/sun/star/datatransfer/clipboard/GenericClipboard \
+    offapi/com/sun/star/datatransfer/clipboard/SystemClipboard \
+    offapi/com/sun/star/datatransfer/dnd/OleDragSource \
+    offapi/com/sun/star/datatransfer/dnd/OleDropTarget \
+    offapi/com/sun/star/datatransfer/dnd/X11DragSource \
+    offapi/com/sun/star/datatransfer/dnd/X11DropTarget \
+    offapi/com/sun/star/document/DocumentInfo \
+    offapi/com/sun/star/document/EventDescriptor \
+    offapi/com/sun/star/document/Events \
+    offapi/com/sun/star/document/ExportFilter \
+    offapi/com/sun/star/document/ExtendedTypeDetection \
+    offapi/com/sun/star/document/ExtendedTypeDetectionFactory \
+    offapi/com/sun/star/document/FilterAdapter \
+    offapi/com/sun/star/document/FilterFactory \
+    offapi/com/sun/star/document/HeaderFooterSettings \
+    offapi/com/sun/star/document/ImportFilter \
+    offapi/com/sun/star/document/LinkTarget \
+    offapi/com/sun/star/document/LinkTargets \
+    offapi/com/sun/star/document/MediaDescriptor \
+    offapi/com/sun/star/document/OfficeDocument \
+    offapi/com/sun/star/document/OleEmbeddedServerRegistration \
+    offapi/com/sun/star/document/PDFDialog \
+    offapi/com/sun/star/document/Settings \
+    offapi/com/sun/star/document/StandaloneDocumentInfo \
+    offapi/com/sun/star/document/TypeDetection \
+    offapi/com/sun/star/drawing/AccessibleDrawDocumentView \
+    offapi/com/sun/star/drawing/AccessibleGraphControl \
+    offapi/com/sun/star/drawing/AccessibleGraphicShape \
+    offapi/com/sun/star/drawing/AccessibleOLEShape \
+    offapi/com/sun/star/drawing/AccessibleShape \
+    offapi/com/sun/star/drawing/AccessibleSlideView \
+    offapi/com/sun/star/drawing/AccessibleSlideViewObject \
+    offapi/com/sun/star/drawing/AppletShape \
+    offapi/com/sun/star/drawing/Background \
+    offapi/com/sun/star/drawing/BitmapTable \
+    offapi/com/sun/star/drawing/CaptionShape \
+    offapi/com/sun/star/drawing/ClosedBezierShape \
+    offapi/com/sun/star/drawing/ConnectorProperties \
+    offapi/com/sun/star/drawing/ConnectorShape \
+    offapi/com/sun/star/drawing/ControlShape \
+    offapi/com/sun/star/drawing/CustomShape \
+    offapi/com/sun/star/drawing/CustomShapeEngine \
+    offapi/com/sun/star/drawing/DashTable \
+    offapi/com/sun/star/drawing/Defaults \
+    offapi/com/sun/star/drawing/DocumentSettings \
+    offapi/com/sun/star/drawing/DrawPage \
+    offapi/com/sun/star/drawing/DrawPages \
+    offapi/com/sun/star/drawing/DrawingDocument \
+    offapi/com/sun/star/drawing/DrawingDocumentDrawView \
+    offapi/com/sun/star/drawing/DrawingDocumentFactory \
+    offapi/com/sun/star/drawing/EllipseShape \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeHandle \
+    offapi/com/sun/star/drawing/EnhancedCustomShapePath \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath \
+    offapi/com/sun/star/drawing/FillProperties \
+    offapi/com/sun/star/drawing/GenericDrawPage \
+    offapi/com/sun/star/drawing/GenericDrawingDocument \
+    offapi/com/sun/star/drawing/GradientTable \
+    offapi/com/sun/star/drawing/GraphicExportFilter \
+    offapi/com/sun/star/drawing/GraphicObjectShape \
+    offapi/com/sun/star/drawing/GroupShape \
+    offapi/com/sun/star/drawing/HatchTable \
+    offapi/com/sun/star/drawing/Layer \
+    offapi/com/sun/star/drawing/LayerManager \
+    offapi/com/sun/star/drawing/LineProperties \
+    offapi/com/sun/star/drawing/LineShape \
+    offapi/com/sun/star/drawing/MarkerTable \
+    offapi/com/sun/star/drawing/MasterPage \
+    offapi/com/sun/star/drawing/MasterPages \
+    offapi/com/sun/star/drawing/MeasureProperties \
+    offapi/com/sun/star/drawing/MeasureShape \
+    offapi/com/sun/star/drawing/OLE2Shape \
+    offapi/com/sun/star/drawing/OpenBezierShape \
+    offapi/com/sun/star/drawing/PageShape \
+    offapi/com/sun/star/drawing/PluginShape \
+    offapi/com/sun/star/drawing/PolyLineShape \
+    offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor \
+    offapi/com/sun/star/drawing/PolyPolygonBezierShape \
+    offapi/com/sun/star/drawing/PolyPolygonDescriptor \
+    offapi/com/sun/star/drawing/PolyPolygonShape \
+    offapi/com/sun/star/drawing/RectangleShape \
+    offapi/com/sun/star/drawing/RotationDescriptor \
+    offapi/com/sun/star/drawing/ShadowProperties \
+    offapi/com/sun/star/drawing/Shape \
+    offapi/com/sun/star/drawing/ShapeCollection \
+    offapi/com/sun/star/drawing/Shapes \
+    offapi/com/sun/star/drawing/Text \
+    offapi/com/sun/star/drawing/TextProperties \
+    offapi/com/sun/star/drawing/TextShape \
+    offapi/com/sun/star/drawing/TransparencyGradientTable \
+    offapi/com/sun/star/embed/BaseStorage \
+    offapi/com/sun/star/embed/EmbeddedObjectDescriptor \
+    offapi/com/sun/star/embed/FileSystemStorage \
+    offapi/com/sun/star/embed/FileSystemStorageFactory \
+    offapi/com/sun/star/embed/Storage \
+    offapi/com/sun/star/embed/StorageFactory \
+    offapi/com/sun/star/embed/StorageStream \
+    offapi/com/sun/star/form/DataAwareControlModel \
+    offapi/com/sun/star/form/FormComponent \
+    offapi/com/sun/star/form/FormComponents \
+    offapi/com/sun/star/form/FormControlModel \
+    offapi/com/sun/star/form/FormController \
+    offapi/com/sun/star/form/FormControllerDispatcher \
+    offapi/com/sun/star/form/Forms \
+    offapi/com/sun/star/form/PropertyBrowserController \
+    offapi/com/sun/star/form/binding/BindableControlModel \
+    offapi/com/sun/star/form/binding/BindableDataAwareControlModel \
+    offapi/com/sun/star/form/binding/BindableDatabaseCheckBox \
+    offapi/com/sun/star/form/binding/BindableDatabaseComboBox \
+    offapi/com/sun/star/form/binding/BindableDatabaseDateField \
+    offapi/com/sun/star/form/binding/BindableDatabaseFormattedField \
+    offapi/com/sun/star/form/binding/BindableDatabaseListBox \
+    offapi/com/sun/star/form/binding/BindableDatabaseNumericField \
+    offapi/com/sun/star/form/binding/BindableDatabaseRadioButton \
+    offapi/com/sun/star/form/binding/BindableDatabaseTextField \
+    offapi/com/sun/star/form/binding/BindableDatabaseTimeField \
+    offapi/com/sun/star/form/binding/BindableIntegerValueRange \
+    offapi/com/sun/star/form/binding/ListEntrySource \
+    offapi/com/sun/star/form/binding/ValueBinding \
+    offapi/com/sun/star/form/component/CheckBox \
+    offapi/com/sun/star/form/component/ComboBox \
+    offapi/com/sun/star/form/component/CommandButton \
+    offapi/com/sun/star/form/component/CurrencyField \
+    offapi/com/sun/star/form/component/DataForm \
+    offapi/com/sun/star/form/component/DatabaseCheckBox \
+    offapi/com/sun/star/form/component/DatabaseComboBox \
+    offapi/com/sun/star/form/component/DatabaseCurrencyField \
+    offapi/com/sun/star/form/component/DatabaseDateField \
+    offapi/com/sun/star/form/component/DatabaseFormattedField \
+    offapi/com/sun/star/form/component/DatabaseImageControl \
+    offapi/com/sun/star/form/component/DatabaseListBox \
+    offapi/com/sun/star/form/component/DatabaseNumericField \
+    offapi/com/sun/star/form/component/DatabasePatternField \
+    offapi/com/sun/star/form/component/DatabaseRadioButton \
+    offapi/com/sun/star/form/component/DatabaseTextField \
+    offapi/com/sun/star/form/component/DatabaseTimeField \
+    offapi/com/sun/star/form/component/DateField \
+    offapi/com/sun/star/form/component/FileControl \
+    offapi/com/sun/star/form/component/FixedText \
+    offapi/com/sun/star/form/component/Form \
+    offapi/com/sun/star/form/component/FormattedField \
+    offapi/com/sun/star/form/component/GridControl \
+    offapi/com/sun/star/form/component/GroupBox \
+    offapi/com/sun/star/form/component/HTMLForm \
+    offapi/com/sun/star/form/component/HiddenControl \
+    offapi/com/sun/star/form/component/ImageButton \
+    offapi/com/sun/star/form/component/ListBox \
+    offapi/com/sun/star/form/component/NavigationToolBar \
+    offapi/com/sun/star/form/component/NumericField \
+    offapi/com/sun/star/form/component/PatternField \
+    offapi/com/sun/star/form/component/RadioButton \
+    offapi/com/sun/star/form/component/RichTextControl \
+    offapi/com/sun/star/form/component/ScrollBar \
+    offapi/com/sun/star/form/component/SpinButton \
+    offapi/com/sun/star/form/component/SubmitButton \
+    offapi/com/sun/star/form/component/TextField \
+    offapi/com/sun/star/form/component/TimeField \
+    offapi/com/sun/star/form/control/CheckBox \
+    offapi/com/sun/star/form/control/ComboBox \
+    offapi/com/sun/star/form/control/CommandButton \
+    offapi/com/sun/star/form/control/CurrencyField \
+    offapi/com/sun/star/form/control/DateField \
+    offapi/com/sun/star/form/control/FormattedField \
+    offapi/com/sun/star/form/control/GridControl \
+    offapi/com/sun/star/form/control/GroupBox \
+    offapi/com/sun/star/form/control/ImageButton \
+    offapi/com/sun/star/form/control/ImageControl \
+    offapi/com/sun/star/form/control/InteractionGridControl \
+    offapi/com/sun/star/form/control/ListBox \
+    offapi/com/sun/star/form/control/NavigationToolBar \
+    offapi/com/sun/star/form/control/NumericField \
+    offapi/com/sun/star/form/control/PatternField \
+    offapi/com/sun/star/form/control/RadioButton \
+    offapi/com/sun/star/form/control/SubmitButton \
+    offapi/com/sun/star/form/control/TextField \
+    offapi/com/sun/star/form/control/TimeField \
+    offapi/com/sun/star/form/inspection/ButtonNavigationHandler \
+    offapi/com/sun/star/form/inspection/CellBindingPropertyHandler \
+    offapi/com/sun/star/form/inspection/EditPropertyHandler \
+    offapi/com/sun/star/form/inspection/EventHandler \
+    offapi/com/sun/star/form/inspection/FormComponentPropertyHandler \
+    offapi/com/sun/star/form/inspection/SubmissionPropertyHandler \
+    offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler \
+    offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler \
+    offapi/com/sun/star/form/modules \
+    offapi/com/sun/star/form/runtime/FormController \
+    offapi/com/sun/star/form/validation/ValidatableBindableControlModel \
+    offapi/com/sun/star/form/validation/ValidatableControlModel \
+    offapi/com/sun/star/formula/AccessibleFormulaText \
+    offapi/com/sun/star/formula/AccessibleFormulaView \
+    offapi/com/sun/star/formula/FormulaProperties \
+    offapi/com/sun/star/frame/Components \
+    offapi/com/sun/star/frame/ContentHandler \
+    offapi/com/sun/star/frame/ContentHandlerFactory \
+    offapi/com/sun/star/frame/Controller \
+    offapi/com/sun/star/frame/Desktop \
+    offapi/com/sun/star/frame/DesktopTask \
+    offapi/com/sun/star/frame/DesktopTasks \
+    offapi/com/sun/star/frame/DispatchHelper \
+    offapi/com/sun/star/frame/DispatchProvider \
+    offapi/com/sun/star/frame/DispatchRecorder \
+    offapi/com/sun/star/frame/DispatchRecorderSupplier \
+    offapi/com/sun/star/frame/DocumentTemplates \
+    offapi/com/sun/star/frame/Frame \
+    offapi/com/sun/star/frame/FrameControl \
+    offapi/com/sun/star/frame/FrameLoader \
+    offapi/com/sun/star/frame/FrameLoaderFactory \
+    offapi/com/sun/star/frame/FramesContainer \
+    offapi/com/sun/star/frame/LayoutManager \
+    offapi/com/sun/star/frame/MediaTypeDetectionHelper \
+    offapi/com/sun/star/frame/ModuleManager \
+    offapi/com/sun/star/frame/PopupMenuController \
+    offapi/com/sun/star/frame/PopupMenuControllerFactory \
+    offapi/com/sun/star/frame/ProtocolHandler \
+    offapi/com/sun/star/frame/SessionManager \
+    offapi/com/sun/star/frame/Settings \
+    offapi/com/sun/star/frame/StatusbarController \
+    offapi/com/sun/star/frame/StatusbarControllerFactory \
+    offapi/com/sun/star/frame/SynchronousFrameLoader \
+    offapi/com/sun/star/frame/Task \
+    offapi/com/sun/star/frame/TemplateAccess \
+    offapi/com/sun/star/frame/ToolbarController \
+    offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory \
+    offapi/com/sun/star/gallery/GalleryItem \
+    offapi/com/sun/star/gallery/GalleryTheme \
+    offapi/com/sun/star/gallery/GalleryThemeProvider \
+    offapi/com/sun/star/graphic/Graphic \
+    offapi/com/sun/star/graphic/GraphicDescriptor \
+    offapi/com/sun/star/graphic/GraphicProvider \
+    offapi/com/sun/star/graphic/GraphicRendererVCL \
+    offapi/com/sun/star/graphic/MediaProperties \
+    offapi/com/sun/star/i18n/BreakIterator \
+    offapi/com/sun/star/i18n/ChapterCollator \
+    offapi/com/sun/star/i18n/CharacterClassification \
+    offapi/com/sun/star/i18n/Collator \
+    offapi/com/sun/star/i18n/IndexEntrySupplier \
+    offapi/com/sun/star/i18n/InputSequenceChecker \
+    offapi/com/sun/star/i18n/LocaleCalendar \
+    offapi/com/sun/star/i18n/LocaleData \
+    offapi/com/sun/star/i18n/NativeNumberSupplier \
+    offapi/com/sun/star/i18n/NumberFormatMapper \
+    offapi/com/sun/star/i18n/OrdinalSuffix \
+    offapi/com/sun/star/i18n/TextConversion \
+    offapi/com/sun/star/i18n/Transliteration \
+    offapi/com/sun/star/image/ImageMap \
+    offapi/com/sun/star/image/ImageMapCircleObject \
+    offapi/com/sun/star/image/ImageMapObject \
+    offapi/com/sun/star/image/ImageMapPolygonObject \
+    offapi/com/sun/star/image/ImageMapRectangleObject \
+    offapi/com/sun/star/installation/InstallationCheck \
+    offapi/com/sun/star/installation/InstallationCheckService \
+    offapi/com/sun/star/installation/InternetSettings \
+    offapi/com/sun/star/installation/ProtocolHandlerCheck \
+    offapi/com/sun/star/installation/ProtocolHandlerCheckService \
+    offapi/com/sun/star/linguistic2/ConversionDictionary \
+    offapi/com/sun/star/linguistic2/ConversionDictionaryList \
+    offapi/com/sun/star/linguistic2/Dictionary \
+    offapi/com/sun/star/linguistic2/DictionaryList \
+    offapi/com/sun/star/linguistic2/HangulHanjaConversionDictionary \
+    offapi/com/sun/star/linguistic2/Hyphenator \
+    offapi/com/sun/star/linguistic2/LinguProperties \
+    offapi/com/sun/star/linguistic2/LinguServiceManager \
+    offapi/com/sun/star/linguistic2/SpellChecker \
+    offapi/com/sun/star/linguistic2/Thesaurus \
+    offapi/com/sun/star/modules \
+    offapi/com/sun/star/mozilla/MenuProxy \
+    offapi/com/sun/star/mozilla/MenuProxyListener \
+    offapi/com/sun/star/mozilla/MozillaBootstrap \
+    offapi/com/sun/star/packages/Package \
+    offapi/com/sun/star/packages/PackageFolder \
+    offapi/com/sun/star/packages/PackageFolderEnumeration \
+    offapi/com/sun/star/packages/PackageStream \
+    offapi/com/sun/star/packages/zip/ZipFileAccess \
+    offapi/com/sun/star/plugin/PluginManager \
+    offapi/com/sun/star/presentation/ChartShape \
+    offapi/com/sun/star/presentation/CustomPresentation \
+    offapi/com/sun/star/presentation/CustomPresentationAccess \
+    offapi/com/sun/star/presentation/DateTimeShape \
+    offapi/com/sun/star/presentation/DocumentSettings \
+    offapi/com/sun/star/presentation/DrawPage \
+    offapi/com/sun/star/presentation/FooterShape \
+    offapi/com/sun/star/presentation/GraphicObjectShape \
+    offapi/com/sun/star/presentation/HandoutShape \
+    offapi/com/sun/star/presentation/HandoutView \
+    offapi/com/sun/star/presentation/HeaderShape \
+    offapi/com/sun/star/presentation/NotesShape \
+    offapi/com/sun/star/presentation/NotesView \
+    offapi/com/sun/star/presentation/OLE2Shape \
+    offapi/com/sun/star/presentation/OutlineView \
+    offapi/com/sun/star/presentation/OutlinerShape \
+    offapi/com/sun/star/presentation/PageShape \
+    offapi/com/sun/star/presentation/Presentation \
+    offapi/com/sun/star/presentation/Presentation2 \
+    offapi/com/sun/star/presentation/PresentationDocument \
+    offapi/com/sun/star/presentation/PresentationView \
+    offapi/com/sun/star/presentation/PreviewView \
+    offapi/com/sun/star/presentation/Shape \
+    offapi/com/sun/star/presentation/SlideNumberShape \
+    offapi/com/sun/star/presentation/SlidesView \
+    offapi/com/sun/star/presentation/SubtitleShape \
+    offapi/com/sun/star/presentation/TitleTextShape \
+    offapi/com/sun/star/presentation/textfield/DateTime \
+    offapi/com/sun/star/presentation/textfield/Footer \
+    offapi/com/sun/star/presentation/textfield/Header \
+    offapi/com/sun/star/rendering/BitmapCanvas \
+    offapi/com/sun/star/report/inspection/DataProviderHandler \
+    offapi/com/sun/star/report/inspection/ReportComponentHandler \
+    offapi/com/sun/star/report/modules \
+    offapi/com/sun/star/scanner/ScannerManager \
+    offapi/com/sun/star/script/browse/BrowseNode \
+    offapi/com/sun/star/script/browse/BrowseNodeFactory \
+    offapi/com/sun/star/script/provider/LanguageScriptProvider \
+    offapi/com/sun/star/script/provider/MasterScriptProvider \
+    offapi/com/sun/star/script/provider/MasterScriptProviderFactory \
+    offapi/com/sun/star/script/provider/ScriptProvider \
+    offapi/com/sun/star/script/provider/ScriptProviderForBasic \
+    offapi/com/sun/star/script/provider/ScriptProviderForBeanShell \
+    offapi/com/sun/star/script/provider/ScriptProviderForJava \
+    offapi/com/sun/star/script/provider/ScriptProviderForJavaScript \
+    offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor \
+    offapi/com/sun/star/script/vba/VBATextEventProcessor \
+    offapi/com/sun/star/sdb/CallableStatement \
+    offapi/com/sun/star/sdb/Column \
+    offapi/com/sun/star/sdb/ColumnDescriptorControl \
+    offapi/com/sun/star/sdb/ColumnDescriptorControlModel \
+    offapi/com/sun/star/sdb/ColumnSettings \
+    offapi/com/sun/star/sdb/Connection \
+    offapi/com/sun/star/sdb/ContentLoader \
+    offapi/com/sun/star/sdb/DataAccessDescriptor \
+    offapi/com/sun/star/sdb/DataColumn \
+    offapi/com/sun/star/sdb/DataSettings \
+    offapi/com/sun/star/sdb/DataSource \
+    offapi/com/sun/star/sdb/DataSourceBrowser \
+    offapi/com/sun/star/sdb/DatabaseAccess \
+    offapi/com/sun/star/sdb/DatabaseAccessConnection \
+    offapi/com/sun/star/sdb/DatabaseAccessContext \
+    offapi/com/sun/star/sdb/DatabaseAccessDataSource \
+    offapi/com/sun/star/sdb/DatabaseContext \
+    offapi/com/sun/star/sdb/DatabaseDocument \
+    offapi/com/sun/star/sdb/DatabaseEnvironment \
+    offapi/com/sun/star/sdb/DatasourceAdministrationDialog \
+    offapi/com/sun/star/sdb/DefinitionContainer \
+    offapi/com/sun/star/sdb/DefinitionContent \
+    offapi/com/sun/star/sdb/Document \
+    offapi/com/sun/star/sdb/DocumentContainer \
+    offapi/com/sun/star/sdb/DocumentDataSource \
+    offapi/com/sun/star/sdb/DocumentDefinition \
+    offapi/com/sun/star/sdb/ErrorMessageDialog \
+    offapi/com/sun/star/sdb/Forms \
+    offapi/com/sun/star/sdb/OfficeDatabaseDocument \
+    offapi/com/sun/star/sdb/OrderColumn \
+    offapi/com/sun/star/sdb/PreparedStatement \
+    offapi/com/sun/star/sdb/Query \
+    offapi/com/sun/star/sdb/QueryDefinition \
+    offapi/com/sun/star/sdb/QueryDescriptor \
+    offapi/com/sun/star/sdb/QueryDesign \
+    offapi/com/sun/star/sdb/RelationDesign \
+    offapi/com/sun/star/sdb/Reports \
+    offapi/com/sun/star/sdb/ResultColumn \
+    offapi/com/sun/star/sdb/ResultSet \
+    offapi/com/sun/star/sdb/RowSet \
+    offapi/com/sun/star/sdb/SQLQueryComposer \
+    offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer \
+    offapi/com/sun/star/sdb/SingleSelectQueryComposer \
+    offapi/com/sun/star/sdb/Table \
+    offapi/com/sun/star/sdb/TableDescriptor \
+    offapi/com/sun/star/sdb/TableDesign \
+    offapi/com/sun/star/sdb/application/DefaultViewController \
+    offapi/com/sun/star/sdbc/CallableStatement \
+    offapi/com/sun/star/sdbc/Connection \
+    offapi/com/sun/star/sdbc/ConnectionProperties \
+    offapi/com/sun/star/sdbc/DBASEConnectionProperties \
+    offapi/com/sun/star/sdbc/Driver \
+    offapi/com/sun/star/sdbc/DriverManager \
+    offapi/com/sun/star/sdbc/FILEConnectionProperties \
+    offapi/com/sun/star/sdbc/FLATConnectionProperties \
+    offapi/com/sun/star/sdbc/JDBCConnectionProperties \
+    offapi/com/sun/star/sdbc/ODBCConnectionProperties \
+    offapi/com/sun/star/sdbc/PreparedStatement \
+    offapi/com/sun/star/sdbc/ResultSet \
+    offapi/com/sun/star/sdbc/RowSet \
+    offapi/com/sun/star/sdbc/Statement \
+    offapi/com/sun/star/sdbcx/Column \
+    offapi/com/sun/star/sdbcx/ColumnDescriptor \
+    offapi/com/sun/star/sdbcx/Container \
+    offapi/com/sun/star/sdbcx/DatabaseDefinition \
+    offapi/com/sun/star/sdbcx/Descriptor \
+    offapi/com/sun/star/sdbcx/Driver \
+    offapi/com/sun/star/sdbcx/Group \
+    offapi/com/sun/star/sdbcx/GroupDescriptor \
+    offapi/com/sun/star/sdbcx/Index \
+    offapi/com/sun/star/sdbcx/IndexColumn \
+    offapi/com/sun/star/sdbcx/IndexColumnDescriptor \
+    offapi/com/sun/star/sdbcx/IndexDescriptor \
+    offapi/com/sun/star/sdbcx/Key \
+    offapi/com/sun/star/sdbcx/KeyColumn \
+    offapi/com/sun/star/sdbcx/KeyColumnDescriptor \
+    offapi/com/sun/star/sdbcx/KeyDescriptor \
+    offapi/com/sun/star/sdbcx/PreparedStatement \
+    offapi/com/sun/star/sdbcx/ReferenceColumn \
+    offapi/com/sun/star/sdbcx/ResultSet \
+    offapi/com/sun/star/sdbcx/Statement \
+    offapi/com/sun/star/sdbcx/Table \
+    offapi/com/sun/star/sdbcx/TableDescriptor \
+    offapi/com/sun/star/sdbcx/User \
+    offapi/com/sun/star/sdbcx/UserDescriptor \
+    offapi/com/sun/star/sdbcx/View \
+    offapi/com/sun/star/sdbcx/ViewDescriptor \
+    offapi/com/sun/star/security/DocumentDigitalSignatures \
+    offapi/com/sun/star/setup/ProductRegistration \
+    offapi/com/sun/star/setup/Setup \
+    offapi/com/sun/star/sheet/AccessibleCell \
+    offapi/com/sun/star/sheet/AccessibleCsvCell \
+    offapi/com/sun/star/sheet/AccessibleCsvRuler \
+    offapi/com/sun/star/sheet/AccessibleCsvTable \
+    offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView \
+    offapi/com/sun/star/sheet/AccessibleSpreadsheet \
+    offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView \
+    offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView \
+    offapi/com/sun/star/sheet/AddIn \
+    offapi/com/sun/star/sheet/CellAnnotation \
+    offapi/com/sun/star/sheet/CellAnnotationShape \
+    offapi/com/sun/star/sheet/CellAnnotations \
+    offapi/com/sun/star/sheet/CellAnnotationsEnumeration \
+    offapi/com/sun/star/sheet/CellAreaLink \
+    offapi/com/sun/star/sheet/CellAreaLinks \
+    offapi/com/sun/star/sheet/CellAreaLinksEnumeration \
+    offapi/com/sun/star/sheet/CellFormatRanges \
+    offapi/com/sun/star/sheet/CellFormatRangesEnumeration \
+    offapi/com/sun/star/sheet/Cells \
+    offapi/com/sun/star/sheet/CellsEnumeration \
+    offapi/com/sun/star/sheet/ConsolidationDescriptor \
+    offapi/com/sun/star/sheet/DDELink \
+    offapi/com/sun/star/sheet/DDELinks \
+    offapi/com/sun/star/sheet/DDELinksEnumeration \
+    offapi/com/sun/star/sheet/DataPilotDescriptor \
+    offapi/com/sun/star/sheet/DataPilotField \
+    offapi/com/sun/star/sheet/DataPilotFieldGroup \
+    offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration \
+    offapi/com/sun/star/sheet/DataPilotFieldGroupItem \
+    offapi/com/sun/star/sheet/DataPilotFieldGroups \
+    offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration \
+    offapi/com/sun/star/sheet/DataPilotFields \
+    offapi/com/sun/star/sheet/DataPilotFieldsEnumeration \
+    offapi/com/sun/star/sheet/DataPilotItem \
+    offapi/com/sun/star/sheet/DataPilotItems \
+    offapi/com/sun/star/sheet/DataPilotItemsEnumeration \
+    offapi/com/sun/star/sheet/DataPilotSource \
+    offapi/com/sun/star/sheet/DataPilotSourceDimension \
+    offapi/com/sun/star/sheet/DataPilotSourceDimensions \
+    offapi/com/sun/star/sheet/DataPilotSourceHierarchies \
+    offapi/com/sun/star/sheet/DataPilotSourceHierarchy \
+    offapi/com/sun/star/sheet/DataPilotSourceLevel \
+    offapi/com/sun/star/sheet/DataPilotSourceLevels \
+    offapi/com/sun/star/sheet/DataPilotSourceMember \
+    offapi/com/sun/star/sheet/DataPilotSourceMembers \
+    offapi/com/sun/star/sheet/DataPilotTable \
+    offapi/com/sun/star/sheet/DataPilotTables \
+    offapi/com/sun/star/sheet/DataPilotTablesEnumeration \
+    offapi/com/sun/star/sheet/DatabaseImportDescriptor \
+    offapi/com/sun/star/sheet/DatabaseRange \
+    offapi/com/sun/star/sheet/DatabaseRanges \
+    offapi/com/sun/star/sheet/DatabaseRangesEnumeration \
+    offapi/com/sun/star/sheet/DocumentSettings \
+    offapi/com/sun/star/sheet/FormulaParser \
+    offapi/com/sun/star/sheet/FunctionAccess \
+    offapi/com/sun/star/sheet/FunctionDescription \
+    offapi/com/sun/star/sheet/FunctionDescriptionEnumeration \
+    offapi/com/sun/star/sheet/FunctionDescriptions \
+    offapi/com/sun/star/sheet/GlobalSheetSettings \
+    offapi/com/sun/star/sheet/HeaderFooterContent \
+    offapi/com/sun/star/sheet/LabelRange \
+    offapi/com/sun/star/sheet/LabelRanges \
+    offapi/com/sun/star/sheet/LabelRangesEnumeration \
+    offapi/com/sun/star/sheet/NamedRange \
+    offapi/com/sun/star/sheet/NamedRanges \
+    offapi/com/sun/star/sheet/NamedRangesEnumeration \
+    offapi/com/sun/star/sheet/RangeSelectionArguments \
+    offapi/com/sun/star/sheet/RecentFunctions \
+    offapi/com/sun/star/sheet/Scenario \
+    offapi/com/sun/star/sheet/Scenarios \
+    offapi/com/sun/star/sheet/ScenariosEnumeration \
+    offapi/com/sun/star/sheet/Shape \
+    offapi/com/sun/star/sheet/SheetCell \
+    offapi/com/sun/star/sheet/SheetCellCursor \
+    offapi/com/sun/star/sheet/SheetCellRange \
+    offapi/com/sun/star/sheet/SheetCellRanges \
+    offapi/com/sun/star/sheet/SheetCellRangesEnumeration \
+    offapi/com/sun/star/sheet/SheetFilterDescriptor \
+    offapi/com/sun/star/sheet/SheetLink \
+    offapi/com/sun/star/sheet/SheetLinks \
+    offapi/com/sun/star/sheet/SheetLinksEnumeration \
+    offapi/com/sun/star/sheet/SheetRangesQuery \
+    offapi/com/sun/star/sheet/SheetSortDescriptor \
+    offapi/com/sun/star/sheet/SheetSortDescriptor2 \
+    offapi/com/sun/star/sheet/Spreadsheet \
+    offapi/com/sun/star/sheet/SpreadsheetDocument \
+    offapi/com/sun/star/sheet/SpreadsheetDocumentSettings \
+    offapi/com/sun/star/sheet/SpreadsheetDrawPage \
+    offapi/com/sun/star/sheet/SpreadsheetView \
+    offapi/com/sun/star/sheet/SpreadsheetViewPane \
+    offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration \
+    offapi/com/sun/star/sheet/SpreadsheetViewSettings \
+    offapi/com/sun/star/sheet/Spreadsheets \
+    offapi/com/sun/star/sheet/SpreadsheetsEnumeration \
+    offapi/com/sun/star/sheet/SubTotalDescriptor \
+    offapi/com/sun/star/sheet/SubTotalField \
+    offapi/com/sun/star/sheet/SubTotalFieldsEnumeration \
+    offapi/com/sun/star/sheet/TableAutoFormat \
+    offapi/com/sun/star/sheet/TableAutoFormatEnumeration \
+    offapi/com/sun/star/sheet/TableAutoFormatField \
+    offapi/com/sun/star/sheet/TableAutoFormats \
+    offapi/com/sun/star/sheet/TableAutoFormatsEnumeration \
+    offapi/com/sun/star/sheet/TableCellStyle \
+    offapi/com/sun/star/sheet/TableConditionalEntry \
+    offapi/com/sun/star/sheet/TableConditionalEntryEnumeration \
+    offapi/com/sun/star/sheet/TableConditionalFormat \
+    offapi/com/sun/star/sheet/TablePageStyle \
+    offapi/com/sun/star/sheet/TableValidation \
+    offapi/com/sun/star/sheet/UniqueCellFormatRanges \
+    offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration \
+    offapi/com/sun/star/sheet/VolatileResult \
+    offapi/com/sun/star/style/CellStyle \
+    offapi/com/sun/star/style/CharacterProperties \
+    offapi/com/sun/star/style/CharacterPropertiesAsian \
+    offapi/com/sun/star/style/CharacterPropertiesComplex \
+    offapi/com/sun/star/style/CharacterStyle \
+    offapi/com/sun/star/style/NumberingAlignment \
+    offapi/com/sun/star/style/NumberingLevel \
+    offapi/com/sun/star/style/NumberingRule \
+    offapi/com/sun/star/style/PageProperties \
+    offapi/com/sun/star/style/PageStyle \
+    offapi/com/sun/star/style/ParagraphProperties \
+    offapi/com/sun/star/style/ParagraphPropertiesAsian \
+    offapi/com/sun/star/style/ParagraphPropertiesComplex \
+    offapi/com/sun/star/style/ParagraphStyle \
+    offapi/com/sun/star/style/Style \
+    offapi/com/sun/star/style/StyleFamilies \
+    offapi/com/sun/star/style/StyleFamily \
+    offapi/com/sun/star/sync/SyncCollector \
+    offapi/com/sun/star/sync/Synchronizer \
+    offapi/com/sun/star/system/ProxySettings \
+    offapi/com/sun/star/system/SOffice52ProxySettings \
+    offapi/com/sun/star/system/SimpleCommandMail \
+    offapi/com/sun/star/system/SimpleSystemMail \
+    offapi/com/sun/star/system/SystemProxySettings \
+    offapi/com/sun/star/system/SystemShellExecute \
+    offapi/com/sun/star/table/AccessibleCellView \
+    offapi/com/sun/star/table/AccessibleTableView \
+    offapi/com/sun/star/table/Cell \
+    offapi/com/sun/star/table/CellCursor \
+    offapi/com/sun/star/table/CellProperties \
+    offapi/com/sun/star/table/CellRange \
+    offapi/com/sun/star/table/CellRangeListSource \
+    offapi/com/sun/star/table/CellValueBinding \
+    offapi/com/sun/star/table/ListPositionCellBinding \
+    offapi/com/sun/star/table/TableChart \
+    offapi/com/sun/star/table/TableCharts \
+    offapi/com/sun/star/table/TableChartsEnumeration \
+    offapi/com/sun/star/table/TableColumn \
+    offapi/com/sun/star/table/TableColumns \
+    offapi/com/sun/star/table/TableColumnsEnumeration \
+    offapi/com/sun/star/table/TableRow \
+    offapi/com/sun/star/table/TableRows \
+    offapi/com/sun/star/table/TableRowsEnumeration \
+    offapi/com/sun/star/table/TableSortDescriptor \
+    offapi/com/sun/star/table/TableSortDescriptor2 \
+    offapi/com/sun/star/task/AsyncJob \
+    offapi/com/sun/star/task/InteractionHandler \
+    offapi/com/sun/star/task/Job \
+    offapi/com/sun/star/task/JobExecutor \
+    offapi/com/sun/star/task/PasswordContainer \
+    offapi/com/sun/star/text/AccessibleEndnoteView \
+    offapi/com/sun/star/text/AccessibleFootnoteView \
+    offapi/com/sun/star/text/AccessibleHeaderFooterView \
+    offapi/com/sun/star/text/AccessiblePageView \
+    offapi/com/sun/star/text/AccessibleParagraphView \
+    offapi/com/sun/star/text/AccessibleTextDocumentPageView \
+    offapi/com/sun/star/text/AccessibleTextDocumentView \
+    offapi/com/sun/star/text/AccessibleTextEmbeddedObject \
+    offapi/com/sun/star/text/AccessibleTextFrameView \
+    offapi/com/sun/star/text/AccessibleTextGraphicObject \
+    offapi/com/sun/star/text/AdvancedTextDocument \
+    offapi/com/sun/star/text/AutoTextContainer \
+    offapi/com/sun/star/text/AutoTextEntry \
+    offapi/com/sun/star/text/AutoTextGroup \
+    offapi/com/sun/star/text/BaseFrame \
+    offapi/com/sun/star/text/BaseFrameProperties \
+    offapi/com/sun/star/text/BaseIndex \
+    offapi/com/sun/star/text/BaseIndexMark \
+    offapi/com/sun/star/text/Bibliography \
+    offapi/com/sun/star/text/Bookmark \
+    offapi/com/sun/star/text/Bookmarks \
+    offapi/com/sun/star/text/Cell \
+    offapi/com/sun/star/text/CellProperties \
+    offapi/com/sun/star/text/CellRange \
+    offapi/com/sun/star/text/ChainedTextFrame \
+    offapi/com/sun/star/text/ChapterNumberingRule \
+    offapi/com/sun/star/text/ContentIndex \
+    offapi/com/sun/star/text/ContentIndexMark \
+    offapi/com/sun/star/text/DefaultNumberingProvider \
+    offapi/com/sun/star/text/Defaults \
+    offapi/com/sun/star/text/DependentTextField \
+    offapi/com/sun/star/text/DocumentIndex \
+    offapi/com/sun/star/text/DocumentIndexFormat \
+    offapi/com/sun/star/text/DocumentIndexLevelFormat \
+    offapi/com/sun/star/text/DocumentIndexMark \
+    offapi/com/sun/star/text/DocumentIndexMarkAsian \
+    offapi/com/sun/star/text/DocumentIndexParagraphStyles \
+    offapi/com/sun/star/text/DocumentIndexes \
+    offapi/com/sun/star/text/DocumentSettings \
+    offapi/com/sun/star/text/Endnote \
+    offapi/com/sun/star/text/EndnoteSettings \
+    offapi/com/sun/star/text/Footnote \
+    offapi/com/sun/star/text/FootnoteSettings \
+    offapi/com/sun/star/text/Footnotes \
+    offapi/com/sun/star/text/GenericTextDocument \
+    offapi/com/sun/star/text/GlobalDocument \
+    offapi/com/sun/star/text/GlobalSettings \
+    offapi/com/sun/star/text/HypertextDocument \
+    offapi/com/sun/star/text/IllustrationsIndex \
+    offapi/com/sun/star/text/InContentMetadata \
+    offapi/com/sun/star/text/LineNumberingProperties \
+    offapi/com/sun/star/text/LineNumberingSettings \
+    offapi/com/sun/star/text/MailMerge \
+    offapi/com/sun/star/text/NumberingLevel \
+    offapi/com/sun/star/text/NumberingRules \
+    offapi/com/sun/star/text/NumberingStyle \
+    offapi/com/sun/star/text/ObjectIndex \
+    offapi/com/sun/star/text/PageFootnoteInfo \
+    offapi/com/sun/star/text/PagePrintSettings \
+    offapi/com/sun/star/text/Paragraph \
+    offapi/com/sun/star/text/ParagraphEnumeration \
+    offapi/com/sun/star/text/PrintPreviewSettings \
+    offapi/com/sun/star/text/PrintSettings \
+    offapi/com/sun/star/text/RedlinePortion \
+    offapi/com/sun/star/text/ReferenceMark \
+    offapi/com/sun/star/text/ReferenceMarks \
+    offapi/com/sun/star/text/Shape \
+    offapi/com/sun/star/text/TableColumns \
+    offapi/com/sun/star/text/TableIndex \
+    offapi/com/sun/star/text/TableRows \
+    offapi/com/sun/star/text/Text \
+    offapi/com/sun/star/text/TextColumns \
+    offapi/com/sun/star/text/TextContent \
+    offapi/com/sun/star/text/TextContentCollection \
+    offapi/com/sun/star/text/TextCursor \
+    offapi/com/sun/star/text/TextDocument \
+    offapi/com/sun/star/text/TextDocumentView \
+    offapi/com/sun/star/text/TextEmbeddedObject \
+    offapi/com/sun/star/text/TextEmbeddedObjects \
+    offapi/com/sun/star/text/TextField \
+    offapi/com/sun/star/text/TextFieldEnumeration \
+    offapi/com/sun/star/text/TextFieldMaster \
+    offapi/com/sun/star/text/TextFieldMasters \
+    offapi/com/sun/star/text/TextFields \
+    offapi/com/sun/star/text/TextFrame \
+    offapi/com/sun/star/text/TextFrames \
+    offapi/com/sun/star/text/TextGraphicObject \
+    offapi/com/sun/star/text/TextGraphicObjects \
+    offapi/com/sun/star/text/TextLayoutCursor \
+    offapi/com/sun/star/text/TextPageStyle \
+    offapi/com/sun/star/text/TextPortion \
+    offapi/com/sun/star/text/TextPortionEnumeration \
+    offapi/com/sun/star/text/TextRange \
+    offapi/com/sun/star/text/TextRangeContentProperties \
+    offapi/com/sun/star/text/TextRanges \
+    offapi/com/sun/star/text/TextSection \
+    offapi/com/sun/star/text/TextSections \
+    offapi/com/sun/star/text/TextSortDescriptor \
+    offapi/com/sun/star/text/TextSortDescriptor2 \
+    offapi/com/sun/star/text/TextSortable \
+    offapi/com/sun/star/text/TextTable \
+    offapi/com/sun/star/text/TextTableCursor \
+    offapi/com/sun/star/text/TextTableRow \
+    offapi/com/sun/star/text/TextTables \
+    offapi/com/sun/star/text/TextViewCursor \
+    offapi/com/sun/star/text/UserDefinedIndex \
+    offapi/com/sun/star/text/UserIndex \
+    offapi/com/sun/star/text/UserIndexMark \
+    offapi/com/sun/star/text/ViewSettings \
+    offapi/com/sun/star/text/WebDocument \
+    offapi/com/sun/star/text/fieldmaster/Bibliography \
+    offapi/com/sun/star/text/fieldmaster/DDE \
+    offapi/com/sun/star/text/fieldmaster/Database \
+    offapi/com/sun/star/text/fieldmaster/SetExpression \
+    offapi/com/sun/star/text/fieldmaster/User \
+    offapi/com/sun/star/text/textfield/Annotation \
+    offapi/com/sun/star/text/textfield/Author \
+    offapi/com/sun/star/text/textfield/Bibliography \
+    offapi/com/sun/star/text/textfield/Chapter \
+    offapi/com/sun/star/text/textfield/CharacterCount \
+    offapi/com/sun/star/text/textfield/CombinedCharacters \
+    offapi/com/sun/star/text/textfield/ConditionalText \
+    offapi/com/sun/star/text/textfield/DDE \
+    offapi/com/sun/star/text/textfield/Database \
+    offapi/com/sun/star/text/textfield/DatabaseName \
+    offapi/com/sun/star/text/textfield/DatabaseNextSet \
+    offapi/com/sun/star/text/textfield/DatabaseNumberOfSet \
+    offapi/com/sun/star/text/textfield/DatabaseSetNumber \
+    offapi/com/sun/star/text/textfield/DateTime \
+    offapi/com/sun/star/text/textfield/DropDown \
+    offapi/com/sun/star/text/textfield/EmbeddedObjectCount \
+    offapi/com/sun/star/text/textfield/ExtendedUser \
+    offapi/com/sun/star/text/textfield/FileName \
+    offapi/com/sun/star/text/textfield/GetExpression \
+    offapi/com/sun/star/text/textfield/GetReference \
+    offapi/com/sun/star/text/textfield/GraphicObjectCount \
+    offapi/com/sun/star/text/textfield/HiddenParagraph \
+    offapi/com/sun/star/text/textfield/HiddenText \
+    offapi/com/sun/star/text/textfield/Input \
+    offapi/com/sun/star/text/textfield/InputUser \
+    offapi/com/sun/star/text/textfield/JumpEdit \
+    offapi/com/sun/star/text/textfield/Macro \
+    offapi/com/sun/star/text/textfield/MetadataField \
+    offapi/com/sun/star/text/textfield/PageCount \
+    offapi/com/sun/star/text/textfield/PageNumber \
+    offapi/com/sun/star/text/textfield/ParagraphCount \
+    offapi/com/sun/star/text/textfield/ReferencePageGet \
+    offapi/com/sun/star/text/textfield/ReferencePageSet \
+    offapi/com/sun/star/text/textfield/Script \
+    offapi/com/sun/star/text/textfield/SetExpression \
+    offapi/com/sun/star/text/textfield/TableCount \
+    offapi/com/sun/star/text/textfield/TableFormula \
+    offapi/com/sun/star/text/textfield/TemplateName \
+    offapi/com/sun/star/text/textfield/URL \
+    offapi/com/sun/star/text/textfield/User \
+    offapi/com/sun/star/text/textfield/WordCount \
+    offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor \
+    offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime \
+    offapi/com/sun/star/text/textfield/docinfo/CreateAuthor \
+    offapi/com/sun/star/text/textfield/docinfo/CreateDateTime \
+    offapi/com/sun/star/text/textfield/docinfo/Custom \
+    offapi/com/sun/star/text/textfield/docinfo/Description \
+    offapi/com/sun/star/text/textfield/docinfo/EditTime \
+    offapi/com/sun/star/text/textfield/docinfo/Info0 \
+    offapi/com/sun/star/text/textfield/docinfo/Info1 \
+    offapi/com/sun/star/text/textfield/docinfo/Info2 \
+    offapi/com/sun/star/text/textfield/docinfo/Info3 \
+    offapi/com/sun/star/text/textfield/docinfo/Keywords \
+    offapi/com/sun/star/text/textfield/docinfo/PrintAuthor \
+    offapi/com/sun/star/text/textfield/docinfo/PrintDateTime \
+    offapi/com/sun/star/text/textfield/docinfo/Revision \
+    offapi/com/sun/star/text/textfield/docinfo/Subject \
+    offapi/com/sun/star/text/textfield/docinfo/Title \
+    offapi/com/sun/star/ucb/AnyCompareFactory \
+    offapi/com/sun/star/ucb/CachedContentResultSet \
+    offapi/com/sun/star/ucb/CachedContentResultSetFactory \
+    offapi/com/sun/star/ucb/CachedContentResultSetStub \
+    offapi/com/sun/star/ucb/CachedContentResultSetStubFactory \
+    offapi/com/sun/star/ucb/CachedDynamicResultSet \
+    offapi/com/sun/star/ucb/CachedDynamicResultSetFactory \
+    offapi/com/sun/star/ucb/CachedDynamicResultSetStub \
+    offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory \
+    offapi/com/sun/star/ucb/Content \
+    offapi/com/sun/star/ucb/ContentProvider \
+    offapi/com/sun/star/ucb/ContentProviderProxy \
+    offapi/com/sun/star/ucb/ContentProviderProxyFactory \
+    offapi/com/sun/star/ucb/ContentResultSet \
+    offapi/com/sun/star/ucb/ContentTransmitter \
+    offapi/com/sun/star/ucb/DefaultHierarchyDataSource \
+    offapi/com/sun/star/ucb/DynamicResultSet \
+    offapi/com/sun/star/ucb/ExpandContentProvider \
+    offapi/com/sun/star/ucb/FTPContent \
+    offapi/com/sun/star/ucb/FTPContentProvider \
+    offapi/com/sun/star/ucb/FileContent \
+    offapi/com/sun/star/ucb/FileContentProvider \
+    offapi/com/sun/star/ucb/GIOContentProvider \
+    offapi/com/sun/star/ucb/GnomeVFSContentProvider \
+    offapi/com/sun/star/ucb/GnomeVFSDocumentContent \
+    offapi/com/sun/star/ucb/GnomeVFSFolderContent \
+    offapi/com/sun/star/ucb/HelpContent \
+    offapi/com/sun/star/ucb/HelpContentProvider \
+    offapi/com/sun/star/ucb/HierarchyContentProvider \
+    offapi/com/sun/star/ucb/HierarchyDataReadAccess \
+    offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess \
+    offapi/com/sun/star/ucb/HierarchyDataSource \
+    offapi/com/sun/star/ucb/HierarchyFolderContent \
+    offapi/com/sun/star/ucb/HierarchyLinkContent \
+    offapi/com/sun/star/ucb/HierarchyRootFolderContent \
+    offapi/com/sun/star/ucb/ODMAContent \
+    offapi/com/sun/star/ucb/ODMAContentProvider \
+    offapi/com/sun/star/ucb/PackageContentProvider \
+    offapi/com/sun/star/ucb/PackageFolderContent \
+    offapi/com/sun/star/ucb/PackageStreamContent \
+    offapi/com/sun/star/ucb/PersistentPropertySet \
+    offapi/com/sun/star/ucb/PropertiesManager \
+    offapi/com/sun/star/ucb/PropertySetRegistry \
+    offapi/com/sun/star/ucb/RemoteAccessContentProvider \
+    offapi/com/sun/star/ucb/RemoteContentProviderAcceptor \
+    offapi/com/sun/star/ucb/RemoteProxyContentProvider \
+    offapi/com/sun/star/ucb/SimpleFileAccess \
+    offapi/com/sun/star/ucb/SortedDynamicResultSetFactory \
+    offapi/com/sun/star/ucb/Store \
+    offapi/com/sun/star/ucb/TransientDocumentsContentProvider \
+    offapi/com/sun/star/ucb/TransientDocumentsDocumentContent \
+    offapi/com/sun/star/ucb/TransientDocumentsFolderContent \
+    offapi/com/sun/star/ucb/TransientDocumentsRootContent \
+    offapi/com/sun/star/ucb/TransientDocumentsStreamContent \
+    offapi/com/sun/star/ucb/UniversalContentBroker \
+    offapi/com/sun/star/ucb/WebDAVContentProvider \
+    offapi/com/sun/star/ucb/WebDAVDocumentContent \
+    offapi/com/sun/star/ucb/WebDAVFolderContent \
+    offapi/com/sun/star/ui/ActionTrigger \
+    offapi/com/sun/star/ui/ActionTriggerContainer \
+    offapi/com/sun/star/ui/ActionTriggerSeparator \
+    offapi/com/sun/star/ui/ConfigurableUIElement \
+    offapi/com/sun/star/ui/ItemDescriptor \
+    offapi/com/sun/star/ui/ModuleUICategoryDescription \
+    offapi/com/sun/star/ui/ModuleUICommandDescription \
+    offapi/com/sun/star/ui/ModuleUIConfigurationManager \
+    offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier \
+    offapi/com/sun/star/ui/ModuleWindowStateConfiguration \
+    offapi/com/sun/star/ui/UICategoryDescription \
+    offapi/com/sun/star/ui/UICommandDescription \
+    offapi/com/sun/star/ui/UIConfigurationManager \
+    offapi/com/sun/star/ui/UIElement \
+    offapi/com/sun/star/ui/UIElementFactory \
+    offapi/com/sun/star/ui/UIElementFactoryManager \
+    offapi/com/sun/star/ui/UIElementSettings \
+    offapi/com/sun/star/ui/WindowStateConfiguration \
+    offapi/com/sun/star/ui/dialogs/FilePicker \
+    offapi/com/sun/star/ui/dialogs/FilterOptionsDialog \
+    offapi/com/sun/star/ui/dialogs/FolderPicker \
+    offapi/com/sun/star/util/NumberFormatProperties \
+    offapi/com/sun/star/util/NumberFormatSettings \
+    offapi/com/sun/star/util/NumberFormats \
+    offapi/com/sun/star/util/NumberFormatsSupplier \
+    offapi/com/sun/star/util/NumberFormatter \
+    offapi/com/sun/star/util/OfficeInstallationDirectories \
+    offapi/com/sun/star/util/PathSettings \
+    offapi/com/sun/star/util/PathSubstitution \
+    offapi/com/sun/star/util/ReplaceDescriptor \
+    offapi/com/sun/star/util/SearchDescriptor \
+    offapi/com/sun/star/util/SortDescriptor \
+    offapi/com/sun/star/util/SortDescriptor2 \
+    offapi/com/sun/star/util/Sortable \
+    offapi/com/sun/star/util/TextSearch \
+    offapi/com/sun/star/util/URLTransformer \
+    offapi/com/sun/star/view/OfficeDocumentView \
+    offapi/com/sun/star/view/PrintOptions \
+    offapi/com/sun/star/view/PrintSettings \
+    offapi/com/sun/star/view/PrinterDescriptor \
+    offapi/com/sun/star/view/RenderDescriptor \
+    offapi/com/sun/star/view/RenderOptions \
+    offapi/com/sun/star/view/ViewSettings \
+    offapi/com/sun/star/xforms/Binding \
+    offapi/com/sun/star/xml/AttributeContainer \
+    offapi/com/sun/star/xml/ExportFilter \
+    offapi/com/sun/star/xml/ImportFilter \
+    offapi/com/sun/star/xml/NamespaceContainer \
+    offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier \
+    offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier \
+    offapi/com/sun/star/xml/UserDefinedAttributeSupplier \
+    offapi/com/sun/star/xml/UserDefinedAttributesSupplier \
+    offapi/com/sun/star/xml/XMLExportFilter \
+    offapi/com/sun/star/xml/XMLImportFilter \
+    offapi/com/sun/star/xml/crypto/SEInitializer \
+    offapi/com/sun/star/xml/crypto/SecurityEnvironment \
+    offapi/com/sun/star/xml/crypto/XMLEncryption \
+    offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate \
+    offapi/com/sun/star/xml/crypto/XMLSecurityContext \
+    offapi/com/sun/star/xml/crypto/XMLSignature \
+    offapi/com/sun/star/xml/crypto/XMLSignatureTemplate \
+    offapi/com/sun/star/xml/crypto/sax/Decryptor \
+    offapi/com/sun/star/xml/crypto/sax/Encryptor \
+    offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper \
+    offapi/com/sun/star/xml/crypto/sax/SignatureCreator \
+    offapi/com/sun/star/xml/crypto/sax/SignatureVerifier \
+    offapi/com/sun/star/xml/dom/SAXDocumentBuilder \
+    offapi/com/sun/star/xml/input/SaxDocumentHandler \
+    offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper \
+    offapi/com/sun/star/xml/wrapper/XMLElementWrapper \
+    offapi/com/sun/star/xml/xpath/XPathAPI \
+    offapi/com/sun/star/xml/xpath/XPathExtension \
+    offapi/com/sun/star/xsd/Boolean \
+    offapi/com/sun/star/xsd/Date \
+    offapi/com/sun/star/xsd/DateTime \
+    offapi/com/sun/star/xsd/Day \
+    offapi/com/sun/star/xsd/Decimal \
+    offapi/com/sun/star/xsd/Month \
+    offapi/com/sun/star/xsd/String \
+    offapi/com/sun/star/xsd/Time \
+    offapi/com/sun/star/xsd/Year \
+))
+
+$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,\
+    offapi/com/sun/star/accessibility/AccessibleEventId \
+    offapi/com/sun/star/accessibility/AccessibleEventObject \
+    offapi/com/sun/star/accessibility/AccessibleRelation \
+    offapi/com/sun/star/accessibility/AccessibleRelationType \
+    offapi/com/sun/star/accessibility/AccessibleRole \
+    offapi/com/sun/star/accessibility/AccessibleStateType \
+    offapi/com/sun/star/accessibility/AccessibleTableModelChange \
+    offapi/com/sun/star/accessibility/AccessibleTableModelChangeType \
+    offapi/com/sun/star/accessibility/AccessibleTextType \
+    offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException \
+    offapi/com/sun/star/accessibility/TextSegment \
+    offapi/com/sun/star/accessibility/XAccessible \
+    offapi/com/sun/star/accessibility/XAccessibleAction \
+    offapi/com/sun/star/accessibility/XAccessibleComponent \
+    offapi/com/sun/star/accessibility/XAccessibleContext \
+    offapi/com/sun/star/accessibility/XAccessibleEditableText \
+    offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster \
+    offapi/com/sun/star/accessibility/XAccessibleEventListener \
+    offapi/com/sun/star/accessibility/XAccessibleExtendedComponent \
+    offapi/com/sun/star/accessibility/XAccessibleHyperlink \
+    offapi/com/sun/star/accessibility/XAccessibleHypertext \
+    offapi/com/sun/star/accessibility/XAccessibleImage \
+    offapi/com/sun/star/accessibility/XAccessibleKeyBinding \
+    offapi/com/sun/star/accessibility/XAccessibleMultiLineText \
+    offapi/com/sun/star/accessibility/XAccessibleRelationSet \
+    offapi/com/sun/star/accessibility/XAccessibleSelection \
+    offapi/com/sun/star/accessibility/XAccessibleStateSet \
+    offapi/com/sun/star/accessibility/XAccessibleTable \
+    offapi/com/sun/star/accessibility/XAccessibleText \
+    offapi/com/sun/star/accessibility/XAccessibleTextAttributes \
+    offapi/com/sun/star/accessibility/XAccessibleTextMarkup \
+    offapi/com/sun/star/accessibility/XAccessibleValue \
+    offapi/com/sun/star/animations/AnimationAdditiveMode \
+    offapi/com/sun/star/animations/AnimationCalcMode \
+    offapi/com/sun/star/animations/AnimationColorSpace \
+    offapi/com/sun/star/animations/AnimationEndSync \
+    offapi/com/sun/star/animations/AnimationFill \
+    offapi/com/sun/star/animations/AnimationNodeType \
+    offapi/com/sun/star/animations/AnimationRestart \
+    offapi/com/sun/star/animations/AnimationTransformType \
+    offapi/com/sun/star/animations/AnimationValueType \
+    offapi/com/sun/star/animations/Event \
+    offapi/com/sun/star/animations/EventTrigger \
+    offapi/com/sun/star/animations/TargetProperties \
+    offapi/com/sun/star/animations/TimeFilterPair \
+    offapi/com/sun/star/animations/Timing \
+    offapi/com/sun/star/animations/TransitionSubType \
+    offapi/com/sun/star/animations/TransitionType \
+    offapi/com/sun/star/animations/ValuePair \
+    offapi/com/sun/star/animations/XAnimate \
+    offapi/com/sun/star/animations/XAnimateColor \
+    offapi/com/sun/star/animations/XAnimateMotion \
+    offapi/com/sun/star/animations/XAnimateSet \
+    offapi/com/sun/star/animations/XAnimateTransform \
+    offapi/com/sun/star/animations/XAnimationListener \
+    offapi/com/sun/star/animations/XAnimationNode \
+    offapi/com/sun/star/animations/XAnimationNodeSupplier \
+    offapi/com/sun/star/animations/XAudio \
+    offapi/com/sun/star/animations/XCommand \
+    offapi/com/sun/star/animations/XIterateContainer \
+    offapi/com/sun/star/animations/XTargetPropertiesCreator \
+    offapi/com/sun/star/animations/XTimeContainer \
+    offapi/com/sun/star/animations/XTransitionFilter \
+    offapi/com/sun/star/auth/AuthenticationFailedException \
+    offapi/com/sun/star/auth/InvalidArgumentException \
+    offapi/com/sun/star/auth/InvalidContextException \
+    offapi/com/sun/star/auth/InvalidCredentialException \
+    offapi/com/sun/star/auth/InvalidPrincipalException \
+    offapi/com/sun/star/auth/PersistenceFailureException \
+    offapi/com/sun/star/auth/UnsupportedException \
+    offapi/com/sun/star/auth/XSSOAcceptorContext \
+    offapi/com/sun/star/auth/XSSOContext \
+    offapi/com/sun/star/auth/XSSOInitiatorContext \
+    offapi/com/sun/star/auth/XSSOManager \
+    offapi/com/sun/star/auth/XSSOManagerFactory \
+    offapi/com/sun/star/auth/XSSOPasswordCache \
+    offapi/com/sun/star/awt/ActionEvent \
+    offapi/com/sun/star/awt/AdjustmentEvent \
+    offapi/com/sun/star/awt/AdjustmentType \
+    offapi/com/sun/star/awt/CharSet \
+    offapi/com/sun/star/awt/Command \
+    offapi/com/sun/star/awt/DeviceCapability \
+    offapi/com/sun/star/awt/DeviceInfo \
+    offapi/com/sun/star/awt/DockingData \
+    offapi/com/sun/star/awt/DockingEvent \
+    offapi/com/sun/star/awt/EndDockingEvent \
+    offapi/com/sun/star/awt/EndPopupModeEvent \
+    offapi/com/sun/star/awt/EnhancedMouseEvent \
+    offapi/com/sun/star/awt/FieldUnit \
+    offapi/com/sun/star/awt/FocusChangeReason \
+    offapi/com/sun/star/awt/FocusEvent \
+    offapi/com/sun/star/awt/FontDescriptor \
+    offapi/com/sun/star/awt/FontEmphasisMark \
+    offapi/com/sun/star/awt/FontFamily \
+    offapi/com/sun/star/awt/FontPitch \
+    offapi/com/sun/star/awt/FontRelief \
+    offapi/com/sun/star/awt/FontSlant \
+    offapi/com/sun/star/awt/FontStrikeout \
+    offapi/com/sun/star/awt/FontType \
+    offapi/com/sun/star/awt/FontUnderline \
+    offapi/com/sun/star/awt/FontWeight \
+    offapi/com/sun/star/awt/FontWidth \
+    offapi/com/sun/star/awt/Gradient \
+    offapi/com/sun/star/awt/GradientStyle \
+    offapi/com/sun/star/awt/ImageAlign \
+    offapi/com/sun/star/awt/ImagePosition \
+    offapi/com/sun/star/awt/ImageScaleMode \
+    offapi/com/sun/star/awt/ImageStatus \
+    offapi/com/sun/star/awt/InputEvent \
+    offapi/com/sun/star/awt/InvalidateStyle \
+    offapi/com/sun/star/awt/ItemEvent \
+    offapi/com/sun/star/awt/ItemListEvent \
+    offapi/com/sun/star/awt/Key \
+    offapi/com/sun/star/awt/KeyEvent \
+    offapi/com/sun/star/awt/KeyFunction \
+    offapi/com/sun/star/awt/KeyGroup \
+    offapi/com/sun/star/awt/KeyModifier \
+    offapi/com/sun/star/awt/KeyStroke \
+    offapi/com/sun/star/awt/LineEndFormat \
+    offapi/com/sun/star/awt/MaxChildrenException \
+    offapi/com/sun/star/awt/MenuEvent \
+    offapi/com/sun/star/awt/MenuItemStyle \
+    offapi/com/sun/star/awt/MenuItemType \
+    offapi/com/sun/star/awt/MenuLogo \
+    offapi/com/sun/star/awt/MessageBoxButtons \
+    offapi/com/sun/star/awt/MessageBoxCommand \
+    offapi/com/sun/star/awt/MouseButton \
+    offapi/com/sun/star/awt/MouseEvent \
+    offapi/com/sun/star/awt/MouseWheelBehavior \
+    offapi/com/sun/star/awt/PaintEvent \
+    offapi/com/sun/star/awt/Point \
+    offapi/com/sun/star/awt/PopupMenuDirection \
+    offapi/com/sun/star/awt/PosSize \
+    offapi/com/sun/star/awt/PrinterException \
+    offapi/com/sun/star/awt/PushButtonType \
+    offapi/com/sun/star/awt/RasterOperation \
+    offapi/com/sun/star/awt/Rectangle \
+    offapi/com/sun/star/awt/ScrollBarOrientation \
+    offapi/com/sun/star/awt/Selection \
+    offapi/com/sun/star/awt/SimpleFontMetric \
+    offapi/com/sun/star/awt/Size \
+    offapi/com/sun/star/awt/SpinEvent \
+    offapi/com/sun/star/awt/Style \
+    offapi/com/sun/star/awt/SystemDependentXWindow \
+    offapi/com/sun/star/awt/SystemPointer \
+    offapi/com/sun/star/awt/TextAlign \
+    offapi/com/sun/star/awt/TextEvent \
+    offapi/com/sun/star/awt/VclContainerEvent \
+    offapi/com/sun/star/awt/VclWindowPeerAttribute \
+    offapi/com/sun/star/awt/VisualEffect \
+    offapi/com/sun/star/awt/WindowAttribute \
+    offapi/com/sun/star/awt/WindowClass \
+    offapi/com/sun/star/awt/WindowDescriptor \
+    offapi/com/sun/star/awt/WindowEvent \
+    offapi/com/sun/star/awt/XActionListener \
+    offapi/com/sun/star/awt/XActivateListener \
+    offapi/com/sun/star/awt/XAdjustmentListener \
+    offapi/com/sun/star/awt/XAnimatedImages \
+    offapi/com/sun/star/awt/XAnimation \
+    offapi/com/sun/star/awt/XBitmap \
+    offapi/com/sun/star/awt/XButton \
+    offapi/com/sun/star/awt/XCallback \
+    offapi/com/sun/star/awt/XCheckBox \
+    offapi/com/sun/star/awt/XComboBox \
+    offapi/com/sun/star/awt/XContainerWindowEventHandler \
+    offapi/com/sun/star/awt/XContainerWindowProvider \
+    offapi/com/sun/star/awt/XControl \
+    offapi/com/sun/star/awt/XControlContainer \
+    offapi/com/sun/star/awt/XControlModel \
+    offapi/com/sun/star/awt/XCurrencyField \
+    offapi/com/sun/star/awt/XDataTransferProviderAccess \
+    offapi/com/sun/star/awt/XDateField \
+    offapi/com/sun/star/awt/XDevice \
+    offapi/com/sun/star/awt/XDialog \
+    offapi/com/sun/star/awt/XDialog2 \
+    offapi/com/sun/star/awt/XDialogEventHandler \
+    offapi/com/sun/star/awt/XDialogProvider \
+    offapi/com/sun/star/awt/XDialogProvider2 \
+    offapi/com/sun/star/awt/XDisplayBitmap \
+    offapi/com/sun/star/awt/XDisplayConnection \
+    offapi/com/sun/star/awt/XDockableWindow \
+    offapi/com/sun/star/awt/XDockableWindowListener \
+    offapi/com/sun/star/awt/XEnhancedMouseClickHandler \
+    offapi/com/sun/star/awt/XEventHandler \
+    offapi/com/sun/star/awt/XExtendedToolkit \
+    offapi/com/sun/star/awt/XFileDialog \
+    offapi/com/sun/star/awt/XFixedHyperlink \
+    offapi/com/sun/star/awt/XFixedText \
+    offapi/com/sun/star/awt/XFocusListener \
+    offapi/com/sun/star/awt/XFont \
+    offapi/com/sun/star/awt/XFont2 \
+    offapi/com/sun/star/awt/XGraphics \
+    offapi/com/sun/star/awt/XImageButton \
+    offapi/com/sun/star/awt/XImageConsumer \
+    offapi/com/sun/star/awt/XImageProducer \
+    offapi/com/sun/star/awt/XInfoPrinter \
+    offapi/com/sun/star/awt/XItemEventBroadcaster \
+    offapi/com/sun/star/awt/XItemList \
+    offapi/com/sun/star/awt/XItemListListener \
+    offapi/com/sun/star/awt/XItemListener \
+    offapi/com/sun/star/awt/XKeyHandler \
+    offapi/com/sun/star/awt/XKeyListener \
+    offapi/com/sun/star/awt/XLayoutConstrains \
+    offapi/com/sun/star/awt/XLayoutContainer \
+    offapi/com/sun/star/awt/XLayoutFlow \
+    offapi/com/sun/star/awt/XLayoutRoot \
+    offapi/com/sun/star/awt/XLayoutUnit \
+    offapi/com/sun/star/awt/XListBox \
+    offapi/com/sun/star/awt/XMenu \
+    offapi/com/sun/star/awt/XMenuBar \
+    offapi/com/sun/star/awt/XMenuBarExtended \
+    offapi/com/sun/star/awt/XMenuExtended \
+    offapi/com/sun/star/awt/XMenuExtended2 \
+    offapi/com/sun/star/awt/XMenuListener \
+    offapi/com/sun/star/awt/XMessageBox \
+    offapi/com/sun/star/awt/XMessageBoxFactory \
+    offapi/com/sun/star/awt/XMetricField \
+    offapi/com/sun/star/awt/XMouseClickHandler \
+    offapi/com/sun/star/awt/XMouseListener \
+    offapi/com/sun/star/awt/XMouseMotionHandler \
+    offapi/com/sun/star/awt/XMouseMotionListener \
+    offapi/com/sun/star/awt/XNumericField \
+    offapi/com/sun/star/awt/XPaintListener \
+    offapi/com/sun/star/awt/XPatternField \
+    offapi/com/sun/star/awt/XPointer \
+    offapi/com/sun/star/awt/XPopupMenu \
+    offapi/com/sun/star/awt/XPopupMenuExtended \
+    offapi/com/sun/star/awt/XPrinter \
+    offapi/com/sun/star/awt/XPrinterPropertySet \
+    offapi/com/sun/star/awt/XPrinterServer \
+    offapi/com/sun/star/awt/XProgressBar \
+    offapi/com/sun/star/awt/XProgressMonitor \
+    offapi/com/sun/star/awt/XRadioButton \
+    offapi/com/sun/star/awt/XRegion \
+    offapi/com/sun/star/awt/XRequestCallback \
+    offapi/com/sun/star/awt/XReschedule \
+    offapi/com/sun/star/awt/XScrollBar \
+    offapi/com/sun/star/awt/XSimpleAnimation \
+    offapi/com/sun/star/awt/XSimpleTabController \
+    offapi/com/sun/star/awt/XSpinField \
+    offapi/com/sun/star/awt/XSpinListener \
+    offapi/com/sun/star/awt/XSpinValue \
+    offapi/com/sun/star/awt/XStyleChangeListener \
+    offapi/com/sun/star/awt/XStyleSettings \
+    offapi/com/sun/star/awt/XStyleSettingsSupplier \
+    offapi/com/sun/star/awt/XSystemChildFactory \
+    offapi/com/sun/star/awt/XSystemDependentMenuPeer \
+    offapi/com/sun/star/awt/XSystemDependentWindowPeer \
+    offapi/com/sun/star/awt/XTabController \
+    offapi/com/sun/star/awt/XTabControllerModel \
+    offapi/com/sun/star/awt/XTabListener \
+    offapi/com/sun/star/awt/XTextArea \
+    offapi/com/sun/star/awt/XTextComponent \
+    offapi/com/sun/star/awt/XTextEditField \
+    offapi/com/sun/star/awt/XTextLayoutConstrains \
+    offapi/com/sun/star/awt/XTextListener \
+    offapi/com/sun/star/awt/XThrobber \
+    offapi/com/sun/star/awt/XTimeField \
+    offapi/com/sun/star/awt/XToggleButton \
+    offapi/com/sun/star/awt/XToolkit \
+    offapi/com/sun/star/awt/XTopWindow \
+    offapi/com/sun/star/awt/XTopWindow2 \
+    offapi/com/sun/star/awt/XTopWindowListener \
+    offapi/com/sun/star/awt/XUnitConversion \
+    offapi/com/sun/star/awt/XUnoControlContainer \
+    offapi/com/sun/star/awt/XUserInputInterception \
+    offapi/com/sun/star/awt/XVclContainer \
+    offapi/com/sun/star/awt/XVclContainerListener \
+    offapi/com/sun/star/awt/XVclContainerPeer \
+    offapi/com/sun/star/awt/XVclWindowPeer \
+    offapi/com/sun/star/awt/XView \
+    offapi/com/sun/star/awt/XWindow \
+    offapi/com/sun/star/awt/XWindow2 \
+    offapi/com/sun/star/awt/XWindowListener \
+    offapi/com/sun/star/awt/XWindowListener2 \
+    offapi/com/sun/star/awt/XWindowPeer \
+    offapi/com/sun/star/awt/grid/GridColumnEvent \
+    offapi/com/sun/star/awt/grid/GridDataEvent \
+    offapi/com/sun/star/awt/grid/GridInvalidDataException \
+    offapi/com/sun/star/awt/grid/GridInvalidModelException \
+    offapi/com/sun/star/awt/grid/GridSelectionEvent \
+    offapi/com/sun/star/awt/grid/SelectionEventType \
+    offapi/com/sun/star/awt/grid/XGridColumn \
+    offapi/com/sun/star/awt/grid/XGridColumnListener \
+    offapi/com/sun/star/awt/grid/XGridColumnModel \
+    offapi/com/sun/star/awt/grid/XGridControl \
+    offapi/com/sun/star/awt/grid/XGridDataListener \
+    offapi/com/sun/star/awt/grid/XGridDataModel \
+    offapi/com/sun/star/awt/grid/XGridSelection \
+    offapi/com/sun/star/awt/grid/XGridSelectionListener \
+    offapi/com/sun/star/awt/grid/XMutableGridDataModel \
+    offapi/com/sun/star/awt/grid/XMutableGridDataModel \
+    offapi/com/sun/star/awt/grid/XSortableGridData \
+    offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel \
+    offapi/com/sun/star/awt/tab/TabPageActivatedEvent \
+    offapi/com/sun/star/awt/tab/XTabPage \
+    offapi/com/sun/star/awt/tab/XTabPageContainer \
+    offapi/com/sun/star/awt/tab/XTabPageContainerListener \
+    offapi/com/sun/star/awt/tab/XTabPageContainerModel \
+    offapi/com/sun/star/awt/tab/XTabPageModel \
+    offapi/com/sun/star/awt/tree/ExpandVetoException \
+    offapi/com/sun/star/awt/tree/TreeDataModelEvent \
+    offapi/com/sun/star/awt/tree/TreeExpansionEvent \
+    offapi/com/sun/star/awt/tree/XMutableTreeDataModel \
+    offapi/com/sun/star/awt/tree/XMutableTreeNode \
+    offapi/com/sun/star/awt/tree/XTreeControl \
+    offapi/com/sun/star/awt/tree/XTreeDataModel \
+    offapi/com/sun/star/awt/tree/XTreeDataModelListener \
+    offapi/com/sun/star/awt/tree/XTreeEditListener \
+    offapi/com/sun/star/awt/tree/XTreeExpansionListener \
+    offapi/com/sun/star/awt/tree/XTreeNode \
+    offapi/com/sun/star/chart/ChartAxisArrangeOrderType \
+    offapi/com/sun/star/chart/ChartAxisAssign \
+    offapi/com/sun/star/chart/ChartAxisLabelPosition \
+    offapi/com/sun/star/chart/ChartAxisMarkPosition \
+    offapi/com/sun/star/chart/ChartAxisMarks \
+    offapi/com/sun/star/chart/ChartAxisPosition \
+    offapi/com/sun/star/chart/ChartAxisType \
+    offapi/com/sun/star/chart/ChartDataCaption \
+    offapi/com/sun/star/chart/ChartDataChangeEvent \
+    offapi/com/sun/star/chart/ChartDataChangeType \
+    offapi/com/sun/star/chart/ChartDataPoint \
+    offapi/com/sun/star/chart/ChartDataRow \
+    offapi/com/sun/star/chart/ChartDataRowSource \
+    offapi/com/sun/star/chart/ChartDataValue \
+    offapi/com/sun/star/chart/ChartErrorCategory \
+    offapi/com/sun/star/chart/ChartErrorIndicatorType \
+    offapi/com/sun/star/chart/ChartLegendExpansion \
+    offapi/com/sun/star/chart/ChartLegendPosition \
+    offapi/com/sun/star/chart/ChartRegressionCurveType \
+    offapi/com/sun/star/chart/ChartSeriesAddress \
+    offapi/com/sun/star/chart/ChartSolidType \
+    offapi/com/sun/star/chart/ChartSymbolType \
+    offapi/com/sun/star/chart/DataLabelPlacement \
+    offapi/com/sun/star/chart/ErrorBarStyle \
+    offapi/com/sun/star/chart/MissingValueTreatment \
+    offapi/com/sun/star/chart/TimeIncrement \
+    offapi/com/sun/star/chart/TimeInterval \
+    offapi/com/sun/star/chart/TimeUnit \
+    offapi/com/sun/star/chart/X3DDefaultSetter \
+    offapi/com/sun/star/chart/X3DDisplay \
+    offapi/com/sun/star/chart/XAxis \
+    offapi/com/sun/star/chart/XAxisSupplier \
+    offapi/com/sun/star/chart/XAxisXSupplier \
+    offapi/com/sun/star/chart/XAxisYSupplier \
+    offapi/com/sun/star/chart/XAxisZSupplier \
+    offapi/com/sun/star/chart/XChartData \
+    offapi/com/sun/star/chart/XChartDataArray \
+    offapi/com/sun/star/chart/XChartDataChangeEventListener \
+    offapi/com/sun/star/chart/XChartDocument \
+    offapi/com/sun/star/chart/XComplexDescriptionAccess \
+    offapi/com/sun/star/chart/XDateCategories \
+    offapi/com/sun/star/chart/XDiagram \
+    offapi/com/sun/star/chart/XDiagramPositioning \
+    offapi/com/sun/star/chart/XSecondAxisTitleSupplier \
+    offapi/com/sun/star/chart/XStatisticDisplay \
+    offapi/com/sun/star/chart/XTwoAxisXSupplier \
+    offapi/com/sun/star/chart/XTwoAxisYSupplier \
+    offapi/com/sun/star/chart2/AxisOrientation \
+    offapi/com/sun/star/chart2/AxisType \
+    offapi/com/sun/star/chart2/CoordinateSystemTypeID \
+    offapi/com/sun/star/chart2/CurveStyle \
+    offapi/com/sun/star/chart2/DataPointGeometry3D \
+    offapi/com/sun/star/chart2/DataPointLabel \
+    offapi/com/sun/star/chart2/FillBitmap \
+    offapi/com/sun/star/chart2/IncrementData \
+    offapi/com/sun/star/chart2/InterpretedData \
+    offapi/com/sun/star/chart2/LegendPosition \
+    offapi/com/sun/star/chart2/LightSource \
+    offapi/com/sun/star/chart2/PieChartOffsetMode \
+    offapi/com/sun/star/chart2/RelativePosition \
+    offapi/com/sun/star/chart2/RelativeSize \
+    offapi/com/sun/star/chart2/ScaleData \
+    offapi/com/sun/star/chart2/StackingDirection \
+    offapi/com/sun/star/chart2/SubIncrement \
+    offapi/com/sun/star/chart2/Symbol \
+    offapi/com/sun/star/chart2/SymbolStyle \
+    offapi/com/sun/star/chart2/TickmarkStyle \
+    offapi/com/sun/star/chart2/TransparencyStyle \
+    offapi/com/sun/star/chart2/XAnyDescriptionAccess \
+    offapi/com/sun/star/chart2/XAxis \
+    offapi/com/sun/star/chart2/XChartDocument \
+    offapi/com/sun/star/chart2/XChartShape \
+    offapi/com/sun/star/chart2/XChartShapeContainer \
+    offapi/com/sun/star/chart2/XChartType \
+    offapi/com/sun/star/chart2/XChartTypeContainer \
+    offapi/com/sun/star/chart2/XChartTypeManager \
+    offapi/com/sun/star/chart2/XChartTypeTemplate \
+    offapi/com/sun/star/chart2/XColorScheme \
+    offapi/com/sun/star/chart2/XCoordinateSystem \
+    offapi/com/sun/star/chart2/XCoordinateSystemContainer \
+    offapi/com/sun/star/chart2/XDataInterpreter \
+    offapi/com/sun/star/chart2/XDataSeries \
+    offapi/com/sun/star/chart2/XDataSeriesContainer \
+    offapi/com/sun/star/chart2/XDefaultSizeTransmitter \
+    offapi/com/sun/star/chart2/XDiagram \
+    offapi/com/sun/star/chart2/XDiagramProvider \
+    offapi/com/sun/star/chart2/XFormattedString \
+    offapi/com/sun/star/chart2/XInternalDataProvider \
+    offapi/com/sun/star/chart2/XLabeled \
+    offapi/com/sun/star/chart2/XLegend \
+    offapi/com/sun/star/chart2/XRegressionCurve \
+    offapi/com/sun/star/chart2/XRegressionCurveCalculator \
+    offapi/com/sun/star/chart2/XRegressionCurveContainer \
+    offapi/com/sun/star/chart2/XScaling \
+    offapi/com/sun/star/chart2/XTarget \
+    offapi/com/sun/star/chart2/XTitle \
+    offapi/com/sun/star/chart2/XTitled \
+    offapi/com/sun/star/chart2/XTransformation \
+    offapi/com/sun/star/chart2/data/DataSequenceRole \
+    offapi/com/sun/star/chart2/data/HighlightedRange \
+    offapi/com/sun/star/chart2/data/LabelOrigin \
+    offapi/com/sun/star/chart2/data/XDataProvider \
+    offapi/com/sun/star/chart2/data/XDataReceiver \
+    offapi/com/sun/star/chart2/data/XDataSequence \
+    offapi/com/sun/star/chart2/data/XDataSink \
+    offapi/com/sun/star/chart2/data/XDataSource \
+    offapi/com/sun/star/chart2/data/XDatabaseDataProvider \
+    offapi/com/sun/star/chart2/data/XLabeledDataSequence \
+    offapi/com/sun/star/chart2/data/XNumericalDataSequence \
+    offapi/com/sun/star/chart2/data/XRangeHighlighter \
+    offapi/com/sun/star/chart2/data/XRangeXMLConversion \
+    offapi/com/sun/star/chart2/data/XTextualDataSequence \
+    offapi/com/sun/star/configuration/CannotLoadConfigurationException \
+    offapi/com/sun/star/configuration/CorruptedConfigurationException \
+    offapi/com/sun/star/configuration/CorruptedUIConfigurationException \
+    offapi/com/sun/star/configuration/InstallationIncompleteException \
+    offapi/com/sun/star/configuration/InvalidBootstrapFileException \
+    offapi/com/sun/star/configuration/MissingBootstrapFileException \
+    offapi/com/sun/star/configuration/XTemplateContainer \
+    offapi/com/sun/star/configuration/XTemplateInstance \
+    offapi/com/sun/star/configuration/XUpdate \
+    offapi/com/sun/star/configuration/backend/AuthenticationFailedException \
+    offapi/com/sun/star/configuration/backend/BackendAccessException \
+    offapi/com/sun/star/configuration/backend/BackendSetupException \
+    offapi/com/sun/star/configuration/backend/CannotConnectException \
+    offapi/com/sun/star/configuration/backend/ComponentChangeEvent \
+    offapi/com/sun/star/configuration/backend/ConnectionLostException \
+    offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException \
+    offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException \
+    offapi/com/sun/star/configuration/backend/MalformedDataException \
+    offapi/com/sun/star/configuration/backend/MergeRecoveryRequest \
+    offapi/com/sun/star/configuration/backend/NodeAttribute \
+    offapi/com/sun/star/configuration/backend/PropertyInfo \
+    offapi/com/sun/star/configuration/backend/SchemaAttribute \
+    offapi/com/sun/star/configuration/backend/StratumCreationException \
+    offapi/com/sun/star/configuration/backend/TemplateIdentifier \
+    offapi/com/sun/star/configuration/backend/XBackend \
+    offapi/com/sun/star/configuration/backend/XBackendChangesListener \
+    offapi/com/sun/star/configuration/backend/XBackendChangesNotifier \
+    offapi/com/sun/star/configuration/backend/XBackendEntities \
+    offapi/com/sun/star/configuration/backend/XCompositeLayer \
+    offapi/com/sun/star/configuration/backend/XLayer \
+    offapi/com/sun/star/configuration/backend/XLayerContentDescriber \
+    offapi/com/sun/star/configuration/backend/XLayerHandler \
+    offapi/com/sun/star/configuration/backend/XLayerImporter \
+    offapi/com/sun/star/configuration/backend/XMultiLayerStratum \
+    offapi/com/sun/star/configuration/backend/XSchema \
+    offapi/com/sun/star/configuration/backend/XSchemaHandler \
+    offapi/com/sun/star/configuration/backend/XSchemaSupplier \
+    offapi/com/sun/star/configuration/backend/XSingleLayerStratum \
+    offapi/com/sun/star/configuration/backend/XUpdatableLayer \
+    offapi/com/sun/star/configuration/backend/XUpdateHandler \
+    offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier \
+    offapi/com/sun/star/datatransfer/DataFlavor \
+    offapi/com/sun/star/datatransfer/UnsupportedFlavorException \
+    offapi/com/sun/star/datatransfer/XDataFormatTranslator \
+    offapi/com/sun/star/datatransfer/XMimeContentType \
+    offapi/com/sun/star/datatransfer/XMimeContentTypeFactory \
+    offapi/com/sun/star/datatransfer/XSystemTransferable \
+    offapi/com/sun/star/datatransfer/XTransferDataAccess \
+    offapi/com/sun/star/datatransfer/XTransferable \
+    offapi/com/sun/star/datatransfer/XTransferableEx \
+    offapi/com/sun/star/datatransfer/XTransferableSource \
+    offapi/com/sun/star/datatransfer/XTransferableSupplier \
+    offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent \
+    offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities \
+    offapi/com/sun/star/datatransfer/clipboard/XClipboard \
+    offapi/com/sun/star/datatransfer/clipboard/XClipboardEx \
+    offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory \
+    offapi/com/sun/star/datatransfer/clipboard/XClipboardListener \
+    offapi/com/sun/star/datatransfer/clipboard/XClipboardManager \
+    offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier \
+    offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner \
+    offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard \
+    offapi/com/sun/star/datatransfer/dnd/DNDConstants \
+    offapi/com/sun/star/datatransfer/dnd/DragGestureEvent \
+    offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent \
+    offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent \
+    offapi/com/sun/star/datatransfer/dnd/DragSourceEvent \
+    offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent \
+    offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent \
+    offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent \
+    offapi/com/sun/star/datatransfer/dnd/DropTargetEvent \
+    offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException \
+    offapi/com/sun/star/datatransfer/dnd/XAutoscroll \
+    offapi/com/sun/star/datatransfer/dnd/XDragGestureListener \
+    offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer \
+    offapi/com/sun/star/datatransfer/dnd/XDragSource \
+    offapi/com/sun/star/datatransfer/dnd/XDragSourceContext \
+    offapi/com/sun/star/datatransfer/dnd/XDragSourceListener \
+    offapi/com/sun/star/datatransfer/dnd/XDropTarget \
+    offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext \
+    offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext \
+    offapi/com/sun/star/datatransfer/dnd/XDropTargetListener \
+    offapi/com/sun/star/deployment/DependencyException \
+    offapi/com/sun/star/deployment/DeploymentException \
+    offapi/com/sun/star/deployment/ExtensionRemovedException \
+    offapi/com/sun/star/deployment/InstallException \
+    offapi/com/sun/star/deployment/InvalidRemovedParameterException \
+    offapi/com/sun/star/deployment/LicenseException \
+    offapi/com/sun/star/deployment/PlatformException \
+    offapi/com/sun/star/deployment/Prerequisites \
+    offapi/com/sun/star/deployment/UpdateInformationEntry \
+    offapi/com/sun/star/deployment/VersionException \
+    offapi/com/sun/star/deployment/XExtensionManager \
+    offapi/com/sun/star/deployment/XPackage \
+    offapi/com/sun/star/deployment/XPackageInformationProvider \
+    offapi/com/sun/star/deployment/XPackageManager \
+    offapi/com/sun/star/deployment/XPackageManagerFactory \
+    offapi/com/sun/star/deployment/XPackageRegistry \
+    offapi/com/sun/star/deployment/XPackageTypeInfo \
+    offapi/com/sun/star/deployment/XUpdateInformationProvider \
+    offapi/com/sun/star/document/AmbigousFilterRequest \
+    offapi/com/sun/star/document/BrokenPackageRequest \
+    offapi/com/sun/star/document/ChangedByOthersRequest \
+    offapi/com/sun/star/document/CorruptedFilterConfigurationException \
+    offapi/com/sun/star/document/DocumentEvent \
+    offapi/com/sun/star/document/EmptyUndoStackException \
+    offapi/com/sun/star/document/EventObject \
+    offapi/com/sun/star/document/FilterOptionsRequest \
+    offapi/com/sun/star/document/LinkUpdateModes \
+    offapi/com/sun/star/document/LockFileIgnoreRequest \
+    offapi/com/sun/star/document/LockedDocumentRequest \
+    offapi/com/sun/star/document/LockedOnSavingRequest \
+    offapi/com/sun/star/document/MacroExecMode \
+    offapi/com/sun/star/document/NoSuchFilterRequest \
+    offapi/com/sun/star/document/OwnLockOnDocumentRequest \
+    offapi/com/sun/star/document/PrinterIndependentLayout \
+    offapi/com/sun/star/document/RedlineDisplayType \
+    offapi/com/sun/star/document/UndoContextNotClosedException \
+    offapi/com/sun/star/document/UndoFailedException \
+    offapi/com/sun/star/document/UndoManagerEvent \
+    offapi/com/sun/star/document/UpdateDocMode \
+    offapi/com/sun/star/document/XActionLockable \
+    offapi/com/sun/star/document/XBinaryStreamResolver \
+    offapi/com/sun/star/document/XCodeNameQuery \
+    offapi/com/sun/star/document/XCompatWriterDocProperties \
+    offapi/com/sun/star/document/XDocumentEventBroadcaster \
+    offapi/com/sun/star/document/XDocumentEventListener \
+    offapi/com/sun/star/document/XDocumentInfo \
+    offapi/com/sun/star/document/XDocumentInfoSupplier \
+    offapi/com/sun/star/document/XDocumentInsertable \
+    offapi/com/sun/star/document/XDocumentLanguages \
+    offapi/com/sun/star/document/XDocumentProperties \
+    offapi/com/sun/star/document/XDocumentPropertiesSupplier \
+    offapi/com/sun/star/document/XDocumentRecovery \
+    offapi/com/sun/star/document/XDocumentRevisionListPersistence \
+    offapi/com/sun/star/document/XDocumentSubStorageSupplier \
+    offapi/com/sun/star/document/XEmbeddedObjectResolver \
+    offapi/com/sun/star/document/XEmbeddedObjectSupplier \
+    offapi/com/sun/star/document/XEmbeddedObjectSupplier2 \
+    offapi/com/sun/star/document/XEmbeddedScripts \
+    offapi/com/sun/star/document/XEventBroadcaster \
+    offapi/com/sun/star/document/XEventListener \
+    offapi/com/sun/star/document/XEventsSupplier \
+    offapi/com/sun/star/document/XExporter \
+    offapi/com/sun/star/document/XExtendedFilterDetection \
+    offapi/com/sun/star/document/XFilter \
+    offapi/com/sun/star/document/XFilterAdapter \
+    offapi/com/sun/star/document/XGraphicObjectResolver \
+    offapi/com/sun/star/document/XImporter \
+    offapi/com/sun/star/document/XInteractionFilterOptions \
+    offapi/com/sun/star/document/XInteractionFilterSelect \
+    offapi/com/sun/star/document/XLinkTargetSupplier \
+    offapi/com/sun/star/document/XMimeTypeInfo \
+    offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter \
+    offapi/com/sun/star/document/XRedlinesSupplier \
+    offapi/com/sun/star/document/XScriptInvocationContext \
+    offapi/com/sun/star/document/XStandaloneDocumentInfo \
+    offapi/com/sun/star/document/XStorageBasedDocument \
+    offapi/com/sun/star/document/XStorageChangeListener \
+    offapi/com/sun/star/document/XTypeDetection \
+    offapi/com/sun/star/document/XUndoAction \
+    offapi/com/sun/star/document/XUndoManager \
+    offapi/com/sun/star/document/XUndoManagerListener \
+    offapi/com/sun/star/document/XUndoManagerSupplier \
+    offapi/com/sun/star/document/XVbaMethodParameter \
+    offapi/com/sun/star/document/XViewDataSupplier \
+    offapi/com/sun/star/drawing/Alignment \
+    offapi/com/sun/star/drawing/Arrangement \
+    offapi/com/sun/star/drawing/BezierPoint \
+    offapi/com/sun/star/drawing/BitmapMode \
+    offapi/com/sun/star/drawing/BoundVolume \
+    offapi/com/sun/star/drawing/CameraGeometry \
+    offapi/com/sun/star/drawing/CanvasFeature \
+    offapi/com/sun/star/drawing/CaptionEscapeDirection \
+    offapi/com/sun/star/drawing/CaptionType \
+    offapi/com/sun/star/drawing/CircleKind \
+    offapi/com/sun/star/drawing/ColorMode \
+    offapi/com/sun/star/drawing/ConnectionType \
+    offapi/com/sun/star/drawing/ConnectorType \
+    offapi/com/sun/star/drawing/CoordinateSequence \
+    offapi/com/sun/star/drawing/CoordinateSequenceSequence \
+    offapi/com/sun/star/drawing/DashStyle \
+    offapi/com/sun/star/drawing/Direction3D \
+    offapi/com/sun/star/drawing/DoubleSequence \
+    offapi/com/sun/star/drawing/DoubleSequenceSequence \
+    offapi/com/sun/star/drawing/DrawViewMode \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeParameter \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeParameterType \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeSegment \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame \
+    offapi/com/sun/star/drawing/EnhancedCustomShapeTextPathMode \
+    offapi/com/sun/star/drawing/EscapeDirection \
+    offapi/com/sun/star/drawing/FillStyle \
+    offapi/com/sun/star/drawing/FlagSequence \
+    offapi/com/sun/star/drawing/FlagSequenceSequence \
+    offapi/com/sun/star/drawing/GluePoint \
+    offapi/com/sun/star/drawing/GluePoint2 \
+    offapi/com/sun/star/drawing/GraphicFilterRequest \
+    offapi/com/sun/star/drawing/Hatch \
+    offapi/com/sun/star/drawing/HatchStyle \
+    offapi/com/sun/star/drawing/HomogenMatrix \
+    offapi/com/sun/star/drawing/HomogenMatrix3 \
+    offapi/com/sun/star/drawing/HomogenMatrix4 \
+    offapi/com/sun/star/drawing/HomogenMatrixLine \
+    offapi/com/sun/star/drawing/HomogenMatrixLine3 \
+    offapi/com/sun/star/drawing/HomogenMatrixLine4 \
+    offapi/com/sun/star/drawing/HorizontalDimensioning \
+    offapi/com/sun/star/drawing/LayerType \
+    offapi/com/sun/star/drawing/LineDash \
+    offapi/com/sun/star/drawing/LineEndType \
+    offapi/com/sun/star/drawing/LineJoint \
+    offapi/com/sun/star/drawing/LineStyle \
+    offapi/com/sun/star/drawing/MeasureKind \
+    offapi/com/sun/star/drawing/MeasureTextHorzPos \
+    offapi/com/sun/star/drawing/MeasureTextVertPos \
+    offapi/com/sun/star/drawing/MirrorAxis \
+    offapi/com/sun/star/drawing/NormalsKind \
+    offapi/com/sun/star/drawing/PointSequence \
+    offapi/com/sun/star/drawing/PointSequenceSequence \
+    offapi/com/sun/star/drawing/PolyPolygonBezierCoords \
+    offapi/com/sun/star/drawing/PolyPolygonShape3D \
+    offapi/com/sun/star/drawing/PolygonFlags \
+    offapi/com/sun/star/drawing/PolygonKind \
+    offapi/com/sun/star/drawing/Position3D \
+    offapi/com/sun/star/drawing/ProjectionMode \
+    offapi/com/sun/star/drawing/RectanglePoint \
+    offapi/com/sun/star/drawing/ShadeMode \
+    offapi/com/sun/star/drawing/SnapObjectType \
+    offapi/com/sun/star/drawing/TextAdjust \
+    offapi/com/sun/star/drawing/TextAnimationDirection \
+    offapi/com/sun/star/drawing/TextAnimationKind \
+    offapi/com/sun/star/drawing/TextFitToSizeType \
+    offapi/com/sun/star/drawing/TextHorizontalAdjust \
+    offapi/com/sun/star/drawing/TextVerticalAdjust \
+    offapi/com/sun/star/drawing/TextureKind \
+    offapi/com/sun/star/drawing/TextureKind2 \
+    offapi/com/sun/star/drawing/TextureMode \
+    offapi/com/sun/star/drawing/TextureProjectionMode \
+    offapi/com/sun/star/drawing/VerticalDimensioning \
+    offapi/com/sun/star/drawing/XConnectableShape \
+    offapi/com/sun/star/drawing/XConnectorShape \
+    offapi/com/sun/star/drawing/XControlShape \
+    offapi/com/sun/star/drawing/XCustomShapeEngine \
+    offapi/com/sun/star/drawing/XCustomShapeHandle \
+    offapi/com/sun/star/drawing/XDrawPage \
+    offapi/com/sun/star/drawing/XDrawPageDuplicator \
+    offapi/com/sun/star/drawing/XDrawPageExpander \
+    offapi/com/sun/star/drawing/XDrawPageSummarizer \
+    offapi/com/sun/star/drawing/XDrawPageSupplier \
+    offapi/com/sun/star/drawing/XDrawPages \
+    offapi/com/sun/star/drawing/XDrawPagesSupplier \
+    offapi/com/sun/star/drawing/XDrawSubController \
+    offapi/com/sun/star/drawing/XDrawView \
+    offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter \
+    offapi/com/sun/star/drawing/XGluePointsSupplier \
+    offapi/com/sun/star/drawing/XLayer \
+    offapi/com/sun/star/drawing/XLayerManager \
+    offapi/com/sun/star/drawing/XLayerSupplier \
+    offapi/com/sun/star/drawing/XMasterPageTarget \
+    offapi/com/sun/star/drawing/XMasterPagesSupplier \
+    offapi/com/sun/star/drawing/XPresenterHelper \
+    offapi/com/sun/star/drawing/XSelectionFunction \
+    offapi/com/sun/star/drawing/XShape \
+    offapi/com/sun/star/drawing/XShapeAligner \
+    offapi/com/sun/star/drawing/XShapeArranger \
+    offapi/com/sun/star/drawing/XShapeBinder \
+    offapi/com/sun/star/drawing/XShapeCombiner \
+    offapi/com/sun/star/drawing/XShapeDescriptor \
+    offapi/com/sun/star/drawing/XShapeGroup \
+    offapi/com/sun/star/drawing/XShapeGrouper \
+    offapi/com/sun/star/drawing/XShapeMirror \
+    offapi/com/sun/star/drawing/XShapes \
+    offapi/com/sun/star/drawing/XSlidePreviewCache \
+    offapi/com/sun/star/drawing/XSlidePreviewCacheListener \
+    offapi/com/sun/star/drawing/XSlideRenderer \
+    offapi/com/sun/star/drawing/XSlideSorterBase \
+    offapi/com/sun/star/drawing/XUniversalShapeDescriptor \
+    offapi/com/sun/star/drawing/framework/AnchorBindingMode \
+    offapi/com/sun/star/drawing/framework/BorderType \
+    offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent \
+    offapi/com/sun/star/drawing/framework/ResourceActivationMode \
+    offapi/com/sun/star/drawing/framework/TabBarButton \
+    offapi/com/sun/star/drawing/framework/XConfiguration \
+    offapi/com/sun/star/drawing/framework/XConfigurationChangeListener \
+    offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest \
+    offapi/com/sun/star/drawing/framework/XConfigurationController \
+    offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster \
+    offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue \
+    offapi/com/sun/star/drawing/framework/XControllerManager \
+    offapi/com/sun/star/drawing/framework/XModuleController \
+    offapi/com/sun/star/drawing/framework/XPane \
+    offapi/com/sun/star/drawing/framework/XPane2 \
+    offapi/com/sun/star/drawing/framework/XPaneBorderPainter \
+    offapi/com/sun/star/drawing/framework/XRelocatableResource \
+    offapi/com/sun/star/drawing/framework/XResource \
+    offapi/com/sun/star/drawing/framework/XResourceFactory \
+    offapi/com/sun/star/drawing/framework/XResourceFactoryManager \
+    offapi/com/sun/star/drawing/framework/XResourceId \
+    offapi/com/sun/star/drawing/framework/XTabBar \
+    offapi/com/sun/star/drawing/framework/XToolBar \
+    offapi/com/sun/star/drawing/framework/XView \
+    offapi/com/sun/star/embed/Actions \
+    offapi/com/sun/star/embed/Aspects \
+    offapi/com/sun/star/embed/ElementModes \
+    offapi/com/sun/star/embed/EmbedMapUnits \
+    offapi/com/sun/star/embed/EmbedMisc \
+    offapi/com/sun/star/embed/EmbedStates \
+    offapi/com/sun/star/embed/EmbedUpdateModes \
+    offapi/com/sun/star/embed/EmbedVerbs \
+    offapi/com/sun/star/embed/EntryInitModes \
+    offapi/com/sun/star/embed/InsertedObjectInfo \
+    offapi/com/sun/star/embed/InvalidStorageException \
+    offapi/com/sun/star/embed/LinkageMisuseException \
+    offapi/com/sun/star/embed/NeedsRunningStateException \
+    offapi/com/sun/star/embed/NoVisualAreaSizeException \
+    offapi/com/sun/star/embed/ObjectSaveVetoException \
+    offapi/com/sun/star/embed/StateChangeInProgressException \
+    offapi/com/sun/star/embed/StorageFormats \
+    offapi/com/sun/star/embed/StorageWrappedTargetException \
+    offapi/com/sun/star/embed/UnreachableStateException \
+    offapi/com/sun/star/embed/UseBackupException \
+    offapi/com/sun/star/embed/VerbAttributes \
+    offapi/com/sun/star/embed/VerbDescriptor \
+    offapi/com/sun/star/embed/VisualRepresentation \
+    offapi/com/sun/star/embed/WrongStateException \
+    offapi/com/sun/star/embed/XActionsApproval \
+    offapi/com/sun/star/embed/XClassifiedObject \
+    offapi/com/sun/star/embed/XCommonEmbedPersist \
+    offapi/com/sun/star/embed/XComponentSupplier \
+    offapi/com/sun/star/embed/XEmbedObjectClipboardCreator \
+    offapi/com/sun/star/embed/XEmbedObjectCreator \
+    offapi/com/sun/star/embed/XEmbedObjectFactory \
+    offapi/com/sun/star/embed/XEmbedPersist \
+    offapi/com/sun/star/embed/XEmbeddedClient \
+    offapi/com/sun/star/embed/XEmbeddedObject \
+    offapi/com/sun/star/embed/XEncryptionProtectedSource \
+    offapi/com/sun/star/embed/XEncryptionProtectedSource2 \
+    offapi/com/sun/star/embed/XEncryptionProtectedStorage \
+    offapi/com/sun/star/embed/XExtendedStorageStream \
+    offapi/com/sun/star/embed/XHatchWindow \
+    offapi/com/sun/star/embed/XHatchWindowController \
+    offapi/com/sun/star/embed/XHatchWindowFactory \
+    offapi/com/sun/star/embed/XHierarchicalStorageAccess \
+    offapi/com/sun/star/embed/XHierarchicalStorageAccess2 \
+    offapi/com/sun/star/embed/XInplaceClient \
+    offapi/com/sun/star/embed/XInplaceObject \
+    offapi/com/sun/star/embed/XInsertObjectDialog \
+    offapi/com/sun/star/embed/XLinkCreator \
+    offapi/com/sun/star/embed/XLinkFactory \
+    offapi/com/sun/star/embed/XLinkageSupport \
+    offapi/com/sun/star/embed/XOLESimpleStorage \
+    offapi/com/sun/star/embed/XOptimizedStorage \
+    offapi/com/sun/star/embed/XPackageStructureCreator \
+    offapi/com/sun/star/embed/XPersistanceHolder \
+    offapi/com/sun/star/embed/XRelationshipAccess \
+    offapi/com/sun/star/embed/XStateChangeBroadcaster \
+    offapi/com/sun/star/embed/XStateChangeListener \
+    offapi/com/sun/star/embed/XStorage \
+    offapi/com/sun/star/embed/XStorage2 \
+    offapi/com/sun/star/embed/XStorageRawAccess \
+    offapi/com/sun/star/embed/XTransactedObject \
+    offapi/com/sun/star/embed/XTransactionBroadcaster \
+    offapi/com/sun/star/embed/XTransactionListener \
+    offapi/com/sun/star/embed/XTransferableSupplier \
+    offapi/com/sun/star/embed/XVisualObject \
+    offapi/com/sun/star/embed/XWindowSupplier \
+    offapi/com/sun/star/form/DataSelectionType \
+    offapi/com/sun/star/form/DatabaseDeleteEvent \
+    offapi/com/sun/star/form/DatabaseParameterEvent \
+    offapi/com/sun/star/form/ErrorEvent \
+    offapi/com/sun/star/form/FormButtonType \
+    offapi/com/sun/star/form/FormComponentType \
+    offapi/com/sun/star/form/FormSubmitEncoding \
+    offapi/com/sun/star/form/FormSubmitMethod \
+    offapi/com/sun/star/form/ListSourceType \
+    offapi/com/sun/star/form/NavigationBarMode \
+    offapi/com/sun/star/form/TabulatorCycle \
+    offapi/com/sun/star/form/XApproveActionBroadcaster \
+    offapi/com/sun/star/form/XApproveActionListener \
+    offapi/com/sun/star/form/XBoundComponent \
+    offapi/com/sun/star/form/XBoundControl \
+    offapi/com/sun/star/form/XChangeBroadcaster \
+    offapi/com/sun/star/form/XChangeListener \
+    offapi/com/sun/star/form/XConfirmDeleteBroadcaster \
+    offapi/com/sun/star/form/XConfirmDeleteListener \
+    offapi/com/sun/star/form/XDatabaseParameterBroadcaster \
+    offapi/com/sun/star/form/XDatabaseParameterBroadcaster2 \
+    offapi/com/sun/star/form/XDatabaseParameterListener \
+    offapi/com/sun/star/form/XDeleteListener \
+    offapi/com/sun/star/form/XErrorBroadcaster \
+    offapi/com/sun/star/form/XErrorListener \
+    offapi/com/sun/star/form/XForm \
+    offapi/com/sun/star/form/XFormComponent \
+    offapi/com/sun/star/form/XFormController \
+    offapi/com/sun/star/form/XFormControllerListener \
+    offapi/com/sun/star/form/XFormsSupplier \
+    offapi/com/sun/star/form/XFormsSupplier2 \
+    offapi/com/sun/star/form/XGrid \
+    offapi/com/sun/star/form/XGridColumnFactory \
+    offapi/com/sun/star/form/XGridControl \
+    offapi/com/sun/star/form/XGridControlListener \
+    offapi/com/sun/star/form/XGridFieldDataSupplier \
+    offapi/com/sun/star/form/XGridPeer \
+    offapi/com/sun/star/form/XImageProducerSupplier \
+    offapi/com/sun/star/form/XInsertListener \
+    offapi/com/sun/star/form/XLoadListener \
+    offapi/com/sun/star/form/XLoadable \
+    offapi/com/sun/star/form/XPositioningListener \
+    offapi/com/sun/star/form/XReset \
+    offapi/com/sun/star/form/XResetListener \
+    offapi/com/sun/star/form/XRestoreListener \
+    offapi/com/sun/star/form/XSubmit \
+    offapi/com/sun/star/form/XSubmitListener \
+    offapi/com/sun/star/form/XUpdateBroadcaster \
+    offapi/com/sun/star/form/XUpdateListener \
+    offapi/com/sun/star/form/binding/IncompatibleTypesException \
+    offapi/com/sun/star/form/binding/InvalidBindingStateException \
+    offapi/com/sun/star/form/binding/ListEntryEvent \
+    offapi/com/sun/star/form/binding/XBindableValue \
+    offapi/com/sun/star/form/binding/XListEntryListener \
+    offapi/com/sun/star/form/binding/XListEntrySink \
+    offapi/com/sun/star/form/binding/XListEntrySource \
+    offapi/com/sun/star/form/binding/XValueBinding \
+    offapi/com/sun/star/form/runtime/FeatureState \
+    offapi/com/sun/star/form/runtime/FilterEvent \
+    offapi/com/sun/star/form/runtime/FormFeature \
+    offapi/com/sun/star/form/runtime/XFeatureInvalidation \
+    offapi/com/sun/star/form/runtime/XFilterController \
+    offapi/com/sun/star/form/runtime/XFilterControllerListener \
+    offapi/com/sun/star/form/runtime/XFormController \
+    offapi/com/sun/star/form/runtime/XFormControllerContext \
+    offapi/com/sun/star/form/runtime/XFormOperations \
+    offapi/com/sun/star/form/submission/XSubmission \
+    offapi/com/sun/star/form/submission/XSubmissionSupplier \
+    offapi/com/sun/star/form/submission/XSubmissionVetoListener \
+    offapi/com/sun/star/form/validation/XFormComponentValidityListener \
+    offapi/com/sun/star/form/validation/XValidatable \
+    offapi/com/sun/star/form/validation/XValidatableFormComponent \
+    offapi/com/sun/star/form/validation/XValidator \
+    offapi/com/sun/star/form/validation/XValidityConstraintListener \
+    offapi/com/sun/star/formula/SymbolDescriptor \
+    offapi/com/sun/star/frame/BorderWidths \
+    offapi/com/sun/star/frame/CommandGroup \
+    offapi/com/sun/star/frame/ControlCommand \
+    offapi/com/sun/star/frame/ControlEvent \
+    offapi/com/sun/star/frame/DispatchDescriptor \
+    offapi/com/sun/star/frame/DispatchInformation \
+    offapi/com/sun/star/frame/DispatchResultEvent \
+    offapi/com/sun/star/frame/DispatchResultState \
+    offapi/com/sun/star/frame/DispatchStatement \
+    offapi/com/sun/star/frame/DoubleInitializationException \
+    offapi/com/sun/star/frame/FeatureStateEvent \
+    offapi/com/sun/star/frame/FrameAction \
+    offapi/com/sun/star/frame/FrameActionEvent \
+    offapi/com/sun/star/frame/FrameSearchFlag \
+    offapi/com/sun/star/frame/IllegalArgumentIOException \
+    offapi/com/sun/star/frame/LayoutManagerEvents \
+    offapi/com/sun/star/frame/TerminationVetoException \
+    offapi/com/sun/star/frame/TitleChangedEvent \
+    offapi/com/sun/star/frame/UnknownModuleException \
+    offapi/com/sun/star/frame/UntitledNumbersConst \
+    offapi/com/sun/star/frame/WindowArrange \
+    offapi/com/sun/star/frame/XBorderResizeListener \
+    offapi/com/sun/star/frame/XBrowseHistoryRegistry \
+    offapi/com/sun/star/frame/XComponentLoader \
+    offapi/com/sun/star/frame/XComponentRegistry \
+    offapi/com/sun/star/frame/XConfigManager \
+    offapi/com/sun/star/frame/XControlNotificationListener \
+    offapi/com/sun/star/frame/XController \
+    offapi/com/sun/star/frame/XController2 \
+    offapi/com/sun/star/frame/XControllerBorder \
+    offapi/com/sun/star/frame/XDesktop \
+    offapi/com/sun/star/frame/XDesktopTask \
+    offapi/com/sun/star/frame/XDispatch \
+    offapi/com/sun/star/frame/XDispatchHelper \
+    offapi/com/sun/star/frame/XDispatchInformationProvider \
+    offapi/com/sun/star/frame/XDispatchProvider \
+    offapi/com/sun/star/frame/XDispatchProviderInterception \
+    offapi/com/sun/star/frame/XDispatchProviderInterceptor \
+    offapi/com/sun/star/frame/XDispatchRecorder \
+    offapi/com/sun/star/frame/XDispatchRecorderSupplier \
+    offapi/com/sun/star/frame/XDispatchResultListener \
+    offapi/com/sun/star/frame/XDocumentTemplates \
+    offapi/com/sun/star/frame/XExtendedFilterDetection \
+    offapi/com/sun/star/frame/XFilterDetect \
+    offapi/com/sun/star/frame/XFrame \
+    offapi/com/sun/star/frame/XFrameActionListener \
+    offapi/com/sun/star/frame/XFrameLoader \
+    offapi/com/sun/star/frame/XFrameLoaderQuery \
+    offapi/com/sun/star/frame/XFrameSetModel \
+    offapi/com/sun/star/frame/XFrames \
+    offapi/com/sun/star/frame/XFramesSupplier \
+    offapi/com/sun/star/frame/XInplaceLayout \
+    offapi/com/sun/star/frame/XInterceptorInfo \
+    offapi/com/sun/star/frame/XLayoutManager \
+    offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster \
+    offapi/com/sun/star/frame/XLayoutManagerListener \
+    offapi/com/sun/star/frame/XLoadEventListener \
+    offapi/com/sun/star/frame/XLoadable \
+    offapi/com/sun/star/frame/XMenuBarAcceptor \
+    offapi/com/sun/star/frame/XMenuBarMergingAcceptor \
+    offapi/com/sun/star/frame/XModel \
+    offapi/com/sun/star/frame/XModel2 \
+    offapi/com/sun/star/frame/XModule \
+    offapi/com/sun/star/frame/XModuleManager \
+    offapi/com/sun/star/frame/XNotifyingDispatch \
+    offapi/com/sun/star/frame/XPopupMenuController \
+    offapi/com/sun/star/frame/XRecordableDispatch \
+    offapi/com/sun/star/frame/XSessionManagerClient \
+    offapi/com/sun/star/frame/XSessionManagerListener \
+    offapi/com/sun/star/frame/XSessionManagerListener2 \
+    offapi/com/sun/star/frame/XStatusListener \
+    offapi/com/sun/star/frame/XStatusbarController \
+    offapi/com/sun/star/frame/XStorable \
+    offapi/com/sun/star/frame/XStorable2 \
+    offapi/com/sun/star/frame/XSubToolbarController \
+    offapi/com/sun/star/frame/XSynchronousDispatch \
+    offapi/com/sun/star/frame/XSynchronousFrameLoader \
+    offapi/com/sun/star/frame/XTask \
+    offapi/com/sun/star/frame/XTasksSupplier \
+    offapi/com/sun/star/frame/XTerminateListener \
+    offapi/com/sun/star/frame/XTerminateListener2 \
+    offapi/com/sun/star/frame/XTitle \
+    offapi/com/sun/star/frame/XTitleChangeBroadcaster \
+    offapi/com/sun/star/frame/XTitleChangeListener \
+    offapi/com/sun/star/frame/XToolbarController \
+    offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory \
+    offapi/com/sun/star/frame/XUIControllerRegistration \
+    offapi/com/sun/star/frame/XUntitledNumbers \
+    offapi/com/sun/star/frame/XUrlList \
+    offapi/com/sun/star/frame/XWindowArranger \
+    offapi/com/sun/star/frame/status/ClipboardFormats \
+    offapi/com/sun/star/frame/status/FontHeight \
+    offapi/com/sun/star/frame/status/ItemState \
+    offapi/com/sun/star/frame/status/ItemStatus \
+    offapi/com/sun/star/frame/status/LeftRightMargin \
+    offapi/com/sun/star/frame/status/Template \
+    offapi/com/sun/star/frame/status/UpperLowerMargin \
+    offapi/com/sun/star/frame/status/UpperLowerMarginScale \
+    offapi/com/sun/star/frame/status/Verb \
+    offapi/com/sun/star/frame/status/Visibility \
+    offapi/com/sun/star/gallery/GalleryItemType \
+    offapi/com/sun/star/gallery/XGalleryItem \
+    offapi/com/sun/star/gallery/XGalleryTheme \
+    offapi/com/sun/star/gallery/XGalleryThemeProvider \
+    offapi/com/sun/star/geometry/AffineMatrix2D \
+    offapi/com/sun/star/geometry/AffineMatrix3D \
+    offapi/com/sun/star/geometry/EllipticalArc \
+    offapi/com/sun/star/geometry/IntegerBezierSegment2D \
+    offapi/com/sun/star/geometry/IntegerPoint2D \
+    offapi/com/sun/star/geometry/IntegerRectangle2D \
+    offapi/com/sun/star/geometry/IntegerSize2D \
+    offapi/com/sun/star/geometry/Matrix2D \
+    offapi/com/sun/star/geometry/RealBezierSegment2D \
+    offapi/com/sun/star/geometry/RealPoint2D \
+    offapi/com/sun/star/geometry/RealRectangle2D \
+    offapi/com/sun/star/geometry/RealRectangle3D \
+    offapi/com/sun/star/geometry/RealSize2D \
+    offapi/com/sun/star/geometry/XMapping2D \
+    offapi/com/sun/star/graphic/GraphicColorMode \
+    offapi/com/sun/star/graphic/GraphicType \
+    offapi/com/sun/star/graphic/XGraphic \
+    offapi/com/sun/star/graphic/XGraphicObject \
+    offapi/com/sun/star/graphic/XGraphicProvider \
+    offapi/com/sun/star/graphic/XGraphicRasterizer \
+    offapi/com/sun/star/graphic/XGraphicRenderer \
+    offapi/com/sun/star/graphic/XGraphicTransformer \
+    offapi/com/sun/star/graphic/XPrimitive2D \
+    offapi/com/sun/star/graphic/XPrimitive3D \
+    offapi/com/sun/star/graphic/XPrimitiveFactory2D \
+    offapi/com/sun/star/i18n/AmPmValue \
+    offapi/com/sun/star/i18n/Boundary \
+    offapi/com/sun/star/i18n/BreakType \
+    offapi/com/sun/star/i18n/CTLScriptType \
+    offapi/com/sun/star/i18n/Calendar \
+    offapi/com/sun/star/i18n/CalendarDisplayCode \
+    offapi/com/sun/star/i18n/CalendarDisplayIndex \
+    offapi/com/sun/star/i18n/CalendarFieldIndex \
+    offapi/com/sun/star/i18n/CalendarItem \
+    offapi/com/sun/star/i18n/CharType \
+    offapi/com/sun/star/i18n/CharacterIteratorMode \
+    offapi/com/sun/star/i18n/CollatorOptions \
+    offapi/com/sun/star/i18n/Currency \
+    offapi/com/sun/star/i18n/Currency2 \
+    offapi/com/sun/star/i18n/DirectionProperty \
+    offapi/com/sun/star/i18n/ForbiddenCharacters \
+    offapi/com/sun/star/i18n/FormatElement \
+    offapi/com/sun/star/i18n/Implementation \
+    offapi/com/sun/star/i18n/InputSequenceCheckMode \
+    offapi/com/sun/star/i18n/KCharacterType \
+    offapi/com/sun/star/i18n/KNumberFormatType \
+    offapi/com/sun/star/i18n/KNumberFormatUsage \
+    offapi/com/sun/star/i18n/KParseTokens \
+    offapi/com/sun/star/i18n/KParseType \
+    offapi/com/sun/star/i18n/LanguageCountryInfo \
+    offapi/com/sun/star/i18n/LineBreakHyphenationOptions \
+    offapi/com/sun/star/i18n/LineBreakResults \
+    offapi/com/sun/star/i18n/LineBreakUserOptions \
+    offapi/com/sun/star/i18n/LocaleDataItem \
+    offapi/com/sun/star/i18n/LocaleItem \
+    offapi/com/sun/star/i18n/Months \
+    offapi/com/sun/star/i18n/MultipleCharsOutputException \
+    offapi/com/sun/star/i18n/NativeNumberMode \
+    offapi/com/sun/star/i18n/NativeNumberXmlAttributes \
+    offapi/com/sun/star/i18n/NumberFormatCode \
+    offapi/com/sun/star/i18n/NumberFormatIndex \
+    offapi/com/sun/star/i18n/ParseResult \
+    offapi/com/sun/star/i18n/ScriptDirection \
+    offapi/com/sun/star/i18n/ScriptType \
+    offapi/com/sun/star/i18n/TextConversionOption \
+    offapi/com/sun/star/i18n/TextConversionResult \
+    offapi/com/sun/star/i18n/TextConversionType \
+    offapi/com/sun/star/i18n/TransliterationModules \
+    offapi/com/sun/star/i18n/TransliterationModulesExtra \
+    offapi/com/sun/star/i18n/TransliterationModulesNew \
+    offapi/com/sun/star/i18n/TransliterationType \
+    offapi/com/sun/star/i18n/UnicodeScript \
+    offapi/com/sun/star/i18n/UnicodeType \
+    offapi/com/sun/star/i18n/Weekdays \
+    offapi/com/sun/star/i18n/WordType \
+    offapi/com/sun/star/i18n/XBreakIterator \
+    offapi/com/sun/star/i18n/XCalendar \
+    offapi/com/sun/star/i18n/XCharacterClassification \
+    offapi/com/sun/star/i18n/XCollator \
+    offapi/com/sun/star/i18n/XExtendedCalendar \
+    offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier \
+    offapi/com/sun/star/i18n/XExtendedInputSequenceChecker \
+    offapi/com/sun/star/i18n/XExtendedTextConversion \
+    offapi/com/sun/star/i18n/XExtendedTransliteration \
+    offapi/com/sun/star/i18n/XForbiddenCharacters \
+    offapi/com/sun/star/i18n/XIndexEntrySupplier \
+    offapi/com/sun/star/i18n/XInputSequenceChecker \
+    offapi/com/sun/star/i18n/XLocaleData \
+    offapi/com/sun/star/i18n/XLocaleData2 \
+    offapi/com/sun/star/i18n/XNativeNumberSupplier \
+    offapi/com/sun/star/i18n/XNumberFormatCode \
+    offapi/com/sun/star/i18n/XOrdinalSuffix \
+    offapi/com/sun/star/i18n/XScriptTypeDetector \
+    offapi/com/sun/star/i18n/XTextConversion \
+    offapi/com/sun/star/i18n/XTransliteration \
+    offapi/com/sun/star/i18n/reservedWords \
+    offapi/com/sun/star/inspection/InteractiveSelectionResult \
+    offapi/com/sun/star/inspection/LineDescriptor \
+    offapi/com/sun/star/inspection/PropertyCategoryDescriptor \
+    offapi/com/sun/star/inspection/PropertyControlType \
+    offapi/com/sun/star/inspection/PropertyLineElement \
+    offapi/com/sun/star/inspection/XHyperlinkControl \
+    offapi/com/sun/star/inspection/XNumericControl \
+    offapi/com/sun/star/inspection/XObjectInspector \
+    offapi/com/sun/star/inspection/XObjectInspectorModel \
+    offapi/com/sun/star/inspection/XObjectInspectorUI \
+    offapi/com/sun/star/inspection/XPropertyControl \
+    offapi/com/sun/star/inspection/XPropertyControlContext \
+    offapi/com/sun/star/inspection/XPropertyControlFactory \
+    offapi/com/sun/star/inspection/XPropertyControlObserver \
+    offapi/com/sun/star/inspection/XPropertyHandler \
+    offapi/com/sun/star/inspection/XStringListControl \
+    offapi/com/sun/star/inspection/XStringRepresentation \
+    offapi/com/sun/star/installation/ProtDlgRes \
+    offapi/com/sun/star/installation/XInstallationCheck \
+    offapi/com/sun/star/installation/XProtocolHandlerCheck \
+    offapi/com/sun/star/installation/protocols \
+    offapi/com/sun/star/ldap/LdapConnectionException \
+    offapi/com/sun/star/ldap/LdapGenericException \
+    offapi/com/sun/star/linguistic2/ConversionDictionaryType \
+    offapi/com/sun/star/linguistic2/ConversionDirection \
+    offapi/com/sun/star/linguistic2/ConversionPropertyType \
+    offapi/com/sun/star/linguistic2/DictionaryEvent \
+    offapi/com/sun/star/linguistic2/DictionaryEventFlags \
+    offapi/com/sun/star/linguistic2/DictionaryListEvent \
+    offapi/com/sun/star/linguistic2/DictionaryListEventFlags \
+    offapi/com/sun/star/linguistic2/DictionaryType \
+    offapi/com/sun/star/linguistic2/LinguServiceEvent \
+    offapi/com/sun/star/linguistic2/LinguServiceEventFlags \
+    offapi/com/sun/star/linguistic2/ProofreadingResult \
+    offapi/com/sun/star/linguistic2/SingleProofreadingError \
+    offapi/com/sun/star/linguistic2/SpellFailure \
+    offapi/com/sun/star/linguistic2/XAvailableLocales \
+    offapi/com/sun/star/linguistic2/XConversionDictionary \
+    offapi/com/sun/star/linguistic2/XConversionDictionaryList \
+    offapi/com/sun/star/linguistic2/XConversionPropertyType \
+    offapi/com/sun/star/linguistic2/XDictionary \
+    offapi/com/sun/star/linguistic2/XDictionary1 \
+    offapi/com/sun/star/linguistic2/XDictionaryEntry \
+    offapi/com/sun/star/linguistic2/XDictionaryEventListener \
+    offapi/com/sun/star/linguistic2/XDictionaryList \
+    offapi/com/sun/star/linguistic2/XDictionaryListEventListener \
+    offapi/com/sun/star/linguistic2/XHyphenatedWord \
+    offapi/com/sun/star/linguistic2/XHyphenator \
+    offapi/com/sun/star/linguistic2/XLanguageGuessing \
+    offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster \
+    offapi/com/sun/star/linguistic2/XLinguServiceEventListener \
+    offapi/com/sun/star/linguistic2/XLinguServiceManager \
+    offapi/com/sun/star/linguistic2/XMeaning \
+    offapi/com/sun/star/linguistic2/XPossibleHyphens \
+    offapi/com/sun/star/linguistic2/XProofreader \
+    offapi/com/sun/star/linguistic2/XProofreadingIterator \
+    offapi/com/sun/star/linguistic2/XSearchableDictionary \
+    offapi/com/sun/star/linguistic2/XSearchableDictionaryList \
+    offapi/com/sun/star/linguistic2/XSetSpellAlternatives \
+    offapi/com/sun/star/linguistic2/XSpellAlternatives \
+    offapi/com/sun/star/linguistic2/XSpellChecker \
+    offapi/com/sun/star/linguistic2/XSpellChecker1 \
+    offapi/com/sun/star/linguistic2/XSupportedLanguages \
+    offapi/com/sun/star/linguistic2/XSupportedLocales \
+    offapi/com/sun/star/linguistic2/XThesaurus \
+    offapi/com/sun/star/logging/LogLevel \
+    offapi/com/sun/star/logging/LogRecord \
+    offapi/com/sun/star/logging/XConsoleHandler \
+    offapi/com/sun/star/logging/XCsvLogFormatter \
+    offapi/com/sun/star/logging/XLogFormatter \
+    offapi/com/sun/star/logging/XLogHandler \
+    offapi/com/sun/star/logging/XLogger \
+    offapi/com/sun/star/logging/XLoggerPool \
+    offapi/com/sun/star/logging/XSimpleLogRing \
+    offapi/com/sun/star/mail/MailAttachment \
+    offapi/com/sun/star/mail/MailException \
+    offapi/com/sun/star/mail/MailServiceType \
+    offapi/com/sun/star/mail/NoMailServiceProviderException \
+    offapi/com/sun/star/mail/SendMailMessageFailedException \
+    offapi/com/sun/star/mail/XAuthenticator \
+    offapi/com/sun/star/mail/XConnectionListener \
+    offapi/com/sun/star/mail/XMailMessage \
+    offapi/com/sun/star/mail/XMailService \
+    offapi/com/sun/star/mail/XMailServiceProvider \
+    offapi/com/sun/star/mail/XSmtpService \
+    offapi/com/sun/star/media/XFrameGrabber \
+    offapi/com/sun/star/media/XManager \
+    offapi/com/sun/star/media/XPlayer \
+    offapi/com/sun/star/media/XPlayerWindow \
+    offapi/com/sun/star/media/ZoomLevel \
+    offapi/com/sun/star/mozilla/MenuMultipleChange \
+    offapi/com/sun/star/mozilla/MenuSingleChange \
+    offapi/com/sun/star/mozilla/MozillaProductType \
+    offapi/com/sun/star/mozilla/XCloseSessionListener \
+    offapi/com/sun/star/mozilla/XCodeProxy \
+    offapi/com/sun/star/mozilla/XMenuProxy \
+    offapi/com/sun/star/mozilla/XMenuProxyListener \
+    offapi/com/sun/star/mozilla/XMozillaBootstrap \
+    offapi/com/sun/star/mozilla/XPluginInstance \
+    offapi/com/sun/star/mozilla/XPluginInstanceNotifySink \
+    offapi/com/sun/star/mozilla/XPluginInstancePeer \
+    offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer \
+    offapi/com/sun/star/mozilla/XPluginWindowPeer \
+    offapi/com/sun/star/mozilla/XProfileDiscover \
+    offapi/com/sun/star/mozilla/XProfileManager \
+    offapi/com/sun/star/mozilla/XProxyRunner \
+    offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider \
+    offapi/com/sun/star/office/XAnnotation \
+    offapi/com/sun/star/office/XAnnotationAccess \
+    offapi/com/sun/star/office/XAnnotationEnumeration \
+    offapi/com/sun/star/oooimprovement/XCore \
+    offapi/com/sun/star/oooimprovement/XCoreController \
+    offapi/com/sun/star/packages/EncryptionNotAllowedException \
+    offapi/com/sun/star/packages/NoEncryptionException \
+    offapi/com/sun/star/packages/NoRawFormatException \
+    offapi/com/sun/star/packages/WrongPasswordException \
+    offapi/com/sun/star/packages/XDataSinkEncrSupport \
+    offapi/com/sun/star/packages/manifest/XManifestReader \
+    offapi/com/sun/star/packages/manifest/XManifestWriter \
+    offapi/com/sun/star/packages/zip/XZipFileAccess \
+    offapi/com/sun/star/packages/zip/ZipConstants \
+    offapi/com/sun/star/packages/zip/ZipEntry \
+    offapi/com/sun/star/packages/zip/ZipException \
+    offapi/com/sun/star/packages/zip/ZipIOException \
+    offapi/com/sun/star/plugin/PluginDescription \
+    offapi/com/sun/star/plugin/PluginException \
+    offapi/com/sun/star/plugin/PluginMode \
+    offapi/com/sun/star/plugin/PluginVariable \
+    offapi/com/sun/star/plugin/XPlugin \
+    offapi/com/sun/star/plugin/XPluginContext \
+    offapi/com/sun/star/plugin/XPluginManager \
+    offapi/com/sun/star/presentation/AnimationEffect \
+    offapi/com/sun/star/presentation/AnimationSpeed \
+    offapi/com/sun/star/presentation/ClickAction \
+    offapi/com/sun/star/presentation/EffectCommands \
+    offapi/com/sun/star/presentation/EffectNodeType \
+    offapi/com/sun/star/presentation/EffectPresetClass \
+    offapi/com/sun/star/presentation/FadeEffect \
+    offapi/com/sun/star/presentation/ParagraphTarget \
+    offapi/com/sun/star/presentation/PresentationRange \
+    offapi/com/sun/star/presentation/ShapeAnimationSubType \
+    offapi/com/sun/star/presentation/TextAnimationType \
+    offapi/com/sun/star/presentation/XCustomPresentationSupplier \
+    offapi/com/sun/star/presentation/XHandoutMasterSupplier \
+    offapi/com/sun/star/presentation/XPresentation \
+    offapi/com/sun/star/presentation/XPresentation2 \
+    offapi/com/sun/star/presentation/XPresentationPage \
+    offapi/com/sun/star/presentation/XPresentationSupplier \
+    offapi/com/sun/star/presentation/XShapeEventListener \
+    offapi/com/sun/star/presentation/XSlideShow \
+    offapi/com/sun/star/presentation/XSlideShowController \
+    offapi/com/sun/star/presentation/XSlideShowListener \
+    offapi/com/sun/star/presentation/XSlideShowView \
+    offapi/com/sun/star/presentation/XTransition \
+    offapi/com/sun/star/presentation/XTransitionFactory \
+    offapi/com/sun/star/rdf/FileFormat \
+    offapi/com/sun/star/rdf/ParseException \
+    offapi/com/sun/star/rdf/QueryException \
+    offapi/com/sun/star/rdf/RepositoryException \
+    offapi/com/sun/star/rdf/Statement \
+    offapi/com/sun/star/rdf/URIs \
+    offapi/com/sun/star/rdf/XBlankNode \
+    offapi/com/sun/star/rdf/XDocumentMetadataAccess \
+    offapi/com/sun/star/rdf/XDocumentRepository \
+    offapi/com/sun/star/rdf/XLiteral \
+    offapi/com/sun/star/rdf/XMetadatable \
+    offapi/com/sun/star/rdf/XNamedGraph \
+    offapi/com/sun/star/rdf/XNode \
+    offapi/com/sun/star/rdf/XQuerySelectResult \
+    offapi/com/sun/star/rdf/XReifiedStatement \
+    offapi/com/sun/star/rdf/XRepository \
+    offapi/com/sun/star/rdf/XRepositorySupplier \
+    offapi/com/sun/star/rdf/XResource \
+    offapi/com/sun/star/rdf/XURI \
+    offapi/com/sun/star/rendering/ARGBColor \
+    offapi/com/sun/star/rendering/AnimationAttributes \
+    offapi/com/sun/star/rendering/AnimationRepeat \
+    offapi/com/sun/star/rendering/BlendMode \
+    offapi/com/sun/star/rendering/Caret \
+    offapi/com/sun/star/rendering/Color \
+    offapi/com/sun/star/rendering/ColorComponent \
+    offapi/com/sun/star/rendering/ColorComponentTag \
+    offapi/com/sun/star/rendering/ColorProfile \
+    offapi/com/sun/star/rendering/ColorSpaceType \
+    offapi/com/sun/star/rendering/CompositeOperation \
+    offapi/com/sun/star/rendering/EmphasisMark \
+    offapi/com/sun/star/rendering/FillRule \
+    offapi/com/sun/star/rendering/FloatingPointBitmapFormat \
+    offapi/com/sun/star/rendering/FloatingPointBitmapLayout \
+    offapi/com/sun/star/rendering/FontInfo \
+    offapi/com/sun/star/rendering/FontMetrics \
+    offapi/com/sun/star/rendering/FontRequest \
+    offapi/com/sun/star/rendering/IntegerBitmapLayout \
+    offapi/com/sun/star/rendering/InterpolationMode \
+    offapi/com/sun/star/rendering/Panose \
+    offapi/com/sun/star/rendering/PanoseArmStyle \
+    offapi/com/sun/star/rendering/PanoseContrast \
+    offapi/com/sun/star/rendering/PanoseFamilyTypes \
+    offapi/com/sun/star/rendering/PanoseLetterForm \
+    offapi/com/sun/star/rendering/PanoseMidline \
+    offapi/com/sun/star/rendering/PanoseProportion \
+    offapi/com/sun/star/rendering/PanoseSerifStyle \
+    offapi/com/sun/star/rendering/PanoseStrokeVariation \
+    offapi/com/sun/star/rendering/PanoseWeight \
+    offapi/com/sun/star/rendering/PanoseXHeight \
+    offapi/com/sun/star/rendering/PathCapType \
+    offapi/com/sun/star/rendering/PathJoinType \
+    offapi/com/sun/star/rendering/RGBColor \
+    offapi/com/sun/star/rendering/RenderState \
+    offapi/com/sun/star/rendering/RenderingIntent \
+    offapi/com/sun/star/rendering/RepaintResult \
+    offapi/com/sun/star/rendering/StringContext \
+    offapi/com/sun/star/rendering/StrokeAttributes \
+    offapi/com/sun/star/rendering/TextDirection \
+    offapi/com/sun/star/rendering/TextHit \
+    offapi/com/sun/star/rendering/Texture \
+    offapi/com/sun/star/rendering/TexturingMode \
+    offapi/com/sun/star/rendering/ViewState \
+    offapi/com/sun/star/rendering/VolatileContentDestroyedException \
+    offapi/com/sun/star/rendering/XAnimatedSprite \
+    offapi/com/sun/star/rendering/XAnimation \
+    offapi/com/sun/star/rendering/XBezierPolyPolygon2D \
+    offapi/com/sun/star/rendering/XBitmap \
+    offapi/com/sun/star/rendering/XBitmapCanvas \
+    offapi/com/sun/star/rendering/XBitmapPalette \
+    offapi/com/sun/star/rendering/XBufferController \
+    offapi/com/sun/star/rendering/XCachedPrimitive \
+    offapi/com/sun/star/rendering/XCanvas \
+    offapi/com/sun/star/rendering/XCanvasFont \
+    offapi/com/sun/star/rendering/XColorSpace \
+    offapi/com/sun/star/rendering/XCustomSprite \
+    offapi/com/sun/star/rendering/XGraphicDevice \
+    offapi/com/sun/star/rendering/XHalfFloatBitmap \
+    offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap \
+    offapi/com/sun/star/rendering/XIeeeDoubleBitmap \
+    offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap \
+    offapi/com/sun/star/rendering/XIeeeFloatBitmap \
+    offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap \
+    offapi/com/sun/star/rendering/XIntegerBitmap \
+    offapi/com/sun/star/rendering/XIntegerBitmapColorSpace \
+    offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap \
+    offapi/com/sun/star/rendering/XLinePolyPolygon2D \
+    offapi/com/sun/star/rendering/XMtfRenderer \
+    offapi/com/sun/star/rendering/XParametricPolyPolygon2D \
+    offapi/com/sun/star/rendering/XPolyPolygon2D \
+    offapi/com/sun/star/rendering/XSimpleCanvas \
+    offapi/com/sun/star/rendering/XSprite \
+    offapi/com/sun/star/rendering/XSpriteCanvas \
+    offapi/com/sun/star/rendering/XTextLayout \
+    offapi/com/sun/star/rendering/XVolatileBitmap \
+    offapi/com/sun/star/report/ForceNewPage \
+    offapi/com/sun/star/report/GroupKeepTogether \
+    offapi/com/sun/star/report/GroupOn \
+    offapi/com/sun/star/report/KeepTogether \
+    offapi/com/sun/star/report/ReportPrintOption \
+    offapi/com/sun/star/report/XFixedLine \
+    offapi/com/sun/star/report/XFixedText \
+    offapi/com/sun/star/report/XFormatCondition \
+    offapi/com/sun/star/report/XFormattedField \
+    offapi/com/sun/star/report/XFunction \
+    offapi/com/sun/star/report/XFunctions \
+    offapi/com/sun/star/report/XFunctionsSupplier \
+    offapi/com/sun/star/report/XGroup \
+    offapi/com/sun/star/report/XGroups \
+    offapi/com/sun/star/report/XImageControl \
+    offapi/com/sun/star/report/XReportComponent \
+    offapi/com/sun/star/report/XReportControlFormat \
+    offapi/com/sun/star/report/XReportControlModel \
+    offapi/com/sun/star/report/XReportDefinition \
+    offapi/com/sun/star/report/XReportEngine \
+    offapi/com/sun/star/report/XSection \
+    offapi/com/sun/star/report/XShape \
+    offapi/com/sun/star/report/meta/XFormulaParser \
+    offapi/com/sun/star/report/meta/XFunctionCategory \
+    offapi/com/sun/star/report/meta/XFunctionDescription \
+    offapi/com/sun/star/report/meta/XFunctionManager \
+    offapi/com/sun/star/resource/MissingResourceException \
+    offapi/com/sun/star/resource/XLocale \
+    offapi/com/sun/star/resource/XResourceBundle \
+    offapi/com/sun/star/resource/XResourceBundleLoader \
+    offapi/com/sun/star/resource/XStringResourceManager \
+    offapi/com/sun/star/resource/XStringResourcePersistence \
+    offapi/com/sun/star/resource/XStringResourceResolver \
+    offapi/com/sun/star/resource/XStringResourceSupplier \
+    offapi/com/sun/star/resource/XStringResourceWithLocation \
+    offapi/com/sun/star/resource/XStringResourceWithStorage \
+    offapi/com/sun/star/scanner/ScanError \
+    offapi/com/sun/star/scanner/ScannerContext \
+    offapi/com/sun/star/scanner/ScannerException \
+    offapi/com/sun/star/scanner/XScannerManager \
+    offapi/com/sun/star/script/LibraryNotLoadedException \
+    offapi/com/sun/star/script/ModuleInfo \
+    offapi/com/sun/star/script/ModuleSizeExceededRequest \
+    offapi/com/sun/star/script/ModuleType \
+    offapi/com/sun/star/script/NativeObjectWrapper \
+    offapi/com/sun/star/script/XLibraryContainer \
+    offapi/com/sun/star/script/XLibraryContainer2 \
+    offapi/com/sun/star/script/XLibraryContainer3 \
+    offapi/com/sun/star/script/XLibraryContainerExport \
+    offapi/com/sun/star/script/XLibraryContainerPassword \
+    offapi/com/sun/star/script/XLibraryQueryExecutable \
+    offapi/com/sun/star/script/XPersistentLibraryContainer \
+    offapi/com/sun/star/script/XStorageBasedLibraryContainer \
+    offapi/com/sun/star/script/browse/BrowseNodeFactoryViewTypes \
+    offapi/com/sun/star/script/browse/BrowseNodeTypes \
+    offapi/com/sun/star/script/browse/XBrowseNode \
+    offapi/com/sun/star/script/browse/XBrowseNodeFactory \
+    offapi/com/sun/star/script/provider/ScriptErrorRaisedException \
+    offapi/com/sun/star/script/provider/ScriptExceptionRaisedException \
+    offapi/com/sun/star/script/provider/ScriptFrameworkErrorException \
+    offapi/com/sun/star/script/provider/ScriptFrameworkErrorType \
+    offapi/com/sun/star/script/provider/XScript \
+    offapi/com/sun/star/script/provider/XScriptContext \
+    offapi/com/sun/star/script/provider/XScriptProvider \
+    offapi/com/sun/star/script/provider/XScriptProviderFactory \
+    offapi/com/sun/star/script/provider/XScriptProviderSupplier \
+    offapi/com/sun/star/script/provider/XScriptURIHelper \
+    offapi/com/sun/star/script/vba/VBAEventId \
+    offapi/com/sun/star/script/vba/VBAScriptEvent \
+    offapi/com/sun/star/script/vba/VBAScriptEventId \
+    offapi/com/sun/star/script/vba/XVBACompatibility \
+    offapi/com/sun/star/script/vba/XVBAEventProcessor \
+    offapi/com/sun/star/script/vba/XVBAMacroResolver \
+    offapi/com/sun/star/script/vba/XVBAModuleInfo \
+    offapi/com/sun/star/script/vba/XVBAScriptListener \
+    offapi/com/sun/star/sdb/BooleanComparisonMode \
+    offapi/com/sun/star/sdb/CommandType \
+    offapi/com/sun/star/sdb/DatabaseRegistrationEvent \
+    offapi/com/sun/star/sdb/DocumentSaveRequest \
+    offapi/com/sun/star/sdb/ErrorCondition \
+    offapi/com/sun/star/sdb/ParametersRequest \
+    offapi/com/sun/star/sdb/RowChangeAction \
+    offapi/com/sun/star/sdb/RowChangeEvent \
+    offapi/com/sun/star/sdb/RowSetVetoException \
+    offapi/com/sun/star/sdb/RowsChangeEvent \
+    offapi/com/sun/star/sdb/SQLContext \
+    offapi/com/sun/star/sdb/SQLErrorEvent \
+    offapi/com/sun/star/sdb/SQLFilterOperator \
+    offapi/com/sun/star/sdb/XAlterQuery \
+    offapi/com/sun/star/sdb/XBookmarksSupplier \
+    offapi/com/sun/star/sdb/XColumn \
+    offapi/com/sun/star/sdb/XColumnUpdate \
+    offapi/com/sun/star/sdb/XCommandPreparation \
+    offapi/com/sun/star/sdb/XCompletedConnection \
+    offapi/com/sun/star/sdb/XCompletedExecution \
+    offapi/com/sun/star/sdb/XDataAccessDescriptorFactory \
+    offapi/com/sun/star/sdb/XDatabaseAccess \
+    offapi/com/sun/star/sdb/XDatabaseAccessListener \
+    offapi/com/sun/star/sdb/XDatabaseEnvironment \
+    offapi/com/sun/star/sdb/XDatabaseRegistrations \
+    offapi/com/sun/star/sdb/XDatabaseRegistrationsListener \
+    offapi/com/sun/star/sdb/XDocumentDataSource \
+    offapi/com/sun/star/sdb/XFormDocumentsSupplier \
+    offapi/com/sun/star/sdb/XInteractionDocumentSave \
+    offapi/com/sun/star/sdb/XInteractionSupplyParameters \
+    offapi/com/sun/star/sdb/XOfficeDatabaseDocument \
+    offapi/com/sun/star/sdb/XParametersSupplier \
+    offapi/com/sun/star/sdb/XQueriesSupplier \
+    offapi/com/sun/star/sdb/XQueryDefinitionsSupplier \
+    offapi/com/sun/star/sdb/XReportDocumentsSupplier \
+    offapi/com/sun/star/sdb/XResultSetAccess \
+    offapi/com/sun/star/sdb/XRowSetApproveBroadcaster \
+    offapi/com/sun/star/sdb/XRowSetApproveListener \
+    offapi/com/sun/star/sdb/XRowSetChangeBroadcaster \
+    offapi/com/sun/star/sdb/XRowSetChangeListener \
+    offapi/com/sun/star/sdb/XRowSetSupplier \
+    offapi/com/sun/star/sdb/XRowsChangeBroadcaster \
+    offapi/com/sun/star/sdb/XRowsChangeListener \
+    offapi/com/sun/star/sdb/XSQLErrorBroadcaster \
+    offapi/com/sun/star/sdb/XSQLErrorListener \
+    offapi/com/sun/star/sdb/XSQLQueryComposer \
+    offapi/com/sun/star/sdb/XSQLQueryComposerFactory \
+    offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer \
+    offapi/com/sun/star/sdb/XSingleSelectQueryComposer \
+    offapi/com/sun/star/sdb/XSubDocument \
+    offapi/com/sun/star/sdb/application/CopyTableContinuation \
+    offapi/com/sun/star/sdb/application/CopyTableOperation \
+    offapi/com/sun/star/sdb/application/CopyTableRowEvent \
+    offapi/com/sun/star/sdb/application/DatabaseObject \
+    offapi/com/sun/star/sdb/application/DatabaseObjectContainer \
+    offapi/com/sun/star/sdb/application/NamedDatabaseObject \
+    offapi/com/sun/star/sdb/application/XCopyTableListener \
+    offapi/com/sun/star/sdb/application/XCopyTableWizard \
+    offapi/com/sun/star/sdb/application/XDatabaseDocumentUI \
+    offapi/com/sun/star/sdb/application/XTableUIProvider \
+    offapi/com/sun/star/sdb/tools/CompositionType \
+    offapi/com/sun/star/sdb/tools/XConnectionSupplier \
+    offapi/com/sun/star/sdb/tools/XConnectionTools \
+    offapi/com/sun/star/sdb/tools/XDataSourceMetaData \
+    offapi/com/sun/star/sdb/tools/XIndexAlteration \
+    offapi/com/sun/star/sdb/tools/XKeyAlteration \
+    offapi/com/sun/star/sdb/tools/XObjectNames \
+    offapi/com/sun/star/sdb/tools/XTableAlteration \
+    offapi/com/sun/star/sdb/tools/XTableName \
+    offapi/com/sun/star/sdb/tools/XTableRename \
+    offapi/com/sun/star/sdb/tools/XViewAccess \
+    offapi/com/sun/star/sdbc/BatchUpdateException \
+    offapi/com/sun/star/sdbc/BestRowScope \
+    offapi/com/sun/star/sdbc/BestRowType \
+    offapi/com/sun/star/sdbc/ChangeAction \
+    offapi/com/sun/star/sdbc/ChangeEvent \
+    offapi/com/sun/star/sdbc/ColumnSearch \
+    offapi/com/sun/star/sdbc/ColumnType \
+    offapi/com/sun/star/sdbc/ColumnValue \
+    offapi/com/sun/star/sdbc/DataTruncation \
+    offapi/com/sun/star/sdbc/DataType \
+    offapi/com/sun/star/sdbc/Deferrability \
+    offapi/com/sun/star/sdbc/DriverPropertyInfo \
+    offapi/com/sun/star/sdbc/FetchDirection \
+    offapi/com/sun/star/sdbc/IndexType \
+    offapi/com/sun/star/sdbc/KeyRule \
+    offapi/com/sun/star/sdbc/ProcedureColumn \
+    offapi/com/sun/star/sdbc/ProcedureResult \
+    offapi/com/sun/star/sdbc/ResultSetConcurrency \
+    offapi/com/sun/star/sdbc/ResultSetType \
+    offapi/com/sun/star/sdbc/SQLException \
+    offapi/com/sun/star/sdbc/SQLWarning \
+    offapi/com/sun/star/sdbc/TransactionIsolation \
+    offapi/com/sun/star/sdbc/XArray \
+    offapi/com/sun/star/sdbc/XBatchExecution \
+    offapi/com/sun/star/sdbc/XBlob \
+    offapi/com/sun/star/sdbc/XClob \
+    offapi/com/sun/star/sdbc/XCloseable \
+    offapi/com/sun/star/sdbc/XColumnLocate \
+    offapi/com/sun/star/sdbc/XConnection \
+    offapi/com/sun/star/sdbc/XDataSource \
+    offapi/com/sun/star/sdbc/XDatabaseMetaData \
+    offapi/com/sun/star/sdbc/XDatabaseMetaData2 \
+    offapi/com/sun/star/sdbc/XDriver \
+    offapi/com/sun/star/sdbc/XDriverAccess \
+    offapi/com/sun/star/sdbc/XDriverManager \
+    offapi/com/sun/star/sdbc/XGeneratedResultSet \
+    offapi/com/sun/star/sdbc/XIsolatedConnection \
+    offapi/com/sun/star/sdbc/XMultipleResults \
+    offapi/com/sun/star/sdbc/XOutParameters \
+    offapi/com/sun/star/sdbc/XParameters \
+    offapi/com/sun/star/sdbc/XPooledConnection \
+    offapi/com/sun/star/sdbc/XPreparedBatchExecution \
+    offapi/com/sun/star/sdbc/XPreparedStatement \
+    offapi/com/sun/star/sdbc/XRef \
+    offapi/com/sun/star/sdbc/XResultSet \
+    offapi/com/sun/star/sdbc/XResultSetMetaData \
+    offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier \
+    offapi/com/sun/star/sdbc/XResultSetUpdate \
+    offapi/com/sun/star/sdbc/XRow \
+    offapi/com/sun/star/sdbc/XRowSet \
+    offapi/com/sun/star/sdbc/XRowSetListener \
+    offapi/com/sun/star/sdbc/XRowUpdate \
+    offapi/com/sun/star/sdbc/XSQLData \
+    offapi/com/sun/star/sdbc/XSQLInput \
+    offapi/com/sun/star/sdbc/XSQLOutput \
+    offapi/com/sun/star/sdbc/XStatement \
+    offapi/com/sun/star/sdbc/XStruct \
+    offapi/com/sun/star/sdbc/XWarningsSupplier \
+    offapi/com/sun/star/sdbcx/CheckOption \
+    offapi/com/sun/star/sdbcx/CompareBookmark \
+    offapi/com/sun/star/sdbcx/KeyType \
+    offapi/com/sun/star/sdbcx/Privilege \
+    offapi/com/sun/star/sdbcx/PrivilegeObject \
+    offapi/com/sun/star/sdbcx/XAlterTable \
+    offapi/com/sun/star/sdbcx/XAlterView \
+    offapi/com/sun/star/sdbcx/XAppend \
+    offapi/com/sun/star/sdbcx/XAuthorizable \
+    offapi/com/sun/star/sdbcx/XColumnsSupplier \
+    offapi/com/sun/star/sdbcx/XCreateCatalog \
+    offapi/com/sun/star/sdbcx/XDataDefinitionSupplier \
+    offapi/com/sun/star/sdbcx/XDataDescriptorFactory \
+    offapi/com/sun/star/sdbcx/XDeleteRows \
+    offapi/com/sun/star/sdbcx/XDrop \
+    offapi/com/sun/star/sdbcx/XDropCatalog \
+    offapi/com/sun/star/sdbcx/XGroupsSupplier \
+    offapi/com/sun/star/sdbcx/XIndexesSupplier \
+    offapi/com/sun/star/sdbcx/XKeysSupplier \
+    offapi/com/sun/star/sdbcx/XRename \
+    offapi/com/sun/star/sdbcx/XRowLocate \
+    offapi/com/sun/star/sdbcx/XTablesSupplier \
+    offapi/com/sun/star/sdbcx/XUser \
+    offapi/com/sun/star/sdbcx/XUsersSupplier \
+    offapi/com/sun/star/sdbcx/XViewsSupplier \
+    offapi/com/sun/star/security/CertAltNameEntry \
+    offapi/com/sun/star/security/CertificateCharacters \
+    offapi/com/sun/star/security/CertificateContainerStatus \
+    offapi/com/sun/star/security/CertificateException \
+    offapi/com/sun/star/security/CertificateValidity \
+    offapi/com/sun/star/security/CryptographyException \
+    offapi/com/sun/star/security/DocumentSignatureInformation \
+    offapi/com/sun/star/security/EncryptionException \
+    offapi/com/sun/star/security/ExtAltNameType \
+    offapi/com/sun/star/security/KeyException \
+    offapi/com/sun/star/security/KeyUsage \
+    offapi/com/sun/star/security/NoPasswordException \
+    offapi/com/sun/star/security/SecurityInfrastructureException \
+    offapi/com/sun/star/security/SignatureException \
+    offapi/com/sun/star/security/XCertificate \
+    offapi/com/sun/star/security/XCertificateContainer \
+    offapi/com/sun/star/security/XCertificateExtension \
+    offapi/com/sun/star/security/XDocumentDigitalSignatures \
+    offapi/com/sun/star/security/XSanExtension \
+    offapi/com/sun/star/security/XSerialNumberAdapter \
+    offapi/com/sun/star/setup/ActionType \
+    offapi/com/sun/star/setup/BaseAction \
+    offapi/com/sun/star/setup/CopyFileAction \
+    offapi/com/sun/star/setup/DeleteDirAction \
+    offapi/com/sun/star/setup/DeleteFileAction \
+    offapi/com/sun/star/setup/DeleteFolderAction \
+    offapi/com/sun/star/setup/DeleteFolderItemAction \
+    offapi/com/sun/star/setup/DownloadAction \
+    offapi/com/sun/star/setup/FontAction \
+    offapi/com/sun/star/setup/InstallEnvironment \
+    offapi/com/sun/star/setup/InstallResponse \
+    offapi/com/sun/star/setup/InstallType \
+    offapi/com/sun/star/setup/MakeDirAction \
+    offapi/com/sun/star/setup/MakeFolderAction \
+    offapi/com/sun/star/setup/MakeFolderItemAction \
+    offapi/com/sun/star/setup/MakeShortcutAction \
+    offapi/com/sun/star/setup/MirrorEntry \
+    offapi/com/sun/star/setup/ModuleInfo \
+    offapi/com/sun/star/setup/ModuleState \
+    offapi/com/sun/star/setup/OSType \
+    offapi/com/sun/star/setup/ProfileItemAction \
+    offapi/com/sun/star/setup/ResponseErrorCode \
+    offapi/com/sun/star/setup/SizeInfo \
+    offapi/com/sun/star/setup/UnzipAction \
+    offapi/com/sun/star/setup/UpdateType \
+    offapi/com/sun/star/setup/VersionIdentifier \
+    offapi/com/sun/star/setup/WindowsRegistryAction \
+    offapi/com/sun/star/setup/XSetup \
+    offapi/com/sun/star/sheet/ActivationEvent \
+    offapi/com/sun/star/sheet/AddressConvention \
+    offapi/com/sun/star/sheet/Border \
+    offapi/com/sun/star/sheet/CellDeleteMode \
+    offapi/com/sun/star/sheet/CellFlags \
+    offapi/com/sun/star/sheet/CellInsertMode \
+    offapi/com/sun/star/sheet/ComplexReference \
+    offapi/com/sun/star/sheet/ConditionOperator \
+    offapi/com/sun/star/sheet/ConditionOperator2 \
+    offapi/com/sun/star/sheet/DDEItemInfo \
+    offapi/com/sun/star/sheet/DDELinkInfo \
+    offapi/com/sun/star/sheet/DDELinkMode \
+    offapi/com/sun/star/sheet/DataImportMode \
+    offapi/com/sun/star/sheet/DataPilotFieldAutoShowInfo \
+    offapi/com/sun/star/sheet/DataPilotFieldFilter \
+    offapi/com/sun/star/sheet/DataPilotFieldGroupBy \
+    offapi/com/sun/star/sheet/DataPilotFieldGroupInfo \
+    offapi/com/sun/star/sheet/DataPilotFieldLayoutInfo \
+    offapi/com/sun/star/sheet/DataPilotFieldLayoutMode \
+    offapi/com/sun/star/sheet/DataPilotFieldOrientation \
+    offapi/com/sun/star/sheet/DataPilotFieldReference \
+    offapi/com/sun/star/sheet/DataPilotFieldReferenceItemType \
+    offapi/com/sun/star/sheet/DataPilotFieldReferenceType \
+    offapi/com/sun/star/sheet/DataPilotFieldShowItemsMode \
+    offapi/com/sun/star/sheet/DataPilotFieldSortInfo \
+    offapi/com/sun/star/sheet/DataPilotFieldSortMode \
+    offapi/com/sun/star/sheet/DataPilotOutputRangeType \
+    offapi/com/sun/star/sheet/DataPilotTableHeaderData \
+    offapi/com/sun/star/sheet/DataPilotTablePositionData \
+    offapi/com/sun/star/sheet/DataPilotTablePositionType \
+    offapi/com/sun/star/sheet/DataPilotTableResultData \
+    offapi/com/sun/star/sheet/DataResult \
+    offapi/com/sun/star/sheet/DataResultFlags \
+    offapi/com/sun/star/sheet/DimensionFlags \
+    offapi/com/sun/star/sheet/ExternalLinkInfo \
+    offapi/com/sun/star/sheet/ExternalLinkType \
+    offapi/com/sun/star/sheet/ExternalReference \
+    offapi/com/sun/star/sheet/FillDateMode \
+    offapi/com/sun/star/sheet/FillDirection \
+    offapi/com/sun/star/sheet/FillMode \
+    offapi/com/sun/star/sheet/FilterConnection \
+    offapi/com/sun/star/sheet/FilterOperator \
+    offapi/com/sun/star/sheet/FilterOperator2 \
+    offapi/com/sun/star/sheet/FormulaLanguage \
+    offapi/com/sun/star/sheet/FormulaMapGroup \
+    offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset \
+    offapi/com/sun/star/sheet/FormulaOpCodeMapEntry \
+    offapi/com/sun/star/sheet/FormulaResult \
+    offapi/com/sun/star/sheet/FormulaToken \
+    offapi/com/sun/star/sheet/FunctionArgument \
+    offapi/com/sun/star/sheet/FunctionCategory \
+    offapi/com/sun/star/sheet/GeneralFunction \
+    offapi/com/sun/star/sheet/GoalResult \
+    offapi/com/sun/star/sheet/LocalizedName \
+    offapi/com/sun/star/sheet/MemberResult \
+    offapi/com/sun/star/sheet/MemberResultFlags \
+    offapi/com/sun/star/sheet/MoveDirection \
+    offapi/com/sun/star/sheet/NamedRangeFlag \
+    offapi/com/sun/star/sheet/NameToken \
+    offapi/com/sun/star/sheet/NoConvergenceException \
+    offapi/com/sun/star/sheet/PasteOperation \
+    offapi/com/sun/star/sheet/RangeSelectionEvent \
+    offapi/com/sun/star/sheet/ReferenceFlags \
+    offapi/com/sun/star/sheet/ResultEvent \
+    offapi/com/sun/star/sheet/SheetLinkMode \
+    offapi/com/sun/star/sheet/SingleReference \
+    offapi/com/sun/star/sheet/SolverConstraint \
+    offapi/com/sun/star/sheet/SolverConstraintOperator \
+    offapi/com/sun/star/sheet/SpreadsheetViewObjectsMode \
+    offapi/com/sun/star/sheet/StatusBarFunction \
+    offapi/com/sun/star/sheet/SubTotalColumn \
+    offapi/com/sun/star/sheet/TableFilterField \
+    offapi/com/sun/star/sheet/TableFilterField2 \
+    offapi/com/sun/star/sheet/TableOperationMode \
+    offapi/com/sun/star/sheet/TablePageBreakData \
+    offapi/com/sun/star/sheet/TableValidationVisibility \
+    offapi/com/sun/star/sheet/ValidationAlertStyle \
+    offapi/com/sun/star/sheet/ValidationType \
+    offapi/com/sun/star/sheet/XActivationBroadcaster \
+    offapi/com/sun/star/sheet/XActivationEventListener \
+    offapi/com/sun/star/sheet/XAddIn \
+    offapi/com/sun/star/sheet/XAreaLink \
+    offapi/com/sun/star/sheet/XAreaLinks \
+    offapi/com/sun/star/sheet/XArrayFormulaRange \
+    offapi/com/sun/star/sheet/XArrayFormulaTokens \
+    offapi/com/sun/star/sheet/XCalculatable \
+    offapi/com/sun/star/sheet/XCellAddressable \
+    offapi/com/sun/star/sheet/XCellFormatRangesSupplier \
+    offapi/com/sun/star/sheet/XCellRangeAddressable \
+    offapi/com/sun/star/sheet/XCellRangeData \
+    offapi/com/sun/star/sheet/XCellRangeFormula \
+    offapi/com/sun/star/sheet/XCellRangeMovement \
+    offapi/com/sun/star/sheet/XCellRangeReferrer \
+    offapi/com/sun/star/sheet/XCellRangesAccess \
+    offapi/com/sun/star/sheet/XCellRangesQuery \
+    offapi/com/sun/star/sheet/XCellSeries \
+    offapi/com/sun/star/sheet/XCompatibilityNames \
+    offapi/com/sun/star/sheet/XConsolidatable \
+    offapi/com/sun/star/sheet/XConsolidationDescriptor \
+    offapi/com/sun/star/sheet/XDDELink \
+    offapi/com/sun/star/sheet/XDDELinkResults \
+    offapi/com/sun/star/sheet/XDDELinks \
+    offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier \
+    offapi/com/sun/star/sheet/XDataPilotDescriptor \
+    offapi/com/sun/star/sheet/XDataPilotField \
+    offapi/com/sun/star/sheet/XDataPilotFieldGrouping \
+    offapi/com/sun/star/sheet/XDataPilotMemberResults \
+    offapi/com/sun/star/sheet/XDataPilotResults \
+    offapi/com/sun/star/sheet/XDataPilotTable \
+    offapi/com/sun/star/sheet/XDataPilotTable2 \
+    offapi/com/sun/star/sheet/XDataPilotTables \
+    offapi/com/sun/star/sheet/XDataPilotTablesSupplier \
+    offapi/com/sun/star/sheet/XDatabaseRange \
+    offapi/com/sun/star/sheet/XDatabaseRanges \
+    offapi/com/sun/star/sheet/XDimensionsSupplier \
+    offapi/com/sun/star/sheet/XDocumentAuditing \
+    offapi/com/sun/star/sheet/XDrillDownDataSupplier \
+    offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster \
+    offapi/com/sun/star/sheet/XExternalDocLink \
+    offapi/com/sun/star/sheet/XExternalDocLinks \
+    offapi/com/sun/star/sheet/XExternalSheetCache \
+    offapi/com/sun/star/sheet/XExternalSheetName \
+    offapi/com/sun/star/sheet/XFillAcrossSheet \
+    offapi/com/sun/star/sheet/XFilterFormulaParser \
+    offapi/com/sun/star/sheet/XFormulaOpCodeMapper \
+    offapi/com/sun/star/sheet/XFormulaParser \
+    offapi/com/sun/star/sheet/XFormulaQuery \
+    offapi/com/sun/star/sheet/XFormulaTokens \
+    offapi/com/sun/star/sheet/XFunctionAccess \
+    offapi/com/sun/star/sheet/XFunctionDescriptions \
+    offapi/com/sun/star/sheet/XGoalSeek \
+    offapi/com/sun/star/sheet/XHeaderFooterContent \
+    offapi/com/sun/star/sheet/XHierarchiesSupplier \
+    offapi/com/sun/star/sheet/XLabelRange \
+    offapi/com/sun/star/sheet/XLabelRanges \
+    offapi/com/sun/star/sheet/XLevelsSupplier \
+    offapi/com/sun/star/sheet/XMembersSupplier \
+    offapi/com/sun/star/sheet/XMultiFormulaTokens \
+    offapi/com/sun/star/sheet/XMultipleOperation \
+    offapi/com/sun/star/sheet/XNamedRange \
+    offapi/com/sun/star/sheet/XNamedRanges \
+    offapi/com/sun/star/sheet/XPrintAreas \
+    offapi/com/sun/star/sheet/XRangeSelection \
+    offapi/com/sun/star/sheet/XRangeSelectionChangeListener \
+    offapi/com/sun/star/sheet/XRangeSelectionListener \
+    offapi/com/sun/star/sheet/XRecentFunctions \
+    offapi/com/sun/star/sheet/XResultListener \
+    offapi/com/sun/star/sheet/XScenario \
+    offapi/com/sun/star/sheet/XScenarioEnhanced \
+    offapi/com/sun/star/sheet/XScenarios \
+    offapi/com/sun/star/sheet/XScenariosSupplier \
+    offapi/com/sun/star/sheet/XSheetAnnotation \
+    offapi/com/sun/star/sheet/XSheetAnnotationAnchor \
+    offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier \
+    offapi/com/sun/star/sheet/XSheetAnnotations \
+    offapi/com/sun/star/sheet/XSheetAnnotationsSupplier \
+    offapi/com/sun/star/sheet/XSheetAuditing \
+    offapi/com/sun/star/sheet/XSheetCellCursor \
+    offapi/com/sun/star/sheet/XSheetCellRange \
+    offapi/com/sun/star/sheet/XSheetCellRangeContainer \
+    offapi/com/sun/star/sheet/XSheetCellRanges \
+    offapi/com/sun/star/sheet/XSheetCondition \
+    offapi/com/sun/star/sheet/XSheetCondition2 \
+    offapi/com/sun/star/sheet/XSheetConditionalEntries \
+    offapi/com/sun/star/sheet/XSheetConditionalEntry \
+    offapi/com/sun/star/sheet/XSheetFilterDescriptor \
+    offapi/com/sun/star/sheet/XSheetFilterDescriptor2 \
+    offapi/com/sun/star/sheet/XSheetFilterable \
+    offapi/com/sun/star/sheet/XSheetFilterableEx \
+    offapi/com/sun/star/sheet/XSheetLinkable \
+    offapi/com/sun/star/sheet/XSheetOperation \
+    offapi/com/sun/star/sheet/XSheetOutline \
+    offapi/com/sun/star/sheet/XSheetPageBreak \
+    offapi/com/sun/star/sheet/XSheetPastable \
+    offapi/com/sun/star/sheet/XSolver \
+    offapi/com/sun/star/sheet/XSolverDescription \
+    offapi/com/sun/star/sheet/XSpreadsheet \
+    offapi/com/sun/star/sheet/XSpreadsheetDocument \
+    offapi/com/sun/star/sheet/XSpreadsheetView \
+    offapi/com/sun/star/sheet/XSpreadsheets \
+    offapi/com/sun/star/sheet/XSubTotalCalculatable \
+    offapi/com/sun/star/sheet/XSubTotalDescriptor \
+    offapi/com/sun/star/sheet/XSubTotalField \
+    offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier \
+    offapi/com/sun/star/sheet/XUnnamedDatabaseRanges \
+    offapi/com/sun/star/sheet/XUsedAreaCursor \
+    offapi/com/sun/star/sheet/XViewFreezable \
+    offapi/com/sun/star/sheet/XViewPane \
+    offapi/com/sun/star/sheet/XViewPanesSupplier \
+    offapi/com/sun/star/sheet/XViewSplitable \
+    offapi/com/sun/star/sheet/XVolatileResult \
+    offapi/com/sun/star/sheet/_NamedRange \
+    offapi/com/sun/star/smarttags/SmartTagRecognizerMode \
+    offapi/com/sun/star/smarttags/XSmartTagAction \
+    offapi/com/sun/star/smarttags/XSmartTagRecognizer \
+    offapi/com/sun/star/style/BreakType \
+    offapi/com/sun/star/style/CaseMap \
+    offapi/com/sun/star/style/DropCapFormat \
+    offapi/com/sun/star/style/GraphicLocation \
+    offapi/com/sun/star/style/HorizontalAlignment \
+    offapi/com/sun/star/style/LineNumberPosition \
+    offapi/com/sun/star/style/LineSpacing \
+    offapi/com/sun/star/style/LineSpacingMode \
+    offapi/com/sun/star/style/NumberingType \
+    offapi/com/sun/star/style/PageStyleLayout \
+    offapi/com/sun/star/style/ParagraphAdjust \
+    offapi/com/sun/star/style/ParagraphStyleCategory \
+    offapi/com/sun/star/style/TabAlign \
+    offapi/com/sun/star/style/TabStop \
+    offapi/com/sun/star/style/VerticalAlignment \
+    offapi/com/sun/star/style/XAutoStyle \
+    offapi/com/sun/star/style/XAutoStyleFamily \
+    offapi/com/sun/star/style/XAutoStyles \
+    offapi/com/sun/star/style/XAutoStylesSupplier \
+    offapi/com/sun/star/style/XDefaultsSupplier \
+    offapi/com/sun/star/style/XStyle \
+    offapi/com/sun/star/style/XStyleCondition \
+    offapi/com/sun/star/style/XStyleFamiliesSupplier \
+    offapi/com/sun/star/style/XStyleLoader \
+    offapi/com/sun/star/style/XStyleSupplier \
+    offapi/com/sun/star/svg/XSVGPrinter \
+    offapi/com/sun/star/svg/XSVGWriter \
+    offapi/com/sun/star/sync/FilterData \
+    offapi/com/sun/star/sync/SyncAction \
+    offapi/com/sun/star/sync/SyncElement \
+    offapi/com/sun/star/sync/SyncEvent \
+    offapi/com/sun/star/sync/SyncInfo \
+    offapi/com/sun/star/sync/SyncMode \
+    offapi/com/sun/star/sync/SyncOptions \
+    offapi/com/sun/star/sync/SyncScheme \
+    offapi/com/sun/star/sync/SyncType \
+    offapi/com/sun/star/sync/XSyncCollector \
+    offapi/com/sun/star/sync/XSynchronizer \
+    offapi/com/sun/star/sync2/BadPartnershipException \
+    offapi/com/sun/star/system/SimpleMailClientFlags \
+    offapi/com/sun/star/system/SystemShellExecuteException \
+    offapi/com/sun/star/system/SystemShellExecuteFlags \
+    offapi/com/sun/star/system/XProxySettings \
+    offapi/com/sun/star/system/XSimpleMailClient \
+    offapi/com/sun/star/system/XSimpleMailClientSupplier \
+    offapi/com/sun/star/system/XSimpleMailMessage \
+    offapi/com/sun/star/system/XSystemShellExecute \
+    offapi/com/sun/star/table/BorderLine \
+    offapi/com/sun/star/table/BorderLine2 \
+    offapi/com/sun/star/table/BorderLineStyle \
+    offapi/com/sun/star/table/CellAddress \
+    offapi/com/sun/star/table/CellContentType \
+    offapi/com/sun/star/table/CellHoriJustify \
+    offapi/com/sun/star/table/CellJustifyMethod \
+    offapi/com/sun/star/table/CellOrientation \
+    offapi/com/sun/star/table/CellRangeAddress \
+    offapi/com/sun/star/table/CellVertJustify \
+    offapi/com/sun/star/table/CellVertJustify2 \
+    offapi/com/sun/star/table/ShadowFormat \
+    offapi/com/sun/star/table/ShadowLocation \
+    offapi/com/sun/star/table/TableBorder \
+    offapi/com/sun/star/table/TableBorderDistances \
+    offapi/com/sun/star/table/TableOrientation \
+    offapi/com/sun/star/table/TableSortField \
+    offapi/com/sun/star/table/TableSortFieldType \
+    offapi/com/sun/star/table/XAutoFormattable \
+    offapi/com/sun/star/table/XCell \
+    offapi/com/sun/star/table/XCell2 \
+    offapi/com/sun/star/table/XCellCursor \
+    offapi/com/sun/star/table/XCellRange \
+    offapi/com/sun/star/table/XColumnRowRange \
+    offapi/com/sun/star/table/XMergeableCell \
+    offapi/com/sun/star/table/XMergeableCellRange \
+    offapi/com/sun/star/table/XTable \
+    offapi/com/sun/star/table/XTableChart \
+    offapi/com/sun/star/table/XTableCharts \
+    offapi/com/sun/star/table/XTableChartsSupplier \
+    offapi/com/sun/star/table/XTableColumns \
+    offapi/com/sun/star/table/XTableRows \
+    offapi/com/sun/star/task/ClassifiedInteractionRequest \
+    offapi/com/sun/star/task/DocumentMSPasswordRequest \
+    offapi/com/sun/star/task/DocumentMSPasswordRequest2 \
+    offapi/com/sun/star/task/DocumentMacroConfirmationRequest \
+    offapi/com/sun/star/task/DocumentPasswordRequest \
+    offapi/com/sun/star/task/DocumentPasswordRequest2 \
+    offapi/com/sun/star/task/ErrorCodeIOException \
+    offapi/com/sun/star/task/ErrorCodeRequest \
+    offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest \
+    offapi/com/sun/star/task/InteractionClassification \
+    offapi/com/sun/star/task/MasterPasswordRequest \
+    offapi/com/sun/star/task/NoMasterException \
+    offapi/com/sun/star/task/PDFExportException \
+    offapi/com/sun/star/task/PasswordRequest \
+    offapi/com/sun/star/task/PasswordRequestMode \
+    offapi/com/sun/star/task/UnsupportedOverwriteRequest \
+    offapi/com/sun/star/task/UrlRecord \
+    offapi/com/sun/star/task/UserRecord \
+    offapi/com/sun/star/task/XAbortChannel \
+    offapi/com/sun/star/task/XAsyncJob \
+    offapi/com/sun/star/task/XInteractionApprove \
+    offapi/com/sun/star/task/XInteractionAskLater \
+    offapi/com/sun/star/task/XInteractionDisapprove \
+    offapi/com/sun/star/task/XInteractionPassword \
+    offapi/com/sun/star/task/XInteractionPassword2 \
+    offapi/com/sun/star/task/XInteractionRequestStringResolver \
+    offapi/com/sun/star/task/XJob \
+    offapi/com/sun/star/task/XJobExecutor \
+    offapi/com/sun/star/task/XJobListener \
+    offapi/com/sun/star/task/XMasterPasswordHandling \
+    offapi/com/sun/star/task/XMasterPasswordHandling2 \
+    offapi/com/sun/star/task/XPasswordContainer \
+    offapi/com/sun/star/task/XRestartManager \
+    offapi/com/sun/star/task/XStatusIndicator \
+    offapi/com/sun/star/task/XStatusIndicatorFactory \
+    offapi/com/sun/star/task/XStatusIndicatorSupplier \
+    offapi/com/sun/star/task/XUrlContainer \
+    offapi/com/sun/star/text/AuthorDisplayFormat \
+    offapi/com/sun/star/text/BibliographyDataField \
+    offapi/com/sun/star/text/BibliographyDataType \
+    offapi/com/sun/star/text/ChapterFormat \
+    offapi/com/sun/star/text/CharacterCompressionType \
+    offapi/com/sun/star/text/ControlCharacter \
+    offapi/com/sun/star/text/DateDisplayFormat \
+    offapi/com/sun/star/text/DocumentStatistic \
+    offapi/com/sun/star/text/FilenameDisplayFormat \
+    offapi/com/sun/star/text/FontEmphasis \
+    offapi/com/sun/star/text/FontRelief \
+    offapi/com/sun/star/text/FootnoteNumbering \
+    offapi/com/sun/star/text/GraphicCrop \
+    offapi/com/sun/star/text/HoriOrientation \
+    offapi/com/sun/star/text/HoriOrientationFormat \
+    offapi/com/sun/star/text/HorizontalAdjust \
+    offapi/com/sun/star/text/InvalidTextContentException \
+    offapi/com/sun/star/text/LabelFollow \
+    offapi/com/sun/star/text/MailMergeEvent \
+    offapi/com/sun/star/text/MailMergeType \
+    offapi/com/sun/star/text/NotePrintMode \
+    offapi/com/sun/star/text/PageNumberType \
+    offapi/com/sun/star/text/ParagraphVertAlign \
+    offapi/com/sun/star/text/PlaceholderType \
+    offapi/com/sun/star/text/PositionAndSpaceMode \
+    offapi/com/sun/star/text/PositionLayoutDir \
+    offapi/com/sun/star/text/ReferenceFieldPart \
+    offapi/com/sun/star/text/ReferenceFieldSource \
+    offapi/com/sun/star/text/RelOrientation \
+    offapi/com/sun/star/text/RubyAdjust \
+    offapi/com/sun/star/text/SectionFileLink \
+    offapi/com/sun/star/text/SetVariableType \
+    offapi/com/sun/star/text/SizeType \
+    offapi/com/sun/star/text/TableColumnSeparator \
+    offapi/com/sun/star/text/TemplateDisplayFormat \
+    offapi/com/sun/star/text/TextColumn \
+    offapi/com/sun/star/text/TextColumnSequence \
+    offapi/com/sun/star/text/TextContentAnchorType \
+    offapi/com/sun/star/text/TextGridMode \
+    offapi/com/sun/star/text/TextMarkupDescriptor \
+    offapi/com/sun/star/text/TextMarkupType \
+    offapi/com/sun/star/text/TimeDisplayFormat \
+    offapi/com/sun/star/text/UserDataPart \
+    offapi/com/sun/star/text/UserFieldFormat \
+    offapi/com/sun/star/text/VertOrientation \
+    offapi/com/sun/star/text/VertOrientationFormat \
+    offapi/com/sun/star/text/WrapInfluenceOnPosition \
+    offapi/com/sun/star/text/WrapTextMode \
+    offapi/com/sun/star/text/WritingMode \
+    offapi/com/sun/star/text/WritingMode2 \
+    offapi/com/sun/star/text/XAutoTextContainer \
+    offapi/com/sun/star/text/XAutoTextEntry \
+    offapi/com/sun/star/text/XAutoTextGroup \
+    offapi/com/sun/star/text/XBookmarkInsertTool \
+    offapi/com/sun/star/text/XBookmarksSupplier \
+    offapi/com/sun/star/text/XChapterNumberingSupplier \
+    offapi/com/sun/star/text/XDefaultNumberingProvider \
+    offapi/com/sun/star/text/XDependentTextField \
+    offapi/com/sun/star/text/XDocumentIndex \
+    offapi/com/sun/star/text/XDocumentIndexMark \
+    offapi/com/sun/star/text/XDocumentIndexesSupplier \
+    offapi/com/sun/star/text/XEndnotesSettingsSupplier \
+    offapi/com/sun/star/text/XEndnotesSupplier \
+    offapi/com/sun/star/text/XFlatParagraph \
+    offapi/com/sun/star/text/XFlatParagraphIterator \
+    offapi/com/sun/star/text/XFlatParagraphIteratorProvider \
+    offapi/com/sun/star/text/XFootnote \
+    offapi/com/sun/star/text/XFootnotesSettingsSupplier \
+    offapi/com/sun/star/text/XFootnotesSupplier \
+    offapi/com/sun/star/text/XFormField \
+    offapi/com/sun/star/text/XHeaderFooter \
+    offapi/com/sun/star/text/XHeaderFooterPageStyle \
+    offapi/com/sun/star/text/XLineNumberingProperties \
+    offapi/com/sun/star/text/XLineNumberingSupplier \
+    offapi/com/sun/star/text/XMailMergeBroadcaster \
+    offapi/com/sun/star/text/XMailMergeListener \
+    offapi/com/sun/star/text/XModule \
+    offapi/com/sun/star/text/XMultiTextMarkup \
+    offapi/com/sun/star/text/XNumberingFormatter \
+    offapi/com/sun/star/text/XNumberingRulesSupplier \
+    offapi/com/sun/star/text/XNumberingTypeInfo \
+    offapi/com/sun/star/text/XPageCursor \
+    offapi/com/sun/star/text/XPagePrintable \
+    offapi/com/sun/star/text/XParagraphAppend \
+    offapi/com/sun/star/text/XParagraphCursor \
+    offapi/com/sun/star/text/XRedline \
+    offapi/com/sun/star/text/XReferenceMarksSupplier \
+    offapi/com/sun/star/text/XRelativeTextContentInsert \
+    offapi/com/sun/star/text/XRelativeTextContentRemove \
+    offapi/com/sun/star/text/XRubySelection \
+    offapi/com/sun/star/text/XSentenceCursor \
+    offapi/com/sun/star/text/XSimpleText \
+    offapi/com/sun/star/text/XText \
+    offapi/com/sun/star/text/XTextAppend \
+    offapi/com/sun/star/text/XTextAppendAndConvert \
+    offapi/com/sun/star/text/XTextColumns \
+    offapi/com/sun/star/text/XTextContent \
+    offapi/com/sun/star/text/XTextContentAppend \
+    offapi/com/sun/star/text/XTextConvert \
+    offapi/com/sun/star/text/XTextCopy \
+    offapi/com/sun/star/text/XTextCursor \
+    offapi/com/sun/star/text/XTextDocument \
+    offapi/com/sun/star/text/XTextEmbeddedObject \
+    offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier \
+    offapi/com/sun/star/text/XTextField \
+    offapi/com/sun/star/text/XTextFieldsSupplier \
+    offapi/com/sun/star/text/XTextFrame \
+    offapi/com/sun/star/text/XTextFramesSupplier \
+    offapi/com/sun/star/text/XTextGraphicObjectsSupplier \
+    offapi/com/sun/star/text/XTextMarkup \
+    offapi/com/sun/star/text/XTextPortionAppend \
+    offapi/com/sun/star/text/XTextRange \
+    offapi/com/sun/star/text/XTextRangeCompare \
+    offapi/com/sun/star/text/XTextRangeMover \
+    offapi/com/sun/star/text/XTextSection \
+    offapi/com/sun/star/text/XTextSectionsSupplier \
+    offapi/com/sun/star/text/XTextShapesSupplier \
+    offapi/com/sun/star/text/XTextTable \
+    offapi/com/sun/star/text/XTextTableCursor \
+    offapi/com/sun/star/text/XTextTablesSupplier \
+    offapi/com/sun/star/text/XTextViewCursor \
+    offapi/com/sun/star/text/XTextViewCursorSupplier \
+    offapi/com/sun/star/text/XWordCursor \
+    offapi/com/sun/star/ucb/AlreadyInitializedException \
+    offapi/com/sun/star/ucb/AuthenticationRequest \
+    offapi/com/sun/star/ucb/CHAOSProgressStart \
+    offapi/com/sun/star/ucb/CertificateValidationRequest \
+    offapi/com/sun/star/ucb/Command \
+    offapi/com/sun/star/ucb/CommandAbortedException \
+    offapi/com/sun/star/ucb/CommandFailedException \
+    offapi/com/sun/star/ucb/CommandInfo \
+    offapi/com/sun/star/ucb/CommandInfoChange \
+    offapi/com/sun/star/ucb/CommandInfoChangeEvent \
+    offapi/com/sun/star/ucb/ConnectionMode \
+    offapi/com/sun/star/ucb/ContentAction \
+    offapi/com/sun/star/ucb/ContentCreationError \
+    offapi/com/sun/star/ucb/ContentCreationException \
+    offapi/com/sun/star/ucb/ContentEvent \
+    offapi/com/sun/star/ucb/ContentInfo \
+    offapi/com/sun/star/ucb/ContentInfoAttribute \
+    offapi/com/sun/star/ucb/ContentProviderInfo \
+    offapi/com/sun/star/ucb/ContentResultSetCapability \
+    offapi/com/sun/star/ucb/Cookie \
+    offapi/com/sun/star/ucb/CookiePolicy \
+    offapi/com/sun/star/ucb/CookieRequest \
+    offapi/com/sun/star/ucb/CrossReference \
+    offapi/com/sun/star/ucb/DocumentHeaderField \
+    offapi/com/sun/star/ucb/DocumentStoreMode \
+    offapi/com/sun/star/ucb/DuplicateCommandIdentifierException \
+    offapi/com/sun/star/ucb/DuplicateProviderException \
+    offapi/com/sun/star/ucb/Error \
+    offapi/com/sun/star/ucb/ExportStreamInfo \
+    offapi/com/sun/star/ucb/FetchError \
+    offapi/com/sun/star/ucb/FetchResult \
+    offapi/com/sun/star/ucb/FileSystemNotation \
+    offapi/com/sun/star/ucb/FolderList \
+    offapi/com/sun/star/ucb/FolderListCommand \
+    offapi/com/sun/star/ucb/FolderListEntry \
+    offapi/com/sun/star/ucb/GlobalTransferCommandArgument \
+    offapi/com/sun/star/ucb/HandleCookiesRequest \
+    offapi/com/sun/star/ucb/IOErrorCode \
+    offapi/com/sun/star/ucb/IllegalIdentifierException \
+    offapi/com/sun/star/ucb/InsertCommandArgument \
+    offapi/com/sun/star/ucb/InteractiveAppException \
+    offapi/com/sun/star/ucb/InteractiveAugmentedIOException \
+    offapi/com/sun/star/ucb/InteractiveBadTransferURLException \
+    offapi/com/sun/star/ucb/InteractiveCHAOSException \
+    offapi/com/sun/star/ucb/InteractiveFileIOException \
+    offapi/com/sun/star/ucb/InteractiveIOException \
+    offapi/com/sun/star/ucb/InteractiveLockingException \
+    offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException \
+    offapi/com/sun/star/ucb/InteractiveLockingLockedException \
+    offapi/com/sun/star/ucb/InteractiveLockingNotLockedException \
+    offapi/com/sun/star/ucb/InteractiveNetworkConnectException \
+    offapi/com/sun/star/ucb/InteractiveNetworkException \
+    offapi/com/sun/star/ucb/InteractiveNetworkGeneralException \
+    offapi/com/sun/star/ucb/InteractiveNetworkOffLineException \
+    offapi/com/sun/star/ucb/InteractiveNetworkReadException \
+    offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException \
+    offapi/com/sun/star/ucb/InteractiveNetworkWriteException \
+    offapi/com/sun/star/ucb/InteractiveWrongMediumException \
+    offapi/com/sun/star/ucb/Link \
+    offapi/com/sun/star/ucb/ListAction \
+    offapi/com/sun/star/ucb/ListActionType \
+    offapi/com/sun/star/ucb/ListEvent \
+    offapi/com/sun/star/ucb/ListenerAlreadySetException \
+    offapi/com/sun/star/ucb/Lock \
+    offapi/com/sun/star/ucb/LockDepth \
+    offapi/com/sun/star/ucb/LockEntry \
+    offapi/com/sun/star/ucb/LockScope \
+    offapi/com/sun/star/ucb/LockType \
+    offapi/com/sun/star/ucb/MissingInputStreamException \
+    offapi/com/sun/star/ucb/MissingPropertiesException \
+    offapi/com/sun/star/ucb/NameClash \
+    offapi/com/sun/star/ucb/NameClashException \
+    offapi/com/sun/star/ucb/NameClashResolveRequest \
+    offapi/com/sun/star/ucb/NumberedSortingInfo \
+    offapi/com/sun/star/ucb/OpenCommandArgument \
+    offapi/com/sun/star/ucb/OpenCommandArgument2 \
+    offapi/com/sun/star/ucb/OpenMode \
+    offapi/com/sun/star/ucb/OutgoingMessageState \
+    offapi/com/sun/star/ucb/PostCommandArgument \
+    offapi/com/sun/star/ucb/PostCommandArgument2 \
+    offapi/com/sun/star/ucb/Priority \
+    offapi/com/sun/star/ucb/PropertyValueInfo \
+    offapi/com/sun/star/ucb/PropertyValueState \
+    offapi/com/sun/star/ucb/RecipientInfo \
+    offapi/com/sun/star/ucb/RememberAuthentication \
+    offapi/com/sun/star/ucb/RemoteContentProviderChangeAction \
+    offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent \
+    offapi/com/sun/star/ucb/ResultSetException \
+    offapi/com/sun/star/ucb/Rule \
+    offapi/com/sun/star/ucb/RuleAction \
+    offapi/com/sun/star/ucb/RuleOperator \
+    offapi/com/sun/star/ucb/RuleSet \
+    offapi/com/sun/star/ucb/RuleTerm \
+    offapi/com/sun/star/ucb/SearchCommandArgument \
+    offapi/com/sun/star/ucb/SearchCriterium \
+    offapi/com/sun/star/ucb/SearchInfo \
+    offapi/com/sun/star/ucb/SearchRecursion \
+    offapi/com/sun/star/ucb/SendInfo \
+    offapi/com/sun/star/ucb/SendMediaTypes \
+    offapi/com/sun/star/ucb/ServiceNotFoundException \
+    offapi/com/sun/star/ucb/SortingInfo \
+    offapi/com/sun/star/ucb/SynchronizePolicy \
+    offapi/com/sun/star/ucb/TransferCommandOperation \
+    offapi/com/sun/star/ucb/TransferInfo \
+    offapi/com/sun/star/ucb/TransferResult \
+    offapi/com/sun/star/ucb/URLAuthenticationRequest \
+    offapi/com/sun/star/ucb/UnsupportedCommandException \
+    offapi/com/sun/star/ucb/UnsupportedDataSinkException \
+    offapi/com/sun/star/ucb/UnsupportedNameClashException \
+    offapi/com/sun/star/ucb/UnsupportedOpenModeException \
+    offapi/com/sun/star/ucb/VerificationMode \
+    offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct \
+    offapi/com/sun/star/ucb/XAnyCompare \
+    offapi/com/sun/star/ucb/XAnyCompareFactory \
+    offapi/com/sun/star/ucb/XCachedContentResultSetFactory \
+    offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory \
+    offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory \
+    offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory \
+    offapi/com/sun/star/ucb/XCommandEnvironment \
+    offapi/com/sun/star/ucb/XCommandInfo \
+    offapi/com/sun/star/ucb/XCommandInfoChangeListener \
+    offapi/com/sun/star/ucb/XCommandInfoChangeNotifier \
+    offapi/com/sun/star/ucb/XCommandProcessor \
+    offapi/com/sun/star/ucb/XCommandProcessor2 \
+    offapi/com/sun/star/ucb/XContent \
+    offapi/com/sun/star/ucb/XContentAccess \
+    offapi/com/sun/star/ucb/XContentCreator \
+    offapi/com/sun/star/ucb/XContentEventListener \
+    offapi/com/sun/star/ucb/XContentIdentifier \
+    offapi/com/sun/star/ucb/XContentIdentifierFactory \
+    offapi/com/sun/star/ucb/XContentIdentifierMapping \
+    offapi/com/sun/star/ucb/XContentProvider \
+    offapi/com/sun/star/ucb/XContentProviderFactory \
+    offapi/com/sun/star/ucb/XContentProviderManager \
+    offapi/com/sun/star/ucb/XContentProviderSupplier \
+    offapi/com/sun/star/ucb/XContentTransmitter \
+    offapi/com/sun/star/ucb/XDataContainer \
+    offapi/com/sun/star/ucb/XDynamicResultSet \
+    offapi/com/sun/star/ucb/XDynamicResultSetListener \
+    offapi/com/sun/star/ucb/XFetchProvider \
+    offapi/com/sun/star/ucb/XFetchProviderForContentAccess \
+    offapi/com/sun/star/ucb/XFileIdentifierConverter \
+    offapi/com/sun/star/ucb/XInteractionCookieHandling \
+    offapi/com/sun/star/ucb/XInteractionHandlerSupplier \
+    offapi/com/sun/star/ucb/XInteractionReplaceExistingData \
+    offapi/com/sun/star/ucb/XInteractionSupplyAuthentication \
+    offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2 \
+    offapi/com/sun/star/ucb/XInteractionSupplyName \
+    offapi/com/sun/star/ucb/XParameterizedContentProvider \
+    offapi/com/sun/star/ucb/XPersistentPropertySet \
+    offapi/com/sun/star/ucb/XProgressHandler \
+    offapi/com/sun/star/ucb/XPropertyMatcher \
+    offapi/com/sun/star/ucb/XPropertyMatcherFactory \
+    offapi/com/sun/star/ucb/XPropertySetRegistry \
+    offapi/com/sun/star/ucb/XPropertySetRegistryFactory \
+    offapi/com/sun/star/ucb/XRecycler \
+    offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor \
+    offapi/com/sun/star/ucb/XRemoteContentProviderActivator \
+    offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener \
+    offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier \
+    offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl \
+    offapi/com/sun/star/ucb/XRemoteContentProviderDistributor \
+    offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener \
+    offapi/com/sun/star/ucb/XRemoteContentProviderSupplier \
+    offapi/com/sun/star/ucb/XSimpleFileAccess \
+    offapi/com/sun/star/ucb/XSimpleFileAccess2 \
+    offapi/com/sun/star/ucb/XSimpleFileAccess3 \
+    offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory \
+    offapi/com/sun/star/ucb/XSourceInitialization \
+    offapi/com/sun/star/ucb/XWebDAVCommandEnvironment \
+    offapi/com/sun/star/ui/ActionTriggerSeparatorType \
+    offapi/com/sun/star/ui/ConfigurationEvent \
+    offapi/com/sun/star/ui/ContextMenuExecuteEvent \
+    offapi/com/sun/star/ui/ContextMenuInterceptorAction \
+    offapi/com/sun/star/ui/DockingArea \
+    offapi/com/sun/star/ui/ImageType \
+    offapi/com/sun/star/ui/ItemStyle \
+    offapi/com/sun/star/ui/ItemType \
+    offapi/com/sun/star/ui/UIElementType \
+    offapi/com/sun/star/ui/XAcceleratorConfiguration \
+    offapi/com/sun/star/ui/XContextMenuInterception \
+    offapi/com/sun/star/ui/XContextMenuInterceptor \
+    offapi/com/sun/star/ui/XDockingAreaAcceptor \
+    offapi/com/sun/star/ui/XImageManager \
+    offapi/com/sun/star/ui/XModuleUIConfigurationManager \
+    offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier \
+    offapi/com/sun/star/ui/XToolPanel \
+    offapi/com/sun/star/ui/XUIConfiguration \
+    offapi/com/sun/star/ui/XUIConfigurationListener \
+    offapi/com/sun/star/ui/XUIConfigurationManager \
+    offapi/com/sun/star/ui/XUIConfigurationManagerSupplier \
+    offapi/com/sun/star/ui/XUIConfigurationPersistence \
+    offapi/com/sun/star/ui/XUIConfigurationStorage \
+    offapi/com/sun/star/ui/XUIElement \
+    offapi/com/sun/star/ui/XUIElementFactory \
+    offapi/com/sun/star/ui/XUIElementFactoryRegistration \
+    offapi/com/sun/star/ui/XUIElementSettings \
+    offapi/com/sun/star/ui/XUIFunctionListener \
+    offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds \
+    offapi/com/sun/star/ui/dialogs/ControlActions \
+    offapi/com/sun/star/ui/dialogs/DialogClosedEvent \
+    offapi/com/sun/star/ui/dialogs/ExecutableDialogException \
+    offapi/com/sun/star/ui/dialogs/ExecutableDialogResults \
+    offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds \
+    offapi/com/sun/star/ui/dialogs/FilePickerEvent \
+    offapi/com/sun/star/ui/dialogs/FilePreviewImageFormats \
+    offapi/com/sun/star/ui/dialogs/ListboxControlActions \
+    offapi/com/sun/star/ui/dialogs/TemplateDescription \
+    offapi/com/sun/star/ui/dialogs/WizardButton \
+    offapi/com/sun/star/ui/dialogs/WizardTravelType \
+    offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog \
+    offapi/com/sun/star/ui/dialogs/XControlAccess \
+    offapi/com/sun/star/ui/dialogs/XControlInformation \
+    offapi/com/sun/star/ui/dialogs/XDialogClosedListener \
+    offapi/com/sun/star/ui/dialogs/XExecutableDialog \
+    offapi/com/sun/star/ui/dialogs/XFilePicker \
+    offapi/com/sun/star/ui/dialogs/XFilePicker2 \
+    offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess \
+    offapi/com/sun/star/ui/dialogs/XFilePickerListener \
+    offapi/com/sun/star/ui/dialogs/XFilePickerNotifier \
+    offapi/com/sun/star/ui/dialogs/XFilePreview \
+    offapi/com/sun/star/ui/dialogs/XFilterGroupManager \
+    offapi/com/sun/star/ui/dialogs/XFilterManager \
+    offapi/com/sun/star/ui/dialogs/XFolderPicker \
+    offapi/com/sun/star/ui/dialogs/XWizard \
+    offapi/com/sun/star/ui/dialogs/XWizardController \
+    offapi/com/sun/star/ui/dialogs/XWizardPage \
+    offapi/com/sun/star/util/AliasProgrammaticPair \
+    offapi/com/sun/star/util/AtomClassRequest \
+    offapi/com/sun/star/util/AtomDescription \
+    offapi/com/sun/star/util/CellProtection \
+    offapi/com/sun/star/util/ChangesEvent \
+    offapi/com/sun/star/util/ChangesSet \
+    offapi/com/sun/star/util/CloseVetoException \
+    offapi/com/sun/star/util/Color \
+    offapi/com/sun/star/util/DataEditorEvent \
+    offapi/com/sun/star/util/DataEditorEventType \
+    offapi/com/sun/star/util/Date \
+    offapi/com/sun/star/util/DateTime \
+    offapi/com/sun/star/util/DateTimeRange \
+    offapi/com/sun/star/util/DiskFullException \
+    offapi/com/sun/star/util/Duration \
+    offapi/com/sun/star/util/ElementChange \
+    offapi/com/sun/star/util/Endianness \
+    offapi/com/sun/star/util/FileIOException \
+    offapi/com/sun/star/util/InvalidStateException \
+    offapi/com/sun/star/util/Language \
+    offapi/com/sun/star/util/MalformedNumberFormatException \
+    offapi/com/sun/star/util/MeasureUnit \
+    offapi/com/sun/star/util/ModeChangeEvent \
+    offapi/com/sun/star/util/NotLockedException \
+    offapi/com/sun/star/util/NotNumericException \
+    offapi/com/sun/star/util/NumberFormat \
+    offapi/com/sun/star/util/RevisionTag \
+    offapi/com/sun/star/util/SearchAlgorithms \
+    offapi/com/sun/star/util/SearchFlags \
+    offapi/com/sun/star/util/SearchOptions \
+    offapi/com/sun/star/util/SearchResult \
+    offapi/com/sun/star/util/SortField \
+    offapi/com/sun/star/util/SortFieldType \
+    offapi/com/sun/star/util/Time \
+    offapi/com/sun/star/util/TriState \
+    offapi/com/sun/star/util/URL \
+    offapi/com/sun/star/util/VetoException \
+    offapi/com/sun/star/util/XArchiver \
+    offapi/com/sun/star/util/XAtomServer \
+    offapi/com/sun/star/util/XBroadcaster \
+    offapi/com/sun/star/util/XCancelManager \
+    offapi/com/sun/star/util/XCancellable \
+    offapi/com/sun/star/util/XChainable \
+    offapi/com/sun/star/util/XChangesBatch \
+    offapi/com/sun/star/util/XChangesListener \
+    offapi/com/sun/star/util/XChangesNotifier \
+    offapi/com/sun/star/util/XChangesSet \
+    offapi/com/sun/star/util/XCloneable \
+    offapi/com/sun/star/util/XCloseBroadcaster \
+    offapi/com/sun/star/util/XCloseListener \
+    offapi/com/sun/star/util/XCloseable \
+    offapi/com/sun/star/util/XDataEditor \
+    offapi/com/sun/star/util/XDataEditorListener \
+    offapi/com/sun/star/util/XFlushListener \
+    offapi/com/sun/star/util/XFlushable \
+    offapi/com/sun/star/util/XImportable \
+    offapi/com/sun/star/util/XIndent \
+    offapi/com/sun/star/util/XJobManager \
+    offapi/com/sun/star/util/XLinkUpdate \
+    offapi/com/sun/star/util/XLocalizedAliases \
+    offapi/com/sun/star/util/XLockable \
+    offapi/com/sun/star/util/XMergeable \
+    offapi/com/sun/star/util/XModeChangeApproveListener \
+    offapi/com/sun/star/util/XModeChangeBroadcaster \
+    offapi/com/sun/star/util/XModeChangeListener \
+    offapi/com/sun/star/util/XModeSelector \
+    offapi/com/sun/star/util/XModifiable \
+    offapi/com/sun/star/util/XModifiable2 \
+    offapi/com/sun/star/util/XModifyBroadcaster \
+    offapi/com/sun/star/util/XModifyListener \
+    offapi/com/sun/star/util/XNumberFormatPreviewer \
+    offapi/com/sun/star/util/XNumberFormatTypes \
+    offapi/com/sun/star/util/XNumberFormats \
+    offapi/com/sun/star/util/XNumberFormatsSupplier \
+    offapi/com/sun/star/util/XNumberFormatter \
+    offapi/com/sun/star/util/XOfficeInstallationDirectories \
+    offapi/com/sun/star/util/XPropertyReplace \
+    offapi/com/sun/star/util/XProtectable \
+    offapi/com/sun/star/util/XRefreshListener \
+    offapi/com/sun/star/util/XRefreshable \
+    offapi/com/sun/star/util/XReplaceDescriptor \
+    offapi/com/sun/star/util/XReplaceable \
+    offapi/com/sun/star/util/XSearchDescriptor \
+    offapi/com/sun/star/util/XSearchable \
+    offapi/com/sun/star/util/XSimpleErrorHandler \
+    offapi/com/sun/star/util/XSortable \
+    offapi/com/sun/star/util/XStringAbbreviation \
+    offapi/com/sun/star/util/XStringEscape \
+    offapi/com/sun/star/util/XStringMapping \
+    offapi/com/sun/star/util/XStringSubstitution \
+    offapi/com/sun/star/util/XStringWidth \
+    offapi/com/sun/star/util/XTextSearch \
+    offapi/com/sun/star/util/XTimeStamped \
+    offapi/com/sun/star/util/XURLTransformer \
+    offapi/com/sun/star/util/XUniqueIDFactory \
+    offapi/com/sun/star/util/XUpdatable \
+    offapi/com/sun/star/view/DocumentZoomType \
+    offapi/com/sun/star/view/DuplexMode \
+    offapi/com/sun/star/view/PaperFormat \
+    offapi/com/sun/star/view/PaperOrientation \
+    offapi/com/sun/star/view/PrintJobEvent \
+    offapi/com/sun/star/view/PrintableState \
+    offapi/com/sun/star/view/PrintableStateEvent \
+    offapi/com/sun/star/view/SelectionType \
+    offapi/com/sun/star/view/XControlAccess \
+    offapi/com/sun/star/view/XFormLayerAccess \
+    offapi/com/sun/star/view/XLineCursor \
+    offapi/com/sun/star/view/XMultiSelectionSupplier \
+    offapi/com/sun/star/view/XPrintJob \
+    offapi/com/sun/star/view/XPrintJobBroadcaster \
+    offapi/com/sun/star/view/XPrintJobListener \
+    offapi/com/sun/star/view/XPrintPreview \
+    offapi/com/sun/star/view/XPrintSettingsSupplier \
+    offapi/com/sun/star/view/XPrintable \
+    offapi/com/sun/star/view/XPrintableBroadcaster \
+    offapi/com/sun/star/view/XPrintableListener \
+    offapi/com/sun/star/view/XRenderable \
+    offapi/com/sun/star/view/XScreenCursor \
+    offapi/com/sun/star/view/XSelectionChangeListener \
+    offapi/com/sun/star/view/XSelectionSupplier \
+    offapi/com/sun/star/view/XViewCursor \
+    offapi/com/sun/star/view/XViewSettingsSupplier \
+    offapi/com/sun/star/xforms/InvalidDataOnSubmitException \
+    offapi/com/sun/star/xforms/XDataTypeRepository \
+    offapi/com/sun/star/xforms/XFormsEvent \
+    offapi/com/sun/star/xforms/XFormsSupplier \
+    offapi/com/sun/star/xforms/XFormsUIHelper1 \
+    offapi/com/sun/star/xforms/XModel \
+    offapi/com/sun/star/xforms/XSubmission \
+    offapi/com/sun/star/xml/Attribute \
+    offapi/com/sun/star/xml/AttributeData \
+    offapi/com/sun/star/xml/FastAttribute \
+    offapi/com/sun/star/xml/XExportFilter \
+    offapi/com/sun/star/xml/XImportFilter \
+    offapi/com/sun/star/xml/crypto/SecurityOperationStatus \
+    offapi/com/sun/star/xml/crypto/XMLEncryptionException \
+    offapi/com/sun/star/xml/crypto/XMLSignatureException \
+    offapi/com/sun/star/xml/crypto/XSEInitializer \
+    offapi/com/sun/star/xml/crypto/XSecurityEnvironment \
+    offapi/com/sun/star/xml/crypto/XUriBinding \
+    offapi/com/sun/star/xml/crypto/XXMLEncryption \
+    offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate \
+    offapi/com/sun/star/xml/crypto/XXMLSecurityContext \
+    offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate \
+    offapi/com/sun/star/xml/crypto/XXMLSignature \
+    offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate \
+    offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId \
+    offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority \
+    offapi/com/sun/star/xml/crypto/sax/ElementMarkType \
+    offapi/com/sun/star/xml/crypto/sax/ElementStackItem \
+    offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor \
+    offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster \
+    offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener \
+    offapi/com/sun/star/xml/crypto/CipherID \
+    offapi/com/sun/star/xml/crypto/DigestID \
+    offapi/com/sun/star/xml/crypto/XCipherContext \
+    offapi/com/sun/star/xml/crypto/XCipherContextSupplier \
+    offapi/com/sun/star/xml/crypto/XDigestContext \
+    offapi/com/sun/star/xml/crypto/XDigestContextSupplier \
+    offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper \
+    offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster \
+    offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener \
+    offapi/com/sun/star/xml/crypto/sax/XKeyCollector \
+    offapi/com/sun/star/xml/crypto/sax/XMissionTaker \
+    offapi/com/sun/star/xml/crypto/sax/XReferenceCollector \
+    offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster \
+    offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener \
+    offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper \
+    offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster \
+    offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener \
+    offapi/com/sun/star/xml/crypto/sax/XSecurityController \
+    offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper \
+    offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster \
+    offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener \
+    offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster \
+    offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener \
+    offapi/com/sun/star/xml/csax/XCompressedDocumentHandler \
+    offapi/com/sun/star/xml/csax/XMLAttribute \
+    offapi/com/sun/star/xml/dom/DOMException \
+    offapi/com/sun/star/xml/dom/DOMExceptionType \
+    offapi/com/sun/star/xml/dom/NodeType \
+    offapi/com/sun/star/xml/dom/SAXDocumentBuilderState \
+    offapi/com/sun/star/xml/dom/XAttr \
+    offapi/com/sun/star/xml/dom/XCDATASection \
+    offapi/com/sun/star/xml/dom/XCharacterData \
+    offapi/com/sun/star/xml/dom/XComment \
+    offapi/com/sun/star/xml/dom/XDOMImplementation \
+    offapi/com/sun/star/xml/dom/XDocument \
+    offapi/com/sun/star/xml/dom/XDocumentBuilder \
+    offapi/com/sun/star/xml/dom/XDocumentFragment \
+    offapi/com/sun/star/xml/dom/XDocumentType \
+    offapi/com/sun/star/xml/dom/XElement \
+    offapi/com/sun/star/xml/dom/XEntity \
+    offapi/com/sun/star/xml/dom/XEntityReference \
+    offapi/com/sun/star/xml/dom/XNamedNodeMap \
+    offapi/com/sun/star/xml/dom/XNode \
+    offapi/com/sun/star/xml/dom/XNodeList \
+    offapi/com/sun/star/xml/dom/XNotation \
+    offapi/com/sun/star/xml/dom/XProcessingInstruction \
+    offapi/com/sun/star/xml/dom/XSAXDocumentBuilder \
+    offapi/com/sun/star/xml/dom/XText \
+    offapi/com/sun/star/xml/dom/events/AttrChangeType \
+    offapi/com/sun/star/xml/dom/events/EventException \
+    offapi/com/sun/star/xml/dom/events/EventType \
+    offapi/com/sun/star/xml/dom/events/PhaseType \
+    offapi/com/sun/star/xml/dom/events/XDocumentEvent \
+    offapi/com/sun/star/xml/dom/events/XEvent \
+    offapi/com/sun/star/xml/dom/events/XEventListener \
+    offapi/com/sun/star/xml/dom/events/XEventTarget \
+    offapi/com/sun/star/xml/dom/events/XMouseEvent \
+    offapi/com/sun/star/xml/dom/events/XMutationEvent \
+    offapi/com/sun/star/xml/dom/events/XUIEvent \
+    offapi/com/sun/star/xml/dom/views/XAbstractView \
+    offapi/com/sun/star/xml/dom/views/XDocumentView \
+    offapi/com/sun/star/xml/input/XAttributes \
+    offapi/com/sun/star/xml/input/XElement \
+    offapi/com/sun/star/xml/input/XNamespaceMapping \
+    offapi/com/sun/star/xml/input/XRoot \
+    offapi/com/sun/star/xml/sax/FastToken \
+    offapi/com/sun/star/xml/sax/InputSource \
+    offapi/com/sun/star/xml/sax/SAXException \
+    offapi/com/sun/star/xml/sax/SAXInvalidCharacterException \
+    offapi/com/sun/star/xml/sax/SAXParseException \
+    offapi/com/sun/star/xml/sax/XAttributeList \
+    offapi/com/sun/star/xml/sax/XDTDHandler \
+    offapi/com/sun/star/xml/sax/XDocumentHandler \
+    offapi/com/sun/star/xml/sax/XEntityResolver \
+    offapi/com/sun/star/xml/sax/XErrorHandler \
+    offapi/com/sun/star/xml/sax/XExtendedDocumentHandler \
+    offapi/com/sun/star/xml/sax/XFastAttributeList \
+    offapi/com/sun/star/xml/sax/XFastContextHandler \
+    offapi/com/sun/star/xml/sax/XFastDocumentHandler \
+    offapi/com/sun/star/xml/sax/XFastParser \
+    offapi/com/sun/star/xml/sax/XFastSAXSerializable \
+    offapi/com/sun/star/xml/sax/XFastSerializer \
+    offapi/com/sun/star/xml/sax/XFastShapeContextHandler \
+    offapi/com/sun/star/xml/sax/XFastTokenHandler \
+    offapi/com/sun/star/xml/sax/XLocator \
+    offapi/com/sun/star/xml/sax/XParser \
+    offapi/com/sun/star/xml/sax/XSAXSerializable \
+    offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper \
+    offapi/com/sun/star/xml/wrapper/XXMLElementWrapper \
+    offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle \
+    offapi/com/sun/star/xml/xpath/XPathException \
+    offapi/com/sun/star/xml/xpath/XPathObjectType \
+    offapi/com/sun/star/xml/xpath/XXPathAPI \
+    offapi/com/sun/star/xml/xpath/XXPathExtension \
+    offapi/com/sun/star/xml/xpath/XXPathObject \
+    offapi/com/sun/star/xsd/DataTypeClass \
+    offapi/com/sun/star/xsd/WhiteSpaceTreatment \
+    offapi/com/sun/star/xsd/XDataType \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/offapi/com/sun/star/configuration/backend/xml/makefile.mk b/offapi/UnoApi_types.mk
index b16dcb545..4c6701c85 100644
--- a/offapi/com/sun/star/configuration/backend/xml/makefile.mk
+++ b/offapi/UnoApi_types.mk
@@ -14,30 +14,32 @@
 #
 # OpenOffice.org is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
 # GNU Lesser General Public License version 3 for more details
 # (a copy is included in the LICENSE file that accompanied this code).
 #
 # You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
+# version 3 along with OpenOffice.org.	If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..$/..$/..
-PRJNAME=offapi
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,types))
 
-TARGET = csscbxml
-PACKAGE = com$/sun$/star$/configuration$/backend$/xml
+$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\
+    udkapi \
+    offapi \
+))
 
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_UnoApiTarget_add_reference_rdbfile,types,\
+    offapi/type_reference/types \
+))
 
-IDLFILES = \
-    SchemaParser.idl				\
-    LayerParser.idl				\
-    LayerWriter.idl				\
+# ugly hack for now!
+statistic : $(gb_Helper_MISC)/api_statistic
 
+$(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiTarget_get_target,types)
+	$(PERL) util/checknewapi.pl $(call gb_UnoApiTarget_get_target,types) $(UNOAPI_REFERENCE_types) "$(RSCREVISION)" "$(gb_UnoApiTarget_REGVIEWTARGET)" > $@
 
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
+# vim: set noet sw=4 ts=4:
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
index e9b441efc..895f68009 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_accessibility_AccessibleEventObject_idl__
 #define __com_sun_star_accessibility_AccessibleEventObject_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelation.idl b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
index d50a35284..96e9b5f12 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelation.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_accessibility_AccessibleRelation_idl__
 #define __com_sun_star_accessibility_AccessibleRelation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
index d948a3e2f..0936faf51 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_AccessibleTableModelChange_idl__
 #define __com_sun_star_accessibility_AccessibleTableModelChange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
index 9ba1a51da..ba6e532d0 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_XAccessibleTableModelChange_idl__
 #define __com_sun_star_accessibility_XAccessibleTableModelChange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
index 9cb78aac9..36b48d65c 100644
--- a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
+++ b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__ 
 #define __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
 module com {  module sun {  module star {  module accessibility {  
  
diff --git a/offapi/com/sun/star/accessibility/XAccessible.idl b/offapi/com/sun/star/accessibility/XAccessible.idl
index afd9928bf..c3dc10f09 100644
--- a/offapi/com/sun/star/accessibility/XAccessible.idl
+++ b/offapi/com/sun/star/accessibility/XAccessible.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_XAccessible_idl__
 #define __com_sun_star_accessibility_XAccessible_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleAction.idl b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
index 1270283f0..37d7c5741 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleAction.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
@@ -28,12 +28,8 @@
 #ifndef	__com_sun_star_accessibility_XAccessibleAction_idl__
 #define	__com_sun_star_accessibility_XAccessibleAction_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
index 3c2d14afb..2ac39d59d 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
@@ -28,30 +28,14 @@
 #ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #define __com_sun_star_accessibility_XAccessibleComponent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_awt_XFocusListener_idl__
 #include <com/sun/star/awt/XFocusListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XFont_idl__
 #include <com/sun/star/awt/XFont.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleContext.idl b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
index 7914a9605..c45340bfb 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleContext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #define __com_sun_star_accessibility_XAccessibleContext_idl__
 
-#ifndef __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__
 #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
index ff0d33356..dab8ec171 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
 #define __com_sun_star_accessibility_XAccessibleEditableText_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__ 
 #include <com/sun/star/accessibility/XAccessibleText.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
-#endif 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
         
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
index f05c7b659..79781bd22 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
@@ -28,9 +28,7 @@
 #ifndef	__com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #define	__com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
index bd76259dd..c1cc33e1c 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
@@ -28,13 +28,8 @@
 #ifndef	__com_sun_star_accessibility_XAccessibleEventListener_idl__
 #define	__com_sun_star_accessibility_XAccessibleEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
-
-#ifndef __com_sun_star_accessibility_AccessibleEventObject_idl__
 #include <com/sun/star/accessibility/AccessibleEventObject.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
index ef31c6500..5746f4778 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
@@ -28,30 +28,14 @@
 #ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #define __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_awt_XFocusListener_idl__
 #include <com/sun/star/awt/XFocusListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XFont_idl__
 #include <com/sun/star/awt/XFont.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
index 3505919bc..71636fe3c 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleHyperlink_idl__
 #define __com_sun_star_accessibility_XAccessibleHyperlink_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__ 
 #include <com/sun/star/accessibility/XAccessibleAction.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
-#endif 
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
index b80a5b195..63ff20296 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleHypertext_idl__
 #define __com_sun_star_accessibility_XAccessibleHypertext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleImage.idl b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
index 94315f721..4e823c5b3 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleImage.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
 #define __com_sun_star_accessibility_XAccessibleImage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
index 83df1f263..839f3b963 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleKeyBinding_idl__
 #define __com_sun_star_accessibility_XAccessibleKeyBinding_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_KeyStroke_idl__
 #include <com/sun/star/awt/KeyStroke.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl b/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
index 9e0310308..e0b80cc98 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleMultiLineText_idl__
 #define __com_sun_star_accessibility_XAccessibleMultiLineText_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__ 
 #include <com/sun/star/accessibility/XAccessibleText.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
-#endif 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
         
diff --git a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
index e35afc5c6..9bad240d2 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleRelationSet_idl__
 #define __com_sun_star_accessibility_XAccessibleRelationSet_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleRelation_idl__
 #include <com/sun/star/accessibility/AccessibleRelation.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
index f0e8cc25e..9fcbf6dc4 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #define __com_sun_star_accessibility_XAccessibleSelection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
index d7a8d006f..0e23d6185 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleStateSet_idl__
 #define __com_sun_star_accessibility_XAccessibleStateSet_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleStateType_idl__
 #include <com/sun/star/accessibility/AccessibleStateType.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTable.idl b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
index 89a7d7a09..a0df1a16c 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTable.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
 #define __com_sun_star_accessibility_XAccessibleTable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleText.idl b/offapi/com/sun/star/accessibility/XAccessibleText.idl
index 46d4e022f..7be269a8e 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleText.idl
@@ -28,31 +28,14 @@
 #ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #define __com_sun_star_accessibility_XAccessibleText_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleTextType_idl__
 #include <com/sun/star/accessibility/AccessibleTextType.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_accessibility_TextSegment_idl__
 #include <com/sun/star/accessibility/TextSegment.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
index a68c8cd74..d0a5e4182 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleTextAttributes_idl__
 #define __com_sun_star_accessibility_XAccessibleTextAttributes_idl__
 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl b/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
index 241d2779f..5cdec2260 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_accessibility_XAccessibleTextMarkup_idl__
 #define __com_sun_star_accessibility_XAccessibleTextMarkup_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_TextSegment_idl__
 #include <com/sun/star/accessibility/TextSegment.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleValue.idl b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
index b7bedfa33..288311451 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleValue.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #define __com_sun_star_accessibility_XAccessibleValue_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/makefile.mk b/offapi/com/sun/star/accessibility/makefile.mk
deleted file mode 100644
index 29403d0e9..000000000
--- a/offapi/com/sun/star/accessibility/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssaccessibility
-PACKAGE=com$/sun$/star$/accessibility
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessBridge.idl                                \
-    Accessible.idl                                  \
-    AccessibleContext.idl                           \
-    AccessibleEventId.idl                           \
-    AccessibleEventObject.idl                       \
-    AccessibleRelation.idl                          \
-    AccessibleRelationType.idl                      \
-    AccessibleRole.idl                              \
-    AccessibleStateType.idl                         \
-    AccessibleTableModelChange.idl                  \
-    AccessibleTableModelChangeType.idl              \
-    AccessibleTextType.idl                          \
-    IllegalAccessibleComponentStateException.idl    \
-    TextSegment.idl                                 \
-    XAccessible.idl                                 \
-    XAccessibleAction.idl                           \
-    XAccessibleComponent.idl                        \
-    XAccessibleContext.idl                          \
-    XAccessibleEditableText.idl                     \
-    XAccessibleEventBroadcaster.idl                 \
-    XAccessibleEventListener.idl                    \
-    XAccessibleExtendedComponent.idl                \
-    XAccessibleHyperlink.idl                        \
-    XAccessibleHypertext.idl                        \
-    XAccessibleImage.idl                            \
-    XAccessibleKeyBinding.idl                       \
-    XAccessibleMultiLineText.idl                    \
-    XAccessibleRelationSet.idl                      \
-    XAccessibleSelection.idl                        \
-    XAccessibleStateSet.idl                         \
-    XAccessibleTable.idl                            \
-    XAccessibleText.idl                             \
-    XAccessibleTextAttributes.idl                   \
-    XAccessibleTextMarkup.idl                       \
-    XAccessibleValue.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/animations/Event.idl b/offapi/com/sun/star/animations/Event.idl
index 96921e3f7..6740cd802 100644
--- a/offapi/com/sun/star/animations/Event.idl
+++ b/offapi/com/sun/star/animations/Event.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_Event_idl__ 
 #define __com_sun_star_animations_Event_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/animations/TargetProperties.idl b/offapi/com/sun/star/animations/TargetProperties.idl
index 44eb5f1f7..940ed83c6 100644
--- a/offapi/com/sun/star/animations/TargetProperties.idl
+++ b/offapi/com/sun/star/animations/TargetProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_TargetProperties_idl__ 
 #define __com_sun_star_animations_TargetProperties_idl__ 
 
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/sal/osl/os2/helpers/dosh.h b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
index 75f0b66f6..7e1627dc7 100644
--- a/sal/osl/os2/helpers/dosh.h
+++ b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,28 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_animations_TargetPropertiesCreator_idl__
+#define __com_sun_star_animations_TargetPropertiesCreator_idl__
 
-/*      This file Copyright (C) 1997-2006 Ulrich M�ller,
- *                                        Dmitry A. Steklenev.
- *      This file is part of the "XWorkplace helpers" source package.
- *
- *      2009-06-15 published under LGPL3 with Ulrich M�ller permission.
- *
- */
-
-#if __cplusplus
-extern "C" {
+#ifndef __com_sun_star_animations_TargetProperties_idl__
+#include <com/sun/star/animations/XTargetPropertiesCreator.idl>
 #endif
 
-#ifndef DOSH_HEADER_INCLUDED
-    #define DOSH_HEADER_INCLUDED
+//=============================================================================
 
-    CHAR doshQueryBootDrive(VOID);
+ module com {  module sun {  module star {  module animations {
 
-#endif
+//=============================================================================
 
-#if __cplusplus
-}
-#endif
+service TargetPropertiesCreator: XTargetPropertiesCreator;
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/animations/XAnimate.idl b/offapi/com/sun/star/animations/XAnimate.idl
index e450bd749..5ece66798 100644
--- a/offapi/com/sun/star/animations/XAnimate.idl
+++ b/offapi/com/sun/star/animations/XAnimate.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_animations_XAnimate_idl__
 #define __com_sun_star_animations_XAnimate_idl__
 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
-
-#ifndef __com_sun_star_animations_TimeFilterPair_idl__
 #include <com/sun/star/animations/TimeFilterPair.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/animations/XAnimateColor.idl b/offapi/com/sun/star/animations/XAnimateColor.idl
index 01f4a2fd7..420d3a398 100644
--- a/offapi/com/sun/star/animations/XAnimateColor.idl
+++ b/offapi/com/sun/star/animations/XAnimateColor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAnimateColor_idl__ 
 #define __com_sun_star_animations_XAnimateColor_idl__ 
 
-#ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/animations/XAnimateMotion.idl b/offapi/com/sun/star/animations/XAnimateMotion.idl
index 42b154f1d..c3d047638 100644
--- a/offapi/com/sun/star/animations/XAnimateMotion.idl
+++ b/offapi/com/sun/star/animations/XAnimateMotion.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAnimateMotion_idl__ 
 #define __com_sun_star_animations_XAnimateMotion_idl__ 
 
-#ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/animations/XAnimateSet.idl b/offapi/com/sun/star/animations/XAnimateSet.idl
index 6db771acf..5f9913f66 100644
--- a/offapi/com/sun/star/animations/XAnimateSet.idl
+++ b/offapi/com/sun/star/animations/XAnimateSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAnimateSet_idl__ 
 #define __com_sun_star_animations_XAnimateSet_idl__ 
 
-#ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/animations/XAnimateTransform.idl b/offapi/com/sun/star/animations/XAnimateTransform.idl
index 03789dcca..ed45a02f2 100644
--- a/offapi/com/sun/star/animations/XAnimateTransform.idl
+++ b/offapi/com/sun/star/animations/XAnimateTransform.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAnimateTransform_idl__ 
 #define __com_sun_star_animations_XAnimateTransform_idl__ 
 
-#ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/animations/XAnimationListener.idl b/offapi/com/sun/star/animations/XAnimationListener.idl
index c885282db..ba00e4db6 100644
--- a/offapi/com/sun/star/animations/XAnimationListener.idl
+++ b/offapi/com/sun/star/animations/XAnimationListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XAnimationListener_idl__ 
-#define __com_sun_star_animations_XAnimationListener_idl__ 
+#ifndef __com_sun_star_animations_XAnimationListener_idl__
+#define __com_sun_star_animations_XAnimationListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module animations {  
- 
-//============================================================================= 
+//=============================================================================
+
+ module com {  module sun {  module star {  module animations {
+
+//=============================================================================
 
 /** makes it possible to register listeners, which are called whenever
     an animation event occurs.
 
     @since OOo 3.0
  */
-interface XAnimationListener : ::com::sun::star::lang::XEventListener
+published interface XAnimationListener : ::com::sun::star::lang::XEventListener
 {
     /** This event is raised when the element local timeline begins to play.
         <p>It will be raised each time the element begins the active duration (i.e. when it restarts, but not when it repeats).</p>
@@ -53,7 +49,7 @@ interface XAnimationListener : ::com::sun::star::lang::XEventListener
         case that the element was begun with an interface method.</p>
 
         @param Node
-            The node that begins to play.			
+            The node that begins to play.
     */
     void beginEvent( [in] XAnimationNode Node );
 
@@ -71,7 +67,7 @@ interface XAnimationListener : ::com::sun::star::lang::XEventListener
         <p>It will be raised each time the element repeats, after the first iteration.</p>
         <p>Associated with the repeat event is an integer that indicates which repeat iteration is
         beginning.
-        
+
         @param Node
             The node that repeats.
 
@@ -81,8 +77,8 @@ interface XAnimationListener : ::com::sun::star::lang::XEventListener
     void repeat( [in] XAnimationNode Node, [in] long Repeat );
 };
 
-//============================================================================= 
- 
-}; }; }; };  
+//=============================================================================
+
+}; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/animations/XAnimationNode.idl b/offapi/com/sun/star/animations/XAnimationNode.idl
index c216a6d72..b118d8ddc 100644
--- a/offapi/com/sun/star/animations/XAnimationNode.idl
+++ b/offapi/com/sun/star/animations/XAnimationNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XAnimationNode_idl__ 
-#define __com_sun_star_animations_XAnimationNode_idl__ 
+#ifndef __com_sun_star_animations_XAnimationNode_idl__
+#define __com_sun_star_animations_XAnimationNode_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module animations {  
- 
-//============================================================================= 
+//=============================================================================
+
+ module com {  module sun {  module star {  module animations {
+
+//=============================================================================
 
 /**
 */
-interface XAnimationNode : ::com::sun::star::container::XChild
+published interface XAnimationNode : ::com::sun::star::container::XChild
 {
     /**  a value from <const>AnimationNodeType</const>.
 
@@ -118,7 +113,7 @@ interface XAnimationNode : ::com::sun::star::container::XChild
             either a <atom>short</atom> constant from <const>EndSync</const>,
             an interface reference to a child <type>XTimeContainer</type>
             or <void/>.
-            
+
         @see http://www.w3.org/TR/smil20/smil-timing.html#adef-endsync
     */
     [attribute] any EndSync;
@@ -162,7 +157,7 @@ interface XAnimationNode : ::com::sun::star::container::XChild
 
     /** the attribute that specify the behavior how an element
         should be extended beyond the active duration by freezing the final
-        state of the element. 
+        state of the element.
         <br>
         <member>Fill</member> is
             a value from <const>AnimationFill</const>.
@@ -173,7 +168,7 @@ interface XAnimationNode : ::com::sun::star::container::XChild
     [attribute] short Fill;
 
     /** the default value for the fill behavior for this element and all
-        descendants. 
+        descendants.
         <br>
         <member>FillDefault</member> is
             <ul>
@@ -194,7 +189,7 @@ interface XAnimationNode : ::com::sun::star::container::XChild
         <br>
         <member>Restart</member> is
             a <atom>short</atom> value from <const>AnimationRestart</const>.
-        
+
         @see <const>AnimationRestart</const>
         @see http://www.w3.org/TR/smil20/smil-timing.html#adef-restart
     */
@@ -204,7 +199,7 @@ interface XAnimationNode : ::com::sun::star::container::XChild
 
         @returns
             a value from <const>Restart</const>.
-        
+
         @see <const>AnimationRestart</const>
         @see http://www.w3.org/TR/smil20/smil-timing.html#adef-restartDefault
     */
@@ -244,7 +239,7 @@ interface XAnimationNode : ::com::sun::star::container::XChild
             <li><false/> if the animation is played normal.</li>
             <li><true/> if the animation is played forwards and then backwards. This doubles the duration</li>
             </ul>
-        
+
         @see http://www.w3.org/TR/smil20/smil-timemanip.html#adef-autoReverse
     */
     [attribute] boolean AutoReverse;
@@ -254,8 +249,8 @@ interface XAnimationNode : ::com::sun::star::container::XChild
     [attribute] sequence< ::com::sun::star::beans::NamedValue > UserData;
 };
 
-//============================================================================= 
- 
-}; }; }; };  
+//=============================================================================
+
+}; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl b/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
index 597f9cba0..5641e7624 100644
--- a/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
+++ b/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAnimationNodeSupplier_idl__ 
 #define __com_sun_star_animations_XAnimationNodeSupplier_idl__ 
 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/animations/XAudio.idl b/offapi/com/sun/star/animations/XAudio.idl
index 6f8014e8b..0493c24cb 100644
--- a/offapi/com/sun/star/animations/XAudio.idl
+++ b/offapi/com/sun/star/animations/XAudio.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAudio_idl__ 
 #define __com_sun_star_animations_XAudio_idl__ 
 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/animations/XCommand.idl b/offapi/com/sun/star/animations/XCommand.idl
index 1aa29eff9..35cf52e38 100644
--- a/offapi/com/sun/star/animations/XCommand.idl
+++ b/offapi/com/sun/star/animations/XCommand.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XCommand_idl__ 
 #define __com_sun_star_animations_XCommand_idl__ 
 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/animations/XIterateContainer.idl b/offapi/com/sun/star/animations/XIterateContainer.idl
index e92b272a0..8cdb6b9e4 100644
--- a/offapi/com/sun/star/animations/XIterateContainer.idl
+++ b/offapi/com/sun/star/animations/XIterateContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XIterateContainer_idl__ 
 #define __com_sun_star_animations_XIterateContainer_idl__ 
 
-#ifndef __com_sun_star_animations_XTimeContainer_idl__
 #include <com/sun/star/animations/XTimeContainer.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
index ff03c57a9..09003666f 100644
--- a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
+++ b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_animations_XTargetPropertiesCreator_idl__ 
 #define __com_sun_star_animations_XTargetPropertiesCreator_idl__ 
 
-#ifndef __com_sun_star_animations_TargetProperties_idl__
 #include <com/sun/star/animations/TargetProperties.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
 
 //============================================================================= 
  
@@ -71,8 +67,6 @@ interface XTargetPropertiesCreator : ::com::sun::star::uno::XInterface
 
 //============================================================================= 
 
-service TargetPropertiesCreator: XTargetPropertiesCreator;
- 
 }; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XTimeContainer.idl b/offapi/com/sun/star/animations/XTimeContainer.idl
index 40ed239dc..0ef5d5569 100644
--- a/offapi/com/sun/star/animations/XTimeContainer.idl
+++ b/offapi/com/sun/star/animations/XTimeContainer.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_animations_XTimeContainer_idl__ 
 #define __com_sun_star_animations_XTimeContainer_idl__ 
 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/animations/XTransitionFilter.idl b/offapi/com/sun/star/animations/XTransitionFilter.idl
index a45c24a6f..a49c5be52 100644
--- a/offapi/com/sun/star/animations/XTransitionFilter.idl
+++ b/offapi/com/sun/star/animations/XTransitionFilter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XTransitionFilter_idl__
 #define __com_sun_star_animations_XTransitionFilter_idl__
 
-#ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/animations/makefile.mk b/offapi/com/sun/star/animations/makefile.mk
deleted file mode 100644
index f899d8c14..000000000
--- a/offapi/com/sun/star/animations/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssanimations
-PACKAGE=com$/sun$/star$/animations
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AnimationAdditiveMode.idl\
-    AnimationCalcMode.idl\
-    AnimationColorSpace.idl\
-    AnimationEndSync.idl\
-    AnimationFill.idl\
-    AnimationNodeType.idl\
-    AnimationRestart.idl\
-    AnimationTransformType.idl\
-    AnimationValueType.idl\
-    Event.idl\
-    EventTrigger.idl\
-    TargetProperties.idl \
-    TimeFilterPair.idl\
-    Timing.idl\
-    TransitionSubType.idl\
-    TransitionType.idl\
-    ValuePair.idl\
-    XAnimate.idl\
-    XAnimateColor.idl\
-    XAnimateMotion.idl\
-    XAnimateSet.idl\
-    XAnimateTransform.idl\
-    XAnimationNode.idl\
-    XAnimationNodeSupplier.idl\
-    XAudio.idl\
-    XIterateContainer.idl\
-    XTargetPropertiesCreator.idl \
-    XTimeContainer.idl\
-    XTransitionFilter.idl\
-    XCommand.idl\
-    XAnimationListener.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/auth/AuthenticationFailedException.idl b/offapi/com/sun/star/auth/AuthenticationFailedException.idl
index b4df2e526..fd5e4a400 100644
--- a/offapi/com/sun/star/auth/AuthenticationFailedException.idl
+++ b/offapi/com/sun/star/auth/AuthenticationFailedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
 #define __com_sun_star_auth_AuthenticationFailedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/InvalidArgumentException.idl b/offapi/com/sun/star/auth/InvalidArgumentException.idl
index 1f6a0ecdb..fdbdd1648 100644
--- a/offapi/com/sun/star/auth/InvalidArgumentException.idl
+++ b/offapi/com/sun/star/auth/InvalidArgumentException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_InvalidArgumentException_idl__
 #define __com_sun_star_auth_InvalidArgumentException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/InvalidContextException.idl b/offapi/com/sun/star/auth/InvalidContextException.idl
index 164fcd7f7..cd4255e49 100644
--- a/offapi/com/sun/star/auth/InvalidContextException.idl
+++ b/offapi/com/sun/star/auth/InvalidContextException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_InvalidContextException_idl__
 #define __com_sun_star_auth_InvalidContextException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/InvalidCredentialException.idl b/offapi/com/sun/star/auth/InvalidCredentialException.idl
index ff0704a05..461080ec7 100644
--- a/offapi/com/sun/star/auth/InvalidCredentialException.idl
+++ b/offapi/com/sun/star/auth/InvalidCredentialException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_InvalidCredentialException_idl__
 #define __com_sun_star_auth_InvalidCredentialException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/InvalidPrincipalException.idl b/offapi/com/sun/star/auth/InvalidPrincipalException.idl
index 106f6c4b3..d8427a09a 100644
--- a/offapi/com/sun/star/auth/InvalidPrincipalException.idl
+++ b/offapi/com/sun/star/auth/InvalidPrincipalException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_InvalidPrincipalException_idl__
 #define __com_sun_star_auth_InvalidPrincipalException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/PersistenceFailureException.idl b/offapi/com/sun/star/auth/PersistenceFailureException.idl
index bc3a84779..4a780823c 100644
--- a/offapi/com/sun/star/auth/PersistenceFailureException.idl
+++ b/offapi/com/sun/star/auth/PersistenceFailureException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_PersistenceFailureException_idl__
 #define __com_sun_star_auth_PersistenceFailureException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/SSOExceptions.idl b/offapi/com/sun/star/auth/SSOExceptions.idl
index 87633e075..6cb6b0a0f 100644
--- a/offapi/com/sun/star/auth/SSOExceptions.idl
+++ b/offapi/com/sun/star/auth/SSOExceptions.idl
@@ -28,26 +28,12 @@
 #ifndef __com_sun_star_auth_SSOExceptions_idl__
 #define __com_sun_star_auth_SSOExceptions_idl__
 
-#ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
 #include <com/sun/star/auth/AuthenticationFailedException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidArgumentException_idl__
 #include <com/sun/star/auth/InvalidArgumentException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidContextException_idl__
 #include <com/sun/star/auth/InvalidContextException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidCredentialException_idl__
 #include <com/sun/star/auth/InvalidCredentialException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidPrincipalException_idl__
 #include <com/sun/star/auth/InvalidPrincipalException.idl>
-#endif
-#ifndef __com_sun_star_auth_PersistenceFailureException_idl__
 #include <com/sun/star/auth/PersistenceFailureException.idl>
-#endif
-#ifndef __com_sun_star_auth_UnsupportedException_idl__
 #include <com/sun/star/auth/UnsupportedException.idl>
-#endif
 
 #endif
diff --git a/offapi/com/sun/star/auth/SSOManagerFactory.idl b/offapi/com/sun/star/auth/SSOManagerFactory.idl
index 071a8e106..c94b2e637 100644
--- a/offapi/com/sun/star/auth/SSOManagerFactory.idl
+++ b/offapi/com/sun/star/auth/SSOManagerFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_SSOManagerFactory_idl__
 #define __com_sun_star_auth_SSOManagerFactory_idl__
 
-#ifndef __com_sun_star_auth_XSSOManagerFactory_idl_
 #include <com/sun/star/auth/XSSOManagerFactory.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/SSOPasswordCache.idl b/offapi/com/sun/star/auth/SSOPasswordCache.idl
index 9fc84c7f8..00556d6d7 100644
--- a/offapi/com/sun/star/auth/SSOPasswordCache.idl
+++ b/offapi/com/sun/star/auth/SSOPasswordCache.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_SSOPasswordCache_idl__
 #define __com_sun_star_auth_SSOPasswordCache_idl__
 
-#ifndef __com_sun_star_auth_XSSOPasswordCache_idl_
 #include <com/sun/star/auth/XSSOPasswordCache.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/UnsupportedException.idl b/offapi/com/sun/star/auth/UnsupportedException.idl
index 3c30a2805..06fd996e8 100644
--- a/offapi/com/sun/star/auth/UnsupportedException.idl
+++ b/offapi/com/sun/star/auth/UnsupportedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_UnsupportedException_idl__
 #define __com_sun_star_auth_UnsupportedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
index fab593716..12101ee8c 100644
--- a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
+++ b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_auth_XSSOAcceptorContext_idl__
 #define __com_sun_star_auth_XSSOAcceptorContext_idl__
 
-#ifndef __com_sun_star_auth_XSSOContext_idl__
 #include <com/sun/star/auth/XSSOContext.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
 #include <com/sun/star/auth/SSOExceptions.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/XSSOContext.idl b/offapi/com/sun/star/auth/XSSOContext.idl
index 3bb6706a9..1a2dac0cc 100644
--- a/offapi/com/sun/star/auth/XSSOContext.idl
+++ b/offapi/com/sun/star/auth/XSSOContext.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_XSSOContext_idl__
 #define __com_sun_star_auth_XSSOContext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
index ef8a7317b..0f1841375 100644
--- a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
+++ b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_auth_XSSOInitiatorContext_idl__
 #define __com_sun_star_auth_XSSOInitiatorContext_idl__
 
-#ifndef __com_sun_star_auth_XSSOContext_idl__
 #include <com/sun/star/auth/XSSOContext.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
 #include <com/sun/star/auth/SSOExceptions.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/XSSOManager.idl b/offapi/com/sun/star/auth/XSSOManager.idl
index fa7cfe9a8..67e02b27b 100644
--- a/offapi/com/sun/star/auth/XSSOManager.idl
+++ b/offapi/com/sun/star/auth/XSSOManager.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_auth_XSSOManager_idl__
 #define __com_sun_star_auth_XSSOManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_auth_InvalidArgumentException_idl__
 #include <com/sun/star/auth/InvalidArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
 #include <com/sun/star/auth/SSOExceptions.idl>
-#endif
-
-#ifndef __com_sun_star_auth_XSSOAcceptorContext_idl__
 #include <com/sun/star/auth/XSSOAcceptorContext.idl>
-#endif
-
-#ifndef __com_sun_star_auth_XSSOInitiatorContext_idl__
 #include <com/sun/star/auth/XSSOInitiatorContext.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/XSSOManagerFactory.idl b/offapi/com/sun/star/auth/XSSOManagerFactory.idl
index fa683d41c..6aef9625b 100644
--- a/offapi/com/sun/star/auth/XSSOManagerFactory.idl
+++ b/offapi/com/sun/star/auth/XSSOManagerFactory.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_auth_XSSOManagerFactory_idl__
 #define __com_sun_star_auth_XSSOManagerFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_auth_XSSOManager_idl__
 #include <com/sun/star/auth/XSSOManager.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/XSSOPasswordCache.idl b/offapi/com/sun/star/auth/XSSOPasswordCache.idl
index ca1c00d8e..5cca7ab9e 100644
--- a/offapi/com/sun/star/auth/XSSOPasswordCache.idl
+++ b/offapi/com/sun/star/auth/XSSOPasswordCache.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_auth_XSSOPasswordCache_idl__
 #define __com_sun_star_auth_XSSOPasswordCache_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
 #include <com/sun/star/auth/SSOExceptions.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/makefile.mk b/offapi/com/sun/star/auth/makefile.mk
deleted file mode 100644
index f6bdb8445..000000000
--- a/offapi/com/sun/star/auth/makefile.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-PRJ = ..$/..$/..$/..
-PRJNAME=offapi
-
-TARGET = cssauth
-PACKAGE = com$/sun$/star$/auth
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    AuthenticationFailedException.idl	\
-    InvalidArgumentException.idl		\
-    InvalidContextException.idl			\
-    InvalidCredentialException.idl		\
-    InvalidPrincipalException.idl		\
-    PersistenceFailureException.idl		\
-    UnsupportedException.idl			\
-    SSOManagerFactory.idl				\
-    SSOPasswordCache.idl				\
-    XSSOAcceptorContext.idl				\
-    XSSOContext.idl						\
-    XSSOInitiatorContext.idl			\
-    XSSOManager.idl						\
-    XSSOManagerFactory.idl				\
-    XSSOPasswordCache.idl
-
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/awt/AccessibleButton.idl b/offapi/com/sun/star/awt/AccessibleButton.idl
index 2ee05f746..d3f163322 100644
--- a/offapi/com/sun/star/awt/AccessibleButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleButton.idl
@@ -28,27 +28,13 @@
 #ifndef __com_sun_star_awt_AccessibleButton_idl__
 #define __com_sun_star_awt_AccessibleButton_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleCheckBox.idl b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
index bb6aa60c2..8a57b15b4 100644
--- a/offapi/com/sun/star/awt/AccessibleCheckBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
@@ -28,27 +28,13 @@
 #ifndef __com_sun_star_awt_AccessibleCheckBox_idl__
 #define __com_sun_star_awt_AccessibleCheckBox_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleComboBox.idl b/offapi/com/sun/star/awt/AccessibleComboBox.idl
index 1e598601b..aa88791ff 100644
--- a/offapi/com/sun/star/awt/AccessibleComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleComboBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleComboBox_idl__
 #define __com_sun_star_awt_AccessibleComboBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
index 292c26116..eb5b46c67 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleDropDownComboBox_idl__
 #define __com_sun_star_awt_AccessibleDropDownComboBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
index 476f21470..6acab23a1 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleDropDownListBox_idl__
 #define __com_sun_star_awt_AccessibleDropDownListBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleEdit.idl b/offapi/com/sun/star/awt/AccessibleEdit.idl
index c3fa8d126..f4802185f 100644
--- a/offapi/com/sun/star/awt/AccessibleEdit.idl
+++ b/offapi/com/sun/star/awt/AccessibleEdit.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_awt_AccessibleEdit_idl__
 #define __com_sun_star_awt_AccessibleEdit_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
 #include <com/sun/star/accessibility/XAccessibleEditableText.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleFixedText.idl b/offapi/com/sun/star/awt/AccessibleFixedText.idl
index 9bd8c63de..b091b41d9 100644
--- a/offapi/com/sun/star/awt/AccessibleFixedText.idl
+++ b/offapi/com/sun/star/awt/AccessibleFixedText.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleFixedText_idl__
 #define __com_sun_star_awt_AccessibleFixedText_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
index 28822d5f4..dd527d09b 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleIconChoiceControl_idl__
 #define __com_sun_star_awt_AccessibleIconChoiceControl_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
index af6b1b5a5..6134d596e 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleIconChoiceControlEntry_idl__
 #define __com_sun_star_awt_AccessibleIconChoiceControlEntry_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleList.idl b/offapi/com/sun/star/awt/AccessibleList.idl
index 271ea2d6f..982ad57bf 100644
--- a/offapi/com/sun/star/awt/AccessibleList.idl
+++ b/offapi/com/sun/star/awt/AccessibleList.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleList_idl__
 #define __com_sun_star_awt_AccessibleList_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/awt/AccessibleListBox.idl b/offapi/com/sun/star/awt/AccessibleListBox.idl
index e3d400f81..faf389940 100644
--- a/offapi/com/sun/star/awt/AccessibleListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleListBox_idl__
 #define __com_sun_star_awt_AccessibleListBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/awt/AccessibleListBoxList.idl b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
index 2dfe53075..ba21330a1 100644
--- a/offapi/com/sun/star/awt/AccessibleListBoxList.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleListBoxList_idl__
 #define __com_sun_star_awt_AccessibleListBoxList_idl__
 
-#ifndef __com_sun_star_awt_AccessibleList_idl__
 #include <com/sun/star/awt/AccessibleList.idl>
-#endif
 
 
 module com { module sun { module star { module awt {
diff --git a/offapi/com/sun/star/awt/AccessibleListItem.idl b/offapi/com/sun/star/awt/AccessibleListItem.idl
index 69333995e..ea5aede19 100644
--- a/offapi/com/sun/star/awt/AccessibleListItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleListItem.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleListItem_idl__
 #define __com_sun_star_awt_AccessibleListItem_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleMenu.idl b/offapi/com/sun/star/awt/AccessibleMenu.idl
index 8d942198f..946cff6d8 100644
--- a/offapi/com/sun/star/awt/AccessibleMenu.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenu.idl
@@ -28,30 +28,14 @@
 #ifndef __com_sun_star_awt_AccessibleMenu_idl__
 #define __com_sun_star_awt_AccessibleMenu_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleMenuBar.idl b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
index 7579cbb9d..efbc73569 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleMenuBar_idl__
 #define __com_sun_star_awt_AccessibleMenuBar_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleMenuItem.idl b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
index 29ea2bd6c..03b6dc94b 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
@@ -28,27 +28,13 @@
 #ifndef __com_sun_star_awt_AccessibleMenuItem_idl__
 #define __com_sun_star_awt_AccessibleMenuItem_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
index a2cbc1062..06a13a66c 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_awt_AccessibleMenuSeparator_idl__
 #define __com_sun_star_awt_AccessibleMenuSeparator_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
index 8790bc04b..722333872 100644
--- a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
+++ b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessiblePopupMenu_idl__
 #define __com_sun_star_awt_AccessiblePopupMenu_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleRadioButton.idl b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
index 62600eb87..d93efc4ad 100644
--- a/offapi/com/sun/star/awt/AccessibleRadioButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
@@ -28,27 +28,13 @@
 #ifndef __com_sun_star_awt_AccessibleRadioButton_idl__
 #define __com_sun_star_awt_AccessibleRadioButton_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleScrollBar.idl b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
index 08323f60b..e6ba6e071 100644
--- a/offapi/com/sun/star/awt/AccessibleScrollBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_awt_AccessibleScrollBar_idl__
 #define __com_sun_star_awt_AccessibleScrollBar_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBar.idl b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
index b4bd6809e..69c0a6169 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_awt_AccessibleStatusBar_idl__
 #define __com_sun_star_awt_AccessibleStatusBar_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
index cc801baf9..071300c70 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleStatusBarItem_idl__
 #define __com_sun_star_awt_AccessibleStatusBarItem_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleTabBar.idl b/offapi/com/sun/star/awt/AccessibleTabBar.idl
index 8342b76f8..6291880ea 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBar.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_awt_AccessibleTabBar_idl__
 #define __com_sun_star_awt_AccessibleTabBar_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
index df8e43d24..6f3fc09e8 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_awt_AccessibleTabBarPage_idl__
 #define __com_sun_star_awt_AccessibleTabBarPage_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
index 91bb00a24..90ccf65cc 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleTabBarPageList_idl__
 #define __com_sun_star_awt_AccessibleTabBarPageList_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleTabControl.idl b/offapi/com/sun/star/awt/AccessibleTabControl.idl
index e5e3871bb..b2804d4fd 100644
--- a/offapi/com/sun/star/awt/AccessibleTabControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabControl.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleTabControl_idl__
 #define __com_sun_star_awt_AccessibleTabControl_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleTabPage.idl b/offapi/com/sun/star/awt/AccessibleTabPage.idl
index c35575857..1d8397e1f 100644
--- a/offapi/com/sun/star/awt/AccessibleTabPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabPage.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleTabPage_idl__
 #define __com_sun_star_awt_AccessibleTabPage_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/AccessibleTextField.idl b/offapi/com/sun/star/awt/AccessibleTextField.idl
index 232acaae4..d20977d04 100644
--- a/offapi/com/sun/star/awt/AccessibleTextField.idl
+++ b/offapi/com/sun/star/awt/AccessibleTextField.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_AccessibleTextField_idl__
 #define __com_sun_star_accessibility_AccessibleTextField_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleToolBox.idl b/offapi/com/sun/star/awt/AccessibleToolBox.idl
index 2a62c81ac..5794776a0 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_AccessibleToolBox_idl__
 #define __com_sun_star_accessibility_AccessibleToolBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
index e1b812e0c..f1c10b479 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleToolBoxItem_idl__
 #define __com_sun_star_awt_AccessibleToolBoxItem_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
index 3c8a69dec..64bd8f400 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleTreeListBox_idl__
 #define __com_sun_star_awt_AccessibleTreeListBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
index 660c47559..92b289a47 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleTreeListBoxEntry_idl__
 #define __com_sun_star_awt_AccessibleTreeListBoxEntry_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleWindow.idl b/offapi/com/sun/star/awt/AccessibleWindow.idl
index 3c1fe7429..4ed0e06d3 100644
--- a/offapi/com/sun/star/awt/AccessibleWindow.idl
+++ b/offapi/com/sun/star/awt/AccessibleWindow.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_awt_AccessibleWindow_idl__
 #define __com_sun_star_awt_AccessibleWindow_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com { module sun { module star { module awt {
     
diff --git a/offapi/com/sun/star/awt/ActionEvent.idl b/offapi/com/sun/star/awt/ActionEvent.idl
index d7f1a1438..7f01ee137 100644
--- a/offapi/com/sun/star/awt/ActionEvent.idl
+++ b/offapi/com/sun/star/awt/ActionEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_ActionEvent_idl__ 
 #define __com_sun_star_awt_ActionEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/AdjustmentEvent.idl b/offapi/com/sun/star/awt/AdjustmentEvent.idl
index e803d70a2..f1fa5165d 100644
--- a/offapi/com/sun/star/awt/AdjustmentEvent.idl
+++ b/offapi/com/sun/star/awt/AdjustmentEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_AdjustmentEvent_idl__ 
 #define __com_sun_star_awt_AdjustmentEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_AdjustmentType_idl__ 
 #include <com/sun/star/awt/AdjustmentType.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl b/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
index 2bc126077..5d8aecdc0 100644
--- a/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
+++ b/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
@@ -33,7 +33,7 @@
 
 module com { module sun { module star { module awt {
 
-interface XAnimatedImages;
+published interface XAnimatedImages;
 
 //======================================================================================================================
 
@@ -41,7 +41,7 @@ interface XAnimatedImages;
 
     @since OOo 3.4
  */
-service AnimatedImagesControlModel
+published service AnimatedImagesControlModel
 {
     service com::sun::star::awt::UnoControlModel;
 
diff --git a/offapi/com/sun/star/awt/AsyncCallback.idl b/offapi/com/sun/star/awt/AsyncCallback.idl
index f108eb9c8..d5d0c763e 100644
--- a/offapi/com/sun/star/awt/AsyncCallback.idl
+++ b/offapi/com/sun/star/awt/AsyncCallback.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AsyncCallback_idl__
 #define __com_sun_star_awt_AsyncCallback_idl__
 
-#ifndef __com_sun_star_awt_XRequestCallback_idl__
 #include <com/sun/star/awt/XRequestCallback.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
@@ -40,7 +38,7 @@ module com { module sun { module star { module awt {
 
     @see XRequestCallback
  */
-service AsyncCallback: XRequestCallback;
+published service AsyncCallback: XRequestCallback;
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/ContainerWindowProvider.idl b/offapi/com/sun/star/awt/ContainerWindowProvider.idl
index c3b6ab599..ff41a302c 100644
--- a/offapi/com/sun/star/awt/ContainerWindowProvider.idl
+++ b/offapi/com/sun/star/awt/ContainerWindowProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,28 +28,23 @@
 #ifndef __com_sun_star_awt_ContainerWindowProvider_idl__
 #define __com_sun_star_awt_ContainerWindowProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XContainerWindowProvider_idl__
 #include <com/sun/star/awt/XContainerWindowProvider.idl>
-#endif
 
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module awt {
 
-//============================================================================= 
+//=============================================================================
 
 /** specifies a provider for container windows implementing the
     <type scope="com::sun::star::awt">XWindow</type> interface.
  */
-service ContainerWindowProvider : com::sun::star::awt::XContainerWindowProvider;
+published service ContainerWindowProvider : com::sun::star::awt::XContainerWindowProvider;
 
 
-//============================================================================= 
+//=============================================================================
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/DialogProvider.idl b/offapi/com/sun/star/awt/DialogProvider.idl
index a3565c797..af1d3cc0e 100644
--- a/offapi/com/sun/star/awt/DialogProvider.idl
+++ b/offapi/com/sun/star/awt/DialogProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,31 +28,26 @@
 #ifndef __com_sun_star_awt_DialogProvider_idl__
 #define __com_sun_star_awt_DialogProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDialogProvider_idl__
 #include <com/sun/star/awt/XDialogProvider.idl>
-#endif
 
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module awt {
 
-//============================================================================= 
+//=============================================================================
 
 /** specifies a provider for dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-service DialogProvider : com::sun::star::awt::XDialogProvider;
+published service DialogProvider : com::sun::star::awt::XDialogProvider;
 
 // service DialogProvider {
     // interface com::sun::star::awt::XDialogProvider;
 // };
 
-//============================================================================= 
+//=============================================================================
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/DialogProvider2.idl b/offapi/com/sun/star/awt/DialogProvider2.idl
index 3312cdf55..bd81dd898 100644
--- a/offapi/com/sun/star/awt/DialogProvider2.idl
+++ b/offapi/com/sun/star/awt/DialogProvider2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,27 +28,22 @@
 #ifndef __com_sun_star_awt_DialogProvider2_idl__
 #define __com_sun_star_awt_DialogProvider2_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDialogProvider2_idl__
 #include <com/sun/star/awt/XDialogProvider2.idl>
-#endif
 
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module awt {
 
-//============================================================================= 
+//=============================================================================
 
 /** specifies a provider for dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-service DialogProvider2 : com::sun::star::awt::XDialogProvider2;
+published service DialogProvider2 : com::sun::star::awt::XDialogProvider2;
 
-//============================================================================= 
+//=============================================================================
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/DockingData.idl b/offapi/com/sun/star/awt/DockingData.idl
index a2919f690..cecda52a0 100644
--- a/offapi/com/sun/star/awt/DockingData.idl
+++ b/offapi/com/sun/star/awt/DockingData.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_DockingData_idl__ 
 #define __com_sun_star_awt_DockingData_idl__ 
  
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/DockingEvent.idl b/offapi/com/sun/star/awt/DockingEvent.idl
index 3bba6a186..4933ff34d 100644
--- a/offapi/com/sun/star/awt/DockingEvent.idl
+++ b/offapi/com/sun/star/awt/DockingEvent.idl
@@ -27,16 +27,10 @@
 #ifndef __com_sun_star_awt_DockingEvent_idl__ 
 #define __com_sun_star_awt_DockingEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/EndDockingEvent.idl b/offapi/com/sun/star/awt/EndDockingEvent.idl
index f033adc46..727ffd96e 100644
--- a/offapi/com/sun/star/awt/EndDockingEvent.idl
+++ b/offapi/com/sun/star/awt/EndDockingEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_EndDockingEvent_idl__ 
 #define __com_sun_star_awt_EndDockingEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/EndPopupModeEvent.idl b/offapi/com/sun/star/awt/EndPopupModeEvent.idl
index dad7c536b..edaf24456 100644
--- a/offapi/com/sun/star/awt/EndPopupModeEvent.idl
+++ b/offapi/com/sun/star/awt/EndPopupModeEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_EndPopupModeEvent_idl__ 
 #define __com_sun_star_awt_EndPopupModeEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/EnhancedMouseEvent.idl b/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
index 402be4f99..71682a5e5 100644
--- a/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
+++ b/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_EnhancedMouseEvent_idl__
 #define __com_sun_star_awt_EnhancedMouseEvent_idl__
 
-#ifndef __com_sun_star_awt_MouseEvent_idl__
 #include <com/sun/star/awt/MouseEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/FocusEvent.idl b/offapi/com/sun/star/awt/FocusEvent.idl
index 45d1401e0..7069e318b 100644
--- a/offapi/com/sun/star/awt/FocusEvent.idl
+++ b/offapi/com/sun/star/awt/FocusEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_FocusEvent_idl__ 
 #define __com_sun_star_awt_FocusEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/FontDescriptor.idl b/offapi/com/sun/star/awt/FontDescriptor.idl
index 8911d03a9..c3d3971cf 100644
--- a/offapi/com/sun/star/awt/FontDescriptor.idl
+++ b/offapi/com/sun/star/awt/FontDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #define __com_sun_star_awt_FontDescriptor_idl__ 
  
-#ifndef __com_sun_star_awt_FontSlant_idl__ 
 #include <com/sun/star/awt/FontSlant.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/Gradient.idl b/offapi/com/sun/star/awt/Gradient.idl
index af50dc9b6..c0b95142d 100644
--- a/offapi/com/sun/star/awt/Gradient.idl
+++ b/offapi/com/sun/star/awt/Gradient.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_Gradient_idl__ 
 #define __com_sun_star_awt_Gradient_idl__ 
  
-#ifndef __com_sun_star_awt_GradientStyle_idl__ 
 #include <com/sun/star/awt/GradientStyle.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/InputEvent.idl b/offapi/com/sun/star/awt/InputEvent.idl
index 1383cb5d3..c0234ec29 100644
--- a/offapi/com/sun/star/awt/InputEvent.idl
+++ b/offapi/com/sun/star/awt/InputEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_InputEvent_idl__ 
 #define __com_sun_star_awt_InputEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/ItemEvent.idl b/offapi/com/sun/star/awt/ItemEvent.idl
index 603dc2699..48a8bb5c8 100644
--- a/offapi/com/sun/star/awt/ItemEvent.idl
+++ b/offapi/com/sun/star/awt/ItemEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_ItemEvent_idl__ 
 #define __com_sun_star_awt_ItemEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/ItemListEvent.idl b/offapi/com/sun/star/awt/ItemListEvent.idl
index f9d2658bd..bcd072062 100644
--- a/offapi/com/sun/star/awt/ItemListEvent.idl
+++ b/offapi/com/sun/star/awt/ItemListEvent.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module awt {
 /** is the event broadcasted by a <type>XListItems</type> implementation for changes
     in its item list.
  */
-struct ItemListEvent : ::com::sun::star::lang::EventObject
+published struct ItemListEvent : ::com::sun::star::lang::EventObject
 {
     /** specifies the position of the item which is affected by the event
 
diff --git a/offapi/com/sun/star/awt/KeyEvent.idl b/offapi/com/sun/star/awt/KeyEvent.idl
index a012b8ffe..0ce60e408 100644
--- a/offapi/com/sun/star/awt/KeyEvent.idl
+++ b/offapi/com/sun/star/awt/KeyEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_KeyEvent_idl__ 
 #define __com_sun_star_awt_KeyEvent_idl__ 
  
-#ifndef __com_sun_star_awt_InputEvent_idl__ 
 #include <com/sun/star/awt/InputEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/MaxChildrenException.idl b/offapi/com/sun/star/awt/MaxChildrenException.idl
index 3fb7d9073..0fd81cb8d 100644
--- a/offapi/com/sun/star/awt/MaxChildrenException.idl
+++ b/offapi/com/sun/star/awt/MaxChildrenException.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_awt_MaxChildrenException_idl__ 
 #define __com_sun_star_awt_MaxChildrenException_idl__ 
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/awt/MenuBar.idl b/offapi/com/sun/star/awt/MenuBar.idl
index faaab666f..9c595a038 100644
--- a/offapi/com/sun/star/awt/MenuBar.idl
+++ b/offapi/com/sun/star/awt/MenuBar.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_MenuBar_idl__ 
 #define __com_sun_star_awt_MenuBar_idl__ 
  
-#ifndef __com_sun_star_awt_XMenuBar_idl__ 
 #include <com/sun/star/awt/XMenuBar.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/MenuEvent.idl b/offapi/com/sun/star/awt/MenuEvent.idl
index b7077f9b6..f2418bb3a 100644
--- a/offapi/com/sun/star/awt/MenuEvent.idl
+++ b/offapi/com/sun/star/awt/MenuEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_MenuEvent_idl__ 
 #define __com_sun_star_awt_MenuEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/MenuItemType.idl b/offapi/com/sun/star/awt/MenuItemType.idl
index 78fe90d0b..8f4606aa1 100644
--- a/offapi/com/sun/star/awt/MenuItemType.idl
+++ b/offapi/com/sun/star/awt/MenuItemType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 /** specifies the type of a menu item, as returned by
     <member scope="com::sun::star::awt">XMenuExtended2::getItemType()</member>.
  */
-enum MenuItemType
+published enum MenuItemType
 {
     /** specifies that the menu item type is unknown.
     */
diff --git a/offapi/com/sun/star/awt/MenuLogo.idl b/offapi/com/sun/star/awt/MenuLogo.idl
index 799bf3592..b0a4ad39b 100644
--- a/offapi/com/sun/star/awt/MenuLogo.idl
+++ b/offapi/com/sun/star/awt/MenuLogo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_MenuLogo_idl__
 #define __com_sun_star_awt_MenuLogo_idl__
 
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_util_color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 //=============================================================================
 
@@ -43,7 +38,7 @@
 
 /** specifies a logo to be displayed on a menu, with a background gradient.
  */
-struct MenuLogo
+published struct MenuLogo
 {
     /** specifies the logo image.
      */
diff --git a/offapi/com/sun/star/awt/MouseEvent.idl b/offapi/com/sun/star/awt/MouseEvent.idl
index 785c45fbc..f3d6df685 100644
--- a/offapi/com/sun/star/awt/MouseEvent.idl
+++ b/offapi/com/sun/star/awt/MouseEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_MouseEvent_idl__ 
 #define __com_sun_star_awt_MouseEvent_idl__ 
  
-#ifndef __com_sun_star_awt_InputEvent_idl__ 
 #include <com/sun/star/awt/InputEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/PaintEvent.idl b/offapi/com/sun/star/awt/PaintEvent.idl
index 67d10b235..e52dea9f0 100644
--- a/offapi/com/sun/star/awt/PaintEvent.idl
+++ b/offapi/com/sun/star/awt/PaintEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_PaintEvent_idl__ 
 #define __com_sun_star_awt_PaintEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/PopupMenu.idl b/offapi/com/sun/star/awt/PopupMenu.idl
index 75f331ee7..d2b847983 100644
--- a/offapi/com/sun/star/awt/PopupMenu.idl
+++ b/offapi/com/sun/star/awt/PopupMenu.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_PopupMenu_idl__ 
 #define __com_sun_star_awt_PopupMenu_idl__ 
  
-#ifndef __com_sun_star_awt_XPopupMenu_idl__ 
 #include <com/sun/star/awt/XPopupMenu.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/PrinterException.idl b/offapi/com/sun/star/awt/PrinterException.idl
index d2f28c70d..2ada2e49c 100644
--- a/offapi/com/sun/star/awt/PrinterException.idl
+++ b/offapi/com/sun/star/awt/PrinterException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_PrinterException_idl__ 
 #define __com_sun_star_awt_PrinterException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/SpinEvent.idl b/offapi/com/sun/star/awt/SpinEvent.idl
index 4a11586cd..d4a6c4ea6 100644
--- a/offapi/com/sun/star/awt/SpinEvent.idl
+++ b/offapi/com/sun/star/awt/SpinEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_SpinEvent_idl__ 
 #define __com_sun_star_awt_SpinEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/SpinningProgressControlModel.idl b/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
index a75417d41..c6c273bce 100644
--- a/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
+++ b/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module awt {
 
     <p>Three image sets are provided, of size 16x16, 32x32, and 64x64 pixels.</p>
  */
-service SpinningProgressControlModel
+published service SpinningProgressControlModel
 {
     service AnimatedImagesControlModel;
 };
diff --git a/offapi/com/sun/star/awt/TabController.idl b/offapi/com/sun/star/awt/TabController.idl
index a9319242a..d218c9c2d 100644
--- a/offapi/com/sun/star/awt/TabController.idl
+++ b/offapi/com/sun/star/awt/TabController.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_TabController_idl__ 
 #define __com_sun_star_awt_TabController_idl__ 
 
-#ifndef __com_sun_star_awt_XTabController_idl__ 
 #include <com/sun/star/awt/XTabController.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/TabControllerModel.idl b/offapi/com/sun/star/awt/TabControllerModel.idl
index def18cd36..c50d1f846 100644
--- a/offapi/com/sun/star/awt/TabControllerModel.idl
+++ b/offapi/com/sun/star/awt/TabControllerModel.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_TabControllerModel_idl__ 
 #define __com_sun_star_awt_TabControllerModel_idl__ 
 
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__ 
 #include <com/sun/star/awt/XTabControllerModel.idl> 
-#endif 
-
-#ifndef __com_sun_star_io_XPersistObject_idl__ 
 #include <com/sun/star/io/XPersistObject.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/TextEvent.idl b/offapi/com/sun/star/awt/TextEvent.idl
index 106aedb02..02af32239 100644
--- a/offapi/com/sun/star/awt/TextEvent.idl
+++ b/offapi/com/sun/star/awt/TextEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_TextEvent_idl__ 
 #define __com_sun_star_awt_TextEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/Toolkit.idl b/offapi/com/sun/star/awt/Toolkit.idl
index 589e80428..d774efb1c 100644
--- a/offapi/com/sun/star/awt/Toolkit.idl
+++ b/offapi/com/sun/star/awt/Toolkit.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_Toolkit_idl__ 
 #define __com_sun_star_awt_Toolkit_idl__ 
  
-#ifndef __com_sun_star_awt_XToolkit_idl__ 
 #include <com/sun/star/awt/XToolkit.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XDataTransferProviderAccess_idl__
 #include <com/sun/star/awt/XDataTransferProviderAccess.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSystemChildFactory_idl__
 #include <com/sun/star/awt/XSystemChildFactory.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMessageBoxFactory_idl__
 #include <com/sun/star/awt/XMessageBoxFactory.idl>
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControl.idl b/offapi/com/sun/star/awt/UnoControl.idl
index 646d62849..70df99790 100644
--- a/offapi/com/sun/star/awt/UnoControl.idl
+++ b/offapi/com/sun/star/awt/UnoControl.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControl_idl__ 
 #define __com_sun_star_awt_UnoControl_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif
-
-#ifndef __com_sun_star_awt_XControl_idl__ 
 #include <com/sun/star/awt/XControl.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XWindow_idl__ 
 #include <com/sun/star/awt/XWindow.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XView_idl__ 
 #include <com/sun/star/awt/XView.idl> 
-#endif 
-
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlButton.idl b/offapi/com/sun/star/awt/UnoControlButton.idl
index e42122285..cc54009b1 100644
--- a/offapi/com/sun/star/awt/UnoControlButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlButton.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_UnoButtonControl_idl__ 
 #define __com_sun_star_awt_UnoButtonControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XButton_idl__ 
 #include <com/sun/star/awt/XButton.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
 #include <com/sun/star/awt/XLayoutConstrains.idl> 
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
index 29f6dc42f..8cebcea58 100644
--- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlButtonModel_idl__
 #define __com_sun_star_awt_UnoControlButtonModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBox.idl b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
index f395350a2..77ce44948 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_UnoCheckBoxControl_idl__ 
 #define __com_sun_star_awt_UnoCheckBoxControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XCheckBox_idl__ 
 #include <com/sun/star/awt/XCheckBox.idl> 
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
 #include <com/sun/star/awt/XLayoutConstrains.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
index 4ad296ca6..0c33e871c 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlCheckBoxModel_idl__
 #define __com_sun_star_awt_UnoControlCheckBoxModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/UnoControlComboBox.idl b/offapi/com/sun/star/awt/UnoControlComboBox.idl
index 3709a2e5b..41e556081 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBox.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_UnoComboBoxControl_idl__ 
 #define __com_sun_star_awt_UnoComboBoxControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
 #include <com/sun/star/awt/UnoControlEdit.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XComboBox_idl__ 
 #include <com/sun/star/awt/XComboBox.idl> 
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index 6e0d10fb9..952c7df5c 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__ 
 #define __com_sun_star_awt_UnoControlComboBoxModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
 #include <com/sun/star/awt/XItemList.idl>
  
diff --git a/offapi/com/sun/star/awt/UnoControlContainer.idl b/offapi/com/sun/star/awt/UnoControlContainer.idl
index 6f09cdf82..d441babc7 100644
--- a/offapi/com/sun/star/awt/UnoControlContainer.idl
+++ b/offapi/com/sun/star/awt/UnoControlContainer.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_UnoControlContainer_idl__ 
 #define __com_sun_star_awt_UnoControlContainer_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XUnoControlContainer_idl__ 
 #include <com/sun/star/awt/XUnoControlContainer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlContainer_idl__ 
 #include <com/sun/star/awt/XControlContainer.idl> 
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__ 
 #include <com/sun/star/container/XContainer.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlContainerModel.idl b/offapi/com/sun/star/awt/UnoControlContainerModel.idl
index 9f59040ae..ec0bdfd13 100644
--- a/offapi/com/sun/star/awt/UnoControlContainerModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlContainerModel.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlContainerModel_idl__ 
 #define __com_sun_star_awt_UnoControlContainerModel_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
index eb7caf147..5fc18d07f 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoCurrencyFieldControl_idl__ 
 #define __com_sun_star_awt_UnoCurrencyFieldControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
 #include <com/sun/star/awt/UnoControlEdit.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XSpinField_idl__ 
 #include <com/sun/star/awt/XSpinField.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XCurrencyField_idl__ 
 #include <com/sun/star/awt/XCurrencyField.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
index e278777fe..57247a35e 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__ 
 #define __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/UnoControlDateField.idl b/offapi/com/sun/star/awt/UnoControlDateField.idl
index fea807ad8..71ae30b0a 100644
--- a/offapi/com/sun/star/awt/UnoControlDateField.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoDateFieldControl_idl__ 
 #define __com_sun_star_awt_UnoDateFieldControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
 #include <com/sun/star/awt/UnoControlEdit.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XSpinField_idl__ 
 #include <com/sun/star/awt/XSpinField.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XDateField_idl__ 
 #include <com/sun/star/awt/XDateField.idl> 
-#endif 
  
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
index 960d4f006..4733de6c9 100644
--- a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__ 
 #define __com_sun_star_awt_UnoControlDateFieldModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/UnoControlDialog.idl b/offapi/com/sun/star/awt/UnoControlDialog.idl
index c3b0b1795..e812a3dd5 100644
--- a/offapi/com/sun/star/awt/UnoControlDialog.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialog.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlDialog_idl__ 
 #define __com_sun_star_awt_UnoControlDialog_idl__
 
-#ifndef __com_sun_star_awt_UnoControlContainer_idl__ 
 #include <com/sun/star/awt/UnoControlContainer.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XTopWindow_idl__ 
 #include <com/sun/star/awt/XTopWindow.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XDialog2_idl__
 #include <com/sun/star/awt/XDialog2.idl>
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlDialogModel.idl b/offapi/com/sun/star/awt/UnoControlDialogModel.idl
index a4b8b9887..2baec7f7d 100644
--- a/offapi/com/sun/star/awt/UnoControlDialogModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialogModel.idl
@@ -27,33 +27,14 @@
 #ifndef __com_sun_star_awt_UnoControlDialogModel_idl__ 
 #define __com_sun_star_awt_UnoControlDialogModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__ 
 #include <com/sun/star/container/XContainer.idl> 
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
  
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/UnoControlEdit.idl b/offapi/com/sun/star/awt/UnoControlEdit.idl
index efb5ecbe5..e5b1f88eb 100644
--- a/offapi/com/sun/star/awt/UnoControlEdit.idl
+++ b/offapi/com/sun/star/awt/UnoControlEdit.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
 #define __com_sun_star_awt_UnoControlEdit_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XTextComponent_idl__ 
 #include <com/sun/star/awt/XTextComponent.idl> 
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
 #include <com/sun/star/awt/XLayoutConstrains.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__ 
 #include <com/sun/star/awt/XTextLayoutConstrains.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlEditModel.idl b/offapi/com/sun/star/awt/UnoControlEditModel.idl
index aab83a142..a8a1e6a7c 100644
--- a/offapi/com/sun/star/awt/UnoControlEditModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlEditModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlEditModel_idl__ 
 #define __com_sun_star_awt_UnoControlEditModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/UnoControlFileControl.idl b/offapi/com/sun/star/awt/UnoControlFileControl.idl
index 39b2eac88..42ed19e40 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_UnoFileControl_idl__ 
 #define __com_sun_star_awt_UnoFileControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
 #include <com/sun/star/awt/UnoControlEdit.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlFileControlModel.idl b/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
index 70505ad82..34e5993a7 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__ 
 #define __com_sun_star_awt_UnoControlFileControlModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
index 0a9c8d5e0..d12205630 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoFixedHyperlinkControl_idl__
 #define __com_sun_star_awt_UnoFixedHyperlinkControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XFixedHyperlink_idl__
 #include <com/sun/star/awt/XFixedHyperlink.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
index 1c70e95f6..dcc3bd387 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_UnoControlFixedHyperlinkModel_idl__
 #define __com_sun_star_awt_UnoControlFixedHyperlinkModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLine.idl b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
index 59b024bdd..4bacd2b32 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLine.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_UnoFixedLineControl_idl__ 
 #define __com_sun_star_awt_UnoFixedLineControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
  
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl b/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
index a25145e40..17c446295 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlFixedLineModel_idl__ 
 #define __com_sun_star_awt_UnoControlFixedLineModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
   
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlFixedText.idl b/offapi/com/sun/star/awt/UnoControlFixedText.idl
index 12befafe2..2fa9c4873 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedText.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedText.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_UnoFixedTextControl_idl__ 
 #define __com_sun_star_awt_UnoFixedTextControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XFixedText_idl__ 
 #include <com/sun/star/awt/XFixedText.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
 #include <com/sun/star/awt/XLayoutConstrains.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
index edf434116..8f65572ec 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__ 
 #define __com_sun_star_awt_UnoControlFixedTextModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlFormattedField.idl b/offapi/com/sun/star/awt/UnoControlFormattedField.idl
index a55c9e926..8c943e0c5 100644
--- a/offapi/com/sun/star/awt/UnoControlFormattedField.idl
+++ b/offapi/com/sun/star/awt/UnoControlFormattedField.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoControlFormattedField_idl__ 
 #define __com_sun_star_awt_UnoControlFormattedField_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
 #include <com/sun/star/awt/UnoControlEdit.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XSpinField_idl__ 
 #include <com/sun/star/awt/XSpinField.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
index bfa6b87f3..f4f70ce3f 100644
--- a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
 #define __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBox.idl b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
index 77b3576e6..d0ddb77cb 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_UnoGroupBoxControl_idl__ 
 #define __com_sun_star_awt_UnoGroupBoxControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl b/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
index 640e5bbcd..a62832c96 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__ 
 #define __com_sun_star_awt_UnoControlGroupBoxModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlImageControl.idl b/offapi/com/sun/star/awt/UnoControlImageControl.idl
index cca77e38f..860d74052 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControl.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoImageControl_idl__ 
 #define __com_sun_star_awt_UnoImageControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
 #include <com/sun/star/awt/XLayoutConstrains.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
index 2b5697804..ec7f6f664 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
 #define __com_sun_star_awt_UnoControlImageControlModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlListBox.idl b/offapi/com/sun/star/awt/UnoControlListBox.idl
index 05087a7bf..d5ed5d0fa 100644
--- a/offapi/com/sun/star/awt/UnoControlListBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBox.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoListBoxControl_idl__ 
 #define __com_sun_star_awt_UnoListBoxControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XListBox_idl__ 
 #include <com/sun/star/awt/XListBox.idl> 
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
 #include <com/sun/star/awt/XLayoutConstrains.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__ 
 #include <com/sun/star/awt/XTextLayoutConstrains.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
index 6fa119114..4432488f2 100644
--- a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__ 
 #define __com_sun_star_awt_UnoControlListBoxModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
- 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
 #include <com/sun/star/awt/XItemList.idl>
  
- 
 //============================================================================= 
  
  module com {  module sun {  module star {  module awt {  
diff --git a/offapi/com/sun/star/awt/UnoControlModel.idl b/offapi/com/sun/star/awt/UnoControlModel.idl
index 5c489ab2b..4b0698ca9 100644
--- a/offapi/com/sun/star/awt/UnoControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlModel.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #define __com_sun_star_awt_UnoControlModel_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlDialogElement_idl__
 #include <com/sun/star/awt/UnoControlDialogElement.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlModel_idl__ 
 #include <com/sun/star/awt/XControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__ 
 #include <com/sun/star/beans/XMultiPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_XPersistObject_idl__ 
 #include <com/sun/star/io/XPersistObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XCloneable_idl__ 
 #include <com/sun/star/util/XCloneable.idl>
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlNumericField.idl b/offapi/com/sun/star/awt/UnoControlNumericField.idl
index 2fe63db7c..ff9da9bf7 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericField.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlNumericField_idl__ 
 #define __com_sun_star_awt_UnoControlNumericField_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
 #include <com/sun/star/awt/UnoControlEdit.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XSpinField_idl__ 
 #include <com/sun/star/awt/XSpinField.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XNumericField_idl__ 
 #include <com/sun/star/awt/XNumericField.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
index 43d2d097c..40e896042 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__ 
 #define __com_sun_star_awt_UnoControlNumericFieldModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/UnoControlPatternField.idl b/offapi/com/sun/star/awt/UnoControlPatternField.idl
index 991380a96..fb74f15de 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternField.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoPatternFieldControl_idl__ 
 #define __com_sun_star_awt_UnoPatternFieldControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
 #include <com/sun/star/awt/UnoControlEdit.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XSpinField_idl__ 
 #include <com/sun/star/awt/XSpinField.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XPatternField_idl__ 
 #include <com/sun/star/awt/XPatternField.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
index e1756a82a..0e9dbe4ae 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__ 
 #define __com_sun_star_awt_UnoControlPatternFieldModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBar.idl b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
index f06fee56b..0464f263d 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_UnoProgressBarControl_idl__ 
 #define __com_sun_star_awt_UnoProgressBarControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XProgressBar_idl__ 
 #include <com/sun/star/awt/XProgressBar.idl> 
-#endif 
  
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl b/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
index 428693b2c..aaa89d86d 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlProgressBarModel_idl__ 
 #define __com_sun_star_awt_UnoControlProgressBarModel_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
   
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButton.idl b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
index 5318ebd03..3f7e7625f 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_UnoButtonControl_idl__ 
 #define __com_sun_star_awt_UnoButtonControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XRadioButton_idl__ 
 #include <com/sun/star/awt/XRadioButton.idl> 
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
 #include <com/sun/star/awt/XLayoutConstrains.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
index 01dace2ec..5181681d5 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__
 #define __com_sun_star_awt_UnoControlRadioButtonModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlRoadmap.idl b/offapi/com/sun/star/awt/UnoControlRoadmap.idl
index 89422d00b..27efb186e 100644
--- a/offapi/com/sun/star/awt/UnoControlRoadmap.idl
+++ b/offapi/com/sun/star/awt/UnoControlRoadmap.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlRoadmap_idl__
 #define __com_sun_star_awt_UnoControlRoadmap_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__
 #include <com/sun/star/awt/XItemEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
index 08257d435..661dd13eb 100644
--- a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
@@ -28,18 +28,10 @@
 #define __com_sun_star_awt_UnoControlRoadmapModel_idl__
 
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBar.idl b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
index ad2c50e20..7ee42d3b1 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoScrollBarControl_idl__ 
 #define __com_sun_star_awt_UnoScrollBarControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif
-
-#ifndef __com_sun_star_awt_XScrollBar_idl__ 
 #include <com/sun/star/awt/XScrollBar.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl b/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
index 06d63c97a..255b69ec3 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__ 
 #define __com_sun_star_awt_UnoControlScrollBarModel_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
-
-#ifndef __com_sun_star_util_Color_idl__ 
 #include <com/sun/star/util/Color.idl> 
-#endif 
 
   
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
index 7e38d5595..18cbef481 100644
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoControlSimpleAnimation_idl__
 #define __com_sun_star_awt_UnoControlSimpleAnimation_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSimpleAnimation_idl__
 #include <com/sun/star/awt/XSimpleAnimation.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
index 8adfca00a..5f2d64386 100644
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_UnoControlSimpleAnimationModel_idl__
 #define __com_sun_star_awt_UnoControlSimpleAnimationModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButton.idl b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
index c3ac46091..12eef77d1 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoSpinButtonControl_idl__
 #define __com_sun_star_awt_UnoSpinButtonControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinValue_idl__
 #include <com/sun/star/awt/XSpinValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
index fd62671be..bd9ee7caa 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoControlSpinButtonModel_idl__
 #define __com_sun_star_awt_UnoControlSpinButtonModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlThrobber.idl b/offapi/com/sun/star/awt/UnoControlThrobber.idl
index 4a41c72b2..5e452d1f9 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobber.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobber.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoControlThrobber_idl__
 #define __com_sun_star_awt_UnoControlThrobber_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XThrobber_idl__
 #include <com/sun/star/awt/XThrobber.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
index bcbdb068e..b370bce45 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_UnoControlThrobberModel_idl__
 #define __com_sun_star_awt_UnoControlThrobberModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlTimeField.idl b/offapi/com/sun/star/awt/UnoControlTimeField.idl
index bc73e10e1..629c99402 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeField.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoTimeFieldControl_idl__ 
 #define __com_sun_star_awt_UnoTimeFieldControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
 #include <com/sun/star/awt/UnoControlEdit.idl> 
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__ 
 #include <com/sun/star/awt/XSpinField.idl> 
-#endif
-
-#ifndef __com_sun_star_awt_XTimeField_idl__ 
 #include <com/sun/star/awt/XTimeField.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
index 2cf1d8e96..86ee312a7 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__ 
 #define __com_sun_star_awt_UnoControlTimeFieldModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
  
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/VclContainerEvent.idl b/offapi/com/sun/star/awt/VclContainerEvent.idl
index 65de4c5ee..91a7f23ce 100644
--- a/offapi/com/sun/star/awt/VclContainerEvent.idl
+++ b/offapi/com/sun/star/awt/VclContainerEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_VclContainerEvent_idl__ 
 #define __com_sun_star_awt_VclContainerEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/WindowDescriptor.idl b/offapi/com/sun/star/awt/WindowDescriptor.idl
index ebe192cf8..4106ca38b 100644
--- a/offapi/com/sun/star/awt/WindowDescriptor.idl
+++ b/offapi/com/sun/star/awt/WindowDescriptor.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_WindowDescriptor_idl__ 
 #define __com_sun_star_awt_WindowDescriptor_idl__ 
  
-#ifndef __com_sun_star_awt_WindowClass_idl__ 
 #include <com/sun/star/awt/WindowClass.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
 #include <com/sun/star/awt/XWindowPeer.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/WindowEvent.idl b/offapi/com/sun/star/awt/WindowEvent.idl
index a353dc067..313354a1d 100644
--- a/offapi/com/sun/star/awt/WindowEvent.idl
+++ b/offapi/com/sun/star/awt/WindowEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_WindowEvent_idl__ 
 #define __com_sun_star_awt_WindowEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XActionListener.idl b/offapi/com/sun/star/awt/XActionListener.idl
index 662aa4d24..59412b640 100644
--- a/offapi/com/sun/star/awt/XActionListener.idl
+++ b/offapi/com/sun/star/awt/XActionListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XActionListener_idl__ 
 #define __com_sun_star_awt_XActionListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_ActionEvent_idl__ 
 #include <com/sun/star/awt/ActionEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XActivateListener.idl b/offapi/com/sun/star/awt/XActivateListener.idl
index 51880a010..ce52e5f03 100644
--- a/offapi/com/sun/star/awt/XActivateListener.idl
+++ b/offapi/com/sun/star/awt/XActivateListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XActivateListener_idl__ 
 #define __com_sun_star_awt_XActivateListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XAdjustmentListener.idl b/offapi/com/sun/star/awt/XAdjustmentListener.idl
index d6baa54ca..2465a68e8 100644
--- a/offapi/com/sun/star/awt/XAdjustmentListener.idl
+++ b/offapi/com/sun/star/awt/XAdjustmentListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XAdjustmentListener_idl__ 
 #define __com_sun_star_awt_XAdjustmentListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_AdjustmentEvent_idl__ 
 #include <com/sun/star/awt/AdjustmentEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XAnimatedImages.idl b/offapi/com/sun/star/awt/XAnimatedImages.idl
index a03d08c96..6a470882e 100644
--- a/offapi/com/sun/star/awt/XAnimatedImages.idl
+++ b/offapi/com/sun/star/awt/XAnimatedImages.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module awt {
 
     @since OOo 3.4
  */
-interface XAnimatedImages
+published interface XAnimatedImages
 {
     /** specifies the time in milliseconds between two animation steps.
 
diff --git a/offapi/com/sun/star/awt/XAnimation.idl b/offapi/com/sun/star/awt/XAnimation.idl
index e1e8f6023..28947b87d 100644
--- a/offapi/com/sun/star/awt/XAnimation.idl
+++ b/offapi/com/sun/star/awt/XAnimation.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module awt {
 
     @since OOo 3.4
  */
-interface XAnimation
+published interface XAnimation
 {
     /** starts the animation
     */
diff --git a/offapi/com/sun/star/awt/XBitmap.idl b/offapi/com/sun/star/awt/XBitmap.idl
index 467be2fd0..c634220b3 100644
--- a/offapi/com/sun/star/awt/XBitmap.idl
+++ b/offapi/com/sun/star/awt/XBitmap.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XBitmap_idl__ 
 #define __com_sun_star_awt_XBitmap_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XButton.idl b/offapi/com/sun/star/awt/XButton.idl
index 99ed50f7f..43a6126ab 100644
--- a/offapi/com/sun/star/awt/XButton.idl
+++ b/offapi/com/sun/star/awt/XButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XButton_idl__ 
 #define __com_sun_star_awt_XButton_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XActionListener_idl__ 
 #include <com/sun/star/awt/XActionListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XCallback.idl b/offapi/com/sun/star/awt/XCallback.idl
index ce3bd7cb6..c18468202 100644
--- a/offapi/com/sun/star/awt/XCallback.idl
+++ b/offapi/com/sun/star/awt/XCallback.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,23 +28,21 @@
 #ifndef __com_sun_star_awt_XCallback_idl__
 #define __com_sun_star_awt_XCallback_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif
+#include <com/sun/star/uno/XInterface.idl>
 
 //=============================================================================
 
 module com { module sun { module star { module awt {
-    
-//============================================================================= 
+
+//=============================================================================
 
 /** specifies an interface which can be used to call back
     an implementation
  */
-interface XCallback
+published interface XCallback
 {
     //-------------------------------------------------------------------------
-    
+
     /** notifies the callback implementation
 
         @param aData
diff --git a/offapi/com/sun/star/awt/XCheckBox.idl b/offapi/com/sun/star/awt/XCheckBox.idl
index ea29a083b..b31a1f93a 100644
--- a/offapi/com/sun/star/awt/XCheckBox.idl
+++ b/offapi/com/sun/star/awt/XCheckBox.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XCheckBox_idl__ 
 #define __com_sun_star_awt_XCheckBox_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XItemListener_idl__ 
 #include <com/sun/star/awt/XItemListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XComboBox.idl b/offapi/com/sun/star/awt/XComboBox.idl
index fc3fcab67..88c5d89c1 100644
--- a/offapi/com/sun/star/awt/XComboBox.idl
+++ b/offapi/com/sun/star/awt/XComboBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XComboBox_idl__ 
 #define __com_sun_star_awt_XComboBox_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XItemListener_idl__ 
 #include <com/sun/star/awt/XItemListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XActionListener_idl__ 
 #include <com/sun/star/awt/XActionListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl b/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
index bc1f0697d..201f0e64a 100644
--- a/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
+++ b/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,29 +28,23 @@
 #ifndef __com_sun_star_awt_XContainerWindowEventHandler_idl__
 #define __com_sun_star_awt_XContainerWindowEventHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__ 
-#include <com/sun/star/awt/XWindow.idl> 
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
-#include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
+#include <com/sun/star/awt/XWindow.idl>
+#include <com/sun/star/lang/WrappedTargetException.idl>
 
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module awt {
 
-//============================================================================= 
+//=============================================================================
 
 /** Handles events fired by windows represented by a
     <type scope="com::sun::star::awt">XWindow</type> interface.
  */
-interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
+published interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** Handles an event generated by a window.
 
@@ -62,7 +56,7 @@ interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
             the window instance that generated the event. If used in the scope of
             <type scope="com::sun::star::awt">XContainerWindowProvider</type> this
             is the same window instance that was returned by the createContainerWindow
-            method when passing the XContainerWindowEventHandler instance receiving the 
+            method when passing the XContainerWindowEventHandler instance receiving the
             event as handler parameter.
 
         @param EventObject
@@ -75,11 +69,11 @@ interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
 
         @param MethodName
             the name of the function which is to be called.
-            
+
         @returns
             true if the event was handled, otherwise false.
 
-        @throws com::sun::star::lang::WrappedTargetException  
+        @throws com::sun::star::lang::WrappedTargetException
             if the implementation of the method, which is determined by the argument MethodName,
             throws an exception. This exception is then wrapped into a
             <type scope="com::sun::star::lang">WrappedTargetException</type>.
@@ -89,7 +83,7 @@ interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
         [in] com::sun::star::awt::XWindow xWindow,
         [in] any EventObject,
         [in] string MethodName)
-        raises(com::sun::star::lang::WrappedTargetException); 
+        raises(com::sun::star::lang::WrappedTargetException);
 
 
     /** returns a sequence of supported method names
@@ -100,7 +94,7 @@ interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
     sequence<string> getSupportedMethodNames();
 };
 
-//============================================================================= 
+//=============================================================================
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XContainerWindowProvider.idl b/offapi/com/sun/star/awt/XContainerWindowProvider.idl
index fea57d85a..b7fce615f 100644
--- a/offapi/com/sun/star/awt/XContainerWindowProvider.idl
+++ b/offapi/com/sun/star/awt/XContainerWindowProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,28 +28,22 @@
 #ifndef __com_sun_star_awt_XContainerWindowProvider_idl__
 #define __com_sun_star_awt_XContainerWindowProvider_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__ 
-#include <com/sun/star/awt/XWindow.idl> 
-#endif
-#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
-#include <com/sun/star/awt/XWindowPeer.idl> 
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/awt/XWindow.idl>
+#include <com/sun/star/awt/XWindowPeer.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module awt {
 
-//============================================================================= 
+//=============================================================================
 
-/** provides container windows implementing the 
+/** provides container windows implementing the
     <type scope="com::sun::star::awt">XWindow</type> interface.
  */
-interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
+published interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** creates a window for the given URL
 
@@ -65,28 +59,28 @@ interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
             This parameter must not be null.
 
         @param xHandler
-            is the interface that will be called to handle the Events that 
-            are generated by the window (and all controls placed on it) and 
-            bound to the handler using a vnd.sun.star.UNO URL specifying a 
-            handler method to be called. Usually this will be done directly 
+            is the interface that will be called to handle the Events that
+            are generated by the window (and all controls placed on it) and
+            bound to the handler using a vnd.sun.star.UNO URL specifying a
+            handler method to be called. Usually this will be done directly
             by the user.
-            
+
             xHandler can handle events in two different ways:
 
-            1. By supporting the <type scope="com::sun::star::awt">XContainerWindowEventHandler</type> 
+            1. By supporting the <type scope="com::sun::star::awt">XContainerWindowEventHandler</type>
             interface. This is a generic interface to accept event notifications.
-            
+
             2. By providing interfaces that directly implement the handler
             methods to be called. The XContainerWindowProvider implementation then
-            will try to access these events using the 
+            will try to access these events using the
             <type scope="com::sun::star::beans">Introspection</type>Introspection
             service. To make this possible the handler implementation also has to
             support <type scope="com::sun::star::lang">XTypeProvider</type>.
 
             If XContainerWindowEventHandler is supported XContainerWindowEventHandler.callHandlerMethod()
-            is always called first to handle the event. Only if the event cannot be 
+            is always called first to handle the event. Only if the event cannot be
             handled by XContainerWindowEventHandler (callHandlerMethod() then has to return
-            false) or if XContainerWindowEventHandler is not supported at all the Introspection 
+            false) or if XContainerWindowEventHandler is not supported at all the Introspection
             based access will be used.
 
             The Introspection based access tries to call a method named according to the
@@ -96,10 +90,10 @@ interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
             void HandlerMethodName( [in] com::sun::star::awt::XWindow xWindow, [in] any aEvent )
 
             will be searched. The signature is similar to XContainerWindowEventHandler.
-            callHandlerMethod except for MethodName itself that isn't needed 
+            callHandlerMethod except for MethodName itself that isn't needed
             here. For more information about these parameters, see
             <type scope="com::sun::star::awt">XContainerWindowEventHandler</type>.
-            
+
             If this method is found, it will be called, otherwise a method
 
             void HandlerMethodName( void )
@@ -119,11 +113,11 @@ interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
     com::sun::star::awt::XWindow createContainerWindow
         ( [in] string URL, [in] string WindowType,
           [in] com::sun::star::awt::XWindowPeer xParent,
-          [in] com::sun::star::uno::XInterface xHandler )  
+          [in] com::sun::star::uno::XInterface xHandler )
             raises ( com::sun::star::lang::IllegalArgumentException );
 };
 
-//============================================================================= 
+//=============================================================================
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XControl.idl b/offapi/com/sun/star/awt/XControl.idl
index 3a51bceef..9056daeec 100644
--- a/offapi/com/sun/star/awt/XControl.idl
+++ b/offapi/com/sun/star/awt/XControl.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_awt_XControl_idl__ 
 #define __com_sun_star_awt_XControl_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XToolkit_idl__ 
 #include <com/sun/star/awt/XToolkit.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
 #include <com/sun/star/awt/XWindowPeer.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XControlModel_idl__ 
 #include <com/sun/star/awt/XControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XView_idl__ 
 #include <com/sun/star/awt/XView.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XControlContainer.idl b/offapi/com/sun/star/awt/XControlContainer.idl
index 9f51fe987..3ddf873de 100644
--- a/offapi/com/sun/star/awt/XControlContainer.idl
+++ b/offapi/com/sun/star/awt/XControlContainer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XControlContainer_idl__ 
 #define __com_sun_star_awt_XControlContainer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XControl_idl__ 
 #include <com/sun/star/awt/XControl.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XControlModel.idl b/offapi/com/sun/star/awt/XControlModel.idl
index bd77db0d8..6cbd5ea61 100644
--- a/offapi/com/sun/star/awt/XControlModel.idl
+++ b/offapi/com/sun/star/awt/XControlModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XControlModel_idl__ 
 #define __com_sun_star_awt_XControlModel_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XCurrencyField.idl b/offapi/com/sun/star/awt/XCurrencyField.idl
index 661d64c22..d91e60843 100644
--- a/offapi/com/sun/star/awt/XCurrencyField.idl
+++ b/offapi/com/sun/star/awt/XCurrencyField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XCurrencyField_idl__ 
 #define __com_sun_star_awt_XCurrencyField_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl b/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
index c0cc57a3f..67ebee905 100644
--- a/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
+++ b/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XDataTransferProviderAccess_idl__
 #define __com_sun_star_awt_XDataTransferProviderAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XDateField.idl b/offapi/com/sun/star/awt/XDateField.idl
index a0d6990a5..20b08728f 100644
--- a/offapi/com/sun/star/awt/XDateField.idl
+++ b/offapi/com/sun/star/awt/XDateField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XDateField_idl__ 
 #define __com_sun_star_awt_XDateField_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XDevice.idl b/offapi/com/sun/star/awt/XDevice.idl
index 5a44f9086..7cf1580fc 100644
--- a/offapi/com/sun/star/awt/XDevice.idl
+++ b/offapi/com/sun/star/awt/XDevice.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XDevice_idl__ 
 #define __com_sun_star_awt_XDevice_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_DeviceInfo_idl__ 
 #include <com/sun/star/awt/DeviceInfo.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/XDialog.idl b/offapi/com/sun/star/awt/XDialog.idl
index 8d897bbe0..7a3866b53 100644
--- a/offapi/com/sun/star/awt/XDialog.idl
+++ b/offapi/com/sun/star/awt/XDialog.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XDialog_idl__ 
 #define __com_sun_star_awt_XDialog_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XDialog2.idl b/offapi/com/sun/star/awt/XDialog2.idl
index 594f072fc..16ef382eb 100644
--- a/offapi/com/sun/star/awt/XDialog2.idl
+++ b/offapi/com/sun/star/awt/XDialog2.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_awt_XDialog2_idl__ 
 #define __com_sun_star_awt_XDialog2_idl__ 
  
-#ifndef __com_sun_star_awt_XDialog_idl__
 #include <com/sun/star/awt/XDialog.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XDialogEventHandler.idl b/offapi/com/sun/star/awt/XDialogEventHandler.idl
index 3f7595a15..992ab75b2 100644
--- a/offapi/com/sun/star/awt/XDialogEventHandler.idl
+++ b/offapi/com/sun/star/awt/XDialogEventHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,29 +28,23 @@
 #ifndef __com_sun_star_awt_XDialogEventHandler_idl__
 #define __com_sun_star_awt_XDialogEventHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XDialog_idl__ 
-#include <com/sun/star/awt/XDialog.idl> 
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
-#include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
+#include <com/sun/star/awt/XDialog.idl>
+#include <com/sun/star/lang/WrappedTargetException.idl>
 
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module awt {
 
-//============================================================================= 
+//=============================================================================
 
 /** Handles events fired by dialogs represented by a
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
+published interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** Handles an event generated by a dialog.
 
@@ -74,11 +68,11 @@ interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
 
         @param MethodName
             the name of the function which is to be called.
-            
+
         @returns
             true if the event was handled, otherwise false.
 
-        @throws com::sun::star::lang::WrappedTargetException  
+        @throws com::sun::star::lang::WrappedTargetException
             if the implementation of the method, which is determined by the argument MethodName,
             throws an exception. This exception is then wrapped into a
             <type scope="com::sun::star::lang">WrappedTargetException</type>.
@@ -88,7 +82,7 @@ interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
         [in] com::sun::star::awt::XDialog xDialog,
         [in] any EventObject,
         [in] string MethodName)
-        raises(com::sun::star::lang::WrappedTargetException); 
+        raises(com::sun::star::lang::WrappedTargetException);
 
 
     /** returns a sequence of supported method names
@@ -99,7 +93,7 @@ interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
     sequence<string> getSupportedMethodNames();
 };
 
-//============================================================================= 
+//=============================================================================
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XDialogProvider.idl b/offapi/com/sun/star/awt/XDialogProvider.idl
index 955f69860..0df719868 100644
--- a/offapi/com/sun/star/awt/XDialogProvider.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,33 +28,27 @@
 #ifndef __com_sun_star_awt_XDialogProvider_idl__
 #define __com_sun_star_awt_XDialogProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XDialog_idl__ 
-#include <com/sun/star/awt/XDialog.idl> 
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/awt/XDialog.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module awt {
 
-//============================================================================= 
+//=============================================================================
 
-/** provides dialogs implementing the 
+/** provides dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-interface XDialogProvider : ::com::sun::star::uno::XInterface {
+published interface XDialogProvider : ::com::sun::star::uno::XInterface {
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** creates a dialog for the given URL.
 
-        @param URL 
+        @param URL
             is the URL.
 
         @returns
@@ -63,12 +57,12 @@ interface XDialogProvider : ::com::sun::star::uno::XInterface {
         @throws com::sun::star::lang::IllegalArgumentException
             if no dialog for the given URL is found or if the URL is invalid.
      */
-    com::sun::star::awt::XDialog createDialog( [in] string URL )  
+    com::sun::star::awt::XDialog createDialog( [in] string URL )
         raises ( com::sun::star::lang::IllegalArgumentException );
 
 };
 
-//============================================================================= 
+//=============================================================================
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XDialogProvider2.idl b/offapi/com/sun/star/awt/XDialogProvider2.idl
index a8ce13c3e..c6bef815a 100644
--- a/offapi/com/sun/star/awt/XDialogProvider2.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,56 +28,52 @@
 #ifndef __com_sun_star_awt_XDialogProvider2_idl__
 #define __com_sun_star_awt_XDialogProvider2_idl__
 
-#ifndef __com_sun_star_awt_XDialogProvider_idl__
 #include <com/sun/star/awt/XDialogProvider.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module awt {
 
-//============================================================================= 
+//=============================================================================
 
-/** provides dialogs implementing the 
+/** provides dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
+published interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** creates a dialog for the given URL accepting an Interface used
         to handle dialog events.
 
-        @param URL 
+        @param URL
             is the URL.
 
         @param xHandler
-            is the interface that will be called to handle the Events that 
-            are generated by the dialog (and all controls placed on it) and 
-            bound to the handler using a vnd.sun.star.UNO URL specifying a 
-            handler method to be called. Usually this will be done directly 
+            is the interface that will be called to handle the Events that
+            are generated by the dialog (and all controls placed on it) and
+            bound to the handler using a vnd.sun.star.UNO URL specifying a
+            handler method to be called. Usually this will be done directly
             by the user.
-            
+
             xHandler can handle events in two different ways:
 
             1. By supporting the <type scope="com::sun::star::awt">XDialogEventHandler</type> interface.
             This is a generic interface to accept event notifications.
-            
+
             2. By providing interfaces that directly implement the handler
             methods to be called. The XDialogProvider2 implementation then
-            will try to access these events using the 
+            will try to access these events using the
             <type scope="com::sun::star::beans">Introspection</type>Introspection
             service. To make this possible the handler implementation also has to
             support <type scope="com::sun::star::lang">XTypeProvider</type>.
 
             If XDialogEventHandler is supported XDialogEventHandler.callHandlerMethod()
-            is always called first to handle the event. Only if the event cannot be 
+            is always called first to handle the event. Only if the event cannot be
             handled by XDialogEventHandler (callHandlerMethod() then has to return
-            false) or if XDialogEventHandler is not supported at all the Introspection 
+            false) or if XDialogEventHandler is not supported at all the Introspection
             based access will be used.
 
             The Introspection based access tries to call a method named according to the
@@ -87,10 +83,10 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
             void HandlerMethodName( [in] com::sun::star::awt::XDialog xDialog, [in] any aEvent )
 
             will be searched. The signature is similar to XDialogEventHandler.
-            callHandlerMethod except for MethodName itself that isn't needed 
+            callHandlerMethod except for MethodName itself that isn't needed
             here. For more information about these parameters, see
             <type scope="com::sun::star::awt">XDialogEventHandler</type>.
-            
+
             If this method is found, it will be called, otherwise a method
 
             void HandlerMethodName( void )
@@ -107,8 +103,8 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
         @see <type scope="com::sun::star::awt">XDialogEventHandler</type>
 
      */
-    com::sun::star::awt::XDialog createDialogWithHandler
-        ( [in] string URL, [in] com::sun::star::uno::XInterface xHandler )  
+    XDialog createDialogWithHandler
+        ( [in] string URL, [in] com::sun::star::uno::XInterface xHandler )
             raises ( com::sun::star::lang::IllegalArgumentException );
 
     /** creates a dialog for the given URL, accepting additional creation parameters
@@ -123,15 +119,13 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
         </p>
     */
 
-    XDialog createDialogWithArguments(
-        [in] string URL,
-        [in] sequence< ::com::sun::star::beans::NamedValue > Arguments
-    )
-    raises  (   com::sun::star::lang::IllegalArgumentException
-            );
+    XDialog createDialogWithArguments
+        ( [in] string URL,
+          [in] sequence< ::com::sun::star::beans::NamedValue > Arguments )
+        raises  ( com::sun::star::lang::IllegalArgumentException );
 };
 
-//============================================================================= 
+//=============================================================================
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XDisplayBitmap.idl b/offapi/com/sun/star/awt/XDisplayBitmap.idl
index e04f2590d..1b7de431f 100644
--- a/offapi/com/sun/star/awt/XDisplayBitmap.idl
+++ b/offapi/com/sun/star/awt/XDisplayBitmap.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XDisplayBitmap_idl__ 
 #define __com_sun_star_awt_XDisplayBitmap_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XDisplayConnection.idl b/offapi/com/sun/star/awt/XDisplayConnection.idl
index 1e9f9113a..58676f78d 100644
--- a/offapi/com/sun/star/awt/XDisplayConnection.idl
+++ b/offapi/com/sun/star/awt/XDisplayConnection.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XDisplayConnection_idl__
 #define __com_sun_star_awt_XDisplayConnection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XDockableWindow.idl b/offapi/com/sun/star/awt/XDockableWindow.idl
index 18a40c451..6ad34e441 100644
--- a/offapi/com/sun/star/awt/XDockableWindow.idl
+++ b/offapi/com/sun/star/awt/XDockableWindow.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_XDockableWindow_idl__ 
 #define __com_sun_star_awt_XDockableWindow_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDockableWindowListener_idl__ 
 #include <com/sun/star/awt/XDockableWindowListener.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/XDockableWindowListener.idl b/offapi/com/sun/star/awt/XDockableWindowListener.idl
index 371c4de96..93b92fcac 100644
--- a/offapi/com/sun/star/awt/XDockableWindowListener.idl
+++ b/offapi/com/sun/star/awt/XDockableWindowListener.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_awt_XDockableWindowListener_idl__ 
 #define __com_sun_star_awt_XDockableWindowListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
-#ifndef __com_sun_star_awt_DockingData_idl__ 
 #include <com/sun/star/awt/DockingData.idl>
-#endif 
-#ifndef __com_sun_star_awt_EndDockingEvent_idl__ 
 #include <com/sun/star/awt/EndDockingEvent.idl>
-#endif
-#ifndef __com_sun_star_awt_DockingEvent_idl__ 
 #include <com/sun/star/awt/DockingEvent.idl>
-#endif
-#ifndef __com_sun_star_awt_EndPopupModeEvent_idl__ 
 #include <com/sun/star/awt/EndPopupModeEvent.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl b/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
index 3f2d57866..1989752c4 100644
--- a/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
+++ b/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XEnhancedMouseClickHandler_idl__
 #define __com_sun_star_awt_XEnhancedMouseClickHandler_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_EnhancedMouseEvent_idl__
 #include <com/sun/star/awt/EnhancedMouseEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XEventHandler.idl b/offapi/com/sun/star/awt/XEventHandler.idl
index 116c52afa..9b7f7a2a8 100644
--- a/offapi/com/sun/star/awt/XEventHandler.idl
+++ b/offapi/com/sun/star/awt/XEventHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XEventHandler_idl__
 #define __com_sun_star_awt_XEventHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XExtendedToolkit.idl b/offapi/com/sun/star/awt/XExtendedToolkit.idl
index bea7e879a..099eeb252 100644
--- a/offapi/com/sun/star/awt/XExtendedToolkit.idl
+++ b/offapi/com/sun/star/awt/XExtendedToolkit.idl
@@ -28,29 +28,12 @@
 #ifndef __com_sun_star_awt_XExtendedToolkit_idl__ 
 #define __com_sun_star_awt_XExtendedToolkit_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XTopWindow_idl__ 
 #include <com/sun/star/awt/XTopWindow.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTopWindowListener_idl__
 #include <com/sun/star/awt/XTopWindowListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XKeyHandler_idl__
 #include <com/sun/star/awt/XKeyHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XFocusListener_idl__
 #include <com/sun/star/awt/XFocusListener.idl>
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XFileDialog.idl b/offapi/com/sun/star/awt/XFileDialog.idl
index 241a0f340..d1aa68148 100644
--- a/offapi/com/sun/star/awt/XFileDialog.idl
+++ b/offapi/com/sun/star/awt/XFileDialog.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XFileDialog_idl__ 
 #define __com_sun_star_awt_XFileDialog_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XFixedHyperlink.idl b/offapi/com/sun/star/awt/XFixedHyperlink.idl
index 7cf8e18b4..05cfe3805 100644
--- a/offapi/com/sun/star/awt/XFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/XFixedHyperlink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XFixedHyperlink_idl__
 #define __com_sun_star_awt_XFixedHyperlink_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XActionListener_idl__
 #include <com/sun/star/awt/XActionListener.idl>
-#endif
 
 //=============================================================================
 
@@ -43,7 +38,7 @@
 
 /** gives access to the text and formatting of a fixed hyperlink field.
  */
-interface XFixedHyperlink: com::sun::star::uno::XInterface
+published interface XFixedHyperlink: com::sun::star::uno::XInterface
 {
         //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XFixedText.idl b/offapi/com/sun/star/awt/XFixedText.idl
index b4e269600..14157c262 100644
--- a/offapi/com/sun/star/awt/XFixedText.idl
+++ b/offapi/com/sun/star/awt/XFixedText.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XFixedText_idl__ 
 #define __com_sun_star_awt_XFixedText_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XFocusListener.idl b/offapi/com/sun/star/awt/XFocusListener.idl
index dd3ab0270..f0ea7c05c 100644
--- a/offapi/com/sun/star/awt/XFocusListener.idl
+++ b/offapi/com/sun/star/awt/XFocusListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XFocusListener_idl__ 
 #define __com_sun_star_awt_XFocusListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_FocusEvent_idl__ 
 #include <com/sun/star/awt/FocusEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XFont.idl b/offapi/com/sun/star/awt/XFont.idl
index 71a139ae7..d0c72621a 100644
--- a/offapi/com/sun/star/awt/XFont.idl
+++ b/offapi/com/sun/star/awt/XFont.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XFont_idl__ 
 #define __com_sun_star_awt_XFont_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_SimpleFontMetric_idl__ 
 #include <com/sun/star/awt/SimpleFontMetric.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XFont2.idl b/offapi/com/sun/star/awt/XFont2.idl
index fe0ecd5e6..39554b855 100644
--- a/offapi/com/sun/star/awt/XFont2.idl
+++ b/offapi/com/sun/star/awt/XFont2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XFont2_idl__
 #define __com_sun_star_awt_XFont2_idl__
 
-#ifndef __com_sun_star_awt_XFont_idl__
 #include <com/sun/star/awt/XFont.idl>
-#endif 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XGraphics.idl b/offapi/com/sun/star/awt/XGraphics.idl
index f63ed2311..47df500e3 100644
--- a/offapi/com/sun/star/awt/XGraphics.idl
+++ b/offapi/com/sun/star/awt/XGraphics.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_awt_XGraphics_idl__ 
 #define __com_sun_star_awt_XGraphics_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_SimpleFontMetric_idl__ 
 #include <com/sun/star/awt/SimpleFontMetric.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_RasterOperation_idl__ 
 #include <com/sun/star/awt/RasterOperation.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Gradient_idl__ 
 #include <com/sun/star/awt/Gradient.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/XImageButton.idl b/offapi/com/sun/star/awt/XImageButton.idl
index 92463ebbb..d29bc50a8 100644
--- a/offapi/com/sun/star/awt/XImageButton.idl
+++ b/offapi/com/sun/star/awt/XImageButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XImageButton_idl__ 
 #define __com_sun_star_awt_XImageButton_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XActionListener_idl__ 
 #include <com/sun/star/awt/XActionListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XImageConsumer.idl b/offapi/com/sun/star/awt/XImageConsumer.idl
index 30c9146e2..8bc457022 100644
--- a/offapi/com/sun/star/awt/XImageConsumer.idl
+++ b/offapi/com/sun/star/awt/XImageConsumer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XImageConsumer_idl__ 
 #define __com_sun_star_awt_XImageConsumer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/XImageProducer.idl b/offapi/com/sun/star/awt/XImageProducer.idl
index 3d2fc0c7a..930015b5a 100644
--- a/offapi/com/sun/star/awt/XImageProducer.idl
+++ b/offapi/com/sun/star/awt/XImageProducer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XImageProducer_idl__ 
 #define __com_sun_star_awt_XImageProducer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XImageConsumer_idl__ 
 #include <com/sun/star/awt/XImageConsumer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XInfoPrinter.idl b/offapi/com/sun/star/awt/XInfoPrinter.idl
index 817e44965..83f752f6b 100644
--- a/offapi/com/sun/star/awt/XInfoPrinter.idl
+++ b/offapi/com/sun/star/awt/XInfoPrinter.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XInfoPrinter_idl__ 
 #define __com_sun_star_awt_XInfoPrinter_idl__ 
  
-#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__ 
 #include <com/sun/star/awt/XPrinterPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XDevice_idl__ 
 #include <com/sun/star/awt/XDevice.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XItemEventBroadcaster.idl b/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
index 986597486..47a9cdbc3 100644
--- a/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
+++ b/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__
 #define __com_sun_star_awt_XItemEventBroadcaster_idl__
 
-#ifndef __com_sun_star_awt_XItemListener_idl__
 #include <com/sun/star/awt/XItemListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 
@@ -46,7 +41,7 @@
 /**  registers item listeners at controls like the com::sun::star::awt::Roadmap
  */
 
-interface XItemEventBroadcaster: com::sun::star::uno::XInterface
+published interface XItemEventBroadcaster: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XItemList.idl b/offapi/com/sun/star/awt/XItemList.idl
index 17b683526..aefb739d7 100644
--- a/offapi/com/sun/star/awt/XItemList.idl
+++ b/offapi/com/sun/star/awt/XItemList.idl
@@ -34,13 +34,13 @@
 
 module com { module sun { module star { module awt {
 
-interface XItemListListener;
+published interface XItemListListener;
 
 //==================================================================================================================
 
 /** provides convenient access to the list of items in a list box
  */
-interface XItemList
+published interface XItemList
 {
     /** is the number of items in the list
     */
diff --git a/offapi/com/sun/star/awt/XItemListListener.idl b/offapi/com/sun/star/awt/XItemListListener.idl
index a7ec6fee8..27ef1831a 100644
--- a/offapi/com/sun/star/awt/XItemListListener.idl
+++ b/offapi/com/sun/star/awt/XItemListListener.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module awt {
 /** describes a listener for changes in a item list
     @see XListItems
  */
-interface XItemListListener : ::com::sun::star::lang::XEventListener
+published interface XItemListListener : ::com::sun::star::lang::XEventListener
 {
     /** is called when an item is inserted into the list
     */
diff --git a/offapi/com/sun/star/awt/XItemListener.idl b/offapi/com/sun/star/awt/XItemListener.idl
index 714eea13e..07a38b015 100644
--- a/offapi/com/sun/star/awt/XItemListener.idl
+++ b/offapi/com/sun/star/awt/XItemListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XItemListener_idl__ 
 #define __com_sun_star_awt_XItemListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_ItemEvent_idl__ 
 #include <com/sun/star/awt/ItemEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XKeyHandler.idl b/offapi/com/sun/star/awt/XKeyHandler.idl
index aff32301e..38e7a26f9 100644
--- a/offapi/com/sun/star/awt/XKeyHandler.idl
+++ b/offapi/com/sun/star/awt/XKeyHandler.idl
@@ -28,13 +28,9 @@
 #ifndef __com_sun_star_awt_XKeyHandler_idl__ 
 #define __com_sun_star_awt_XKeyHandler_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_KeyEvent_idl__ 
 #include <com/sun/star/awt/KeyEvent.idl> 
-#endif 
  
  
 module com {  module sun {  module star {  module awt {  
diff --git a/offapi/com/sun/star/awt/XKeyListener.idl b/offapi/com/sun/star/awt/XKeyListener.idl
index d07a31180..138bdd571 100644
--- a/offapi/com/sun/star/awt/XKeyListener.idl
+++ b/offapi/com/sun/star/awt/XKeyListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XKeyListener_idl__ 
 #define __com_sun_star_awt_XKeyListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_KeyEvent_idl__ 
 #include <com/sun/star/awt/KeyEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XLayoutConstrains.idl b/offapi/com/sun/star/awt/XLayoutConstrains.idl
index bbb3c6b1a..abb0ae9d2 100644
--- a/offapi/com/sun/star/awt/XLayoutConstrains.idl
+++ b/offapi/com/sun/star/awt/XLayoutConstrains.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
 #define __com_sun_star_awt_XLayoutConstrains_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XLayoutContainer.idl b/offapi/com/sun/star/awt/XLayoutContainer.idl
index bea70db11..ab8d661b2 100644
--- a/offapi/com/sun/star/awt/XLayoutContainer.idl
+++ b/offapi/com/sun/star/awt/XLayoutContainer.idl
@@ -1,24 +1,12 @@
 #ifndef __com_sun_star_awt_XLayoutContainer_idl__ 
 #define __com_sun_star_awt_XLayoutContainer_idl__ 
 
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
 #include <com/sun/star/awt/XLayoutConstrains.idl> 
-#endif 
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl> 
-#endif 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
-#ifndef __com_sun_star_container_XChild_idl__ 
 #include <com/sun/star/container/XChild.idl> 
-#endif
-#ifndef __com_sun_star_awt_MaxChildrenException_idl__ 
 #include <com/sun/star/awt/MaxChildrenException.idl> 
-#endif
-#ifndef __com_sun_star_awt_XLayoutUnit_idl__ 
 #include <com/sun/star/awt/XLayoutUnit.idl> 
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/awt/XLayoutRoot.idl b/offapi/com/sun/star/awt/XLayoutRoot.idl
index 107d7e919..06b34262d 100644
--- a/offapi/com/sun/star/awt/XLayoutRoot.idl
+++ b/offapi/com/sun/star/awt/XLayoutRoot.idl
@@ -1,15 +1,9 @@
 #ifndef __com_sun_star_awt_XLayoutRoot_idl__ 
 #define __com_sun_star_awt_XLayoutRoot_idl__ 
  
-#ifndef __com_sun_star_awt_XLayoutContainer_idl__ 
 #include <com/sun/star/awt/XLayoutContainer.idl> 
-#endif 
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/XLayoutUnit.idl b/offapi/com/sun/star/awt/XLayoutUnit.idl
index fdd01dd9c..c29681d1a 100644
--- a/offapi/com/sun/star/awt/XLayoutUnit.idl
+++ b/offapi/com/sun/star/awt/XLayoutUnit.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_awt_XLayoutUnit_idl__ 
 #define __com_sun_star_awt_XLayoutUnit_idl__ 
 
-#ifndef __com_sun_star_awt_XLayoutContainer_idl__ 
 #include <com/sun/star/awt/XLayoutContainer.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/XListBox.idl b/offapi/com/sun/star/awt/XListBox.idl
index 8763965ee..0bbd15387 100644
--- a/offapi/com/sun/star/awt/XListBox.idl
+++ b/offapi/com/sun/star/awt/XListBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XListBox_idl__ 
 #define __com_sun_star_awt_XListBox_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XItemListener_idl__ 
 #include <com/sun/star/awt/XItemListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XActionListener_idl__ 
 #include <com/sun/star/awt/XActionListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XMenu.idl b/offapi/com/sun/star/awt/XMenu.idl
index 42cd6b6f7..801427c22 100644
--- a/offapi/com/sun/star/awt/XMenu.idl
+++ b/offapi/com/sun/star/awt/XMenu.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XMenu_idl__ 
 #define __com_sun_star_awt_XMenu_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XMenuBar.idl b/offapi/com/sun/star/awt/XMenuBar.idl
index 8847b7350..be334a78a 100644
--- a/offapi/com/sun/star/awt/XMenuBar.idl
+++ b/offapi/com/sun/star/awt/XMenuBar.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XMenuBar_idl__ 
 #define __com_sun_star_awt_XMenuBar_idl__ 
  
-#ifndef __com_sun_star_awt_XMenu_idl__ 
 #include <com/sun/star/awt/XMenu.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XMenuBarExtended.idl b/offapi/com/sun/star/awt/XMenuBarExtended.idl
index c3601da09..d5ca6ae92 100644
--- a/offapi/com/sun/star/awt/XMenuBarExtended.idl
+++ b/offapi/com/sun/star/awt/XMenuBarExtended.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_XMenuBarExtended_idl__
 #define __com_sun_star_awt_XMenuBarExtended_idl__
 
-#ifndef __com_sun_star_awt_XMenuBar_idl__
 #include <com/sun/star/awt/XMenuBar.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuExtended2_idl__
 #include <com/sun/star/awt/XMenuExtended2.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XMenuExtended.idl b/offapi/com/sun/star/awt/XMenuExtended.idl
index 3caa554c5..3bf107779 100644
--- a/offapi/com/sun/star/awt/XMenuExtended.idl
+++ b/offapi/com/sun/star/awt/XMenuExtended.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XMenuExtended_idl__
 #define __com_sun_star_awt_XMenuExtended_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -38,7 +36,7 @@ module com {  module sun {  module star {  module awt {
 /** specifies extended menu functions.
  */
 
-interface XMenuExtended: com::sun::star::uno::XInterface
+published interface XMenuExtended: com::sun::star::uno::XInterface
 {
     /** sets the command string for the menu item.
 
diff --git a/offapi/com/sun/star/awt/XMenuExtended2.idl b/offapi/com/sun/star/awt/XMenuExtended2.idl
index 262032fc1..eace9b211 100644
--- a/offapi/com/sun/star/awt/XMenuExtended2.idl
+++ b/offapi/com/sun/star/awt/XMenuExtended2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_XMenuExtended2_idl__
 #define __com_sun_star_awt_XMenuExtended2_idl__
 
-#ifndef __com_sun_star_awt_XMenu_idl__
 #include <com/sun/star/awt/XMenu.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuExtended_idl__
 #include <com/sun/star/awt/XMenuExtended.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MenuItemType_idl__
 #include <com/sun/star/awt/MenuItemType.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
@@ -50,7 +39,7 @@ module com {  module sun {  module star {  module awt {
 /** specifies extended menu functions.
  */
 
-interface XMenuExtended2
+published interface XMenuExtended2
 {
     /** specifies some extended menu functions, like setting a command URL and a help command for a menu item.<br>
         These functions are available for both menu bar and pop-up menu.
diff --git a/offapi/com/sun/star/awt/XMenuListener.idl b/offapi/com/sun/star/awt/XMenuListener.idl
index 033de9add..5c6d08396 100644
--- a/offapi/com/sun/star/awt/XMenuListener.idl
+++ b/offapi/com/sun/star/awt/XMenuListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XMenuListener_idl__ 
 #define __com_sun_star_awt_XMenuListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_MenuEvent_idl__ 
 #include <com/sun/star/awt/MenuEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XMessageBox.idl b/offapi/com/sun/star/awt/XMessageBox.idl
index 87162cf32..7f4ceb51b 100644
--- a/offapi/com/sun/star/awt/XMessageBox.idl
+++ b/offapi/com/sun/star/awt/XMessageBox.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XMessageBox_idl__ 
 #define __com_sun_star_awt_XMessageBox_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XMessageBoxFactory.idl b/offapi/com/sun/star/awt/XMessageBoxFactory.idl
index 1610e10bd..ffd4721b9 100644
--- a/offapi/com/sun/star/awt/XMessageBoxFactory.idl
+++ b/offapi/com/sun/star/awt/XMessageBoxFactory.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_awt_XMessageBoxFactory_idl__
 #define __com_sun_star_awt_XMessageBoxFactory_idl__
 
-#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
 #include <com/sun/star/awt/XWindowPeer.idl> 
-#endif
-
-#ifndef __com_sun_star_awt_XMessageBox_idl__
 #include <com/sun/star/awt/XMessageBox.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MessageBoxButtons_idl__
 #include <com/sun/star/awt/MessageBoxButtons.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XMetricField.idl b/offapi/com/sun/star/awt/XMetricField.idl
index ba2f954d6..49ed66aee 100644
--- a/offapi/com/sun/star/awt/XMetricField.idl
+++ b/offapi/com/sun/star/awt/XMetricField.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_awt_XMetricField_idl__ 
 #define __com_sun_star_awt_XMetricField_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_util_MeasureUnit_idl__ 
 #include <com/sun/star/util/MeasureUnit.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/XMouseClickHandler.idl b/offapi/com/sun/star/awt/XMouseClickHandler.idl
index 6af2742d6..0316e9ddf 100644
--- a/offapi/com/sun/star/awt/XMouseClickHandler.idl
+++ b/offapi/com/sun/star/awt/XMouseClickHandler.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XMouseClickHandler_idl__
 #define __com_sun_star_awt_XMouseClickHandler_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
 #include <com/sun/star/awt/MouseEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XMouseListener.idl b/offapi/com/sun/star/awt/XMouseListener.idl
index f85a71d70..fcbebf634 100644
--- a/offapi/com/sun/star/awt/XMouseListener.idl
+++ b/offapi/com/sun/star/awt/XMouseListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XMouseListener_idl__ 
 #define __com_sun_star_awt_XMouseListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_MouseEvent_idl__ 
 #include <com/sun/star/awt/MouseEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XMouseMotionHandler.idl b/offapi/com/sun/star/awt/XMouseMotionHandler.idl
index c9ca8e480..865f6cd16 100644
--- a/offapi/com/sun/star/awt/XMouseMotionHandler.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionHandler.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XMouseMotionHandler_idl__ 
 #define __com_sun_star_awt_XMouseMotionHandler_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_MouseEvent_idl__ 
 #include <com/sun/star/awt/MouseEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XMouseMotionListener.idl b/offapi/com/sun/star/awt/XMouseMotionListener.idl
index 8751ecf80..6eb70abff 100644
--- a/offapi/com/sun/star/awt/XMouseMotionListener.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XMouseMotionListener_idl__ 
 #define __com_sun_star_awt_XMouseMotionListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_MouseEvent_idl__ 
 #include <com/sun/star/awt/MouseEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XNumericField.idl b/offapi/com/sun/star/awt/XNumericField.idl
index 3482bdb72..54d88efe7 100644
--- a/offapi/com/sun/star/awt/XNumericField.idl
+++ b/offapi/com/sun/star/awt/XNumericField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XNumericField_idl__ 
 #define __com_sun_star_awt_XNumericField_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XPaintListener.idl b/offapi/com/sun/star/awt/XPaintListener.idl
index 135234e4a..87cc2c013 100644
--- a/offapi/com/sun/star/awt/XPaintListener.idl
+++ b/offapi/com/sun/star/awt/XPaintListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XPaintListener_idl__ 
 #define __com_sun_star_awt_XPaintListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_PaintEvent_idl__ 
 #include <com/sun/star/awt/PaintEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XPatternField.idl b/offapi/com/sun/star/awt/XPatternField.idl
index b34e0c25a..8c9bb6dd8 100644
--- a/offapi/com/sun/star/awt/XPatternField.idl
+++ b/offapi/com/sun/star/awt/XPatternField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XPatternField_idl__ 
 #define __com_sun_star_awt_XPatternField_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XPointer.idl b/offapi/com/sun/star/awt/XPointer.idl
index 983c46184..7935bf756 100644
--- a/offapi/com/sun/star/awt/XPointer.idl
+++ b/offapi/com/sun/star/awt/XPointer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XPointer_idl__ 
 #define __com_sun_star_awt_XPointer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XPopupMenu.idl b/offapi/com/sun/star/awt/XPopupMenu.idl
index b92b17596..03da3c94a 100644
--- a/offapi/com/sun/star/awt/XPopupMenu.idl
+++ b/offapi/com/sun/star/awt/XPopupMenu.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XPopupMenu_idl__ 
 #define __com_sun_star_awt_XPopupMenu_idl__ 
  
-#ifndef __com_sun_star_awt_XMenu_idl__ 
 #include <com/sun/star/awt/XMenu.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/XPopupMenuExtended.idl b/offapi/com/sun/star/awt/XPopupMenuExtended.idl
index 4786ae3dd..16cd5735a 100644
--- a/offapi/com/sun/star/awt/XPopupMenuExtended.idl
+++ b/offapi/com/sun/star/awt/XPopupMenuExtended.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_awt_XPopupMenuExtended_idl__
 #define __com_sun_star_awt_XPopupMenuExtended_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
 #include <com/sun/star/awt/XPopupMenu.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuExtended2_idl__
 #include <com/sun/star/awt/XMenuExtended2.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MenuLogo_idl__
 #include <com/sun/star/awt/MenuLogo.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
 #include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
@@ -63,7 +43,7 @@ module com {  module sun {  module star {  module awt {
 
     @since OOo 3.1
  */
-interface XPopupMenuExtended
+published interface XPopupMenuExtended
 {
     /** specifies basic functions for a pop-up menu.
     */
diff --git a/offapi/com/sun/star/awt/XPrinter.idl b/offapi/com/sun/star/awt/XPrinter.idl
index b90bfcac9..ea6fc0803 100644
--- a/offapi/com/sun/star/awt/XPrinter.idl
+++ b/offapi/com/sun/star/awt/XPrinter.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_awt_XPrinter_idl__ 
 #define __com_sun_star_awt_XPrinter_idl__ 
  
-#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__ 
 #include <com/sun/star/awt/XPrinterPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_PrinterException_idl__ 
 #include <com/sun/star/awt/PrinterException.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XDevice_idl__ 
 #include <com/sun/star/awt/XDevice.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XPrinterPropertySet.idl b/offapi/com/sun/star/awt/XPrinterPropertySet.idl
index 5b1ed3d29..ce4e2f925 100644
--- a/offapi/com/sun/star/awt/XPrinterPropertySet.idl
+++ b/offapi/com/sun/star/awt/XPrinterPropertySet.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XPrinterPropertySet_idl__ 
 #define __com_sun_star_awt_XPrinterPropertySet_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
 #include <com/sun/star/beans/PropertyVetoException.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XPrinterServer.idl b/offapi/com/sun/star/awt/XPrinterServer.idl
index 78e550e7b..8e1ef0dfd 100644
--- a/offapi/com/sun/star/awt/XPrinterServer.idl
+++ b/offapi/com/sun/star/awt/XPrinterServer.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XPrinterServer_idl__ 
 #define __com_sun_star_awt_XPrinterServer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XPrinter_idl__ 
 #include <com/sun/star/awt/XPrinter.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XInfoPrinter_idl__ 
 #include <com/sun/star/awt/XInfoPrinter.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XProgressBar.idl b/offapi/com/sun/star/awt/XProgressBar.idl
index 340e26903..aa596fc94 100644
--- a/offapi/com/sun/star/awt/XProgressBar.idl
+++ b/offapi/com/sun/star/awt/XProgressBar.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XProgressBar_idl__ 
 #define __com_sun_star_awt_XProgressBar_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XProgressMonitor.idl b/offapi/com/sun/star/awt/XProgressMonitor.idl
index fb51b1880..f9a34699a 100644
--- a/offapi/com/sun/star/awt/XProgressMonitor.idl
+++ b/offapi/com/sun/star/awt/XProgressMonitor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XProgressMonitor_idl__ 
 #define __com_sun_star_awt_XProgressMonitor_idl__ 
  
-#ifndef __com_sun_star_awt_XProgressBar_idl__ 
 #include <com/sun/star/awt/XProgressBar.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XRadioButton.idl b/offapi/com/sun/star/awt/XRadioButton.idl
index 73261eb76..1ef1f91ee 100644
--- a/offapi/com/sun/star/awt/XRadioButton.idl
+++ b/offapi/com/sun/star/awt/XRadioButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XRadioButton_idl__ 
 #define __com_sun_star_awt_XRadioButton_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XItemListener_idl__ 
 #include <com/sun/star/awt/XItemListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XRegion.idl b/offapi/com/sun/star/awt/XRegion.idl
index 515071f44..fef8f601c 100644
--- a/offapi/com/sun/star/awt/XRegion.idl
+++ b/offapi/com/sun/star/awt/XRegion.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XRegion_idl__ 
 #define __com_sun_star_awt_XRegion_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XRequestCallback.idl b/offapi/com/sun/star/awt/XRequestCallback.idl
index 65d688d45..b1802c228 100644
--- a/offapi/com/sun/star/awt/XRequestCallback.idl
+++ b/offapi/com/sun/star/awt/XRequestCallback.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,23 +28,21 @@
 #ifndef __com_sun_star_awt_XRequestCallback_idl__
 #define __com_sun_star_awt_XRequestCallback_idl__
 
-#ifndef __com_sun_star_awt_XCallback_idl__ 
-#include <com/sun/star/awt/XCallback.idl> 
-#endif
+#include <com/sun/star/awt/XCallback.idl>
 
 //=============================================================================
 
 module com { module sun { module star { module awt {
-    
-//============================================================================= 
+
+//=============================================================================
 
 /** specifies an interface which can be used to call back
     an implementation
  */
-interface XRequestCallback
+published interface XRequestCallback
 {
     //-------------------------------------------------------------------------
-    
+
     /** adds a callback request to the implementation
 
         @param aData
diff --git a/offapi/com/sun/star/awt/XReschedule.idl b/offapi/com/sun/star/awt/XReschedule.idl
index aa892845a..88b448612 100644
--- a/offapi/com/sun/star/awt/XReschedule.idl
+++ b/offapi/com/sun/star/awt/XReschedule.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XReschedule_idl__ 
 #define __com_sun_star_awt_XReschedulet_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XScrollBar.idl b/offapi/com/sun/star/awt/XScrollBar.idl
index 83c1a67b3..3b3de4a9a 100644
--- a/offapi/com/sun/star/awt/XScrollBar.idl
+++ b/offapi/com/sun/star/awt/XScrollBar.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XScrollBar_idl__ 
 #define __com_sun_star_awt_XScrollBar_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XAdjustmentListener_idl__ 
 #include <com/sun/star/awt/XAdjustmentListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XSimpleAnimation.idl b/offapi/com/sun/star/awt/XSimpleAnimation.idl
index 9e172cf8b..e00877362 100644
--- a/offapi/com/sun/star/awt/XSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/XSimpleAnimation.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XSimpleAnimation_idl__
 #define __com_sun_star_awt_XSimpleAnimation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XSimpleTabController.idl b/offapi/com/sun/star/awt/XSimpleTabController.idl
index 0dd3c566a..e69829de3 100644
--- a/offapi/com/sun/star/awt/XSimpleTabController.idl
+++ b/offapi/com/sun/star/awt/XSimpleTabController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_XSimpleTabController_idl__
 #define __com_sun_star_awt_XSimpleTabController_idl__
 
-#ifndef __com_sun_star_awt_XTabListener_idl__
 #include <com/sun/star/awt/XTabListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
@@ -52,7 +41,7 @@
 /** specifies the basic operations for a tab controller,
     but does not require XControl as type of tabs.
  */
-interface XSimpleTabController : com::sun::star::uno::XInterface
+published interface XSimpleTabController : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** create a new tab and return an unique ID,
diff --git a/offapi/com/sun/star/awt/XSpinField.idl b/offapi/com/sun/star/awt/XSpinField.idl
index ed41231b6..78ec904cf 100644
--- a/offapi/com/sun/star/awt/XSpinField.idl
+++ b/offapi/com/sun/star/awt/XSpinField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XSpinField_idl__ 
 #define __com_sun_star_awt_XSpinField_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XSpinListener_idl__ 
 #include <com/sun/star/awt/XSpinListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XSpinListener.idl b/offapi/com/sun/star/awt/XSpinListener.idl
index 28587336a..cd9c05fd8 100644
--- a/offapi/com/sun/star/awt/XSpinListener.idl
+++ b/offapi/com/sun/star/awt/XSpinListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XSpinListener_idl__ 
 #define __com_sun_star_awt_XSpinListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_SpinEvent_idl__ 
 #include <com/sun/star/awt/SpinEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XSpinValue.idl b/offapi/com/sun/star/awt/XSpinValue.idl
index f4ebdc0ec..563d035c8 100644
--- a/offapi/com/sun/star/awt/XSpinValue.idl
+++ b/offapi/com/sun/star/awt/XSpinValue.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_XSpinValue_idl__
 #define __com_sun_star_awt_XSpinValue_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XAdjustmentListener_idl__
 #include <com/sun/star/awt/XAdjustmentListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XStyleChangeListener.idl b/offapi/com/sun/star/awt/XStyleChangeListener.idl
index 34679612c..97ef47bfa 100644
--- a/offapi/com/sun/star/awt/XStyleChangeListener.idl
+++ b/offapi/com/sun/star/awt/XStyleChangeListener.idl
@@ -31,7 +31,7 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module awt { 
+module com { module sun { module star { module awt {
 
 //==================================================================================================================
 
@@ -39,7 +39,7 @@ module com { module sun { module star { module awt {
 
     @see XStyleSettings
  */
-interface XStyleChangeListener : ::com::sun::star::lang::XEventListener
+published interface XStyleChangeListener : ::com::sun::star::lang::XEventListener
 {
     /// called when the style settings of the observed component changed
     void    styleSettingsChanged( [in] com::sun::star::lang::EventObject Event );
diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl b/offapi/com/sun/star/awt/XStyleSettings.idl
index fd188c432..bb9525f23 100644
--- a/offapi/com/sun/star/awt/XStyleSettings.idl
+++ b/offapi/com/sun/star/awt/XStyleSettings.idl
@@ -35,7 +35,7 @@
 
 module com { module sun { module star { module awt {
 
-interface XStyleChangeListener;
+published interface XStyleChangeListener;
 
 //==================================================================================================================
 
@@ -53,12 +53,12 @@ interface XStyleChangeListener;
     while the text is drawn by OpenOffice.org. In this case, the button respects the
     <code>ButtonRolloverTextColor</code> when painting its text.</p>
  */
-interface XStyleSettings
+published interface XStyleSettings
 {
     /// specifies the color of the border of active windows
     [attribute] ::com::sun::star::util::Color ActiveBorderColor;
 
-    /// 
+    ///
     [attribute] ::com::sun::star::util::Color ActiveColor;
 
     /// specifies the color of the active tab of a tab control
@@ -97,10 +97,10 @@ interface XStyleSettings
     /// specifies the text color for disabled UI elements
     [attribute] ::com::sun::star::util::Color DisableColor;
 
-    /// 
+    ///
     [attribute] ::com::sun::star::util::Color FaceColor;
 
-    /// 
+    ///
     [attribute, readonly] ::com::sun::star::util::Color FaceGradientColor;
 
     /// specifies the background color for dialog input controls
diff --git a/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl b/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
index 4c1a3ed7d..d3622bbc2 100644
--- a/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
+++ b/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
@@ -30,15 +30,15 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module awt { 
+module com { module sun { module star { module awt {
 
-    interface XStyleSettings;
+    published interface XStyleSettings;
 
 //==================================================================================================================
 
 /** provides access to the style settings of a component
  */
-interface XStyleSettingsSupplier
+published interface XStyleSettingsSupplier
 {
     [attribute, readonly] XStyleSettings StyleSettings;
 };
diff --git a/offapi/com/sun/star/awt/XSystemChildFactory.idl b/offapi/com/sun/star/awt/XSystemChildFactory.idl
index f9ac89025..a64f1c8eb 100644
--- a/offapi/com/sun/star/awt/XSystemChildFactory.idl
+++ b/offapi/com/sun/star/awt/XSystemChildFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XSystemChildFactory_idl__
 #define __com_sun_star_awt_XSystemChildFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -62,7 +60,6 @@ published interface XSystemChildFactory : com::sun::star::uno::XInterface
         JAVA: global reference to a java.awt.Component
         object provided from the JNI-API.<BR>
         
-        OS2: HWND.<BR>
         MAC: Not supported.<BR></p>
         
         @param ProcessId
diff --git a/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl b/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
index 77decad4b..b5e7b803c 100644
--- a/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
+++ b/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XSystemDependentMenuPeer_idl__ 
 #define __com_sun_star_awt_XSystemDependentMenuPeer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl b/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
index 71d3f086f..90acc0854 100644
--- a/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XSystemDependentWindowPeer_idl__ 
 #define __com_sun_star_awt_XSystemDependentWindowPeer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
 
 
 //============================================================================= 
@@ -61,8 +59,6 @@ published interface XSystemDependentWindowPeer: com::sun::star::uno::XInterface
         JAVA: Returns a global reference to a java.awt.Component 
         object provided from the JNI-API.<BR> 
                  
-        OS2: Returns an HWND if possible, otherwise 0.<BR> 
-
         MAC: Returns a ptr to the NSView implementing the window.<BR> 
                  
         XWINDOW: Returns a structure SystemDependentXWindow
diff --git a/offapi/com/sun/star/awt/XTabController.idl b/offapi/com/sun/star/awt/XTabController.idl
index 5f9d1a136..a8f3547df 100644
--- a/offapi/com/sun/star/awt/XTabController.idl
+++ b/offapi/com/sun/star/awt/XTabController.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_awt_XTabController_idl__ 
 #define __com_sun_star_awt_XTabController_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__ 
 #include <com/sun/star/awt/XTabControllerModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XControlContainer_idl__ 
 #include <com/sun/star/awt/XControlContainer.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XControl_idl__ 
 #include <com/sun/star/awt/XControl.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XTabControllerModel.idl b/offapi/com/sun/star/awt/XTabControllerModel.idl
index f4a9af7f0..d3a8030bd 100644
--- a/offapi/com/sun/star/awt/XTabControllerModel.idl
+++ b/offapi/com/sun/star/awt/XTabControllerModel.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XTabControllerModel_idl__ 
 #define __com_sun_star_awt_XTabControllerModel_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XControlModel_idl__ 
 #include <com/sun/star/awt/XControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XTabListener.idl b/offapi/com/sun/star/awt/XTabListener.idl
index 67522ed57..682cfe9d1 100644
--- a/offapi/com/sun/star/awt/XTabListener.idl
+++ b/offapi/com/sun/star/awt/XTabListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_XTabListener_idl__
 #define __com_sun_star_awt_XTabListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
@@ -48,7 +40,7 @@
 /** such listener will be informed if tab's was inserted/removed from
     an XSimpleTabController instance or if the properties of a tab was changed.
  */
-interface XTabListener : com::sun::star::lang::XEventListener
+published interface XTabListener : com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
     /** a new tab was inserted.
diff --git a/offapi/com/sun/star/awt/XTextArea.idl b/offapi/com/sun/star/awt/XTextArea.idl
index bbec7a7a8..d3ed37a64 100644
--- a/offapi/com/sun/star/awt/XTextArea.idl
+++ b/offapi/com/sun/star/awt/XTextArea.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XTextArea_idl__ 
 #define __com_sun_star_awt_XTextArea_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XTextComponent.idl b/offapi/com/sun/star/awt/XTextComponent.idl
index b2d4b27b7..609ed21fa 100644
--- a/offapi/com/sun/star/awt/XTextComponent.idl
+++ b/offapi/com/sun/star/awt/XTextComponent.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XTextComponent_idl__ 
 #define __com_sun_star_awt_XTextComponent_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XTextListener_idl__ 
 #include <com/sun/star/awt/XTextListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Selection_idl__ 
 #include <com/sun/star/awt/Selection.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XTextEditField.idl b/offapi/com/sun/star/awt/XTextEditField.idl
index 3357acf88..4c4914a38 100644
--- a/offapi/com/sun/star/awt/XTextEditField.idl
+++ b/offapi/com/sun/star/awt/XTextEditField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XTextEditField_idl__ 
 #define __com_sun_star_awt_XTextEditField_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XTextLayoutConstrains.idl b/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
index 6eccbacab..b3e53362e 100644
--- a/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
+++ b/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__ 
 #define __com_sun_star_awt_XTextLayoutConstrains_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XTextListener.idl b/offapi/com/sun/star/awt/XTextListener.idl
index e04453c51..d9467a03b 100644
--- a/offapi/com/sun/star/awt/XTextListener.idl
+++ b/offapi/com/sun/star/awt/XTextListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XTextListener_idl__ 
 #define __com_sun_star_awt_XTextListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_TextEvent_idl__ 
 #include <com/sun/star/awt/TextEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XThrobber.idl b/offapi/com/sun/star/awt/XThrobber.idl
index 424861edb..333eb0ad6 100644
--- a/offapi/com/sun/star/awt/XThrobber.idl
+++ b/offapi/com/sun/star/awt/XThrobber.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XThrobber_idl__
 #define __com_sun_star_awt_XThrobber_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XTimeField.idl b/offapi/com/sun/star/awt/XTimeField.idl
index c102a5591..dc9507b7a 100644
--- a/offapi/com/sun/star/awt/XTimeField.idl
+++ b/offapi/com/sun/star/awt/XTimeField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XTimeField_idl__ 
 #define __com_sun_star_awt_XTimeField_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XToggleButton.idl b/offapi/com/sun/star/awt/XToggleButton.idl
index 5b551687a..05955a5c5 100644
--- a/offapi/com/sun/star/awt/XToggleButton.idl
+++ b/offapi/com/sun/star/awt/XToggleButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XToggleButton_idl__ 
 #define __com_sun_star_awt_XToggleButton_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__ 
 #include <com/sun/star/awt/XItemEventBroadcaster.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XToolkit.idl b/offapi/com/sun/star/awt/XToolkit.idl
index cb3a6d2dc..0d8ca65da 100644
--- a/offapi/com/sun/star/awt/XToolkit.idl
+++ b/offapi/com/sun/star/awt/XToolkit.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_awt_XToolkit_idl__ 
 #define __com_sun_star_awt_XToolkit_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
 #include <com/sun/star/awt/XWindowPeer.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_WindowDescriptor_idl__ 
 #include <com/sun/star/awt/WindowDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XDevice_idl__ 
 #include <com/sun/star/awt/XDevice.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XRegion_idl__ 
 #include <com/sun/star/awt/XRegion.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XTopWindow.idl b/offapi/com/sun/star/awt/XTopWindow.idl
index 31bfe04d1..c73289626 100644
--- a/offapi/com/sun/star/awt/XTopWindow.idl
+++ b/offapi/com/sun/star/awt/XTopWindow.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XTopWindow_idl__ 
 #define __com_sun_star_awt_XTopWindow_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XTopWindowListener_idl__ 
 #include <com/sun/star/awt/XTopWindowListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XMenuBar_idl__ 
 #include <com/sun/star/awt/XMenuBar.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XTopWindowListener.idl b/offapi/com/sun/star/awt/XTopWindowListener.idl
index 89ae2115a..1ed756d79 100644
--- a/offapi/com/sun/star/awt/XTopWindowListener.idl
+++ b/offapi/com/sun/star/awt/XTopWindowListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XTopWindowListener_idl__ 
 #define __com_sun_star_awt_XTopWindowListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XUnitConversion.idl b/offapi/com/sun/star/awt/XUnitConversion.idl
index c6b0a8350..c0efbdacd 100644
--- a/offapi/com/sun/star/awt/XUnitConversion.idl
+++ b/offapi/com/sun/star/awt/XUnitConversion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XUnitConversion_idl__ 
-#define __com_sun_star_awt_XUnitConversion_idl__ 
- 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_Point_idl__
-#include <com/sun/star/awt/Point.idl>
-#endif
+#ifndef __com_sun_star_awt_XUnitConversion_idl__
+#define __com_sun_star_awt_XUnitConversion_idl__
 
-#ifndef __com_sun_star_awt_Size_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/awt/Point.idl>
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
+//=============================================================================
+
+ module com {  module sun {  module star {  module awt {
+
+//=============================================================================
 
 /** allows converting between different measurement units
 
     @since OOo 3.0
  */
-interface XUnitConversion: com::sun::star::uno::XInterface
-{ 
+published interface XUnitConversion: com::sun::star::uno::XInterface
+{
     /** converts the given <type>Point</type>, which is specified in pixels, into the given logical unit
 
         @param Point
@@ -81,7 +70,7 @@ interface XUnitConversion: com::sun::star::uno::XInterface
     com::sun::star::awt::Point convertPointToPixel( [in] com::sun::star::awt::Point aPoint, [in] short SourceUnit )
             raises ( com::sun::star::lang::IllegalArgumentException );
 
- 
+
     /** converts the given <type>Size</type>, which is specified in pixels, into the given logical unit
 
         @param aSize
@@ -108,11 +97,11 @@ interface XUnitConversion: com::sun::star::uno::XInterface
     com::sun::star::awt::Size convertSizeToPixel( [in] com::sun::star::awt::Size aSize, [in] short SourceUnit )
             raises ( com::sun::star::lang::IllegalArgumentException );
 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/XUnoControlContainer.idl b/offapi/com/sun/star/awt/XUnoControlContainer.idl
index 7b572e25a..a0dd28d40 100644
--- a/offapi/com/sun/star/awt/XUnoControlContainer.idl
+++ b/offapi/com/sun/star/awt/XUnoControlContainer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XUnoControlContainer_idl__ 
 #define __com_sun_star_awt_XUnoControlContainer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XTabController_idl__ 
 #include <com/sun/star/awt/XTabController.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XUserInputInterception.idl b/offapi/com/sun/star/awt/XUserInputInterception.idl
index cfecff9d9..704a38356 100644
--- a/offapi/com/sun/star/awt/XUserInputInterception.idl
+++ b/offapi/com/sun/star/awt/XUserInputInterception.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_awt_XUserInputInterception_idl__
 #define __com_sun_star_awt_XUserInputInterception_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XKeyHandler_idl__
 #include <com/sun/star/awt/XKeyHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseClickHandler_idl__
 #include <com/sun/star/awt/XMouseClickHandler.idl>
-#endif
 
 module com {  module sun {  module star {  module awt {
 
diff --git a/offapi/com/sun/star/awt/XVclContainer.idl b/offapi/com/sun/star/awt/XVclContainer.idl
index 5f544bf7c..822c09bf1 100644
--- a/offapi/com/sun/star/awt/XVclContainer.idl
+++ b/offapi/com/sun/star/awt/XVclContainer.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XVclContainer_idl__ 
 #define __com_sun_star_awt_XVclContainer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XVclContainerListener_idl__ 
 #include <com/sun/star/awt/XVclContainerListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XWindow_idl__ 
 #include <com/sun/star/awt/XWindow.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XVclContainerListener.idl b/offapi/com/sun/star/awt/XVclContainerListener.idl
index 9b41dd602..137717c34 100644
--- a/offapi/com/sun/star/awt/XVclContainerListener.idl
+++ b/offapi/com/sun/star/awt/XVclContainerListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XVclContainerListener_idl__ 
 #define __com_sun_star_awt_XVclContainerListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_VclContainerEvent_idl__ 
 #include <com/sun/star/awt/VclContainerEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XVclContainerPeer.idl b/offapi/com/sun/star/awt/XVclContainerPeer.idl
index b3ec1e68e..185848a05 100644
--- a/offapi/com/sun/star/awt/XVclContainerPeer.idl
+++ b/offapi/com/sun/star/awt/XVclContainerPeer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XVclContainerPeer_idl__ 
 #define __com_sun_star_awt_XVclContainerPeer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XWindow_idl__ 
 #include <com/sun/star/awt/XWindow.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XVclWindowPeer.idl b/offapi/com/sun/star/awt/XVclWindowPeer.idl
index d0d14c5e8..622498a2d 100644
--- a/offapi/com/sun/star/awt/XVclWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XVclWindowPeer.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_XVclWindowPeer_idl__ 
 #define __com_sun_star_awt_XVclWindowPeer_idl__ 
  
-#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
 #include <com/sun/star/awt/XWindowPeer.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XView.idl b/offapi/com/sun/star/awt/XView.idl
index 3cbb9c5b6..9bded4c85 100644
--- a/offapi/com/sun/star/awt/XView.idl
+++ b/offapi/com/sun/star/awt/XView.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XView_idl__ 
 #define __com_sun_star_awt_XView_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XGraphics_idl__ 
 #include <com/sun/star/awt/XGraphics.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XWindow.idl b/offapi/com/sun/star/awt/XWindow.idl
index 801cb6a86..f92f8cbb4 100644
--- a/offapi/com/sun/star/awt/XWindow.idl
+++ b/offapi/com/sun/star/awt/XWindow.idl
@@ -27,37 +27,21 @@
 #ifndef __com_sun_star_awt_XWindow_idl__ 
 #define __com_sun_star_awt_XWindow_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XWindowListener_idl__ 
 #include <com/sun/star/awt/XWindowListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XFocusListener_idl__ 
 #include <com/sun/star/awt/XFocusListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XKeyListener_idl__ 
 #include <com/sun/star/awt/XKeyListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XMouseListener_idl__ 
 #include <com/sun/star/awt/XMouseListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XMouseMotionListener_idl__ 
 #include <com/sun/star/awt/XMouseMotionListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XPaintListener_idl__ 
 #include <com/sun/star/awt/XPaintListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XWindow2.idl b/offapi/com/sun/star/awt/XWindow2.idl
index e755c02dd..3267b71ac 100644
--- a/offapi/com/sun/star/awt/XWindow2.idl
+++ b/offapi/com/sun/star/awt/XWindow2.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XWindow2_idl__ 
 #define __com_sun_star_awt_XWindow2_idl__ 
  
-#ifndef __com_sun_star_awt_XWindow_idl__ 
 #include <com/sun/star/awt/XWindow.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl> 
-#endif 
  
  
  
diff --git a/offapi/com/sun/star/awt/XWindowListener.idl b/offapi/com/sun/star/awt/XWindowListener.idl
index 3119cb9c2..7c2175067 100644
--- a/offapi/com/sun/star/awt/XWindowListener.idl
+++ b/offapi/com/sun/star/awt/XWindowListener.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XWindowListener_idl__ 
 #define __com_sun_star_awt_XWindowListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_WindowEvent_idl__ 
 #include <com/sun/star/awt/WindowEvent.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/XWindowListener2.idl b/offapi/com/sun/star/awt/XWindowListener2.idl
index 65336239a..87296ffba 100644
--- a/offapi/com/sun/star/awt/XWindowListener2.idl
+++ b/offapi/com/sun/star/awt/XWindowListener2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XWindowListener2_idl__
 #define __com_sun_star_awt_XWindowListener2_idl__
 
-#ifndef __com_sun_star_awt_XWindowListener_idl__
 #include <com/sun/star/awt/XWindowListener.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@ module com {  module sun {  module star {  module awt {
 
 /** allows receive window-related events, additional to the ones received by an <type>XWindowListener</type>
  */
-interface XWindowListener2: XWindowListener
+published interface XWindowListener2: XWindowListener
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XWindowPeer.idl b/offapi/com/sun/star/awt/XWindowPeer.idl
index 58a4ac8cd..ee69fb0a4 100644
--- a/offapi/com/sun/star/awt/XWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XWindowPeer.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_XWindowPeer_idl__ 
 #define __com_sun_star_awt_XWindowPeer_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
index b07a20121..fb4b47cac 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_DefaultGridColumnModel_idl__
 #define __com_sun_star_awt_DefaultGridColumnModel_idl__
  
-#ifndef __com_sun_star_awt_grid_XGridColumnModel_idl__ 
 #include <com/sun/star/awt/grid/XGridColumnModel.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl
index 79cfce91b..be4f9f0d1 100644
--- a/offapi/com/sun/star/awt/grid/GridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_GridColumn_idl__
 #define __com_sun_star_awt_GridColumn_idl__
  
-#ifndef __com_sun_star_awt_grid_XGridColumn_idl__ 
 #include <com/sun/star/awt/grid/XGridColumn.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
index fe6c93f7a..10a5b03a0 100644
--- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__ 
-#define __com_sun_star_awt_grid_GridColumnEvent_idl__ 
- 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
-#include <com/sun/star/lang/EventObject.idl> 
-#endif 
-
-//============================================================================= 
- 
-module com {  module sun {  module star {  module awt { module grid { 
- 
-//============================================================================= 
+#ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__
+#define __com_sun_star_awt_grid_GridColumnEvent_idl__
+
+#include <com/sun/star/lang/EventObject.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
 /** An event used by a <type>XGridColumn</type> to notify changes in the column.
 
     @since OOo 3.3
- */ 
-struct GridColumnEvent: com::sun::star::lang::EventObject
-{ 
+ */
+published struct GridColumnEvent: com::sun::star::lang::EventObject
+{
     /** Contains the name of the attributes whose value changed. **/
     string AttributeName;
 
     /** Contains the old value **/
-    any OldValue; 
+    any OldValue;
 
     /** Contains the new value **/
     any NewValue;
 
     /** Contains the index of the changed column**/
     long ColumnIndex;
-    //------------------------------------------------------------------------- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; };  
- 
-#endif 
+    //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
index 62c22afbe..da2a719d0 100644
--- a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
+++ b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_grid_GridInvalidDataException_idl__ 
 #define __com_sun_star_awt_grid_GridInvalidDataException_idl__ 
  
-#ifndef __com_sun_star_uno_RuntimeException_idl__ 
 #include <com/sun/star/uno/RuntimeException.idl> 
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
index d48cb1f42..52c440759 100644
--- a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
+++ b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_grid_GridInvalidModelException_idl__ 
 #define __com_sun_star_awt_grid_GridInvalidModelException_idl__ 
  
-#ifndef __com_sun_star_uno_RuntimeException_idl__ 
 #include <com/sun/star/uno/RuntimeException.idl> 
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
index 6802e3c86..af5ba4c1c 100644
--- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_GridSelectionEvent_idl__ 
 #define __com_sun_star_awt_GridSelectionEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__ 
 #include <com/sun/star/awt/grid/SelectionEventType.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
index dbb13a958..ad79ceb1f 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlGrid_idl__
 #define __com_sun_star_awt_UnoControlGrid_idl__
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_grid_XGridControl_idl__ 
 #include <com/sun/star/awt/grid/XGridControl.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index b74bc88ef..3a359c451 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridColumn_idl__ 
-#define __com_sun_star_awt_grid_XGridColumn_idl__ 
- 
+#ifndef __com_sun_star_awt_grid_XGridColumn_idl__
+#define __com_sun_star_awt_grid_XGridColumn_idl__
+
 #include <com/sun/star/lang/XComponent.idl>
 #include <com/sun/star/style/HorizontalAlignment.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#include <com/sun/star/awt/grid/XGridColumnListener.idl> 
-#include <com/sun/star/util/XCloneable.idl> 
- 
-//============================================================================= 
- 
+#include <com/sun/star/awt/grid/XGridColumnListener.idl>
+#include <com/sun/star/util/XCloneable.idl>
+
+//=============================================================================
+
 module com {  module sun {  module star {  module awt {  module grid {
- 
-//============================================================================= 
+
+//=============================================================================
 
 /** The <type>XGridColumn</types> defines the properties and behavior of a column in a grid control
     @since OOo 3.3
- */     
-interface XGridColumn
-{ 
+ */
+published interface XGridColumn
+{
     /** implements life time control for the component
     */
     interface ::com::sun::star::lang::XComponent;
@@ -99,7 +99,7 @@ interface XGridColumn
     /** Specifies the horizontal alignment of the content in the control.
      */
     [attribute] ::com::sun::star::style::HorizontalAlignment HorizontalAlign;
-    
+
     /** A title is displayed in the column header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/
     [attribute] string Title;
 
@@ -110,7 +110,7 @@ interface XGridColumn
     [attribute] string HelpText;
 
     /** denotes the index of the column within the grid column model it belongs to
-    
+
         <p>If the column is not yet part of a column model, <code>Index</code> is -1.</p>
     */
     [attribute, readonly] long Index;
@@ -132,20 +132,20 @@ interface XGridColumn
     /** Adds a listener for the <type>GridColumnEvent</type> posted after the grid changes.
         @param Listener
             the listener to add.
-    */     
-    void addGridColumnListener( [in] XGridColumnListener  listener); 
- 
-    //------------------------------------------------------------------------- 
+    */
+    void addGridColumnListener( [in] XGridColumnListener  listener);
+
+    //-------------------------------------------------------------------------
 
     /** Removes a listener previously added with <method>addColumnListener()</method>.
         @param Listener
             the listener to remove.
-    */   
-    void removeGridColumnListener( [in] XGridColumnListener listener); 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; }; 
- 
-#endif 
+    */
+    void removeGridColumnListener( [in] XGridColumnListener listener);
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
index c1f96b14a..be1b0b171 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridColumnListener_idl__ 
-#define __com_sun_star_awt_grid_XGridColumnListener_idl__ 
- 
-#include <com/sun/star/awt/grid/GridColumnEvent.idl> 
-#include <com/sun/star/lang/XEventListener.idl> 
-
-//============================================================================= 
- 
-module com {  module sun {  module star {  module awt { module grid {  
- 
-//============================================================================= 
+#ifndef __com_sun_star_awt_grid_XGridColumnListener_idl__
+#define __com_sun_star_awt_grid_XGridColumnListener_idl__
+
+#include <com/sun/star/awt/grid/GridColumnEvent.idl>
+#include <com/sun/star/lang/XEventListener.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module grid {
+
+//=============================================================================
 
 /** An instance of this interface is used by the <type>XGridColumnModel</type> to
     get notifications about column model changes.
-    
+
     @since OOo 3.3
- */     
-interface XGridColumnListener : ::com::sun::star::lang::XEventListener
-{ 
+ */
+published interface XGridColumnListener : ::com::sun::star::lang::XEventListener
+{
     /** Invoked after a column was modified.
     */
-    void columnChanged( [in] GridColumnEvent event ); 
-}; 
-//============================================================================= 
- 
-}; }; }; }; };  
- 
-#endif 
+    void columnChanged( [in] GridColumnEvent event );
+};
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
index 97d8131d6..b8154e68c 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -30,14 +30,13 @@
 #include <com/sun/star/uno/XInterface.idl> 
 #include <com/sun/star/lang/XComponent.idl> 
 #include <com/sun/star/util/XCloneable.idl> 
-
 #include <com/sun/star/awt/grid/XGridColumn.idl> 
 #include <com/sun/star/container/XContainer.idl>
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 
 //============================================================================= 
- 
+
 module com {  module sun {  module star {  module awt { module grid { 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
index d8bd7065f..74b29f585 100644
--- a/offapi/com/sun/star/awt/grid/XGridDataListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_grid_XGridDataListener_idl__ 
 #define __com_sun_star_awt_grid_XGridDataListener_idl__ 
  
-#ifndef __com_sun_star_awt_grid_GridDataEvent_idl__ 
 #include <com/sun/star/awt/grid/GridDataEvent.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
index 43c6197ec..ae2bc7c67 100644
--- a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_grid_XGridSelectionListener_idl__ 
 #define __com_sun_star_awt_grid_XGridSelectionListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif
  
-#ifndef __com_sun_star_awt_grid_GridSelectionEvent_idl__ 
 #include <com/sun/star/awt/grid/GridSelectionEvent.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl b/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl
index 5e10820ff..d387b9f3c 100644
--- a/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl
@@ -91,9 +91,9 @@ interface XMutableGridDataModel : XGridDataModel
     /** updates the content of a given row.
 
         <p>The change in the data model will be notified to registered listeners via
-        <member">XGridDataListener::dataChanged</member>. The <member>GridDataEvent::FirstColumn</member> and
+        <member>XGridDataListener::dataChanged</member>. The <member>GridDataEvent::FirstColumn</member> and
         <member>GridDataEvent::LastColumn</member> will denote the smallest respectively largest column
-        index from <argColumnIndexes</arg>.</p>
+        index from <arg>ColumnIndexes</arg>.</p>
 
         @param ColumnIndexes
             contains the column indexes of the cells, which should be updated
diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk
deleted file mode 100644
index 8499dca27..000000000
--- a/offapi/com/sun/star/awt/grid/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssawtgrid
-PACKAGE=com$/sun$/star$/awt$/grid
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    GridColumnEvent.idl\
-    GridDataEvent.idl\
-    SelectionEventType.idl\
-    GridSelectionEvent.idl\
-    XGridSelectionListener.idl\
-    XGridSelection.idl\
-    XGridColumn.idl\
-     XGridColumnListener.idl\
-    XGridDataListener.idl\
-    DefaultGridDataModel.idl\
-    XGridDataModel.idl\
-    XMutableGridDataModel.idl\
-    XGridColumnModel.idl\
-    XGridControl.idl\
-    UnoControlGrid.idl\
-    UnoControlGridModel.idl\
-    GridInvalidDataException.idl\
-    GridInvalidModelException.idl\
-    XSortableGridData.idl\
-    SortableGridDataModel.idl\
-    XSortableMutableGridDataModel.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/awt/makefile.mk b/offapi/com/sun/star/awt/makefile.mk
deleted file mode 100644
index c2397d81b..000000000
--- a/offapi/com/sun/star/awt/makefile.mk
+++ /dev/null
@@ -1,348 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssawt
-PACKAGE=com$/sun$/star$/awt
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleButton.idl\
-    AccessibleCheckBox.idl\
-    AccessibleComboBox.idl\
-    AccessibleDropDownComboBox.idl\
-    AccessibleDropDownListBox.idl\
-    AccessibleEdit.idl\
-    AccessibleFixedText.idl\
-    AccessibleIconChoiceControl.idl\
-    AccessibleIconChoiceControlEntry.idl\
-    AccessibleList.idl\
-    AccessibleListBox.idl\
-    AccessibleListBoxList.idl\
-    AccessibleListItem.idl\
-    AccessibleMenu.idl\
-    AccessibleMenuBar.idl\
-    AccessibleMenuItem.idl\
-    AccessibleMenuSeparator.idl\
-    AccessiblePopupMenu.idl\
-    AccessibleRadioButton.idl\
-    AccessibleScrollBar.idl\
-    AccessibleStatusBar.idl\
-    AccessibleStatusBarItem.idl\
-    AccessibleTabBar.idl\
-    AccessibleTabBarPage.idl\
-    AccessibleTabBarPageList.idl\
-    AccessibleTabControl.idl\
-    AccessibleTabPage.idl\
-    AccessibleTextField.idl\
-    AccessibleToolBox.idl\
-    AccessibleToolBoxItem.idl\
-    AccessibleTreeListBox.idl\
-    AccessibleTreeListBoxEntry.idl\
-    AccessibleWindow.idl\
-    ActionEvent.idl\
-    AdjustmentEvent.idl\
-    AdjustmentType.idl\
-    AsyncCallback.idl\
-    CharSet.idl\
-    Command.idl\
-    DeviceCapability.idl\
-    DeviceInfo.idl\
-    DialogProvider.idl\
-    DialogProvider2.idl\
-    ContainerWindowProvider.idl\
-    DockingData.idl\
-    DockingEvent.idl\
-    EndDockingEvent.idl\
-    EndPopupModeEvent.idl\
-    EnhancedMouseEvent.idl\
-    FieldUnit.idl\
-    FocusChangeReason.idl\
-    FocusEvent.idl\
-    FontDescriptor.idl\
-    FontEmphasisMark.idl\
-    FontFamily.idl\
-    FontPitch.idl\
-    FontRelief.idl\
-    FontSlant.idl\
-    FontStrikeout.idl\
-    FontType.idl\
-    FontUnderline.idl\
-    FontWeight.idl\
-    FontWidth.idl\
-    Gradient.idl\
-    GradientStyle.idl\
-    ImageAlign.idl\
-    ImagePosition.idl\
-    ImageScaleMode.idl\
-    ImageStatus.idl\
-    InputEvent.idl\
-    InvalidateStyle.idl\
-    ItemEvent.idl\
-    Key.idl\
-    KeyEvent.idl\
-    KeyFunction.idl\
-    KeyGroup.idl\
-    KeyModifier.idl\
-    KeyStroke.idl\
-    LineEndFormat.idl\
-    MenuEvent.idl\
-    MenuItemStyle.idl\
-    MessageBoxButtons.idl\
-    MessageBoxCommand.idl\
-    MouseButton.idl\
-    MouseEvent.idl\
-    MouseWheelBehavior.idl\
-    PaintEvent.idl\
-    Point.idl\
-    PopupMenuDirection.idl\
-    PosSize.idl\
-    PrinterException.idl\
-    PushButtonType.idl\
-    RasterOperation.idl\
-    Rectangle.idl\
-    RoadmapItem.idl\
-    ScrollBarOrientation.idl\
-    Selection.idl\
-    SimpleFontMetric.idl\
-    Size.idl\
-    SpinEvent.idl\
-    Style.idl\
-    SystemPointer.idl\
-    TabController.idl\
-    TabControllerModel.idl\
-    TextAlign.idl\
-    TextEvent.idl\
-    Toolkit.idl\
-    UnoControl.idl\
-    UnoControlButton.idl\
-    UnoControlButtonModel.idl\
-    UnoControlCheckBox.idl\
-    UnoControlCheckBoxModel.idl\
-    UnoControlComboBox.idl\
-    UnoControlComboBoxModel.idl\
-    UnoControlContainer.idl\
-    UnoControlContainerModel.idl\
-    UnoControlCurrencyField.idl\
-    UnoControlCurrencyFieldModel.idl\
-    UnoControlDateField.idl\
-    UnoControlDateFieldModel.idl\
-    UnoControlDialog.idl\
-    UnoControlDialogElement.idl\
-    UnoControlDialogModel.idl\
-    UnoControlDialogModelProvider.idl\
-    UnoControlEdit.idl\
-    UnoControlEditModel.idl\
-    UnoControlFileControl.idl\
-    UnoControlFileControlModel.idl\
-    UnoControlFixedHyperlink.idl\
-    UnoControlFixedHyperlinkModel.idl\
-    UnoControlFixedLine.idl\
-    UnoControlFixedLineModel.idl\
-    UnoControlFixedText.idl\
-    UnoControlFixedTextModel.idl\
-    UnoControlFormattedField.idl\
-    UnoControlFormattedFieldModel.idl\
-    UnoControlGroupBox.idl\
-    UnoControlGroupBoxModel.idl\
-    UnoControlImageControl.idl\
-    UnoControlImageControlModel.idl\
-    UnoControlListBox.idl\
-    UnoControlListBoxModel.idl\
-    UnoControlModel.idl\
-    UnoControlNumericField.idl\
-    UnoControlNumericFieldModel.idl\
-    UnoControlPatternField.idl\
-    UnoControlPatternFieldModel.idl\
-    UnoControlProgressBar.idl\
-    UnoControlProgressBarModel.idl\
-    UnoControlRadioButton.idl\
-    UnoControlRadioButtonModel.idl\
-    UnoControlRoadmap.idl\
-    UnoControlRoadmapModel.idl\
-    UnoControlScrollBar.idl\
-    UnoControlScrollBarModel.idl\
-    UnoControlSimpleAnimation.idl\
-    UnoControlSimpleAnimationModel.idl\
-    UnoControlSpinButton.idl\
-    UnoControlSpinButtonModel.idl\
-    UnoControlThrobber.idl\
-    UnoControlThrobberModel.idl\
-    UnoControlTimeField.idl\
-    UnoControlTimeFieldModel.idl\
-    VclContainerEvent.idl\
-    VclWindowPeerAttribute.idl\
-    VisualEffect.idl\
-    WindowAttribute.idl\
-    WindowClass.idl\
-    WindowDescriptor.idl\
-    WindowEvent.idl\
-    XActionListener.idl\
-    XActivateListener.idl\
-    XAdjustmentListener.idl\
-    XBitmap.idl\
-    XButton.idl\
-    XCallback.idl\
-    XCheckBox.idl\
-    XComboBox.idl\
-    XControl.idl\
-    XControlContainer.idl\
-    XControlModel.idl\
-    XCurrencyField.idl\
-    XDataTransferProviderAccess.idl\
-    XDateField.idl\
-    XDevice.idl\
-    XDialog.idl\
-    XDialogProvider.idl\
-    XDialogProvider2.idl\
-    XDialogEventHandler.idl\
-    ContainerWindowProvider.idl\
-    XContainerWindowProvider.idl\
-    XContainerWindowEventHandler.idl\
-    XDisplayBitmap.idl\
-    XDisplayConnection.idl\
-    XDockableWindow.idl\
-    XDockableWindowListener.idl\
-    XEnhancedMouseClickHandler.idl\
-    XEventHandler.idl\
-    XExtendedToolkit.idl\
-    XFileDialog.idl\
-    XFixedHyperlink.idl\
-    XFixedText.idl\
-    XFocusListener.idl\
-    XFont.idl\
-    XFont2.idl\
-    XGraphics.idl\
-    XImageButton.idl\
-    XImageConsumer.idl\
-    XImageProducer.idl\
-    XInfoPrinter.idl\
-    XItemEventBroadcaster.idl\
-    XItemListener.idl\
-    XKeyHandler.idl\
-    XKeyListener.idl\
-    XLayoutConstrains.idl\
-    XListBox.idl\
-    XMenu.idl\
-    XMenuBar.idl\
-    XMenuListener.idl\
-    XMessageBox.idl\
-    XMessageBoxFactory.idl\
-    XMetricField.idl\
-    XMouseClickHandler.idl\
-    XMouseListener.idl\
-    XMouseMotionListener.idl\
-    XMouseMotionHandler.idl\
-    XNumericField.idl\
-    XPaintListener.idl\
-    XPatternField.idl\
-    XPointer.idl\
-    XPopupMenu.idl\
-    XPrinter.idl\
-    XPrinterPropertySet.idl\
-    XPrinterServer.idl\
-    XProgressBar.idl\
-    XProgressMonitor.idl\
-    XRadioButton.idl\
-    XRegion.idl\
-    XRequestCallback.idl\
-    XReschedule.idl\
-    XScrollBar.idl\
-    XSimpleTabController.idl\
-    XSpinField.idl\
-    XSpinListener.idl\
-    XSpinValue.idl\
-    XStyleChangeListener.idl\
-    XStyleSettings.idl\
-    XStyleSettingsSupplier.idl\
-    XSystemChildFactory.idl\
-    XSystemDependentMenuPeer.idl\
-    XSystemDependentWindowPeer.idl\
-    SystemDependentXWindow.idl\
-    XSimpleAnimation.idl\
-    XSimpleTabController.idl\
-    XThrobber.idl\
-    XTabController.idl\
-    XTabControllerModel.idl\
-        XTabListener.idl\
-    XTextArea.idl\
-    XTextComponent.idl\
-    XTextEditField.idl\
-    XTextLayoutConstrains.idl\
-    XTextListener.idl\
-    XTimeField.idl\
-        XToggleButton.idl\
-    XToolkit.idl\
-    XTopWindow.idl\
-    XTopWindow2.idl\
-    XTopWindowListener.idl\
-    XUnitConversion.idl\
-    XUnoControlContainer.idl\
-    XUserInputInterception.idl\
-    XVclContainer.idl\
-    XVclContainerListener.idl\
-    XVclContainerPeer.idl\
-    XVclWindowPeer.idl\
-    XView.idl\
-    XWindow.idl\
-    XWindow2.idl\
-    XWindowListener.idl\
-    XWindowListener2.idl\
-    XWindowPeer.idl\
-    XMenuExtended.idl\
-    MaxChildrenException.idl\
-    XDialog2.idl\
-    XLayoutContainer.idl\
-    XLayoutFlow.idl\
-    XLayoutFlowContainer.idl\
-    XLayoutRoot.idl\
-    XLayoutUnit.idl \
-    MenuItemType.idl \
-    MenuLogo.idl \
-    XMenuExtended2.idl \
-    XMenuBarExtended.idl \
-    XPopupMenuExtended.idl \
-    XItemList.idl \
-    XItemListListener.idl \
-    ItemListEvent.idl \
-    AnimatedImagesControl.idl \
-    AnimatedImagesControlModel.idl \
-    XAnimatedImages.idl \
-    XAnimation.idl \
-    SpinningProgressControlModel.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
index be399c34d..c3a0db7d1 100644
--- a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
+++ b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tab_TabPageActivationEvent_idl__ 
-#define __com_sun_star_awt_tab_TabPageActivationEvent_idl__ 
- 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
-#include <com/sun/star/lang/EventObject.idl> 
-#endif 
- 
-//============================================================================= 
- 
-module com {  module sun {  module star {  module awt { module tab {  
- 
-//============================================================================= 
+#ifndef __com_sun_star_awt_tab_TabPageActivationEvent_idl__
+#define __com_sun_star_awt_tab_TabPageActivationEvent_idl__
+
+#include <com/sun/star/lang/EventObject.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module tab {
+
+//=============================================================================
 
 /** An event used by a <type>XTabPageContainer</type> to notify changes in tab page activation.
 
     @since OOo 3.4
- */  
-struct TabPageActivatedEvent: com::sun::star::lang::EventObject
-{ 
-    /** Contains the ID of the tab page 
+ */
+published struct TabPageActivatedEvent: com::sun::star::lang::EventObject
+{
+    /** Contains the ID of the tab page
     */
     short TabPageID;
 
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl
index 2ef18f97f..bb9a8456a 100644
--- a/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl
+++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tab_UnoControlTabPageContainerModel_idl__ 
+#ifndef __com_sun_star_awt_tab_UnoControlTabPageContainerModel_idl__
 #define __com_sun_star_awt_tab_UnoControlTabPageContainerModel_idl__
 
-#include <com/sun/star/awt/UnoControlModel.idl>  
-#include <com/sun/star/awt/tab/XTabPageContainerModel.idl>  
+#include <com/sun/star/awt/UnoControlModel.idl>
+#include <com/sun/star/awt/tab/XTabPageContainerModel.idl>
+
+//=============================================================================
 
-//============================================================================= 
- 
 module com {  module sun {  module star {  module awt {  module tab {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** specifies a model for a UnoControlTabPageContainer control.
 
     @since OOo 3.4
  */
-service UnoControlTabPageContainerModel
+published service UnoControlTabPageContainerModel
 {
-    service com::sun::star::awt::UnoControlModel; 
-    
+    service com::sun::star::awt::UnoControlModel;
+
     interface com::sun::star::awt::tab::XTabPageContainerModel;
 
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
  }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
index 500af0a3a..266f6a561 100644
--- a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
+++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tab_UnoControlTabPageModel_idl__ 
-#define __com_sun_star_awt_tab_UnoControlTabPageModel_idl__ 
+#ifndef __com_sun_star_awt_tab_UnoControlTabPageModel_idl__
+#define __com_sun_star_awt_tab_UnoControlTabPageModel_idl__
+
+#include <com/sun/star/awt/tab/XTabPageModel.idl>
+
+//=============================================================================
 
-#include <com/sun/star/awt/tab/XTabPageModel.idl> 
+module com {  module sun {  module star {  module awt { module tab {
+
+//=============================================================================
 
-//============================================================================= 
- 
-module com {  module sun {  module star {  module awt { module tab { 
- 
-//============================================================================= 
- 
 /** specifies the standard model of a XTabPageModel.
     @since OOo 3.4
  */
-service UnoControlTabPageModel : XTabPageModel
-{ 
+published service UnoControlTabPageModel : XTabPageModel
+{
     /** Creates a new XTabPageModel with a given ID.
     */
-    create([in] short tabPageID);  
+    create([in] short tabPageID);
 
-    /** Creates a new XTabPageModel with a given ID and a url which is used to load teh tab page model.
+    /** Creates a new XTabPageModel with a given ID and a url which is used to load the tab page model.
     */
     load([in] short tabPageID,[in] string url);
-}; 
+};
+
+//=============================================================================
 
-//============================================================================= 
- 
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tab/XTabPage.idl b/offapi/com/sun/star/awt/tab/XTabPage.idl
index 1400f1303..0c79d3407 100644
--- a/offapi/com/sun/star/awt/tab/XTabPage.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tab_XTabPage_idl__ 
-#define __com_sun_star_awt_tab_XTabPage_idl__ 
+#ifndef __com_sun_star_awt_tab_XTabPage_idl__
+#define __com_sun_star_awt_tab_XTabPage_idl__
 
 #include <com/sun/star/awt/tab/XTabPageModel.idl>
-//============================================================================= 
- 
-module com {  module sun {  module star {  module awt { module tab { 
- 
-//============================================================================= 
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module tab {
+
+//=============================================================================
 
 /** An interface to a control that displays a tab page.
 
     @see UnoControlTabPage
-    
+
     @since OOo 3.4
- */      
-interface XTabPage 
-{ 
-
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; }; 
- 
-#endif 
+ */
+published interface XTabPage
+{
+
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainer.idl b/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
index 1dcb42759..0349b04cc 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tab_XTabPageContainer_idl__ 
-#define __com_sun_star_awt_tab_XTabPageContainer_idl__ 
-  
-#include <com/sun/star/awt/tab/XTabPageContainerListener.idl> 
+#ifndef __com_sun_star_awt_tab_XTabPageContainer_idl__
+#define __com_sun_star_awt_tab_XTabPageContainer_idl__
+
+#include <com/sun/star/awt/tab/XTabPageContainerListener.idl>
 #include <com/sun/star/awt/tab/XTabPage.idl>
-//============================================================================= 
- 
-module com {  module sun {  module star {  module awt { module tab { 
- 
-//============================================================================= 
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module tab {
+
+//=============================================================================
 
 /** An interface to a control that displays tab pages.
 
     @see UnoControlTabPageContainer
-    
+
     @since OOo 3.4
- */      
-interface XTabPageContainer
-{ 
+ */
+published interface XTabPageContainer
+{
     /** Returns the number of tab pages.
         @returns
             the number of tab pages.
@@ -81,29 +81,29 @@ interface XTabPageContainer
 
     //-------------------------------------------------------------------------
 
-    /** Adds a listener for the <type>TabPageActivedEvent</type> posted after 
+    /** Adds a listener for the <type>TabPageActivedEvent</type> posted after
         the tab page was activated.
         @param listener
             the listener to add.
-    */    
-    [oneway] void addTabPageListener( [in] XTabPageContainerListener  listener); 
- 
-    //------------------------------------------------------------------------- 
+    */
+    [oneway] void addTabPageListener( [in] XTabPageContainerListener  listener);
+
+    //-------------------------------------------------------------------------
 
     /** Removes a listener previously added with <method>addTabPageListener()</method>.
         @param listener
             the listener to remove.
-    */   
+    */
     [oneway] void removeTabPageListener( [in] XTabPageContainerListener listener);
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
     /** Specifies the ID of the current active tab page.
     */
     [attribute] short ActiveTabPageID;
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; }; 
- 
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
 #endif
diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl b/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl
index 0eb5778cf..6bfe04e5b 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tab_XTabPageContainerListener_idl__ 
-#define __com_sun_star_awt_tab_XTabPageContainerListener_idl__ 
-
-#include <com/sun/star/lang/XEventListener.idl> 
-#include <com/sun/star/awt/tab/TabPageActivatedEvent.idl>  
- 
-//============================================================================= 
- 
-module com {  module sun {  module star {  module awt { module tab {  
- 
-//============================================================================= 
+#ifndef __com_sun_star_awt_tab_XTabPageContainerListener_idl__
+#define __com_sun_star_awt_tab_XTabPageContainerListener_idl__
+
+#include <com/sun/star/lang/XEventListener.idl>
+#include <com/sun/star/awt/tab/TabPageActivatedEvent.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module tab {
+
+//=============================================================================
 
 /** An instance of this interface is used by the <type>XTabPageContainer</type> to
     get notifications about changes in activation of tab pages.
 
     @since OOo 3.4
- */      
-interface XTabPageContainerListener: com::sun::star::lang::XEventListener
-{ 
-    //------------------------------------------------------------------------- 
+ */
+published interface XTabPageContainerListener: com::sun::star::lang::XEventListener
+{
+    //-------------------------------------------------------------------------
     /** Invoked after a tab page was activated.
-     */    
-    [oneway] void tabPageActivated( [in] TabPageActivatedEvent tabPageActivatedEvent); 
- 
-}; 
- 
-//============================================================================= 
- 
+     */
+    [oneway] void tabPageActivated( [in] TabPageActivatedEvent tabPageActivatedEvent);
+
+};
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl b/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl
index 4f554ed5a..8b3bf2d9a 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tab_XTabPageContainerModel_idl__ 
+#ifndef __com_sun_star_awt_tab_XTabPageContainerModel_idl__
 #define __com_sun_star_awt_tab_XTabPageContainerModel_idl__
- 
-#include <com/sun/star/container/XIndexContainer.idl>  
-#include <com/sun/star/container/XContainer.idl> 
 
-//============================================================================= 
- 
+#include <com/sun/star/container/XIndexContainer.idl>
+#include <com/sun/star/container/XContainer.idl>
+
+//=============================================================================
+
 module com {  module sun {  module star {  module awt {  module tab {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** specifies an interface for a UnoControlTabPageContainerModel.
 
     @since OOo 3.4
  */
-interface XTabPageContainerModel
+published interface XTabPageContainerModel
 {
     interface com::sun::star::container::XIndexContainer;
     interface com::sun::star::container::XContainer;
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
  }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tab/XTabPageModel.idl b/offapi/com/sun/star/awt/tab/XTabPageModel.idl
index 87ce21cbe..b07c3ea4e 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageModel.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tab_XTabPageModel_idl__ 
-#define __com_sun_star_awt_tab_XTabPageModel_idl__ 
+#ifndef __com_sun_star_awt_tab_XTabPageModel_idl__
+#define __com_sun_star_awt_tab_XTabPageModel_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
 #include <com/sun/star/container/XContainer.idl>
 #include <com/sun/star/container/XNameContainer.idl>
 
-//============================================================================= 
- 
+//=============================================================================
+
 module com {  module sun {  module star {  module awt {  module tab {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** specifies an XTabPageModel interface.
 
     @since OOo 3.4
 */
 
-interface XTabPageModel
+published interface XTabPageModel
 {
     //interface com::sun::star::lang::XMultiServiceFactory;
 
@@ -58,14 +58,14 @@ interface XTabPageModel
 
     /** determines whether a tab page is enabled or disabled.
      */
-    [attribute] boolean Enabled; 
- 
-    //------------------------------------------------------------------------- 
-    
+    [attribute] boolean Enabled;
+
+    //-------------------------------------------------------------------------
+
     /** specifies the text that is displayed in the tab bar of the tab page.
      */
     [attribute] string Title;
-    
+
     //-------------------------------------------------------------------------
 
     /** specifies a URL that references a graphic that should be displayed in the tab bar.
@@ -77,11 +77,11 @@ interface XTabPageModel
     /** specifies a tooltip text that should be displayed in the tab bar.
     */
     [attribute] string Tooltip;
-}; 
+};
+
+
+//=============================================================================
 
- 
-//============================================================================= 
- 
  }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/ExpandVetoException.idl b/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
index 69e0a1004..70c2b5dd0 100644
--- a/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
+++ b/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_ExpandVetoException_idl__ 
-#define __com_sun_star_awt_tree_ExpandVetoException_idl__ 
- 
-#ifndef __com_sun_star_util_VetoException_idl__ 
-#include <com/sun/star/util/VetoException.idl> 
-#endif
+#ifndef __com_sun_star_awt_tree_ExpandVetoException_idl__
+#define __com_sun_star_awt_tree_ExpandVetoException_idl__
 
-#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
+#include <com/sun/star/util/VetoException.idl>
 #include <com/sun/star/awt/tree/TreeExpansionEvent.idl>
-#endif
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 module com {  module sun {  module star {  module awt { module tree {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** Exception used to stop an expand/collapse from happening.
     @see XTreeExpansionListener
     @see XTreeControl
  */
-exception ExpandVetoException : com::sun::star::util::VetoException
+published exception ExpandVetoException : com::sun::star::util::VetoException
 {
     /** The event that the exception was created for. */
     TreeExpansionEvent Event;
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl b/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
index e0f38adeb..ad8bff90a 100644
--- a/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_MutableTreeDataModel_idl__ 
-#define __com_sun_star_awt_tree_MutableTreeDataModel_idl__ 
+#ifndef __com_sun_star_awt_tree_MutableTreeDataModel_idl__
+#define __com_sun_star_awt_tree_MutableTreeDataModel_idl__
 
-#ifndef __com_sun_star_awt_tree_XMutableTreeDataModel_idl__
 #include <com/sun/star/awt/tree/XMutableTreeDataModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
 #include <com/sun/star/awt/tree/XMutableTreeNode.idl>
-#endif
 
-//============================================================================= 
- 
+//=============================================================================
+
 module com {  module sun {  module star {  module awt {  module tree {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** If you do not want to implement the <type>XTreeDataModel</type> yourself, use this service.
     This implementation uses <type>MutableTreeNode</type> for its nodes.
  */
-service MutableTreeDataModel : XMutableTreeDataModel
+published service MutableTreeDataModel : XMutableTreeDataModel
 {
 };
 
-//============================================================================= 
- 
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/MutableTreeNode.idl b/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
index 1f506cad1..ebd818893 100644
--- a/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_tree_MutableTreeNode_idl__ 
 #define __com_sun_star_awt_tree_MutableTreeNode_idl__ 
  
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
 #include <com/sun/star/awt/tree/XMutableTreeNode.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/tree/TreeControl.idl b/offapi/com/sun/star/awt/tree/TreeControl.idl
index a534b52f1..8ac2cd0d9 100644
--- a/offapi/com/sun/star/awt/tree/TreeControl.idl
+++ b/offapi/com/sun/star/awt/tree/TreeControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_tree_TreeControl_idl__ 
 #define __com_sun_star_awt_tree_TreeControl_idl__ 
  
-#ifndef __com_sun_star_awt_tree_XTreeControl_idl__
 #include <com/sun/star/awt/tree/XTreeControl.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/tree/TreeControlModel.idl b/offapi/com/sun/star/awt/tree/TreeControlModel.idl
index 40436e4d7..be04fdb8a 100644
--- a/offapi/com/sun/star/awt/tree/TreeControlModel.idl
+++ b/offapi/com/sun/star/awt/tree/TreeControlModel.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_tree_TreeControlModel_idl__ 
 #define __com_sun_star_awt_tree_TreeControlModel_idl__ 
  
-#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__ 
 #include <com/sun/star/awt/tree/XTreeDataModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_view_SelectionType_idl__ 
 #include <com/sun/star/view/SelectionType.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl b/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
index 2e372ef14..d26730191 100644
--- a/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
+++ b/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__ 
-#define __com_sun_star_awt_tree_TreeDataModelEvent_idl__ 
- 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
-#include <com/sun/star/lang/EventObject.idl> 
-#endif 
+#ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__
+#define __com_sun_star_awt_tree_TreeDataModelEvent_idl__
 
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
+#include <com/sun/star/lang/EventObject.idl>
 #include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
 
-//============================================================================= 
- 
-module com {  module sun {  module star {  module awt { module tree {  
- 
-//============================================================================= 
- 
+//=============================================================================
+
+module com {  module sun {  module star {  module awt { module tree {
+
+//=============================================================================
+
 /** An event used by a <type>XTreeDataModel</type> to notify changes in the data
     model to the <type>XTreeControl</type>.
     You usually need to fill this event only if you implement the <type>XTreeDataModel</type>
@@ -50,7 +45,7 @@ module com {  module sun {  module star {  module awt { module tree {
     @see XTreeControl
     @see XTreeDataModelListener
  */
-struct TreeDataModelEvent : ::com::sun::star::lang::EventObject
+published struct TreeDataModelEvent : ::com::sun::star::lang::EventObject
 {
     /** contains the changed, added or removed nodes.
         <p> All nodes must have <member>ParentNode</member> as parent. */
@@ -59,10 +54,10 @@ struct TreeDataModelEvent : ::com::sun::star::lang::EventObject
     /** holds the parent node for changed, added or removed nodes.
         <p> If this is null, <member>Nodes</member> must contain only the root node */
     XTreeNode ParentNode;
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl b/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
index 333c10353..c30a531ab 100644
--- a/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
+++ b/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__ 
-#define __com_sun_star_awt_tree_TreeExpansionEvent_idl__ 
- 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
-#include <com/sun/star/lang/EventObject.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
+#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
+#define __com_sun_star_awt_tree_TreeExpansionEvent_idl__
+
+#include <com/sun/star/lang/EventObject.idl>
 #include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
 
-//============================================================================= 
- 
+//=============================================================================
+
 module com {  module sun {  module star {  module awt { module tree {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** This event tells you what node is currently expanding or collapsing.
 
     @see XTreeExpansionListener
     @see XTreeControl
  */
-struct TreeExpansionEvent : ::com::sun::star::lang::EventObject
+published struct TreeExpansionEvent : ::com::sun::star::lang::EventObject
 {
     /* The node that has been expanded/collapsed.*/
     com::sun::star::awt::tree::XTreeNode Node;
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl b/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
index 4b8963e18..0651234b5 100644
--- a/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XMutableTreeDataModel_idl__ 
-#define __com_sun_star_awt_tree_XMutableTreeDataModel_idl__ 
+#ifndef __com_sun_star_awt_tree_XMutableTreeDataModel_idl__
+#define __com_sun_star_awt_tree_XMutableTreeDataModel_idl__
 
-#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__ 
 #include <com/sun/star/awt/tree/XTreeDataModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__ 
 #include <com/sun/star/awt/tree/XMutableTreeNode.idl>
-#endif
 
-//============================================================================= 
- 
+//=============================================================================
+
 module com {  module sun {  module star {  module awt {  module tree {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** This is the editable version of the <type>XTreeDataModel</type>.
 
     <p>Note that only <type>XTreeNode</type> created from the same instance with <member>createNode</member>
     are valid nodes for this instance.</p>
  */
-interface XMutableTreeDataModel : XTreeDataModel
+published interface XMutableTreeDataModel : XTreeDataModel
 {
     /** creates a new tree node with the given value and given settings.
-        
+
         @param DisplayValue
             should be convertible to a string and is used by the <type>XTreeControl</type>
             as a textual representation of the created node.
@@ -77,9 +72,9 @@ interface XMutableTreeDataModel : XTreeDataModel
     void setRoot( [in] XMutableTreeNode RootNode )
         raises( ::com::sun::star::lang::IllegalArgumentException );
 };
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl b/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
index b8c83ab6f..065f52b79 100644
--- a/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__ 
-#define __com_sun_star_awt_tree_XMutableTreeNode_idl__ 
- 
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
+#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
+#define __com_sun_star_awt_tree_XMutableTreeNode_idl__
+
 #include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
+#include <com/sun/star/lang/IllegalArgumentException.idl>
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
-#include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
- 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
-#endif 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
+
+//=============================================================================
 
-//============================================================================= 
- 
 module com {  module sun {  module star {  module awt { module tree {
 
-//============================================================================= 
+//=============================================================================
 
 /** Represents a mutable tree node as used by the <type>MutableTreeDataModel</type>
  */
-interface XMutableTreeNode : XTreeNode
+published interface XMutableTreeNode : XTreeNode
 {
     /** appends <var>ChildNode</var> to this instance.
 
@@ -69,8 +62,8 @@ interface XMutableTreeNode : XTreeNode
             if <var>Index</var> is less than 0 or greater then <member>XTreeNode::getChildCount()</member>.
     */
     void insertChildByIndex( [in] long Index, [in] XMutableTreeNode ChildNode )
-        raises( com::sun::star::lang::IllegalArgumentException, 
-                    com::sun::star::lang::IndexOutOfBoundsException ); 
+        raises( com::sun::star::lang::IllegalArgumentException,
+                    com::sun::star::lang::IndexOutOfBoundsException );
 
     /** removes the node from this instance at the specified index.
 
@@ -80,9 +73,9 @@ interface XMutableTreeNode : XTreeNode
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if <var>Index</var> is less than 0 or greater then <member>XTreeNode::getChildCount()</member>.
      */
-    void removeChildByIndex( [in] long Index ) 
-            raises( com::sun::star::lang::IndexOutOfBoundsException ); 
- 
+    void removeChildByIndex( [in] long Index )
+            raises( com::sun::star::lang::IndexOutOfBoundsException );
+
     /** Changes if the children of this node are created on demand.
 
         @see XTreeNode::hasChildrenOnDemand()
@@ -113,10 +106,10 @@ interface XMutableTreeNode : XTreeNode
         <p>If <var>URL</var> is empty, <member>XTreeControl::DefaultCollapsedGraphicURL</member> is used.
     */
     void setCollapsedGraphicURL( [in] string URL );
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/XTreeControl.idl b/offapi/com/sun/star/awt/tree/XTreeControl.idl
index 443698776..57ae438d6 100644
--- a/offapi/com/sun/star/awt/tree/XTreeControl.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeControl.idl
@@ -1,7 +1,7 @@
 /************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeControl_idl__ 
-#define __com_sun_star_awt_tree_XTreeControl_idl__ 
- 
-#ifndef __com_sun_star_awt_XControl_idl__ 
-#include <com/sun/star/awt/XControl.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_tree_XTreeExpansionListener_idl__
-#include <com/sun/star/awt/tree/XTreeExpansionListener.idl>
-#endif
+#ifndef __com_sun_star_awt_tree_XTreeControl_idl__
+#define __com_sun_star_awt_tree_XTreeControl_idl__
 
-#ifndef __com_sun_star_view_XMultiSelectionSupplier_idl__
+#include <com/sun/star/awt/XControl.idl>
+#include <com/sun/star/awt/tree/XTreeExpansionListener.idl>
 #include <com/sun/star/view/XMultiSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__ 
 #include <com/sun/star/awt/tree/XTreeEditListener.idl>
-#endif
 
-//============================================================================= 
- 
+//=============================================================================
+
 module com {  module sun {  module star {  module awt { module tree {
 
-//============================================================================= 
- 
+//=============================================================================
+
 /** An interface to a control that displays a set of hierarchical data as an outline.
 
     @see TreeControl
  */
-interface XTreeControl
-{ 
+published interface XTreeControl
+{
     /**	This interfaces provides access to the selection of tree nodes for this control.
-    
+
         <p>valid selection values for this interface are
         <type>XTreeNode</type> or sequence&lt;<type>XTreeNode</type>&gt;.</p>
 
@@ -88,7 +77,7 @@ interface XTreeControl
     /** Returns <TRUE/> if <var>Node</var> is currently collapsed.
 
         @param Node
-            the <type>XTreeNode</type> specifying the node to check 
+            the <type>XTreeNode</type> specifying the node to check
 
         @returns
             <TRUE/> if <var>Node</var> or at least one of its parent nodes are collapsed,
@@ -275,7 +264,7 @@ interface XTreeControl
     /** Adds a <type>XTreeEditListener</type>.
 
         @param xListener
-            a <type>XTreeEditListener</type> that will be notified 
+            a <type>XTreeEditListener</type> that will be notified
             before and after a tree node is edited.
     */
     void addTreeEditListener( [in] XTreeEditListener Listener );
@@ -286,10 +275,10 @@ interface XTreeControl
             the <type>XTreeEditListener</type> to remove
     */
     void removeTreeEditListener( [in] XTreeEditListener Listener );
-}; 
- 
-//============================================================================= 
+};
+
+//=============================================================================
 
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModel.idl b/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
index 53338d5ac..b79b9718f 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__ 
-#define __com_sun_star_awt_tree_XTreeDataModel_idl__ 
+#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__
+#define __com_sun_star_awt_tree_XTreeDataModel_idl__
 
-#ifndef __com_sun_star_awt_tree_XTreeDataModelListener_idl__
 #include <com/sun/star/awt/tree/XTreeDataModelListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
-#include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl>
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
 
-//============================================================================= 
- 
+//=============================================================================
+
 module com {  module sun {  module star {  module awt {  module tree {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** An instance of this interface is used by the <type>TreeControl</type> to
     retrieve the hierarchical outline data that is displayed in the actual control.
 
@@ -58,7 +47,7 @@ module com {  module sun {  module star {  module awt {  module tree {
 
     If you do not need your own model implementation, you can also use the <type>MutableTreeDataModel</type>.
 */
-interface XTreeDataModel : ::com::sun::star::lang::XComponent
+published interface XTreeDataModel : ::com::sun::star::lang::XComponent
 {
     /** Returns the root of the tree.
         <p>Returns null only if the tree has no nodes.
@@ -83,10 +72,10 @@ interface XTreeDataModel : ::com::sun::star::lang::XComponent
     */
     void removeTreeDataModelListener( [in] XTreeDataModelListener Listener );
 
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
index e1c1dd58c..3858e37ec 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeDataModelListener_idl__ 
-#define __com_sun_star_awt_tree_XTreeDataModelListener_idl__ 
- 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
-#include <com/sun/star/lang/XEventListener.idl> 
-#endif 
- 
-#ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__ 
-#include <com/sun/star/awt/tree/TreeDataModelEvent.idl> 
-#endif 
- 
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_awt_tree_XTreeDataModelListener_idl__
+#define __com_sun_star_awt_tree_XTreeDataModelListener_idl__
+
+#include <com/sun/star/lang/XEventListener.idl>
+
+#include <com/sun/star/awt/tree/TreeDataModelEvent.idl>
+
+
+//=============================================================================
+
 module com {  module sun {  module star {  module awt {  module tree {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** An instance of this interface is used by the <type>TreeControl</type> to
     get notifications about data model changes.
-    
+
     <p>Usually you must not implement this interface yourself as it is already handled
     by the <type>TreeControl</type>, but you must notify it correctly if
     you implement the <type>XTreeDataModel</type> yourself</p>.
  */
-interface XTreeDataModelListener: com::sun::star::lang::XEventListener
+published interface XTreeDataModelListener: com::sun::star::lang::XEventListener
 {
     /** Invoked after a node (or a set of siblings) has changed in some way.
         The node(s) have not changed locations in the tree or altered their
         children arrays, but other attributes have changed and may affect
         presentation.
-        
+
         Example: the name of a file has changed, but it is in the same location in the file system.
 
         To indicate the root has changed, <member>TreeDataModelEvent::Nodes</member> will contain
@@ -86,10 +82,10 @@ interface XTreeDataModelListener: com::sun::star::lang::XEventListener
         structure has changed. <member>TreeDataModelEvent::Nodes</member> is empty.
     */
     void treeStructureChanged( [in] TreeDataModelEvent Event );
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/XTreeEditListener.idl b/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
index 572a15d81..89bbd5f0d 100644
--- a/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__ 
-#define __com_sun_star_awt_tree_XTreeEditListener_idl__ 
+#ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__
+#define __com_sun_star_awt_tree_XTreeEditListener_idl__
 
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
-#include <com/sun/star/lang/XEventListener.idl> 
-#endif 
-
-#ifndef __com_sun_star_util_VetoException_idl__
+#include <com/sun/star/lang/XEventListener.idl>
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
-//============================================================================= 
- 
+//=============================================================================
+
 module com {  module sun {  module star {  module awt {  module tree {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** You can implement this interface and register with <method scope="XTreeControl">addTreeEditListener</method>
     to get notifications when editing of a node starts and ends.
 
-    <p>You have to set the <member>TreeControlModel::Editable</member> property to 
+    <p>You have to set the <member>TreeControlModel::Editable</member> property to
     <TRUE/> before a tree supports editing.</p>
  */
-interface XTreeEditListener : ::com::sun::star::lang::XEventListener
+published interface XTreeEditListener : ::com::sun::star::lang::XEventListener
 {
     /** This method is called from the <type>TreeControl</type> implementation when editing of
         <var>Node</var> is requested by calling <member>XTreeControl::startEditingAtNode()</member>.
@@ -59,7 +51,7 @@ interface XTreeEditListener : ::com::sun::star::lang::XEventListener
         @param Node
             the <type>XTreeNode</type> for that an edit request was fired by calling
             <method scope="XTreeControl">startEditingAtNode</method>
-        
+
         @throws VetoException
             if thrown the editing will not start.
     */
@@ -80,10 +72,10 @@ interface XTreeEditListener : ::com::sun::star::lang::XEventListener
             the text that was entered by the user.
     */
     void nodeEdited( [in] XTreeNode Node, [in] string NewText );
-}; 
+};
+
+//=============================================================================
 
-//============================================================================= 
- 
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
index 6e6501f02..95e578773 100644
--- a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeExpansionListener_idl__ 
-#define __com_sun_star_awt_tree_XTreeExpansionListener_idl__ 
- 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
-#include <com/sun/star/lang/XEventListener.idl> 
-#endif 
- 
-#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__ 
-#include <com/sun/star/awt/tree/TreeExpansionEvent.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_tree_ExpandVetoException_idl__
+#ifndef __com_sun_star_awt_tree_XTreeExpansionListener_idl__
+#define __com_sun_star_awt_tree_XTreeExpansionListener_idl__
+
+#include <com/sun/star/lang/XEventListener.idl>
+
+#include <com/sun/star/awt/tree/TreeExpansionEvent.idl>
 #include <com/sun/star/awt/tree/ExpandVetoException.idl>
-#endif
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 module com {  module sun {  module star {  module awt {  module tree {
- 
-//============================================================================= 
- 
+
+//=============================================================================
+
 /** An instance of this interface can get notifications from a <type>TreeControl</type>
     when nodes are expanded or collapsed.
 
     @see XTreeControl::addTreeExpansionListener
     @see XTreeControl::removeTreeExpansionListener
  */
-interface XTreeExpansionListener: com::sun::star::lang::XEventListener
+published interface XTreeExpansionListener: com::sun::star::lang::XEventListener
 {
     /** Invoked when a node with children on demand is about to be expanded.
 
@@ -83,10 +76,10 @@ interface XTreeExpansionListener: com::sun::star::lang::XEventListener
 
     /** Called whenever a node in the tree has been successfully collapsed. */
     void treeCollapsed( [in] TreeExpansionEvent Event );
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/XTreeNode.idl b/offapi/com/sun/star/awt/tree/XTreeNode.idl
index d47ccc607..2afa185b1 100644
--- a/offapi/com/sun/star/awt/tree/XTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__ 
-#define __com_sun_star_awt_tree_XTreeNode_idl__ 
- 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
+#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
+#define __com_sun_star_awt_tree_XTreeNode_idl__
 
-#ifndef _com_sun_star_lang_IndexOutOfBoundsException_idl_
+#include <com/sun/star/container/XEnumerationAccess.idl>
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
-//============================================================================= 
- 
+//=============================================================================
+
 module com {  module sun {  module star {  module awt { module tree {
 
-//============================================================================= 
- 
+//=============================================================================
+
 /** An instance implementing this interface represents the model data for an entry in a
     <type>XTreeDataModel</type>.
     <p>The <type>TreeControl</type> uses this interface to retrieve the model
     information needed to display a hierarchical outline</p>
     <p>Each XTreeNode in a <type>XTreeDataModel</type> must be unique.
  */
-interface XTreeNode
+published interface XTreeNode
 {
     /** Returns the child tree node at <var>Index</var>.
-    
+
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if <var>Index</var> is less than 0 or equal or greater then <member>getChildCount</member>.
     */
@@ -96,10 +91,10 @@ interface XTreeNode
         <p>If <var>URL</var> is empty, <member>XTreeControl::DefaultCollapsedGraphicURL</member> is used.
     */
     string getCollapsedGraphicURL();
-}; 
- 
-//============================================================================= 
- 
+};
+
+//=============================================================================
+
 }; }; }; }; };
- 
-#endif 
+
+#endif
diff --git a/offapi/com/sun/star/awt/tree/makefile.mk b/offapi/com/sun/star/awt/tree/makefile.mk
deleted file mode 100644
index 797644e76..000000000
--- a/offapi/com/sun/star/awt/tree/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssawttree
-PACKAGE=com$/sun$/star$/awt$/tree
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MutableTreeDataModel.idl\
-    ExpandVetoException.idl\
-    MutableTreeNode.idl\
-    TreeControl.idl\
-    TreeControlModel.idl\
-    TreeDataModelEvent.idl\
-    TreeExpansionEvent.idl\
-    XMutableTreeDataModel.idl\
-    XMutableTreeNode.idl\
-    XTreeControl.idl\
-    XTreeDataModel.idl\
-    XTreeDataModelListener.idl\
-    XTreeExpansionListener.idl\
-    XTreeNode.idl\
-    XTreeEditListener.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
index 85638a22f..7d427b6be 100644
--- a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_chart_AccessibleChartDocumentView_idl__
 #define __com_sun_star_chart_AccessibleChartDocumentView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
 
 module com {  module sun {  module star {  module chart {
 
diff --git a/offapi/com/sun/star/chart/AccessibleChartElement.idl b/offapi/com/sun/star/chart/AccessibleChartElement.idl
index 6f319aea1..e3d772edc 100644
--- a/offapi/com/sun/star/chart/AccessibleChartElement.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartElement.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_chart_AccessibleChartElement_idl__
 #define __com_sun_star_chart_AccessibleChartElement_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 
 module com {  module sun {  module star {  module chart {
diff --git a/offapi/com/sun/star/chart/AreaDiagram.idl b/offapi/com/sun/star/chart/AreaDiagram.idl
index b8c285048..a0c76ee56 100644
--- a/offapi/com/sun/star/chart/AreaDiagram.idl
+++ b/offapi/com/sun/star/chart/AreaDiagram.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_chart_AreaDiagram_idl__ 
 #define __com_sun_star_chart_AreaDiagram_idl__ 
  
-#ifndef __com_sun_star_chart_Diagram_idl__ 
 #include <com/sun/star/chart/Diagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
 #include <com/sun/star/chart/ChartStatistics.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisXSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisZSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__ 
 #include <com/sun/star/chart/Dim3DDiagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_StackableDiagram_idl__ 
 #include <com/sun/star/chart/StackableDiagram.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/BarDiagram.idl b/offapi/com/sun/star/chart/BarDiagram.idl
index e3eeee598..43d16a2e1 100644
--- a/offapi/com/sun/star/chart/BarDiagram.idl
+++ b/offapi/com/sun/star/chart/BarDiagram.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_chart_BarDiagram_idl__
 #define __com_sun_star_chart_BarDiagram_idl__
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
 #include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
 #include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
 #include <com/sun/star/chart/ChartAxisZSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
 #include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
 #include <com/sun/star/chart/StackableDiagram.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/BubbleDiagram.idl b/offapi/com/sun/star/chart/BubbleDiagram.idl
index 9d91c13df..175077982 100644
--- a/offapi/com/sun/star/chart/BubbleDiagram.idl
+++ b/offapi/com/sun/star/chart/BubbleDiagram.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_chart_BubbleDiagram_idl__ 
 #define __com_sun_star_chart_BubbleDiagram_idl__ 
  
-#ifndef __com_sun_star_chart_Diagram_idl__ 
 #include <com/sun/star/chart/Diagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisXSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl> 
-#endif 
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
 #include <com/sun/star/chart/ChartStatistics.idl> 
-#endif 
   
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/Chart3DBarProperties.idl b/offapi/com/sun/star/chart/Chart3DBarProperties.idl
index 3d90ed27f..b62112219 100644
--- a/offapi/com/sun/star/chart/Chart3DBarProperties.idl
+++ b/offapi/com/sun/star/chart/Chart3DBarProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_Chart3DBarProperties_idl__ 
 #define __com_sun_star_chart_Chart3DBarProperties_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/ChartArea.idl b/offapi/com/sun/star/chart/ChartArea.idl
index cab628733..44f4a40ec 100644
--- a/offapi/com/sun/star/chart/ChartArea.idl
+++ b/offapi/com/sun/star/chart/ChartArea.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_chart_ChartArea_idl__ 
 #define __com_sun_star_chart_ChartArea_idl__ 
  
-#ifndef __com_sun_star_drawing_FillProperties_idl__ 
 #include <com/sun/star/drawing/FillProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/ChartAxis.idl b/offapi/com/sun/star/chart/ChartAxis.idl
index 97110b5d7..f80c77170 100644
--- a/offapi/com/sun/star/chart/ChartAxis.idl
+++ b/offapi/com/sun/star/chart/ChartAxis.idl
@@ -27,49 +27,20 @@
 #ifndef __com_sun_star_chart_ChartAxis_idl__ 
 #define __com_sun_star_chart_ChartAxis_idl__ 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_style_CharacterProperties_idl__ 
 #include <com/sun/star/style/CharacterProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisArrangeOrderType_idl__ 
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.idl> 
-#endif 
-
-#ifndef __com_sun_star_chart_ChartAxisPosition_idl__ 
 #include <com/sun/star/chart/ChartAxisPosition.idl> 
-#endif 
-
-#ifndef __com_sun_star_chart_ChartAxisLabelPosition_idl__ 
 #include <com/sun/star/chart/ChartAxisLabelPosition.idl> 
-#endif 
-
-#ifndef __com_sun_star_chart_ChartAxisMarkPosition_idl__ 
 #include <com/sun/star/chart/ChartAxisMarkPosition.idl> 
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisType_idl__ 
 #include <com/sun/star/chart/ChartAxisType.idl> 
-#endif
-
-#ifndef __com_sun_star_chart_TimeIncrement_idl__ 
 #include <com/sun/star/chart/TimeIncrement.idl> 
-#endif
-
-#ifndef __com_sun_star_chart_XAxis_idl__ 
 #include <com/sun/star/chart/XAxis.idl> 
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/ChartAxisXSupplier.idl b/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
index 28d7f784b..ba3a6f092 100644
--- a/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
 #define __com_sun_star_chart_ChartAxisXSupplier_idl__ 
  
-#ifndef __com_sun_star_chart_XAxisXSupplier_idl__ 
 #include <com/sun/star/chart/XAxisXSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartAxisYSupplier.idl b/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
index 009b8259d..1986c0479 100644
--- a/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__ 
 #define __com_sun_star_chart_ChartAxisYSupplier_idl__ 
  
-#ifndef __com_sun_star_chart_XAxisYSupplier_idl__ 
 #include <com/sun/star/chart/XAxisYSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartAxisZSupplier.idl b/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
index a9c5bcc14..004774cc2 100644
--- a/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__ 
 #define __com_sun_star_chart_ChartAxisZSupplier_idl__ 
  
-#ifndef __com_sun_star_chart_XAxisZSupplier_idl__ 
 #include <com/sun/star/chart/XAxisZSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartData.idl b/offapi/com/sun/star/chart/ChartData.idl
index a0361d27b..006f03036 100644
--- a/offapi/com/sun/star/chart/ChartData.idl
+++ b/offapi/com/sun/star/chart/ChartData.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartData_idl__ 
 #define __com_sun_star_chart_ChartData_idl__ 
  
-#ifndef __com_sun_star_chart_XChartData_idl__ 
 #include <com/sun/star/chart/XChartData.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartDataArray.idl b/offapi/com/sun/star/chart/ChartDataArray.idl
index 8540a7929..29de42c2c 100644
--- a/offapi/com/sun/star/chart/ChartDataArray.idl
+++ b/offapi/com/sun/star/chart/ChartDataArray.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_ChartDataArray_idl__ 
 #define __com_sun_star_chart_ChartDataArray_idl__ 
  
-#ifndef __com_sun_star_chart_ChartData_idl__ 
 #include <com/sun/star/chart/ChartData.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_XChartDataArray_idl__ 
 #include <com/sun/star/chart/XChartDataArray.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_XChartData_idl__ 
 #include <com/sun/star/chart/XChartData.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartDataChangeEvent.idl b/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
index 03ced44b8..7c2c9a1ac 100644
--- a/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
+++ b/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_ChartDataChangeEvent_idl__ 
 #define __com_sun_star_chart_ChartDataChangeEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartDataChangeType_idl__ 
 #include <com/sun/star/chart/ChartDataChangeType.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartDataPoint.idl b/offapi/com/sun/star/chart/ChartDataPoint.idl
index 538f0f0c1..eac7a643f 100644
--- a/offapi/com/sun/star/chart/ChartDataPoint.idl
+++ b/offapi/com/sun/star/chart/ChartDataPoint.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartDataPoint_idl__
 #define __com_sun_star_chart_ChartDataPoint_idl__
 
-#ifndef __com_sun_star_chart_ChartDataValue_idl__
 #include <com/sun/star/chart/ChartDataValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/ChartDataPointProperties.idl b/offapi/com/sun/star/chart/ChartDataPointProperties.idl
index 9781baa33..e446c2e23 100644
--- a/offapi/com/sun/star/chart/ChartDataPointProperties.idl
+++ b/offapi/com/sun/star/chart/ChartDataPointProperties.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_chart_ChartDataPointProperties_idl__ 
 #define __com_sun_star_chart_ChartDataPointProperties_idl__ 
  
-#ifndef __com_sun_star_drawing_FillProperties_idl__ 
 #include <com/sun/star/drawing/FillProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_style_CharacterProperties_idl__ 
 #include <com/sun/star/style/CharacterProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_Chart3DBarProperties_idl__
 #include <com/sun/star/chart/Chart3DBarProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/ChartDataRow.idl b/offapi/com/sun/star/chart/ChartDataRow.idl
index 0e6b105a3..71673e634 100644
--- a/offapi/com/sun/star/chart/ChartDataRow.idl
+++ b/offapi/com/sun/star/chart/ChartDataRow.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartDataRow_idl__ 
 #define __com_sun_star_chart_ChartDataRow_idl__ 
  
-#ifndef __com_sun_star_chart_ChartDataValue_idl__ 
 #include <com/sun/star/chart/ChartDataValue.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/ChartDataRowProperties.idl b/offapi/com/sun/star/chart/ChartDataRowProperties.idl
index 77c310ce0..696e0982b 100644
--- a/offapi/com/sun/star/chart/ChartDataRowProperties.idl
+++ b/offapi/com/sun/star/chart/ChartDataRowProperties.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_chart_ChartDataRowProperties_idl__ 
 #define __com_sun_star_chart_ChartDataRowProperties_idl__ 
  
-#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__ 
 #include <com/sun/star/chart/ChartDataPointProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
 #include <com/sun/star/chart/ChartStatistics.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/ChartDocument.idl b/offapi/com/sun/star/chart/ChartDocument.idl
index a45ebeb30..c817cb171 100644
--- a/offapi/com/sun/star/chart/ChartDocument.idl
+++ b/offapi/com/sun/star/chart/ChartDocument.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_chart_ChartDocument_idl__
 #define __com_sun_star_chart_ChartDocument_idl__
 
-#ifndef __com_sun_star_chart_XChartDocument_idl__
 #include <com/sun/star/chart/XChartDocument.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
-
 #include <com/sun/star/drawing/XDrawPageSupplier.idl>
 
-
 //=============================================================================
 
  module com {  module sun {  module star {  module chart {
diff --git a/offapi/com/sun/star/chart/ChartGrid.idl b/offapi/com/sun/star/chart/ChartGrid.idl
index a999e613d..0cb2f3888 100644
--- a/offapi/com/sun/star/chart/ChartGrid.idl
+++ b/offapi/com/sun/star/chart/ChartGrid.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_ChartGrid_idl__ 
 #define __com_sun_star_chart_ChartGrid_idl__ 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/ChartLegend.idl b/offapi/com/sun/star/chart/ChartLegend.idl
index b9635f84b..b3935762a 100644
--- a/offapi/com/sun/star/chart/ChartLegend.idl
+++ b/offapi/com/sun/star/chart/ChartLegend.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_chart_ChartLegend_idl__ 
 #define __com_sun_star_chart_ChartLegend_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_style_CharacterProperties_idl__ 
 #include <com/sun/star/style/CharacterProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartLegendPosition_idl__ 
 #include <com/sun/star/chart/ChartLegendPosition.idl> 
-#endif 
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartLine.idl b/offapi/com/sun/star/chart/ChartLine.idl
index 04081a02e..81d096ccb 100644
--- a/offapi/com/sun/star/chart/ChartLine.idl
+++ b/offapi/com/sun/star/chart/ChartLine.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_ChartLine_idl__ 
 #define __com_sun_star_chart_ChartLine_idl__ 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl b/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
index c9d4111b2..10f883a5b 100644
--- a/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
+++ b/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_ChartPieSegmentProperties_idl__ 
 #define __com_sun_star_chart_ChartPieSegmentProperties_idl__ 
  
-#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__ 
 #include <com/sun/star/chart/ChartDataPointProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartStatistics.idl b/offapi/com/sun/star/chart/ChartStatistics.idl
index 149648854..bf9d60329 100644
--- a/offapi/com/sun/star/chart/ChartStatistics.idl
+++ b/offapi/com/sun/star/chart/ChartStatistics.idl
@@ -27,22 +27,10 @@
 #ifndef __com_sun_star_chart_ChartStatistics_idl__ 
 #define __com_sun_star_chart_ChartStatistics_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
- 
-#ifndef __com_sun_star_chart_ChartErrorCategory_idl__ 
 #include <com/sun/star/chart/ChartErrorCategory.idl> 
-#endif 
- 
-#ifndef __com_sun_star_chart_ChartErrorIndicatorType_idl__ 
 #include <com/sun/star/chart/ChartErrorIndicatorType.idl> 
-#endif 
- 
-#ifndef __com_sun_star_chart_ChartRegressionCurveType_idl__ 
 #include <com/sun/star/chart/ChartRegressionCurveType.idl> 
-#endif 
-
 #include <com/sun/star/chart/ErrorBarStyle.idl>
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl b/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
index 37cb0bd67..fec5182c6 100644
--- a/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartTableAddressSupplier_idl__
 #define __com_sun_star_chart_ChartTableAddressSupplier_idl__
 
-#ifndef __com_sun_star_chart_ChartSeriesAddress_idl__
 #include <com/sun/star/chart/ChartSeriesAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/ChartTitle.idl b/offapi/com/sun/star/chart/ChartTitle.idl
index aaba6bc70..0c43589d5 100644
--- a/offapi/com/sun/star/chart/ChartTitle.idl
+++ b/offapi/com/sun/star/chart/ChartTitle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_chart_ChartTitle_idl__ 
 #define __com_sun_star_chart_ChartTitle_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl b/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
index 7a0abf7dd..c2e70d737 100644
--- a/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_ChartTwoAxisXSupplier_idl__ 
 #define __com_sun_star_chart_ChartTwoAxisXSupplier_idl__ 
  
-#ifndef __com_sun_star_chart_XTwoAxisXSupplier_idl__ 
 #include <com/sun/star/chart/XTwoAxisXSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisXSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl b/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
index 60b4aa414..dd356e963 100644
--- a/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
 #define __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
  
-#ifndef __com_sun_star_chart_XTwoAxisYSupplier_idl__ 
 #include <com/sun/star/chart/XTwoAxisYSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisYSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/Diagram.idl b/offapi/com/sun/star/chart/Diagram.idl
index 639068d80..4d6102077 100644
--- a/offapi/com/sun/star/chart/Diagram.idl
+++ b/offapi/com/sun/star/chart/Diagram.idl
@@ -27,33 +27,16 @@
 #ifndef __com_sun_star_chart_Diagram_idl__ 
 #define __com_sun_star_chart_Diagram_idl__ 
  
-#ifndef __com_sun_star_chart_XDiagram_idl__ 
 #include <com/sun/star/chart/XDiagram.idl> 
-#endif
-
-#ifndef __com_sun_star_chart_XAxisSupplier_idl__ 
 #include <com/sun/star/chart/XAxisSupplier.idl> 
-#endif
-
-#ifndef __com_sun_star_chart_XDiagramPositioning_idl__ 
 #include <com/sun/star/chart/XDiagramPositioning.idl> 
-#endif
  
-#ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
 #include <com/sun/star/chart/XSecondAxisTitleSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartDataRowSource_idl__ 
 #include <com/sun/star/chart/ChartDataRowSource.idl> 
-#endif 
  
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/Dim3DDiagram.idl b/offapi/com/sun/star/chart/Dim3DDiagram.idl
index d012e832e..a7c20db64 100644
--- a/offapi/com/sun/star/chart/Dim3DDiagram.idl
+++ b/offapi/com/sun/star/chart/Dim3DDiagram.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_chart_Dim3DDiagram_idl__ 
 #define __com_sun_star_chart_Dim3DDiagram_idl__ 
  
-#ifndef __com_sun_star_chart_X3DDisplay_idl__ 
 #include <com/sun/star/chart/X3DDisplay.idl> 
-#endif 
-#ifndef __com_sun_star_chart_X3DDefaultSetter_idl__ 
 #include <com/sun/star/chart/X3DDefaultSetter.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/DonutDiagram.idl b/offapi/com/sun/star/chart/DonutDiagram.idl
index 50dc0bc19..26e6d6f05 100644
--- a/offapi/com/sun/star/chart/DonutDiagram.idl
+++ b/offapi/com/sun/star/chart/DonutDiagram.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_DonutDiagram_idl__ 
 #define __com_sun_star_chart_DonutDiagram_idl__ 
  
-#ifndef __com_sun_star_chart_Diagram_idl__ 
 #include <com/sun/star/chart/Diagram.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/FilledNetDiagram.idl b/offapi/com/sun/star/chart/FilledNetDiagram.idl
index 1a136ae9c..6f86873c5 100644
--- a/offapi/com/sun/star/chart/FilledNetDiagram.idl
+++ b/offapi/com/sun/star/chart/FilledNetDiagram.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_chart_FilledNetDiagram_idl__ 
 #define __com_sun_star_chart_FilledNetDiagram_idl__ 
  
-#ifndef __com_sun_star_chart_Diagram_idl__ 
 #include <com/sun/star/chart/Diagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_StackableDiagram_idl__ 
 #include <com/sun/star/chart/StackableDiagram.idl> 
-#endif 
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisXSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisYSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/LineDiagram.idl b/offapi/com/sun/star/chart/LineDiagram.idl
index b21648357..e823a58ee 100644
--- a/offapi/com/sun/star/chart/LineDiagram.idl
+++ b/offapi/com/sun/star/chart/LineDiagram.idl
@@ -27,37 +27,20 @@
 #ifndef __com_sun_star_chart_LineDiagram_idl__ 
 #define __com_sun_star_chart_LineDiagram_idl__ 
  
-#ifndef __com_sun_star_chart_Diagram_idl__ 
 #include <com/sun/star/chart/Diagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
 #include <com/sun/star/chart/ChartStatistics.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisXSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisZSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__ 
 #include <com/sun/star/chart/Dim3DDiagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_StackableDiagram_idl__ 
 #include <com/sun/star/chart/StackableDiagram.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/NetDiagram.idl b/offapi/com/sun/star/chart/NetDiagram.idl
index 4670ed7f1..6693a305b 100644
--- a/offapi/com/sun/star/chart/NetDiagram.idl
+++ b/offapi/com/sun/star/chart/NetDiagram.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_NetDiagram_idl__ 
 #define __com_sun_star_chart_NetDiagram_idl__ 
  
-#ifndef __com_sun_star_chart_Diagram_idl__ 
 #include <com/sun/star/chart/Diagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_StackableDiagram_idl__ 
 #include <com/sun/star/chart/StackableDiagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisYSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/PieDiagram.idl b/offapi/com/sun/star/chart/PieDiagram.idl
index f79b9a5bb..ae1ccab33 100644
--- a/offapi/com/sun/star/chart/PieDiagram.idl
+++ b/offapi/com/sun/star/chart/PieDiagram.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_PieDiagram_idl__ 
 #define __com_sun_star_chart_PieDiagram_idl__ 
  
-#ifndef __com_sun_star_chart_Diagram_idl__ 
 #include <com/sun/star/chart/Diagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__ 
 #include <com/sun/star/chart/Dim3DDiagram.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/StockDiagram.idl b/offapi/com/sun/star/chart/StockDiagram.idl
index 3e7da9fda..c6a617507 100644
--- a/offapi/com/sun/star/chart/StockDiagram.idl
+++ b/offapi/com/sun/star/chart/StockDiagram.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_chart_StockDiagram_idl__ 
 #define __com_sun_star_chart_StockDiagram_idl__ 
  
-#ifndef __com_sun_star_chart_XStatisticDisplay_idl__ 
 #include <com/sun/star/chart/XStatisticDisplay.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
 #include <com/sun/star/chart/ChartStatistics.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_Diagram_idl__ 
 #include <com/sun/star/chart/Diagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisXSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/X3DDefaultSetter.idl b/offapi/com/sun/star/chart/X3DDefaultSetter.idl
index 915f0a912..ac5d4f0fe 100644
--- a/offapi/com/sun/star/chart/X3DDefaultSetter.idl
+++ b/offapi/com/sun/star/chart/X3DDefaultSetter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_X3DDefaultSetter_idl__ 
 #define __com_sun_star_chart_X3DDefaultSetter_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/X3DDisplay.idl b/offapi/com/sun/star/chart/X3DDisplay.idl
index 3c6718a0b..072412d9b 100644
--- a/offapi/com/sun/star/chart/X3DDisplay.idl
+++ b/offapi/com/sun/star/chart/X3DDisplay.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_X3DDisplay_idl__ 
 #define __com_sun_star_chart_X3DDisplay_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/XAxis.idl b/offapi/com/sun/star/chart/XAxis.idl
index 9a1503aa7..d6335325b 100644
--- a/offapi/com/sun/star/chart/XAxis.idl
+++ b/offapi/com/sun/star/chart/XAxis.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart_XAxis_idl
 #define com_sun_star_chart_XAxis_idl
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
 
 module com {  module sun {  module star {  module chart {
 
diff --git a/offapi/com/sun/star/chart/XAxisSupplier.idl b/offapi/com/sun/star/chart/XAxisSupplier.idl
index 43701ca10..245f7c619 100644
--- a/offapi/com/sun/star/chart/XAxisSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart_XAxisSupplier_idl
 #define com_sun_star_chart_XAxisSupplier_idl
 
-#ifndef __com_sun_star_chart_XAxis_idl__ 
 #include <com/sun/star/chart/XAxis.idl> 
-#endif
 
 module com {  module sun {  module star {  module chart {
 
diff --git a/offapi/com/sun/star/chart/XAxisXSupplier.idl b/offapi/com/sun/star/chart/XAxisXSupplier.idl
index 974af5088..42a8b1ff1 100644
--- a/offapi/com/sun/star/chart/XAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisXSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_XAxisXSupplier_idl__ 
 #define __com_sun_star_chart_XAxisXSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/XAxisYSupplier.idl b/offapi/com/sun/star/chart/XAxisYSupplier.idl
index e994516a4..307198d20 100644
--- a/offapi/com/sun/star/chart/XAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisYSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_XAxisYSupplier_idl__ 
 #define __com_sun_star_chart_XAxisYSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/XAxisZSupplier.idl b/offapi/com/sun/star/chart/XAxisZSupplier.idl
index ba611ecaa..ad7c46463 100644
--- a/offapi/com/sun/star/chart/XAxisZSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisZSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_XAxisZSupplier_idl__ 
 #define __com_sun_star_chart_XAxisZSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/XChartData.idl b/offapi/com/sun/star/chart/XChartData.idl
index 64426705e..76044b7cd 100644
--- a/offapi/com/sun/star/chart/XChartData.idl
+++ b/offapi/com/sun/star/chart/XChartData.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_XChartData_idl__ 
 #define __com_sun_star_chart_XChartData_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_XChartDataChangeEventListener_idl__ 
 #include <com/sun/star/chart/XChartDataChangeEventListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/XChartDataArray.idl b/offapi/com/sun/star/chart/XChartDataArray.idl
index 8c7e8f932..7b44da41e 100644
--- a/offapi/com/sun/star/chart/XChartDataArray.idl
+++ b/offapi/com/sun/star/chart/XChartDataArray.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_XChartDataArray_idl__ 
 #define __com_sun_star_chart_XChartDataArray_idl__ 
  
-#ifndef __com_sun_star_chart_XChartData_idl__ 
 #include <com/sun/star/chart/XChartData.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl b/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
index f021afbdd..39e49b3e3 100644
--- a/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
+++ b/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_XChartDataChangeEventListener_idl__ 
 #define __com_sun_star_chart_XChartDataChangeEventListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartDataChangeEvent_idl__ 
 #include <com/sun/star/chart/ChartDataChangeEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/XChartDocument.idl b/offapi/com/sun/star/chart/XChartDocument.idl
index 32c2fdce1..b16a72857 100644
--- a/offapi/com/sun/star/chart/XChartDocument.idl
+++ b/offapi/com/sun/star/chart/XChartDocument.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_chart_XChartDocument_idl__ 
 #define __com_sun_star_chart_XChartDocument_idl__ 
  
-#ifndef __com_sun_star_frame_XModel_idl__ 
 #include <com/sun/star/frame/XModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_XDiagram_idl__ 
 #include <com/sun/star/chart/XDiagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_XChartData_idl__ 
 #include <com/sun/star/chart/XChartData.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
index 930feae28..01f4b00d3 100644
--- a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
+++ b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_XComplexDescriptionAccess_idl__ 
 #define __com_sun_star_chart_XComplexDescriptionAccess_idl__ 
  
-#ifndef __com_sun_star_chart_XChartDataArray_idl__ 
 #include <com/sun/star/chart/XChartDataArray.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/XDiagram.idl b/offapi/com/sun/star/chart/XDiagram.idl
index 6a1cb0432..01b9fe9dd 100644
--- a/offapi/com/sun/star/chart/XDiagram.idl
+++ b/offapi/com/sun/star/chart/XDiagram.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_XDiagram_idl__ 
 #define __com_sun_star_chart_XDiagram_idl__ 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/XDiagramPositioning.idl b/offapi/com/sun/star/chart/XDiagramPositioning.idl
index 5b7da27a5..33b48bcea 100644
--- a/offapi/com/sun/star/chart/XDiagramPositioning.idl
+++ b/offapi/com/sun/star/chart/XDiagramPositioning.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_chart_XDiagramPositioning_idl__ 
 #define __com_sun_star_chart_XDiagramPositioning_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl b/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
index 9f1009e33..527f58e2f 100644
--- a/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
+++ b/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
@@ -1,13 +1,8 @@
 #ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
 #define __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 
 module com {  module sun {  module star {  module chart {
diff --git a/offapi/com/sun/star/chart/XStatisticDisplay.idl b/offapi/com/sun/star/chart/XStatisticDisplay.idl
index 0b71d6923..2e2ee24a0 100644
--- a/offapi/com/sun/star/chart/XStatisticDisplay.idl
+++ b/offapi/com/sun/star/chart/XStatisticDisplay.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_XStatisticDisplay_idl__ 
 #define __com_sun_star_chart_XStatisticDisplay_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl b/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
index d6a05afa4..37e6ce793 100644
--- a/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_XTwoAxisXSupplier_idl__ 
 #define __com_sun_star_chart_XTwoAxisXSupplier_idl__ 
  
-#ifndef __com_sun_star_chart_XAxisXSupplier_idl__ 
 #include <com/sun/star/chart/XAxisXSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl b/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
index 44753229f..d08044fc1 100644
--- a/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_XTwoAxisYSupplier_idl__ 
 #define __com_sun_star_chart_XTwoAxisYSupplier_idl__ 
  
-#ifndef __com_sun_star_chart_XAxisYSupplier_idl__ 
 #include <com/sun/star/chart/XAxisYSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/XYDiagram.idl b/offapi/com/sun/star/chart/XYDiagram.idl
index 8b0ff9342..37b6d8a0f 100644
--- a/offapi/com/sun/star/chart/XYDiagram.idl
+++ b/offapi/com/sun/star/chart/XYDiagram.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_chart_XYDiagram_idl__ 
 #define __com_sun_star_chart_XYDiagram_idl__ 
  
-#ifndef __com_sun_star_chart_Diagram_idl__ 
 #include <com/sun/star/chart/Diagram.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
 #include <com/sun/star/chart/ChartStatistics.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
 #include <com/sun/star/chart/ChartAxisXSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_chart_LineDiagram_idl__ 
 #include <com/sun/star/chart/LineDiagram.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/chart/makefile.mk b/offapi/com/sun/star/chart/makefile.mk
deleted file mode 100644
index 94592e0d7..000000000
--- a/offapi/com/sun/star/chart/makefile.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csschart
-PACKAGE=com$/sun$/star$/chart
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleChartElement.idl\
-    AccessibleChartDocumentView.idl\
-    AreaDiagram.idl\
-    BarDiagram.idl\
-    BubbleDiagram.idl\
-    Chart3DBarProperties.idl\
-    ChartArea.idl\
-    ChartAxis.idl\
-    ChartAxisArrangeOrderType.idl\
-    ChartAxisAssign.idl\
-    ChartAxisMarks.idl\
-    ChartAxisPosition.idl\
-    ChartAxisLabelPosition.idl\
-    ChartAxisMarkPosition.idl\
-    ChartAxisType.idl\
-    ChartAxisXSupplier.idl\
-    ChartAxisYSupplier.idl\
-    ChartAxisZSupplier.idl\
-    ChartData.idl\
-    ChartDataArray.idl\
-    ChartDataCaption.idl\
-    ChartDataChangeEvent.idl\
-    ChartDataChangeType.idl\
-    ChartDataPoint.idl\
-    ChartDataPointProperties.idl\
-    ChartDataRow.idl\
-    ChartDataRowProperties.idl\
-    ChartDataRowSource.idl\
-    ChartDataValue.idl\
-    ChartDocument.idl\
-    ChartErrorCategory.idl\
-    ChartErrorIndicatorType.idl\
-    ChartGrid.idl\
-    ChartLegend.idl\
-    ChartLegendPosition.idl\
-    ChartLegendExpansion.idl \
-    ChartLine.idl\
-    ChartPieSegmentProperties.idl\
-    ChartRegressionCurveType.idl\
-    ChartSeriesAddress.idl\
-    ChartSolidType.idl\
-    ChartStatistics.idl\
-    ChartSymbolType.idl\
-    ChartTableAddressSupplier.idl\
-    ChartTitle.idl\
-    ChartTwoAxisXSupplier.idl\
-    ChartTwoAxisYSupplier.idl\
-    DataLabelPlacement.idl\
-    TimeIncrement.idl \
-    Diagram.idl\
-    Dim3DDiagram.idl\
-    DonutDiagram.idl\
-    FilledNetDiagram.idl\
-    LineDiagram.idl\
-    MissingValueTreatment.idl\
-    NetDiagram.idl\
-    PieDiagram.idl\
-    StackableDiagram.idl\
-    StockDiagram.idl\
-    TimeUnit.idl\
-    TimeInterval.idl\
-    X3DDefaultSetter.idl\
-    X3DDisplay.idl\
-    XAxis.idl\
-    XAxisSupplier.idl\
-    XAxisXSupplier.idl\
-    XAxisYSupplier.idl\
-    XAxisZSupplier.idl\
-    XChartData.idl\
-    XChartDataArray.idl\
-    XChartDataChangeEventListener.idl\
-    XChartDocument.idl\
-    XComplexDescriptionAccess.idl\
-    XDateCategories.idl\
-    XDiagram.idl\
-    XDiagramPositioning.idl\
-    XStatisticDisplay.idl\
-    XTwoAxisXSupplier.idl\
-    XTwoAxisYSupplier.idl\
-    XSecondAxisTitleSupplier.idl\
-    XYDiagram.idl\
-    ErrorBarStyle.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl
index c552a4d7b..16e8fd41c 100644
--- a/offapi/com/sun/star/chart2/Axis.idl
+++ b/offapi/com/sun/star/chart2/Axis.idl
@@ -28,15 +28,12 @@
 #define com_sun_star_chart_Axis_idl
 
 #include <com/sun/star/beans/PropertySet.idl>
-
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.idl>
 #include <com/sun/star/chart/ChartAxisPosition.idl>
 #include <com/sun/star/chart/ChartAxisLabelPosition.idl>
 #include <com/sun/star/chart/ChartAxisMarkPosition.idl>
-
 #include <com/sun/star/chart2/XAxis.idl>
 #include <com/sun/star/chart2/XTitled.idl>
-
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/style/CharacterProperties.idl>
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
diff --git a/offapi/com/sun/star/chart2/ChartDocument.idl b/offapi/com/sun/star/chart2/ChartDocument.idl
index c2f3f1c25..fe7216cd7 100644
--- a/offapi/com/sun/star/chart2/ChartDocument.idl
+++ b/offapi/com/sun/star/chart2/ChartDocument.idl
@@ -29,11 +29,9 @@
 
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-
 #include <com/sun/star/chart2/XChartDocument.idl>
 #include <com/sun/star/chart2/XUndoSupplier.idl>
 #include <com/sun/star/chart2/data/XDataReceiver.idl>
-
 #include <com/sun/star/chart2/XTitled.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 
diff --git a/offapi/com/sun/star/chart2/ChartType.idl b/offapi/com/sun/star/chart2/ChartType.idl
index 73c47039f..c6b5d4855 100644
--- a/offapi/com/sun/star/chart2/ChartType.idl
+++ b/offapi/com/sun/star/chart2/ChartType.idl
@@ -28,7 +28,6 @@
 #define com_sun_star_chart2_ChartType_idl
 
 #include <com/sun/star/beans/XPropertySet.idl>
-
 #include <com/sun/star/chart2/XChartType.idl>
 #include <com/sun/star/chart2/XDataSeriesContainer.idl>
 
diff --git a/offapi/com/sun/star/chart2/CoordinateSystem.idl b/offapi/com/sun/star/chart2/CoordinateSystem.idl
index 17db847c8..b74aace0e 100644
--- a/offapi/com/sun/star/chart2/CoordinateSystem.idl
+++ b/offapi/com/sun/star/chart2/CoordinateSystem.idl
@@ -1,21 +1,10 @@
 #ifndef com_sun_star_chart2_CoordinateSystem_idl
 #define com_sun_star_chart2_CoordinateSystem_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_chart2_XScale_idl
 #include <com/sun/star/chart2/XScale.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloneable_idl__
 #include <com/sun/star/util/XCloneable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/CurveStyle.idl b/offapi/com/sun/star/chart2/CurveStyle.idl
index 84d2fa015..6762084ac 100644
--- a/offapi/com/sun/star/chart2/CurveStyle.idl
+++ b/offapi/com/sun/star/chart2/CurveStyle.idl
@@ -49,9 +49,8 @@ enum CurveStyle
      */
     CUBIC_SPLINES,
 
-    /** Data points are connected via a smoothed B-spline curve.  The
-        data points themselves are not necessarily part of to the
-        curve.
+    /** Data points are connected via a parametric, interpolating
+        B-spline curve.
      */
     B_SPLINES,
 
diff --git a/offapi/com/sun/star/chart2/DataPoint.idl b/offapi/com/sun/star/chart2/DataPoint.idl
index bdfa2d8bc..f2ea3e8d8 100644
--- a/offapi/com/sun/star/chart2/DataPoint.idl
+++ b/offapi/com/sun/star/chart2/DataPoint.idl
@@ -28,7 +28,6 @@
 #define com_sun_star_chart2_DataPoint_idl
 
 #include <com/sun/star/style/CharacterProperties.idl>
-
 #include <com/sun/star/style/XStyle.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/DataPointProperties.idl b/offapi/com/sun/star/chart2/DataPointProperties.idl
index 6e309dc72..7c19752fa 100644
--- a/offapi/com/sun/star/chart2/DataPointProperties.idl
+++ b/offapi/com/sun/star/chart2/DataPointProperties.idl
@@ -28,12 +28,10 @@
 #define com_sun_star_chart2_DataPointProperties_idl
 
 #include <com/sun/star/beans/PropertySet.idl>
-
 #include <com/sun/star/awt/Gradient.idl>
 #include <com/sun/star/drawing/Hatch.idl>
 #include <com/sun/star/drawing/LineDash.idl>
 #include <com/sun/star/style/XStyle.idl>
-
 #include <com/sun/star/chart2/BitmapProperty.idl>
 #include <com/sun/star/chart2/TransparencyStyle.idl>
 #include <com/sun/star/chart2/DataCaptionStyle.idl>
diff --git a/offapi/com/sun/star/chart2/DataSeries.idl b/offapi/com/sun/star/chart2/DataSeries.idl
index 16b0b1f2f..a6364024a 100644
--- a/offapi/com/sun/star/chart2/DataSeries.idl
+++ b/offapi/com/sun/star/chart2/DataSeries.idl
@@ -31,7 +31,6 @@
 #include <com/sun/star/container/XIndexContainer.idl>
 #include <com/sun/star/container/XContainer.idl>
 #include <com/sun/star/style/XStyle.idl>
-
 #include <com/sun/star/chart2/CoordinateSystemSupplier.idl>
 #include <com/sun/star/chart2/data/XDataSink.idl>
 #include <com/sun/star/chart2/data/XDataSource.idl>
diff --git a/offapi/com/sun/star/chart2/Diagram.idl b/offapi/com/sun/star/chart2/Diagram.idl
index 3b75f89cb..fec55fe12 100644
--- a/offapi/com/sun/star/chart2/Diagram.idl
+++ b/offapi/com/sun/star/chart2/Diagram.idl
@@ -27,10 +27,7 @@
 #ifndef com_sun_star_chart_Diagram_idl
 #define com_sun_star_chart_Diagram_idl
 
-#ifndef com_sun_star_chart2_XDiagram_idl__
 #include <com/sun/star/chart2/XDiagram.idl>
-#endif
-
 #include <com/sun/star/chart2/XCoordinateSystemContainer.idl>
 #include <com/sun/star/chart2/XTitled.idl>
 #include <com/sun/star/chart2/RelativePosition.idl>
diff --git a/offapi/com/sun/star/chart2/ExponentialScaling.idl b/offapi/com/sun/star/chart2/ExponentialScaling.idl
index 6ac775831..58a65f992 100644
--- a/offapi/com/sun/star/chart2/ExponentialScaling.idl
+++ b/offapi/com/sun/star/chart2/ExponentialScaling.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_ExponentialScaling_idl
 #define com_sun_star_chart2_ExponentialScaling_idl
 
-#ifndef com_sun_star_chart2_XScaling_idl
 #include <com/sun/star/chart2/XScaling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/FillBitmap.idl b/offapi/com/sun/star/chart2/FillBitmap.idl
index 96e61f18a..472df59a9 100644
--- a/offapi/com/sun/star/chart2/FillBitmap.idl
+++ b/offapi/com/sun/star/chart2/FillBitmap.idl
@@ -27,19 +27,10 @@
 #ifndef com_sun_star_chart2_FillBitmap_idl
 #define com_sun_star_chart2_FillBitmap_idl
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_BitmapMode_idl__
 #include <com/sun/star/drawing/BitmapMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
 #include <com/sun/star/drawing/RectanglePoint.idl>
-#endif
 
 
 module com
diff --git a/offapi/com/sun/star/chart2/FormattedString.idl b/offapi/com/sun/star/chart2/FormattedString.idl
index 5c9c094ad..1916425e5 100644
--- a/offapi/com/sun/star/chart2/FormattedString.idl
+++ b/offapi/com/sun/star/chart2/FormattedString.idl
@@ -1,15 +1,11 @@
 #ifndef com_sun_star_chart_XFormattedString_idl
 #define com_sun_star_chart_XFormattedString_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/style/CharacterProperties.idl>
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-
 #include <com/sun/star/chart2/XFormattedString.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/GridProperties.idl b/offapi/com/sun/star/chart2/GridProperties.idl
index 3a6b51a82..dbcd4a38c 100644
--- a/offapi/com/sun/star/chart2/GridProperties.idl
+++ b/offapi/com/sun/star/chart2/GridProperties.idl
@@ -28,9 +28,7 @@
 #define com_sun_star_chart_GridProperties_idl
 
 #include <com/sun/star/beans/XPropertySet.idl>
-
 #include <com/sun/star/chart2/XGrid.idl>
-
 #include <com/sun/star/drawing/LineProperties.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/Legend.idl b/offapi/com/sun/star/chart2/Legend.idl
index 40a4c1ead..3bd908a6f 100644
--- a/offapi/com/sun/star/chart2/Legend.idl
+++ b/offapi/com/sun/star/chart2/Legend.idl
@@ -30,7 +30,6 @@
 #include <com/sun/star/chart2/XLegend.idl>
 #include <com/sun/star/chart2/LegendPosition.idl>
 #include <com/sun/star/chart/ChartLegendExpansion.idl>
-
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/drawing/FillProperties.idl>
diff --git a/offapi/com/sun/star/chart2/LinearScaling.idl b/offapi/com/sun/star/chart2/LinearScaling.idl
index 37a488afe..28e39050a 100644
--- a/offapi/com/sun/star/chart2/LinearScaling.idl
+++ b/offapi/com/sun/star/chart2/LinearScaling.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_LinearScaling_idl
 #define com_sun_star_chart2_LinearScaling_idl
 
-#ifndef com_sun_star_chart2_XScaling_idl
 #include <com/sun/star/chart2/XScaling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/LogarithmicScaling.idl b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
index ee0e9154a..35c18519a 100644
--- a/offapi/com/sun/star/chart2/LogarithmicScaling.idl
+++ b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_LogarithmicScaling_idl
 #define com_sun_star_chart2_LogarithmicScaling_idl
 
-#ifndef com_sun_star_chart2_XScaling_idl
 #include <com/sun/star/chart2/XScaling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/PowerScaling.idl b/offapi/com/sun/star/chart2/PowerScaling.idl
index 72269798b..dc6f07cb9 100644
--- a/offapi/com/sun/star/chart2/PowerScaling.idl
+++ b/offapi/com/sun/star/chart2/PowerScaling.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_PowerScaling_idl
 #define com_sun_star_chart2_PowerScaling_idl
 
-#ifndef com_sun_star_chart2_XScaling_idl
 #include <com/sun/star/chart2/XScaling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/RelativePosition.idl b/offapi/com/sun/star/chart2/RelativePosition.idl
index ae2e95c6f..84b0b799c 100644
--- a/offapi/com/sun/star/chart2/RelativePosition.idl
+++ b/offapi/com/sun/star/chart2/RelativePosition.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_RelativePosition_idl
 #define com_sun_star_chart2_RelativePosition_idl
 
-#ifndef __com_sun_star_drawing_Alignment_idl__
 #include <com/sun/star/drawing/Alignment.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/Scaling.idl b/offapi/com/sun/star/chart2/Scaling.idl
index 32382467e..bd87603df 100644
--- a/offapi/com/sun/star/chart2/Scaling.idl
+++ b/offapi/com/sun/star/chart2/Scaling.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_Scaling_idl
 #define com_sun_star_chart2_Scaling_idl
 
-#ifndef com_sun_star_chart2_XScaling_idl
 #include <com/sun/star/chart2/XScaling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
index 11f509170..4e0357164 100644
--- a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
+++ b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart_StandardDiagramCreationParameters_idl
 #define com_sun_star_chart_StandardDiagramCreationParameters_idl
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/Symbol.idl b/offapi/com/sun/star/chart2/Symbol.idl
index 24fafa99d..40c7de726 100644
--- a/offapi/com/sun/star/chart2/Symbol.idl
+++ b/offapi/com/sun/star/chart2/Symbol.idl
@@ -27,13 +27,9 @@
 #ifndef com_sun_star_chart2_Symbol_idl
 #define com_sun_star_chart2_Symbol_idl
 
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-
 #include <com/sun/star/awt/Size.idl>
 #include <com/sun/star/graphic/XGraphic.idl>
-
 #include <com/sun/star/chart2/SymbolStyle.idl>
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart2/Title.idl b/offapi/com/sun/star/chart2/Title.idl
index 90a64c550..d1d2f1df8 100644
--- a/offapi/com/sun/star/chart2/Title.idl
+++ b/offapi/com/sun/star/chart2/Title.idl
@@ -29,9 +29,7 @@
 
 #include <com/sun/star/style/ParagraphProperties.idl>
 #include <com/sun/star/layout/LayoutElement.idl>
-
 #include <com/sun/star/chart2/XTitle.idl>
-
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/drawing/FillProperties.idl>
diff --git a/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl b/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl
index 7c4e9d431..3897f3a94 100644
--- a/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl
+++ b/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart2_XAnyDescriptionAccess_idl__ 
 #define __com_sun_star_chart2_XAnyDescriptionAccess_idl__ 
  
-#ifndef __com_sun_star_chart_XComplexDescriptionAccess_idl__ 
 #include <com/sun/star/chart/XComplexDescriptionAccess.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/chart2/XAxis.idl b/offapi/com/sun/star/chart2/XAxis.idl
index 5651f7a32..9e0e86c16 100644
--- a/offapi/com/sun/star/chart2/XAxis.idl
+++ b/offapi/com/sun/star/chart2/XAxis.idl
@@ -27,12 +27,8 @@
 #ifndef com_sun_star_chart_XAxis_idl
 #define com_sun_star_chart_XAxis_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/beans/XPropertySet.idl>
-
 #include <com/sun/star/chart2/ScaleData.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XChartShape.idl b/offapi/com/sun/star/chart2/XChartShape.idl
index c58f35023..669aadabf 100644
--- a/offapi/com/sun/star/chart2/XChartShape.idl
+++ b/offapi/com/sun/star/chart2/XChartShape.idl
@@ -1,34 +1,14 @@
 #ifndef com_sun_star_chart2_XChartShape_idl
 #define com_sun_star_chart2_XChartShape_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_chart2_XTransformation_idl
 #include <com/sun/star/chart2/XTransformation.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart2/XChartShapeContainer.idl b/offapi/com/sun/star/chart2/XChartShapeContainer.idl
index f7505e030..e32e8f47b 100644
--- a/offapi/com/sun/star/chart2/XChartShapeContainer.idl
+++ b/offapi/com/sun/star/chart2/XChartShapeContainer.idl
@@ -1,13 +1,8 @@
 #ifndef com_sun_star_chart2_XChartShapeContainer_idl
 #define com_sun_star_chart2_XChartShapeContainer_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/XChartType.idl b/offapi/com/sun/star/chart2/XChartType.idl
index 07f358b2a..6dce9a1e1 100644
--- a/offapi/com/sun/star/chart2/XChartType.idl
+++ b/offapi/com/sun/star/chart2/XChartType.idl
@@ -1,14 +1,8 @@
 #ifndef com_sun_star_chart2_XChartType_idl
 #define com_sun_star_chart2_XChartType_idl
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/chart2/XCoordinateSystem.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XChartTypeContainer.idl b/offapi/com/sun/star/chart2/XChartTypeContainer.idl
index 8b153c865..2701739d4 100644
--- a/offapi/com/sun/star/chart2/XChartTypeContainer.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeContainer.idl
@@ -28,17 +28,9 @@
 #define com_sun_star_chart2_XChartTypeContainer_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
-#ifndef com_sun_star_chart_XChartType_idl
 #include <com/sun/star/chart2/XChartType.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XChartTypeManager.idl b/offapi/com/sun/star/chart2/XChartTypeManager.idl
index efc9e7a12..bc2b23d3e 100644
--- a/offapi/com/sun/star/chart2/XChartTypeManager.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeManager.idl
@@ -3,7 +3,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-
 #include <com/sun/star/chart2/XChartTypeTemplate.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
index afb241f57..890b90a03 100644
--- a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
@@ -27,17 +27,9 @@
 #ifndef com_sun_star_chart_XChartTypeTemplate_idl
 #define com_sun_star_chart_XChartTypeTemplate_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
 #include <com/sun/star/chart2/XDiagram.idl>
 #include <com/sun/star/chart2/data/XDataSource.idl>
 #include <com/sun/star/chart2/XChartType.idl>
diff --git a/offapi/com/sun/star/chart2/XCoordinateSystem.idl b/offapi/com/sun/star/chart2/XCoordinateSystem.idl
index 90f498e03..c036c5a47 100644
--- a/offapi/com/sun/star/chart2/XCoordinateSystem.idl
+++ b/offapi/com/sun/star/chart2/XCoordinateSystem.idl
@@ -27,14 +27,8 @@
 #ifndef com_sun_star_chart2_XCoordinateSystem_idl
 #define com_sun_star_chart2_XCoordinateSystem_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
 #include <com/sun/star/chart2/XAxis.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl b/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
index 0f455202f..554c9fb70 100644
--- a/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
+++ b/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
@@ -28,15 +28,9 @@
 #define com_sun_star_chart2_XCoordinateSystemContainer_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/chart2/XCoordinateSystem.idl>
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XDataInterpreter.idl b/offapi/com/sun/star/chart2/XDataInterpreter.idl
index ace1d9459..6f4857e44 100644
--- a/offapi/com/sun/star/chart2/XDataInterpreter.idl
+++ b/offapi/com/sun/star/chart2/XDataInterpreter.idl
@@ -27,13 +27,8 @@
 #ifndef com_sun_star_chart2_XDataInterpreter_idl
 #define com_sun_star_chart2_XDataInterpreter_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
 #include <com/sun/star/chart2/InterpretedData.idl>
 #include <com/sun/star/chart2/data/XDataSource.idl>
 #include <com/sun/star/chart2/XDataSeries.idl>
diff --git a/offapi/com/sun/star/chart2/XDataSeries.idl b/offapi/com/sun/star/chart2/XDataSeries.idl
index 08840668b..a2ff114ab 100644
--- a/offapi/com/sun/star/chart2/XDataSeries.idl
+++ b/offapi/com/sun/star/chart2/XDataSeries.idl
@@ -27,17 +27,9 @@
 #ifndef com_sun_star_chart2_XDataSeries_idl
 #define com_sun_star_chart2_XDataSeries_idl
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XDataSeriesContainer.idl b/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
index 10691d557..a65008d0b 100644
--- a/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
+++ b/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
@@ -28,17 +28,9 @@
 #define com_sun_star_chart2_XDataSeriesContainer_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
-#ifndef com_sun_star_chart_XDataSeries_idl
 #include <com/sun/star/chart2/XDataSeries.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
index f7a59ddac..5b102ffab 100644
--- a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
+++ b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
@@ -27,13 +27,8 @@
 #ifndef com_sun_star_chart2_xdefaultsizetransmitter_idl
 #define com_sun_star_chart2_xdefaultsizetransmitter_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XDiagram.idl b/offapi/com/sun/star/chart2/XDiagram.idl
index fe8183208..78998ae69 100644
--- a/offapi/com/sun/star/chart2/XDiagram.idl
+++ b/offapi/com/sun/star/chart2/XDiagram.idl
@@ -27,10 +27,7 @@
 #ifndef com_sun_star_chart2_XDiagram_idl
 #define com_sun_star_chart2_XDiagram_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/beans/XPropertySet.idl>
 #include <com/sun/star/beans/PropertyValue.idl>
 #include <com/sun/star/chart2/XLegend.idl>
diff --git a/offapi/com/sun/star/chart2/XDiagramProvider.idl b/offapi/com/sun/star/chart2/XDiagramProvider.idl
index 128dd08cb..d16f1c6f8 100644
--- a/offapi/com/sun/star/chart2/XDiagramProvider.idl
+++ b/offapi/com/sun/star/chart2/XDiagramProvider.idl
@@ -27,10 +27,7 @@
 #ifndef com_sun_star_chart2_XDiagramProvider_idl
 #define com_sun_star_chart2_XDiagramProvider_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/chart2/XDiagram.idl>
 #include <com/sun/star/chart2/XChartTypeTemplate.idl>
 
diff --git a/offapi/com/sun/star/chart2/XFastPropertyState.idl b/offapi/com/sun/star/chart2/XFastPropertyState.idl
index ec7ac4691..ee6b40e42 100644
--- a/offapi/com/sun/star/chart2/XFastPropertyState.idl
+++ b/offapi/com/sun/star/chart2/XFastPropertyState.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_beans_XFastPropertyState_idl__
 #define __com_sun_star_beans_XFastPropertyState_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart2/XFormattedString.idl b/offapi/com/sun/star/chart2/XFormattedString.idl
index 5928f41f3..6c6338f41 100644
--- a/offapi/com/sun/star/chart2/XFormattedString.idl
+++ b/offapi/com/sun/star/chart2/XFormattedString.idl
@@ -1,9 +1,7 @@
 #ifndef com_sun_star_chart_XFormattedString_idl
 #define com_sun_star_chart_XFormattedString_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XLabeled.idl b/offapi/com/sun/star/chart2/XLabeled.idl
index e9e19e3a5..9f9e24dc8 100644
--- a/offapi/com/sun/star/chart2/XLabeled.idl
+++ b/offapi/com/sun/star/chart2/XLabeled.idl
@@ -27,17 +27,9 @@
 #ifndef com_sun_star_chart2_XLabeled_idl
 #define com_sun_star_chart2_XLabeled_idl
 
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef com_sun_star_chart2_XTitle_idl
 #include <com/sun/star/chart2/XTitle.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
 #include <com/sun/star/drawing/RectanglePoint.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XRegressionCurve.idl b/offapi/com/sun/star/chart2/XRegressionCurve.idl
index 406b57dc3..f75497205 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurve.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurve.idl
@@ -29,7 +29,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/beans/XPropertySet.idl>
-
 #include <com/sun/star/chart2/XRegressionCurveCalculator.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
index 10960d9a4..98d5ee75c 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
@@ -28,7 +28,6 @@
 #define com_sun_star_chart2_XRegressionCurveCalculator_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #include <com/sun/star/geometry/RealPoint2D.idl>
diff --git a/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl b/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
index 3a1c52a4c..23802b418 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
@@ -28,15 +28,9 @@
 #define com_sun_star_chart2_XRegressionCurveContainer_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/chart2/XRegressionCurve.idl>
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XScaling.idl b/offapi/com/sun/star/chart2/XScaling.idl
index 569f29ff2..b68ee3aea 100644
--- a/offapi/com/sun/star/chart2/XScaling.idl
+++ b/offapi/com/sun/star/chart2/XScaling.idl
@@ -1,9 +1,7 @@
 #ifndef com_sun_star_chart2_XScaling_idl
 #define com_sun_star_chart2_XScaling_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/XStyleSupplier.idl b/offapi/com/sun/star/chart2/XStyleSupplier.idl
index 8036595ef..97a02c495 100644
--- a/offapi/com/sun/star/chart2/XStyleSupplier.idl
+++ b/offapi/com/sun/star/chart2/XStyleSupplier.idl
@@ -27,15 +27,9 @@
 #ifndef com_sun_star_style_XStyleSupplier_idl
 #define com_sun_star_style_XStyleSupplier_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_style_XStyle_idl__
 #include <com/sun/star/style/XStyle.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XTarget.idl b/offapi/com/sun/star/chart2/XTarget.idl
index e41afe75f..65ea3175d 100644
--- a/offapi/com/sun/star/chart2/XTarget.idl
+++ b/offapi/com/sun/star/chart2/XTarget.idl
@@ -1,9 +1,7 @@
 #ifndef com_sun_star_chart2_XTarget_idl
 #define com_sun_star_chart2_XTarget_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 module com {  module sun {  module star {  module chart2 {
diff --git a/offapi/com/sun/star/chart2/XTitle.idl b/offapi/com/sun/star/chart2/XTitle.idl
index 7ba39af8a..100a226be 100644
--- a/offapi/com/sun/star/chart2/XTitle.idl
+++ b/offapi/com/sun/star/chart2/XTitle.idl
@@ -27,10 +27,7 @@
 #ifndef com_sun_star_chart_XTitle_idl
 #define com_sun_star_chart_XTitle_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/chart2/XFormattedString.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XTitled.idl b/offapi/com/sun/star/chart2/XTitled.idl
index ba9d81234..9d3d0b5e5 100644
--- a/offapi/com/sun/star/chart2/XTitled.idl
+++ b/offapi/com/sun/star/chart2/XTitled.idl
@@ -27,10 +27,7 @@
 #ifndef com_sun_star_chart_XTitled_idl
 #define com_sun_star_chart_XTitled_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/chart2/XTitle.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XTransformation.idl b/offapi/com/sun/star/chart2/XTransformation.idl
index 4459d54c8..f3e26c9cf 100644
--- a/offapi/com/sun/star/chart2/XTransformation.idl
+++ b/offapi/com/sun/star/chart2/XTransformation.idl
@@ -27,13 +27,8 @@
 #ifndef com_sun_star_chart2_XTransformation_idl
 #define com_sun_star_chart2_XTransformation_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/data/DataSequence.idl b/offapi/com/sun/star/chart2/data/DataSequence.idl
index 36f9167f6..765cad6a6 100644
--- a/offapi/com/sun/star/chart2/data/DataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/DataSequence.idl
@@ -31,11 +31,9 @@
 #include <com/sun/star/container/XIndexReplace.idl>
 #include <com/sun/star/util/XCloneable.idl>
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-
 #include <com/sun/star/chart2/data/XDataSequence.idl>
 #include <com/sun/star/chart2/data/XNumericalDataSequence.idl>
 #include <com/sun/star/chart2/data/XTextualDataSequence.idl>
-
 #include <com/sun/star/chart2/data/DataSequenceRole.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
new file mode 100644
index 000000000..09d05cb1c
--- /dev/null
+++ b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_DatabaseDataProvider_idl__
+#define __com_sun_star_report_DatabaseDataProvider_idl__
+
+#include <com/sun/star/chart2/data/XDatabaseDataProvider.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module chart2 { module data {
+
+//=============================================================================
+
+service DatabaseDataProvider : XDatabaseDataProvider
+{
+    createWithConnection([in] com::sun::star::sdbc::XConnection connection);
+};
+//=============================================================================
+
+ }; }; }; };  };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl b/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
index d2d40f00c..c29d92670 100644
--- a/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
@@ -29,7 +29,6 @@
 
 #include <com/sun/star/util/XCloneable.idl>
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-
 #include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/data/XDataProvider.idl b/offapi/com/sun/star/chart2/data/XDataProvider.idl
index 0adc3d5f8..a66619956 100644
--- a/offapi/com/sun/star/chart2/data/XDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDataProvider.idl
@@ -29,11 +29,8 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-
 #include <com/sun/star/chart2/data/XDataSource.idl>
-
 #include <com/sun/star/beans/PropertyValue.idl>
-
 #include <com/sun/star/sheet/XRangeSelection.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/data/XDataReceiver.idl b/offapi/com/sun/star/chart2/data/XDataReceiver.idl
index bc84d95b1..66b188f14 100644
--- a/offapi/com/sun/star/chart2/data/XDataReceiver.idl
+++ b/offapi/com/sun/star/chart2/data/XDataReceiver.idl
@@ -27,28 +27,12 @@
 #ifndef com_sun_star_chart2_data_XDataReceiver_idl
 #define com_sun_star_chart2_data_XDataReceiver_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef com_sun_star_chart2_data_XDataProvider_idl
 #include <com/sun/star/chart2/data/XDataProvider.idl>
-#endif
-
-#ifndef com_sun_star_chart2_data_XRangeHighlighter_idl
 #include <com/sun/star/chart2/data/XRangeHighlighter.idl>
-#endif
-
-#ifndef com_sun_star_beans_PropertyValue_idl
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/data/XDataSink.idl b/offapi/com/sun/star/chart2/data/XDataSink.idl
index a3ea105ad..9fdb22d0c 100644
--- a/offapi/com/sun/star/chart2/data/XDataSink.idl
+++ b/offapi/com/sun/star/chart2/data/XDataSink.idl
@@ -28,7 +28,6 @@
 #define com_sun_star_chart2_data_XDataSink_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/data/XDataSource.idl b/offapi/com/sun/star/chart2/data/XDataSource.idl
index a6b95297d..e2ea022d2 100644
--- a/offapi/com/sun/star/chart2/data/XDataSource.idl
+++ b/offapi/com/sun/star/chart2/data/XDataSource.idl
@@ -28,7 +28,6 @@
 #define com_sun_star_chart2_data_XDataSource_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index afa956be0..abab9678b 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_report_XDatabaseDataProvider_idl__ 
 #define __com_sun_star_report_XDatabaseDataProvider_idl__
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 #include <com/sun/star/beans/XPropertySet.idl>
 #include <com/sun/star/beans/UnknownPropertyException.idl> 
 #include <com/sun/star/lang/XInitialization.idl>
@@ -210,10 +208,6 @@ interface XDatabaseDataProvider
     [attribute,bound] string DataSourceName;
 }; 
  
-service DatabaseDataProvider : XDatabaseDataProvider
-{
-    createWithConnection([in] com::sun::star::sdbc::XConnection connection);
-};
 //============================================================================= 
  
  }; }; }; };  };
diff --git a/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl b/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
index fe23fa0ff..1443d0c23 100644
--- a/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
+++ b/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
@@ -27,17 +27,9 @@
 #ifndef com_sun_star_chart2_data_XRangeHighlighter_idl
 #define com_sun_star_chart2_data_XRangeHighlighter_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
 #include <com/sun/star/view/XSelectionChangeListener.idl>
-#endif
-
-#ifndef com_sun_star_chart2_data_HighlightedRange_idl
 #include <com/sun/star/chart2/data/HighlightedRange.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/data/makefile.mk b/offapi/com/sun/star/chart2/data/makefile.mk
deleted file mode 100644
index f36f9e6c8..000000000
--- a/offapi/com/sun/star/chart2/data/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-TARGET=csschart2data
-PACKAGE=com$/sun$/star$/chart2$/data
-
-PRJNAME=chart2
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-#-------------------------------------------------------------------
-
-IDLFILES= \
-    DataSequenceRole.idl \
-    HighlightedRange.idl \
-    LabelOrigin.idl \
-    XDataProvider.idl \
-    XDataReceiver.idl \
-    XDataSequence.idl \
-    XDataSink.idl \
-    XDataSource.idl \
-    XLabeledDataSequence.idl \
-    XNumericalDataSequence.idl \
-    XRangeHighlighter.idl \
-    XRangeXMLConversion.idl \
-    XTextualDataSequence.idl \
-    XDatabaseDataProvider.idl
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/chart2/makefile.mk b/offapi/com/sun/star/chart2/makefile.mk
deleted file mode 100644
index 873bb985d..000000000
--- a/offapi/com/sun/star/chart2/makefile.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-TARGET=csschart2
-PACKAGE=com$/sun$/star$/chart2
-
-PRJNAME=offapi
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-#-------------------------------------------------------------------
-
-IDLFILES= \
-    AxisType.idl \
-    AxisOrientation.idl \
-    CoordinateSystemTypeID.idl \
-    CurveStyle.idl \
-    DataPointGeometry3D.idl \
-    DataPointLabel.idl \
-    FillBitmap.idl \
-    IncrementData.idl \
-    InterpretedData.idl \
-    LegendPosition.idl \
-    LightSource.idl \
-    PieChartOffsetMode.idl \
-    RelativePosition.idl \
-    RelativeSize.idl \
-    ScaleData.idl \
-    StackingDirection.idl \
-    SubIncrement.idl \
-    Symbol.idl \
-    SymbolStyle.idl \
-    TickmarkStyle.idl \
-    TransparencyStyle.idl \
-    XAnyDescriptionAccess.idl\
-    XAxis.idl \
-    XCoordinateSystem.idl \
-    XCoordinateSystemContainer.idl \
-    XChartDocument.idl \
-    XChartShape.idl \
-    XChartShapeContainer.idl \
-    XChartType.idl \
-    XChartTypeContainer.idl \
-    XChartTypeManager.idl \
-    XChartTypeTemplate.idl \
-    XColorScheme.idl \
-    XDataInterpreter.idl \
-    XDataSeries.idl \
-    XDataSeriesContainer.idl \
-    XDefaultSizeTransmitter.idl \
-    XDiagram.idl \
-    XDiagramProvider.idl \
-    XFastPropertyState.idl \
-    XFormattedString.idl \
-    XInternalDataProvider.idl \
-    XLabeled.idl \
-    XLegend.idl \
-    XRegressionCurve.idl \
-    XRegressionCurveCalculator.idl \
-    XRegressionCurveContainer.idl \
-    XScaling.idl \
-    XStyleSupplier.idl \
-    XTarget.idl \
-    XTitle.idl \
-    XTitled.idl \
-    XTransformation.idl \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/configuration/AccessRootElement.idl b/offapi/com/sun/star/configuration/AccessRootElement.idl
index cda31e80a..12606ca7b 100644
--- a/offapi/com/sun/star/configuration/AccessRootElement.idl
+++ b/offapi/com/sun/star/configuration/AccessRootElement.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_AccessRootElement_idl__
 #define __com_sun_star_configuration_AccessRootElement_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
 #include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XLocalizable_idl__
 #include <com/sun/star/lang/XLocalizable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XChangesNotifier_idl__
 #include <com/sun/star/util/XChangesNotifier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/AdministrationProvider.idl b/offapi/com/sun/star/configuration/AdministrationProvider.idl
index 572275ff4..7a1855b41 100644
--- a/offapi/com/sun/star/configuration/AdministrationProvider.idl
+++ b/offapi/com/sun/star/configuration/AdministrationProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
 #define __com_sun_star_configuration_ConfigurationProvider_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl b/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
index 21f318569..a14ee8d07 100644
--- a/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__ 
 #define __com_sun_star_configuration_CannotLoadConfigurationException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/configuration/ConfigurationAccess.idl b/offapi/com/sun/star/configuration/ConfigurationAccess.idl
index 2c1f37ff1..33d2e16e5 100644
--- a/offapi/com/sun/star/configuration/ConfigurationAccess.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationAccess.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_configuration_ConfigurationAccess_idl__
 #define __com_sun_star_configuration_ConfigurationAccess_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyAccess_idl__
 #include <com/sun/star/configuration/HierarchyAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
 #include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SetAccess_idl__
 #include <com/sun/star/configuration/SetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_GroupAccess_idl__
 #include <com/sun/star/configuration/GroupAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_AccessRootElement_idl__
 #include <com/sun/star/configuration/AccessRootElement.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SetElement_idl__
 #include <com/sun/star/configuration/SetElement.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_GroupElement_idl__
 #include <com/sun/star/configuration/GroupElement.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/ConfigurationProvider.idl b/offapi/com/sun/star/configuration/ConfigurationProvider.idl
index c74016d76..ba1073bd0 100644
--- a/offapi/com/sun/star/configuration/ConfigurationProvider.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
 #define __com_sun_star_configuration_ConfigurationProvider_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
index fd4ffe8c9..a48f31111 100644
--- a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
@@ -29,12 +29,8 @@
 
 //=============================================================================
 
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
 #include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
 
 module com { module sun { module star { module configuration { 
 
diff --git a/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl b/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
index 27e9d09f5..da5e4e03b 100644
--- a/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_ConfigurationUpdateAccess_idl__
 #define __com_sun_star_configuration_ConfigurationUpdateAccess_idl__
 
-#ifndef __com_sun_star_configuration_ConfigurationAccess_idl__
 #include <com/sun/star/configuration/ConfigurationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SetUpdate_idl__
 #include <com/sun/star/configuration/SetUpdate.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_GroupUpdate_idl__
 #include <com/sun/star/configuration/GroupUpdate.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_UpdateRootElement_idl__
 #include <com/sun/star/configuration/UpdateRootElement.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl b/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
index fd8ec35e3..362b498db 100644
--- a/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_CorruptedConfigurationException_idl__ 
 #define __com_sun_star_configuration_CorruptedConfigurationException_idl__ 
  
-#ifndef __com_sun_star_uno_RuntimeException_idl__ 
 #include <com/sun/star/uno/RuntimeException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl b/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
index 14bd759ae..eab0fe361 100644
--- a/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_CorruptedUIConfigurationException_idl__ 
 #define __com_sun_star_configuration_CorruptedUIConfigurationException_idl__ 
  
-#ifndef __com_sun_star_configuration_CorruptedConfigurationException_idl__ 
 #include <com/sun/star/configuration/CorruptedConfigurationException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/configuration/DefaultProvider.idl b/offapi/com/sun/star/configuration/DefaultProvider.idl
index 6767063af..8cc31a47c 100644
--- a/offapi/com/sun/star/configuration/DefaultProvider.idl
+++ b/offapi/com/sun/star/configuration/DefaultProvider.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_DefaultProvider_idl__
 #define __com_sun_star_configuration_DefaultProvider_idl__
 
-#ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
 #include <com/sun/star/configuration/ConfigurationProvider.idl>
-#endif 
-
-#ifndef __com_sun_star_util_XRefreshable_idl__ 
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__ 
 #include <com/sun/star/util/XFlushable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XLocalizable_idl__
 #include <com/sun/star/lang/XLocalizable.idl>
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/configuration/GroupAccess.idl b/offapi/com/sun/star/configuration/GroupAccess.idl
index 180696aee..ead0a96b4 100644
--- a/offapi/com/sun/star/configuration/GroupAccess.idl
+++ b/offapi/com/sun/star/configuration/GroupAccess.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_GroupAccess_idl__
 #define __com_sun_star_configuration_GroupAccess_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyAccess_idl__
 #include <com/sun/star/configuration/HierarchyAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_PropertyHierarchy_idl__
 #include <com/sun/star/configuration/PropertyHierarchy.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertyState_idl__
 #include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/GroupElement.idl b/offapi/com/sun/star/configuration/GroupElement.idl
index 15068860f..455c7bec3 100644
--- a/offapi/com/sun/star/configuration/GroupElement.idl
+++ b/offapi/com/sun/star/configuration/GroupElement.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_GroupElement_idl__
 #define __com_sun_star_configuration_GroupElement_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
 #include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/GroupUpdate.idl b/offapi/com/sun/star/configuration/GroupUpdate.idl
index c834f09ae..ff9c25525 100644
--- a/offapi/com/sun/star/configuration/GroupUpdate.idl
+++ b/offapi/com/sun/star/configuration/GroupUpdate.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_GroupUpdate_idl__
 #define __com_sun_star_configuration_GroupUpdate_idl__
 
-#ifndef __com_sun_star_configuration_GroupAccess_idl__
 #include <com/sun/star/configuration/GroupAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameReplace_idl__
 #include <com/sun/star/container/XNameReplace.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/HierarchyAccess.idl b/offapi/com/sun/star/configuration/HierarchyAccess.idl
index b0a18ae6e..f019bb90a 100644
--- a/offapi/com/sun/star/configuration/HierarchyAccess.idl
+++ b/offapi/com/sun/star/configuration/HierarchyAccess.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_configuration_HierarchyAccess_idl__
 #define __com_sun_star_configuration_HierarchyAccess_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XExactName_idl__
 #include <com/sun/star/beans/XExactName.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
 #include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertyState_idl__
 #include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/HierarchyElement.idl b/offapi/com/sun/star/configuration/HierarchyElement.idl
index 580a48663..702ca743c 100644
--- a/offapi/com/sun/star/configuration/HierarchyElement.idl
+++ b/offapi/com/sun/star/configuration/HierarchyElement.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_configuration_HierarchyElement_idl__
 #define __com_sun_star_configuration_HierarchyElement_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalName_idl__
 #include <com/sun/star/container/XHierarchicalName.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XProperty_idl__
 #include <com/sun/star/beans/XProperty.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyWithState_idl__
 #include <com/sun/star/beans/XPropertyWithState.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/InstallationIncompleteException.idl b/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
index 3d4e712fa..e323aa38b 100644
--- a/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
+++ b/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_InstallationIncompleteException_idl__ 
 #define __com_sun_star_configuration_InstallationIncompleteException_idl__ 
  
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__ 
 #include <com/sun/star/configuration/CannotLoadConfigurationException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl b/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
index 5fd594390..bf084823c 100644
--- a/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
+++ b/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_InvalidBootstrapFileException_idl__ 
 #define __com_sun_star_configuration_InvalidBootstrapFileException_idl__ 
  
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__ 
 #include <com/sun/star/configuration/CannotLoadConfigurationException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl b/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
index 5c70af4cf..0ddac5ca4 100644
--- a/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
+++ b/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_MissingBootstrapFileException_idl__ 
 #define __com_sun_star_configuration_MissingBootstrapFileException_idl__ 
  
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__ 
 #include <com/sun/star/configuration/CannotLoadConfigurationException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/configuration/PropertyHierarchy.idl b/offapi/com/sun/star/configuration/PropertyHierarchy.idl
index dde8be258..4cb57eb14 100644
--- a/offapi/com/sun/star/configuration/PropertyHierarchy.idl
+++ b/offapi/com/sun/star/configuration/PropertyHierarchy.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_PropertyHierarchy_idl__
 #define __com_sun_star_configuration_PropertyHierarchy_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XHierarchicalPropertySet_idl__
 #include <com/sun/star/beans/XHierarchicalPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__
 #include <com/sun/star/beans/XMultiHierarchicalPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/SetAccess.idl b/offapi/com/sun/star/configuration/SetAccess.idl
index c2548c2ee..f787223db 100644
--- a/offapi/com/sun/star/configuration/SetAccess.idl
+++ b/offapi/com/sun/star/configuration/SetAccess.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_SetAccess_idl__
 #define __com_sun_star_configuration_SetAccess_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyAccess_idl__
 #include <com/sun/star/configuration/HierarchyAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SimpleSetAccess_idl__
 #include <com/sun/star/configuration/SimpleSetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/SetElement.idl b/offapi/com/sun/star/configuration/SetElement.idl
index 9a5448601..0aff67b4e 100644
--- a/offapi/com/sun/star/configuration/SetElement.idl
+++ b/offapi/com/sun/star/configuration/SetElement.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_SetElement_idl__
 #define __com_sun_star_configuration_SetElement_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
 #include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_XTemplateInstance_idl__
 #include <com/sun/star/configuration/XTemplateInstance.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/SetUpdate.idl b/offapi/com/sun/star/configuration/SetUpdate.idl
index 8dd32e0ed..532dca2a2 100644
--- a/offapi/com/sun/star/configuration/SetUpdate.idl
+++ b/offapi/com/sun/star/configuration/SetUpdate.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_SetUpdate_idl__
 #define __com_sun_star_configuration_SetUpdate_idl__
 
-#ifndef __com_sun_star_configuration_SetAccess_idl__
 #include <com/sun/star/configuration/SetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SimpleSetUpdate_idl__
 #include <com/sun/star/configuration/SimpleSetUpdate.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/SimpleSetAccess.idl b/offapi/com/sun/star/configuration/SimpleSetAccess.idl
index c0063753f..62ba14475 100644
--- a/offapi/com/sun/star/configuration/SimpleSetAccess.idl
+++ b/offapi/com/sun/star/configuration/SimpleSetAccess.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_SimpleSetAccess_idl__
 #define __com_sun_star_configuration_SimpleSetAccess_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_XTemplateContainer_idl__
 #include <com/sun/star/configuration/XTemplateContainer.idl>
-#endif
-
-#ifndef __com_sun_star_util_XStringEscape_idl__
 #include <com/sun/star/util/XStringEscape.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/SimpleSetUpdate.idl b/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
index 2e51ae768..5ba815e48 100644
--- a/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
+++ b/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_SimpleSetUpdate_idl__
 #define __com_sun_star_configuration_SimpleSetUpdate_idl__
 
-#ifndef __com_sun_star_configuration_SimpleSetAccess_idl__
 #include <com/sun/star/configuration/SimpleSetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/UpdateRootElement.idl b/offapi/com/sun/star/configuration/UpdateRootElement.idl
index d185183da..b63571a9f 100644
--- a/offapi/com/sun/star/configuration/UpdateRootElement.idl
+++ b/offapi/com/sun/star/configuration/UpdateRootElement.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_UpdateRootElement_idl__
 #define __com_sun_star_configuration_UpdateRootElement_idl__
 
-#ifndef __com_sun_star_configuration_AccessRootElement_idl__
 #include <com/sun/star/configuration/AccessRootElement.idl>
-#endif
-
-#ifndef __com_sun_star_util_XChangesBatch_idl__
 #include <com/sun/star/util/XChangesBatch.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/XTemplateContainer.idl b/offapi/com/sun/star/configuration/XTemplateContainer.idl
index 1ad7308db..697b97932 100644
--- a/offapi/com/sun/star/configuration/XTemplateContainer.idl
+++ b/offapi/com/sun/star/configuration/XTemplateContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_XTemplateContainer_idl__ 
 #define __com_sun_star_configuration_XTemplateContainer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/configuration/XTemplateInstance.idl b/offapi/com/sun/star/configuration/XTemplateInstance.idl
index e2b32fdbf..7a71102c3 100644
--- a/offapi/com/sun/star/configuration/XTemplateInstance.idl
+++ b/offapi/com/sun/star/configuration/XTemplateInstance.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_XTemplateInstance_idl__ 
 #define __com_sun_star_configuration_XTemplateInstance_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl b/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
index 82bec312a..20e65b10f 100644
--- a/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
+++ b/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_AuthenticationFailedException_idl__
 #define __com_sun_star_configuration_backend_AuthenticationFailedException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
 #include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/Backend.idl b/offapi/com/sun/star/configuration/backend/Backend.idl
index 38c28c25c..2e97f3236 100644
--- a/offapi/com/sun/star/configuration/backend/Backend.idl
+++ b/offapi/com/sun/star/configuration/backend/Backend.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_Backend_idl__
 #define __com_sun_star_configuration_backend_Backend_idl__
 
-#ifndef __com_sun_star_configuration_backend_XBackend_idl__
 #include <com/sun/star/configuration/backend/XBackend.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/BackendAccessException.idl b/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
index cfe15292b..63c741cda 100644
--- a/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #define __com_sun_star_configuration_backend_BackendAccessException_idl__
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/BackendAdapter.idl b/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
index dfb881b76..cad0641e9 100644
--- a/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #define __com_sun_star_configuration_backend_BackendAdapter_idl__
 
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/BackendSetupException.idl b/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
index 3e94c6959..640412e1b 100644
--- a/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
 #define __com_sun_star_configuration_backend_BackendSetupException_idl__
 
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
 #include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/CannotConnectException.idl b/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
index 965f19673..9fff1fa4a 100644
--- a/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
+++ b/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_CannotConnectException_idl__
 #define __com_sun_star_configuration_backend_CannotConnectException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
 #include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl b/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
index c4e792728..e19dae5ce 100644
--- a/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
+++ b/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_ComponentChangeEvent_idl__ 
 #define __com_sun_star_configuration_backend_ComponentChangeEvent_idl__ 
 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
 //============================================================================= 
  
 module com {  module sun {  module star {  module configuration {  module backend {  
diff --git a/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl b/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
index e39e89425..c7e377087 100644
--- a/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
+++ b/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_ConnectionLostException_idl__
 #define __com_sun_star_configuration_backend_ConnectionLostException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/CopyImporter.idl b/offapi/com/sun/star/configuration/backend/CopyImporter.idl
index 4f3507b94..97f46385c 100644
--- a/offapi/com/sun/star/configuration/backend/CopyImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/CopyImporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_CopyImporter_idl__
 #define __com_sun_star_configuration_backend_CopyImporter_idl__
 
-#ifndef __com_sun_star_configuration_backend_Importer_idl__
 #include <com/sun/star/configuration/backend/Importer.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/DataImporter.idl b/offapi/com/sun/star/configuration/backend/DataImporter.idl
index 45c445f6d..53a54c6c3 100644
--- a/offapi/com/sun/star/configuration/backend/DataImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/DataImporter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_DataImporter_idl__
 #define __com_sun_star_configuration_backend_DataImporter_idl__
 
-#ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/DefaultBackend.idl b/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
index f56bde412..69e91932a 100644
--- a/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_DefaultBackend_idl__
 #define __com_sun_star_configuration_backend_DefaultBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl b/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
index 4cd33be6b..8fca55745 100644
--- a/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
+++ b/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_HierarchyBrowser_idl__
 #define __com_sun_star_configuration_backend_HierarchyBrowser_idl__
 
-#ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/Importer.idl b/offapi/com/sun/star/configuration/backend/Importer.idl
index 8d5f6cbc6..6cba46f9a 100644
--- a/offapi/com/sun/star/configuration/backend/Importer.idl
+++ b/offapi/com/sun/star/configuration/backend/Importer.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_Importer_idl__
 #define __com_sun_star_configuration_backend_Importer_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XLayerImporter_idl__
 #include <com/sun/star/configuration/backend/XLayerImporter.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl b/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
index 2a21eec34..2087ae74c 100644
--- a/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
+++ b/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_InsufficientAccessRightsException_idl__
 #define __com_sun_star_configuration_backend_InsufficientAccessRightsException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl b/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
index ffa243b70..958ff8c0a 100644
--- a/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
+++ b/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_InvalidAuthenticationMechanismException_idl__
 #define __com_sun_star_configuration_backend_InvalidAuthenticationMechanismException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
 #include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/Layer.idl b/offapi/com/sun/star/configuration/backend/Layer.idl
index 31d67ca07..581cbdf68 100644
--- a/offapi/com/sun/star/configuration/backend/Layer.idl
+++ b/offapi/com/sun/star/configuration/backend/Layer.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_configuration_backend_Layer_idl__
 #define __com_sun_star_configuration_backend_Layer_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XCompositeLayer_idl__
 #include <com/sun/star/configuration/backend/XCompositeLayer.idl>
-#endif
-
-#ifndef __com_sun_star_util_XTimeStamped_idl__
 #include <com/sun/star/util/XTimeStamped.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/LayerDescriber.idl b/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
index 79d25f588..cb7ed8c61 100644
--- a/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
@@ -1,13 +1,8 @@
 #ifndef __com_sun_star_configuration_backend_LayerDescriber_idl__
 #define __com_sun_star_configuration_backend_LayerDescriber_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
 #include <com/sun/star/configuration/backend/XLayerContentDescriber.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif 
 
 
 
diff --git a/offapi/com/sun/star/configuration/backend/LayerFilter.idl b/offapi/com/sun/star/configuration/backend/LayerFilter.idl
index 9666dfb22..2d013a605 100644
--- a/offapi/com/sun/star/configuration/backend/LayerFilter.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerFilter.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_configuration_backend_LayerFilter_idl__
 #define __com_sun_star_configuration_backend_LayerFilter_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl b/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
index c4520007e..0612a17ce 100644
--- a/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_LayerUpdateMerger_idl__
 #define __com_sun_star_configuration_backend_LayerUpdateMerger_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
 #include <com/sun/star/configuration/backend/XUpdateHandler.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
index 2b0c3566e..43e46ac36 100644
--- a/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LdapMultiLayerStratum_idl__
 #define __com_sun_star_configuration_backend_LdapMultiLayerStratum_idl__
 
-#ifndef __com_sun_star_configuration_backend_MultiLayerStratum_idl__
 #include <com/sun/star/configuration/backend/MultiLayerStratum.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl b/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
index 8cec9f9d5..9cc952217 100644
--- a/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LdapSingleBackend_idl__
 #define __com_sun_star_configuration_backend_LdapSingleBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
 #include <com/sun/star/configuration/backend/SingleBackend.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl b/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
index f2f823e9a..c18553360 100644
--- a/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LdapSingleStratum_idl__
 #define __com_sun_star_configuration_backend_LdapSingleStratum_idl__
 
-#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 #include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl b/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
index 5b34c1988..409204b6a 100644
--- a/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LocalDataImporter_idl__
 #define __com_sun_star_configuration_backend_LocalDataImporter_idl__
 
-#ifndef __com_sun_star_configuration_backend_DataImporter_idl__
 #include <com/sun/star/configuration/backend/DataImporter.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl b/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
index b2e5eb5e0..3fe73010e 100644
--- a/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LocalHierarchyBrowser_idl__
 #define __com_sun_star_configuration_backend_LocalHierarchyBrowser_idl__
 
-#ifndef __com_sun_star_configuration_backend_HierarchyBrowser_idl__
 #include <com/sun/star/configuration/backend/HierarchyBrowser.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
index 035616fa4..a0cb8cc3e 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LocalSchemaSupplier_idl__
 #define __com_sun_star_configuration_backend_LocalSchemaSupplier_idl__
 
-#ifndef __com_sun_star_configuration_backend_SchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/SchemaSupplier.idl>
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl b/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
index 29a125aa6..b81c2e728 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LocalSingleBackend_idl__
 #define __com_sun_star_configuration_backend_LocalSingleBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
 #include <com/sun/star/configuration/backend/SingleBackend.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl b/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
index 8f5d06d86..465618338 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LocalSingleStratum_idl__
 #define __com_sun_star_configuration_backend_LocalSingleStratum_idl__
 
-#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 #include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/MalformedDataException.idl b/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
index 039a2146a..56a43a762 100644
--- a/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
+++ b/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__ 
 #define __com_sun_star_configuration_backend_MalformedDataException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/MergeImporter.idl b/offapi/com/sun/star/configuration/backend/MergeImporter.idl
index e3b75ff3a..71ec64914 100644
--- a/offapi/com/sun/star/configuration/backend/MergeImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeImporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_MergeImporter_idl__
 #define __com_sun_star_configuration_backend_MergeImporter_idl__
 
-#ifndef __com_sun_star_configuration_backend_Importer_idl__
 #include <com/sun/star/configuration/backend/Importer.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
index 46502afb8..cff7546a7 100644
--- a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_MergeRecoveryRequest_idl__ 
 #define __com_sun_star_configuration_backend_MergeRecoveryRequest_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
index ae92e6580..d76006de5 100644
--- a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 #define __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
 #include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl b/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
index a8b2d9797..8dcc055ca 100644
--- a/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_MultiStratumBackend_idl__
 #define __com_sun_star_configuration_backend_MultiStratumBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/OfflineBackend.idl b/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
index 54be9bb7b..8fc76ff62 100644
--- a/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_OfflineBackend_idl__
 #define __com_sun_star_configuration_backend_OfflineBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/OnlineBackend.idl b/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
index ddebe6bc5..5095336b7 100644
--- a/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_OnlineBackend_idl__
 #define __com_sun_star_configuration_backend_OnlineBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/PlatformBackend.idl b/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
index 2fc097a78..1d898e3c3 100644
--- a/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_PlatformBackend_idl__
 #define __com_sun_star_configuration_backend_PlatformBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 #include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/Schema.idl b/offapi/com/sun/star/configuration/backend/Schema.idl
index a3f0fcd54..4adc909f0 100644
--- a/offapi/com/sun/star/configuration/backend/Schema.idl
+++ b/offapi/com/sun/star/configuration/backend/Schema.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_Schema_idl__
 #define __com_sun_star_configuration_backend_Schema_idl__
 
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
index 667821899..f59a6f0f4 100644
--- a/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_SchemaSupplier_idl__
 #define __com_sun_star_configuration_backend_SchemaSupplier_idl__
 
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/configuration/backend/SingleBackend.idl b/offapi/com/sun/star/configuration/backend/SingleBackend.idl
index 4ef98f4d0..d3648e7db 100644
--- a/offapi/com/sun/star/configuration/backend/SingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleBackend.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
 #define __com_sun_star_configuration_backend_SingleBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
 #include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl b/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
index d2cd5b1fd..287ca6440 100644
--- a/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_SingleBackendAdapter_idl__
 #define __com_sun_star_configuration_backend_SingleBackendAdapter_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl b/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
index 8cf43f94e..04f3865a7 100644
--- a/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 #define __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XSingleLayerStratum_idl__
 #include <com/sun/star/configuration/backend/XSingleLayerStratum.idl>
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
index 2c25fe7df..66f11e7b0 100644
--- a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
+++ b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_StratumCreationException_idl__ 
 #define __com_sun_star_configuration_backend_StratumCreationException_idl__ 
  
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
 #include <com/sun/star/configuration/backend/BackendSetupException.idl> 
-#endif 
  
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/SystemIntegration.idl b/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
index 5d87e90b0..2086cba3d 100644
--- a/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
+++ b/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_SystemIntegration_idl__
 #define __com_sun_star_configuration_backend_SystemIntegration_idl__
 
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif 
 //============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
diff --git a/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl b/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
index 312280e36..17f9534e3 100644
--- a/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_configuration_backend_UpdatableLayer_idl__
 #define __com_sun_star_configuration_backend_UpdatableLayer_idl__
 
-#ifndef __com_sun_star_configuration_backend_Layer_idl__
 #include <com/sun/star/configuration/backend/Layer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 #include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XBackend.idl b/offapi/com/sun/star/configuration/backend/XBackend.idl
index 02a4b4ee7..68c2b40ae 100644
--- a/offapi/com/sun/star/configuration/backend/XBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackend.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_configuration_backend_XBackend_idl__
 #define __com_sun_star_configuration_backend_XBackend_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
 #include <com/sun/star/configuration/backend/XUpdateHandler.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl b/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
index aa41d2905..4059c481e 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_configuration_backend_XBackendChangesListener_idl__ 
 #define __com_sun_star_configuration_backend_XBackendChangesListener_idl__ 
 
-#ifndef __com_sun_star_configuration_backend_ComponentChangeEvent_idl__ 
 #include <com/sun/star/configuration/backend/ComponentChangeEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
 //============================================================================= 
  
 module com {  module sun {  module star {  module configuration {  module backend {  
diff --git a/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl b/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
index 3a87a533e..3f571b937 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_XBackendChangesNotifier_idl__ 
 #define __com_sun_star_configuration_backend_XBackendChangesNotifier_idl__ 
  
-#ifndef __com_sun_star_configuration_backend_XBackendChangesListener_idl__ 
 #include <com/sun/star/configuration/backend/XBackendChangesListener.idl> 
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif  
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/configuration/backend/XBackendEntities.idl b/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
index 3855281fb..ae6f460cc 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
@@ -27,16 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #define __com_sun_star_configuration_backend_XBackendEntities_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl b/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
index 255f91701..687d02dc6 100644
--- a/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_configuration_backend_XCompositeLayer_idl__
 #define __com_sun_star_configuration_backend_XCompositeLayer_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XLayer.idl b/offapi/com/sun/star/configuration/backend/XLayer.idl
index 55ee830f7..14db149f3 100644
--- a/offapi/com/sun/star/configuration/backend/XLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayer.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #define __com_sun_star_configuration_backend_XLayer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
 #include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl b/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
index 684fffab3..4573fe56a 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
 #define __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
 
-#ifndef __com_sun_star_configuration_backend_PropertyInfo_idl__ 
 #include <com/sun/star/configuration/backend/PropertyInfo.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
 #include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
index aa7eb0a40..a6a458fc3 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__ 
 #define __com_sun_star_configuration_backend_XLayerHandler_idl__
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__ 
 #include <com/sun/star/configuration/backend/TemplateIdentifier.idl> 
-#endif 
  
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__ 
 #include <com/sun/star/configuration/backend/MalformedDataException.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
 
 //=============================================================================
  
diff --git a/offapi/com/sun/star/configuration/backend/XLayerImporter.idl b/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
index 9a47b0e8d..72d917140 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
@@ -27,30 +27,13 @@
 #ifndef __com_sun_star_configuration_backend_XLayerImporter_idl__
 #define __com_sun_star_configuration_backend_XLayerImporter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XBackend_idl__
 #include <com/sun/star/configuration/backend/XBackend.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif 
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
index 6079b1619..c3238b5eb 100644
--- a/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
 #define __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 #include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/XSchema.idl b/offapi/com/sun/star/configuration/backend/XSchema.idl
index 440d4b027..2bfad56c4 100644
--- a/offapi/com/sun/star/configuration/backend/XSchema.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchema.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #define __com_sun_star_configuration_backend_XSchema_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XSchemaHandler_idl__
 #include <com/sun/star/configuration/backend/XSchemaHandler.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl b/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
index 867882488..2f683fd15 100644
--- a/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_configuration_backend_XSchemaHandler_idl__ 
 #define __com_sun_star_configuration_backend_XSchemaHandler_idl__
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__ 
 #include <com/sun/star/configuration/backend/TemplateIdentifier.idl> 
-#endif 
  
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__ 
 #include <com/sun/star/configuration/backend/MalformedDataException.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
 
 //=============================================================================
  
diff --git a/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
index d7ae32edd..526ca8e2f 100644
--- a/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #define __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl b/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
index 62f7bd18d..389bfbf7b 100644
--- a/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_configuration_backend_XSingleLayerStratum_idl__
 #define __com_sun_star_configuration_backend_XSingleLayerStratum_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 #include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl b/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
index 66bf699be..a4af8f3a4 100644
--- a/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 #define __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl b/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
index 31aa9d437..c2dab299a 100644
--- a/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__ 
 #define __com_sun_star_configuration_backend_XUpdateHandler_idl__
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__ 
 #include <com/sun/star/configuration/backend/TemplateIdentifier.idl> 
-#endif 
  
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__ 
 #include <com/sun/star/configuration/backend/MalformedDataException.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__ 
 #include <com/sun/star/lang/IllegalAccessException.idl> 
-#endif 
 
 //=============================================================================
  
diff --git a/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
index 845d8ba44..93d6d2df9 100644
--- a/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_XVersionedSchemaSupplier_idl__
 #define __com_sun_star_configuration_backend_XVersionedSchemaSupplier_idl__
 
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/makefile.mk b/offapi/com/sun/star/configuration/backend/makefile.mk
deleted file mode 100644
index 2e2042b0e..000000000
--- a/offapi/com/sun/star/configuration/backend/makefile.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME=offapi
-
-TARGET = csscbackend
-PACKAGE = com$/sun$/star$/configuration$/backend
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    Backend.idl				\
-    SingleBackend.idl	    \
-    LocalSingleBackend.idl	\
-    LdapSingleBackend.idl	\
-    BackendAdapter.idl		\
-    SingleBackendAdapter.idl \
-    OfflineBackend.idl		\
-    OnlineBackend.idl		\
-    HierarchyBrowser.idl	\
-    LocalHierarchyBrowser.idl	\
-    DataImporter.idl		\
-    LocalDataImporter.idl	\
-    LayerFilter.idl	\
-    LayerUpdateMerger.idl	\
-    Importer.idl			\
-    MergeImporter.idl		\
-    CopyImporter.idl		\
-    Schema.idl				\
-    Layer.idl				\
-    UpdatableLayer.idl      \
-    SingleLayerStratum.idl  \
-    LocalSingleStratum.idl  \
-    LdapSingleStratum.idl	\
-    MultiStratumBackend.idl \
-    MultiLayerStratum.idl   \
-    LdapMultiLayerStratum.idl \
-    SchemaSupplier.idl	    \
-    LocalSchemaSupplier.idl \
-    PlatformBackend.idl		\
-    SystemIntegration.idl	\
-    LayerDescriber.idl		\
-    InteractionHandler.idl  \
-    XBackend.idl			\
-    XBackendEntities.idl	\
-    XSchemaSupplier.idl		\
-    XVersionedSchemaSupplier.idl		\
-    XSingleLayerStratum.idl	\
-    XMultiLayerStratum.idl	\
-    XSchema.idl				\
-    XLayer.idl				\
-    XCompositeLayer.idl     \
-    XUpdatableLayer.idl     \
-    XSchemaHandler.idl		\
-    XLayerHandler.idl		\
-    XUpdateHandler.idl      \
-    XLayerImporter.idl		\
-    XBackendChangesNotifier.idl	\
-    XBackendChangesListener.idl	\
-    XLayerContentDescriber.idl	\
-    ComponentChangeEvent.idl	\
-    TemplateIdentifier.idl  \
-    SchemaAttribute.idl     \
-    NodeAttribute.idl       \
-    PropertyInfo.idl			\
-    MergeRecoveryRequest.idl	\
-    MalformedDataException.idl	\
-    BackendSetupException.idl	\
-    StratumCreationException.idl	\
-    AuthenticationFailedException.idl	\
-    CannotConnectException.idl	\
-    InvalidAuthenticationMechanismException.idl \
-    BackendAccessException.idl	\
-    ConnectionLostException.idl	\
-    InsufficientAccessRightsException.idl
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl b/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
index d1aca1ecf..3a43bed6a 100644
--- a/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_xml_LayerParser_idl__
 #define __com_sun_star_configuration_backend_xml_LayerParser_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif 
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl b/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
index 4be9d74a7..d39c4fbaf 100644
--- a/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_xml_LayerWriter_idl__
 #define __com_sun_star_configuration_backend_xml_LayerWriter_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif 
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif 
-
-#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
 #include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl b/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
index a835c15e4..77fb03c80 100644
--- a/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_xml_SchemaParser_idl__
 #define __com_sun_star_configuration_backend_xml_SchemaParser_idl__
 
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif 
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif 
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl b/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
index c5b5057b1..008d31d27 100644
--- a/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
+++ b/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_bootstrap_BootstrapContext_idl__
 #define __com_sun_star_configuration_bootstrap_BootstrapContext_idl__
 
-#ifndef __com_sun_star_uno_XComponentContext_idl__
 #include <com/sun/star/uno/XComponentContext.idl>
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/configuration/makefile.mk b/offapi/com/sun/star/configuration/makefile.mk
deleted file mode 100644
index 00525e9ba..000000000
--- a/offapi/com/sun/star/configuration/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssconfiguration
-PACKAGE=com$/sun$/star$/configuration
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AdministrationProvider.idl \
-    DefaultProvider.idl \
-    CannotLoadConfigurationException.idl \
-    CorruptedConfigurationException.idl \
-    CorruptedUIConfigurationException.idl \
-    InvalidBootstrapFileException.idl \
-    MissingBootstrapFileException.idl \
-    InstallationIncompleteException.idl \
-    ConfigurationAccess.idl\
-    ConfigurationProvider.idl\
-    ConfigurationUpdateAccess.idl\
-    ConfigurationRegistry.idl\
-    HierarchyElement.idl\
-    AccessRootElement.idl\
-    UpdateRootElement.idl\
-    GroupElement.idl\
-    SetElement.idl\
-    HierarchyAccess.idl\
-    GroupAccess.idl\
-    GroupUpdate.idl\
-    SetAccess.idl\
-    SetUpdate.idl\
-    SimpleSetAccess.idl\
-    SimpleSetUpdate.idl\
-    PropertyHierarchy.idl\
-    XTemplateContainer.idl\
-    XTemplateInstance.idl\
-    Update.idl \
-    XUpdate.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
index 498cf3161..1d178b418 100644
--- a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
+++ b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_DataFormatTranslator_idl__
 #define __com_sun_star_datatransfer_DataFormatTranslator_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
index 818184a93..4744792e7 100644
--- a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_datatransfer_MimeContentType_idl__
 #define __com_sun_star_datatransfer_MimeContentType_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl b/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
index 0cc5eef93..5e4ec0de7 100644
--- a/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
+++ b/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #define __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
index 8c675bbd9..168baf212 100644
--- a/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
+++ b/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
@@ -29,13 +29,8 @@
 #ifndef __com_sun_star_datatransfer_XDataFormatTranslator_idl__
 #define __com_sun_star_datatransfer_XDataFormatTranslator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
 
 module com { module sun { module star { module datatransfer {
 
diff --git a/offapi/com/sun/star/datatransfer/XMimeContentType.idl b/offapi/com/sun/star/datatransfer/XMimeContentType.idl
index a91a4bef6..386f0d0b1 100644
--- a/offapi/com/sun/star/datatransfer/XMimeContentType.idl
+++ b/offapi/com/sun/star/datatransfer/XMimeContentType.idl
@@ -29,13 +29,8 @@
 #ifndef __com_sun_star_datatransfer_XMimeContentType_idl__
 #define __com_sun_star_datatransfer_XMimeContentType_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com { module sun { module star { module datatransfer {
 
diff --git a/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
index 93b515a1c..de1f02b58 100644
--- a/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
@@ -29,17 +29,9 @@
 #ifndef __com_sun_star_datatransfer_XMimeContentTypeFactory_idl__
 #define __com_sun_star_datatransfer_XMimeContentTypeFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XMimeContentType_idl__
 #include <com/sun/star/datatransfer/XMimeContentType.idl>
-#endif
 
 module com { module sun { module star { module datatransfer {
 
diff --git a/offapi/com/sun/star/datatransfer/XSystemTransferable.idl b/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
index a3c0ff9e5..e73bae7e3 100644
--- a/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
+++ b/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_XSystemTransferable_idl__
 #define __com_sun_star_datatransfer_XSystemTransferable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
index 31f245c73..ff4e38978 100644
--- a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_XTransferDataInfo_idl__
 #define __com_sun_star_datatransfer_XTransferDataInfo_idl__
 
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XTransferable.idl b/offapi/com/sun/star/datatransfer/XTransferable.idl
index 7f1b71fc5..4519fcb49 100644
--- a/offapi/com/sun/star/datatransfer/XTransferable.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferable.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #define __com_sun_star_datatransfer_XTransferable_idl__
 
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XTransferableEx.idl b/offapi/com/sun/star/datatransfer/XTransferableEx.idl
index 61945aef9..8072b478d 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableEx.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableEx.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_XTransferableEx_idl__
 #define __com_sun_star_datatransfer_XTransferable_idl__
 
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XTransferableSource.idl b/offapi/com/sun/star/datatransfer/XTransferableSource.idl
index 09fafd9df..2120f91f3 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableSource.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableSource.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_XTransferableSource_idl__
 #define __com_sun_star_datatransfer_XTransferableSource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl b/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
index e616351d2..6251dc14d 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,19 +28,14 @@
 #ifndef __com_sun_star_datatransfer_XTransferableSupplier_idl__
 #define __com_sun_star_datatransfer_XTransferableSupplier_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module datatransfer {
 
-interface XTransferableSupplier
+published interface XTransferableSupplier
 {
     //-------------------------------------------------------------------------
     /** To get access to a transferable representation of a selected part of an object.
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
index 8506affca..021714302 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_clipboard_ClipboardEvent_idl__
 #define __com_sun_star_datatransfer_clipboard_ClipboardEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
index 9159ba0d8..f7238568f 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_datatransfer_clipboard_ClipboardManager_idl__
 #define __com_sun_star_datatransfer_clipboard_ClipboardManager_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
index c8dc1ba56..2fd08be56 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_clipboard_GenericClipboard_idl__
 #define __com_sun_star_datatransfer_clipboard_GenericClipboard_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
index bb068d731..4956e5452 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__
 #define __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
index 4ac580b65..631fabe7f 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboard_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboard_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
index 1ced3e55e..6f60a07fc 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardEx_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardEx_idl__
 
-#ifndef __com_sun_star_datatransfer_clipboard_XClipboard_idl__
 #include <com/sun/star/datatransfer/clipboard/XClipboard.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
index 0b6efa9fe..4ba35c012 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardFactory_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardFactory_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
index dd4095841..21bb72e68 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardListener_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardListener_idl__
 
-#ifndef __com_sun_star_datatransfer_clipboard_ClipboardEvent_idl__
 #include <com/sun/star/datatransfer/clipboard/ClipboardEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
index 3fa46e053..53d9837c7 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardManager_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardManager_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
index 2719e1aea..39f1717d1 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardNotifier_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardNotifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
index fc8e4b30b..fe619ad66 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardOwner_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardOwner_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
index 514e42a59..2d8771b75 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XFlushableClipboard_idl__
 #define __com_sun_star_datatransfer_clipboard_XFlushableClipboard_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/makefile.mk b/offapi/com/sun/star/datatransfer/clipboard/makefile.mk
deleted file mode 100644
index c7d011aea..000000000
--- a/offapi/com/sun/star/datatransfer/clipboard/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdclipboard
-PACKAGE=com$/sun$/star$/datatransfer$/clipboard
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ClipboardEvent.idl \
-    ClipboardManager.idl \
-    GenericClipboard.idl \
-    RenderingCapabilities.idl \
-    SystemClipboard.idl \
-    XClipboard.idl \
-    XClipboardEx.idl \
-    XClipboardFactory.idl \
-    XClipboardListener.idl \
-    XClipboardManager.idl \
-    XClipboardNotifier.idl \
-    XClipboardOwner.idl \
-    XFlushableClipboard.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
index dccf95496..3f59cb432 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
index f0e91f634..9fd2f841b 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DragSourceDragEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DragSourceDragEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragSourceEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
index d3164f0a0..adcefb078 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DragSourceDropEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DragSourceDropEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragSourceEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
index f8d580b44..a32b0742f 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
index 5e40014ff..3e2d4c86e 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEnterEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DropTargetDragEnterEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
index 1c5314cd4..e3a58f8c9 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DropTargetDragEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DropTargetEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
index a5e60ca31..132ba591c 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_DropTargetDropEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DropTargetDropEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DropTargetEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
index 65e644a29..2add5be11 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl b/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
index 93dc8189a..73cf399af 100644
--- a/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
 #define __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
index 86d2bf7ca..c9478ca50 100644
--- a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_dnd_OleDragSource_idl__
 #define __com_sun_star_datatransfer_dnd_OleDragSource_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
index 8bea1848e..7396169d1 100644
--- a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_dnd_OleDropTarget_idl__
 #define __com_sun_star_datatransfer_dnd_OleDropTarget_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
index 33ab11070..6d7ccb6ed 100644
--- a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_dnd_X11DragSource_idl__
 #define __com_sun_star_datatransfer_dnd_X11DragSource_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
index 94ac8536b..533586cab 100644
--- a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_dnd_X11DropTarget_idl__
 #define __com_sun_star_datatransfer_dnd_X11DropTarget_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl b/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
index e54d341ab..c2a936cd8 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_XAutoscroll_idl__
 #define __com_sun_star_datatransfer_dnd_XAutoscroll_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
index ca8a8fed5..8790d02f8 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDragGestureListener_idl__
 #define __com_sun_star_datatransfer_dnd_XDragGestureListener_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragGestureEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl b/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
index 29b7b8fd9..d393c7b56 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDragGestureRecognizer_idl__
 #define __com_sun_star_datatransfer_dnd_XDragGestureRecognizer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
index 5d2771dd9..822b729dc 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDragSource_idl__
 #define __com_sun_star_datatransfer_dnd_XDragSource_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
 #include <com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragGestureEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
index c56c6bede..542d99f97 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDragSourceContext_idl__
 #define __com_sun_star_datatransfer_dnd_XDragSourceContext_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
index 5e745982d..35e5cdd08 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDragSourceListener_idl__
 #define __com_sun_star_datatransfer_dnd_XDragSourceListener_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceDragEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceDropEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
index 83770e8bd..7bdba5d2a 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDropTarget_idl__
 #define __com_sun_star_datatransfer_dnd_XDropTarget_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
index c05decfaa..eb825d1d5 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDropTargetDragContext_idl__
 #define __com_sun_star_datatransfer_dnd_XDropTargetDragContext_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
 #include <com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
index 59760d52f..9a9833e35 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDropTargetDropContext_idl__
 #define __com_sun_star_datatransfer_dnd_XDropTargetDropContext_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
 #include <com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
index bb71ab340..15434cff0 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDropTargetListener_idl__
 #define __com_sun_star_datatransfer_dnd_XDropTargetListener_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEnterEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetDropEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/makefile.mk b/offapi/com/sun/star/datatransfer/dnd/makefile.mk
deleted file mode 100644
index 358a126aa..000000000
--- a/offapi/com/sun/star/datatransfer/dnd/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssddnd
-PACKAGE=com$/sun$/star$/datatransfer$/dnd
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    DNDConstants.idl \
-    DragGestureEvent.idl \
-    DragSourceEvent.idl \
-    DragSourceDragEvent.idl \
-    DragSourceDropEvent.idl \
-    DropTargetDragEvent.idl \
-    DropTargetDragEnterEvent.idl \
-    DropTargetDropEvent.idl \
-    DropTargetEvent.idl \
-    InvalidDNDOperationException.idl \
-    OleDragSource.idl	\
-    OleDropTarget.idl \
-    X11DragSource.idl \
-    X11DropTarget.idl \
-    XAutoscroll.idl\
-    XDragGestureListener.idl \
-    XDragGestureRecognizer.idl \
-    XDragSource.idl \
-    XDragSourceContext.idl \
-    XDragSourceListener.idl \
-    XDropTarget.idl \
-    XDropTargetDragContext.idl \
-    XDropTargetDropContext.idl \
-    XDropTargetListener.idl \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/datatransfer/makefile.mk b/offapi/com/sun/star/datatransfer/makefile.mk
deleted file mode 100644
index aff51f398..000000000
--- a/offapi/com/sun/star/datatransfer/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdatatransfer
-PACKAGE=com$/sun$/star$/datatransfer
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        XTransferableSupplier.idl \
-    DataFlavor.idl \
-    UnsupportedFlavorException.idl \
-    XTransferable.idl \
-    XTransferableEx.idl \
-    XSystemTransferable.idl \
-    XTransferableSource.idl \
-    XTransferDataAccess.idl \
-    XMimeContentType.idl \
-    XMimeContentTypeFactory.idl \
-    MimeContentTypeFactory.idl\
-    DataFormatTranslator.idl\
-    XDataFormatTranslator.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/deployment/DeploymentException.idl b/offapi/com/sun/star/deployment/DeploymentException.idl
index 5943c1c59..2b82c4621 100644
--- a/offapi/com/sun/star/deployment/DeploymentException.idl
+++ b/offapi/com/sun/star/deployment/DeploymentException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,16 +34,16 @@
 module com { module sun { module star { module deployment {
 
 /** A DeploymentException reflects a deployment error.
-    
+
     @since OOo 2.0
  */
-exception DeploymentException : com::sun::star::uno::Exception
+published exception DeploymentException : com::sun::star::uno::Exception
 {
     /** reflects the cause of the error.  Commonly an exception.
     */
     any Cause;
 };
 
-}; }; }; }; 
+}; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/deployment/PackageInformationProvider.idl b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
index 9a78f6b65..8f86fd4e1 100644
--- a/offapi/com/sun/star/deployment/PackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module deployment {
 
     @since OOo 2.3
 */
-singleton PackageInformationProvider : XPackageInformationProvider;
+published singleton PackageInformationProvider : XPackageInformationProvider;
 
 }; }; }; };
 #endif
diff --git a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
index 08478310a..8885fd1cc 100644
--- a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,12 +33,12 @@
 
 module com { module sun { module star { module deployment {
 
-/** Objects implementing this interface provide an URL to the root of 
+/** Objects implementing this interface provide an URL to the root of
     an installed package.
-    
+
     @since OOo 2.3
 */
-interface XPackageInformationProvider
+published interface XPackageInformationProvider
 {
     /** get Package information for a specific extension.
 
diff --git a/offapi/com/sun/star/deployment/makefile.mk b/offapi/com/sun/star/deployment/makefile.mk
deleted file mode 100644
index 1e3a77b89..000000000
--- a/offapi/com/sun/star/deployment/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET = cssdeployment
-PACKAGE = com$/sun$/star$/deployment
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-        DeploymentException.idl \
-        XPackageTypeInfo.idl \
-        XPackage.idl \
-        XPackageRegistry.idl \
-        PackageRegistryBackend.idl \
-        XPackageManager.idl \
-        XPackageManagerFactory.idl \
-        XExtensionManager.idl \
-        ExtensionManager.idl \
-        thePackageManagerFactory.idl \
-        DependencyException.idl \
-        LicenseException.idl \
-        VersionException.idl \
-        InstallException.idl \
-        UpdateInformationEntry.idl \
-        XUpdateInformationProvider.idl \
-        UpdateInformationProvider.idl \
-        XPackageInformationProvider.idl \
-        PackageInformationProvider.idl \
-        PlatformException.idl \
-        InvalidRemovedParameterException.idl \
-        ExtensionRemovedException.idl \
-        Prerequisites.idl
-
-.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/document/AmbigousFilterRequest.idl b/offapi/com/sun/star/document/AmbigousFilterRequest.idl
index d0b567362..0693490db 100644
--- a/offapi/com/sun/star/document/AmbigousFilterRequest.idl
+++ b/offapi/com/sun/star/document/AmbigousFilterRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_AmbigousFilterRequest_idl__
 #define __com_sun_star_document_AmbigousFilterRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/BrokenPackageRequest.idl b/offapi/com/sun/star/document/BrokenPackageRequest.idl
index 2355cb7b4..6b9204766 100644
--- a/offapi/com/sun/star/document/BrokenPackageRequest.idl
+++ b/offapi/com/sun/star/document/BrokenPackageRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_BrokenPackageRequest_idl__
 #define __com_sun_star_document_BrokenPackageRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/ChangedByOthersRequest.idl b/offapi/com/sun/star/document/ChangedByOthersRequest.idl
index ee638a828..9cca8aa64 100644
--- a/offapi/com/sun/star/document/ChangedByOthersRequest.idl
+++ b/offapi/com/sun/star/document/ChangedByOthersRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_ChangedByOthersRequest_idl__
 #define __com_sun_star_document_ChangedByOthersRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl b/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
index b7fe140fe..50346de1c 100644
--- a/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
+++ b/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_CorruptedFilterConfigurationException_idl__ 
 #define __com_sun_star_document_CorruptedFilterConfigurationException_idl__ 
  
-#ifndef __com_sun_star_uno_RuntimeException_idl__ 
 #include <com/sun/star/uno/RuntimeException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/document/DocumentEvent.idl b/offapi/com/sun/star/document/DocumentEvent.idl
index f3244e79c..c580387cc 100644
--- a/offapi/com/sun/star/document/DocumentEvent.idl
+++ b/offapi/com/sun/star/document/DocumentEvent.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,16 +27,12 @@
 #ifndef __com_sun_star_document_DocumentEvent_idl__
 #define __com_sun_star_document_DocumentEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_frame_XController2_idl__
 #include <com/sun/star/frame/XController2.idl>
-#endif
 
 //=============================================================================
 
-module com { module sun { module star { module document { 
+module com { module sun { module star { module document {
 
 //=============================================================================
 
@@ -51,7 +47,7 @@ module com { module sun { module star { module document {
     @see XDocumentEventBroadcaster
     @since OOo 3.1
  */
-struct DocumentEvent : ::com::sun::star::lang::EventObject
+published struct DocumentEvent : ::com::sun::star::lang::EventObject
 {
     /** specifies the name of the event.
 
@@ -78,7 +74,7 @@ struct DocumentEvent : ::com::sun::star::lang::EventObject
 
 //=============================================================================
 
-}; }; }; }; 
+}; }; }; };
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/DocumentInfo.idl b/offapi/com/sun/star/document/DocumentInfo.idl
index f50328da2..d6796e59e 100644
--- a/offapi/com/sun/star/document/DocumentInfo.idl
+++ b/offapi/com/sun/star/document/DocumentInfo.idl
@@ -27,36 +27,14 @@
 #ifndef __com_sun_star_document_DocumentInfo_idl__
 #define __com_sun_star_document_DocumentInfo_idl__
 
-#ifndef __com_sun_star_document_XDocumentInfo_idl__
 #include <com/sun/star/document/XDocumentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/DocumentProperties.idl b/offapi/com/sun/star/document/DocumentProperties.idl
index 111cedb01..c39ab986a 100644
--- a/offapi/com/sun/star/document/DocumentProperties.idl
+++ b/offapi/com/sun/star/document/DocumentProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_DocumentProperties_idl__
 #define __com_sun_star_document_DocumentProperties_idl__
 
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
 #include <com/sun/star/document/XDocumentProperties.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl b/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
index 3fd6056b6..bd34f32fc 100644
--- a/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
+++ b/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_DocumentRevisionListPersistence_idl__
 #define __com_sun_star_document_DocumentRevisionListPersistence_idl__
 
-#ifndef __com_sun_star_document_XDocumentRevisionListPersistence_idl__
 #include <com/sun/star/document/XDocumentRevisionListPersistence.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/EmptyUndoStackException.idl b/offapi/com/sun/star/document/EmptyUndoStackException.idl
index 35ff85ad2..476a82bbe 100644
--- a/offapi/com/sun/star/document/EmptyUndoStackException.idl
+++ b/offapi/com/sun/star/document/EmptyUndoStackException.idl
@@ -31,14 +31,14 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module document { 
+module com { module sun { module star { module document {
 
 //==================================================================================================================
 
 /** is raised when an operation is attemption at an XUndoManager which requires a non-empty stack
     of undo actions, and this requirement is not fullfilled.
  */
-exception EmptyUndoStackException : ::com::sun::star::util::InvalidStateException
+published exception EmptyUndoStackException : ::com::sun::star::util::InvalidStateException
 {
 };
 
diff --git a/offapi/com/sun/star/document/EventObject.idl b/offapi/com/sun/star/document/EventObject.idl
index 51962fe21..1cc14181e 100644
--- a/offapi/com/sun/star/document/EventObject.idl
+++ b/offapi/com/sun/star/document/EventObject.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_EventObject_idl__
 #define __com_sun_star_document_EventObject_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/Events.idl b/offapi/com/sun/star/document/Events.idl
index 5e037f3ab..e95d2e293 100644
--- a/offapi/com/sun/star/document/Events.idl
+++ b/offapi/com/sun/star/document/Events.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_Events_idl__
 #define __com_sun_star_document_Events_idl__
 
-#ifndef __com_sun_star_container_XNameReplace_idl__
 #include <com/sun/star/container/XNameReplace.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/ExportFilter.idl b/offapi/com/sun/star/document/ExportFilter.idl
index 1032f369a..e041b98f2 100644
--- a/offapi/com/sun/star/document/ExportFilter.idl
+++ b/offapi/com/sun/star/document/ExportFilter.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_document_ExportFilter_idl__
 #define __com_sun_star_document_ExportFilter_idl__
 
-#ifndef __com_sun_star_document_XExporter_idl__
 #include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
 #include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/ExtendedTypeDetection.idl b/offapi/com/sun/star/document/ExtendedTypeDetection.idl
index 997b51ee0..83dcde5a4 100644
--- a/offapi/com/sun/star/document/ExtendedTypeDetection.idl
+++ b/offapi/com/sun/star/document/ExtendedTypeDetection.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_ExtendedTypeDetection_idl__
 #define __com_sun_star_document_ExtendedTypeDetection_idl__
 
-#ifndef __com_sun_star_document_XExtendedFilterDetection_idl__
 #include <com/sun/star/document/XExtendedFilterDetection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl b/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
index 0c059dcaf..42504c01f 100644
--- a/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
+++ b/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_document_ExtendedTypeDetectionFactory_idl__
 #define __com_sun_star_document_ExtendedTypeDetectionFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
 #include <com/sun/star/container/XContainerQuery.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/FilterAdapter.idl b/offapi/com/sun/star/document/FilterAdapter.idl
index 0564b9f71..69a7ed9f8 100644
--- a/offapi/com/sun/star/document/FilterAdapter.idl
+++ b/offapi/com/sun/star/document/FilterAdapter.idl
@@ -27,9 +27,7 @@
 #ifndef _COM_SUN_STAR_DOCUMENT_FILTERADAPTOR_IDL__
 #define _COM_SUN_STAR_DOCUMENT_FILTERADAPTOR_IDL__
 
-#ifndef _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
 #include <com/sun/star/document/XFilterAdapter.idl>
-#endif
 
 //=============================================================================  
   
diff --git a/offapi/com/sun/star/document/FilterFactory.idl b/offapi/com/sun/star/document/FilterFactory.idl
index c7bf28e7d..8c1d0af1f 100644
--- a/offapi/com/sun/star/document/FilterFactory.idl
+++ b/offapi/com/sun/star/document/FilterFactory.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_document_FilterFactory_idl__
 #define __com_sun_star_document_FilterFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
 #include <com/sun/star/container/XContainerQuery.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/FilterOptionsRequest.idl b/offapi/com/sun/star/document/FilterOptionsRequest.idl
index a750c4d91..d305b0cd3 100644
--- a/offapi/com/sun/star/document/FilterOptionsRequest.idl
+++ b/offapi/com/sun/star/document/FilterOptionsRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_AmbigousFilterRequest_idl__
 #define __com_sun_star_document_AmbigousFilterRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/HeaderFooterSettings.idl b/offapi/com/sun/star/document/HeaderFooterSettings.idl
index 4a5964805..8d9ecb46c 100644
--- a/offapi/com/sun/star/document/HeaderFooterSettings.idl
+++ b/offapi/com/sun/star/document/HeaderFooterSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_HeaderFooterSettings_idl__
 #define __com_sun_star_document_HeaderFooterSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/ImportFilter.idl b/offapi/com/sun/star/document/ImportFilter.idl
index 1e0ed4db1..0ad6e9e15 100644
--- a/offapi/com/sun/star/document/ImportFilter.idl
+++ b/offapi/com/sun/star/document/ImportFilter.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_document_ImportFilter_idl__
 #define __com_sun_star_document_ImportFilter_idl__
 
-#ifndef __com_sun_star_document_XImporter_idl__
 #include <com/sun/star/document/XImporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
 #include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/LinkTarget.idl b/offapi/com/sun/star/document/LinkTarget.idl
index 6d938537e..0f439b529 100644
--- a/offapi/com/sun/star/document/LinkTarget.idl
+++ b/offapi/com/sun/star/document/LinkTarget.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_document_LinkTarget_idl__  
 #define __com_sun_star_document_LinkTarget_idl__  
   
-#ifndef __com_sun_star_beans_XPropertySet_idl__  
 #include <com/sun/star/beans/XPropertySet.idl>  
-#endif  
   
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__  
 #include <com/sun/star/document/XLinkTargetSupplier.idl>  
-#endif  
   
   
 //=============================================================================  
diff --git a/offapi/com/sun/star/document/LinkTargets.idl b/offapi/com/sun/star/document/LinkTargets.idl
index 6b7c34c6d..d700a692b 100644
--- a/offapi/com/sun/star/document/LinkTargets.idl
+++ b/offapi/com/sun/star/document/LinkTargets.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_LinkTargets_idl__  
 #define __com_sun_star_document_LinkTargets_idl__  
   
-#ifndef __com_sun_star_container_XNameAccess_idl__  
 #include <com/sun/star/container/XNameAccess.idl>  
-#endif  
   
   
 //=============================================================================  
diff --git a/offapi/com/sun/star/document/LockFileIgnoreRequest.idl b/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
index a0c80ba9d..a8f28a849 100644
--- a/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
+++ b/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_LockFileIgnoreRequest_idl__
 #define __com_sun_star_document_LockFileIgnoreRequest_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/LockedDocumentRequest.idl b/offapi/com/sun/star/document/LockedDocumentRequest.idl
index 78b596e1f..b80cad32a 100644
--- a/offapi/com/sun/star/document/LockedDocumentRequest.idl
+++ b/offapi/com/sun/star/document/LockedDocumentRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_LockedDocumentRequest_idl__
 #define __com_sun_star_document_LockedDocumentRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/LockedOnSavingRequest.idl b/offapi/com/sun/star/document/LockedOnSavingRequest.idl
index cab8c1e8b..9fb2b2bed 100644
--- a/offapi/com/sun/star/document/LockedOnSavingRequest.idl
+++ b/offapi/com/sun/star/document/LockedOnSavingRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_LockedOnSavingRequest_idl__
 #define __com_sun_star_document_LockedOnSavingRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index 48b00b874..c5c635f5b 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -27,37 +27,14 @@
 #ifndef __com_sun_star_document_MediaDescriptor_idl__
 #define __com_sun_star_document_MediaDescriptor_idl__
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
 #include <com/sun/star/task/XStatusIndicator.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/NoSuchFilterRequest.idl b/offapi/com/sun/star/document/NoSuchFilterRequest.idl
index 7ba822444..e8bba8e4c 100644
--- a/offapi/com/sun/star/document/NoSuchFilterRequest.idl
+++ b/offapi/com/sun/star/document/NoSuchFilterRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_NoSuchFilterRequest_idl__
 #define __com_sun_star_document_NoSuchFilterRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl b/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
index e0ec61512..eb833c19c 100644
--- a/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
+++ b/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_OOXMLDocumentPropertiesImporter_idl__
 #define __com_sun_star_document_OOXMLDocumentPropertiesImporter_idl__
 
-#ifndef __com_sun_star_document_XOOXMLDocumentPropertiesImporter_idl__
 #include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl b/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
index 54e6e7afc..d94009e7b 100644
--- a/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
+++ b/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_OleEmbeddedServerRegistration_idl__ 
 #define __com_sun_star_document_OleEmbeddedServerRegistration_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl b/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
index eb5b54cc9..2a28abe2b 100644
--- a/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
+++ b/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_OwnLockOnDocumentRequest_idl__
 #define __com_sun_star_document_OwnLockOnDocumentRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/PDFDialog.idl b/offapi/com/sun/star/document/PDFDialog.idl
index b271afb2e..00e1ef4d1 100644
--- a/offapi/com/sun/star/document/PDFDialog.idl
+++ b/offapi/com/sun/star/document/PDFDialog.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_PDFDialog_idl__ 
 #define __com_sun_star_document_PDFDialog_idl__ 
  
-#ifndef __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
 #include <com/sun/star/ui/dialogs/FilterOptionsDialog.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/document/Settings.idl b/offapi/com/sun/star/document/Settings.idl
index 2179bed61..8692fbb3a 100644
--- a/offapi/com/sun/star/document/Settings.idl
+++ b/offapi/com/sun/star/document/Settings.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_document_Settings_idl__
 #define __com_sun_star_document_Settings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
 #include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/StandaloneDocumentInfo.idl b/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
index 16c11612f..b8ff15a81 100644
--- a/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
+++ b/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_StandaloneDocumentInfo_idl__
 #define __com_sun_star_document_StandaloneDocumentInfo_idl__
 
-#ifndef __com_sun_star_document_DocumentInfo_idl__
 #include <com/sun/star/document/DocumentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_document_XStandaloneDocumentInfo_idl__
 #include <com/sun/star/document/XStandaloneDocumentInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/TypeDetection.idl b/offapi/com/sun/star/document/TypeDetection.idl
index ccfc301ec..943f84922 100644
--- a/offapi/com/sun/star/document/TypeDetection.idl
+++ b/offapi/com/sun/star/document/TypeDetection.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_document_TypeDetection_idl__
 #define __com_sun_star_document_TypeDetection_idl__
 
-#ifndef __com_sun_star_document_XTypeDetection_idl__
 #include <com/sun/star/document/XTypeDetection.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
 #include <com/sun/star/container/XContainerQuery.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/UndoContextNotClosedException.idl b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
index 811feb394..81eeca83c 100644
--- a/offapi/com/sun/star/document/UndoContextNotClosedException.idl
+++ b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
@@ -31,14 +31,14 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module document { 
+module com { module sun { module star { module document {
 
 //==================================================================================================================
 
 /** is thrown when an operation is attempted at an <type>XUndoManager</type> which requires all undo
     contexts to be closed, but this requirement is not fullfilled.
  */
-exception UndoContextNotClosedException : ::com::sun::star::util::InvalidStateException
+published exception UndoContextNotClosedException : ::com::sun::star::util::InvalidStateException
 {
 };
 
diff --git a/offapi/com/sun/star/document/UndoFailedException.idl b/offapi/com/sun/star/document/UndoFailedException.idl
index 9fbaec7ee..65b23148a 100644
--- a/offapi/com/sun/star/document/UndoFailedException.idl
+++ b/offapi/com/sun/star/document/UndoFailedException.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module document {
     @see XUndoAction::undo
     @see XUndoManager::undo
  */
-exception UndoFailedException : ::com::sun::star::uno::Exception
+published exception UndoFailedException : ::com::sun::star::uno::Exception
 {
     /** describes the reason why the operation failed. Usually, this member will carry an exception.
     */
@@ -49,7 +49,7 @@ exception UndoFailedException : ::com::sun::star::uno::Exception
 
 //==================================================================================================================
 
-}; }; }; }; 
+}; }; }; };
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/document/UndoManagerEvent.idl b/offapi/com/sun/star/document/UndoManagerEvent.idl
index 55928a17b..163b9c6dd 100644
--- a/offapi/com/sun/star/document/UndoManagerEvent.idl
+++ b/offapi/com/sun/star/document/UndoManagerEvent.idl
@@ -31,7 +31,7 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module document { 
+module com { module sun { module star { module document {
 
 //==================================================================================================================
 
@@ -41,7 +41,7 @@ module com { module sun { module star { module document {
     @see XUndoManagerListener
     @see XUndoAction
  */
-struct UndoManagerEvent : ::com::sun::star::lang::EventObject
+published struct UndoManagerEvent : ::com::sun::star::lang::EventObject
 {
     /** the title of the undo action which is described by the event
         @see XUndoAction::Title
diff --git a/offapi/com/sun/star/document/XActionLockable.idl b/offapi/com/sun/star/document/XActionLockable.idl
index 5e5c4b2f9..8ad6a0292 100644
--- a/offapi/com/sun/star/document/XActionLockable.idl
+++ b/offapi/com/sun/star/document/XActionLockable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XActionLockable_idl__  
 #define __com_sun_star_document_XActionLockable_idl__  
   
-#ifndef __com_sun_star_uno_XInterface_idl__  
 #include <com/sun/star/uno/XInterface.idl>  
-#endif  
   
   
 //=============================================================================  
diff --git a/offapi/com/sun/star/document/XBinaryStreamResolver.idl b/offapi/com/sun/star/document/XBinaryStreamResolver.idl
index 4c9a9e1cf..866af41f6 100644
--- a/offapi/com/sun/star/document/XBinaryStreamResolver.idl
+++ b/offapi/com/sun/star/document/XBinaryStreamResolver.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_document_XBinaryStreamResolver_idl__
 #define __com_sun_star_document_XBinaryStreamResolver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XOututStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/document/XCodeNameQuery.idl b/offapi/com/sun/star/document/XCodeNameQuery.idl
index ea64bef9d..6c3c992e3 100644
--- a/offapi/com/sun/star/document/XCodeNameQuery.idl
+++ b/offapi/com/sun/star/document/XCodeNameQuery.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_document_XCodeNameQuery_idl__
 #define __com_sun_star_document_XCodeNameQuery_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XCompatWriterDocProperties.idl b/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
index 5cde05b1b..569bc7bca 100644
--- a/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
+++ b/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XCompatWriterDocProperties_idl__
 #define __com_sun_star_document_XCompatWriterDocProperties_idl__
 
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
 #include <com/sun/star/document/XDocumentProperties.idl>
-#endif
 //=============================================================================
 
 module com {   module sun {   module star {   module document {
diff --git a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
index 7885f9cde..e15dbf661 100644
--- a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
@@ -27,27 +27,16 @@
 #ifndef __com_sun_star_document_XDocumentEventBroadcaster_idl__
 #define __com_sun_star_document_XDocumentEventBroadcaster_idl__
 
-#ifndef __com_sun_star_frame_XController2_idl__
 #include <com/sun/star/frame/XController2.idl>
-#endif
-
-#ifndef __com_sun_star_document_DocumentEvent_idl__
 #include <com/sun/star/document/DocumentEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module document {
 
-interface XDocumentEventListener;
+published interface XDocumentEventListener;
 
 //=============================================================================
 
@@ -60,7 +49,7 @@ interface XDocumentEventListener;
     @see DocumentEvent
     @since OOo 3.1
 */
-interface XDocumentEventBroadcaster
+published interface XDocumentEventBroadcaster
 {
     /** registers a listener which is notified about document events
 
diff --git a/offapi/com/sun/star/document/XDocumentEventListener.idl b/offapi/com/sun/star/document/XDocumentEventListener.idl
index ea0e2cf46..d58e99b14 100644
--- a/offapi/com/sun/star/document/XDocumentEventListener.idl
+++ b/offapi/com/sun/star/document/XDocumentEventListener.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XDocumentEventListener_idl__
 #define __com_sun_star_document_XDocumentEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_document_DocumentEvent_idl__
 #include <com/sun/star/document/DocumentEvent.idl>
-#endif
 
 //=============================================================================
 
@@ -49,7 +44,7 @@ module com { module sun { module star { module document {
     @see XDocumentEventBroadcaster
     @since OOo 3.1
  */
-interface XDocumentEventListener : ::com::sun::star::lang::XEventListener
+published interface XDocumentEventListener : ::com::sun::star::lang::XEventListener
 {
     /** is called whenever a document event occurred
     */
diff --git a/offapi/com/sun/star/document/XDocumentInfo.idl b/offapi/com/sun/star/document/XDocumentInfo.idl
index 28d7b53d2..f44612503 100644
--- a/offapi/com/sun/star/document/XDocumentInfo.idl
+++ b/offapi/com/sun/star/document/XDocumentInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XDocumentInfo_idl__
 #define __com_sun_star_document_XDocumentInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/ArrayIndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentInfoSupplier.idl b/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
index 4b3d21278..f342d2428 100644
--- a/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XDocumentInfoSupplier_idl__
 #define __com_sun_star_document_XDocumentInfoSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_document_XDocumentInfo_idl__
 #include <com/sun/star/document/XDocumentInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentInsertable.idl b/offapi/com/sun/star/document/XDocumentInsertable.idl
index ef6b576fe..9edf5c621 100644
--- a/offapi/com/sun/star/document/XDocumentInsertable.idl
+++ b/offapi/com/sun/star/document/XDocumentInsertable.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_document_XDocumentInsertable_idl__  
 #define __com_sun_star_document_XDocumentInsertable_idl__  
   
-#ifndef __com_sun_star_uno_XInterface_idl__  
 #include <com/sun/star/uno/XInterface.idl>  
-#endif  
   
-#ifndef __com_sun_star_beans_PropertyValue_idl__  
 #include <com/sun/star/beans/PropertyValue.idl>  
-#endif  
   
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__  
 #include <com/sun/star/lang/IllegalArgumentException.idl>  
-#endif  
   
-#ifndef __com_sun_star_io_IOException_idl__  
 #include <com/sun/star/io/IOException.idl>  
-#endif  
   
   
 //=============================================================================  
diff --git a/offapi/com/sun/star/document/XDocumentLanguages.idl b/offapi/com/sun/star/document/XDocumentLanguages.idl
index aaecfaa46..fca40ea05 100644
--- a/offapi/com/sun/star/document/XDocumentLanguages.idl
+++ b/offapi/com/sun/star/document/XDocumentLanguages.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_XDocumentLanguages_idl__
 #define __com_sun_star_document_XDocumentLanguages_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentProperties.idl b/offapi/com/sun/star/document/XDocumentProperties.idl
index acc895f48..79a07b9d9 100644
--- a/offapi/com/sun/star/document/XDocumentProperties.idl
+++ b/offapi/com/sun/star/document/XDocumentProperties.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_document_XDocumentProperties_idl__
 #define __com_sun_star_document_XDocumentProperties_idl__
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_WrongFormatException_idl__
 #include <com/sun/star/io/WrongFormatException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
index 8fa61d44a..c97ed7284 100644
--- a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XDocumentPropertiesSupplier_idl__
 #define __com_sun_star_document_XDocumentPropertiesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
 #include <com/sun/star/document/XDocumentProperties.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl b/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
index 0b70c8ce2..f05e150b7 100644
--- a/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
+++ b/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_document_XDocumentRevisionListPersistence_idl__
 #define __com_sun_star_document_XDocumentRevisionListPersistence_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_util_RevisionTag_idl__
 #include <com/sun/star/util/RevisionTag.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/io/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
+#include <com/sun/star/container/NoSuchElementException.idl>
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
index 93c3d8b71..cb842a872 100644
--- a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
 #define __com_sun_star_document_XDocumentSubStorageSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
 
 
 //=============================================================================
@@ -50,7 +45,7 @@ module com {   module sun {   module star {   module document {
     @see DocumentInfo
     @see StandaloneDocumentInfo
  */
-interface XDocumentSubStorageSupplier: com::sun::star::uno::XInterface
+published interface XDocumentSubStorageSupplier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** provides the access to a substorage with specified name
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl b/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
index 0abca8785..635f2f76e 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XEmbeddedObjectResolver_idl__ 
 #define __com_sun_star_document_XEmbeddedObjectResolver_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl b/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
index 4ce50ebbf..fad147574 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__  
 #define __com_sun_star_document_XEmbeddedObjectSupplier_idl__  
   
-#ifndef __com_sun_star_uno_XInterface_idl__  
 #include <com/sun/star/uno/XInterface.idl>  
-#endif  
   
-#ifndef __com_sun_star_lang_XComponent_idl__  
 #include <com/sun/star/lang/XComponent.idl>  
-#endif  
   
   
 //=============================================================================  
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl b/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
index 600ede940..750d02429 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_document_XEmbeddedObjectSupplier2_idl__  
 #define __com_sun_star_document_XEmbeddedObjectSupplier2_idl__  
   
-#ifndef __com_sun_star_embed_XEmbeddedObject_idl__  
 #include <com/sun/star/embed/XEmbeddedObject.idl>  
-#endif  
  
-#ifndef __com_sun_star_graphic_XGraphic_idl__  
 #include <com/sun/star/graphic/XGraphic.idl>  
-#endif  
-
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__  
 #include <com/sun/star/document/XEmbeddedObjectSupplier.idl>  
-#endif  
   
   
 //=============================================================================  
diff --git a/offapi/com/sun/star/document/XEmbeddedScripts.idl b/offapi/com/sun/star/document/XEmbeddedScripts.idl
index 1fbde210f..6eadff5b1 100644
--- a/offapi/com/sun/star/document/XEmbeddedScripts.idl
+++ b/offapi/com/sun/star/document/XEmbeddedScripts.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_document_XEmbeddedScripts_idl__
 #define __com_sun_star_document_XEmbeddedScripts_idl__
 
-#ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
 #include <com/sun/star/script/XStorageBasedLibraryContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XEventBroadcaster.idl b/offapi/com/sun/star/document/XEventBroadcaster.idl
index c1c03ea20..f2d3ef323 100644
--- a/offapi/com/sun/star/document/XEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XEventBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #define __com_sun_star_document_XEventBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventListener_idl__
 #include <com/sun/star/document/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XEventListener.idl b/offapi/com/sun/star/document/XEventListener.idl
index 832bfb86c..12c7bf396 100644
--- a/offapi/com/sun/star/document/XEventListener.idl
+++ b/offapi/com/sun/star/document/XEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XEventListener_idl__
 #define __com_sun_star_document_XEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_document_EventObject_idl__
 #include <com/sun/star/document/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XEventsSupplier.idl b/offapi/com/sun/star/document/XEventsSupplier.idl
index 4269ef3b1..21cbe63ce 100644
--- a/offapi/com/sun/star/document/XEventsSupplier.idl
+++ b/offapi/com/sun/star/document/XEventsSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XEventsSupplier_idl__
 #define __com_sun_star_document_XEventsSupplier_idl__
 
-#ifndef __com_sun_star_container_XNameReplace_idl__
 #include <com/sun/star/container/XNameReplace.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XExporter.idl b/offapi/com/sun/star/document/XExporter.idl
index 616c4200b..fc5feae17 100644
--- a/offapi/com/sun/star/document/XExporter.idl
+++ b/offapi/com/sun/star/document/XExporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XExporter_idl__
 #define __com_sun_star_document_XExporter_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XExtendedFilterDetection.idl b/offapi/com/sun/star/document/XExtendedFilterDetection.idl
index 65160d7c6..a1b1f2db5 100644
--- a/offapi/com/sun/star/document/XExtendedFilterDetection.idl
+++ b/offapi/com/sun/star/document/XExtendedFilterDetection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XExtendedFilterDetection_idl__
 #define __com_sun_star_document_XExtendedFilterDetection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/document/XFilter.idl b/offapi/com/sun/star/document/XFilter.idl
index c44ef18cf..9e0121370 100644
--- a/offapi/com/sun/star/document/XFilter.idl
+++ b/offapi/com/sun/star/document/XFilter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XFilter_idl__
 #define __com_sun_star_document_XFilter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XFilterAdapter.idl b/offapi/com/sun/star/document/XFilterAdapter.idl
index e35f9cfc1..23ecdedc4 100644
--- a/offapi/com/sun/star/document/XFilterAdapter.idl
+++ b/offapi/com/sun/star/document/XFilterAdapter.idl
@@ -27,10 +27,7 @@
 #ifndef _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
 #define _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/io/XInputStream.idl>
 #include <com/sun/star/io/XOutputStream.idl>
diff --git a/offapi/com/sun/star/document/XGraphicObjectResolver.idl b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
index 59955e6aa..c8c33eff3 100644
--- a/offapi/com/sun/star/document/XGraphicObjectResolver.idl
+++ b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XGraphicObjectResolver_idl__ 
 #define __com_sun_star_document_XGraphicObjectResolver_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/document/XImporter.idl b/offapi/com/sun/star/document/XImporter.idl
index 063717b95..7bf4f1bf2 100644
--- a/offapi/com/sun/star/document/XImporter.idl
+++ b/offapi/com/sun/star/document/XImporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XImporter_idl__
 #define __com_sun_star_document_XImporter_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XInteractionFilterOptions.idl b/offapi/com/sun/star/document/XInteractionFilterOptions.idl
index 89c843d82..eef45ec27 100644
--- a/offapi/com/sun/star/document/XInteractionFilterOptions.idl
+++ b/offapi/com/sun/star/document/XInteractionFilterOptions.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XInteractionFilterOptions_idl__
 #define __com_sun_star_document_XInteractionFilterOptions_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XInteractionFilterSelect.idl b/offapi/com/sun/star/document/XInteractionFilterSelect.idl
index 99b046923..78495373c 100644
--- a/offapi/com/sun/star/document/XInteractionFilterSelect.idl
+++ b/offapi/com/sun/star/document/XInteractionFilterSelect.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XInteractionFilterSelect_idl__
 #define __com_sun_star_document_XInteractionFilterSelect_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XLinkTargetSupplier.idl b/offapi/com/sun/star/document/XLinkTargetSupplier.idl
index db37319ec..5cbac06f1 100644
--- a/offapi/com/sun/star/document/XLinkTargetSupplier.idl
+++ b/offapi/com/sun/star/document/XLinkTargetSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_document_XLinkTargetSupplier_idl__  
 #define __com_sun_star_document_XLinkTargetSupplier_idl__  
   
-#ifndef __com_sun_star_uno_XInterface_idl__  
 #include <com/sun/star/uno/XInterface.idl>  
-#endif  
   
-#ifndef __com_sun_star_container_XNameAccess_idl__  
 #include <com/sun/star/container/XNameAccess.idl>  
-#endif  
   
   
 //=============================================================================  
diff --git a/offapi/com/sun/star/document/XMLBasicExporter.idl b/offapi/com/sun/star/document/XMLBasicExporter.idl
index 91c82f416..9d78ff200 100644
--- a/offapi/com/sun/star/document/XMLBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicExporter.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_XMLBasicExporter_idl__
 #define __com_sun_star_document_XMLBasicExporter_idl__
 
-#ifndef __com_sun_star_document_XExporter_idl__
 #include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
 #include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMLBasicImporter.idl b/offapi/com/sun/star/document/XMLBasicImporter.idl
index 495481717..f8857fac6 100644
--- a/offapi/com/sun/star/document/XMLBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicImporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XMLBasicImporter_idl__
 #define __com_sun_star_document_XMLBasicImporter_idl__
 
-#ifndef __com_sun_star_document_XImporter_idl__
 #include <com/sun/star/document/XImporter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XDocumentHandler.idl> 
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
index 936fce9ae..015d6841b 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_XMLOasisBasicExporter_idl__
 #define __com_sun_star_document_XMLOasisBasicExporter_idl__
 
-#ifndef __com_sun_star_document_XExporter_idl__
 #include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
 #include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
index 87c1f7fb2..846bcfee5 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XMLOasisBasicImporter_idl__
 #define __com_sun_star_document_XMLOasisBasicImporter_idl__
 
-#ifndef __com_sun_star_document_XImporter_idl__
 #include <com/sun/star/document/XImporter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XDocumentHandler.idl> 
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMimeTypeInfo.idl b/offapi/com/sun/star/document/XMimeTypeInfo.idl
index ea470a1c9..3ed3f885d 100644
--- a/offapi/com/sun/star/document/XMimeTypeInfo.idl
+++ b/offapi/com/sun/star/document/XMimeTypeInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XMimeTypeInfo_idl__ 
 #define __com_sun_star_document_XMimeTypeInfo_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl b/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
index e5f2ea619..c78ad19fb 100644
--- a/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
+++ b/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_document_XOOXMLDocumentPropertiesImporter_idl__
 #define __com_sun_star_document_XOOXMLDocumentPropertiesImporter_idl__
 
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
 #include <com/sun/star/document/XDocumentProperties.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XRedlinesSupplier.idl b/offapi/com/sun/star/document/XRedlinesSupplier.idl
index 3dd924a32..05d331f8d 100644
--- a/offapi/com/sun/star/document/XRedlinesSupplier.idl
+++ b/offapi/com/sun/star/document/XRedlinesSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XRedlinesSupplier_idl__
 #define __com_sun_star_document_XRedlinesSupplier_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XScriptInvocationContext.idl b/offapi/com/sun/star/document/XScriptInvocationContext.idl
index ffdafbfd4..c31315142 100644
--- a/offapi/com/sun/star/document/XScriptInvocationContext.idl
+++ b/offapi/com/sun/star/document/XScriptInvocationContext.idl
@@ -29,9 +29,7 @@
 #define __com_sun_star_document_XScriptInvocationContext_idl__
 
 
-#ifndef __com_sun_star_document_XEmbeddedScripts_idl__
 #include <com/sun/star/document/XEmbeddedScripts.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl b/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
index 79a02e554..0d32ca264 100644
--- a/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
+++ b/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XStandaloneDocumentInfo_idl__
 #define __com_sun_star_document_XStandaloneDocumentInfo_idl__
 
-#ifndef __com_sun_star_document_XDocumentInfo_idl__
 #include <com/sun/star/document/XDocumentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XStorageBasedDocument.idl b/offapi/com/sun/star/document/XStorageBasedDocument.idl
index b34c4daab..0fa418ed3 100644
--- a/offapi/com/sun/star/document/XStorageBasedDocument.idl
+++ b/offapi/com/sun/star/document/XStorageBasedDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #define __com_sun_star_embed_XStorageBasedDocument_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
 #include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
-
-#ifndef __com_sun_star_document_XStorageChangeListener_idl__
 #include <com/sun/star/document/XStorageChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
@@ -63,7 +43,7 @@
 /** allows to initialize document with a storage, to store document to
     a storage, and to set document to be based on provided storage.
  */
-interface XStorageBasedDocument: com::sun::star::uno::XInterface
+published interface XStorageBasedDocument: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** lets the document load itself using provided storage.
diff --git a/offapi/com/sun/star/document/XStorageChangeListener.idl b/offapi/com/sun/star/document/XStorageChangeListener.idl
index 3381d711f..a927f8110 100644
--- a/offapi/com/sun/star/document/XStorageChangeListener.idl
+++ b/offapi/com/sun/star/document/XStorageChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_XStorageChangeListener_idl__
 #define __com_sun_star_document_XStorageChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
 
 //=============================================================================
 
@@ -46,7 +38,7 @@ module com {  module sun {  module star {  module document {
 //=============================================================================
 /** allows to be notified when a document is switched to a new storage.
  */
-interface XStorageChangeListener: com::sun::star::lang::XEventListener
+published interface XStorageChangeListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
     /** is called when document switches to another storage.
diff --git a/offapi/com/sun/star/document/XTypeDetection.idl b/offapi/com/sun/star/document/XTypeDetection.idl
index 054c2d7ba..46a94fa01 100644
--- a/offapi/com/sun/star/document/XTypeDetection.idl
+++ b/offapi/com/sun/star/document/XTypeDetection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XTypeDetection_idl__
 #define __com_sun_star_document_XTypeDetection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/document/XUndoAction.idl b/offapi/com/sun/star/document/XUndoAction.idl
index 88b4f3f04..e65354013 100644
--- a/offapi/com/sun/star/document/XUndoAction.idl
+++ b/offapi/com/sun/star/document/XUndoAction.idl
@@ -32,13 +32,13 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module document { 
+module com { module sun { module star { module document {
 
 //==================================================================================================================
 
 /** represents a single (undoable) action on a document
  */
-interface XUndoAction
+published interface XUndoAction
 {
     /** reverts the action represented by the instance
 
diff --git a/offapi/com/sun/star/document/XUndoManager.idl b/offapi/com/sun/star/document/XUndoManager.idl
index edae819ff..74aa4de0c 100644
--- a/offapi/com/sun/star/document/XUndoManager.idl
+++ b/offapi/com/sun/star/document/XUndoManager.idl
@@ -38,10 +38,10 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module document { 
+module com { module sun { module star { module document {
 
-interface XUndoAction;
-interface XUndoManagerListener;
+published interface XUndoAction;
+published interface XUndoManagerListener;
 
 //==================================================================================================================
 
@@ -76,7 +76,7 @@ interface XUndoManagerListener;
     <member>XLockable::unlock</member> methods. When it is locked, then every attempt to add an undo action, or to
     enter or leave an Undo context, will be silently ignored.</p>
  */
-interface XUndoManager
+published interface XUndoManager
 {
     /** allows <a href="#locking">locking</a> the undo manager.
     */
diff --git a/offapi/com/sun/star/document/XUndoManagerListener.idl b/offapi/com/sun/star/document/XUndoManagerListener.idl
index 360e320ae..045e74761 100644
--- a/offapi/com/sun/star/document/XUndoManagerListener.idl
+++ b/offapi/com/sun/star/document/XUndoManagerListener.idl
@@ -32,7 +32,7 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module document { 
+module com { module sun { module star { module document {
 
 //==================================================================================================================
 
@@ -40,7 +40,7 @@ module com { module sun { module star { module document {
 
     @see XUndoManager
  */
-interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
+published interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
 {
     /** is called when an undo action is added to the undo stack.
 
diff --git a/offapi/com/sun/star/document/XUndoManagerSupplier.idl b/offapi/com/sun/star/document/XUndoManagerSupplier.idl
index 88a082259..211dd151e 100644
--- a/offapi/com/sun/star/document/XUndoManagerSupplier.idl
+++ b/offapi/com/sun/star/document/XUndoManagerSupplier.idl
@@ -33,13 +33,13 @@
 
 module com { module sun { module star { module document {
 
-interface XUndoManager;
+published interface XUndoManager;
 
 //==================================================================================================================
 
 /** provides access to an XUndoManager.
  */
-interface XUndoManagerSupplier
+published interface XUndoManagerSupplier
 {
     /** returns the Undo manager associated with the component.
     */
diff --git a/offapi/com/sun/star/document/XVbaMethodParameter.idl b/offapi/com/sun/star/document/XVbaMethodParameter.idl
index 275fe3787..64fca058b 100644
--- a/offapi/com/sun/star/document/XVbaMethodParameter.idl
+++ b/offapi/com/sun/star/document/XVbaMethodParameter.idl
@@ -29,9 +29,7 @@
 #ifndef __org_openoffice_vba_XVbaMethodParameter_idl__
 #define __org_openoffice_vba_XVbaMethodParameter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //============================================================================= 
 
@@ -45,18 +43,18 @@ module com {  module sun {  module star {  module document {
 
 interface XVbaMethodParameter : com::sun::star::uno::XInterface
 {
-	//------------------------------------------------------------------------- 
-	 
-	/** sets the value of the parameter with the specified name.
-	 */
-	void setVbaMethodParameter( [in] string PropertyName, 
-			 [in] any Value ); 
+    //------------------------------------------------------------------------- 
+     
+    /** sets the value of the parameter with the specified name.
+     */
+    void setVbaMethodParameter( [in] string PropertyName, 
+             [in] any Value ); 
  
-	//------------------------------------------------------------------------- 
+    //------------------------------------------------------------------------- 
 
-	/** returns the value of the parameter with the specified name.
+    /** returns the value of the parameter with the specified name.
      */
-	any getVbaMethodParameter( [in] string PropertyName ); 
+    any getVbaMethodParameter( [in] string PropertyName ); 
 };
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/document/XViewDataSupplier.idl b/offapi/com/sun/star/document/XViewDataSupplier.idl
index 902720863..6656e9829 100644
--- a/offapi/com/sun/star/document/XViewDataSupplier.idl
+++ b/offapi/com/sun/star/document/XViewDataSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XViewDataSupplier_idl__
 #define __com_sun_star_document_XViewDataSupplier_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
index c878c4905..21c575df0 100644
--- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
 #define __com_sun_star_drawing_AccessibleGraphicShape_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
index c195cdb13..80e06e80b 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
 #define __com_sun_star_drawing_AccessibleGraphicShape_idl__
 
-#ifndef __com_sun_star_drawing_AccessibleShape_idl__
 #include <com/sun/star/drawing/AccessibleShape.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
 #include <com/sun/star/accessibility/XAccessibleImage.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
diff --git a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
index b678b0eb5..744e25bb7 100644
--- a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
+++ b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_drawing_AccessibleImageBullet_idl__
 #define __com_sun_star_drawing_AccessibleImageBullet_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
 #include <com/sun/star/accessibility/XAccessibleEditableText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
index eddb6fd29..2d2d30c51 100644
--- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
 #define __com_sun_star_drawing_AccessibleGraphicShape_idl__
 
-#ifndef __com_sun_star_drawing_AccessibleShape_idl__
 #include <com/sun/star/drawing/AccessibleShape.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl
index 508228a28..cde9f72a5 100644
--- a/offapi/com/sun/star/drawing/AccessibleShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleShape.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_AccessibleShape_idl__
 #define __com_sun_star_drawing_AccessibleShape_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideView.idl b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
index ac5738aab..b5a98c784 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
 #define __com_sun_star_drawing_AccessibleGraphicShape_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
index b4cc9c544..015a38d44 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
 #define __com_sun_star_drawing_AccessibleGraphicShape_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
diff --git a/offapi/com/sun/star/drawing/AppletShape.idl b/offapi/com/sun/star/drawing/AppletShape.idl
index 4d8cf3dee..df8131492 100644
--- a/offapi/com/sun/star/drawing/AppletShape.idl
+++ b/offapi/com/sun/star/drawing/AppletShape.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_drawing_AppletShape_idl__
 #define __com_sun_star_drawing_AppletShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/Background.idl b/offapi/com/sun/star/drawing/Background.idl
index 22ad933e2..30cd2838d 100644
--- a/offapi/com/sun/star/drawing/Background.idl
+++ b/offapi/com/sun/star/drawing/Background.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_Background_idl__
 #define __com_sun_star_drawing_Background_idl__
 
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/BezierPoint.idl b/offapi/com/sun/star/drawing/BezierPoint.idl
index c5351b387..da44ffac0 100644
--- a/offapi/com/sun/star/drawing/BezierPoint.idl
+++ b/offapi/com/sun/star/drawing/BezierPoint.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_BezierPoint_idl__ 
 #define __com_sun_star_drawing_BezierPoint_idl__ 
  
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/BitmapTable.idl b/offapi/com/sun/star/drawing/BitmapTable.idl
index 155e62157..da7dc8d72 100644
--- a/offapi/com/sun/star/drawing/BitmapTable.idl
+++ b/offapi/com/sun/star/drawing/BitmapTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_BitmapTable_idl__ 
 #define __com_sun_star_drawing_BitmapTable_idl__ 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/BoundVolume.idl b/offapi/com/sun/star/drawing/BoundVolume.idl
index 20e787b90..ca1f6c475 100644
--- a/offapi/com/sun/star/drawing/BoundVolume.idl
+++ b/offapi/com/sun/star/drawing/BoundVolume.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_BoundVolume_idl__ 
 #define __com_sun_star_drawing_BoundVolume_idl__ 
  
-#ifndef __com_sun_star_drawing_Position3D_idl__ 
 #include <com/sun/star/drawing/Position3D.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/CameraGeometry.idl b/offapi/com/sun/star/drawing/CameraGeometry.idl
index 3bdd6e8a8..055665864 100644
--- a/offapi/com/sun/star/drawing/CameraGeometry.idl
+++ b/offapi/com/sun/star/drawing/CameraGeometry.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_drawing_CameraGeometry_idl__ 
 #define __com_sun_star_drawing_CameraGeometry_idl__ 
 
-#ifndef __com_sun_star_drawing_Direction3D_idl__ 
 #include <com/sun/star/drawing/Direction3D.idl>
-#endif 
-
-#ifndef __com_sun_star_drawing_Position3D_idl__
 #include <com/sun/star/drawing/Position3D.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp b/offapi/com/sun/star/drawing/CanvasFeature.idl
index cf94a77ea..bcb2470e7 100644
--- a/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp
+++ b/offapi/com/sun/star/drawing/CanvasFeature.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,11 +25,19 @@
  *
  ************************************************************************/
 
-#include "macros.h"
+#ifndef __com_sun_star_drawing_CanvasFeature_idl__
+#define __com_sun_star_drawing_CanvasFeature_idl__
+
+module com { module sun { module star { module drawing {
 
-IMPLEMENT_THUNK( kernel32, WINDOWS, LANGID, WINAPI, GetUserDefaultUILanguage,())
+constants CanvasFeature
 {
-    return LANGIDFROMLCID(GetUserDefaultLCID());
-}
+    const short None = 0;
+    const short SpriteCanvas = 1;
+};
+
+
+
+}; }; }; }; // ::com::sun::star::drawing
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+#endif
diff --git a/offapi/com/sun/star/drawing/CaptionShape.idl b/offapi/com/sun/star/drawing/CaptionShape.idl
index 6a7118b6f..63314e327 100644
--- a/offapi/com/sun/star/drawing/CaptionShape.idl
+++ b/offapi/com/sun/star/drawing/CaptionShape.idl
@@ -27,33 +27,16 @@
 #ifndef __com_sun_star_drawing_CaptionShape_idl__ 
 #define __com_sun_star_drawing_CaptionShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__ 
 #include <com/sun/star/drawing/FillProperties.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/ClosedBezierShape.idl b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
index 717f0f0d8..af5cf13d3 100644
--- a/offapi/com/sun/star/drawing/ClosedBezierShape.idl
+++ b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_drawing_ClosedBezierShape_idl__ 
 #define __com_sun_star_drawing_ClosedBezierShape_idl__ 
 
-#ifndef __com_sun_star_drawing_LineShape_idl__ 
 #include <com/sun/star/drawing/LineShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_FillProperties_idl__ 
 #include <com/sun/star/drawing/FillProperties.idl> 
-#endif 
   
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__ 
 #include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/ConnectorProperties.idl b/offapi/com/sun/star/drawing/ConnectorProperties.idl
index 51300ea85..02a7afaf1 100644
--- a/offapi/com/sun/star/drawing/ConnectorProperties.idl
+++ b/offapi/com/sun/star/drawing/ConnectorProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_ConnectorProperties_idl__ 
 #define __com_sun_star_drawing_ConnectorProperties_idl__ 
  
-#ifndef __com_sun_star_drawing_ConnectorType_idl__ 
 #include <com/sun/star/drawing/ConnectorType.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/ConnectorShape.idl b/offapi/com/sun/star/drawing/ConnectorShape.idl
index 0ae94af11..447574c3d 100644
--- a/offapi/com/sun/star/drawing/ConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/ConnectorShape.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_drawing_ConnectorShape_idl__ 
 #define __com_sun_star_drawing_ConnectorShape_idl__ 
  
-#ifndef __com_sun_star_drawing_XConnectorShape_idl__ 
 #include <com/sun/star/drawing/XConnectorShape.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_ConnectorProperties_idl__ 
 #include <com/sun/star/drawing/ConnectorProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/ControlShape.idl b/offapi/com/sun/star/drawing/ControlShape.idl
index ca0767750..8f3e42f5c 100644
--- a/offapi/com/sun/star/drawing/ControlShape.idl
+++ b/offapi/com/sun/star/drawing/ControlShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_ControlShape_idl__ 
 #define __com_sun_star_drawing_ControlShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XControlShape_idl__ 
 #include <com/sun/star/drawing/XControlShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
index a4bf78c80..a9f7d635f 100644
--- a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_CoordinateSequenceSequence_idl__
 #define __com_sun_star_drawing_CoordinateSequenceSequence_idl__
 
-#ifndef __com_sun_star_drawing_CoordinateSequence_idl__
 #include <com/sun/star/drawing/CoordinateSequence.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/CustomShape.idl b/offapi/com/sun/star/drawing/CustomShape.idl
index 4ed2579ce..d46c8045d 100644
--- a/offapi/com/sun/star/drawing/CustomShape.idl
+++ b/offapi/com/sun/star/drawing/CustomShape.idl
@@ -27,33 +27,16 @@
 #ifndef __com_sun_star_drawing_CustomShape_idl__ 
 #define __com_sun_star_drawing_CustomShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_FillProperties_idl__ 
 #include <com/sun/star/drawing/FillProperties.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/CustomShapeEngine.idl b/offapi/com/sun/star/drawing/CustomShapeEngine.idl
index a72d2a4c9..95e6361d6 100644
--- a/offapi/com/sun/star/drawing/CustomShapeEngine.idl
+++ b/offapi/com/sun/star/drawing/CustomShapeEngine.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_CustomShapeEngine_idl__ 
 #define __com_sun_star_drawing_CustomShapeEngine_idl__ 
  
-#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__
 #include <com/sun/star/drawing/XCustomShapeEngine.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/DashTable.idl b/offapi/com/sun/star/drawing/DashTable.idl
index e41ea0c9c..a3b841023 100644
--- a/offapi/com/sun/star/drawing/DashTable.idl
+++ b/offapi/com/sun/star/drawing/DashTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_DashTable_idl__ 
 #define __com_sun_star_drawing_DashTable_idl__ 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/Defaults.idl b/offapi/com/sun/star/drawing/Defaults.idl
index 35e5cbc10..b957019d3 100644
--- a/offapi/com/sun/star/drawing/Defaults.idl
+++ b/offapi/com/sun/star/drawing/Defaults.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_drawing_Defaults_idl__
 #define __com_sun_star_drawing_Defaults_idl__
 
-#ifndef __com_sun_star_drawing_TextProperties_idl__
 #include <com/sun/star/drawing/TextProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
 #include <com/sun/star/drawing/ConnectorProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_MeasureProperties_idl__
 #include <com/sun/star/drawing/MeasureProperties.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/DocumentSettings.idl b/offapi/com/sun/star/drawing/DocumentSettings.idl
index 2ebfc6065..604ddc2e5 100644
--- a/offapi/com/sun/star/drawing/DocumentSettings.idl
+++ b/offapi/com/sun/star/drawing/DocumentSettings.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_drawing_DocumentSettings_idl__
 #define __com_sun_star_drawing_DocumentSettings_idl__
 
-#ifndef __com_sun_star_document_Settings_idl__
 #include <com/sun/star/document/Settings.idl>
-#endif
-
-#ifndef __com_sun_star_document_HeaderFooterSettings_idl__
 #include <com/sun/star/document/HeaderFooterSettings.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
index 427fb051d..25c7e5a9f 100644
--- a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_DoubleSequenceSequence_idl__
 #define __com_sun_star_drawing_DoubleSequenceSequence_idl__
 
-#ifndef __com_sun_star_drawing_DoubleSequence_idl__
 #include <com/sun/star/drawing/DoubleSequence.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/DrawPage.idl b/offapi/com/sun/star/drawing/DrawPage.idl
index bc0b033c6..8bbfc2b9a 100644
--- a/offapi/com/sun/star/drawing/DrawPage.idl
+++ b/offapi/com/sun/star/drawing/DrawPage.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_drawing_DrawPage_idl__ 
 #define __com_sun_star_drawing_DrawPage_idl__ 
  
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__ 
 #include <com/sun/star/drawing/GenericDrawPage.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XMasterPageTarget_idl__ 
 #include <com/sun/star/drawing/XMasterPageTarget.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XFormsSupplier_idl__ 
 #include <com/sun/star/form/XFormsSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/DrawPages.idl b/offapi/com/sun/star/drawing/DrawPages.idl
index 73ae48965..53d81bcaa 100644
--- a/offapi/com/sun/star/drawing/DrawPages.idl
+++ b/offapi/com/sun/star/drawing/DrawPages.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_DrawPages_idl__ 
 #define __com_sun_star_drawing_DrawPages_idl__ 
  
-#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
 #include <com/sun/star/drawing/XDrawPages.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__ 
 #include <com/sun/star/drawing/XDrawPageSummarizer.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPageExpander_idl__ 
 #include <com/sun/star/drawing/XDrawPageExpander.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/DrawingDocument.idl b/offapi/com/sun/star/drawing/DrawingDocument.idl
index a269618fb..2f9a39e34 100644
--- a/offapi/com/sun/star/drawing/DrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_DrawingDocument_idl__
 #define __com_sun_star_drawing_DrawingDocument_idl__
 
-#ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
 #include <com/sun/star/drawing/GenericDrawingDocument.idl>
-#endif
 
 //=============================================================================
 
@@ -40,7 +38,7 @@
 /** specifies a document which consists of multiple pages
     with drawings.
  */
-service DrawingDocument
+published service DrawingDocument
 {
     /** this base service describes the whole functionality of such DrawingDocument. */
     service GenericDrawingDocument;
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
index c175c7b34..ff365780f 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
@@ -27,37 +27,18 @@
 #ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__ 
 #define __com_sun_star_drawing_DrawingDocumentDrawView_idl__ 
  
-#ifndef __com_sun_star_drawing_XDrawView_idl__ 
 #include <com/sun/star/drawing/XDrawView.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_frame_Controller_idl__ 
 #include <com/sun/star/frame/Controller.idl> 
-#endif 
  
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
 #include <com/sun/star/view/XSelectionSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
 #include <com/sun/star/lang/XServiceInfo.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 //============================================================================= 
 module com {  module sun {  module star {  module view {
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
index be3ef6cd3..a8762ab0b 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_DrawingDocumentFactory_idl__
 #define __com::sun::star::drawing_DrawingDocumentFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EllipseShape.idl b/offapi/com/sun/star/drawing/EllipseShape.idl
index cdc52ab8f..1b553ec45 100644
--- a/offapi/com/sun/star/drawing/EllipseShape.idl
+++ b/offapi/com/sun/star/drawing/EllipseShape.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_drawing_EllipseShape_idl__ 
 #define __com_sun_star_drawing_EllipseShape_idl__ 
 
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_FillProperties_idl__ 
 #include <com/sun/star/drawing/FillProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_CircleKind_idl__
 #include <com/sun/star/drawing/CircleKind.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
index 8eb1da01c..ebdbabb26 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
 
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
index 4ebd27990..746c036f1 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
@@ -27,30 +27,14 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeExtrusion_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeExtrusion_idl__
 
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_Position3D_idl__ 
 #include <com/sun/star/drawing/Position3D.idl>
-#endif
-#ifndef __com_sun_star_drawing_Direction3D_idl__ 
 #include <com/sun/star/drawing/Direction3D.idl>
-#endif
-#ifndef __com_sun_star_drawing_ProjectionMode_idl__ 
 #include <com/sun/star/drawing/ProjectionMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadeMode_idl__ 
 #include <com/sun/star/drawing/ShadeMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
index 8538e3709..db36c29ec 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeGeometry_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeGeometry_idl__
 
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__ 
 #include <com/sun/star/drawing/EnhancedCustomShapeHandle.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__ 
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
index 2d5f57d57..24e5aeed4 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
 
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
index 5b6a92bd1..6a3dca9e2 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
   
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameter_idl__ 
 #include <com/sun/star/drawing/EnhancedCustomShapeParameter.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
index b15de6f5e..829f1e5a7 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapePath_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapePath_idl__
 
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
-#ifndef __sun_star_drawing_EnhancedCustomShapeSegment_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.idl>
-#endif
-#ifndef __sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
index 6b0ad9f84..426df1891 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeSegment_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeSegment_idl__
 
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeSegmentCommand_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
index 88a1cb8d5..b4787ec03 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
   
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__ 
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
index 820c94a09..a6dc9277c 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeTextPath_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeTextPath_idl__
 
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeTextPathMode_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/FillProperties.idl b/offapi/com/sun/star/drawing/FillProperties.idl
index dd07f73ea..eb35d3acf 100644
--- a/offapi/com/sun/star/drawing/FillProperties.idl
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_drawing_FillProperties_idl__
 #define __com_sun_star_drawing_FillProperties_idl__
 
-#ifndef __com_sun_star_drawing_FillStyle_idl__
 #include <com/sun/star/drawing/FillStyle.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Gradient_idl__
 #include <com/sun/star/awt/Gradient.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Hatch_idl__
 #include <com/sun/star/drawing/Hatch.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_BitmapMode_idl__
 #include <com/sun/star/drawing/BitmapMode.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
 #include <com/sun/star/drawing/RectanglePoint.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/FlagSequence.idl b/offapi/com/sun/star/drawing/FlagSequence.idl
index 01e115492..38ce17d7d 100644
--- a/offapi/com/sun/star/drawing/FlagSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_FlagSequence_idl__
 #define __com_sun_star_drawing_FlagSequence_idl__
 
-#ifndef __com_sun_star_drawing_PolygonFlags_idl__
 #include <com/sun/star/drawing/PolygonFlags.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
index 01bc7bdc4..8fc5f134b 100644
--- a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_FlagSequenceSequence_idl__
 #define __com_sun_star_drawing_FlagSequenceSequence_idl__
 
-#ifndef __com_sun_star_drawing_FlagSequence_idl__
 #include <com/sun/star/drawing/FlagSequence.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/GenericDrawPage.idl b/offapi/com/sun/star/drawing/GenericDrawPage.idl
index a5432f666..cd3504b8f 100644
--- a/offapi/com/sun/star/drawing/GenericDrawPage.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawPage.idl
@@ -27,41 +27,23 @@
 #ifndef __com_sun_star_drawing_GenericDrawPage_idl__ 
 #define __com_sun_star_drawing_GenericDrawPage_idl__ 
  
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
 #include <com/sun/star/drawing/XShapes.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapeGrouper_idl__ 
 #include <com/sun/star/drawing/XShapeGrouper.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapeCombiner_idl__ 
 #include <com/sun/star/drawing/XShapeCombiner.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapeBinder_idl__ 
 #include <com/sun/star/drawing/XShapeBinder.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
 #include <com/sun/star/lang/XServiceInfo.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_view_PaperOrientation_idl__ 
 #include <com/sun/star/view/PaperOrientation.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
index db54258ad..7cad94297 100644
--- a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,49 +27,17 @@
 #ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
 #define __com_sun_star_drawing_GenericDrawingDocument_idl__
 
-#ifndef __com_sun_star_drawing_XDrawPageDuplicator_idl__
 #include <com/sun/star/drawing/XDrawPageDuplicator.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
 #include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XMasterPagesSupplier_idl__
 #include <com/sun/star/drawing/XMasterPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XLayerSupplier_idl__
 #include <com/sun/star/drawing/XLayerSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
 #include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
-
-#ifndef __com_sun_star_document_OfficeDocument_idl__
 #include <com/sun/star/document/OfficeDocument.idl>
-#endif
 
 //=============================================================================
 
@@ -82,7 +50,7 @@
 
     <p>Because its function is needed more then once, its defined as generic one.</p>
  */
-service GenericDrawingDocument
+published service GenericDrawingDocument
 {
     /** this base service describes storing and printing */
     service com::sun::star::document::OfficeDocument;
diff --git a/offapi/com/sun/star/drawing/GluePoint.idl b/offapi/com/sun/star/drawing/GluePoint.idl
index d2fa2a5cb..3cd82e9be 100644
--- a/offapi/com/sun/star/drawing/GluePoint.idl
+++ b/offapi/com/sun/star/drawing/GluePoint.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_GluePoint_idl__ 
 #define __com_sun_star_drawing_GluePoint_idl__ 
  
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/GluePoint2.idl b/offapi/com/sun/star/drawing/GluePoint2.idl
index dc5269665..36cc2c2b9 100644
--- a/offapi/com/sun/star/drawing/GluePoint2.idl
+++ b/offapi/com/sun/star/drawing/GluePoint2.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_drawing_GluePoint2_idl__ 
 #define __com_sun_star_drawing_GluePoint2_idl__ 
  
-#ifndef __com_sun_star_drawing_Alignment_idl__
 #include <com/sun/star/drawing/Alignment.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_EscapeDirection_idl__ 
 #include <com/sun/star/drawing/EscapeDirection.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/GradientTable.idl b/offapi/com/sun/star/drawing/GradientTable.idl
index 7630303f1..94ce06370 100644
--- a/offapi/com/sun/star/drawing/GradientTable.idl
+++ b/offapi/com/sun/star/drawing/GradientTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_GradientTable_idl__ 
 #define __com_sun_star_drawing_GradientTable_idl__ 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/GraphicExportFilter.idl b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
index 317114d93..e8c19e1bd 100644
--- a/offapi/com/sun/star/drawing/GraphicExportFilter.idl
+++ b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_drawing_GraphicExportFilter_idl__
 #define __com_sun_star_drawing_GraphicExportFilter_idl__
 
-#ifndef __com_sun_star_document_XFilter_idl__
 #include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XExporter_idl__
 #include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XMimeTypeInfo_idl__
 #include <com/sun/star/document/XMimeTypeInfo.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/GraphicFilterRequest.idl b/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
index eb6062b74..5e3561bdd 100644
--- a/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
+++ b/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_GraphicFilterRequest_idl__
 #define __com_sun_star_drawing_GraphicFilterRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index 0331bd83c..286bcd5f2 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -27,37 +27,19 @@
 #ifndef __com_sun_star_drawing_GraphicObjectShape_idl__ 
 #define __com_sun_star_drawing_GraphicObjectShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
   
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
  
-#ifndef __com_sun_star_drawing_ColorMode_idl__
 #include <com/sun/star/drawing/ColorMode.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/GroupShape.idl b/offapi/com/sun/star/drawing/GroupShape.idl
index 49538a307..82d1c5af9 100644
--- a/offapi/com/sun/star/drawing/GroupShape.idl
+++ b/offapi/com/sun/star/drawing/GroupShape.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_drawing_GroupShape_idl__ 
 #define __com_sun_star_drawing_GroupShape_idl__ 
  
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__ 
 #include <com/sun/star/drawing/XShapeGroup.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
 #include <com/sun/star/drawing/XShapes.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/Hatch.idl b/offapi/com/sun/star/drawing/Hatch.idl
index 1a544d686..dba5b0a9e 100644
--- a/offapi/com/sun/star/drawing/Hatch.idl
+++ b/offapi/com/sun/star/drawing/Hatch.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_Hatch_idl__ 
 #define __com_sun_star_drawing_Hatch_idl__ 
  
-#ifndef __com_sun_star_drawing_HatchStyle_idl__ 
 #include <com/sun/star/drawing/HatchStyle.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__ 
 #include <com/sun/star/util/Color.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/HatchTable.idl b/offapi/com/sun/star/drawing/HatchTable.idl
index aa61bea9b..30d93d0b5 100644
--- a/offapi/com/sun/star/drawing/HatchTable.idl
+++ b/offapi/com/sun/star/drawing/HatchTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_HatchTable_idl__ 
 #define __com_sun_star_drawing_HatchTable_idl__ 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix.idl b/offapi/com/sun/star/drawing/HomogenMatrix.idl
index b8f80156d..fd8af8571 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_HomogenMatrix_idl__ 
 #define __com_sun_star_drawing_HomogenMatrix_idl__ 
  
-#ifndef __com_sun_star_drawing_HomogenMatrixLine_idl__ 
 #include <com/sun/star/drawing/HomogenMatrixLine.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix3.idl b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
index 0784a753e..1aca1e83f 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix3.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_HomogenMatrix3_idl__ 
 #define __com_sun_star_drawing_HomogenMatrix3_idl__ 
  
-#ifndef __com_sun_star_drawing_HomogenMatrixLine3_idl__ 
 #include <com/sun/star/drawing/HomogenMatrixLine3.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix4.idl b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
index 615120de4..c71cffd15 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix4.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_HomogenMatrix4_idl__ 
 #define __com_sun_star_drawing_HomogenMatrix4_idl__ 
  
-#ifndef __com_sun_star_drawing_HomogenMatrixLine4_idl__ 
 #include <com/sun/star/drawing/HomogenMatrixLine4.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/Layer.idl b/offapi/com/sun/star/drawing/Layer.idl
index 9aff24a4c..d4ac568e3 100644
--- a/offapi/com/sun/star/drawing/Layer.idl
+++ b/offapi/com/sun/star/drawing/Layer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_Layer_idl__ 
 #define __com_sun_star_drawing_Layer_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/LayerManager.idl b/offapi/com/sun/star/drawing/LayerManager.idl
index abf61cd43..5ebd8ef1d 100644
--- a/offapi/com/sun/star/drawing/LayerManager.idl
+++ b/offapi/com/sun/star/drawing/LayerManager.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_LayerManager_idl__ 
 #define __com_sun_star_drawing_LayerManager_idl__ 
  
-#ifndef __com_sun_star_drawing_XLayerManager_idl__ 
 #include <com/sun/star/drawing/XLayerManager.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/LineDash.idl b/offapi/com/sun/star/drawing/LineDash.idl
index cc7c95f9b..83e3e0d22 100644
--- a/offapi/com/sun/star/drawing/LineDash.idl
+++ b/offapi/com/sun/star/drawing/LineDash.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_LineDash_idl__ 
 #define __com_sun_star_drawing_LineDash_idl__ 
  
-#ifndef __com_sun_star_drawing_DashStyle_idl__ 
 #include <com/sun/star/drawing/DashStyle.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/LineProperties.idl b/offapi/com/sun/star/drawing/LineProperties.idl
index 3de848c33..a384265cd 100644
--- a/offapi/com/sun/star/drawing/LineProperties.idl
+++ b/offapi/com/sun/star/drawing/LineProperties.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_drawing_LineProperties_idl__
 #define __com_sun_star_drawing_LineProperties_idl__
 
-#ifndef __com_sun_star_drawing_LineStyle_idl__
 #include <com/sun/star/drawing/LineStyle.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineDash_idl__
 #include <com/sun/star/drawing/LineDash.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineJoint_idl__
 #include <com/sun/star/drawing/LineJoint.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/LineShape.idl b/offapi/com/sun/star/drawing/LineShape.idl
index a2b3b8bf9..23aba7d4e 100644
--- a/offapi/com/sun/star/drawing/LineShape.idl
+++ b/offapi/com/sun/star/drawing/LineShape.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_drawing_LineShape_idl__ 
 #define __com_sun_star_drawing_LineShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__ 
 #include <com/sun/star/drawing/PolyPolygonDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/MarkerTable.idl b/offapi/com/sun/star/drawing/MarkerTable.idl
index fc677d136..bca36f42e 100644
--- a/offapi/com/sun/star/drawing/MarkerTable.idl
+++ b/offapi/com/sun/star/drawing/MarkerTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_MarkerTable_idl__ 
 #define __com_sun_star_drawing_MarkerTable_idl__ 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/MasterPage.idl b/offapi/com/sun/star/drawing/MasterPage.idl
index a0330bf3c..ed70ec562 100644
--- a/offapi/com/sun/star/drawing/MasterPage.idl
+++ b/offapi/com/sun/star/drawing/MasterPage.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_MasterPage_idl__ 
 #define __com_sun_star_drawing_MasterPage_idl__ 
  
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__ 
 #include <com/sun/star/drawing/GenericDrawPage.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/MasterPages.idl b/offapi/com/sun/star/drawing/MasterPages.idl
index b316989e5..82747f690 100644
--- a/offapi/com/sun/star/drawing/MasterPages.idl
+++ b/offapi/com/sun/star/drawing/MasterPages.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_MasterPages_idl__ 
 #define __com_sun_star_drawing_MasterPages_idl__ 
  
-#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
 #include <com/sun/star/drawing/XDrawPages.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/MeasureProperties.idl b/offapi/com/sun/star/drawing/MeasureProperties.idl
index e73b01cae..e39994229 100644
--- a/offapi/com/sun/star/drawing/MeasureProperties.idl
+++ b/offapi/com/sun/star/drawing/MeasureProperties.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_MeasureProperties_idl__ 
 #define __com_sun_star_drawing_MeasureProperties_idl__ 
  
-#ifndef __com_sun_star_drawing_MeasureKind_idl__ 
 #include <com/sun/star/drawing/MeasureKind.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_MeasureTextHorzPos_idl__ 
 #include <com/sun/star/drawing/MeasureTextHorzPos.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_MeasureTextVertPos_idl__ 
 #include <com/sun/star/drawing/MeasureTextVertPos.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/MeasureShape.idl b/offapi/com/sun/star/drawing/MeasureShape.idl
index ddb309274..36ab21af9 100644
--- a/offapi/com/sun/star/drawing/MeasureShape.idl
+++ b/offapi/com/sun/star/drawing/MeasureShape.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_drawing_MeasureShape_idl__ 
 #define __com_sun_star_drawing_MeasureShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_MeasureProperties_idl__ 
 #include <com/sun/star/drawing/MeasureProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/OLE2Shape.idl b/offapi/com/sun/star/drawing/OLE2Shape.idl
index 959f32449..b92f51348 100644
--- a/offapi/com/sun/star/drawing/OLE2Shape.idl
+++ b/offapi/com/sun/star/drawing/OLE2Shape.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_drawing_OLE2Shape_idl__
 #define __com_sun_star_drawing_OLE2Shape_idl__
 
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
 #include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/OpenBezierShape.idl b/offapi/com/sun/star/drawing/OpenBezierShape.idl
index beb97b938..d97b5e56f 100644
--- a/offapi/com/sun/star/drawing/OpenBezierShape.idl
+++ b/offapi/com/sun/star/drawing/OpenBezierShape.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_drawing_OpenBezierShape_idl__ 
 #define __com_sun_star_drawing_OpenBezierShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__ 
 #include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/PageShape.idl b/offapi/com/sun/star/drawing/PageShape.idl
index 78e5fa06f..4d3e914a4 100644
--- a/offapi/com/sun/star/drawing/PageShape.idl
+++ b/offapi/com/sun/star/drawing/PageShape.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_PageShape_idl__ 
 #define __com_sun_star_drawing_PageShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/PluginShape.idl b/offapi/com/sun/star/drawing/PluginShape.idl
index 5edaf73e0..514254267 100644
--- a/offapi/com/sun/star/drawing/PluginShape.idl
+++ b/offapi/com/sun/star/drawing/PluginShape.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_drawing_PluginShape_idl__
 #define __com_sun_star_drawing_PluginShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/PointSequence.idl b/offapi/com/sun/star/drawing/PointSequence.idl
index 37406e9b1..ff64cfd1d 100644
--- a/offapi/com/sun/star/drawing/PointSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_PointSequence_idl__
 #define __com_sun_star_drawing_PointSequence_idl__
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/PointSequenceSequence.idl b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
index d46345a39..19c501fad 100644
--- a/offapi/com/sun/star/drawing/PointSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
 #define __com_sun_star_drawing_PointSequenceSequence_idl__
 
-#ifndef __com_sun_star_drawing_PointSequence_idl__
 #include <com/sun/star/drawing/PointSequence.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/PolyLineShape.idl b/offapi/com/sun/star/drawing/PolyLineShape.idl
index d0a1368d3..19fe34d68 100644
--- a/offapi/com/sun/star/drawing/PolyLineShape.idl
+++ b/offapi/com/sun/star/drawing/PolyLineShape.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_drawing_PolyLineShape_idl__ 
 #define __com_sun_star_drawing_PolyLineShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__ 
 #include <com/sun/star/drawing/PolyPolygonDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
index eaa8f59d7..977cfe848 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__ 
 #define __com_sun_star_drawing_PolyPolygonBezierCoords_idl__ 
  
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__ 
 #include <com/sun/star/drawing/PointSequenceSequence.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_FlagSequenceSequence_idl__ 
 #include <com/sun/star/drawing/FlagSequenceSequence.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
index e9ca54a44..ec3d25c48 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__ 
 #define __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__ 
  
-#ifndef __com_sun_star_drawing_PolygonKind_idl__ 
 #include <com/sun/star/drawing/PolygonKind.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__ 
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
index 00800726b..7de116a66 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_drawing_PolyPolygonBezierShape_idl__ 
 #define __com_sun_star_drawing_PolyPolygonBezierShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__ 
 #include <com/sun/star/drawing/FillProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__ 
 #include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
index b44be55ce..af65e8a56 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__ 
 #define __com_sun_star_drawing_PolyPolygonDescriptor_idl__ 
  
-#ifndef __com_sun_star_drawing_PolygonKind_idl__ 
 #include <com/sun/star/drawing/PolygonKind.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__ 
 #include <com/sun/star/drawing/PointSequenceSequence.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape.idl b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
index 5ec61b9f7..32f0e8c48 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_drawing_PolyPolygonShape_idl__ 
 #define __com_sun_star_drawing_PolyPolygonShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__ 
 #include <com/sun/star/drawing/FillProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__ 
 #include <com/sun/star/drawing/PolyPolygonDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
index 0a5e2fab4..3fcf9a65a 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_PolyPolygonShape3D_idl__ 
 #define __com_sun_star_drawing_PolyPolygonShape3D_idl__ 
  
-#ifndef __com_sun_star_drawing_DoubleSequenceSequence_idl__ 
 #include <com/sun/star/drawing/DoubleSequenceSequence.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/RectangleShape.idl b/offapi/com/sun/star/drawing/RectangleShape.idl
index 3ee1626d0..64311fc8b 100644
--- a/offapi/com/sun/star/drawing/RectangleShape.idl
+++ b/offapi/com/sun/star/drawing/RectangleShape.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_drawing_RectangleShape_idl__ 
 #define __com_sun_star_drawing_RectangleShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__ 
 #include <com/sun/star/drawing/FillProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/ShadowProperties.idl b/offapi/com/sun/star/drawing/ShadowProperties.idl
index 0dd82a07b..7aecec8ae 100644
--- a/offapi/com/sun/star/drawing/ShadowProperties.idl
+++ b/offapi/com/sun/star/drawing/ShadowProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #define __com_sun_star_drawing_ShadowProperties_idl__ 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl
index 1a5ce84bd..b194811a2 100644
--- a/offapi/com/sun/star/drawing/Shape.idl
+++ b/offapi/com/sun/star/drawing/Shape.idl
@@ -27,37 +27,14 @@
 #ifndef __com_sun_star_drawing_Shape_idl__
 #define __com_sun_star_drawing_Shape_idl__
 
-#ifndef __com_sun_star_document_LinkTarget_idl__
 #include <com/sun/star/document/LinkTarget.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyle_idl__
 #include <com/sun/star/style/XStyle.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
 #include <com/sun/star/drawing/HomogenMatrix3.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XGluePointsSupplier_idl__
 #include <com/sun/star/drawing/XGluePointsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 #include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -201,9 +178,9 @@ published service Shape
     */
     [optional, property] long NavigationOrder;
 
-	/** this property lets you get and set a hyperlink for this shape.
-	 */
-	[optional, property] string Hyperlink;
+    /** this property lets you get and set a hyperlink for this shape.
+     */
+    [optional, property] string Hyperlink;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/ShapeCollection.idl b/offapi/com/sun/star/drawing/ShapeCollection.idl
index 8789c6196..c7bbcf428 100644
--- a/offapi/com/sun/star/drawing/ShapeCollection.idl
+++ b/offapi/com/sun/star/drawing/ShapeCollection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_drawing_ShapeCollection_idl__
 #define __com_sun_star_drawing_ShapeCollection_idl__
 
-#ifndef __com_sun_star_drawing_Shapes_idl__
 #include <com/sun/star/drawing/Shapes.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/Shapes.idl b/offapi/com/sun/star/drawing/Shapes.idl
index 4f769d63b..123124d05 100644
--- a/offapi/com/sun/star/drawing/Shapes.idl
+++ b/offapi/com/sun/star/drawing/Shapes.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_Shapes_idl__ 
 #define __com_sun_star_drawing_Shapes_idl__ 
  
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
 #include <com/sun/star/drawing/XShapes.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/SlideRenderer.idl b/offapi/com/sun/star/drawing/SlideRenderer.idl
index 07f97eaed..7d5711fe2 100644
--- a/offapi/com/sun/star/drawing/SlideRenderer.idl
+++ b/offapi/com/sun/star/drawing/SlideRenderer.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_SlideRenderer_idl__
 #define __com_sun_star_drawing_SlideRenderer_idl__
 
-#ifndef __com_sun_star_drawing_XSlideRenderer_idl__
 #include <com/sun/star/drawing/XSlideRenderer.idl>
-#endif
 
 module com { module sun { module star { module drawing {
 
diff --git a/offapi/com/sun/star/drawing/SlideSorter.idl b/offapi/com/sun/star/drawing/SlideSorter.idl
index 2f2404938..fda890bfe 100644
--- a/offapi/com/sun/star/drawing/SlideSorter.idl
+++ b/offapi/com/sun/star/drawing/SlideSorter.idl
@@ -28,110 +28,16 @@
 #ifndef __com_sun_star_drawing_SlideSorter_idl__
 #define __com_sun_star_drawing_SlideSorter_idl__
 
-#ifndef __com_sun_star_drawing_framework_XView_idl__
 #include <com/sun/star/drawing/framework/XView.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawView_idl__
 #include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
+#include <com/sun/star/drawing/XSlideSorterBase.idl>
 
 module com {  module sun {  module star {  module drawing {
 
-/** This interface exists only because services do not directly support
-    multiple inheritance and attributes.
-    <p>It provides the interfaces and attributes that every object that
-    implements the <type>SlideSorter</type> service.</p>
-*/
-interface XSlideSorterBase
-{
-    /** This interface is included to mark a <type>SlideSorter</type> object
-        as view of the drawing framework and to provide a
-        <type>ResourceId</type>.
-    */
-    interface ::com::sun::star::drawing::framework::XView;
-
-    /** The <type>XDrawView</type> interface is included to provide access
-        to the current slide (especially write access).
-    */
-    interface ::com::sun::star::drawing::XDrawView;
-
-    /** The set of slides that are displayed by the implementing object.
-        <p>The default value is the set of all slides of the document for
-        which a slide sorter is created.</p>
-    */
-    [attribute] ::com::sun::star::container::XIndexAccess DocumentSlides;
-
-    /** Set this flag to <TRUE/> in order to have the current slide
-        highlighted.
-        <p>The default value is <FALSE/>.</p>
-    */
-    [attribute] boolean IsHighlightCurrentSlide;
-
-    /** Set this flag to <TRUE/> in order to visualize the selection of
-        slides (typically a bold frame around the selected slides).
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsShowSelection;
-
-    /** Set this flag to <TRUE/> to visualize to where the focus is by
-        showing a dotted rectangle around the focused slide.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsShowFocus;
-
-    /** When this flag has the value <TRUE/> then every time the current
-        slide is changed the visual area is shifted so that the new current
-        slide is display in the center of the slide sorter window.
-        <p>It is not always possible to move the current slide into the
-        exact center of the window, for example when slides are located near
-        the start or end of a document.</p>
-        <p>The default value is <FALSE/>.
-    */
-    [attribute] boolean IsCenterSelection;
-
-    /** This flag controls whether updates of previews are created during
-        full screen presentations (<FALSE/>) or not (<TRUE/>).  The
-        suspension of preview creations is an optimization for not slowing
-        down a running presentation.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsSuspendPreviewUpdatesDuringFullScreenPresentation;
-
-    /** The orientation of a slide sorter can be either vertical (<TRUE/>)
-        or horizontal (<FALSE/>).
-    */
-    [attribute] boolean IsOrientationVertical;
-
-    /** This flag is a hint to make scrolling look smooth.
-    */
-    [attribute] boolean IsSmoothScrolling;
-
-    [attribute] ::com::sun::star::util::Color BackgroundColor;
-    [attribute] ::com::sun::star::util::Color TextColor;
-    [attribute] ::com::sun::star::util::Color SelectionColor;
-    [attribute] ::com::sun::star::util::Color HighlightColor;
-
-    /** This flag controls whether the model can be modified by using
-        keyboard or mouse.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsUIReadOnly;
-};
-
-
-
 
 /** A slide sorter shows previews for a set of slides, typically all slides
     in a document, and allows the selection, reordering, creation, and
diff --git a/offapi/com/sun/star/drawing/Text.idl b/offapi/com/sun/star/drawing/Text.idl
index 5d1fc5e5c..372da35a4 100644
--- a/offapi/com/sun/star/drawing/Text.idl
+++ b/offapi/com/sun/star/drawing/Text.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_Text_idl__ 
 #define __com_sun_star_drawing_Text_idl__ 
  
-#ifndef __com_sun_star_text_XText_idl__ 
 #include <com/sun/star/text/XText.idl> 
-#endif 
   
-#ifndef __com_sun_star_drawing_TextProperties_idl__ 
 #include <com/sun/star/drawing/TextProperties.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/TextProperties.idl b/offapi/com/sun/star/drawing/TextProperties.idl
index 3a70ccf9f..5ee1dc624 100644
--- a/offapi/com/sun/star/drawing/TextProperties.idl
+++ b/offapi/com/sun/star/drawing/TextProperties.idl
@@ -27,61 +27,27 @@
 #ifndef __com_sun_star_drawing_TextProperties_idl__ 
 #define __com_sun_star_drawing_TextProperties_idl__ 
 
-#ifndef __com_sun_star_container_XIndexReplace_idl__ 
 #include <com/sun/star/container/XIndexReplace.idl> 
-#endif 
  
-#ifndef __com_sun_star_style_CharacterProperties_idl__ 
 #include <com/sun/star/style/CharacterProperties.idl> 
-#endif 
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__ 
 #include <com/sun/star/style/CharacterPropertiesAsian.idl> 
-#endif 
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__ 
 #include <com/sun/star/style/CharacterPropertiesComplex.idl> 
-#endif 
  
-#ifndef __com_sun_star_style_ParagraphProperties_idl__ 
 #include <com/sun/star/style/ParagraphProperties.idl> 
-#endif 
-
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__ 
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl> 
-#endif 
-
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__ 
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__ 
 #include <com/sun/star/drawing/TextFitToSizeType.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextAdjust_idl__ 
 #include <com/sun/star/drawing/TextAdjust.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextAnimationDirection_idl__ 
 #include <com/sun/star/drawing/TextAnimationDirection.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextAnimationKind_idl__ 
 #include <com/sun/star/drawing/TextAnimationKind.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextVerticalAdjust_idl__ 
 #include <com/sun/star/drawing/TextVerticalAdjust.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_TextHorizontalAdjust_idl__ 
 #include <com/sun/star/drawing/TextHorizontalAdjust.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_WritingMode_idl__ 
 #include <com/sun/star/text/WritingMode.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/TextShape.idl b/offapi/com/sun/star/drawing/TextShape.idl
index 0db839c2c..c5802348b 100644
--- a/offapi/com/sun/star/drawing/TextShape.idl
+++ b/offapi/com/sun/star/drawing/TextShape.idl
@@ -27,29 +27,15 @@
 #ifndef __com_sun_star_drawing_TextShape_idl__ 
 #define __com_sun_star_drawing_TextShape_idl__ 
  
-#ifndef __com_sun_star_drawing_Shape_idl__ 
 #include <com/sun/star/drawing/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Text_idl__ 
 #include <com/sun/star/drawing/Text.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__ 
 #include <com/sun/star/drawing/FillProperties.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__ 
 #include <com/sun/star/drawing/LineProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
 #include <com/sun/star/drawing/ShadowProperties.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
 #include <com/sun/star/drawing/RotationDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
index 030c78172..a42cd344e 100644
--- a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
+++ b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_TransparencyGradientTable_idl__ 
 #define __com_sun_star_drawing_TransparencyGradientTable_idl__ 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/XConnectableShape.idl b/offapi/com/sun/star/drawing/XConnectableShape.idl
index 174924e5f..72d62f571 100644
--- a/offapi/com/sun/star/drawing/XConnectableShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectableShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XConnectableShape_idl__ 
 #define __com_sun_star_drawing_XConnectableShape_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XConnectorShape.idl b/offapi/com/sun/star/drawing/XConnectorShape.idl
index 2163f45ad..3ae3cced4 100644
--- a/offapi/com/sun/star/drawing/XConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectorShape.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XConnectorShape_idl__ 
 #define __com_sun_star_drawing_XConnectorShape_idl__ 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XConnectableShape_idl__ 
 #include <com/sun/star/drawing/XConnectableShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_ConnectionType_idl__ 
 #include <com/sun/star/drawing/ConnectionType.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XControlShape.idl b/offapi/com/sun/star/drawing/XControlShape.idl
index 2bcbbe88c..9ad0ecf0a 100644
--- a/offapi/com/sun/star/drawing/XControlShape.idl
+++ b/offapi/com/sun/star/drawing/XControlShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XControlShape_idl__ 
 #define __com_sun_star_drawing_XControlShape_idl__ 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XControlModel_idl__ 
 #include <com/sun/star/awt/XControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XCustomShapeEngine.idl b/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
index 9a934de4f..ee195caa2 100644
--- a/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
+++ b/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__ 
 #define __com_sun_star_drawing_XCustomShapeEngine_idl__ 
 
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl> 
-#endif 
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__ 
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
-#ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__ 
 #include <com/sun/star/drawing/XCustomShapeHandle.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/XCustomShapeHandle.idl b/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
index 1f274c0d2..8fadedd21 100644
--- a/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
+++ b/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__ 
 #define __com_sun_star_drawing_XCustomShapeHandle_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/XDrawPage.idl b/offapi/com/sun/star/drawing/XDrawPage.idl
index 0ee0e5e87..a80d723e2 100644
--- a/offapi/com/sun/star/drawing/XDrawPage.idl
+++ b/offapi/com/sun/star/drawing/XDrawPage.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #define __com_sun_star_drawing_XDrawPage_idl__ 
  
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
 #include <com/sun/star/drawing/XShapes.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
index f08c87fb7..5b0ae0ac0 100644
--- a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XDrawPageDuplicator_idl__ 
 #define __com_sun_star_drawing_XDrawPageDuplicator_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XDrawPageExpander.idl b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
index 92e436fe0..36d2d35de 100644
--- a/offapi/com/sun/star/drawing/XDrawPageExpander.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XDrawPageExpander_idl__ 
 #define __com_sun_star_drawing_XDrawPageExpander_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
 #include <com/sun/star/drawing/XDrawPages.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
index 557f3ccfb..f4f9e2bf0 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__ 
 #define __com_sun_star_drawing_XDrawPageSummarizer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
 #include <com/sun/star/drawing/XDrawPages.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
index 19e77b911..e2902bfe9 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XDrawPageSupplier_idl__ 
 #define __com_sun_star_drawing_XDrawPageSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XDrawPages.idl b/offapi/com/sun/star/drawing/XDrawPages.idl
index 73e036bb4..3e6cde0b9 100644
--- a/offapi/com/sun/star/drawing/XDrawPages.idl
+++ b/offapi/com/sun/star/drawing/XDrawPages.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XDrawPages_idl__ 
 #define __com_sun_star_drawing_XDrawPages_idl__ 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
index 436241b5a..3f848b9ed 100644
--- a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__ 
 #define __com_sun_star_drawing_XDrawPagesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
 #include <com/sun/star/drawing/XDrawPages.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XDrawSubController.idl b/offapi/com/sun/star/drawing/XDrawSubController.idl
index c4f1681de..23a62512a 100644
--- a/offapi/com/sun/star/drawing/XDrawSubController.idl
+++ b/offapi/com/sun/star/drawing/XDrawSubController.idl
@@ -28,19 +28,11 @@
 #ifndef __com_sun_star_drawing_XDrawSubController_idl__ 
 #define __com_sun_star_drawing_XDrawSubController_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__ 
 #include <com/sun/star/beans/XFastPropertySet.idl> 
-#endif 
-#ifndef __com_sun_star_drawing_XDrawView_idl__ 
 #include <com/sun/star/drawing/XDrawView.idl> 
-#endif 
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
 #include <com/sun/star/view/XSelectionSupplier.idl> 
-#endif 
  
  
  
diff --git a/offapi/com/sun/star/drawing/XDrawView.idl b/offapi/com/sun/star/drawing/XDrawView.idl
index 3ce9fc3fe..9a47daba0 100644
--- a/offapi/com/sun/star/drawing/XDrawView.idl
+++ b/offapi/com/sun/star/drawing/XDrawView.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XDrawView_idl__ 
 #define __com_sun_star_drawing_XDrawView_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl b/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
index e747eeaf8..8015b3c1a 100644
--- a/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
+++ b/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__ 
 #define __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
index 0a258076d..597f86e29 100644
--- a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
+++ b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XGluePointsSupplier_idl__ 
 #define __com_sun_star_drawing_XGluePointsSupplier_idl__ 
  
-#ifndef __com_sun_star_container_XIndexContainer_idl__ 
 #include <com/sun/star/container/XIndexContainer.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/XLayer.idl b/offapi/com/sun/star/drawing/XLayer.idl
index 738f7b406..2daeef0d5 100644
--- a/offapi/com/sun/star/drawing/XLayer.idl
+++ b/offapi/com/sun/star/drawing/XLayer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XLayer_idl__ 
 #define __com_sun_star_drawing_XLayer_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XLayerManager.idl b/offapi/com/sun/star/drawing/XLayerManager.idl
index 865fccfe6..5b4bf7f8e 100644
--- a/offapi/com/sun/star/drawing/XLayerManager.idl
+++ b/offapi/com/sun/star/drawing/XLayerManager.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_drawing_XLayerManager_idl__ 
 #define __com_sun_star_drawing_XLayerManager_idl__ 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XLayer_idl__ 
 #include <com/sun/star/drawing/XLayer.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XLayerSupplier.idl b/offapi/com/sun/star/drawing/XLayerSupplier.idl
index b5aecc8be..68f32c827 100644
--- a/offapi/com/sun/star/drawing/XLayerSupplier.idl
+++ b/offapi/com/sun/star/drawing/XLayerSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XLayerSupplier_idl__ 
 #define __com_sun_star_drawing_XLayerSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XMasterPageTarget.idl b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
index 763587bf1..c1b0c2a49 100644
--- a/offapi/com/sun/star/drawing/XMasterPageTarget.idl
+++ b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XMasterPageTarget_idl__ 
 #define __com_sun_star_drawing_XMasterPageTarget_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
index 4ffc451c9..0017694c4 100644
--- a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XMasterPagesSupplier_idl__ 
 #define __com_sun_star_drawing_XMasterPagesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
 #include <com/sun/star/drawing/XDrawPages.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl
index 8e3cf7ac3..2738289a0 100644
--- a/offapi/com/sun/star/drawing/XPresenterHelper.idl
+++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl
@@ -28,27 +28,14 @@
 #ifndef __com_sun_star_drawing_XPresenterHelper_idl__
 #define __com_sun_star_drawing_XPresenterHelper_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
 #include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
+#include <com/sun/star/drawing/CanvasFeature.idl>
 
 module com { module sun { module star { module drawing {
 
-constants CanvasFeature
-{
-    const short None = 0;
-    const short SpriteCanvas = 1;
-};
-
 /** This interface is a collection of functions that are necessary to
     implement larger parts of the presenter screen as extension.  The
     methods of this interface give access to services that can, at the
diff --git a/offapi/com/sun/star/drawing/XSelectionFunction.idl b/offapi/com/sun/star/drawing/XSelectionFunction.idl
index d7de4033b..fb486aa75 100644
--- a/offapi/com/sun/star/drawing/XSelectionFunction.idl
+++ b/offapi/com/sun/star/drawing/XSelectionFunction.idl
@@ -27,37 +27,15 @@
 #ifndef __com_sun_star_drawing_XSelectionFunction_idl__ 
 #define __com_sun_star_drawing_XSelectionFunction_idl__ 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif  
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
 #include <com/sun/star/lang/XServiceInfo.idl> 
-#endif  
-
-#ifndef __com_sun_star_frame_XDispatch_idl__ 
 #include <com/sun/star/frame/XDispatch.idl> 
-#endif  
-
-#ifndef __com_sun_star_awt_XKeyHandler_idl__ 
 #include <com/sun/star/awt/XKeyHandler.idl> 
-#endif  
-
-#ifndef __com_sun_star_awt_XMouseClickHandler_idl__ 
 #include <com/sun/star/awt/XMouseClickHandler.idl> 
-#endif  
-
-#ifndef __com_sun_star_awt_XMouseMotionHandler_idl__ 
 #include <com/sun/star/awt/XMouseMotionHandler.idl> 
-#endif  
-
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__ 
 #include <com/sun/star/view/XSelectionChangeListener.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/drawing/XShape.idl b/offapi/com/sun/star/drawing/XShape.idl
index 6869e0c44..dcb551cb0 100644
--- a/offapi/com/sun/star/drawing/XShape.idl
+++ b/offapi/com/sun/star/drawing/XShape.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_drawing_XShape_idl__ 
 #define __com_sun_star_drawing_XShape_idl__ 
  
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__ 
 #include <com/sun/star/drawing/XShapeDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
 #include <com/sun/star/beans/PropertyVetoException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XShapeAligner.idl b/offapi/com/sun/star/drawing/XShapeAligner.idl
index ed7ba262e..af30b69dd 100644
--- a/offapi/com/sun/star/drawing/XShapeAligner.idl
+++ b/offapi/com/sun/star/drawing/XShapeAligner.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XShapeAligner_idl__ 
 #define __com_sun_star_drawing_XShapeAligner_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
 #include <com/sun/star/drawing/XShapes.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Alignment_idl__ 
 #include <com/sun/star/drawing/Alignment.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XShapeArranger.idl b/offapi/com/sun/star/drawing/XShapeArranger.idl
index 39a7a6b66..6efbc9a81 100644
--- a/offapi/com/sun/star/drawing/XShapeArranger.idl
+++ b/offapi/com/sun/star/drawing/XShapeArranger.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_drawing_XShapeArranger_idl__ 
 #define __com_sun_star_drawing_XShapeArranger_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
 #include <com/sun/star/drawing/XShapes.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_Arrangement_idl__ 
 #include <com/sun/star/drawing/Arrangement.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XShapeBinder.idl b/offapi/com/sun/star/drawing/XShapeBinder.idl
index c2c21b92d..9fe15c7fd 100644
--- a/offapi/com/sun/star/drawing/XShapeBinder.idl
+++ b/offapi/com/sun/star/drawing/XShapeBinder.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XShapeBinder_idl__ 
 #define __com_sun_star_drawing_XShapeBinder_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
 #include <com/sun/star/drawing/XShapes.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XShapeCombiner.idl b/offapi/com/sun/star/drawing/XShapeCombiner.idl
index cfeff4eb3..022c616e0 100644
--- a/offapi/com/sun/star/drawing/XShapeCombiner.idl
+++ b/offapi/com/sun/star/drawing/XShapeCombiner.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XShapeCombiner_idl__ 
 #define __com_sun_star_drawing_XShapeCombiner_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
 #include <com/sun/star/drawing/XShapes.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XShapeDescriptor.idl b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
index c0d1830fe..d24938dfd 100644
--- a/offapi/com/sun/star/drawing/XShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XShapeDescriptor_idl__ 
 #define __com_sun_star_drawing_XShapeDescriptor_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XShapeGroup.idl b/offapi/com/sun/star/drawing/XShapeGroup.idl
index 536d1f264..4eecca1c7 100644
--- a/offapi/com/sun/star/drawing/XShapeGroup.idl
+++ b/offapi/com/sun/star/drawing/XShapeGroup.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XShapeGroup_idl__ 
 #define __com_sun_star_drawing_XShapeGroup_idl__ 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XShapeGrouper.idl b/offapi/com/sun/star/drawing/XShapeGrouper.idl
index 4611f5cad..107bf2833 100644
--- a/offapi/com/sun/star/drawing/XShapeGrouper.idl
+++ b/offapi/com/sun/star/drawing/XShapeGrouper.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XShapeGrouper_idl__ 
 #define __com_sun_star_drawing_XShapeGrouper_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__ 
 #include <com/sun/star/drawing/XShapeGroup.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
 #include <com/sun/star/drawing/XShapes.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XShapeMirror.idl b/offapi/com/sun/star/drawing/XShapeMirror.idl
index 5bbe7e97b..2b13e74d3 100644
--- a/offapi/com/sun/star/drawing/XShapeMirror.idl
+++ b/offapi/com/sun/star/drawing/XShapeMirror.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_drawing_XShapeMirror_idl__ 
 #define __com_sun_star_drawing_XShapeMirror_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
 #include <com/sun/star/drawing/XShapes.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_MirrorAxis_idl__ 
 #include <com/sun/star/drawing/MirrorAxis.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XShapes.idl b/offapi/com/sun/star/drawing/XShapes.idl
index 499800d03..0b42a57cc 100644
--- a/offapi/com/sun/star/drawing/XShapes.idl
+++ b/offapi/com/sun/star/drawing/XShapes.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XShapes_idl__ 
 #define __com_sun_star_drawing_XShapes_idl__ 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
index db615f0a2..a7977ccfd 100644
--- a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
+++ b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,44 +28,15 @@
 #ifndef __com_sun_star_drawing_XSlidePreviewCache_idl__
 #define __com_sun_star_drawing_XSlidePreviewCache_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
 #include <com/sun/star/geometry/IntegerSize2D.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
-
+#include <com/sun/star/drawing/XSlidePreviewCacheListener.idl>
 
 module com { module sun { module star { module drawing {
 
-/** Listener for asynchronous preview creations.  Called when a slide
-    preview has been created that was previously requested via a call to
-    <method>XSlidePreviewCache::getSlidePreview()</method>.  The 
-    implementor may then call <method>getSlidePreview()</method> a second
-    time to get the up-to-date version of the preview.
-*/
-interface XSlidePreviewCacheListener
-{
-    /** Called by a <interface>XSlidePreviewCache</interface> object when a
-        preview has been created for the slide with the given index.
-        @param nSlideIndex
-            The index of the slide for which a new preview has been created.
-    */
-    void notifyPreviewCreation ([in] long nSlideIndex);
-};
-
-
-
-
 /** A cache of preview bitmaps for the slides of one Impress or Draw
     document in one size.  There may be more than one cache for one
     document.  These are internally connected and for missing previews one
@@ -77,7 +48,7 @@ interface XSlidePreviewCacheListener
     order to allow multiple references to a single slide (custom
     presentations).
 */
-interface XSlidePreviewCache
+published interface XSlidePreviewCache
 {
     /** Set the set of slides for which the cache will provide the
         previews.  All slides in the given XIndexAccess are required to come
diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl b/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl
new file mode 100644
index 000000000..d6192889b
--- /dev/null
+++ b/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
+#define __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+module com { module sun { module star { module drawing {
+
+/** Listener for asynchronous preview creations.  Called when a slide
+    preview has been created that was previously requested via a call to
+    <method>XSlidePreviewCache::getSlidePreview()</method>.  The
+    implementor may then call <method>getSlidePreview()</method> a second
+    time to get the up-to-date version of the preview.
+*/
+published interface XSlidePreviewCacheListener
+{
+    /** Called by a <interface>XSlidePreviewCache</interface> object when a
+        preview has been created for the slide with the given index.
+        @param nSlideIndex
+            The index of the slide for which a new preview has been created.
+    */
+    void notifyPreviewCreation ([in] long nSlideIndex);
+};
+
+}; }; }; }; // ::com::sun::star::drawing
+
+#endif
diff --git a/offapi/com/sun/star/drawing/XSlideRenderer.idl b/offapi/com/sun/star/drawing/XSlideRenderer.idl
index c7906a79c..cdd9952db 100644
--- a/offapi/com/sun/star/drawing/XSlideRenderer.idl
+++ b/offapi/com/sun/star/drawing/XSlideRenderer.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_drawing_XSlideRenderer_idl__
 #define __com_sun_star_drawing_XSlideRenderer_idl__
 
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
 #include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
 
 
 module com { module sun { module star { module drawing {
diff --git a/offapi/com/sun/star/drawing/XSlideSorterBase.idl b/offapi/com/sun/star/drawing/XSlideSorterBase.idl
new file mode 100644
index 000000000..5a6c4de65
--- /dev/null
+++ b/offapi/com/sun/star/drawing/XSlideSorterBase.idl
@@ -0,0 +1,137 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_drawing_XSlideSorterBase_idl__
+#define __com_sun_star_drawing_XSlideSorterBase_idl__
+
+#ifndef __com_sun_star_drawing_framework_XView_idl__
+#include <com/sun/star/drawing/framework/XView.idl>
+#endif
+#ifndef __com_sun_star_drawing_XDrawView_idl__
+#include <com/sun/star/drawing/XDrawView.idl>
+#endif
+#ifndef __com_sun_star_awt_XWindow_idl__
+#include <com/sun/star/awt/XWindow.idl>
+#endif
+#ifndef __com_sun_star_container_XIndexAccess_idl__
+#include <com/sun/star/container/XIndexAccess.idl>
+#endif
+#ifndef __com_sun_star_frame_XController_idl__
+#include <com/sun/star/frame/XController.idl>
+#endif
+#ifndef __com_sun_star_util_Color_idl__
+#include <com/sun/star/util/Color.idl>
+#endif
+
+module com {  module sun {  module star {  module drawing {
+
+/** This interface exists only because services do not directly support
+    multiple inheritance and attributes.
+    <p>It provides the interfaces and attributes that every object that
+    implements the <type>SlideSorter</type> service.</p>
+*/
+interface XSlideSorterBase
+{
+    /** This interface is included to mark a <type>SlideSorter</type> object
+        as view of the drawing framework and to provide a
+        <type>ResourceId</type>.
+    */
+    interface ::com::sun::star::drawing::framework::XView;
+
+    /** The <type>XDrawView</type> interface is included to provide access
+        to the current slide (especially write access).
+    */
+    interface ::com::sun::star::drawing::XDrawView;
+
+    /** The set of slides that are displayed by the implementing object.
+        <p>The default value is the set of all slides of the document for
+        which a slide sorter is created.</p>
+    */
+    [attribute] ::com::sun::star::container::XIndexAccess DocumentSlides;
+
+    /** Set this flag to <TRUE/> in order to have the current slide
+        highlighted.
+        <p>The default value is <FALSE/>.</p>
+    */
+    [attribute] boolean IsHighlightCurrentSlide;
+
+    /** Set this flag to <TRUE/> in order to visualize the selection of
+        slides (typically a bold frame around the selected slides).
+        <p>The default value is <TRUE/>.</p>
+    */
+    [attribute] boolean IsShowSelection;
+
+    /** Set this flag to <TRUE/> to visualize to where the focus is by
+        showing a dotted rectangle around the focused slide.
+        <p>The default value is <TRUE/>.</p>
+    */
+    [attribute] boolean IsShowFocus;
+
+    /** When this flag has the value <TRUE/> then every time the current
+        slide is changed the visual area is shifted so that the new current
+        slide is display in the center of the slide sorter window.
+        <p>It is not always possible to move the current slide into the
+        exact center of the window, for example when slides are located near
+        the start or end of a document.</p>
+        <p>The default value is <FALSE/>.
+    */
+    [attribute] boolean IsCenterSelection;
+
+    /** This flag controls whether updates of previews are created during
+        full screen presentations (<FALSE/>) or not (<TRUE/>).  The
+        suspension of preview creations is an optimization for not slowing
+        down a running presentation.
+        <p>The default value is <TRUE/>.</p>
+    */
+    [attribute] boolean IsSuspendPreviewUpdatesDuringFullScreenPresentation;
+
+    /** The orientation of a slide sorter can be either vertical (<TRUE/>)
+        or horizontal (<FALSE/>).
+    */
+    [attribute] boolean IsOrientationVertical;
+
+    /** This flag is a hint to make scrolling look smooth.
+    */
+    [attribute] boolean IsSmoothScrolling;
+
+    [attribute] ::com::sun::star::util::Color BackgroundColor;
+    [attribute] ::com::sun::star::util::Color TextColor;
+    [attribute] ::com::sun::star::util::Color SelectionColor;
+    [attribute] ::com::sun::star::util::Color HighlightColor;
+
+    /** This flag controls whether the model can be modified by using
+        keyboard or mouse.
+        <p>The default value is <TRUE/>.</p>
+    */
+    [attribute] boolean IsUIReadOnly;
+};
+
+
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
index 2dac30e00..2a273f6b4 100644
--- a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XUniversalShapeDescriptor_idl__ 
 #define __com_sun_star_drawing_XUniversalShapeDescriptor_idl__ 
  
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__ 
 #include <com/sun/star/drawing/XShapeDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
index 6d99dbc41..4d0ab101b 100644
--- a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
+++ b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_ResourceSearchMode_idl__
 #define __com_sun_star_drawing_framework_ResourceSearchMode_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
 #include <com/sun/star/util/XCloneable.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -43,7 +39,7 @@ module com { module sun { module star { module drawing { module framework {
     anchor a1:a2 which itself is a resource a1 bound to anchor a2.
     Then r:a1:a2 is bound directly to a1:a2 and indirectly to a2.</p>
 */
-enum AnchorBindingMode
+published enum AnchorBindingMode
 {
     DIRECT,
     INDIRECT
diff --git a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
index 6f478627e..c9443c758 100644
--- a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_BasicPaneFactory_idl__
 #define __com_sun_star_drawing_framework_BasicPaneFactory_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XPANEFACTORY_IDL_
 #include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl b/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
index 273293e43..ac39e4247 100644
--- a/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_BasicToolBarFactory_idl__
 #define __com_sun_star_drawing_framework_BasicToolBarFactory_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XPANEFACTORY_IDL_
 #include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl b/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
index 85528e990..06f02248e 100644
--- a/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_BasicViewFactory_idl__
 #define __com_sun_star_drawing_framework_BasicViewFactory_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResourceFactory_idl__
 #include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/BorderType.idl b/offapi/com/sun/star/drawing/framework/BorderType.idl
new file mode 100644
index 000000000..d1c9ea3f3
--- /dev/null
+++ b/offapi/com/sun/star/drawing/framework/BorderType.idl
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_drawing_framework_BorderType_idl__
+#define __com_sun_star_drawing_framework_BorderType_idl__
+
+
+module com { module sun { module star { module drawing { module framework {
+
+/** See XPaneBorderPainter and its addBorder() and removeBorder() methods
+    for an explanation of the border type and its values.
+*/
+published enum BorderType
+{
+    INNER_BORDER,
+    OUTER_BORDER,
+    TOTAL_BORDER
+};
+
+}; }; }; }; }; // ::com::sun::star::drawing::framework
+
+#endif
diff --git a/offapi/com/sun/star/drawing/framework/Configuration.idl b/offapi/com/sun/star/drawing/framework/Configuration.idl
index 6b5e9e85c..1b3edaa5f 100644
--- a/offapi/com/sun/star/drawing/framework/Configuration.idl
+++ b/offapi/com/sun/star/drawing/framework/Configuration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_ConfigurationController_idl__
 #define __com_sun_star_drawing_framework_ConfigurationController_idl__
 
-#ifndef __com_sun_star_drawing_framework_XConfiguration_idl__
 #include <com/sun/star/drawing/framework/XConfiguration.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
index 44c359b6b..c92772a0b 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,17 +28,14 @@
 #ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 #define __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 module com { module sun { module star { module uno { interface XInterface; }; }; }; };
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XConfiguration;
-interface XConfigurationController;
-interface XResourceId;
+published interface XConfiguration;
+published interface XResourceId;
 
 /** Objects of this class are used for notifying changes of the
     configuration.
@@ -53,7 +50,7 @@ interface XResourceId;
     general guidelines.   See <type>XConfigurationController</type> for a
     list of event types used by the basic drawing framework.</p>
 */
-struct ConfigurationChangeEvent
+published struct ConfigurationChangeEvent
      : ::com::sun::star::lang::EventObject
 {
     /** The type of configuration change is a free-form string.  This is the
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationController.idl b/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
index 06a1532cb..a10d084ba 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_framework_ConfigurationController_idl__
 #define __com_sun_star_drawing_framework_ConfigurationController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationController_idl__
 #include <com/sun/star/drawing/framework/XConfigurationController.idl>
-#endif
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/ModuleController.idl b/offapi/com/sun/star/drawing/framework/ModuleController.idl
index 15dbe1da3..b9da00bc6 100644
--- a/offapi/com/sun/star/drawing/framework/ModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/ModuleController.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_ModuleController_idl__
 #define __com_sun_star_drawing_framework_ModuleController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XModuleController_idl__
 #include <com/sun/star/drawing/framework/XModuleController.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl b/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
index 07d896e45..162d94f24 100644
--- a/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
+++ b/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,11 +32,11 @@ module com { module sun { module star { module drawing { module framework {
 
 /** The ResourceActivationMode specifies, for example for the <member
     scope="com::sun::star::drawing::framework"
-    >XConfigurationController::requestResourceActivation()</member>, 
+    >XConfigurationController::requestResourceActivation()</member>,
     whether a requested resource is to replace an existing resource of the
     same class or is to be activated additionally.
 */
-enum ResourceActivationMode
+published enum ResourceActivationMode
 {
     /** A resource is requested in addition to already existing ones.  This
         is used for example for panes.
diff --git a/offapi/com/sun/star/drawing/framework/ResourceId.idl b/offapi/com/sun/star/drawing/framework/ResourceId.idl
index dde316f15..44c10c9ea 100644
--- a/offapi/com/sun/star/drawing/framework/ResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/ResourceId.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_ResourceId_idl__
 #define __com_sun_star_drawing_framework_ResourceId_idl__
 
-#ifndef __com_sun_star_drawing_framework_XResourceId_idl__
 #include <com/sun/star/drawing/framework/XResourceId.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XConfiguration.idl b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
index 7b16c4d72..ad6bf6aa5 100644
--- a/offapi/com/sun/star/drawing/framework/XConfiguration.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,19 +28,13 @@
 #ifndef __com_sun_star_drawing_framework_XConfiguration_idl__
 #define __com_sun_star_drawing_framework_XConfiguration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
 #include <com/sun/star/util/XCloneable.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_AnchorBindingMode_idl__
 #include <com/sun/star/drawing/framework/AnchorBindingMode.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XResourceId;
+published interface XResourceId;
 
 /** A configuration describes the resources of an application like panes,
     views, and tool bars and their relationships that are currently active
@@ -54,7 +48,7 @@ interface XResourceId;
 
     @see XConfigurationController
 */
-interface XConfiguration
+published interface XConfiguration
     : ::com::sun::star::util::XCloneable
 {
     /** Returns the list of resources that are bound directly and/or
@@ -117,7 +111,7 @@ interface XConfiguration
             IllegalArgumentException is thrown.
     */
     void addResource ([in] XResourceId xResourceId);
-    
+
     /** Remove a resource from the configuration.
         <p>This method should be used only by objects that implement the
         <type>XConfigurationRequest</type> interface or by the configuration
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
index 8412320b1..2bc727a06 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_XConfigurationChangeListener_idl__
 #define __com_sun_star_drawing_framework_XConfigurationChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -41,7 +37,7 @@ module com { module sun { module star { module drawing { module framework {
     registered at the configuration controller and a configuration change
     occurs.
 */
-interface XConfigurationChangeListener
+published interface XConfigurationChangeListener
     : ::com::sun::star::lang::XEventListener
 {
     /** The exact time of when a listener is called (before the change takes
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
index 0f4b6032d..709e2350b 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,16 +28,12 @@
 #ifndef __com_sun_star_drawing_framework_XConfigurationChangeRequest_idl__
 #define __com_sun_star_drawing_framework_XConfigurationChangeRequest_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XConfiguration;
+published interface XConfiguration;
 
 /** A single explicit request for a configuration change.
 
@@ -53,7 +49,7 @@ interface XConfiguration;
     <p>This interface is typically used internally by the
     <type>XConfigurationController</type></p> @see XConfigurationController
 */
-interface XConfigurationChangeRequest
+published interface XConfigurationChangeRequest
 {
     /** Commit the configuration change request represented by the called
         object to the given configuration.
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index c422d9e80..e80c14333 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,29 +28,19 @@
 #ifndef __com_sun_star_drawing_framework_XConfigurationController_idl__
 #define __com_sun_star_drawing_framework_XConfigurationController_idl__
 
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
 #include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
 #include <com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
 #include <com/sun/star/drawing/framework/XResourceFactoryManager.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ResourceActivationMode_idl__
 #include <com/sun/star/drawing/framework/ResourceActivationMode.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XConfigurationChangeListener;
-interface XConfigurationChangeRequest;
-interface XResourceId;
-interface XResource;
-    
+published interface XConfigurationChangeListener;
+published interface XConfigurationChangeRequest;
+published interface XResourceId;
+published interface XResource;
+
 /** The configuration controller is responsible for the management of the
     set of active resources.
 
@@ -62,18 +52,18 @@ interface XResource;
     <member>requestResourceActivation()</member> and
     <member>requestResourceDeactivation()</member>.</li>
     </ul></p>
-    
+
     <p>When the two configurations differ then the current configuration is
     updated eventually to reflect the requested configuration.  An update
     takes place when the following three conditions are fulfilled.
     <ol>
     <li>when the last pending request for configuration changes has been
-    processed,</li> 
+    processed,</li>
     <li>when the <member>update()</member> method is called.</li>
     <li>when the configuration manager it is unlocked after formerly being
     locked.</li>
     </ol></p>
-    
+
     <p>Requests for configuration changes are handled in a two step process:
     <ol>
     <li>First the requested configuration is updated iteratively: Every
@@ -94,7 +84,7 @@ interface XResource;
     <p>This process goes on until the queue of request objects becomes
     empty.  Until this point only the requested configuration has been
     modified.  No resources have been activated or deactivated.</p></li>
-    
+
     <li><p>The second update step activates or deactivates resources so that
     the current configuration (the one that comprises the actually active
     resources) reflects the requested configuration.</p>
@@ -157,7 +147,7 @@ interface XResource;
     deactivated resource.</p></li>
     </ul></p>
 */
-interface XConfigurationController
+published interface XConfigurationController
 {
     interface XConfigurationControllerRequestQueue;
     interface XConfigurationControllerBroadcaster;
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
index b8eaaf32e..7411be758 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,22 +28,18 @@
 #ifndef __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
 #define __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XConfigurationChangeListener;
+published interface XConfigurationChangeListener;
 
 /** Manage the set of registered event listeners and the event notification for a configuration
     controller.
     <p>The listeners are called in the order in which they are registered.</p>
 */
-interface XConfigurationControllerBroadcaster
+published interface XConfigurationControllerBroadcaster
 {
     /** Add a new listener for configuration changes.
         <p>The listener is notified only for the specified type of
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
index c799cd01e..940f8be35 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,23 +28,21 @@
 #ifndef __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
 #define __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XConfigurationChangeRequest;
+published interface XConfigurationChangeRequest;
 
 /** The request queue of the configuration controller handles requests for
     changes to the current configuration.
-    
+
     <p>This interface allows callers to add requests to the back of the
     queue and to determine whether the queue is empty.  Using this interface
     should normally not be necessary for anyone else than the
     <type>XConfigurationController</type>.  It may be removed in the future.</p>
 */
-interface XConfigurationControllerRequestQueue
+published interface XConfigurationControllerRequestQueue
 {
     /** Return whether there are pending requests for configuration changes.
         @return
diff --git a/offapi/com/sun/star/drawing/framework/XControllerManager.idl b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
index 40990d04b..ab21d8181 100644
--- a/offapi/com/sun/star/drawing/framework/XControllerManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XControllerManager_idl__
 #define __com_sun_star_drawing_framework_XControllerManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XModuleController.idl b/offapi/com/sun/star/drawing/framework/XModuleController.idl
index c12de82fd..e125cdd5a 100644
--- a/offapi/com/sun/star/drawing/framework/XModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/XModuleController.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_drawing_framework_XModuleController_idl__
 #define __com_sun_star_drawing_framework_XModuleController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_IDL_
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ResourceId_idl__
 #include <com/sun/star/drawing/framework/ResourceId.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XPane.idl b/offapi/com/sun/star/drawing/framework/XPane.idl
index d75cb6800..a99dd567e 100644
--- a/offapi/com/sun/star/drawing/framework/XPane.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_drawing_framework_XPane_idl__
 #define __com_sun_star_drawing_framework_XPane_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCcanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
 #include <com/sun/star/drawing/framework/XResource.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XRelocatableResource_idl__
 #include <com/sun/star/drawing/framework/XRelocatableResource.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -49,7 +41,7 @@ module com { module sun { module star { module drawing { module framework {
     parts like title, menu, closer button.</p>
     <p>The URL prefix of panes is <code>private:resource/floater</code></p>
 */
-interface XPane
+published interface XPane
 {
     interface XResource;
 
@@ -59,7 +51,7 @@ interface XPane
     ::com::sun::star::awt::XWindow getWindow ();
 
     /** Return the <type scope="com::sun::star::awt">XCanvas</type> of the pane.  The
-        <type scope="com::sun::star::rendering">XCanvas</type> object is expected to 
+        <type scope="com::sun::star::rendering">XCanvas</type> object is expected to
         be associated with the <type
         scope="com::sun::star::awt">XWindow</type> object returned by
         <member>getWindow()</member>.
diff --git a/offapi/com/sun/star/drawing/framework/XPane2.idl b/offapi/com/sun/star/drawing/framework/XPane2.idl
index 2784e5fe3..4c52ec7f9 100644
--- a/offapi/com/sun/star/drawing/framework/XPane2.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XPane2_idl__
 #define __com_sun_star_drawing_framework_XPane2_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
index 6c66829a3..292af409b 100644
--- a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
+++ b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,31 +28,15 @@
 #ifndef __com_sun_star_drawing_framework_XPaneBorderPainter_idl__
 #define __com_sun_star_drawing_framework_XPaneBorderPainter_idl__
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
+#include <com/sun/star/drawing/framework/BorderType.idl>
 
 module com { module sun { module star { module drawing { module framework {
 
-/** See XPaneBorderPainter and its addBorder() and removeBorder() methods
-    for an explanation of the border type and its values.
-*/
-enum BorderType
-{
-    INNER_BORDER,
-    OUTER_BORDER,
-    TOTAL_BORDER
-};
-
-
 /** Paint the border around a rectangular region, typically a pane.
-    
+
     <p>Calling objects have to be able to derive inner bounding boxes of the
     border from the outer ones and inner ones from outer ones.  This
     conversion and the painting of the border involves three rectangles.
@@ -65,7 +49,7 @@ enum BorderType
     left corner bitmap is painted with its lower right at the upper left of
     the center box.</p>
 */
-interface XPaneBorderPainter
+published interface XPaneBorderPainter
 {
     /** Enlarge the given rectangle by the size of the specified part of the
         border.  This method can be used to convert an inner bounding box
diff --git a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
index c5e998f54..0f3b7ee97 100644
--- a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XRelocatableResource_idl__
 #define __com_sun_star_drawing_framework_XRelocatableResource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XResource.idl b/offapi/com/sun/star/drawing/framework/XResource.idl
index 6099dea8c..99cf9e2f2 100644
--- a/offapi/com/sun/star/drawing/framework/XResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XResource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,18 +28,16 @@
 #ifndef __com_sun_star_drawing_framework_XResource_idl__
 #define __com_sun_star_drawing_framework_XResource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XResourceId;
+published interface XResourceId;
 
 /** Base interface that provides functionality shared by all resource types
     of the drawing framework.
 */
-interface XResource
+published interface XResource
 {
     /** Return an <type>XResourceId</type> object for the called resource.
         The returned id unambiguously identifies the resource.
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
index 67f810f69..2ed59bd0e 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,20 +28,14 @@
 #ifndef __com_sun_star_drawing_framework_XResourceFactory_idl__
 #define __com_sun_star_drawing_framework_XResourceFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XResource;
-interface XResourceId;
+published interface XResource;
+published interface XResourceId;
 
 /** Factory and possibly cache for creating and releasing resources.
     <p>A resource factory is created and used by the
@@ -49,7 +43,7 @@ interface XResourceId;
     <p>A factory may want to implement a cache to reuse previously released
     resources.</p>
 */
-interface XResourceFactory
+published interface XResourceFactory
 {
     /** Create a resource for the given <type>XResourceId</type> object.
         @param xResourceId
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
index 595f41314..0c5e3fceb 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,22 +28,20 @@
 #ifndef __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
 #define __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XResourceId;
-interface XResourceFactory;
-                                                
+published interface XResourceId;
+published interface XResourceFactory;
+
 /** The XResourceFactoryManager is part of the configuration controller and
     manages the set of registered resource factories.
 
     @see XConfigurationController
     @see XResourceFactory
 */
-interface XResourceFactoryManager
+published interface XResourceFactoryManager
 {
     /** Register a new resource factory for the given URL.
         <p>When one factory is responsible for more than one type of resource
diff --git a/offapi/com/sun/star/drawing/framework/XResourceId.idl b/offapi/com/sun/star/drawing/framework/XResourceId.idl
index 3ca156ad2..5dfe46acc 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceId.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_framework_XResourceId_idl__
 #define __com_sun_star_drawing_framework_XResourceId_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_AnchorBindingMode_idl__
 #include <com/sun/star/drawing/framework/AnchorBindingMode.idl>
-#endif
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -55,7 +49,7 @@ module com { module sun { module star { module drawing { module framework {
     method on its creation.  Arguments are only available through the
     getFullResourceURL().  The getResourceURL() method strips them away.</p>
 */
-interface XResourceId
+published interface XResourceId
 {
     /** Return the URL of the resource.  Arguments supplied on creation are
         stripped away.  Use getFullResourceURL() to access them.
diff --git a/offapi/com/sun/star/drawing/framework/XTabBar.idl b/offapi/com/sun/star/drawing/framework/XTabBar.idl
index 7ade5dfcd..0022e3176 100644
--- a/offapi/com/sun/star/drawing/framework/XTabBar.idl
+++ b/offapi/com/sun/star/drawing/framework/XTabBar.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_framework_XTabBar_idl__
 #define __com_sun_star_drawing_framework_XTabBar_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_TabBarButton_idl__
 #include <com/sun/star/drawing/framework/TabBarButton.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XToolBar.idl b/offapi/com/sun/star/drawing/framework/XToolBar.idl
index 7cb8c44f1..a85a31ea2 100644
--- a/offapi/com/sun/star/drawing/framework/XToolBar.idl
+++ b/offapi/com/sun/star/drawing/framework/XToolBar.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XToolBar_idl__
 #define __com_sun_star_drawing_framework_XToolBar_idl__
 
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
 #include <com/sun/star/drawing/framework/XResource.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XView.idl b/offapi/com/sun/star/drawing/framework/XView.idl
index 552915290..3f9d5d379 100644
--- a/offapi/com/sun/star/drawing/framework/XView.idl
+++ b/offapi/com/sun/star/drawing/framework/XView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_XView_idl__
 #define __com_sun_star_drawing_framework_XView_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
 #include <com/sun/star/drawing/framework/XResource.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -46,7 +42,7 @@ module com { module sun { module star { module drawing { module framework {
     reference them.</p>
     <p>The URL prefix of views is <code>private:resource/view</code></p>
 */
-interface XView
+published interface XView
 {
     interface XResource;
 };
diff --git a/offapi/com/sun/star/drawing/framework/makefile.mk b/offapi/com/sun/star/drawing/framework/makefile.mk
deleted file mode 100644
index e073b1a61..000000000
--- a/offapi/com/sun/star/drawing/framework/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssdframework
-PACKAGE=com$/sun$/star$/drawing$/framework
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=									\
-    AnchorBindingMode.idl					\
-    BasicPaneFactory.idl					\
-    BasicToolBarFactory.idl					\
-    BasicViewFactory.idl					\
-    Configuration.idl						\
-    ConfigurationChangeEvent.idl			\
-    ConfigurationController.idl				\
-    ModuleController.idl					\
-    ResourceActivationMode.idl				\
-    ResourceId.idl							\
-    TabBarButton.idl						\
-    XConfiguration.idl						\
-    XConfigurationChangeListener.idl		\
-    XConfigurationChangeRequest.idl			\
-    XConfigurationController.idl			\
-    XConfigurationControllerBroadcaster.idl	\
-    XConfigurationControllerRequestQueue.idl\
-    XControllerManager.idl					\
-    XModuleController.idl					\
-    XPane.idl								\
-    XPane2.idl								\
-    XPaneBorderPainter.idl					\
-    XRelocatableResource.idl				\
-    XResource.idl							\
-    XResourceId.idl							\
-    XResourceFactory.idl					\
-    XResourceFactoryManager.idl				\
-    XTabBar.idl								\
-    XToolBar.idl							\
-    XView.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/drawing/makefile.mk b/offapi/com/sun/star/drawing/makefile.mk
deleted file mode 100644
index b3d581c75..000000000
--- a/offapi/com/sun/star/drawing/makefile.mk
+++ /dev/null
@@ -1,227 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdrawing
-PACKAGE=com$/sun$/star$/drawing
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleShape.idl      		\
-    AccessibleGraphicShape.idl      \
-    AccessibleOLEShape.idl      	\
-    AccessibleDrawDocumentView.idl	\
-    AccessibleSlideView.idl			\
-    AccessibleSlideViewObject.idl	\
-    AccessibleGraphControl.idl\
-    Alignment.idl\
-    AppletShape.idl\
-    Arrangement.idl\
-    Background.idl\
-    BezierPoint.idl\
-    BitmapMode.idl\
-    BitmapTable.idl\
-    BoundVolume.idl\
-    CameraGeometry.idl\
-    CaptionEscapeDirection.idl\
-    CaptionShape.idl\
-    CaptionType.idl\
-    CircleKind.idl\
-    ClosedBezierShape.idl\
-    ColorMode.idl\
-    ConnectionType.idl\
-    ConnectorProperties.idl\
-    ConnectorShape.idl\
-    ConnectorType.idl\
-    ControlShape.idl\
-    CoordinateSequence.idl\
-    CoordinateSequenceSequence.idl\
-    CustomShape.idl\
-    CustomShapeEngine.idl\
-    DashStyle.idl\
-    DashTable.idl\
-    Defaults.idl\
-    Direction3D.idl\
-    DocumentSettings.idl\
-    DoubleSequence.idl\
-    DoubleSequenceSequence.idl\
-    DrawingDocument.idl\
-    DrawingDocumentDrawView.idl\
-    DrawingDocumentFactory.idl\
-    DrawPage.idl\
-    DrawPages.idl\
-    DrawViewMode.idl\
-    EnhancedCustomShapeAdjustmentValue.idl\
-    EnhancedCustomShapeExtrusion.idl\
-    EnhancedCustomShapeGeometry.idl\
-    EnhancedCustomShapeGluePointType.idl\
-    EnhancedCustomShapeHandle.idl\
-    EnhancedCustomShapeParameter.idl\
-    EnhancedCustomShapeParameterPair.idl\
-    EnhancedCustomShapeParameterType.idl\
-    EnhancedCustomShapePath.idl\
-    EnhancedCustomShapeSegment.idl\
-    EnhancedCustomShapeSegmentCommand.idl\
-    EnhancedCustomShapeTextFrame.idl\
-    EnhancedCustomShapeTextPath.idl\
-    EnhancedCustomShapeTextPathMode.idl\
-    EllipseShape.idl\
-    EscapeDirection.idl\
-    FillProperties.idl\
-    FillStyle.idl\
-    FlagSequence.idl\
-    FlagSequenceSequence.idl\
-    GenericDrawingDocument.idl\
-    GenericDrawPage.idl\
-    GluePoint.idl\
-    GluePoint2.idl\
-    GradientTable.idl\
-    GraphicExportFilter.idl\
-    GraphicFilterRequest.idl\
-    GraphicObjectShape.idl\
-    GroupShape.idl\
-    Hatch.idl\
-    HatchStyle.idl\
-    HatchTable.idl\
-    HomogenMatrix.idl\
-    HomogenMatrix3.idl\
-    HomogenMatrix4.idl\
-    HomogenMatrixLine.idl\
-    HomogenMatrixLine3.idl\
-    HomogenMatrixLine4.idl\
-    HorizontalDimensioning.idl\
-    Layer.idl\
-    LayerManager.idl\
-    LayerType.idl\
-    LineDash.idl\
-    LineEndType.idl\
-    LineJoint.idl\
-    LineProperties.idl\
-    LineShape.idl\
-    LineStyle.idl\
-    MarkerTable.idl\
-    MasterPage.idl\
-    MasterPages.idl\
-    MeasureKind.idl\
-    MeasureProperties.idl\
-    MeasureShape.idl\
-    MeasureTextHorzPos.idl\
-    MeasureTextVertPos.idl\
-    MirrorAxis.idl\
-    NormalsKind.idl\
-    OLE2Shape.idl\
-    OpenBezierShape.idl\
-    PageShape.idl\
-    PluginShape.idl\
-    PointSequence.idl\
-    PointSequenceSequence.idl\
-    PolygonFlags.idl\
-    PolygonKind.idl\
-    PolyLineShape.idl\
-    PolyPolygonBezierCoords.idl\
-    PolyPolygonBezierDescriptor.idl\
-    PolyPolygonBezierShape.idl\
-    PolyPolygonDescriptor.idl\
-    PolyPolygonShape.idl\
-    PolyPolygonShape3D.idl\
-    Position3D.idl\
-    ProjectionMode.idl\
-    RectanglePoint.idl\
-    RectangleShape.idl\
-    RotationDescriptor.idl\
-    ShadeMode.idl\
-    ShadowProperties.idl\
-    Shape.idl\
-    ShapeCollection.idl\
-    Shapes.idl\
-    SlideRenderer.idl\
-    SlideSorter.idl\
-    SnapObjectType.idl\
-    Text.idl\
-    TextAdjust.idl\
-    TextAnimationDirection.idl\
-    TextAnimationKind.idl\
-    TextFitToSizeType.idl\
-    TextHorizontalAdjust.idl\
-    TextProperties.idl\
-    TextShape.idl\
-    TextureKind.idl\
-    TextureKind2.idl\
-    TextureMode.idl\
-    TextureProjectionMode.idl\
-    TextVerticalAdjust.idl\
-    TransparencyGradientTable.idl\
-    VerticalDimensioning.idl\
-    XConnectableShape.idl\
-    XConnectorShape.idl\
-    XControlShape.idl\
-    XCustomShapeEngine.idl\
-    XCustomShapeHandle.idl\
-    XDrawPage.idl\
-    XDrawPageDuplicator.idl\
-    XDrawPageExpander.idl\
-    XDrawPages.idl\
-    XDrawPagesSupplier.idl\
-    XDrawPageSummarizer.idl\
-    XDrawPageSupplier.idl\
-    XDrawSubController.idl\
-    XDrawView.idl\
-    XEnhancedCustomShapeDefaulter.idl\
-    XGluePointsSupplier.idl\
-    XLayer.idl\
-    XLayerManager.idl\
-    XLayerSupplier.idl\
-    XMasterPagesSupplier.idl\
-    XMasterPageTarget.idl\
-    XPresenterHelper.idl\
-    XShape.idl\
-    XShapeAligner.idl\
-    XShapeArranger.idl\
-    XShapeBinder.idl\
-    XShapeCombiner.idl\
-    XShapeDescriptor.idl\
-    XShapeGroup.idl\
-    XShapeGrouper.idl\
-    XShapeMirror.idl\
-    XShapes.idl\
-    XSlidePreviewCache.idl\
-    XSlideRenderer.idl\
-    XUniversalShapeDescriptor.idl\
-    XSelectionFunction.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/embed/BaseStorage.idl b/offapi/com/sun/star/embed/BaseStorage.idl
index cc55208ca..dd4136873 100644
--- a/offapi/com/sun/star/embed/BaseStorage.idl
+++ b/offapi/com/sun/star/embed/BaseStorage.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_embed_BaseStorage_idl__
 #define __com_sun_star_embed_BaseStorage_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__ 
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/DocumentCloser.idl b/offapi/com/sun/star/embed/DocumentCloser.idl
index e4657b35e..0317da32e 100644
--- a/offapi/com/sun/star/embed/DocumentCloser.idl
+++ b/offapi/com/sun/star/embed/DocumentCloser.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_embed_DocumentCloser_idl__
 #define __com_sun_star_embed_DocumentCloser_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
 #include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module embed {
diff --git a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
index 5b6e91917..25eee5bc0 100644
--- a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
+++ b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
@@ -27,30 +27,12 @@
 #ifndef __com_sun_star_embed_EmbeddedObjectDescriptor_idl__
 #define __com_sun_star_embed_EmbeddedObjectDescriptor_idl__
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
 #include <com/sun/star/task/XStatusIndicator.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
 #include <com/sun/star/frame/XDispatchProviderInterceptor.idl>
-#endif
-
 #include <com/sun/star/embed/XStorage.idl>
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/FileSystemStorage.idl b/offapi/com/sun/star/embed/FileSystemStorage.idl
index f8b6b6eb6..ed1754539 100644
--- a/offapi/com/sun/star/embed/FileSystemStorage.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorage.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_embed_FileSystemStorage_idl__
 #define __com_sun_star_embed_FileSystemStorage_idl__
 
-#ifndef __com_sun_star_embed_BaseStorage_idl__ 
 #include <com/sun/star/embed/BaseStorage.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
index fd1ea68bd..d22b201db 100644
--- a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_embed_FileSystemStorageFactory_idl__
 #define __com_sun_star_embed_FileSystemStorageFactory_idl__
 
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__ 
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/InsertedObjectInfo.idl b/offapi/com/sun/star/embed/InsertedObjectInfo.idl
index 6f0c2acb7..a0fdb5c68 100644
--- a/offapi/com/sun/star/embed/InsertedObjectInfo.idl
+++ b/offapi/com/sun/star/embed/InsertedObjectInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_InsertedObjectInfo_idl__ 
 #define __com_sun_star_embed_InsertedObjectInfo_idl__ 
  
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEmbeddedObject_idl__
 #include <com/sun/star/embed/XEmbeddedObject.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/embed/InstanceLocker.idl b/offapi/com/sun/star/embed/InstanceLocker.idl
index b5e378711..fd7b76c42 100644
--- a/offapi/com/sun/star/embed/InstanceLocker.idl
+++ b/offapi/com/sun/star/embed/InstanceLocker.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_embed_InstanceLocker_idl__
 #define __com_sun_star_embed_InstanceLocker_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_embed_XActionsApproval_idl__
 #include <com/sun/star/embed/XActionsApproval.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
 #include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module embed {
diff --git a/offapi/com/sun/star/embed/InvalidStorageException.idl b/offapi/com/sun/star/embed/InvalidStorageException.idl
index 4e74f8a6e..ea5d8057a 100644
--- a/offapi/com/sun/star/embed/InvalidStorageException.idl
+++ b/offapi/com/sun/star/embed/InvalidStorageException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_InvalidStorageException_idl__ 
 #define __com_sun_star_embed_InvalidStorageException_idl__ 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/LinkageMisuseException.idl b/offapi/com/sun/star/embed/LinkageMisuseException.idl
index 88153d25c..ec10fc476 100644
--- a/offapi/com/sun/star/embed/LinkageMisuseException.idl
+++ b/offapi/com/sun/star/embed/LinkageMisuseException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_LinkageMisuseException_idl__ 
 #define __com_sun_star_embed_LinkageMisuseException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/NeedsRunningStateException.idl b/offapi/com/sun/star/embed/NeedsRunningStateException.idl
index adf3c7e25..7bf2e1d55 100644
--- a/offapi/com/sun/star/embed/NeedsRunningStateException.idl
+++ b/offapi/com/sun/star/embed/NeedsRunningStateException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_NeedsRunningStateException_idl__ 
 #define __com_sun_star_embed_NeedsRunningStateException_idl__ 
  
-#ifndef __com_sun_star_embed_WrongStateException_idl__ 
 #include <com/sun/star/embed/WrongStateException.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl b/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
index bdebbefa6..7487c5196 100644
--- a/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
+++ b/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_NoVisualAreaSizeException_idl__ 
 #define __com_sun_star_embed_NoVisualAreaSizeException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/OLESimpleStorage.idl b/offapi/com/sun/star/embed/OLESimpleStorage.idl
index 59c3470ef..b08e09478 100644
--- a/offapi/com/sun/star/embed/OLESimpleStorage.idl
+++ b/offapi/com/sun/star/embed/OLESimpleStorage.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_embed_OLESimpleStorage_idl__
 #define __com_sun_star_embed_OLESimpleStorage_idl__
 
-#ifndef __com_sun_star_embed_XOLESimpleStorage_idl__
 #include <com/sun/star/embed/XOLESimpleStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
 
 //============================================================================
 module com { module sun { module star { module embed {
diff --git a/offapi/com/sun/star/embed/ObjectSaveVetoException.idl b/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
index 551be7ee6..de9395bdb 100644
--- a/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
+++ b/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_ObjectSaveVetoException_idl__ 
 #define __com_sun_star_embed_ObjectSaveVetoException_idl__ 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/StateChangeInProgressException.idl b/offapi/com/sun/star/embed/StateChangeInProgressException.idl
index 932039abe..fe88160c9 100644
--- a/offapi/com/sun/star/embed/StateChangeInProgressException.idl
+++ b/offapi/com/sun/star/embed/StateChangeInProgressException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_StateChangeInProgressException_idl__ 
 #define __com_sun_star_embed_StateChangeInProgressException_idl__ 
  
-#ifndef __com_sun_star_embed_WrongStateException_idl__ 
 #include <com/sun/star/embed/WrongStateException.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/Storage.idl b/offapi/com/sun/star/embed/Storage.idl
index 9e5fe479b..e125ce440 100644
--- a/offapi/com/sun/star/embed/Storage.idl
+++ b/offapi/com/sun/star/embed/Storage.idl
@@ -28,37 +28,14 @@
 #ifndef __com_sun_star_embed_Storage_idl__
 #define __com_sun_star_embed_Storage_idl__
 
-#ifndef __com_sun_star_embed_BaseStorage_idl__ 
 #include <com/sun/star/embed/BaseStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__ 
 #include <com/sun/star/embed/XEncryptionProtectedSource.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactedObject_idl__ 
 #include <com/sun/star/embed/XTransactedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__ 
 #include <com/sun/star/embed/XTransactionBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifiable_idl__ 
 #include <com/sun/star/util/XModifiable.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //============================================================================
@@ -356,7 +333,6 @@ published service Storage
         </p>
      */
     [property, optional, readonly] boolean HasNonEncryptedEntries;
-
 };
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/StorageFactory.idl b/offapi/com/sun/star/embed/StorageFactory.idl
index c0bb62b1f..79df3afeb 100644
--- a/offapi/com/sun/star/embed/StorageFactory.idl
+++ b/offapi/com/sun/star/embed/StorageFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_embed_StorageFactory_idl__
 #define __com_sun_star_embed_StorageFactory_idl__
 
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__ 
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/StorageStream.idl b/offapi/com/sun/star/embed/StorageStream.idl
index f3082d4c4..7d1df0b04 100644
--- a/offapi/com/sun/star/embed/StorageStream.idl
+++ b/offapi/com/sun/star/embed/StorageStream.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_embed_StorageStream_idl__
 #define __com_sun_star_embed_StorageStream_idl__
 
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__ 
 #include <com/sun/star/embed/XEncryptionProtectedSource.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__ 
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XSeekable_idl__ 
 #include <com/sun/star/io/XSeekable.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/embed/StorageWrappedTargetException.idl b/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
index eecd166a9..af835d50e 100644
--- a/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
+++ b/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__ 
 #define __com_sun_star_embed_StorageWrappedTargetException_idl__ 
  
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/UnreachableStateException.idl b/offapi/com/sun/star/embed/UnreachableStateException.idl
index 6c852c05a..1622e7833 100644
--- a/offapi/com/sun/star/embed/UnreachableStateException.idl
+++ b/offapi/com/sun/star/embed/UnreachableStateException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_UnreachableStateException_idl__ 
 #define __com_sun_star_embed_UnreachableStateException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/UseBackupException.idl b/offapi/com/sun/star/embed/UseBackupException.idl
index 605d836af..32ede7b23 100644
--- a/offapi/com/sun/star/embed/UseBackupException.idl
+++ b/offapi/com/sun/star/embed/UseBackupException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_UseBackupException_idl__ 
 #define __com_sun_star_embed_UseBackupException_idl__ 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/VisualRepresentation.idl b/offapi/com/sun/star/embed/VisualRepresentation.idl
index b118f88a2..32afb91d8 100644
--- a/offapi/com/sun/star/embed/VisualRepresentation.idl
+++ b/offapi/com/sun/star/embed/VisualRepresentation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_VisualRepresentation_idl__ 
 #define __com_sun_star_embed_VisualRepresentation_idl__ 
  
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/embed/WrongStateException.idl b/offapi/com/sun/star/embed/WrongStateException.idl
index 18c625bbf..afca5239f 100644
--- a/offapi/com/sun/star/embed/WrongStateException.idl
+++ b/offapi/com/sun/star/embed/WrongStateException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_WrongStateException_idl__ 
 #define __com_sun_star_embed_WrongStateException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XActionsApproval.idl b/offapi/com/sun/star/embed/XActionsApproval.idl
index 8aaa53e18..1b752fc6e 100644
--- a/offapi/com/sun/star/embed/XActionsApproval.idl
+++ b/offapi/com/sun/star/embed/XActionsApproval.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_XActionsApproval_idl__
 #define __com_sun_star_embed_XActionsApproval_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XClassifiedObject.idl b/offapi/com/sun/star/embed/XClassifiedObject.idl
index 758a69eb5..abd79e02b 100644
--- a/offapi/com/sun/star/embed/XClassifiedObject.idl
+++ b/offapi/com/sun/star/embed/XClassifiedObject.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XClassifiedObject_idl__
 #define __com_sun_star_embed_XClassifiedObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
index 31e59f3da..0f3545819 100644
--- a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_embed_XCommonEmbedPersist_idl__
 #define __com_sun_star_embed_XCommonEmbedPersist_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XComponentSupplier.idl b/offapi/com/sun/star/embed/XComponentSupplier.idl
index b266b0761..417f06e35 100644
--- a/offapi/com/sun/star/embed/XComponentSupplier.idl
+++ b/offapi/com/sun/star/embed/XComponentSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_XComponentSupplier_idl__
 #define __com_sun_star_embed_XComponentSupplier_idl__
 
-#ifndef __com_sun_star_util_XCloseable_idl__
 #include <com/sun/star/util/XCloseable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl b/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
index 715225990..19b22b61b 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_embed_XEmbedObjectClipboardCreator_idl__
 #define __com_sun_star_embed_XEmbedObjectClipboardCreator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InsertedObjectInfo_idl__
 #include <com/sun/star/embed/InsertedObjectInfo.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
index 11cb6bf26..20ab4f26a 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_embed_XEmbedObjectCreator_idl__
 #define __com_sun_star_embed_XEmbedObjectCreator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
index 19a3c9cc3..c0d52cf84 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_embed_XEmbedObjectFactory_idl__
 #define __com_sun_star_embed_XEmbedObjectFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XEmbedPersist.idl b/offapi/com/sun/star/embed/XEmbedPersist.idl
index d186850f9..31c9154dd 100644
--- a/offapi/com/sun/star/embed/XEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XEmbedPersist.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_embed_XEmbedPersist_idl__
 #define __com_sun_star_embed_XEmbedPersist_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XCommonEmbedPersist_idl__
 #include <com/sun/star/embed/XCommonEmbedPersist.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XEmbeddedClient.idl b/offapi/com/sun/star/embed/XEmbeddedClient.idl
index 42e76b667..11aa303f5 100644
--- a/offapi/com/sun/star/embed/XEmbeddedClient.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedClient.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_embed_XEmbeddedClient_idl__
 #define __com_sun_star_embed_XEmbeddedClient_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XComponentSupplier_idl__
 #include <com/sun/star/embed/XComponentSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_embed_ObjectSaveVetoException_idl__
 #include <com/sun/star/embed/ObjectSaveVetoException.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/embed/XEmbeddedObject.idl b/offapi/com/sun/star/embed/XEmbeddedObject.idl
index eea7bbb7f..e40b148ad 100644
--- a/offapi/com/sun/star/embed/XEmbeddedObject.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedObject.idl
@@ -27,61 +27,20 @@
 #ifndef __com_sun_star_embed_XEmbeddedObject_idl__
 #define __com_sun_star_embed_XEmbeddedObject_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEmbeddedClient_idl__
 #include <com/sun/star/embed/XEmbeddedClient.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XVisualObject_idl__
 #include <com/sun/star/embed/XVisualObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XClassifiedObject_idl__
 #include <com/sun/star/embed/XClassifiedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XComponentSupplier_idl__
 #include <com/sun/star/embed/XComponentSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStateChangeBroadcaster_idl__
 #include <com/sun/star/embed/XStateChangeBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_embed_VerbDescriptor_idl__
 #include <com/sun/star/embed/VerbDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_embed_UnreachableStateException_idl__
 #include <com/sun/star/embed/UnreachableStateException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_NeedsRunningStateException_idl__
 #include <com/sun/star/embed/NeedsRunningStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseable_idl__
 #include <com/sun/star/util/XCloseable.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
index c31cab6c3..8f30c6061 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
 #define __com_sun_star_embed_XEncryptionProtectedSource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
index 3c5fcf7f0..ea89e52de 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XEncryptionProtectedSource2_idl__
 #define __com_sun_star_embed_XEncryptionProtectedSource2_idl__
 
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
 #include <com/sun/star/embed/XEncryptionProtectedSource.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //============================================================================
 
@@ -41,17 +36,19 @@ module com {  module sun {  module star {  module embed {
 
 //============================================================================
 /** This interface allows to set a password for an object.
+
+    @since OOo 3.4
  */
-published interface XEncryptionProtectedSource2: XEncryptionProtectedSource
+interface XEncryptionProtectedSource2: XEncryptionProtectedSource
 {
     // -----------------------------------------------------------------------
     /** sets an encryption data for the object.
 
-    @param aEncryptionData
-        the new encryption data
+        @param aEncryptionData
+            the new encryption data
 
-    @throws ::com::sun::star::io::IOException
-        in case the data could not be set
+        @throws ::com::sun::star::io::IOException
+            in case the data could not be set
      */
     void setEncryptionData( [in] sequence< ::com::sun::star::beans::NamedValue > aEncryptionData )
         raises( ::com::sun::star::io::IOException );
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl b/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
new file mode 100644
index 000000000..30ec5621f
--- /dev/null
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
@@ -0,0 +1,120 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_embed_XEncryptionProtectedStorage_idl__
+#define __com_sun_star_embed_XEncryptionProtectedStorage_idl__
+
+#ifndef __com_sun_star_embed_XEncryptionProtectedSource2_idl__
+#include <com/sun/star/embed/XEncryptionProtectedSource2.idl>
+#endif
+
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+#ifndef __com_sun_star_xml_crypto_DigestID_idl__
+#include <com/sun/star/xml/crypto/DigestID.idl>
+#endif
+
+#ifndef __com_sun_star_xml_crypto_CipherID_idl__
+#include <com/sun/star/xml/crypto/CipherID.idl>
+#endif
+
+//============================================================================
+
+module com {  module sun {  module star {  module embed {
+
+//============================================================================
+/** This interface allows to set a password for an object.
+
+    @since OOo 3.4
+ */
+interface XEncryptionProtectedStorage: XEncryptionProtectedSource2
+{
+    // -----------------------------------------------------------------------
+    /** allows to set the encryption algorithms for the object.
+        <p>
+        The algorithms will of course be used only for streams that have been
+        marked to be encrypted. If no stream in the storage is marked to be
+        encrypted, the algorithms-related information may have no effect to
+        the result package.
+        </p>
+
+        <p>
+        The following values could be part of the provided sequence:
+        </p>
+        <dl>
+            <dt>StartKeyGenerationAlgorithm</dt>
+            <dd>
+                    specifies the algorithm that was used to generate
+                    the EncryptionKey from the original password; in case
+                    the contents should be decrypted, the algorithm might
+                    be already known by the object; if a different one is
+                    set an exception should be thrown to indicate the
+                    error; it should take values from
+                    <type scope="com::sun::star::xml:crypto">DigestID</type>.
+            </dd>
+            <dt>EncryptionAlgorithm</dt>
+            <dd>
+                    specifies the algorithm that should be used to
+                    encrypt/decrypt the contents; in case the contents
+                    should be decrypted, the algorithm might be already
+                    known by the object; if a different one is set
+                    an exception should be thrown to indicate the error;
+                    it should take values from
+                    <type scope="com::sun::star::xml:crypto">CipherID</type>.
+            </dd>
+            <dt>ChecksumAlgorithm</dt>
+            <dd>
+                    specifies the algorithm that was used to generate
+                    the checksum of the encrypted data; in case
+                    the contents should be decrypted, the algorithm might
+                    be already known by the object; if a different one is
+                    set an exception should be thrown to indicate the
+                    error; it should take values from
+                    <type scope="com::sun::star::xml:crypto">DigestID</type>.
+            </dd>
+        </dl>
+     */
+    void setEncryptionAlgorithms( [in] sequence< ::com::sun::star::beans::NamedValue > aAlgorithms )
+        raises( ::com::sun::star::lang::IllegalArgumentException );
+
+    // -----------------------------------------------------------------------
+    /** allows to get the encryption algorithms of the object.
+     */
+    sequence< ::com::sun::star::beans::NamedValue > getEncryptionAlgorithms();
+};
+
+//============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/embed/XExtendedStorageStream.idl b/offapi/com/sun/star/embed/XExtendedStorageStream.idl
index 927839129..6c2ee402f 100644
--- a/offapi/com/sun/star/embed/XExtendedStorageStream.idl
+++ b/offapi/com/sun/star/embed/XExtendedStorageStream.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_embed_XExtendedStorageStream_idl__
 #define __com_sun_star_embed_XExtendedStorageStream_idl__
 
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XSeekable_idl__
 #include <com/sun/star/io/XSeekable.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
 #include <com/sun/star/embed/XEncryptionProtectedSource.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactedObject_idl__
 #include <com/sun/star/embed/XTransactedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__
 #include <com/sun/star/embed/XTransactionBroadcaster.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XHatchWindow.idl b/offapi/com/sun/star/embed/XHatchWindow.idl
index 0c6c68c8b..d371c6ee7 100644
--- a/offapi/com/sun/star/embed/XHatchWindow.idl
+++ b/offapi/com/sun/star/embed/XHatchWindow.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_embed_XHatchWindow_idl__
 #define __com_sun_star_embed_XHatchWindow_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XHatchWindowController_idl__
 #include <com/sun/star/embed/XHatchWindowController.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XHatchWindowController.idl b/offapi/com/sun/star/embed/XHatchWindowController.idl
index 06f31eb51..65bda92e4 100644
--- a/offapi/com/sun/star/embed/XHatchWindowController.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowController.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XHatchWindowController_idl__
 #define __com_sun_star_embed_XHatchWindowController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XHatchWindowFactory.idl b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
index cce67b8e8..0ab4abd59 100644
--- a/offapi/com/sun/star/embed/XHatchWindowFactory.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_embed_XHatchWindowFactory_idl__ 
 #define __com_sun_star_embed_XHatchWindowFactory_idl__ 
 
-#ifndef __com_sun_star_embed_XHatchWindow_idl__
 #include <com/sun/star/embed/XHatchWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
 #include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //============================================================================
  
diff --git a/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl b/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
index 9ae2e6472..f118dd53e 100644
--- a/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
+++ b/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
@@ -27,53 +27,18 @@
 #ifndef __com_sun_star_embed_XHierarchicalStorageAccess_idl__
 #define __com_sun_star_embed_XHierarchicalStorageAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XExtendedStorageStream_idl__
 #include <com/sun/star/embed/XExtendedStorageStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
 #include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
 #include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
 #include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
 #include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl b/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl
index 1fa9f3906..c1a29893a 100644
--- a/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl
+++ b/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XHierarchicalStorageAccess2_idl__
 #define __com_sun_star_embed_XHierarchicalStorageAccess2_idl__
 
-#ifndef __com_sun_star_embed_XHierarchicalStorageAccess_idl__
 #include <com/sun/star/embed/XHierarchicalStorageAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XInplaceClient.idl b/offapi/com/sun/star/embed/XInplaceClient.idl
index d9aa16f43..a8c2a585e 100644
--- a/offapi/com/sun/star/embed/XInplaceClient.idl
+++ b/offapi/com/sun/star/embed/XInplaceClient.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_embed_XInplaceClient_idl__
 #define __com_sun_star_embed_XInplaceClient_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLayoutManager_idl__
 #include <com/sun/star/frame/XLayoutManager.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
 #include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XInplaceObject.idl b/offapi/com/sun/star/embed/XInplaceObject.idl
index cd901b692..3961756c9 100644
--- a/offapi/com/sun/star/embed/XInplaceObject.idl
+++ b/offapi/com/sun/star/embed/XInplaceObject.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_embed_XInplaceObject_idl__
 #define __com_sun_star_embed_XInplaceObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
 #include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/embed/XInsertObjectDialog.idl b/offapi/com/sun/star/embed/XInsertObjectDialog.idl
index 07e36dcd5..877277afa 100644
--- a/offapi/com/sun/star/embed/XInsertObjectDialog.idl
+++ b/offapi/com/sun/star/embed/XInsertObjectDialog.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_embed_XInsertObjectDialog_idl__
 #define __com_sun_star_embed_XInsertObjectDialog_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InsertedObjectInfo_idl__
 #include <com/sun/star/embed/InsertedObjectInfo.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/embed/XLinkCreator.idl b/offapi/com/sun/star/embed/XLinkCreator.idl
index 8c071ae40..1ac54af97 100644
--- a/offapi/com/sun/star/embed/XLinkCreator.idl
+++ b/offapi/com/sun/star/embed/XLinkCreator.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_embed_XLinkCreator_idl__
 #define __com_sun_star_embed_XLinkCreator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/embed/XLinkFactory.idl b/offapi/com/sun/star/embed/XLinkFactory.idl
index e7cf1aee1..8b3222073 100644
--- a/offapi/com/sun/star/embed/XLinkFactory.idl
+++ b/offapi/com/sun/star/embed/XLinkFactory.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_embed_XLinkFactory_idl__
 #define __com_sun_star_embed_XLinkFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XLinkageSupport.idl b/offapi/com/sun/star/embed/XLinkageSupport.idl
index 4fcc6acab..92366cc24 100644
--- a/offapi/com/sun/star/embed/XLinkageSupport.idl
+++ b/offapi/com/sun/star/embed/XLinkageSupport.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_embed_XLinkageSupport_idl__
 #define __com_sun_star_embed_XLinkageSupport_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XCommonEmbedPersist_idl__
 #include <com/sun/star/embed/XCommonEmbedPersist.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XOLESimpleStorage.idl b/offapi/com/sun/star/embed/XOLESimpleStorage.idl
index fc62ced36..fbc419cf7 100644
--- a/offapi/com/sun/star/embed/XOLESimpleStorage.idl
+++ b/offapi/com/sun/star/embed/XOLESimpleStorage.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_embed_XOLESimpleStorage_idl__
 #define __com_sun_star_embed_XOLESimpleStorage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactedObject_idl__
 #include <com/sun/star/embed/XTransactedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XClassifiedObject_idl__
 #include <com/sun/star/embed/XClassifiedObject.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XOptimizedStorage.idl b/offapi/com/sun/star/embed/XOptimizedStorage.idl
index a5fc1d9f4..d68ca4833 100644
--- a/offapi/com/sun/star/embed/XOptimizedStorage.idl
+++ b/offapi/com/sun/star/embed/XOptimizedStorage.idl
@@ -27,65 +27,21 @@
 #ifndef __com_sun_star_embed_XOptimizedStorage_idl__
 #define __com_sun_star_embed_XOptimizedStorage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
 #include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
 #include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__
 #include <com/sun/star/packages/EncryptionNotAllowedException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
 #include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
 #include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
 #include <com/sun/star/beans/PropertyVetoException.idl> 
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XPackageStructureCreator.idl b/offapi/com/sun/star/embed/XPackageStructureCreator.idl
index b83282fd0..46ad49e68 100644
--- a/offapi/com/sun/star/embed/XPackageStructureCreator.idl
+++ b/offapi/com/sun/star/embed/XPackageStructureCreator.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XPackageStructureCreator_idl__
 #define __com_sun_star_embed_XPackageStructureCreator_idl__
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/embed/XPersistanceHolder.idl b/offapi/com/sun/star/embed/XPersistanceHolder.idl
index 18e677b01..cc34a1e85 100644
--- a/offapi/com/sun/star/embed/XPersistanceHolder.idl
+++ b/offapi/com/sun/star/embed/XPersistanceHolder.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_embed_XPersistanceHolder_idl__
 #define __com_sun_star_embed_XPersistanceHolder_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/embed/XRelationshipAccess.idl b/offapi/com/sun/star/embed/XRelationshipAccess.idl
index d9f97d4c1..0a8466bc3 100644
--- a/offapi/com/sun/star/embed/XRelationshipAccess.idl
+++ b/offapi/com/sun/star/embed/XRelationshipAccess.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_embed_XRelationshipAccess_idl__
 #define __com_sun_star_embed_XRelationshipAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
 #include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl b/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
index 291cfae53..134ccbd8a 100644
--- a/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
+++ b/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_embed_XStateChangeBroadcaster_idl__ 
 #define __com_sun_star_embed_XStateChangeBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_embed_XStateChangeListener_idl__ 
 #include <com/sun/star/embed/XStateChangeListener.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XStateChangeListener.idl b/offapi/com/sun/star/embed/XStateChangeListener.idl
index 367a587c5..114e9f09c 100644
--- a/offapi/com/sun/star/embed/XStateChangeListener.idl
+++ b/offapi/com/sun/star/embed/XStateChangeListener.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_embed_XStateChangeListener_idl__ 
 #define __com_sun_star_embed_XStateChangeListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_embed_WrongStateException_idl__ 
 #include <com/sun/star/embed/WrongStateException.idl> 
-#endif 
  
 //============================================================================
  
diff --git a/offapi/com/sun/star/embed/XStorage.idl b/offapi/com/sun/star/embed/XStorage.idl
index 4fdb4eb5b..2e532f8a1 100644
--- a/offapi/com/sun/star/embed/XStorage.idl
+++ b/offapi/com/sun/star/embed/XStorage.idl
@@ -27,61 +27,20 @@
 #ifndef __com_sun_star_embed_XStorage_idl__
 #define __com_sun_star_embed_XStorage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
 #include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
 #include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
 #include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
 #include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
 #include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XStorage2.idl b/offapi/com/sun/star/embed/XStorage2.idl
index 3a9ccce34..54c57856a 100644
--- a/offapi/com/sun/star/embed/XStorage2.idl
+++ b/offapi/com/sun/star/embed/XStorage2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XStorage2_idl__
 #define __com_sun_star_embed_XStorage2_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XStorageRawAccess.idl b/offapi/com/sun/star/embed/XStorageRawAccess.idl
index f8a5eb788..ffa0997ef 100644
--- a/offapi/com/sun/star/embed/XStorageRawAccess.idl
+++ b/offapi/com/sun/star/embed/XStorageRawAccess.idl
@@ -27,49 +27,17 @@
 #ifndef __com_sun_star_embed_XStorageRawAccess_idl__
 #define __com_sun_star_embed_XStorageRawAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
 #include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
 #include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
 #include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
 #include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XTransactedObject.idl b/offapi/com/sun/star/embed/XTransactedObject.idl
index d27878f26..d6592f2e0 100644
--- a/offapi/com/sun/star/embed/XTransactedObject.idl
+++ b/offapi/com/sun/star/embed/XTransactedObject.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_embed_XTransactedObject_idl__
 #define __com_sun_star_embed_XTransactedObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
  
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XTransactionBroadcaster.idl b/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
index ef003667a..8d1c264a9 100644
--- a/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
+++ b/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__ 
 #define __com_sun_star_embed_XTransactionBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_embed_XTransactionListener_idl__ 
 #include <com/sun/star/embed/XTransactionListener.idl> 
-#endif 
  
  
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XTransactionListener.idl b/offapi/com/sun/star/embed/XTransactionListener.idl
index 57b172574..2ff6f1a42 100644
--- a/offapi/com/sun/star/embed/XTransactionListener.idl
+++ b/offapi/com/sun/star/embed/XTransactionListener.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_embed_XTransactionListener_idl__ 
 #define __com_sun_star_embed_XTransactionListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
 //============================================================================
  
diff --git a/offapi/com/sun/star/embed/XTransferableSupplier.idl b/offapi/com/sun/star/embed/XTransferableSupplier.idl
index 1a5360aba..610afbead 100644
--- a/offapi/com/sun/star/embed/XTransferableSupplier.idl
+++ b/offapi/com/sun/star/embed/XTransferableSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_XTransferableSupplier_idl__
 #define __com_sun_star_embed_XTransferableSupplier_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XVisualObject.idl b/offapi/com/sun/star/embed/XVisualObject.idl
index feda4d3be..3d139f028 100644
--- a/offapi/com/sun/star/embed/XVisualObject.idl
+++ b/offapi/com/sun/star/embed/XVisualObject.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_embed_XVisualObject_idl__
 #define __com_sun_star_embed_XVisualObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_embed_VisualRepresentation_idl__
 #include <com/sun/star/embed/VisualRepresentation.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/embed/XWindowSupplier.idl b/offapi/com/sun/star/embed/XWindowSupplier.idl
index 2c2be60bd..1f29c4fe9 100644
--- a/offapi/com/sun/star/embed/XWindowSupplier.idl
+++ b/offapi/com/sun/star/embed/XWindowSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_XWindowSupplier_idl__
 #define __com_sun_star_embed_XWindowSupplier_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/makefile.mk b/offapi/com/sun/star/embed/makefile.mk
index 8ee156af4..c142086cd 100644
--- a/offapi/com/sun/star/embed/makefile.mk
+++ b/offapi/com/sun/star/embed/makefile.mk
@@ -78,6 +78,7 @@ IDLFILES=\
     XLinkFactory.idl\
     XEncryptionProtectedSource.idl\
     XEncryptionProtectedSource2.idl\
+    XEncryptionProtectedStorage.idl\
     XInplaceClient.idl\
     XInsertObjectDialog.idl\
     XWindowSupplier.idl\
diff --git a/offapi/com/sun/star/form/DataAwareControlModel.idl b/offapi/com/sun/star/form/DataAwareControlModel.idl
index ab1848cc1..ab3e5ebe0 100644
--- a/offapi/com/sun/star/form/DataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/DataAwareControlModel.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #define __com_sun_star_form_DataAwareControlModel_idl__ 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XBoundComponent_idl__ 
 #include <com/sun/star/form/XBoundComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XLoadListener_idl__ 
 #include <com/sun/star/form/XLoadListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
index 29deeeff5..44bbf0134 100644
--- a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_DatabaseDeleteEvent_idl__ 
 #define __com_sun_star_form_DatabaseDeleteEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/DatabaseParameterEvent.idl b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
index d619d2e0e..a954f3096 100644
--- a/offapi/com/sun/star/form/DatabaseParameterEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_DatabaseParameterEvent_idl__ 
 #define __com_sun_star_form_DatabaseParameterEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/ErrorEvent.idl b/offapi/com/sun/star/form/ErrorEvent.idl
index 89f811ac3..0d67c46ca 100644
--- a/offapi/com/sun/star/form/ErrorEvent.idl
+++ b/offapi/com/sun/star/form/ErrorEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_ErrorEvent_idl__ 
 #define __com_sun_star_form_ErrorEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/FormComponent.idl b/offapi/com/sun/star/form/FormComponent.idl
index 430c8ce57..a14eb86b3 100644
--- a/offapi/com/sun/star/form/FormComponent.idl
+++ b/offapi/com/sun/star/form/FormComponent.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_form_FormComponent_idl__ 
 #define __com_sun_star_form_FormComponent_idl__ 
  
-#ifndef __com_sun_star_form_XFormComponent_idl__ 
 #include <com/sun/star/form/XFormComponent.idl> 
-#endif 
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
-#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl> 
-#endif 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
-#ifndef __com_sun_star_io_XPersistObject_idl__ 
 #include <com/sun/star/io/XPersistObject.idl> 
-#endif 
-#ifndef __com_sun_star_beans_PropertyBag_idl__ 
 #include <com/sun/star/beans/PropertyBag.idl> 
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/FormComponents.idl b/offapi/com/sun/star/form/FormComponents.idl
index 120cb46f5..a81465bac 100644
--- a/offapi/com/sun/star/form/FormComponents.idl
+++ b/offapi/com/sun/star/form/FormComponents.idl
@@ -27,22 +27,10 @@
 #ifndef __com_sun_star_form_FormComponents_idl__ 
 #define __com_sun_star_form_FormComponents_idl__ 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif 
- 
-#ifndef __com_sun_star_container_XIndexContainer_idl__ 
 #include <com/sun/star/container/XIndexContainer.idl> 
-#endif 
- 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl> 
-#endif 
- 
-#ifndef __com_sun_star_container_XContainer_idl__ 
 #include <com/sun/star/container/XContainer.idl> 
-#endif 
-
 #include <com/sun/star/script/XEventAttacherManager.idl> 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/FormControlModel.idl b/offapi/com/sun/star/form/FormControlModel.idl
index b5eab1bca..fe55a07be 100644
--- a/offapi/com/sun/star/form/FormControlModel.idl
+++ b/offapi/com/sun/star/form/FormControlModel.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_form_FormControlModel_idl__ 
 #define __com_sun_star_form_FormControlModel_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormComponent_idl__ 
 #include <com/sun/star/form/FormComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__ 
 #include <com/sun/star/beans/XFastPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertyState_idl__ 
 #include <com/sun/star/beans/XPropertyState.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/FormController.idl b/offapi/com/sun/star/form/FormController.idl
index f0afa6cd2..f2e3cac54 100644
--- a/offapi/com/sun/star/form/FormController.idl
+++ b/offapi/com/sun/star/form/FormController.idl
@@ -27,49 +27,23 @@
 #ifndef __com_sun_star_form_FormController_idl__ 
 #define __com_sun_star_form_FormController_idl__ 
  
-#ifndef __com_sun_star_form_XFormController_idl__ 
 #include <com/sun/star/form/XFormController.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XTabController_idl__ 
 #include <com/sun/star/awt/XTabController.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XChild_idl__ 
 #include <com/sun/star/container/XChild.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__ 
 #include <com/sun/star/util/XModifyBroadcaster.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__ 
 #include <com/sun/star/form/XConfirmDeleteBroadcaster.idl> 
-#endif
-
-#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__ 
 #include <com/sun/star/sdb/XSQLErrorBroadcaster.idl> 
-#endif
-
-#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__ 
 #include <com/sun/star/sdb/XRowSetApproveBroadcaster.idl> 
-#endif
  
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__ 
 #include <com/sun/star/form/XDatabaseParameterBroadcaster.idl> 
-#endif
-
-#ifndef __com_sun_star_form_FormControllerDispatcher_idl__
 #include <com/sun/star/form/FormControllerDispatcher.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/FormControllerDispatcher.idl b/offapi/com/sun/star/form/FormControllerDispatcher.idl
index 0d88d2924..6b18f23a5 100644
--- a/offapi/com/sun/star/form/FormControllerDispatcher.idl
+++ b/offapi/com/sun/star/form/FormControllerDispatcher.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_FormControllerDispatcher_idl__
 #define __com_sun_star_form_FormControllerDispatcher_idl__
 
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/Forms.idl b/offapi/com/sun/star/form/Forms.idl
index fd381961f..e3a29dac8 100644
--- a/offapi/com/sun/star/form/Forms.idl
+++ b/offapi/com/sun/star/form/Forms.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_form_Forms_idl__
 #define __com_sun_star_form_Forms_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__ 
 #include <com/sun/star/form/FormComponents.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/PropertyBrowserController.idl b/offapi/com/sun/star/form/PropertyBrowserController.idl
index 812cb25c8..ca434cd65 100644
--- a/offapi/com/sun/star/form/PropertyBrowserController.idl
+++ b/offapi/com/sun/star/form/PropertyBrowserController.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_form_PropertyBrowserController_idl__ 
 #define __com_sun_star_form_PropertyBrowserController_idl__ 
 
-#ifndef __com_sun_star_frame_XController_idl__ 
 #include <com/sun/star/frame/XController.idl> 
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__ 
 #include <com/sun/star/beans/XFastPropertySet.idl> 
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__ 
 #include <com/sun/star/beans/XMultiPropertySet.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
index 1f04866b0..68068ddec 100644
--- a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
+++ b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__ 
 #define __com_sun_star_form_XApproveActionBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XApproveActionListener_idl__ 
 #include <com/sun/star/form/XApproveActionListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XApproveActionListener.idl b/offapi/com/sun/star/form/XApproveActionListener.idl
index 7f6be2cdd..e8f12e1f3 100644
--- a/offapi/com/sun/star/form/XApproveActionListener.idl
+++ b/offapi/com/sun/star/form/XApproveActionListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XApproveActionListener_idl__ 
 #define __com_sun_star_form_XApproveActionListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XBoundComponent.idl b/offapi/com/sun/star/form/XBoundComponent.idl
index 592f29530..0e1dd0526 100644
--- a/offapi/com/sun/star/form/XBoundComponent.idl
+++ b/offapi/com/sun/star/form/XBoundComponent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XBoundComponent_idl__ 
 #define __com_sun_star_form_XBoundComponent_idl__ 
  
-#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__ 
 #include <com/sun/star/form/XUpdateBroadcaster.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XBoundControl.idl b/offapi/com/sun/star/form/XBoundControl.idl
index 493651850..a02b90edb 100644
--- a/offapi/com/sun/star/form/XBoundControl.idl
+++ b/offapi/com/sun/star/form/XBoundControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XBoundControl_idl__ 
 #define __com_sun_star_form_XBoundControl_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XChangeBroadcaster.idl b/offapi/com/sun/star/form/XChangeBroadcaster.idl
index 23aa2f289..cc10c26ca 100644
--- a/offapi/com/sun/star/form/XChangeBroadcaster.idl
+++ b/offapi/com/sun/star/form/XChangeBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XChangeBroadcaster_idl__ 
 #define __com_sun_star_form_XChangeBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XChangeListener_idl__ 
 #include <com/sun/star/form/XChangeListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XChangeListener.idl b/offapi/com/sun/star/form/XChangeListener.idl
index a506658ad..7baf6ba13 100644
--- a/offapi/com/sun/star/form/XChangeListener.idl
+++ b/offapi/com/sun/star/form/XChangeListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XChangeListener_idl__ 
 #define __com_sun_star_form_XChangeListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
index 6f771aea7..6cc057c33 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__ 
 #define __com_sun_star_form_XConfirmDeleteBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__ 
 #include <com/sun/star/form/XConfirmDeleteListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XConfirmDeleteListener.idl b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
index 7d6bcc9b9..7c37b62ed 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteListener.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XConfirmDeleteListener_idl__ 
 #define __com_sun_star_form_XConfirmDeleteListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__ 
 #include <com/sun/star/sdb/RowChangeEvent.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
index 47f33de28..5831f5b21 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__ 
 #define __com_sun_star_form_XDatabaseParameterBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__ 
 #include <com/sun/star/form/XDatabaseParameterListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
index 063370eb5..bcc57d2e7 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XDatabaseParameterBroadcaster2_idl__
 #define __com_sun_star_form_XDatabaseParameterBroadcaster2_idl__
 
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
 #include <com/sun/star/form/XDatabaseParameterBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/XDatabaseParameterListener.idl b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
index 66ce82d4e..1b65f34df 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterListener.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XDatabaseParameterListener_idl__ 
 #define __com_sun_star_form_XDatabaseParameterListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__ 
 #include <com/sun/star/form/DatabaseParameterEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XDeleteListener.idl b/offapi/com/sun/star/form/XDeleteListener.idl
index e317a8b43..f942aa15c 100644
--- a/offapi/com/sun/star/form/XDeleteListener.idl
+++ b/offapi/com/sun/star/form/XDeleteListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XDeleteListener_idl__ 
 #define __com_sun_star_form_XDeleteListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XErrorBroadcaster.idl b/offapi/com/sun/star/form/XErrorBroadcaster.idl
index 63c941bcc..7167208c9 100644
--- a/offapi/com/sun/star/form/XErrorBroadcaster.idl
+++ b/offapi/com/sun/star/form/XErrorBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XErrorBroadcaster_idl__ 
 #define __com_sun_star_form_XErrorBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XErrorListener_idl__ 
 #include <com/sun/star/form/XErrorListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XErrorListener.idl b/offapi/com/sun/star/form/XErrorListener.idl
index 18a75e994..e6b50d84a 100644
--- a/offapi/com/sun/star/form/XErrorListener.idl
+++ b/offapi/com/sun/star/form/XErrorListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XErrorListener_idl__ 
 #define __com_sun_star_form_XErrorListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_ErrorEvent_idl__ 
 #include <com/sun/star/form/ErrorEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XForm.idl b/offapi/com/sun/star/form/XForm.idl
index f03b6a0ae..dc55c6438 100644
--- a/offapi/com/sun/star/form/XForm.idl
+++ b/offapi/com/sun/star/form/XForm.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XForm_idl__ 
 #define __com_sun_star_form_XForm_idl__ 
  
-#ifndef __com_sun_star_form_XFormComponent_idl__ 
 #include <com/sun/star/form/XFormComponent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XFormComponent.idl b/offapi/com/sun/star/form/XFormComponent.idl
index e85769157..eeab1433f 100644
--- a/offapi/com/sun/star/form/XFormComponent.idl
+++ b/offapi/com/sun/star/form/XFormComponent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XFormComponent_idl__ 
 #define __com_sun_star_form_XFormComponent_idl__ 
  
-#ifndef __com_sun_star_container_XChild_idl__ 
 #include <com/sun/star/container/XChild.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XFormController.idl b/offapi/com/sun/star/form/XFormController.idl
index 3855d84c2..521a8630f 100644
--- a/offapi/com/sun/star/form/XFormController.idl
+++ b/offapi/com/sun/star/form/XFormController.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_XFormController_idl__ 
 #define __com_sun_star_form_XFormController_idl__ 
  
-#ifndef __com_sun_star_awt_XTabController_idl__ 
 #include <com/sun/star/awt/XTabController.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XControl_idl__ 
 #include <com/sun/star/awt/XControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XFormControllerListener_idl__ 
 #include <com/sun/star/form/XFormControllerListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XFormControllerListener.idl b/offapi/com/sun/star/form/XFormControllerListener.idl
index 80ed3f82f..294d6b89d 100644
--- a/offapi/com/sun/star/form/XFormControllerListener.idl
+++ b/offapi/com/sun/star/form/XFormControllerListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XFormControllerListener_idl__ 
 #define __com_sun_star_form_XFormControllerListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XFormsSupplier.idl b/offapi/com/sun/star/form/XFormsSupplier.idl
index 5bd9e901c..52e3eac1f 100644
--- a/offapi/com/sun/star/form/XFormsSupplier.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XFormsSupplier_idl__ 
 #define __com_sun_star_form_XFormsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XFormsSupplier2.idl b/offapi/com/sun/star/form/XFormsSupplier2.idl
index 8b6fd355f..fe3e0d7a3 100644
--- a/offapi/com/sun/star/form/XFormsSupplier2.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_XFormsSupplier2_idl__
 #define __com_sun_star_form_XFormsSupplier2_idl__
 
-#ifndef __com_sun_star_form_XFormsSupplier_idl__
 #include <com/sun/star/form/XFormsSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/XGrid.idl b/offapi/com/sun/star/form/XGrid.idl
index 38a1f3158..b8fa924e2 100644
--- a/offapi/com/sun/star/form/XGrid.idl
+++ b/offapi/com/sun/star/form/XGrid.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XGrid_idl__ 
 #define __com_sun_star_form_XGrid_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XGridColumnFactory.idl b/offapi/com/sun/star/form/XGridColumnFactory.idl
index 671523dcb..2a20d2473 100644
--- a/offapi/com/sun/star/form/XGridColumnFactory.idl
+++ b/offapi/com/sun/star/form/XGridColumnFactory.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_XGridColumnFactory_idl__ 
 #define __com_sun_star_form_XGridColumnFactory_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
index 23319f034..977056c3f 100644
--- a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
+++ b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__ 
 #define __com_sun_star_form_XGridFieldDataSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
 #include <com/sun/star/reflection/XIdlClass.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XGridPeer.idl b/offapi/com/sun/star/form/XGridPeer.idl
index f81f02bf5..574bdcf3e 100644
--- a/offapi/com/sun/star/form/XGridPeer.idl
+++ b/offapi/com/sun/star/form/XGridPeer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XGridPeer_idl__ 
 #define __com_sun_star_form_XGridPeer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexContainer_idl__ 
 #include <com/sun/star/container/XIndexContainer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XImageProducerSupplier.idl b/offapi/com/sun/star/form/XImageProducerSupplier.idl
index 6a9dbb9a4..a3361a5ba 100644
--- a/offapi/com/sun/star/form/XImageProducerSupplier.idl
+++ b/offapi/com/sun/star/form/XImageProducerSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XImageProducerSupplier_idl__ 
 #define __com_sun_star_form_XImageProducerSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XImageProducer_idl__ 
 #include <com/sun/star/awt/XImageProducer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XInsertListener.idl b/offapi/com/sun/star/form/XInsertListener.idl
index a53e0f9fc..60d62e6cd 100644
--- a/offapi/com/sun/star/form/XInsertListener.idl
+++ b/offapi/com/sun/star/form/XInsertListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XInsertListener_idl__ 
 #define __com_sun_star_form_XInsertListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XLoadListener.idl b/offapi/com/sun/star/form/XLoadListener.idl
index d2ca9690c..c67862937 100644
--- a/offapi/com/sun/star/form/XLoadListener.idl
+++ b/offapi/com/sun/star/form/XLoadListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XLoadListener_idl__ 
 #define __com_sun_star_form_XLoadListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XLoadable.idl b/offapi/com/sun/star/form/XLoadable.idl
index 42130cca6..22fa68cfc 100644
--- a/offapi/com/sun/star/form/XLoadable.idl
+++ b/offapi/com/sun/star/form/XLoadable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XLoadable_idl__ 
 #define __com_sun_star_form_XLoadable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XLoadListener_idl__ 
 #include <com/sun/star/form/XLoadListener.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/XPositioningListener.idl b/offapi/com/sun/star/form/XPositioningListener.idl
index cff9ff017..473518092 100644
--- a/offapi/com/sun/star/form/XPositioningListener.idl
+++ b/offapi/com/sun/star/form/XPositioningListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XPositioningListener_idl__ 
 #define __com_sun_star_form_XPositioningListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XReset.idl b/offapi/com/sun/star/form/XReset.idl
index 17129f08e..763681b09 100644
--- a/offapi/com/sun/star/form/XReset.idl
+++ b/offapi/com/sun/star/form/XReset.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XReset_idl__ 
 #define __com_sun_star_form_XReset_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XResetListener_idl__ 
 #include <com/sun/star/form/XResetListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XResetListener.idl b/offapi/com/sun/star/form/XResetListener.idl
index fbafa0649..daaaef694 100644
--- a/offapi/com/sun/star/form/XResetListener.idl
+++ b/offapi/com/sun/star/form/XResetListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XResetListener_idl__ 
 #define __com_sun_star_form_XResetListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XRestoreListener.idl b/offapi/com/sun/star/form/XRestoreListener.idl
index ca9cd06ac..a0cdf65d8 100644
--- a/offapi/com/sun/star/form/XRestoreListener.idl
+++ b/offapi/com/sun/star/form/XRestoreListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XRestoreListener_idl__ 
 #define __com_sun_star_form_XRestoreListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XSubmit.idl b/offapi/com/sun/star/form/XSubmit.idl
index 4c5cb7119..007121c97 100644
--- a/offapi/com/sun/star/form/XSubmit.idl
+++ b/offapi/com/sun/star/form/XSubmit.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_form_XSubmit_idl__ 
 #define __com_sun_star_form_XSubmit_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XControl_idl__ 
 #include <com/sun/star/awt/XControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_MouseEvent_idl__ 
 #include <com/sun/star/awt/MouseEvent.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XSubmitListener_idl__ 
 #include <com/sun/star/form/XSubmitListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XSubmitListener.idl b/offapi/com/sun/star/form/XSubmitListener.idl
index de50d2dce..b13db54db 100644
--- a/offapi/com/sun/star/form/XSubmitListener.idl
+++ b/offapi/com/sun/star/form/XSubmitListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XSubmitListener_idl__ 
 #define __com_sun_star_form_XSubmitListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XUpdateBroadcaster.idl b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
index d49ae0606..41e623460 100644
--- a/offapi/com/sun/star/form/XUpdateBroadcaster.idl
+++ b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XUpdateBroadcaster_idl__ 
 #define __com_sun_star_form_XUpdateBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XUpdateListener_idl__ 
 #include <com/sun/star/form/XUpdateListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/XUpdateListener.idl b/offapi/com/sun/star/form/XUpdateListener.idl
index 259c7d5b1..263c66a6e 100644
--- a/offapi/com/sun/star/form/XUpdateListener.idl
+++ b/offapi/com/sun/star/form/XUpdateListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XUpdateListener_idl__ 
 #define __com_sun_star_form_XUpdateListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/binding/BindableControlModel.idl b/offapi/com/sun/star/form/binding/BindableControlModel.idl
index aeb8999d6..272d32ced 100644
--- a/offapi/com/sun/star/form/binding/BindableControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableControlModel.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableControlModel_idl__
 #define __com_sun_star_form_binding_BindableControlModel_idl__
 
-#ifndef __com_sun_star_form_binding_XBindableValue_idl__
 #include <com/sun/star/form/binding/XBindableValue.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
index 640b8ea2e..47dd34cc6 100644
--- a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #define __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
 #include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
index fde5f805c..55c767fcc 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseCheckBox_idl__
 #define __com_sun_star_form_binding_BindableDatabaseCheckBox_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
 #include <com/sun/star/form/component/DatabaseCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
index a0514a184..2bc372d5b 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseComboBox_idl__
 #define __com_sun_star_form_binding_BindableDatabaseComboBox_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
 #include <com/sun/star/form/component/DatabaseComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
index 2a25a49fc..06f73760d 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseDateField_idl__
 #define __com_sun_star_form_binding_BindableDatabaseDateField_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseDateField_idl__
 #include <com/sun/star/form/component/DatabaseDateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
index d526aa7f7..50254a58d 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseFormattedField_idl__
 #define __com_sun_star_form_binding_BindableDatabaseFormattedField_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
 #include <com/sun/star/form/component/DatabaseFormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
index e9bd4e685..1228e7271 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseListBox_idl__
 #define __com_sun_star_form_binding_BindableDatabaseListBox_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseListBox_idl__
 #include <com/sun/star/form/component/DatabaseListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
index 4094d5cde..61878579c 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseNumericField_idl__
 #define __com_sun_star_form_binding_BindableDatabaseNumericField_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
 #include <com/sun/star/form/component/DatabaseNumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
index 9722d8a9a..a7839d408 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseRadioButton_idl__
 #define __com_sun_star_form_binding_BindableDatabaseRadioButton_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
 #include <com/sun/star/form/component/DatabaseRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
index 674a4f285..32badd925 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseTextField_idl__
 #define __com_sun_star_form_binding_BindableDatabaseTextField_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseTextField_idl__
 #include <com/sun/star/form/component/DatabaseTextField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
index 93ba21b1a..c29309a29 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseTimeField_idl__
 #define __com_sun_star_form_binding_BindableDatabaseTimeField_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
 #include <com/sun/star/form/component/DatabaseTimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
index 7d88a5013..a7352f138 100644
--- a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
+++ b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_binding_BindableIntegerValueRange_idl__
 #define __com_sun_star_form_binding_BindableIntegerValueRange_idl__
 
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
 #include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
index 6349a187b..2b30a8778 100644
--- a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
+++ b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
 #define __com_sun_star_form_binding_IncompatibleTypesException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
index 2e8518126..9d36f0a1c 100644
--- a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
+++ b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_binding_InvalidBindingStateException_idl__
 #define __com_sun_star_form_binding_InvalidBindingStateException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ListEntryEvent.idl b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
index 532adc655..9c21b7cf7 100644
--- a/offapi/com/sun/star/form/binding/ListEntryEvent.idl
+++ b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_binding_ListEntryEvent_idl__
 #define __com_sun_star_form_binding_ListEntryEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/ListEntrySource.idl b/offapi/com/sun/star/form/binding/ListEntrySource.idl
index e25206965..63bfd3b35 100644
--- a/offapi/com/sun/star/form/binding/ListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/ListEntrySource.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_form_binding_ListEntrySource_idl__
 #define __com_sun_star_form_binding_ListEntrySource_idl__
 
-#ifndef __com_sun_star_form_binding_XListEntrySource_idl__
 #include <com/sun/star/form/binding/XListEntrySource.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/ValueBinding.idl b/offapi/com/sun/star/form/binding/ValueBinding.idl
index e3ac0b208..eb0662247 100644
--- a/offapi/com/sun/star/form/binding/ValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/ValueBinding.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_form_binding_ValueBinding_idl__
 #define __com_sun_star_form_binding_ValueBinding_idl__
 
-#ifndef __com_sun_star_util_XValueBinding_idl__
 #include <com/sun/star/form/binding/XValueBinding.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/XBindableValue.idl b/offapi/com/sun/star/form/binding/XBindableValue.idl
index 3e7a3e005..58e93548a 100644
--- a/offapi/com/sun/star/form/binding/XBindableValue.idl
+++ b/offapi/com/sun/star/form/binding/XBindableValue.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_form_binding_XBindableValue_idl__
 #define __com_sun_star_form_binding_XBindableValue_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
 #include <com/sun/star/form/binding/IncompatibleTypesException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/XListEntryListener.idl b/offapi/com/sun/star/form/binding/XListEntryListener.idl
index ff3873035..2845c9571 100644
--- a/offapi/com/sun/star/form/binding/XListEntryListener.idl
+++ b/offapi/com/sun/star/form/binding/XListEntryListener.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_form_binding_XListEntryListener_idl__
 #define __com_sun_star_form_binding_XListEntryListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_binding_ListEntryEvent_idl__
 #include <com/sun/star/form/binding/ListEntryEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/XListEntrySink.idl b/offapi/com/sun/star/form/binding/XListEntrySink.idl
index e1e43d17d..ae1803c44 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySink.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySink.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_binding_XListEntrySink_idl__
 #define __com_sun_star_form_binding_XListEntrySink_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/XListEntrySource.idl b/offapi/com/sun/star/form/binding/XListEntrySource.idl
index 08d719d09..ab883be61 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySource.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_form_binding_XListEntrySource_idl__
 #define __com_sun_star_form_binding_XListEntrySource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/XValueBinding.idl b/offapi/com/sun/star/form/binding/XValueBinding.idl
index 56a50c6ac..83207e8f6 100644
--- a/offapi/com/sun/star/form/binding/XValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/XValueBinding.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_form_binding_XValueBinding_idl__
 #define __com_sun_star_form_binding_XValueBinding_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
-#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
 #include <com/sun/star/form/binding/IncompatibleTypesException.idl>
-#endif
-#ifndef __com_sun_star_form_binding_InvalidBindingStateException_idl__
 #include <com/sun/star/form/binding/InvalidBindingStateException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/makefile.mk b/offapi/com/sun/star/form/binding/makefile.mk
deleted file mode 100644
index dc9885f5f..000000000
--- a/offapi/com/sun/star/form/binding/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfbinding
-PACKAGE=com$/sun$/star$/form$/binding
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XBindableValue.idl  \
-    XValueBinding.idl   \
-    ValueBinding.idl   \
-    XListEntrySink.idl   \
-    XListEntrySource.idl   \
-    XListEntryListener.idl   \
-    ListEntryEvent.idl   \
-    ListEntrySource.idl   \
-    \
-    BindableControlModel.idl   \
-    BindableIntegerValueRange.idl \
-    BindableDataAwareControlModel.idl   \
-    BindableDatabaseCheckBox.idl   \
-    BindableDatabaseComboBox.idl   \
-    BindableDatabaseDateField.idl   \
-    BindableDatabaseFormattedField.idl   \
-    BindableDatabaseListBox.idl   \
-    BindableDatabaseNumericField.idl   \
-    BindableDatabaseRadioButton.idl   \
-    BindableDatabaseTextField.idl   \
-    BindableDatabaseTimeField.idl   \
-    \
-    IncompatibleTypesException.idl   \
-    InvalidBindingStateException.idl   \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/component/CheckBox.idl b/offapi/com/sun/star/form/component/CheckBox.idl
index ff9409730..290fe0ec8 100644
--- a/offapi/com/sun/star/form/component/CheckBox.idl
+++ b/offapi/com/sun/star/form/component/CheckBox.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_CheckBox_idl__
 #define __com_sun_star_form_component_CheckBox_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlCheckBoxModel_idl__
 #include <com/sun/star/awt/UnoControlCheckBoxModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/ComboBox.idl b/offapi/com/sun/star/form/component/ComboBox.idl
index c54c2e459..b6dc6bf23 100644
--- a/offapi/com/sun/star/form/component/ComboBox.idl
+++ b/offapi/com/sun/star/form/component/ComboBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_ComboBox_idl__ 
 #define __com_sun_star_form_component_ComboBox_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__ 
 #include <com/sun/star/awt/UnoControlComboBoxModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/CurrencyField.idl b/offapi/com/sun/star/form/component/CurrencyField.idl
index 2bf935205..2d54c7ea6 100644
--- a/offapi/com/sun/star/form/component/CurrencyField.idl
+++ b/offapi/com/sun/star/form/component/CurrencyField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_CurrencyField_idl__ 
 #define __com_sun_star_form_component_CurrencyField_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__ 
 #include <com/sun/star/awt/UnoControlCurrencyFieldModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DataForm.idl b/offapi/com/sun/star/form/component/DataForm.idl
index ecc0c81a7..4c7d8fc88 100644
--- a/offapi/com/sun/star/form/component/DataForm.idl
+++ b/offapi/com/sun/star/form/component/DataForm.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_form_component_DataForm_idl__
 #define __com_sun_star_form_component_DataForm_idl__
 
-#ifndef __com_sun_star_form_component_Form_idl__
 #include <com/sun/star/form/component/Form.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_RowSet_idl__
 #include <com/sun/star/sdb/RowSet.idl>
-#endif
-
-#ifndef __com_sun_star_form_TabulatorCycle_idl__
 #include <com/sun/star/form/TabulatorCycle.idl>
-#endif
-
-#ifndef __com_sun_star_form_NavigationBarMode_idl__
 #include <com/sun/star/form/NavigationBarMode.idl>
-#endif
-
-#ifndef __com_sun_star_form_XLoadable_idl__
 #include <com/sun/star/form/XLoadable.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
 #include <com/sun/star/sdb/XCompletedExecution.idl>
-#endif
-
-#ifndef __com_sun_star_awt_TabControllerModel_idl__
 #include <com/sun/star/awt/TabControllerModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
index d3d6127f0..f2fb4a224 100644
--- a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__ 
 #define __com_sun_star_form_component_DatabaseCheckBox_idl__ 
  
-#ifndef __com_sun_star_form_component_CheckBox_idl__ 
 #include <com/sun/star/form/component/CheckBox.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabaseComboBox.idl b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
index 733308f0d..618b2ac27 100644
--- a/offapi/com/sun/star/form/component/DatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DatabaseComboBox_idl__ 
 #define __com_sun_star_form_component_DatabaseComboBox_idl__ 
  
-#ifndef __com_sun_star_form_component_ComboBox_idl__ 
 #include <com/sun/star/form/component/ComboBox.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_ListSourceType_idl__ 
 #include <com/sun/star/form/ListSourceType.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
index c589ca062..8b70860a0 100644
--- a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseCurrencyField_idl__ 
 #define __com_sun_star_form_component_DatabaseCurrencyField_idl__ 
  
-#ifndef __com_sun_star_form_component_CurrencyField_idl__ 
 #include <com/sun/star/form/component/CurrencyField.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabaseDateField.idl b/offapi/com/sun/star/form/component/DatabaseDateField.idl
index 894a8d238..159de219b 100644
--- a/offapi/com/sun/star/form/component/DatabaseDateField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseDateField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseDateField_idl__ 
 #define __com_sun_star_form_component_DatabaseDateField_idl__ 
  
-#ifndef __com_sun_star_form_component_DateField_idl__ 
 #include <com/sun/star/form/component/DateField.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
index 90dda9c87..24a69e0d9 100644
--- a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__ 
 #define __com_sun_star_form_component_DatabaseFormattedField_idl__ 
  
-#ifndef __com_sun_star_form_component_FormattedField_idl__ 
 #include <com/sun/star/form/component/FormattedField.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabaseImageControl.idl b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
index f3c5e4cca..2ec9fca06 100644
--- a/offapi/com/sun/star/form/component/DatabaseImageControl.idl
+++ b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DatabaseImageControl_idl__ 
 #define __com_sun_star_form_component_DatabaseImageControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlImageControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__ 
 #include <com/sun/star/form/XImageProducerSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabaseListBox.idl b/offapi/com/sun/star/form/component/DatabaseListBox.idl
index 576c3a2b1..9f72d27ac 100644
--- a/offapi/com/sun/star/form/component/DatabaseListBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseListBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DatabaseListBox_idl__ 
 #define __com_sun_star_form_component_DatabaseListBox_idl__ 
  
-#ifndef __com_sun_star_form_component_ListBox_idl__ 
 #include <com/sun/star/form/component/ListBox.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_ListSourceType_idl__ 
 #include <com/sun/star/form/ListSourceType.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabaseNumericField.idl b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
index e68d581d3..219d58ba6 100644
--- a/offapi/com/sun/star/form/component/DatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseNumericField_idl__ 
 #define __com_sun_star_form_component_DatabaseNumericField_idl__ 
  
-#ifndef __com_sun_star_form_component_NumericField_idl__ 
 #include <com/sun/star/form/component/NumericField.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabasePatternField.idl b/offapi/com/sun/star/form/component/DatabasePatternField.idl
index f7f19dd18..382ffec1a 100644
--- a/offapi/com/sun/star/form/component/DatabasePatternField.idl
+++ b/offapi/com/sun/star/form/component/DatabasePatternField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabasePatternField_idl__ 
 #define __com_sun_star_form_component_DatabasePatternField_idl__ 
  
-#ifndef __com_sun_star_form_component_PatternField_idl__ 
 #include <com/sun/star/form/component/PatternField.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
index d2f07b71f..6f758bfd2 100644
--- a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__ 
 #define __com_sun_star_form_component_DatabaseRadioButton_idl__ 
  
-#ifndef __com_sun_star_form_component_RadioButton_idl__ 
 #include <com/sun/star/form/component/RadioButton.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabaseTextField.idl b/offapi/com/sun/star/form/component/DatabaseTextField.idl
index 8709ec890..fc528f127 100644
--- a/offapi/com/sun/star/form/component/DatabaseTextField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTextField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseTextField_idl__ 
 #define __com_sun_star_form_component_DatabaseTextField_idl__ 
  
-#ifndef __com_sun_star_form_component_TextField_idl__ 
 #include <com/sun/star/form/component/TextField.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DatabaseTimeField.idl b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
index 740363584..655751516 100644
--- a/offapi/com/sun/star/form/component/DatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseTimeField_idl__ 
 #define __com_sun_star_form_component_DatabaseTimeField_idl__ 
  
-#ifndef __com_sun_star_form_component_TimeField_idl__ 
 #include <com/sun/star/form/component/TimeField.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
 #include <com/sun/star/form/DataAwareControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/DateField.idl b/offapi/com/sun/star/form/component/DateField.idl
index 72b0afdac..6db499e40 100644
--- a/offapi/com/sun/star/form/component/DateField.idl
+++ b/offapi/com/sun/star/form/component/DateField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DateField_idl__ 
 #define __com_sun_star_form_component_DateField_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__ 
 #include <com/sun/star/awt/UnoControlDateFieldModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/FileControl.idl b/offapi/com/sun/star/form/component/FileControl.idl
index e042d1264..2a4bd38ee 100644
--- a/offapi/com/sun/star/form/component/FileControl.idl
+++ b/offapi/com/sun/star/form/component/FileControl.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_FileControl_idl__ 
 #define __com_sun_star_form_component_FileControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlFileControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/component/FixedText.idl b/offapi/com/sun/star/form/component/FixedText.idl
index 4b3778be0..1de773f5d 100644
--- a/offapi/com/sun/star/form/component/FixedText.idl
+++ b/offapi/com/sun/star/form/component/FixedText.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_FixedText_idl__ 
 #define __com_sun_star_form_component_FixedText_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__ 
 #include <com/sun/star/awt/UnoControlFixedTextModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/Form.idl b/offapi/com/sun/star/form/component/Form.idl
index 5b9be2cef..05d738e87 100644
--- a/offapi/com/sun/star/form/component/Form.idl
+++ b/offapi/com/sun/star/form/component/Form.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_form_component_Form_idl__
 #define __com_sun_star_form_component_Form_idl__
 
-#ifndef __com_sun_star_form_FormComponent_idl__
 #include <com/sun/star/form/FormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
 #include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_form_XForm_idl__
 #include <com/sun/star/form/XForm.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
 #include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
-
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
 #include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/FormattedField.idl b/offapi/com/sun/star/form/component/FormattedField.idl
index a839f0ae2..790806ecd 100644
--- a/offapi/com/sun/star/form/component/FormattedField.idl
+++ b/offapi/com/sun/star/form/component/FormattedField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_FormattedField_idl__ 
 #define __com_sun_star_form_component_FormattedField_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__ 
 #include <com/sun/star/awt/UnoControlFormattedFieldModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/GridControl.idl b/offapi/com/sun/star/form/component/GridControl.idl
index ec12b65a5..c920292d9 100644
--- a/offapi/com/sun/star/form/component/GridControl.idl
+++ b/offapi/com/sun/star/form/component/GridControl.idl
@@ -27,53 +27,27 @@
 #ifndef __com_sun_star_form_component_GridControl_idl__ 
 #define __com_sun_star_form_component_GridControl_idl__ 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XGridColumnFactory_idl__ 
 #include <com/sun/star/form/XGridColumnFactory.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormComponents_idl__ 
 #include <com/sun/star/form/FormComponents.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_XContainer_idl__ 
 #include <com/sun/star/container/XContainer.idl> 
-#endif 
  
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
 #include <com/sun/star/view/XSelectionSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexContainer_idl__ 
 #include <com/sun/star/container/XIndexContainer.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__ 
 #include <com/sun/star/script/XEventAttacherManager.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/GroupBox.idl b/offapi/com/sun/star/form/component/GroupBox.idl
index 535d59c50..6b0eed5eb 100644
--- a/offapi/com/sun/star/form/component/GroupBox.idl
+++ b/offapi/com/sun/star/form/component/GroupBox.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_GroupBox_idl__ 
 #define __com_sun_star_form_component_GroupBox_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__ 
 #include <com/sun/star/awt/UnoControlGroupBoxModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/HTMLForm.idl b/offapi/com/sun/star/form/component/HTMLForm.idl
index 08ebb1036..e0a78ad2c 100644
--- a/offapi/com/sun/star/form/component/HTMLForm.idl
+++ b/offapi/com/sun/star/form/component/HTMLForm.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_form_component_HTMLForm_idl__ 
 #define __com_sun_star_form_component_HTMLForm_idl__ 
  
-#ifndef __com_sun_star_form_component_Form_idl__ 
 #include <com/sun/star/form/component/Form.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XSubmit_idl__ 
 #include <com/sun/star/form/XSubmit.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormSubmitMethod_idl__ 
 #include <com/sun/star/form/FormSubmitMethod.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormSubmitEncoding_idl__ 
 #include <com/sun/star/form/FormSubmitEncoding.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/HiddenControl.idl b/offapi/com/sun/star/form/component/HiddenControl.idl
index f9d972542..904a080a1 100644
--- a/offapi/com/sun/star/form/component/HiddenControl.idl
+++ b/offapi/com/sun/star/form/component/HiddenControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_component_HiddenControl_idl__ 
 #define __com_sun_star_form_component_HiddenControl_idl__ 
  
-#ifndef __com_sun_star_form_FormComponent_idl__ 
 #include <com/sun/star/form/FormComponent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/ImageButton.idl b/offapi/com/sun/star/form/component/ImageButton.idl
index 48cc3f209..1d28f464f 100644
--- a/offapi/com/sun/star/form/component/ImageButton.idl
+++ b/offapi/com/sun/star/form/component/ImageButton.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_form_component_ImageButton_idl__ 
 #define __com_sun_star_form_component_ImageButton_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlImageControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__ 
 #include <com/sun/star/form/XApproveActionBroadcaster.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__ 
 #include <com/sun/star/form/XImageProducerSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormButtonType_idl__ 
 #include <com/sun/star/form/FormButtonType.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/ListBox.idl b/offapi/com/sun/star/form/component/ListBox.idl
index 3752e4d44..c1fdce566 100644
--- a/offapi/com/sun/star/form/component/ListBox.idl
+++ b/offapi/com/sun/star/form/component/ListBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_ListBox_idl__ 
 #define __com_sun_star_form_component_ListBox_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__ 
 #include <com/sun/star/awt/UnoControlListBoxModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/NavigationToolBar.idl b/offapi/com/sun/star/form/component/NavigationToolBar.idl
index deeeb2ceb..fde0ffaca 100644
--- a/offapi/com/sun/star/form/component/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/component/NavigationToolBar.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_form_component_NavigationToolBar_idl__
 #define __com_sun_star_form_component_NavigationToolBar_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/NumericField.idl b/offapi/com/sun/star/form/component/NumericField.idl
index faba3d05c..cff1500dd 100644
--- a/offapi/com/sun/star/form/component/NumericField.idl
+++ b/offapi/com/sun/star/form/component/NumericField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_NumericField_idl__ 
 #define __com_sun_star_form_component_NumericField_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__ 
 #include <com/sun/star/awt/UnoControlNumericFieldModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/PatternField.idl b/offapi/com/sun/star/form/component/PatternField.idl
index 4a4ee8616..cd8e207b3 100644
--- a/offapi/com/sun/star/form/component/PatternField.idl
+++ b/offapi/com/sun/star/form/component/PatternField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_PatternField_idl__ 
 #define __com_sun_star_form_component_PatternField_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__ 
 #include <com/sun/star/awt/UnoControlPatternFieldModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/RadioButton.idl b/offapi/com/sun/star/form/component/RadioButton.idl
index 089c3d883..4248dc1b5 100644
--- a/offapi/com/sun/star/form/component/RadioButton.idl
+++ b/offapi/com/sun/star/form/component/RadioButton.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_RadioButton_idl__ 
 #define __com_sun_star_form_component_RadioButton_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__ 
 #include <com/sun/star/awt/UnoControlRadioButtonModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/RichTextControl.idl b/offapi/com/sun/star/form/component/RichTextControl.idl
index 7cc56efca..f62bd3b14 100644
--- a/offapi/com/sun/star/form/component/RichTextControl.idl
+++ b/offapi/com/sun/star/form/component/RichTextControl.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_form_component_RichTextControl_idl__
 #define __com_sun_star_form_component_RichTextControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
 #include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_TextRange_idl__
 #include <com/sun/star/text/TextRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/ScrollBar.idl b/offapi/com/sun/star/form/component/ScrollBar.idl
index 8f8d8865f..7216ab2dc 100644
--- a/offapi/com/sun/star/form/component/ScrollBar.idl
+++ b/offapi/com/sun/star/form/component/ScrollBar.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_ScrollBar_idl__
 #define __com_sun_star_form_component_ScrollBar_idl__
 
-#ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__
 #include <com/sun/star/awt/UnoControlScrollBarModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/SpinButton.idl b/offapi/com/sun/star/form/component/SpinButton.idl
index 33d1306f2..a3fca95e2 100644
--- a/offapi/com/sun/star/form/component/SpinButton.idl
+++ b/offapi/com/sun/star/form/component/SpinButton.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_SpinButton_idl__
 #define __com_sun_star_form_component_SpinButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlSpinButtonModel_idl__
 #include <com/sun/star/awt/UnoControlSpinButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/SubmitButton.idl b/offapi/com/sun/star/form/component/SubmitButton.idl
index 544ef3a94..40485719b 100644
--- a/offapi/com/sun/star/form/component/SubmitButton.idl
+++ b/offapi/com/sun/star/form/component/SubmitButton.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_SubmitButton_idl__
 #define __com_sun_star_form_component_SubmitButton_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlButtonModel_idl__
 #include <com/sun/star/awt/UnoControlButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
 #include <com/sun/star/form/submission/XSubmissionSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/TextField.idl b/offapi/com/sun/star/form/component/TextField.idl
index c9aa7a219..2489da97a 100644
--- a/offapi/com/sun/star/form/component/TextField.idl
+++ b/offapi/com/sun/star/form/component/TextField.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_form_component_TextField_idl__ 
 #define __com_sun_star_form_component_TextField_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__ 
 #include <com/sun/star/awt/UnoControlEditModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_component_RichTextControl_idl__ 
 #include <com/sun/star/form/component/RichTextControl.idl> 
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/TimeField.idl b/offapi/com/sun/star/form/component/TimeField.idl
index 4c646182d..50889861d 100644
--- a/offapi/com/sun/star/form/component/TimeField.idl
+++ b/offapi/com/sun/star/form/component/TimeField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_TimeField_idl__ 
 #define __com_sun_star_form_component_TimeField_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__ 
 #include <com/sun/star/awt/UnoControlTimeFieldModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_form_XReset_idl__ 
 #include <com/sun/star/form/XReset.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/form/component/makefile.mk b/offapi/com/sun/star/form/component/makefile.mk
deleted file mode 100644
index 37c1bb44d..000000000
--- a/offapi/com/sun/star/form/component/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfcomp
-PACKAGE=com$/sun$/star$/form$/component
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    CheckBox.idl\
-    ComboBox.idl\
-    CommandButton.idl\
-    CurrencyField.idl\
-    DatabaseCheckBox.idl\
-    DatabaseComboBox.idl\
-    DatabaseCurrencyField.idl\
-    DatabaseDateField.idl\
-    DatabaseImageControl.idl\
-    DatabaseListBox.idl\
-    DatabaseNumericField.idl\
-    DatabasePatternField.idl\
-    DatabaseRadioButton.idl\
-    DatabaseTextField.idl\
-    DatabaseFormattedField.idl\
-    DatabaseTimeField.idl\
-    DataForm.idl\
-    DateField.idl\
-    FileControl.idl\
-    FixedText.idl\
-    Form.idl\
-    GridControl.idl\
-    GroupBox.idl\
-    HiddenControl.idl\
-    HTMLForm.idl\
-    ImageButton.idl\
-    ListBox.idl\
-    NumericField.idl\
-    PatternField.idl\
-    RadioButton.idl\
-    TextField.idl\
-    FormattedField.idl\
-    TimeField.idl\
-    NavigationToolBar.idl\
-    ScrollBar.idl\
-    SpinButton.idl\
-    SubmitButton.idl\
-    RichTextControl.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/control/CheckBox.idl b/offapi/com/sun/star/form/control/CheckBox.idl
index e098c7d59..381b9d69c 100644
--- a/offapi/com/sun/star/form/control/CheckBox.idl
+++ b/offapi/com/sun/star/form/control/CheckBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_component_checkbox_idl__ 
 #define __com_sun_star_form_component_checkbox_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlCheckBox_idl__ 
 #include <com/sun/star/awt/UnoControlCheckBox.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/ComboBox.idl b/offapi/com/sun/star/form/control/ComboBox.idl
index 46c0512fc..f9a52b790 100644
--- a/offapi/com/sun/star/form/control/ComboBox.idl
+++ b/offapi/com/sun/star/form/control/ComboBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_ComboBox_idl__ 
 #define __com_sun_star_form_control_ComboBox_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlComboBox_idl__ 
 #include <com/sun/star/awt/UnoControlComboBox.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/CommandButton.idl b/offapi/com/sun/star/form/control/CommandButton.idl
index 891153a0d..bb819ad2a 100644
--- a/offapi/com/sun/star/form/control/CommandButton.idl
+++ b/offapi/com/sun/star/form/control/CommandButton.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_CommandButton_idl__ 
 #define __com_sun_star_form_control_CommandButton_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlButton_idl__ 
 #include <com/sun/star/awt/UnoControlButton.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__ 
 #include <com/sun/star/form/XApproveActionBroadcaster.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/CurrencyField.idl b/offapi/com/sun/star/form/control/CurrencyField.idl
index 6e05b6159..5a4a87d2d 100644
--- a/offapi/com/sun/star/form/control/CurrencyField.idl
+++ b/offapi/com/sun/star/form/control/CurrencyField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_CurrencyField_idl__ 
 #define __com_sun_star_form_control_CurrencyField_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlCurrencyField_idl__ 
 #include <com/sun/star/awt/UnoControlCurrencyField.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/DateField.idl b/offapi/com/sun/star/form/control/DateField.idl
index ba137ce67..b988c0ce3 100644
--- a/offapi/com/sun/star/form/control/DateField.idl
+++ b/offapi/com/sun/star/form/control/DateField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_DateField_idl__ 
 #define __com_sun_star_form_control_DateField_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlDateField_idl__ 
 #include <com/sun/star/awt/UnoControlDateField.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/FormattedField.idl b/offapi/com/sun/star/form/control/FormattedField.idl
index 18fc8211b..cd13d47be 100644
--- a/offapi/com/sun/star/form/control/FormattedField.idl
+++ b/offapi/com/sun/star/form/control/FormattedField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_FormattedField_idl__ 
 #define __com_sun_star_form_control_FormattedField_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlFormattedField_idl__ 
 #include <com/sun/star/awt/UnoControlFormattedField.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/GridControl.idl b/offapi/com/sun/star/form/control/GridControl.idl
index 5c45c43a4..ef1cf2657 100644
--- a/offapi/com/sun/star/form/control/GridControl.idl
+++ b/offapi/com/sun/star/form/control/GridControl.idl
@@ -28,49 +28,17 @@
 #ifndef __com_sun_star_form_control_GridControl_idl__ 
 #define __com_sun_star_form_control_GridControl_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGrid_idl__ 
 #include <com/sun/star/form/XGrid.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundComponent_idl__ 
 #include <com/sun/star/form/XBoundComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__ 
 #include <com/sun/star/form/XGridFieldDataSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__ 
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeSelector_idl__ 
 #include <com/sun/star/util/XModeSelector.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__ 
 #include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__ 
 #include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/GroupBox.idl b/offapi/com/sun/star/form/control/GroupBox.idl
index 339526827..150f55f18 100644
--- a/offapi/com/sun/star/form/control/GroupBox.idl
+++ b/offapi/com/sun/star/form/control/GroupBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_GroupBox_idl__ 
 #define __com_sun_star_form_control_GroupBox_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlGroupBox_idl__ 
 #include <com/sun/star/awt/UnoControlGroupBox.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/ImageButton.idl b/offapi/com/sun/star/form/control/ImageButton.idl
index 1cd1629ca..3cab821db 100644
--- a/offapi/com/sun/star/form/control/ImageButton.idl
+++ b/offapi/com/sun/star/form/control/ImageButton.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_ImageButton_idl__ 
 #define __com_sun_star_form_control_ImageButton_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__ 
 #include <com/sun/star/awt/UnoControlImageControl.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__ 
 #include <com/sun/star/form/XApproveActionBroadcaster.idl> 
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/ImageControl.idl b/offapi/com/sun/star/form/control/ImageControl.idl
index de6711b03..4dda44d9f 100644
--- a/offapi/com/sun/star/form/control/ImageControl.idl
+++ b/offapi/com/sun/star/form/control/ImageControl.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_ImageControl_idl__ 
 #define __com_sun_star_form_control_ImageControl_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__ 
 #include <com/sun/star/awt/UnoControlImageControl.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/InteractionGridControl.idl b/offapi/com/sun/star/form/control/InteractionGridControl.idl
index 48cf08043..f3d165336 100644
--- a/offapi/com/sun/star/form/control/InteractionGridControl.idl
+++ b/offapi/com/sun/star/form/control/InteractionGridControl.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_form_component_InteractionGridControl_idl__ 
 #define __com_sun_star_form_component_InteractionGridControl_idl__ 
 
-#ifndef __com_sun_star_form_control_GridControl_idl__ 
 #include <com/sun/star/form/control/GridControl.idl> 
-#endif 
-#ifndef __com_sun_star_frame_XDispatch_idl__ 
 #include <com/sun/star/frame/XDispatch.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/ListBox.idl b/offapi/com/sun/star/form/control/ListBox.idl
index bad847c43..bdd4774e2 100644
--- a/offapi/com/sun/star/form/control/ListBox.idl
+++ b/offapi/com/sun/star/form/control/ListBox.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_form_control_ListBox_idl__ 
 #define __com_sun_star_form_control_ListBox_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlListBox_idl__ 
 #include <com/sun/star/awt/UnoControlListBox.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__ 
 #include <com/sun/star/form/XChangeBroadcaster.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/NavigationToolBar.idl b/offapi/com/sun/star/form/control/NavigationToolBar.idl
index ec8762eec..034e0edcf 100644
--- a/offapi/com/sun/star/form/control/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/control/NavigationToolBar.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_control_NavigationToolBar_idl__
 #define __com_sun_star_form_control_NavigationToolBar_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/NumericField.idl b/offapi/com/sun/star/form/control/NumericField.idl
index 45d9b2b7b..c23691387 100644
--- a/offapi/com/sun/star/form/control/NumericField.idl
+++ b/offapi/com/sun/star/form/control/NumericField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_NumericField_idl__ 
 #define __com_sun_star_form_control_NumericField_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlNumericField_idl__ 
 #include <com/sun/star/awt/UnoControlNumericField.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/PatternField.idl b/offapi/com/sun/star/form/control/PatternField.idl
index f09d31065..cd9f7fed9 100644
--- a/offapi/com/sun/star/form/control/PatternField.idl
+++ b/offapi/com/sun/star/form/control/PatternField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_PatternField_idl__ 
 #define __com_sun_star_form_control_PatternField_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlPatternField_idl__ 
 #include <com/sun/star/awt/UnoControlPatternField.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/RadioButton.idl b/offapi/com/sun/star/form/control/RadioButton.idl
index 1907ad7c5..1112daeb5 100644
--- a/offapi/com/sun/star/form/control/RadioButton.idl
+++ b/offapi/com/sun/star/form/control/RadioButton.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_RadioButton_idl__ 
 #define __com_sun_star_form_control_RadioButton_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlRadioButton_idl__ 
 #include <com/sun/star/awt/UnoControlRadioButton.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/SubmitButton.idl b/offapi/com/sun/star/form/control/SubmitButton.idl
index 790750341..5b056bce2 100644
--- a/offapi/com/sun/star/form/control/SubmitButton.idl
+++ b/offapi/com/sun/star/form/control/SubmitButton.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_SubmitButton_idl__
 #define __com_sun_star_form_control_SubmitButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlButton_idl__
 #include <com/sun/star/awt/UnoControlButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmission_idl__
 #include <com/sun/star/form/submission/XSubmission.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/TextField.idl b/offapi/com/sun/star/form/control/TextField.idl
index aa053db87..edca94bf7 100644
--- a/offapi/com/sun/star/form/control/TextField.idl
+++ b/offapi/com/sun/star/form/control/TextField.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_form_control_TextField_idl__ 
 #define __com_sun_star_form_control_TextField_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
 #include <com/sun/star/awt/UnoControlEdit.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__ 
 #include <com/sun/star/form/XChangeBroadcaster.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/TimeField.idl b/offapi/com/sun/star/form/control/TimeField.idl
index f92fe724e..f93273d49 100644
--- a/offapi/com/sun/star/form/control/TimeField.idl
+++ b/offapi/com/sun/star/form/control/TimeField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_TimeField_idl__ 
 #define __com_sun_star_form_control_TimeField_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlTimeField_idl__ 
 #include <com/sun/star/awt/UnoControlTimeField.idl> 
-#endif 
-
-#ifndef __com_sun_star_form_XBoundControl_idl__ 
 #include <com/sun/star/form/XBoundControl.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/form/control/makefile.mk b/offapi/com/sun/star/form/control/makefile.mk
deleted file mode 100644
index 6e972b224..000000000
--- a/offapi/com/sun/star/form/control/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfcontrol
-PACKAGE=com$/sun$/star$/form$/control
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        CheckBox.idl			\
-        ComboBox.idl			\
-        CommandButton.idl		\
-        CurrencyField.idl		\
-        DateField.idl			\
-        FormattedField.idl		\
-        GridControl.idl			\
-        GroupBox.idl			\
-        ImageButton.idl			\
-        ImageControl.idl		\
-        InteractionGridControl.idl	\
-        ListBox.idl				\
-        NumericField.idl		\
-        PatternField.idl		\
-        RadioButton.idl			\
-        TextField.idl			\
-        TimeField.idl           \
-        SubmitButton.idl        \
-        NavigationToolBar.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
index 11896c239..b401d021e 100644
--- a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
+++ b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_ButtonNavigationHandler_idl__
 #define __com_sun_star_form_ButtonNavigationHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
index 52cdadeb1..a2ee04db8 100644
--- a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_CellBindingPropertyHandler_idl__
 #define __com_sun_star_form_inspection_CellBindingPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
index 26bc733cf..74837f0a9 100644
--- a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
+++ b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
 #define __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
 
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
 #include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
index c27466e5f..5feed0af8 100644
--- a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_EditPropertyHandler_idl__
 #define __com_sun_star_form_inspection_EditPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/EventHandler.idl b/offapi/com/sun/star/form/inspection/EventHandler.idl
index 4136be6bb..c883e3959 100644
--- a/offapi/com/sun/star/form/inspection/EventHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EventHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_EventHandler_idl__
 #define __com_sun_star_form_EventHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
index 9fed13039..ca8172dc3 100644
--- a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_FormComponentPropertyHandler_idl__
 #define __com_sun_star_form_inspection_FormComponentPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
index a84d76c94..9654f4d54 100644
--- a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_SubmissionPropertyHandler_idl__
 #define __com_sun_star_form_inspection_SubmissionPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
index 2017c7d6e..dd27d832d 100644
--- a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_XMLFormsPropertyHandler_idl__
 #define __com_sun_star_form_inspection_XMLFormsPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
index 34a40611b..4f2b75c9d 100644
--- a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_XSDValidationPropertyHandler_idl__
 #define __com_sun_star_form_inspection_XSDValidationPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/makefile.mk b/offapi/com/sun/star/form/inspection/makefile.mk
deleted file mode 100644
index e867febf8..000000000
--- a/offapi/com/sun/star/form/inspection/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfinsp
-PACKAGE=com$/sun$/star$/form$/inspection
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ButtonNavigationHandler.idl \
-    CellBindingPropertyHandler.idl \
-    DefaultFormComponentInspectorModel.idl \
-    EditPropertyHandler.idl \
-    EventHandler.idl \
-    FormComponentPropertyHandler.idl \
-    SubmissionPropertyHandler.idl \
-    XMLFormsPropertyHandler.idl \
-    XSDValidationPropertyHandler.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/makefile.mk b/offapi/com/sun/star/form/makefile.mk
deleted file mode 100644
index b1161cb2a..000000000
--- a/offapi/com/sun/star/form/makefile.mk
+++ /dev/null
@@ -1,104 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssform
-PACKAGE=com$/sun$/star$/form
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    modules.idl\
-    DataAwareControlModel.idl\
-    DatabaseDeleteEvent.idl\
-    DatabaseParameterEvent.idl\
-    DataSelectionType.idl\
-    ErrorEvent.idl\
-    FormButtonType.idl\
-    FormComponent.idl\
-    FormComponents.idl\
-    FormComponentType.idl\
-    FormController.idl\
-    FormControllerDispatcher.idl\
-    FormControlModel.idl\
-    Forms.idl\
-    FormSubmitEncoding.idl\
-    FormSubmitMethod.idl\
-    ListSourceType.idl\
-    NavigationBarMode.idl\
-    PropertyBrowserController.idl\
-    TabulatorCycle.idl\
-    XApproveActionBroadcaster.idl\
-    XApproveActionListener.idl\
-    XBoundComponent.idl\
-    XBoundControl.idl\
-    XChangeBroadcaster.idl\
-    XChangeListener.idl\
-    XConfirmDeleteBroadcaster.idl\
-    XConfirmDeleteListener.idl\
-    XDatabaseParameterBroadcaster.idl\
-    XDatabaseParameterBroadcaster2.idl\
-    XDatabaseParameterListener.idl\
-    XDeleteListener.idl\
-    XErrorBroadcaster.idl\
-    XErrorListener.idl\
-    XForm.idl\
-    XFormComponent.idl\
-    XFormController.idl\
-    XFormControllerListener.idl\
-    XFormsSupplier.idl\
-    XFormsSupplier2.idl\
-    XGrid.idl\
-    XGridColumnFactory.idl\
-    XGridControl.idl\
-    XGridControlListener.idl\
-    XGridFieldDataSupplier.idl\
-    XGridPeer.idl\
-    XImageProducerSupplier.idl\
-    XInsertListener.idl\
-    XLoadListener.idl\
-    XPositioningListener.idl\
-    XReset.idl\
-    XResetListener.idl\
-    XRestoreListener.idl\
-    XSubmit.idl\
-    XSubmitListener.idl\
-    XUpdateBroadcaster.idl\
-    XUpdateListener.idl\
-    XLoadable.idl\
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/runtime/FormOperations.idl b/offapi/com/sun/star/form/runtime/FormOperations.idl
index e47f078d4..9ca3d7105 100644
--- a/offapi/com/sun/star/form/runtime/FormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/FormOperations.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_form_runtime_FormOperations_idl__
 #define __com_sun_star_form_runtime_FormOperations_idl__
 
-#ifndef __com_sun_star_form_runtime_XFormOperations_idl__
 #include <com/sun/star/form/runtime/XFormOperations.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__ 
 #include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_form_XForm_idl__ 
 #include <com/sun/star/form/XForm.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
index 6486de470..1b3255dfe 100644
--- a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
+++ b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_runtime_XFeatureInvalidation_idl__
 #define __com_sun_star_form_runtime_XFeatureInvalidation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/XFormOperations.idl b/offapi/com/sun/star/form/runtime/XFormOperations.idl
index 375badf63..f49657980 100644
--- a/offapi/com/sun/star/form/runtime/XFormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/XFormOperations.idl
@@ -28,31 +28,14 @@
 #ifndef __com_sun_star_form_runtime_XFormOperations_idl__
 #define __com_sun_star_form_runtime_XFormOperations_idl__
 
-#ifndef __com_sun_star_form_runtime_FeatureState_idl__
 #include <com/sun/star/form/runtime/FeatureState.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XRowSet_idl__ 
 #include <com/sun/star/sdbc/XRowSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__ 
 #include <com/sun/star/sdbc/XResultSetUpdate.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__ 
 #include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/makefile.mk b/offapi/com/sun/star/form/runtime/makefile.mk
deleted file mode 100644
index 4b34b28ca..000000000
--- a/offapi/com/sun/star/form/runtime/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfrunt
-PACKAGE=com$/sun$/star$/form$/runtime
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    FeatureState.idl \
-    FilterEvent.idl \
-    FormFeature.idl \
-    FormOperations.idl \
-    FormController.idl \
-    XFeatureInvalidation.idl \
-    XFilterController.idl \
-    XFilterControllerListener.idl \
-    XFormController.idl \
-    XFormControllerContext.idl \
-    XFormOperations.idl \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/submission/XSubmission.idl b/offapi/com/sun/star/form/submission/XSubmission.idl
index a3ee2be75..724b67b5b 100644
--- a/offapi/com/sun/star/form/submission/XSubmission.idl
+++ b/offapi/com/sun/star/form/submission/XSubmission.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_form_submission_XSubmission_idl__
 #define __com_sun_star_form_submission_XSubmission_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
index 08771226f..6bc1ea899 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
 #define __com_sun_star_form_submission_XSubmissionSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
index f3473ed5e..0105b1939 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_form_submission_XSubmissionVetoListener_idl__
 #define __com_sun_star_form_submission_XSubmissionVetoListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
index e369f4a0d..2d6ffe588 100644
--- a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_validation_ValidatableBindableControlModel_idl__
 #define __com_sun_star_form_validation_ValidatableBindableControlModel_idl__
 
-#ifndef __com_sun_star_form_validation_ValidatableControlModel_idl__
 #include <com/sun/star/form/validation/ValidatableControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
 #include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {  module form { module validation {
diff --git a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
index ef4b4cc09..94d07e57e 100644
--- a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_form_validation_ValidatableControlModel_idl__
 #define __com_sun_star_form_validation_ValidatableControlModel_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidatableFormComponent_idl__
 #include <com/sun/star/form/validation/XValidatableFormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidityConstraintListener_idl__
 #include <com/sun/star/form/validation/XValidityConstraintListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
index a967f388b..8157f1c87 100644
--- a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
+++ b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_validation_XFormComponentValidityListener_idl__
 #define __com_sun_star_form_validation_XFormComponentValidityListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/XValidatable.idl b/offapi/com/sun/star/form/validation/XValidatable.idl
index 2a8c014c7..6280d70cb 100644
--- a/offapi/com/sun/star/form/validation/XValidatable.idl
+++ b/offapi/com/sun/star/form/validation/XValidatable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_validation_XValidatable_idl__
 #define __com_sun_star_form_validation_XValidatable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
index f20c52ffd..ee2a1319c 100644
--- a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
+++ b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_form_validation_XValidatableFormComponent_idl__
 #define __com_sun_star_form_validation_XValidatableFormComponent_idl__
 
-#ifndef __com_sun_star_form_validation_XValidatable_idl__
 #include <com/sun/star/form/validation/XValidatable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/XValidator.idl b/offapi/com/sun/star/form/validation/XValidator.idl
index 02a702430..bf81be977 100644
--- a/offapi/com/sun/star/form/validation/XValidator.idl
+++ b/offapi/com/sun/star/form/validation/XValidator.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_validation_XValidator_idl__
 #define __com_sun_star_form_validation_XValidator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
index f462bbf58..3028f260c 100644
--- a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
+++ b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_validation_XValidityConstraintListener_idl__
 #define __com_sun_star_form_validation_XValidityConstraintListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/makefile.mk b/offapi/com/sun/star/form/validation/makefile.mk
deleted file mode 100644
index 752438c94..000000000
--- a/offapi/com/sun/star/form/validation/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfvalidation
-PACKAGE=com$/sun$/star$/form$/validation
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XValidatable.idl   \
-    XValidator.idl   \
-    XValidityConstraintListener.idl   \
-    XValidatableFormComponent.idl   \
-    XFormComponentValidityListener.idl   \
-    \
-    ValidatableControlModel.idl   \
-    ValidatableBindableControlModel.idl \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaText.idl b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
index 7c1549774..e7e734a74 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaText.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_formula_AccessibleFormulaText_idl__
 #define __com_sun_star_formula_AccessibleFormulaText_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaView.idl b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
index 800afeacd..395a61093 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaView.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_formula_AccessibleFormulaView__
 #define __com_sun_star_formula_AccessibleFormulaView__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/formula/makefile.mk b/offapi/com/sun/star/formula/makefile.mk
deleted file mode 100644
index aae03ff03..000000000
--- a/offapi/com/sun/star/formula/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssformula
-PACKAGE=com$/sun$/star$/formula
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleFormulaText.idl \
-    AccessibleFormulaView.idl \
-    SymbolDescriptor.idl \
-    FormulaProperties.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/frame/Components.idl b/offapi/com/sun/star/frame/Components.idl
index 8b6714f62..738589f49 100644
--- a/offapi/com/sun/star/frame/Components.idl
+++ b/offapi/com/sun/star/frame/Components.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_Components_idl__
 #define __com_sun_star_frame_Components_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/ContentHandler.idl b/offapi/com/sun/star/frame/ContentHandler.idl
index 1da4e4dbf..0a8c7947e 100644
--- a/offapi/com/sun/star/frame/ContentHandler.idl
+++ b/offapi/com/sun/star/frame/ContentHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_ContentHandler_idl__
 #define __com_sun_star_frame_ContentHandler_idl__
 
-#ifndef __com_sun_star_frame_XNotifyingDispatch_idl__
 #include <com/sun/star/frame/XNotifyingDispatch.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/ContentHandlerFactory.idl b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
index 894f76a6e..ed7830871 100644
--- a/offapi/com/sun/star/frame/ContentHandlerFactory.idl
+++ b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_ContentHandlerFactory_idl__
 #define __com_sun_star_frame_ContentHandlerFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
 #include <com/sun/star/container/XContainerQuery.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/ControlCommand.idl b/offapi/com/sun/star/frame/ControlCommand.idl
index 345659f1e..094524e62 100644
--- a/offapi/com/sun/star/frame/ControlCommand.idl
+++ b/offapi/com/sun/star/frame/ControlCommand.idl
@@ -28,9 +28,7 @@
 #define __com_sun_star_frame_ControlCommand_idl__ 
  
  
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/frame/ControlEvent.idl b/offapi/com/sun/star/frame/ControlEvent.idl
index 7c15ffa07..528190ceb 100644
--- a/offapi/com/sun/star/frame/ControlEvent.idl
+++ b/offapi/com/sun/star/frame/ControlEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_frame_ControlEvent_idl__ 
 #define __com_sun_star_frame_ControlEvent_idl__ 
 
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
  
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/frame/Controller.idl b/offapi/com/sun/star/frame/Controller.idl
index ec11bbd51..56763e584 100644
--- a/offapi/com/sun/star/frame/Controller.idl
+++ b/offapi/com/sun/star/frame/Controller.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_frame_Controller_idl__
 #define __com_sun_star_frame_Controller_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XContextMenuInterception_idl__
 #include <com/sun/star/ui/XContextMenuInterception.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XUserInputInterception_idl__
 #include <com/sun/star/awt/XUserInputInterception.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferableSupplier_idl__
 #include <com/sun/star/datatransfer/XTransferableSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/Desktop.idl b/offapi/com/sun/star/frame/Desktop.idl
index 5f67f0dfa..771c2d2fc 100644
--- a/offapi/com/sun/star/frame/Desktop.idl
+++ b/offapi/com/sun/star/frame/Desktop.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_frame_Desktop_idl__
 #define __com_sun_star_frame_Desktop_idl__
 
-#ifndef __com_sun_star_frame_Frame_idl__
 #include <com/sun/star/frame/Frame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDesktop_idl__
 #include <com/sun/star/frame/XDesktop.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XComponentLoader_idl__
 #include <com/sun/star/frame/XComponentLoader.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DesktopTask.idl b/offapi/com/sun/star/frame/DesktopTask.idl
index 07d57142d..18a03804b 100644
--- a/offapi/com/sun/star/frame/DesktopTask.idl
+++ b/offapi/com/sun/star/frame/DesktopTask.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_frame_DesktopTask_idl__
 #define __com_sun_star_frame_DesktopTask_idl__
 
-#ifndef __com_sun_star_frame_XDesktopTask_idl__
 #include <com/sun/star/frame/XDesktopTask.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XWindowArranger_idl__
 #include <com/sun/star/frame/XWindowArranger.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFramesSupplier_idl__
 #include <com/sun/star/frame/XFramesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DesktopTasks.idl b/offapi/com/sun/star/frame/DesktopTasks.idl
index 8a3260999..268fa7e89 100644
--- a/offapi/com/sun/star/frame/DesktopTasks.idl
+++ b/offapi/com/sun/star/frame/DesktopTasks.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DesktopTasks_idl__
 #define __com_sun_star_frame_DesktopTasks_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchDescriptor.idl b/offapi/com/sun/star/frame/DispatchDescriptor.idl
index 1b95b543f..945041dfb 100644
--- a/offapi/com/sun/star/frame/DispatchDescriptor.idl
+++ b/offapi/com/sun/star/frame/DispatchDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DispatchDescriptor_idl__
 #define __com_sun_star_frame_DispatchDescriptor_idl__
 
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/DispatchHelper.idl b/offapi/com/sun/star/frame/DispatchHelper.idl
index 7b9c3d354..1281819ad 100644
--- a/offapi/com/sun/star/frame/DispatchHelper.idl
+++ b/offapi/com/sun/star/frame/DispatchHelper.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DispatchHelper_idl__
 #define __com_sun_star_frame_DispatchHelper_idl__
 
-#ifndef __com_sun_star_frame_XDispatchHelper_idl__
 #include <com/sun/star/frame/XDispatchHelper.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchInformation.idl b/offapi/com/sun/star/frame/DispatchInformation.idl
index a402f8942..c180b0ec9 100644
--- a/offapi/com/sun/star/frame/DispatchInformation.idl
+++ b/offapi/com/sun/star/frame/DispatchInformation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DispatchInformation_idl__
 #define __com_sun_star_frame_DispatchInformation_idl__
 
-#ifndef __com_sun_star_frame_CommandGroup_idl__
 #include <com/sun/star/frame/CommandGroup.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchProvider.idl b/offapi/com/sun/star/frame/DispatchProvider.idl
index 312adbaa0..9fe2eec28 100644
--- a/offapi/com/sun/star/frame/DispatchProvider.idl
+++ b/offapi/com/sun/star/frame/DispatchProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_DispatchProvider_idl__
 #define __com_sun_star_frame_DispatchProvider_idl__
 
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
 #include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchRecorder.idl b/offapi/com/sun/star/frame/DispatchRecorder.idl
index ec9bd68aa..08a215efa 100644
--- a/offapi/com/sun/star/frame/DispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorder.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_DispatchRecorder_idl__
 #define __com_sun_star_frame_DispatchRecorder_idl__
 
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
 #include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
index 91f127c58..ed1bcdfe5 100644
--- a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DispatchRecorderSupplier_idl__
 #define __com_sun_star_frame_DispatchRecorderSupplier_idl__
 
-#ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
 #include <com/sun/star/frame/XDispatchRecorderSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchResultEvent.idl b/offapi/com/sun/star/frame/DispatchResultEvent.idl
index 399a44ff6..88b70f9fd 100644
--- a/offapi/com/sun/star/frame/DispatchResultEvent.idl
+++ b/offapi/com/sun/star/frame/DispatchResultEvent.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_DispatchResultEvent_idl__
 #define __com_sun_star_frame_DispatchResultEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchStatement.idl b/offapi/com/sun/star/frame/DispatchStatement.idl
index 662a51024..51526fd0a 100644
--- a/offapi/com/sun/star/frame/DispatchStatement.idl
+++ b/offapi/com/sun/star/frame/DispatchStatement.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DispatchStatement_idl__
 #define __com_sun_star_frame_DispatchStatement_idl__
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DocumentTemplates.idl b/offapi/com/sun/star/frame/DocumentTemplates.idl
index 3b7a14052..c5c7f1af5 100644
--- a/offapi/com/sun/star/frame/DocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/DocumentTemplates.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DocumentTemplates_idl__
 #define __com_sun_star_frame_DocumentTemplates_idl__
 
-#ifndef __com_sun_star_frame_XDocumentTemplates_idl__
 #include <com/sun/star/frame/XDocumentTemplates.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DoubleInitializationException.idl b/offapi/com/sun/star/frame/DoubleInitializationException.idl
index 414e6155f..e2445f317 100644
--- a/offapi/com/sun/star/frame/DoubleInitializationException.idl
+++ b/offapi/com/sun/star/frame/DoubleInitializationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_TerminationVetoException_idl__ 
 #define __com_sun_star_frame_TerminationVetoException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/frame/FeatureStateEvent.idl b/offapi/com/sun/star/frame/FeatureStateEvent.idl
index 8105257cd..7e6db5383 100644
--- a/offapi/com/sun/star/frame/FeatureStateEvent.idl
+++ b/offapi/com/sun/star/frame/FeatureStateEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_FeatureStateEvent_idl__
 #define __com_sun_star_frame_FeatureStateEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/Frame.idl b/offapi/com/sun/star/frame/Frame.idl
index a196a57cd..eec586068 100644
--- a/offapi/com/sun/star/frame/Frame.idl
+++ b/offapi/com/sun/star/frame/Frame.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_frame_Frame_idl__
 #define __com_sun_star_frame_Frame_idl__
 
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
 #include <com/sun/star/frame/XDispatchRecorderSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
 #include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFramesSupplier_idl__
 #include <com/sun/star/frame/XFramesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicatorFactory_idl__
 #include <com/sun/star/task/XStatusIndicatorFactory.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchInformationProvider_idl__
 #include <com/sun/star/frame/XDispatchInformationProvider.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/FrameActionEvent.idl b/offapi/com/sun/star/frame/FrameActionEvent.idl
index 76b37aab9..e29c8b14f 100644
--- a/offapi/com/sun/star/frame/FrameActionEvent.idl
+++ b/offapi/com/sun/star/frame/FrameActionEvent.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_FrameActionEvent_idl__
 #define __com_sun_star_frame_FrameActionEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FrameAction_idl__
 #include <com/sun/star/frame/FrameAction.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/FrameControl.idl b/offapi/com/sun/star/frame/FrameControl.idl
index 3972e2504..89cd2b876 100644
--- a/offapi/com/sun/star/frame/FrameControl.idl
+++ b/offapi/com/sun/star/frame/FrameControl.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_FrameControl_idl__
 #define __com_sun_star_frame_FrameControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/FrameLoader.idl b/offapi/com/sun/star/frame/FrameLoader.idl
index 2d4746d7b..af2dae030 100644
--- a/offapi/com/sun/star/frame/FrameLoader.idl
+++ b/offapi/com/sun/star/frame/FrameLoader.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_FrameLoader_idl__
 #define __com_sun_star_frame_FrameLoader_idl__
 
-#ifndef __com_sun_star_frame_XFrameLoader_idl__
 #include <com/sun/star/frame/XFrameLoader.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/FrameLoaderFactory.idl b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
index f00b50c82..4582b459a 100644
--- a/offapi/com/sun/star/frame/FrameLoaderFactory.idl
+++ b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_FrameLoaderFactory_idl__
 #define __com_sun_star_frame_FrameLoaderFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
 #include <com/sun/star/container/XContainerQuery.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/FramesContainer.idl b/offapi/com/sun/star/frame/FramesContainer.idl
index 1d1d19729..52e6f706d 100644
--- a/offapi/com/sun/star/frame/FramesContainer.idl
+++ b/offapi/com/sun/star/frame/FramesContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_FramesContainer_idl__
 #define __com_sun_star_frame_FramesContainer_idl__
 
-#ifndef __com_sun_star_frame_XFrames_idl__
 #include <com/sun/star/frame/XFrames.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl b/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
index 3af26c857..546eebcf7 100644
--- a/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_GlobalEventBroadcaster_idl__
 #define __com_sun_star_frame_GlobalEventBroadcaster_idl__
 
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventsSupplier_idl__
 #include <com/sun/star/document/XEventsSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
index c82fcf505..b7153b9bc 100644
--- a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
+++ b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_TerminationVetoException_idl__ 
 #define __com_sun_star_frame_TerminationVetoException_idl__ 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl
index f57f44fcf..ca68cce9d 100644
--- a/offapi/com/sun/star/frame/LayoutManager.idl
+++ b/offapi/com/sun/star/frame/LayoutManager.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_frame_LayoutManager_idl__
 #define __com_sun_star_frame_LayoutManager_idl__
 
-#ifndef __com_sun_star_frame_XLayoutManager_idl__
 #include <com/sun/star/frame/XLayoutManager.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrameActionListener_idl__
 #include <com/sun/star/frame/XFrameActionListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
 #include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XInplaceLayout_idl__
 #include <com/sun/star/frame/XInplaceLayout.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
 #include <com/sun/star/frame/XMenuBarMergingAcceptor.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
 #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
index 92361bfe7..4eb879d7a 100644
--- a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
+++ b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_MediaTypeDetectionHelper_idl__
 #define __com_sun_star_frame_MediaTypeDetectionHelper_idl__
 
-#ifndef __com_sun_star_util_XStringMapping_idl__
 #include <com/sun/star/util/XStringMapping.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/ModuleManager.idl b/offapi/com/sun/star/frame/ModuleManager.idl
index 3a5559232..c69cd2156 100644
--- a/offapi/com/sun/star/frame/ModuleManager.idl
+++ b/offapi/com/sun/star/frame/ModuleManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_ModuleManager_idl__
 #define __com_sun_star_frame_ModuleManager_idl__
 
-#ifndef __com_sun_star_frame_XModuleManager_idl__
 #include <com/sun/star/frame/XModuleManager.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //===============================================
 
@@ -42,7 +37,7 @@ module com { module sun { module star { module frame {
 
 //===============================================
 /** can be used to identify office modules.
- 
+
     <p>
     Further it provides read access to the configuration
     of office modules.
@@ -51,7 +46,7 @@ module com { module sun { module star { module frame {
     @since OOo 2.0
  */
 
-service ModuleManager
+published service ModuleManager
 {
     //-------------------------------------------
     /** provides functions to identify office modules.
@@ -60,14 +55,14 @@ service ModuleManager
 
     //-------------------------------------------
     /** provides read access to the configuration of office modules.
-     
+
         <p>
         Every module is referenced by an unique service name
         (which is used inside configuration as set node name too)
         and is further represented by a sequence of elements of type
         <type scope="com::sun::star::beans">PropertyValue</type>.
         A list of properties can be gotten from the configuration template
-        org.openoffice.Setup/Factory. 
+        org.openoffice.Setup/Factory.
         </p>
      */
     interface ::com::sun::star::container::XNameAccess;
diff --git a/offapi/com/sun/star/frame/PopupMenuController.idl b/offapi/com/sun/star/frame/PopupMenuController.idl
index f2a8e72f3..841929b2e 100644
--- a/offapi/com/sun/star/frame/PopupMenuController.idl
+++ b/offapi/com/sun/star/frame/PopupMenuController.idl
@@ -28,26 +28,11 @@
 #ifndef __com_sun_star_frame_PopupMenuController_idl__
 #define __com_sun_star_frame_PopupMenuController_idl__
 
-#ifndef __com_sun_star_frame_XPopupMenuController_idl__
 #include <com/sun/star/frame/XPopupMenuController.idl>
-#endif
-
-#ifndef _com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__ 
 #include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__ 
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
index 9a485133a..8e6aa61a5 100644
--- a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
+++ b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_PopupMenuControllerFactory_idl__
 #define __com_sun_star_frame_PopupMenuControllerFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
 #include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
 #include <com/sun/star/frame/XUIControllerRegistration.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/frame/ProtocolHandler.idl b/offapi/com/sun/star/frame/ProtocolHandler.idl
index 025dc11ca..0c09f1635 100644
--- a/offapi/com/sun/star/frame/ProtocolHandler.idl
+++ b/offapi/com/sun/star/frame/ProtocolHandler.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_ProtocolHandler_idl__
 #define __com_sun_star_frame_ProtocolHandler_idl__
 
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/SessionManager.idl b/offapi/com/sun/star/frame/SessionManager.idl
index 8124bf803..73654e926 100644
--- a/offapi/com/sun/star/frame/SessionManager.idl
+++ b/offapi/com/sun/star/frame/SessionManager.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_SessionManager_idl__
 #define __com_sun_star_frame_SessionManager_idl__
 
-#ifndef __com_sun_star_frame_XSessionManagerClient_idl__
 #include <com/sun/star/frame/XSessionManagerClient.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/Settings.idl b/offapi/com/sun/star/frame/Settings.idl
index 0da152723..ef369a2e4 100644
--- a/offapi/com/sun/star/frame/Settings.idl
+++ b/offapi/com/sun/star/frame/Settings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_Settings_idl__
 #define __com_sun_star_frame_Settings_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/StatusbarController.idl b/offapi/com/sun/star/frame/StatusbarController.idl
index 94b1006c7..74134d8e0 100644
--- a/offapi/com/sun/star/frame/StatusbarController.idl
+++ b/offapi/com/sun/star/frame/StatusbarController.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_StatusbarController_idl__
 #define __com_sun_star_frame_StatusbarController_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
 #include <com/sun/star/util/XUpdatable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
 #include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusbarController_idl__
 #include <com/sun/star/frame/XStatusbarController.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
index a74cdfd0e..0290ec5c8 100644
--- a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_StatusbarControllerFactory_idl__
 #define __com_sun_star_frame_StatusbarControllerFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
 #include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
 #include <com/sun/star/frame/XUIControllerRegistration.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/frame/SynchronousFrameLoader.idl b/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
index a05b29858..7ce8ef19c 100644
--- a/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
+++ b/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_SynchronousFrameLoader_idl__
 #define __com_sun_star_frame_SynchronousFrameLoader_idl__
 
-#ifndef __com_sun_star_frame_XSynchronousFrameLoader_idl__
 #include <com/sun/star/frame/XSynchronousFrameLoader.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/Task.idl b/offapi/com/sun/star/frame/Task.idl
index 630d56cde..6547908ee 100644
--- a/offapi/com/sun/star/frame/Task.idl
+++ b/offapi/com/sun/star/frame/Task.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_Task_idl__
 #define __com_sun_star_frame_Task_idl__
 
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTask_idl__
 #include <com/sun/star/frame/XTask.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/TemplateAccess.idl b/offapi/com/sun/star/frame/TemplateAccess.idl
index d845c2d17..2f1119888 100644
--- a/offapi/com/sun/star/frame/TemplateAccess.idl
+++ b/offapi/com/sun/star/frame/TemplateAccess.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_TemplateAccess_idl__
 #define __com_sun_star_frame_TemplateAccess_idl__
 
-#ifndef __com_sun_star_lang_XLocalizable_idl__
 #include <com/sun/star/lang/XLocalizable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDocumentTemplates_idl__
 #include <com/sun/star/frame/XDocumentTemplates.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/TerminationVetoException.idl b/offapi/com/sun/star/frame/TerminationVetoException.idl
index bf2813969..1cb921c84 100644
--- a/offapi/com/sun/star/frame/TerminationVetoException.idl
+++ b/offapi/com/sun/star/frame/TerminationVetoException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_TerminationVetoException_idl__
 #define __com_sun_star_frame_TerminationVetoException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/TitleChangedEvent.idl b/offapi/com/sun/star/frame/TitleChangedEvent.idl
index a67daddeb..a885f3343 100644
--- a/offapi/com/sun/star/frame/TitleChangedEvent.idl
+++ b/offapi/com/sun/star/frame/TitleChangedEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_TitleChangedEvent_idl__
 #define __com_sun_star_frame_TitleChangedEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/ToolbarController.idl b/offapi/com/sun/star/frame/ToolbarController.idl
index 0dffd4f80..75a23a0b5 100644
--- a/offapi/com/sun/star/frame/ToolbarController.idl
+++ b/offapi/com/sun/star/frame/ToolbarController.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_frame_ToolbarController_idl__
 #define __com_sun_star_frame_ToolbarController_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
 #include <com/sun/star/util/XUpdatable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
 #include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XToolbarController_idl__
 #include <com/sun/star/frame/XToolbarController.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XSubToolbarController_idl__
 #include <com/sun/star/frame/XSubToolbarController.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
index d2fdf37c1..269f9bd6a 100644
--- a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_TransientDocumentsDocumentContentFactory_idl__
 #define __com_sun_star_frame_TransientDocumentsDocumentContentFactory_idl__
 
-#ifndef __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
 #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/UnknownModuleException.idl b/offapi/com/sun/star/frame/UnknownModuleException.idl
index de0f97c7a..0751c535e 100644
--- a/offapi/com/sun/star/frame/UnknownModuleException.idl
+++ b/offapi/com/sun/star/frame/UnknownModuleException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_UnknownModuleException_idl__
 #define __com_sun_star_frame_UnknownModuleException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //===============================================
 
@@ -40,9 +38,9 @@ module com {  module sun {  module star {  module frame {
  *  module could not be classified or does not have
  *  a valid configuration.
 
-    @since OOo 2.0    
+    @since OOo 2.0
  */
-exception UnknownModuleException : ::com::sun::star::uno::Exception
+published exception UnknownModuleException : ::com::sun::star::uno::Exception
 {
 };
 
diff --git a/sal/osl/os2/util.c b/offapi/com/sun/star/frame/UntitledNumbersConst.idl
index 762f7a3f9..de80742b1 100644
--- a/sal/osl/os2/util.c
+++ b/offapi/com/sun/star/frame/UntitledNumbersConst.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,15 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_frame_UntitledNumbersConst_idl__
+#define __com_sun_star_frame_UntitledNumbersConst_idl__
 
-#include "osl/util.h"
-
-
+ module com {  module sun {  module star {  module frame {
 
-extern sal_Bool osl_getEthernetAddress( sal_uInt8 * pTargetAddress )
+constants UntitledNumbersConst
 {
-    return sal_False;
-}
+    const long INVALID_NUMBER = 0;
+};
 
+}; }; }; };
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+#endif
diff --git a/offapi/com/sun/star/frame/XBorderResizeListener.idl b/offapi/com/sun/star/frame/XBorderResizeListener.idl
index 0b0eb8161..e18fa2fd5 100644
--- a/offapi/com/sun/star/frame/XBorderResizeListener.idl
+++ b/offapi/com/sun/star/frame/XBorderResizeListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XBorderResizeListener_idl__
 #define __com_sun_star_frame_XBorderResizeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_BorderWidths_idl__
 #include <com/sun/star/frame/BorderWidths.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl b/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
index 92e664d04..8a203a6a3 100644
--- a/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
+++ b/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XBrowseHistoryRegistry_idl__
 #define __com_sun_star_frame_XBrowseHistoryRegistry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XComponentLoader.idl b/offapi/com/sun/star/frame/XComponentLoader.idl
index d2a4b59e4..44c677a90 100644
--- a/offapi/com/sun/star/frame/XComponentLoader.idl
+++ b/offapi/com/sun/star/frame/XComponentLoader.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_frame_XComponentLoader_idl__
 #define __com_sun_star_frame_XComponentLoader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XComponentRegistry.idl b/offapi/com/sun/star/frame/XComponentRegistry.idl
index 8389798d5..0cca43083 100644
--- a/offapi/com/sun/star/frame/XComponentRegistry.idl
+++ b/offapi/com/sun/star/frame/XComponentRegistry.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XComponentRegistry_idl__
 #define __com_sun_star_frame_XComponentRegistry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Uik_idl__
 #include <com/sun/star/uno/Uik.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XConfigManager.idl b/offapi/com/sun/star/frame/XConfigManager.idl
index 28362ad3c..dcba210c4 100644
--- a/offapi/com/sun/star/frame/XConfigManager.idl
+++ b/offapi/com/sun/star/frame/XConfigManager.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XConfigManager_idl__
 #define __com_sun_star_frame_XConfigManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/frame/XControlNotificationListener.idl b/offapi/com/sun/star/frame/XControlNotificationListener.idl
index 963ea0648..a06b7d6d8 100644
--- a/offapi/com/sun/star/frame/XControlNotificationListener.idl
+++ b/offapi/com/sun/star/frame/XControlNotificationListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XControlNotificationListener_idl__ 
 #define __com_sun_star_frame_XControlNotificationListener_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
-
-#ifndef __com_sun_star_frame_ControlEvent_idl__
 #include <com/sun/star/frame/ControlEvent.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/frame/XController.idl b/offapi/com/sun/star/frame/XController.idl
index 1815d7b37..5fec699c2 100644
--- a/offapi/com/sun/star/frame/XController.idl
+++ b/offapi/com/sun/star/frame/XController.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XController_idl__
 #define __com_sun_star_frame_XController_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XController2.idl b/offapi/com/sun/star/frame/XController2.idl
index f21ef4293..f3d7f07ab 100644
--- a/offapi/com/sun/star/frame/XController2.idl
+++ b/offapi/com/sun/star/frame/XController2.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,10 +41,10 @@ module com {  module sun {  module star {  module frame {
 
     @since OOo 3.0
 */
-interface XController2 : XController
+published interface XController2 : XController
 {
     /** denotes the &quot;root window&quot; of the controller.
-    
+
         <p>If the controller is plugged into a frame, this window acts as the
         frame's <code>ComponentWindow</code>.</p>
 
diff --git a/offapi/com/sun/star/frame/XControllerBorder.idl b/offapi/com/sun/star/frame/XControllerBorder.idl
index 617f45ca7..73694e7bc 100644
--- a/offapi/com/sun/star/frame/XControllerBorder.idl
+++ b/offapi/com/sun/star/frame/XControllerBorder.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XControllerBorder_idl__
 #define __com_sun_star_frame_XControllerBorder_idl__
 
-#ifndef __com_sun_star_frame_BorderWidths_idl__
 #include <com/sun/star/frame/BorderWidths.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XBorderResizeListener_idl__
 #include <com/sun/star/frame/XBorderResizeListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/frame/XDesktop.idl b/offapi/com/sun/star/frame/XDesktop.idl
index f1080be62..277f18215 100644
--- a/offapi/com/sun/star/frame/XDesktop.idl
+++ b/offapi/com/sun/star/frame/XDesktop.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_frame_XDesktop_idl__
 #define __com_sun_star_frame_XDesktop_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTerminateListener_idl__
 #include <com/sun/star/frame/XTerminateListener.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XDesktopTask.idl b/offapi/com/sun/star/frame/XDesktopTask.idl
index 23a891a13..12f18f890 100644
--- a/offapi/com/sun/star/frame/XDesktopTask.idl
+++ b/offapi/com/sun/star/frame/XDesktopTask.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XDesktopTask_idl__
 #define __com_sun_star_frame_XDesktopTask_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatch.idl b/offapi/com/sun/star/frame/XDispatch.idl
index b9eac63af..f72cfe6f5 100644
--- a/offapi/com/sun/star/frame/XDispatch.idl
+++ b/offapi/com/sun/star/frame/XDispatch.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XDispatch_idl__
 #define __com_sun_star_frame_XDispatch_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
 #include <com/sun/star/frame/XStatusListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchHelper.idl b/offapi/com/sun/star/frame/XDispatchHelper.idl
index 5bb7cce1b..1af0d6e25 100644
--- a/offapi/com/sun/star/frame/XDispatchHelper.idl
+++ b/offapi/com/sun/star/frame/XDispatchHelper.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XDispatchHelper_idl__
 #define __com_sun_star_frame_XDispatchHelper_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
index a40b5e923..d36a04e96 100644
--- a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XDispatchInformationProvider_idl__
 #define __com_sun_star_frame_XDispatchInformationProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchInformation_idl__
 #include <com/sun/star/frame/DispatchInformation.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XDispatchProvider.idl b/offapi/com/sun/star/frame/XDispatchProvider.idl
index 38ef9cf5f..3507e1281 100644
--- a/offapi/com/sun/star/frame/XDispatchProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchProvider.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #define __com_sun_star_frame_XDispatchProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
 #include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchDescriptor_idl__
 #include <com/sun/star/frame/DispatchDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchProviderInterception.idl b/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
index c45178290..ae163109c 100644
--- a/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
+++ b/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
 #define __com_sun_star_frame_XDispatchProviderInterception_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
 #include <com/sun/star/frame/XDispatchProviderInterceptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl b/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
index 3739ec2fa..d7dea236e 100644
--- a/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
+++ b/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
 #define __com_sun_star_frame_XDispatchProviderInterceptor_idl__
 
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchRecorder.idl b/offapi/com/sun/star/frame/XDispatchRecorder.idl
index f8d79dd4b..163f9609b 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorder.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XDispatchRecorder_idl__
 #define __com_sun_star_frame_XDispatchRecorder_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
index cd0261164..32ac048ed 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
 #define __com_sun_star_frame_XDispatchRecorderSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
 #include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
 #include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XDispatchResultListener.idl b/offapi/com/sun/star/frame/XDispatchResultListener.idl
index 10587ad14..d25339773 100644
--- a/offapi/com/sun/star/frame/XDispatchResultListener.idl
+++ b/offapi/com/sun/star/frame/XDispatchResultListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XDispatchResultListener_idl__
 #define __com_sun_star_frame_XDispatchResultListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchResultEvent_idl__
 #include <com/sun/star/frame/DispatchResultEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XDocumentTemplates.idl b/offapi/com/sun/star/frame/XDocumentTemplates.idl
index 59bfb2b3c..54d6c2148 100644
--- a/offapi/com/sun/star/frame/XDocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/XDocumentTemplates.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XDocumentTemplates_idl__
 #define __com_sun_star_frame_XDocumentTemplates_idl__
 
-#ifndef __com_sun_star_frame_XStorable_idl__
 #include <com/sun/star/frame/XStorable.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XExtendedFilterDetection.idl b/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
index a0ca00544..6a90f850b 100644
--- a/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
+++ b/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XExtendedFilterDetection_idl__
 #define __com_sun_star_frame_XExtendedFilterDetection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/frame/XFilterDetect.idl b/offapi/com/sun/star/frame/XFilterDetect.idl
index e55f527fa..64e9c3c4e 100644
--- a/offapi/com/sun/star/frame/XFilterDetect.idl
+++ b/offapi/com/sun/star/frame/XFilterDetect.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XFilterDetect_idl__
 #define __com_sun_star_frame_XFilterDetect_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrame.idl b/offapi/com/sun/star/frame/XFrame.idl
index afdae5613..200032193 100644
--- a/offapi/com/sun/star/frame/XFrame.idl
+++ b/offapi/com/sun/star/frame/XFrame.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XFrame_idl__
 #define __com_sun_star_frame_XFrame_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XFrameActionListener.idl b/offapi/com/sun/star/frame/XFrameActionListener.idl
index dfef212e2..451ce15df 100644
--- a/offapi/com/sun/star/frame/XFrameActionListener.idl
+++ b/offapi/com/sun/star/frame/XFrameActionListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XFrameActionListener_idl__
 #define __com_sun_star_frame_XFrameActionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FrameActionEvent_idl__
 #include <com/sun/star/frame/FrameActionEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameLoader.idl b/offapi/com/sun/star/frame/XFrameLoader.idl
index 61b4363c4..63f5deeeb 100644
--- a/offapi/com/sun/star/frame/XFrameLoader.idl
+++ b/offapi/com/sun/star/frame/XFrameLoader.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XFrameLoader_idl__
 #define __com_sun_star_frame_XFrameLoader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLoadEventListener_idl__
 #include <com/sun/star/frame/XLoadEventListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameLoaderQuery.idl b/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
index c6f0c538f..0bc9f05da 100644
--- a/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
+++ b/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XFrameLoaderQuery_idl__
 #define __com_sun_star_frame_XFrameLoaderQuery_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/frame/XFrameSetModel.idl b/offapi/com/sun/star/frame/XFrameSetModel.idl
index 8635c31af..b81514d03 100644
--- a/offapi/com/sun/star/frame/XFrameSetModel.idl
+++ b/offapi/com/sun/star/frame/XFrameSetModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XFrameSetModel_idl__
 #define __com_sun_star_frame_XFrameSetModel_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrames.idl b/offapi/com/sun/star/frame/XFrames.idl
index 0c65c3fa4..7eee2b1eb 100644
--- a/offapi/com/sun/star/frame/XFrames.idl
+++ b/offapi/com/sun/star/frame/XFrames.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XFrames_idl__
 #define __com_sun_star_frame_XFrames_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XFramesSupplier.idl b/offapi/com/sun/star/frame/XFramesSupplier.idl
index 1a0bc8709..ae7e77e01 100644
--- a/offapi/com/sun/star/frame/XFramesSupplier.idl
+++ b/offapi/com/sun/star/frame/XFramesSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XFramesSupplier_idl__
 #define __com_sun_star_frame_XFramesSupplier_idl__
 
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl
index f79ecdcc2..15b1c0ccb 100644
--- a/offapi/com/sun/star/frame/XInplaceLayout.idl
+++ b/offapi/com/sun/star/frame/XInplaceLayout.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_frame_XInplaceLayout_idl__
 #define __com_sun_star_frame_XInplaceLayout_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/frame/XInterceptorInfo.idl b/offapi/com/sun/star/frame/XInterceptorInfo.idl
index 938ed057e..640b390c6 100644
--- a/offapi/com/sun/star/frame/XInterceptorInfo.idl
+++ b/offapi/com/sun/star/frame/XInterceptorInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XInterceptorInfo_idl__
 #define __com_sun_star_frame_XInterceptorInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XLayoutManager.idl b/offapi/com/sun/star/frame/XLayoutManager.idl
index e6d71b822..13396ffe5 100644
--- a/offapi/com/sun/star/frame/XLayoutManager.idl
+++ b/offapi/com/sun/star/frame/XLayoutManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,51 +28,28 @@
 #ifndef __com_sun_star_frame_XLayoutManager_idl__
 #define __com_sun_star_frame_XLayoutManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElement_idl__
 #include <com/sun/star/ui/XUIElement.idl>
-#endif
-
-#ifndef __com_sun_star_ui_DockingArea_idl__
 #include <com/sun/star/ui/DockingArea.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XDockingAreaAcceptor_idl__
 #include <com/sun/star/ui/XDockingAreaAcceptor.idl>
-#endif
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module frame {
 
-//============================================================================= 
+//=============================================================================
 
-/** central interface to query for, create, destroy and manipulate user 
+/** central interface to query for, create, destroy and manipulate user
     interface elements which are bound to a layout manager.
 
     <p>
-    Every user interface element which is controlled by a layout manager has 
+    Every user interface element which is controlled by a layout manager has
     a unique identifier called resource URL.
-    
+
     A resource URL must meet the following syntax:
     "private:resource/$type/$name". It is only allowed to use ASCII characters
     for type and name.
@@ -97,28 +74,28 @@ module com { module sun { module star { module frame {
 
     @since OOo 2.0
 */
-    
-interface XLayoutManager : com::sun::star::uno::XInterface
+
+published interface XLayoutManager : com::sun::star::uno::XInterface
 {
-    /** attaches a <type scope="com::sun::star::frame">XFrame</type> to a layout manager. 
-        
+    /** attaches a <type scope="com::sun::star::frame">XFrame</type> to a layout manager.
+
         @param Frame
             specifies the frame that should be attached to the layout manager
-            
+
         <p>
-        A layout manager needs a <type scope="com::sun::star::frame">XFrame</type> to be 
+        A layout manager needs a <type scope="com::sun::star::frame">XFrame</type> to be
         able to work. Without a it no user interface elements can be created.
         </p>
     */
     void attachFrame( [in] com::sun::star::frame::XFrame Frame );
-    
-    /** resets the layout manager and remove all of its internal user interface 
+
+    /** resets the layout manager and remove all of its internal user interface
         elements.
 
         <p>
         This call should be handled with care as all user interface elements will
-        be destroyed and the layout manager is reseted to a state after a 
-        <member>attachFrame</member> has been made. That means an attached frame 
+        be destroyed and the layout manager is reseted to a state after a
+        <member>attachFrame</member> has been made. That means an attached frame
         which has been set by <member>attachFrame</member> is not released.
         The layout manager itself calls reset after a component has been attached
         or reattached to a frame.
@@ -127,9 +104,9 @@ interface XLayoutManager : com::sun::star::uno::XInterface
     void reset();
 
     /** provides the current docking area size of the layout manager.
-        
+
         @return
-            The <type scope="com::sun::star::awt">Rectangle</type> contains pixel values. The 
+            The <type scope="com::sun::star::awt">Rectangle</type> contains pixel values. The
             members of <type scope="com::sun::star::awt">Rectangle</type> are filled as following:
             <ul>
                 <li>X      = docking area on left side (in pixel)</li>
@@ -140,12 +117,12 @@ interface XLayoutManager : com::sun::star::uno::XInterface
     */
     com::sun::star::awt::Rectangle getCurrentDockingArea();
 
-    /** retrieves the current docking area acceptor that controls the border space of the frame's 
+    /** retrieves the current docking area acceptor that controls the border space of the frame's
         container window.
 
         @return
             current docking area acceptor which controls the border space of frame's container window.
-        
+
         <p>
         A docking area acceptor retrieved by this method is owned by the layout manager. It is not
         allowed to dispose this object, it will be destroyed on reference count!
@@ -157,7 +134,7 @@ interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param xDockingAreaAcceptor
             a docking area acceptor which controls the border space of frame's container window.
-        
+
         <p>
         A docking area acceptor decides if the layout manager can use requested border space for
         docking windows. If the acceptor denies the requested space the layout manager automatically
@@ -167,7 +144,7 @@ interface XLayoutManager : com::sun::star::uno::XInterface
         </p>
     */
     void setDockingAreaAcceptor( [in] com::sun::star::ui::XDockingAreaAcceptor xDockingAreaAcceptor );
-    
+
     /** creates a new user interface element.
 
         @param ResourceURL
@@ -176,32 +153,32 @@ interface XLayoutManager : com::sun::star::uno::XInterface
             name.
     */
     void createElement( [in] string ResourceURL );
-    
-    /** destroys a user interface element. 
-        
+
+    /** destroys a user interface element.
+
         @param ResourceURL
             specifies which user interface element should be destroyed. A resource URL must meet
             the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII
             characters for type and name.
     */
     void destroyElement( [in] string ResourceURL );
-    
+
     /** request to make a user interface element visible if it is not in hidden state.
 
         @param ResourceURL
             specifies which user interface element should be made visible. A resource URL must
-            meet the following syntax: "private:resource/$type/$name". It is only allowed to use 
+            meet the following syntax: "private:resource/$type/$name". It is only allowed to use
             ASCII characters for type and
             name.
-        
+
         @return
-            returns <TRUE/> if the user interface element could be made visible, otherwise 
+            returns <TRUE/> if the user interface element could be made visible, otherwise
             <FALSE/> will be returned.
 
         <p>
-        If a user interface element should forced to the visible state 
-        <member>XLayoutManager::showElement</member> should be used. This function can be 
-        used for context dependent elements which should respect a the current visibility 
+        If a user interface element should forced to the visible state
+        <member>XLayoutManager::showElement</member> should be used. This function can be
+        used for context dependent elements which should respect a the current visibility
         state.
         </p>
     */
@@ -213,14 +190,14 @@ interface XLayoutManager : com::sun::star::uno::XInterface
             specifies which user interface element should be retrieved. A resource URL must meet the following
             syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
-        
+
         <p>
-        The layout manager instance is owner of the returned user interface element. That means that the life time of 
+        The layout manager instance is owner of the returned user interface element. That means that the life time of
         the user interface element is controlled by the layout manager. It can be disposed at every time!
         </p>
     */
     com::sun::star::ui::XUIElement getElement( [in] string ResourceURL );
-    
+
     /** retrieves all user interface elements which are currently instantiated.
 
         @return
@@ -228,7 +205,7 @@ interface XLayoutManager : com::sun::star::uno::XInterface
             interface.
 
         <p>
-        The layout manager instance is owner of the returned user interface elements. That means that the life time of 
+        The layout manager instance is owner of the returned user interface elements. That means that the life time of
         the user interface elements is controlled by the layout manager. They can be disposed at every time!
         </p>
     */
@@ -240,24 +217,24 @@ interface XLayoutManager : com::sun::star::uno::XInterface
             specifies which user interface element should be shown. A resource URL must meet the following
             syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
-        
+
         @return
             returns <TRUE/> if the user interface element has been shown, otherwise <FALSE/> will be returned.
     */
     boolean showElement( [in] string ResourceURL );
-    
+
     /** hides a user interface element.
 
         @param ResourceURL
             specifies which user interface element should be hidden. A resource URL must meet the following
             syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
-        
+
         @return
             returns <TRUE/> if the user interface element has been hidden, otherwise <FALSE/> will be returned.
     */
     boolean hideElement( [in] string ResourceURL );
-    
+
     /** docks a window based user interface element to a specified docking area.
 
         @param ResourceURL
@@ -270,27 +247,27 @@ interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param Pos
             specifies the position inside the docking area.
-            
+
         @return
             returns <TRUE/> if the user interface element has been docked, otherwise <FALSE/> will be returned.
 
         @see com::sun::star::ui::DockingArea
     */
     boolean dockWindow( [in] string ResourceURL, [in] com::sun::star::ui::DockingArea DockingArea, [in] com::sun::star::awt::Point Pos );
-    
+
     /** docks all windows which are member of the provided user interface element type.
 
         @param nElementType
             specifies which user interface element type should be docked.
 
         @return
-            returns <TRUE/> if all user interface elements of the requested type could be 
+            returns <TRUE/> if all user interface elements of the requested type could be
             docked, otherwise <FALSE/> will be returned.
 
         @see com::sun::star::ui::UIElementType
     */
     boolean dockAllWindows( [in] short nElementType );
-    
+
     /** forces a window based user interface element to float.
 
         @param ResourceURL
@@ -302,7 +279,7 @@ interface XLayoutManager : com::sun::star::uno::XInterface
             returns <TRUE/> if the user interface element has been docked, otherwise <FALSE/> will be returned.
     */
     boolean floatWindow( [in] string ResourceURL );
-    
+
     /** locks a window based user interface element if it's in a docked state.
 
         @param ResourceURL
@@ -319,11 +296,11 @@ interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param ResourceURL
             specifies which user interface element should be unlocked. A resource URL must
-            meet the following syntax: "private:resource/$type/$name". It is only allowed 
+            meet the following syntax: "private:resource/$type/$name". It is only allowed
             to use ASCII characters for type and name.
 
         @return
-            returns <TRUE/> if the user interface element has been unlocked, otherwise 
+            returns <TRUE/> if the user interface element has been unlocked, otherwise
             <FALSE/> will be returned.
     */
     boolean unlockWindow( [in] string ResourceURL );
@@ -344,7 +321,7 @@ interface XLayoutManager : com::sun::star::uno::XInterface
         </p>
     */
     void setElementSize( [in] string ResourceURL, [in] com::sun::star::awt::Size Size );
-    
+
     /** sets a new position for a window based user interface element.
 
         @param ResourceURL
@@ -361,7 +338,7 @@ interface XLayoutManager : com::sun::star::uno::XInterface
         </p>
     */
     void setElementPos( [in] string ResourceURL, [in] com::sun::star::awt::Point Pos );
-    
+
     /** sets a new position and size for a window based user interface element.
 
         @param ResourceURL
@@ -376,84 +353,84 @@ interface XLayoutManager : com::sun::star::uno::XInterface
             specifies the new position in pixel.
 
         <p>
-        It is up to the layout manager to decide if the user interface element can be moved and resized. The new position and size can 
+        It is up to the layout manager to decide if the user interface element can be moved and resized. The new position and size can
         be retrieved by calling <member>getElementPos</member> and <member>getElementSize</member>.
         </p>
     */
     void setElementPosSize( [in] string ResourceURL, [in] com::sun::star::awt::Point Pos, [in] com::sun::star::awt::Size Size );
-    
+
     /** retrieves the current visibility state of a window based user interface element.
 
         @param ResourceURL
-            specifies for which user interface element the visibility state should be retrieved. A resource URL must meet 
+            specifies for which user interface element the visibility state should be retrieved. A resource URL must meet
             the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
-        
+
         @return
             <TRUE/> if the user interface element is visible, otherwise <FALSE/>.
     */
     boolean isElementVisible( [in] string ResourceURL );
-    
+
     /** retrieves the current floating state of a window based user interface element.
-        
+
         @param ResourceURL
-            specifies for which user interface element the floating state should be retrieved. A resource URL must meet 
+            specifies for which user interface element the floating state should be retrieved. A resource URL must meet
             the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
-        
+
         @return
             <TRUE/> if the user interface element is floating, otherwise <FALSE/>.
     */
     boolean isElementFloating( [in] string ResourceURL );
-    
+
     /** retrieves the current docking state of a window based user interface element.
-        
+
         @param ResourceURL
-            specifies for which user interface element the docking state should be retrieved. A resource URL must meet 
+            specifies for which user interface element the docking state should be retrieved. A resource URL must meet
             the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
-        
+
         @return
             <TRUE/> if the user interface element is docked, otherwise <FALSE/>.
     */
     boolean isElementDocked( [in] string ResourceURL );
-    
+
     /** retrieves the current lock state of a window based user interface element.
-        
+
         @param ResourceURL
-            specifies for which user interface element the lock state should be retrieved. A resource URL must meet 
+            specifies for which user interface element the lock state should be retrieved. A resource URL must meet
             the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
-        
+
         @return
             <TRUE/> if the user interface element is locked, otherwise <FALSE/>.
     */
     boolean isElementLocked( [in] string ResourceURL  );
 
     /** retrieves the current size of a window based user interface element.
-        
+
         @param ResourceURL
-            specifies for which user interface element the current size should be retrieved. A resource URL must meet 
+            specifies for which user interface element the current size should be retrieved. A resource URL must meet
             the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
-        
+
         @return
             the size in pixel of the user interface element. A non-window based user interface element provides a zero size.
     */
     com::sun::star::awt::Size getElementSize( [in] string ResourceURL );
-    
+
     /** retrieves the current pixel position of a window based user interface element.
-        
+
         @param ResourceURL
-            specifies for which user interface element the current position should be retrieved. A resource URL must meet 
+            specifies for which user interface element the current position should be retrieved. A resource URL must meet
             the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
-        
+
         @return
             the size in pixel of the user interface element. A non-window based user interface element provides a zero size.
     */
     com::sun::star::awt::Point getElementPos( [in] string ResourceURL );
-    
+
     /** prohibit all layout updates until unlock is called again.
 
         <p>
@@ -462,25 +439,25 @@ interface XLayoutManager : com::sun::star::uno::XInterface
         </p>
     */
     void lock();
-    
+
     /** permit layout updates again.
-        
+
         <p>
         This function should be called to permit layout updates. The layout manager starts to calculate the new layout after
         this call.
         </p>
     */
     void unlock();
-    
+
     /** forces a complete new layouting of all user interface elements.
     */
     void doLayout();
 
-    /** sets the layout manager to invisible state and hides all user interface elements. 
+    /** sets the layout manager to invisible state and hides all user interface elements.
 
         <p>
-        A layout manager can be set to invisible state to force it to hide all of its 
-        user interface elements. If another component wants to use the window for its 
+        A layout manager can be set to invisible state to force it to hide all of its
+        user interface elements. If another component wants to use the window for its
         own user interface elements it can use this function. This function is normally
         used to implement inplace editing.
         </p>
@@ -494,8 +471,8 @@ interface XLayoutManager : com::sun::star::uno::XInterface
     /** retrieves the visibility state of a layout manager.
 
         <p>
-        A layout manager can be set to invisible state to force it to hide all of its 
-        user interface elements. If another component wants to use the window for its 
+        A layout manager can be set to invisible state to force it to hide all of its
+        user interface elements. If another component wants to use the window for its
         own user interface elements it can use this function. This function is normally
         used to implement inplace editing.
         </p>
diff --git a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
index a6d74a8a7..28767c69e 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
 #define __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
 
-#ifndef __com_sun_star_frame_XLayoutManagerListener_idl__
 #include <com/sun/star/frame/XLayoutManagerListener.idl>
-#endif
 
 //=============================================================================
 
@@ -43,7 +41,7 @@
     @since OOo 2.0
  */
 
-interface XLayoutManagerEventBroadcaster : com::sun::star::uno::XInterface
+published interface XLayoutManagerEventBroadcaster : com::sun::star::uno::XInterface
 {
     /** adds a layout manager event listener to the object's listener list.
 
@@ -53,11 +51,11 @@ interface XLayoutManagerEventBroadcaster : com::sun::star::uno::XInterface
      */
     void addLayoutManagerEventListener( [in] XLayoutManagerListener aLayoutManagerListener );
 
-    /** removes a layout manager event listener from the object's listener 
+    /** removes a layout manager event listener from the object's listener
         list.
 
         @param aLayoutManagerListener
-            a listener that don't want to receive events regarding user 
+            a listener that don't want to receive events regarding user
             interface elements that are controlled by a layout manager.
      */
     void removeLayoutManagerEventListener( [in] XLayoutManagerListener aLayoutManagerListener );
diff --git a/offapi/com/sun/star/frame/XLayoutManagerListener.idl b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
index d82ec922f..fbacb6c5d 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerListener.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XLayoutManagerListener_idl__
 #define __com_sun_star_frame_XLayoutManagerListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
-#include <com/sun/star/lang/XEventListener.idl> 
-#endif  
+#include <com/sun/star/lang/XEventListener.idl>
 
 //=============================================================================
 
@@ -38,25 +36,25 @@ module com {  module sun {  module star {  module frame {
 //=============================================================================
 /** makes it possible to receive events from a layout manager.
 
-    <p>Events are provided <strong>only</strong> for notification 
+    <p>Events are provided <strong>only</strong> for notification
     purposes only.  All operations are handled internally by the
-    layout manager component, so that GUI layout works properly 
-    regardless of whether a component registers such a listener 
+    layout manager component, so that GUI layout works properly
+    regardless of whether a component registers such a listener
     or not.</p>
 
     @see ::com::sun::star::frame::LayoutManager
     @see ::com::sun::star::frame::LayoutManagerEvents
-    
+
     @since OOo 2.0
  */
-interface XLayoutManagerListener : com::sun::star::lang::XEventListener 
+published interface XLayoutManagerListener : com::sun::star::lang::XEventListener
 {
     //=============================================================================
     /** is invoked when a layout manager has made a certain operation.
 
         @param aSource
             reference to the layout manager which invoked the event.
-        
+
         @param eLayoutEvent
             identifies the layout event that has occurred.
 
diff --git a/offapi/com/sun/star/frame/XLoadEventListener.idl b/offapi/com/sun/star/frame/XLoadEventListener.idl
index a67782f1c..4055e6692 100644
--- a/offapi/com/sun/star/frame/XLoadEventListener.idl
+++ b/offapi/com/sun/star/frame/XLoadEventListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XLoadEventListener_idl__
 #define __com_sun_star_frame_XLoadEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XLoadable.idl b/offapi/com/sun/star/frame/XLoadable.idl
index e8ab52fc7..d97c0a15e 100644
--- a/offapi/com/sun/star/frame/XLoadable.idl
+++ b/offapi/com/sun/star/frame/XLoadable.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XLoadable_idl__
 #define __com_sun_star_frame_XLoadable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
 #include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
index 0ef9d880c..23037ee84 100644
--- a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_LayoutManager_idl__
 #define __com_sun_star_frame_LayoutManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuBar_idl__
 #include <com/sun/star/awt/XMenuBar.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
index 1d64bb947..d39892245 100644
--- a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
 #define __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/frame/XModel.idl b/offapi/com/sun/star/frame/XModel.idl
index ba66ab771..879a4d31a 100644
--- a/offapi/com/sun/star/frame/XModel.idl
+++ b/offapi/com/sun/star/frame/XModel.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_frame_XModel_idl__
 #define __com_sun_star_frame_XModel_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XModule.idl b/offapi/com/sun/star/frame/XModule.idl
index 2ffce95ef..c611b00f0 100644
--- a/offapi/com/sun/star/frame/XModule.idl
+++ b/offapi/com/sun/star/frame/XModule.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_frame_XModule_idl__
 #define __com_sun_star_frame_XModule_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_UnknownModuleException_idl__
 #include <com/sun/star/frame/UnknownModuleException.idl>
-#endif
 
 //===============================================
 
diff --git a/offapi/com/sun/star/frame/XModuleManager.idl b/offapi/com/sun/star/frame/XModuleManager.idl
index dc42cb753..04eae9710 100644
--- a/offapi/com/sun/star/frame/XModuleManager.idl
+++ b/offapi/com/sun/star/frame/XModuleManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_frame_XModuleManager_idl__
 #define __com_sun_star_frame_XModuleManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_UnknownModuleException_idl__
 #include <com/sun/star/frame/UnknownModuleException.idl>
-#endif
 
 //===============================================
 
@@ -46,25 +38,25 @@ module com { module sun { module star { module frame {
 
 //===============================================
 /** can be used to identify office modules.
-    
+
     @since OOo 2.0
  */
-interface XModuleManager : com::sun::star::uno::XInterface
+published interface XModuleManager : com::sun::star::uno::XInterface
 {
     //-------------------------------------------
     /**
        @short  identifies the given module.
-     
+
        @descr  This identifier can then be used at the service <type>ModuleManager</type>
                to get more information about this module.
-     
+
                For identification the interface <type scope="com::sun::star::lang">XServiceInfo</type>
                is requested on the given module. Because all module service registrations must be unique
                this value can be queried and checked against the configuration.
 
                Since OOo 2.3.0 also the optional interface <type>XModule</type> will be used.
                If its exists it will be preferred.
-     
+
        @param  Module
                Possible objects for this parameter can be the following one:
                <ul>
@@ -84,7 +76,7 @@ interface XModuleManager : com::sun::star::uno::XInterface
                        identification directly.
                    </li>
                </ul>
-     
+
        @throws <type scope="com::sun::star::lang">IllegalArgumentException</type>
                if the parameter Module is:
                <ul>
@@ -93,12 +85,12 @@ interface XModuleManager : com::sun::star::uno::XInterface
                        XFrame, XController, XModel</li>
                    <li>or does not provide the needed interface XServiceInfo.</li>
                </ul>
-     
+
        @throws <type>UnknownModuleException</type>
                if the given module could not be identified.
                Note: If the module represent a XFrame instance with does not contain
                a document, this exception is thrown too!
-     
+
        @return An identifier for the given module.
                Note: This value varies everytime. Error will be transported
                by thrown exceptions!
@@ -106,8 +98,8 @@ interface XModuleManager : com::sun::star::uno::XInterface
     string identify( [in] ::com::sun::star::uno::XInterface Module )
         raises(::com::sun::star::lang::IllegalArgumentException,
                                        UnknownModuleException  );
-                                       
-                                           
+
+
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/frame/XNotifyingDispatch.idl b/offapi/com/sun/star/frame/XNotifyingDispatch.idl
index 882dfa822..68a5f0923 100644
--- a/offapi/com/sun/star/frame/XNotifyingDispatch.idl
+++ b/offapi/com/sun/star/frame/XNotifyingDispatch.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XNotifyingDispatch_idl__
 #define __com_sun_star_frame_XNotifyingDispatch_idl__
 
-#ifndef __com_sun_star_frame_XDispatch_idl__
 #include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchResultListener_idl__
 #include <com/sun/star/frame/XDispatchResultListener.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {  module frame {
diff --git a/offapi/com/sun/star/frame/XPopupMenuController.idl b/offapi/com/sun/star/frame/XPopupMenuController.idl
index 510b2ea18..d19d28c27 100644
--- a/offapi/com/sun/star/frame/XPopupMenuController.idl
+++ b/offapi/com/sun/star/frame/XPopupMenuController.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_frame_XPopupMenuController_idl__
 #define __com_sun_star_frame_XPopupMenuController_idl__
 
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
 #include <com/sun/star/awt/XPopupMenu.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/frame/XRecordableDispatch.idl b/offapi/com/sun/star/frame/XRecordableDispatch.idl
index 51f466279..1aa28cfdd 100644
--- a/offapi/com/sun/star/frame/XRecordableDispatch.idl
+++ b/offapi/com/sun/star/frame/XRecordableDispatch.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XRecordableDispatch_idl__
 #define __com_sun_star_frame_XRecordableDispatch_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
 #include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XSessionManagerClient.idl b/offapi/com/sun/star/frame/XSessionManagerClient.idl
index 1fe891935..630f276c8 100644
--- a/offapi/com/sun/star/frame/XSessionManagerClient.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerClient.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XSessionManagerClient_idl__
 #define __com_sun_star_frame_XSessionManagerClient_idl__
 
-#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
 #include <com/sun/star/frame/XSessionManagerListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XSessionManagerListener.idl b/offapi/com/sun/star/frame/XSessionManagerListener.idl
index 7159b38b2..abbeedfeb 100644
--- a/offapi/com/sun/star/frame/XSessionManagerListener.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XSessionManagerListener_idl__
 #define __com_sun_star_frame_XSessionManagerListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {  module frame {
diff --git a/offapi/com/sun/star/frame/XSessionManagerListener2.idl b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
index 8db874ded..7d4e2a74a 100644
--- a/offapi/com/sun/star/frame/XSessionManagerListener2.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XSessionManagerListener2_idl__
 #define __com_sun_star_frame_XSessionManagerListener2_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
 #include <com/sun/star/frame/XSessionManagerListener.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {  module frame {
diff --git a/offapi/com/sun/star/frame/XStatusListener.idl b/offapi/com/sun/star/frame/XStatusListener.idl
index 7bb3bd22e..1d48bf484 100644
--- a/offapi/com/sun/star/frame/XStatusListener.idl
+++ b/offapi/com/sun/star/frame/XStatusListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XStatusListener_idl__
 #define __com_sun_star_frame_XStatusListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FeatureStateEvent_idl__
 #include <com/sun/star/frame/FeatureStateEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XStatusbarController.idl b/offapi/com/sun/star/frame/XStatusbarController.idl
index 549a9cb7b..e5a8a0d8b 100644
--- a/offapi/com/sun/star/frame/XStatusbarController.idl
+++ b/offapi/com/sun/star/frame/XStatusbarController.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XStatusbarController_idl__
 #define __com_sun_star_frame_XStatusbarController_idl__
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
 #include <com/sun/star/awt/MouseEvent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XGraphics_idl__
 #include <com/sun/star/awt/XGraphics.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XStorable.idl b/offapi/com/sun/star/frame/XStorable.idl
index 521774b03..ec0a1b109 100644
--- a/offapi/com/sun/star/frame/XStorable.idl
+++ b/offapi/com/sun/star/frame/XStorable.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XStorable_idl__
 #define __com_sun_star_frame_XStorable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XStorable2.idl b/offapi/com/sun/star/frame/XStorable2.idl
index 5c08705f0..9013c3e91 100644
--- a/offapi/com/sun/star/frame/XStorable2.idl
+++ b/offapi/com/sun/star/frame/XStorable2.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XStorable2_idl__
 #define __com_sun_star_frame_XStorable2_idl__
 
-#ifndef __com_sun_star_frame_XStorable_idl__
 #include <com/sun/star/frame/XStorable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XSubToolbarController.idl b/offapi/com/sun/star/frame/XSubToolbarController.idl
index f6823ddb7..e7e88abae 100644
--- a/offapi/com/sun/star/frame/XSubToolbarController.idl
+++ b/offapi/com/sun/star/frame/XSubToolbarController.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XSubToolbarController_idl__
 #define __com_sun_star_frame_XSubToolbarController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XSynchronousDispatch.idl b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
index 990b9d900..86ceb1f46 100644
--- a/offapi/com/sun/star/frame/XSynchronousDispatch.idl
+++ b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XSynchronousDispatch_idl__
 #define __com_sun_star_frame_XSynchronousDispatch_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl b/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
index 7f5903849..9c8347cd4 100644
--- a/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
+++ b/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XSynchronousFrameLoader_idl__
 #define __com_sun_star_frame_XSynchronousFrameLoader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XTask.idl b/offapi/com/sun/star/frame/XTask.idl
index 88c75626d..02885ea91 100644
--- a/offapi/com/sun/star/frame/XTask.idl
+++ b/offapi/com/sun/star/frame/XTask.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XTask_idl__
 #define __com_sun_star_frame_XTask_idl__
 
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XTasksSupplier.idl b/offapi/com/sun/star/frame/XTasksSupplier.idl
index 7fca1dcf7..27f5a78af 100644
--- a/offapi/com/sun/star/frame/XTasksSupplier.idl
+++ b/offapi/com/sun/star/frame/XTasksSupplier.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XTasksSupplier_idl__
 #define __com_sun_star_frame_XTasksSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTask_idl__
 #include <com/sun/star/frame/XTask.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XTerminateListener.idl b/offapi/com/sun/star/frame/XTerminateListener.idl
index 073faf6e8..1cb77f2d5 100644
--- a/offapi/com/sun/star/frame/XTerminateListener.idl
+++ b/offapi/com/sun/star/frame/XTerminateListener.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XTerminateListener_idl__
 #define __com_sun_star_frame_XTerminateListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_frame_TerminationVetoException_idl__
 #include <com/sun/star/frame/TerminationVetoException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XTerminateListener2.idl b/offapi/com/sun/star/frame/XTerminateListener2.idl
index b7ba37dfe..039bf2c45 100644
--- a/offapi/com/sun/star/frame/XTerminateListener2.idl
+++ b/offapi/com/sun/star/frame/XTerminateListener2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XTerminateListener2_idl__
 #define __com_sun_star_frame_XTerminateListener2_idl__
 
-#ifndef __com_sun_star_frame_XTerminateListener_idl__
 #include <com/sun/star/frame/XTerminateListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XTitle.idl b/offapi/com/sun/star/frame/XTitle.idl
index eb2b10198..b4c460cf5 100644
--- a/offapi/com/sun/star/frame/XTitle.idl
+++ b/offapi/com/sun/star/frame/XTitle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,30 +27,31 @@
 #ifndef __com_sun_star_frame_XTitle_idl__
 #define __com_sun_star_frame_XTitle_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
  module com {  module sun {  module star {  module frame {
 
 //=============================================================================
-/** todo document me
+/** an interface representing an entity with a modifyable title.
  */
-interface XTitle : com::sun::star::uno::XInterface
+published interface XTitle : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** todo document me
+    /** Returns the title of the object.
+     *
+     *  @returns
+     *  The title.
      */
     string getTitle ();
 
     //-------------------------------------------------------------------------
-    /** todo document me
+    /** Sets the title of the object.
+     *
+     *  @param sTitle
+     *  The title.
      */
     void setTitle ( [in] string sTitle );
 };
diff --git a/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl b/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
index a2228df93..6511bf3e6 100644
--- a/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XTitleChangeBroadcaster_idl__
 #define __com_sun_star_frame_XTitleChangeBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTitleChangeListener_idl__
 #include <com/sun/star/frame/XTitleChangeListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XTitleChangeListener.idl b/offapi/com/sun/star/frame/XTitleChangeListener.idl
index 9f510ba8b..182c39680 100644
--- a/offapi/com/sun/star/frame/XTitleChangeListener.idl
+++ b/offapi/com/sun/star/frame/XTitleChangeListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XTitleChangeListener_idl__
 #define __com_sun_star_frame_XTitleChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_TitleChangedEvent_idl__
 #include <com/sun/star/frame/TitleChangedEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XToolbarController.idl b/offapi/com/sun/star/frame/XToolbarController.idl
index 45e792c51..1bd3dfe4f 100644
--- a/offapi/com/sun/star/frame/XToolbarController.idl
+++ b/offapi/com/sun/star/frame/XToolbarController.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XToolbarController_idl__
 #define __com_sun_star_frame_XToolbarController_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyModifier_idl__
 #include <com/sun/star/awt/KeyModifier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
index 52d6d7d30..f7540c2da 100644
--- a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
 #define __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XUIControllerRegistration.idl b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
index e459f80c0..467255db6 100644
--- a/offapi/com/sun/star/frame/XUIControllerRegistration.idl
+++ b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
 #define __com_sun_star_frame_XUIControllerRegistration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/frame/XUntitledNumbers.idl b/offapi/com/sun/star/frame/XUntitledNumbers.idl
index 56101e949..42977c1f5 100644
--- a/offapi/com/sun/star/frame/XUntitledNumbers.idl
+++ b/offapi/com/sun/star/frame/XUntitledNumbers.idl
@@ -27,23 +27,13 @@
 #ifndef __com_sun_star_frame_XUntitledNumbers_idl__
 #define __com_sun_star_frame_XUntitledNumbers_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
  module com {  module sun {  module star {  module frame {
 
-constants UntitledNumbersConst
-{
-    const long INVALID_NUMBER = 0;
-};
- 
 //=============================================================================
 /** knows all currently used and all free numbers for using with untitled
     but counted objects.
diff --git a/offapi/com/sun/star/frame/XUrlList.idl b/offapi/com/sun/star/frame/XUrlList.idl
index 7b40fa359..624b074c4 100644
--- a/offapi/com/sun/star/frame/XUrlList.idl
+++ b/offapi/com/sun/star/frame/XUrlList.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XUrlList_idl__
 #define __com_sun_star_frame_XUrlList_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XWindowArranger.idl b/offapi/com/sun/star/frame/XWindowArranger.idl
index f4375cbc8..e3a34cb9b 100644
--- a/offapi/com/sun/star/frame/XWindowArranger.idl
+++ b/offapi/com/sun/star/frame/XWindowArranger.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XWindowArranger_idl__
 #define __com_sun_star_frame_XWindowArranger_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/makefile.mk b/offapi/com/sun/star/frame/makefile.mk
deleted file mode 100644
index dbcfd03cd..000000000
--- a/offapi/com/sun/star/frame/makefile.mk
+++ /dev/null
@@ -1,166 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssframe
-PACKAGE=com$/sun$/star$/frame
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    BorderWidths.idl\
-    CommandGroup.idl\
-    Components.idl\
-    ContentHandler.idl\
-    ContentHandlerFactory.idl\
-    ControlCommand.idl\
-    ControlEvent.idl\
-    Controller.idl\
-    Desktop.idl\
-    DesktopTask.idl\
-    DesktopTasks.idl\
-    DispatchDescriptor.idl\
-    DispatchHelper.idl\
-    DispatchInformation.idl\
-    DispatchProvider.idl\
-    DispatchRecorder.idl\
-    DispatchRecorderSupplier.idl\
-    DispatchResultState.idl\
-    DispatchResultEvent.idl\
-    DispatchStatement.idl\
-    DocumentTemplates.idl\
-    DoubleInitializationException.idl\
-    FeatureStateEvent.idl\
-    Frame.idl\
-    FrameAction.idl\
-    FrameActionEvent.idl\
-    FrameControl.idl\
-    FrameLoader.idl\
-    FrameLoaderFactory.idl\
-    FramesContainer.idl\
-    FrameSearchFlag.idl\
-    IllegalArgumentIOException.idl\
-    LayoutManager.idl\
-    LayoutManagerEvents.idl\
-    MediaTypeDetectionHelper.idl\
-    ModuleManager.idl\
-    PopupMenuController.idl\
-    PopupMenuControllerFactory.idl\
-    ProtocolHandler.idl\
-    SessionManager.idl\
-    Settings.idl\
-    SynchronousFrameLoader.idl\
-    StatusbarController.idl\
-    StatusbarControllerFactory.idl\
-    Task.idl\
-    TemplateAccess.idl\
-    TerminationVetoException.idl\
-    TitleChangedEvent.idl\
-    ToolbarController.idl\
-    TransientDocumentsDocumentContentFactory.idl \
-    UnknownModuleException.idl\
-    WindowArrange.idl\
-    XBorderResizeListener.idl\
-    XBrowseHistoryRegistry.idl\
-    XComponentLoader.idl\
-    XComponentRegistry.idl\
-    XConfigManager.idl\
-    XController.idl\
-    XController2.idl\
-    XControlNotificationListener.idl\
-    XControllerBorder.idl\
-    XDesktop.idl\
-    XDesktopTask.idl\
-    XDispatch.idl\
-    XDispatchHelper.idl\
-    XDispatchInformationProvider.idl\
-    XDispatchProvider.idl\
-    XDispatchProviderInterception.idl\
-    XDispatchProviderInterceptor.idl\
-    XDispatchRecorder.idl\
-    XDispatchRecorderSupplier.idl\
-    XDispatchResultListener.idl\
-    XDocumentTemplates.idl\
-    XExtendedFilterDetection.idl\
-    XFilterDetect.idl\
-    XFrame.idl\
-    XFrameActionListener.idl\
-    XFrameLoader.idl\
-    XFrameLoaderQuery.idl\
-    XFrames.idl\
-    XFrameSetModel.idl\
-    XFramesSupplier.idl\
-    XInplaceLayout.idl\
-    XInterceptorInfo.idl\
-    XLayoutManager.idl\
-    XLayoutManagerEventBroadcaster.idl\
-    XLayoutManagerListener.idl\
-    XLoadable.idl\
-    XLoadEventListener.idl\
-    XMenuBarAcceptor.idl\
-    XMenuBarMergingAcceptor.idl\
-    XModel.idl\
-    XModel2.idl\
-    XModule.idl\
-    XModuleManager.idl\
-    XNotifyingDispatch.idl\
-    XPopupMenuController.idl\
-    XRecordableDispatch.idl\
-    XSessionManagerClient.idl\
-    XSessionManagerListener.idl\
-    XSessionManagerListener2.idl\
-    XStatusListener.idl\
-    XStatusbarController.idl\
-    XStorable.idl\
-    XSubToolbarController.idl\
-    XStorable2.idl\
-    XSynchronousDispatch.idl\
-    XSynchronousFrameLoader.idl\
-    XTask.idl\
-    XTasksSupplier.idl\
-    XTerminateListener.idl\
-    XTerminateListener2.idl\
-    XTitle.idl\
-    XTitleChangeBroadcaster.idl\
-    XTitleChangeListener.idl\
-    XToolbarController.idl\
-    XTransientDocumentsDocumentContentFactory.idl\
-    XUIControllerRegistration.idl\
-    XUntitledNumbers.idl\
-    XUrlList.idl\
-    XWindowArranger.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/frame/status/makefile.mk b/offapi/com/sun/star/frame/status/makefile.mk
deleted file mode 100644
index ca8beb50d..000000000
--- a/offapi/com/sun/star/frame/status/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfstatus
-PACKAGE=com$/sun$/star$/frame$/status
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    FontHeight.idl              \
-    Verb.idl                    \
-    ClipboardFormats.idl        \
-    LeftRightMargin.idl         \
-    UpperLowerMargin.idl        \
-    UpperLowerMarginScale.idl   \
-    Template.idl                \
-    ItemStatus.idl              \
-    ItemState.idl               \
-    Visibility.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/gallery/GalleryItem.idl b/offapi/com/sun/star/gallery/GalleryItem.idl
index cba6c24f4..1a0def153 100644
--- a/offapi/com/sun/star/gallery/GalleryItem.idl
+++ b/offapi/com/sun/star/gallery/GalleryItem.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_gallery_GalleryItem_idl__
 #define __com_sun_star_gallery_GalleryItem_idl__
 
-#ifndef __com_sun_star_gallery_XGalleryItem_idl__
 #include <com/sun/star/gallery/XGalleryItem.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/gallery/GalleryTheme.idl b/offapi/com/sun/star/gallery/GalleryTheme.idl
index 8220e7556..bc9252019 100644
--- a/offapi/com/sun/star/gallery/GalleryTheme.idl
+++ b/offapi/com/sun/star/gallery/GalleryTheme.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_gallery_GalleryTheme_idl__
 #define __com_sun_star_gallery_GalleryTheme_idl__
  
-#ifndef __com_sun_star_gallery_XGalleryTheme_idl__ 
 #include <com/sun/star/gallery/XGalleryTheme.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/gallery/GalleryThemeProvider.idl b/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
index 276a52abc..bdaabfa7f 100644
--- a/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
+++ b/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_gallery_GalleryThemeProvider_idl__
 #define __com_sun_star_gallery_GalleryThemeProvider_idl__
  
-#ifndef __com_sun_star_gallery_XGalleryThemeProvider_idl__ 
 #include <com/sun/star/gallery/XGalleryThemeProvider.idl> 
-#endif 
-#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/gallery/XGalleryItem.idl b/offapi/com/sun/star/gallery/XGalleryItem.idl
index 2e0ed046f..e06cef006 100644
--- a/offapi/com/sun/star/gallery/XGalleryItem.idl
+++ b/offapi/com/sun/star/gallery/XGalleryItem.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_gallery_XGalleryItem_idl__
 #define __com_sun_star_gallery_XGalleryItem_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/gallery/XGalleryTheme.idl b/offapi/com/sun/star/gallery/XGalleryTheme.idl
index 652078029..4eab17c04 100644
--- a/offapi/com/sun/star/gallery/XGalleryTheme.idl
+++ b/offapi/com/sun/star/gallery/XGalleryTheme.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_gallery_XGalleryTheme_idl__
 #define __com_sun_star_gallery_XGalleryTheme_idl__
     
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_gallery_XGalleryItem_idl__
 #include <com/sun/star/gallery/XGalleryItem.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl b/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
index 1f4f675dc..20aa7944a 100644
--- a/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
+++ b/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_gallery_XGalleryThemeProvider_idl__
 #define __com_sun_star_gallery_XGalleryThemeProvider_idl__
 
-#ifndef __com_sun_star_gallery_XGalleryTheme_idl__
 #include <com/sun/star/gallery/XGalleryTheme.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/gallery/makefile.mk b/offapi/com/sun/star/gallery/makefile.mk
deleted file mode 100644
index 49a9c908d..000000000
--- a/offapi/com/sun/star/gallery/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-PRJNAME=offapi
-TARGET=cssgallery
-PACKAGE=com$/sun$/star$/gallery
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    GalleryThemeProvider.idl   	\
-    GalleryTheme.idl   			\
-    GalleryItem.idl   			\
-    GalleryItemType.idl 		\
-    XGalleryThemeProvider.idl	\
-    XGalleryTheme.idl  			\
-    XGalleryItem.idl  	
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/geometry/AffineMatrix2D.idl b/offapi/com/sun/star/geometry/AffineMatrix2D.idl
index 719db8192..919ee070b 100644
--- a/offapi/com/sun/star/geometry/AffineMatrix2D.idl
+++ b/offapi/com/sun/star/geometry/AffineMatrix2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module geometry {
     to be [0,0,1].<p>
 
     An affine mapping, as performed by this matrix, can be written out
-    as follows, where <code>xs</code> and <code>ys</code> are the source, and 
+    as follows, where <code>xs</code> and <code>ys</code> are the source, and
     <code>xd</code> and <code>yd</code> the corresponding result coordinates:
 
     <code>
@@ -67,7 +67,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct AffineMatrix2D
+published struct AffineMatrix2D
 {
     /// The top, left matrix entry.
     double m00;
diff --git a/offapi/com/sun/star/geometry/EllipticalArc.idl b/offapi/com/sun/star/geometry/EllipticalArc.idl
index 628f57c8f..04ba36aea 100644
--- a/offapi/com/sun/star/geometry/EllipticalArc.idl
+++ b/offapi/com/sun/star/geometry/EllipticalArc.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_geometry_EllipticalArc_idl__
 #define __com_sun_star_geometry_EllipticalArc_idl__
 
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
 
 module com {  module sun {  module star {  module geometry {
 
diff --git a/offapi/com/sun/star/geometry/IntegerSize2D.idl b/offapi/com/sun/star/geometry/IntegerSize2D.idl
index e9aea711e..0f41d2d6a 100644
--- a/offapi/com/sun/star/geometry/IntegerSize2D.idl
+++ b/offapi/com/sun/star/geometry/IntegerSize2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct IntegerSize2D
+published struct IntegerSize2D
 {
     /// Amount of space occupied in the x direction.
     long Width;
diff --git a/offapi/com/sun/star/geometry/Matrix2D.idl b/offapi/com/sun/star/geometry/Matrix2D.idl
index 3fac5764d..7d96b7d2a 100644
--- a/offapi/com/sun/star/geometry/Matrix2D.idl
+++ b/offapi/com/sun/star/geometry/Matrix2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module geometry {
     matrix does not include any translational components.<p>
 
     A linear mapping, as performed by this matrix, can be written out
-    as follows, where <code>xs</code> and <code>ys</code> are the source, and 
+    as follows, where <code>xs</code> and <code>ys</code> are the source, and
     <code>xd</code> and <code>yd</code> the corresponding result coordinates:
 
     <code>
@@ -70,7 +70,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct Matrix2D
+published struct Matrix2D
 {
     /// The top, left matrix entry.
     double m00;
diff --git a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
index 3183f7407..83180b1ae 100644
--- a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
+++ b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ module com {  module sun {  module star {  module geometry {
     @see com.sun.star.rendering.XBezierPolyPolygon2D
     @since OOo 2.0
  */
-struct RealBezierSegment2D
+published struct RealBezierSegment2D
 {
     /// The x coordinate of the start point.
     double Px;
diff --git a/offapi/com/sun/star/geometry/RealPoint2D.idl b/offapi/com/sun/star/geometry/RealPoint2D.idl
index bb95ab45c..4f9b0fbc8 100644
--- a/offapi/com/sun/star/geometry/RealPoint2D.idl
+++ b/offapi/com/sun/star/geometry/RealPoint2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct RealPoint2D
+published struct RealPoint2D
 {
     /// The x coordinate of the point.
     double X;
diff --git a/offapi/com/sun/star/geometry/RealRectangle2D.idl b/offapi/com/sun/star/geometry/RealRectangle2D.idl
index d81a6d62a..52e113046 100644
--- a/offapi/com/sun/star/geometry/RealRectangle2D.idl
+++ b/offapi/com/sun/star/geometry/RealRectangle2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct RealRectangle2D
+published struct RealRectangle2D
 {
     /// X coordinate of upper left corner .
     double X1;
diff --git a/offapi/com/sun/star/geometry/RealSize2D.idl b/offapi/com/sun/star/geometry/RealSize2D.idl
index 0177c57ca..a01fa5bd9 100644
--- a/offapi/com/sun/star/geometry/RealSize2D.idl
+++ b/offapi/com/sun/star/geometry/RealSize2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct RealSize2D
+published struct RealSize2D
 {
     /// Amount of space occupied in the x direction.
     double Width;
diff --git a/offapi/com/sun/star/geometry/XMapping2D.idl b/offapi/com/sun/star/geometry/XMapping2D.idl
index 981f5394b..356afa5df 100644
--- a/offapi/com/sun/star/geometry/XMapping2D.idl
+++ b/offapi/com/sun/star/geometry/XMapping2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_geometry_XMapping2D_idl__
 #define __com_sun_star_geometry_XMapping2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
 
 module com {  module sun {  module star {  module geometry {
 
@@ -50,11 +46,11 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-interface XMapping2D : ::com::sun::star::uno::XInterface
+published interface XMapping2D : ::com::sun::star::uno::XInterface
 {
     /** Forward 2D mapping function
      */
-    RealPoint2D 	map( [in] RealPoint2D aPoint );
+    RealPoint2D     map( [in] RealPoint2D aPoint );
 
     //-------------------------------------------------------------------------
 
@@ -64,7 +60,7 @@ interface XMapping2D : ::com::sun::star::uno::XInterface
         <code>map(mapInverse(p))=p</code>. This effectively rules out
         non-bijective mappings.<p>
      */
-    RealPoint2D 	mapInverse( [in] RealPoint2D aPoint );
+    RealPoint2D     mapInverse( [in] RealPoint2D aPoint );
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/geometry/makefile.mk b/offapi/com/sun/star/geometry/makefile.mk
deleted file mode 100644
index 2ade163ea..000000000
--- a/offapi/com/sun/star/geometry/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssgeometry
-PACKAGE=com$/sun$/star$/geometry
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AffineMatrix2D.idl			\
-    AffineMatrix3D.idl			\
-    EllipticalArc.idl			\
-    Matrix2D.idl				\
-    XMapping2D.idl				\
-    IntegerBezierSegment2D.idl 	\
-    RealBezierSegment2D.idl 	\
-    RealPoint2D.idl				\
-    RealRectangle2D.idl			\
-    RealRectangle3D.idl			\
-    RealSize2D.idl				\
-    IntegerPoint2D.idl			\
-    IntegerRectangle2D.idl		\
-    IntegerSize2D.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/graphic/GraphicRasterizer.idl b/offapi/com/sun/star/graphic/GraphicRasterizer.idl
new file mode 100644
index 000000000..ee1214f39
--- /dev/null
+++ b/offapi/com/sun/star/graphic/GraphicRasterizer.idl
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef com_sun_star_graphic_GraphicRasterizer_idl
+#define com_sun_star_graphic_GraphicRasterizer_idl
+
+#include <com/sun/star/graphic/XGraphicRasterizer.idl>
+
+module com { module sun { module star { module graphic
+{
+
+/** Service that describes the necessary interfaces and properties
+    to convert arbitrary graphic data to a <type>XGraphic</type>
+    interface containing a pixel graphic, that can be rendered the usual
+    ways.
+ */
+
+service GraphicRasterizer
+{
+    /** Interface to initiate the rasterizing process
+    */
+    interface ::com::sun::star::graphic::XGraphicRasterizer;
+
+};
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/graphic/XGraphic.idl b/offapi/com/sun/star/graphic/XGraphic.idl
index 498bef88d..b4e86d7fb 100644
--- a/offapi/com/sun/star/graphic/XGraphic.idl
+++ b/offapi/com/sun/star/graphic/XGraphic.idl
@@ -63,3 +63,5 @@ published interface XGraphic : ::com::sun::star::uno::XInterface
 } ; } ; } ; } ; 
 
 #endif
+
+
diff --git a/offapi/com/sun/star/graphic/XGraphicRasterizer.idl b/offapi/com/sun/star/graphic/XGraphicRasterizer.idl
new file mode 100644
index 000000000..097c4fdfa
--- /dev/null
+++ b/offapi/com/sun/star/graphic/XGraphicRasterizer.idl
@@ -0,0 +1,150 @@
+/*/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef com_sun_star_graphic_XGraphicRasterizer_idl
+#define com_sun_star_graphic_XGraphicRasterizer_idl
+
+#include <com/sun/star/io/XInputStream.idl>
+#include <com/sun/star/graphic/XGraphic.idl>
+#include <com/sun/star/beans/PropertyValues.idl>
+#include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/awt/Size.idl>
+
+module com { module sun { module star { module graphic
+{
+
+/** This interfaces exposes the initialize and a rasterize method to
+    rasterize a given data stream to a pixel graphic
+  */
+interface XGraphicRasterizer : ::com::sun::star::uno::XInterface
+{
+    /** Initializing the rasterizer
+
+        <p>This method could also be used to determine, if
+        the provided data is able to be rasterized by the
+        implementation. The implementation should take care of
+        this feature as well as setting the default image size in
+        pixel within the given output parameter.</p>
+
+        @param DataStream
+            The input stream of data that should be rasterized
+
+        @param DPI_X
+            The horizontal resolution of the callers device in pixel per inch. This
+            value is needed to calculate the correct dimensions of the graphic to be
+            rasterized. If a value of <value>0</value> is given, a horizontal default
+            resolution of 72 DPI is used.
+
+        @param DPI_Y
+            The vertical resolution of the callers device in pixel per inch. This
+            value is needed to calculate the correct dimensions of the graphic to be
+            rasterized. If a value of <value>0</value> is given, a vertical default
+            resolution of 72 DPI is used.
+
+        @param DefaultSizePixel
+            The default rendering size in pixel of the underlying graphics
+            data may be available after the call via this output parameter.
+
+            In case no default size can be determined during initialization,
+            a default pixel size of 0,0 is returned. In this case, the caller
+            needs to assume a default pixel size, appropriate for the calling
+            context.
+
+        @returns
+            A boolean value indicating if rasterizing of the given data is
+            possible at all and if the initialization process happened
+            successfully.
+
+        @see com::sun::star::io::XInputStream
+        @see com::sun::star::awt::Size
+    */
+    boolean initializeData( [in] com::sun::star::io::XInputStream DataStream,
+                            [in] unsigned long DPI_X,
+                            [in] unsigned long DPI_Y,
+                            [out] com::sun::star::awt::Size DefaultSizePixel );
+
+    /** Rasterizing the initialized data into a <type>XGraphic</type> container.
+
+        <p>The <type>XGraphic</type> container will contain a pixel
+        type graphic after a successful rasterization process</p>
+
+        <p>In case of any fault during the rasterization process,
+        the <type>XGraphic</type> container will be empty afterwards and
+        the method will return false</p>
+
+        @param Width
+            The width in pixel of the graphic to be rasterized.
+            This parameter is used without taking other transformation
+            values into account.
+
+        @param Height
+            The height in pixel of the graphic to be rasterized.
+            This parameter is used without taking other transformation
+            values into account.
+
+        @param RotateAngle
+            The rotation angle of the graphic to be rasterized.
+            This parameter is used without taking other transformation
+            values into account. The rotation is applied after scaling
+            and shearing the original image.
+
+        @param ShearXAngle
+            The horizontal shear angle of the graphic to be rasterized.
+            This parameter is used without taking other transformation
+            values into account. The shearing is applied after scaling
+            and before rotation of the image.
+
+        @param ShearYAngle
+            The vertical shear angle of the graphic to be rasterized.
+            This parameter is used without taking other transformation
+            values into account. The shearing is applied after scaling
+            and before rotation of the image.
+
+        @param RasterizeProperties
+            Additional properties for special needs (undefined by now)
+
+        @param Graphic
+            An interface to a graphic container into which the given data
+            should be rasterized.
+
+        @returns com::sun::star::graphic::XGraphic
+            An interface to a graphic container that holds the rasterized pixel data
+
+        @see com::sun::star::beans::PropertyValues
+        @see com::sun::star::graphic::XGraphic
+    */
+    com::sun::star::graphic::XGraphic rasterize( [in] unsigned long Width,
+                                                 [in] unsigned long Height,
+                                                 [in] double RotateAngle,
+                                                 [in] double ShearAngle_X,
+                                                 [in] double ShearAngle_Y,
+                                                 [in] com::sun::star::beans::PropertyValues RasterizeProperties );
+};
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/graphic/XPrimitive2D.idl b/offapi/com/sun/star/graphic/XPrimitive2D.idl
index cbc6b3515..4531e2ed5 100644
--- a/offapi/com/sun/star/graphic/XPrimitive2D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitive2D.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_graphic_XPrimitive2D_idl__
 #define __com_sun_star_graphic_XPrimitive2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl> 
-#endif 
 
 module com {  module sun {  module star {  module graphic {
 
diff --git a/offapi/com/sun/star/graphic/XPrimitive3D.idl b/offapi/com/sun/star/graphic/XPrimitive3D.idl
index 36a560d6e..c6ecca1c2 100644
--- a/offapi/com/sun/star/graphic/XPrimitive3D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitive3D.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_graphic_XPrimitive3D_idl__
 #define __com_sun_star_graphic_XPrimitive3D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle3D_idl__
 #include <com/sun/star/geometry/RealRectangle3D.idl>
-#endif
 
 module com {  module sun {  module star {  module graphic {
 
diff --git a/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl b/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
index 00c20fd38..527cf64cf 100644
--- a/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_graphic_XPrimitiveFactory2D_idl__
 #define __com_sun_star_graphic_XPrimitiveFactory2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
diff --git a/offapi/com/sun/star/graphic/makefile.mk b/offapi/com/sun/star/graphic/makefile.mk
index 4ee0031ab..6e4a0187c 100644
--- a/offapi/com/sun/star/graphic/makefile.mk
+++ b/offapi/com/sun/star/graphic/makefile.mk
@@ -42,7 +42,9 @@ IDLFILES= \
     Graphic.idl \
     GraphicColorMode.idl \
     GraphicDescriptor.idl \
+    GraphicObject.idl \
     GraphicProvider.idl \
+    GraphicRasterizer.idl \
     GraphicRendererVCL.idl \
     GraphicType.idl \
     MediaProperties.idl \
@@ -51,9 +53,9 @@ IDLFILES= \
     XPrimitiveFactory2D.idl \
     XGraphic.idl \
     XGraphicProvider.idl \
+    XGraphicRasterizer.idl \
     XGraphicRenderer.idl \
     XGraphicObject.idl \
-    GraphicObject.idl \
     XGraphicTransformer.idl
     
 # --- Targets ------------------------------------------------------
diff --git a/offapi/com/sun/star/i18n/BreakIterator.idl b/offapi/com/sun/star/i18n/BreakIterator.idl
index fca19fa8c..9160709e8 100644
--- a/offapi/com/sun/star/i18n/BreakIterator.idl
+++ b/offapi/com/sun/star/i18n/BreakIterator.idl
@@ -28,10 +28,7 @@
 #define __com_sun_star_i18n_BreakIterator_idl__
 
 #include <com/sun/star/lang/XServiceInfo.idl>
-
-#ifndef __com_sun_star_i18n_XBreakIterator_idl__
 #include <com/sun/star/i18n/XBreakIterator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/i18n/CharacterClassification.idl b/offapi/com/sun/star/i18n/CharacterClassification.idl
index 093f4cab8..9050d90e8 100644
--- a/offapi/com/sun/star/i18n/CharacterClassification.idl
+++ b/offapi/com/sun/star/i18n/CharacterClassification.idl
@@ -29,7 +29,6 @@
 #define __com_sun_star_i18n_CharacterClassification_idl__
 
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include <com/sun/star/i18n/XCharacterClassification.idl>
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/Collator.idl b/offapi/com/sun/star/i18n/Collator.idl
index 6cb518841..5b0b6e777 100644
--- a/offapi/com/sun/star/i18n/Collator.idl
+++ b/offapi/com/sun/star/i18n/Collator.idl
@@ -28,10 +28,7 @@
 #define __com_sun_star_i18n_Collator_idl__
 
 #include <com/sun/star/lang/XServiceInfo.idl>
-
-#ifndef __com_sun_star_i18n_XCollator_idl__
 #include <com/sun/star/i18n/XCollator.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/i18n/Currency2.idl b/offapi/com/sun/star/i18n/Currency2.idl
index e296d011a..d732a1a3a 100644
--- a/offapi/com/sun/star/i18n/Currency2.idl
+++ b/offapi/com/sun/star/i18n/Currency2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_i18n_Currency2_idl__
 #define __com_sun_star_i18n_Currency2_idl__
 
-#ifndef __com_sun_star_i18n_Currency_idl__
 #include <com/sun/star/i18n/Currency.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl b/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
index feadc2705..92d9fd442 100644
--- a/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
+++ b/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_i18n_LineBreakHyphenationOptions_idl__
 #define __com_sun_star_i18n_LineBreakHyphenationOptions_idl__
 
-#ifndef __com_sun_star_linguistic2_XHyphenator_idl__
 #include <com/sun/star/linguistic2/XHyphenator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/i18n/LineBreakResults.idl b/offapi/com/sun/star/i18n/LineBreakResults.idl
index 7d1bfbea2..f0662e2ec 100644
--- a/offapi/com/sun/star/i18n/LineBreakResults.idl
+++ b/offapi/com/sun/star/i18n/LineBreakResults.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_i18n_LineBreakResults_idl__
 #define __com_sun_star_i18n_LineBreakResults_idl__
 
-#ifndef __com_sun_star_linguistic2_XHyphenatedWord_idl__
 #include <com/sun/star/linguistic2/XHyphenatedWord.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl b/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
index 57246988b..ba5a9d3c9 100644
--- a/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
+++ b/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_i18n_MultipleCharsOutputException_idl__
 #define __com_sun_star_i18n_MultipleCharsOutputException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/i18n/TextConversion.idl b/offapi/com/sun/star/i18n/TextConversion.idl
index 42f00eb18..ac7277dbe 100644
--- a/offapi/com/sun/star/i18n/TextConversion.idl
+++ b/offapi/com/sun/star/i18n/TextConversion.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_i18n_TextConversion_idl__
 #define __com_sun_star_i18n_TextConversion_idl__
 
-#ifndef __com_sun_star_i18n_XTextConversion_idl__
 #include <com/sun/star/i18n/XTextConversion.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/i18n/TextConversionResult.idl b/offapi/com/sun/star/i18n/TextConversionResult.idl
index fc8746359..8b2a90bf6 100644
--- a/offapi/com/sun/star/i18n/TextConversionResult.idl
+++ b/offapi/com/sun/star/i18n/TextConversionResult.idl
@@ -29,9 +29,7 @@
 #define __com_sun_star_i18n_XTextConversionResult_idl__
 
 
-#ifndef __com_sun_star_i18n_Boundary_idl__
 #include <com/sun/star/i18n/Boundary.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/XBreakIterator.idl b/offapi/com/sun/star/i18n/XBreakIterator.idl
index 9015e161c..3636ce4b0 100644
--- a/offapi/com/sun/star/i18n/XBreakIterator.idl
+++ b/offapi/com/sun/star/i18n/XBreakIterator.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_i18n_XBreakIterator_idl__
 #define __com_sun_star_i18n_XBreakIterator_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_LineBreakUserOptions_idl__
 #include <com/sun/star/i18n/LineBreakUserOptions.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_LineBreakHyphenationOptions_idl__
 #include <com/sun/star/i18n/LineBreakHyphenationOptions.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_LineBreakResults_idl__
 #include <com/sun/star/i18n/LineBreakResults.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_Boundary_idl__
 #include <com/sun/star/i18n/Boundary.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/i18n/XCharacterClassification.idl b/offapi/com/sun/star/i18n/XCharacterClassification.idl
index ae28cd689..65b22eb23 100644
--- a/offapi/com/sun/star/i18n/XCharacterClassification.idl
+++ b/offapi/com/sun/star/i18n/XCharacterClassification.idl
@@ -29,13 +29,8 @@
 #define __com_sun_star_i18n_XCharacterClassification_idl__
 
 #include <com/sun/star/i18n/ParseResult.idl>
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/i18n/XForbiddenCharacters.idl b/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
index 4d086d0ea..e10caf140 100644
--- a/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
+++ b/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
@@ -28,13 +28,8 @@
 #define __com_sun_star_i18n_XForbiddenCharacters_idl__
 
 #include <com/sun/star/i18n/ForbiddenCharacters.idl>
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl b/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
index 1997275f9..ea6e6c45b 100644
--- a/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
+++ b/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_i18n_XIndexEntrySupplier_idl__
 #define __com_sun_star_i18n_XIndexEntrySupplier_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/i18n/XNumberFormatCode.idl b/offapi/com/sun/star/i18n/XNumberFormatCode.idl
index 5ae3b981e..ce868aff5 100644
--- a/offapi/com/sun/star/i18n/XNumberFormatCode.idl
+++ b/offapi/com/sun/star/i18n/XNumberFormatCode.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_i18n_XNumberFormatCode_idl__
 #define __com_sun_star_i18n_XNumberFormatCode_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/i18n/NumberFormatCode.idl>
 
diff --git a/offapi/com/sun/star/i18n/XTextConversion.idl b/offapi/com/sun/star/i18n/XTextConversion.idl
index 8bb6ec6ae..1272cbd79 100644
--- a/offapi/com/sun/star/i18n/XTextConversion.idl
+++ b/offapi/com/sun/star/i18n/XTextConversion.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_i18n_XTextConversion_idl__
 #define __com_sun_star_i18n_XTextConversion_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_TextConversionResult_idl__
 #include <com/sun/star/i18n/TextConversionResult.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/makefile.mk b/offapi/com/sun/star/i18n/makefile.mk
deleted file mode 100644
index 7d861fa14..000000000
--- a/offapi/com/sun/star/i18n/makefile.mk
+++ /dev/null
@@ -1,129 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssi18n
-PACKAGE=com$/sun$/star$/i18n
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AmPmValue.idl \
-    Boundary.idl \
-    BreakIterator.idl \
-    BreakType.idl \
-    CTLScriptType.idl \
-    Calendar.idl \
-    CalendarDisplayCode.idl \
-    CalendarDisplayIndex.idl \
-    CalendarFieldIndex.idl \
-    CalendarItem.idl \
-    ChapterCollator.idl \
-    CharType.idl \
-    CharacterClassification.idl \
-    CharacterIteratorMode.idl \
-    Collator.idl \
-    CollatorOptions.idl \
-    Currency.idl \
-    Currency2.idl \
-    DirectionProperty.idl \
-    ForbiddenCharacters.idl \
-    FormatElement.idl \
-    Implementation.idl \
-    IndexEntrySupplier.idl \
-    InputSequenceChecker.idl \
-    InputSequenceCheckMode.idl \
-    KCharacterType.idl \
-    KNumberFormatType.idl \
-    KNumberFormatUsage.idl \
-    KParseTokens.idl \
-    KParseType.idl \
-    LanguageCountryInfo.idl \
-    LineBreakHyphenationOptions.idl  \
-    LineBreakResults.idl \
-    LineBreakUserOptions.idl  \
-    LocaleCalendar.idl \
-    LocaleData.idl \
-    LocaleDataItem.idl \
-    LocaleItem.idl \
-    Months.idl \
-    MultipleCharsOutputException.idl \
-    NativeNumberMode.idl \
-    NativeNumberSupplier.idl \
-    NativeNumberXmlAttributes.idl \
-    NumberFormatCode.idl \
-    NumberFormatIndex.idl \
-    NumberFormatMapper.idl \
-    ParseResult.idl \
-    ScriptDirection.idl \
-    ScriptType.idl \
-    TextConversion.idl \
-    TextConversionOption.idl \
-    TextConversionResult.idl \
-    TextConversionType.idl \
-    Transliteration.idl \
-    TransliterationModules.idl \
-    TransliterationModulesNew.idl \
-    TransliterationModulesExtra.idl \
-    TransliterationType.idl \
-    UnicodeScript.idl \
-    UnicodeType.idl \
-    Weekdays.idl \
-    WordType.idl \
-    XBreakIterator.idl \
-    XCalendar.idl \
-    XCharacterClassification.idl \
-    XCollator.idl \
-    XExtendedCalendar.idl \
-    XExtendedIndexEntrySupplier.idl \
-    XExtendedTransliteration.idl \
-    XForbiddenCharacters.idl \
-    XIndexEntrySupplier.idl \
-    XInputSequenceChecker.idl \
-    XExtendedInputSequenceChecker.idl \
-    XLocaleData.idl \
-    XLocaleData2.idl \
-    XNativeNumberSupplier.idl \
-    XNumberFormatCode.idl \
-    XTextConversion.idl \
-    XExtendedTextConversion.idl \
-    XScriptTypeDetector.idl \
-    XTransliteration.idl \
-    reservedWords.idl \
-    XOrdinalSuffix.idl \
-    OrdinalSuffix.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/image/ImageMap.idl b/offapi/com/sun/star/image/ImageMap.idl
index 0009d0584..6991883e7 100644
--- a/offapi/com/sun/star/image/ImageMap.idl
+++ b/offapi/com/sun/star/image/ImageMap.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_image_ImageMap_idl__ 
 #define __com_sun_star_image_ImageMap_idl__ 
  
-#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__ 
 #include <com/sun/star/container/XIndexContainer.idl> 
-#endif 
   
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/image/ImageMapCircleObject.idl b/offapi/com/sun/star/image/ImageMapCircleObject.idl
index 5f44de3b7..7e05c61bb 100644
--- a/offapi/com/sun/star/image/ImageMapCircleObject.idl
+++ b/offapi/com/sun/star/image/ImageMapCircleObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_image_ImageMapCircleObject_idl__ 
 #define __com_sun_star_image_ImageMapCircleObject_idl__ 
  
-#ifndef __com_sun_star_image_ImageMapObject_idl__ 
 #include <com/sun/star/image/ImageMapObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/image/ImageMapObject.idl b/offapi/com/sun/star/image/ImageMapObject.idl
index cd709fb56..02296a41d 100644
--- a/offapi/com/sun/star/image/ImageMapObject.idl
+++ b/offapi/com/sun/star/image/ImageMapObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_image_ImageMapObject_idl__ 
 #define __com_sun_star_image_ImageMapObject_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_document_XEventsSupplier_idl__ 
 #include <com/sun/star/document/XEventsSupplier.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/image/ImageMapPolygonObject.idl b/offapi/com/sun/star/image/ImageMapPolygonObject.idl
index f43506c76..8f9d37cdd 100644
--- a/offapi/com/sun/star/image/ImageMapPolygonObject.idl
+++ b/offapi/com/sun/star/image/ImageMapPolygonObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_image_ImageMapPolygonObject_idl__ 
 #define __com_sun_star_image_ImageMapPolygonObject_idl__ 
  
-#ifndef __com_sun_star_image_ImageMapObject_idl__ 
 #include <com/sun/star/image/ImageMapObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_PointSequence_idl__ 
 #include <com/sun/star/drawing/PointSequence.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/image/ImageMapRectangleObject.idl b/offapi/com/sun/star/image/ImageMapRectangleObject.idl
index 3d86637ae..b539f5631 100644
--- a/offapi/com/sun/star/image/ImageMapRectangleObject.idl
+++ b/offapi/com/sun/star/image/ImageMapRectangleObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_image_ImageMapRectangleObject_idl__ 
 #define __com_sun_star_image_ImageMapRectangleObject_idl__ 
  
-#ifndef __com_sun_star_image_ImageMapObject_idl__ 
 #include <com/sun/star/image/ImageMapObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/image/makefile.mk b/offapi/com/sun/star/image/makefile.mk
deleted file mode 100644
index a09e60ad7..000000000
--- a/offapi/com/sun/star/image/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssimage
-PACKAGE=com$/sun$/star$/image
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ImageMap.idl\
-    ImageMapObject.idl\
-    ImageMapRectangleObject.idl\
-    ImageMapCircleObject.idl\
-    ImageMapPolygonObject.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/inspection/DefaultHelpProvider.idl b/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
index bb47cbea7..392cbe000 100644
--- a/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
+++ b/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,15 +27,13 @@
 #ifndef __com_sun_star_inspection_DefaultHelpProvider_idl__
 #define __com_sun_star_inspection_DefaultHelpProvider_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
-module com { module sun { module star { module inspection { 
+module com { module sun { module star { module inspection {
 
-interface XObjectInspectorUI;
+published interface XObjectInspectorUI;
 
 //=============================================================================
 
@@ -48,7 +46,7 @@ interface XObjectInspectorUI;
     the extended help text of this control's window, and set this help text at the
     object inspector's help section.</p>
  */
-service DefaultHelpProvider : com::sun::star::uno::XInterface
+published service DefaultHelpProvider : com::sun::star::uno::XInterface
 {
     /** creates a help provider instance
         @param InspectorUI
diff --git a/offapi/com/sun/star/inspection/GenericPropertyHandler.idl b/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
index 0b0a0e25f..85db8c54c 100644
--- a/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_inspection_GenericPropertyHandler_idl__
 #define __com_sun_star_inspection_GenericPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -52,7 +50,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-service GenericPropertyHandler : XPropertyHandler;
+published service GenericPropertyHandler : XPropertyHandler;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl b/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
index 0063c7aa5..0d00b86e8 100644
--- a/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
+++ b/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-enum InteractiveSelectionResult
+published enum InteractiveSelectionResult
 {
     /** The interactive selection of a property value was canceled.
     */
diff --git a/offapi/com/sun/star/inspection/LineDescriptor.idl b/offapi/com/sun/star/inspection/LineDescriptor.idl
index af738e273..a6d248093 100644
--- a/offapi/com/sun/star/inspection/LineDescriptor.idl
+++ b/offapi/com/sun/star/inspection/LineDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,14 +28,12 @@
 #ifndef __com_sun_star_inspection_LineDescriptor_idl__
 #define __com_sun_star_inspection_LineDescriptor_idl__
 
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XPropertyControl;
+published interface XPropertyControl;
 
 //-----------------------------------------------------------------------------
 /** describes the appearance of a line representing a single property in an <type>ObjectInspector</type>.
@@ -55,14 +53,14 @@ interface XPropertyControl;
 
     @since OOo 2.0.3
 */
-struct LineDescriptor
+published struct LineDescriptor
 {
     /** denotes the human-readable display name used to present a property to the user
     */
     string  DisplayName;
 
     /** denotes the control which should be used to represent the property at the UI.
-    
+
         @see XPropertyControlFactory
     */
     XPropertyControl Control;
diff --git a/offapi/com/sun/star/inspection/ObjectInspector.idl b/offapi/com/sun/star/inspection/ObjectInspector.idl
index bfa90ef80..49ca2806d 100644
--- a/offapi/com/sun/star/inspection/ObjectInspector.idl
+++ b/offapi/com/sun/star/inspection/ObjectInspector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_inspection_ObjectInspector_idl__
 #define __com_sun_star_inspection_ObjectInspector_idl__
 
-#ifndef __com_sun_star_inspection_XObjectInspector_idl__
 #include <com/sun/star/inspection/XObjectInspector.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -82,7 +77,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-service ObjectInspector : XObjectInspector
+published service ObjectInspector : XObjectInspector
 {
     /** creates a default instance of the ObjectInspector
 
diff --git a/offapi/com/sun/star/inspection/ObjectInspectorModel.idl b/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
index 8c9b3d9aa..b6e31286e 100644
--- a/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
+++ b/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_inspection_ObjectInspectorModel_idl__
 #define __com_sun_star_inspection_ObjectInspectorModel_idl__
 
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
 #include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -54,7 +49,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-service ObjectInspectorModel : XObjectInspectorModel
+published service ObjectInspectorModel : XObjectInspectorModel
 {
     /** creates a default ObjectInspectorModel, whose one and only handler factory
         creates a <type>GenericPropertyHandler</type>.
diff --git a/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl b/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl
index fed450ccc..1d0c18d06 100644
--- a/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl
+++ b/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-struct PropertyCategoryDescriptor
+published struct PropertyCategoryDescriptor
 {
     /** contains the programmatic name of the category.
 
diff --git a/offapi/com/sun/star/inspection/PropertyControlType.idl b/offapi/com/sun/star/inspection/PropertyControlType.idl
index 061d84145..d2bec8ec0 100644
--- a/offapi/com/sun/star/inspection/PropertyControlType.idl
+++ b/offapi/com/sun/star/inspection/PropertyControlType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-constants PropertyControlType
+published constants PropertyControlType
 {
     /** denotes a control which allows the user to choose from a list of
         possible property values
diff --git a/offapi/com/sun/star/inspection/PropertyLineElement.idl b/offapi/com/sun/star/inspection/PropertyLineElement.idl
index e7fae48cd..9979169a2 100644
--- a/offapi/com/sun/star/inspection/PropertyLineElement.idl
+++ b/offapi/com/sun/star/inspection/PropertyLineElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-constants PropertyLineElement
+published constants PropertyLineElement
 {
     /// specifies the input control in a group of controls related to a single property
     const short InputControl    = 0x01;
diff --git a/sal/inc/systools/win32/AutoSystoolInit.hxx b/offapi/com/sun/star/inspection/StringRepresentation.idl
index cb22bd54c..dd23ddcae 100644
--- a/sal/inc/systools/win32/AutoSystoolInit.hxx
+++ b/offapi/com/sun/star/inspection/StringRepresentation.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,40 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef _AUTOSYSTOOLINIT_HXX_
-#define _AUTOSYSTOOLINIT_HXX_
+#ifndef __com_sun_star_inspection_StringRepresentation_idl__
+#define __com_sun_star_inspection_StringRepresentation_idl__
 
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
+#include <com/sun/star/inspection/XStringRepresentation.idl>
 
-//------------------------------------------------------------------------
-// class used to automatically initialize/deinitialize the systools 
-//------------------------------------------------------------------------
+//=============================================================================
+module com {  module sun {  module star {  module inspection {
 
-class OAutoSystoolInit
+//-----------------------------------------------------------------------------
+service StringRepresentation : XStringRepresentation
 {
-    typedef void ( WINAPI *LPFNINIT_T   )( );
-    typedef void ( WINAPI *LPFNDEINIT_T )( );
-
-public:
-    OAutoSystoolInit( LPFNINIT_T lpfnInit, LPFNDEINIT_T lpfnDeInit ) :
-        m_lpfnDeInit( lpfnDeInit )
-    {
-        if ( NULL != lpfnInit )
-            lpfnInit( );
-    }
-
-    ~OAutoSystoolInit( )
-    {
-        if ( NULL != m_lpfnDeInit )
-            m_lpfnDeInit( );
-    }
-    
-private:
-    LPFNDEINIT_T m_lpfnDeInit; // address of the deinit function
+    create([in]com::sun::star::script::XTypeConverter TypeConverter)raises( com::sun::star::lang::IllegalArgumentException );
+    createConstant([in]com::sun::star::script::XTypeConverter TypeConverter,[in] string Constant,[in] sequence<string> Values)raises( com::sun::star::lang::IllegalArgumentException );
 };
+//=============================================================================
+
+}; }; }; };
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/inspection/XHyperlinkControl.idl b/offapi/com/sun/star/inspection/XHyperlinkControl.idl
index 9300b7bd9..6beb5cda5 100644
--- a/offapi/com/sun/star/inspection/XHyperlinkControl.idl
+++ b/offapi/com/sun/star/inspection/XHyperlinkControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_inspection_XHyperlinkControl_idl__
 #define __com_sun_star_inspection_XHyperlinkControl_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
-#ifndef __com_sun_star_awt_XActionListener_idl__
 #include <com/sun/star/awt/XActionListener.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -46,7 +42,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-interface XHyperlinkControl : XPropertyControl
+published interface XHyperlinkControl : XPropertyControl
 {
     /** adds a listener which will be notified when the user clicked the hyperlink text in the control
         @param listener
diff --git a/offapi/com/sun/star/inspection/XNumericControl.idl b/offapi/com/sun/star/inspection/XNumericControl.idl
index 54e4d277f..6f79c9bae 100644
--- a/offapi/com/sun/star/inspection/XNumericControl.idl
+++ b/offapi/com/sun/star/inspection/XNumericControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_inspection_XNumericControl_idl__
 #define __com_sun_star_inspection_XNumericControl_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -47,7 +41,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-interface XNumericControl : XPropertyControl
+published interface XNumericControl : XPropertyControl
 {
     /** describes the number of decimal digits to use for the value
     */
diff --git a/offapi/com/sun/star/inspection/XObjectInspector.idl b/offapi/com/sun/star/inspection/XObjectInspector.idl
index b6f854744..ae24450f3 100644
--- a/offapi/com/sun/star/inspection/XObjectInspector.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,21 +28,15 @@
 #ifndef __com_sun_star_inspection_XObjectInspector_idl__
 #define __com_sun_star_inspection_XObjectInspector_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XObjectInspectorModel;
-interface XObjectInspectorUI;
+published interface XObjectInspectorModel;
+published interface XObjectInspectorUI;
 
 //-----------------------------------------------------------------------------
 /** describes the main interface of an <type>ObjectInspector</type>.
@@ -51,7 +45,7 @@ interface XObjectInspectorUI;
 
     @since OOo 2.0.3
 */
-interface XObjectInspector
+published interface XObjectInspector
 {
     /** allows to plug the inspector into an <type scope="com::sun::star::frame">XFrame</type>
 
diff --git a/offapi/com/sun/star/inspection/XObjectInspectorModel.idl b/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
index f3ef85b96..621219777 100644
--- a/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
 #define __com_sun_star_inspection_XObjectInspectorModel_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_inspection_PropertyCategoryDescriptor_idl__
 #include <com/sun/star/inspection/PropertyCategoryDescriptor.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -47,7 +43,7 @@ interface XPropertyHandler;
 
     @since OOo 2.0.3
 */
-interface XObjectInspectorModel
+published interface XObjectInspectorModel
 {
     /** describes a set of factories for creating <type>XPropertyHandler</type>s
 
@@ -83,7 +79,7 @@ interface XObjectInspectorModel
         attribute, which is filled in <member>XPropertyHandler::describePropertyLine</member>
         method of your property handler.<br/>
         Those names provided by the handlers are programmatic names. All other information
-        about categories is part of the <type>PropertyCategoryDescriptor</type>, and 
+        about categories is part of the <type>PropertyCategoryDescriptor</type>, and
         <member>describeCategories</member> assembles information about all categories which
         all property handlers provided by the model use.</p>
 
@@ -135,7 +131,7 @@ interface XObjectInspectorModel
         Additionally, the inspector can optionally display a section dedicated to help
         texts. Clients could use this section to display context-sensitive help, for
         instance short texts explaining the currently selected property.</p>
- 
+
         @since OOo 2.2
     */
     [attribute, readonly] boolean HasHelpSection;
@@ -169,7 +165,7 @@ interface XObjectInspectorModel
     [attribute, readonly] long MaxHelpTextLines;
 
     /** determines whether the object inspector's UI should be read-only.
-    
+
         <p>In this case, the user is able to browse through all properties, but cannot
         change any of them.</p>
 
diff --git a/offapi/com/sun/star/inspection/XObjectInspectorUI.idl b/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
index ced380a6d..cde86cea2 100644
--- a/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,23 +27,15 @@
 #ifndef __com_sun_star_inspection_XObjectInspectorUI_idl__
 #define __com_sun_star_inspection_XObjectInspectorUI_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__ 
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XPropertyControlObserver;
+published interface XPropertyControlObserver;
 
 //-----------------------------------------------------------------------------
 /** grants access to certain aspects of the user interface of an object
@@ -59,7 +51,7 @@ interface XPropertyControlObserver;
 
     @since OOo 2.0.3
 */
-interface XObjectInspectorUI
+published interface XObjectInspectorUI
 {
     /** enables or disables all components belonging to the UI representation of a property
 
@@ -136,7 +128,7 @@ interface XObjectInspectorUI
     void    showCategory( [in] string Category, [in] boolean Show );
 
     /** retrieves the control currently used to display a given property
-    
+
         @param PropertyName
             the name of the property whose control should be retrieved
 
diff --git a/offapi/com/sun/star/inspection/XPropertyControl.idl b/offapi/com/sun/star/inspection/XPropertyControl.idl
index d22314502..0f00cd84b 100644
--- a/offapi/com/sun/star/inspection/XPropertyControl.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,24 +28,20 @@
 #ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #define __com_sun_star_inspection_XPropertyControl_idl__
 
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__ 
 #include <com/sun/star/beans/IllegalTypeException.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__ 
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XPropertyControlContext;
+published interface XPropertyControlContext;
 
 //-----------------------------------------------------------------------------
 /** defines the interface for a single control in an <type>ObjectInspector</type>
 
     @since OOo 2.0.3
 */
-interface XPropertyControl
+published interface XPropertyControl
 {
     /** denotes the type of the control, as one of the <type>PropertyControlType</type>
         constants
diff --git a/offapi/com/sun/star/inspection/XPropertyControlContext.idl b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
index be9a0c5f7..48d349759 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlContext.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_inspection_XPropertyControlContext_idl__
 #define __com_sun_star_inspection_XPropertyControlContext_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyControlObserver_idl__
 #include <com/sun/star/inspection/XPropertyControlObserver.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -42,7 +40,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-interface XPropertyControlContext : XPropertyControlObserver
+published interface XPropertyControlContext : XPropertyControlObserver
 {
     /** instructs the <type>XPropertyControlContext</type> to active the next control
 
diff --git a/offapi/com/sun/star/inspection/XPropertyControlFactory.idl b/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
index f83e13c38..117886a5e 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,21 +28,19 @@
 #ifndef __com_sun_star_inspection_XPropertyControlFactory_idl__
 #define __com_sun_star_inspection_XPropertyControlFactory_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XPropertyControl;
+published interface XPropertyControl;
 
 //-----------------------------------------------------------------------------
 /** a factory for <type>XPropertyControl</type>s
 
     @since OOo 2.0.3
 */
-interface XPropertyControlFactory
+published interface XPropertyControlFactory
 {
     /** creates a <type>XPropertyControl</type>
 
diff --git a/offapi/com/sun/star/inspection/XPropertyControlObserver.idl b/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
index 33542f2a4..8a995e22e 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,24 +28,22 @@
 #ifndef __com_sun_star_inspection_XPropertyControlObserver_idl__
 #define __com_sun_star_inspection_XPropertyControlObserver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module inspection {
 
-interface XPropertyControl;
+published interface XPropertyControl;
 
 //=============================================================================
 
 /** specifies an interface for components to observer certain aspects
     of an <type>XPropertyControl</type>.
- 
+
     @since OOo 2.2
 */
-interface XPropertyControlObserver
+published interface XPropertyControlObserver
 {
     /** notifies the observer that a certain <type>XPropertyControl</type>'s UI
         representation gained the focus.
diff --git a/offapi/com/sun/star/inspection/XPropertyHandler.idl b/offapi/com/sun/star/inspection/XPropertyHandler.idl
index 714ecbc98..7c89c0576 100644
--- a/offapi/com/sun/star/inspection/XPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/XPropertyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,36 +27,20 @@
 #ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #define __com_sun_star_inspection_XPropertyHandler_idl__
 
-#ifndef __com_sun_star_beans_PropertyState_idl__ 
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
-#ifndef __com_sun_star_beans_Property_idl__ 
 #include <com/sun/star/beans/Property.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__ 
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-#ifndef __com_sun_star_inspection_LineDescriptor_idl__
 #include <com/sun/star/inspection/LineDescriptor.idl>
-#endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__ 
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_inspection_InteractiveSelectionResult_idl__ 
 #include <com/sun/star/inspection/InteractiveSelectionResult.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XObjectInspectorUI;
-interface XPropertyControlFactory;
+published interface XObjectInspectorUI;
+published interface XPropertyControlFactory;
 
 //-----------------------------------------------------------------------------
 /** is the basic interface for object inspection.
@@ -72,7 +56,7 @@ interface XPropertyControlFactory;
 
     @since OOo 2.0.3
 */
-interface XPropertyHandler
+published interface XPropertyHandler
 {
     /** used for controlling resources acquired by the handler
 
diff --git a/offapi/com/sun/star/inspection/XStringListControl.idl b/offapi/com/sun/star/inspection/XStringListControl.idl
index 2372e81a7..87908aaf2 100644
--- a/offapi/com/sun/star/inspection/XStringListControl.idl
+++ b/offapi/com/sun/star/inspection/XStringListControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_inspection_XStringListControl_idl__
 #define __com_sun_star_inspection_XStringListControl_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -46,7 +44,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-interface XStringListControl : XPropertyControl
+published interface XStringListControl : XPropertyControl
 {
     /** clears the whole list
     */
diff --git a/offapi/com/sun/star/inspection/XStringRepresentation.idl b/offapi/com/sun/star/inspection/XStringRepresentation.idl
index 63b8e27a7..520138517 100644
--- a/offapi/com/sun/star/inspection/XStringRepresentation.idl
+++ b/offapi/com/sun/star/inspection/XStringRepresentation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,18 +28,16 @@
 #ifndef __com_sun_star_inspection_XStringRepresentation_idl__
 #define __com_sun_star_inspection_XStringRepresentation_idl__
 
-#ifndef __com_sun_star_script_XTypeConverter_idl__ 
 #include <com/sun/star/script/XTypeConverter.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
 //-----------------------------------------------------------------------------
 /** handles string representations of property values.
-    @see 
+    @see
 */
-interface XStringRepresentation
+published interface XStringRepresentation
 {
     /** converts a  into a string.
         @param PropertyValue
@@ -63,11 +61,6 @@ interface XStringRepresentation
                         ) raises( com::sun::star::uno::Exception );
 };
 
-service StringRepresentation : XStringRepresentation
-{
-    create([in]com::sun::star::script::XTypeConverter TypeConverter)raises( com::sun::star::lang::IllegalArgumentException );
-    createConstant([in]com::sun::star::script::XTypeConverter TypeConverter,[in] string Constant,[in] sequence<string> Values)raises( com::sun::star::lang::IllegalArgumentException );
-};
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/inspection/makefile.mk b/offapi/com/sun/star/inspection/makefile.mk
deleted file mode 100644
index bca5fd1e1..000000000
--- a/offapi/com/sun/star/inspection/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssinspection
-PACKAGE=com$/sun$/star$/inspection
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    DefaultHelpProvider.idl \
-    GenericPropertyHandler.idl \
-    InteractiveSelectionResult.idl \
-    LineDescriptor.idl \
-    ObjectInspector.idl \
-    ObjectInspectorModel.idl \
-    PropertyCategoryDescriptor.idl \
-    PropertyControlType.idl \
-    PropertyLineElement.idl \
-    XHyperlinkControl.idl \
-    XNumericControl.idl \
-    XObjectInspector.idl \
-    XObjectInspectorModel.idl \
-    XObjectInspectorUI.idl \
-    XPropertyControl.idl \
-    XPropertyControlContext.idl \
-    XPropertyControlFactory.idl \
-    XPropertyControlObserver.idl \
-    XPropertyHandler.idl \
-    XStringListControl.idl \
-    XStringRepresentation.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/installation/InstallationCheck.idl b/offapi/com/sun/star/installation/InstallationCheck.idl
index 68cc693be..42c23484e 100644
--- a/offapi/com/sun/star/installation/InstallationCheck.idl
+++ b/offapi/com/sun/star/installation/InstallationCheck.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_InstallationCheck_idl__ 
 #define __com_sun_star_installation_InstallationCheck_idl__ 
  
-#ifndef __com_sun_star_installation_XInstallationCheck_idl__ 
 #include <com/sun/star/installation/XInstallationCheck.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/installation/InstallationCheckService.idl b/offapi/com/sun/star/installation/InstallationCheckService.idl
index de262ef31..99433d91a 100644
--- a/offapi/com/sun/star/installation/InstallationCheckService.idl
+++ b/offapi/com/sun/star/installation/InstallationCheckService.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_InstallationCheckService_idl__
 #define __com_sun_star_installation_InstallationCheckService_idl__
 
-#ifndef __com_sun_star_installation_XInstallationCheck_idl__
 #include <com/sun/star/installation/XInstallationCheck.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/installation/InternetSettings.idl b/offapi/com/sun/star/installation/InternetSettings.idl
index c676932b8..d271f440a 100644
--- a/offapi/com/sun/star/installation/InternetSettings.idl
+++ b/offapi/com/sun/star/installation/InternetSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_InternetSettings_idl__ 
 #define __com_sun_star_installation_InternetSettings_idl__ 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl b/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
index d4fce7f69..667ff2a41 100644
--- a/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
+++ b/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_ProtocolHandlerCheck_idl__ 
 #define __com_sun_star_installation_ProtocolHandlerCheck_idl__ 
  
-#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__ 
 #include <com/sun/star/installation/XProtocolHandlerCheck.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl b/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
index 4164cb620..457231b62 100644
--- a/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
+++ b/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_ProtocolHandlerCheckService_idl__
 #define __com_sun_star_installation_ProtocolHandlerCheckService_idl__
 
-#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__
 #include <com/sun/star/installation/XProtocolHandlerCheck.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/installation/XInstallationCheck.idl b/offapi/com/sun/star/installation/XInstallationCheck.idl
index e5deaf5ff..76de905b1 100644
--- a/offapi/com/sun/star/installation/XInstallationCheck.idl
+++ b/offapi/com/sun/star/installation/XInstallationCheck.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_XInstallationCheck_idl__ 
 #define __com_sun_star_installation_XInstallationCheck_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl b/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
index b7ac0845c..5d7746379 100644
--- a/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
+++ b/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__ 
 #define __com_sun_star_installation_XProtocolHandlerCheck_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_installation_ProtDlgRes_idl__ 
 #include <com/sun/star/installation/ProtDlgRes.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/installation/makefile.mk b/offapi/com/sun/star/installation/makefile.mk
deleted file mode 100644
index 5483b6453..000000000
--- a/offapi/com/sun/star/installation/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssinstallation
-PACKAGE=com$/sun$/star$/installation
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    InstallationCheck.idl\
-    InstallationCheckService.idl\
-    InternetSettings.idl\
-    ProtDlgRes.idl\
-    ProtocolHandlerCheck.idl\
-    ProtocolHandlerCheckService.idl\
-    protocols.idl\
-    XInstallationCheck.idl\
-    XProtocolHandlerCheck.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/ldap/LdapConnectionException.idl b/offapi/com/sun/star/ldap/LdapConnectionException.idl
index 437b907db..27e728b42 100644
--- a/offapi/com/sun/star/ldap/LdapConnectionException.idl
+++ b/offapi/com/sun/star/ldap/LdapConnectionException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ldap_LdapConnectionException_idl__
 #define __com_sun_star_ldap_LdapConnectionException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module ldap {
 
diff --git a/offapi/com/sun/star/ldap/LdapGenericException.idl b/offapi/com/sun/star/ldap/LdapGenericException.idl
index 022902348..97427f508 100644
--- a/offapi/com/sun/star/ldap/LdapGenericException.idl
+++ b/offapi/com/sun/star/ldap/LdapGenericException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ldap_LdapGenericException_idl__
 #define __com_sun_star_ldap_LdapGenericException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module ldap {
 
diff --git a/offapi/com/sun/star/ldap/makefile.mk b/offapi/com/sun/star/ldap/makefile.mk
deleted file mode 100644
index 35e601ee4..000000000
--- a/offapi/com/sun/star/ldap/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssldap
-PACKAGE=com$/sun$/star$/ldap
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    LdapGenericException.idl\
-    LdapConnectionException.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/linguistic2/ConversionDictionary.idl b/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
index d81eae905..a578392d9 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_linguistic2_ConversionDictionary_idl__
 #define __com_sun_star_linguistic2_ConversionDictionary_idl__
 
-#ifndef __com_sun_star_linguistic2_XConversionDictionary_idl__
 #include <com/sun/star/linguistic2/XConversionDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XConversionPropertyType_idl__
 #include <com/sun/star/linguistic2/XConversionPropertyType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl b/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
index c7c55cdcb..52406a9ae 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_ConversionDictionaryList_idl__
 #define __com_sun_star_linguistic2_ConversionDictionaryList_idl__
 
-#ifndef __com_sun_star_linguistic2_XConversionDictionaryList_idl__
 #include <com/sun/star/linguistic2/XConversionDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/Dictionary.idl b/offapi/com/sun/star/linguistic2/Dictionary.idl
index fd8665967..4d5a29f4e 100644
--- a/offapi/com/sun/star/linguistic2/Dictionary.idl
+++ b/offapi/com/sun/star/linguistic2/Dictionary.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_linguistic2_Dictionary_idl__
 #define __com_sun_star_linguistic2_Dictionary_idl__
 
-#ifndef __com_sun_star_linguistic2_XDictionary_idl__
 #include <com/sun/star/linguistic2/XDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSearchableDictionary_idl__
 #include <com/sun/star/linguistic2/XSearchableDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStorable_idl__
 #include <com/sun/star/frame/XStorable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/DictionaryEvent.idl b/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
index c237bbea2..a0f54b821 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_DictionaryEvent_idl__
 #define __com_sun_star_linguistic2_DictionaryEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/DictionaryList.idl b/offapi/com/sun/star/linguistic2/DictionaryList.idl
index ff6870ea9..380139c44 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryList.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_linguistic2_DictionaryList_idl__
 #define __com_sun_star_linguistic2_DictionaryList_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl b/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
index 33c1e7801..b2ddb1df4 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_DictionaryListEvent_idl__
 #define __com_sun_star_linguistic2_DictionaryListEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryEvent_idl__
 #include <com/sun/star/linguistic2/DictionaryEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/Hyphenator.idl b/offapi/com/sun/star/linguistic2/Hyphenator.idl
index fdf7be0dc..50894a811 100644
--- a/offapi/com/sun/star/linguistic2/Hyphenator.idl
+++ b/offapi/com/sun/star/linguistic2/Hyphenator.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_linguistic2_Hyphenator_idl__
 #define __com_sun_star_linguistic2_Hyphenator_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
 #include <com/sun/star/lang/XServiceDisplayName.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/LinguProperties.idl b/offapi/com/sun/star/linguistic2/LinguProperties.idl
index 3bda5fe2e..2a9ed1a1e 100644
--- a/offapi/com/sun/star/linguistic2/LinguProperties.idl
+++ b/offapi/com/sun/star/linguistic2/LinguProperties.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_linguistic2_LinguProperties_idl__
 #define __com_sun_star_linguistic2_LinguProperties_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl b/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
index f94ae810b..85095e69b 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_linguistic2_LinguServiceEvent_idl__
 #define __com_sun_star_linguistic2_LinguServiceEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
index 05e207438..5d1445485 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_linguistic2_LinguServiceManager_idl__
 #define __com_sun_star_linguistic2_LinguServiceManager_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
index 38be5c8ad..007111694 100644
--- a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
+++ b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
@@ -27,23 +27,10 @@
 #ifndef __com_sun_star_linguistic2_ProofreadingResult_idl__
 #define __com_sun_star_linguistic2_ProofreadingResult_idl__
 
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
 #include <com/sun/star/text/XFlatParagraph.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_SingleProofreadingError_idl__
 #include <com/sun/star/linguistic2/SingleProofreadingError.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_idl_
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
index a4ebf527c..7552cae3a 100644
--- a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
+++ b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_SingleProofreadingError_idl__
 #define __com_sun_star_linguistic2_SingleProofreadingError_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_idl_
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/SpellChecker.idl b/offapi/com/sun/star/linguistic2/SpellChecker.idl
index 7c2896785..cec23474e 100644
--- a/offapi/com/sun/star/linguistic2/SpellChecker.idl
+++ b/offapi/com/sun/star/linguistic2/SpellChecker.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_linguistic2_SpellChecker_idl__
 #define __com_sun_star_linguistic2_SpellChecker_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
 #include <com/sun/star/lang/XServiceDisplayName.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/Thesaurus.idl b/offapi/com/sun/star/linguistic2/Thesaurus.idl
index 22d65d741..51121a0a5 100644
--- a/offapi/com/sun/star/linguistic2/Thesaurus.idl
+++ b/offapi/com/sun/star/linguistic2/Thesaurus.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_linguistic2_Thesaurus_idl__
 #define __com_sun_star_linguistic2_Thesaurus_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
 #include <com/sun/star/lang/XServiceDisplayName.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XAvailableLocales.idl b/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
index d50bd4269..ae20e7a4f 100644
--- a/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
+++ b/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
@@ -28,9 +28,7 @@
 #define __com_sun_star_linguistic2_XAvailableLocales_idl__
 
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XConversionDictionary.idl b/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
index 0cf28878d..e84287562 100644
--- a/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
@@ -28,33 +28,13 @@
 #define __com_sun_star_linguistic2_XConversionDictionary_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ConversionDictionaryType_idl__
 #include <com/sun/star/linguistic2/ConversionDictionaryType.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ConversionDirection_idl__
 #include <com/sun/star/linguistic2/ConversionDirection.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl b/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
index 28720b286..02413159b 100644
--- a/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
@@ -28,29 +28,12 @@
 #define __com_sun_star_linguistic2_XConversionDictionaryList_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XConversionDictionary_idl__
 #include <com/sun/star/linguistic2/XConversionDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl b/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
index 79c2de073..2520115b6 100644
--- a/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
@@ -28,18 +28,11 @@
 #define __com_sun_star_linguistic2_XConversionPropertyType_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XDictionary.idl b/offapi/com/sun/star/linguistic2/XDictionary.idl
index 5a7dd07e4..342e68006 100644
--- a/offapi/com/sun/star/linguistic2/XDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionary.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_linguistic2_XDictionary_idl__
 #define __com_sun_star_linguistic2_XDictionary_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryType_idl__
 #include <com/sun/star/linguistic2/DictionaryType.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEventListener_idl__
 #include <com/sun/star/linguistic2/XDictionaryEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XDictionary1.idl b/offapi/com/sun/star/linguistic2/XDictionary1.idl
index 20b1390dd..ba59b9364 100644
--- a/offapi/com/sun/star/linguistic2/XDictionary1.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionary1.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_linguistic2_XDictionary1_idl__
 #define __com_sun_star_linguistic2_XDictionary1_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryType_idl__
 #include <com/sun/star/linguistic2/DictionaryType.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEventListener_idl__
 #include <com/sun/star/linguistic2/XDictionaryEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl b/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
index 9d1058ab3..d1335f01e 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #define __com_sun_star_linguistic2_XDictionaryEntry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl b/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
index f4d8ce189..78a9079f1 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XDictionaryEventListener_idl__
 #define __com_sun_star_linguistic2_XDictionaryEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryEvent_idl__
 #include <com/sun/star/linguistic2/DictionaryEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryList.idl b/offapi/com/sun/star/linguistic2/XDictionaryList.idl
index 5e5189e15..3e28c3c13 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryList.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
 #define __com_sun_star_linguistic2_XDictionaryList_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionary_idl__
 #include <com/sun/star/linguistic2/XDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryListEventListener_idl__
 #include <com/sun/star/linguistic2/XDictionaryListEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl b/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
index 23b4e7318..46b8d6560 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XDictionaryListEventListener_idl__
 #define __com_sun_star_linguistic2_XDictionaryListEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryListEvent_idl__
 #include <com/sun/star/linguistic2/DictionaryListEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl b/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
index aa0e10191..3c853cdb1 100644
--- a/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
+++ b/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XHyphenatedWord_idl__
 #define __com_sun_star_linguistic2_XHyphenatedWord_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XHyphenator.idl b/offapi/com/sun/star/linguistic2/XHyphenator.idl
index bfc7d5aeb..15a4804c3 100644
--- a/offapi/com/sun/star/linguistic2/XHyphenator.idl
+++ b/offapi/com/sun/star/linguistic2/XHyphenator.idl
@@ -28,34 +28,13 @@
 #define __com_sun_star_linguistic2_XHyphenator_idl__
 
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
 #include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
 #include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XHyphenatedWord_idl__
 #include <com/sun/star/linguistic2/XHyphenatedWord.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XPossibleHyphens_idl__
 #include <com/sun/star/linguistic2/XPossibleHyphens.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_idl_
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
index 237bc4d72..c204fa798 100644
--- a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
+++ b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_linguistic2_XLanguageGuessing_idl__
 #define __com_sun_star_linguistic2_XLanguageGuessing_idl__
 
-#ifndef _COM_SUN_STAR_UNO_XINTERFACE_idl_
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef _COM_SUN_STAR_LANG_LOCALE_idl_
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_IDL_
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com { module sun { module star { module linguistic2 {
     
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl b/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
index d065f5659..0f6a131e5 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
@@ -28,13 +28,8 @@
 #define __com_sun_star_linguistic2_XLinguServiceEventBroadcaster_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XLinguServiceEventListener_idl__
 #include <com/sun/star/linguistic2/XLinguServiceEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl b/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
index e5f1e408b..54a25d3aa 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
@@ -28,13 +28,8 @@
 #define __com_sun_star_linguistic2_XLinguServiceEventListener_idl__
 
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_LinguServiceEvent_idl__
 #include <com/sun/star/linguistic2/LinguServiceEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl b/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
index 236514a26..46f430803 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
@@ -28,21 +28,10 @@
 #define __com_sun_star_linguistic2_XLinguServiceManager_idl__
 
 
-#ifndef __com_sun_star_linguistic2_XSpellChecker_idl__
 #include <com/sun/star/linguistic2/XSpellChecker.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XHyphenator_idl__
 #include <com/sun/star/linguistic2/XHyphenator.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XThesaurus_idl__
 #include <com/sun/star/linguistic2/XThesaurus.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XMeaning.idl b/offapi/com/sun/star/linguistic2/XMeaning.idl
index a277bfb8c..f21fe85ed 100644
--- a/offapi/com/sun/star/linguistic2/XMeaning.idl
+++ b/offapi/com/sun/star/linguistic2/XMeaning.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_linguistic2_XMeaning_idl__
 #define __com_sun_star_linguistic2_XMeaning_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl b/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
index 8a5ab6c03..33ec10642 100644
--- a/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
+++ b/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XPossibleHyphens_idl__
 #define __com_sun_star_linguistic2_XPossibleHyphens_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XProofreader.idl b/offapi/com/sun/star/linguistic2/XProofreader.idl
index 7489f7ab9..33db9354b 100644
--- a/offapi/com/sun/star/linguistic2/XProofreader.idl
+++ b/offapi/com/sun/star/linguistic2/XProofreader.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_linguistic2_XProofreader_idl__
 #define __com_sun_star_linguistic2_XProofreader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
 #include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
 #include <com/sun/star/text/XFlatParagraph.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ProofreadingResult_idl__
 #include <com/sun/star/linguistic2/ProofreadingResult.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_idl_
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
index e63f73c07..a8ec75e40 100644
--- a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
+++ b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_linguistic2_XProofreadingIterator_idl__
 #define __com_sun_star_linguistic2_XProofreadingIterator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraphIteratorProvider_idl__
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
 #include <com/sun/star/text/XFlatParagraph.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ProofreadingResult_idl__
 #include <com/sun/star/linguistic2/ProofreadingResult.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
index e4ce92eae..af9b4670e 100644
--- a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XSearchableDictionary_idl__
 #define __com_sun_star_linguistic2_XSearchableDictionary_idl__
 
-#ifndef __com_sun_star_linguistic2_XDictionary_idl__
 #include <com/sun/star/linguistic2/XDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl b/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
index 70a1660a3..8206042bc 100644
--- a/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
@@ -28,17 +28,9 @@
 #define __com_sun_star_linguistic2_XSearchableDictionaryList_idl__
 
 
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
 #include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
index 9e5e08530..436a010ef 100644
--- a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
+++ b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_linguistic2_XSetSpellAlternatives_idl__
 #define __com_sun_star_linguistic2_XSetSpellAlternatives_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl b/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
index 933891d6a..fb2b5f191 100644
--- a/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XSpellAlternatives_idl__
 #define __com_sun_star_linguistic2_XSpellAlternatives_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XSpellChecker.idl b/offapi/com/sun/star/linguistic2/XSpellChecker.idl
index d5954789e..821d6fe75 100644
--- a/offapi/com/sun/star/linguistic2/XSpellChecker.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellChecker.idl
@@ -27,26 +27,11 @@
 #ifndef __com_sun_star_linguistic2_XSpellChecker_idl__
 #define __com_sun_star_linguistic2_XSpellChecker_idl__
 
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
 #include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
 #include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSpellAlternatives_idl__
 #include <com/sun/star/linguistic2/XSpellAlternatives.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_idl_
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XSpellChecker1.idl b/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
index bbcce2cb5..1723590d2 100644
--- a/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
@@ -27,26 +27,11 @@
 #ifndef __com_sun_star_linguistic2_XSpellChecker1_idl__
 #define __com_sun_star_linguistic2_XSpellChecker1_idl__
 
-#ifndef __com_sun_star_linguistic2_XSupportedLanguages_idl__
 #include <com/sun/star/linguistic2/XSupportedLanguages.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
 #include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSpellAlternatives_idl__
 #include <com/sun/star/linguistic2/XSpellAlternatives.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_idl_
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl b/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
index 8cc2bd12f..9db904ae3 100644
--- a/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
+++ b/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XSupportedLanguages_idl__
 #define __com_sun_star_linguistic2_XSupportedLanguages_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSupportedLocales.idl b/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
index a099d1f46..fdba1540c 100644
--- a/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
+++ b/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
 #define __com_sun_star_linguistic2_XSupportedLocales_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XThesaurus.idl b/offapi/com/sun/star/linguistic2/XThesaurus.idl
index f6cbfe04a..4acb83538 100644
--- a/offapi/com/sun/star/linguistic2/XThesaurus.idl
+++ b/offapi/com/sun/star/linguistic2/XThesaurus.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_linguistic2_XThesaurus_idl__
 #define __com_sun_star_linguistic2_XThesaurus_idl__
 
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
 #include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XMeaning_idl__
 #include <com/sun/star/linguistic2/XMeaning.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/makefile.mk b/offapi/com/sun/star/linguistic2/makefile.mk
deleted file mode 100644
index 54c08c7be..000000000
--- a/offapi/com/sun/star/linguistic2/makefile.mk
+++ /dev/null
@@ -1,101 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csslinguistic2
-PACKAGE=com$/sun$/star$/linguistic2
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ConversionDictionary.idl \
-    ConversionDictionaryList.idl \
-    ConversionDictionaryType.idl \
-    ConversionDirection.idl \
-    ConversionPropertyType.idl \
-    Dictionary.idl\
-    DictionaryEvent.idl\
-    DictionaryEventFlags.idl\
-    DictionaryList.idl\
-    DictionaryListEvent.idl\
-    DictionaryListEventFlags.idl\
-    DictionaryType.idl\
-    HangulHanjaConversionDictionary.idl \
-    Hyphenator.idl\
-    LinguProperties.idl\
-    LinguServiceEvent.idl\
-    LinguServiceEventFlags.idl\
-    LinguServiceManager.idl\
-    SpellChecker.idl\
-    SpellFailure.idl\
-    Thesaurus.idl\
-    XAvailableLocales.idl\
-    XConversionDictionary.idl \
-    XConversionDictionaryList.idl \
-    XConversionPropertyType.idl \
-    XDictionary.idl\
-    XDictionary1.idl\
-    XDictionaryEntry.idl\
-    XDictionaryEventListener.idl\
-    XDictionaryList.idl\
-    XDictionaryListEventListener.idl\
-    XHyphenatedWord.idl\
-    XHyphenator.idl\
-    XLanguageGuessing.idl\
-    XLinguServiceEventBroadcaster.idl\
-    XLinguServiceEventListener.idl\
-    XLinguServiceManager.idl\
-    XMeaning.idl\
-    XPossibleHyphens.idl\
-    XSearchableDictionary.idl\
-    XSearchableDictionaryList.idl\
-    XSpellAlternatives.idl\
-    XSetSpellAlternatives.idl\
-    XSpellChecker.idl\
-    XSpellChecker1.idl\
-    XSupportedLanguages.idl\
-    XSupportedLocales.idl\
-    XThesaurus.idl\
-    SingleProofreadingError.idl\
-    ProofreadingResult.idl\
-    Proofreader.idl\
-    XProofreader.idl\
-    XProofreadingIterator.idl\
-    ProofreadingIterator.idl
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :	target.mk
-.INCLUDE :	$(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/logging/ConsoleHandler.idl b/offapi/com/sun/star/logging/ConsoleHandler.idl
index cffa793d9..9e5818f57 100644
--- a/offapi/com/sun/star/logging/ConsoleHandler.idl
+++ b/offapi/com/sun/star/logging/ConsoleHandler.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_logging_ConsoleHandler_idl__
 #define __com_sun_star_logging_ConsoleHandler_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/DocumentIOLogRing.idl b/offapi/com/sun/star/logging/DocumentIOLogRing.idl
index 92ec359c0..45712531e 100644
--- a/offapi/com/sun/star/logging/DocumentIOLogRing.idl
+++ b/offapi/com/sun/star/logging/DocumentIOLogRing.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_logging_DocumentIOLogRing_idl__
 #define __com_sun_star_logging_DocumentIOLogRing_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/FileHandler.idl b/offapi/com/sun/star/logging/FileHandler.idl
index 1cd030a3b..b7bc704d4 100644
--- a/offapi/com/sun/star/logging/FileHandler.idl
+++ b/offapi/com/sun/star/logging/FileHandler.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_logging_FileHandler_idl__
 #define __com_sun_star_logging_FileHandler_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/LogRecord.idl b/offapi/com/sun/star/logging/LogRecord.idl
index 801bd6c87..4019f4acd 100644
--- a/offapi/com/sun/star/logging/LogRecord.idl
+++ b/offapi/com/sun/star/logging/LogRecord.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,11 @@
 #ifndef __com_sun_star_logging_LogRecord_idl__
 #define __com_sun_star_logging_LogRecord_idl__
 
-#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 //=============================================================================
 
-module com { module sun { module star { module logging { 
+module com { module sun { module star { module logging {
 
 //=============================================================================
 
@@ -44,7 +42,7 @@ module com { module sun { module star { module logging {
 
     @since OOo 2.3
  */
-struct LogRecord
+published struct LogRecord
 {
     /// specifies the name of the logger at which the record is logged
     string  LoggerName;
@@ -89,7 +87,7 @@ struct LogRecord
 
 //=============================================================================
 
-}; }; }; }; 
+}; }; }; };
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/LoggerPool.idl b/offapi/com/sun/star/logging/LoggerPool.idl
index 301749d15..b5578ee06 100644
--- a/offapi/com/sun/star/logging/LoggerPool.idl
+++ b/offapi/com/sun/star/logging/LoggerPool.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_logging_LoggerPool_idl__
 #define __com_sun_star_logging_LoggerPool_idl__
 
-#ifndef __com_sun_star_logging_XLoggerPool_idl__
 #include <com/sun/star/logging/XLoggerPool.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/SimpleLogRing.idl b/offapi/com/sun/star/logging/SimpleLogRing.idl
index 6eda0b9f6..10442c08d 100644
--- a/offapi/com/sun/star/logging/SimpleLogRing.idl
+++ b/offapi/com/sun/star/logging/SimpleLogRing.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_logging_SimpleLogRing_idl__
 #define __com_sun_star_logging_SimpleLogRing_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XConsoleHandler.idl b/offapi/com/sun/star/logging/XConsoleHandler.idl
index 803965153..78fa532ac 100644
--- a/offapi/com/sun/star/logging/XConsoleHandler.idl
+++ b/offapi/com/sun/star/logging/XConsoleHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __offapi_com_sun_star_logging_XConsoleHandler_idl__
 #define __offapi_com_sun_star_logging_XConsoleHandler_idl__
 
-#ifndef __com_sun_star_logging_XLogHandler_idl__
 #include <com/sun/star/logging/XLogHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XCsvLogFormatter.idl b/offapi/com/sun/star/logging/XCsvLogFormatter.idl
index e5ca4f52c..84abc5621 100644
--- a/offapi/com/sun/star/logging/XCsvLogFormatter.idl
+++ b/offapi/com/sun/star/logging/XCsvLogFormatter.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_logging_XCsvLogFormatter_idl__
 #define __com_sun_star_logging_XCsvLogFormatter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_logging_XLogFormatter_idl__
 #include <com/sun/star/logging/XLogFormatter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XLogFormatter.idl b/offapi/com/sun/star/logging/XLogFormatter.idl
index 383519ee7..adc4c34ab 100644
--- a/offapi/com/sun/star/logging/XLogFormatter.idl
+++ b/offapi/com/sun/star/logging/XLogFormatter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,27 +28,22 @@
 #ifndef __com_sun_star_logging_XLogFormatter_idl__
 #define __com_sun_star_logging_XLogFormatter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_logging_LogRecord_idl__
 #include <com/sun/star/logging/LogRecord.idl>
-#endif
 
 //=============================================================================
 
-module com { module sun { module star { module logging { 
+module com { module sun { module star { module logging {
 
 //=============================================================================
 
 /** specifies the interface to be used for formatting log records
 
     @see XLogHandler
- 
+
     @since OOo 2.3
 */
-interface XLogFormatter
+published interface XLogFormatter
 {
     /** returns the header string for the log
 
@@ -81,7 +76,7 @@ interface XLogFormatter
 
 //=============================================================================
 
-}; }; }; }; 
+}; }; }; };
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XLogHandler.idl b/offapi/com/sun/star/logging/XLogHandler.idl
index 9d7a070f3..2d9610dcc 100644
--- a/offapi/com/sun/star/logging/XLogHandler.idl
+++ b/offapi/com/sun/star/logging/XLogHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,21 +28,13 @@
 #ifndef __com_sun_star_logging_XLogHandler_idl__
 #define __com_sun_star_logging_XLogHandler_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_logging_LogRecord_idl__
 #include <com/sun/star/logging/LogRecord.idl>
-#endif
-
-#ifndef __com_sun_star_logging_XLogFormatter_idl__
 #include <com/sun/star/logging/XLogFormatter.idl>
-#endif
 
 //=============================================================================
 
-module com { module sun { module star { module logging { 
+module com { module sun { module star { module logging {
 
 //=============================================================================
 
@@ -53,7 +45,7 @@ module com { module sun { module star { module logging {
 
     @since OOo 2.3
  */
-interface XLogHandler
+published interface XLogHandler
 {
     /** allows life time control for the handler
 
@@ -103,7 +95,7 @@ interface XLogHandler
 
 //=============================================================================
 
-}; }; }; }; 
+}; }; }; };
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XLogger.idl b/offapi/com/sun/star/logging/XLogger.idl
index 1e2fe786c..b5ee7c3ed 100644
--- a/offapi/com/sun/star/logging/XLogger.idl
+++ b/offapi/com/sun/star/logging/XLogger.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,15 +28,13 @@
 #ifndef __com_sun_star_logging_XLogger_idl__
 #define __com_sun_star_logging_XLogger_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
-module com { module sun { module star { module logging { 
+module com { module sun { module star { module logging {
 
-interface XLogHandler;
+published interface XLogHandler;
 
 //=============================================================================
 
@@ -53,7 +51,7 @@ interface XLogHandler;
 
     @since OOo 2.3
  */
-interface XLogger
+published interface XLogger
 {
     /** denotes the name of the logger.
     */
@@ -98,7 +96,7 @@ interface XLogger
 
         @param Level
             level to be checked against
-        
+
         @returns
             <TRUE/> if there would be some output for this XLogger for the given level, <FALSE/>
             otherwise. Note that a return value of <FALSE/> could also indicate that the logger
@@ -141,7 +139,7 @@ interface XLogger
 
 //=============================================================================
 
-}; }; }; }; 
+}; }; }; };
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XLoggerPool.idl b/offapi/com/sun/star/logging/XLoggerPool.idl
index 91cb5a813..f4922af97 100644
--- a/offapi/com/sun/star/logging/XLoggerPool.idl
+++ b/offapi/com/sun/star/logging/XLoggerPool.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_logging_XLoggerPool_idl__
 #define __com_sun_star_logging_XLoggerPool_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XSimpleLogRing.idl b/offapi/com/sun/star/logging/XSimpleLogRing.idl
index bc4c8a308..2ee0d48be 100644
--- a/offapi/com/sun/star/logging/XSimpleLogRing.idl
+++ b/offapi/com/sun/star/logging/XSimpleLogRing.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_logging_XSimpleLogRing_idl__
 #define __com_sun_star_logging_XSimpleLogRing_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/makefile.mk b/offapi/com/sun/star/logging/makefile.mk
deleted file mode 100644
index 9a5e82845..000000000
--- a/offapi/com/sun/star/logging/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..
-PRJNAME := offapi
-TARGET := csslogging
-
-PACKAGE := com$/sun$/star$/logging
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    ConsoleHandler.idl\
-    CsvLogFormatter.idl\
-    DocumentIOLogRing.idl\
-    FileHandler.idl\
-    LoggerPool.idl\
-    LogLevel.idl\
-    LogRecord.idl\
-    PlainTextFormatter.idl\
-    SimpleLogRing.idl\
-    XConsoleHandler.idl\
-    XCsvLogFormatter.idl\
-    XLogFormatter.idl\
-    XLogger.idl\
-    XLoggerPool.idl\
-    XLogHandler.idl\
-    XSimpleLogRing.idl
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/mail/MailAttachment.idl b/offapi/com/sun/star/mail/MailAttachment.idl
index 412cdac35..b21581321 100644
--- a/offapi/com/sun/star/mail/MailAttachment.idl
+++ b/offapi/com/sun/star/mail/MailAttachment.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_MailAttachment_idl__
 #define __com_sun_star_mail_MailAttachment_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/MailException.idl b/offapi/com/sun/star/mail/MailException.idl
index 8355699ff..11d7d18ed 100644
--- a/offapi/com/sun/star/mail/MailException.idl
+++ b/offapi/com/sun/star/mail/MailException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_MailException_idl__
 #define __com_sun_star_mail_MailException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/MailMessage.idl b/offapi/com/sun/star/mail/MailMessage.idl
index 658c9cfe1..8b628e486 100644
--- a/offapi/com/sun/star/mail/MailMessage.idl
+++ b/offapi/com/sun/star/mail/MailMessage.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_mail_MailMessage_idl__
 #define __com_sun_star_mail_MailMessage_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailAttachment_idl__
 #include <com/sun/star/mail/MailAttachment.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/MailServer.idl b/offapi/com/sun/star/mail/MailServer.idl
index 7c9497fef..b13f90538 100644
--- a/offapi/com/sun/star/mail/MailServer.idl
+++ b/offapi/com/sun/star/mail/MailServer.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_MailServer_idl__
 #define __com_sun_star_mail_MailServer_idl__
 
-#ifndef __com_sun_star_mail_NoMailTransportProviderException_idl__
 #include <com/sun/star/mail/NoMailTransportProviderException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/MailServiceProvider.idl b/offapi/com/sun/star/mail/MailServiceProvider.idl
index e9e0f1dbb..d93c3e9ad 100644
--- a/offapi/com/sun/star/mail/MailServiceProvider.idl
+++ b/offapi/com/sun/star/mail/MailServiceProvider.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_mail_MailServiceProvider_idl__
 #define __com_sun_star_mail_MailServiceProvider_idl__
 
-#ifndef __com_sun_star_mail_XMailServiceProvider_idl__
 #include <com/sun/star/mail/XMailServiceProvider.idl>
-#endif
-
-#ifndef __com_sun_star_mail_NoMailServiceProviderException_idl__
 #include <com/sun/star/mail/NoMailServiceProviderException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailServiceType_idl__
 #include <com/sun/star/mail/MailServiceType.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/NoMailServiceProviderException.idl b/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
index 1e913e3a0..0d4d23467 100644
--- a/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
+++ b/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_NoMailServiceProviderException_idl__
 #define __com_sun_star_mail_NoMailServiceProviderException_idl__
 
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/NoMailTransportProviderException.idl b/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
index 89341a4c7..2b5ac4f45 100644
--- a/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
+++ b/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_NoMailTransportProviderException_idl__
 #define __com_sun_star_mail_NoMailTransportProviderException_idl__
 
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/SendMailMessageFailedException.idl b/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
index 8eb498ee3..820efba0b 100644
--- a/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
+++ b/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_SendMailMessageFailedException_idl__
 #define __com_sun_star_mail_SendMailMessageFailedException_idl__
 
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/XAuthenticator.idl b/offapi/com/sun/star/mail/XAuthenticator.idl
index f3103d832..eb0fd1b39 100644
--- a/offapi/com/sun/star/mail/XAuthenticator.idl
+++ b/offapi/com/sun/star/mail/XAuthenticator.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_XAuthenticator_idl__
 #define __com_sun_star_mail_XAuthenticator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/XConnectionListener.idl b/offapi/com/sun/star/mail/XConnectionListener.idl
index 025da122d..19ee970a2 100644
--- a/offapi/com/sun/star/mail/XConnectionListener.idl
+++ b/offapi/com/sun/star/mail/XConnectionListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_mail_XConnectionListener_idl__
 #define __com_sun_star_mail_XConnectionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/XMailMessage.idl b/offapi/com/sun/star/mail/XMailMessage.idl
index aaf06d53d..2c285b484 100644
--- a/offapi/com/sun/star/mail/XMailMessage.idl
+++ b/offapi/com/sun/star/mail/XMailMessage.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_mail_XMailMessage_idl__
 #define __com_sun_star_mail_XMailMessage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailAttachment_idl__
 #include <com/sun/star/mail/MailAttachment.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/XMailServer.idl b/offapi/com/sun/star/mail/XMailServer.idl
index 97bd1a2f1..0d8371863 100644
--- a/offapi/com/sun/star/mail/XMailServer.idl
+++ b/offapi/com/sun/star/mail/XMailServer.idl
@@ -28,65 +28,21 @@
 #ifndef __com_sun_star_mail_XMailServer_idl__
 #define __com_sun_star_mail_XMailServer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XAuthenticator_idl__
 #include <com/sun/star/mail/XAuthenticator.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XMailMessage_idl__
 #include <com/sun/star/mail/XMailMessage.idl>
-#endif
-
-#ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
 #include <com/sun/star/auth/AuthenticationFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_AlreadyConnectedException_idl__
 #include <com/sun/star/io/AlreadyConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
 #include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_UnknownHostException_idl__
 #include <com/sun/star/io/UnknownHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NoRouteToHostException_idl__
 #include <com/sun/star/io/NoRouteToHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_ConnectException_idl__
 #include <com/sun/star/io/ConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
 #include <com/sun/star/ucb/InteractiveIOException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_SendMailMessageFailedException_idl__
 #include <com/sun/star/mail/SendMailMessageFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XConnectionListener_idl__
 #include <com/sun/star/mail/XConnectionListener.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/XMailService.idl b/offapi/com/sun/star/mail/XMailService.idl
index 6535ba948..7cd33292b 100644
--- a/offapi/com/sun/star/mail/XMailService.idl
+++ b/offapi/com/sun/star/mail/XMailService.idl
@@ -28,53 +28,18 @@
 #ifndef __com_sun_star_mail_XMailService_idl__
 #define __com_sun_star_mail_XMailService_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XAuthenticator_idl__
 #include <com/sun/star/mail/XAuthenticator.idl>
-#endif
-
-#ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
 #include <com/sun/star/auth/AuthenticationFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_AlreadyConnectedException_idl__
 #include <com/sun/star/io/AlreadyConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
 #include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_UnknownHostException_idl__
 #include <com/sun/star/io/UnknownHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NoRouteToHostException_idl__
 #include <com/sun/star/io/NoRouteToHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_ConnectException_idl__
 #include <com/sun/star/io/ConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XConnectionListener_idl__
 #include <com/sun/star/mail/XConnectionListener.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XCurrentContext_idl__ 
 #include <com/sun/star/uno/XCurrentContext.idl>
-#endif
 
 
 module com { module sun { module star { module mail {
diff --git a/offapi/com/sun/star/mail/XMailServiceProvider.idl b/offapi/com/sun/star/mail/XMailServiceProvider.idl
index bdabc05b1..234bc5f76 100644
--- a/offapi/com/sun/star/mail/XMailServiceProvider.idl
+++ b/offapi/com/sun/star/mail/XMailServiceProvider.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_mail_XMailServiceProvider_idl__
 #define __com_sun_star_mail_XMailServiceProvider_idl__
 
-#ifndef __com_sun_star_mail_XMailService_idl__
 #include <com/sun/star/mail/XMailService.idl>
-#endif
-
-#ifndef __com_sun_star_mail_NoMailServiceProviderException_idl__
 #include <com/sun/star/mail/NoMailServiceProviderException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailServiceType_idl__
 #include <com/sun/star/mail/MailServiceType.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/XSmtpService.idl b/offapi/com/sun/star/mail/XSmtpService.idl
index ef94c4704..3f3ca8c2f 100644
--- a/offapi/com/sun/star/mail/XSmtpService.idl
+++ b/offapi/com/sun/star/mail/XSmtpService.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_mail_XSmtpService_idl__
 #define __com_sun_star_mail_XSmtpService_idl__
 
-#ifndef __com_sun_star_mail_XMailService_idl__
 #include <com/sun/star/mail/XMailService.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XMailMessage_idl__
 #include <com/sun/star/mail/XMailMessage.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
 #include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_ConnectException_idl__
 #include <com/sun/star/io/ConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_SendMailMessageFailedException_idl__
 #include <com/sun/star/mail/SendMailMessageFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/makefile.mk b/offapi/com/sun/star/mail/makefile.mk
deleted file mode 100644
index 4b6854220..000000000
--- a/offapi/com/sun/star/mail/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssmail
-PACKAGE=com$/sun$/star$/mail
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MailException.idl\
-    SendMailMessageFailedException.idl\
-    NoMailServiceProviderException.idl\
-    XMailService.idl\
-    XAuthenticator.idl\
-    XMailMessage.idl\
-    MailMessage.idl\
-    XConnectionListener.idl\
-    MailAttachment.idl\
-    XSmtpService.idl\
-    MailServiceType.idl\
-    XMailServiceProvider.idl\
-    MailServiceProvider.idl
-    
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/makefile.mk b/offapi/com/sun/star/makefile.mk
deleted file mode 100644
index c3daa292c..000000000
--- a/offapi/com/sun/star/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=css
-PACKAGE=com$/sun$/star
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    modules.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/media/Manager.idl b/offapi/com/sun/star/media/Manager.idl
index f97705cd7..569a05430 100644
--- a/offapi/com/sun/star/media/Manager.idl
+++ b/offapi/com/sun/star/media/Manager.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_media_Manager_idl__
 #define __com_sun_star_media_Manager_idl__
 
-#ifndef __com_sun_star_media_XManager_idl__
 #include <com/sun/star/media/XManager.idl>
-#endif
 
 module com {  module sun {  module star {  module media {
 
diff --git a/offapi/com/sun/star/media/XFrameGrabber.idl b/offapi/com/sun/star/media/XFrameGrabber.idl
index 2967c72ac..0dce48d59 100644
--- a/offapi/com/sun/star/media/XFrameGrabber.idl
+++ b/offapi/com/sun/star/media/XFrameGrabber.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_media_XFrameGrabber_idl__
 #define __com_sun_star_media_XFrameGrabber_idl__
 
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 module com {  module sun {  module star {  module media {
 
diff --git a/offapi/com/sun/star/media/XManager.idl b/offapi/com/sun/star/media/XManager.idl
index 61df576b2..eedcf26b9 100644
--- a/offapi/com/sun/star/media/XManager.idl
+++ b/offapi/com/sun/star/media/XManager.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_media_XManager_idl__
 #define __com_sun_star_media_XManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_media_XPlayer_idl__
 #include <com/sun/star/media/XPlayer.idl>
-#endif
 
 module com {  module sun {  module star {  module media {
 
diff --git a/offapi/com/sun/star/media/XPlayer.idl b/offapi/com/sun/star/media/XPlayer.idl
index 81f2bd633..dfd65e766 100644
--- a/offapi/com/sun/star/media/XPlayer.idl
+++ b/offapi/com/sun/star/media/XPlayer.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_media_XPlayer_idl__
 #define __com_sun_star_media_XPlayer_idl__
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_media_XPlayerWindow_idl__
 #include <com/sun/star/media/XPlayerWindow.idl>
-#endif
-#ifndef __com_sun_star_media_XFrameGrabber_idl__
 #include <com/sun/star/media/XFrameGrabber.idl>
-#endif
 
 module com {  module sun {  module star {  module media {
 
diff --git a/offapi/com/sun/star/media/XPlayerWindow.idl b/offapi/com/sun/star/media/XPlayerWindow.idl
index 134c8093a..c6e88c733 100644
--- a/offapi/com/sun/star/media/XPlayerWindow.idl
+++ b/offapi/com/sun/star/media/XPlayerWindow.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_media_XPlayerWindow_idl__
 #define __com_sun_star_media_XPlayerWindow_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_media_ZoomLevel_idl__
 #include <com/sun/star/media/ZoomLevel.idl>
-#endif
 
 module com {  module sun {  module star {  module media {
 
diff --git a/offapi/com/sun/star/media/makefile.mk b/offapi/com/sun/star/media/makefile.mk
deleted file mode 100644
index 4d4ac1df1..000000000
--- a/offapi/com/sun/star/media/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-PRJNAME=offapi
-TARGET=cssmedia
-PACKAGE=com$/sun$/star$/media
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Manager.idl         \
-    XManager.idl        \
-    XFrameGrabber.idl   \
-    XPlayer.idl         \
-    XPlayerWindow.idl   \
-    ZoomLevel.idl       
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/mozilla/MenuMultipleChange.idl b/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
index f5dd8bc35..ffa10bd58 100644
--- a/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
+++ b/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_mozilla_MenuMultipleChange_idl__ 
 #define __com_sun_star_mozilla_MenuMultipleChange_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/MenuProxy.idl b/offapi/com/sun/star/mozilla/MenuProxy.idl
index 1a1ea52e4..33568171b 100644
--- a/offapi/com/sun/star/mozilla/MenuProxy.idl
+++ b/offapi/com/sun/star/mozilla/MenuProxy.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_mozilla_MenuProxy_idl__ 
 #define __com_sun_star_mozilla_MenuProxy_idl__ 
  
-#ifndef __com_sun_star_mozilla_XMenuProxy_idl__ 
 #include <com/sun/star/mozilla/XMenuProxy.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/MenuProxyListener.idl b/offapi/com/sun/star/mozilla/MenuProxyListener.idl
index ce5fcfada..88c31c2f8 100644
--- a/offapi/com/sun/star/mozilla/MenuProxyListener.idl
+++ b/offapi/com/sun/star/mozilla/MenuProxyListener.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_mozilla_MenuProxyListener_idl__ 
 #define __com_sun_star_mozilla_MenuProxyListener_idl__ 
  
-#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__ 
 #include <com/sun/star/mozilla/XMenuProxyListener.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/MenuSingleChange.idl b/offapi/com/sun/star/mozilla/MenuSingleChange.idl
index 88f1e3626..c2e5cd352 100644
--- a/offapi/com/sun/star/mozilla/MenuSingleChange.idl
+++ b/offapi/com/sun/star/mozilla/MenuSingleChange.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_mozilla_MenuSingleChange_idl__ 
 #define __com_sun_star_mozilla_MenuSingleChange_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/MozillaBootstrap.idl b/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
index 782d6d3d4..13d35eff3 100644
--- a/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
+++ b/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_mozilla_MozillaBootstrap_idl__ 
 #define __com_sun_star_mozilla_MozillaBootstrap_idl__ 
  
-#ifndef __com_sun_star_mozilla_XMozillaBootstrap_idl__ 
 #include <com/sun/star/mozilla/XMozillaBootstrap.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/XCloseSessionListener.idl b/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
index 6e178b2c6..4522d2f07 100644
--- a/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
+++ b/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_mozilla_XCloseSessionListener_idl__ 
 #define __com_sun_star_mozilla_XCloseSessionListener_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/XCodeProxy.idl b/offapi/com/sun/star/mozilla/XCodeProxy.idl
index 5df8d64f7..873844c1e 100644
--- a/offapi/com/sun/star/mozilla/XCodeProxy.idl
+++ b/offapi/com/sun/star/mozilla/XCodeProxy.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdbc_XCodeProxy_idl__ 
 #define __com_sun_star_sdbc_XCodeProxy_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__ 
 #include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif 
  
  module com {  module sun {  module star {  module mozilla { 
  
diff --git a/offapi/com/sun/star/mozilla/XMenuProxy.idl b/offapi/com/sun/star/mozilla/XMenuProxy.idl
index e54bede8e..5fceaa216 100644
--- a/offapi/com/sun/star/mozilla/XMenuProxy.idl
+++ b/offapi/com/sun/star/mozilla/XMenuProxy.idl
@@ -29,13 +29,9 @@
 #ifndef __com_sun_star_mozilla_XMenuProxy_idl__ 
 #define __com_sun_star_mozilla_XMenuProxy_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__ 
 #include <com/sun/star/mozilla/XMenuProxyListener.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/XMenuProxyListener.idl b/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
index dd0c94d34..6c009174e 100644
--- a/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
+++ b/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
@@ -29,17 +29,11 @@
 #ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__ 
 #define __com_sun_star_mozilla_XMenuProxyListener_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_mozilla_MenuMultipleChange_idl__ 
 #include <com/sun/star/mozilla/MenuMultipleChange.idl> 
-#endif 
  
-#ifndef __com_sun_star_mozilla_MenuSingleChange_idl__ 
 #include <com/sun/star/mozilla/MenuSingleChange.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl b/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
index 09314d048..8ad03ae78 100644
--- a/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
+++ b/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
@@ -27,19 +27,10 @@
 #ifndef __com_sun_star_mozilla_XMozillaBootstrap_idl__ 
 #define __com_sun_star_mozilla_XMozillaBootstrap_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_mozilla_XProfileDiscover_idl__ 
 #include <com/sun/star/mozilla/XProfileDiscover.idl> 
-#endif 
-#ifndef __com_sun_star_mozilla_XProfileManager_idl__ 
 #include <com/sun/star/mozilla/XProfileManager.idl> 
-#endif 
-#ifndef __com_sun_star_mozilla_XProxyRunner_idl__ 
 #include <com/sun/star/mozilla/XProxyRunner.idl> 
-#endif 
  
  
  module com {  module sun {  module star {  module mozilla { 
diff --git a/offapi/com/sun/star/mozilla/XPluginInstance.idl b/offapi/com/sun/star/mozilla/XPluginInstance.idl
index e37208f31..3b3adf299 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstance.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstance.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_mozilla_XPluginInstance_idl__
 #define __com_sun_star_mozilla_XPluginInstance_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl b/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
index da222bc14..5f7a3a0af 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_mozilla_XPluginInstanceNotifySink_idl__ 
 #define __com_sun_star_mozilla_XPluginInstanceNotifySink_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl b/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
index a8649ccd7..f68f84238 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_mozilla_XPluginInstancePeer_idl__ 
 #define __com_sun_star_mozilla_XPluginInstancePeer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
 #include <com/sun/star/io/XActiveDataSource.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_XInputStream_idl__ 
 #include <com/sun/star/io/XInputStream.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__ 
 #include <com/sun/star/lang/XMultiServiceFactory.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl b/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
index bca7c006a..2801c9f62 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_mozilla_XPluginInstanceSyncPeer_idl__ 
 #define __com_sun_star_mozilla_XPluginInstanceSyncPeer_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_mozilla_XPluginInstance_idl__ 
 #include <com/sun/star/mozilla/XPluginInstance.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl b/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
index db3c7f0b9..5901ccc97 100644
--- a/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_mozilla_XPluginWindowPeer_idl__ 
 #define __com_sun_star_mozilla_XPluginWindowPeer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/mozilla/XProfileDiscover.idl b/offapi/com/sun/star/mozilla/XProfileDiscover.idl
index cbcd4c92c..ffb64993d 100644
--- a/offapi/com/sun/star/mozilla/XProfileDiscover.idl
+++ b/offapi/com/sun/star/mozilla/XProfileDiscover.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_mozilla_XProfileDiscover_idl__ 
 #define __com_sun_star_mozilla_XProfileDiscover_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__ 
 #include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif 
  
  
  module com {  module sun {  module star {  module mozilla { 
diff --git a/offapi/com/sun/star/mozilla/XProfileManager.idl b/offapi/com/sun/star/mozilla/XProfileManager.idl
index 10d84e936..6f4d2067f 100644
--- a/offapi/com/sun/star/mozilla/XProfileManager.idl
+++ b/offapi/com/sun/star/mozilla/XProfileManager.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_mozilla_XProfileManager_idl__ 
 #define __com_sun_star_mozilla_XProfileManager_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__ 
 #include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif 
  
  
  
diff --git a/offapi/com/sun/star/mozilla/XProxyRunner.idl b/offapi/com/sun/star/mozilla/XProxyRunner.idl
index 69c088664..1b375aa0a 100644
--- a/offapi/com/sun/star/mozilla/XProxyRunner.idl
+++ b/offapi/com/sun/star/mozilla/XProxyRunner.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_mozilla_XProxyRunner_idl__ 
 #define __com_sun_star_mozilla_XProxyRunner_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_mozilla_XCodeProxy_idl__ 
 #include <com/sun/star/mozilla/XCodeProxy.idl> 
-#endif 
  
  
  module com {  module sun {  module star {  module mozilla { 
diff --git a/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl b/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
index 10cfa1ac9..8e5147126 100644
--- a/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
+++ b/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mozilla_XRemoteServiceManagerProvider_idl__
 #define __com_sun_star_mozilla_XRemoteServiceManagerProvider_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/makefile.mk b/offapi/com/sun/star/mozilla/makefile.mk
deleted file mode 100644
index 38a3f009f..000000000
--- a/offapi/com/sun/star/mozilla/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssmozilla
-PACKAGE=com$/sun$/star$/mozilla
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MenuMultipleChange.idl \
-    MenuSingleChange.idl \
-    MenuProxy.idl \
-    MenuProxyListener.idl \
-    XMenuProxy.idl \
-    XMenuProxyListener.idl \
-    XPluginInstance.idl \
-    XPluginInstanceNotifySink.idl \
-    XPluginInstancePeer.idl \
-    XPluginInstanceSyncPeer.idl \
-    XPluginWindowPeer.idl \
-    XCloseSessionListener.idl \
-    XRemoteServiceManagerProvider.idl	\
-    MozillaBootstrap.idl \
-    MozillaProductType.idl	\
-    XMozillaBootstrap.idl \
-    XProfileDiscover.idl	\
-    XProfileManager.idl	\
-    XProxyRunner.idl	\
-    XCodeProxy.idl
-
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/office/XAnnotation.idl b/offapi/com/sun/star/office/XAnnotation.idl
index a5d669676..54b0d16af 100644
--- a/offapi/com/sun/star/office/XAnnotation.idl
+++ b/offapi/com/sun/star/office/XAnnotation.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_office_XAnnotation_idl__
 #define __com_sun_star_office_XAnnotation_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
-
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
 #include <com/sun/star/geometry/RealSize2D.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/office/XAnnotationAccess.idl b/offapi/com/sun/star/office/XAnnotationAccess.idl
index 60b770eed..a71a1f4db 100644
--- a/offapi/com/sun/star/office/XAnnotationAccess.idl
+++ b/offapi/com/sun/star/office/XAnnotationAccess.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_office_XAnnotationAccess_idl__
 #define __com_sun_star_office_XAnnotationAccess_idl__
 
-#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__ 
 #include <com/sun/star/office/XAnnotationEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/office/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_office_XAnnotation_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
 #include <com/sun/star/office/XAnnotation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/office/XAnnotationEnumeration.idl b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
index 05ad13425..7e16345aa 100644
--- a/offapi/com/sun/star/office/XAnnotationEnumeration.idl
+++ b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_office_XAnnotationEnumeration_idl__ 
 #define __com_sun_star_office_XAnnotationEnumeration_idl__ 
  
-#ifndef __com_sun_star_office_XAnnotation_idl__ 
 #include <com/sun/star/office/XAnnotation.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
   
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/office/makefile.mk b/offapi/com/sun/star/office/makefile.mk
deleted file mode 100644
index e24a411dd..000000000
--- a/offapi/com/sun/star/office/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-PRJNAME=offapi
-TARGET=cssoffice
-PACKAGE=com$/sun$/star$/office
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XAnnotation.idl\
-    XAnnotationEnumeration.idl\
-    XAnnotationAccess.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl b/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
index 26f6a4146..e584a9996 100644
--- a/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
+++ b/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__ 
 #define __com_sun_star_packages_EncryptionNotAllowedException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/packages/NoEncryptionException.idl b/offapi/com/sun/star/packages/NoEncryptionException.idl
index 711ebf76a..f5b82a73a 100644
--- a/offapi/com/sun/star/packages/NoEncryptionException.idl
+++ b/offapi/com/sun/star/packages/NoEncryptionException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_packages_NoEncryptionException_idl__ 
 #define __com_sun_star_packages_NoEncryptionException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/packages/NoRawFormatException.idl b/offapi/com/sun/star/packages/NoRawFormatException.idl
index 7795c2748..24ea68a85 100644
--- a/offapi/com/sun/star/packages/NoRawFormatException.idl
+++ b/offapi/com/sun/star/packages/NoRawFormatException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_packages_NoRawFormatException_idl__ 
 #define __com_sun_star_packages_NoRawFormatException_idl__ 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/packages/Package.idl b/offapi/com/sun/star/packages/Package.idl
index 29b2d40b7..968629d2e 100644
--- a/offapi/com/sun/star/packages/Package.idl
+++ b/offapi/com/sun/star/packages/Package.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_packages_Package_idl__ 
 #define __com_sun_star_packages_Package_idl__ 
  
-#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__ 
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_util_XChangesBatch_idl__ 
 #include <com/sun/star/util/XChangesBatch.idl>
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/packages/PackageFolder.idl b/offapi/com/sun/star/packages/PackageFolder.idl
index cf4d24be4..30b13e939 100644
--- a/offapi/com/sun/star/packages/PackageFolder.idl
+++ b/offapi/com/sun/star/packages/PackageFolder.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_packages_PackageFolder_idl__ 
 #define __com_sun_star_packages_PackageFolder_idl__ 
  
-#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__ 
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 //============================================================================= 
  
 module com {  module sun {  module star {   module packages {  
diff --git a/offapi/com/sun/star/packages/PackageFolderEnumeration.idl b/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
index b8f9a31ed..613286966 100644
--- a/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
+++ b/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
@@ -28,9 +28,7 @@
 #define __com_sun_star_packages_PackageFolderEnumeration_idl__ 
  
 
-#ifndef __com_sun_star_container_XEnumeration_idl__ 
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/packages/PackageStream.idl b/offapi/com/sun/star/packages/PackageStream.idl
index 79aeea84d..aa02c6576 100644
--- a/offapi/com/sun/star/packages/PackageStream.idl
+++ b/offapi/com/sun/star/packages/PackageStream.idl
@@ -28,21 +28,10 @@
 #define __com_sun_star_packages_PackageStream_idl__ 
  
 
-#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__ 
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__ 
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/packages/WrongPasswordException.idl b/offapi/com/sun/star/packages/WrongPasswordException.idl
index c37744c9d..a41ff3d08 100644
--- a/offapi/com/sun/star/packages/WrongPasswordException.idl
+++ b/offapi/com/sun/star/packages/WrongPasswordException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_packages_WrongPasswordException_idl__ 
 #define __com_sun_star_packages_WrongPasswordException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl b/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
index b0309935c..7c8ba78a2 100644
--- a/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
+++ b/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
@@ -27,33 +27,16 @@
 #ifndef __com_sun_star_packages_XDataSinkEncrSupport_idl__ 
 #define __com_sun_star_packages_XDataSinkEncrSupport_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_XInputStream_idl__ 
 #include <com/sun/star/io/XInputStream.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__ 
 #include <com/sun/star/packages/WrongPasswordException.idl> 
-#endif 
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__ 
 #include <com/sun/star/packages/NoEncryptionException.idl> 
-#endif 
  
-#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__ 
 #include <com/sun/star/packages/EncryptionNotAllowedException.idl> 
-#endif 
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__ 
 #include <com/sun/star/packages/NoRawFormatException.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/packages/makefile.mk b/offapi/com/sun/star/packages/makefile.mk
deleted file mode 100644
index 3707e0983..000000000
--- a/offapi/com/sun/star/packages/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csspackages
-PACKAGE=com$/sun$/star$/packages
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        Package.idl\
-        PackageFolder.idl\
-        PackageFolderEnumeration.idl\
-        PackageStream.idl\
-        EncryptionNotAllowedException.idl\
-        NoEncryptionException.idl\
-        WrongPasswordException.idl\
-        NoRawFormatException.idl\
-        XDataSinkEncrSupport.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/packages/manifest/XManifestReader.idl b/offapi/com/sun/star/packages/manifest/XManifestReader.idl
index 0ad44ab37..8bafdfced 100644
--- a/offapi/com/sun/star/packages/manifest/XManifestReader.idl
+++ b/offapi/com/sun/star/packages/manifest/XManifestReader.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_packages_manifest_XManifestReader_idl__ 
 #define __com_sun_star_packages_manifest_XManifestReader_idl__ 
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/packages/manifest/XManifestWriter.idl b/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
index 729033f8c..131ba665a 100644
--- a/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
+++ b/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_packages_manifest_XManifestWriter_idl__ 
 #define __com_sun_star_packages_manifest_XManifestWriter_idl__ 
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/packages/manifest/makefile.mk b/offapi/com/sun/star/packages/manifest/makefile.mk
deleted file mode 100644
index 9be92686a..000000000
--- a/offapi/com/sun/star/packages/manifest/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssmanifest
-PACKAGE=com$/sun$/star$/packages$/manifest
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        XManifestReader.idl\
-        XManifestWriter.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
index e8e4cc690..0de3100ff 100644
--- a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
+++ b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_packages_zip_XZipFileAccess_idl__
 #define __com_sun_star_packages_zip_XZipFileAccess_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
- 
-#ifndef __com_sun_star_packages_zip_ZipEntry_idl__ 
 #include <com/sun/star/packages/zip/ZipEntry.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl_
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
-
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/packages/zip/ZipEntry.idl b/offapi/com/sun/star/packages/zip/ZipEntry.idl
index 3691ec79c..367d30fcf 100644
--- a/offapi/com/sun/star/packages/zip/ZipEntry.idl
+++ b/offapi/com/sun/star/packages/zip/ZipEntry.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_packages_zip_ZipEntry_idl__
 #define __com_sun_star_packages_zip_ZipEntry_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_InputSource_idl__ 
 #include <com/sun/star/xml/sax/InputSource.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/packages/zip/ZipException.idl b/offapi/com/sun/star/packages/zip/ZipException.idl
index daaad4496..c6e5ef884 100644
--- a/offapi/com/sun/star/packages/zip/ZipException.idl
+++ b/offapi/com/sun/star/packages/zip/ZipException.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_packages_zip_ZipException_idl__
 #define __com_sun_star_packages_zip_ZipException_idl__
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_XInputStream_idl__ 
 #include <com/sun/star/io/XInputStream.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/packages/zip/ZipFileAccess.idl b/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
index 3b4e55f94..df7b5b6de 100644
--- a/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
+++ b/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_packages_zip_ZipFileAccess_idl__
 #define __com_sun_star_packages_zip_ZipFileAccess_idl__ 
  
-#ifndef __com_sun_star_packages_zip_XZipFileAccess_idl__ 
 #include <com/sun/star/packages/zip/XZipFileAccess.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
-
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/packages/zip/ZipIOException.idl b/offapi/com/sun/star/packages/zip/ZipIOException.idl
index 2ffb692c1..fccf5bd2c 100644
--- a/offapi/com/sun/star/packages/zip/ZipIOException.idl
+++ b/offapi/com/sun/star/packages/zip/ZipIOException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_packages_zip_ZipIOException_idl__
 #define __com_sun_star_packages_zip_ZipIOException_idl__
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/packages/zip/makefile.mk b/offapi/com/sun/star/packages/zip/makefile.mk
deleted file mode 100644
index b361ebeac..000000000
--- a/offapi/com/sun/star/packages/zip/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csszippackage
-PACKAGE=com$/sun$/star$/packages
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        ZipEntry.idl\
-        ZipException.idl \
-        ZipIOException.idl \
-        ZipConstants.idl\
-        ZipFileAccess.idl\
-        XZipFileAccess.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/plugin/PluginException.idl b/offapi/com/sun/star/plugin/PluginException.idl
index fefe79cfd..2d05d6314 100644
--- a/offapi/com/sun/star/plugin/PluginException.idl
+++ b/offapi/com/sun/star/plugin/PluginException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_plugin_PluginException_idl__ 
 #define __com_sun_star_plugin_PluginException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/plugin/PluginManager.idl b/offapi/com/sun/star/plugin/PluginManager.idl
index 5f6ef5c69..3b7c25fed 100644
--- a/offapi/com/sun/star/plugin/PluginManager.idl
+++ b/offapi/com/sun/star/plugin/PluginManager.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_plugin_PluginManager_idl__ 
 #define __com_sun_star_plugin_PluginManager_idl__ 
  
-#ifndef __com_sun_star_plugin_XPluginManager_idl__ 
 #include <com/sun/star/plugin/XPluginManager.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/plugin/XPlugin.idl b/offapi/com/sun/star/plugin/XPlugin.idl
index 7d823f779..d13be0e9c 100644
--- a/offapi/com/sun/star/plugin/XPlugin.idl
+++ b/offapi/com/sun/star/plugin/XPlugin.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_plugin_XPlugin_idl__ 
 #define __com_sun_star_plugin_XPlugin_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
 #include <com/sun/star/io/XActiveDataSource.idl> 
-#endif 
  
-#ifndef __com_sun_star_plugin_PluginException_idl__ 
 #include <com/sun/star/plugin/PluginException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/plugin/XPluginContext.idl b/offapi/com/sun/star/plugin/XPluginContext.idl
index 221d15758..457fd628b 100644
--- a/offapi/com/sun/star/plugin/XPluginContext.idl
+++ b/offapi/com/sun/star/plugin/XPluginContext.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_plugin_XPluginContext_idl__ 
 #define __com_sun_star_plugin_XPluginContext_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_plugin_XPlugin_idl__ 
 #include <com/sun/star/plugin/XPlugin.idl> 
-#endif 
  
-#ifndef __com_sun_star_plugin_PluginVariable_idl__ 
 #include <com/sun/star/plugin/PluginVariable.idl> 
-#endif 
  
-#ifndef __com_sun_star_plugin_PluginException_idl__ 
 #include <com/sun/star/plugin/PluginException.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
 #include <com/sun/star/io/XActiveDataSource.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/plugin/XPluginManager.idl b/offapi/com/sun/star/plugin/XPluginManager.idl
index 62530b00e..73137269c 100644
--- a/offapi/com/sun/star/plugin/XPluginManager.idl
+++ b/offapi/com/sun/star/plugin/XPluginManager.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_plugin_XPluginManager_idl__ 
 #define __com_sun_star_plugin_XPluginManager_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_plugin_XPluginContext_idl__ 
 #include <com/sun/star/plugin/XPluginContext.idl> 
-#endif 
  
-#ifndef __com_sun_star_plugin_PluginDescription_idl__ 
 #include <com/sun/star/plugin/PluginDescription.idl> 
-#endif 
  
-#ifndef __com_sun_star_plugin_XPlugin_idl__ 
 #include <com/sun/star/plugin/XPlugin.idl> 
-#endif 
  
-#ifndef __com_sun_star_plugin_PluginException_idl__ 
 #include <com/sun/star/plugin/PluginException.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XToolkit_idl__ 
 #include <com/sun/star/awt/XToolkit.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
 #include <com/sun/star/awt/XWindowPeer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/plugin/makefile.mk b/offapi/com/sun/star/plugin/makefile.mk
deleted file mode 100644
index a0b4615f0..000000000
--- a/offapi/com/sun/star/plugin/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssplugin
-PACKAGE=com$/sun$/star$/plugin
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    PluginDescription.idl\
-    PluginException.idl\
-    PluginManager.idl\
-    PluginMode.idl\
-    PluginVariable.idl\
-    XPlugin.idl\
-    XPluginContext.idl\
-    XPluginManager.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/presentation/ChartShape.idl b/offapi/com/sun/star/presentation/ChartShape.idl
index ea85211e8..326801b1f 100644
--- a/offapi/com/sun/star/presentation/ChartShape.idl
+++ b/offapi/com/sun/star/presentation/ChartShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_ChartShape_idl__ 
 #define __com_sun_star_presentation_ChartShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_OLE2Shape_idl__ 
 #include <com/sun/star/drawing/OLE2Shape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/CustomPresentation.idl b/offapi/com/sun/star/presentation/CustomPresentation.idl
index 9194b88b8..e04d728bc 100644
--- a/offapi/com/sun/star/presentation/CustomPresentation.idl
+++ b/offapi/com/sun/star/presentation/CustomPresentation.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_CustomPresentation_idl__ 
 #define __com_sun_star_presentation_CustomPresentation_idl__ 
  
-#ifndef __com_sun_star_container_XIndexContainer_idl__ 
 #include <com/sun/star/container/XIndexContainer.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/CustomPresentationAccess.idl b/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
index 5c6c05ea6..15441eaa4 100644
--- a/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
+++ b/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_CustomPresentationAccess_idl__ 
 #define __com_sun_star_presentation_CustomPresentationAccess_idl__ 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__ 
 #include <com/sun/star/lang/XSingleServiceFactory.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/presentation/DateTimeShape.idl b/offapi/com/sun/star/presentation/DateTimeShape.idl
index 1aa691950..8f305b6e6 100644
--- a/offapi/com/sun/star/presentation/DateTimeShape.idl
+++ b/offapi/com/sun/star/presentation/DateTimeShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_DateTimeShape_idl__ 
 #define __com_sun_star_presentation_DateTimeShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextShape_idl__ 
 #include <com/sun/star/drawing/TextShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/DocumentSettings.idl b/offapi/com/sun/star/presentation/DocumentSettings.idl
index 406265839..d224045e7 100644
--- a/offapi/com/sun/star/presentation/DocumentSettings.idl
+++ b/offapi/com/sun/star/presentation/DocumentSettings.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_presentation_DocumentSettings_idl__
 #define __com_sun_star_presentation_DocumentSettings_idl__
 
-#ifndef __com_sun_star_document_HeaderFooterSettings_idl__
 #include <com/sun/star/document/HeaderFooterSettings.idl>
-#endif
-
-#ifndef __com_sun_star_document_Settings_idl__
 #include <com/sun/star/document/Settings.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/presentation/DrawPage.idl b/offapi/com/sun/star/presentation/DrawPage.idl
index 5fad7d787..9ee209d3a 100644
--- a/offapi/com/sun/star/presentation/DrawPage.idl
+++ b/offapi/com/sun/star/presentation/DrawPage.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_presentation_DrawPage_idl__ 
 #define __com_sun_star_presentation_DrawPage_idl__ 
  
-#ifndef __com_sun_star_drawing_DrawPage_idl__ 
 #include <com/sun/star/drawing/DrawPage.idl> 
-#endif 
  
-#ifndef __com_sun_star_document_LinkTarget_idl__ 
 #include <com/sun/star/document/LinkTarget.idl> 
-#endif 
  
-#ifndef __com_sun_star_presentation_FadeEffect_idl__ 
 #include <com/sun/star/presentation/FadeEffect.idl> 
-#endif 
  
-#ifndef __com_sun_star_presentation_AnimationSpeed_idl__ 
 #include <com/sun/star/presentation/AnimationSpeed.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/FooterShape.idl b/offapi/com/sun/star/presentation/FooterShape.idl
index 94d55b01d..e51f4309d 100644
--- a/offapi/com/sun/star/presentation/FooterShape.idl
+++ b/offapi/com/sun/star/presentation/FooterShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_FooterShape_idl__ 
 #define __com_sun_star_presentation_FooterShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextShape_idl__ 
 #include <com/sun/star/drawing/TextShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/GraphicObjectShape.idl b/offapi/com/sun/star/presentation/GraphicObjectShape.idl
index 7337f6e44..97c7fa7e9 100644
--- a/offapi/com/sun/star/presentation/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/presentation/GraphicObjectShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_GraphicObjectShape_idl__ 
 #define __com_sun_star_presentation_GraphicObjectShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_GraphicObjectShape_idl__ 
 #include <com/sun/star/drawing/GraphicObjectShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/HandoutShape.idl b/offapi/com/sun/star/presentation/HandoutShape.idl
index 75e94b2bb..9d1a201fb 100644
--- a/offapi/com/sun/star/presentation/HandoutShape.idl
+++ b/offapi/com/sun/star/presentation/HandoutShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_HandoutShape_idl__ 
 #define __com_sun_star_presentation_HandoutShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_PageShape_idl__ 
 #include <com/sun/star/drawing/PageShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/HandoutView.idl b/offapi/com/sun/star/presentation/HandoutView.idl
index 398cffdbe..13b018233 100644
--- a/offapi/com/sun/star/presentation/HandoutView.idl
+++ b/offapi/com/sun/star/presentation/HandoutView.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_HandoutView_idl__ 
 #define __com_sun_star_presentation_HandoutView_idl__ 
  
-#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__ 
 #include <com/sun/star/drawing/DrawingDocumentDrawView.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/presentation/HeaderShape.idl b/offapi/com/sun/star/presentation/HeaderShape.idl
index f0b3f48df..1036b7d09 100644
--- a/offapi/com/sun/star/presentation/HeaderShape.idl
+++ b/offapi/com/sun/star/presentation/HeaderShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_HeaderShape_idl__ 
 #define __com_sun_star_presentation_HeaderShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextShape_idl__ 
 #include <com/sun/star/drawing/TextShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/NotesShape.idl b/offapi/com/sun/star/presentation/NotesShape.idl
index babf6b34f..f6743a405 100644
--- a/offapi/com/sun/star/presentation/NotesShape.idl
+++ b/offapi/com/sun/star/presentation/NotesShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_NotesShape_idl__ 
 #define __com_sun_star_presentation_NotesShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextShape_idl__ 
 #include <com/sun/star/drawing/TextShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/NotesView.idl b/offapi/com/sun/star/presentation/NotesView.idl
index 4ae52ea96..6fd504878 100644
--- a/offapi/com/sun/star/presentation/NotesView.idl
+++ b/offapi/com/sun/star/presentation/NotesView.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_NotesView_idl__ 
 #define __com_sun_star_presentation_NotesView_idl__ 
  
-#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__ 
 #include <com/sun/star/drawing/DrawingDocumentDrawView.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/presentation/OLE2Shape.idl b/offapi/com/sun/star/presentation/OLE2Shape.idl
index 22bd07b39..5d07b1e01 100644
--- a/offapi/com/sun/star/presentation/OLE2Shape.idl
+++ b/offapi/com/sun/star/presentation/OLE2Shape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_OLE2Shape_idl__ 
 #define __com_sun_star_presentation_OLE2Shape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_OLE2Shape_idl__ 
 #include <com/sun/star/drawing/OLE2Shape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/OutlineView.idl b/offapi/com/sun/star/presentation/OutlineView.idl
index 6172d2709..a68141990 100644
--- a/offapi/com/sun/star/presentation/OutlineView.idl
+++ b/offapi/com/sun/star/presentation/OutlineView.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_presentation_OutlineView_idl__ 
 #define __com_sun_star_presentation_OutlineView_idl__ 
  
-#ifndef __com_sun_star_drawing_XDrawView_idl__ 
 #include <com/sun/star/drawing/XDrawView.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_frame_Controller_idl__ 
 #include <com/sun/star/frame/Controller.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
 #include <com/sun/star/lang/XServiceInfo.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/presentation/OutlinerShape.idl b/offapi/com/sun/star/presentation/OutlinerShape.idl
index 46fe8e665..e97591b34 100644
--- a/offapi/com/sun/star/presentation/OutlinerShape.idl
+++ b/offapi/com/sun/star/presentation/OutlinerShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_OutlinerShape_idl__ 
 #define __com_sun_star_presentation_OutlinerShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextShape_idl__ 
 #include <com/sun/star/drawing/TextShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/PageShape.idl b/offapi/com/sun/star/presentation/PageShape.idl
index 24eee43c0..616b74f11 100644
--- a/offapi/com/sun/star/presentation/PageShape.idl
+++ b/offapi/com/sun/star/presentation/PageShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_PageShape_idl__ 
 #define __com_sun_star_presentation_PageShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_PageShape_idl__ 
 #include <com/sun/star/drawing/PageShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/ParagraphTarget.idl b/offapi/com/sun/star/presentation/ParagraphTarget.idl
index e90c730ae..9c9ced2ac 100644
--- a/offapi/com/sun/star/presentation/ParagraphTarget.idl
+++ b/offapi/com/sun/star/presentation/ParagraphTarget.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_ParagraphTarget_idl__ 
 #define __com_sun_star_presentation_ParagraphTarget_idl__ 
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/presentation/Presentation.idl b/offapi/com/sun/star/presentation/Presentation.idl
index 106fabb66..896e701f0 100644
--- a/offapi/com/sun/star/presentation/Presentation.idl
+++ b/offapi/com/sun/star/presentation/Presentation.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_Presentation_idl__ 
 #define __com_sun_star_presentation_Presentation_idl__ 
  
-#ifndef __com_sun_star_presentation_XPresentation_idl__ 
 #include <com/sun/star/presentation/XPresentation.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/Presentation2.idl b/offapi/com/sun/star/presentation/Presentation2.idl
index 0a1c1c22a..19bd60776 100644
--- a/offapi/com/sun/star/presentation/Presentation2.idl
+++ b/offapi/com/sun/star/presentation/Presentation2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_presentation_Presentation2_idl__ 
 #define __com_sun_star_presentation_Presentation2_idl__ 
 
-#ifndef __com_sun_star_presentation_Presentation_idl__ 
 #include <com/sun/star/presentation/Presentation.idl> 
-#endif 
-
-#ifndef __com_sun_star_presentation_XPresentation2_idl__ 
 #include <com/sun/star/presentation/XPresentation2.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/presentation/PresentationDocument.idl b/offapi/com/sun/star/presentation/PresentationDocument.idl
index d9c80a9c3..803b06325 100644
--- a/offapi/com/sun/star/presentation/PresentationDocument.idl
+++ b/offapi/com/sun/star/presentation/PresentationDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_presentation_PresentationDocument_idl__
 #define __com_sun_star_presentation_PresentationDocument_idl__
 
-#ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
 #include <com/sun/star/drawing/GenericDrawingDocument.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XPresentationSupplier_idl__
 #include <com/sun/star/presentation/XPresentationSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XCustomPresentationSupplier_idl__
 #include <com/sun/star/presentation/XCustomPresentationSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
 #include <com/sun/star/document/XLinkTargetSupplier.idl>
-#endif
 
 
 //=============================================================================
@@ -52,7 +41,7 @@
 
 /** This is the service provided by a presentation document.
  */
-service PresentationDocument
+published service PresentationDocument
 {
     /** This is a basic service for a drawing document.
 
diff --git a/offapi/com/sun/star/presentation/PresentationView.idl b/offapi/com/sun/star/presentation/PresentationView.idl
index 201ed44d8..8e5103a0c 100644
--- a/offapi/com/sun/star/presentation/PresentationView.idl
+++ b/offapi/com/sun/star/presentation/PresentationView.idl
@@ -27,29 +27,15 @@
 #ifndef __com_sun_star_presentation_PresentationView_idl__ 
 #define __com_sun_star_presentation_PresentationView_idl__ 
  
-#ifndef __com_sun_star_drawing_XDrawView_idl__ 
 #include <com/sun/star/drawing/XDrawView.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_frame_Controller_idl__ 
 #include <com/sun/star/frame/Controller.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
 #include <com/sun/star/lang/XServiceInfo.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/PreviewView.idl b/offapi/com/sun/star/presentation/PreviewView.idl
index 6d0e07ef9..a5a1dfc06 100644
--- a/offapi/com/sun/star/presentation/PreviewView.idl
+++ b/offapi/com/sun/star/presentation/PreviewView.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_presentation_PreviewView_idl__ 
 #define __com_sun_star_presentation_PreviewView_idl__ 
  
-#ifndef __com_sun_star_drawing_XDrawView_idl__ 
 #include <com/sun/star/drawing/XDrawView.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_frame_Controller_idl__ 
 #include <com/sun/star/frame/Controller.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
 #include <com/sun/star/lang/XServiceInfo.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/presentation/Shape.idl b/offapi/com/sun/star/presentation/Shape.idl
index fd4fe03c6..75bac480f 100644
--- a/offapi/com/sun/star/presentation/Shape.idl
+++ b/offapi/com/sun/star/presentation/Shape.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_presentation_Shape_idl__ 
 #define __com_sun_star_presentation_Shape_idl__ 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_AnimationEffect_idl__ 
 #include <com/sun/star/presentation/AnimationEffect.idl> 
-#endif 
  
-#ifndef __com_sun_star_presentation_ClickAction_idl__ 
 #include <com/sun/star/presentation/ClickAction.idl> 
-#endif 
  
-#ifndef __com_sun_star_presentation_AnimationSpeed_idl__ 
 #include <com/sun/star/presentation/AnimationSpeed.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/SlideNumberShape.idl b/offapi/com/sun/star/presentation/SlideNumberShape.idl
index f611840e3..c6177f93e 100644
--- a/offapi/com/sun/star/presentation/SlideNumberShape.idl
+++ b/offapi/com/sun/star/presentation/SlideNumberShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_SlideNumberShape_idl__ 
 #define __com_sun_star_presentation_SlideNumberShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextShape_idl__ 
 #include <com/sun/star/drawing/TextShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp b/offapi/com/sun/star/presentation/SlideShow.idl
index 59a4fb203..6e026dab0 100644
--- a/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp
+++ b/offapi/com/sun/star/presentation/SlideShow.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,8 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef _com_sun_star_presentation_SlideShow_idl
+#define _com_sun_star_presentation_SlideShow_idl
+
+#include <com/sun/star/presentation/XSlideShow.idl>
+
+module com {  module sun {  module star {  module presentation {
+
+service SlideShow : XSlideShow;
+
+}; }; }; };
 
-#include "macros.h"
+#endif
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindVolumeMountPointClose, (HANDLE hFindVolumeMountPoint ) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/SlidesView.idl b/offapi/com/sun/star/presentation/SlidesView.idl
index 908605d7c..c145020b7 100644
--- a/offapi/com/sun/star/presentation/SlidesView.idl
+++ b/offapi/com/sun/star/presentation/SlidesView.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_presentation_SlidesView_idl__ 
 #define __com_sun_star_presentation_SlidesView_idl__ 
  
-#ifndef __com_sun_star_drawing_XDrawView_idl__ 
 #include <com/sun/star/drawing/XDrawView.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_frame_Controller_idl__ 
 #include <com/sun/star/frame/Controller.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
 #include <com/sun/star/lang/XServiceInfo.idl> 
-#endif 
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/presentation/SubtitleShape.idl b/offapi/com/sun/star/presentation/SubtitleShape.idl
index ba5dc12d5..3ac1969d9 100644
--- a/offapi/com/sun/star/presentation/SubtitleShape.idl
+++ b/offapi/com/sun/star/presentation/SubtitleShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_SubtitleShape_idl__ 
 #define __com_sun_star_presentation_SubtitleShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextShape_idl__ 
 #include <com/sun/star/drawing/TextShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/TitleTextShape.idl b/offapi/com/sun/star/presentation/TitleTextShape.idl
index b9abd5f82..b0c73acb3 100644
--- a/offapi/com/sun/star/presentation/TitleTextShape.idl
+++ b/offapi/com/sun/star/presentation/TitleTextShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_TitleTextShape_idl__ 
 #define __com_sun_star_presentation_TitleTextShape_idl__ 
  
-#ifndef __com_sun_star_presentation_Shape_idl__ 
 #include <com/sun/star/presentation/Shape.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_TextShape_idl__ 
 #include <com/sun/star/drawing/TextShape.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp b/offapi/com/sun/star/presentation/TransitionFactory.idl
index ec4d868f6..28b19466c 100644
--- a/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp
+++ b/offapi/com/sun/star/presentation/TransitionFactory.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,8 +24,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_presentation_TransitionFactory_idl__
+#define __com_sun_star_presentation_TransitionFactory_idl__
+
+#include <com/sun/star/presentation/XTransitionFactory.idl>
+
+
+module com {  module sun {  module star { module presentation {
+
+service TransitionFactory : XTransitionFactory;
+
+}; }; }; };
 
-#include "macros.h"
+#endif
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl b/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
index 51bd353d0..ddf410e21 100644
--- a/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
+++ b/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_XCustomPresentationSupplier_idl__ 
 #define __com_sun_star_presentation_XCustomPresentationSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl b/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
index 7ece8b1b4..7ea747e42 100644
--- a/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
+++ b/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_XHandoutMasterSupplier_idl__ 
 #define __com_sun_star_presentation_XHandoutMasterSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/XPresentation.idl b/offapi/com/sun/star/presentation/XPresentation.idl
index 2b1ee78d3..d213c6420 100644
--- a/offapi/com/sun/star/presentation/XPresentation.idl
+++ b/offapi/com/sun/star/presentation/XPresentation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_XPresentation_idl__ 
 #define __com_sun_star_presentation_XPresentation_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/XPresentation2.idl b/offapi/com/sun/star/presentation/XPresentation2.idl
index 95f7c12c8..bbe3de4be 100644
--- a/offapi/com/sun/star/presentation/XPresentation2.idl
+++ b/offapi/com/sun/star/presentation/XPresentation2.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_presentation_XPresentation2_idl__ 
 #define __com_sun_star_presentation_XPresentation2_idl__ 
 
-#ifndef __com_sun_star_presentation_XPresentation_idl__
 #include <com/sun/star/presentation/XPresentation.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
-
-#ifndef __com_sun_star_presentation_XSlideShowListener_idl__ 
 #include <com/sun/star/presentation/XSlideShowListener.idl> 
-#endif 
-
-#ifndef __com_sun_star_presentation_XSlideShowController_idl__ 
 #include <com/sun/star/presentation/XSlideShowController.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/presentation/XPresentationPage.idl b/offapi/com/sun/star/presentation/XPresentationPage.idl
index 497871a07..fc57513ba 100644
--- a/offapi/com/sun/star/presentation/XPresentationPage.idl
+++ b/offapi/com/sun/star/presentation/XPresentationPage.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_XPresentationPage_idl__ 
 #define __com_sun_star_presentation_XPresentationPage_idl__ 
  
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/XPresentationSupplier.idl b/offapi/com/sun/star/presentation/XPresentationSupplier.idl
index 67b0ca305..9fff9363e 100644
--- a/offapi/com/sun/star/presentation/XPresentationSupplier.idl
+++ b/offapi/com/sun/star/presentation/XPresentationSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_XPresentationSupplier_idl__ 
 #define __com_sun_star_presentation_XPresentationSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_presentation_XPresentation_idl__ 
 #include <com/sun/star/presentation/XPresentation.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/presentation/XShapeEventListener.idl b/offapi/com/sun/star/presentation/XShapeEventListener.idl
index fd960f0fa..b94f06cb9 100644
--- a/offapi/com/sun/star/presentation/XShapeEventListener.idl
+++ b/offapi/com/sun/star/presentation/XShapeEventListener.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_presentation_XShapeEventListener_idl__
 #define __com_sun_star_presentation_XShapeEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
-#ifndef __com_sun_star_awt_XMouseListener_idl__ 
 #include <com/sun/star/awt/XMouseListener.idl> 
-#endif 
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
 
 module com {  module sun {  module star {  module presentation {
 
diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl
index f01f5a8c2..d9b2c9b76 100644
--- a/offapi/com/sun/star/presentation/XSlideShow.idl
+++ b/offapi/com/sun/star/presentation/XSlideShow.idl
@@ -27,42 +27,18 @@
 #ifndef _com_sun_star_presentation_XSlideShow_idl
 #define _com_sun_star_presentation_XSlideShow_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__ 
 #include <com/sun/star/geometry/RealRectangle2D.idl> 
-#endif 
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__ 
 #include <com/sun/star/rendering/XSpriteCanvas.idl> 
-#endif 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__ 
 #include <com/sun/star/animations/XAnimationNode.idl> 
-#endif 
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
 #include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl> 
-#endif 
-#ifndef __com_sun_star_presentation_XSlideShowView_idl__ 
 #include <com/sun/star/presentation/XSlideShowView.idl> 
-#endif 
-#ifndef __com_sun_star_presentation_XSlideShowListener_idl__ 
 #include <com/sun/star/presentation/XSlideShowListener.idl> 
-#endif 
-#ifndef __com_sun_star_presentation_XShapeEventListener_idl__ 
 #include <com/sun/star/presentation/XShapeEventListener.idl> 
-#endif 
 
 module com {  module sun {  module star {  module presentation {
 
@@ -370,8 +346,6 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
 
 };
 
-service SlideShow : XSlideShow;
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/presentation/XSlideShowController.idl b/offapi/com/sun/star/presentation/XSlideShowController.idl
index 7c823e737..bd6773ba9 100644
--- a/offapi/com/sun/star/presentation/XSlideShowController.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowController.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_presentation_XSlideShowController_idl__ 
 #define __com_sun_star_presentation_XSlideShowController_idl__ 
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
 #include <com/sun/star/drawing/XDrawPage.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
-
-#ifndef __com_sun_star_presentation_XSlideShow_idl__
 #include <com/sun/star/presentation/XSlideShow.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/presentation/XSlideShowListener.idl b/offapi/com/sun/star/presentation/XSlideShowListener.idl
index 53966403e..ca17c2aaf 100644
--- a/offapi/com/sun/star/presentation/XSlideShowListener.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_XSlideShowListener_idl__
 #define __com_sun_star_presentation_XSlideShowListener_idl__
 
-#ifndef __com_sun_star_animations_XAnimationListener_idl__ 
-#include <com/sun/star/animations/XAnimationListener.idl> 
-#endif 
+#include <com/sun/star/animations/XAnimationListener.idl>
 
 module com {  module sun {  module star {  module presentation {
 
@@ -39,7 +37,7 @@ module com {  module sun {  module star {  module presentation {
 
     @since OOo 3.0
  */
-interface XSlideShowListener : ::com::sun::star::animations::XAnimationListener
+published interface XSlideShowListener : ::com::sun::star::animations::XAnimationListener
 {
     /** Notify that the slide show is paused
     */
@@ -67,7 +65,7 @@ interface XSlideShowListener : ::com::sun::star::animations::XAnimationListener
             flag is <TRUE/>.
     */
     void slideEnded( [in] boolean reverse );
-    
+
     /** Notifies that a hyperlink has been clicked.
         @param hyperLink hyperlink URL
      */
diff --git a/offapi/com/sun/star/presentation/XSlideShowView.idl b/offapi/com/sun/star/presentation/XSlideShowView.idl
index 2adccd4a9..c34f2d4d4 100644
--- a/offapi/com/sun/star/presentation/XSlideShowView.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_presentation_XSlideShowView_idl__
 #define __com_sun_star_presentation_XSlideShowView_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__ 
-#include <com/sun/star/rendering/XSpriteCanvas.idl> 
-#endif 
-#ifndef __com_sun_star_util_XModifyListener_idl__ 
-#include <com/sun/star/util/XModifyListener.idl> 
-#endif 
-#ifndef __com_sun_star_awt_XPaintListener_idl__ 
-#include <com/sun/star/awt/XPaintListener.idl> 
-#endif 
-#ifndef __com_sun_star_awt_XMouseListener_idl__ 
-#include <com/sun/star/awt/XMouseListener.idl> 
-#endif 
-#ifndef __com_sun_star_awt_XMouseMotionListener_idl__ 
-#include <com/sun/star/awt/XMouseMotionListener.idl> 
-#endif 
-#ifndef __com_sun_star_awt_Rectangle_idl__ 
-#include <com/sun/star/awt/Rectangle.idl> 
-#endif 
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/rendering/XSpriteCanvas.idl>
+#include <com/sun/star/util/XModifyListener.idl>
+#include <com/sun/star/awt/XPaintListener.idl>
+#include <com/sun/star/awt/XMouseListener.idl>
+#include <com/sun/star/awt/XMouseMotionListener.idl>
+#include <com/sun/star/awt/Rectangle.idl>
 
 module com {  module sun {  module star {  module presentation {
 
@@ -59,7 +45,7 @@ module com {  module sun {  module star {  module presentation {
 
     @since OOo 2.4
  */
-interface XSlideShowView : ::com::sun::star::uno::XInterface
+published interface XSlideShowView : ::com::sun::star::uno::XInterface
 {
     /** Get view canvas.<p>
 
@@ -81,9 +67,9 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface
 
     /** Query the current transformation matrix for this view.<p>
 
-           This method returns the transformation matrix of the
-           view. When notified via the transformation change listener,
-           the show will be displayed using the new transformation.<p>
+            This method returns the transformation matrix of the
+            view. When notified via the transformation change listener,
+            the show will be displayed using the new transformation.<p>
 
         @return the view transformation matrix. Note that the slide
         show itself will paint all slides as one-by-one boxes, one
@@ -119,7 +105,7 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface
         representation.<p>
 
         @param xListener
-        Listener interface to call when the view needs a repaint.        
+        Listener interface to call when the view needs a repaint.
      */
     void addPaintListener( [in] ::com::sun::star::awt::XPaintListener xListener );
 
@@ -138,15 +124,15 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface
         @param xListener
         Listener interface to call when the mouse is clicked on the view.
      */
-    void addMouseListener( [in] com::sun::star::awt::XMouseListener xListener ); 
- 
+    void addMouseListener( [in] com::sun::star::awt::XMouseListener xListener );
+
     /** Revoke a previously registered mouse listener.<p>
 
         @param xListener
         Listener interface to revoke from being called.
      */
-    void removeMouseListener( [in] com::sun::star::awt::XMouseListener xListener ); 
- 
+    void removeMouseListener( [in] com::sun::star::awt::XMouseListener xListener );
+
     /** Add a mouse motion listener to the view.<p>
 
         This method registers a listener with the view, which will get
@@ -155,14 +141,14 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface
         @param xListener
         Listener interface to call when the mouse is moved on the view.
      */
-    void addMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener ); 
- 
+    void addMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener );
+
     /** Revoke a previously registered mouse move listener.<p>
 
         @param xListener
         Listener interface to revoke from being called.
      */
-    void removeMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener ); 
+    void removeMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener );
 
     /** Change the mouse cursor currently in effect.<p>
 
diff --git a/offapi/com/sun/star/presentation/XTransition.idl b/offapi/com/sun/star/presentation/XTransition.idl
index e6970524f..f25df7a99 100644
--- a/offapi/com/sun/star/presentation/XTransition.idl
+++ b/offapi/com/sun/star/presentation/XTransition.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_XTransition_idl__
 #define __com_sun_star_presentation_XTransition_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
 
 module com {  module sun {  module star {
 
diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl
index 481493606..da6d27b85 100644
--- a/offapi/com/sun/star/presentation/XTransitionFactory.idl
+++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_presentation_XTransitionFactory_idl__
 #define __com_sun_star_presentation_XTransitionFactory_idl__
 
-#ifndef __com_sun_star_presentation_XTransition_idl__ 
 #include <com/sun/star/presentation/XTransition.idl> 
-#endif 
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__ 
 #include <com/sun/star/geometry/RealPoint2D.idl> 
-#endif 
 
 
 module com {  module sun {  module star {  
@@ -84,8 +80,6 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
                                   [in] com::sun::star::rendering::XBitmap    enteringBitmap );
 };
 
-service TransitionFactory : XTransitionFactory;
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/presentation/makefile.mk b/offapi/com/sun/star/presentation/makefile.mk
deleted file mode 100644
index 806894018..000000000
--- a/offapi/com/sun/star/presentation/makefile.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csspresentation
-PACKAGE=com$/sun$/star$/presentation
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    HeaderShape.idl\
-    FooterShape.idl\
-    DateTimeShape.idl\
-    SlideNumberShape.idl\
-    AnimationEffect.idl\
-    AnimationSpeed.idl\
-    ChartShape.idl\
-    ClickAction.idl\
-    CustomPresentation.idl\
-    CustomPresentationAccess.idl\
-    DocumentSettings.idl\
-    DrawPage.idl\
-    FadeEffect.idl\
-    GraphicObjectShape.idl\
-    HandoutShape.idl\
-    HandoutView.idl\
-    NotesShape.idl\
-    NotesView.idl\
-    OLE2Shape.idl\
-    OutlinerShape.idl\
-    OutlineView.idl\
-    PageShape.idl\
-    Presentation.idl\
-    Presentation2.idl\
-    PresentationDocument.idl\
-    PresentationRange.idl\
-    PresentationView.idl\
-    PreviewView.idl\
-    Shape.idl\
-    SlidesView.idl\
-    SubtitleShape.idl\
-    TitleTextShape.idl\
-    XCustomPresentationSupplier.idl\
-    XHandoutMasterSupplier.idl\
-    XPresentation.idl\
-    XPresentationPage.idl\
-    XPresentationSupplier.idl\
-    EffectNodeType.idl\
-    EffectPresetClass.idl\
-    ParagraphTarget.idl\
-    ShapeAnimationSubType.idl\
-    TextAnimationType.idl\
-    EffectCommands.idl\
-    XShapeEventListener.idl\
-    XSlideShow.idl\
-    XSlideShowController.idl\
-    XSlideShowListener.idl\
-    XSlideShowView.idl\
-    XPresentation2.idl\
-    XTransition.idl\
-    XTransitionFactory.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/presentation/textfield/makefile.mk b/offapi/com/sun/star/presentation/textfield/makefile.mk
deleted file mode 100644
index 49220f824..000000000
--- a/offapi/com/sun/star/presentation/textfield/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csspresentationtextfield
-PACKAGE=com$/sun$/star$/presentation$/textfield
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Header.idl\
-    Footer.idl\
-    DateTime.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/rdf/BlankNode.idl b/offapi/com/sun/star/rdf/BlankNode.idl
index cad859471..3d0b7f320 100644
--- a/offapi/com/sun/star/rdf/BlankNode.idl
+++ b/offapi/com/sun/star/rdf/BlankNode.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_rdf_BlankNode_idl__
 #define __com_sun_star_rdf_BlankNode_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XBlankNode_idl__
 #include <com/sun/star/rdf/XBlankNode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/Literal.idl b/offapi/com/sun/star/rdf/Literal.idl
index 537c1b0ce..839d65842 100644
--- a/offapi/com/sun/star/rdf/Literal.idl
+++ b/offapi/com/sun/star/rdf/Literal.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_rdf_Literal_idl__
 #define __com_sun_star_rdf_Literal_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XLiteral_idl__
 #include <com/sun/star/rdf/XLiteral.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/ParseException.idl b/offapi/com/sun/star/rdf/ParseException.idl
index a156525e5..3f06b1905 100644
--- a/offapi/com/sun/star/rdf/ParseException.idl
+++ b/offapi/com/sun/star/rdf/ParseException.idl
@@ -28,10 +28,7 @@
 #ifndef __com_sun_star_rdf_ParseException_idl__
 #define __com_sun_star_rdf_ParseException_idl__
 
-#ifndef __com_sun_star_uno_Eception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/rdf/QueryException.idl b/offapi/com/sun/star/rdf/QueryException.idl
index 3c92535d9..e3fb2c1e1 100644
--- a/offapi/com/sun/star/rdf/QueryException.idl
+++ b/offapi/com/sun/star/rdf/QueryException.idl
@@ -28,10 +28,7 @@
 #ifndef __com_sun_star_rdf_QueryException_idl__
 #define __com_sun_star_rdf_QueryException_idl__
 
-#ifndef __com_sun_star_uno_Eception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/rdf/Repository.idl b/offapi/com/sun/star/rdf/Repository.idl
index b6df3d700..07531a47e 100644
--- a/offapi/com/sun/star/rdf/Repository.idl
+++ b/offapi/com/sun/star/rdf/Repository.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_Repository_idl__
 #define __com_sun_star_rdf_Repository_idl__
 
-#ifndef __com_sun_star_rdf_XRepository_idl__
 #include <com/sun/star/rdf/XRepository.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/RepositoryException.idl b/offapi/com/sun/star/rdf/RepositoryException.idl
index 0d30a026c..8fac395b7 100644
--- a/offapi/com/sun/star/rdf/RepositoryException.idl
+++ b/offapi/com/sun/star/rdf/RepositoryException.idl
@@ -28,10 +28,7 @@
 #ifndef __com_sun_star_rdf_RepositoryException_idl__
 #define __com_sun_star_rdf_RepositoryException_idl__
 
-#ifndef __com_sun_star_uno_Eception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/rdf/Statement.idl b/offapi/com/sun/star/rdf/Statement.idl
index f035a60af..82c02286c 100644
--- a/offapi/com/sun/star/rdf/Statement.idl
+++ b/offapi/com/sun/star/rdf/Statement.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_Statement_idl__
 #define __com_sun_star_rdf_Statement_idl__
 
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/URI.idl b/offapi/com/sun/star/rdf/URI.idl
index 3f638c2ea..03205e410 100644
--- a/offapi/com/sun/star/rdf/URI.idl
+++ b/offapi/com/sun/star/rdf/URI.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_rdf_URI_idl__
 #define __com_sun_star_rdf_URI_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XBlankNode.idl b/offapi/com/sun/star/rdf/XBlankNode.idl
index 68ead6e29..f6d347ac9 100644
--- a/offapi/com/sun/star/rdf/XBlankNode.idl
+++ b/offapi/com/sun/star/rdf/XBlankNode.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XBlankNode_idl__
 #define __com_sun_star_rdf_XBlankNode_idl__
 
-#ifndef __com_sun_star_rdf_XResource_idl__
 #include <com/sun/star/rdf/XResource.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl b/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
index 4a657b244..f85cda0cb 100644
--- a/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
+++ b/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
@@ -28,65 +28,21 @@
 #ifndef __com_sun_star_rdf_XDocumentMetadataAccess_idl__
 #define __com_sun_star_rdf_XDocumentMetadataAccess_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_FileFormat_idl__
 #include <com/sun/star/rdf/FileFormat.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_ParseException_idl__
 #include <com/sun/star/rdf/ParseException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
 #include <com/sun/star/rdf/XMetadatable.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XRepositorySupplier_idl__
 #include <com/sun/star/rdf/XRepositorySupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XDocumentRepository.idl b/offapi/com/sun/star/rdf/XDocumentRepository.idl
index d0d7cccb7..be74bda00 100644
--- a/offapi/com/sun/star/rdf/XDocumentRepository.idl
+++ b/offapi/com/sun/star/rdf/XDocumentRepository.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_rdf_XDocumentRepository_idl__
 #define __com_sun_star_rdf_XDocumentRepository_idl__
 
-#ifndef __com_sun_star_beans_Pair_idl__
 #include <com/sun/star/beans/Pair.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
 #include <com/sun/star/rdf/XMetadatable.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XRepository_idl__
 #include <com/sun/star/rdf/XRepository.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XLiteral.idl b/offapi/com/sun/star/rdf/XLiteral.idl
index 0c0fafda8..139db8252 100644
--- a/offapi/com/sun/star/rdf/XLiteral.idl
+++ b/offapi/com/sun/star/rdf/XLiteral.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XLiteral_idl__
 #define __com_sun_star_rdf_XLiteral_idl__
 
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XMetadatable.idl b/offapi/com/sun/star/rdf/XMetadatable.idl
index a11009a37..df35c8e7b 100644
--- a/offapi/com/sun/star/rdf/XMetadatable.idl
+++ b/offapi/com/sun/star/rdf/XMetadatable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_rdf_XMetadatable_idl__
 #define __com_sun_star_rdf_XMetadatable_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
 #include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
 
 
 //=============================================================================
@@ -67,7 +59,7 @@ module com {   module sun {   module star {   module rdf {
     @see XRepository
     @see XDocumentMetadataAccess
  */
-interface XMetadatable : XURI
+published interface XMetadatable : XURI
 {
     //-------------------------------------------------------------------------
     /** a metadata reference, comprising the stream name and the XML ID.
diff --git a/offapi/com/sun/star/rdf/XNamedGraph.idl b/offapi/com/sun/star/rdf/XNamedGraph.idl
index 5f226ba73..7c96d1ef5 100644
--- a/offapi/com/sun/star/rdf/XNamedGraph.idl
+++ b/offapi/com/sun/star/rdf/XNamedGraph.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_rdf_XNamedGraph_idl__
 #define __com_sun_star_rdf_XNamedGraph_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_RepositoryException_idl__
 #include <com/sun/star/rdf/RepositoryException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XNode.idl b/offapi/com/sun/star/rdf/XNode.idl
index bf52f4e20..e1added4a 100644
--- a/offapi/com/sun/star/rdf/XNode.idl
+++ b/offapi/com/sun/star/rdf/XNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XNode_idl__
 #define __com_sun_star_rdf_XNode_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -66,7 +64,7 @@ module com {   module sun {   module star {   module rdf {
     @see XURI
     @see XLiteral
  */
-interface XNode
+published interface XNode
 {
     /// the string value of the node.
     [readonly, attribute] string StringValue;
diff --git a/offapi/com/sun/star/rdf/XQuerySelectResult.idl b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
index ff2d91382..4b6e96c8f 100644
--- a/offapi/com/sun/star/rdf/XQuerySelectResult.idl
+++ b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XQuerySelectResult_idl__
 #define __com_sun_star_rdf_XQuerySelectResult_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XReifiedStatement.idl b/offapi/com/sun/star/rdf/XReifiedStatement.idl
index aea170659..e5ca470a1 100644
--- a/offapi/com/sun/star/rdf/XReifiedStatement.idl
+++ b/offapi/com/sun/star/rdf/XReifiedStatement.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XReifiedStatement_idl__
 #define __com_sun_star_rdf_XReifiedStatement_idl__
 
-#ifndef __com_sun_star_rdf_Statement_idl__
 #include <com/sun/star/rdf/Statement.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XRepository.idl b/offapi/com/sun/star/rdf/XRepository.idl
index 85718b403..fb4ee281d 100644
--- a/offapi/com/sun/star/rdf/XRepository.idl
+++ b/offapi/com/sun/star/rdf/XRepository.idl
@@ -28,73 +28,23 @@
 #ifndef __com_sun_star_rdf_XRepository_idl__
 #define __com_sun_star_rdf_XRepository_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_FileFormat_idl__
 #include <com/sun/star/rdf/FileFormat.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_ParseException_idl__
 #include <com/sun/star/rdf/ParseException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_QueryException_idl__
 #include <com/sun/star/rdf/QueryException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_RepositoryException_idl__
 #include <com/sun/star/rdf/RepositoryException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XBlankNode_idl__
 #include <com/sun/star/rdf/XBlankNode.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_Statement_idl__
 #include <com/sun/star/rdf/Statement.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XQuerySelectResult_idl__
 #include <com/sun/star/rdf/XQuerySelectResult.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XNamedGraph_idl__
 #include <com/sun/star/rdf/XNamedGraph.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XRepositorySupplier.idl b/offapi/com/sun/star/rdf/XRepositorySupplier.idl
index a1b42491d..5d5b0e69d 100644
--- a/offapi/com/sun/star/rdf/XRepositorySupplier.idl
+++ b/offapi/com/sun/star/rdf/XRepositorySupplier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XRepositorySupplier_idl__
 #define __com_sun_star_rdf_XRepositorySupplier_idl__
 
-#ifndef __com_sun_star_rdf_XRepository_idl__
 #include <com/sun/star/rdf/XRepository.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XResource.idl b/offapi/com/sun/star/rdf/XResource.idl
index d6fcea6bc..3d50fdf69 100644
--- a/offapi/com/sun/star/rdf/XResource.idl
+++ b/offapi/com/sun/star/rdf/XResource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XResource_idl__
 #define __com_sun_star_rdf_XResource_idl__
 
-#ifndef __com_sun_star_rdf_XNode_idl__
 #include <com/sun/star/rdf/XNode.idl>
-#endif
 
 
 //=============================================================================
@@ -50,7 +48,7 @@ module com {   module sun {   module star {   module rdf {
     @see XBlankNode
     @see XURI
  */
-interface XResource : XNode
+published interface XResource : XNode
 {
 };
 
diff --git a/offapi/com/sun/star/rdf/XURI.idl b/offapi/com/sun/star/rdf/XURI.idl
index 3960f48be..7f00e0a29 100644
--- a/offapi/com/sun/star/rdf/XURI.idl
+++ b/offapi/com/sun/star/rdf/XURI.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XURI_idl__
 #define __com_sun_star_rdf_XURI_idl__
 
-#ifndef __com_sun_star_rdf_XResource_idl__
 #include <com/sun/star/rdf/XResource.idl>
-#endif
 
 
 //=============================================================================
@@ -62,7 +60,7 @@ module com {   module sun {   module star {   module rdf {
 
     @see XRepository
  */
-interface XURI : XResource
+published interface XURI : XResource
 {
     /// prefix
     [readonly, attribute] string Namespace;
diff --git a/offapi/com/sun/star/rdf/makefile.mk b/offapi/com/sun/star/rdf/makefile.mk
deleted file mode 100644
index b27ea74e5..000000000
--- a/offapi/com/sun/star/rdf/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssrdf
-PACKAGE=com$/sun$/star$/rdf
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES= \
-    FileFormat.idl \
-    URIs.idl \
-    ParseException.idl \
-    QueryException.idl \
-    RepositoryException.idl \
-    XNode.idl \
-    XResource.idl \
-    XBlankNode.idl \
-    XURI.idl \
-    XLiteral.idl \
-    BlankNode.idl \
-    URI.idl \
-    Literal.idl \
-    Statement.idl \
-    XReifiedStatement.idl \
-    XQuerySelectResult.idl \
-    XNamedGraph.idl \
-    XRepository.idl \
-    XDocumentRepository.idl \
-    Repository.idl \
-    XRepositorySupplier.idl \
-    XMetadatable.idl \
-    XDocumentMetadataAccess.idl \
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/sal/systools/win32/uwinapi/CopyFileExW.cpp b/offapi/com/sun/star/rendering/ARGBColor.idl
index 9ba56f6ba..16d0ee17b 100644
--- a/sal/systools/win32/uwinapi/CopyFileExW.cpp
+++ b/offapi/com/sun/star/rendering/ARGBColor.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,18 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
+#ifndef __com_sun_star_rendering_ARGBColor_idl__
+#define __com_sun_star_rendering_ARGBColor_idl__
+
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#include <com/sun/star/rendering/ColorComponent.idl>
 #endif
 
-#define _WIN32_WINNT 0x0400
-#include "macros.h"
+module com { module sun { module star { module rendering {
 
-IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExW, ( LPCWSTR lpExistingFileNameW, LPCWSTR lpNewFileNameW, LPPROGRESS_ROUTINE  lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags ) )
+/// ARGB color quad
+published struct ARGBColor
 {
-    AUTO_WSTR2STR( lpExistingFileName );
-    AUTO_WSTR2STR( lpNewFileName );
+    /** Alpha component.<p>
+
+        Valid range is [0,1.0], with 0.0 denoting fully transparent,
+        and 1.0 fully opaque.
+     */
+    ColorComponent Alpha;
+    /// Red component. Valid range is [0,1.0]
+    ColorComponent Red;
+    /// Green component. Valid range is [0,1.0]
+    ColorComponent Green;
+    /// Blue component. Valid range is [0,1.0]
+    ColorComponent Blue;
+};
 
-    return CopyFileExA( lpExistingFileNameA, lpNewFileNameA, lpProgressRoutine, lpData, pbCancel, dwCopyFlags );
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/rendering/AnimationAttributes.idl b/offapi/com/sun/star/rendering/AnimationAttributes.idl
index 44c6c825d..73498a453 100644
--- a/offapi/com/sun/star/rendering/AnimationAttributes.idl
+++ b/offapi/com/sun/star/rendering/AnimationAttributes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_rendering_AnimationAttributes_idl__
 #define __com_sun_star_rendering_AnimationAttributes_idl__
 
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
 #include <com/sun/star/geometry/RealSize2D.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -37,23 +35,23 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct AnimationAttributes
+published struct AnimationAttributes
 {
     /// Preferred duration of the animation sequence in seconds.
-    double 										Duration;
-    
+    double                                          Duration;
+
     //-------------------------------------------------------------------------
 
     /** Repeat mode of the animation sequence.<p>
-    
+
         This value determines how the [0,1] parameter space of the animation
         should be swept through. Permissible values are given in
         <type>AnimationRepeat</type>.<p>
-        
+
         @see AnimationRepeat.
      */
     byte										RepeatMode;
-    
+
     //-------------------------------------------------------------------------
 
     /** Size of the untransformed animation sequence.<p>
@@ -64,7 +62,7 @@ struct AnimationAttributes
         animation content in finite-sized bitmaps.<p>
      */
     ::com::sun::star::geometry::RealSize2D	UntransformedSize;
-}; 
+};
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/rendering/BitmapCanvas.idl b/offapi/com/sun/star/rendering/BitmapCanvas.idl
new file mode 100644
index 000000000..70bd91303
--- /dev/null
+++ b/offapi/com/sun/star/rendering/BitmapCanvas.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_rendering_BitmapCanvas_idl__
+#define __com_sun_star_rendering_BitmapCanvas_idl__
+
+#ifndef __com_sun_star_rendering_XBitmap_idl__
+#include <com/sun/star/rendering/XBitmap.idl>
+#endif
+#ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
+#include <com/sun/star/rendering/XBitmapCanvas.idl>
+#endif
+
+
+module com { module sun { module star { module rendering {
+
+// TODO: Multiple-inheritance interfaces
+
+/** This service provides the interfaces for a <type>XBitmapCanvas</type>
+ */
+service BitmapCanvas
+{
+    /** Canvas interface, to issue rendering operations.
+     */
+    interface XBitmapCanvas;
+
+    /** Bitmap interface, to directly manipulate the pixel.
+     */
+    interface XBitmap;
+};
+
+}; }; }; };
+
+#endif
diff --git a/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp b/offapi/com/sun/star/rendering/Canvas.idl
index ee81b38b0..6c7336f79 100644
--- a/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp
+++ b/offapi/com/sun/star/rendering/Canvas.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,11 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
+#ifndef __com_sun_star_rendering_Canvas_idl__
+#define __com_sun_star_rendering_Canvas_idl__
+
+#ifndef __com_sun_star_rendering_XCanvas_idl__
+#include <com/sun/star/rendering/XCanvas.idl>
 #endif
 
-#include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, DeleteVolumeMountPointA, (LPCSTR lpszVolumeMountPoint) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+module com { module sun { module star { module rendering {
+
+/// Service providing an <type>XCanvas</type> interface
+service Canvas: XCanvas;
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/rendering/Caret.idl b/offapi/com/sun/star/rendering/Caret.idl
index 0c7fee72b..1c1cc7463 100644
--- a/offapi/com/sun/star/rendering/Caret.idl
+++ b/offapi/com/sun/star/rendering/Caret.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,14 +36,14 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct Caret 
+published struct Caret
 {
     /** This contains the main caret index.<p>
 
         The main caret index corresponds to the insert position when
         inserting text in the layout's main text direction.
      */
-    long 		MainCaretIndex;
+    long        MainCaretIndex;
 
     /** This contains the secondary caret index.<p>
 
@@ -52,7 +52,7 @@ struct Caret
         at a direction change opposite to the layout's main text
         direction.
      */
-    long 		SecondaryCaretIndex;
+    long        SecondaryCaretIndex;
 
     /** The angle of the caret.<p>
 
diff --git a/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp b/offapi/com/sun/star/rendering/Color.idl
index 739c5f467..f36fbbe90 100644
--- a/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp
+++ b/offapi/com/sun/star/rendering/Color.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,11 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
+#ifndef __com_sun_star_rendering_Color_idl__
+#define __com_sun_star_rendering_Color_idl__
+
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#include <com/sun/star/rendering/ColorComponent.idl>
 #endif
 
-#include "macros.h"
+module com { module sun { module star { module rendering {
+
+/// Shorthand for the device-dependent color components, and easier to read
+published typedef sequence<ColorComponent> Color;
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, DeleteVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+}; }; }; };
+
+#endif
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp b/offapi/com/sun/star/rendering/ColorComponent.idl
index 627e15c3b..c4a21a5a0 100644
--- a/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp
+++ b/offapi/com/sun/star/rendering/ColorComponent.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,7 +25,14 @@
  *
  ************************************************************************/
 
-#include "macros.h"
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#define __com_sun_star_rendering_ColorComponent_idl__
+
+module com { module sun { module star { module rendering {
+
+/// Shorthand for the device-dependent color components, and easier to read
+published typedef double ColorComponent;
+
+}; }; }; };
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+#endif
diff --git a/offapi/com/sun/star/rendering/FillRule.idl b/offapi/com/sun/star/rendering/FillRule.idl
index 97ef0707f..3ad5c8194 100644
--- a/offapi/com/sun/star/rendering/FillRule.idl
+++ b/offapi/com/sun/star/rendering/FillRule.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-enum FillRule
+published enum FillRule
 {
     /** Fill every area, where, when traveling along a line, the
         summed winding number (that is, -1 for a
diff --git a/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl b/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
index 045357699..9c46159d8 100644
--- a/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
+++ b/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #define __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 
-#ifndef __com_sun_star_rendering_FloatingPointBitmapFormat_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapFormat.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/FontInfo.idl b/offapi/com/sun/star/rendering/FontInfo.idl
index 12cbf5bab..9b1097908 100644
--- a/offapi/com/sun/star/rendering/FontInfo.idl
+++ b/offapi/com/sun/star/rendering/FontInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_rendering_FontInfo_idl__
 #define __com_sun_star_rendering_FontInfo_idl__
 
-#ifndef __com_sun_star_util_TriState_idl__ 
 #include <com/sun/star/util/TriState.idl>
-#endif
-
-#ifndef __com_sun_star_rendering_Panose_idl__
 #include <com/sun/star/rendering/Panose.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -42,7 +37,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct FontInfo
+published struct FontInfo
 {
     /** The PANOSE font classification.<p>
 
@@ -73,7 +68,7 @@ struct FontInfo
     //-------------------------------------------------------------------------
 
     /** This value specifies which Unicode ranges are supported by
-         this font.<p>
+        this font.<p>
 
         This is to be interpreted as a split-up 128-bit value, see <a
         href=http://partners.adobe.com/asn/tech/type/opentype/os2.jsp#ur>Adobe's
diff --git a/offapi/com/sun/star/rendering/FontMetrics.idl b/offapi/com/sun/star/rendering/FontMetrics.idl
index 207e5dff8..1c0449d5b 100644
--- a/offapi/com/sun/star/rendering/FontMetrics.idl
+++ b/offapi/com/sun/star/rendering/FontMetrics.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,20 +51,20 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct FontMetrics
+published struct FontMetrics
 {
-    /// Ascent (above the baseline) part of the font. 
+    /// Ascent (above the baseline) part of the font.
     double		Ascent;
 
     //-------------------------------------------------------------------------
 
     /// Descent (below the baseline) part of the font.
-    double		Descent; 
+    double		Descent;
 
     //-------------------------------------------------------------------------
 
     /// Extra space above ascent
-    double		InternalLeading; 
+    double		InternalLeading;
 
     //-------------------------------------------------------------------------
 
@@ -84,14 +84,14 @@ struct FontMetrics
         characters, and if one needs a font with double character
         width, the referenceCharSize should be doubled.<p>
      */
-    double 		ReferenceCharSize;
+    double          ReferenceCharSize;
 
     //-------------------------------------------------------------------------
 
     /** Specifies the offset to be added to the baseline when drawing
         underlined text.
      */
-    double 		UnderlineOffset;
+    double          UnderlineOffset;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/FontRequest.idl b/offapi/com/sun/star/rendering/FontRequest.idl
index f4759b46d..79a8607bb 100644
--- a/offapi/com/sun/star/rendering/FontRequest.idl
+++ b/offapi/com/sun/star/rendering/FontRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,19 +27,14 @@
 #ifndef __com_sun_star_rendering_FontRequest_idl__
 #define __com_sun_star_rendering_FontRequest_idl__
 
-#ifndef __com_sun_star_rendering_FontInfo_idl__
 #include <com/sun/star/rendering/FontInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
 /** This structure contains all information necessary to describe a
     font to be queried from XCanvas.<p>
-    
+
     Note: Outline fonts are to be requested as a special family, set
     <member>FontInfo::FamilyName</member> appropriately. Emboss/relief
     must be emulated by upper layers.<p>
@@ -50,7 +45,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct FontRequest
+published struct FontRequest
 {
     /** The description of the font.<p>
 
@@ -84,8 +79,8 @@ struct FontRequest
         output equals the identity transform. This also applies to all
         query methods, for both <type>XCanvasFont</type> and
         <type>XTextLayout</type>.<p>
-    */ 
-    double 							CellSize; 
+    */
+    double                              CellSize;
 
     //-------------------------------------------------------------------------
 
@@ -103,7 +98,7 @@ struct FontRequest
     double							ReferenceAdvancement;
 
     //-------------------------------------------------------------------------
-    
+
     /** The locale this font should be able to render.<p>
 
         This member supplements the
diff --git a/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl b/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
index 18ada68da..da7e78a36 100644
--- a/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
+++ b/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_rendering_IntegerBitmapLayout_idl__
 #define __com_sun_star_rendering_IntegerBitmapLayout_idl__
 
-#ifndef __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
 #include <com/sun/star/rendering/XIntegerBitmapColorSpace.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmapPalette_idl__
 #include <com/sun/star/rendering/XBitmapPalette.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/MtfRenderer.idl b/offapi/com/sun/star/rendering/MtfRenderer.idl
index dbcc850c3..43b76ef10 100644
--- a/offapi/com/sun/star/rendering/MtfRenderer.idl
+++ b/offapi/com/sun/star/rendering/MtfRenderer.idl
@@ -28,19 +28,12 @@
 #ifndef __com_sun_star_rendering_MtfRenderer_idl__
 #define __com_sun_star_rendering_MtfRenderer_idl__
 
-#ifndef __com_sun_star_uno_XCanvas_idl__
-#include <com/sun/star/rendering/XCanvas.idl>
-#endif
+#include <com/sun/star/rendering/XMtfRenderer.idl>
 
 module com { module sun { module star { module rendering {
 
-    interface XMtfRenderer : ::com::sun::star::uno::XInterface
-    {
-        void setMetafile( [in] sequence< byte > aMtf );
-        void draw( [in] double fScaleX, [in] double fScaleY );
-    };
-
     service MtfRenderer : XMtfRenderer;
+
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/rendering/Panose.idl b/offapi/com/sun/star/rendering/Panose.idl
index 3f70151f9..bdf8b421c 100644
--- a/offapi/com/sun/star/rendering/Panose.idl
+++ b/offapi/com/sun/star/rendering/Panose.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,37 +29,37 @@
 
 module com { module sun { module star { module rendering {
 
-struct Panose 
+published struct Panose
 {
     /// <type>PanoseFamilyTypes</type>
-    byte	FamilyType; 
+    byte	FamilyType;
 
     /// <type>PanoseSerifStyle</type>
-    byte	SerifStyle; 
+    byte	SerifStyle;
 
     /// <type>PanoseWeight</type>
-    byte	Weight; 
+    byte	Weight;
 
     /// <type>PanoseProportion</type>
-    byte	Proportion; 
+    byte	Proportion;
 
     /// <type>PanoseContrast</type>
-    byte	Contrast; 
+    byte	Contrast;
 
     /// <type>PanoseStrokeVariation</type>
-    byte	StrokeVariation; 
+    byte	StrokeVariation;
 
     /// <type>PanoseArmStyle</type>
-    byte	ArmStyle; 
+    byte	ArmStyle;
 
     /// <type>PanoseLetterForm</type>
-    byte	Letterform; 
+    byte	Letterform;
 
     /// <type>PanoseMidline</type>
-    byte	Midline; 
+    byte	Midline;
 
     /// <type>PanoseXHeight</type>
-    byte	XHeight; 
+    byte	XHeight;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/RGBColor.idl b/offapi/com/sun/star/rendering/RGBColor.idl
new file mode 100644
index 000000000..a2bee3373
--- /dev/null
+++ b/offapi/com/sun/star/rendering/RGBColor.idl
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_rendering_RGBColor_idl__
+#define __com_sun_star_rendering_RGBColor_idl__
+
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#include <com/sun/star/rendering/ColorComponent.idl>
+#endif
+
+module com { module sun { module star { module rendering {
+
+/// RGB color triplet
+published struct RGBColor
+{
+    /// Red component. Valid range is [0,1.0]
+    ColorComponent Red;
+    /// Green component. Valid range is [0,1.0]
+    ColorComponent Green;
+    /// Blue component. Valid range is [0,1.0]
+    ColorComponent Blue;
+};
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/rendering/RenderState.idl b/offapi/com/sun/star/rendering/RenderState.idl
index 4e9cf6533..408f64c2c 100644
--- a/offapi/com/sun/star/rendering/RenderState.idl
+++ b/offapi/com/sun/star/rendering/RenderState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,16 +27,12 @@
 #ifndef __com_sun_star_rendering_RenderState_idl__
 #define __com_sun_star_rendering_RenderState_idl__
 
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
-interface XPolyPolygon2D;
+published interface XPolyPolygon2D;
 
 /** This structure contains information passed to each
     <type>XCanvas</type> render operation.<p>
@@ -47,7 +43,7 @@ interface XPolyPolygon2D;
 
     @since OOo 2.0
  */
-struct RenderState
+published struct RenderState
 {
     /** The affine transform associated with this render
         operation.<p>
diff --git a/offapi/com/sun/star/rendering/StringContext.idl b/offapi/com/sun/star/rendering/StringContext.idl
index ee16c5220..0cee83d9a 100644
--- a/offapi/com/sun/star/rendering/StringContext.idl
+++ b/offapi/com/sun/star/rendering/StringContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,12 +38,12 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct StringContext
+published struct StringContext
 {
     /** The complete text, from which a subset is selected by the
         parameters below.
      */
-    string 	Text;
+    string      Text;
 
     //-------------------------------------------------------------------------
 
@@ -51,7 +51,7 @@ struct StringContext
 
         The first character has index 0.<p>
      */
-    long 	StartPosition;
+    long    StartPosition;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/StrokeAttributes.idl b/offapi/com/sun/star/rendering/StrokeAttributes.idl
index 80a0dfbff..362c0a743 100644
--- a/offapi/com/sun/star/rendering/StrokeAttributes.idl
+++ b/offapi/com/sun/star/rendering/StrokeAttributes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,14 +27,6 @@
 #ifndef __com_sun_star_rendering_StrokeAttributes_idl__
 #define __com_sun_star_rendering_StrokeAttributes_idl__
 
-#ifndef __com_sun_star_rendering_PathCapType_idl__
-#include <com/sun/star/rendering/PathCapType.idl>
-#endif
-#ifndef __com_sun_star_rendering_PathJoinType_idl__
-#include <com/sun/star/rendering/PathJoinType.idl>
-#endif
-
-
 module com { module sun { module star { module rendering {
 
 /** This structure contains all attributes required for path stroking.<p>
@@ -45,14 +37,14 @@ module com { module sun { module star { module rendering {
 
     @single #110496#
  */
-struct StrokeAttributes
+published struct StrokeAttributes
 {
     /** Defines the width of the stroke, measured in user
         coordinate space.
 
         This value must be positive (or 0.0)
-     */	
-    double 				StrokeWidth;
+     */
+    double                  StrokeWidth;
 
     //-------------------------------------------------------------------------
 
@@ -107,7 +99,7 @@ struct StrokeAttributes
         ends with a spacing, this spacing is included in the total
         width of the multiple-line stroke. That is, the stroke becomes
         asymmetric.<p>
-     */	
+     */
     sequence<double>	LineArray;
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/rendering/TextHit.idl b/offapi/com/sun/star/rendering/TextHit.idl
index 9a5e95746..d2f81e295 100644
--- a/offapi/com/sun/star/rendering/TextHit.idl
+++ b/offapi/com/sun/star/rendering/TextHit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct TextHit 
+published struct TextHit
 {
     /** This contains the entry index.<p>
 
@@ -49,7 +49,7 @@ struct TextHit
         containing the number of characters denotes an insertion
         <em>behind</em> the last character.<p>
      */
-    long 		EntryIndex;
+    long        EntryIndex;
 
     /** This member denotes whether the hit was on the leading
         edge.<p>
diff --git a/offapi/com/sun/star/rendering/Texture.idl b/offapi/com/sun/star/rendering/Texture.idl
index a7bbf35b4..054148f29 100644
--- a/offapi/com/sun/star/rendering/Texture.idl
+++ b/offapi/com/sun/star/rendering/Texture.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,13 @@
 #ifndef __com_sun_star_rendering_Texture_idl__
 #define __com_sun_star_rendering_Texture_idl__
 
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_StrokeAttributes_idl__
 #include <com/sun/star/rendering/StrokeAttributes.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
-interface XBitmap;
-interface XParametricPolyPolygon2D;
+published interface XBitmap;
+published interface XParametricPolyPolygon2D;
 
 /** Contains all information needed to define a texture.<p>
 
@@ -53,7 +49,7 @@ interface XParametricPolyPolygon2D;
 
     @since OOo 2.0
  */
-struct Texture
+published struct Texture
 {
     /** Texture transformation from texture to primitive space.<p>
 
@@ -136,18 +132,18 @@ struct Texture
     /** Repeat mode of the texture, x direction.<p>
 
         The repeat mode is separated into x and y direction, this is
-        the x direction part. Permissible values are from the 
+        the x direction part. Permissible values are from the
         <type>TexturingMode</type> constants.<p>
     */
-    byte				                		RepeatModeX;
+    byte				                        RepeatModeX;
 
     /** Repeat mode of the texture, y direction.<p>
 
         The repeat mode is separated into x and y direction, this is
-        the y direction part. Permissible values are from the 
+        the y direction part. Permissible values are from the
         <type>TexturingMode</type> constants.<p>
     */
-    byte				                		RepeatModeY;
+    byte				                        RepeatModeY;
 
 };
 
diff --git a/offapi/com/sun/star/rendering/ViewState.idl b/offapi/com/sun/star/rendering/ViewState.idl
index 1f35b74c8..fce6019c8 100644
--- a/offapi/com/sun/star/rendering/ViewState.idl
+++ b/offapi/com/sun/star/rendering/ViewState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,13 +27,11 @@
 #ifndef __com_sun_star_rendering_ViewState_idl__
 #define __com_sun_star_rendering_ViewState_idl__
 
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
-interface XPolyPolygon2D;
+published interface XPolyPolygon2D;
 
 /** This structure contains information considered the view state.<p>
 
@@ -43,13 +41,13 @@ interface XPolyPolygon2D;
 
     @since OOo 2.0
  */
-struct ViewState
+published struct ViewState
 {
     /** The affine transform associated with the view.<p>
 
         This member is used to transform coordinates of draw
         operations from user space to screen space.<p>
-     */	
+     */
     ::com::sun::star::geometry::AffineMatrix2D	AffineTransform;
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl b/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
index d8681859e..177e339d4 100644
--- a/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
+++ b/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,15 +24,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__ 
+#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #define __com_sun_star_rendering_VolatileContentDestroyedException_idl__
- 
-#ifndef __com_sun_star_uno_Exception_idl__ 
-#include <com/sun/star/uno/Exception.idl> 
-#endif 
- 
-module com { module sun { module star { module rendering {  
- 
+
+#include <com/sun/star/uno/Exception.idl>
+
+module com { module sun { module star { module rendering {
+
     /** This exception indicates an invalid volatile bitmap content.<p>
 
         When accessing or rendering XVolatileBitmap data, that has
@@ -40,10 +38,10 @@ module com { module sun { module star { module rendering {
 
         @since OOo 2.0
     */
-    exception VolatileContentDestroyedException : ::com::sun::star::uno::Exception
+    published exception VolatileContentDestroyedException : ::com::sun::star::uno::Exception
     {
-    }; 
+    };
 
 }; }; }; };
- 
+
 #endif
diff --git a/offapi/com/sun/star/rendering/XAnimatedSprite.idl b/offapi/com/sun/star/rendering/XAnimatedSprite.idl
index 880606291..03e1ac13e 100644
--- a/offapi/com/sun/star/rendering/XAnimatedSprite.idl
+++ b/offapi/com/sun/star/rendering/XAnimatedSprite.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_rendering_XAnimatedSprite_idl__
 #define __com_sun_star_rendering_XAnimatedSprite_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSprite_idl__
 #include <com/sun/star/rendering/XSprite.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -56,7 +44,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XAnimatedSprite : XSprite
+published interface XAnimatedSprite : XSprite
 {
     /**	Start animation sequence of this sprite.<p>
 
@@ -84,7 +72,7 @@ interface XAnimatedSprite : XSprite
     //-------------------------------------------------------------------------
 
     /** Stop the animation sequence.<p>
-        
+
         A subsequent <member>XAnimatedSprite::startAnimation</member>
         will commence the sequence at the point where it was stopped
         with here. Once an animation is stopped, the associated
@@ -106,7 +94,7 @@ interface XAnimatedSprite : XSprite
     void resetAnimation();
 
     //-------------------------------------------------------------------------
-    
+
     /** Issue an additional render call to this sprite's
         animation.<p>
 
@@ -151,7 +139,7 @@ interface XAnimatedSprite : XSprite
 
         This is useful at times where one does not want multiple
         redraws for every state change.<p>
-        
+
         Please note that if an animation is not started, the
         associated <type>XSpriteCanvas</type> does not update changed
         sprites automatically, but has to be told to do so via
@@ -165,12 +153,12 @@ interface XAnimatedSprite : XSprite
         New view state of the sprite, and part of the transformation
         that is applied to aNewPos. The view transformation matrix
         must not be singular.
-        
+
         @param aRenderState
         New render state of the sprite, and part of the transformation
         that is applied to aNewPos. The render transformation matrix
         must not be singular.
-        
+
         @param nAlpha
         New alpha value of the sprite. This value must be within the
         [0,1] range.
@@ -183,12 +171,12 @@ interface XAnimatedSprite : XSprite
         if one of the passed parameters does not lie in the specified,
         permissible range.
      */
-    void setAll( [in] ::com::sun::star::geometry::RealPoint2D	aNewPos, 
-                 [in] ViewState 										aViewState, 
-                 [in] RenderState 										aRenderState,
-                 [in] double 											nAlpha,
+    void setAll( [in] ::com::sun::star::geometry::RealPoint2D	aNewPos,
+                 [in] ViewState                                         aViewState,
+                 [in] RenderState                                       aRenderState,
+                 [in] double                                            nAlpha,
                  [in] boolean											bUpdateAnimation )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XAnimation.idl b/offapi/com/sun/star/rendering/XAnimation.idl
index 9169e997d..82e6a5b73 100644
--- a/offapi/com/sun/star/rendering/XAnimation.idl
+++ b/offapi/com/sun/star/rendering/XAnimation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_rendering_XAnimation_idl__
 #define __com_sun_star_rendering_XAnimation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_AnimationAttributes_idl__
 #include <com/sun/star/rendering/AnimationAttributes.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -60,7 +50,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XAnimation : ::com::sun::star::uno::XInterface
+published interface XAnimation : ::com::sun::star::uno::XInterface
 {
     /** Render the animation content at time t into the specified
         canvas.<p>
@@ -72,7 +62,7 @@ interface XAnimation : ::com::sun::star::uno::XInterface
         same parameter set, identical output must be generated. This
         is because e.g. a Sprite might decide arbitrarily to render an
         animation once and cache the result, or repaint it via
-        XAnimation::render everytime.<p> 
+        XAnimation::render everytime.<p>
 
         The rendered content, although, must be exactly the same for
         identical viewState, canvas and t values. Or, for that
@@ -101,8 +91,8 @@ interface XAnimation : ::com::sun::star::uno::XInterface
         if one of the passed parameters does not lie in the specified,
         permissible range.
      */
-    void 					render( [in] XCanvas canvas, [in] ViewState viewState, [in] double t )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+    void                    render( [in] XCanvas canvas, [in] ViewState viewState, [in] double t )
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
index 6f9fb6e55..21ec8bc52 100644
--- a/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,23 +27,15 @@
 #ifndef __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 #define __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XPolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealBezierSegment2D_idl__
 #include <com/sun/star/geometry/RealBezierSegment2D.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
 /** This is a specialized interface for a 2D poly-polygon containing
-     straight line and Bezier segments.<p>
+    straight line and Bezier segments.<p>
 
     This poly-polygon can contain polygons consisting of a mixture of
     cubic Bezier curves and straight lines. As the straight line is a
@@ -56,7 +48,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XBezierPolyPolygon2D : XPolyPolygon2D
+published interface XBezierPolyPolygon2D : XPolyPolygon2D
 {
     /** Query subset of this poly-polygon.<p>
 
@@ -89,7 +81,7 @@ interface XBezierPolyPolygon2D : XPolyPolygon2D
         if one of the given values exceed the permissible range.
      */
     sequence< sequence < ::com::sun::star::geometry::RealBezierSegment2D > > getBezierSegments( [in] long nPolygonIndex, [in] long nNumberOfPolygons, [in] long nPointIndex, [in] long nNumberOfPoints )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 
     //-------------------------------------------------------------------------
 
@@ -112,10 +104,10 @@ interface XBezierPolyPolygon2D : XPolyPolygon2D
         specified Bezier segment data.
 
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
-        if one of the given values exceed the permissible range.        
+        if one of the given values exceed the permissible range.
      */
     void setBezierSegments( [in] sequence< sequence< ::com::sun::star::geometry::RealBezierSegment2D > > points, [in] long nPolygonIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 
     //-------------------------------------------------------------------------
 
@@ -132,13 +124,13 @@ interface XBezierPolyPolygon2D : XPolyPolygon2D
         exceed the number of points in this polygon minus one.
 
         @returns the requested point.
-        
+
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
         if one of the given values exceed the permissible range.
-        
+
      */
     ::com::sun::star::geometry::RealBezierSegment2D	getBezierSegment( [in] long nPolygonIndex, [in] long nPointIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 
     //-------------------------------------------------------------------------
 
@@ -162,12 +154,12 @@ interface XBezierPolyPolygon2D : XPolyPolygon2D
         The index of the point in the polygon specified by
         nPolygonIndex, which is to be set.  This value must not
         exceed the number of points in this polygon.
-        
+
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
         if one of the given values exceed the permissible range.
      */
     void setBezierSegment( [in] ::com::sun::star::geometry::RealBezierSegment2D point, [in] long nPolygonIndex, [in] long nPointIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XBitmap.idl b/offapi/com/sun/star/rendering/XBitmap.idl
index e58ba975d..7777964cd 100644
--- a/offapi/com/sun/star/rendering/XBitmap.idl
+++ b/offapi/com/sun/star/rendering/XBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,26 +27,14 @@
 #ifndef __com_sun_star_rendering_XBitmap_idl__
 #define __com_sun_star_rendering_XBitmap_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
 #include <com/sun/star/geometry/IntegerSize2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
 #include <com/sun/star/geometry/RealSize2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
-interface XBitmapCanvas;
-
 /** This is a generic interface to a bitmap.<p>
 
     This interface contains the generic functionality to be used on
@@ -57,14 +45,14 @@ interface XBitmapCanvas;
 
     @since OOo 2.0
  */
-interface XBitmap : ::com::sun::star::uno::XInterface
+published interface XBitmap : ::com::sun::star::uno::XInterface
 {
     /** Query the size of the bitmap.<p>
 
         This method queries the bitmap size in pixel.<p>
 
         @return the bitmap size in pixel.
-      */
+     */
     ::com::sun::star::geometry::IntegerSize2D	getSize();
 
     //-------------------------------------------------------------------------
@@ -80,7 +68,7 @@ interface XBitmap : ::com::sun::star::uno::XInterface
 
         @return <TRUE/>, if the bitmap has alpha data, or <FALSE/> if
         not.
-      */
+     */
     boolean										hasAlpha();
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/rendering/XBitmapCanvas.idl b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
index fb4a2df3b..2dcab8f2a 100644
--- a/offapi/com/sun/star/rendering/XBitmapCanvas.idl
+++ b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,27 +27,12 @@
 #ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
 #define __com_sun_star_rendering_XBitmapCanvas_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
-#include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -61,7 +46,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XBitmapCanvas : XCanvas
+published interface XBitmapCanvas : XCanvas
 {
     /** This method copies a rectangular area from a place of one
         canvas to a place on another.<p>
@@ -74,7 +59,7 @@ interface XBitmapCanvas : XCanvas
         operation. The device color for both source and destination
         render state is ignored, the compositing mode only for the
         source render state.<p>
-        
+
         @param sourceCanvas
         Canvas from which to copy the bitmap data. Can be identical to
         the canvas this method is called on, but must be valid.
@@ -120,32 +105,15 @@ interface XBitmapCanvas : XCanvas
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the parameters are not within the specified range.
-     */	
-    void copyRect( [in] XBitmapCanvas sourceCanvas, 
+     */
+    void copyRect( [in] XBitmapCanvas sourceCanvas,
                    [in] ::com::sun::star::geometry::RealRectangle2D sourceRect, [in] ViewState sourceViewState, [in] RenderState sourceRenderState,
                    [in] ::com::sun::star::geometry::RealRectangle2D destRect, [in] ViewState destViewState, [in] RenderState destRenderState )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException);  
+                VolatileContentDestroyedException);
 
 };
 
-//=============================================================================
-
-// TODO: Multiple-inheritance interfaces
-
-/** This service provides the interfaces for a <type>XBitmapCanvas</type>
- */
-service BitmapCanvas
-{
-    /** Canvas interface, to issue rendering operations.
-     */
-    interface XBitmapCanvas;
-
-    /** Bitmap interface, to directly manipulate the pixel.
-     */
-    interface XBitmap;
-};
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/rendering/XBitmapPalette.idl b/offapi/com/sun/star/rendering/XBitmapPalette.idl
index f15073301..6ac46b2a1 100644
--- a/offapi/com/sun/star/rendering/XBitmapPalette.idl
+++ b/offapi/com/sun/star/rendering/XBitmapPalette.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_rendering_XBitmapPalette_idl__
 #define __com_sun_star_rendering_XBitmapPalette_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XBufferController.idl b/offapi/com/sun/star/rendering/XBufferController.idl
index 852b08aa9..1e3d871e4 100644
--- a/offapi/com/sun/star/rendering/XBufferController.idl
+++ b/offapi/com/sun/star/rendering/XBufferController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_rendering_XBufferController_idl__
 #define __com_sun_star_rendering_XBufferController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
 
 module com { module sun { module star { module rendering {
 
@@ -44,7 +40,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XBufferController : ::com::sun::star::uno::XInterface
+published interface XBufferController : ::com::sun::star::uno::XInterface
 {
     /** Create the given number of background buffers.<p>
 
@@ -61,15 +57,15 @@ interface XBufferController : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if nBuffers is smaller than one.
-      */
-    long 	createBuffers( [in] long nBuffers )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+     */
+    long    createBuffers( [in] long nBuffers )
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
-    /** Destroy all buffers generated via this object.    	
+    /** Destroy all buffers generated via this object.
      */
-    void 	destroyBuffers();
+    void    destroyBuffers();
 
     //-------------------------------------------------------------------------
 
@@ -95,7 +91,7 @@ interface XBufferController : ::com::sun::star::uno::XInterface
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if nBuffer is outside the permissible range.
      */
-    boolean	showBuffer( [in] boolean bUpdateAll ); 
+    boolean	showBuffer( [in] boolean bUpdateAll );
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/XCachedPrimitive.idl b/offapi/com/sun/star/rendering/XCachedPrimitive.idl
index 5870d1679..ff029831a 100644
--- a/offapi/com/sun/star/rendering/XCachedPrimitive.idl
+++ b/offapi/com/sun/star/rendering/XCachedPrimitive.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_rendering_XCachedPrimitive_idl__
 #define __com_sun_star_rendering_XCachedPrimitive_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -47,7 +41,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XCachedPrimitive : ::com::sun::star::uno::XInterface
+published interface XCachedPrimitive : ::com::sun::star::uno::XInterface
 {
     /** Redraw the cached primitive.<p>
 
diff --git a/offapi/com/sun/star/rendering/XCanvas.idl b/offapi/com/sun/star/rendering/XCanvas.idl
index 5d19f24bd..386420a25 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,66 +27,35 @@
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #define __com_sun_star_rendering_XCanvas_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealBezierSegment2D_idl__
 #include <com/sun/star/geometry/RealBezierSegment2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_Matrix2D_idl__
 #include <com/sun/star/geometry/Matrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontRequest_idl__
 #include <com/sun/star/rendering/FontRequest.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontInfo_idl__
 #include <com/sun/star/rendering/FontInfo.idl>
-#endif
-#ifndef __com_sun_star_rendering_Texture_idl__
 #include <com/sun/star/rendering/Texture.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
 #include <com/sun/star/rendering/StringContext.idl>
-#endif
-#ifndef __com_sun_star_rendering_StrokeAttributes_idl__
 #include <com/sun/star/rendering/StrokeAttributes.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 module com {  module sun {  module star {  module geometry {
-    interface XMapping2D;
+    published interface XMapping2D;
 }; }; }; };
 
 module com { module sun { module star { module rendering {
 
-interface XCanvasFont;
-interface XPolyPolygon2D;
-interface XCachedPrimitive;
-interface XBitmap;
-interface XGraphicDevice;
-interface XTextLayout;
+published interface XCanvasFont;
+published interface XPolyPolygon2D;
+published interface XCachedPrimitive;
+published interface XBitmap;
+published interface XGraphicDevice;
+published interface XTextLayout;
 
 /** Central interface for rendering.<p>
 
@@ -150,10 +119,10 @@ interface XTextLayout;
 
     @since OOo 2.0
  */
-interface XCanvas : ::com::sun::star::uno::XInterface
+published interface XCanvas : ::com::sun::star::uno::XInterface
 {
     /** Clear the whole canvas area.<p>
-        
+
         This method clears the whole canvas area to the device default
         color (e.g. white for a printer, transparent for an
         <type>XCustomSprite</type>).
@@ -162,7 +131,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
      /** Draw a point in device resolution on the device.
 
-         @param aPoint
+        @param aPoint
         The point to draw.
 
         @param aViewState
@@ -173,20 +142,20 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
      */
     void				drawPoint( [in] ::com::sun::star::geometry::RealPoint2D aPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
     /** Draw a line in device resolution width (i.e. one device	pixel
         wide).
 
-         @param aStartPoint
+        @param aStartPoint
         The start point of the line to draw.
 
-         @param aEndPoint
+        @param aEndPoint
         The end point of the line to draw.
 
         @param aViewState
@@ -197,10 +166,10 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
      */
     void				drawLine( [in] ::com::sun::star::geometry::RealPoint2D aStartPoint, [in] ::com::sun::star::geometry::RealPoint2D aEndPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -221,11 +190,11 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
      */
     void				drawBezier( [in] ::com::sun::star::geometry::RealBezierSegment2D aBezierSegment, [in] ::com::sun::star::geometry::RealPoint2D aEndPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException); 
- 
+        raises (com::sun::star::lang::IllegalArgumentException);
+
     //-------------------------------------------------------------------------
 
     /** Draw a poly-polygon in device resolution line width (i.e. the
@@ -241,13 +210,13 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         The render state to be used when drawing this polygon.
 
         @return a handle to the cached rendering output.
-        
+
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
      */
     XCachedPrimitive	drawPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -274,13 +243,13 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         Further attributes used to parameterize the stroking.
 
         @return a handle to the cached rendering output.
-        
+
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
      */
     XCachedPrimitive	strokePolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -312,10 +281,10 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         Further attributes used to parameterize the stroking.
 
         @return a handle to the cached rendering output.
-        
+
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
@@ -323,7 +292,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
      */
     XCachedPrimitive	strokeTexturedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> aTextures, [in] StrokeAttributes aStrokeAttributes )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException); 
+                VolatileContentDestroyedException);
 
     //-------------------------------------------------------------------------
 
@@ -360,10 +329,10 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         Further attributes used to parameterize the stroking.
 
         @return a handle to the cached rendering output.
-        
+
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
@@ -371,7 +340,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
      */
     XCachedPrimitive	strokeTextureMappedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> aTextures, [in] ::com::sun::star::geometry::XMapping2D xMapping, [in] StrokeAttributes aStrokeAttributes )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException); 
+                VolatileContentDestroyedException);
 
     //-------------------------------------------------------------------------
 
@@ -391,7 +360,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @param aRenderState
         The render state to be used when generating the outline.
-        
+
         @param aStrokeAttributes
         Further attributes used to parameterize the stroking.
 
@@ -400,10 +369,10 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
      */
-    XPolyPolygon2D 		queryStrokeShapes( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+    XPolyPolygon2D          queryStrokeShapes( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -421,15 +390,15 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @param aRenderState
         The render state to be used when filling this polygon.
-        
+
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.                
+        specified range.
      */
     XCachedPrimitive	fillPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -447,7 +416,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @param aRenderState
         The render state to be used when filling this polygon.
-        
+
         @param aTextures
         A sequence of texture definitions, with which to fill the
         polygonal area.
@@ -456,7 +425,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
@@ -464,7 +433,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
     */
     XCachedPrimitive	fillTexturedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> xTextures )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException); 
+                VolatileContentDestroyedException);
 
     //-------------------------------------------------------------------------
 
@@ -483,7 +452,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @param aRenderState
         The render state to be used when filling this polygon.
-        
+
         @param aTextures
         A sequence of texture definitions, with which to fill the
         polygonal area.
@@ -496,7 +465,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
@@ -504,7 +473,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
      */
     XCachedPrimitive	fillTextureMappedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> xTextures, [in] ::com::sun::star::geometry::XMapping2D xMapping )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException); 
+                VolatileContentDestroyedException);
 
     //-------------------------------------------------------------------------
 
@@ -515,7 +484,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         @param aExtraFontProperties
         Additional font properties to be applied when selecting this
         font. Normally, you should not need this parameter. Currently,
-        the following properties are recognized: 
+        the following properties are recognized:
         <ul>
 
             <il>Kerning: a <type>double</type> between 0 and 1, where
@@ -527,9 +496,9 @@ interface XCanvas : ::com::sun::star::uno::XInterface
             Hebrew. The default value, if this property is not
             specified, is <FALSE/>.</il>
 
-            <il>ExpandedSpacing: a <type>double</type> value which is added 
-            between all cell distances for this font. The default value for 
-            this property is zero. Use negative values for condensed output, 
+            <il>ExpandedSpacing: a <type>double</type> value which is added
+            between all cell distances for this font. The default value for
+            this property is zero. Use negative values for condensed output,
             and positive values for expanded output.</il>
 
             <il>OptionalLayoutFeatures: a sequence of <type
@@ -550,7 +519,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         if one of the parameters is not within the allowed range.
      */
     XCanvasFont				createFont( [in] FontRequest aFontRequest, [in] sequence< ::com::sun::star::beans::PropertyValue > aExtraFontProperties, [in] ::com::sun::star::geometry::Matrix2D aFontMatrix )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -574,7 +543,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         the permitted range.
      */
     sequence< FontInfo >	queryAvailableFonts( [in] FontInfo aFilter, [in] sequence< ::com::sun::star::beans::PropertyValue > aFontProperties )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -598,7 +567,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @param aRenderState
         The render state to be used when drawing this text.
-        
+
         @param nTextDirection
         A value from the <type>TextDirection</type> collection,
         denoting the main writing direction for this string. The main
@@ -610,10 +579,10 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
      */
     XCachedPrimitive		drawText( [in] StringContext aText, [in] XCanvasFont xFont, [in] ViewState aViewState, [in] RenderState aRenderState, [in] byte nTextDirection )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -642,10 +611,10 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
      */
     XCachedPrimitive		drawTextLayout( [in] XTextLayout xLayoutetText, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -671,7 +640,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
@@ -679,7 +648,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
      */
     XCachedPrimitive		drawBitmap( [in] XBitmap xBitmap, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException); 
+                VolatileContentDestroyedException);
 
     /** Render the given bitmap, with a global color modulation.<p>
 
@@ -710,7 +679,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
@@ -718,7 +687,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
      */
     XCachedPrimitive		drawBitmapModulated( [in] XBitmap xBitmap, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException); 
+                VolatileContentDestroyedException);
 
     //-------------------------------------------------------------------------
 
@@ -734,11 +703,6 @@ interface XCanvas : ::com::sun::star::uno::XInterface
     XGraphicDevice			getDevice();
 };
 
-//=============================================================================
-
-/// Service providing an <type>XCanvas</type> interface
-service Canvas: XCanvas;
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/rendering/XCanvasFont.idl b/offapi/com/sun/star/rendering/XCanvasFont.idl
index f6d3b549b..bb1598112 100644
--- a/offapi/com/sun/star/rendering/XCanvasFont.idl
+++ b/offapi/com/sun/star/rendering/XCanvasFont.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,47 +27,28 @@
 #ifndef __com_sun_star_rendering_XCanvasFont_idl__
 #define __com_sun_star_rendering_XCanvasFont_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontRequest_idl__
 #include <com/sun/star/rendering/FontRequest.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontMetrics_idl__
 #include <com/sun/star/rendering/FontMetrics.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif 
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif 
-#ifndef __com_sun_star_rendering_StringContext_idl__
 #include <com/sun/star/rendering/StringContext.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
 
-interface XCanvas;
-interface XTextLayout;
-interface XPolyPolygon2D;
+published interface XCanvas;
+published interface XTextLayout;
+published interface XPolyPolygon2D;
 
 /** This interface provides access to a specific, XCanvas-dependent
     font incarnation. This font is not universally usable, but belongs
     to the XCanvas it was queried from.
  */
-interface XCanvasFont : ::com::sun::star::uno::XInterface
+published interface XCanvasFont : ::com::sun::star::uno::XInterface
 {
     /** Create a text layout interface.<p>
 
@@ -122,7 +103,7 @@ interface XCanvasFont : ::com::sun::star::uno::XInterface
         contained in the list returned by this method can lead to
         visible disturbances.<p>
      */
-    sequence< double > 									getAvailableSizes();
+    sequence< double >                                      getAvailableSizes();
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/XColorSpace.idl b/offapi/com/sun/star/rendering/XColorSpace.idl
index b292aea2d..ed624c9b0 100644
--- a/offapi/com/sun/star/rendering/XColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XColorSpace.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,59 +27,16 @@
 #ifndef __com_sun_star_rendering_XColorSpace_idl__
 #define __com_sun_star_rendering_XColorSpace_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_rendering_ColorProfile_idl__
 #include <com/sun/star/rendering/ColorProfile.idl>
-#endif
+#include <com/sun/star/rendering/ColorComponent.idl>
+#include <com/sun/star/rendering/RGBColor.idl>
+#include <com/sun/star/rendering/ARGBColor.idl>
 
 module com { module sun { module star { module rendering {
 
-/// Shorthand for the device-dependent color components, and easier to read
-typedef double ColorComponent;
-typedef sequence<ColorComponent> Color;
-
-//=============================================================================
-
-/// RGB color triplet
-struct RGBColor
-{
-    /// Red component. Valid range is [0,1.0]
-    ColorComponent Red;
-    /// Green component. Valid range is [0,1.0]
-    ColorComponent Green;
-    /// Blue component. Valid range is [0,1.0]
-    ColorComponent Blue;
-};
-
-//=============================================================================
-
-/// ARGB color quad
-struct ARGBColor
-{
-    /** Alpha component.<p>
-
-        Valid range is [0,1.0], with 0.0 denoting fully transparent,
-        and 1.0 fully opaque.
-     */
-    ColorComponent Alpha;
-    /// Red component. Valid range is [0,1.0]
-    ColorComponent Red;
-    /// Green component. Valid range is [0,1.0]
-    ColorComponent Green;
-    /// Blue component. Valid range is [0,1.0]
-    ColorComponent Blue;
-};
-
-//=============================================================================
-
 /** Information how to interpret certain color data.<p>
 
     This interface encapsulates all information that is necessary to
@@ -95,14 +52,14 @@ struct ARGBColor
     e.g. <type>XIntegerBitmapColorSpace</type>, which use sequences of
     integers for color representation.<p>
  */
-interface XColorSpace
+published interface XColorSpace
 {
     /** Query type of this color space.<p>
 
         @return a value from the <type>ColorSpaceType</type> constant
         group.
      */
-    byte                     getType(); 
+    byte                     getType();
 
     /** Query the kind for each color component.<p>
 
@@ -112,7 +69,7 @@ interface XColorSpace
         tags, specifying for each component of a color value, to what
         color attribute (if any) it corresponds. The values must be
         one of the <type>ColorComponentTag</type> constants.<p>
-        
+
         At the same time, the number of elements in this sequence
         corresponds to the number of color channels for this color
         space.<p>
@@ -139,7 +96,7 @@ interface XColorSpace
         href="http://en.wikipedia.org/wiki/Color_temperature">here</a>.
      */
     sequence< ::com::sun::star::beans::PropertyValue > getProperties();
-    
+
 
     //=============================================================================
 
diff --git a/offapi/com/sun/star/rendering/XCustomSprite.idl b/offapi/com/sun/star/rendering/XCustomSprite.idl
index 03cb54261..bbc01238a 100644
--- a/offapi/com/sun/star/rendering/XCustomSprite.idl
+++ b/offapi/com/sun/star/rendering/XCustomSprite.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,22 +27,14 @@
 #ifndef __com_sun_star_rendering_XCustomSprite_idl__
 #define __com_sun_star_rendering_XCustomSprite_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_rendering_ViewState_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSprite_idl__
 #include <com/sun/star/rendering/XSprite.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
-interface XCanvas;
+published interface XCanvas;
 
 /** Interface to control a custom sprite object on a XSpriteCanvas.<p>
 
@@ -53,7 +45,7 @@ interface XCanvas;
     TODO: Maybe more than alpha has to be overridden from render state.
     TODO: Provide means to change the output area
  */
-interface XCustomSprite : XSprite
+published interface XCustomSprite : XSprite
 {
 
     /** Query a render canvas for this sprite's content.<p>
diff --git a/offapi/com/sun/star/rendering/XGraphicDevice.idl b/offapi/com/sun/star/rendering/XGraphicDevice.idl
index a07a52874..94f460ee8 100644
--- a/offapi/com/sun/star/rendering/XGraphicDevice.idl
+++ b/offapi/com/sun/star/rendering/XGraphicDevice.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,36 +27,20 @@
 #ifndef __com_sun_star_rendering_XGraphicDevice_idl__
 #define __com_sun_star_rendering_XGraphicDevice_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
 #include <com/sun/star/geometry/IntegerSize2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
 #include <com/sun/star/geometry/RealSize2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XLinePolyPolygon2D_idl__
 #include <com/sun/star/rendering/XLinePolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XBezierPolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
-interface XBitmap;
-interface XVolatileBitmap;
-interface XBufferController;
+published interface XBitmap;
+published interface XVolatileBitmap;
+published interface XBufferController;
 
 /* TODO: There's obviously a concept called window missing here, where
    methods such as bufferController, fullscreen mode etc . belong
@@ -78,29 +62,29 @@ interface XBufferController;
     have this state, it might even be that all windows on the screen
     share a common graphic device.
  */
-interface XGraphicDevice : ::com::sun::star::uno::XInterface
+published interface XGraphicDevice : ::com::sun::star::uno::XInterface
 {
     /** Query the controller for multi buffering functionality on this
-        graphic device. 
+        graphic device.
 
         If there is no such functionality available, the NULL
         reference is returned.
      */
-    XBufferController 							getBufferController();
+    XBufferController                           getBufferController();
 
     //-------------------------------------------------------------------------
 
-    /** Query the color space interface for this graphic device. 
+    /** Query the color space interface for this graphic device.
 
         This is to be used when interpreting or setting device color
         values.
      */
-    XColorSpace		 							getDeviceColorSpace();
+    XColorSpace		                            getDeviceColorSpace();
 
     //-------------------------------------------------------------------------
 
     /** Query the physical resolution of the device in pixel per
-        millimeter. 
+        millimeter.
 
         A special floating point value of +infinity here indicates
         "unknown", i.e. at the time of rendering undetermined or
@@ -111,7 +95,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    /** Query the physical dimensions of the device in millimeter. 
+    /** Query the physical dimensions of the device in millimeter.
 
         A special floating point value of +infinity here indicates
         "unknown", i.e. at the time of rendering undetermined or
@@ -130,7 +114,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         @param points
         The points of the poly-polygon, in a separate array for every polygon.
      */
-    XLinePolyPolygon2D 				createCompatibleLinePolyPolygon( [in] sequence< sequence< ::com::sun::star::geometry::RealPoint2D > > points );
+    XLinePolyPolygon2D                  createCompatibleLinePolyPolygon( [in] sequence< sequence< ::com::sun::star::geometry::RealPoint2D > > points );
 
     //-------------------------------------------------------------------------
 
@@ -140,7 +124,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         @param points
         The points of the poly-polygon, in a separate array for every polygon.
      */
-    XBezierPolyPolygon2D 			createCompatibleBezierPolyPolygon( [in] sequence< sequence< ::com::sun::star::geometry::RealBezierSegment2D > > points );
+    XBezierPolyPolygon2D            createCompatibleBezierPolyPolygon( [in] sequence< sequence< ::com::sun::star::geometry::RealBezierSegment2D > > points );
 
     //-------------------------------------------------------------------------
 
@@ -151,8 +135,8 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         Size of the requested bitmap in pixel. Both components of the
         size must be greater than 0
      */
-    XBitmap			 				createCompatibleBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+    XBitmap			                createCompatibleBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -171,8 +155,8 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         Size of the requested bitmap in pixel. Both components of the
         size must be greater than 0
      */
-    XVolatileBitmap	 				createVolatileBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+    XVolatileBitmap	                createVolatileBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -183,8 +167,8 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         Size of the requested bitmap in pixel. Both components of the
         size must be greater than 0
      */
-    XBitmap			 				createCompatibleAlphaBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+    XBitmap			                createCompatibleAlphaBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -204,8 +188,8 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         Size of the requested bitmap in pixel. Both components of the
         size must be greater than 0
      */
-    XVolatileBitmap	 				createVolatileAlphaBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+    XVolatileBitmap	                createVolatileAlphaBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -275,7 +259,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
           * "FourCrossingLinesHatch" - this hatching consists of
             vertical and horizontal lines plus diagonal lines in both
             directions.
-        </pre>     
+        </pre>
      */
     com::sun::star::lang::XMultiServiceFactory getParametricPolyPolygonFactory();
 
@@ -284,7 +268,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
     /** Tells whether this graphic device has a full screen mode,
         i.e. whether a window can cover the whole screen exclusively.
      */
-    boolean			 				hasFullScreenMode();
+    boolean			                hasFullScreenMode();
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl b/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
index 2c2d6d787..b76ca68e3 100644
--- a/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
+++ b/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XHalfFloatBitmap_idl__
 #define __com_sun_star_rendering_XHalfFloatBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XHalfFloatReadOnlyBitmap_idl__
 #include <com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
index e740949a9..25d9d4cf9 100644
--- a/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XHalfFloatReadOnlyBitmap_idl__
 #define __com_sun_star_rendering_XHalfFloatReadOnlyBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl b/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
index eae58b546..484509e77 100644
--- a/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XIeeeDoubleBitmap_idl__
 #define __com_sun_star_rendering_XIeeeDoubleBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XIeeeDoubleReadOnlyBitmap_idl__
 #include <com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
index a8fcfaa7a..1bd4a962a 100644
--- a/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XIeeeDoubleReadOnlyBitmap_idl__
 #define __com_sun_star_rendering_XIeeeDoubleReadOnlyBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl b/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
index 7b0b16f28..d1f52c4aa 100644
--- a/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XIeeeFloatBitmap_idl__
 #define __com_sun_star_rendering_XIeeeFloatBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XIeeeFloatReadOnlyBitmap_idl__
 #include <com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
index 6b7919c5a..124eb0f5b 100644
--- a/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XIeeeFloatReadOnlyBitmap_idl__
 #define __com_sun_star_rendering_XIeeeFloatReadOnlyBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIntegerBitmap.idl b/offapi/com/sun/star/rendering/XIntegerBitmap.idl
index 2950a8e42..e38151f84 100644
--- a/offapi/com/sun/star/rendering/XIntegerBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIntegerBitmap.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_rendering_XIntegerBitmap_idl__
 #define __com_sun_star_rendering_XIntegerBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_IntegerBitmapLayout_idl__
 #include <com/sun/star/rendering/IntegerBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_rendering_XIntegerReadOnlyBitmap_idl__
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl b/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
index 7940b7d93..319d7db6a 100644
--- a/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
 #define __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
 
-#ifndef __com_sun_star_rendering_XColorSpace_idl__ 
 #include <com/sun/star/rendering/XColorSpace.idl> 
-#endif 
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
index f3a0a51e1..095bb368e 100644
--- a/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XIntegerReadOnlyBitmap_idl__
 #define __com_sun_star_rendering_XIntegerReadOnlyBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_IntegerBitmapLayout_idl__
 #include <com/sun/star/rendering/IntegerBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl b/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
index ae4215aaa..61322ab53 100644
--- a/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_rendering_XLinePolyPolygon2D_idl__
 #define __com_sun_star_rendering_XLinePolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XPolyPolygon2D.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -46,12 +38,12 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XLinePolyPolygon2D : XPolyPolygon2D
+published interface XLinePolyPolygon2D : XPolyPolygon2D
 {
     /** Query subset of this poly-polygon, starting at the given
         polygon and the given point within that polygon, and
         containing the specified number of polygons and points in the
-        last polygon. 
+        last polygon.
 
         @param nPolygonIndex
         The index number of the polygon to start with extracting
@@ -74,7 +66,7 @@ interface XLinePolyPolygon2D : XPolyPolygon2D
         from the last polygon.
      */
     sequence< sequence< ::com::sun::star::geometry::RealPoint2D > > getPoints( [in] long nPolygonIndex, [in] long nNumberOfPolygons, [in] long nPointIndex, [in] long nNumberOfPoints )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 
     //-------------------------------------------------------------------------
 
@@ -97,17 +89,17 @@ interface XLinePolyPolygon2D : XPolyPolygon2D
         specified point data.
 
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
-        if one of the given values exceed the permissible range.        
+        if one of the given values exceed the permissible range.
      */
     void setPoints( [in] sequence< sequence< ::com::sun::star::geometry::RealPoint2D > > points, [in] long nPolygonIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 
     //-------------------------------------------------------------------------
 
     /** Get a single point from the poly-polygon
      */
     ::com::sun::star::geometry::RealPoint2D	getPoint( [in] long nPolygonIndex, [in] long nPointIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 
     //-------------------------------------------------------------------------
 
@@ -115,7 +107,7 @@ interface XLinePolyPolygon2D : XPolyPolygon2D
         the poly-polygon will not be changed by this method.
      */
     void setPoint( [in] ::com::sun::star::geometry::RealPoint2D point, [in] long nPolygonIndex, [in] long nPointIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 };
 
 }; }; }; };
diff --git a/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp b/offapi/com/sun/star/rendering/XMtfRenderer.idl
index 5ee3bf9e7..ac69a9a75 100644
--- a/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp
+++ b/offapi/com/sun/star/rendering/XMtfRenderer.idl
@@ -1,9 +1,8 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * Copyright 2010 Novell, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -26,18 +25,17 @@
  *
  ************************************************************************/
 
-#include "macros.h"
+#ifndef __com_sun_star_rendering_XMtfRenderer_idl__
+#define __com_sun_star_rendering_XMtfRenderer_idl__
+
+module com { module sun { module star { module rendering {
 
-#define _SHLWAPI_
-#include <shlwapi.h>
+    interface XMtfRenderer : ::com::sun::star::uno::XInterface
+    {
+        void setMetafile( [in] sequence< byte > aMtf );
+        void draw( [in] double fScaleX, [in] double fScaleY );
+    };
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathIsFileSpecW, 
-(
-    LPCWSTR lpPathW
-))
-{
-    AUTO_WSTR2STR(lpPath);
-    return PathIsFileSpecA(lpPathA);
-}
+}; }; }; };
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+#endif
diff --git a/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
index 7e400831e..f4f4da92b 100644
--- a/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_rendering_XParametricPolyPolygon2D_idl__
 #define __com_sun_star_rendering_XParametricPolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XPolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -52,13 +42,13 @@ module com { module sun { module star { module rendering {
     [0,1]x[0,1] rectangle. At least that is the dimension expected at
     other places. e.g. <type>Texture</type>.
  */
-interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
+published interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
 {
-    /** Query the polygonal outline at the specified value. 
+    /** Query the polygonal outline at the specified value.
 
         The returned outline should be clipped to the [0,1]x[0,1]
         rectangle.
-    
+
         @param t
         Parameter value in the range [0,1]. During painting, this
         range is swept through starting from 0. When using such a
@@ -67,8 +57,8 @@ interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
         with t (unless singularities in e.g. the resulting gradient
         are desired).
      */
-    XPolyPolygon2D 				getOutline( [in] double t )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+    XPolyPolygon2D                  getOutline( [in] double t )
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -79,23 +69,23 @@ interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
         Parameter value in the range [0,1]. During painting, this
         range is swept through starting from 0.
      */
-    sequence<ColorComponent> 	getColor( [in] double t )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+    sequence<ColorComponent>    getColor( [in] double t )
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
-    /** Query the color for a dedicated point in the plane. 
-    
+    /** Query the color for a dedicated point in the plane.
+
         @param point
         The permissible parameter range for point is [0,1]x[0,1]
      */
     sequence<ColorComponent>	getPointColor( [in] ::com::sun::star::geometry::RealPoint2D point )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
     /** Query the color space employed by this object
-    
+
         @return the color space the colors generated by this object
         are to be interpreted in.
      */
diff --git a/offapi/com/sun/star/rendering/XPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
index 49005e491..ef3cec100 100644
--- a/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
 #define __com_sun_star_rendering_XPolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_FillRule_idl__
 #include <com/sun/star/rendering/FillRule.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -49,9 +39,9 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
+published interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
 {
-    /** Add the specified poly-polygon at the given position. 
+    /** Add the specified poly-polygon at the given position.
 
         One can do symbolic path construction with this method. The
         poly-polygons added by this method are not joined in the sense
@@ -82,7 +72,7 @@ interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
         <type>XLinePolyPolygon2D</type>).
      */
     void		addPolyPolygon( [in] ::com::sun::star::geometry::RealPoint2D position, [in] XPolyPolygon2D polyPolygon )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -99,7 +89,7 @@ interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
         for. Must be in the range [0,getNumberOfPolygons()-1].
      */
     long		getNumberOfPolygonPoints( [in] long polygon )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 
     //-------------------------------------------------------------------------
 
@@ -120,7 +110,7 @@ interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
     /** Query whether the specified polygon outline is closed.
      */
     boolean		isClosed( [in] long index )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 
     //-------------------------------------------------------------------------
 
@@ -128,7 +118,7 @@ interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
         as the index to affect all polygons of this poly-polygon.
      */
     void		setClosed( [in] long index, [in] boolean closedState )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XSimpleCanvas.idl b/offapi/com/sun/star/rendering/XSimpleCanvas.idl
index c9d589750..00b1dc1ea 100644
--- a/offapi/com/sun/star/rendering/XSimpleCanvas.idl
+++ b/offapi/com/sun/star/rendering/XSimpleCanvas.idl
@@ -27,30 +27,14 @@
 #ifndef __com_sun_star_rendering_XSimpleCanvas_idl__ 
 #define __com_sun_star_rendering_XSimpleCanvas_idl__
 
-#ifndef __com_sun_star_util_Color_idl__ 
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
 #include <com/sun/star/rendering/StringContext.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontMetrics_idl__
 #include <com/sun/star/rendering/FontMetrics.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/rendering/XSprite.idl b/offapi/com/sun/star/rendering/XSprite.idl
index caeebf656..76348558f 100644
--- a/offapi/com/sun/star/rendering/XSprite.idl
+++ b/offapi/com/sun/star/rendering/XSprite.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_rendering_XSprite_idl__
 #define __com_sun_star_rendering_XSprite_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -54,7 +42,7 @@ module com { module sun { module star { module rendering {
     <type>XSpriteCanvas</type>. Sprites are moving, back-buffered
     objects.<p>
  */
-interface XSprite : ::com::sun::star::uno::XInterface
+published interface XSprite : ::com::sun::star::uno::XInterface
 {
     /** Set overall transparency of the sprite.<p>
 
@@ -70,10 +58,10 @@ interface XSprite : ::com::sun::star::uno::XInterface
         background. Valid range is [0,1].
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if nAlpha is not within the permissible range.        
+        if nAlpha is not within the permissible range.
      */
     void setAlpha( [in] double nAlpha )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -100,15 +88,15 @@ interface XSprite : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
      */
     void move( [in] ::com::sun::star::geometry::RealPoint2D aNewPos, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
     /** Apply a local transformation to the sprite.<p>
-        
+
         The given transformation matrix locally transforms the sprite
         shape. If this transformation contains translational
         components, be aware that sprite content moved beyond the
@@ -135,7 +123,7 @@ interface XSprite : ::com::sun::star::uno::XInterface
         if the given transformation matrix is singular.
      */
     void transform( [in] com::sun::star::geometry::AffineMatrix2D aTransformation )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -171,7 +159,7 @@ interface XSprite : ::com::sun::star::uno::XInterface
         @param aClip
         The clip poly-polygon to apply.
      */
-    void clip( [in] XPolyPolygon2D aClip ); 
+    void clip( [in] XPolyPolygon2D aClip );
 
     //-------------------------------------------------------------------------
 
@@ -188,7 +176,7 @@ interface XSprite : ::com::sun::star::uno::XInterface
         irregular floating point values here, the order position for
         sprites with such a priority value is undefined.
      */
-    void setPriority( [in] double nPriority ); 
+    void setPriority( [in] double nPriority );
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/XSpriteCanvas.idl b/offapi/com/sun/star/rendering/XSpriteCanvas.idl
index 0f1987158..6fe7f3741 100644
--- a/offapi/com/sun/star/rendering/XSpriteCanvas.idl
+++ b/offapi/com/sun/star/rendering/XSpriteCanvas.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,24 +27,16 @@
 #ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
 #define __com_sun_star_rendering_XSpriteCanvas_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
 #include <com/sun/star/rendering/XBitmapCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_XAnimation_idl__
 #include <com/sun/star/rendering/XAnimation.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
-interface XSprite;
-interface XAnimatedSprite;
-interface XCustomSprite;
+published interface XSprite;
+published interface XAnimatedSprite;
+published interface XCustomSprite;
 
 /** Specialization of a XBitmapCanvas, where moving, animated objects
     (called sprites) are supported.<p>
@@ -62,21 +54,21 @@ interface XCustomSprite;
     you don't need sprite functionality, and don't want the
     updateScreen hassle, simply use the XBitmapCanvas.
  */
-interface XSpriteCanvas : XBitmapCanvas
+published interface XSpriteCanvas : XBitmapCanvas
 {
     /** Create a sprite object from the specified animation
         sequence. A sprite is a back-buffered object with its own,
         independent animation.
-     */	
+     */
     XAnimatedSprite	createSpriteFromAnimation( [in] XAnimation animation )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     /** Create a sprite object from the specified animation
         sequence.
 
         A sprite is a back-buffered object with its own,
         independent animation.
-        
+
         @param animationBitmaps
         Sequence of bitmaps. The bitmaps don't need to have the same
         size, but they are all rendered with their left, top edges
@@ -89,12 +81,12 @@ interface XSpriteCanvas : XBitmapCanvas
 
         @throws <type>VolatileContentDestroyedException</type>
         if at least one of the bitmap is volatile, and its content has been destroyed by the system.
-     */	
+     */
     XAnimatedSprite	createSpriteFromBitmaps( [in] sequence<XBitmap> animationBitmaps, [in] byte interpolationMode )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException); 
+                VolatileContentDestroyedException);
 
-    /** Create a custom, user-handles-it-all sprite object. 
+    /** Create a custom, user-handles-it-all sprite object.
 
         A sprite is a back-buffered object with its own, independent
         animation.
@@ -106,9 +98,9 @@ interface XSpriteCanvas : XBitmapCanvas
         be greater than zero.
 
         @return an interface to a custom sprite object.
-     */	
+     */
     XCustomSprite createCustomSprite( [in] ::com::sun::star::geometry::RealSize2D spriteSize )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     /** Create a cloned version of an already existing sprite
         object.
@@ -125,13 +117,13 @@ interface XSpriteCanvas : XBitmapCanvas
         IllegalArgumentException.
 
         @return an interface to a sprite object.
-     */	
+     */
     XSprite createClonedSprite( [in] XSprite original )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     /** Tells the sprite canvas to now update the screen
-         representation.
-        
+        representation.
+
         Required to display rendered changes to the canvas, and
         updates to stopped animations and XCustomSprites in
         general. This method will return only after the screen update
diff --git a/offapi/com/sun/star/rendering/XTextLayout.idl b/offapi/com/sun/star/rendering/XTextLayout.idl
index 2f4dad0e1..11b61baa6 100644
--- a/offapi/com/sun/star/rendering/XTextLayout.idl
+++ b/offapi/com/sun/star/rendering/XTextLayout.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,46 +27,24 @@
 #ifndef __com_sun_star_rendering_XTextLayout_idl__
 #define __com_sun_star_rendering_XTextLayout_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealBezierSegment2D_idl__
 #include <com/sun/star/geometry/RealBezierSegment2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
 #include <com/sun/star/rendering/StringContext.idl>
-#endif
-#ifndef __com_sun_star_rendering_TextHit_idl__
 #include <com/sun/star/rendering/TextHit.idl>
-#endif
-#ifndef __com_sun_star_rendering_Caret_idl__
 #include <com/sun/star/rendering/Caret.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
 
-interface XCanvas;
-interface XCanvasFont;
-interface XPolyPolygon2D;
+published interface XCanvas;
+published interface XCanvasFont;
+published interface XPolyPolygon2D;
 
 /** This is the central interface for text layouting.<p>
 
@@ -92,7 +70,7 @@ interface XPolyPolygon2D;
 
     @since OOo 2.0
  */
-interface XTextLayout : ::com::sun::star::uno::XInterface
+published interface XTextLayout : ::com::sun::star::uno::XInterface
 {
     /** Extract the polygonal shapes of the layouted text.<p>
 
@@ -102,12 +80,12 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         @returns a sequence of <type>XPolyPolygon2D</type> in font
         coordinate space, one for every glyph.
      */
-    sequence<XPolyPolygon2D>	queryTextShapes(); 
+    sequence<XPolyPolygon2D>	queryTextShapes();
 
     //-------------------------------------------------------------------------
 
     /** Query the ink bounding boxes for every glyph in the layouted
-         text.<p>
+        text.<p>
 
         Ink, or tight bounding boxes in this case means that for
         e.g. an "a", the bounding box for the
@@ -120,7 +98,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
 
         @see <member>XTextLayout::queryMeasures()</member>
      */
-    sequence<::com::sun::star::geometry::RealRectangle2D >	queryInkMeasures(); 
+    sequence<::com::sun::star::geometry::RealRectangle2D >	queryInkMeasures();
 
     //-------------------------------------------------------------------------
 
@@ -137,7 +115,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
 
         @see <member>XTextLayout::queryInkMeasures()</member>
      */
-    sequence<::com::sun::star::geometry::RealRectangle2D>	queryMeasures(); 
+    sequence<::com::sun::star::geometry::RealRectangle2D>	queryMeasures();
 
     //-------------------------------------------------------------------------
 
@@ -159,7 +137,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
 
         @see <member>XTextLayout::applyLogicalAdvancements()</member>
      */
-    sequence<double>			queryLogicalAdvancements(); 
+    sequence<double>			queryLogicalAdvancements();
 
     //-------------------------------------------------------------------------
 
@@ -184,7 +162,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         characters in the text.
      */
     void						applyLogicalAdvancements( [in] sequence< double > aAdvancements )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -197,7 +175,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         @return the overall bounding box for the given layout, in font
         coordinate space.
      */
-    ::com::sun::star::geometry::RealRectangle2D   queryTextBounds(); 
+    ::com::sun::star::geometry::RealRectangle2D   queryTextBounds();
 
     //-------------------------------------------------------------------------
 
@@ -223,7 +201,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         if nSize is 0 or negative.
      */
     double justify( [in] double nSize )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -257,10 +235,10 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         might even be significantly larger than nSize.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the parameters are not in the valid range.        
+        if one of the parameters are not in the valid range.
      */
     double combinedJustify( [in] sequence< XTextLayout > aNextLayouts, [in] double nSize )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -274,7 +252,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         underlying character index for.
 
      */
-    TextHit getTextHit( [in] ::com::sun::star::geometry::RealPoint2D aHitPoint ); 
+    TextHit getTextHit( [in] ::com::sun::star::geometry::RealPoint2D aHitPoint );
 
     //-------------------------------------------------------------------------
 
@@ -282,7 +260,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
 
         This method generates caret information for a given insertion
         point in the layout text.<p>
-    
+
         @param nInsertionIndex
         The insertion index, as e.g. returned by
         <member>XTextLayout::getTextHit()</member>. This value must be
@@ -298,9 +276,9 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
         if nInsertionIndex is outside the permissible range.
      */
-    Caret getCaret( [in] long nInsertionIndex, 
+    Caret getCaret( [in] long nInsertionIndex,
                     [in] boolean bExcludeLigatures )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 
     //-------------------------------------------------------------------------
 
@@ -324,10 +302,10 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         if nStartIndex or nCaretAdvancement is outside the permissible
         range.
      */
-    long getNextInsertionIndex( [in] long nStartIndex, 
-                                [in] long nCaretAdvancement, 
+    long getNextInsertionIndex( [in] long nStartIndex,
+                                [in] long nCaretAdvancement,
                                 [in] boolean bExcludeLigatures )
-        raises (com::sun::star::lang::IndexOutOfBoundsException); 
+        raises (com::sun::star::lang::IndexOutOfBoundsException);
 
     //-------------------------------------------------------------------------
 
@@ -349,7 +327,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         if nStartIndex or nEndIndex are outside the permissible
         range.
      */
-    XPolyPolygon2D queryVisualHighlighting( [in] long nStartIndex, 
+    XPolyPolygon2D queryVisualHighlighting( [in] long nStartIndex,
                                             [in] long nEndIndex )
         raises (com::sun::star::lang::IndexOutOfBoundsException);
 
@@ -375,7 +353,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         if nStartIndex or nEndIndex are outside the permissible
         range.
      */
-    XPolyPolygon2D queryLogicalHighlighting( [in] long nStartIndex, 
+    XPolyPolygon2D queryLogicalHighlighting( [in] long nStartIndex,
                                              [in] long nEndIndex )
         raises (com::sun::star::lang::IndexOutOfBoundsException);
 
@@ -419,7 +397,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
 
     /** Request the text this layout contains.
 
-        @returns the text this layout contains. 
+        @returns the text this layout contains.
      */
     StringContext getText();
 
diff --git a/offapi/com/sun/star/rendering/XVolatileBitmap.idl b/offapi/com/sun/star/rendering/XVolatileBitmap.idl
index f94bcf2dc..7969c7747 100644
--- a/offapi/com/sun/star/rendering/XVolatileBitmap.idl
+++ b/offapi/com/sun/star/rendering/XVolatileBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,25 +27,23 @@
 #ifndef __com_sun_star_rendering_XVolatileBitmap_idl__
 #define __com_sun_star_rendering_XVolatileBitmap_idl__
 
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
 /** This is a specialized interface to a volatile bitmap (which can
     become invalid at any point in time).
  */
-interface XVolatileBitmap : XBitmap
-{		
-    /** Query whether this volatile bitmap still has valid content. 
+published interface XVolatileBitmap : XBitmap
+{
+    /** Query whether this volatile bitmap still has valid content.
 
         As the video RAM allocated to this bitmap can be reclaimed at
         any time, a return value of true here does not imply that the
         next draw operation with this bitmap will succeed. Instead,
         the exception VolatileContentDestroyed might then be thrown,
         if lost bitmap data is accessed.
-     */	
+     */
     boolean	isValid();
 };
 
diff --git a/offapi/com/sun/star/report/Calculation.idl b/offapi/com/sun/star/report/Calculation.idl
index 38f130981..3e4611345 100644
--- a/offapi/com/sun/star/report/Calculation.idl
+++ b/offapi/com/sun/star/report/Calculation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_Calculation_idl__ 
-#define __com_sun_star_report_Calculation_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report { 
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_report_Calculation_idl__
+#define __com_sun_star_report_Calculation_idl__
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
 /** Specifies how to calculate a value.
     @see XFormattedField
  */
-constants Calculation
-{ 
-    //------------------------------------------------------------------------- 
-     
+published constants Calculation
+{
+    //-------------------------------------------------------------------------
+
     /** returns the average of a field.
      */
     const short NONE = 0;
@@ -76,7 +76,7 @@ constants Calculation
     /** returns the smallest value from the field.
     */
     const short MINIMUM = 8;
-    
+
     /** returns the most frequently returning value from the field.
     */
     const short MODE = 9;
@@ -124,13 +124,13 @@ constants Calculation
     /** returns the weighted average for the field.
     */
     const short WEIGHTEDAVG = 20;
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/FixedLine.idl b/offapi/com/sun/star/report/FixedLine.idl
new file mode 100644
index 000000000..76856b426
--- /dev/null
+++ b/offapi/com/sun/star/report/FixedLine.idl
@@ -0,0 +1,45 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_FixedLine_idl__
+#define __com_sun_star_report_FixedLine_idl__
+
+#include <com/sun/star/report/XFixedLine.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+service FixedLine : XFixedLine;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/FixedText.idl b/offapi/com/sun/star/report/FixedText.idl
new file mode 100644
index 000000000..74bb17680
--- /dev/null
+++ b/offapi/com/sun/star/report/FixedText.idl
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_FixedText_idl__
+#define __com_sun_star_report_FixedText_idl__
+
+
+#include <com/sun/star/report/XFixedText.idl>
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+service FixedText : XFixedText;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/ForceNewPage.idl b/offapi/com/sun/star/report/ForceNewPage.idl
index 3387b9a8c..3be6d1aeb 100644
--- a/offapi/com/sun/star/report/ForceNewPage.idl
+++ b/offapi/com/sun/star/report/ForceNewPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_ForceNewPage_idl__ 
-#define __com_sun_star_report_ForceNewPage_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report { 
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_report_ForceNewPage_idl__
+#define __com_sun_star_report_ForceNewPage_idl__
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
 /** Specifies if the section will be printed on an separate page.
     <p>This does not apply to page header or page footer.</p>
     @see XSection
  */
-constants ForceNewPage
-{ 
-    //------------------------------------------------------------------------- 
-     
+published constants ForceNewPage
+{
+    //-------------------------------------------------------------------------
+
     /** The current section is printed on the current page.
      */
     const short NONE = 0;
@@ -57,13 +57,13 @@ constants ForceNewPage
     /** The current section is printed at the top of a new page as well as the next section.
      */
     const short BEFORE_AFTER_SECTION = 3;
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/FormatCondition.idl b/offapi/com/sun/star/report/FormatCondition.idl
new file mode 100644
index 000000000..f1449d114
--- /dev/null
+++ b/offapi/com/sun/star/report/FormatCondition.idl
@@ -0,0 +1,40 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_FormatCondition_idl__
+#define __com_sun_star_report_FormatCondition_idl__
+
+#include <com/sun/star/report/XFormatCondition.idl>
+
+//=============================================================================
+ module com {  module sun {  module star {  module report {
+//=============================================================================
+
+service FormatCondition : XFormatCondition;
+//=============================================================================
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/report/FormattedField.idl b/offapi/com/sun/star/report/FormattedField.idl
new file mode 100644
index 000000000..ae1f96594
--- /dev/null
+++ b/offapi/com/sun/star/report/FormattedField.idl
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_FormattedField_idl__
+#define __com_sun_star_report_FormattedField_idl__
+
+#include <com/sun/star/report/XFormattedField.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+service FormattedField : XFormattedField;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/Function.idl b/offapi/com/sun/star/report/Function.idl
new file mode 100644
index 000000000..b829b2716
--- /dev/null
+++ b/offapi/com/sun/star/report/Function.idl
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_Function_idl__
+#define __com_sun_star_report_Function_idl__
+
+#include <com/sun/star/report/XFunction.idl>
+
+//=============================================================================
+ module com {  module sun {  module star {  module report {
+//=============================================================================
+
+service Function : XFunction
+{
+    create();
+};
+//=============================================================================
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/report/Group.idl b/offapi/com/sun/star/report/Group.idl
new file mode 100644
index 000000000..650a0cba6
--- /dev/null
+++ b/offapi/com/sun/star/report/Group.idl
@@ -0,0 +1,45 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_Group_idl__
+#define __com_sun_star_report_Group_idl__
+
+#include <com/sun/star/report/XGroup.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+service Group : XGroup;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/GroupKeepTogether.idl b/offapi/com/sun/star/report/GroupKeepTogether.idl
index a117d09bd..1a6adbca5 100644
--- a/offapi/com/sun/star/report/GroupKeepTogether.idl
+++ b/offapi/com/sun/star/report/GroupKeepTogether.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_GroupKeepTogether_idl__ 
-#define __com_sun_star_report_GroupKeepTogether_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report { 
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_report_GroupKeepTogether_idl__
+#define __com_sun_star_report_GroupKeepTogether_idl__
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
 /** Specifies if groups in a multi column report where the group has the property
     <member scope="XGroup">KeepTogether</member> set to WHOLE_GROUP or WITH_FIRST_DETAIL will keep together by page or column.
     @see XGroup
  */
-constants GroupKeepTogether
-{ 
-    //------------------------------------------------------------------------- 
-     
+published constants GroupKeepTogether
+{
+    //-------------------------------------------------------------------------
+
     /** Groups are kept together by page.
      */
     const short PER_PAGE = 0;
@@ -49,13 +49,13 @@ constants GroupKeepTogether
     /** Groups are kept together by column.
      */
     const short PER_COLUMN = 1;
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/GroupOn.idl b/offapi/com/sun/star/report/GroupOn.idl
index 653ef2f44..8a9cbecc1 100644
--- a/offapi/com/sun/star/report/GroupOn.idl
+++ b/offapi/com/sun/star/report/GroupOn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_GroupOn_idl__ 
-#define __com_sun_star_report_GroupOn_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report { 
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_report_GroupOn_idl__
+#define __com_sun_star_report_GroupOn_idl__
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
 /** Specifies how to group data.
     @see XGroup
  */
-constants GroupOn
-{ 
-    //------------------------------------------------------------------------- 
-     
+published constants GroupOn
+{
+    //-------------------------------------------------------------------------
+
     /** The same value in the column value or expression.
      */
     const short DEFAULT = 0;
@@ -49,7 +49,7 @@ constants GroupOn
      */
     const short PREFIX_CHARACTERS = 1;
 
-    /** Dates in the same calendar year. 
+    /** Dates in the same calendar year.
     */
     const short YEAR= 2;
 
@@ -72,7 +72,7 @@ constants GroupOn
     /** Times in the same hour.
     */
     const short HOUR = 7;
-    
+
     /** Times in the same minute.
     */
     const short MINUTE = 8;
@@ -80,13 +80,13 @@ constants GroupOn
     /** Values within an interval you specify.
     */
     const short INTERVAL = 9;
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/Groups.idl b/offapi/com/sun/star/report/Groups.idl
new file mode 100644
index 000000000..c9986cc36
--- /dev/null
+++ b/offapi/com/sun/star/report/Groups.idl
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_Groups_idl__
+#define __com_sun_star_report_Groups_idl__
+
+#include <com/sun/star/report/XGroups.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+service Groups : XGroups;
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/report/ImageControl.idl b/offapi/com/sun/star/report/ImageControl.idl
new file mode 100644
index 000000000..d0bd03034
--- /dev/null
+++ b/offapi/com/sun/star/report/ImageControl.idl
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_ImageControl_idl__
+#define __com_sun_star_report_ImageControl_idl__
+
+#include <com/sun/star/report/XImageControl.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+service ImageControl : XImageControl;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/KeepTogether.idl b/offapi/com/sun/star/report/KeepTogether.idl
index 98f5cb1d2..f004c3f17 100644
--- a/offapi/com/sun/star/report/KeepTogether.idl
+++ b/offapi/com/sun/star/report/KeepTogether.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_KeepTogether_idl__ 
-#define __com_sun_star_report_KeepTogether_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report { 
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_report_KeepTogether_idl__
+#define __com_sun_star_report_KeepTogether_idl__
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
 /** Specifies that a group header, detail, and footer section is printed on the same page.
     @see XGroup
  */
-constants KeepTogether
-{ 
-    //------------------------------------------------------------------------- 
-     
+published constants KeepTogether
+{
+    //-------------------------------------------------------------------------
+
     /** Prints the group without keeping the header, detail, and footer together on the same page.
      */
     const short NO = 0;
@@ -52,13 +52,13 @@ constants KeepTogether
     /** Prints the group header on a page when the first detail record can fit on the same page.
     */
     const short WITH_FIRST_DETAIL = 2;
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/ReportControlFormat.idl b/offapi/com/sun/star/report/ReportControlFormat.idl
new file mode 100644
index 000000000..00de8134b
--- /dev/null
+++ b/offapi/com/sun/star/report/ReportControlFormat.idl
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_ReportControlFormat_idl__
+#define __com_sun_star_report_ReportControlFormat_idl__
+
+#include <com/sun/star/report/XReportControlFormat.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+service ReportControlFormat : XReportControlFormat;
+//=============================================================================
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/report/ReportControlModel.idl b/offapi/com/sun/star/report/ReportControlModel.idl
new file mode 100644
index 000000000..a5b2ab314
--- /dev/null
+++ b/offapi/com/sun/star/report/ReportControlModel.idl
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_ReportControlModel_idl__
+#define __com_sun_star_report_ReportControlModel_idl__
+
+#include <com/sun/star/report/XReportControlModel.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+service ReportControlModel : XReportControlModel;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/sal/osl/os2/secimpl.h b/offapi/com/sun/star/report/ReportDefinition.idl
index 14b4d1ad4..8025ff971 100644
--- a/sal/osl/os2/secimpl.h
+++ b/offapi/com/sun/star/report/ReportDefinition.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,28 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_report_ReportDefinition_idl__
+#define __com_sun_star_report_ReportDefinition_idl__
 
-#ifndef _OSL_SECURITYIMPL_H_
-#define _OSL_SECURITYIMPL_H_
+#include <com/sun/star/report/XReportDefinition.idl>
 
-#include <osl/security.h>
+//=============================================================================
 
-#define PASSWD_BUFFER_SIZE 1024		/* recommended, see 'man getpwnam_r' */
+ module com {  module sun {  module star {  module report {
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+//=============================================================================
 
-typedef struct _oslSecurityImpl {
-    int           m_isValid;
-    struct passwd m_pPasswd;
-    sal_Char          m_buffer[PASSWD_BUFFER_SIZE];
-} oslSecurityImpl;
+service ReportDefinition : XReportDefinition;
 
-#ifdef __cplusplus
-}
-#endif
+//=============================================================================
 
-#endif 
+}; }; }; };
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+#endif
diff --git a/offapi/com/sun/star/report/ReportPrintOption.idl b/offapi/com/sun/star/report/ReportPrintOption.idl
index 6d42a7800..a73db5436 100644
--- a/offapi/com/sun/star/report/ReportPrintOption.idl
+++ b/offapi/com/sun/star/report/ReportPrintOption.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_ReportPrintOption_idl__ 
-#define __com_sun_star_report_ReportPrintOption_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report { 
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_report_ReportPrintOption_idl__
+#define __com_sun_star_report_ReportPrintOption_idl__
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
 /** Specifies whether a page header or footer is printed on the same page as the report header or report footer.
  */
-constants ReportPrintOption
-{ 
-    //------------------------------------------------------------------------- 
-     
-    /** The page header/footer is printed on all pages. 
+published constants ReportPrintOption
+{
+    //-------------------------------------------------------------------------
+
+    /** The page header/footer is printed on all pages.
      */
     const short ALL_PAGES = 0;
 
@@ -55,13 +55,13 @@ constants ReportPrintOption
     /** The page header/footer is not printed on the same page as the report header or footer.
      */
     const short NOT_WITH_REPORT_HEADER_FOOTER = 3;
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/Section.idl b/offapi/com/sun/star/report/Section.idl
new file mode 100644
index 000000000..f1e44aabd
--- /dev/null
+++ b/offapi/com/sun/star/report/Section.idl
@@ -0,0 +1,48 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_Section_idl__
+#define __com_sun_star_report_Section_idl__
+
+#include <com/sun/star/report/XSection.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+ interface XGroup;
+//=============================================================================
+
+
+
+service Section : XSection;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/SectionPageBreak.idl b/offapi/com/sun/star/report/SectionPageBreak.idl
index 6efbce102..abf935201 100644
--- a/offapi/com/sun/star/report/SectionPageBreak.idl
+++ b/offapi/com/sun/star/report/SectionPageBreak.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_SectionPageBreak_idl__ 
-#define __com_sun_star_report_SectionPageBreak_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report { 
- 
-//============================================================================= 
- 
-/** Specifies that page breaks are allowed inside this section. 
+#ifndef __com_sun_star_report_SectionPageBreak_idl__
+#define __com_sun_star_report_SectionPageBreak_idl__
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+/** Specifies that page breaks are allowed inside this section.
     @see XSection
  */
-constants SectionPageBreak
+published constants SectionPageBreak
 {
-    //------------------------------------------------------------------------- 
-     
+    //-------------------------------------------------------------------------
+
     /** Page breaks will never be inserted. If the section doesn't fit on a page than the content will be cut.
      */
     const short NONE = 0;
@@ -52,9 +52,9 @@ constants SectionPageBreak
     /** If the section doesn't fit on page than a page break will be inserted as long as the section fits.
      */
     const short AUTO = 2;
-}; 
-//============================================================================= 
-}; }; }; }; 
-/*============================================================================= 
-=============================================================================*/ 
-#endif 
+};
+//=============================================================================
+}; }; }; };
+/*=============================================================================
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/Shape.idl b/offapi/com/sun/star/report/Shape.idl
new file mode 100644
index 000000000..0f711390c
--- /dev/null
+++ b/offapi/com/sun/star/report/Shape.idl
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_report_Shape_idl__
+#define __com_sun_star_report_Shape_idl__
+
+#include <com/sun/star/report/XShape.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+service Shape : XShape;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XFixedLine.idl b/offapi/com/sun/star/report/XFixedLine.idl
index c7ea3c200..32ea1898a 100644
--- a/offapi/com/sun/star/report/XFixedLine.idl
+++ b/offapi/com/sun/star/report/XFixedLine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XFixedLine_idl__ 
-#define __com_sun_star_report_XFixedLine_idl__ 
- 
-#ifndef __com_sun_star_report_XReportControlModel_idl__ 
-#include <com/sun/star/report/XReportControlModel.idl> 
-#endif
-#ifndef __com_sun_star_drawing_CircleKind_idl__
+#ifndef __com_sun_star_report_XFixedLine_idl__
+#define __com_sun_star_report_XFixedLine_idl__
+
+#include <com/sun/star/report/XReportControlModel.idl>
 #include <com/sun/star/drawing/CircleKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineStyle_idl__ 
-#include <com/sun/star/drawing/LineStyle.idl> 
-#endif 
- 
-#ifndef __com_sun_star_util_Color_idl__
+#include <com/sun/star/drawing/LineStyle.idl>
+
 #include <com/sun/star/util/Color.idl>
-#endif
+#include <com/sun/star/drawing/LineDash.idl>
+//=============================================================================
 
-#ifndef __com_sun_star_drawing_LineDash_idl__ 
-#include <com/sun/star/drawing/LineDash.idl> 
-#endif 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- 
-//============================================================================= 
-interface XFixedLine
-{ 
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+published interface XFixedLine
+{
     interface XReportControlModel;
 
     /** specifies the orientation of the control.
@@ -68,41 +57,40 @@ interface XFixedLine
 
     /** This property contains the type of the line.
      */
-    [attribute,bound] com::sun::star::drawing::LineStyle LineStyle; 
- 
-    //------------------------------------------------------------------------- 
-     
+    [attribute,bound] com::sun::star::drawing::LineStyle LineStyle;
+
+    //-------------------------------------------------------------------------
+
     /** This property contains the dash of the line.
      */
-    [attribute,bound] com::sun::star::drawing::LineDash LineDash; 
- 
-    //------------------------------------------------------------------------- 
-     
+    [attribute,bound] com::sun::star::drawing::LineDash LineDash;
+
+    //-------------------------------------------------------------------------
+
     /** This property contains the line color.
      */
-    [attribute,bound] com::sun::star::util::Color LineColor; 
- 
-    //------------------------------------------------------------------------- 
-     
+    [attribute,bound] com::sun::star::util::Color LineColor;
+
+    //-------------------------------------------------------------------------
+
     /** This property contains the extent of transparency.
      */
-    [attribute,bound] short LineTransparence; 
- 
-    //------------------------------------------------------------------------- 
-     
+    [attribute,bound] short LineTransparence;
+
+    //-------------------------------------------------------------------------
+
     /** This property contains the width of the line in 1/100th mm.
      */
-    [attribute,bound] long LineWidth; 
- 
-    //------------------------------------------------------------------------- 
-}; 
- 
-service FixedLine : XFixedLine;
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+    [attribute,bound] long LineWidth;
+
+    //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XFixedText.idl b/offapi/com/sun/star/report/XFixedText.idl
index 4c971f1e0..fb2bd9196 100644
--- a/offapi/com/sun/star/report/XFixedText.idl
+++ b/offapi/com/sun/star/report/XFixedText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XFixedText_idl__ 
-#define __com_sun_star_report_XFixedText_idl__ 
- 
-#ifndef __com_sun_star_report_XReportControlModel_idl__ 
-#include <com/sun/star/report/XReportControlModel.idl> 
-#endif
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- 
-//============================================================================= 
-interface XFixedText
-{ 
+#ifndef __com_sun_star_report_XFixedText_idl__
+#define __com_sun_star_report_XFixedText_idl__
+
+#include <com/sun/star/report/XReportControlModel.idl>
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+published interface XFixedText
+{
     interface XReportControlModel;
 
     /** specifies the label of the control.
      */
     [attribute,bound] string Label;
-}; 
- 
-service FixedText : XFixedText;
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XFormatCondition.idl b/offapi/com/sun/star/report/XFormatCondition.idl
index 2983577eb..15644341d 100644
--- a/offapi/com/sun/star/report/XFormatCondition.idl
+++ b/offapi/com/sun/star/report/XFormatCondition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XFormatCondition_idl__ 
-#define __com_sun_star_report_XFormatCondition_idl__ 
+#ifndef __com_sun_star_report_XFormatCondition_idl__
+#define __com_sun_star_report_XFormatCondition_idl__
 
-#ifndef __com_sun_star_report_XReportControlFormat_idl__ 
-#include <com/sun/star/report/XReportControlFormat.idl> 
-#endif
+#include <com/sun/star/report/XReportControlFormat.idl>
 
-//=============================================================================  
- module com {  module sun {  module star {  module report {   
-//============================================================================= 
+//=============================================================================
+ module com {  module sun {  module star {  module report {
+//=============================================================================
 /** specifies a format condition for a control.
-*/ 
-interface XFormatCondition
-{ 
+*/
+published interface XFormatCondition
+{
     interface XReportControlFormat;
 
     /** gives access to the properties.
     */
-    interface com::sun::star::beans::XPropertySet; 
+    interface com::sun::star::beans::XPropertySet;
 
     /** specifies if the condition is enabled or not.
     */
     [attribute,bound] boolean Enabled;
 
     /** defines the formula of the format condition.
-        If the formula evaluates to <TRUE/> then the format will be applied. 
+        If the formula evaluates to <TRUE/> then the format will be applied.
     */
     [attribute,bound] string Formula;
-}; 
- 
-service FormatCondition : XFormatCondition;
-//============================================================================= 
- 
-}; }; }; };  
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/report/XFormattedField.idl b/offapi/com/sun/star/report/XFormattedField.idl
index 04984e966..38367ef99 100644
--- a/offapi/com/sun/star/report/XFormattedField.idl
+++ b/offapi/com/sun/star/report/XFormattedField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XFormattedField_idl__ 
-#define __com_sun_star_report_XFormattedField_idl__ 
- 
-#ifndef __com_sun_star_report_XReportControlModel_idl__ 
-#include <com/sun/star/report/XReportControlModel.idl> 
-#endif
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
+#ifndef __com_sun_star_report_XFormattedField_idl__
+#define __com_sun_star_report_XFormattedField_idl__
+
+#include <com/sun/star/report/XReportControlModel.idl>
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- 
-//============================================================================= 
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
 /** describes a control which can be used for displaying values with a arbitrary formatting.
 
     @see com::sun::star::report::XReportControlModel
     @see com::sun::star::util::XNumberFormatsSupplier
 */
-interface XFormattedField
-{ 
+published interface XFormattedField
+{
     interface XReportControlModel;
 
     /** specifies the format to be used when formatting the field input
         and output.
-        
+
         <p>This value is meaningful relative to the FormatsSupplier attribute
         only.</p>
      */
@@ -59,14 +55,13 @@ interface XFormattedField
     /** supplies the formats the field should work with.
      */
     [attribute,bound] com::sun::star::util::XNumberFormatsSupplier FormatsSupplier;
-}; 
- 
-service FormattedField : XFormattedField;
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XFunction.idl b/offapi/com/sun/star/report/XFunction.idl
index ed6558505..1de5ab69f 100644
--- a/offapi/com/sun/star/report/XFunction.idl
+++ b/offapi/com/sun/star/report/XFunction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,28 +27,20 @@
 #ifndef __com_sun_star_report_XFunction_idl__
 #define __com_sun_star_report_XFunction_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XChild_idl__ 
-#include <com/sun/star/container/XChild.idl> 
-#endif 
-//=============================================================================  
- module com {  module sun {  module star {  module report {   
-//============================================================================= 
+#include <com/sun/star/container/XChild.idl>
+//=============================================================================
+ module com {  module sun {  module star {  module report {
+//=============================================================================
 /** specifies a format condition for a control.
-*/ 
-interface XFunction
-{ 
+*/
+published interface XFunction
+{
     /** gives access to the properties.
     */
-    interface com::sun::star::beans::XPropertySet; 
+    interface com::sun::star::beans::XPropertySet;
 
     /** allows life-time control of function instances.
      */
@@ -78,13 +70,9 @@ interface XFunction
     /** defines the formula for the initial value
     */
     [attribute,bound] com::sun::star::beans::Optional<string> InitialFormula;
-}; 
- 
-service Function : XFunction
-{
-    create();
 };
-//============================================================================= 
- 
-}; }; }; };  
-#endif 
+
+//=============================================================================
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/report/XFunctions.idl b/offapi/com/sun/star/report/XFunctions.idl
index 106346b88..efad49b98 100644
--- a/offapi/com/sun/star/report/XFunctions.idl
+++ b/offapi/com/sun/star/report/XFunctions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,34 +27,26 @@
 #ifndef __com_sun_star_report_XFunctions_idl__
 #define __com_sun_star_report_XFunctions_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__ 
-#include <com/sun/star/container/XChild.idl> 
-#endif 
-#ifndef __com_sun_star_container_XContainer_idl__ 
-#include <com/sun/star/container/XContainer.idl> 
-#endif 
-#ifndef __com_sun_star_container_XIndexContainer_idl__ 
-#include <com/sun/star/container/XIndexContainer.idl> 
-#endif 
-#ifndef __com_sun_star_lang_XComponent_idl__ 
-#include <com/sun/star/lang/XComponent.idl> 
-#endif
+#include <com/sun/star/container/XChild.idl>
+#include <com/sun/star/container/XContainer.idl>
+#include <com/sun/star/container/XIndexContainer.idl>
+#include <com/sun/star/lang/XComponent.idl>
 //=============================================================================
 
- module com {  module sun {  module star {  module report { 
-interface XReportDefinition;
-interface XFunction;
+ module com {  module sun {  module star {  module report {
+published interface XReportDefinition;
+published interface XFunction;
 //=============================================================================
 
 /** This interface specifies the functions collections of the report definition or a group.
     @see XFunction
     @see XReportDefinition
  */
-interface XFunctions
+published interface XFunctions
 {
     /** allows to register listeners to be notified of changes in the container.
     */
-    interface com::sun::star::container::XContainer; 
+    interface com::sun::star::container::XContainer;
     /** gives access to the group elements.
         The elements are of type <type>XFunction</type>.
     */
diff --git a/offapi/com/sun/star/report/XFunctionsSupplier.idl b/offapi/com/sun/star/report/XFunctionsSupplier.idl
index 774c6749e..8902eba6b 100644
--- a/offapi/com/sun/star/report/XFunctionsSupplier.idl
+++ b/offapi/com/sun/star/report/XFunctionsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,25 +27,21 @@
 #ifndef __com_sun_star_report_XFunctionsSupplier_idl__
 #define __com_sun_star_report_XFunctionsSupplier_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-//=============================================================================  
- module com {  module sun {  module star {  module report {   
-//============================================================================= 
-     interface XFunctions;
+//=============================================================================
+ module com {  module sun {  module star {  module report {
+//=============================================================================
+published interface XFunctions;
 /** specifies the functions supplier which are located in a report definition or a group.
-*/ 
-interface XFunctionsSupplier
-{ 
+*/
+published interface XFunctionsSupplier
+{
     /** access to the functions
     */
     [attribute,readonly] com::sun::star::report::XFunctions Functions;
-}; 
-//============================================================================= 
- 
-}; }; }; };  
-#endif 
+};
+//=============================================================================
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/report/XGroup.idl b/offapi/com/sun/star/report/XGroup.idl
index 66cf7338f..3ead87e36 100644
--- a/offapi/com/sun/star/report/XGroup.idl
+++ b/offapi/com/sun/star/report/XGroup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XGroup_idl__ 
+#ifndef __com_sun_star_report_XGroup_idl__
 #define __com_sun_star_report_XGroup_idl__
- 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
+
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_report_XSection_idl__
 #include <com/sun/star/report/XSection.idl>
-#endif
-#ifndef __com_sun_star_report_XGroups_idl__
 #include <com/sun/star/report/XGroups.idl>
-#endif
 #include <com/sun/star/report/XFunctions.idl>
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- 
-//============================================================================= 
- 
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
 /** identifies a <type>XGroup</type>.
     A group is always a child of the groups collection in the report.
     @see XReportDefinition
     @see XGroups
  */
-interface XGroup
-{ 
+published interface XGroup
+{
     /** allows access to the groups collection of the report.
     */
     interface com::sun::star::container::XChild;
@@ -65,7 +59,7 @@ interface XGroup
     /** gives access to functions defined in the group definition.
     */
     interface XFunctionsSupplier;
-    
+
     /** Defines if the group is sorted ascending or descending.
         The default is <TRUE/>.
      */
@@ -87,7 +81,7 @@ interface XGroup
 
     [attribute,readonly] XSection Header
     {
-        get raises (com::sun::star::container::NoSuchElementException); 
+        get raises (com::sun::star::container::NoSuchElementException);
     };
 
     /** returns the group footer.
@@ -97,7 +91,7 @@ interface XGroup
     */
     [attribute,readonly,bound] XSection Footer
     {
-        get raises (com::sun::star::container::NoSuchElementException); 
+        get raises (com::sun::star::container::NoSuchElementException);
     };
 
     /** Specifies how to group data.
@@ -136,14 +130,13 @@ interface XGroup
     /** Specifies that the group header should always be printed on a new page and the reset of the page number to zero.
     */
     [attribute,bound] boolean ResetPageNumber;
-}; 
- 
-service Group : XGroup;
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XGroups.idl b/offapi/com/sun/star/report/XGroups.idl
index 3e8c8bb79..21df874d7 100644
--- a/offapi/com/sun/star/report/XGroups.idl
+++ b/offapi/com/sun/star/report/XGroups.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,34 +27,26 @@
 #ifndef __com_sun_star_report_XGroups_idl__
 #define __com_sun_star_report_XGroups_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__ 
-#include <com/sun/star/container/XChild.idl> 
-#endif 
-#ifndef __com_sun_star_container_XContainer_idl__ 
-#include <com/sun/star/container/XContainer.idl> 
-#endif 
-#ifndef __com_sun_star_container_XIndexContainer_idl__ 
-#include <com/sun/star/container/XIndexContainer.idl> 
-#endif 
-#ifndef __com_sun_star_lang_XComponent_idl__ 
-#include <com/sun/star/lang/XComponent.idl> 
-#endif
+#include <com/sun/star/container/XChild.idl>
+#include <com/sun/star/container/XContainer.idl>
+#include <com/sun/star/container/XIndexContainer.idl>
+#include <com/sun/star/lang/XComponent.idl>
 //=============================================================================
 
- module com {  module sun {  module star {  module report { 
-interface XReportDefinition;
-interface XGroup;
+ module com {  module sun {  module star {  module report {
+published interface XReportDefinition;
+published interface XGroup;
 //=============================================================================
 
 /** This interface specifies the groups collections of the report definition.
     @see XGroup
     @see XReportDefinition
  */
-interface XGroups
+published interface XGroups
 {
     /** allows to register listeners to be notified of changes in the container.
     */
-    interface com::sun::star::container::XContainer; 
+    interface com::sun::star::container::XContainer;
     /** gives access to the group elements.
         The elements are of type <type>XGroup</type>.
     */
@@ -75,7 +67,6 @@ interface XGroups
     [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
 };
 
-service Groups : XGroups;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XImageControl.idl b/offapi/com/sun/star/report/XImageControl.idl
index 5396525e2..569d3b3ee 100644
--- a/offapi/com/sun/star/report/XImageControl.idl
+++ b/offapi/com/sun/star/report/XImageControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XImageControl_idl__ 
-#define __com_sun_star_report_XImageControl_idl__ 
- 
-#ifndef __com_sun_star_report_XReportControlModel_idl__ 
-#include <com/sun/star/report/XReportControlModel.idl> 
-#endif
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__ 
-#include <com/sun/star/form/XImageProducerSupplier.idl> 
-#endif 
-
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- 
-//============================================================================= 
-interface XImageControl
-{ 
+#ifndef __com_sun_star_report_XImageControl_idl__
+#define __com_sun_star_report_XImageControl_idl__
+
+#include <com/sun/star/report/XReportControlModel.idl>
+#include <com/sun/star/form/XImageProducerSupplier.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+published interface XImageControl
+{
     interface XReportControlModel;
 
     /** supplies the caller with an <type scope="com::sun::star::awt">XImageProducer</type>.
@@ -56,7 +52,7 @@ interface XImageControl
         Usually, controls acting for an <type>ImageControl</type> model are consumers, and use the
         data stream to display the image</p>
      */
-    interface com::sun::star::form::XImageProducerSupplier; 
+    interface com::sun::star::form::XImageProducerSupplier;
 
     /** specifies an URL to an image to use for the control.
      */
@@ -79,14 +75,13 @@ interface XImageControl
         If the data field contains something different as string then this attribute will be ignored.
     */
     [attribute,bound] boolean PreserveIRI;
-}; 
- 
-service ImageControl : XImageControl;
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XReportComponent.idl b/offapi/com/sun/star/report/XReportComponent.idl
index 62da745f8..519f6bc32 100644
--- a/offapi/com/sun/star/report/XReportComponent.idl
+++ b/offapi/com/sun/star/report/XReportComponent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XReportComponent_idl__ 
-#define __com_sun_star_report_XReportComponent_idl__ 
- 
-#ifndef __com_sun_star_container_XChild_idl__ 
-#include <com/sun/star/container/XChild.idl> 
-#endif 
- 
-#ifndef __com_sun_star_lang_XComponent_idl__ 
-#include <com/sun/star/lang/XComponent.idl> 
-#endif
- 
-#ifndef __com_sun_star_container_XNamed_idl__ 
-#include <com/sun/star/container/XNamed.idl> 
-#endif 
- 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
-#include <com/sun/star/beans/XPropertySet.idl> 
-#endif  
-#ifndef __com_sun_star_util_XCloneable_idl__ 
+#ifndef __com_sun_star_report_XReportComponent_idl__
+#define __com_sun_star_report_XReportComponent_idl__
+
+#include <com/sun/star/container/XChild.idl>
+
+#include <com/sun/star/lang/XComponent.idl>
+
+#include <com/sun/star/container/XNamed.idl>
+
+#include <com/sun/star/beans/XPropertySet.idl>
 #include <com/sun/star/util/XCloneable.idl>
-#endif
-#ifndef __com_sun_star_awt_XControlModel_idl__ 
-#include <com/sun/star/awt/XControlModel.idl> 
-#endif 
-#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/awt/XControlModel.idl>
 #include <com/sun/star/drawing/XShape.idl>
-#endif
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- interface XSection;
-//============================================================================= 
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+published interface XSection;
+
+//=============================================================================
 /** describes a component which may be part of a report.
-    
+
     @see XReportDefinition
  */
-interface XReportComponent
-{ 
+published interface XReportComponent
+{
     interface com::sun::star::util::XCloneable;
     /** identifies the component as a candidate for being part of a report.
         <p>This interface also provides the access to the component's parent.</p>
      */
-    interface com::sun::star::container::XChild; 
-     
+    interface com::sun::star::container::XChild;
+
     /** allows life-time control of report components.
      */
-    interface com::sun::star::lang::XComponent; 
+    interface com::sun::star::lang::XComponent;
+
+    interface com::sun::star::drawing::XShape;
 
-    interface com::sun::star::drawing::XShape; 
-          
     /** gives access to the properties.
     */
-    interface com::sun::star::beans::XPropertySet; 
+    interface com::sun::star::beans::XPropertySet;
 
     /** the name of the component.
      */
@@ -88,12 +76,12 @@ interface XReportComponent
 
     /** specifies the height of the control.
      */
-    [attribute,bound] long Height; 
- 
+    [attribute,bound] long Height;
+
     /** specifies the horizontal position of the control.
      */
     [attribute,bound] long PositionX;
-    
+
     /** specifies the vertical position of the control.
      */
     [attribute,bound] long PositionY;
@@ -145,7 +133,7 @@ interface XReportComponent
     it's data based on the values of the master fields.</p>
     <p>If the report is no sub report (e.g. it's parent is not a report itself), this
     property is not evaluated.</p>
-    
+
     */
     [attribute,bound] sequence<string> MasterFields
     {
@@ -174,7 +162,7 @@ interface XReportComponent
     fields or their aliases of the detail report.</p>
     <p>If the report is no sub report (e.g. it's parent is not a report itself), this
     property is not evaluated.</p>
-    * 
+    *
     */
     [attribute,bound] sequence<string> DetailFields
     {
@@ -188,13 +176,13 @@ interface XReportComponent
         This value is <NULL/> when the control was not inserted in any section.
     */
     [attribute,readonly] com::sun::star::report::XSection Section;
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XReportControlFormat.idl b/offapi/com/sun/star/report/XReportControlFormat.idl
index 1ce71308a..9163198f9 100644
--- a/offapi/com/sun/star/report/XReportControlFormat.idl
+++ b/offapi/com/sun/star/report/XReportControlFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XReportControlFormat_idl__ 
-#define __com_sun_star_report_XReportControlFormat_idl__ 
+#ifndef __com_sun_star_report_XReportControlFormat_idl__
+#define __com_sun_star_report_XReportControlFormat_idl__
 
 #include <com/sun/star/awt/FontDescriptor.idl>
 #include <com/sun/star/awt/FontSlant.idl>
 #include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#include <com/sun/star/lang/IllegalArgumentException.idl>
 #include <com/sun/star/lang/Locale.idl>
 #include <com/sun/star/style/ParagraphAdjust.idl>
 #include <com/sun/star/style/VerticalAlignment.idl>
 #include <com/sun/star/util/Color.idl>
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- 
-//============================================================================= 
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
 /** specifies a format condition for a control.
-*/ 
-interface XReportControlFormat
-{ 
+*/
+published interface XReportControlFormat
+{
     /** specifies the background color (RGB) of the control.
      */
     [attribute,bound] com::sun::star::util::Color ControlBackground
@@ -60,7 +60,7 @@ interface XReportControlFormat
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** specifies the horizontal alignment of the text. 
+    /** specifies the horizontal alignment of the text.
         @see ::com::sun::star::style::ParagraphAdjust
      */
     [attribute,bound] short ParaAdjust
@@ -69,7 +69,7 @@ interface XReportControlFormat
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** specifies the font attributes of the text in the control.
      */
@@ -305,9 +305,9 @@ interface XReportControlFormat
         set raises ( com::sun::star::beans::UnknownPropertyException );
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
- 
+
     //-------------------------------------------------------------------------
-    
+
     /** specifies the text line color (RGB) of the control.
      */
     [attribute,bound] com::sun::star::util::Color CharUnderlineColor
@@ -374,7 +374,7 @@ interface XReportControlFormat
     };
 
     /** determines the rotation of a character in degree.
-         <p>Depending on the implementation only certain values may be allowed.
+        <p>Depending on the implementation only certain values may be allowed.
         </p>
      */
     [attribute,bound] short CharRotation
@@ -388,7 +388,7 @@ interface XReportControlFormat
 
         <p>The value refers to the original width which is denoted by 100,
         and it has to be greater than 0.</p>
-        
+
      */
     [attribute,bound] short CharScaleWidth
     {
@@ -556,7 +556,7 @@ interface XReportControlFormat
         <p>This property may be empty.</p>
      */
     [attribute,bound] string CharFontStyleNameComplex
-    
+
     {
         set raises ( com::sun::star::beans::UnknownPropertyException );
         get raises ( com::sun::star::beans::UnknownPropertyException );
@@ -604,10 +604,9 @@ interface XReportControlFormat
         set raises ( com::sun::star::beans::UnknownPropertyException );
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
-}; 
- 
-service ReportControlFormat : XReportControlFormat;
-//============================================================================= 
- 
-}; }; }; };  
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/report/XReportControlModel.idl b/offapi/com/sun/star/report/XReportControlModel.idl
index 2a5322d82..0ba6667f9 100644
--- a/offapi/com/sun/star/report/XReportControlModel.idl
+++ b/offapi/com/sun/star/report/XReportControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XReportControlModel_idl__ 
-#define __com_sun_star_report_XReportControlModel_idl__ 
- 
-#ifndef __com_sun_star_report_XReportComponent_idl__ 
-#include <com/sun/star/report/XReportComponent.idl> 
-#endif
-#ifndef __com_sun_star_report_XReportControlFormat_idl__ 
+#ifndef __com_sun_star_report_XReportControlModel_idl__
+#define __com_sun_star_report_XReportControlModel_idl__
+
+#include <com/sun/star/report/XReportComponent.idl>
 #include <com/sun/star/report/XReportControlFormat.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__ 
-#include <com/sun/star/container/XContainer.idl> 
-#endif 
-#ifndef __com_sun_star_container_XIndexContainer_idl__ 
-#include <com/sun/star/container/XIndexContainer.idl> 
-#endif 
-#ifndef __com_sun_star_report_XFormatCondition_idl__ 
-#include <com/sun/star/report/XFormatCondition.idl> 
-#endif
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- 
-//============================================================================= 
-interface XReportControlModel
-{ 
+#include <com/sun/star/container/XContainer.idl>
+#include <com/sun/star/container/XIndexContainer.idl>
+#include <com/sun/star/report/XFormatCondition.idl>
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+published interface XReportControlModel
+{
     /** allows the creation of sub reports.
     */
     interface XReportComponent;
@@ -57,19 +47,19 @@ interface XReportControlModel
 
     /** allows to register listeners to be notified of changes in the container.
     */
-    interface com::sun::star::container::XContainer; 
+    interface com::sun::star::container::XContainer;
 
     /** gives access to the <type scope="com::sun::star::report">XFormatCondition</type> elements by index.
     */
-    interface com::sun::star::container::XIndexContainer; 
+    interface com::sun::star::container::XIndexContainer;
 
     /** Creates a format condition.
         @return
                report component
     */
-    XFormatCondition createFormatCondition() raises( com::sun::star::uno::Exception ); 
+    XFormatCondition createFormatCondition() raises( com::sun::star::uno::Exception );
+
 
-    
     /** Specifies which content should be shown.
         The value can be <br/>
         <li>the name of a database column. The format to use is field:[name] </li>
@@ -94,7 +84,7 @@ interface XReportControlModel
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** Describes the print expression of the report control model. 
+    /** Describes the print expression of the report control model.
         If the expression evaluates to true than the report control model will be printed otherwise not.
     */
     [attribute,bound] string ConditionalPrintExpression
@@ -102,14 +92,13 @@ interface XReportControlModel
         set raises ( com::sun::star::beans::UnknownPropertyException );
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
-}; 
- 
-service ReportControlModel : XReportControlModel;
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl
index 799953cb8..82e90b80a 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,78 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XReportDefinition_idl__ 
-#define __com_sun_star_report_XReportDefinition_idl__ 
- 
-#ifndef __com_sun_star_report_XReportComponent_idl__ 
-#include <com/sun/star/report/XReportComponent.idl> 
-#endif
-#ifndef __com_sun_star_report_XFunctionsSupplier_idl__ 
+#ifndef __com_sun_star_report_XReportDefinition_idl__
+#define __com_sun_star_report_XReportDefinition_idl__
+
+#include <com/sun/star/report/XReportComponent.idl>
 #include <com/sun/star/report/XFunctionsSupplier.idl>
-#endif
-#ifndef __com_sun_star_view_PaperOrientation_idl__ 
-#include <com/sun/star/view/PaperOrientation.idl> 
-#endif 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
+#include <com/sun/star/view/PaperOrientation.idl>
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_view_PaperFormat_idl__ 
-#include <com/sun/star/view/PaperFormat.idl> 
-#endif 
-#ifndef __com_sun_star_util_XClosable_idl__
+#include <com/sun/star/view/PaperFormat.idl>
 #include <com/sun/star/util/XCloseable.idl>
-#endif
-#ifndef __com_sun_star_ui_XUIConfigurationManagerSupplier_idl__
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.idl>
-#endif
-#ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
 #include <com/sun/star/document/XDocumentSubStorageSupplier.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_document_XViewDataSupplier_idl__
 #include <com/sun/star/document/XViewDataSupplier.idl>
-#endif
-#ifndef __com_sun_star_frame_XLoadable_idl__
 #include <com/sun/star/frame/XLoadable.idl>
-#endif
-#ifndef __com_sun_star_embed_XVisualObject_idl__
 #include <com/sun/star/embed/XVisualObject.idl>
-#endif
-#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #include <com/sun/star/document/XStorageBasedDocument.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_util_XModifiable2_idl__
 #include <com/sun/star/util/XModifiable2.idl>
-#endif
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_lang_DisposedException_idl__ 
 #include <com/sun/star/lang/DisposedException.idl>
-#endif
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__ 
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
 
-module com {  module sun {  module star {  module sdbc { 
-published interface XConnection; 
-};};};}; 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- 
-     interface XSection;
-     interface XGroups;
-//============================================================================= 
- 
+module com {  module sun {  module star {  module sdbc {
+published interface XConnection;
+};};};};
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+     published interface XSection;
+     published interface XGroups;
+//=============================================================================
+
 /** identifies a <type>XReportComponent</type> as being a (sub-) report.
 
     <p>This interface does not really provide an own functionality, it is only for easier
@@ -107,8 +69,8 @@ published interface XConnection;
 
     @see XReportComponent
  */
-interface XReportDefinition
-{ 
+published interface XReportDefinition
+{
     /** allows the access to the model embedded in the database storage.
     */
     interface com::sun::star::frame::XModel;
@@ -181,8 +143,8 @@ interface XReportDefinition
         raises( ::com::sun::star::lang::DisposedException,
                 ::com::sun::star::uno::Exception );
 
-    //------------------------------------------------------------------------- 
-    
+    //-------------------------------------------------------------------------
+
     /** Represents the output format (media (mime) type) of the resulting document when executing this report.
     */
     [attribute,bound] string MimeType
@@ -224,8 +186,8 @@ interface XReportDefinition
     The default value for <member scope="com::sun::star::sdbc">RowSet::EscapeProcessing</member>
     is <TRUE/>. By switching it to <FALSE/>, you can pass backend-specific SQL statements,
     which are not standard SQL, to your database.</p>
-    
-    
+
+
     @see com::sun::star::sdb::CommandType
     */
     [attribute,bound] string Command;
@@ -303,7 +265,7 @@ interface XReportDefinition
 
     /** Represents the groups of the report.
     */
-    [attribute,readonly] com::sun::star::report::XGroups Groups; 
+    [attribute,readonly] com::sun::star::report::XGroups Groups;
 
     /** returns the report header if the <member>ReportHeaderOn</member>is <TRUE/>.
         @throws <type scope="com::sun::star::container">NoSuchElementException</type>
@@ -312,7 +274,7 @@ interface XReportDefinition
     */
     [attribute,readonly] com::sun::star::report::XSection ReportHeader
     {
-        get raises (com::sun::star::container::NoSuchElementException); 
+        get raises (com::sun::star::container::NoSuchElementException);
     };
 
     /** returns the page header if the <member>PageHeaderOn</member>is <TRUE/>.
@@ -322,7 +284,7 @@ interface XReportDefinition
     */
     [attribute,readonly] com::sun::star::report::XSection PageHeader
     {
-        get raises (com::sun::star::container::NoSuchElementException); 
+        get raises (com::sun::star::container::NoSuchElementException);
     };
 
     /** returns the detail section.
@@ -337,7 +299,7 @@ interface XReportDefinition
     */
     [attribute,readonly] com::sun::star::report::XSection PageFooter
     {
-        get raises (com::sun::star::container::NoSuchElementException); 
+        get raises (com::sun::star::container::NoSuchElementException);
     };
 
     /** returns the report footer if the <member>ReportFooterOn</member>is <TRUE/>.
@@ -347,16 +309,15 @@ interface XReportDefinition
     */
     [attribute,readonly] com::sun::star::report::XSection ReportFooter
     {
-        get raises (com::sun::star::container::NoSuchElementException); 
+        get raises (com::sun::star::container::NoSuchElementException);
     };
-}; 
- 
-service ReportDefinition : XReportDefinition;
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XReportEngine.idl b/offapi/com/sun/star/report/XReportEngine.idl
index d842f6e70..1e756269f 100644
--- a/offapi/com/sun/star/report/XReportEngine.idl
+++ b/offapi/com/sun/star/report/XReportEngine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,39 +27,17 @@
 #ifndef __com_sun_star_report_XReportEngine_idl__
 #define __com_sun_star_report_XReportEngine_idl__
 
-#ifndef __com_sun_star_report_XReportDefinition_idl__
 #include <com/sun/star/report/XReportDefinition.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
 #include <com/sun/star/task/XStatusIndicator.idl>
-#endif
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
 #include <com/sun/star/sdbc/XConnection.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_DisposedException_idl__
 #include <com/sun/star/lang/DisposedException.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module report {
@@ -76,7 +54,7 @@ module com {  module sun {  module star {  module report {
     @see com.sun.star.document.OfficeDocument
 */
 
-interface XReportEngine
+published interface XReportEngine
 {
     /** allows life-time control of report engine.
      */
diff --git a/offapi/com/sun/star/report/XSection.idl b/offapi/com/sun/star/report/XSection.idl
index e1952ab0f..eaa888a29 100644
--- a/offapi/com/sun/star/report/XSection.idl
+++ b/offapi/com/sun/star/report/XSection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XSection_idl__ 
-#define __com_sun_star_report_XSection_idl__ 
- 
-#ifndef __com_sun_star_container_XChild_idl__ 
-#include <com/sun/star/container/XChild.idl> 
-#endif 
-#ifndef __com_sun_star_drawing_XShapes_idl__ 
-#include <com/sun/star/drawing/XShapes.idl> 
-#endif 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
-#include <com/sun/star/container/XEnumerationAccess.idl> 
-#endif 
-#ifndef __com_sun_star_container_XContainer_idl__ 
-#include <com/sun/star/container/XContainer.idl> 
-#endif 
-#ifndef __com_sun_star_util_Color_idl__ 
-#include <com/sun/star/util/Color.idl> 
-#endif 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_report_XSection_idl__
+#define __com_sun_star_report_XSection_idl__
+
+#include <com/sun/star/container/XChild.idl>
+#include <com/sun/star/drawing/XShapes.idl>
+#include <com/sun/star/container/XEnumerationAccess.idl>
+#include <com/sun/star/container/XContainer.idl>
+#include <com/sun/star/util/Color.idl>
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_report_XReportDefinition_idl__ 
 #include <com/sun/star/report/XReportDefinition.idl>
-#endif
-#ifndef __com_sun_star_report_XReportComponent_idl__ 
 #include <com/sun/star/report/XReportComponent.idl>
-#endif
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- interface XGroup;
-//============================================================================= 
- 
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+ published interface XGroup;
+//=============================================================================
+
 /** identifies a <type>XSection</type> inside a report.
 
     <p>A section acts like a container of report components. This generic
@@ -66,22 +50,22 @@
     @see XReportDefinition
     @see XGroup
  */
-interface XSection
-{ 
+published interface XSection
+{
     /** allows to navigate to group or report definition.
     */
     interface com::sun::star::container::XChild;
     /** allows to register listeners to be notified of changes in the container.
     */
-    interface com::sun::star::container::XContainer; 
-    
+    interface com::sun::star::container::XContainer;
+
     /** gives access to the elements by index.
     */
-    interface com::sun::star::drawing::XShapes; 
-    
+    interface com::sun::star::drawing::XShapes;
+
     /** creates an enumeration of the elements.
     */
-    interface com::sun::star::container::XEnumerationAccess; 
+    interface com::sun::star::container::XEnumerationAccess;
 
     /** provides generic access to the instance properties
     */
@@ -91,8 +75,8 @@ interface XSection
      */
     interface com::sun::star::lang::XComponent;
 
-    //------------------------------------------------------------------------- 
-     
+    //-------------------------------------------------------------------------
+
     /** Defines if the section should be visible in report.
     */
     [attribute,bound] boolean Visible;
@@ -139,7 +123,7 @@ interface XSection
     };
 
     /** Specifies that the section is printed on one page.
-    <p>Not valid for page header or page footer.</p>  
+    <p>Not valid for page header or page footer.</p>
     */
     [attribute,bound] boolean KeepTogether
     {
@@ -147,8 +131,8 @@ interface XSection
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** Specifies that elements with dynamic state will be expanded vertically when then content of the element is larger than it's container. 
-        If this property is disabled the content will be truncated when it's size is larger than the container.  
+    /** Specifies that elements with dynamic state will be expanded vertically when then content of the element is larger than it's container.
+        If this property is disabled the content will be truncated when it's size is larger than the container.
     */
     [attribute,bound] boolean CanGrow
     {
@@ -158,7 +142,7 @@ interface XSection
 
 /**
   <p>Represents ...</p>
-  
+
  */
     [attribute,bound] boolean CanShrink
     {
@@ -166,7 +150,7 @@ interface XSection
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** Defines that the group header should be repeated on the next page when a group spans more than one page. 
+    /** Defines that the group header should be repeated on the next page when a group spans more than one page.
         It only applies to group headers.
     */
     [attribute,bound] boolean RepeatSection
@@ -182,14 +166,13 @@ interface XSection
     /** Specifies the parent of the section if it is a page header or page footer.
     */
     [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
-}; 
-
-service Section : XSection;
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XShape.idl b/offapi/com/sun/star/report/XShape.idl
index e088958ac..2f94c934e 100644
--- a/offapi/com/sun/star/report/XShape.idl
+++ b/offapi/com/sun/star/report/XShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XShape_idl__ 
-#define __com_sun_star_report_XShape_idl__ 
- 
-#ifndef __com_sun_star_report_XReportControlModel_idl__ 
-#include <com/sun/star/report/XReportControlModel.idl> 
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
+#ifndef __com_sun_star_report_XShape_idl__
+#define __com_sun_star_report_XShape_idl__
+
+#include <com/sun/star/report/XReportControlModel.idl>
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
 #include <com/sun/star/drawing/HomogenMatrix3.idl>
-#endif
-//============================================================================= 
- 
- module com {  module sun {  module star {  module report {  
- 
-//============================================================================= 
-interface XShape
-{ 
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+published interface XShape
+{
     interface XReportControlModel;
 
     /** is used to query or change the ZOrder of this <type>Shape</type>. */
@@ -73,7 +65,7 @@ interface XShape
 
     /** This property describes the geometry of the CustomShape. The CustomShapeEngine
         that is used should be able to get on with the content of this property.
-        
+
         If the CustomShapeEngine property is "com.sun.star.drawing.EnhancedCustomShapeEngine",
         then this property is containing properties as they are specified in the service
         com.sun.star.drawing.EnhancedCustomShapeGeometry
@@ -83,14 +75,13 @@ interface XShape
     /** determines if the object is opaque or transparent for text.
      */
     [attribute,bound] boolean Opaque;
-}; 
- 
-service Shape : XShape;
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/inspection/DataProviderHandler.idl b/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
index eed4e7e53..68bc96a42 100644
--- a/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
+++ b/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_report_inspection_DataProviderHandler_idl__
 #define __com_sun_star_report_inspection_DataProviderHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +40,7 @@ module com {  module sun {  module star {  module report { module inspection {
 
     @see com::sun::star::inspection::XPropertyHandler
 */
-service DataProviderHandler
+published service DataProviderHandler
 {
     interface com::sun::star::inspection::XPropertyHandler;
 };
diff --git a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
index 92d51bde2..d0257ab5a 100644
--- a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
+++ b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_report_inspection__DefaultComponentInspectorModel_idl__
 #define __com_sun_star_report_inspection_DefaultComponentInspectorModel_idl__
 
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
 #include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -52,7 +48,7 @@ module com {  module sun {  module star {  module report { module inspection {
 
     @see com::sun::star::inspection::XObjectInspectorModel::HandlerFactories
 */
-service DefaultComponentInspectorModel : com::sun::star::inspection::XObjectInspectorModel
+published service DefaultComponentInspectorModel : com::sun::star::inspection::XObjectInspectorModel
 {
     /** creates a default DefaultComponentInspectorModel, providing factories for all
         handlers listed above.
@@ -82,7 +78,7 @@ service DefaultComponentInspectorModel : com::sun::star::inspection::XObjectInsp
 
         @since OOo 2.2
     */
-    createWithHelpSection( 
+    createWithHelpSection(
         [in] long minHelpTextLines,
         [in] long maxHelpTextLines
     )
diff --git a/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl b/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
index ba4d99a75..827e96c48 100644
--- a/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
+++ b/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_report_inspection_ReportComponentHandler_idl__
 #define __com_sun_star_report_inspection_ReportComponentHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +40,7 @@ module com {  module sun {  module star {  module report { module inspection {
 
     @see com::sun::star::inspection::XPropertyHandler
 */
-service ReportComponentHandler
+published service ReportComponentHandler
 {
     interface com::sun::star::inspection::XPropertyHandler;
 };
diff --git a/offapi/com/sun/star/report/inspection/makefile.mk b/offapi/com/sun/star/report/inspection/makefile.mk
deleted file mode 100644
index a123a2a42..000000000
--- a/offapi/com/sun/star/report/inspection/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssrptins
-PACKAGE=com$/sun$/star$/report$/inspection
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    DefaultComponentInspectorModel.idl	\
-    ReportComponentHandler.idl			\
-    DataProviderHandler.idl	
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/report/makefile.mk b/offapi/com/sun/star/report/makefile.mk
deleted file mode 100644
index c2fa45637..000000000
--- a/offapi/com/sun/star/report/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssreport
-PACKAGE=com$/sun$/star$/report
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        modules.idl\
-    XReportDefinition.idl	\
-    XReportComponent.idl	\
-    XReportControlModel.idl	\
-    XGroups.idl				\
-    XGroup.idl				\
-    XFormattedField.idl		\
-    XFixedText.idl			\
-    XImageControl.idl		\
-    XSection.idl			\
-    ReportPrintOption.idl	\
-    GroupKeepTogether.idl	\
-    ForceNewPage.idl		\
-    KeepTogether.idl		\
-    XReportEngine.idl		\
-    XFormatCondition.idl	\
-    XReportControlFormat.idl	\
-    XFunction.idl			\
-    XFunctions.idl			\
-    XFunctionsSupplier.idl	\
-    GroupOn.idl				\
-    XShape.idl				\
-    XFixedLine.idl
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/report/meta/XFormulaParser.idl b/offapi/com/sun/star/report/meta/XFormulaParser.idl
index ce9931600..61bbba184 100644
--- a/offapi/com/sun/star/report/meta/XFormulaParser.idl
+++ b/offapi/com/sun/star/report/meta/XFormulaParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ module com {  module sun {  module star {  module report { module meta {
 /** identifies a <type>XFormulaParser</type> which allows to retrieve the meta data of all supported functions.
 
 */
-interface XFormulaParser
+published interface XFormulaParser
 {
     /** allows life-time control of report engine.
      */
diff --git a/offapi/com/sun/star/report/meta/XFunctionCategory.idl b/offapi/com/sun/star/report/meta/XFunctionCategory.idl
index 799111919..d60af9d70 100644
--- a/offapi/com/sun/star/report/meta/XFunctionCategory.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionCategory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,12 +34,12 @@
 //=============================================================================
 module com {  module sun {  module star {  module report { module meta {
 
-interface XFunctionDescription;
+published interface XFunctionDescription;
 /** identifies a <type>XFunctionCategory</type> which allows to retrieve the meta data of all supported functions.
 
 */
 
-interface XFunctionCategory 
+published interface XFunctionCategory
 {
     /** gives access to the properties.
     */
@@ -53,8 +53,8 @@ interface XFunctionCategory
         @see com.sun.star.container.XIndexAccess
     */
     XFunctionDescription getFunction([in] long position)
-        raises( com::sun::star::lang::IndexOutOfBoundsException, 
-                    com::sun::star::lang::WrappedTargetException ); 
+        raises( com::sun::star::lang::IndexOutOfBoundsException,
+                    com::sun::star::lang::WrappedTargetException );
 
     /** returns the localized category's name.
      */
diff --git a/offapi/com/sun/star/report/meta/XFunctionDescription.idl b/offapi/com/sun/star/report/meta/XFunctionDescription.idl
index 518caefb5..ac92a6948 100644
--- a/offapi/com/sun/star/report/meta/XFunctionDescription.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,12 +34,12 @@
 //=============================================================================
 module com {  module sun {  module star {  module report { module meta {
 
-interface XFunctionCategory;
+published interface XFunctionCategory;
 
 /** identifies a <type>XFunctionDescription</type> which allows to retrieve the meta data of all supported functions.
 
 */
-interface XFunctionDescription 
+published interface XFunctionDescription
 {
     /** gives access to the properties.
     */
diff --git a/offapi/com/sun/star/report/meta/XFunctionManager.idl b/offapi/com/sun/star/report/meta/XFunctionManager.idl
index 04f1b6247..312313e4e 100644
--- a/offapi/com/sun/star/report/meta/XFunctionManager.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 #include <com/sun/star/lang/XComponent.idl>
 #include <com/sun/star/container/XIndexAccess.idl>
-#include <com/sun/star/container/NoSuchElementException.idl> 
+#include <com/sun/star/container/NoSuchElementException.idl>
 #include <com/sun/star/lang/DisposedException.idl>
 #include <com/sun/star/report/meta/XFunctionCategory.idl>
 #include <com/sun/star/report/meta/XFunctionDescription.idl>
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module report { module meta {
 /** identifies a <type>XFunctionManager</type> which allows to retrieve the meta data of all supported functions.
 
 */
-interface XFunctionManager
+published interface XFunctionManager
 {
     /** allows life-time control of report engine.
      */
@@ -53,14 +53,14 @@ interface XFunctionManager
         @see com.sun.star.container.XIndexAccess
     */
     XFunctionCategory getCategory([in] long position)
-        raises( com::sun::star::lang::IndexOutOfBoundsException, 
-                    com::sun::star::lang::WrappedTargetException ); 
+        raises( com::sun::star::lang::IndexOutOfBoundsException,
+                    com::sun::star::lang::WrappedTargetException );
 
     /** get the function description by name
         @param  name    the name of the function
     */
     XFunctionDescription getFunctionByName([in] string name)
-        raises( com::sun::star::container::NoSuchElementException); 
+        raises( com::sun::star::container::NoSuchElementException);
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/report/meta/makefile.mk b/offapi/com/sun/star/report/meta/makefile.mk
deleted file mode 100644
index 2a6a6e7e7..000000000
--- a/offapi/com/sun/star/report/meta/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssrptmeta
-PACKAGE=com$/sun$/star$/report$/meta
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XFunctionManager.idl        \
-    XFunctionCategory.idl       \
-    XFunctionDescription.idl    \
-    XFormulaParser.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/resource/MissingResourceException.idl b/offapi/com/sun/star/resource/MissingResourceException.idl
index aea68a706..e76624b62 100644
--- a/offapi/com/sun/star/resource/MissingResourceException.idl
+++ b/offapi/com/sun/star/resource/MissingResourceException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_resource_MissingResourceException_idl__ 
 #define __com_sun_star_resource_MissingResourceException_idl__ 
  
-#ifndef __com_sun_star_uno_RuntimeException_idl__ 
 #include <com/sun/star/uno/RuntimeException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/resource/OfficeResourceLoader.idl b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
index 3c784f8c4..092ff247d 100644
--- a/offapi/com/sun/star/resource/OfficeResourceLoader.idl
+++ b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_resource_OfficeResourceLoader_idl__
 #define __com_sun_star_resource_OfficeResourceLoader_idl__
 
-#ifndef __com_sun_star_resource_XResourceBundleLoader_idl__ 
 #include <com/sun/star/resource/XResourceBundleLoader.idl>
-#endif
 
 //=============================================================================
 module com { module sun { module star { module resource {
diff --git a/offapi/com/sun/star/resource/StringResource.idl b/offapi/com/sun/star/resource/StringResource.idl
index 6d49859d2..dbe13b603 100644
--- a/offapi/com/sun/star/resource/StringResource.idl
+++ b/offapi/com/sun/star/resource/StringResource.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_resource_StringResourceManager_idl__
 #define __com_sun_star_resource_StringResourceManager_idl__
 
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__ 
 #include <com/sun/star/resource/XStringResourcePersistence.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/resource/StringResourceWithLocation.idl b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
index a32bb6d3f..089de5469 100644
--- a/offapi/com/sun/star/resource/StringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,21 +28,19 @@
 #ifndef __com_sun_star_resource_StringResourceWithLocation_idl__
 #define __com_sun_star_resource_StringResourceWithLocation_idl__
 
-#ifndef __com_sun_star_resource_XStringResourceWithLocation_idl__
 #include <com/sun/star/resource/XStringResourceWithLocation.idl>
-#endif
 
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module resource {
 
-//============================================================================= 
+//=============================================================================
 
 /** specifies a service providing access to a resource string table implementing the
     <type scope="com::sun::star::resource">XStringResourceWithLocation</type> interface.
  */
-service StringResourceWithLocation : com::sun::star::resource::XStringResourceWithLocation
+published service StringResourceWithLocation : com::sun::star::resource::XStringResourceWithLocation
 {
     /** is used to initialize the object on its creation.
 
@@ -51,11 +49,11 @@ service StringResourceWithLocation : com::sun::star::resource::XStringResourceWi
             the ReadOnly state allows it - the string table data.
 
         @param ReadOnly
-            Specifies if the resource should be read only,	
+            Specifies if the resource should be read only,
             see <code>XStringResourceManager::isReadOnly</code>
 
         @param locale
-            Specifies if the locale first to be used as current locale. Internally 
+            Specifies if the locale first to be used as current locale. Internally
             the <code>XStringResourceManager::setCurrentLocale</code> method is
             called with FindClosestMatch=true.
             see <code>XStringResourceManager::setCurrentLocale</code>
@@ -64,7 +62,7 @@ service StringResourceWithLocation : com::sun::star::resource::XStringResourceWi
             Base string for the file names used to store the locale data.
             The locale data is stored in Java properties files also following
             the corresponding naming scheme. The files will be named like this:
-            "[BaseName]_[Language]_[Country].properties", 
+            "[BaseName]_[Language]_[Country].properties",
             e.g. "MyBaseName_en_US.properties"
             If an empty string is passed for BaseName, "strings" will be used
             as BaseName.
@@ -83,14 +81,14 @@ service StringResourceWithLocation : com::sun::star::resource::XStringResourceWi
         @throws <type scope="com::sun::star::lang">IllegalArgumentException</type>
             if no string or an empty string is passed as URL
      */
-    create( [in] string URL, [in] boolean ReadOnly, 
+    create( [in] string URL, [in] boolean ReadOnly,
             [in] com::sun::star::lang::Locale locale,
             [in] string BaseName, [in] string Comment,
             [in] com::sun::star::task::XInteractionHandler Handler )
         raises( ::com::sun::star::lang::IllegalArgumentException );
 };
 
-//============================================================================= 
+//=============================================================================
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/resource/StringResourceWithStorage.idl b/offapi/com/sun/star/resource/StringResourceWithStorage.idl
index 6611feda4..d9a602d86 100644
--- a/offapi/com/sun/star/resource/StringResourceWithStorage.idl
+++ b/offapi/com/sun/star/resource/StringResourceWithStorage.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_resource_StringResourceWithStorage_idl__
 #define __com_sun_star_resource_StringResourceWithStorage_idl__
 
-#ifndef __com_sun_star_resource_XStringResourceWithStorage_idl__
 #include <com/sun/star/resource/XStringResourceWithStorage.idl>
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/resource/XLocale.idl b/offapi/com/sun/star/resource/XLocale.idl
index 092e15956..7336c458d 100644
--- a/offapi/com/sun/star/resource/XLocale.idl
+++ b/offapi/com/sun/star/resource/XLocale.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_resource_XLocale_idl__ 
 #define __com_sun_star_resource_XLocale_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
  
-#ifndef __com_sun_star_resource_MissingResourceException_idl__ 
 #include <com/sun/star/resource/MissingResourceException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/resource/XResourceBundle.idl b/offapi/com/sun/star/resource/XResourceBundle.idl
index 45ee94245..715266df5 100644
--- a/offapi/com/sun/star/resource/XResourceBundle.idl
+++ b/offapi/com/sun/star/resource/XResourceBundle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_resource_XResourceBundle_idl__
 #define __com_sun_star_resource_XResourceBundle_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/resource/XResourceBundleLoader.idl b/offapi/com/sun/star/resource/XResourceBundleLoader.idl
index 65b335809..728297241 100644
--- a/offapi/com/sun/star/resource/XResourceBundleLoader.idl
+++ b/offapi/com/sun/star/resource/XResourceBundleLoader.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_resource_XResourceBundleLoader_idl__ 
 #define __com_sun_star_resource_XResourceBundleLoader_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_resource_XResourceBundle_idl__ 
 #include <com/sun/star/resource/XResourceBundle.idl> 
-#endif 
  
-#ifndef __com_sun_star_resource_MissingResourceException_idl__ 
 #include <com/sun/star/resource/MissingResourceException.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/resource/XStringResourceManager.idl b/offapi/com/sun/star/resource/XStringResourceManager.idl
index a8a027d82..7839f02db 100644
--- a/offapi/com/sun/star/resource/XStringResourceManager.idl
+++ b/offapi/com/sun/star/resource/XStringResourceManager.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_resource_XStringResourceManager_idl__
 #define __com_sun_star_resource_XStringResourceManager_idl__
 
-#ifndef __com_sun_star_resource_MissingResourceException_idl__ 
 #include <com/sun/star/resource/MissingResourceException.idl> 
-#endif
-
-#ifndef __com_sun_star_resource_XStringResourceResolver_idl__ 
 #include <com/sun/star/resource/XStringResourceResolver.idl> 
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 
 //=============================================================================
@@ -71,9 +54,9 @@ module com { module sun { module star { module resource {
     localized dialogs.
     
 */
-interface XStringResourceManager: com::sun::star::resource::XStringResourceResolver
+published interface XStringResourceManager: com::sun::star::resource::XStringResourceResolver
 {
-    /** 
+    /**
         Returns the resource's read only state
 
         @return  <TRUE/> if the resource is read only, otherwise <FALSE/>
@@ -87,16 +70,16 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
             Specifies the current locale to be used.
 
         @param FindClosestMatch
-            <p>If true: If the exact locale that should be set is not available 
+            <p>If true: If the exact locale that should be set is not available
             the method tries to find the closest match. E.g. if en_US is re-
             quired but not available, en would be the next choice. Finally
-            the default locale will be used <TRUE/>. 
-            
-            <p>If false: If the exact locale that should be set is not available 
+            the default locale will be used <TRUE/>.
+
+            <p>If false: If the exact locale that should be set is not available
             a <type scope="com::sun::star::lang">IllegalArgumentException</type>
             is thrown.
-            
-            <p>If false: If the exact locale that should be set is not available 
+
+            <p>If false: If the exact locale that should be set is not available
             a <type scope="com::sun::star::lang">IllegalArgumentException</type>
             is thrown.
     */
@@ -111,8 +94,8 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
     /** Sets the default locale to be used
 
         @param aLocale
-            Specifies the default locale to be used. 
-            If this locale is not available a 
+            Specifies the default locale to be used.
+            If this locale is not available a
             <type scope="com::sun::star::lang">IllegalArgumentException</type>
             is thrown.
 
@@ -153,7 +136,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
         associated with it will be overwritten, otherwise a new
         entry will be created.
 
-        It's not recommended to use this method to get the best 
+        It's not recommended to use this method to get the best
         performance as the implementation may be optimized for
         the use of the current locale.
 
@@ -165,7 +148,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
         @param locale
             The locale the string should be set for.
-            The locale has to match exactly with one of the locales provided by 
+            The locale has to match exactly with one of the locales provided by
             <member>getLocales</member>. A closest match search is not supported.
 
         @throws <type scope="com::sun::star::lang">NoSupportException</type>
@@ -181,7 +164,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
 
     /**
-        Removes a Resource ID including the corresponding string for 
+        Removes a Resource ID including the corresponding string for
         the current locale.
 
         @param ResourceID
@@ -201,7 +184,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
 
     /**
-        Removes a Resource ID including the corresponding string for 
+        Removes a Resource ID including the corresponding string for
         s specific locale.
 
         @param ResourceID
@@ -209,7 +192,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
         @param locale
             The locale the Resource ID should be removed for.
-            The locale has to match exactly with one of the locales provided by 
+            The locale has to match exactly with one of the locales provided by
             <member>getLocales</member>. A closest match search is not supported.
 
         @throws
@@ -226,9 +209,9 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
 
     /**
-        Creates a new locale. 
-        
-        <p>For each existing ResourceID an empty string 
+        Creates a new locale.
+
+        <p>For each existing ResourceID an empty string
         will be created. The first locale created will
         automatically be the first default locale.
         Otherwise strings for all already created IDs
@@ -240,7 +223,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
         @throws
         <type scope="com::sun::star::lang">IllegalArgumentException</type>
-        if the Locale is not valid.	
+        if the Locale is not valid.
 
         @throws
         <type scope="com::sun::star::lang">NoSupportException</type>
diff --git a/offapi/com/sun/star/resource/XStringResourcePersistence.idl b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
index 3acf9a30f..1f883ad11 100644
--- a/offapi/com/sun/star/resource/XStringResourcePersistence.idl
+++ b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
 #define __com_sun_star_resource_XStringResourcePersistence_idl__
 
-#ifndef __com_sun_star_resource_XStringResourceManager_idl__ 
 #include <com/sun/star/resource/XStringResourceManager.idl> 
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 
 //=============================================================================
@@ -52,7 +44,7 @@ module com { module sun { module star { module resource {
     
     @see <type>XStringResourceManager</type>.
 */
-interface XStringResourcePersistence: com::sun::star::resource::XStringResourceManager
+published interface XStringResourcePersistence: com::sun::star::resource::XStringResourceManager
 {
     /**
         Stores all string table data respectively all data modified since 
diff --git a/offapi/com/sun/star/resource/XStringResourceResolver.idl b/offapi/com/sun/star/resource/XStringResourceResolver.idl
index 02b5c978b..f10b6d711 100644
--- a/offapi/com/sun/star/resource/XStringResourceResolver.idl
+++ b/offapi/com/sun/star/resource/XStringResourceResolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,28 +27,20 @@
 #ifndef __com_sun_star_resource_XStringResourceResolver_idl__
 #define __com_sun_star_resource_XStringResourceResolver_idl__
 
-#ifndef __com_sun_star_resource_MissingResourceException_idl__ 
-#include <com/sun/star/resource/MissingResourceException.idl> 
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
+#include <com/sun/star/resource/MissingResourceException.idl>
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
 
-module com { module sun { module star { module resource { 
+module com { module sun { module star { module resource {
 
 //=============================================================================
-/** 
+/**
     Interface to access strings in a resource.
 
-    The interface is derived from 
+    The interface is derived from
     <type scope="com::sun::star::util">XModifyBroadcaster</type>
 
     All registered <type scope="com::sun::star::util">XModifyListener</type>
@@ -60,18 +52,18 @@ module com { module sun { module star { module resource {
     But also changing the locale at runtime can be supported in this way.
 
 */
-interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
+published interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 {
     /**
-        Resolves the passed ResoureID for the current locale. This 
+        Resolves the passed ResoureID for the current locale. This
         locale is set during initialization of the object implementing
-        this interface or - in case that also the interface 
+        this interface or - in case that also the interface
         <type scope="com::sun::star::resource">XStringResourceManager</type>
-        is supported - by using the <code>XStringResourceManager::setLocale</code> 
+        is supported - by using the <code>XStringResourceManager::setLocale</code>
         method.
 
         @param ResourceID
-            ID to specify the string inside the resource. 
+            ID to specify the string inside the resource.
             The ID can - but not needs to - be a hierarchical
             name like "foo.nothing.invalid".
 
@@ -86,18 +78,18 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 
     /** Resolves the passed ResoureID for a specific locale.
 
-        It's not recommended to use this method to get the best 
+        It's not recommended to use this method to get the best
         performance as the implementation may be optimized for
         the use of the current locale.
 
         @param ResourceID
-            ID to specify the string inside the resource. 
+            ID to specify the string inside the resource.
             The ID can - but not needs to - be a hierarchical
             name like "foo.nothing.invalid".
 
         @param locale
             The locale the string should be resolved for.
-            The locale has to match exactly with one of the locales provided by 
+            The locale has to match exactly with one of the locales provided by
             <member>getLocales</member>. A closest match search is not supported.
 
         @return  the localized string for the specified ID and Locale
@@ -114,7 +106,7 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
         and current locale.
 
         @param ResourceID
-            ID to specify the string inside the resource. 
+            ID to specify the string inside the resource.
 
         @return  <TRUE/> if an entry exists, otherwise <FALSE/>
 
@@ -125,16 +117,16 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
     /**
         Checks if the resource contains an entry for the given ResourceID and locale.
 
-        It's not recommended to use this method to get the best 
+        It's not recommended to use this method to get the best
         performance as the implementation may be optimized for
         the use of the current locale.
 
         @param ResourceID
-            ID to specify the string inside the resource. 
+            ID to specify the string inside the resource.
 
         @param locale
             The locale the entry should be checked for.
-            The locale has to match exactly with one of the locales provided by 
+            The locale has to match exactly with one of the locales provided by
             <member>getLocales</member>. A closest match search is not supported.
 
         @return  <TRUE/> if an entry exists, otherwise <FALSE/>
@@ -153,13 +145,13 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
     /**
         Returns a sequence of all valid Resource IDs for a specific locale
 
-        It's not recommended to use this method to get the best 
+        It's not recommended to use this method to get the best
         performance as the implementation may be optimized for
         the use of the current locale.
 
         @param locale
             The locale the ResourceIDs should be returned for.
-            The locale has to match exactly with one of the locales provided by 
+            The locale has to match exactly with one of the locales provided by
             <member>getLocales</member>. A closest match search is not supported.
 
         @return  a sequence of all valid Resource IDs
@@ -168,7 +160,7 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 
 
     /** Returns the current locale specified in the accessed resource.
-        
+
         If no locale is available, the returned Locale structure
         only contains empty strings.
 
@@ -178,7 +170,7 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 
 
     /** Returns the default locale of the accessed resource. In many
-        cases this will be the locale of the Office initially used 
+        cases this will be the locale of the Office initially used
         to create the resource.
 
         @return  the used locale
@@ -196,6 +188,6 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 
 //=============================================================================
 
-}; }; }; }; 
+}; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/resource/XStringResourceSupplier.idl b/offapi/com/sun/star/resource/XStringResourceSupplier.idl
index 6fff924cc..415b33774 100644
--- a/offapi/com/sun/star/resource/XStringResourceSupplier.idl
+++ b/offapi/com/sun/star/resource/XStringResourceSupplier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_resource_XStringResourceSupplier_idl__
 #define __com_sun_star_resource_XStringResourceSupplier_idl__
 
-#ifndef __com_sun_star_resource_XStringResourceResolver_idl__ 
 #include <com/sun/star/resource/XStringResourceResolver.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
index 0715b2ee4..6c66f78c2 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,27 +27,25 @@
 #ifndef __com_sun_star_resource_XStringResourceWithLocation_idl__
 #define __com_sun_star_resource_XStringResourceWithLocation_idl__
 
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__ 
-#include <com/sun/star/resource/XStringResourcePersistence.idl> 
-#endif
+#include <com/sun/star/resource/XStringResourcePersistence.idl>
 
 
 //=============================================================================
 
-module com { module sun { module star { module resource { 
+module com { module sun { module star { module resource {
 
 //=============================================================================
-/** 
+/**
     Extends <type>XStringResourcePersistence</type> by methods to handle an
     associated location.
 
     @see <type>XStringResourcePersistence</type>.
 */
-interface XStringResourceWithLocation: com::sun::star::resource::XStringResourcePersistence
+published interface XStringResourceWithLocation: com::sun::star::resource::XStringResourcePersistence
 {
     /**
         Stores all string table data to a location and associates this location
-        to this instance as if <member>setLocation</member> was called with this 
+        to this instance as if <member>setLocation</member> was called with this
         location. The modified state will be unmodified after the call.
 
         @param URL
@@ -58,19 +56,19 @@ interface XStringResourceWithLocation: com::sun::star::resource::XStringResource
 
 
     /**
-        Associates a location to the StringResourceWithStorage instance 
+        Associates a location to the StringResourceWithStorage instance
         which is used on subsequent calls of <member>store</member>.
-        
+
         @param URL
             the location to be associated to the StringResourceManager
 
         <p>
         This call has to be used carefully as it removes the location
-        previously connected to the StringResourceWithStorage. It may 
-        force the implementation to reload data from the previous 
-        location before releasing it. The StringResourceManager will 
-        be modified after calling this method as the data isn't stored 
-        to the new location yet. <member>storeAsURL</member> should 
+        previously connected to the StringResourceWithStorage. It may
+        force the implementation to reload data from the previous
+        location before releasing it. The StringResourceManager will
+        be modified after calling this method as the data isn't stored
+        to the new location yet. <member>storeAsURL</member> should
         be preferred as it directly stores the data to the new location
         and afterwards this location is in sync with the resource data.
         </p>
@@ -84,6 +82,6 @@ interface XStringResourceWithLocation: com::sun::star::resource::XStringResource
 
 //=============================================================================
 
-}; }; }; }; 
+}; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/resource/XStringResourceWithStorage.idl b/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
index 405153350..0e571b729 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_resource_XStringResourceWithStorage_idl__
 #define __com_sun_star_resource_XStringResourceWithStorage_idl__
 
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__ 
 #include <com/sun/star/resource/XStringResourcePersistence.idl> 
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/resource/makefile.mk b/offapi/com/sun/star/resource/makefile.mk
deleted file mode 100644
index b255b2f2e..000000000
--- a/offapi/com/sun/star/resource/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssresource
-PACKAGE=com$/sun$/star$/resource
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MissingResourceException.idl\
-    OfficeResourceLoader.idl\
-    XLocale.idl\
-    XResourceBundle.idl\
-    XResourceBundleLoader.idl\
-    XStringResourceResolver.idl\
-    XStringResourceManager.idl\
-    XStringResourcePersistence.idl\
-    XStringResourceWithStorage.idl\
-    XStringResourceWithLocation.idl\
-    XStringResourceSupplier.idl\
-    StringResource.idl\
-    StringResourceWithLocation.idl\
-    StringResourceWithStorage.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/scanner/ScannerException.idl b/offapi/com/sun/star/scanner/ScannerException.idl
index 02cd8929f..3e14638b9 100644
--- a/offapi/com/sun/star/scanner/ScannerException.idl
+++ b/offapi/com/sun/star/scanner/ScannerException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_scanner_ScannerException_idl__
 #define __com_sun_star_scanner_ScannerException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScanError_idl__
 #include <com/sun/star/scanner/ScanError.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/scanner/ScannerManager.idl b/offapi/com/sun/star/scanner/ScannerManager.idl
index 38c917deb..399ae28e3 100644
--- a/offapi/com/sun/star/scanner/ScannerManager.idl
+++ b/offapi/com/sun/star/scanner/ScannerManager.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_scanner_ScannerManager_idl__
 #define __com_sun_star_scanner_ScannerManager_idl__
 
-#ifndef __com_sun_star_scanner_XScannerManager_idl__
 #include <com/sun/star/scanner/XScannerManager.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/scanner/XScannerManager.idl b/offapi/com/sun/star/scanner/XScannerManager.idl
index 8d985beb0..d2331c2e1 100644
--- a/offapi/com/sun/star/scanner/XScannerManager.idl
+++ b/offapi/com/sun/star/scanner/XScannerManager.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_scanner_XScannerManager_idl__
 #define __com_sun_star_scanner_XScannerManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScannerContext_idl__
 #include <com/sun/star/scanner/ScannerContext.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScannerException_idl__
 #include <com/sun/star/scanner/ScannerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScanError_idl__
 #include <com/sun/star/scanner/ScanError.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/scanner/makefile.mk b/offapi/com/sun/star/scanner/makefile.mk
deleted file mode 100644
index b4214c205..000000000
--- a/offapi/com/sun/star/scanner/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssscanner
-PACKAGE=com$/sun$/star$/scanner
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ScanError.idl\
-    ScannerContext.idl\
-    ScannerException.idl\
-    ScannerManager.idl\
-    XScannerManager.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl b/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
index bcdc39bc8..205e701ad 100644
--- a/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
+++ b/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_DocumentDialogLibraryContainer_idl__
 #define __com_sun_star_script_DocumentDialogLibraryContainer_idl__
 
-#ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
 #include <com/sun/star/script/XStorageBasedLibraryContainer.idl>
-#endif
-#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #include <com/sun/star/document/XStorageBasedDocument.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl b/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
index c1d7dfe15..602d54b4f 100644
--- a/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
+++ b/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_DocumentScriptLibraryContainer_idl__
 #define __com_sun_star_script_DocumentScriptLibraryContainer_idl__
 
-#ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
 #include <com/sun/star/script/XStorageBasedLibraryContainer.idl>
-#endif
-#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #include <com/sun/star/document/XStorageBasedDocument.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/LibraryNotLoadedException.idl b/offapi/com/sun/star/script/LibraryNotLoadedException.idl
index da5ca71be..6fc81be0e 100644
--- a/offapi/com/sun/star/script/LibraryNotLoadedException.idl
+++ b/offapi/com/sun/star/script/LibraryNotLoadedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_LibraryNotLoadedException_idl__
 #define __com_sun_star_script_LibraryNotLoadedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/script/ModuleInfo.idl b/offapi/com/sun/star/script/ModuleInfo.idl
index 31342c002..745ab0b10 100644
--- a/offapi/com/sun/star/script/ModuleInfo.idl
+++ b/offapi/com/sun/star/script/ModuleInfo.idl
@@ -30,9 +30,7 @@
 #ifndef __com_sun_star_script_ModuleInfo_idl__
 #define __com_sun_star_script_ModuleInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star { module script {
diff --git a/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl b/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
index 15f20e71b..1da8c5171 100644
--- a/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
+++ b/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_ModuleSizeExceededRequest_idl__
 #define __com_sun_star_document_ModuleSizeExceededRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/script/XLibraryContainer.idl b/offapi/com/sun/star/script/XLibraryContainer.idl
index 43cf7cfaf..eb60bb6aa 100644
--- a/offapi/com/sun/star/script/XLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer.idl
@@ -27,36 +27,20 @@
 #ifndef __com_sun_star_script_XLibraryContainer_idl__ 
 #define __com_sun_star_script_XLibraryContainer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl> 
-#endif 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/script/XLibraryContainer2.idl b/offapi/com/sun/star/script/XLibraryContainer2.idl
index a522ba11b..f8ce8bab2 100644
--- a/offapi/com/sun/star/script/XLibraryContainer2.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_XLibraryContainer2_idl__ 
 #define __com_sun_star_script_XLibraryContainer2_idl__ 
  
-#ifndef __com_sun_star_script_XLibraryContainer_idl__ 
 #include <com/sun/star/script/XLibraryContainer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/script/XLibraryContainer3.idl b/offapi/com/sun/star/script/XLibraryContainer3.idl
index 167e57843..55ffe95c7 100644
--- a/offapi/com/sun/star/script/XLibraryContainer3.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer3.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_XLibraryContainer3_idl__ 
 #define __com_sun_star_script_XLibraryContainer3_idl__ 
  
-#ifndef __com_sun_star_script_XLibraryContainer2_idl__ 
 #include <com/sun/star/script/XLibraryContainer2.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/script/XLibraryContainerExport.idl b/offapi/com/sun/star/script/XLibraryContainerExport.idl
index 3d51efa03..1ccdd6226 100644
--- a/offapi/com/sun/star/script/XLibraryContainerExport.idl
+++ b/offapi/com/sun/star/script/XLibraryContainerExport.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_script_XLibraryContainerExport_idl__ 
 #define __com_sun_star_script_XLibraryContainerExport_idl__ 
  
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/script/XLibraryContainerPassword.idl b/offapi/com/sun/star/script/XLibraryContainerPassword.idl
index 9d0f6c972..43e82a3f4 100644
--- a/offapi/com/sun/star/script/XLibraryContainerPassword.idl
+++ b/offapi/com/sun/star/script/XLibraryContainerPassword.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_script_XLibraryContainerPassword_idl__ 
 #define __com_sun_star_script_XLibraryContainerPassword_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/script/XLibraryQueryExecutable.idl b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
index 3c3a0a9b3..e7c1b0264 100644
--- a/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
+++ b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_XLibraryQueryExecutable_idl__ 
 #define __com_sun_star_script_XLibraryQueryExecutable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
@@ -37,7 +35,7 @@ module com {  module sun {  module star {  module script {
  
 interface XLibraryQueryExecutable: com::sun::star::uno::XInterface
 { 
-	boolean HasExecutableCode( [in] string name );
+    boolean HasExecutableCode( [in] string name );
 };
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/script/XPersistentLibraryContainer.idl b/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
index 796dd73a0..6de86c38a 100644
--- a/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_XPersistentLibraryContainer_idl__
 #define __com_sun_star_script_XPersistentLibraryContainer_idl__
 
-#ifndef __com_sun_star_util_XModifiable_idl__ 
 #include <com/sun/star/util/XModifiable.idl>
-#endif
-#ifndef __com_sun_star_script_XLibraryContainer2_idl__ 
 #include <com/sun/star/script/XLibraryContainer2.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl b/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
index 77e6f5532..ac130235c 100644
--- a/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
@@ -29,12 +29,8 @@
 #ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
 #define __com_sun_star_script_XStorageBasedLibraryContainer_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-#ifndef __com_sun_star_script_XPersistentLibraryContainer_idl__
 #include <com/sun/star/script/XPersistentLibraryContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/script/browse/BrowseNode.idl b/offapi/com/sun/star/script/browse/BrowseNode.idl
index 899d7afe3..f8e8523e4 100644
--- a/offapi/com/sun/star/script/browse/BrowseNode.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNode.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_script_browse_BrowseNode_idl__
 #define __com_sun_star_script_browse_BrowseNode_idl__
 
-#ifndef __com_sun_star_script_browse_XBrowseNode_idl__
 #include <com/sun/star/script/browse/XBrowseNode.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocation_idl__
 #include <com/sun/star/script/XInvocation.idl>
-#endif
 
 module com {
  module sun {
diff --git a/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl b/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
index b0cf65058..545db3d7a 100644
--- a/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_browse_BrowseNodeFactory_idl__
 #define __com_sun_star_script_browse_BrowseNodeFactory_idl__
 
-#ifndef __com_sun_star_script_browse_XBrowseNodeFactory_idl__
 #include <com/sun/star/script/browse/XBrowseNodeFactory.idl>
-#endif
 
 module com { module sun { module star { module script { module browse {
 
diff --git a/offapi/com/sun/star/script/browse/XBrowseNode.idl b/offapi/com/sun/star/script/browse/XBrowseNode.idl
index 93645ff85..362b553f6 100644
--- a/offapi/com/sun/star/script/browse/XBrowseNode.idl
+++ b/offapi/com/sun/star/script/browse/XBrowseNode.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_browse_XBrowseNode_idl__
 #define __com_sun_star_script_browse_XBrowseNode_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module script { module browse {
 //==============================================================================
diff --git a/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl b/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
index bbb768546..d4b4c556c 100644
--- a/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
+++ b/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_provider_XBrowseNodeFactory_idl__
 #define __com_sun_star_script_provider_XBrowseNodeFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_browse_XBrowseNode_idl__
 #include <com/sun/star/script/browse/XBrowseNode.idl>
-#endif
-#ifndef __com_sun_star_script_browse_BrowseNodeFactoryViewTypes_idl__
 #include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/browse/makefile.mk b/offapi/com/sun/star/script/browse/makefile.mk
deleted file mode 100644
index 4a2fdfddf..000000000
--- a/offapi/com/sun/star/script/browse/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssbrowse
-PACKAGE=com$/sun$/star$/script$/browse
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XBrowseNode.idl\
-    XBrowseNodeFactory.idl\
-    BrowseNodeFactoryViewTypes.idl\
-    BrowseNodeFactory.idl\
-    BrowseNode.idl\
-    BrowseNodeTypes.idl
-     
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl b/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
index 6fab8ec69..bf847f456 100644
--- a/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
 #define __com_sun_star_script_provider_LanguageScriptProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_ScriptProvider_idl__
 #include <com/sun/star/script/provider/ScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/MasterScriptProvider.idl b/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
index 987349a43..064ef890f 100644
--- a/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_MasterScriptProvider_idl__
 #define __com_sun_star_script_provider_MasterScriptProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_ScriptProvider_idl__
 #include <com/sun/star/script/provider/ScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl b/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
index df64e2b84..ebb19b81f 100644
--- a/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
+++ b/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
@@ -29,9 +29,7 @@
 #define __com_sun_star_script_provider_MasterScriptProviderFactory_idl__
 
 
-#ifndef __com_sun_star_script_provider_XScriptProviderFactory_idl__
 #include <com/sun/star/script/provider/XScriptProviderFactory.idl>
-#endif
 
 module com { module sun { module star { module script { module provider {
 
diff --git a/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl b/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
index 0fee9d375..c0a35d9a4 100644
--- a/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_provider_ScriptErrorRaisedException_idl__
 #define __com_sun_star_script_provider_ScriptErrorRaisedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl b/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
index 8f1516928..185b88659 100644
--- a/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_provider_ScriptExceptionRaisedException_idl__
 #define __com_sun_star_script_provider_ScriptExceptionRaisedException_idl__
 
-#ifndef __com_sun_star_script_provider_ScriptErrorRaisedException_idl__
 #include <com/sun/star/script/provider/ScriptErrorRaisedException.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
index 5519c3bf8..b7ee2569e 100644
--- a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
 #define __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptProvider.idl b/offapi/com/sun/star/script/provider/ScriptProvider.idl
index d9d4027df..bcf5d759f 100644
--- a/offapi/com/sun/star/script/provider/ScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProvider.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_script_provider_ScriptProvider_idl__
 #define __com_sun_star_script_provider_ScriptProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_XScriptProvider_idl__
 #include <com/sun/star/script/provider/XScriptProvider.idl>
-#endif
-
-#ifndef __com_sun_star_script_browse_BrowseNode_idl__
 #include <com/sun/star/script/browse/BrowseNode.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl b/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
index f833f58dc..4ed9c57ed 100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_ScriptProviderForBasic_idl__
 #define __com_sun_star_script_provider_ScriptProviderForBasic_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
 #include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl b/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
index d14280376..29e831691 100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_ScriptProviderForBeanShell_idl__
 #define __com_sun_star_script_provider_ScriptProviderForBeanShell_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
 #include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl b/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
index 433ed4b2b..7ef640fcf 100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_ScriptProviderForJava_idl__
 #define __com_sun_star_script_provider_ScriptProviderForJava_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
 #include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl b/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
index 21b36aac6..8c5c9936d 100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_ScriptProviderForJavaScript_idl__
 #define __com_sun_star_script_provider_ScriptProviderForJavaScript_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
 #include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptURIHelper.idl b/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
index fc6ed02a9..4a25c6ae6 100644
--- a/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
+++ b/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_script_provider_ScriptURIHelper_idl__
 #define __com_sun_star_script_provider_ScriptURIHelper_idl__
 
-#ifndef __com_sun_star_script_provider_XScriptURIHelper_idl__
 #include <com/sun/star/script/provider/XScriptURIHelper.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/XScript.idl b/offapi/com/sun/star/script/provider/XScript.idl
index b93ad165f..2a0db03bc 100644
--- a/offapi/com/sun/star/script/provider/XScript.idl
+++ b/offapi/com/sun/star/script/provider/XScript.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_script_provider_XScript_idl__
 #define __com_sun_star_script_provider_XScript_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_script_CannotConvertException_idl__
 #include <com/sun/star/script/CannotConvertException.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
 #include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
-
-#ifndef  __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
 #include <com/sun/star/script/provider/ScriptFrameworkErrorException.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/XScriptContext.idl b/offapi/com/sun/star/script/provider/XScriptContext.idl
index 4cf1de6eb..0e65f9755 100644
--- a/offapi/com/sun/star/script/provider/XScriptContext.idl
+++ b/offapi/com/sun/star/script/provider/XScriptContext.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_script_provider_XScriptContext_idl__
 #define __com_sun_star_script_provider_XScriptContext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDesktop_idl__
 #include <com/sun/star/frame/XDesktop.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XComponentContext_idl__ 
 #include <com/sun/star/uno/XComponentContext.idl>
-#endif
 
 
 module com { module sun { module star { module document {
diff --git a/offapi/com/sun/star/script/provider/XScriptProvider.idl b/offapi/com/sun/star/script/provider/XScriptProvider.idl
index 01da666be..666ec1cb6 100644
--- a/offapi/com/sun/star/script/provider/XScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProvider.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_script_provider_XScriptProvider_idl__
 #define __com_sun_star_script_provider_XScriptProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScript_idl__
 #include <com/sun/star/script/provider/XScript.idl>
-#endif
-#ifndef __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
 #include <com/sun/star/script/provider/ScriptFrameworkErrorException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl b/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
index 501633d2d..e35b24406 100644
--- a/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_provider_XScriptProviderFactory_idl__
 #define __com_sun_star_script_provider_XScriptProviderFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScriptProvider_idl__
 #include <com/sun/star/script/provider/XScriptProvider.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl b/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
index 077302e98..1a36a22f9 100644
--- a/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_provider_XScriptProviderSupplier_idl__
 #define __com_sun_star_script_provider_XScriptProviderSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScriptProvider_idl__
 #include <com/sun/star/script/provider/XScriptProvider.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/XScriptURIHelper.idl b/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
index a04f6486c..e5b7ae728 100644
--- a/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
+++ b/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_XScriptURIHelper_idl__
 #define __com_sun_star_script_provider_XScriptURIHelper_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //===========================================================================
diff --git a/offapi/com/sun/star/script/provider/makefile.mk b/offapi/com/sun/star/script/provider/makefile.mk
deleted file mode 100644
index 488944ff7..000000000
--- a/offapi/com/sun/star/script/provider/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssprovider
-PACKAGE=com$/sun$/star$/script$/provider
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        XScript.idl\
-        XScriptContext.idl\
-        XScriptProvider.idl\
-        XScriptProviderSupplier.idl\
-        ScriptProvider.idl\
-        MasterScriptProvider.idl\
-        XScriptProviderFactory.idl\
-        LanguageScriptProvider.idl\
-        ScriptProviderForJava.idl\
-        ScriptProviderForJavaScript.idl\
-        ScriptProviderForBeanShell.idl\
-        MasterScriptProviderFactory.idl\
-        ScriptErrorRaisedException.idl\
-        ScriptExceptionRaisedException.idl\
-        ScriptFrameworkErrorException.idl\
-        ScriptFrameworkErrorType.idl\
-        ScriptURIHelper.idl\
-        XScriptURIHelper.idl\
-        ScriptProviderForBasic.idl
-
-# ------------------------------------------------------------------
-
-# ------------------------------------------------------------------
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/script/vba/VBAEventId.idl b/offapi/com/sun/star/script/vba/VBAEventId.idl
index fc305bc1a..af0527a16 100644
--- a/offapi/com/sun/star/script/vba/VBAEventId.idl
+++ b/offapi/com/sun/star/script/vba/VBAEventId.idl
@@ -97,11 +97,11 @@ constants VBAEventId
     const long WORKBOOK_AFTERSAVE                   = 2007;
     /** New sheet inserted. Arguments: short nSheet. */
     const long WORKBOOK_NEWSHEET                    = 2008;
-    /** Document window has been activated. No arguments. */
+    /** Document window has been activated. Arguments: XController aController. */
     const long WORKBOOK_WINDOWACTIVATE              = 2009;
-    /** Document window has been deactivated. No arguments. */
+    /** Document window has been deactivated. Arguments: XController aController. */
     const long WORKBOOK_WINDOWDEACTIVATE            = 2010;
-    /** Document window has been resized. No arguments. */
+    /** Document window has been resized. Arguments: XController aController. */
     const long WORKBOOK_WINDOWRESIZE                = 2011;
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/script/vba/VBAScriptEvent.idl b/offapi/com/sun/star/script/vba/VBAScriptEvent.idl
new file mode 100644
index 000000000..c1fc7096b
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/VBAScriptEvent.idl
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_script_vba_VBAScriptEvent_idl__
+#define __com_sun_star_script_vba_VBAScriptEvent_idl__
+
+#include <com/sun/star/lang/EventObject.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star { module script { module vba {
+
+//=============================================================================
+
+/** Describes a VBA script event fired via <member>XVBACompatibility::
+    broadcastVBAScriptEvent</member>, and received by <member>
+    XVBAScriptListener::notifyVBAScriptEvent</member>.
+
+    @see XVBACompatibility
+    @see XVBAScriptListener
+ */
+struct VBAScriptEvent : ::com::sun::star::lang::EventObject
+{
+    //-------------------------------------------------------------------------
+
+    /** Identifies the type of the event.
+
+        @see VBAScriptEventId
+     */
+    long Identifier;
+
+    //-------------------------------------------------------------------------
+
+    /** Contains the name of the involved VBA module.
+
+        @see VBAScriptEventId
+     */
+    string ModuleName;
+
+    //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/VBAScriptEventId.idl b/offapi/com/sun/star/script/vba/VBAScriptEventId.idl
new file mode 100644
index 000000000..cc66a3fc0
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/VBAScriptEventId.idl
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_script_vba_VBAScriptEventId_idl__
+#define __com_sun_star_script_vba_VBAScriptEventId_idl__
+
+//=============================================================================
+
+module com {  module sun {  module star { module script { module vba {
+
+//=============================================================================
+
+/** Identifies a VBA script event fired via <member>XVBACompatibility::
+    broadcastVBAScriptEvent</member>, and received by <member>
+    XVBAScriptListener::notifyVBAScriptEvent</member>.
+
+    @see VBAScriptEvent
+    @see XVBACompatibility
+    @see XVBAScriptListener
+ */
+constants VBAScriptEventId
+{
+    //-------------------------------------------------------------------------
+    /** This event is fired when a VBA script in the current document has been
+        started.
+
+        <p>Several scripts may run simultaneously, e.g. when a running script
+        triggers a document event that starts another script.</p>
+
+        <p>The number of running scripts can be obtained via <member>
+        XVBACompatibility::RunningVBAScripts</member>. The number returned
+        there will already contain the new script notified with this event.</p>
+
+        <p>The member <member>VBAScriptEvent::ModuleName</member> of the event
+        object will contain the name of the code module that contains the
+        started script.</p>
+     */
+    const long SCRIPT_STARTED = 0;
+
+    //-------------------------------------------------------------------------
+    /** This event is fired when a VBA script in the current document stops
+        running.
+
+        <p>Several scripts may run simultaneously, e.g. when a running script
+        triggers a document event that starts another script.</p>
+
+        <p>The number of scripts still running can be obtained via <member>
+        XVBACompatibility::RunningVBAScripts</member>. The number returned
+        there will not contain the stopped script notified with this event
+        anymore.</p>
+
+        <p>The member <member>VBAScriptEvent::ModuleName</member> of the event
+        object will contain the name of the code module that contains the
+        script that has been stopped.</p>
+     */
+    const long SCRIPT_STOPPED = 1;
+
+    //-------------------------------------------------------------------------
+    /** This event is fired when a VBA script in the current document tries to
+        instanciate a userform.
+
+        <p>The member <member>VBAScriptEvent::ModuleName</member> of the event
+        object will contain the name of the userform module.</p>
+     */
+    const long INITIALIZE_USERFORM = 2;
+
+    //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/XVBACompatibility.idl b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
index 77b1435f7..9f93bb08f 100644
--- a/offapi/com/sun/star/script/vba/XVBACompatibility.idl
+++ b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
@@ -28,12 +28,13 @@
 #ifndef __com_sun_star_script_vba_XVBACompatibility_idl__
 #define __com_sun_star_script_vba_XVBACompatibility_idl__
 
-#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/frame/XModel.idl>
+#include <com/sun/star/script/vba/XVBAScriptListener.idl>
 
 //=============================================================================
- 
+
 module com {  module sun {  module star {  module script { module vba {
- 
+
 interface XVBACompatibility
 {
     //-------------------------------------------------------------------------
@@ -42,6 +43,22 @@ interface XVBACompatibility
     [attribute ] string  ProjectName;
 
     //-------------------------------------------------------------------------
+
+    [attribute, readonly] long RunningVBAScripts;
+
+    //-------------------------------------------------------------------------
+
+    [oneway] void addVBAScriptListener( [in] XVBAScriptListener Listener );
+
+    //-------------------------------------------------------------------------
+
+    [oneway] void removeVBAScriptListener( [in] XVBAScriptListener Listener );
+
+    //-------------------------------------------------------------------------
+
+    void broadcastVBAScriptEvent( [in] long Identifier, [in] string ModuleName );
+
+    //-------------------------------------------------------------------------
 };
 
 }; }; }; }; };
diff --git a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
index a75e6fa4e..ab7d3aad7 100644
--- a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
@@ -30,7 +30,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#include <com/sun/star/script/provider/ScriptFrameworkErrorException.idl>
 #include <com/sun/star/util/VetoException.idl>
 
 //=============================================================================
@@ -74,24 +73,21 @@ interface XVBAEventProcessor
         @param aArgs
             The input arguments needed to create the argument list of the VBA
             event handler.
-            
+
+        @return
+            <TRUE/>, if event handing is enabled, and the event handler macro
+            exists and has been invoked.
+
         @throws <type scope="::com::sun::star::lang">IllegalArgumentException</type>
             if the passed event identifier is not supported, or if the passed
             arguments do not conform to the arguments expected by the specified
             event.
 
-        @throws <type scope="::com::sun::star::script::provider">ScriptFrameworkErrorException</type>
-            if the VBA event handler could not be invoked. Reasons may be, that
-            handling of VBA events is not enabled, that the VBA event handler
-            macro has not been found, or that the execution of the macro has
-            been aborted with an error.
-
         @throws <type scope="::com::sun::star::util">VetoException</type>
             if the VBA event handler has indicated to veto the event.
     **/
-    void processVbaEvent( [in] long nEventId, [in] sequence< any > aArgs )
+    boolean processVbaEvent( [in] long nEventId, [in] sequence< any > aArgs )
         raises (::com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::script::provider::ScriptFrameworkErrorException,
                 ::com::sun::star::util::VetoException);
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/script/vba/XVBAScriptListener.idl b/offapi/com/sun/star/script/vba/XVBAScriptListener.idl
new file mode 100644
index 000000000..2f5594d3b
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/XVBAScriptListener.idl
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_script_vba_XVBAScriptListener_idl__
+#define __com_sun_star_script_vba_XVBAScriptListener_idl__
+
+#include <com/sun/star/lang/XEventListener.idl>
+#include <com/sun/star/script/vba/VBAScriptEvent.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star { module script { module vba {
+
+//=============================================================================
+
+interface XVBAScriptListener : ::com::sun::star::lang::XEventListener
+{
+    void notifyVBAScriptEvent( [in] VBAScriptEvent Event );
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/makefile.mk b/offapi/com/sun/star/script/vba/makefile.mk
index 336be1b5e..6f13245f7 100644
--- a/offapi/com/sun/star/script/vba/makefile.mk
+++ b/offapi/com/sun/star/script/vba/makefile.mk
@@ -41,12 +41,15 @@ IDLFILES=\
     VBAEventId.idl \
     VBAEventProcessor.idl \
     VBAMacroResolver.idl \
+    VBAScriptEvent.idl \
+    VBAScriptEventId.idl \
     VBASpreadsheetEventProcessor.idl \
     VBATextEventProcessor.idl \
     XVBACompatibility.idl \
     XVBAEventProcessor.idl \
     XVBAMacroResolver.idl \
-    XVBAModuleInfo.idl
+    XVBAModuleInfo.idl \
+    XVBAScriptListener.idl
 
 # ------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sdb/CallableStatement.idl b/offapi/com/sun/star/sdb/CallableStatement.idl
index 1bfc56372..3f24d5fdc 100644
--- a/offapi/com/sun/star/sdb/CallableStatement.idl
+++ b/offapi/com/sun/star/sdb/CallableStatement.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_CallableStatement_idl__ 
 #define __com_sun_star_sdb_CallableStatement_idl__ 
  
-#ifndef __com_sun_star_sdbc_CallableStatement_idl__ 
 #include <com/sun/star/sdbc/CallableStatement.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdb_PreparedStatement_idl__ 
 #include <com/sun/star/sdb/PreparedStatement.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/Column.idl b/offapi/com/sun/star/sdb/Column.idl
index 6726fc862..9a0ca3688 100644
--- a/offapi/com/sun/star/sdb/Column.idl
+++ b/offapi/com/sun/star/sdb/Column.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_Column_idl__ 
 #define __com_sun_star_sdb_Column_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Column_idl__ 
 #include <com/sun/star/sdbcx/Column.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__ 
 #include <com/sun/star/sdb/ColumnSettings.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl b/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
index 1bee8c1df..608c7f637 100644
--- a/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
+++ b/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_ColumnDescriptorControl_idl__ 
 #define __com_sun_star_sdb_ColumnDescriptorControl_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl b/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
index 152a24b09..6a72ee06f 100644
--- a/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
+++ b/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_ColumnDescriptorControlModel_idl__ 
 #define __com_sun_star_sdb_ColumnDescriptorControlModel_idl__ 
  
-#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/sdb/ColumnSettings.idl b/offapi/com/sun/star/sdb/ColumnSettings.idl
index 369e42e92..f2cbb2b1d 100644
--- a/offapi/com/sun/star/sdb/ColumnSettings.idl
+++ b/offapi/com/sun/star/sdb/ColumnSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_ColumnSettings_idl__ 
 #define __com_sun_star_sdb_ColumnSettings_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/Connection.idl b/offapi/com/sun/star/sdb/Connection.idl
index b6b4f25f1..b238df771 100644
--- a/offapi/com/sun/star/sdb/Connection.idl
+++ b/offapi/com/sun/star/sdb/Connection.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdb_Connection_idl__ 
 #define __com_sun_star_sdb_Connection_idl__ 
  
-#ifndef __com_sun_star_container_XChild_idl__ 
 #include <com/sun/star/container/XChild.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_Connection_idl__ 
 #include <com/sun/star/sdbc/Connection.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__ 
 #include <com/sun/star/sdbcx/DatabaseDefinition.idl> 
-#endif 
  
 module com {  module sun {  module star {  module lang {  
      published interface XMultiServiceFactory;
diff --git a/offapi/com/sun/star/sdb/ContentLoader.idl b/offapi/com/sun/star/sdb/ContentLoader.idl
index 0b35c9f71..25d4d79b2 100644
--- a/offapi/com/sun/star/sdb/ContentLoader.idl
+++ b/offapi/com/sun/star/sdb/ContentLoader.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_sdb_ContentLoader_idl__ 
 #define __com_sun_star_sdb_ContentLoader_idl__ 
 
-#ifndef __com_sun_star_frame_Frame_idl__ 
 #include <com/sun/star/frame/FrameLoader.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb { 
 
diff --git a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
index f40eba358..2c489f819 100644
--- a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
+++ b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sdb_DataAccessDescriptor_idl__
 #define __com_sun_star_sdb_DataAccessDescriptor_idl__
 
-#ifndef __com_sun_star_sdbc_Connection_idl__ 
 #include <com/sun/star/sdbc/Connection.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_ResultSet_idl__ 
 #include <com/sun/star/sdbc/ResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/DataColumn.idl b/offapi/com/sun/star/sdb/DataColumn.idl
index 2c94feb19..e82b28e4b 100644
--- a/offapi/com/sun/star/sdb/DataColumn.idl
+++ b/offapi/com/sun/star/sdb/DataColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_DataColumn_idl__ 
 #define __com_sun_star_sdb_DataColumn_idl__ 
  
-#ifndef __com_sun_star_sdb_ResultColumn_idl__ 
 #include <com/sun/star/sdb/ResultColumn.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/DataSettings.idl b/offapi/com/sun/star/sdb/DataSettings.idl
index 9bd98da72..c7c63f1a7 100644
--- a/offapi/com/sun/star/sdb/DataSettings.idl
+++ b/offapi/com/sun/star/sdb/DataSettings.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_sdb_DataSettings_idl__ 
 #define __com_sun_star_sdb_DataSettings_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
 #include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/DataSource.idl b/offapi/com/sun/star/sdb/DataSource.idl
index 52772c658..b4591bf44 100644
--- a/offapi/com/sun/star/sdb/DataSource.idl
+++ b/offapi/com/sun/star/sdb/DataSource.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_sdb_DataSource_idl__ 
 #define __com_sun_star_sdb_DataSource_idl__ 
  
-#ifndef __com_sun_star_io_XPersistObject_idl__ 
 #include <com/sun/star/io/XPersistObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XFlushable_idl__ 
 #include <com/sun/star/util/XFlushable.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__ 
 #include <com/sun/star/util/XNumberFormatsSupplier.idl> 
-#endif 
  
 
  module com {  module sun {  module star {  module sdbc { 
diff --git a/offapi/com/sun/star/sdb/DataSourceBrowser.idl b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
index 4ae161f0c..daf1075c6 100644
--- a/offapi/com/sun/star/sdb/DataSourceBrowser.idl
+++ b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
@@ -29,21 +29,11 @@
 #ifndef __com_sun_star_sdb_DataSourceBrowser_idl__ 
 #define __com_sun_star_sdb_DataSourceBrowser_idl__ 
 
-#ifndef __com_sun_star_frame_XController_idl__ 
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__ 
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__ 
 #include <com/sun/star/form/FormController.idl>
-#endif
-#ifndef __com_sun_star_ui_XContextMenuInterception_idl__
 #include <com/sun/star/ui/XContextMenuInterception.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb { 
 
diff --git a/offapi/com/sun/star/sdb/DatabaseAccess.idl b/offapi/com/sun/star/sdb/DatabaseAccess.idl
index 1b80b0f54..aceaa19c2 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccess.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccess.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdb_DatabaseAccess_idl__ 
 #define __com_sun_star_sdb_DatabaseAccess_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__ 
 #include <com/sun/star/util/XNumberFormatsSupplier.idl> 
-#endif 
  
  
  module com {  module sun {  module star {  module sdb { 
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl b/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
index 4e3b59e23..4b08fffa3 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdb_DatabaseAccessConnection_idl__ 
 #define __com_sun_star_sdb_DatabaseAccessConnection_idl__ 
  
-#ifndef __com_sun_star_container_XChild_idl__ 
 #include <com/sun/star/container/XChild.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__ 
 #include <com/sun/star/sdbcx/DatabaseDefinition.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_Connection_idl__ 
 #include <com/sun/star/sdbc/Connection.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessContext.idl b/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
index e6ec14dfd..b0f3c97dd 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdb_DatabaseAccessContext_idl__ 
 #define __com_sun_star_sdb_DatabaseAccessContext_idl__ 
  
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XLocalizedAliases_idl__ 
 #include <com/sun/star/util/XLocalizedAliases.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XLocalizable_idl__ 
 #include <com/sun/star/lang/XLocalizable.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl b/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
index 9b8870193..91742978d 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_sdb_DatabaseAccessDataSource_idl__
 #define __com_sun_star_sdb_DatabaseAccessDataSource_idl__
 
-#ifndef __com_sun_star_io_XPersistObject_idl__
 #include <com/sun/star/io/XPersistObject.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_RememberAuthentication_idl__
 #include <com/sun/star/ucb/RememberAuthentication.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
 #include <com/sun/star/sdbc/XDataSource.idl>
-#endif
 
 module com { module sun { module star { module sdb {
 
diff --git a/offapi/com/sun/star/sdb/DatabaseContext.idl b/offapi/com/sun/star/sdb/DatabaseContext.idl
index 77ff3db29..3e4aa1637 100644
--- a/offapi/com/sun/star/sdb/DatabaseContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseContext.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_sdb_DatabaseContext_idl__ 
 #define __com_sun_star_sdb_DatabaseContext_idl__ 
  
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XContainer_idl__ 
 #include <com/sun/star/container/XContainer.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__ 
 #include <com/sun/star/lang/XSingleServiceFactory.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_uno_XNamingService_idl__ 
 #include <com/sun/star/uno/XNamingService.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
 
diff --git a/offapi/com/sun/star/sdb/DatabaseDocument.idl b/offapi/com/sun/star/sdb/DatabaseDocument.idl
index 33d86e373..3a717d4e8 100644
--- a/offapi/com/sun/star/sdb/DatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/DatabaseDocument.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_DatabaseDocument_idl__ 
 #define __com_sun_star_sdb_DatabaseDocument_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XProtectable_idl__ 
 #include <com/sun/star/util/XProtectable.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  published interface XDataDescriptorFactory; 
diff --git a/offapi/com/sun/star/sdb/DatabaseEnvironment.idl b/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
index 9cc5a4efc..4ae94c076 100644
--- a/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
+++ b/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_DatabaseEnvironment_idl__ 
 #define __com_sun_star_sdb_DatabaseEnvironment_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__ 
 #include <com/sun/star/util/XNumberFormatsSupplier.idl> 
-#endif 
  
  
  module com {  module sun {  module star {  module sdb { 
diff --git a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
index 2d4ea77ad..6f1a5ad71 100644
--- a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
+++ b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sdb_DatasourceAdministrationDialog_idl__ 
 #define __com_sun_star_sdb_DatasourceAdministrationDialog_idl__ 
  
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__ 
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XWindow_idl__ 
 #include <com/sun/star/awt/XWindow.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl> 
-#endif 
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sdb/Document.idl b/offapi/com/sun/star/sdb/Document.idl
index 1afce66dc..2452ca012 100644
--- a/offapi/com/sun/star/sdb/Document.idl
+++ b/offapi/com/sun/star/sdb/Document.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_DocumentDefinition_idl__
 #define __com_sun_star_sdb_DocumentDefinition_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 module com { module sun { module star { module sdb {
 
diff --git a/offapi/com/sun/star/sdb/DocumentContainer.idl b/offapi/com/sun/star/sdb/DocumentContainer.idl
index a64e063ee..1d7697ef8 100644
--- a/offapi/com/sun/star/sdb/DocumentContainer.idl
+++ b/offapi/com/sun/star/sdb/DocumentContainer.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_DocumentContainer_idl__
 #define __com_sun_star_sdb_DocumentContainer_idl__
 
-#ifndef __com_sun_star_sdb_DefinitionContainer_idl__
 #include <com/sun/star/sdb/DefinitionContainer.idl>
-#endif
-#ifndef __com_sun_star_sdb_DefinitionContent_idl__
 #include <com/sun/star/sdb/DefinitionContent.idl>
-#endif
 
  
  module com {  module sun {  module star {  module lang {
diff --git a/offapi/com/sun/star/sdb/DocumentDataSource.idl b/offapi/com/sun/star/sdb/DocumentDataSource.idl
index e9ad6f8a1..ba6e0dcc0 100644
--- a/offapi/com/sun/star/sdb/DocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/DocumentDataSource.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_sdb_DocumentDataSource_idl__ 
 #define __com_sun_star_sdb_DocumentDataSource_idl__ 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
-#ifndef __com_sun_star_sdb_XDocumentDataSource_idl__
 #include <com/sun/star/sdb/XDocumentDataSource.idl> 
-#endif
-#ifndef __com_sun_star_sdb_DataSource_idl__
 #include <com/sun/star/sdb/DataSource.idl> 
-#endif
 //============================================================================= 
  
  module com {  module sun {  module star {  module sdb { 
diff --git a/offapi/com/sun/star/sdb/DocumentDefinition.idl b/offapi/com/sun/star/sdb/DocumentDefinition.idl
index d100421c5..967edc694 100644
--- a/offapi/com/sun/star/sdb/DocumentDefinition.idl
+++ b/offapi/com/sun/star/sdb/DocumentDefinition.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_DocumentDefinition2_idl__
 #define __com_sun_star_sdb_DocumentDefinition2_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_sdb_DefinitionContent_idl__
 #include <com/sun/star/sdb/DefinitionContent.idl>
-#endif
 
 module com { module sun { module star { module sdb {
 
diff --git a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
index bf496ce58..fb045cdc7 100644
--- a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
+++ b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_DocumentSaveRequest_idl__ 
 #define __com_sun_star_sdb_DocumentSaveRequest_idl__ 
  
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__ 
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl> 
-#endif 
-#ifndef __com_sun_star_ucb_XContent_idl__ 
 #include <com/sun/star/ucb/XContent.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
index 8194dc7bd..fba89e5c1 100644
--- a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
+++ b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sdb_ErrorMessageDialog_idl__ 
 #define __com_sun_star_sdb_ErrorMessageDialog_idl__ 
  
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__ 
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl> 
-#endif 
-
-#ifndef __com_sun_star_awt_XWindow_idl__ 
 #include <com/sun/star/awt/XWindow.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl> 
-#endif 
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sdb/Forms.idl b/offapi/com/sun/star/sdb/Forms.idl
index 66a0c2012..5e9c3c25e 100644
--- a/offapi/com/sun/star/sdb/Forms.idl
+++ b/offapi/com/sun/star/sdb/Forms.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_Forms_idl__
 #define __com_sun_star_sdb_Forms_idl__
 
-#ifndef __com_sun_star_sdb_DocumentContainer_idl__
 #include <com/sun/star/sdb/DocumentContainer.idl>
-#endif
 
  
 
diff --git a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
index c87784c3c..da14fcb89 100644
--- a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_sdb_OfficeDatabaseDocument_idl__ 
 #define __com_sun_star_sdb_OfficeDatabaseDocument_idl__ 
  
-#ifndef __com_sun_star_document_OfficeDocument_idl__
 #include <com/sun/star/document/OfficeDocument.idl>
-#endif
-#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.idl> 
-#endif
-#ifndef __com_sun_star_document_XDocumentEventBroadcaster_idl__
 #include <com/sun/star/document/XDocumentEventBroadcaster.idl> 
-#endif
-#ifndef __com_sun_star_script_provider_XScriptProviderSupplier_idl__
 #include <com/sun/star/script/provider/XScriptProviderSupplier.idl> 
-#endif
-#ifndef __com_sun_star_frame_XLoadable_idl__
 #include <com/sun/star/frame/XLoadable.idl> 
-#endif
-#ifndef __com_sun_star_util_XCloseable_idl__
 #include <com/sun/star/util/XCloseable.idl> 
-#endif
 
 module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/OrderColumn.idl b/offapi/com/sun/star/sdb/OrderColumn.idl
index 0bbdd5809..339962845 100644
--- a/offapi/com/sun/star/sdb/OrderColumn.idl
+++ b/offapi/com/sun/star/sdb/OrderColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_OrderColumn_idl__ 
 #define __com_sun_star_sdb_OrderColumn_idl__ 
 
-#ifndef __com_sun_star_sdbcx_Column_idl__ 
 #include <com/sun/star/sdbcx/Column.idl> 
-#endif 
 
 module com {  module sun {  module star {  module sdb { 
 
diff --git a/offapi/com/sun/star/sdb/ParametersRequest.idl b/offapi/com/sun/star/sdb/ParametersRequest.idl
index 156bdc4d0..dbc558b09 100644
--- a/offapi/com/sun/star/sdb/ParametersRequest.idl
+++ b/offapi/com/sun/star/sdb/ParametersRequest.idl
@@ -27,16 +27,10 @@
 #ifndef __com_sun_star_sdb_ParametersRequest_idl__ 
 #define __com_sun_star_sdb_ParametersRequest_idl__ 
  
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__ 
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
-#ifndef __com_sun_star_sdbc_XConnection_idl__ 
 #include <com/sun/star/sdbc/XConnection.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sdb/PreparedStatement.idl b/offapi/com/sun/star/sdb/PreparedStatement.idl
index 3bec0ef05..4539945bc 100644
--- a/offapi/com/sun/star/sdb/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdb/PreparedStatement.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_PreparedStatement_idl__ 
 #define __com_sun_star_sdb_PreparedStatement_idl__ 
  
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__ 
 #include <com/sun/star/sdbc/PreparedStatement.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  published interface XColumnsSupplier; 
diff --git a/offapi/com/sun/star/sdb/Query.idl b/offapi/com/sun/star/sdb/Query.idl
index 80e97ee7c..de8851f8d 100644
--- a/offapi/com/sun/star/sdb/Query.idl
+++ b/offapi/com/sun/star/sdb/Query.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_Query_idl__ 
 #define __com_sun_star_sdb_Query_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  published interface XDataDescriptorFactory; 
@@ -37,13 +35,9 @@
  published interface XRename; 
 };};};}; 
  
-#ifndef __com_sun_star_sdb_DataSettings_idl__ 
 #include <com/sun/star/sdb/DataSettings.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdb_QueryDefinition_idl__ 
 #include <com/sun/star/sdb/QueryDefinition.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/QueryDefinition.idl b/offapi/com/sun/star/sdb/QueryDefinition.idl
index 035a4f6a4..12f169abb 100644
--- a/offapi/com/sun/star/sdb/QueryDefinition.idl
+++ b/offapi/com/sun/star/sdb/QueryDefinition.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_QueryDefinition_idl__ 
 #define __com_sun_star_sdb_QueryDefinition_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/QueryDescriptor.idl b/offapi/com/sun/star/sdb/QueryDescriptor.idl
index f39091eef..e013d73d1 100644
--- a/offapi/com/sun/star/sdb/QueryDescriptor.idl
+++ b/offapi/com/sun/star/sdb/QueryDescriptor.idl
@@ -27,18 +27,14 @@
 #ifndef __com_sun_star_sdb_QueryDescriptor_idl__ 
 #define __com_sun_star_sdb_QueryDescriptor_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
 #include <com/sun/star/sdbcx/Descriptor.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  published interface XDataDescriptorFactory; 
  published interface XColumnsSupplier; 
 };};};}; 
  
-#ifndef __com_sun_star_sdb_DataSettings_idl__ 
 #include <com/sun/star/sdb/DataSettings.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/QueryDesign.idl b/offapi/com/sun/star/sdb/QueryDesign.idl
index 8c4878570..9a699527c 100644
--- a/offapi/com/sun/star/sdb/QueryDesign.idl
+++ b/offapi/com/sun/star/sdb/QueryDesign.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_sdb_QueryDesign_idl__ 
 #define __com_sun_star_sdb_QueryDesign_idl__ 
 
-#ifndef __com_sun_star_frame_XController_idl__ 
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__ 
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__ 
 #include <com/sun/star/form/FormController.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb { 
 
diff --git a/offapi/com/sun/star/sdb/RelationDesign.idl b/offapi/com/sun/star/sdb/RelationDesign.idl
index 9b630a52f..f974b2c29 100644
--- a/offapi/com/sun/star/sdb/RelationDesign.idl
+++ b/offapi/com/sun/star/sdb/RelationDesign.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_sdb_RelationDesign_idl__ 
 #define __com_sun_star_sdb_RelationDesign_idl__ 
 
-#ifndef __com_sun_star_frame_XController_idl__ 
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__ 
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__ 
 #include <com/sun/star/form/FormController.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb { 
 
diff --git a/offapi/com/sun/star/sdb/Reports.idl b/offapi/com/sun/star/sdb/Reports.idl
index 28f438c02..88d8defd3 100644
--- a/offapi/com/sun/star/sdb/Reports.idl
+++ b/offapi/com/sun/star/sdb/Reports.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_Reports_idl__
 #define __com_sun_star_sdb_Reports_idl__
 
-#ifndef __com_sun_star_sdb_DocumentContainer_idl__
 #include <com/sun/star/sdb/DocumentContainer.idl>
-#endif
 
  
 
diff --git a/offapi/com/sun/star/sdb/ResultColumn.idl b/offapi/com/sun/star/sdb/ResultColumn.idl
index 47d90ac19..5bac8956f 100644
--- a/offapi/com/sun/star/sdb/ResultColumn.idl
+++ b/offapi/com/sun/star/sdb/ResultColumn.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_ResultColumn_idl__ 
 #define __com_sun_star_sdb_ResultColumn_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Column_idl__ 
 #include <com/sun/star/sdbcx/Column.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__ 
 #include <com/sun/star/sdb/ColumnSettings.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/ResultSet.idl b/offapi/com/sun/star/sdb/ResultSet.idl
index 013c8c368..acd1b8d84 100644
--- a/offapi/com/sun/star/sdb/ResultSet.idl
+++ b/offapi/com/sun/star/sdb/ResultSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_ResultSet_idl__ 
 #define __com_sun_star_sdb_ResultSet_idl__ 
  
-#ifndef __com_sun_star_sdbcx_ResultSet_idl__ 
 #include <com/sun/star/sdbcx/ResultSet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  published interface XColumnsSupplier; 
diff --git a/offapi/com/sun/star/sdb/RowChangeEvent.idl b/offapi/com/sun/star/sdb/RowChangeEvent.idl
index 8897ec510..6e763b93f 100644
--- a/offapi/com/sun/star/sdb/RowChangeEvent.idl
+++ b/offapi/com/sun/star/sdb/RowChangeEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_RowChangeEvent_idl__ 
 #define __com_sun_star_sdb_RowChangeEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/RowSet.idl b/offapi/com/sun/star/sdb/RowSet.idl
index 6de7165af..5d40fb403 100644
--- a/offapi/com/sun/star/sdb/RowSet.idl
+++ b/offapi/com/sun/star/sdb/RowSet.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdb_RowSet_idl__
 #define __com_sun_star_sdb_RowSet_idl__
 
-#ifndef __com_sun_star_sdbc_RowSet_idl__
 #include <com/sun/star/sdbc/RowSet.idl>
-#endif
 
 module com {  module sun {  module star {  module sdbc {
 published interface XConnection;
 };};};};
-
-#ifndef __com_sun_star_sdb_ResultSet_idl__
 #include <com/sun/star/sdb/ResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
 #include <com/sun/star/sdb/XCompletedExecution.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 published interface XDeleteRows;
diff --git a/offapi/com/sun/star/sdb/RowSetVetoException.idl b/offapi/com/sun/star/sdb/RowSetVetoException.idl
index dd8610025..2546ab81e 100644
--- a/offapi/com/sun/star/sdb/RowSetVetoException.idl
+++ b/offapi/com/sun/star/sdb/RowSetVetoException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_RowSetVetoException_idl__ 
 #define __com_sun_star_sdb_RowSetVetoException_idl__ 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/SQLContext.idl b/offapi/com/sun/star/sdb/SQLContext.idl
index e27a29f75..ec074795a 100644
--- a/offapi/com/sun/star/sdb/SQLContext.idl
+++ b/offapi/com/sun/star/sdb/SQLContext.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_SQLContext_idl__ 
 #define __com_sun_star_sdb_SQLContext_idl__ 
  
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__ 
 #include <com/sun/star/sdbc/SQLWarning.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/SQLErrorEvent.idl b/offapi/com/sun/star/sdb/SQLErrorEvent.idl
index c8f75dfc9..24c0b910d 100644
--- a/offapi/com/sun/star/sdb/SQLErrorEvent.idl
+++ b/offapi/com/sun/star/sdb/SQLErrorEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_SQLErrorEvent_idl__ 
 #define __com_sun_star_sdb_SQLErrorEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
  module com {  module sun {  module star {  module sdb { 
diff --git a/offapi/com/sun/star/sdb/SQLQueryComposer.idl b/offapi/com/sun/star/sdb/SQLQueryComposer.idl
index fc55845b2..e13bdf8b1 100644
--- a/offapi/com/sun/star/sdb/SQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/SQLQueryComposer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_SQLQueryComposer_idl__ 
 #define __com_sun_star_sdb_SQLQueryComposer_idl__ 
  
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__ 
 #include <com/sun/star/sdb/XSQLQueryComposer.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  published interface XTablesSupplier; 
diff --git a/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
index 10b31ce0d..5b9bd9b44 100644
--- a/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__ 
 #define __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__ 
  
-#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__ 
 #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
 interface XTablesSupplier; 
diff --git a/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
index 46e7f9180..0c0b76ed8 100644
--- a/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_SingleSelectQueryComposer_idl__ 
 #define __com_sun_star_sdb_SingleSelectQueryComposer_idl__ 
  
-#ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__ 
 #include <com/sun/star/sdb/SingleSelectQueryAnalyzer.idl> 
-#endif 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
 
 module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/Table.idl b/offapi/com/sun/star/sdb/Table.idl
index 36384a5be..ebfaa5dce 100644
--- a/offapi/com/sun/star/sdb/Table.idl
+++ b/offapi/com/sun/star/sdb/Table.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_Table_idl__ 
 #define __com_sun_star_sdb_Table_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Table_idl__ 
 #include <com/sun/star/sdbcx/Table.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdb_DataSettings_idl__ 
 #include <com/sun/star/sdb/DataSettings.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/TableDescriptor.idl b/offapi/com/sun/star/sdb/TableDescriptor.idl
index daa48cc70..ea8033886 100644
--- a/offapi/com/sun/star/sdb/TableDescriptor.idl
+++ b/offapi/com/sun/star/sdb/TableDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_TableDescriptor_idl__ 
 #define __com_sun_star_sdb_TableDescriptor_idl__ 
  
-#ifndef __com_sun_star_sdbcx_TableDescriptor_idl__ 
 #include <com/sun/star/sdbcx/TableDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdb_DataSettings_idl__ 
 #include <com/sun/star/sdb/DataSettings.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/TableDesign.idl b/offapi/com/sun/star/sdb/TableDesign.idl
index be2b7190e..9068ebd6b 100644
--- a/offapi/com/sun/star/sdb/TableDesign.idl
+++ b/offapi/com/sun/star/sdb/TableDesign.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_sdb_TableDesign_idl__ 
 #define __com_sun_star_sdb_TableDesign_idl__ 
 
-#ifndef __com_sun_star_frame_XController_idl__ 
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__ 
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__ 
 #include <com/sun/star/form/FormController.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb { 
 
diff --git a/offapi/com/sun/star/sdb/XAlterQuery.idl b/offapi/com/sun/star/sdb/XAlterQuery.idl
index da3d2c529..2a5ef7ff8 100644
--- a/offapi/com/sun/star/sdb/XAlterQuery.idl
+++ b/offapi/com/sun/star/sdb/XAlterQuery.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XAlterQuery_idl__ 
 #define __com_sun_star_sdb_XAlterQuery_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XBookmarksSupplier.idl b/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
index c065967d5..240da8be9 100644
--- a/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
+++ b/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XBookmarksSupplier_idl__ 
 #define __com_sun_star_sdb_XBookmarksSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/sdb/XColumn.idl b/offapi/com/sun/star/sdb/XColumn.idl
index 18b4d8e8e..4a7ae1323 100644
--- a/offapi/com/sun/star/sdb/XColumn.idl
+++ b/offapi/com/sun/star/sdb/XColumn.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_sdb_XColumn_idl__ 
 #define __com_sun_star_sdb_XColumn_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Date_idl__ 
 #include <com/sun/star/util/Date.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Time_idl__ 
 #include <com/sun/star/util/Time.idl> 
-#endif 
  
  module com {  module sun {  module star {  module io { 
  published interface XInputStream; 
diff --git a/offapi/com/sun/star/sdb/XColumnUpdate.idl b/offapi/com/sun/star/sdb/XColumnUpdate.idl
index b0f238f31..90088eab9 100644
--- a/offapi/com/sun/star/sdb/XColumnUpdate.idl
+++ b/offapi/com/sun/star/sdb/XColumnUpdate.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_sdb_XColumnUpdate_idl__ 
 #define __com_sun_star_sdb_XColumnUpdate_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Date_idl__ 
 #include <com/sun/star/util/Date.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Time_idl__ 
 #include <com/sun/star/util/Time.idl> 
-#endif 
  
  module com {  module sun {  module star {  module io { 
  published interface XInputStream; 
diff --git a/offapi/com/sun/star/sdb/XCommandPreparation.idl b/offapi/com/sun/star/sdb/XCommandPreparation.idl
index b3a17147c..17a19382b 100644
--- a/offapi/com/sun/star/sdb/XCommandPreparation.idl
+++ b/offapi/com/sun/star/sdb/XCommandPreparation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_XCommandPreparation_idl__ 
 #define __com_sun_star_sdb_XCommandPreparation_idl__ 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  published interface XPreparedStatement; 
diff --git a/offapi/com/sun/star/sdb/XCompletedConnection.idl b/offapi/com/sun/star/sdb/XCompletedConnection.idl
index 16c55e7a6..9e83b91e7 100644
--- a/offapi/com/sun/star/sdb/XCompletedConnection.idl
+++ b/offapi/com/sun/star/sdb/XCompletedConnection.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XCompletedConnection_idl__ 
 #define __com_sun_star_sdb_XCompletedConnection_idl__ 
  
-#ifndef __com_sun_star_task_XInteractionHandler_idl__ 
 #include <com/sun/star/task/XInteractionHandler.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  published interface XConnection; 
diff --git a/offapi/com/sun/star/sdb/XCompletedExecution.idl b/offapi/com/sun/star/sdb/XCompletedExecution.idl
index 20a96ef32..48977fa39 100644
--- a/offapi/com/sun/star/sdb/XCompletedExecution.idl
+++ b/offapi/com/sun/star/sdb/XCompletedExecution.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XCompletedExecution_idl__ 
 #define __com_sun_star_sdb_XCompletedExecution_idl__ 
  
-#ifndef __com_sun_star_task_XInteractionHandler_idl__ 
 #include <com/sun/star/task/XInteractionHandler.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl b/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
index daea6cb5e..668a77555 100644
--- a/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
+++ b/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sdb_XDataAccessDescriptorFactory_idl__
 #define __com_sun_star_sdb_XDataAccessDescriptorFactory_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/XDatabaseAccess.idl b/offapi/com/sun/star/sdb/XDatabaseAccess.idl
index 2b14f17d9..3b6547115 100644
--- a/offapi/com/sun/star/sdb/XDatabaseAccess.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseAccess.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdb_XDatabaseAccess_idl__ 
 #define __com_sun_star_sdb_XDatabaseAccess_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_XDataSource_idl__ 
 #include <com/sun/star/sdbc/XDataSource.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module task { 
  published interface XInteractionHandler; 
diff --git a/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl b/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
index 6547ed789..207e2e718 100644
--- a/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_XDatabaseAccessListener_idl__ 
 #define __com_sun_star_sdb_XDatabaseAccessListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl b/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
index cfa52c627..3b3f8462c 100644
--- a/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdb_XDatabaseEnvironment_idl__ 
 #define __com_sun_star_sdb_XDatabaseEnvironment_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_XDriverManager_idl__ 
 #include <com/sun/star/sdbc/XDriverManager.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sdb/XDocumentDataSource.idl b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
index 0eb77a813..04fda8584 100644
--- a/offapi/com/sun/star/sdb/XDocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XDocumentDataSource_idl__ 
-#define __com_sun_star_sdb_XDocumentDataSource_idl__ 
- 
-#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
-#include <com/sun/star/sdb/XOfficeDatabaseDocument.idl> 
-#endif
+#ifndef __com_sun_star_sdb_XDocumentDataSource_idl__
+#define __com_sun_star_sdb_XDocumentDataSource_idl__
+
+#include <com/sun/star/sdb/XOfficeDatabaseDocument.idl>
 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module sdb { 
- 
-//============================================================================= 
+//=============================================================================
+
+ module com {  module sun {  module star {  module sdb {
+
+//=============================================================================
 /** simplifies the accessing of data sources and their corresponding database document.
-    
+
     <p>
     The interface can be used to access the data source of the database document.
     </p>
     @see OfficeDatabaseDocument
  */
-interface XDocumentDataSource 
+published interface XDocumentDataSource
 {
     /** provides access to the one and only <type>OfficeDatabaseDocument</type>
         which the data source is based on.
@@ -63,13 +61,13 @@ interface XDocumentDataSource
     */
     [readonly, attribute] XOfficeDatabaseDocument DatabaseDocument;
 };
- 
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
 
diff --git a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
index bd8d6db7c..e47b1f8de 100644
--- a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__ 
-#define __com_sun_star_sdb_XFormDocumentsSupplier_idl__ 
- 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
- 
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
-#include <com/sun/star/container/XNameAccess.idl> 
-#endif 
- 
- module com {  module sun {  module star {  module sdb { 
- 
- 
+#ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__
+#define __com_sun_star_sdb_XFormDocumentsSupplier_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+#include <com/sun/star/container/XNameAccess.idl>
+
+ module com {  module sun {  module star {  module sdb {
+
+
 /** provides the access to a container of database forms.
     @see Forms
  */
-interface XFormDocumentsSupplier: com::sun::star::uno::XInterface
-{ 
-     
+published interface XFormDocumentsSupplier: com::sun::star::uno::XInterface
+{
+
     /** returns the container of forms.
         @returns
             the form documents
         @see Forms
      */
-    com::sun::star::container::XNameAccess getFormDocuments(); 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*=========================================================================== 
-===========================================================================*/ 
-#endif 
+    com::sun::star::container::XNameAccess getFormDocuments();
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*===========================================================================
+===========================================================================*/
+#endif
diff --git a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
index d74584d30..31b19bdbc 100644
--- a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
+++ b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_XInteractionDocumentSave_idl__ 
 #define __com_sun_star_sdb_XInteractionDocumentSave_idl__ 
  
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
 #include <com/sun/star/task/XInteractionContinuation.idl> 
-#endif 
-#ifndef __com_sun_star_ucb_XContent_idl__ 
 #include <com/sun/star/ucb/XContent.idl> 
-#endif 
  
 module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl b/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
index 50620517f..ace96e5ef 100644
--- a/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
+++ b/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_XInteractionSupplyParameters_idl__ 
 #define __com_sun_star_sdb_XInteractionSupplyParameters_idl__ 
  
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
 #include <com/sun/star/task/XInteractionContinuation.idl> 
-#endif 
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
 module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
index d6ab4fc46..7440c6247 100644
--- a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__ 
-#define __com_sun_star_sdb_XOfficeDatabaseDocument_idl__ 
+#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
+#define __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
 
-#ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__
-#include <com/sun/star/sdb/XFormDocumentsSupplier.idl> 
-#endif
-#ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__
-#include <com/sun/star/sdb/XReportDocumentsSupplier.idl> 
-#endif
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
-#include <com/sun/star/sdbc/XDataSource.idl> 
-#endif
-#ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
+#include <com/sun/star/sdb/XFormDocumentsSupplier.idl>
+#include <com/sun/star/sdb/XReportDocumentsSupplier.idl>
+#include <com/sun/star/sdbc/XDataSource.idl>
 #include <com/sun/star/document/XDocumentSubStorageSupplier.idl>
-#endif
 
-//============================================================================= 
- 
-module com {  module sun {  module star {  module sdb { 
- 
-//============================================================================= 
+//=============================================================================
+
+module com {  module sun {  module star {  module sdb {
+
+//=============================================================================
 /** simplifies the accessing of data sources, and it's corresponding database document and forms, and reports.
 */
-interface XOfficeDatabaseDocument
+published interface XOfficeDatabaseDocument
 {
     /** allows to access the supplier for forms.
         @see com::sun::star::sdb::Forms
@@ -68,11 +60,11 @@ interface XOfficeDatabaseDocument
     */
     [readonly, attribute]   com::sun::star::sdbc::XDataSource DataSource;
 };
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
 #endif
diff --git a/offapi/com/sun/star/sdb/XParametersSupplier.idl b/offapi/com/sun/star/sdb/XParametersSupplier.idl
index ba8f94d2f..1c4033257 100644
--- a/offapi/com/sun/star/sdb/XParametersSupplier.idl
+++ b/offapi/com/sun/star/sdb/XParametersSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XParametersSupplier_idl__ 
 #define __com_sun_star_sdb_XParametersSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XQueriesSupplier.idl b/offapi/com/sun/star/sdb/XQueriesSupplier.idl
index 34aa14caa..8c6a226b1 100644
--- a/offapi/com/sun/star/sdb/XQueriesSupplier.idl
+++ b/offapi/com/sun/star/sdb/XQueriesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XQueriesSupplier_idl__ 
 #define __com_sun_star_sdb_XQueriesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl b/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
index d9fe95602..7d7703313 100644
--- a/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__ 
 #define __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
index 8c3419540..d0489cf54 100644
--- a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__ 
-#define __com_sun_star_sdb_XReportDocumentsSupplier_idl__ 
- 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
- 
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
-#include <com/sun/star/container/XNameAccess.idl> 
-#endif 
- 
- module com {  module sun {  module star {  module sdb { 
- 
- 
+#ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__
+#define __com_sun_star_sdb_XReportDocumentsSupplier_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+#include <com/sun/star/container/XNameAccess.idl>
+
+ module com {  module sun {  module star {  module sdb {
+
+
 /** provides the access to a container of database reports.
     @see Reports
  */
-interface XReportDocumentsSupplier: com::sun::star::uno::XInterface
-{ 
-     
+published interface XReportDocumentsSupplier: com::sun::star::uno::XInterface
+{
+
     /** returns the container of reports.
         @returns
             the report documents
         @see Reports
      */
-    com::sun::star::container::XNameAccess getReportDocuments(); 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*=========================================================================== 
-===========================================================================*/ 
-#endif 
+    com::sun::star::container::XNameAccess getReportDocuments();
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*===========================================================================
+===========================================================================*/
+#endif
diff --git a/offapi/com/sun/star/sdb/XResultSetAccess.idl b/offapi/com/sun/star/sdb/XResultSetAccess.idl
index 79a96d59f..2694eaa6c 100644
--- a/offapi/com/sun/star/sdb/XResultSetAccess.idl
+++ b/offapi/com/sun/star/sdb/XResultSetAccess.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XResultSetAccess_idl__ 
 #define __com_sun_star_sdb_XResultSetAccess_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
index 3a8f2ab80..88189ac8a 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__ 
 #define __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
index da461addd..c9b3687e2 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XRowSetApproveListener_idl__ 
 #define __com_sun_star_sdb_XRowSetApproveListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__ 
 #include <com/sun/star/sdb/RowChangeEvent.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XRowSetSupplier.idl b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
index ab91375d6..6036bf44f 100644
--- a/offapi/com/sun/star/sdb/XRowSetSupplier.idl
+++ b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XRowSetSupplier_idl__ 
 #define __com_sun_star_sdb_XRowSetSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_XRowSet_idl__ 
 #include <com/sun/star/sdbc/XRowSet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XRowsChangeListener.idl b/offapi/com/sun/star/sdb/XRowsChangeListener.idl
index 6702d4608..48797a516 100644
--- a/offapi/com/sun/star/sdb/XRowsChangeListener.idl
+++ b/offapi/com/sun/star/sdb/XRowsChangeListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_XRowsChangeListener_idl__ 
 #define __com_sun_star_sdb_XRowsChangeListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
 #include <com/sun/star/sdb/RowsChangeEvent.idl> 
  
  module com {  module sun {  module star {  module sdb { 
diff --git a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
index 51d4cd825..aa161010b 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__ 
 #define __com_sun_star_sdb_XSQLErrorBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdb_XSQLErrorListener_idl__ 
 #include <com/sun/star/sdb/XSQLErrorListener.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XSQLErrorListener.idl b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
index 4a73c480e..6ba08ffff 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorListener.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XSQLErrorListener_idl__ 
 #define __com_sun_star_sdb_XSQLErrorListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdb_SQLErrorEvent_idl__ 
 #include <com/sun/star/sdb/SQLErrorEvent.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdb { 
  
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
index b5bf0ed1e..1dad7902e 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__ 
 #define __com_sun_star_sdb_XSQLQueryComposer_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
index 00fd8fe4e..f0eca84d8 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_XSQLQueryComposerFactory_idl__ 
 #define __com_sun_star_sdb_XSQLQueryComposerFactory_idl__ 
  
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__ 
 #include <com/sun/star/sdb/XSQLQueryComposer.idl> 
-#endif 
  
 //============================================================================= 
  module com {  module sun {  module star {  module sdb { 
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index b7d5e4f43..b00af59a7 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,20 +27,12 @@
 #ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
 #define __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 module com {  module sun {  module star {  module container {
-interface XIndexAccess;
+published interface XIndexAccess;
 };};};};
 //=============================================================================
 
@@ -55,7 +47,7 @@ interface XIndexAccess;
     structure of the used query.
     </p>
  */
-interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
+published interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
 {
 
     /** returns the query.
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
index b31028076..d5015b94d 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XSingleSelectQueryComposer_idl__ 
-#define __com_sun_star_sdb_XSingleSelectQueryComposer_idl__ 
- 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
-#include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
- 
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
-#include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
- 
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
-#include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
- 
-#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__ 
-#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl> 
-#endif 
-
-//============================================================================= 
- 
- module com {  module sun {  module star {  module sdb { 
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_sdb_XSingleSelectQueryComposer_idl__
+#define __com_sun_star_sdb_XSingleSelectQueryComposer_idl__
+
+#include <com/sun/star/beans/XPropertySet.idl>
+
+#include <com/sun/star/beans/PropertyValue.idl>
+
+#include <com/sun/star/sdbc/SQLException.idl>
+
+#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module sdb {
+
+//=============================================================================
+
 /** simplifies the composing of single select statements.
-    
+
     <p>
     The interface can be used for composing single SELECT statements without knowing the
     structure of the used query.
@@ -58,41 +50,41 @@
 
     @see com::sun::star::sdb::SingleSelectQueryComposer
  */
-interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
-{ 
-    //------------------------------------------------------------------------- 
+published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
+{
+    //-------------------------------------------------------------------------
     // FILTER
-    //------------------------------------------------------------------------- 
-     
+    //-------------------------------------------------------------------------
+
     /** makes it possible to set a filter condition	for the query.
         @param filter
             the filter to set
-        @throws com::sun::star::sdbc::SQLException  
+        @throws com::sun::star::sdbc::SQLException
             if a database access error occurs
-            or the statement isn't valid 
+            or the statement isn't valid
             or the statement isn't parsable.
      */
-    void setFilter([in] string filter) 
-            raises (com::sun::star::sdbc::SQLException); 
-    //------------------------------------------------------------------------- 
+    void setFilter([in] string filter)
+            raises (com::sun::star::sdbc::SQLException);
+    //-------------------------------------------------------------------------
 
     /** appends a new set of filter criteria which is split into levels.
         @param filter
-            The filter criteria is split into levels. Each level represents the 
+            The filter criteria is split into levels. Each level represents the
             OR criteria. Within each level, the filters are provided as an AND criteria
-            with the name of the column and the filter condition. The filter condition 
+            with the name of the column and the filter condition. The filter condition
             is of type string. The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
 
-        @throws com::sun::star::sdbc::SQLException  
+        @throws com::sun::star::sdbc::SQLException
             if a database access error occurs.
      */
     void setStructuredFilter([in] sequence< sequence<com::sun::star::beans::PropertyValue> > filter)
-        raises (com::sun::star::sdbc::SQLException,com::sun::star::lang::IllegalArgumentException); 
-    //------------------------------------------------------------------------- 
-     
-    /** appends a new filter condition by a 
+        raises (com::sun::star::sdbc::SQLException,com::sun::star::lang::IllegalArgumentException);
+    //-------------------------------------------------------------------------
+
+    /** appends a new filter condition by a
         <type scope="com::sun::star::sdb">DataColumn</type>
-        providing the name and the value for the filter. 
+        providing the name and the value for the filter.
         The value property must be supported by the <type scope="com::sun::star::sdb">DataColumn</type>.
         @param column
             the column which is used to create a filter
@@ -102,72 +94,72 @@ interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
             E.g. (xx AND bb AND cc) OR newCriteria
         @param  filterOperator
             The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
-        @throws com::sun::star::sdbc::SQLException  
+        @throws com::sun::star::sdbc::SQLException
             if a database access error occurs.
      */
     void appendFilterByColumn([in] com::sun::star::beans::XPropertySet column,[in] boolean andCriteria,[in] long filterOperator)
-            raises (com::sun::star::sdbc::SQLException); 
+            raises (com::sun::star::sdbc::SQLException);
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
     // GROUP BY
-    //-------------------------------------------------------------------------  
-     
-     
+    //-------------------------------------------------------------------------
+
+
     /** makes it possible to set a group for the query.
         @param group
             the group part to set
-        @throws com::sun::star::sdbc::SQLException  
+        @throws com::sun::star::sdbc::SQLException
             if a database access error occurs
-            or the statement isn't valid 
+            or the statement isn't valid
             or the statement isn't parsable.
      */
-    void setGroup([in] string group) 
-            raises (com::sun::star::sdbc::SQLException); 
+    void setGroup([in] string group)
+            raises (com::sun::star::sdbc::SQLException);
+
+    //-------------------------------------------------------------------------
 
-    //------------------------------------------------------------------------- 
-     
     /** appends an additional part to the group criteria of the select
         statement. The column must be a <type scope="com::sun::star::sdbcx">Column</type>.
         @param column
             the column which is used to create a group part
-        @throws com::sun::star::sdbc::SQLException  
+        @throws com::sun::star::sdbc::SQLException
             if a database access error occurs.
      */
-    void appendGroupByColumn([in] com::sun::star::beans::XPropertySet column) 
-            raises (com::sun::star::sdbc::SQLException); 
-    
-    //------------------------------------------------------------------------- 
+    void appendGroupByColumn([in] com::sun::star::beans::XPropertySet column)
+            raises (com::sun::star::sdbc::SQLException);
+
+    //-------------------------------------------------------------------------
     // HAVING
-    //------------------------------------------------------------------------- 
-     
+    //-------------------------------------------------------------------------
+
     /** makes it possible to set a HAVING filter condition for the query.
         @param filter
             the filter to set
-        @throws com::sun::star::sdbc::SQLException  
+        @throws com::sun::star::sdbc::SQLException
             if a database access error occurs
-            or the statement isn't valid 
+            or the statement isn't valid
             or the statement isn't parsable.
      */
-    void setHavingClause([in] string filter) 
-            raises (com::sun::star::sdbc::SQLException); 
+    void setHavingClause([in] string filter)
+            raises (com::sun::star::sdbc::SQLException);
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** appends a new set of HAVING filter criteria which is split into levels.
         @param filter
-            The HAVING filter criteria is split into levels. Each level represents the 
+            The HAVING filter criteria is split into levels. Each level represents the
             OR criteria. Within each level, the filters are provided as an AND criteria
-            with the name of the column and the filter condition. The filter condition 
+            with the name of the column and the filter condition. The filter condition
             is of type string. The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
 
-        @throws com::sun::star::sdbc::SQLException  
+        @throws com::sun::star::sdbc::SQLException
             if a database access error occurs.
      */
     void setStructuredHavingClause([in] sequence< sequence<com::sun::star::beans::PropertyValue> > filter)
-            raises (com::sun::star::sdbc::SQLException); 
-    //------------------------------------------------------------------------- 
-     
-    /** appends a new HAVING filter condition by a 
+            raises (com::sun::star::sdbc::SQLException);
+    //-------------------------------------------------------------------------
+
+    /** appends a new HAVING filter condition by a
         <type scope="com::sun::star::sdb">DataColumn</type>
         providing the name and the value for the filter.
         @param column
@@ -178,45 +170,45 @@ interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
             E.g. (xx AND bb AND cc) OR newCriteria
         @param  filterOperator
             The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
-        @throws com::sun::star::sdbc::SQLException  
+        @throws com::sun::star::sdbc::SQLException
             if a database access error occurs.
      */
-    void appendHavingClauseByColumn([in] com::sun::star::beans::XPropertySet column,[in] boolean andCriteria,[in] long filterOperator) 
-            raises (com::sun::star::sdbc::SQLException); 
+    void appendHavingClauseByColumn([in] com::sun::star::beans::XPropertySet column,[in] boolean andCriteria,[in] long filterOperator)
+            raises (com::sun::star::sdbc::SQLException);
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
     // ORDER BY
-    //-------------------------------------------------------------------------  
-     
+    //-------------------------------------------------------------------------
+
     /** makes it possible to set a sort condition for the query.
         @param order
             the order part to set
-        @throws com::sun::star::sdbc::SQLException  
+        @throws com::sun::star::sdbc::SQLException
             if a database access error occurs
-            or the order isn't valid 
+            or the order isn't valid
             or the statement isn't parsable.
      */
-    void setOrder([in] string order) 
-            raises (com::sun::star::sdbc::SQLException); 
+    void setOrder([in] string order)
+            raises (com::sun::star::sdbc::SQLException);
+
+    //-------------------------------------------------------------------------
 
-    //------------------------------------------------------------------------- 
-     
     /** appends an additional part to the sort order criteria of the select
         statement. The column must be a <type scope="com::sun::star::sdbcx">Column</type>.
         @param column
             the column which is used to create a order part
         @param	ascending
             <TRUE/> when the order should be ascending, otherwise if <FALSE/> descending.
-        @throws com::sun::star::sdbc::SQLException  
+        @throws com::sun::star::sdbc::SQLException
             if a database access error occurs.
      */
-    void appendOrderByColumn([in] com::sun::star::beans::XPropertySet column, 
-                              [in] boolean ascending) 
-            raises (com::sun::star::sdbc::SQLException); 
-    
-    //------------------------------------------------------------------------- 
+    void appendOrderByColumn([in] com::sun::star::beans::XPropertySet column,
+                             [in] boolean ascending)
+            raises (com::sun::star::sdbc::SQLException);
+
+    //-------------------------------------------------------------------------
     // cumulative composing
-    //-------------------------------------------------------------------------  
+    //-------------------------------------------------------------------------
 
     /** sets a new elementary query for the composer
 
@@ -261,14 +253,14 @@ interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
     {
         set raises (com::sun::star::sdbc::SQLException);
     };
-}; 
- 
-//============================================================================= 
- 
-}; }; }; }; 
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
 
diff --git a/offapi/com/sun/star/sdb/XSubDocument.idl b/offapi/com/sun/star/sdb/XSubDocument.idl
index 92a09e586..2f9e86b10 100644
--- a/offapi/com/sun/star/sdb/XSubDocument.idl
+++ b/offapi/com/sun/star/sdb/XSubDocument.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { 
+module com { module sun { module star { module sdb {
 
 //=============================================================================
 
@@ -40,7 +40,7 @@ module com { module sun { module star { module sdb {
 
     @since OOo 3.1
  */
-interface XSubDocument
+published interface XSubDocument
 {
     /** opens the sub document
 
@@ -95,7 +95,7 @@ interface XSubDocument
 
 //=============================================================================
 
-}; }; }; }; 
+}; }; }; };
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl b/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
index e7e472622..8519ccfb8 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sdb_application_CopyTableRowEvent_idl__
 #define __com_sun_star_sdb_application_CopyTableRowEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSet_idl__ 
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
index f271a7d42..252c53a0d 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_sdb_application_CopyTableWizard_idl__
 #define __com_sun_star_sdb_application_CopyTableWizard_idl__
 
-#ifndef __com_sun_star_sdb_application_XCopyTableWizard_idl__
 #include <com/sun/star/sdb/application/XCopyTableWizard.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionHandler_idl__ 
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/DatabaseObject.idl b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
index f961a569f..46a39c052 100644
--- a/offapi/com/sun/star/sdb/application/DatabaseObject.idl
+++ b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sdb_application_DatabaseObject_idl__
 #define __com_sun_star_sdb_application_DatabaseObject_idl__
 
-#ifndef __com_sun_star_sdb_CommandType_idl__ 
 #include <com/sun/star/sdb/CommandType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableListener.idl b/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
index 52054372a..ceb9e7910 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sdb_application_XCopyTableListener_idl__
 #define __com_sun_star_sdb_application_XCopyTableListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_sdb_application_CopyTableRowEvent_idl__
 #include <com/sun/star/sdb/application/CopyTableRowEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
index bb0ea321e..51d228103 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sdb_application_XCopyTableWizard_idl__
 #define __com_sun_star_sdb_application_XCopyTableWizard_idl__
 
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
index 60c30f3cf..527186f40 100644
--- a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
+++ b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application { 
+module com { module sun { module star { module sdb { module application {
 
 //=============================================================================
 
@@ -54,7 +54,7 @@ module com { module sun { module star { module sdb { module application {
 
     @since OOo 2.2
  */
-interface XDatabaseDocumentUI
+published interface XDatabaseDocumentUI
 {
     /** provides access to the data source belong to the database document
     */
@@ -322,7 +322,7 @@ interface XDatabaseDocumentUI
 
 //=============================================================================
 
-}; }; }; }; }; 
+}; }; }; }; };
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/makefile.mk b/offapi/com/sun/star/sdb/application/makefile.mk
deleted file mode 100644
index 7eb972b28..000000000
--- a/offapi/com/sun/star/sdb/application/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssdbapp
-PACKAGE=com$/sun$/star$/sdb$/application
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-UNOIDLDEFS += -w
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    DefaultViewController.idl \
-    CopyTableContinuation.idl \
-    CopyTableOperation.idl \
-    CopyTableRowEvent.idl \
-    CopyTableWizard.idl \
-    DatabaseObject.idl \
-    DatabaseObjectContainer.idl \
-    NamedDatabaseObject.idl \
-    XCopyTableWizard.idl \
-    XCopyTableListener.idl \
-    XDatabaseDocumentUI.idl \
-    XTableUIProvider.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/sdb/makefile.mk b/offapi/com/sun/star/sdb/makefile.mk
deleted file mode 100644
index f095f338b..000000000
--- a/offapi/com/sun/star/sdb/makefile.mk
+++ /dev/null
@@ -1,147 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssdb
-PACKAGE=com$/sun$/star$/sdb
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-UNOIDLDEFS += -w
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    BooleanComparisonMode.idl \
-    CallableStatement.idl \
-    Column.idl \
-    ColumnDescriptorControl.idl \
-    ColumnDescriptorControlModel.idl \
-    ColumnSettings.idl \
-    CommandType.idl \
-    Connection.idl \
-    ContentLoader.idl \
-    DataAccessDescriptor.idl \
-    DataAccessDescriptorFactory.idl \
-    DatabaseAccess.idl \
-    DatabaseAccessConnection.idl \
-    DatabaseAccessContext.idl \
-    DatabaseAccessDataSource.idl\
-    DatabaseContext.idl \
-    DatabaseDocument.idl \
-    DatabaseEnvironment.idl \
-    DatabaseInteractionHandler.idl \
-    DatabaseRegistrationEvent.idl \
-    DataColumn.idl \
-    DataSettings.idl \
-    DataSource.idl \
-    DatasourceAdministrationDialog.idl \
-    DataSourceBrowser.idl \
-    DefinitionContainer.idl \
-    DefinitionContent.idl \
-    Document.idl \
-    DocumentContainer.idl \
-    DocumentDataSource.idl \
-    DocumentDefinition.idl \
-    DocumentSaveRequest.idl \
-    ErrorCondition.idl \
-    ErrorMessageDialog.idl \
-    Forms.idl \
-    InteractionHandler.idl \
-    OfficeDatabaseDocument.idl \
-    OrderColumn.idl \
-    ParametersRequest.idl \
-    PreparedStatement.idl \
-    Query.idl \
-    QueryDefinition.idl \
-    QueryDescriptor.idl \
-    QueryDesign.idl \
-    RelationDesign.idl \
-    Reports.idl \
-    ResultColumn.idl \
-    ResultSet.idl \
-    RowChangeAction.idl \
-    RowChangeEvent.idl \
-    RowsChangeEvent.idl \
-    RowSet.idl \
-    RowSetVetoException.idl \
-    SingleSelectQueryAnalyzer.idl \
-    SingleSelectQueryComposer.idl \
-    SQLContext.idl \
-    SQLErrorEvent.idl \
-    SQLFilterOperator.idl \
-    SQLQueryComposer.idl \
-    Table.idl \
-    TableDescriptor.idl \
-    TableDesign.idl \
-    XAlterQuery.idl \
-    XBookmarksSupplier.idl \
-    XColumn.idl \
-    XColumnUpdate.idl \
-    XCommandPreparation.idl \
-    XCompletedConnection.idl \
-    XCompletedExecution.idl \
-    XDataAccessDescriptorFactory.idl \
-    XDatabaseAccess.idl \
-    XDatabaseAccessListener.idl \
-    XDatabaseRegistrations.idl \
-    XDatabaseRegistrationsListener.idl \
-    XDatabaseEnvironment.idl \
-    XDocumentDataSource.idl \
-    XFormDocumentsSupplier.idl \
-    XInteractionDocumentSave.idl \
-    XInteractionSupplyParameters.idl \
-    XOfficeDatabaseDocument.idl \
-    XParametersSupplier.idl \
-    XQueriesSupplier.idl \
-    XQueryDefinitionsSupplier.idl \
-    XReportDocumentsSupplier.idl \
-    XResultSetAccess.idl \
-    XRowSetApproveBroadcaster.idl \
-    XRowSetApproveListener.idl \
-    XRowSetChangeBroadcaster.idl \
-    XRowSetChangeListener.idl \
-    XRowsChangeBroadcaster.idl \
-    XRowsChangeListener.idl \
-    XRowSetSupplier.idl \
-    XSingleSelectQueryAnalyzer.idl \
-    XSingleSelectQueryComposer.idl \
-    XSubDocument.idl \
-    XSQLErrorBroadcaster.idl \
-    XSQLErrorListener.idl \
-    XSQLQueryComposer.idl \
-    XSQLQueryComposerFactory.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
index 7ab067d8d..2cf981fb4 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
@@ -29,12 +29,8 @@
 #define __com_sun_star_sdb_tools_XConnectionSupplier_idl__
 
 #include <com/sun/star/sdbc/XConnection.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
index 061e79b68..2f35b5a84 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,30 +28,26 @@
 #ifndef __com_sun_star_sdb_tools_XConnectionTools_idl__
 #define __com_sun_star_sdb_tools_XConnectionTools_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
-#include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
+#include <com/sun/star/sdbc/SQLException.idl>
 
-module com {  module sun {  module star {  
+module com {  module sun {  module star {
     module container {
-        interface XNameAccess;
+        published interface XNameAccess;
     };
     module lang {
-        interface XComponent;
+        published interface XComponent;
     };
 };};};
 //=============================================================================
-module com {  module sun {  module star {  module sdb { 
-    interface XSingleSelectQueryComposer;
+module com {  module sun {  module star {  module sdb {
+    published interface XSingleSelectQueryComposer;
     module tools {
 //=============================================================================
 
-interface XTableName;
-interface XObjectNames;
-interface XDataSourceMetaData;
+published interface XTableName;
+published interface XObjectNames;
+published interface XDataSourceMetaData;
 
 //-----------------------------------------------------------------------------
 /** encapsulates various useful functionality around a
@@ -68,7 +64,7 @@ interface XDataSourceMetaData;
 
     @since OOo 2.0.4
 */
-interface XConnectionTools
+published interface XConnectionTools
 {
     /** creates an instance supporting the <type>XTableName</type> interface,
         which can be used to manipulate table names for various purposes.
@@ -133,7 +129,7 @@ interface XConnectionTools
         @param command
             the object. This may be a table name, a query name, or an SQL statement, depending on the value
             of <arg>_nCommandType</arg>
-        @return 
+        @return
             the composer filled with command and command type.
     */
     ::com::sun::star::sdb::XSingleSelectQueryComposer getComposer([in] long commandType,[in] string command);
diff --git a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
index 4ceaa0f76..a7c7daad4 100644
--- a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
+++ b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,15 +28,13 @@
 #ifndef __com_sun_star_sdb_tools_XDataSourceMetaData_idl__
 #define __com_sun_star_sdb_tools_XDataSourceMetaData_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
 //=============================================================================
 
-interface XDataSourceMetaData
+published interface XDataSourceMetaData
 {
     /** determines whether the data source supports queries in the <code>FROM</code>
         part of a <code>SELECT</code> statement.
diff --git a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
index 62e51cb5a..981d36b93 100644
--- a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
@@ -28,16 +28,10 @@
 #ifndef __com_sun_star_sdb_tools_XIndexAlteration_idl__
 #define __com_sun_star_sdb_tools_XIndexAlteration_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 #include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
index 2ca7e4b49..c4090ce3e 100644
--- a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
@@ -28,16 +28,10 @@
 #ifndef __com_sun_star_sdb_tools_XKeyAlteration_idl__
 #define __com_sun_star_sdb_tools_XKeyAlteration_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 #include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XObjectNames.idl b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
index 9da75a902..3fcf6a207 100644
--- a/offapi/com/sun/star/sdb/tools/XObjectNames.idl
+++ b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sdb_tools_XObjectNames_idl__
 #define __com_sun_star_sdb_tools_XObjectNames_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
@@ -70,7 +65,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @since OOo 2.0.4
 */
-interface XObjectNames
+published interface XObjectNames
 {
     /** suggests a (unique) table or query name
 
diff --git a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
index 3791cf072..211180eb6 100644
--- a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
@@ -28,16 +28,10 @@
 #ifndef __com_sun_star_sdb_tools_XTableAlteration_idl__
 #define __com_sun_star_sdb_tools_XTableAlteration_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 #include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XTableName.idl b/offapi/com/sun/star/sdb/tools/XTableName.idl
index 68664cb3f..935e03bec 100644
--- a/offapi/com/sun/star/sdb/tools/XTableName.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sdb_tools_XTableName_idl__
 #define __com_sun_star_sdb_tools_XTableName_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
@@ -72,7 +64,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @since OOo 2.0.4
 */
-interface XTableName
+published interface XTableName
 {
     /** denotes the name of the catalog which the table is a part of
     */
@@ -98,7 +90,7 @@ interface XTableName
 
         @see CompositionType
 
-        @throws com::sun::star::IllegalArgumentException    
+        @throws com::sun::star::IllegalArgumentException
             if the given <arg>Type</arg> does not denote a valid <type>CompositionType</type>
     */
     string  getComposedName( [in] long Type, [in] boolean Quote )
diff --git a/offapi/com/sun/star/sdb/tools/XTableRename.idl b/offapi/com/sun/star/sdb/tools/XTableRename.idl
index 774848f9c..38c1d295a 100644
--- a/offapi/com/sun/star/sdb/tools/XTableRename.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableRename.idl
@@ -28,16 +28,10 @@
 #ifndef __com_sun_star_sdb_tools_XTableRename_idl__
 #define __com_sun_star_sdb_tools_XTableRename_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 #include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XViewAccess.idl b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
index 721698353..ff21af697 100644
--- a/offapi/com/sun/star/sdb/tools/XViewAccess.idl
+++ b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
@@ -28,16 +28,10 @@
 #ifndef __com_sun_star_sdb_tools_XViewAccess_idl__
 #define __com_sun_star_sdb_tools_XViewAccess_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 #include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/makefile.mk b/offapi/com/sun/star/sdb/tools/makefile.mk
deleted file mode 100644
index 1bc7e6b11..000000000
--- a/offapi/com/sun/star/sdb/tools/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssdbtools
-PACKAGE=com$/sun$/star$/sdb$/tools
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-UNOIDLDEFS += -w
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    CompositionType.idl \
-    XConnectionTools.idl \
-    XDataSourceMetaData.idl \
-    XObjectNames.idl \
-    XTableName.idl \
-    XTableRename.idl \
-    XViewAccess.idl \
-    XTableAlteration.idl \
-    XKeyAlteration.idl \
-    XIndexAlteration.idl \
-    XConnectionSupplier.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/sdbc/BatchUpdateException.idl b/offapi/com/sun/star/sdbc/BatchUpdateException.idl
index c3b59265f..927c0deaa 100644
--- a/offapi/com/sun/star/sdbc/BatchUpdateException.idl
+++ b/offapi/com/sun/star/sdbc/BatchUpdateException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_BatchUpdateException_idl__ 
 #define __com_sun_star_sdbc_BatchUpdateException_idl__ 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/CallableStatement.idl b/offapi/com/sun/star/sdbc/CallableStatement.idl
index 3efcd4fa4..fe2cd88ae 100644
--- a/offapi/com/sun/star/sdbc/CallableStatement.idl
+++ b/offapi/com/sun/star/sdbc/CallableStatement.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_CallableStatement_idl__ 
 #define __com_sun_star_sdbc_CallableStatement_idl__ 
  
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__ 
 #include <com/sun/star/sdbc/PreparedStatement.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/ChangeEvent.idl b/offapi/com/sun/star/sdbc/ChangeEvent.idl
index 77476db9b..014d46f00 100644
--- a/offapi/com/sun/star/sdbc/ChangeEvent.idl
+++ b/offapi/com/sun/star/sdbc/ChangeEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_ChangeEvent_idl__
 #define __com_sun_star_sdbc_ChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 module com { module sun { module star { module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/Connection.idl b/offapi/com/sun/star/sdbc/Connection.idl
index 4d8005e6d..f7ea3e2dd 100644
--- a/offapi/com/sun/star/sdbc/Connection.idl
+++ b/offapi/com/sun/star/sdbc/Connection.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_Connection_idl__ 
 #define __com_sun_star_sdbc_Connection_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl b/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
index 5dc68f41a..e2370a95d 100644
--- a/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_DBASEConnectionProperties_idl__ 
 #define __com_sun_star_sdbc_DBASEConnectionProperties_idl__ 
  
-#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__ 
 #include <com/sun/star/sdbc/FILEConnectionProperties.idl> 
-#endif     
  
 module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/DataTruncation.idl b/offapi/com/sun/star/sdbc/DataTruncation.idl
index c0689192e..6e1d40af6 100644
--- a/offapi/com/sun/star/sdbc/DataTruncation.idl
+++ b/offapi/com/sun/star/sdbc/DataTruncation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_DataTruncation_idl__ 
 #define __com_sun_star_sdbc_DataTruncation_idl__ 
  
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__ 
 #include <com/sun/star/sdbc/SQLWarning.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/DriverManager.idl b/offapi/com/sun/star/sdbc/DriverManager.idl
index df67c42b5..7928d70ab 100644
--- a/offapi/com/sun/star/sdbc/DriverManager.idl
+++ b/offapi/com/sun/star/sdbc/DriverManager.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_DriverManager_idl__ 
 #define __com_sun_star_sdbc_DriverManager_idl__ 
  
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl b/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
index ac863e40d..5a7738d25 100644
--- a/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__ 
 #define __com_sun_star_sdbc_FILEConnectionProperties_idl__ 
  
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__ 
 #include <com/sun/star/sdbc/ConnectionProperties.idl> 
-#endif    
  
 module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl b/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
index 7849560a5..b34f33f0e 100644
--- a/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_FLATConnectionProperties_idl__ 
 #define __com_sun_star_sdbc_FLATConnectionProperties_idl__ 
  
-#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__ 
 #include <com/sun/star/sdbc/FILEConnectionProperties.idl> 
-#endif    
  
 module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl b/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
index a513b2c0b..d1795199c 100644
--- a/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdbc_JDBCConnectionProperties_idl__ 
 #define __com_sun_star_sdbc_JDBCConnectionProperties_idl__ 
  
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__ 
 #include <com/sun/star/sdbc/ConnectionProperties.idl> 
-#endif   
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl> 
-#endif
 
 module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl b/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
index ff937bbac..a5ecff60f 100644
--- a/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_ODBCConnectionProperties_idl__ 
 #define __com_sun_star_sdbc_ODBCConnectionProperties_idl__ 
 
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__ 
 #include <com/sun/star/sdbc/ConnectionProperties.idl> 
-#endif  
 
 module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/PreparedStatement.idl b/offapi/com/sun/star/sdbc/PreparedStatement.idl
index c3aec0f7a..b4e28c740 100644
--- a/offapi/com/sun/star/sdbc/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/PreparedStatement.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbc_PreparedStatement_idl__ 
 #define __com_sun_star_sdbc_PreparedStatement_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XCancellable_idl__ 
 #include <com/sun/star/util/XCancellable.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/ResultSet.idl b/offapi/com/sun/star/sdbc/ResultSet.idl
index 7f868bec1..75723a8f4 100644
--- a/offapi/com/sun/star/sdbc/ResultSet.idl
+++ b/offapi/com/sun/star/sdbc/ResultSet.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbc_ResultSet_idl__ 
 #define __com_sun_star_sdbc_ResultSet_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XCancellable_idl__ 
 #include <com/sun/star/util/XCancellable.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/RowSet.idl b/offapi/com/sun/star/sdbc/RowSet.idl
index 936171a8c..0cf93bfcd 100644
--- a/offapi/com/sun/star/sdbc/RowSet.idl
+++ b/offapi/com/sun/star/sdbc/RowSet.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdbc_RowSet_idl__ 
 #define __com_sun_star_sdbc_RowSet_idl__ 
  
-#ifndef __com_sun_star_sdbc_ResultSet_idl__ 
 #include <com/sun/star/sdbc/ResultSet.idl> 
-#endif 
-#ifndef __com_sun_star_sdbc_XColumnLocate_idl__ 
 #include <com/sun/star/sdbc/XColumnLocate.idl>
-#endif 
  
  module com {  module sun {  module star {  module container { 
  published interface XNameAccess; 
diff --git a/offapi/com/sun/star/sdbc/SQLException.idl b/offapi/com/sun/star/sdbc/SQLException.idl
index 8acb588e7..e81fb0fda 100644
--- a/offapi/com/sun/star/sdbc/SQLException.idl
+++ b/offapi/com/sun/star/sdbc/SQLException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #define __com_sun_star_sdbc_SQLException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/SQLWarning.idl b/offapi/com/sun/star/sdbc/SQLWarning.idl
index e95edef32..fa7e89c36 100644
--- a/offapi/com/sun/star/sdbc/SQLWarning.idl
+++ b/offapi/com/sun/star/sdbc/SQLWarning.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_SQLWarning_idl__ 
 #define __com_sun_star_sdbc_SQLWarning_idl__ 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/Statement.idl b/offapi/com/sun/star/sdbc/Statement.idl
index f6359d611..cbcbc0191 100644
--- a/offapi/com/sun/star/sdbc/Statement.idl
+++ b/offapi/com/sun/star/sdbc/Statement.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbc_Statement_idl__ 
 #define __com_sun_star_sdbc_Statement_idl__ 
  
-#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XCancellable_idl__ 
 #include <com/sun/star/util/XCancellable.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XArray.idl b/offapi/com/sun/star/sdbc/XArray.idl
index ba4e87be9..3c50177c6 100644
--- a/offapi/com/sun/star/sdbc/XArray.idl
+++ b/offapi/com/sun/star/sdbc/XArray.idl
@@ -27,17 +27,13 @@
 #ifndef __com_sun_star_sdbc_XArray_idl__ 
 #define __com_sun_star_sdbc_XArray_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  module com {  module sun {  module star {  module container { 
  published interface XNameAccess; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XBatchExecution.idl b/offapi/com/sun/star/sdbc/XBatchExecution.idl
index 874fc4652..87bd050dd 100644
--- a/offapi/com/sun/star/sdbc/XBatchExecution.idl
+++ b/offapi/com/sun/star/sdbc/XBatchExecution.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XBatchExecution_idl__ 
 #define __com_sun_star_sdbc_XBatchExecution_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XBlob.idl b/offapi/com/sun/star/sdbc/XBlob.idl
index cf3fa1eb2..cf0315e12 100644
--- a/offapi/com/sun/star/sdbc/XBlob.idl
+++ b/offapi/com/sun/star/sdbc/XBlob.idl
@@ -27,17 +27,13 @@
 #ifndef __com_sun_star_sdbc_XBlob_idl__ 
 #define __com_sun_star_sdbc_XBlob_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  module com {  module sun {  module star {  module io { 
  published interface XInputStream; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XClob.idl b/offapi/com/sun/star/sdbc/XClob.idl
index 36b5c98c4..cc411eefa 100644
--- a/offapi/com/sun/star/sdbc/XClob.idl
+++ b/offapi/com/sun/star/sdbc/XClob.idl
@@ -27,17 +27,13 @@
 #ifndef __com_sun_star_sdbc_XClob_idl__ 
 #define __com_sun_star_sdbc_XClob_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  module com {  module sun {  module star {  module io { 
  published interface XInputStream; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XCloseable.idl b/offapi/com/sun/star/sdbc/XCloseable.idl
index 56aeae4cc..8d231806f 100644
--- a/offapi/com/sun/star/sdbc/XCloseable.idl
+++ b/offapi/com/sun/star/sdbc/XCloseable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XCloseable_idl__ 
 #define __com_sun_star_sdbc_XCloseable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XColumnLocate.idl b/offapi/com/sun/star/sdbc/XColumnLocate.idl
index abca22e06..d00eb9491 100644
--- a/offapi/com/sun/star/sdbc/XColumnLocate.idl
+++ b/offapi/com/sun/star/sdbc/XColumnLocate.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XColumnLocate_idl__ 
 #define __com_sun_star_sdbc_XColumnLocate_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XConnection.idl b/offapi/com/sun/star/sdbc/XConnection.idl
index 8ee076990..d4c2b1d74 100644
--- a/offapi/com/sun/star/sdbc/XConnection.idl
+++ b/offapi/com/sun/star/sdbc/XConnection.idl
@@ -27,21 +27,15 @@
 #ifndef __com_sun_star_sdbc_XConnection_idl__ 
 #define __com_sun_star_sdbc_XConnection_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  module com {  module sun {  module star {  module container { 
  published interface XNameAccess; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_XCloseable_idl__ 
 #include <com/sun/star/sdbc/XCloseable.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XDataSource.idl b/offapi/com/sun/star/sdbc/XDataSource.idl
index acb2fdbf4..abdd5a7c8 100644
--- a/offapi/com/sun/star/sdbc/XDataSource.idl
+++ b/offapi/com/sun/star/sdbc/XDataSource.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XDataSource_idl__ 
 #define __com_sun_star_sdbc_XDataSource_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
index 4f5c49cf8..db500024a 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XDatabaseMetaData_idl__ 
 #define __com_sun_star_sdbc_XDatabaseMetaData_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  
  module com {  module sun {  module star {  module sdbc { 
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
index 487c2723b..2d6d49f27 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sdbc_XDatabaseMetaData2_idl__
 #define __com_sun_star_sdbc_XDatabaseMetaData2_idl__
 
-#ifndef __com_sun_star_sdbc_XDatabaseMetaData_idl__ 
 #include <com/sun/star/sdbc/XDatabaseMetaData.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdbc/XDriver.idl b/offapi/com/sun/star/sdbc/XDriver.idl
index 30764eb8b..d459c1e37 100644
--- a/offapi/com/sun/star/sdbc/XDriver.idl
+++ b/offapi/com/sun/star/sdbc/XDriver.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdbc_XDriver_idl__ 
 #define __com_sun_star_sdbc_XDriver_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_DriverPropertyInfo_idl__ 
 #include <com/sun/star/sdbc/DriverPropertyInfo.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XDriverAccess.idl b/offapi/com/sun/star/sdbc/XDriverAccess.idl
index 04ddbb10d..00f962e5f 100644
--- a/offapi/com/sun/star/sdbc/XDriverAccess.idl
+++ b/offapi/com/sun/star/sdbc/XDriverAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_XDriverAccess_idl__ 
 #define __com_sun_star_sdbc_XDriverAccess_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XDriverManager.idl b/offapi/com/sun/star/sdbc/XDriverManager.idl
index 63173c803..5d659e9d1 100644
--- a/offapi/com/sun/star/sdbc/XDriverManager.idl
+++ b/offapi/com/sun/star/sdbc/XDriverManager.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbc_XDriverManager_idl__ 
 #define __com_sun_star_sdbc_XDriverManager_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl b/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
index d9382cb6b..d8ae06af6 100644
--- a/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
+++ b/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XGeneratedResultSet_idl__ 
 #define __com_sun_star_sdbc_XGeneratedResultSet_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XIsolatedConnection.idl b/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
index 82c39fd32..e88686135 100644
--- a/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
+++ b/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XIsolatedConnection_idl__ 
 #define __com_sun_star_sdbc_XIsolatedConnection_idl__ 
  
-#ifndef __com_sun_star_task_XInteractionHandler_idl__ 
 #include <com/sun/star/task/XInteractionHandler.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XMultipleResults.idl b/offapi/com/sun/star/sdbc/XMultipleResults.idl
index fa27ee453..9cf25d922 100644
--- a/offapi/com/sun/star/sdbc/XMultipleResults.idl
+++ b/offapi/com/sun/star/sdbc/XMultipleResults.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XMultipleResults_idl__ 
 #define __com_sun_star_sdbc_XMultipleResults_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XOutParameters.idl b/offapi/com/sun/star/sdbc/XOutParameters.idl
index d615d3917..3446d32a7 100644
--- a/offapi/com/sun/star/sdbc/XOutParameters.idl
+++ b/offapi/com/sun/star/sdbc/XOutParameters.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XOutParameters_idl__ 
 #define __com_sun_star_sdbc_XOutParameters_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XParameters.idl b/offapi/com/sun/star/sdbc/XParameters.idl
index fe0bfae6a..104325f60 100644
--- a/offapi/com/sun/star/sdbc/XParameters.idl
+++ b/offapi/com/sun/star/sdbc/XParameters.idl
@@ -27,29 +27,19 @@
 #ifndef __com_sun_star_sdbc_XParameters_idl__ 
 #define __com_sun_star_sdbc_XParameters_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Date_idl__ 
 #include <com/sun/star/util/Date.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Time_idl__ 
 #include <com/sun/star/util/Time.idl> 
-#endif 
  
  module com {  module sun {  module star {  module io { 
  published interface XInputStream; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XPooledConnection.idl b/offapi/com/sun/star/sdbc/XPooledConnection.idl
index 0cff113df..48c05b768 100644
--- a/offapi/com/sun/star/sdbc/XPooledConnection.idl
+++ b/offapi/com/sun/star/sdbc/XPooledConnection.idl
@@ -28,17 +28,11 @@
 #ifndef __com_sun_star_sdbc_XPooledConnection_idl__ 
 #define __com_sun_star_sdbc_XPooledConnection_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl b/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
index c9bd611bb..925e5fdb2 100644
--- a/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
+++ b/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XPreparedBatchExecution_idl__ 
 #define __com_sun_star_sdbc_XPreparedBatchExecution_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XPreparedStatement.idl b/offapi/com/sun/star/sdbc/XPreparedStatement.idl
index 26f03df79..8e1a728f8 100644
--- a/offapi/com/sun/star/sdbc/XPreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/XPreparedStatement.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XPreparedStatement_idl__ 
 #define __com_sun_star_sdbc_XPreparedStatement_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XRef.idl b/offapi/com/sun/star/sdbc/XRef.idl
index a6e6e3099..d1af765e8 100644
--- a/offapi/com/sun/star/sdbc/XRef.idl
+++ b/offapi/com/sun/star/sdbc/XRef.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XRef_idl__ 
 #define __com_sun_star_sdbc_XRef_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XResultSet.idl b/offapi/com/sun/star/sdbc/XResultSet.idl
index c4afe29a6..3d6d19bda 100644
--- a/offapi/com/sun/star/sdbc/XResultSet.idl
+++ b/offapi/com/sun/star/sdbc/XResultSet.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XResultSet_idl__ 
 #define __com_sun_star_sdbc_XResultSet_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XResultSetMetaData.idl b/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
index 7aba7203b..5802dc8cc 100644
--- a/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XResultSetMetaData_idl__ 
 #define __com_sun_star_sdbc_XResultSetMetaData_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl b/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
index abeca09c0..9170f6c5b 100644
--- a/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__ 
 #define __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
index ec020ed65..3ff57ef87 100644
--- a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__ 
 #define __com_sun_star_sdbc_XResultSetUpdate_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XRow.idl b/offapi/com/sun/star/sdbc/XRow.idl
index 58f134260..edf8f7aaa 100644
--- a/offapi/com/sun/star/sdbc/XRow.idl
+++ b/offapi/com/sun/star/sdbc/XRow.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdbc_XRow_idl__ 
 #define __com_sun_star_sdbc_XRow_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Date_idl__ 
 #include <com/sun/star/util/Date.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Time_idl__ 
 #include <com/sun/star/util/Time.idl> 
-#endif 
  
  module com {  module sun {  module star {  module io { 
  published interface XInputStream; 
@@ -51,9 +43,7 @@
  published interface XNameAccess; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XRowSet.idl b/offapi/com/sun/star/sdbc/XRowSet.idl
index f95451092..d2c3cf31d 100644
--- a/offapi/com/sun/star/sdbc/XRowSet.idl
+++ b/offapi/com/sun/star/sdbc/XRowSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_XRowSet_idl__ 
 #define __com_sun_star_sdbc_XRowSet_idl__ 
  
-#ifndef __com_sun_star_sdbc_XResultSet_idl__ 
 #include <com/sun/star/sdbc/XResultSet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XRowSetListener.idl b/offapi/com/sun/star/sdbc/XRowSetListener.idl
index 46adf650c..feb3a3403 100644
--- a/offapi/com/sun/star/sdbc/XRowSetListener.idl
+++ b/offapi/com/sun/star/sdbc/XRowSetListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_XRowSetListener_idl__ 
 #define __com_sun_star_sdbc_XRowSetListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XRowUpdate.idl b/offapi/com/sun/star/sdbc/XRowUpdate.idl
index bad8f6d25..82dcfa8df 100644
--- a/offapi/com/sun/star/sdbc/XRowUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XRowUpdate.idl
@@ -27,29 +27,19 @@
 #ifndef __com_sun_star_sdbc_XRowUpdate_idl__ 
 #define __com_sun_star_sdbc_XRowUpdate_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Date_idl__ 
 #include <com/sun/star/util/Date.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Time_idl__ 
 #include <com/sun/star/util/Time.idl> 
-#endif 
  
  module com {  module sun {  module star {  module io { 
  published interface XInputStream; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XSQLData.idl b/offapi/com/sun/star/sdbc/XSQLData.idl
index 62e0aa033..f788ff6a8 100644
--- a/offapi/com/sun/star/sdbc/XSQLData.idl
+++ b/offapi/com/sun/star/sdbc/XSQLData.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XSQLData_idl__ 
 #define __com_sun_star_sdbc_XSQLData_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XSQLInput.idl b/offapi/com/sun/star/sdbc/XSQLInput.idl
index 7cbad32f2..669dde07d 100644
--- a/offapi/com/sun/star/sdbc/XSQLInput.idl
+++ b/offapi/com/sun/star/sdbc/XSQLInput.idl
@@ -27,29 +27,19 @@
 #ifndef __com_sun_star_sdbc_XSQLInput_idl__ 
 #define __com_sun_star_sdbc_XSQLInput_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Date_idl__ 
 #include <com/sun/star/util/Date.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Time_idl__ 
 #include <com/sun/star/util/Time.idl> 
-#endif 
  
  module com {  module sun {  module star {  module io { 
  published interface XInputStream; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XSQLOutput.idl b/offapi/com/sun/star/sdbc/XSQLOutput.idl
index e467298ad..96f06a71f 100644
--- a/offapi/com/sun/star/sdbc/XSQLOutput.idl
+++ b/offapi/com/sun/star/sdbc/XSQLOutput.idl
@@ -27,29 +27,19 @@
 #ifndef __com_sun_star_sdbc_XSQLOutput_idl__ 
 #define __com_sun_star_sdbc_XSQLOutput_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Date_idl__ 
 #include <com/sun/star/util/Date.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Time_idl__ 
 #include <com/sun/star/util/Time.idl> 
-#endif 
  
  module com {  module sun {  module star {  module io { 
  published interface XInputStream; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XStatement.idl b/offapi/com/sun/star/sdbc/XStatement.idl
index 3255ff411..77d875f1b 100644
--- a/offapi/com/sun/star/sdbc/XStatement.idl
+++ b/offapi/com/sun/star/sdbc/XStatement.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XStatement_idl__ 
 #define __com_sun_star_sdbc_XStatement_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XStruct.idl b/offapi/com/sun/star/sdbc/XStruct.idl
index 99f2610c1..72d6748a5 100644
--- a/offapi/com/sun/star/sdbc/XStruct.idl
+++ b/offapi/com/sun/star/sdbc/XStruct.idl
@@ -27,17 +27,13 @@
 #ifndef __com_sun_star_sdbc_XStruct_idl__ 
 #define __com_sun_star_sdbc_XStruct_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  module com {  module sun {  module star {  module container { 
  published interface XNameAccess; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/XWarningsSupplier.idl b/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
index d0754611c..ddf88b37b 100644
--- a/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
+++ b/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XWarningsSupplier_idl__ 
 #define __com_sun_star_sdbc_XWarningsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__ 
 #include <com/sun/star/sdbc/SQLWarning.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  
diff --git a/offapi/com/sun/star/sdbc/makefile.mk b/offapi/com/sun/star/sdbc/makefile.mk
deleted file mode 100644
index aa033684a..000000000
--- a/offapi/com/sun/star/sdbc/makefile.mk
+++ /dev/null
@@ -1,118 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssdbc
-PACKAGE=com$/sun$/star$/sdbc
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    BatchUpdateException.idl \
-    BestRowScope.idl \
-    BestRowType.idl \
-    CallableStatement.idl \
-    ChangeAction.idl \
-    ChangeEvent.idl \
-    ColumnSearch.idl \
-    ColumnType.idl \
-    ColumnValue.idl \
-    Connection.idl \
-    ConnectionPool.idl \
-    ConnectionProperties.idl \
-    DataTruncation.idl \
-    DataType.idl \
-    DBASEConnectionProperties.idl \
-    Deferrability.idl \
-    Driver.idl \
-    DriverManager.idl \
-    DriverPropertyInfo.idl \
-    FetchDirection.idl \
-    FILEConnectionProperties.idl \
-    FLATConnectionProperties.idl \
-    IndexType.idl \
-    JDBCConnectionProperties.idl \
-    KeyRule.idl \
-    ODBCConnectionProperties.idl \
-    PreparedStatement.idl \
-    ProcedureColumn.idl \
-    ProcedureResult.idl \
-    ResultSet.idl \
-    ResultSetConcurrency.idl \
-    ResultSetType.idl \
-    RowSet.idl \
-    SQLException.idl \
-    SQLWarning.idl \
-    Statement.idl \
-    TransactionIsolation.idl \
-    XArray.idl \
-    XBatchExecution.idl \
-    XBlob.idl \
-    XClob.idl \
-    XCloseable.idl \
-    XColumnLocate.idl \
-    XConnection.idl \
-    XDatabaseMetaData.idl \
-    XDatabaseMetaData2.idl \
-    XDataSource.idl \
-    XDriver.idl \
-    XDriverAccess.idl \
-    XDriverManager.idl \
-    XGeneratedResultSet.idl \
-    XIsolatedConnection.idl \
-    XMultipleResults.idl \
-    XOutParameters.idl \
-    XParameters.idl \
-    XPooledConnection.idl \
-    XPreparedBatchExecution.idl \
-    XPreparedStatement.idl \
-    XRef.idl \
-    XResultSet.idl \
-    XResultSetMetaData.idl \
-    XResultSetMetaDataSupplier.idl \
-    XResultSetUpdate.idl \
-    XRow.idl \
-    XRowSet.idl \
-    XRowSetListener.idl \
-    XRowUpdate.idl \
-    XSQLData.idl \
-    XSQLInput.idl \
-    XSQLOutput.idl \
-    XStatement.idl \
-    XStruct.idl \
-    XWarningsSupplier.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/sdbcx/Column.idl b/offapi/com/sun/star/sdbcx/Column.idl
index 4cd6f6049..d516743f7 100644
--- a/offapi/com/sun/star/sdbcx/Column.idl
+++ b/offapi/com/sun/star/sdbcx/Column.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Column_idl__ 
 #define __com_sun_star_sdbcx_Column_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
index 774adf994..2e386bb87 100644
--- a/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_ColumnDescriptor_idl__ 
 #define __com_sun_star_sdbcx_ColumnDescriptor_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
 #include <com/sun/star/sdbcx/Descriptor.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/Descriptor.idl b/offapi/com/sun/star/sdbcx/Descriptor.idl
index 06671fc17..1c9504134 100644
--- a/offapi/com/sun/star/sdbcx/Descriptor.idl
+++ b/offapi/com/sun/star/sdbcx/Descriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
 #define __com_sun_star_sdbcx_Descriptor_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/Driver.idl b/offapi/com/sun/star/sdbcx/Driver.idl
index 7ab5f1408..f018612fd 100644
--- a/offapi/com/sun/star/sdbcx/Driver.idl
+++ b/offapi/com/sun/star/sdbcx/Driver.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Driver_idl__ 
 #define __com_sun_star_sdbcx_Driver_idl__ 
  
-#ifndef __com_sun_star_sdbc_Driver_idl__ 
 #include <com/sun/star/sdbc/Driver.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/Group.idl b/offapi/com/sun/star/sdbcx/Group.idl
index 0d4394541..cfd539076 100644
--- a/offapi/com/sun/star/sdbcx/Group.idl
+++ b/offapi/com/sun/star/sdbcx/Group.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Group_idl__ 
 #define __com_sun_star_sdbcx_Group_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/GroupDescriptor.idl b/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
index eb912f22f..ca03ca486 100644
--- a/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_GroupDescriptor_idl__ 
 #define __com_sun_star_sdbcx_GroupDescriptor_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
 #include <com/sun/star/sdbcx/Descriptor.idl> 
-#endif  
  module com {  module sun {  module star {  module sdbcx { 
  
 /** is used to create a new group in a database.
diff --git a/offapi/com/sun/star/sdbcx/Index.idl b/offapi/com/sun/star/sdbcx/Index.idl
index 14a5980b2..5dc9f1978 100644
--- a/offapi/com/sun/star/sdbcx/Index.idl
+++ b/offapi/com/sun/star/sdbcx/Index.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Index_idl__ 
 #define __com_sun_star_sdbcx_Index_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/IndexColumn.idl b/offapi/com/sun/star/sdbcx/IndexColumn.idl
index 4bb165da1..13cb5b1f4 100644
--- a/offapi/com/sun/star/sdbcx/IndexColumn.idl
+++ b/offapi/com/sun/star/sdbcx/IndexColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_IndexColumn_idl__ 
 #define __com_sun_star_sdbcx_IndexColumn_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Column_idl__ 
 #include <com/sun/star/sdbcx/Column.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
index 59d09c670..8b00f67fc 100644
--- a/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_IndexColumnDescriptor_idl__ 
 #define __com_sun_star_sdbcx_IndexColumnDescriptor_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
 #include <com/sun/star/sdbcx/Descriptor.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/IndexDescriptor.idl b/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
index eaf2468e3..3871cdc80 100644
--- a/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_IndexDescriptor_idl__ 
 #define __com_sun_star_sdbcx_IndexDescriptor_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
 #include <com/sun/star/sdbcx/Descriptor.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/Key.idl b/offapi/com/sun/star/sdbcx/Key.idl
index dde227738..0f37ced9d 100644
--- a/offapi/com/sun/star/sdbcx/Key.idl
+++ b/offapi/com/sun/star/sdbcx/Key.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Key_idl__ 
 #define __com_sun_star_sdbcx_Key_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/KeyColumn.idl b/offapi/com/sun/star/sdbcx/KeyColumn.idl
index b8f14914e..3d1fda768 100644
--- a/offapi/com/sun/star/sdbcx/KeyColumn.idl
+++ b/offapi/com/sun/star/sdbcx/KeyColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_KeyColumn_idl__
 #define __com_sun_star_sdbcx_KeyColumn_idl__
 
-#ifndef __com_sun_star_sdbcx_Column_idl__
 #include <com/sun/star/sdbcx/Column.idl>
-#endif
 
 module com { module sun { module star { module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
index b11c6a15a..bd1875cf0 100644
--- a/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_KeyColumnDescriptor_idl__ 
 #define __com_sun_star_sdbcx_KeyColumnDescriptor_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
 #include <com/sun/star/sdbcx/Descriptor.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/KeyDescriptor.idl b/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
index f9f8d8360..a029eadb9 100644
--- a/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_KeyDescriptor_idl__
 #define __com_sun_star_sdbcx_KeyDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
 
 module com { module sun { module star { module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/PreparedStatement.idl b/offapi/com/sun/star/sdbcx/PreparedStatement.idl
index 6e18056b6..d1e6fa5d6 100644
--- a/offapi/com/sun/star/sdbcx/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbcx/PreparedStatement.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_PreparedStatement_idl__
 #define __com_sun_star_sdbcx_PreparedStatement_idl__
 
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
 #include <com/sun/star/sdbc/PreparedStatement.idl>
-#endif
 
 module com { module sun { module star { module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/ReferenceColumn.idl b/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
index 60daaef08..98325dc6e 100644
--- a/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
+++ b/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_ReferenceColumn_idl__ 
 #define __com_sun_star_sdbcx_ReferenceColumn_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Column_idl__ 
 #include <com/sun/star/sdbcx/Column.idl> 
-#endif 
  
  
  module com {  module sun {  module star {  module sdbcx { 
diff --git a/offapi/com/sun/star/sdbcx/ResultSet.idl b/offapi/com/sun/star/sdbcx/ResultSet.idl
index b718bcc18..9700ea6f5 100644
--- a/offapi/com/sun/star/sdbcx/ResultSet.idl
+++ b/offapi/com/sun/star/sdbcx/ResultSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_ResultSet_idl__ 
 #define __com_sun_star_sdbcx_ResultSet_idl__ 
  
-#ifndef __com_sun_star_sdbc_ResultSet_idl__ 
 #include <com/sun/star/sdbc/ResultSet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/Statement.idl b/offapi/com/sun/star/sdbcx/Statement.idl
index 5695914eb..479113adb 100644
--- a/offapi/com/sun/star/sdbcx/Statement.idl
+++ b/offapi/com/sun/star/sdbcx/Statement.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Statement_idl__ 
 #define __com_sun_star_sdbcx_Statement_idl__ 
  
-#ifndef __com_sun_star_sdbc_Statement_idl__ 
 #include <com/sun/star/sdbc/Statement.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/Table.idl b/offapi/com/sun/star/sdbcx/Table.idl
index df26c7892..c5371f5be 100644
--- a/offapi/com/sun/star/sdbcx/Table.idl
+++ b/offapi/com/sun/star/sdbcx/Table.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Table_idl__ 
 #define __com_sun_star_sdbcx_Table_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/TableDescriptor.idl b/offapi/com/sun/star/sdbcx/TableDescriptor.idl
index 915444892..195e7873b 100644
--- a/offapi/com/sun/star/sdbcx/TableDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/TableDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_TableDescriptor_idl__ 
 #define __com_sun_star_sdbcx_TableDescriptor_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
 #include <com/sun/star/sdbcx/Descriptor.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/User.idl b/offapi/com/sun/star/sdbcx/User.idl
index 320092c2b..cf8dbc7af 100644
--- a/offapi/com/sun/star/sdbcx/User.idl
+++ b/offapi/com/sun/star/sdbcx/User.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_User_idl__ 
 #define __com_sun_star_sdbcx_User_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/UserDescriptor.idl b/offapi/com/sun/star/sdbcx/UserDescriptor.idl
index c5673367f..8f26c8001 100644
--- a/offapi/com/sun/star/sdbcx/UserDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/UserDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_UserDescriptor_idl__ 
 #define __com_sun_star_sdbcx_UserDescriptor_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
 #include <com/sun/star/sdbcx/Descriptor.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/View.idl b/offapi/com/sun/star/sdbcx/View.idl
index 9cd102f0f..ae2908b72 100644
--- a/offapi/com/sun/star/sdbcx/View.idl
+++ b/offapi/com/sun/star/sdbcx/View.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_View_idl__
 #define __com_sun_star_sdbcx_View_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/ViewDescriptor.idl b/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
index dd13fb4cd..d6d69e1ad 100644
--- a/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_ViewDescriptor_idl__ 
 #define __com_sun_star_sdbcx_ViewDescriptor_idl__ 
  
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
 #include <com/sun/star/sdbcx/Descriptor.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XAlterTable.idl b/offapi/com/sun/star/sdbcx/XAlterTable.idl
index 73287aafe..fd8e1ca2b 100644
--- a/offapi/com/sun/star/sdbcx/XAlterTable.idl
+++ b/offapi/com/sun/star/sdbcx/XAlterTable.idl
@@ -27,25 +27,14 @@
 #ifndef __com_sun_star_sdbcx_XAlterTable_idl__
 #define __com_sun_star_sdbcx_XAlterTable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
  module com {  module sun {  module star {  module beans {
  published interface XPropertySet;
 };};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XAlterView.idl b/offapi/com/sun/star/sdbcx/XAlterView.idl
index d56300a5a..cf9e3a68d 100644
--- a/offapi/com/sun/star/sdbcx/XAlterView.idl
+++ b/offapi/com/sun/star/sdbcx/XAlterView.idl
@@ -28,9 +28,7 @@
 #ifndef __offapi_com_sun_star_sdbcx_XAlterView_idl__
 #define __offapi_com_sun_star_sdbcx_XAlterView_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdbcx/XAppend.idl b/offapi/com/sun/star/sdbcx/XAppend.idl
index fcd3ec374..9b4ff3acc 100644
--- a/offapi/com/sun/star/sdbcx/XAppend.idl
+++ b/offapi/com/sun/star/sdbcx/XAppend.idl
@@ -27,21 +27,15 @@
 #ifndef __com_sun_star_sdbcx_XAppend_idl__ 
 #define __com_sun_star_sdbcx_XAppend_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module beans { 
  published interface XPropertySet; 
 };};};}; 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XAuthorizable.idl b/offapi/com/sun/star/sdbcx/XAuthorizable.idl
index 3679020f6..19750a601 100644
--- a/offapi/com/sun/star/sdbcx/XAuthorizable.idl
+++ b/offapi/com/sun/star/sdbcx/XAuthorizable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XAuthorizable_idl__ 
 #define __com_sun_star_sdbcx_XAuthorizable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl b/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
index af854b7eb..9b083f700 100644
--- a/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbcx_XColumnsSupplier_idl__ 
 #define __com_sun_star_sdbcx_XColumnsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XCreateCatalog.idl b/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
index 4aa79d125..12341a233 100644
--- a/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
+++ b/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdbcx_XCreateCatalog_idl__ 
 #define __com_sun_star_sdbcx_XCreateCatalog_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl b/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
index 5a78bd531..0d4001780 100644
--- a/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbcx_XDataDefinitionSupplier_idl__ 
 #define __com_sun_star_sdbcx_XDataDefinitionSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbc { 
  published interface XConnection; 
diff --git a/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl b/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
index 386bdb399..57667ed5c 100644
--- a/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
+++ b/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_XDataDescriptorFactory_idl__ 
 #define __com_sun_star_sdbcx_XDataDescriptorFactory_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  module com {  module sun {  module star {  module beans { 
  published interface XPropertySet; 
diff --git a/offapi/com/sun/star/sdbcx/XDeleteRows.idl b/offapi/com/sun/star/sdbcx/XDeleteRows.idl
index db7197cfd..7f43c59b8 100644
--- a/offapi/com/sun/star/sdbcx/XDeleteRows.idl
+++ b/offapi/com/sun/star/sdbcx/XDeleteRows.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XDeleteRows_idl__ 
 #define __com_sun_star_sdbcx_XDeleteRows_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XDrop.idl b/offapi/com/sun/star/sdbcx/XDrop.idl
index ee9b53798..e952f8c18 100644
--- a/offapi/com/sun/star/sdbcx/XDrop.idl
+++ b/offapi/com/sun/star/sdbcx/XDrop.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdbcx_XDrop_idl__ 
 #define __com_sun_star_sdbcx_XDrop_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XDropCatalog.idl b/offapi/com/sun/star/sdbcx/XDropCatalog.idl
index b2195b4e1..df9659a30 100644
--- a/offapi/com/sun/star/sdbcx/XDropCatalog.idl
+++ b/offapi/com/sun/star/sdbcx/XDropCatalog.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdbcx_XDropCatalog_idl__ 
 #define __com_sun_star_sdbcx_XDropCatalog_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl b/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
index 797bda5f9..1e55d1167 100644
--- a/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XGroupsSupplier_idl__ 
 #define __com_sun_star_sdbcx_XGroupsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl b/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
index 381a892cd..1530af0d2 100644
--- a/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XIndexesSupplier_idl__ 
 #define __com_sun_star_sdbcx_XIndexesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XKeysSupplier.idl b/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
index f89a3875d..331a24e29 100644
--- a/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XKeysSupplier_idl__ 
 #define __com_sun_star_sdbcx_XKeysSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XRename.idl b/offapi/com/sun/star/sdbcx/XRename.idl
index 8f20951f9..07f3fee11 100644
--- a/offapi/com/sun/star/sdbcx/XRename.idl
+++ b/offapi/com/sun/star/sdbcx/XRename.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbcx_XRename_idl__ 
 #define __com_sun_star_sdbcx_XRename_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XRowLocate.idl b/offapi/com/sun/star/sdbcx/XRowLocate.idl
index 6ccf45281..512f341ea 100644
--- a/offapi/com/sun/star/sdbcx/XRowLocate.idl
+++ b/offapi/com/sun/star/sdbcx/XRowLocate.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XRowLocate_idl__ 
 #define __com_sun_star_sdbcx_XRowLocate_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XTablesSupplier.idl b/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
index ad68b3076..efd922218 100644
--- a/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XTablesSupplier_idl__ 
 #define __com_sun_star_sdbcx_XTablesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XUser.idl b/offapi/com/sun/star/sdbcx/XUser.idl
index 9dcbcf34d..9b82880ea 100644
--- a/offapi/com/sun/star/sdbcx/XUser.idl
+++ b/offapi/com/sun/star/sdbcx/XUser.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_XUser_idl__ 
 #define __com_sun_star_sdbcx_XUser_idl__ 
  
-#ifndef __com_sun_star_sdbcx_XAuthorizable_idl__ 
 #include <com/sun/star/sdbcx/XAuthorizable.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XUsersSupplier.idl b/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
index 7ed581080..336c602c8 100644
--- a/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbcx_XUsersSupplier_idl__ 
 #define __com_sun_star_sdbcx_XUsersSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/XViewsSupplier.idl b/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
index b0ace0542..e733b687d 100644
--- a/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XViewsSupplier_idl__ 
 #define __com_sun_star_sdbcx_XViewsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  module com {  module sun {  module star {  module sdbcx { 
  
diff --git a/offapi/com/sun/star/sdbcx/makefile.mk b/offapi/com/sun/star/sdbcx/makefile.mk
deleted file mode 100644
index 595068798..000000000
--- a/offapi/com/sun/star/sdbcx/makefile.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssdbcx
-PACKAGE=com$/sun$/star$/sdbcx
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    CheckOption.idl \
-    CompareBookmark.idl \
-    Column.idl \
-    ColumnDescriptor.idl \
-    Container.idl \
-    DatabaseDefinition.idl \
-    Descriptor.idl \
-    Driver.idl \
-    Group.idl \
-    GroupDescriptor.idl \
-    Index.idl \
-    IndexColumn.idl \
-    IndexColumnDescriptor.idl \
-    IndexDescriptor.idl \
-    Key.idl \
-    KeyColumn.idl \
-    KeyDescriptor.idl \
-    KeyColumnDescriptor.idl \
-    KeyDescriptor.idl \
-    KeyType.idl \
-    PreparedStatement.idl \
-    Privilege.idl \
-    PrivilegeObject.idl \
-    ReferenceColumn.idl \
-    ResultSet.idl \
-    Statement.idl \
-    Table.idl \
-    TableDescriptor.idl \
-    User.idl \
-    UserDescriptor.idl \
-    View.idl \
-    ViewDescriptor.idl \
-    XAlterTable.idl \
-    XAlterView.idl \
-    XAppend.idl \
-    XAuthorizable.idl \
-    XColumnsSupplier.idl \
-    XCreateCatalog.idl \
-    XDeleteRows.idl \
-    XDataDefinitionSupplier.idl \
-    XDataDescriptorFactory.idl \
-    XDrop.idl \
-    XDropCatalog.idl \
-    XGroupsSupplier.idl \
-    XIndexesSupplier.idl \
-    XKeysSupplier.idl \
-    XRename.idl \
-    XRowLocate.idl \
-    XTablesSupplier.idl \
-    XUser.idl \
-    XUsersSupplier.idl \
-    XViewsSupplier.idl \
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/security/CertAltNameEntry.idl b/offapi/com/sun/star/security/CertAltNameEntry.idl
new file mode 100644
index 000000000..00e221baa
--- /dev/null
+++ b/offapi/com/sun/star/security/CertAltNameEntry.idl
@@ -0,0 +1,59 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef __com_sun_star_security_CertAltNameEntry_idl__
+#define __com_sun_star_security_CertAltNameEntry_idl__
+
+#include <com/sun/star/security/ExtAltNameType.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module security {
+
+//=============================================================================
+/**
+ * struct contains a single entry within a Subject Alternative Name Extension of a
+ * X509 certificate.
+ */
+struct CertAltNameEntry
+{
+    /**
+     * defines the type of the value . With this information you can determine how to interprete the Any value.
+     * @see com::sun::star::security::ExtAltNameType
+     */
+    com::sun::star::security::ExtAltNameType Type;
+
+    /**
+     * stores the value of entry.
+     */
+    any 	Value;
+};
+
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/security/CertificateContainer.idl b/offapi/com/sun/star/security/CertificateContainer.idl
index 1e3dcb72e..b6ffcd30d 100644
--- a/offapi/com/sun/star/security/CertificateContainer.idl
+++ b/offapi/com/sun/star/security/CertificateContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,17 +30,17 @@
 
 #include <com/sun/star/security/XCertificateContainer.idl>
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
 module com { module sun { module star { module security {
 
 /**  the service to be used for <type>XCertificateContainer</type>.
+
     @since OOo 2.3.1
 */
-service CertificateContainer: XCertificateContainer;
+published service CertificateContainer: XCertificateContainer;
 
 }; }; }; };
 
-#endif 
+#endif
diff --git a/offapi/com/sun/star/security/CertificateContainerStatus.idl b/offapi/com/sun/star/security/CertificateContainerStatus.idl
index b6ded62f2..f1765e5f8 100644
--- a/offapi/com/sun/star/security/CertificateContainerStatus.idl
+++ b/offapi/com/sun/star/security/CertificateContainerStatus.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,8 +24,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- 
-/** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_CertificateContainerStatus_idl_
 #define __com_sun_star_security_CertificateContainerStatus_idl_
@@ -39,7 +37,7 @@ module com { module sun { module star { module security {
  * Constant definition of a certificate container status.
  *
  */
-enum CertificateContainerStatus
+published enum CertificateContainerStatus
 {
     /**
      * The certificate was not found.
@@ -60,5 +58,5 @@ enum CertificateContainerStatus
 
 } ; } ; } ; } ;
 
-#endif 
+#endif
 
diff --git a/offapi/com/sun/star/security/CertificateException.idl b/offapi/com/sun/star/security/CertificateException.idl
index e76465c8d..45b2caf00 100644
--- a/offapi/com/sun/star/security/CertificateException.idl
+++ b/offapi/com/sun/star/security/CertificateException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_CertificateException_idl__
 #define __com_sun_star_security_CertificateException_idl__ 
  
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl> 
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/security/CryptographyException.idl b/offapi/com/sun/star/security/CryptographyException.idl
index b91b0c75c..a35f9ebb9 100644
--- a/offapi/com/sun/star/security/CryptographyException.idl
+++ b/offapi/com/sun/star/security/CryptographyException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_CryptographyException_idl__
 #define __com_sun_star_security_CryptographyException_idl__ 
  
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
index e25ef28cb..b1bdb5b8d 100644
--- a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
@@ -32,10 +32,8 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include "XDocumentDigitalSignatures.idl"
 
 module com { module sun { module star { module security {
diff --git a/offapi/com/sun/star/security/EncryptionException.idl b/offapi/com/sun/star/security/EncryptionException.idl
index eaeb64a9d..081dfb881 100644
--- a/offapi/com/sun/star/security/EncryptionException.idl
+++ b/offapi/com/sun/star/security/EncryptionException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_EncryptionException_idl__
 #define __com_sun_star_security_EncryptionException_idl__ 
  
-#ifndef __com_sun_star_security_CryptographyException_idl__
 #include <com/sun/star/security/CryptographyException.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/security/ExtAltNameType.idl b/offapi/com/sun/star/security/ExtAltNameType.idl
new file mode 100644
index 000000000..3910772c2
--- /dev/null
+++ b/offapi/com/sun/star/security/ExtAltNameType.idl
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_security_ExtAltNameType_idl_
+#define __com_sun_star_security_ExtAltNameType_idl_
+
+#include <com/sun/star/uno/XInterface.idl>
+
+module com { module sun { module star { module security {
+
+/**
+ * Constant definiton of a certificate container status.
+ */
+enum ExtAltNameType
+{
+    /**
+     * Cutomize name/value pair
+     * The value of CertAltNameEntry contains a NamedValue.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    OTHER_NAME,
+
+    /**
+     * The entry contains rfc822 name.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    RFC822_NAME,
+
+    /**
+     * The entry contains a dns name.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    DNS_NAME,
+
+    /**
+     * Currently unsupported.
+     */
+    DIRECTORY_NAME,
+
+    /**
+     * The entry contains an url.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    URL,
+
+    /**
+     * The entry contains a ip address.
+     * The value of CertAltNameEntry contains a Sequence of sal_Int8.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    IP_ADDRESS,
+
+    /**
+     * The entry contains a registered id.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    REGISTERED_ID,
+
+    /**
+     * Currently unsupported.
+     */
+    EDI_PARTY_NAME,
+
+    /**
+     * Currently unsupported.
+     */
+    X400_ADDRESS
+
+};
+
+} ; } ; } ; } ;
+
+#endif
+
diff --git a/offapi/com/sun/star/security/KeyException.idl b/offapi/com/sun/star/security/KeyException.idl
index 884bedd70..3301d8ff9 100644
--- a/offapi/com/sun/star/security/KeyException.idl
+++ b/offapi/com/sun/star/security/KeyException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_KeyException_idl__
 #define __com_sun_star_security_KeyException_idl__ 
  
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/security/NoPasswordException.idl b/offapi/com/sun/star/security/NoPasswordException.idl
index 093338c49..e1be18419 100644
--- a/offapi/com/sun/star/security/NoPasswordException.idl
+++ b/offapi/com/sun/star/security/NoPasswordException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_NoPasswordException_idl__
 #define __com_sun_star_security_NoPasswordException_idl__ 
  
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/security/SecurityInfrastructureException.idl b/offapi/com/sun/star/security/SecurityInfrastructureException.idl
index 10e894250..fef5c4e10 100644
--- a/offapi/com/sun/star/security/SecurityInfrastructureException.idl
+++ b/offapi/com/sun/star/security/SecurityInfrastructureException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- 
-//i20156 - new file for xmlsecurity module
-
-/** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_SecurityInfrastructureException_idl__
-#define __com_sun_star_security_SecurityInfrastructureException_idl__ 
- 
-#ifndef __com_sun_star_uno_SecurityException_idl__
-#include <com/sun/star/uno/SecurityException.idl> 
-#endif
+#define __com_sun_star_security_SecurityInfrastructureException_idl__
 
+#include <com/sun/star/uno/SecurityException.idl>
 
-//============================================================================= 
+
+//=============================================================================
 
 module com { module sun { module star { module security {
 
-//============================================================================= 
- 
-exception SecurityInfrastructureException : com::sun::star::uno::SecurityException
+//=============================================================================
+
+published exception SecurityInfrastructureException : com::sun::star::uno::SecurityException
 {
 };
 
-//============================================================================= 
- 
+//=============================================================================
+
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/security/SignatureException.idl b/offapi/com/sun/star/security/SignatureException.idl
index 6fbc33a4f..9c74646ce 100644
--- a/offapi/com/sun/star/security/SignatureException.idl
+++ b/offapi/com/sun/star/security/SignatureException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_SignatureException_idl__
 #define __com_sun_star_security_SignatureException_idl__ 
  
-#ifndef __com_sun_star_security_CryptographyException_idl__
 #include <com/sun/star/security/CryptographyException.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/security/XCertificate.idl b/offapi/com/sun/star/security/XCertificate.idl
index f85a29c50..d9bfe0c89 100644
--- a/offapi/com/sun/star/security/XCertificate.idl
+++ b/offapi/com/sun/star/security/XCertificate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,10 +24,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- 
-//i20156 - new file for xmlsecurity module
-
-/** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_XCertificate_idl_
 #define __com_sun_star_security_XCertificate_idl_
@@ -43,7 +39,7 @@ module com { module sun { module star { module security {
  *
  * <p>This interface represents a x509 certificate.</p>
  */
-interface XCertificate : com::sun::star::uno::XInterface
+published interface XCertificate : com::sun::star::uno::XInterface
 {
     /**
      * the version number attribute of the certificate.
@@ -79,17 +75,17 @@ interface XCertificate : com::sun::star::uno::XInterface
      * the issuer unique ID attribute of the certificate.
      */
     [attribute, readonly] sequence< byte > IssuerUniqueID ;
-    
+
     /**
      * the subject unique ID attribute of the certificate.
      */
     [attribute, readonly] sequence< byte > SubjectUniqueID ;
-    
+
     /**
      * all extensions of a certificate.
      */
     [attribute, readonly] sequence< XCertificateExtension > Extensions ;
-    
+
     /**
      * the DER encoded form of the certificate
      */
@@ -124,7 +120,7 @@ interface XCertificate : com::sun::star::uno::XInterface
      * Find a extension with a object identifier.
      */
     XCertificateExtension findCertificateExtension( [in]sequence< byte > oid ) ;
-    
+
     /**
      * get the certificate usage
      */
@@ -133,5 +129,5 @@ interface XCertificate : com::sun::star::uno::XInterface
 
 } ; } ; } ; } ;
 
-#endif 
+#endif
 
diff --git a/offapi/com/sun/star/security/XCertificateContainer.idl b/offapi/com/sun/star/security/XCertificateContainer.idl
index d30d75f07..21eec4c97 100644
--- a/offapi/com/sun/star/security/XCertificateContainer.idl
+++ b/offapi/com/sun/star/security/XCertificateContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com { module sun { module star { module security {
     @see CertificateContainer
     @since OOo 2.3.1
 */
-interface XCertificateContainer
+published interface XCertificateContainer
 {
     /** Store the certificate in memory.
         @param url
@@ -45,10 +45,10 @@ interface XCertificateContainer
         @param trust
         @return boolean
      */
-    
-    boolean addCertificate( [in] string url, 
+
+    boolean addCertificate( [in] string url,
                               [in] string cert, [in] boolean trust );
-    
+
     /** Check if a certificate was stored earlier before.
         @param url
         @param cert
@@ -56,11 +56,11 @@ interface XCertificateContainer
 
       */
 
-    CertificateContainerStatus hasCertificate([in] string url, 
+    CertificateContainerStatus hasCertificate([in] string url,
                               [in] string cert );
-    
+
 };
 
 }; }; }; };
 
-#endif 
+#endif
diff --git a/offapi/com/sun/star/security/XCertificateExtension.idl b/offapi/com/sun/star/security/XCertificateExtension.idl
index 00044c2fd..5c8c9549c 100644
--- a/offapi/com/sun/star/security/XCertificateExtension.idl
+++ b/offapi/com/sun/star/security/XCertificateExtension.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,10 +24,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- 
-//i20156 - new file for xmlsecurity module
-
-/** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_XCertificateExtension_idl_
 #define __com_sun_star_security_XCertificateExtension_idl_
@@ -41,7 +37,7 @@ module com { module sun { module star { module security {
  *
  * <p>This interface represents a x509 certificate.</p>
  */
-interface XCertificateExtension : com::sun::star::uno::XInterface
+published interface XCertificateExtension : com::sun::star::uno::XInterface
 {
     /**
      * Check whether it is a critical extension
@@ -57,9 +53,9 @@ interface XCertificateExtension : com::sun::star::uno::XInterface
      * Get the extension value
      */
     [attribute, readonly] sequence< byte > ExtensionValue ;
-}; 
+};
 
 } ; } ; } ; } ;
 
-#endif 
+#endif
 
diff --git a/offapi/com/sun/star/security/XSanExtension.idl b/offapi/com/sun/star/security/XSanExtension.idl
new file mode 100644
index 000000000..e378e1b08
--- /dev/null
+++ b/offapi/com/sun/star/security/XSanExtension.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_security_XSanExtension_idl_
+#define __com_sun_star_security_XSanExtension_idl_
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/security/XCertificateExtension.idl>
+#include <com/sun/star/security/CertAltNameEntry.idl>
+
+module com { module sun { module star { module security {
+
+/**
+ * Interface of a X509 Subject Alternative Name Certificate Extension
+ *
+ * <p>This interface represents a x509 certificate extension.</p>
+ */
+interface XSanExtension : com::sun::star::security::XCertificateExtension
+{
+        /**
+         * Contains the alternative names of a certificate
+         */
+        [attribute, readonly] sequence< com::sun::star::security::CertAltNameEntry >  AlternativeNames;
+};
+
+} ; } ; } ; } ;
+
+#endif
+
diff --git a/offapi/com/sun/star/security/makefile.mk b/offapi/com/sun/star/security/makefile.mk
index 21667da10..2064e9fb4 100644
--- a/offapi/com/sun/star/security/makefile.mk
+++ b/offapi/com/sun/star/security/makefile.mk
@@ -59,7 +59,13 @@ IDLFILES=\
     XSerialNumberAdapter.idl		\
     SerialNumberAdapter.idl		\
     CertificateContainer.idl \
-    CertificateContainerStatus.idl
+    CertificateContainerStatus.idl \
+    ExtAltNameType.idl \
+    XSanExtension.idl \
+    CertAltNameEntry.idl
+    
+    
+    
 
 # ------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/setup/BaseAction.idl b/offapi/com/sun/star/setup/BaseAction.idl
index 321ba4b73..37692686d 100644
--- a/offapi/com/sun/star/setup/BaseAction.idl
+++ b/offapi/com/sun/star/setup/BaseAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_BaseAction_idl__ 
 #define __com_sun_star_setup_BaseAction_idl__ 
  
-#ifndef __com_sun_star_setup_ActionType_idl__ 
 #include <com/sun/star/setup/ActionType.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/offapi/com/sun/star/setup/CopyFileAction.idl b/offapi/com/sun/star/setup/CopyFileAction.idl
index 26d71bc2d..84eee6716 100644
--- a/offapi/com/sun/star/setup/CopyFileAction.idl
+++ b/offapi/com/sun/star/setup/CopyFileAction.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_setup_CopyFileAction_idl__
 #define __com_sun_star_setup_CopyFileAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/DeleteDirAction.idl b/offapi/com/sun/star/setup/DeleteDirAction.idl
index 0f6fc5a8d..962103214 100644
--- a/offapi/com/sun/star/setup/DeleteDirAction.idl
+++ b/offapi/com/sun/star/setup/DeleteDirAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_DeleteDirAction_idl__ 
 #define __com_sun_star_setup_DeleteDirAction_idl__ 
  
-#ifndef __com_sun_star_setup_BaseAction_idl__ 
 #include <com/sun/star/setup/BaseAction.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/offapi/com/sun/star/setup/DeleteFileAction.idl b/offapi/com/sun/star/setup/DeleteFileAction.idl
index 09247d21b..b48a7077d 100644
--- a/offapi/com/sun/star/setup/DeleteFileAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFileAction.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_setup_DeleteFileAction_idl__
 #define __com_sun_star_setup_DeleteFileAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/DeleteFolderAction.idl b/offapi/com/sun/star/setup/DeleteFolderAction.idl
index 6f735f357..c7a513dcc 100644
--- a/offapi/com/sun/star/setup/DeleteFolderAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFolderAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_DeleteFolderAction_idl__ 
 #define __com_sun_star_setup_DeleteFolderAction_idl__ 
  
-#ifndef __com_sun_star_setup_BaseAction_idl__ 
 #include <com/sun/star/setup/BaseAction.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/offapi/com/sun/star/setup/DeleteFolderItemAction.idl b/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
index 2691a3d0f..d630f8dfb 100644
--- a/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_DeleteFolderItemAction_idl__ 
 #define __com_sun_star_setup_DeleteFolderItemAction_idl__ 
  
-#ifndef __com_sun_star_setup_BaseAction_idl__ 
 #include <com/sun/star/setup/BaseAction.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/offapi/com/sun/star/setup/DownloadAction.idl b/offapi/com/sun/star/setup/DownloadAction.idl
index cbddd25b0..3a688aca0 100644
--- a/offapi/com/sun/star/setup/DownloadAction.idl
+++ b/offapi/com/sun/star/setup/DownloadAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_DownloadAction_idl__
 #define __com_sun_star_setup_DownloadAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/FontAction.idl b/offapi/com/sun/star/setup/FontAction.idl
index fc014d055..2cafb4229 100644
--- a/offapi/com/sun/star/setup/FontAction.idl
+++ b/offapi/com/sun/star/setup/FontAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_FontAction_idl__ 
 #define __com_sun_star_setup_FontAction_idl__ 
  
-#ifndef __com_sun_star_setup_BaseAction_idl__ 
 #include <com/sun/star/setup/BaseAction.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/offapi/com/sun/star/setup/InstallResponse.idl b/offapi/com/sun/star/setup/InstallResponse.idl
index 0107f8508..45ce4c52b 100644
--- a/offapi/com/sun/star/setup/InstallResponse.idl
+++ b/offapi/com/sun/star/setup/InstallResponse.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_setup_InstallResponse_idl__ 
 #define __com_sun_star_setup_InstallResponse_idl__ 
  
+#include <com/sun/star/setup/ResponseErrorCode.idl>
+
 module com {  module sun {  module star {  module setup { 
      
-/// @deprecated
-published enum ResponseErrorCode
-{ 
-    // DocMerge: empty anyway
-    NOERROR, 
-        
-    // DocMerge: empty anyway
-    NOT_ENOUGH_SPACE 
-    }; 
- 
 // DocMerge: empty anyway
 published struct InstallResponse
 {
diff --git a/offapi/com/sun/star/setup/MakeDirAction.idl b/offapi/com/sun/star/setup/MakeDirAction.idl
index 525b3bbbf..a0a66b700 100644
--- a/offapi/com/sun/star/setup/MakeDirAction.idl
+++ b/offapi/com/sun/star/setup/MakeDirAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_MakeDirAction_idl__ 
 #define __com_sun_star_setup_MakeDirAction_idl__ 
  
-#ifndef __com_sun_star_setup_BaseAction_idl__ 
 #include <com/sun/star/setup/BaseAction.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/offapi/com/sun/star/setup/MakeFolderAction.idl b/offapi/com/sun/star/setup/MakeFolderAction.idl
index ff1a3436b..c341524b1 100644
--- a/offapi/com/sun/star/setup/MakeFolderAction.idl
+++ b/offapi/com/sun/star/setup/MakeFolderAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_MakeFolderAction_idl__ 
 #define __com_sun_star_setup_MakeFolderAction_idl__ 
  
-#ifndef __com_sun_star_setup_BaseAction_idl__ 
 #include <com/sun/star/setup/BaseAction.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/offapi/com/sun/star/setup/MakeFolderItemAction.idl b/offapi/com/sun/star/setup/MakeFolderItemAction.idl
index c0ec8c3c2..4e5d504e8 100644
--- a/offapi/com/sun/star/setup/MakeFolderItemAction.idl
+++ b/offapi/com/sun/star/setup/MakeFolderItemAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_MakeFolderItemAction_idl__ 
 #define __com_sun_star_setup_MakeFolderItemAction_idl__ 
  
-#ifndef __com_sun_star_setup_BaseAction_idl__ 
 #include <com/sun/star/setup/BaseAction.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/offapi/com/sun/star/setup/MakeShortcutAction.idl b/offapi/com/sun/star/setup/MakeShortcutAction.idl
index d52b9f356..8299450f7 100644
--- a/offapi/com/sun/star/setup/MakeShortcutAction.idl
+++ b/offapi/com/sun/star/setup/MakeShortcutAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_MakeShortcutAction_idl__ 
 #define __com_sun_star_setup_MakeShortcutAction_idl__ 
  
-#ifndef __com_sun_star_setup_BaseAction_idl__ 
 #include <com/sun/star/setup/BaseAction.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/offapi/com/sun/star/setup/ProductRegistration.idl b/offapi/com/sun/star/setup/ProductRegistration.idl
index 9dd3fa804..8d6a1ae09 100644
--- a/offapi/com/sun/star/setup/ProductRegistration.idl
+++ b/offapi/com/sun/star/setup/ProductRegistration.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_setup_ProductRegistration_idl__
 #define __com_sun_star_setup_ProductRegistration_idl__
 
-#ifndef __com_sun_star_task_JobExecutor_idl__
 #include <com/sun/star/task/JobExecutor.idl>
-#endif
-
-#ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif
 
 module com {  module sun {  module star {  module setup { 
 
diff --git a/offapi/com/sun/star/setup/ProfileItemAction.idl b/offapi/com/sun/star/setup/ProfileItemAction.idl
index 5e4e2c2e5..454e2ee10 100644
--- a/offapi/com/sun/star/setup/ProfileItemAction.idl
+++ b/offapi/com/sun/star/setup/ProfileItemAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_ProfileItemAction_idl__ 
 #define __com_sun_star_setup_ProfileItemAction_idl__ 
  
-#ifndef __com_sun_star_setup_BaseAction_idl__ 
 #include <com/sun/star/setup/BaseAction.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp b/offapi/com/sun/star/setup/ResponseErrorCode.idl
index acbb450e3..648e2257f 100644
--- a/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp
+++ b/offapi/com/sun/star/setup/ResponseErrorCode.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,9 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_setup_ResponseErrorCode_idl__
+#define __com_sun_star_setup_ResponseErrorCode_idl__
+
+module com {  module sun {  module star {  module setup {
 
+/// @deprecated
+published enum ResponseErrorCode
 {
-    return GetEnvironmentVariable( TEXT("USERDOMAIN"), lpBuffer, nSize );
-}
+    // DocMerge: empty anyway
+    NOERROR,
+
+    // DocMerge: empty anyway
+    NOT_ENOUGH_SPACE
+};
+
+}; }; }; };
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+#endif
diff --git a/offapi/com/sun/star/setup/UnzipAction.idl b/offapi/com/sun/star/setup/UnzipAction.idl
index 048bdfdb1..f89fe2e01 100644
--- a/offapi/com/sun/star/setup/UnzipAction.idl
+++ b/offapi/com/sun/star/setup/UnzipAction.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_setup_UnzipAction_idl__
 #define __com_sun_star_setup_UnzipAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/WindowsRegistryAction.idl b/offapi/com/sun/star/setup/WindowsRegistryAction.idl
index 0d281d9ca..17e7558ad 100644
--- a/offapi/com/sun/star/setup/WindowsRegistryAction.idl
+++ b/offapi/com/sun/star/setup/WindowsRegistryAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_WindowsRegistryAction_idl__ 
 #define __com_sun_star_setup_WindowsRegistryAction_idl__ 
  
-#ifndef __com_sun_star_setup_BaseAction_idl__ 
 #include <com/sun/star/setup/BaseAction.idl> 
-#endif 
  
 module com {  module sun {  module star {  module setup { 
      
diff --git a/offapi/com/sun/star/setup/XSetup.idl b/offapi/com/sun/star/setup/XSetup.idl
index a918f0e21..2a93efaaa 100644
--- a/offapi/com/sun/star/setup/XSetup.idl
+++ b/offapi/com/sun/star/setup/XSetup.idl
@@ -27,10 +27,7 @@
 #ifndef __com_sun_star_setup_XSetup_idl__
 #define __com_sun_star_setup_XSetup_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/setup/OSType.idl>
 #include <com/sun/star/setup/UpdateType.idl>
 #include <com/sun/star/setup/ModuleInfo.idl>
diff --git a/offapi/com/sun/star/setup/makefile.mk b/offapi/com/sun/star/setup/makefile.mk
deleted file mode 100644
index 5970e1cd8..000000000
--- a/offapi/com/sun/star/setup/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-TARGET=csssetup
-PACKAGE=com$/sun$/star$/setup
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------
-
-IDLFILES=\
-    UpdateType.idl			\
-    ActionType.idl			\
-    BaseAction.idl			\
-    CopyFileAction.idl		\
-    DeleteDirAction.idl		\
-    DeleteFileAction.idl		\
-    DeleteFolderAction.idl		\
-    DeleteFolderItemAction.idl	\
-    DownloadAction.idl		\
-    FontAction.idl	     		\
-    InstallEnvironment.idl		\
-    InstallResponse.idl		\
-    InstallType.idl			\
-    MakeDirAction.idl		\
-    MakeFolderAction.idl		\
-    MakeFolderItemAction.idl	\
-    MakeShortcutAction.idl		\
-    MirrorEntry.idl			\
-    ModuleInfo.idl			\
-    ModuleState.idl			\
-    OSType.idl			\
-    ProductRegistration.idl		\
-    ProfileItemAction.idl		\
-    Setup.idl			\
-    SizeInfo.idl			\
-    UnzipAction.idl			\
-    VersionIdentifier.idl		\
-    WindowsRegistryAction.idl	\
-    XSetup.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/sheet/AccessibleCell.idl b/offapi/com/sun/star/sheet/AccessibleCell.idl
index 697c27ace..1e2b1924c 100644
--- a/offapi/com/sun/star/sheet/AccessibleCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCell.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_sheet_AccessibleCell_idl__
 #define __com_sun_star_sheet_AccessibleCell_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
index 5470880a3..39a1abf30 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_AccessibleCsvCell_idl__
 #define __com_sun_star_sheet_AccessibleCsvCell_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
index 48d7bbe8b..2438ae3f8 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_AccessibleCsvRuler_idl__
 #define __com_sun_star_sheet_AccessibleCsvRuler_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
index 35e81d142..38ca93eb1 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_AccessibleCsvTable_idl__
 #define __com_sun_star_sheet_AccessibleCsvTable_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
 #include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
index 7abeaf47b..bdcb6fc82 100644
--- a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
+++ b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_sheet_AccessiblePageHeaderFooterAreasView_idl__
 #define __com_sun_star_sheet_AccessiblePageHeaderFooterAreasView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
index fdd0f9c1c..8fc6b1202 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_sheet_AccessibleSpreadsheet_idl__
 #define __com_sun_star_sheet_AccessibleSpreadsheet_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
 #include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
index d7898b316..06c40566c 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 #define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
index aef731b3e..64c70057a 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_sheet_AccessibleSpreadsheetPageView_idl__
 #define __com_sun_star_sheet_AccessibleSpreadsheetPageView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/ActivationEvent.idl b/offapi/com/sun/star/sheet/ActivationEvent.idl
index 7cf624f6a..ec2028301 100644
--- a/offapi/com/sun/star/sheet/ActivationEvent.idl
+++ b/offapi/com/sun/star/sheet/ActivationEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_ActivationEvent_idl__
 #define __com_sun_star_sheet_ActivationEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
 #include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/AddIn.idl b/offapi/com/sun/star/sheet/AddIn.idl
index c0081a48b..f1d4285d2 100644
--- a/offapi/com/sun/star/sheet/AddIn.idl
+++ b/offapi/com/sun/star/sheet/AddIn.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_AddIn_idl__
 #define __com_sun_star_sheet_AddIn_idl__
 
-#ifndef __com_sun_star_lang_XServiceName_idl__
 #include <com/sun/star/lang/XServiceName.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XAddIn_idl__
 #include <com/sun/star/sheet/XAddIn.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCompatibilityNames_idl__
 #include <com/sun/star/sheet/XCompatibilityNames.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAnnotation.idl b/offapi/com/sun/star/sheet/CellAnnotation.idl
index 42fd49e25..50b2c5a0e 100644
--- a/offapi/com/sun/star/sheet/CellAnnotation.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotation.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_CellAnnotation_idl__
 #define __com_sun_star_sheet_CellAnnotation_idl__
 
-#ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
 #include <com/sun/star/sheet/XSheetAnnotation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
 #include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_text_XSimpleText_idl__
 #include <com/sun/star/text/XSimpleText.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAnnotationShape.idl b/offapi/com/sun/star/sheet/CellAnnotationShape.idl
index 86d7a58ab..da6a52de8 100644
--- a/offapi/com/sun/star/sheet/CellAnnotationShape.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotationShape.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_CellAnnotationShape_idl__
 #define __com_sun_star_sheet_CellAnnotationShape_idl__
 
-#ifndef __com_sun_star_drawing_CaptionShape_idl__
 #include <com/sun/star/drawing/CaptionShape.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAnnotations.idl b/offapi/com/sun/star/sheet/CellAnnotations.idl
index c5429537f..167865b26 100644
--- a/offapi/com/sun/star/sheet/CellAnnotations.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotations.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_CellAnnotations_idl__
 #define __com_sun_star_sheet_CellAnnotations_idl__
 
-#ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
 #include <com/sun/star/sheet/XSheetAnnotations.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl b/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
index 2d9aecdd3..8337daf86 100644
--- a/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_CellAnnotationsEnumeration_idl__
 #define __com_sun_star_sheet_CellAnnotationsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAreaLink.idl b/offapi/com/sun/star/sheet/CellAreaLink.idl
index 58f1883bd..2cde2fed8 100644
--- a/offapi/com/sun/star/sheet/CellAreaLink.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLink.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_CellAreaLink_idl__
 #define __com_sun_star_sheet_CellAreaLink_idl__
 
-#ifndef __com_sun_star_sheet_XAreaLink_idl__
 #include <com/sun/star/sheet/XAreaLink.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAreaLinks.idl b/offapi/com/sun/star/sheet/CellAreaLinks.idl
index ef91308af..ea9564db8 100644
--- a/offapi/com/sun/star/sheet/CellAreaLinks.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLinks.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sheet_CellAreaLinks_idl__
 #define __com_sun_star_sheet_CellAreaLinks_idl__
 
-#ifndef __com_sun_star_sheet_XAreaLinks_idl__
 #include <com/sun/star/sheet/XAreaLinks.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl b/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
index 98cf349d2..20e842fad 100644
--- a/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_CellAreaLinksEnumeration_idl__
 #define __com_sun_star_sheet_CellAreaLinksEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellFormatRanges.idl b/offapi/com/sun/star/sheet/CellFormatRanges.idl
index a221dc245..0c5be9186 100644
--- a/offapi/com/sun/star/sheet/CellFormatRanges.idl
+++ b/offapi/com/sun/star/sheet/CellFormatRanges.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_CellFormatRanges_idl__
 #define __com_sun_star_sheet_CellFormatRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl b/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
index fa104a423..f5d7d3cea 100644
--- a/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_CellFormatRangesEnumeration_idl__
 #define __com_sun_star_sheet_CellFormatRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Cells.idl b/offapi/com/sun/star/sheet/Cells.idl
index 2f8275733..1efab1bc2 100644
--- a/offapi/com/sun/star/sheet/Cells.idl
+++ b/offapi/com/sun/star/sheet/Cells.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_Cells_idl__
 #define __com_sun_star_sheet_Cells_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellsEnumeration.idl b/offapi/com/sun/star/sheet/CellsEnumeration.idl
index 7e04193cc..407ff8c2b 100644
--- a/offapi/com/sun/star/sheet/CellsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_CellsEnumeration_idl__
 #define __com_sun_star_sheet_CellsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/ComplexReference.idl b/offapi/com/sun/star/sheet/ComplexReference.idl
index 934a62dec..12aad66da 100644
--- a/offapi/com/sun/star/sheet/ComplexReference.idl
+++ b/offapi/com/sun/star/sheet/ComplexReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_ComplexReference_idl__
 #define __com_sun_star_sheet_ComplexReference_idl__
 
-#ifndef __com_sun_star_sheet_SingleReference_idl__
 #include <com/sun/star/sheet/SingleReference.idl>
-#endif
 
 //=============================================================================
 
@@ -40,7 +38,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** contains a reference to a cell range.
  */
-struct ComplexReference
+published struct ComplexReference
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl b/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
index 13000e192..1a7011f25 100644
--- a/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
+++ b/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_ConsolidationDescriptor_idl__
 #define __com_sun_star_sheet_ConsolidationDescriptor_idl__
 
-#ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
 #include <com/sun/star/sheet/XConsolidationDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DDELink.idl b/offapi/com/sun/star/sheet/DDELink.idl
index 453049106..57dbca342 100644
--- a/offapi/com/sun/star/sheet/DDELink.idl
+++ b/offapi/com/sun/star/sheet/DDELink.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_DDELink_idl__
 #define __com_sun_star_sheet_DDELink_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELink_idl__
 #include <com/sun/star/sheet/XDDELink.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELinkResults_idl__
 #include <com/sun/star/sheet/XDDELinkResults.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DDELinkInfo.idl b/offapi/com/sun/star/sheet/DDELinkInfo.idl
index 22da15ff6..5f813bd9e 100644
--- a/offapi/com/sun/star/sheet/DDELinkInfo.idl
+++ b/offapi/com/sun/star/sheet/DDELinkInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_DDELinkInfo_idl__
 #define __com_sun_star_sheet_DDELinkInfo_idl__
 
-#ifndef __com_sun_star_sheet_DDEItemInfo_idl__
 #include <com/sun/star/sheet/DDEItemInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DDELinks.idl b/offapi/com/sun/star/sheet/DDELinks.idl
index 412f3e19c..719b700e0 100644
--- a/offapi/com/sun/star/sheet/DDELinks.idl
+++ b/offapi/com/sun/star/sheet/DDELinks.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_sheet_DDELinks_idl__
 #define __com_sun_star_sheet_DDELinks_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_sheet_XDDELinks_idl__
 #include <com/sun/star/sheet/XDDELinks.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DDELinksEnumeration.idl b/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
index b5b6b7c97..0d2334c3b 100644
--- a/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DDELinksEnumeration_idl__
 #define __com_sun_star_sheet_DDELinksEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
index 1ce44dcd7..a3482e079 100644
--- a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_DataPilotTableDescriptor_idl__
 #define __com_sun_star_sheet_DataPilotTableDescriptor_idl__
 
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
 #include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
 #include <com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -107,25 +96,26 @@ published service DataPilotDescriptor
 
     //-------------------------------------------------------------------------
 
-    /** specifies the orientation of the field.
+    /** specifies if empty rows in the source data are ignored.
      */
     [optional, property] boolean IgnoreEmptyRows;
 
     //-------------------------------------------------------------------------
 
-    /** specifies the orientation of the field.
+    /** specifies if empty category cells in the source data should be treated
+        as repetition of the content from the previous row.
      */
     [optional, property] boolean RepeatIfEmpty;
 
     //-------------------------------------------------------------------------
 
-    /** specifies the orientation of the field.
+    /** specifies if columns for grand total results are created.
      */
     [optional, property] boolean ColumnGrand;
 
     //-------------------------------------------------------------------------
 
-    /** specifies the orientation of the field.
+    /** specifies if rows for grand total results are created.
      */
     [optional, property] boolean RowGrand;
 
@@ -142,6 +132,14 @@ published service DataPilotDescriptor
     [optional, property] boolean DrillDownOnDoubleClick;
 
     //-------------------------------------------------------------------------
+
+    /** specifies a label for grand total results.
+
+    @since OOo 3.4
+     */
+    [optional, property] string GrandTotalName;
+
+    //-------------------------------------------------------------------------
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/DataPilotField.idl b/offapi/com/sun/star/sheet/DataPilotField.idl
index 6b49905c5..af42c6c11 100644
--- a/offapi/com/sun/star/sheet/DataPilotField.idl
+++ b/offapi/com/sun/star/sheet/DataPilotField.idl
@@ -28,49 +28,17 @@
 #ifndef __com_sun_star_sheet_DataPilotField_idl__
 #define __com_sun_star_sheet_DataPilotField_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
 #include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
 #include <com/sun/star/sheet/XDataPilotFieldGrouping.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldOrientation_idl__
 #include <com/sun/star/sheet/DataPilotFieldOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldReference_idl__
 #include <com/sun/star/sheet/DataPilotFieldReference.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldLayoutInfo_idl__
 #include <com/sun/star/sheet/DataPilotFieldLayoutInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldAutoShowInfo_idl__
 #include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
 #include <com/sun/star/sheet/DataPilotFieldSortInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
 #include <com/sun/star/sheet/DataPilotFieldGroupInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
index e8b5d79a1..954baa4a5 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroup_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroup_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
index aa6a1e9f1..5b923bd2d 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroupEnumeration_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroupEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
index 15d995899..9a363b6c6 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
 
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
 #include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
index d68f02d9e..eb687f492 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroupItem_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroupItem_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
index 7ba028b18..54756d55f 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroups_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroups_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
index aaf8dda59..5876744ab 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroupsEnumeration_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroupsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldReference.idl b/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
index f3f31364d..ddbe53b8c 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldReference_idl__
 #define __com_sun_star_sheet_DataPilotFieldReference_idl__
 
-#ifndef __com_sun_star_sheet_DataPilotFieldReferenceItemType_idl__
 #include <com/sun/star/sheet/DataPilotFieldReferenceItemType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
index b4a8284e3..a083e3ead 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
 #define __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
 
-#ifndef __com_sun_star_sheet_DataPilotFieldSortMode_idl__
 #include <com/sun/star/sheet/DataPilotFieldSortMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFields.idl b/offapi/com/sun/star/sheet/DataPilotFields.idl
index bef7d4097..a2c726f41 100644
--- a/offapi/com/sun/star/sheet/DataPilotFields.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFields.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_DataPilotFields_idl__
 #define __com_sun_star_sheet_DataPilotFields_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
index 963de8d4b..45f0d8faa 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldsEnumeration_idl__
 #define __com_sun_star_sheet_DataPilotFieldsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotItem.idl b/offapi/com/sun/star/sheet/DataPilotItem.idl
index ae0b4713e..a6497cfb7 100644
--- a/offapi/com/sun/star/sheet/DataPilotItem.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItem.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_DataPilotItem_idl__
 #define __com_sun_star_sheet_DataPilotItem_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotItems.idl b/offapi/com/sun/star/sheet/DataPilotItems.idl
index a5fd2a6af..7f8b80a93 100644
--- a/offapi/com/sun/star/sheet/DataPilotItems.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItems.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_DataPilotItems_idl__
 #define __com_sun_star_sheet_DataPilotItems_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
index 7f18eae9a..1835e8ad4 100644
--- a/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotItemsEnumeration_idl__
 #define __com_sun_star_sheet_DataPilotItemsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSource.idl b/offapi/com/sun/star/sheet/DataPilotSource.idl
index 8a8b662cb..0576b9f45 100644
--- a/offapi/com/sun/star/sheet/DataPilotSource.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSource.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_DataPilotSource_idl__
 #define __com_sun_star_sheet_DataPilotSource_idl__
 
-#ifndef __com_sun_star_sheet_XDimensionsSupplier_idl__
 #include <com/sun/star/sheet/XDimensionsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotResults_idl__
 #include <com/sun/star/sheet/XDataPilotResults.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
index 4948945ac..c80fe4b60 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceDimension_idl__
 #define __com_sun_star_sheet_DataPilotSourceDimension_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XHierarchiesSupplier_idl__
 #include <com/sun/star/sheet/XHierarchiesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloneable_idl__
 #include <com/sun/star/util/XCloneable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldOrientation_idl__
 #include <com/sun/star/sheet/DataPilotFieldOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TableFilterField_idl__
 #include <com/sun/star/sheet/TableFilterField.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
index d6a6ce01e..4a36372a4 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceDimensions_idl__
 #define __com_sun_star_sheet_DataPilotSourceDimensions_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
index b2fcab9cb..f4e656121 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceHierarchies_idl__
 #define __com_sun_star_sheet_DataPilotSourceHierarchies_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl b/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
index f17bbf66e..a2a50c1ab 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceHierarchy_idl__
 #define __com_sun_star_sheet_DataPilotSourceHierarchy_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLevelsSupplier_idl__
 #include <com/sun/star/sheet/XLevelsSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl b/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
index 6d3d75539..5b6427fec 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceLevel_idl__
 #define __com_sun_star_sheet_DataPilotSourceLevel_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XMembersSupplier_idl__
 #include <com/sun/star/sheet/XMembersSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotMemberResults_idl__
 #include <com/sun/star/sheet/XDataPilotMemberResults.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl b/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
index 78218f8e6..1cc7dca39 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceLevels_idl__
 #define __com_sun_star_sheet_DataPilotSourceLevels_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceMember.idl b/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
index 1b45d0680..8540dd9f3 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceMember_idl__
 #define __com_sun_star_sheet_DataPilotSourceMember_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl b/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
index d8aeb3ed5..7f6008ef9 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceMembers_idl__
 #define __com_sun_star_sheet_DataPilotSourceMembers_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotTable.idl b/offapi/com/sun/star/sheet/DataPilotTable.idl
index d2fbbed56..087268834 100644
--- a/offapi/com/sun/star/sheet/DataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTable.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_DataPilotTable_idl__
 #define __com_sun_star_sheet_DataPilotTable_idl__
 
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
 #include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTable_idl__
 #include <com/sun/star/sheet/XDataPilotTable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotTables.idl b/offapi/com/sun/star/sheet/DataPilotTables.idl
index f85d697b5..ff78cff6d 100644
--- a/offapi/com/sun/star/sheet/DataPilotTables.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTables.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sheet_DataPilotTables_idl__
 #define __com_sun_star_sheet_DataPilotTables_idl__
 
-#ifndef __com_sun_star_sheet_XDataPilotTables_idl__
 #include <com/sun/star/sheet/XDataPilotTables.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
index 997efbb08..ed45444fe 100644
--- a/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotTablesEnumeration_idl__
 #define __com_sun_star_sheet_DataPilotTablesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl b/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
index de0c48905..38dfc80d6 100644
--- a/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DatabaseImportDescriptor_idl__
 #define __com_sun_star_sheet_DatabaseImportDescriptor_idl__
 
-#ifndef __com_sun_star_sheet_DataImportMode_idl__
 #include <com/sun/star/sheet/DataImportMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DatabaseRange.idl b/offapi/com/sun/star/sheet/DatabaseRange.idl
index 16c697e51..7da0672ee 100644
--- a/offapi/com/sun/star/sheet/DatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRange.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_sheet_DatabaseRange_idl__
 #define __com_sun_star_sheet_DatabaseRange_idl__
 
-#ifndef __com_sun_star_sheet_XDatabaseRange_idl__
 #include <com/sun/star/sheet/XDatabaseRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
 #include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/DatabaseRanges.idl b/offapi/com/sun/star/sheet/DatabaseRanges.idl
index 3262dea80..702fef079 100644
--- a/offapi/com/sun/star/sheet/DatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRanges.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_DatabaseRanges_idl__
 #define __com_sun_star_sheet_DatabaseRanges_idl__
 
-#ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
 #include <com/sun/star/sheet/XDatabaseRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl b/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
index 9aa2b2a96..a94587501 100644
--- a/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DatabaseRangesEnumeration_idl__
 #define __com_sun_star_sheet_DatabaseRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DocumentSettings.idl b/offapi/com/sun/star/sheet/DocumentSettings.idl
index c6621c4ee..011dc936d 100644
--- a/offapi/com/sun/star/sheet/DocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/DocumentSettings.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_sheet_DocumentSettings_idl__
 #define __com_sun_star_sheet_DocumentSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_document_Settings_idl__
 #include <com/sun/star/document/Settings.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
index db537e749..d74505c56 100644
--- a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
+++ b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_ExternalLinkInfo_idl__
 #define __com_sun_star_sheet_ExternalLinkInfo_idl__
 
-#ifndef __com_sun_star_sheet_ExternalLinkType_idl__
 #include <com/sun/star/sheet/ExternalLinkType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
index 78661a7a6..4fbd54f81 100644
--- a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
+++ b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
 #define __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
 
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
 #include <com/sun/star/sheet/FormulaToken.idl>
-#endif
 
 //=============================================================================
 
@@ -41,7 +39,7 @@ module com {  module sun {  module star {  module sheet {
 /** contains a mapping from a formula name (function name, operator,
     ...) to the OpCode used by the formula compiler.
  */
-struct FormulaOpCodeMapEntry
+published struct FormulaOpCodeMapEntry
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/FormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/FormulaOpCodeMapper.idl
new file mode 100644
index 000000000..28c381b12
--- /dev/null
+++ b/offapi/com/sun/star/sheet/FormulaOpCodeMapper.idl
@@ -0,0 +1,48 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_sheet_FormulaOpCodeMapper_idl__
+#define __com_sun_star_sheet_FormulaOpCodeMapper_idl__
+
+#include <com/sun/star/sheet/XFormulaOpCodeMapper.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module sheet {
+
+//=============================================================================
+
+//=============================================================================
+
+service FormulaOpCodeMapper : XFormulaOpCodeMapper;
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/sheet/FormulaParser.idl b/offapi/com/sun/star/sheet/FormulaParser.idl
index 6d3483228..13bd45665 100644
--- a/offapi/com/sun/star/sheet/FormulaParser.idl
+++ b/offapi/com/sun/star/sheet/FormulaParser.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_sheet_FormulaParser_idl__
 #define __com_sun_star_sheet_FormulaParser_idl__
 
-#ifndef __com_sun_star_beans_PropertySet_idl__
 #include <com/sun/star/beans/PropertySet.idl>
-#endif
-#ifndef __com_sun_star_sheet_XFormulaParser_idl__
 #include <com/sun/star/sheet/XFormulaParser.idl>
-#endif
-#ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.idl>
-#endif
-#ifndef __com_sun_star_sheet_ExternalLinkInfo_idl__
 #include <com/sun/star/sheet/ExternalLinkInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/FormulaToken.idl b/offapi/com/sun/star/sheet/FormulaToken.idl
index d5fedeca9..96eaefcc5 100644
--- a/offapi/com/sun/star/sheet/FormulaToken.idl
+++ b/offapi/com/sun/star/sheet/FormulaToken.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** contains a single token within a formula.
  */
-struct FormulaToken
+published struct FormulaToken
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/FunctionAccess.idl b/offapi/com/sun/star/sheet/FunctionAccess.idl
index 23dec11ba..5c4b824e2 100644
--- a/offapi/com/sun/star/sheet/FunctionAccess.idl
+++ b/offapi/com/sun/star/sheet/FunctionAccess.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_FunctionAccess_idl__
 #define __com_sun_star_sheet_FunctionAccess_idl__
 
-#ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
 #include <com/sun/star/sheet/SpreadsheetDocumentSettings.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XFunctionAccess_idl__
 #include <com/sun/star/sheet/XFunctionAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/FunctionDescription.idl b/offapi/com/sun/star/sheet/FunctionDescription.idl
index 31bcbf315..80264b971 100644
--- a/offapi/com/sun/star/sheet/FunctionDescription.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_FunctionDescription_idl__
 #define __com_sun_star_sheet_FunctionDescription_idl__
 
-#ifndef __com_sun_star_sheet_FunctionArgument_idl__
 #include <com/sun/star/sheet/FunctionArgument.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl b/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
index b1f292060..7f1dccc22 100644
--- a/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_FunctionDescriptionEnumeration_idl__
 #define __com_sun_star_sheet_FunctionDescriptionEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/FunctionDescriptions.idl b/offapi/com/sun/star/sheet/FunctionDescriptions.idl
index 580a79ee7..30593d1a9 100644
--- a/offapi/com/sun/star/sheet/FunctionDescriptions.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescriptions.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_sheet_FunctionDescriptions_idl__
 #define __com_sun_star_sheet_FunctionDescriptions_idl__
 
-#ifndef __com_sun_star_sheet_XFunctionDescriptions_idl__
 #include <com/sun/star/sheet/XFunctionDescriptions.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
index 664aa584a..2ea03e7b0 100644
--- a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
+++ b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_GlobalSheetSettings_idl__
 #define __com_sun_star_sheet_GlobalSheetSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/HeaderFooterContent.idl b/offapi/com/sun/star/sheet/HeaderFooterContent.idl
index c4a613131..3a81f50c0 100644
--- a/offapi/com/sun/star/sheet/HeaderFooterContent.idl
+++ b/offapi/com/sun/star/sheet/HeaderFooterContent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_HeaderFooterContent_idl__
 #define __com_sun_star_sheet_HeaderFooterContent_idl__
 
-#ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
 #include <com/sun/star/sheet/XHeaderFooterContent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/LabelRange.idl b/offapi/com/sun/star/sheet/LabelRange.idl
index f5537b753..9fde5bcb1 100644
--- a/offapi/com/sun/star/sheet/LabelRange.idl
+++ b/offapi/com/sun/star/sheet/LabelRange.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_LabelRange_idl__
 #define __com_sun_star_sheet_LabelRange_idl__
 
-#ifndef __com_sun_star_sheet_XLabelRange_idl__
 #include <com/sun/star/sheet/XLabelRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/LabelRanges.idl b/offapi/com/sun/star/sheet/LabelRanges.idl
index cda8b6021..4577a5396 100644
--- a/offapi/com/sun/star/sheet/LabelRanges.idl
+++ b/offapi/com/sun/star/sheet/LabelRanges.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_sheet_LabelRanges_idl__
 #define __com_sun_star_sheet_LabelRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLabelRanges_idl__
 #include <com/sun/star/sheet/XLabelRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl b/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
index a222eb77f..e091a099a 100644
--- a/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_LabelRangesEnumeration_idl__
 #define __com_sun_star_sheet_LabelRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/LocalizedName.idl b/offapi/com/sun/star/sheet/LocalizedName.idl
index f43813060..a8a8e193f 100644
--- a/offapi/com/sun/star/sheet/LocalizedName.idl
+++ b/offapi/com/sun/star/sheet/LocalizedName.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_LocalizedName_idl__
 #define __com_sun_star_sheet_LocalizedName_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/NameToken.idl b/offapi/com/sun/star/sheet/NameToken.idl
index 5bd57d66f..15cd48c5f 100644
--- a/offapi/com/sun/star/sheet/NameToken.idl
+++ b/offapi/com/sun/star/sheet/NameToken.idl
@@ -50,4 +50,3 @@ struct NameToken
 }; }; }; };
 
 #endif
-
diff --git a/offapi/com/sun/star/sheet/NamedRange.idl b/offapi/com/sun/star/sheet/NamedRange.idl
index 22e1f93ab..5ac72e79e 100644
--- a/offapi/com/sun/star/sheet/NamedRange.idl
+++ b/offapi/com/sun/star/sheet/NamedRange.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_NamedRange_idl__
 #define __com_sun_star_sheet_NamedRange_idl__
 
-#ifndef __com_sun_star_sheet_XNamedRange_idl__
 #include <com/sun/star/sheet/XNamedRange.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
 #include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/NamedRanges.idl b/offapi/com/sun/star/sheet/NamedRanges.idl
index 6d07c9c31..6b38ada6d 100644
--- a/offapi/com/sun/star/sheet/NamedRanges.idl
+++ b/offapi/com/sun/star/sheet/NamedRanges.idl
@@ -28,22 +28,11 @@
 #ifndef __com_sun_star_sheet_NamedRanges_idl__
 #define __com_sun_star_sheet_NamedRanges_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XNamedRanges_idl__
 #include <com/sun/star/sheet/XNamedRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_document_XActionLockable_idl__
 #include <com/sun/star/document/XActionLockable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl b/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
index 6eb62167a..afa5f8b30 100644
--- a/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_NamedRangesEnumeration_idl__
 #define __com_sun_star_sheet_NamedRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/NoConvergenceException.idl b/offapi/com/sun/star/sheet/NoConvergenceException.idl
index f846ec9aa..a56f897c2 100644
--- a/offapi/com/sun/star/sheet/NoConvergenceException.idl
+++ b/offapi/com/sun/star/sheet/NoConvergenceException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_NoConvergenceException_idl__
 #define __com_sun_star_sheet_NoConvergenceException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/RangeSelectionEvent.idl b/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
index e44d29547..5496d7b0f 100644
--- a/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
+++ b/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__ 
 #define __com_sun_star_sheet_RangeSelectionEvent_idl__ 
 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sheet/RecentFunctions.idl b/offapi/com/sun/star/sheet/RecentFunctions.idl
index 6336f44ac..f0ae0f4ed 100644
--- a/offapi/com/sun/star/sheet/RecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/RecentFunctions.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_RecentFunctions_idl__
 #define __com_sun_star_sheet_RecentFunctions_idl__
 
-#ifndef __com_sun_star_sheet_XRecentFunctions_idl__
 #include <com/sun/star/sheet/XRecentFunctions.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/ResultEvent.idl b/offapi/com/sun/star/sheet/ResultEvent.idl
index 7c99a3396..ce879fca8 100644
--- a/offapi/com/sun/star/sheet/ResultEvent.idl
+++ b/offapi/com/sun/star/sheet/ResultEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_ResultEvent_idl__
 #define __com_sun_star_sheet_ResultEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Scenario.idl b/offapi/com/sun/star/sheet/Scenario.idl
index c65c21511..4c4228570 100644
--- a/offapi/com/sun/star/sheet/Scenario.idl
+++ b/offapi/com/sun/star/sheet/Scenario.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_Scenario_idl__
 #define __com_sun_star_sheet_Scenario_idl__
 
-#ifndef __com_sun_star_sheet_XScenario_idl__
 #include <com/sun/star/sheet/XScenario.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenarioEnhanced_idl__
 #include <com/sun/star/sheet/XScenarioEnhanced.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Scenarios.idl b/offapi/com/sun/star/sheet/Scenarios.idl
index 9e2bc8109..95d1c9881 100644
--- a/offapi/com/sun/star/sheet/Scenarios.idl
+++ b/offapi/com/sun/star/sheet/Scenarios.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_Scenarios_idl__
 #define __com_sun_star_sheet_Scenarios_idl__
 
-#ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
 #include <com/sun/star/sheet/XScenariosSupplier.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/ScenariosEnumeration.idl b/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
index ce815fe9c..8581b7e44 100644
--- a/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
+++ b/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_ScenariosEnumeration_idl__
 #define __com_sun_star_sheet_ScenariosEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Shape.idl b/offapi/com/sun/star/sheet/Shape.idl
index f41911177..b7901d1b7 100644
--- a/offapi/com/sun/star/sheet/Shape.idl
+++ b/offapi/com/sun/star/sheet/Shape.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sheet_Shape_idl__
 #define __com_sun_star_sheet_Shape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetCell.idl b/offapi/com/sun/star/sheet/SheetCell.idl
index c75ddce8e..424a8ab46 100644
--- a/offapi/com/sun/star/sheet/SheetCell.idl
+++ b/offapi/com/sun/star/sheet/SheetCell.idl
@@ -29,95 +29,32 @@
 #define __com_sun_star_sheet_SheetCell_idl__
 
 
-#ifndef __com_sun_star_table_Cell_idl__
 #include <com/sun/star/table/Cell.idl>
-#endif
-
-#ifndef __com_sun_star_text_Text_idl__
 #include <com/sun/star/text/Text.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
 #include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
 
 
-#ifndef __com_sun_star_document_XActionLockable_idl__
 #include <com/sun/star/document/XActionLockable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XReplaceable_idl__
 #include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
 #include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
 #include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellAddressable_idl__
 #include <com/sun/star/sheet/XCellAddressable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
 #include <com/sun/star/sheet/XSheetAnnotationAnchor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFieldsSupplier_idl__
 #include <com/sun/star/text/XTextFieldsSupplier.idl>
-#endif
 
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
 #include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 #include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetCellCursor.idl b/offapi/com/sun/star/sheet/SheetCellCursor.idl
index 2471f93bc..94696fbad 100644
--- a/offapi/com/sun/star/sheet/SheetCellCursor.idl
+++ b/offapi/com/sun/star/sheet/SheetCellCursor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_SheetCellCursor_idl__
 #define __com_sun_star_sheet_SheetCellCursor_idl__
 
-#ifndef __com_sun_star_table_CellCursor_idl__
 #include <com/sun/star/table/CellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetCellRange_idl__
 #include <com/sun/star/sheet/SheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellCursor_idl__
 #include <com/sun/star/sheet/XSheetCellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XUsedAreaCursor_idl__
 #include <com/sun/star/sheet/XUsedAreaCursor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetCellRange.idl b/offapi/com/sun/star/sheet/SheetCellRange.idl
index 0e9aa5779..11a988e2b 100644
--- a/offapi/com/sun/star/sheet/SheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRange.idl
@@ -29,135 +29,42 @@
 #define __com_sun_star_sheet_SheetCellRange_idl__
 
 
-#ifndef __com_sun_star_table_CellRange_idl__
 #include <com/sun/star/table/CellRange.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
 #include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
 
 
-#ifndef __com_sun_star_util_XReplaceable_idl__
 #include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XMergeable_idl__
 #include <com/sun/star/util/XMergeable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
 #include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
 #include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_table_XAutoFormattable_idl__
 #include <com/sun/star/table/XAutoFormattable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
 #include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
 #include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeFormula_idl__
 #include <com/sun/star/sheet/XCellRangeFormula.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeAddressable_idl__
 #include <com/sun/star/sheet/XCellRangeAddressable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOperation_idl__
 #include <com/sun/star/sheet/XSheetOperation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellSeries_idl__
 #include <com/sun/star/sheet/XCellSeries.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XArrayFormulaRange_idl__
 #include <com/sun/star/sheet/XArrayFormulaRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XMultipleOperation_idl__
 #include <com/sun/star/sheet/XMultipleOperation.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
 #include <com/sun/star/util/XSortable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XImportable_idl__
 #include <com/sun/star/util/XImportable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalCalculatable_idl__
 #include <com/sun/star/sheet/XSubTotalCalculatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterableEx_idl__
 #include <com/sun/star/sheet/XSheetFilterableEx.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
 #include <com/sun/star/sheet/XCellFormatRangesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
 #include <com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
 #include <com/sun/star/chart/XChartDataArray.idl>
-#endif
 
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
 #include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 #include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetCellRanges.idl b/offapi/com/sun/star/sheet/SheetCellRanges.idl
index db9882f93..5f9a1fe26 100644
--- a/offapi/com/sun/star/sheet/SheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRanges.idl
@@ -29,67 +29,25 @@
 #define __com_sun_star_sheet_SheetCellRanges_idl__
 
 
-#ifndef __com_sun_star_table_CellProperties_idl__
 #include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
 #include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
 
 
-#ifndef __com_sun_star_util_XReplaceable_idl__
 #include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
 #include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOperation_idl__
 #include <com/sun/star/sheet/XSheetOperation.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
 #include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRangeContainer_idl__
 #include <com/sun/star/sheet/XSheetCellRangeContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
 #include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl b/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
index 717b90558..672286803 100644
--- a/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SheetCellRangesEnumeration_idl__
 #define __com_sun_star_sheet_SheetCellRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetLink.idl b/offapi/com/sun/star/sheet/SheetLink.idl
index ec2db78a9..2d8c51095 100644
--- a/offapi/com/sun/star/sheet/SheetLink.idl
+++ b/offapi/com/sun/star/sheet/SheetLink.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_SheetLink_idl__
 #define __com_sun_star_sheet_SheetLink_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetLinks.idl b/offapi/com/sun/star/sheet/SheetLinks.idl
index f80b82906..4f5283810 100644
--- a/offapi/com/sun/star/sheet/SheetLinks.idl
+++ b/offapi/com/sun/star/sheet/SheetLinks.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_SheetLinks_idl__
 #define __com_sun_star_sheet_SheetLinks_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl b/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
index a874132d9..faee80de7 100644
--- a/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SheetLinksEnumeration_idl__
 #define __com_sun_star_sheet_SheetLinkssEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetRangesQuery.idl b/offapi/com/sun/star/sheet/SheetRangesQuery.idl
index 9d541a058..c0c1b2585 100644
--- a/offapi/com/sun/star/sheet/SheetRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/SheetRangesQuery.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
 #define __com_sun_star_sheet_SheetRangesQuery_idl__
 
-#ifndef __com_sun_star_sheet_XCellRangesQuery_idl__
 #include <com/sun/star/sheet/XCellRangesQuery.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XFormulaQuery_idl__
 #include <com/sun/star/sheet/XFormulaQuery.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetSortDescriptor.idl b/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
index 676652e67..ae9a5fa74 100644
--- a/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_SheetSortDescriptor_idl__
 #define __com_sun_star_sheet_SheetSortDescriptor_idl__
 
-#ifndef __com_sun_star_table_TableSortDescriptor_idl__
 #include <com/sun/star/table/TableSortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl b/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
index fdeb4619f..243384721 100644
--- a/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
+++ b/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_SheetSortDescriptor2_idl__
 #define __com_sun_star_sheet_SheetSortDescriptor2_idl__
 
-#ifndef __com_sun_star_table_TableSortDescriptor2_idl__
 #include <com/sun/star/table/TableSortDescriptor2.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SingleReference.idl b/offapi/com/sun/star/sheet/SingleReference.idl
index cf802fb5a..b49bf326f 100644
--- a/offapi/com/sun/star/sheet/SingleReference.idl
+++ b/offapi/com/sun/star/sheet/SingleReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** contains a reference to a single cell.
  */
-struct SingleReference
+published struct SingleReference
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/Solver.idl b/offapi/com/sun/star/sheet/Solver.idl
index 08804e2b2..8246215ad 100644
--- a/offapi/com/sun/star/sheet/Solver.idl
+++ b/offapi/com/sun/star/sheet/Solver.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_Solver_idl__
 #define __com_sun_star_sheet_Solver_idl__
 
-#ifndef __com_sun_star_sheet_XSolver_idl__
 #include <com/sun/star/sheet/XSolver.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SolverConstraint.idl b/offapi/com/sun/star/sheet/SolverConstraint.idl
index 0a760c21e..93eed51f3 100644
--- a/offapi/com/sun/star/sheet/SolverConstraint.idl
+++ b/offapi/com/sun/star/sheet/SolverConstraint.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_SolverConstraint_idl__
 #define __com_sun_star_sheet_SolverConstraint_idl__
 
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SolverConstraintOperator_idl__
 #include <com/sun/star/sheet/SolverConstraintOperator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Spreadsheet.idl b/offapi/com/sun/star/sheet/Spreadsheet.idl
index 5ba0e5345..5fb1bce20 100644
--- a/offapi/com/sun/star/sheet/Spreadsheet.idl
+++ b/offapi/com/sun/star/sheet/Spreadsheet.idl
@@ -28,74 +28,23 @@
 #ifndef __com_sun_star_sheet_Spreadsheet_idl__
 #define __com_sun_star_sheet_Spreadsheet_idl__
 
-#ifndef __com_sun_star_sheet_SheetCellRange_idl__
 #include <com/sun/star/sheet/SheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
 #include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XProtectable_idl__
 #include <com/sun/star/util/XProtectable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
 #include <com/sun/star/sheet/XDataPilotTablesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
 #include <com/sun/star/sheet/XScenariosSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
 #include <com/sun/star/sheet/XSheetAnnotationsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPageSupplier_idl__
 #include <com/sun/star/drawing/XDrawPageSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableChartsSupplier_idl__
 #include <com/sun/star/table/XTableChartsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeMovement_idl__
 #include <com/sun/star/sheet/XCellRangeMovement.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XPrintAreas_idl__
 #include <com/sun/star/sheet/XPrintAreas.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetPageBreak_idl__
 #include <com/sun/star/sheet/XSheetPageBreak.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOutline_idl__
 #include <com/sun/star/sheet/XSheetOutline.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAuditing_idl__
 #include <com/sun/star/sheet/XSheetAuditing.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetLinkable_idl__
 #include <com/sun/star/sheet/XSheetLinkable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_Scenario_idl__
 #include <com/sun/star/sheet/Scenario.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XExternalSheetName_idl__
 #include <com/sun/star/sheet/XExternalSheetName.idl>
-#endif
-
 #include <com/sun/star/util/Color.idl>
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocument.idl b/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
index e6e7c6bee..efd3ff91e 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
@@ -28,91 +28,31 @@
 #ifndef __com_sun_star_sheet_SpreadsheetDocument_idl__
 #define __com_sun_star_sheet_SpreadsheetDocument_idl__
 
-#ifndef __com_sun_star_document_OfficeDocument_idl__
 #include <com/sun/star/document/OfficeDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
 #include <com/sun/star/sheet/SpreadsheetDocumentSettings.idl>
-#endif
 
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_document_XActionLockable_idl__
 #include <com/sun/star/document/XActionLockable.idl>
-#endif
-
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
 #include <com/sun/star/document/XLinkTargetSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XProtectable_idl__
 #include <com/sun/star/util/XProtectable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
 #include <com/sun/star/sheet/XSpreadsheetDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCalculatable_idl__
 #include <com/sun/star/sheet/XCalculatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDocumentAuditing_idl__
 #include <com/sun/star/sheet/XDocumentAuditing.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XConsolidatable_idl__
 #include <com/sun/star/sheet/XConsolidatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XGoalSeek_idl__
 #include <com/sun/star/sheet/XGoalSeek.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
 #include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
 
 
-#ifndef __com_sun_star_sheet_XNamedRanges_idl__
 #include <com/sun/star/sheet/XNamedRanges.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
 #include <com/sun/star/sheet/XDatabaseRanges.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLabelRanges_idl__
 #include <com/sun/star/sheet/XLabelRanges.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XAreaLinks_idl__
 #include <com/sun/star/sheet/XAreaLinks.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XExternalDocLinks_idl__
 #include <com/sun/star/sheet/XExternalDocLinks.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
index c719b78ab..d4f3e8b7d 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
 #define __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
 #include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDevice_idl__
 #include <com/sun/star/awt/XDevice.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
index 64306912b..83d09aae9 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_sheet_SpreadsheetDrawPage_idl__
 #define __com_sun_star_sheet_SpreadsheetDrawPage_idl__
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
 #include <com/sun/star/drawing/XShapeGrouper.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetView.idl b/offapi/com/sun/star/sheet/SpreadsheetView.idl
index 9a76ef8b9..a2e639050 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetView.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetView.idl
@@ -27,53 +27,18 @@
 #ifndef __com_sun_star_sheet_SpreadsheetView_idl__
 #define __com_sun_star_sheet_SpreadsheetView_idl__
 
-#ifndef __com_sun_star_frame_Controller_idl__
 #include <com/sun/star/frame/Controller.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetViewSettings_idl__
 #include <com/sun/star/sheet/SpreadsheetViewSettings.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetViewPane_idl__
 #include <com/sun/star/sheet/SpreadsheetViewPane.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheetView_idl__
 #include <com/sun/star/sheet/XSpreadsheetView.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XViewSplitable_idl__
 #include <com/sun/star/sheet/XViewSplitable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XViewFreezable_idl__
 #include <com/sun/star/sheet/XViewFreezable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XRangeSelection_idl__
 #include <com/sun/star/sheet/XRangeSelection.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XActivationBroadcaster_idl__
 #include <com/sun/star/sheet/XActivationBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
 #include <com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl b/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
index 48e505cf8..2d77d5a15 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sheet_SpreadsheetViewPane_idl__ 
 #define __com_sun_star_sheet_SpreadsheetViewPane_idl__ 
  
-#ifndef __com_sun_star_sheet_XViewPane_idl__ 
 #include <com/sun/star/sheet/XViewPane.idl> 
-#endif 
  
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__ 
 #include <com/sun/star/sheet/XCellRangeReferrer.idl> 
-#endif 
  
-#ifndef __com_sun_star_view_XControlAccess_idl__ 
 #include <com/sun/star/view/XControlAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl b/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
index 7ce815204..9e384c7c5 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SpreadsheetViewPanesEnumeration_idl__
 #define __com_sun_star_sheet_SpreadsheetViewPanesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
index 6c692ce0f..6a525c16a 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
@@ -28,13 +28,9 @@
 #ifndef __com_sun_star_sheet_SpreadsheetViewSettings_idl__ 
 #define __com_sun_star_sheet_SpreadsheetViewSettings_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sheet/Spreadsheets.idl b/offapi/com/sun/star/sheet/Spreadsheets.idl
index 7051842b2..cec26be06 100644
--- a/offapi/com/sun/star/sheet/Spreadsheets.idl
+++ b/offapi/com/sun/star/sheet/Spreadsheets.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_Spreadsheets_idl__
 #define __com_sun_star_sheet_Spreadsheets_idl__
 
-#ifndef __com_sun_star_sheet_XSpreadsheets_idl__
 #include <com/sun/star/sheet/XSpreadsheets.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangesAccess_idl__
 #include <com/sun/star/sheet/XCellRangesAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl b/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
index 4e6d9b053..62e4b928b 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SpreadsheetsEnumeration_idl__
 #define __com_sun_star_sheet_SpreadsheetsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SubTotalColumn.idl b/offapi/com/sun/star/sheet/SubTotalColumn.idl
index 6c13e05cb..a528f2c36 100644
--- a/offapi/com/sun/star/sheet/SubTotalColumn.idl
+++ b/offapi/com/sun/star/sheet/SubTotalColumn.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SubTotalColumn_idl__
 #define __com_sun_star_sheet_SubTotalColumn_idl__
 
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SubTotalDescriptor.idl b/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
index b95e17ae5..da4ebdfee 100644
--- a/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
@@ -28,19 +28,10 @@
 #ifndef __com_sun_star_sheet_SubTotalDescriptor_idl__
 #define __com_sun_star_sheet_SubTotalDescriptor_idl__
 
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
 #include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SubTotalField.idl b/offapi/com/sun/star/sheet/SubTotalField.idl
index f47ca69aa..c9089c6a1 100644
--- a/offapi/com/sun/star/sheet/SubTotalField.idl
+++ b/offapi/com/sun/star/sheet/SubTotalField.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SubTotalField_idl__
 #define __com_sun_star_sheet_SubTotalField_idl__
 
-#ifndef __com_sun_star_sheet_XSubTotalField_idl__
 #include <com/sun/star/sheet/XSubTotalField.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl b/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
index a015b7dfa..f064d767d 100644
--- a/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SubTotalFieldsEnumeration_idl__
 #define __com_sun_star_sheet_SubTotalFieldsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableAutoFormat.idl b/offapi/com/sun/star/sheet/TableAutoFormat.idl
index f10cd415c..5614b6d8d 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormat.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormat.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_TableAutoFormat_idl__
 #define __com_sun_star_sheet_TableAutoFormat_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl b/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
index 318aaa2c2..0036c270a 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_TableAutoFormatEnumeration_idl__
 #define __com_sun_star_sheet_TableAutoFormatEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatField.idl b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
index fbd6a5333..13a824805 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatField.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
@@ -28,41 +28,15 @@
 #ifndef __com_sun_star_sheet_TableAutoFormatField_idl__
 #define __com_sun_star_sheet_TableAutoFormatField_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontSlant_idl__
 #include <com/sun/star/awt/FontSlant.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellHoriJustify_idl__
 #include <com/sun/star/table/CellHoriJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellVertJustify_idl__
 #include <com/sun/star/table/CellVertJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellOrientation_idl__
 #include <com/sun/star/table/CellOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableBorder_idl__
 #include <com/sun/star/table/TableBorder.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableAutoFormats.idl b/offapi/com/sun/star/sheet/TableAutoFormats.idl
index 25d5c4ccf..1549330e6 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormats.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormats.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_TableAutoFormats_idl__
 #define __com_sun_star_sheet_TableAutoFormats_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl b/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
index fdb6e7d27..6560e66e9 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_TableAutoFormatsEnumeration_idl__
 #define __com_sun_star_sheet_TableAutoFormatsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableCellStyle.idl b/offapi/com/sun/star/sheet/TableCellStyle.idl
index 09d996be2..8dd181e45 100644
--- a/offapi/com/sun/star/sheet/TableCellStyle.idl
+++ b/offapi/com/sun/star/sheet/TableCellStyle.idl
@@ -28,29 +28,12 @@
 #ifndef __com_sun_star_sheet_TableCellStyle_idl__
 #define __com_sun_star_sheet_TableCellStyle_idl__
 
-#ifndef __com_sun_star_table_CellProperties_idl__
 #include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CellStyle_idl__
 #include <com/sun/star/style/CellStyle.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableConditionalEntry.idl b/offapi/com/sun/star/sheet/TableConditionalEntry.idl
index 5fd74a77d..9487b6219 100644
--- a/offapi/com/sun/star/sheet/TableConditionalEntry.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalEntry.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_TableConditionalEntry_idl__
 #define __com_sun_star_sheet_TableConditionalEntry_idl__
 
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
 #include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetConditionalEntry_idl__
 #include <com/sun/star/sheet/XSheetConditionalEntry.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl b/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
index 4221ba8c8..fa20deba3 100644
--- a/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_TableConditionalEntryEnumeration_idl__
 #define __com_sun_star_sheet_TableConditionalEntryEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableConditionalFormat.idl b/offapi/com/sun/star/sheet/TableConditionalFormat.idl
index 473237f29..ac68d158d 100644
--- a/offapi/com/sun/star/sheet/TableConditionalFormat.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalFormat.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_sheet_TableConditionalFormat_idl__
 #define __com_sun_star_sheet_TableConditionalFormat_idl__
 
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
 #include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TablePageStyle.idl b/offapi/com/sun/star/sheet/TablePageStyle.idl
index 68b4baf4e..377c649f3 100644
--- a/offapi/com/sun/star/sheet/TablePageStyle.idl
+++ b/offapi/com/sun/star/sheet/TablePageStyle.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_TablePageStyle_idl__
 #define __com_sun_star_sheet_TablePageStyle_idl__
 
-#ifndef __com_sun_star_style_PageStyle_idl__
 #include <com/sun/star/style/PageStyle.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
 #include <com/sun/star/sheet/XHeaderFooterContent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableValidation.idl b/offapi/com/sun/star/sheet/TableValidation.idl
index 41ddbba00..41b954f1c 100644
--- a/offapi/com/sun/star/sheet/TableValidation.idl
+++ b/offapi/com/sun/star/sheet/TableValidation.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_TableValidation_idl__
 #define __com_sun_star_sheet_TableValidation_idl__
 
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
 #include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ValidationType_idl__
 #include <com/sun/star/sheet/ValidationType.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ValidationAlertStyle_idl__
 #include <com/sun/star/sheet/ValidationAlertStyle.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl b/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
index 3e25e0ea2..c1c10763e 100644
--- a/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
+++ b/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_UniqueCellFormatRanges_idl__
 #define __com_sun_star_sheet_UniqueCellFormatRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl b/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
index 8f04a6971..92a4003ac 100644
--- a/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_UniqueCellFormatRangesEnumeration_idl__
 #define __com_sun_star_sheet_UniqueCellFormatRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/VolatileResult.idl b/offapi/com/sun/star/sheet/VolatileResult.idl
index 3c6cff1d8..aade7509a 100644
--- a/offapi/com/sun/star/sheet/VolatileResult.idl
+++ b/offapi/com/sun/star/sheet/VolatileResult.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_VolatileResult_idl__
 #define __com_sun_star_sheet_VolatileResult_idl__
 
-#ifndef __com_sun_star_sheet_XVolatileResult_idl__
 #include <com/sun/star/sheet/XVolatileResult.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XActivationBroadcaster.idl b/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
index 3e58f608e..db8278816 100644
--- a/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
+++ b/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XActivationBroadcaster_idl__
 #define __com_sun_star_sheet_XActivationBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XActivationEventListener_idl__
 #include <com/sun/star/sheet/XActivationEventListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XActivationEventListener.idl b/offapi/com/sun/star/sheet/XActivationEventListener.idl
index 99786f9db..d8326ba73 100644
--- a/offapi/com/sun/star/sheet/XActivationEventListener.idl
+++ b/offapi/com/sun/star/sheet/XActivationEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XActivationEventListener_idl__
 #define __com_sun_star_sheet_XActivationEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ActivationEvent_idl__
 #include <com/sun/star/sheet/ActivationEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XAddIn.idl b/offapi/com/sun/star/sheet/XAddIn.idl
index b59945941..1d259a52c 100644
--- a/offapi/com/sun/star/sheet/XAddIn.idl
+++ b/offapi/com/sun/star/sheet/XAddIn.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XAddIn_idl__
 #define __com_sun_star_sheet_XAddIn_idl__
 
-#ifndef __com_sun_star_lang_XLocalizable_idl__
 #include <com/sun/star/lang/XLocalizable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XAreaLink.idl b/offapi/com/sun/star/sheet/XAreaLink.idl
index 31ad7a518..b497d9c38 100644
--- a/offapi/com/sun/star/sheet/XAreaLink.idl
+++ b/offapi/com/sun/star/sheet/XAreaLink.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XAreaLink_idl__
 #define __com_sun_star_sheet_XAreaLink_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XAreaLinks.idl b/offapi/com/sun/star/sheet/XAreaLinks.idl
index 89e788ba5..608f12b94 100644
--- a/offapi/com/sun/star/sheet/XAreaLinks.idl
+++ b/offapi/com/sun/star/sheet/XAreaLinks.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XAreaLinks_idl__
 #define __com_sun_star_sheet_XAreaLinks_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XArrayFormulaRange.idl b/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
index 07631618f..ab2d82a2e 100644
--- a/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
+++ b/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XArrayFormulaRange_idl__
 #define __com_sun_star_sheet_XArrayFormulaRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl b/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
index cc39d1219..239a22623 100644
--- a/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XArrayFormulaTokens_idl__
 #define __com_sun_star_sheet_XArrayFormulaTokens_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
 #include <com/sun/star/sheet/FormulaToken.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCalculatable.idl b/offapi/com/sun/star/sheet/XCalculatable.idl
index f5a0bb751..27f27934e 100644
--- a/offapi/com/sun/star/sheet/XCalculatable.idl
+++ b/offapi/com/sun/star/sheet/XCalculatable.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XCalculatable_idl__
 #define __com_sun_star_sheet_XCalculatable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellAddressable.idl b/offapi/com/sun/star/sheet/XCellAddressable.idl
index 41d98838d..e0d4bab5f 100644
--- a/offapi/com/sun/star/sheet/XCellAddressable.idl
+++ b/offapi/com/sun/star/sheet/XCellAddressable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XCellAddressable_idl__
 #define __com_sun_star_sheet_XCellAddressable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl b/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
index ca743a35d..fe99ffe7b 100644
--- a/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
 #define __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangeAddressable.idl b/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
index cc921f5f5..a41da0129 100644
--- a/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XCellRangeAddressable_idl__
 #define __com_sun_star_sheet_XCellRangeAddressable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangeData.idl b/offapi/com/sun/star/sheet/XCellRangeData.idl
index 62a85c7e6..6da4dfe03 100644
--- a/offapi/com/sun/star/sheet/XCellRangeData.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeData.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_XCellRangeData_idl__
 #define __com_sun_star_sheet_XCellRangeData_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sheet {
diff --git a/offapi/com/sun/star/sheet/XCellRangeFormula.idl b/offapi/com/sun/star/sheet/XCellRangeFormula.idl
index 5c396f8b0..2941cd508 100644
--- a/offapi/com/sun/star/sheet/XCellRangeFormula.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeFormula.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XCellRangeFormula_idl__
 #define __com_sun_star_sheet_XCellRangeFormula_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangeMovement.idl b/offapi/com/sun/star/sheet/XCellRangeMovement.idl
index 8cb34b781..a0dc62cf7 100644
--- a/offapi/com/sun/star/sheet/XCellRangeMovement.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeMovement.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_XCellRangeMovement_idl__
 #define __com_sun_star_sheet_XCellRangeMovement_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellInsertMode_idl__
 #include <com/sun/star/sheet/CellInsertMode.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellDeleteMode_idl__
 #include <com/sun/star/sheet/CellDeleteMode.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangeReferrer.idl b/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
index 027e0dc54..9773d081e 100644
--- a/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
 #define __com_sun_star_sheet_XCellRangeReferrer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangesAccess.idl b/offapi/com/sun/star/sheet/XCellRangesAccess.idl
index dc0b03de7..73db5ec51 100644
--- a/offapi/com/sun/star/sheet/XCellRangesAccess.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesAccess.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_XCellRangesAccess_idl__
 #define __com_sun_star_sheet_XCellRangesAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangesQuery.idl b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
index 43d2d6733..2f633a2c5 100644
--- a/offapi/com/sun/star/sheet/XCellRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XCellRangesQuery_idl__
 #define __com_sun_star_sheet_XCellRangesQuery_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
 #include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellSeries.idl b/offapi/com/sun/star/sheet/XCellSeries.idl
index 72a15a841..9828c7fc4 100644
--- a/offapi/com/sun/star/sheet/XCellSeries.idl
+++ b/offapi/com/sun/star/sheet/XCellSeries.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XCellSeries_idl__
 #define __com_sun_star_sheet_XCellSeries_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillDirection_idl__
 #include <com/sun/star/sheet/FillDirection.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillMode_idl__
 #include <com/sun/star/sheet/FillMode.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillDateMode_idl__
 #include <com/sun/star/sheet/FillDateMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCompatibilityNames.idl b/offapi/com/sun/star/sheet/XCompatibilityNames.idl
index 3835d6849..700ecbc5e 100644
--- a/offapi/com/sun/star/sheet/XCompatibilityNames.idl
+++ b/offapi/com/sun/star/sheet/XCompatibilityNames.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XCompatibilityNames_idl__
 #define __com_sun_star_sheet_XCompatibilityNames_idl__
 
-#ifndef __com_sun_star_sheet_LocalizedName_idl__
 #include <com/sun/star/sheet/LocalizedName.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XConsolidatable.idl b/offapi/com/sun/star/sheet/XConsolidatable.idl
index e4c9ae526..8301b2f28 100644
--- a/offapi/com/sun/star/sheet/XConsolidatable.idl
+++ b/offapi/com/sun/star/sheet/XConsolidatable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XConsolidatable_idl__
 #define __com_sun_star_sheet_XConsolidatable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
 #include <com/sun/star/sheet/XConsolidationDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl b/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
index 1cbda36d5..13e8a64ae 100644
--- a/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
 #define __com_sun_star_sheet_XConsolidationDescriptor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDDELink.idl b/offapi/com/sun/star/sheet/XDDELink.idl
index 0916c0978..30d74541a 100644
--- a/offapi/com/sun/star/sheet/XDDELink.idl
+++ b/offapi/com/sun/star/sheet/XDDELink.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XDDELink_idl__
 #define __com_sun_star_sheet_XDDELink_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDDELinkResults.idl b/offapi/com/sun/star/sheet/XDDELinkResults.idl
index f342b5e55..cd9ab7e71 100644
--- a/offapi/com/sun/star/sheet/XDDELinkResults.idl
+++ b/offapi/com/sun/star/sheet/XDDELinkResults.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XDDELinkResults_idl__
 #define __com_sun_star_sheet_XDDELinkResults_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDDELinks.idl b/offapi/com/sun/star/sheet/XDDELinks.idl
index 58ccf8511..1d763f327 100644
--- a/offapi/com/sun/star/sheet/XDDELinks.idl
+++ b/offapi/com/sun/star/sheet/XDDELinks.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XDDELinks_idl__
 #define __com_sun_star_sheet_XDDELinks_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELink_idl__
 #include <com/sun/star/sheet/XDDELink.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DDELinkMode_idl__
 #include <com/sun/star/sheet/DDELinkMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl b/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
index c0fa95086..1db69f841 100644
--- a/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
 #define __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
 
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
 #include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl b/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
index 7832205b0..3ae62b39c 100644
--- a/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
 #define __com_sun_star_sheet_XDataPilotDescriptor_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 #include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotField.idl b/offapi/com/sun/star/sheet/XDataPilotField.idl
index eb892ee89..2aeb2d20d 100644
--- a/offapi/com/sun/star/sheet/XDataPilotField.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDataPilotField_idl__
 #define __com_sun_star_sheet_XDataPilotField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
index 6a24f4f8f..ee399eaff 100644
--- a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
 #define __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
 #include <com/sun/star/sheet/DataPilotFieldGroupInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl b/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
index 7777b3adb..ddf30892f 100644
--- a/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDataPilotMemberResults_idl__
 #define __com_sun_star_sheet_XDataPilotMemberResults_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_MemberResult_idl__
 #include <com/sun/star/sheet/MemberResult.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotResults.idl b/offapi/com/sun/star/sheet/XDataPilotResults.idl
index 9a5f0629f..93b9db935 100644
--- a/offapi/com/sun/star/sheet/XDataPilotResults.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotResults.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDataPilotResults_idl__
 #define __com_sun_star_sheet_XDataPilotResults_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataResult_idl__
 #include <com/sun/star/sheet/DataResult.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotTable.idl b/offapi/com/sun/star/sheet/XDataPilotTable.idl
index 6613e722c..371b0c134 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDataPilotTable_idl__
 #define __com_sun_star_sheet_XDataPilotTable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotTable2.idl b/offapi/com/sun/star/sheet/XDataPilotTable2.idl
index 6d50b6f1a..2a5815df0 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTable2.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTable2.idl
@@ -28,30 +28,12 @@
 #ifndef __com_sun_star_sheet_XDataPilotTable2_idl__
 #define __com_sun_star_sheet_XDataPilotTable2_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTable_idl__
 #include <com/sun/star/sheet/XDataPilotTable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotOutputRangeType_idl__
 #include <com/sun/star/sheet/DataPilotOutputRangeType.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldFilter_idl__
 #include <com/sun/star/sheet/DataPilotFieldFilter.idl>
-#endif
-
 #include <com/sun/star/sheet/DataPilotTablePositionData.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotTables.idl b/offapi/com/sun/star/sheet/XDataPilotTables.idl
index aab35d542..324221f78 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTables.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTables.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XDataPilotTables_idl__
 #define __com_sun_star_sheet_XDataPilotTables_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
 #include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl b/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
index 68ecd3657..ed4d701b4 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
 #define __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTables_idl__
 #include <com/sun/star/sheet/XDataPilotTables.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDatabaseRange.idl b/offapi/com/sun/star/sheet/XDatabaseRange.idl
index f9a245d1d..b39f174de 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRange.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_XDatabaseRange_idl__
 #define __com_sun_star_sheet_XDatabaseRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 #include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
 #include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDatabaseRanges.idl b/offapi/com/sun/star/sheet/XDatabaseRanges.idl
index 3ba23bec4..2872465c2 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRanges.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
 #define __com_sun_star_sheet_XDatabaseRanges_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDimensionsSupplier.idl b/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
index 40bcd69b0..e9dd53cbc 100644
--- a/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDimensionsSupplier_idl__
 #define __com_sun_star_sheet_XDimensionsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDocumentAuditing.idl b/offapi/com/sun/star/sheet/XDocumentAuditing.idl
index b62610384..2884043a2 100644
--- a/offapi/com/sun/star/sheet/XDocumentAuditing.idl
+++ b/offapi/com/sun/star/sheet/XDocumentAuditing.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XDocumentAuditing_idl__
 #define __com_sun_star_sheet_XDocumentAuditing_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
index 545f4ba85..ed675cf01 100644
--- a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XDrillDownDataSupplier_idl__
 #define __com_sun_star_sheet_XDrillDownDataSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldFilter_idl__
 #include <com/sun/star/sheet/DataPilotFieldFilter.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl b/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
index 94569c8c5..21b7a57ed 100644
--- a/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
+++ b/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
 #define __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XEnhancedMouseClickHandler_idl__
 #include <com/sun/star/awt/XEnhancedMouseClickHandler.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XExternalSheetName.idl b/offapi/com/sun/star/sheet/XExternalSheetName.idl
index 8cbad974a..7ffce0a69 100644
--- a/offapi/com/sun/star/sheet/XExternalSheetName.idl
+++ b/offapi/com/sun/star/sheet/XExternalSheetName.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XExternalSheetName_idl__
 #define __com_sun_star_sheet_XExternalSheetName_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl> 
-#endif 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XFillAcrossSheet.idl b/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
index 6a71ae5c1..d67c0ccc6 100644
--- a/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
+++ b/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XFillAcrossSheet_idl__
 #define __com_sun_star_sheet_XFillAcrossSheet_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
index 92a74ada9..b1230f494 100644
--- a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
+++ b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XFormulaOpCodeMapper_idl__
 #define __com_sun_star_sheet_XFormulaOpCodeMapper_idl__
 
-#ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -44,7 +39,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** gives access to spreadsheet compiler token interns.
  */
-interface XFormulaOpCodeMapper
+published interface XFormulaOpCodeMapper
 {
     //-------------------------------------------------------------------------
 
@@ -145,10 +140,6 @@ interface XFormulaOpCodeMapper
 
 //=============================================================================
 
-service FormulaOpCodeMapper : XFormulaOpCodeMapper;
-
-//=============================================================================
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/sheet/XFormulaParser.idl b/offapi/com/sun/star/sheet/XFormulaParser.idl
index db540bc75..b7bbab984 100644
--- a/offapi/com/sun/star/sheet/XFormulaParser.idl
+++ b/offapi/com/sun/star/sheet/XFormulaParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** converts between text and token representations of formulas.
  */
-interface XFormulaParser
+published interface XFormulaParser
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/XFormulaQuery.idl b/offapi/com/sun/star/sheet/XFormulaQuery.idl
index 8185d23b7..f98805694 100644
--- a/offapi/com/sun/star/sheet/XFormulaQuery.idl
+++ b/offapi/com/sun/star/sheet/XFormulaQuery.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XFormulaQuery_idl__
 #define __com_sun_star_sheet_XFormulaQuery_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
 #include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XFormulaTokens.idl b/offapi/com/sun/star/sheet/XFormulaTokens.idl
index 3b48ef349..3bf172e86 100644
--- a/offapi/com/sun/star/sheet/XFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XFormulaTokens.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XFormulaTokens_idl__
 #define __com_sun_star_sheet_XFormulaTokens_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
 #include <com/sun/star/sheet/FormulaToken.idl>
-#endif
 
 //=============================================================================
 
@@ -44,7 +39,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** gives access to a formula as token sequence.
  */
-interface XFormulaTokens
+published interface XFormulaTokens
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/XFunctionAccess.idl b/offapi/com/sun/star/sheet/XFunctionAccess.idl
index a66785150..439af6086 100644
--- a/offapi/com/sun/star/sheet/XFunctionAccess.idl
+++ b/offapi/com/sun/star/sheet/XFunctionAccess.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XFunctionAccess_idl__
 #define __com_sun_star_sheet_XFunctionAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XFunctionDescriptions.idl b/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
index 7e748ce56..624f26c8e 100644
--- a/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
+++ b/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XFunctionDescriptions_idl__
 #define __com_sun_star_sheet_XFunctionDescriptions_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XGoalSeek.idl b/offapi/com/sun/star/sheet/XGoalSeek.idl
index c3a7e0d31..616f507a9 100644
--- a/offapi/com/sun/star/sheet/XGoalSeek.idl
+++ b/offapi/com/sun/star/sheet/XGoalSeek.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XGoalSeek_idl__
 #define __com_sun_star_sheet_XGoalSeek_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GoalResult_idl__
 #include <com/sun/star/sheet/GoalResult.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XHeaderFooterContent.idl b/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
index bc2380751..7a13ef4fd 100644
--- a/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
+++ b/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
 #define __com_sun_star_sheet_XHeaderFooterContent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl b/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
index c28bd5222..01f856fcc 100644
--- a/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XHierarchiesSupplier_idl__
 #define __com_sun_star_sheet_XHierarchiesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XLabelRange.idl b/offapi/com/sun/star/sheet/XLabelRange.idl
index 7a6e771ac..cbabb22a0 100644
--- a/offapi/com/sun/star/sheet/XLabelRange.idl
+++ b/offapi/com/sun/star/sheet/XLabelRange.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XLabelRange_idl__
 #define __com_sun_star_sheet_XLabelRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XLabelRanges.idl b/offapi/com/sun/star/sheet/XLabelRanges.idl
index b4e4ceb5a..4d74e67ae 100644
--- a/offapi/com/sun/star/sheet/XLabelRanges.idl
+++ b/offapi/com/sun/star/sheet/XLabelRanges.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XLabelRanges_idl__
 #define __com_sun_star_sheet_XLabelRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XLevelsSupplier.idl b/offapi/com/sun/star/sheet/XLevelsSupplier.idl
index 1224b49cd..62bb5e803 100644
--- a/offapi/com/sun/star/sheet/XLevelsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XLevelsSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XLevelsSupplier_idl__
 #define __com_sun_star_sheet_XLevelsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XMembersSupplier.idl b/offapi/com/sun/star/sheet/XMembersSupplier.idl
index 87f466496..ac91c4998 100644
--- a/offapi/com/sun/star/sheet/XMembersSupplier.idl
+++ b/offapi/com/sun/star/sheet/XMembersSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XMembersSupplier_idl__
 #define __com_sun_star_sheet_XMembersSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
index d60272ba0..b9582e72a 100644
--- a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XMultiFormulaTokens_idl__
 #define __com_sun_star_sheet_XMultiFormulaTokens_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
 #include <com/sun/star/sheet/FormulaToken.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XMultipleOperation.idl b/offapi/com/sun/star/sheet/XMultipleOperation.idl
index 962fb8110..e4600f434 100644
--- a/offapi/com/sun/star/sheet/XMultipleOperation.idl
+++ b/offapi/com/sun/star/sheet/XMultipleOperation.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XMultipleOperation_idl__
 #define __com_sun_star_sheet_XMultipleOperation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TableOperationMode_idl__
 #include <com/sun/star/sheet/TableOperationMode.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XNamedRange.idl b/offapi/com/sun/star/sheet/XNamedRange.idl
index 528198b83..07ff2391f 100644
--- a/offapi/com/sun/star/sheet/XNamedRange.idl
+++ b/offapi/com/sun/star/sheet/XNamedRange.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XNamedRange_idl__
 #define __com_sun_star_sheet_XNamedRange_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XNamedRanges.idl b/offapi/com/sun/star/sheet/XNamedRanges.idl
index ed0bef17c..775d72b8f 100644
--- a/offapi/com/sun/star/sheet/XNamedRanges.idl
+++ b/offapi/com/sun/star/sheet/XNamedRanges.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XNamedRanges_idl__
 #define __com_sun_star_sheet_XNamedRanges_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_Border_idl__
 #include <com/sun/star/sheet/Border.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XPrintAreas.idl b/offapi/com/sun/star/sheet/XPrintAreas.idl
index 82f2d3a41..f7fda04ec 100644
--- a/offapi/com/sun/star/sheet/XPrintAreas.idl
+++ b/offapi/com/sun/star/sheet/XPrintAreas.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XPrintAreas_idl__
 #define __com_sun_star_sheet_XPrintAreas_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XRangeSelection.idl b/offapi/com/sun/star/sheet/XRangeSelection.idl
index 2c1089051..567380a16 100644
--- a/offapi/com/sun/star/sheet/XRangeSelection.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XRangeSelection_idl__ 
 #define __com_sun_star_sheet_XRangeSelection_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl b/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
index 575c6a14f..8214065b3 100644
--- a/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XRangeSelectionChangeListener_idl__ 
 #define __com_sun_star_sheet_XRangeSelectionChangeListener_idl__ 
 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
-
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__ 
 #include <com/sun/star/sheet/RangeSelectionEvent.idl> 
-#endif
  
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/sheet/XRangeSelectionListener.idl b/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
index 6e676c07e..e69a90515 100644
--- a/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XRangeSelectionListener_idl__ 
 #define __com_sun_star_sheet_XRangeSelectionListener_idl__ 
 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
-
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__ 
 #include <com/sun/star/sheet/RangeSelectionEvent.idl> 
-#endif
  
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/sheet/XRecentFunctions.idl b/offapi/com/sun/star/sheet/XRecentFunctions.idl
index 04f647e3a..1b4a62b7b 100644
--- a/offapi/com/sun/star/sheet/XRecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/XRecentFunctions.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XRecentFunctions_idl__
 #define __com_sun_star_sheet_XRecentFunctions_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XResultListener.idl b/offapi/com/sun/star/sheet/XResultListener.idl
index 682c612d7..4ed59dff1 100644
--- a/offapi/com/sun/star/sheet/XResultListener.idl
+++ b/offapi/com/sun/star/sheet/XResultListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XResultListener_idl__
 #define __com_sun_star_sheet_XResultListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ResultEvent_idl__
 #include <com/sun/star/sheet/ResultEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XScenario.idl b/offapi/com/sun/star/sheet/XScenario.idl
index 96b573893..dbf817bd7 100644
--- a/offapi/com/sun/star/sheet/XScenario.idl
+++ b/offapi/com/sun/star/sheet/XScenario.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XScenario_idl__
 #define __com_sun_star_sheet_XScenario_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenarioEnhanced.idl b/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
index 2aae00c99..3689e5622 100644
--- a/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
+++ b/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XScenarioEnhanced_idl__
 #define __com_sun_star_sheet_XScenarioEnhanced_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenarios.idl b/offapi/com/sun/star/sheet/XScenarios.idl
index 9b8edf222..fa736bee0 100644
--- a/offapi/com/sun/star/sheet/XScenarios.idl
+++ b/offapi/com/sun/star/sheet/XScenarios.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XScenarios_idl__
 #define __com_sun_star_sheet_XScenarios_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XScenariosSupplier.idl b/offapi/com/sun/star/sheet/XScenariosSupplier.idl
index 8308e1b05..5ed5e8a65 100644
--- a/offapi/com/sun/star/sheet/XScenariosSupplier.idl
+++ b/offapi/com/sun/star/sheet/XScenariosSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
 #define __com_sun_star_sheet_XScenariosSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenarios_idl__
 #include <com/sun/star/sheet/XScenarios.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotation.idl b/offapi/com/sun/star/sheet/XSheetAnnotation.idl
index b3a332dc0..88ef8fb27 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotation.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotation.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
 #define __com_sun_star_sheet_XSheetAnnotation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl b/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
index 726e3b5c1..16a787bcd 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
 #define __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
 #include <com/sun/star/sheet/XSheetAnnotation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl b/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
index c54adf9ce..574a5d6c2 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
 #define __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotations.idl b/offapi/com/sun/star/sheet/XSheetAnnotations.idl
index 0d9c6f088..7f5b457c6 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotations.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotations.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
 #define __com_sun_star_sheet_XSheetAnnotations_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl b/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
index 372130480..ed5eae659 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
 #define __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
 #include <com/sun/star/sheet/XSheetAnnotations.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAuditing.idl b/offapi/com/sun/star/sheet/XSheetAuditing.idl
index 3e0e30bdf..045e76100 100644
--- a/offapi/com/sun/star/sheet/XSheetAuditing.idl
+++ b/offapi/com/sun/star/sheet/XSheetAuditing.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAuditing_idl__
 #define __com_sun_star_sheet_XSheetAuditing_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCellCursor.idl b/offapi/com/sun/star/sheet/XSheetCellCursor.idl
index c9d0a4795..4f6094320 100644
--- a/offapi/com/sun/star/sheet/XSheetCellCursor.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellCursor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSheetCellCursor_idl__
 #define __com_sun_star_sheet_XSheetCellCursor_idl__
 
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
 #include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCellRange.idl b/offapi/com/sun/star/sheet/XSheetCellRange.idl
index 0d7b403bc..891480002 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRange.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSheetCellRange_idl__
 #define __com_sun_star_sheet_XSheetCellRange_idl__
 
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl b/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
index e77e3b4fb..b2b30f69f 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XSheetCellRangeContainer_idl__
 #define __com_sun_star_sheet_XSheetCellRangeContainer_idl__
 
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
 #include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCellRanges.idl b/offapi/com/sun/star/sheet/XSheetCellRanges.idl
index 527fe521e..9e967905c 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRanges.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
 #define __com_sun_star_sheet_XSheetCellRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCondition.idl b/offapi/com/sun/star/sheet/XSheetCondition.idl
index 4a7e81850..63d55af35 100644
--- a/offapi/com/sun/star/sheet/XSheetCondition.idl
+++ b/offapi/com/sun/star/sheet/XSheetCondition.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XSheetCondition_idl__
 #define __com_sun_star_sheet_XSheetCondition_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ConditionOperator_idl__
 #include <com/sun/star/sheet/ConditionOperator.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCondition2.idl b/offapi/com/sun/star/sheet/XSheetCondition2.idl
index 3c78f16e5..d03a79f0c 100644
--- a/offapi/com/sun/star/sheet/XSheetCondition2.idl
+++ b/offapi/com/sun/star/sheet/XSheetCondition2.idl
@@ -29,21 +29,10 @@
 #ifndef __com_sun_star_sheet_XSheetCondition2_idl__
 #define __com_sun_star_sheet_XSheetCondition2_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ConditionOperator2_idl__
 #include <com/sun/star/sheet/ConditionOperator2.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
 #include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl b/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
index c6f1489d1..9d26cca12 100644
--- a/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
+++ b/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
 #define __com_sun_star_sheet_XSheetConditionalEntries_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl b/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
index d2fe33a28..50935c930 100644
--- a/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
+++ b/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSheetConditionalEntry_idl__
 #define __com_sun_star_sheet_XSheetConditionalEntry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetFilterable.idl b/offapi/com/sun/star/sheet/XSheetFilterable.idl
index 4daaebcaa..75551609d 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterable.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetFilterable_idl__
 #define __com_sun_star_sheet_XSheetFilterable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 #include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetFilterableEx.idl b/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
index 536e81483..8ea333ed9 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XSheetFilterableEx_idl__
 #define __com_sun_star_sheet_XSheetFilterableEx_idl__
 
-#ifndef __com_sun_star_sheet_XSheetFilterable_idl__
 #include <com/sun/star/sheet/XSheetFilterable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 #include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetLinkable.idl b/offapi/com/sun/star/sheet/XSheetLinkable.idl
index 732d779ad..806ee6e5c 100644
--- a/offapi/com/sun/star/sheet/XSheetLinkable.idl
+++ b/offapi/com/sun/star/sheet/XSheetLinkable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetLinkable_idl__
 #define __com_sun_star_sheet_XSheetLinkable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetLinkMode_idl__
 #include <com/sun/star/sheet/SheetLinkMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetOperation.idl b/offapi/com/sun/star/sheet/XSheetOperation.idl
index fadd3c80d..3dff21beb 100644
--- a/offapi/com/sun/star/sheet/XSheetOperation.idl
+++ b/offapi/com/sun/star/sheet/XSheetOperation.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XSheetOperation_idl__
 #define __com_sun_star_sheet_XSheetOperation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetOutline.idl b/offapi/com/sun/star/sheet/XSheetOutline.idl
index bed3b6c2a..c1c3d9ee4 100644
--- a/offapi/com/sun/star/sheet/XSheetOutline.idl
+++ b/offapi/com/sun/star/sheet/XSheetOutline.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XSheetOutline_idl__
 #define __com_sun_star_sheet_XSheetOutline_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableOrientation_idl__
 #include <com/sun/star/table/TableOrientation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetPageBreak.idl b/offapi/com/sun/star/sheet/XSheetPageBreak.idl
index c6fd8d0e6..f316307cb 100644
--- a/offapi/com/sun/star/sheet/XSheetPageBreak.idl
+++ b/offapi/com/sun/star/sheet/XSheetPageBreak.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetPageBreak_idl__
 #define __com_sun_star_sheet_XSheetPageBreak_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TablePageBreakData_idl__
 #include <com/sun/star/sheet/TablePageBreakData.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetPastable.idl b/offapi/com/sun/star/sheet/XSheetPastable.idl
index aaff93192..c94ee23da 100644
--- a/offapi/com/sun/star/sheet/XSheetPastable.idl
+++ b/offapi/com/sun/star/sheet/XSheetPastable.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_XSheetPastable_idl__
 #define __com_sun_star_sheet_XSheetPastable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_PasteOperation_idl__
 #include <com/sun/star/sheet/PasteOperation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellInsertMode_idl__
 #include <com/sun/star/sheet/CellInsertMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSolver.idl b/offapi/com/sun/star/sheet/XSolver.idl
index 4d46c39d3..d428038ff 100644
--- a/offapi/com/sun/star/sheet/XSolver.idl
+++ b/offapi/com/sun/star/sheet/XSolver.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSolver_idl__
 #define __com_sun_star_sheet_XSolver_idl__
 
-#ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
 #include <com/sun/star/sheet/XSpreadsheetDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SolverConstraint_idl__
 #include <com/sun/star/sheet/SolverConstraint.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSolverDescription.idl b/offapi/com/sun/star/sheet/XSolverDescription.idl
index 59192dcab..e2c95035d 100644
--- a/offapi/com/sun/star/sheet/XSolverDescription.idl
+++ b/offapi/com/sun/star/sheet/XSolverDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSolverDescription_idl__
 #define __com_sun_star_sheet_XSolverDescription_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSpreadsheet.idl b/offapi/com/sun/star/sheet/XSpreadsheet.idl
index 55b80630f..963047d91 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheet.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSpreadsheet_idl__
 #define __com_sun_star_sheet_XSpreadsheet_idl__
 
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
 #include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl b/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
index 67a1d2edf..81406a693 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
 #define __com_sun_star_sheet_XSpreadsheetDocument_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheets_idl__
 #include <com/sun/star/sheet/XSpreadsheets.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSpreadsheetView.idl b/offapi/com/sun/star/sheet/XSpreadsheetView.idl
index 42568bdf6..461c783fb 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheetView.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheetView.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sheet_XSpreadsheetView_idl__ 
 #define __com_sun_star_sheet_XSpreadsheetView_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__ 
 #include <com/sun/star/sheet/XSpreadsheet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/sheet/XSpreadsheets.idl b/offapi/com/sun/star/sheet/XSpreadsheets.idl
index 1020655bb..2d32c2bbe 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheets.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheets.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSpreadsheets_idl__
 #define __com_sun_star_sheet_XSpreadsheets_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl b/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
index 9ac28744c..cde23955f 100644
--- a/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSubTotalCalculatable_idl__
 #define __com_sun_star_sheet_XSubTotalCalculatable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
 #include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl b/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
index a60134f77..e06c5c245 100644
--- a/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
 #define __com_sun_star_sheet_XSubTotalDescriptor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SubTotalColumn_idl__
 #include <com/sun/star/sheet/SubTotalColumn.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSubTotalField.idl b/offapi/com/sun/star/sheet/XSubTotalField.idl
index 4b69f62c6..402edc780 100644
--- a/offapi/com/sun/star/sheet/XSubTotalField.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSubTotalField_idl__
 #define __com_sun_star_sheet_XSubTotalField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SubTotalColumn_idl__
 #include <com/sun/star/sheet/SubTotalColumn.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl b/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
index d2923ffed..3293a0cba 100644
--- a/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
 #define __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XUsedAreaCursor.idl b/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
index 1a936f9d6..a089e7bf4 100644
--- a/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
+++ b/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XUsedAreaCursor_idl__
 #define __com_sun_star_sheet_XUsedAreaCursor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XViewFreezable.idl b/offapi/com/sun/star/sheet/XViewFreezable.idl
index 2b5409ce8..6608507c0 100644
--- a/offapi/com/sun/star/sheet/XViewFreezable.idl
+++ b/offapi/com/sun/star/sheet/XViewFreezable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_XViewFreezable_idl__ 
 #define __com_sun_star_sheet_XViewFreezable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/sheet/XViewPane.idl b/offapi/com/sun/star/sheet/XViewPane.idl
index 52b175070..1f8002c41 100644
--- a/offapi/com/sun/star/sheet/XViewPane.idl
+++ b/offapi/com/sun/star/sheet/XViewPane.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sheet_XViewPane_idl__ 
 #define __com_sun_star_sheet_XViewPane_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_table_CellRangeAddress_idl__ 
 #include <com/sun/star/table/CellRangeAddress.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/sheet/XViewPanesSupplier.idl b/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
index 38082fee1..29b46629a 100644
--- a/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XViewPanesSupplier_idl__
 #define __com_sun_star_sheet_XViewPanesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XViewSplitable.idl b/offapi/com/sun/star/sheet/XViewSplitable.idl
index 9c7cdf303..09402d198 100644
--- a/offapi/com/sun/star/sheet/XViewSplitable.idl
+++ b/offapi/com/sun/star/sheet/XViewSplitable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_XViewSplitable_idl__ 
 #define __com_sun_star_sheet_XViewSplitable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/sheet/XVolatileResult.idl b/offapi/com/sun/star/sheet/XVolatileResult.idl
index 0926bb0ea..3739d235d 100644
--- a/offapi/com/sun/star/sheet/XVolatileResult.idl
+++ b/offapi/com/sun/star/sheet/XVolatileResult.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XVolatileResult_idl__
 #define __com_sun_star_sheet_XVolatileResult_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XResultListener_idl__
 #include <com/sun/star/sheet/XResultListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/smarttags/XSmartTagAction.idl b/offapi/com/sun/star/smarttags/XSmartTagAction.idl
index e59e927ad..9a6efcbb0 100644
--- a/offapi/com/sun/star/smarttags/XSmartTagAction.idl
+++ b/offapi/com/sun/star/smarttags/XSmartTagAction.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_smarttags_XSmartTagAction_idl__
 #define __com_sun_star_smarttags_XSmartTagAction_idl__
 
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
 #include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl b/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
index b84073cdf..94fa22b89 100644
--- a/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
+++ b/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_smarttags_XSmartTagRecognizer_idl__
 #define __com_sun_star_smarttags_XSmartTagRecognizer_idl__
 
-#ifndef __com_sun_star_uno_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XBreakIterator_idl__
 #include <com/sun/star/i18n/XBreakIterator.idl>
-#endif
-
-#ifndef __com_sun_star_smarttags_SmartTagRecognizerMode_idl__
 #include <com/sun/star/smarttags/SmartTagRecognizerMode.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextMarkup_idl__
 #include <com/sun/star/text/XTextMarkup.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/smarttags/makefile.mk b/offapi/com/sun/star/smarttags/makefile.mk
deleted file mode 100644
index 40d83a298..000000000
--- a/offapi/com/sun/star/smarttags/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=csssmarttags
-PACKAGE=com$/sun$/star$/smarttags
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        SmartTagAction.idl\
-        SmartTagRecognizer.idl\
-        SmartTagRecognizerMode.idl\
-        XSmartTagAction.idl\
-        XSmartTagRecognizer.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/offapi/com/sun/star/style/CellStyle.idl b/offapi/com/sun/star/style/CellStyle.idl
index ad57b46f9..13abc4870 100644
--- a/offapi/com/sun/star/style/CellStyle.idl
+++ b/offapi/com/sun/star/style/CellStyle.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_style_CellStyle_idl__
 #define __com_sun_star_style_CellStyle_idl__
 
-#ifndef __com_sun_star_style_Style_idl__
 #include <com/sun/star/style/Style.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/CharacterProperties.idl b/offapi/com/sun/star/style/CharacterProperties.idl
index 73940e833..5ac606ffa 100644
--- a/offapi/com/sun/star/style/CharacterProperties.idl
+++ b/offapi/com/sun/star/style/CharacterProperties.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_style_CharacterProperties_idl__
 #define __com_sun_star_style_CharacterProperties_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontSlant_idl__
 #include <com/sun/star/awt/FontSlant.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/CharacterPropertiesAsian.idl b/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
index 8184cadc0..f12433619 100644
--- a/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
+++ b/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #define __com_sun_star_style_CharacterPropertiesAsian_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_awt_FontSlant_idl__
 #include <com/sun/star/awt/FontSlant.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/CharacterPropertiesComplex.idl b/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
index 14a24e9ca..6dacf0874 100644
--- a/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
+++ b/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_style_CharacterProperties_Complex_idl__
 #define __com_sun_star_style_CharacterProperties_Complex_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_awt_FontSlant_idl__
 #include <com/sun/star/awt/FontSlant.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/CharacterStyle.idl b/offapi/com/sun/star/style/CharacterStyle.idl
index 236ac0577..de536e02f 100644
--- a/offapi/com/sun/star/style/CharacterStyle.idl
+++ b/offapi/com/sun/star/style/CharacterStyle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_style_CharacterStyle_idl__
 #define __com_sun_star_style_CharacterStyle_idl__
 
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_Style_idl__
 #include <com/sun/star/style/Style.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/NumberingAlignment.idl b/offapi/com/sun/star/style/NumberingAlignment.idl
index 11081a7e0..5e17ec84e 100644
--- a/offapi/com/sun/star/style/NumberingAlignment.idl
+++ b/offapi/com/sun/star/style/NumberingAlignment.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_style_NumberingAlignment_idl__ 
 #define __com_sun_star_style_NumberingAlignment_idl__ 
  
-#ifndef __com_sun_star_style_HorizontalAlignment_idl__ 
 #include <com/sun/star/style/HorizontalAlignment.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/style/NumberingRule.idl b/offapi/com/sun/star/style/NumberingRule.idl
index c3a728042..d884994b0 100644
--- a/offapi/com/sun/star/style/NumberingRule.idl
+++ b/offapi/com/sun/star/style/NumberingRule.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_NumberingRule_idl__ 
 #define __com_sun_star_style_NumberingRule_idl__ 
  
-#ifndef __com_sun_star_style_NumberingAlignment_idl__ 
 #include <com/sun/star/style/NumberingAlignment.idl> 
-#endif 
  
-#ifndef __com_sun_star_style_NumberingLevel_idl__ 
 #include <com/sun/star/style/NumberingLevel.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/style/PageProperties.idl b/offapi/com/sun/star/style/PageProperties.idl
index dc5265e97..17449780d 100644
--- a/offapi/com/sun/star/style/PageProperties.idl
+++ b/offapi/com/sun/star/style/PageProperties.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_style_PageProperties_idl__
 #define __com_sun_star_style_PageProperties_idl__
 
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-
-#ifndef __com_sun_star_style_PageStyleLayout_idl__
 #include <com/sun/star/style/PageStyleLayout.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextColumns_idl__
 #include <com/sun/star/text/XTextColumns.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_text_WritingMode2_idl__
 #include <com/sun/star/text/WritingMode2.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/PageStyle.idl b/offapi/com/sun/star/style/PageStyle.idl
index 2510d81c6..58d470c20 100644
--- a/offapi/com/sun/star/style/PageStyle.idl
+++ b/offapi/com/sun/star/style/PageStyle.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_style_PageStyle_idl__
 #define __com_sun_star_style_PageStyle_idl__
 
-#ifndef __com_sun_star_style_Style_idl__
 #include <com/sun/star/style/Style.idl>
-#endif
-
-#ifndef __com_sun_star_style_PageProperties_idl__
 #include <com/sun/star/style/PageProperties.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl
index ba72ed895..40d1de9fa 100644
--- a/offapi/com/sun/star/style/ParagraphProperties.idl
+++ b/offapi/com/sun/star/style/ParagraphProperties.idl
@@ -27,45 +27,17 @@
 #ifndef __com_sun_star_style_ParagraphProperties_idl__
 #define __com_sun_star_style_ParagraphProperties_idl__
 
-#ifndef __com_sun_star_style_ParagraphAdjust_idl__
 #include <com/sun/star/style/ParagraphAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_style_LineSpacing_idl__
 #include <com/sun/star/style/LineSpacing.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-
-#ifndef __com_sun_star_style_TabStop_idl__
 #include <com/sun/star/style/TabStop.idl>
-#endif
-
-#ifndef __com_sun_star_style_DropCapFormat_idl__
 #include <com/sun/star/style/DropCapFormat.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_style_BreakType_idl__
 #include <com/sun/star/style/BreakType.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/ParagraphStyle.idl b/offapi/com/sun/star/style/ParagraphStyle.idl
index 5d7c6efd1..efe761ae8 100644
--- a/offapi/com/sun/star/style/ParagraphStyle.idl
+++ b/offapi/com/sun/star/style/ParagraphStyle.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_style_ParagraphStyle_idl__
 #define __com_sun_star_style_ParagraphStyle_idl__
 
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_Style_idl__
 #include <com/sun/star/style/Style.idl>
-#endif
-
-#ifndef _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/Style.idl b/offapi/com/sun/star/style/Style.idl
index 9d275c145..faaa67b53 100644
--- a/offapi/com/sun/star/style/Style.idl
+++ b/offapi/com/sun/star/style/Style.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_style_Style_idl__
 #define __com_sun_star_style_Style_idl__
 
-#ifndef __com_sun_star_style_XStyle_idl__
 #include <com/sun/star/style/XStyle.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XMultiPropertyStates_idl__
 #include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/StyleFamilies.idl b/offapi/com/sun/star/style/StyleFamilies.idl
index 708fe6c0b..4542ac029 100644
--- a/offapi/com/sun/star/style/StyleFamilies.idl
+++ b/offapi/com/sun/star/style/StyleFamilies.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_StyleFamilies_idl__ 
 #define __com_sun_star_style_StyleFamilies_idl__ 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/style/StyleFamily.idl b/offapi/com/sun/star/style/StyleFamily.idl
index 17c8d1a7b..1a1e5d539 100644
--- a/offapi/com/sun/star/style/StyleFamily.idl
+++ b/offapi/com/sun/star/style/StyleFamily.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_StyleFamily_idl__ 
 #define __com_sun_star_style_StyleFamily_idl__ 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/style/TabStop.idl b/offapi/com/sun/star/style/TabStop.idl
index 5300dcca2..acdd8b5f2 100644
--- a/offapi/com/sun/star/style/TabStop.idl
+++ b/offapi/com/sun/star/style/TabStop.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_style_TabStop_idl__ 
 #define __com_sun_star_style_TabStop_idl__ 
  
-#ifndef __com_sun_star_style_TabAlign_idl__ 
 #include <com/sun/star/style/TabAlign.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/style/XAutoStyle.idl b/offapi/com/sun/star/style/XAutoStyle.idl
index 400d0685e..8cb60a9e5 100644
--- a/offapi/com/sun/star/style/XAutoStyle.idl
+++ b/offapi/com/sun/star/style/XAutoStyle.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_style_XAutoStyle_idl__
 #define __com_sun_star_style_XAutoStyle_idl__
 
-#ifndef __com_sun_star_style_XStyle_idl__
 #include <com/sun/star/style/XStyle.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XMultiPropertyStates_idl__
 #include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/style/XAutoStyleFamily.idl b/offapi/com/sun/star/style/XAutoStyleFamily.idl
index 2ec3158b9..9abff3376 100644
--- a/offapi/com/sun/star/style/XAutoStyleFamily.idl
+++ b/offapi/com/sun/star/style/XAutoStyleFamily.idl
@@ -26,16 +26,10 @@
  ************************************************************************/
 #ifndef __com_sun_star_style_XAutoStyleFamily_idl__ 
 #define __com_sun_star_style_XAutoStyleFamily_idl__
-#ifndef __com_sun_star_style_XAutoStyle_idl__
 #include <com/sun/star/style/XAutoStyle.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/style/XAutoStyles.idl b/offapi/com/sun/star/style/XAutoStyles.idl
index b63d0b6d5..a5b67733f 100644
--- a/offapi/com/sun/star/style/XAutoStyles.idl
+++ b/offapi/com/sun/star/style/XAutoStyles.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_XAutoStyles_idl__ 
 #define __com_sun_star_style_XAutoStyles_idl__ 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/style/XAutoStylesSupplier.idl b/offapi/com/sun/star/style/XAutoStylesSupplier.idl
index 141a2785e..b0730450c 100644
--- a/offapi/com/sun/star/style/XAutoStylesSupplier.idl
+++ b/offapi/com/sun/star/style/XAutoStylesSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_style_XAutoStylesSupplier_idl__
 #define __com_sun_star_style_XAutoStylesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_style_XAutoStyles_idl__
 #include <com/sun/star/style/XAutoStyles.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/XDefaultsSupplier.idl b/offapi/com/sun/star/style/XDefaultsSupplier.idl
index 25b767ce0..22baa247e 100644
--- a/offapi/com/sun/star/style/XDefaultsSupplier.idl
+++ b/offapi/com/sun/star/style/XDefaultsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_XDefaultsSupplier_idl__ 
 #define __com_sun_star_style_XDefaultsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/style/XStyle.idl b/offapi/com/sun/star/style/XStyle.idl
index bf5d5d568..342d9c1a6 100644
--- a/offapi/com/sun/star/style/XStyle.idl
+++ b/offapi/com/sun/star/style/XStyle.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_XStyle_idl__ 
 #define __com_sun_star_style_XStyle_idl__ 
  
-#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/style/XStyleCondition.idl b/offapi/com/sun/star/style/XStyleCondition.idl
index c159de9fe..cddc869a2 100644
--- a/offapi/com/sun/star/style/XStyleCondition.idl
+++ b/offapi/com/sun/star/style/XStyleCondition.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_style_XStyleCondition_idl__ 
 #define __com_sun_star_style_XStyleCondition_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl b/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
index 0e6fb1d75..3e3a71fde 100644
--- a/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
+++ b/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__ 
 #define __com_sun_star_style_XStyleFamiliesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/style/XStyleLoader.idl b/offapi/com/sun/star/style/XStyleLoader.idl
index cc668028f..0d9711c12 100644
--- a/offapi/com/sun/star/style/XStyleLoader.idl
+++ b/offapi/com/sun/star/style/XStyleLoader.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_style_XStyleLoader_idl__
 #define __com_sun_star_style_XStyleLoader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/XStyleSupplier.idl b/offapi/com/sun/star/style/XStyleSupplier.idl
new file mode 100644
index 000000000..cfc4d34ca
--- /dev/null
+++ b/offapi/com/sun/star/style/XStyleSupplier.idl
@@ -0,0 +1,75 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef com_sun_star_style_XStyleSupplier_idl
+#define com_sun_star_style_XStyleSupplier_idl
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+#ifndef __com_sun_star_style_XStyle_idl__
+#include <com/sun/star/style/XStyle.idl>
+#endif
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+module com
+{
+module sun
+{
+module star
+{
+module style
+{
+
+interface XStyleSupplier : ::com::sun::star::uno::XInterface
+{
+    /** get the currently set style.
+
+        @return the style.  If no style was set, the returned object
+                may be empty (null).  Otherwise, the returned object
+                must support the service
+                <type>PropertyTemplate</type>.
+     */
+    ::com::sun::star::style::XStyle getStyle();
+
+    /** @param xStyle If you want to remove an existing style, you can
+               set an empty (null) object.  Otherwise, the object
+               given must support the service
+               <type>PropertyTemplate</type>.
+     */
+    void setStyle( [in] ::com::sun::star::style::XStyle xStyle )
+        raises( com::sun::star::lang::IllegalArgumentException );
+};
+
+} ; // style
+} ; // com
+} ; // sun
+} ; // star
+
+
+#endif
diff --git a/offapi/com/sun/star/svg/XSVGPrinter.idl b/offapi/com/sun/star/svg/XSVGPrinter.idl
index e21196873..7c867e790 100644
--- a/offapi/com/sun/star/svg/XSVGPrinter.idl
+++ b/offapi/com/sun/star/svg/XSVGPrinter.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync_XSVGPrinter_idl__ 
 #define __com_sun_star_sync_XSVGPrinter_idl__ 
  
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XDocumentHandler.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/svg/XSVGWriter.idl b/offapi/com/sun/star/svg/XSVGWriter.idl
index d856c3a76..af9effeef 100644
--- a/offapi/com/sun/star/svg/XSVGWriter.idl
+++ b/offapi/com/sun/star/svg/XSVGWriter.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync_XSVGWriter_idl__ 
 #define __com_sun_star_sync_XSVGWriter_idl__ 
  
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XDocumentHandler.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/svg/makefile.mk b/offapi/com/sun/star/svg/makefile.mk
deleted file mode 100644
index 7f5f04526..000000000
--- a/offapi/com/sun/star/svg/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssvg
-PACKAGE=com$/sun$/star$/svg
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XSVGPrinter.idl\
-    XSVGWriter.idl	
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/sal/systools/win32/uwinapi/CheckTokenMembership.cpp b/offapi/com/sun/star/sync/FilterData.idl
index e94dfd5e4..0ecb9f2b0 100644
--- a/sal/systools/win32/uwinapi/CheckTokenMembership.cpp
+++ b/offapi/com/sun/star/sync/FilterData.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,12 +25,17 @@
  *
  ************************************************************************/
 
-#if defined(_MSC_VER) && (_MSC_VER>=1400)
-#pragma warning(disable : 4273)
-#endif
-#include "macros.h"
+#ifndef __com_sun_star_sync_FilterData_idl__
+#define __com_sun_star_sync_FilterData_idl__
+
+//=============================================================================
 
+module com {  module sun {  module star {  module sync {
 
-DEFINE_DEFAULT_THUNK( advapi32, TRYLOAD, BOOL, WINAPI, CheckTokenMembership, (HANDLE TokenHandle, PSID SidToCheck, PBOOL IsMember) )
+published typedef sequence< string > FilterData;
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/sync/SyncCollector.idl b/offapi/com/sun/star/sync/SyncCollector.idl
index 5a1e4b804..58f865771 100644
--- a/offapi/com/sun/star/sync/SyncCollector.idl
+++ b/offapi/com/sun/star/sync/SyncCollector.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync_SyncCollector_idl__ 
 #define __com_sun_star_sync_SyncCollector_idl__ 
  
-#ifndef __com_sun_star_sync_XSyncCollector_idl__ 
 #include <com/sun/star/sync/XSyncCollector.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sync/SyncInfo.idl b/offapi/com/sun/star/sync/SyncInfo.idl
index 58d24fbf3..88a84f3ca 100644
--- a/offapi/com/sun/star/sync/SyncInfo.idl
+++ b/offapi/com/sun/star/sync/SyncInfo.idl
@@ -28,16 +28,13 @@
 #ifndef __com_sun_star_sync_SyncInfo_idl__ 
 #define __com_sun_star_sync_SyncInfo_idl__ 
  
-#ifndef __com_sun_star_sync_SyncScheme_idl__ 
 #include <com/sun/star/sync/SyncScheme.idl> 
-#endif 
+#include <com/sun/star/sync/FilterData.idl>
  
 //============================================================================= 
  
 module com {  module sun {  module star {  module sync {  
  
-published typedef sequence< string > FilterData; 
- 
 //============================================================================= 
  
 /// @deprecated
diff --git a/offapi/com/sun/star/sync/Synchronizer.idl b/offapi/com/sun/star/sync/Synchronizer.idl
index bbe8d11b6..7625f001f 100644
--- a/offapi/com/sun/star/sync/Synchronizer.idl
+++ b/offapi/com/sun/star/sync/Synchronizer.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync_Synchronizer_idl__ 
 #define __com_sun_star_sync_Synchronizer_idl__ 
  
-#ifndef __com_sun_star_sync_XSynchronizer_idl__ 
 #include <com/sun/star/sync/XSynchronizer.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sync/XSyncCollector.idl b/offapi/com/sun/star/sync/XSyncCollector.idl
index 1e2d6ea29..d85445569 100644
--- a/offapi/com/sun/star/sync/XSyncCollector.idl
+++ b/offapi/com/sun/star/sync/XSyncCollector.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_sync_XSyncCollector_idl__ 
 #define __com_sun_star_sync_XSyncCollector_idl__ 
  
-#ifndef __com_sun_star_ucb_XContentProviderManager_idl__ 
 #include <com/sun/star/ucb/XContentProviderManager.idl> 
-#endif 
-#ifndef __com_sun_star_ucb_XContent_idl__ 
 #include <com/sun/star/ucb/XContent.idl> 
-#endif 
-#ifndef __com_sun_star_sync_SyncScheme_idl__ 
 #include <com/sun/star/sync/SyncScheme.idl> 
-#endif 
-#ifndef __com_sun_star_sync_SyncInfo_idl__ 
 #include <com/sun/star/sync/SyncInfo.idl> 
-#endif 
-#ifndef __com_sun_star_sync_SyncElement_idl__ 
 #include <com/sun/star/sync/SyncElement.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sync/XSynchronizer.idl b/offapi/com/sun/star/sync/XSynchronizer.idl
index d3ed40e82..9e9c0ef07 100644
--- a/offapi/com/sun/star/sync/XSynchronizer.idl
+++ b/offapi/com/sun/star/sync/XSynchronizer.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sync_XSynchronizer_idl__ 
 #define __com_sun_star_sync_XSynchronizer_idl__ 
  
-#ifndef __com_sun_star_sync_XSyncCollector_idl__ 
 #include <com/sun/star/sync/XSyncCollector.idl> 
-#endif 
-#ifndef __com_sun_star_sync_SyncInfo_idl__ 
 #include <com/sun/star/sync/SyncInfo.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/sync/makefile.mk b/offapi/com/sun/star/sync/makefile.mk
deleted file mode 100644
index 93de367a8..000000000
--- a/offapi/com/sun/star/sync/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssync
-PACKAGE=com$/sun$/star$/sync
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    SyncCollector.idl\
-    Synchronizer.idl\
-    SyncElement.idl\
-    SyncType.idl\
-    SyncScheme.idl\
-    SyncAction.idl\
-    SyncEvent.idl\
-    SyncInfo.idl\
-    SyncMode.idl\
-    SyncOptions.idl\
-    XSyncCollector.idl\
-    XSynchronizer.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/sync2/BadPartnershipException.idl b/offapi/com/sun/star/sync2/BadPartnershipException.idl
index de5df68cd..a24ecb09a 100644
--- a/offapi/com/sun/star/sync2/BadPartnershipException.idl
+++ b/offapi/com/sun/star/sync2/BadPartnershipException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync2_BadPartnershipException_idl__
 #define __com_sun_star_sync2_BadPartnershipException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include "com/sun/star/uno/Exception.idl"
-#endif
 
 module com { module sun { module star { module sync2 {
 
diff --git a/offapi/com/sun/star/system/ProxySettings.idl b/offapi/com/sun/star/system/ProxySettings.idl
index 4369aee8a..bef32327f 100644
--- a/offapi/com/sun/star/system/ProxySettings.idl
+++ b/offapi/com/sun/star/system/ProxySettings.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_system_ProxySettings_idl__
 #define __com_sun_star_system_ProxySettings_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SOffice52ProxySettings.idl b/offapi/com/sun/star/system/SOffice52ProxySettings.idl
index fb53b5521..5ce220905 100644
--- a/offapi/com/sun/star/system/SOffice52ProxySettings.idl
+++ b/offapi/com/sun/star/system/SOffice52ProxySettings.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_system_SOffice52ProxySettings_idl__
 #define __com_sun_star_system_SOffice52ProxySettings_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_system_ProxySettings_idl__
 #include <com/sun/star/system/ProxySettings.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SimpleCommandMail.idl b/offapi/com/sun/star/system/SimpleCommandMail.idl
index 687cd6ef5..eedcba5d4 100644
--- a/offapi/com/sun/star/system/SimpleCommandMail.idl
+++ b/offapi/com/sun/star/system/SimpleCommandMail.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_system_SimpleCommandMail_idl__
 #define __com_sun_star_system_SimpleCommandMail_idl__
 
-#ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
 #include <com/sun/star/configuration/ConfigurationProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SimpleSystemMail.idl b/offapi/com/sun/star/system/SimpleSystemMail.idl
index c4e29d79d..7bb8d0e4b 100644
--- a/offapi/com/sun/star/system/SimpleSystemMail.idl
+++ b/offapi/com/sun/star/system/SimpleSystemMail.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_system_SimpleSystemMail_idl__
 #define __com_sun_star_system_SimpleSystemMail_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SystemProxySettings.idl b/offapi/com/sun/star/system/SystemProxySettings.idl
index 9faffd83a..484b81f2c 100644
--- a/offapi/com/sun/star/system/SystemProxySettings.idl
+++ b/offapi/com/sun/star/system/SystemProxySettings.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_system_SystemProxySettings_idl__
 #define __com_sun_star_system_SystemProxySettings_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_system_ProxySettings_idl__
 #include <com/sun/star/system/ProxySettings.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SystemShellExecute.idl b/offapi/com/sun/star/system/SystemShellExecute.idl
index 7ec1e9366..b65185cfe 100644
--- a/offapi/com/sun/star/system/SystemShellExecute.idl
+++ b/offapi/com/sun/star/system/SystemShellExecute.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_system_SystemShellExecute_idl__
 #define __com_sun_star_system_SystemShellExecute_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SystemShellExecuteException.idl b/offapi/com/sun/star/system/SystemShellExecuteException.idl
index 632c59323..5b7214b5e 100644
--- a/offapi/com/sun/star/system/SystemShellExecuteException.idl
+++ b/offapi/com/sun/star/system/SystemShellExecuteException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_system_SystemShellExecuteException_idl__
 #define __com_sun_star_system_SystemShellExecuteException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/XProxySettings.idl b/offapi/com/sun/star/system/XProxySettings.idl
index c39bffb71..83267dc55 100644
--- a/offapi/com/sun/star/system/XProxySettings.idl
+++ b/offapi/com/sun/star/system/XProxySettings.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_system_XProxySettings_idl__
 #define __com_sun_star_system_XProxySettings_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/XSimpleMailClient.idl b/offapi/com/sun/star/system/XSimpleMailClient.idl
index eb0f3073f..2d602323f 100644
--- a/offapi/com/sun/star/system/XSimpleMailClient.idl
+++ b/offapi/com/sun/star/system/XSimpleMailClient.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_system_XSimpleMailClient_idl__
 #define __com_sun_star_system_XSimpleMailClient_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_XSimpleMailMessage_idl__
 #include <com/sun/star/system/XSimpleMailMessage.idl>
-#endif
-
-#ifndef __com_sun_star_system_SimpleMailClientFlags_idl__
 #include <com/sun/star/system/SimpleMailClientFlags.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl b/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
index 98df9d5dd..0ff2cd092 100644
--- a/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
+++ b/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_system_XSimpleMailClientSupplier_idl__
 #define __com_sun_star_system_XSimpleMailClientSupplier_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_XSimpleMailClient_idl__
 #include <com/sun/star/system/XSimpleMailClient.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/XSimpleMailMessage.idl b/offapi/com/sun/star/system/XSimpleMailMessage.idl
index b4f488a62..c16734e61 100644
--- a/offapi/com/sun/star/system/XSimpleMailMessage.idl
+++ b/offapi/com/sun/star/system/XSimpleMailMessage.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_system_XSimpleMailMessage_idl__
 #define __com_sun_star_system_XSimpleMailMessage_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/XSystemShellExecute.idl b/offapi/com/sun/star/system/XSystemShellExecute.idl
index 22db7e9ea..b9aeae487 100644
--- a/offapi/com/sun/star/system/XSystemShellExecute.idl
+++ b/offapi/com/sun/star/system/XSystemShellExecute.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_system_XSystemShellExecute_idl__
 #define __com_sun_star_system_XSystemShellExecute_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_SystemShellExecuteException_idl__
 #include <com/sun/star/system/SystemShellExecuteException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/makefile.mk b/offapi/com/sun/star/system/makefile.mk
deleted file mode 100644
index 7e30a8a65..000000000
--- a/offapi/com/sun/star/system/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssystem
-PACKAGE=com$/sun$/star$/system
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    SystemShellExecute.idl\
-    SystemShellExecuteException.idl\
-    SystemShellExecuteFlags.idl\
-    XSystemShellExecute.idl\
-    SimpleMailClientFlags.idl\
-    XSimpleMailMessage.idl\
-    XSimpleMailClient.idl\
-    XSimpleMailClientSupplier.idl\
-    SimpleCommandMail.idl \
-    SimpleSystemMail.idl\
-    ProxySettings.idl\
-    SOffice52ProxySettings.idl\
-    SystemProxySettings.idl\
-    XProxySettings.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/table/AccessibleCellView.idl b/offapi/com/sun/star/table/AccessibleCellView.idl
index 3f1ff2b0f..f8a9b4b6f 100644
--- a/offapi/com/sun/star/table/AccessibleCellView.idl
+++ b/offapi/com/sun/star/table/AccessibleCellView.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 #define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/table/AccessibleTableView.idl b/offapi/com/sun/star/table/AccessibleTableView.idl
index e83b22078..cd286dd5a 100644
--- a/offapi/com/sun/star/table/AccessibleTableView.idl
+++ b/offapi/com/sun/star/table/AccessibleTableView.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 #define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
 #include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/table/BorderLine.idl b/offapi/com/sun/star/table/BorderLine.idl
index 8ae2be47d..c2951f601 100644
--- a/offapi/com/sun/star/table/BorderLine.idl
+++ b/offapi/com/sun/star/table/BorderLine.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_BorderLine_idl__
 #define __com_sun_star_table_BorderLine_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/Cell.idl b/offapi/com/sun/star/table/Cell.idl
index c1a44d772..a3c41b043 100644
--- a/offapi/com/sun/star/table/Cell.idl
+++ b/offapi/com/sun/star/table/Cell.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_Cell_idl__
 #define __com_sun_star_table_Cell_idl__
 
-#ifndef __com_sun_star_table_CellProperties_idl__
 #include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/CellCursor.idl b/offapi/com/sun/star/table/CellCursor.idl
index 0ea732991..64f7f9bc8 100644
--- a/offapi/com/sun/star/table/CellCursor.idl
+++ b/offapi/com/sun/star/table/CellCursor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_CellCursor_idl__
 #define __com_sun_star_table_CellCursor_idl__
 
-#ifndef __com_sun_star_table_XCellCursor_idl__
 #include <com/sun/star/table/XCellCursor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/CellProperties.idl b/offapi/com/sun/star/table/CellProperties.idl
index a598d8a66..1d807551c 100644
--- a/offapi/com/sun/star/table/CellProperties.idl
+++ b/offapi/com/sun/star/table/CellProperties.idl
@@ -28,45 +28,16 @@
 #ifndef __com_sun_star_table_CellProperties_idl__
 #define __com_sun_star_table_CellProperties_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellHoriJustify_idl__
 #include <com/sun/star/table/CellHoriJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellVertJustify_idl__
 #include <com/sun/star/table/CellVertJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellOrientation_idl__
 #include <com/sun/star/table/CellOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_util_CellProtection_idl__
 #include <com/sun/star/util/CellProtection.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableBorder_idl__
 #include <com/sun/star/table/TableBorder.idl>
-#endif
-
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/CellRange.idl b/offapi/com/sun/star/table/CellRange.idl
index 74a433601..e3411990a 100644
--- a/offapi/com/sun/star/table/CellRange.idl
+++ b/offapi/com/sun/star/table/CellRange.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_CellRange_idl__
 #define __com_sun_star_table_CellRange_idl__
 
-#ifndef __com_sun_star_table_CellProperties_idl__
 #include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/CellRangeListSource.idl b/offapi/com/sun/star/table/CellRangeListSource.idl
index 4b47cf3ff..92d11cbf0 100644
--- a/offapi/com/sun/star/table/CellRangeListSource.idl
+++ b/offapi/com/sun/star/table/CellRangeListSource.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_CellRangeListSource_idl__
 #define __com_sun_star_sheet_CellRangeListSource_idl__
 
-#ifndef __com_sun_star_form_binding_ListEntrySource_idl__
 #include <com/sun/star/form/binding/ListEntrySource.idl>
-#endif
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/CellValueBinding.idl b/offapi/com/sun/star/table/CellValueBinding.idl
index bd58919d7..9c8eee1cd 100644
--- a/offapi/com/sun/star/table/CellValueBinding.idl
+++ b/offapi/com/sun/star/table/CellValueBinding.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_table_CellValueBinding_idl__
 #define __com_sun_star_table_CellValueBinding_idl__
 
-#ifndef __com_sun_star_form_binding_ValueBinding_idl__
 #include <com/sun/star/form/binding/ValueBinding.idl>
-#endif
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/ListPositionCellBinding.idl b/offapi/com/sun/star/table/ListPositionCellBinding.idl
index 81423c21b..34d025263 100644
--- a/offapi/com/sun/star/table/ListPositionCellBinding.idl
+++ b/offapi/com/sun/star/table/ListPositionCellBinding.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_ListPositionCellBinding_idl__
 #define __com_sun_star_table_ListPositionCellBinding_idl__
 
-#ifndef __com_sun_star_table_CellValueBinding_idl__
 #include <com/sun/star/table/CellValueBinding.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/ShadowFormat.idl b/offapi/com/sun/star/table/ShadowFormat.idl
index 562ca2f2b..dfc012165 100644
--- a/offapi/com/sun/star/table/ShadowFormat.idl
+++ b/offapi/com/sun/star/table/ShadowFormat.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_ShadowFormat_idl__
 #define __com_sun_star_table_ShadowFormat_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowLocation_idl__
 #include <com/sun/star/table/ShadowLocation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableBorder.idl b/offapi/com/sun/star/table/TableBorder.idl
index 4fa40e88f..f67d35a99 100644
--- a/offapi/com/sun/star/table/TableBorder.idl
+++ b/offapi/com/sun/star/table/TableBorder.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_TableBorder_idl__
 #define __com_sun_star_table_TableBorder_idl__
 
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableBorderDistances.idl b/offapi/com/sun/star/table/TableBorderDistances.idl
index 36b7241b1..68855a9df 100644
--- a/offapi/com/sun/star/table/TableBorderDistances.idl
+++ b/offapi/com/sun/star/table/TableBorderDistances.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_TableBorderDistances_idl__
 #define __com_sun_star_table_TableBorderDistances_idl__
 
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableChart.idl b/offapi/com/sun/star/table/TableChart.idl
index 3b2134e9b..e2b1602a2 100644
--- a/offapi/com/sun/star/table/TableChart.idl
+++ b/offapi/com/sun/star/table/TableChart.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableChart_idl__
 #define __com_sun_star_table_TableChart_idl__
 
-#ifndef __com_sun_star_table_XTableChart_idl__
 #include <com/sun/star/table/XTableChart.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
 #include <com/sun/star/document/XEmbeddedObjectSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableCharts.idl b/offapi/com/sun/star/table/TableCharts.idl
index 563e95807..d81b2c314 100644
--- a/offapi/com/sun/star/table/TableCharts.idl
+++ b/offapi/com/sun/star/table/TableCharts.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableCharts_idl__
 #define __com_sun_star_table_TableCharts_idl__
 
-#ifndef __com_sun_star_table_XTableCharts_idl__
 #include <com/sun/star/table/XTableCharts.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableChartsEnumeration.idl b/offapi/com/sun/star/table/TableChartsEnumeration.idl
index 5cbbb61e2..c3236483e 100644
--- a/offapi/com/sun/star/table/TableChartsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableChartsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_TableChartsEnumeration_idl__
 #define __com_sun_star_table_TableChartsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableColumn.idl b/offapi/com/sun/star/table/TableColumn.idl
index 5633872e1..22ede4bc1 100644
--- a/offapi/com/sun/star/table/TableColumn.idl
+++ b/offapi/com/sun/star/table/TableColumn.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableColumn_idl__
 #define __com_sun_star_table_TableColumn_idl__
 
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableColumns.idl b/offapi/com/sun/star/table/TableColumns.idl
index a04a717d1..0638b4ed1 100644
--- a/offapi/com/sun/star/table/TableColumns.idl
+++ b/offapi/com/sun/star/table/TableColumns.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableColumns_idl__
 #define __com_sun_star_table_TableColumns_idl__
 
-#ifndef __com_sun_star_table_XTableColumns_idl__
 #include <com/sun/star/table/XTableColumns.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableColumnsEnumeration.idl b/offapi/com/sun/star/table/TableColumnsEnumeration.idl
index 4791acffc..243983fe6 100644
--- a/offapi/com/sun/star/table/TableColumnsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableColumnsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_TableColumnsEnumeration_idl__
 #define __com_sun_star_table_TableColumnsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableRow.idl b/offapi/com/sun/star/table/TableRow.idl
index 592eb020d..481187b64 100644
--- a/offapi/com/sun/star/table/TableRow.idl
+++ b/offapi/com/sun/star/table/TableRow.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_TableRow_idl__
 #define __com_sun_star_table_TableRow_idl__
 
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableRows.idl b/offapi/com/sun/star/table/TableRows.idl
index 65ad60173..a0b1afa60 100644
--- a/offapi/com/sun/star/table/TableRows.idl
+++ b/offapi/com/sun/star/table/TableRows.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_TableRows_idl__
 #define __com_sun_star_table_TableRows_idl__
 
-#ifndef __com_sun_star_table_XTableRows_idl__
 #include <com/sun/star/table/XTableRows.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableRowsEnumeration.idl b/offapi/com/sun/star/table/TableRowsEnumeration.idl
index af0f4b505..a807bc33b 100644
--- a/offapi/com/sun/star/table/TableRowsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableRowsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_TableRowsEnumeration_idl__
 #define __com_sun_star_table_TableRowsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableSortDescriptor.idl b/offapi/com/sun/star/table/TableSortDescriptor.idl
index e6aab2994..9c0c622cc 100644
--- a/offapi/com/sun/star/table/TableSortDescriptor.idl
+++ b/offapi/com/sun/star/table/TableSortDescriptor.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableSortDescriptor_idl__
 #define __com_sun_star_table_TableSortDescriptor_idl__
 
-#ifndef __com_sun_star_util_SortDescriptor_idl__
 #include <com/sun/star/util/SortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_SortField_idl__
 #include <com/sun/star/util/SortField.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableOrientation_idl__
 #include <com/sun/star/table/TableOrientation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableSortDescriptor2.idl b/offapi/com/sun/star/table/TableSortDescriptor2.idl
index cba145afe..1198025a7 100644
--- a/offapi/com/sun/star/table/TableSortDescriptor2.idl
+++ b/offapi/com/sun/star/table/TableSortDescriptor2.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_table_TableSortDescriptor2_idl__
 #define __com_sun_star_table_TableSortDescriptor2_idl__
 
-#ifndef __com_sun_star_util_SortDescriptor2_idl__ 
 #include <com/sun/star/util/SortDescriptor2.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortField_idl__
 #include <com/sun/star/table/TableSortField.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableSortField.idl b/offapi/com/sun/star/table/TableSortField.idl
index 34e262ab6..3691b0a3f 100644
--- a/offapi/com/sun/star/table/TableSortField.idl
+++ b/offapi/com/sun/star/table/TableSortField.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_table_TableSortField_idl__ 
 #define __com_sun_star_table_TableSortField_idl__ 
  
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
-#ifndef __com_sun_star_table_TableSortFieldType_idl__ 
 #include <com/sun/star/table/TableSortFieldType.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/table/XAutoFormattable.idl b/offapi/com/sun/star/table/XAutoFormattable.idl
index eac9d19b2..315b7dde0 100644
--- a/offapi/com/sun/star/table/XAutoFormattable.idl
+++ b/offapi/com/sun/star/table/XAutoFormattable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_XAutoFormattable_idl__
 #define __com_sun_star_table_XAutoFormattable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XCell.idl b/offapi/com/sun/star/table/XCell.idl
index 8c1f581a7..39dc89206 100644
--- a/offapi/com/sun/star/table/XCell.idl
+++ b/offapi/com/sun/star/table/XCell.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_XCell_idl__
 #define __com_sun_star_table_XCell_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellContentType_idl__
 #include <com/sun/star/table/CellContentType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XCell2.idl b/offapi/com/sun/star/table/XCell2.idl
new file mode 100644
index 000000000..6e3c24e69
--- /dev/null
+++ b/offapi/com/sun/star/table/XCell2.idl
@@ -0,0 +1,71 @@
+/*
+ * 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. 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.
+ *
+ * The Initial Developer of the Original Code is
+ *                       Novell, Inc.
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Muthu Subramanian <sumuthu@novell.com>
+ *
+ * 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.
+ */
+
+#ifndef __com_sun_star_table_XCell2_idl__
+#define __com_sun_star_table_XCell2_idl__
+
+#include <com/sun/star/table/XCell.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module table {
+
+//=============================================================================
+
+/** extends XCell methods to access the contents of a cell in a table.
+
+    @see com::sun::star::table::Cell
+ */
+interface XCell2: com::sun::star::table::XCell
+{
+    /** sets a formula result into the cell.
+
+        <p>When assigned, the formula cell's result will be set to this
+        value and will not be calculated - unless a HardRecalc is
+        executed.</p>
+      */
+    void setFormulaResult( [in] double nValue );
+
+    //-------------------------------------------------------------------------
+
+    /** sets a formula string into the cell.
+
+        <p>When assigned, the formula is set into the string. But is not
+        compiled, tokenized or calculated. Its useful when loading a
+        document and setFormulaResult() is used. Otherwise it is compiled
+        on trying to fetch a result value.</p>
+      */
+    void setFormulaString( [in] string aFormula );
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/table/XCellCursor.idl b/offapi/com/sun/star/table/XCellCursor.idl
index 1064b9b60..1dd643809 100644
--- a/offapi/com/sun/star/table/XCellCursor.idl
+++ b/offapi/com/sun/star/table/XCellCursor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_XCellCursor_idl__
 #define __com_sun_star_table_XCellCursor_idl__
 
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XCellRange.idl b/offapi/com/sun/star/table/XCellRange.idl
index 3a0557089..8ea243469 100644
--- a/offapi/com/sun/star/table/XCellRange.idl
+++ b/offapi/com/sun/star/table/XCellRange.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_XCellRange_idl__
 #define __com_sun_star_table_XCellRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XColumnRowRange.idl b/offapi/com/sun/star/table/XColumnRowRange.idl
index 7f3dc3f67..fc71a327b 100644
--- a/offapi/com/sun/star/table/XColumnRowRange.idl
+++ b/offapi/com/sun/star/table/XColumnRowRange.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_XColumnRowRange_idl__
 #define __com_sun_star_table_XColumnRowRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableColumns_idl__
 #include <com/sun/star/table/XTableColumns.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableRows_idl__
 #include <com/sun/star/table/XTableRows.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XMergeableCell.idl b/offapi/com/sun/star/table/XMergeableCell.idl
index 42870a70f..1cf3dadad 100644
--- a/offapi/com/sun/star/table/XMergeableCell.idl
+++ b/offapi/com/sun/star/table/XMergeableCell.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_XMergeableCell_idl__
 #define __com_sun_star_table_XMergeableCell_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XMergeableCellRange.idl b/offapi/com/sun/star/table/XMergeableCellRange.idl
index b142576c7..9c4334f0d 100644
--- a/offapi/com/sun/star/table/XMergeableCellRange.idl
+++ b/offapi/com/sun/star/table/XMergeableCellRange.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_table_XMergeableCellRange_idl__ 
 #define __com_sun_star_table_XMergeableCellRange_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/table/XTable.idl b/offapi/com/sun/star/table/XTable.idl
index 346ac2525b..246a3d4ac 100644
--- a/offapi/com/sun/star/table/XTable.idl
+++ b/offapi/com/sun/star/table/XTable.idl
@@ -28,41 +28,15 @@
 #ifndef __com_sun_star_table_XTable_idl__
 #define __com_sun_star_table_XTable_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
 #include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellCursor_idl__
 #include <com/sun/star/table/XCellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifiable_idl__ 
 #include <com/sun/star/util/XModifiable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XTableChart.idl b/offapi/com/sun/star/table/XTableChart.idl
index 10b884448..bf0a5b6d9 100644
--- a/offapi/com/sun/star/table/XTableChart.idl
+++ b/offapi/com/sun/star/table/XTableChart.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_XTableChart_idl__
 #define __com_sun_star_table_XTableChart_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XTableCharts.idl b/offapi/com/sun/star/table/XTableCharts.idl
index 43fb021d2..76a83e022 100644
--- a/offapi/com/sun/star/table/XTableCharts.idl
+++ b/offapi/com/sun/star/table/XTableCharts.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_XTableCharts_idl__
 #define __com_sun_star_table_XTableCharts_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XTableChartsSupplier.idl b/offapi/com/sun/star/table/XTableChartsSupplier.idl
index 2fb041890..8befde850 100644
--- a/offapi/com/sun/star/table/XTableChartsSupplier.idl
+++ b/offapi/com/sun/star/table/XTableChartsSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_XTableChartsSupplier_idl__
 #define __com_sun_star_table_XTableChartsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableCharts_idl__
 #include <com/sun/star/table/XTableCharts.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XTableColumns.idl b/offapi/com/sun/star/table/XTableColumns.idl
index 6745b8692..deed52f0d 100644
--- a/offapi/com/sun/star/table/XTableColumns.idl
+++ b/offapi/com/sun/star/table/XTableColumns.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_XTableColumns_idl__
 #define __com_sun_star_table_XTableColumns_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XTableRows.idl b/offapi/com/sun/star/table/XTableRows.idl
index 5b8ab14b8..24a5482e0 100644
--- a/offapi/com/sun/star/table/XTableRows.idl
+++ b/offapi/com/sun/star/table/XTableRows.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_XTableRows_idl__
 #define __com_sun_star_table_XTableRows_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/makefile.mk b/offapi/com/sun/star/table/makefile.mk
index 9b7e18582..4cb90ab6e 100644
--- a/offapi/com/sun/star/table/makefile.mk
+++ b/offapi/com/sun/star/table/makefile.mk
@@ -75,6 +75,7 @@ IDLFILES=\
         TableSortFieldType.idl\
     XAutoFormattable.idl\
     XCell.idl\
+    XCell2.idl\
     XMergeableCell.idl\
     XMergeableCellRange.idl\
     XCellCursor.idl\
diff --git a/offapi/com/sun/star/task/AsyncJob.idl b/offapi/com/sun/star/task/AsyncJob.idl
index f82988b6e..1db46738d 100644
--- a/offapi/com/sun/star/task/AsyncJob.idl
+++ b/offapi/com/sun/star/task/AsyncJob.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_task_AsyncJob_idl__
 #define __com_sun_star_task_AsyncJob_idl__
 
-#ifndef __com_sun_star_task_XAsyncJob_idl__
 #include <com/sun/star/task/XAsyncJob.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseable_idl__
 #include <com/sun/star/util/XCloseable.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl b/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
index 117ecf0db..c02b04946 100644
--- a/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
+++ b/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__ 
 #define __com_sun_star_task_ClassifiedInteractionRequest_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
-#ifndef __com_sun_star_task_InteractionClassification_idl__ 
 #include <com/sun/star/task/InteractionClassification.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
index ed8ac898a..2c5af2cd3 100644
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_task_DocumentMSPasswordRequest_idl__
 #define __com_sun_star_task_DocumentMSPasswordRequest_idl__
 
-#ifndef __com_sun_star_task_PasswordRequest_idl__
 #include <com/sun/star/task/PasswordRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/DocumentPasswordRequest.idl b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
index af9a44c7a..a9bc9c8a2 100644
--- a/offapi/com/sun/star/task/DocumentPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_DocumentPasswordRequest_idl__
 #define __com_sun_star_task_DocumentPasswordRequest_idl__
 
-#ifndef __com_sun_star_task_PasswordRequest_idl__
 #include <com/sun/star/task/PasswordRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/ErrorCodeIOException.idl b/offapi/com/sun/star/task/ErrorCodeIOException.idl
index 6ab4e16ea..4e2752933 100644
--- a/offapi/com/sun/star/task/ErrorCodeIOException.idl
+++ b/offapi/com/sun/star/task/ErrorCodeIOException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_ErrorCodeIOException_idl__
 #define __com_sun_star_task_ErrorCodeIOException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //============================================================================
 
@@ -40,7 +38,7 @@
 /** IOException that can carry error codes ( not only io related ).
     It can be used to transport the error code information.
  */
-exception ErrorCodeIOException : com::sun::star::io::IOException
+published exception ErrorCodeIOException : com::sun::star::io::IOException
 {
     //------------------------------------------------------------------------
     /** specifies the error code.
diff --git a/offapi/com/sun/star/task/ErrorCodeRequest.idl b/offapi/com/sun/star/task/ErrorCodeRequest.idl
index 6966ad1a3..dadd4fbe7 100644
--- a/offapi/com/sun/star/task/ErrorCodeRequest.idl
+++ b/offapi/com/sun/star/task/ErrorCodeRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_ErrorCodeRequest_idl__
 #define __com_sun_star_task_ErrorCodeRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/Job.idl b/offapi/com/sun/star/task/Job.idl
index c9c4f6c92..166559a67 100644
--- a/offapi/com/sun/star/task/Job.idl
+++ b/offapi/com/sun/star/task/Job.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_task_Job_idl__
 #define __com_sun_star_task_Job_idl__
 
-#ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseable_idl__
 #include <com/sun/star/util/XCloseable.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/task/JobExecutor.idl b/offapi/com/sun/star/task/JobExecutor.idl
index c7e187085..a4a6e2c82 100644
--- a/offapi/com/sun/star/task/JobExecutor.idl
+++ b/offapi/com/sun/star/task/JobExecutor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_task_JobExecutor_idl__
 #define __com_sun_star_task_JobExecutor_idl__
 
-#ifndef __com_sun_star_task_XJobExecutor_idl__
 #include <com/sun/star/task/XJobExecutor.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/task/MasterPasswordRequest.idl b/offapi/com/sun/star/task/MasterPasswordRequest.idl
index e32c1da3a..71f461d67 100644
--- a/offapi/com/sun/star/task/MasterPasswordRequest.idl
+++ b/offapi/com/sun/star/task/MasterPasswordRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_MasterPasswordRequest_idl__
 #define __com_sun_star_task_MasterPasswordRequest_idl__
 
-#ifndef __com_sun_star_task_PasswordRequest_idl__
 #include <com/sun/star/task/PasswordRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/NoMasterException.idl b/offapi/com/sun/star/task/NoMasterException.idl
index 9f3dd302b..7660b1976 100644
--- a/offapi/com/sun/star/task/NoMasterException.idl
+++ b/offapi/com/sun/star/task/NoMasterException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_MasterPasswordRequest_idl__
 #define __com_sun_star_task_MasterPasswordRequest_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_task_PasswordRequestMode_idl__
 #include <com/sun/star/task/PasswordRequestMode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/PDFExportException.idl b/offapi/com/sun/star/task/PDFExportException.idl
index de8b4561a..12e4283a3 100644
--- a/offapi/com/sun/star/task/PDFExportException.idl
+++ b/offapi/com/sun/star/task/PDFExportException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_PDFExportException_idl__ 
 #define __com_sun_star_task_PDFExportException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  module com {  module sun {  module star {  module task { 
  
diff --git a/offapi/com/sun/star/task/PasswordRequest.idl b/offapi/com/sun/star/task/PasswordRequest.idl
index 1cd90b969..d03e67636 100644
--- a/offapi/com/sun/star/task/PasswordRequest.idl
+++ b/offapi/com/sun/star/task/PasswordRequest.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_PasswordRequest_idl__
 #define __com_sun_star_task_PasswordRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_task_PasswordRequestMode_idl__
 #include <com/sun/star/task/PasswordRequestMode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl b/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
index c3ad06113..9e0b5c1b8 100644
--- a/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
+++ b/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_UnsupportedOverwriteRequest_idl__
 #define __com_sun_star_task_UnsupportedOverwriteRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/UrlRecord.idl b/offapi/com/sun/star/task/UrlRecord.idl
index 4acf05726..eea770291 100644
--- a/offapi/com/sun/star/task/UrlRecord.idl
+++ b/offapi/com/sun/star/task/UrlRecord.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_UrlRecord_idl__
 #define __com_sun_star_task_UrlRecord_idl__
 
-#ifndef __com_sun_star_task_UserRecord_idl__
 #include <com/sun/star/task/UserRecord.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XAsyncJob.idl b/offapi/com/sun/star/task/XAsyncJob.idl
index 3cd20e673..7b692da01 100644
--- a/offapi/com/sun/star/task/XAsyncJob.idl
+++ b/offapi/com/sun/star/task/XAsyncJob.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_task_XAsyncJob_idl__
 #define __com_sun_star_task_XAsyncJob_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XInteractionApprove.idl b/offapi/com/sun/star/task/XInteractionApprove.idl
index cc10231da..f5849c921 100644
--- a/offapi/com/sun/star/task/XInteractionApprove.idl
+++ b/offapi/com/sun/star/task/XInteractionApprove.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionApprove_idl__ 
 #define __com_sun_star_task_XInteractionApprove_idl__ 
  
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
 #include <com/sun/star/task/XInteractionContinuation.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/task/XInteractionDisapprove.idl b/offapi/com/sun/star/task/XInteractionDisapprove.idl
index 7c85c7f1b..da68ea879 100644
--- a/offapi/com/sun/star/task/XInteractionDisapprove.idl
+++ b/offapi/com/sun/star/task/XInteractionDisapprove.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionDisapprove_idl__ 
 #define __com_sun_star_task_XInteractionDisapprove_idl__ 
  
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
 #include <com/sun/star/task/XInteractionContinuation.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/task/XInteractionPassword.idl b/offapi/com/sun/star/task/XInteractionPassword.idl
index 4d448dff9..c8bcfacbf 100644
--- a/offapi/com/sun/star/task/XInteractionPassword.idl
+++ b/offapi/com/sun/star/task/XInteractionPassword.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionPassword_idl__
 #define __com_sun_star_task_XInteractionPassword_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XInteractionPassword2.idl b/offapi/com/sun/star/task/XInteractionPassword2.idl
index b760feac4..4e47ce950 100644
--- a/offapi/com/sun/star/task/XInteractionPassword2.idl
+++ b/offapi/com/sun/star/task/XInteractionPassword2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionPassword2_idl__
 #define __com_sun_star_task_XInteractionPassword2_idl__
 
-#ifndef __com_sun_star_task_XInteractionPassword_idl__
 #include <com/sun/star/task/XInteractionPassword.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl b/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
index 1fbdf615e..c8cfe9679 100644
--- a/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
+++ b/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_task_XInteractionRequestStringResolver_idl__ 
 #define __com_sun_star_task_XInteractionRequestStringResolver_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_Optional_idl__ 
 #include <com/sun/star/beans/Optional.idl> 
-#endif 
  
-#ifndef __com_sun_star_task_XInteractionRequest_idl__ 
 #include <com/sun/star/task/XInteractionRequest.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/task/XJob.idl b/offapi/com/sun/star/task/XJob.idl
index ecc2fd27a..c52b3aea7 100644
--- a/offapi/com/sun/star/task/XJob.idl
+++ b/offapi/com/sun/star/task/XJob.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_task_XJob_idl__
 #define __com_sun_star_task_XJob_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/task/XJobExecutor.idl b/offapi/com/sun/star/task/XJobExecutor.idl
index bb79e9f4c..4ed83b4a8 100644
--- a/offapi/com/sun/star/task/XJobExecutor.idl
+++ b/offapi/com/sun/star/task/XJobExecutor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_task_XJobExecutor_idl__
 #define __com_sun_star_task_XJobExecutor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XJobListener.idl b/offapi/com/sun/star/task/XJobListener.idl
index d393d02bf..e233e4226 100644
--- a/offapi/com/sun/star/task/XJobListener.idl
+++ b/offapi/com/sun/star/task/XJobListener.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_task_XJobListener_idl__
 #define __com_sun_star_task_XJobListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XMasterPasswordHandling.idl b/offapi/com/sun/star/task/XMasterPasswordHandling.idl
index 28206cbdf..144af431f 100644
--- a/offapi/com/sun/star/task/XMasterPasswordHandling.idl
+++ b/offapi/com/sun/star/task/XMasterPasswordHandling.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_XMasterPasswordHandling_idl__
 #define __com_sun_star_task_XMasterPasswordHandling_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/XMasterPasswordHandling2.idl b/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
index 706e13893..12de256e9 100644
--- a/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
+++ b/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_XMasterPasswordHandling2_idl__
 #define __com_sun_star_task_XMasterPasswordHandling2_idl__
 
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_task_XMasterPasswordHandling_idl__
 #include <com/sun/star/task/XMasterPasswordHandling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XPasswordContainer.idl b/offapi/com/sun/star/task/XPasswordContainer.idl
index 7611df646..8cf36016f 100644
--- a/offapi/com/sun/star/task/XPasswordContainer.idl
+++ b/offapi/com/sun/star/task/XPasswordContainer.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_task_XPasswordContainer_idl__
 #define __com_sun_star_task_XPasswordContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_UrlRecord_idl__
 #include <com/sun/star/task/UrlRecord.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/XRestartManager.idl b/offapi/com/sun/star/task/XRestartManager.idl
index a6d97142b..25b941491 100644
--- a/offapi/com/sun/star/task/XRestartManager.idl
+++ b/offapi/com/sun/star/task/XRestartManager.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_task_XRestartManager_idl__
 #define __com_sun_star_task_XRestartManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/task/XStatusIndicator.idl b/offapi/com/sun/star/task/XStatusIndicator.idl
index b6bb627c0..4291b09e2 100644
--- a/offapi/com/sun/star/task/XStatusIndicator.idl
+++ b/offapi/com/sun/star/task/XStatusIndicator.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XStatusIndicator_idl__
 #define __com_sun_star_task_XStatusIndicator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XStatusIndicatorFactory.idl b/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
index 17e879352..126c25ac0 100644
--- a/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
+++ b/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_XStatusIndicatorFactory_idl__
 #define __com_sun_star_task_XStatusIndicatorFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
 #include <com/sun/star/task/XStatusIndicator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl b/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
index 6fedb8b52..25f0856cc 100644
--- a/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
+++ b/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_XStatusIndicatorSupplier_idl__
 #define __com_sun_star_task_XStatusIndicatorSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
 #include <com/sun/star/task/XStatusIndicator.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/XUrlContainer.idl b/offapi/com/sun/star/task/XUrlContainer.idl
index ee15e6ad6..a2e4c10dc 100644
--- a/offapi/com/sun/star/task/XUrlContainer.idl
+++ b/offapi/com/sun/star/task/XUrlContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_XUrlContainer_idl__
 #define __com_sun_star_task_XUrlContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 
 //=============================================================================
@@ -46,7 +41,7 @@ module com { module sun { module star { module task {
 
     @since OOo 3.2
 */
-/*published*/ interface XUrlContainer : com::sun::star::uno::XInterface
+published interface XUrlContainer : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** Add a URL to the container.
diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
deleted file mode 100644
index cd9db6b5a..000000000
--- a/offapi/com/sun/star/task/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-# Copyright IBM Corporation 2009.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csstask
-PACKAGE=com$/sun$/star$/task
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ClassifiedInteractionRequest.idl\
-    DocumentMacroConfirmationRequest.idl\
-    DocumentPasswordRequest.idl\
-    DocumentPasswordRequest2.idl\
-    DocumentMSPasswordRequest.idl\
-    DocumentMSPasswordRequest2.idl\
-    ErrorCodeRequest.idl\
-    ErrorCodeIOException.idl\
-    FutureDocumentVersionProductUpdateRequest.idl\
-    InteractionClassification.idl\
-    InteractionHandler.idl\
-    JobExecutor.idl\
-    Job.idl\
-    AsyncJob.idl\
-    MasterPasswordRequest.idl\
-    NoMasterException.idl\
-    PasswordContainer.idl\
-    PasswordContainerInteractionHandler.idl\
-    PasswordRequest.idl\
-    PasswordRequestMode.idl\
-    PDFExportException.idl\
-    OfficeRestartManager.idl\
-    UnsupportedOverwriteRequest.idl\
-    UrlRecord.idl\
-    UserRecord.idl\
-    XAsyncJob.idl\
-    XInteractionApprove.idl\
-    XInteractionAskLater.idl\
-    XInteractionDisapprove.idl\
-    XInteractionPassword.idl\
-    XInteractionPassword2.idl\
-    XJob.idl\
-    XJobExecutor.idl\
-    XJobListener.idl\
-    XMasterPasswordHandling.idl\
-    XMasterPasswordHandling2.idl\
-    XPasswordContainer.idl\
-    XRestartManager.idl\
-    XStatusIndicator.idl\
-    XStatusIndicatorFactory.idl\
-    XStatusIndicatorSupplier.idl\
-    XAbortChannel.idl\
-    XInteractionRequestStringResolver.idl\
-    InteractionRequestStringResolver.idl\
-    XUrlContainer.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/text/AccessibleEndnoteView.idl b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
index 49f6c0ee2..5f7273e16 100644
--- a/offapi/com/sun/star/text/AccessibleEndnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_AccessibleEndnoteView_idl__
 #define __com_sun_star_text_AccessibleEndnoteView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleFootnoteView.idl b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
index 1d3f0c43a..9dc0658f2 100644
--- a/offapi/com/sun/star/text/AccessibleFootnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_AccessibleFootnoteView_idl__
 #define __com_sun_star_text_AccessibleFootnoteView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
index db9774b05..9d957f4e1 100644
--- a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
+++ b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_AccessibleHeaderFooterView_idl__
 #define __com_sun_star_text_AccessibleHeaderFooterView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/AccessiblePageView.idl b/offapi/com/sun/star/text/AccessiblePageView.idl
index 79be93024..2779c7c37 100644
--- a/offapi/com/sun/star/text/AccessiblePageView.idl
+++ b/offapi/com/sun/star/text/AccessiblePageView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_AccessibleEndnoteView_idl__
 #define __com_sun_star_text_AccessibleEndnoteView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleParagraphView.idl b/offapi/com/sun/star/text/AccessibleParagraphView.idl
index d794058a7..20ff498cf 100644
--- a/offapi/com/sun/star/text/AccessibleParagraphView.idl
+++ b/offapi/com/sun/star/text/AccessibleParagraphView.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_text_AccessibleParagraphView_idl__
 #define __com_sun_star_text_AccessibleParagraphView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
 #include <com/sun/star/accessibility/XAccessibleEditableText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTextAttributes_idl__
 #include <com/sun/star/accessibility/XAccessibleTextAttributes.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
index aa0ccce2d..f65682a1a 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_AccessibleTextDocumentPageView_idl__
 #define __com_sun_star_text_AccessibleTextDocumentPageView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
index 715ec7b91..d30165652 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_AccessibleTextDocumentView_idl__
 #define __com_sun_star_text_AccessibleTextDocumentView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
index 14418a0be..f6fe7cdf3 100644
--- a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_AccessibleTextEmbeddedObjectView_idl__
 #define __com_sun_star_text_AccessibleTextEmbeddedObjectView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
 #include <com/sun/star/accessibility/XAccessibleImage.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/text/AccessibleTextFrameView.idl b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
index bda6d66dd..a797f453a 100644
--- a/offapi/com/sun/star/text/AccessibleTextFrameView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
@@ -27,18 +27,11 @@
 #ifndef __com_sun_star_text_AccessibleTextFrameView_idl__
 #define __com_sun_star_text_AccessibleTextFrameView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
 
 
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
index c8ba927a3..fc90fd872 100644
--- a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_AccessibleTextGraphicObjectView_idl__
 #define __com_sun_star_text_AccessibleTextGraphicObjectView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
 #include <com/sun/star/accessibility/XAccessibleImage.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/AdvancedTextDocument.idl b/offapi/com/sun/star/text/AdvancedTextDocument.idl
index 45191ada6..6ca2da6a9 100644
--- a/offapi/com/sun/star/text/AdvancedTextDocument.idl
+++ b/offapi/com/sun/star/text/AdvancedTextDocument.idl
@@ -27,45 +27,25 @@
 #ifndef __com_sun_star_text_AdvancedTextDocument_idl__ 
 #define __com_sun_star_text_AdvancedTextDocument_idl__ 
  
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_HypertextDocument_idl__ 
 #include <com/sun/star/text/HypertextDocument.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XFootnotesSupplier_idl__ 
 #include <com/sun/star/text/XFootnotesSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XEndnotesSupplier_idl__ 
 #include <com/sun/star/text/XEndnotesSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XReplaceable_idl__ 
 #include <com/sun/star/util/XReplaceable.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XPagePrintable_idl__ 
 #include <com/sun/star/text/XPagePrintable.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__ 
 #include <com/sun/star/text/XReferenceMarksSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__ 
 #include <com/sun/star/text/XLineNumberingSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__ 
 #include <com/sun/star/text/XChapterNumberingSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/AutoTextContainer.idl b/offapi/com/sun/star/text/AutoTextContainer.idl
index b5d305b5b..c431fee93 100644
--- a/offapi/com/sun/star/text/AutoTextContainer.idl
+++ b/offapi/com/sun/star/text/AutoTextContainer.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_AutoTextContainer_idl__ 
 #define __com_sun_star_text_AutoTextContainer_idl__ 
  
-#ifndef __com_sun_star_text_XAutoTextContainer_idl__ 
 #include <com/sun/star/text/XAutoTextContainer.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/AutoTextEntry.idl b/offapi/com/sun/star/text/AutoTextEntry.idl
index 400eb5b66..d653d78f4 100644
--- a/offapi/com/sun/star/text/AutoTextEntry.idl
+++ b/offapi/com/sun/star/text/AutoTextEntry.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_AutoTextEntry_idl__ 
 #define __com_sun_star_text_AutoTextEntry_idl__ 
 
-#ifndef __com_sun_star_text_XAutoTextEntry_idl__ 
 #include <com/sun/star/text/XAutoTextEntry.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_XText_idl__ 
 #include <com/sun/star/text/XText.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/AutoTextGroup.idl b/offapi/com/sun/star/text/AutoTextGroup.idl
index 18adf9236..02784f7ed 100644
--- a/offapi/com/sun/star/text/AutoTextGroup.idl
+++ b/offapi/com/sun/star/text/AutoTextGroup.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_text_AutoTextGroup_idl__ 
 #define __com_sun_star_text_AutoTextGroup_idl__ 
  
-#ifndef __com_sun_star_text_XAutoTextGroup_idl__ 
 #include <com/sun/star/text/XAutoTextGroup.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/BaseFrame.idl b/offapi/com/sun/star/text/BaseFrame.idl
index 425c2f72f..e2bb90692 100644
--- a/offapi/com/sun/star/text/BaseFrame.idl
+++ b/offapi/com/sun/star/text/BaseFrame.idl
@@ -27,37 +27,15 @@
 #ifndef __com_sun_star_text_BaseFrame_idl__
 #define __com_sun_star_text_BaseFrame_idl__
 
-#ifndef __com_sun_star_text_BaseFrameProperties_idl__
 #include <com/sun/star/text/BaseFrameProperties.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_text_XTextFrame_idl__
 #include <com/sun/star/text/XTextFrame.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl b/offapi/com/sun/star/text/BaseFrameProperties.idl
index cb96e7a40..caf77ad0e 100644
--- a/offapi/com/sun/star/text/BaseFrameProperties.idl
+++ b/offapi/com/sun/star/text/BaseFrameProperties.idl
@@ -27,30 +27,14 @@
 #ifndef __com_sun_star_text_BaseFrameProperties_idl__
 #define __com_sun_star_text_BaseFrameProperties_idl__
 
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_text_XTextFrame_idl__
 #include <com/sun/star/text/XTextFrame.idl>
-#endif
-#ifndef __com_sun_star_text_WrapTextMode_idl__
 #include <com/sun/star/text/WrapTextMode.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/BaseIndex.idl b/offapi/com/sun/star/text/BaseIndex.idl
index e13cd21f2..84703b35d 100644
--- a/offapi/com/sun/star/text/BaseIndex.idl
+++ b/offapi/com/sun/star/text/BaseIndex.idl
@@ -29,29 +29,13 @@
 #ifndef __com_sun_star_text_BaseIndex_idl__
 #define __com_sun_star_text_BaseIndex_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndex_idl__
 #include <com/sun/star/text/XDocumentIndex.idl>
-#endif
-#ifndef _com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef _com_sun_star_text_XTextColumns_idl__
 #include <com/sun/star/text/XTextColumns.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef _com_sun_star_text_XTextSection_idl__
 #include <com/sun/star/text/XTextSection.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/BaseIndexMark.idl b/offapi/com/sun/star/text/BaseIndexMark.idl
index 47cbf896f..4c1e8d244 100644
--- a/offapi/com/sun/star/text/BaseIndexMark.idl
+++ b/offapi/com/sun/star/text/BaseIndexMark.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_BaseIndexMark_idl__
 #define __com_sun_star_text_BaseIndexMark_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Bookmark.idl b/offapi/com/sun/star/text/Bookmark.idl
index bd91dca8b..20d0629fd 100644
--- a/offapi/com/sun/star/text/Bookmark.idl
+++ b/offapi/com/sun/star/text/Bookmark.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_Bookmark_idl__ 
 #define __com_sun_star_text_Bookmark_idl__ 
  
-#ifndef __com_sun_star_text_TextContent_idl__ 
 #include <com/sun/star/text/TextContent.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/Bookmarks.idl b/offapi/com/sun/star/text/Bookmarks.idl
index 7f9081cd3..33f4453a2 100644
--- a/offapi/com/sun/star/text/Bookmarks.idl
+++ b/offapi/com/sun/star/text/Bookmarks.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_Bookmarks_idl__
 #define __com_sun_star_text_Bookmarks_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Cell.idl b/offapi/com/sun/star/text/Cell.idl
index 7ee4e5816..960b33df5 100644
--- a/offapi/com/sun/star/text/Cell.idl
+++ b/offapi/com/sun/star/text/Cell.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_text_Cell_idl__
 #define __com_sun_star_text_Cell_idl__
 
-#ifndef __com_sun_star_text_CellProperties_idl__
 #include <com/sun/star/text/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellProperties_idl__
 #include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/CellProperties.idl b/offapi/com/sun/star/text/CellProperties.idl
index db80a8e80..c6ebe1643 100644
--- a/offapi/com/sun/star/text/CellProperties.idl
+++ b/offapi/com/sun/star/text/CellProperties.idl
@@ -27,29 +27,13 @@
 #ifndef __com_sun_star_text_CellProperties_idl__
 #define __com_sun_star_text_CellProperties_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSection_idl__
 #include <com/sun/star/text/XTextSection.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/CellRange.idl b/offapi/com/sun/star/text/CellRange.idl
index 09b5fd2b7..b68a7e021 100644
--- a/offapi/com/sun/star/text/CellRange.idl
+++ b/offapi/com/sun/star/text/CellRange.idl
@@ -27,49 +27,19 @@
 #ifndef __com_sun_star_text_CellRange_idl__
 #define __com_sun_star_text_CellRange_idl__
 
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
 #include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_Complex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
 #include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
 #include <com/sun/star/chart/XChartDataArray.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/ChainedTextFrame.idl b/offapi/com/sun/star/text/ChainedTextFrame.idl
index 772fb3332..e3b7cff8d 100644
--- a/offapi/com/sun/star/text/ChainedTextFrame.idl
+++ b/offapi/com/sun/star/text/ChainedTextFrame.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_ChainedTextFrame_idl__ 
 #define __com_sun_star_text_ChainedTextFrame_idl__ 
  
-#ifndef __com_sun_star_text_TextFrame_idl__ 
 #include <com/sun/star/text/TextFrame.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XChainable_idl__ 
 #include <com/sun/star/util/XChainable.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/ChapterNumberingRule.idl b/offapi/com/sun/star/text/ChapterNumberingRule.idl
index d79a4b67e..2fd848910 100644
--- a/offapi/com/sun/star/text/ChapterNumberingRule.idl
+++ b/offapi/com/sun/star/text/ChapterNumberingRule.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_ChapterNumberingRule_idl__ 
 #define __com_sun_star_text_ChapterNumberingRule_idl__ 
  
-#ifndef __com_sun_star_style_NumberingRule_idl__ 
 #include <com/sun/star/style/NumberingRule.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/ContentIndexMark.idl b/offapi/com/sun/star/text/ContentIndexMark.idl
index 76a66d58a..22ad20471 100644
--- a/offapi/com/sun/star/text/ContentIndexMark.idl
+++ b/offapi/com/sun/star/text/ContentIndexMark.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_ContentIndexMark_idl__
 #define __com_sun_star_text_ContentIndexMark_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_BaseIndexMark_idl__
 #include <com/sun/star/text/BaseIndexMark.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Defaults.idl b/offapi/com/sun/star/text/Defaults.idl
index d3b3cabaf..195470507 100644
--- a/offapi/com/sun/star/text/Defaults.idl
+++ b/offapi/com/sun/star/text/Defaults.idl
@@ -27,28 +27,13 @@
 #ifndef __com_sun_star_text_Defaults_idl__
 #define __com_sun_star_text_Defaults_idl__
 
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/DependentTextField.idl b/offapi/com/sun/star/text/DependentTextField.idl
index be2408393..c6e3cbd6f 100644
--- a/offapi/com/sun/star/text/DependentTextField.idl
+++ b/offapi/com/sun/star/text/DependentTextField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_DependentTextField_idl__ 
 #define __com_sun_star_text_DependentTextField_idl__ 
  
-#ifndef __com_sun_star_text_TextField_idl__ 
 #include <com/sun/star/text/TextField.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XDependentTextField_idl__ 
 #include <com/sun/star/text/XDependentTextField.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/DocumentIndex.idl b/offapi/com/sun/star/text/DocumentIndex.idl
index c3cb5c46f..64157b2b1 100644
--- a/offapi/com/sun/star/text/DocumentIndex.idl
+++ b/offapi/com/sun/star/text/DocumentIndex.idl
@@ -30,9 +30,7 @@
 #define __com_sun_star_text_DocumentIndex_idl__
 
 #include <com/sun/star/text/BaseIndex.idl>
-#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
 #include <com/sun/star/text/XDocumentIndexMark.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
index 5d6c7d8c3..7897da79f 100644
--- a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
+++ b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_DocumentIndex_idl__ 
 #define __com_sun_star_text_DocumentIndex_idl__ 
  
-#ifndef _com_sun_star_container_XIndexReplace_idl__ 
 #include <com/sun/star/container/XIndexReplace.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/DocumentIndexMark.idl b/offapi/com/sun/star/text/DocumentIndexMark.idl
index a3032b5be..a07e50697 100644
--- a/offapi/com/sun/star/text/DocumentIndexMark.idl
+++ b/offapi/com/sun/star/text/DocumentIndexMark.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_DocumentIndexMark_idl__
 #define __com_sun_star_text_DocumentIndexMark_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_BaseIndexMark_idl__
 #include <com/sun/star/text/BaseIndexMark.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
index 411fb4fb6..444a1e9f7 100644
--- a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
+++ b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_DocumentIndex_idl__ 
 #define __com_sun_star_text_DocumentIndex_idl__ 
  
-#ifndef _com_sun_star_container_XIndexReplace_idl__ 
 #include <com/sun/star/container/XIndexReplace.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/DocumentIndexes.idl b/offapi/com/sun/star/text/DocumentIndexes.idl
index 204d95713..d23c2aaa7 100644
--- a/offapi/com/sun/star/text/DocumentIndexes.idl
+++ b/offapi/com/sun/star/text/DocumentIndexes.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_DocumentIndexes_idl__
 #define __com_sun_star_text_DocumentIndexes_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentSettings.idl b/offapi/com/sun/star/text/DocumentSettings.idl
index a6ee4f5cb..6d17938e2 100644
--- a/offapi/com/sun/star/text/DocumentSettings.idl
+++ b/offapi/com/sun/star/text/DocumentSettings.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_TextDocumentSettings_idl__
 #define __com_sun_star_text_TextDocumentSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_document_Settings_idl__
 #include <com/sun/star/document/Settings.idl>
-#endif
-
-#ifndef __com_sun_star_text_PrintSettings_idl__
 #include <com/sun/star/text/PrintSettings.idl>
-#endif
-
-#ifndef __com_sun_star_text_PrintPreviewSettings_idl__
 #include <com/sun/star/text/PrintPreviewSettings.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/Endnote.idl b/offapi/com/sun/star/text/Endnote.idl
index 9b4e0f216..17ccdb8e6 100644
--- a/offapi/com/sun/star/text/Endnote.idl
+++ b/offapi/com/sun/star/text/Endnote.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_Endnote_idl__
 #define __com_sun_star_text_Endnote_idl__
 
-#ifndef __com_sun_star_text_Footnote_idl__
 #include <com/sun/star/text/Footnote.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/EndnoteSettings.idl b/offapi/com/sun/star/text/EndnoteSettings.idl
index bc02e44fd..46fa41342 100644
--- a/offapi/com/sun/star/text/EndnoteSettings.idl
+++ b/offapi/com/sun/star/text/EndnoteSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_EndnoteSettings_idl__
 #define __com_sun_star_text_EndnoteSettings_idl__
 
-#ifndef __com_sun_star_text_FootnoteSettings_idl__
 #include <com/sun/star/text/FootnoteSettings.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/Footnote.idl b/offapi/com/sun/star/text/Footnote.idl
index df126fbe1..968535b05 100644
--- a/offapi/com/sun/star/text/Footnote.idl
+++ b/offapi/com/sun/star/text/Footnote.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_Footnote_idl__
 #define __com_sun_star_text_Footnote_idl__
 
-#ifndef __com_sun_star_text_XFootnote_idl__
 #include <com/sun/star/text/XFootnote.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Footnotes.idl b/offapi/com/sun/star/text/Footnotes.idl
index c68b2d5dd..bccacf4dd 100644
--- a/offapi/com/sun/star/text/Footnotes.idl
+++ b/offapi/com/sun/star/text/Footnotes.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_Footnotes_idl__ 
 #define __com_sun_star_text_Footnotes_idl__ 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/GenericTextDocument.idl b/offapi/com/sun/star/text/GenericTextDocument.idl
index 2f0739dcc..7c5955771 100644
--- a/offapi/com/sun/star/text/GenericTextDocument.idl
+++ b/offapi/com/sun/star/text/GenericTextDocument.idl
@@ -27,97 +27,29 @@
 #ifndef __com_sun_star_text_GenericTextDocument_idl__
 #define __com_sun_star_text_GenericTextDocument_idl__
 
-#ifndef __com_sun_star_document_OfficeDocument_idl__
 #include <com/sun/star/document/OfficeDocument.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextDocument_idl__
 #include <com/sun/star/text/XTextDocument.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSearchable_idl__
 #include <com/sun/star/util/XSearchable.idl>
-#endif
-
-#ifndef _com_sun_star_util_XRefreshable_idl_
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFootnotesSupplier_idl__
 #include <com/sun/star/text/XFootnotesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XEndnotesSupplier_idl__
 #include <com/sun/star/text/XEndnotesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XReplaceable_idl__
 #include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XPagePrintable_idl__
 #include <com/sun/star/text/XPagePrintable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__
 #include <com/sun/star/text/XReferenceMarksSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__
 #include <com/sun/star/text/XLineNumberingSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__
 #include <com/sun/star/text/XChapterNumberingSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
 #include <com/sun/star/text/XTextGraphicObjectsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
 #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTablesSupplier_idl__
 #include <com/sun/star/text/XTextTablesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XBookmarksSupplier_idl__
 #include <com/sun/star/text/XBookmarksSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndexesSupplier_idl__
 #include <com/sun/star/text/XDocumentIndexesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFieldsSupplier_idl__
 #include <com/sun/star/text/XTextFieldsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFramesSupplier_idl__
 #include <com/sun/star/text/XTextFramesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSectionsSupplier_idl__
 #include <com/sun/star/text/XTextSectionsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/GlobalDocument.idl b/offapi/com/sun/star/text/GlobalDocument.idl
index a2229f2b1..a4ffd1584 100644
--- a/offapi/com/sun/star/text/GlobalDocument.idl
+++ b/offapi/com/sun/star/text/GlobalDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_GlobalDocument_idl__
 #define __com_sun_star_text_GlobalDocument_idl__
 
-#ifndef __com_sun_star_text_GenericTextDocument_idl__
 #include <com/sun/star/text/GenericTextDocument.idl>
-#endif
 
 //=============================================================================
 
@@ -38,8 +36,10 @@
 //=============================================================================
 
 /** Specify the document service of the global text module.
+
+    @deprecated
  */
-service GlobalDocument
+published service GlobalDocument
 {
     /** Provides the functionality of such global document. */
     service GenericTextDocument;
diff --git a/offapi/com/sun/star/text/GlobalSettings.idl b/offapi/com/sun/star/text/GlobalSettings.idl
index 7d83a1740..831e0d9f3 100644
--- a/offapi/com/sun/star/text/GlobalSettings.idl
+++ b/offapi/com/sun/star/text/GlobalSettings.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_BaseFrame_idl__
 #define __com_sun_star_text_BaseFrame_idl__
 
-#ifndef __com_sun_star_view_XPrintSettingsSupplier_idl__
 #include <com/sun/star/view/XPrintSettingsSupplier.idl>
-#endif
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
 #include <com/sun/star/view/XViewSettingsSupplier.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/text/HypertextDocument.idl b/offapi/com/sun/star/text/HypertextDocument.idl
index f71e6b195..414ad9e0f 100644
--- a/offapi/com/sun/star/text/HypertextDocument.idl
+++ b/offapi/com/sun/star/text/HypertextDocument.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_text_HypertextDocument_idl__ 
 #define __com_sun_star_text_HypertextDocument_idl__ 
  
-#ifndef __com_sun_star_text_TextDocument_idl__ 
 #include <com/sun/star/text/TextDocument.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__ 
 #include <com/sun/star/text/XTextGraphicObjectsSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__ 
 #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextTablesSupplier_idl__ 
 #include <com/sun/star/text/XTextTablesSupplier.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/InContentMetadata.idl b/offapi/com/sun/star/text/InContentMetadata.idl
index d08c534b3..1250de6de 100644
--- a/offapi/com/sun/star/text/InContentMetadata.idl
+++ b/offapi/com/sun/star/text/InContentMetadata.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_text_InContentMetadata_idl__
 #define __com_sun_star_text_InContentMetadata_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
 #include <com/sun/star/rdf/XMetadatable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/InvalidTextContentException.idl b/offapi/com/sun/star/text/InvalidTextContentException.idl
index 8cdc027ce..536f7d541 100644
--- a/offapi/com/sun/star/text/InvalidTextContentException.idl
+++ b/offapi/com/sun/star/text/InvalidTextContentException.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_InvalidTextContentException_idl__ 
 #define __com_sun_star_text_InvalidTextContentException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/LineNumberingProperties.idl b/offapi/com/sun/star/text/LineNumberingProperties.idl
index 352997c8f..f440358dd 100644
--- a/offapi/com/sun/star/text/LineNumberingProperties.idl
+++ b/offapi/com/sun/star/text/LineNumberingProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_LineNumberingProperties_idl__
 #define __com_sun_star_text_LineNumberingProperties_idl__
 
-#ifndef __com_sun_star_text_XLineNumberingProperties_idl__
 #include <com/sun/star/text/XLineNumberingProperties.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/MailMerge.idl b/offapi/com/sun/star/text/MailMerge.idl
index b2b7613e9..cc3d138e1 100644
--- a/offapi/com/sun/star/text/MailMerge.idl
+++ b/offapi/com/sun/star/text/MailMerge.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_text_MailMerge_idl__
 #define __com_sun_star_text_MailMerge_idl__
 
-#ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
 #include <com/sun/star/sdbc/XConnection.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_text_XMailMergeBroadcaster_idl__
 #include <com/sun/star/text/XMailMergeBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_sdb_DataAccessDescriptor_idl__
 #include <com/sun/star/sdb/DataAccessDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/MailMergeEvent.idl b/offapi/com/sun/star/text/MailMergeEvent.idl
index 29682641e..dfa93c728 100644
--- a/offapi/com/sun/star/text/MailMergeEvent.idl
+++ b/offapi/com/sun/star/text/MailMergeEvent.idl
@@ -29,12 +29,8 @@
 
 
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/NumberingLevel.idl b/offapi/com/sun/star/text/NumberingLevel.idl
index f6b51b5c9..f50eaf13c 100644
--- a/offapi/com/sun/star/text/NumberingLevel.idl
+++ b/offapi/com/sun/star/text/NumberingLevel.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_text_NumberingLevel_idl__
 #define __com_sun_star_text_NumberingLevel_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/NumberingRules.idl b/offapi/com/sun/star/text/NumberingRules.idl
index 8fb861118..ada5b7816 100644
--- a/offapi/com/sun/star/text/NumberingRules.idl
+++ b/offapi/com/sun/star/text/NumberingRules.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_NumberingRules_idl__
 #define __com_sun_star_text_NumberingRules_idl__
 
-#ifndef __com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/NumberingStyle.idl b/offapi/com/sun/star/text/NumberingStyle.idl
index 8ab4fe219..3fa0e34a7 100644
--- a/offapi/com/sun/star/text/NumberingStyle.idl
+++ b/offapi/com/sun/star/text/NumberingStyle.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_style_NumberingStyle_idl__
 #define __com_sun_star_style_NumberingStyle_idl__
 
-#ifndef __com_sun_star_style_Style_idl__
 #include <com/sun/star/style/Style.idl>
-#endif
-#ifndef __com_sun_star_text_NumberingRules_idl__
 #include <com/sun/star/text/NumberingRules.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/PageFootnoteInfo.idl b/offapi/com/sun/star/text/PageFootnoteInfo.idl
index 224dd3bab..09dbcb7c0 100644
--- a/offapi/com/sun/star/text/PageFootnoteInfo.idl
+++ b/offapi/com/sun/star/text/PageFootnoteInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_PageFootnoteInfo_idl__ 
 #define __com_sun_star_text_PageFootnoteInfo_idl__ 
  
-#ifndef __com_sun_star_text_HorizontalAdjust_idl__ 
 #include <com/sun/star/text/HorizontalAdjust.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/Paragraph.idl b/offapi/com/sun/star/text/Paragraph.idl
index 6712ee738..7af4b0800 100644
--- a/offapi/com/sun/star/text/Paragraph.idl
+++ b/offapi/com/sun/star/text/Paragraph.idl
@@ -27,49 +27,18 @@
 #ifndef __com_sun_star_text_Paragraph_idl__
 #define __com_sun_star_text_Paragraph_idl__
 
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 #include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextTable_idl__
 #include <com/sun/star/text/TextTable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/ParagraphEnumeration.idl b/offapi/com/sun/star/text/ParagraphEnumeration.idl
index bb11718ab..927eaa61e 100644
--- a/offapi/com/sun/star/text/ParagraphEnumeration.idl
+++ b/offapi/com/sun/star/text/ParagraphEnumeration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_ParagraphEnumeration_idl__ 
 #define __com_sun_star_text_ParagraphEnumeration_idl__ 
  
-#ifndef __com_sun_star_container_XEnumeration_idl__ 
 #include <com/sun/star/container/XEnumeration.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/PrintPreviewSettings.idl b/offapi/com/sun/star/text/PrintPreviewSettings.idl
index 41ea68211..dc82a3af3 100644
--- a/offapi/com/sun/star/text/PrintPreviewSettings.idl
+++ b/offapi/com/sun/star/text/PrintPreviewSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_PrintPreviewSettings_idl__ 
 #define __com_sun_star_text_PrintPreviewSettings_idl__ 
  
-#ifndef __com_sun_star_text_NotePrintMode_idl__ 
 #include <com/sun/star/text/NotePrintMode.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/PrintSettings.idl b/offapi/com/sun/star/text/PrintSettings.idl
index 5a2465815..31355cb41 100644
--- a/offapi/com/sun/star/text/PrintSettings.idl
+++ b/offapi/com/sun/star/text/PrintSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_PrintSettings_idl__
 #define __com_sun_star_text_PrintSettings_idl__
 
-#ifndef __com_sun_star_text_NotePrintMode_idl__
 #include <com/sun/star/text/NotePrintMode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/RedlinePortion.idl b/offapi/com/sun/star/text/RedlinePortion.idl
index 42f0524ff..ee61ea396 100644
--- a/offapi/com/sun/star/text/RedlinePortion.idl
+++ b/offapi/com/sun/star/text/RedlinePortion.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_text_RedlinePortion_idl__
 #define __com_sun_star_text_RedlinePortion_idl__
 
-#ifndef __com_sun_star_text_TextPortion_idl__
 #include <com/sun/star/text/TextPortion.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/ReferenceMark.idl b/offapi/com/sun/star/text/ReferenceMark.idl
index 1820a813c..c1c5d674b 100644
--- a/offapi/com/sun/star/text/ReferenceMark.idl
+++ b/offapi/com/sun/star/text/ReferenceMark.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_ReferenceMark_idl__
 #define __com_sun_star_text_ReferenceMark_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/ReferenceMarks.idl b/offapi/com/sun/star/text/ReferenceMarks.idl
index 08aaa0d1d..ccaac7100 100644
--- a/offapi/com/sun/star/text/ReferenceMarks.idl
+++ b/offapi/com/sun/star/text/ReferenceMarks.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_ReferenceMarks_idl__
 #define __com_sun_star_text_ReferenceMarks_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Shape.idl b/offapi/com/sun/star/text/Shape.idl
index 08ee925d7..a28cd9728 100644
--- a/offapi/com/sun/star/text/Shape.idl
+++ b/offapi/com/sun/star/text/Shape.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_text_Shape_idl__
 #define __com_sun_star_text_Shape_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_XTextFrame_idl__
 #include <com/sun/star/text/XTextFrame.idl>
-#endif
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_text_TextContentAnchorType_idl__
 #include <com/sun/star/text/TextContentAnchorType.idl>
-#endif
-#ifndef __com_sun_star_text_WrapTextMode_idl__
 #include <com/sun/star/text/WrapTextMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TableColumns.idl b/offapi/com/sun/star/text/TableColumns.idl
index b89cdf80c..c6d2ce78e 100644
--- a/offapi/com/sun/star/text/TableColumns.idl
+++ b/offapi/com/sun/star/text/TableColumns.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableColumns_idl__
 #define __com_sun_star_table_TableColumns_idl__
 
-#ifndef __com_sun_star_table_XTableColumns_idl__
 #include <com/sun/star/table/XTableColumns.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TableRows.idl b/offapi/com/sun/star/text/TableRows.idl
index 48df1d5f6..19d6018b4 100644
--- a/offapi/com/sun/star/text/TableRows.idl
+++ b/offapi/com/sun/star/text/TableRows.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_TableRows_idl__
 #define __com_sun_star_table_TableRows_idl__
 
-#ifndef __com_sun_star_table_XTableRows_idl__
 #include <com/sun/star/table/XTableRows.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/Text.idl b/offapi/com/sun/star/text/Text.idl
index 7d49cf8be..65d73df03 100644
--- a/offapi/com/sun/star/text/Text.idl
+++ b/offapi/com/sun/star/text/Text.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_text_Text_idl__
 #define __com_sun_star_text_Text_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextColumnSequence.idl b/offapi/com/sun/star/text/TextColumnSequence.idl
index 8494098fe..9f5002fec 100644
--- a/offapi/com/sun/star/text/TextColumnSequence.idl
+++ b/offapi/com/sun/star/text/TextColumnSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextColumnSequence_idl__
 #define __com_sun_star_text_TextColumnSequence_idl__
 
-#ifndef __com_sun_star_text_TextColumn_idl__
 #include <com/sun/star/text/TextColumn.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextColumns.idl b/offapi/com/sun/star/text/TextColumns.idl
index 0a1ea7bec..57deaebe2 100644
--- a/offapi/com/sun/star/text/TextColumns.idl
+++ b/offapi/com/sun/star/text/TextColumns.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_TextColumns_idl__
 #define __com_sun_star_text_TextColumns_idl__
 
-#ifndef __com_sun_star_text_XTextColumns_idl__
 #include <com/sun/star/text/XTextColumns.idl>
-#endif
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextContent.idl b/offapi/com/sun/star/text/TextContent.idl
index 6d2cc5e83..9535bd14c 100644
--- a/offapi/com/sun/star/text/TextContent.idl
+++ b/offapi/com/sun/star/text/TextContent.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_TextContent_idl__
 #define __com_sun_star_text_TextContent_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContentAnchorType_idl__
 #include <com/sun/star/text/TextContentAnchorType.idl>
-#endif
-
-#ifndef __com_sun_star_text_WrapTextMode_idl__
 #include <com/sun/star/text/WrapTextMode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextContentCollection.idl b/offapi/com/sun/star/text/TextContentCollection.idl
index 602e690b5..f5beaa7d0 100644
--- a/offapi/com/sun/star/text/TextContentCollection.idl
+++ b/offapi/com/sun/star/text/TextContentCollection.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_TextContentCollection_idl__ 
 #define __com_sun_star_text_TextContentCollection_idl__ 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XContainer_idl__ 
 #include <com/sun/star/container/XContainer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/TextCursor.idl b/offapi/com/sun/star/text/TextCursor.idl
index c7902f989..784a1b077 100644
--- a/offapi/com/sun/star/text/TextCursor.idl
+++ b/offapi/com/sun/star/text/TextCursor.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_text_TextCursor_idl__
 #define __com_sun_star_text_TextCursor_idl__
 
-#ifndef __com_sun_star_text_TextRange_idl__
 #include <com/sun/star/text/TextRange.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextCursor_idl__
 #include <com/sun/star/text/XTextCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XWordCursor_idl__
 #include <com/sun/star/text/XWordCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XSentenceCursor_idl__
 #include <com/sun/star/text/XSentenceCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XParagraphCursor_idl__
 #include <com/sun/star/text/XParagraphCursor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertyStates_idl__
 #include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
-
-#ifndef __com_sun_star_document_XDocumentInsertable_idl__
 #include <com/sun/star/document/XDocumentInsertable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
 #include <com/sun/star/util/XSortable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextDocument.idl b/offapi/com/sun/star/text/TextDocument.idl
index 7db6e291d..a4da4639b 100644
--- a/offapi/com/sun/star/text/TextDocument.idl
+++ b/offapi/com/sun/star/text/TextDocument.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextDocument_idl__
 #define __com_sun_star_text_TextDocument_idl__
 
-#ifndef __com_sun_star_text_GenericTextDocument_idl__
 #include <com/sun/star/text/GenericTextDocument.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextDocumentView.idl b/offapi/com/sun/star/text/TextDocumentView.idl
index 31e869e71..d6c229f61 100644
--- a/offapi/com/sun/star/text/TextDocumentView.idl
+++ b/offapi/com/sun/star/text/TextDocumentView.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_text_TextDocumentView_idl__ 
 #define __com_sun_star_text_TextDocumentView_idl__ 
  
-#ifndef __com_sun_star_view_OfficeDocumentView_idl__ 
 #include <com/sun/star/view/OfficeDocumentView.idl> 
-#endif 
  
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__ 
 #include <com/sun/star/view/XViewSettingsSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextViewCursorSupplier_idl__ 
 #include <com/sun/star/text/XTextViewCursorSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/TextEmbeddedObject.idl b/offapi/com/sun/star/text/TextEmbeddedObject.idl
index ae15d2db2..2c877d26e 100644
--- a/offapi/com/sun/star/text/TextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/TextEmbeddedObject.idl
@@ -27,16 +27,9 @@
 #ifndef __com_sun_star_text_TextEmbeddedObject_idl__
 #define __com_sun_star_text_TextEmbeddedObject_idl__
 
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
 #include <com/sun/star/document/XEmbeddedObjectSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_BaseFrame_idl__
 #include <com/sun/star/text/BaseFrame.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextEmbeddedObjects.idl b/offapi/com/sun/star/text/TextEmbeddedObjects.idl
index 420a8d8a3..74e883c9c 100644
--- a/offapi/com/sun/star/text/TextEmbeddedObjects.idl
+++ b/offapi/com/sun/star/text/TextEmbeddedObjects.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextEmbeddedObjects_idl__
 #define __com_sun_star_text_TextEmbeddedObjects_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextField.idl b/offapi/com/sun/star/text/TextField.idl
index b4a2a6352..ceba5f659 100644
--- a/offapi/com/sun/star/text/TextField.idl
+++ b/offapi/com/sun/star/text/TextField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_TextField_idl__ 
 #define __com_sun_star_text_TextField_idl__ 
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_TextContent_idl__ 
 #include <com/sun/star/text/TextContent.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_XTextField_idl__ 
 #include <com/sun/star/text/XTextField.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/TextFieldEnumeration.idl b/offapi/com/sun/star/text/TextFieldEnumeration.idl
index a40a70d70..28ee13edf 100644
--- a/offapi/com/sun/star/text/TextFieldEnumeration.idl
+++ b/offapi/com/sun/star/text/TextFieldEnumeration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextFieldEnumeration_idl__
 #define __com_sun_star_text_TextFieldEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextFieldMaster.idl b/offapi/com/sun/star/text/TextFieldMaster.idl
index bee5e4b0c..afea7b1a4 100644
--- a/offapi/com/sun/star/text/TextFieldMaster.idl
+++ b/offapi/com/sun/star/text/TextFieldMaster.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_TextFieldMaster_idl__
 #define __com_sun_star_text_TextFieldMaster_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_text_XDependentTextField_idl__
 #include <com/sun/star/text/XDependentTextField.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextFieldMasters.idl b/offapi/com/sun/star/text/TextFieldMasters.idl
index 289d32070..51fd89b5c 100644
--- a/offapi/com/sun/star/text/TextFieldMasters.idl
+++ b/offapi/com/sun/star/text/TextFieldMasters.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextFieldMasters_idl__
 #define __com_sun_star_text_TextFieldMasters_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextFields.idl b/offapi/com/sun/star/text/TextFields.idl
index 3e8a0637a..1bc0b9b5b 100644
--- a/offapi/com/sun/star/text/TextFields.idl
+++ b/offapi/com/sun/star/text/TextFields.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextFields_idl__ 
 #define __com_sun_star_text_TextFields_idl__ 
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl> 
-#endif 
-
-#ifndef __com_sun_star_util_XRefreshable_idl__ 
 #include <com/sun/star/util/XRefreshable.idl> 
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/text/TextFrame.idl b/offapi/com/sun/star/text/TextFrame.idl
index d10bcbc1d..a279b5d56 100644
--- a/offapi/com/sun/star/text/TextFrame.idl
+++ b/offapi/com/sun/star/text/TextFrame.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextFrame_idl__
 #define __com_sun_star_text_TextFrame_idl__
 
-#ifndef __com_sun_star_text_XTextFrame_idl__
 #include <com/sun/star/text/XTextFrame.idl>
-#endif
-
-#ifndef __com_sun_star_text_BaseFrame_idl__
 #include <com/sun/star/text/BaseFrame.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextFrames.idl b/offapi/com/sun/star/text/TextFrames.idl
index 9f459d194..be6b2df3e 100644
--- a/offapi/com/sun/star/text/TextFrames.idl
+++ b/offapi/com/sun/star/text/TextFrames.idl
@@ -27,16 +27,9 @@
 #ifndef __com_sun_star_text_TextFrames_idl__
 #define __com_sun_star_text_TextFrames_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextGraphicObject.idl b/offapi/com/sun/star/text/TextGraphicObject.idl
index d06fbfc78..6f9251aae 100644
--- a/offapi/com/sun/star/text/TextGraphicObject.idl
+++ b/offapi/com/sun/star/text/TextGraphicObject.idl
@@ -27,26 +27,12 @@
 #ifndef __com_sun_star_text_TextGraphicObject_idl__
 #define __com_sun_star_text_TextGraphicObject_idl__
 
-#ifndef __com_sun_star_text_BaseFrame_idl__
 #include <com/sun/star/text/BaseFrame.idl>
-#endif
-
-#ifndef __com_sun_star_text_GraphicCrop_idl__
 #include <com/sun/star/text/GraphicCrop.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
 #include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
-#ifndef __com_sun_star_drawing_ColorMode_idl__
 #include <com/sun/star/drawing/ColorMode.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextGraphicObjects.idl b/offapi/com/sun/star/text/TextGraphicObjects.idl
index 8f9e3193d..19616be4f 100644
--- a/offapi/com/sun/star/text/TextGraphicObjects.idl
+++ b/offapi/com/sun/star/text/TextGraphicObjects.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextGraphicObjects_idl__
 #define __com_sun_star_text_TextGraphicObjects_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextLayoutCursor.idl b/offapi/com/sun/star/text/TextLayoutCursor.idl
index 6ca0c6c7f..8618ce7da 100644
--- a/offapi/com/sun/star/text/TextLayoutCursor.idl
+++ b/offapi/com/sun/star/text/TextLayoutCursor.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextLayoutCursor_idl__ 
 #define __com_sun_star_text_TextLayoutCursor_idl__ 
 
-#ifndef __com_sun_star_text_TextCursor_idl__ 
 #include <com/sun/star/text/TextCursor.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_XPageCursor_idl__ 
 #include <com/sun/star/text/XPageCursor.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/TextMarkupDescriptor.idl b/offapi/com/sun/star/text/TextMarkupDescriptor.idl
index e5abc252f..10539b634 100644
--- a/offapi/com/sun/star/text/TextMarkupDescriptor.idl
+++ b/offapi/com/sun/star/text/TextMarkupDescriptor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_text_TextMarkupDescriptor_idl__
 #define __com_sun_star_text_TextMarkupDescriptor_idl__
 
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
 #include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextMarkupType_idl__
 #include <com/sun/star/text/TextMarkupType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextPageStyle.idl b/offapi/com/sun/star/text/TextPageStyle.idl
index e2ccbf7df..c93b053f3 100644
--- a/offapi/com/sun/star/text/TextPageStyle.idl
+++ b/offapi/com/sun/star/text/TextPageStyle.idl
@@ -28,34 +28,15 @@
 #ifndef __com_sun_star_text_TextPageStyle_idl__
 #define __com_sun_star_text_TextPageStyle_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_style_PageStyleLayout_idl__
 #include <com/sun/star/style/PageStyleLayout.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
-#ifndef __com_sun_star_text_XTextColumns_idl__
 #include <com/sun/star/text/XTextColumns.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextPortion.idl b/offapi/com/sun/star/text/TextPortion.idl
index 601c25222..5c4c5a6c4 100644
--- a/offapi/com/sun/star/text/TextPortion.idl
+++ b/offapi/com/sun/star/text/TextPortion.idl
@@ -28,29 +28,12 @@
 #define __com_sun_star_text_TextPortion_idl__
 
 
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 #include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
 #include <com/sun/star/container/XContentEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextRange_idl__
 #include <com/sun/star/text/TextRange.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextField_idl__
 #include <com/sun/star/text/XTextField.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFootnote_idl__
 #include <com/sun/star/text/XFootnote.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextPortionEnumeration.idl b/offapi/com/sun/star/text/TextPortionEnumeration.idl
index f4454536e..b9a7845ef 100644
--- a/offapi/com/sun/star/text/TextPortionEnumeration.idl
+++ b/offapi/com/sun/star/text/TextPortionEnumeration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextPortionEnumeration_idl__
 #define __com_sun_star_text_TextPortionEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextRange.idl b/offapi/com/sun/star/text/TextRange.idl
index 8679b8b43..8389a6e4f 100644
--- a/offapi/com/sun/star/text/TextRange.idl
+++ b/offapi/com/sun/star/text/TextRange.idl
@@ -27,40 +27,16 @@
 #ifndef __com_sun_star_text_TextRange_idl__
 #define __com_sun_star_text_TextRange_idl__
 
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
 #include <com/sun/star/container/XContentEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextRangeContentProperties.idl b/offapi/com/sun/star/text/TextRangeContentProperties.idl
index 74acb67cf..c425dbbe3 100644
--- a/offapi/com/sun/star/text/TextRangeContentProperties.idl
+++ b/offapi/com/sun/star/text/TextRangeContentProperties.idl
@@ -28,37 +28,14 @@
 #ifndef __com_sun_star_text_TextRangeContentProperties_idl__
 #define __com_sun_star_text_TextRangeContentProperties_idl__
 
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndex_idl__
 #include <com/sun/star/text/XDocumentIndex.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTable_idl__
 #include <com/sun/star/text/XTextTable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFrame_idl__
 #include <com/sun/star/text/XTextFrame.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSection_idl__
 #include <com/sun/star/text/XTextSection.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
 #include <com/sun/star/text/XDocumentIndexMark.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFootnote_idl__
 #include <com/sun/star/text/XFootnote.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextRanges.idl b/offapi/com/sun/star/text/TextRanges.idl
index a6c6b3352..e5565d834 100644
--- a/offapi/com/sun/star/text/TextRanges.idl
+++ b/offapi/com/sun/star/text/TextRanges.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextRanges_idl__ 
 #define __com_sun_star_text_TextRanges_idl__ 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/TextSection.idl b/offapi/com/sun/star/text/TextSection.idl
index be90446ca..d76692d5a 100644
--- a/offapi/com/sun/star/text/TextSection.idl
+++ b/offapi/com/sun/star/text/TextSection.idl
@@ -27,38 +27,15 @@
 #ifndef __com_sun_star_text_TextSection_idl__
 #define __com_sun_star_text_TextSection_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSection_idl__
 #include <com/sun/star/text/XTextSection.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_text_SectionFileLink_idl__
 #include <com/sun/star/text/SectionFileLink.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_text_XTextColumns_idl__
 #include <com/sun/star/text/XTextColumns.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextSections.idl b/offapi/com/sun/star/text/TextSections.idl
index 7a2011e0e..d3ca0bd57 100644
--- a/offapi/com/sun/star/text/TextSections.idl
+++ b/offapi/com/sun/star/text/TextSections.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_TextSections_idl__ 
 #define __com_sun_star_text_TextSections_idl__ 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/TextSortDescriptor.idl b/offapi/com/sun/star/text/TextSortDescriptor.idl
index 0d5df5595..ad484f89e 100644
--- a/offapi/com/sun/star/text/TextSortDescriptor.idl
+++ b/offapi/com/sun/star/text/TextSortDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextSortDescriptor_idl__ 
 #define __com_sun_star_text_TextSortDescriptor_idl__ 
  
-#ifndef __com_sun_star_util_SortDescriptor_idl__ 
 #include <com/sun/star/util/SortDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/TextSortDescriptor2.idl b/offapi/com/sun/star/text/TextSortDescriptor2.idl
index ae53b1f2c..ceada1e34 100644
--- a/offapi/com/sun/star/text/TextSortDescriptor2.idl
+++ b/offapi/com/sun/star/text/TextSortDescriptor2.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_text_TextSortDescriptor2_idl__ 
 #define __com_sun_star_text_TextSortDescriptor2_idl__ 
  
-#ifndef __com_sun_star_table_TableSortDescriptor2_idl__ 
 #include <com/sun/star/table/TableSortDescriptor2.idl> 
-#endif 
-#ifndef __com_sun_star_table_TableSortField_idl__ 
 #include <com/sun/star/table/TableSortField.idl> 
-#endif 
-#ifndef __com_sun_star_table_TableSortFieldType_idl__ 
 #include <com/sun/star/table/TableSortFieldType.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/TextSortable.idl b/offapi/com/sun/star/text/TextSortable.idl
index 6a6c6343f..defedad43 100644
--- a/offapi/com/sun/star/text/TextSortable.idl
+++ b/offapi/com/sun/star/text/TextSortable.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_TextSortable_idl__ 
 #define __com_sun_star_util_TextSortable_idl__ 
   
-#ifndef __com_sun_star_text_TextSortDescriptor_idl__ 
 #include <com/sun/star/text/TextSortDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_util_XSortable_idl__ 
 #include <com/sun/star/util/XSortable.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/TextTable.idl b/offapi/com/sun/star/text/TextTable.idl
index ed86dd212..d0520aa2e 100644
--- a/offapi/com/sun/star/text/TextTable.idl
+++ b/offapi/com/sun/star/text/TextTable.idl
@@ -27,59 +27,22 @@
 #ifndef __com_sun_star_text_TextTable_idl__
 #define __com_sun_star_text_TextTable_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTable_idl__
 #include <com/sun/star/text/XTextTable.idl>
-#endif
-#ifndef __com_sun_star_text_TableColumnSeparator_idl__
 #include <com/sun/star/text/TableColumnSeparator.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_style_BreakType_idl__
 #include <com/sun/star/style/BreakType.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_table_TableBorder_idl__
 #include <com/sun/star/table/TableBorder.idl>
-#endif
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
-#ifndef __com_sun_star_table_XAutoFormattable_idl__
 #include <com/sun/star/table/XAutoFormattable.idl>
-#endif
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
 #include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-#ifndef __com_sun_star_util_XSortable_idl__
 #include <com/sun/star/util/XSortable.idl>
-#endif
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
 #include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextTableCursor.idl b/offapi/com/sun/star/text/TextTableCursor.idl
index a53a16b3d..93222eb91 100644
--- a/offapi/com/sun/star/text/TextTableCursor.idl
+++ b/offapi/com/sun/star/text/TextTableCursor.idl
@@ -27,28 +27,13 @@
 #ifndef __com_sun_star_text_TextTableCursor_idl__
 #define __com_sun_star_text_TextTableCursor_idl__
 
-#ifndef __com_sun_star_text_XTextTableCursor_idl__
 #include <com/sun/star/text/XTextTableCursor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextTableRow.idl b/offapi/com/sun/star/text/TextTableRow.idl
index 19836bd04..47a42cff8 100644
--- a/offapi/com/sun/star/text/TextTableRow.idl
+++ b/offapi/com/sun/star/text/TextTableRow.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_TextTableRow_idl__
 #define __com_sun_star_text_TextTableRow_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-
-#ifndef __com_sun_star_text_TableColumnSeparator_idl__
 #include <com/sun/star/text/TableColumnSeparator.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextTables.idl b/offapi/com/sun/star/text/TextTables.idl
index f92b22bb5..a9fcc6418 100644
--- a/offapi/com/sun/star/text/TextTables.idl
+++ b/offapi/com/sun/star/text/TextTables.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_TextTables_idl__ 
 #define __com_sun_star_text_TextTables_idl__ 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/TextViewCursor.idl b/offapi/com/sun/star/text/TextViewCursor.idl
index 83f22ca7d..378e35605 100644
--- a/offapi/com/sun/star/text/TextViewCursor.idl
+++ b/offapi/com/sun/star/text/TextViewCursor.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextViewCursor_idl__ 
 #define __com_sun_star_text_TextViewCursor_idl__ 
 
-#ifndef __com_sun_star_text_TextLayoutCursor_idl__ 
 #include <com/sun/star/text/TextLayoutCursor.idl> 
-#endif 
-
-#ifndef __com_sun_star_view_XScreenCursor_idl__ 
 #include <com/sun/star/view/XScreenCursor.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/UserDefinedIndex.idl b/offapi/com/sun/star/text/UserDefinedIndex.idl
index cfd96f76a..525866571 100644
--- a/offapi/com/sun/star/text/UserDefinedIndex.idl
+++ b/offapi/com/sun/star/text/UserDefinedIndex.idl
@@ -30,9 +30,7 @@
 #define __com_sun_star_text_UserDefinedIndex_idl__
 
 #include <com/sun/star/text/BaseIndex.idl>
-#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
 #include <com/sun/star/text/XDocumentIndexMark.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/UserIndexMark.idl b/offapi/com/sun/star/text/UserIndexMark.idl
index ac84d8782..c931624f0 100644
--- a/offapi/com/sun/star/text/UserIndexMark.idl
+++ b/offapi/com/sun/star/text/UserIndexMark.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_UserIndexMark_idl__
 #define __com_sun_star_text_UserIndexMark_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_BaseIndexMark_idl__
 #include <com/sun/star/text/BaseIndexMark.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl
index 7d05f3659..61361af0d 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_text_ViewSettings_idl__
 #define __com_sun_star_text_ViewSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_view_DocumentZoomType_idl__
 #include <com/sun/star/view/DocumentZoomType.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/WebDocument.idl b/offapi/com/sun/star/text/WebDocument.idl
index 60060994c..4570ecd81 100644
--- a/offapi/com/sun/star/text/WebDocument.idl
+++ b/offapi/com/sun/star/text/WebDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_WebDocument_idl__
 #define __com_sun_star_text_WebDocument_idl__
 
-#ifndef __com_sun_star_text_GenericTextDocument_idl__
 #include <com/sun/star/text/GenericTextDocument.idl>
-#endif
 
 //=============================================================================
 
@@ -38,8 +36,10 @@
 //=============================================================================
 
 /** Specify the document service of the web module.
+
+    @deprecated
  */
-service WebDocument
+published service WebDocument
 {
     /** Provides the functionality of such web document. */
     service GenericTextDocument;
diff --git a/offapi/com/sun/star/text/XAutoTextContainer.idl b/offapi/com/sun/star/text/XAutoTextContainer.idl
index b1a7ee988..38d00278c 100644
--- a/offapi/com/sun/star/text/XAutoTextContainer.idl
+++ b/offapi/com/sun/star/text/XAutoTextContainer.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_text_XAutoTextContainer_idl__ 
 #define __com_sun_star_text_XAutoTextContainer_idl__ 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XAutoTextGroup_idl__ 
 #include <com/sun/star/text/XAutoTextGroup.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XAutoTextEntry.idl b/offapi/com/sun/star/text/XAutoTextEntry.idl
index 78b72cc1b..7c1849ffe 100644
--- a/offapi/com/sun/star/text/XAutoTextEntry.idl
+++ b/offapi/com/sun/star/text/XAutoTextEntry.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XAutoTextEntry_idl__ 
 #define __com_sun_star_text_XAutoTextEntry_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextRange_idl__ 
 #include <com/sun/star/text/XTextRange.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XAutoTextGroup.idl b/offapi/com/sun/star/text/XAutoTextGroup.idl
index e68e1269a..2fa07e19a 100644
--- a/offapi/com/sun/star/text/XAutoTextGroup.idl
+++ b/offapi/com/sun/star/text/XAutoTextGroup.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_text_XAutoTextGroup_idl__ 
 #define __com_sun_star_text_XAutoTextGroup_idl__ 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XAutoTextEntry_idl__ 
 #include <com/sun/star/text/XAutoTextEntry.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextRange_idl__ 
 #include <com/sun/star/text/XTextRange.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XBookmarkInsertTool.idl b/offapi/com/sun/star/text/XBookmarkInsertTool.idl
index f80e92f6d..611c5365a 100644
--- a/offapi/com/sun/star/text/XBookmarkInsertTool.idl
+++ b/offapi/com/sun/star/text/XBookmarkInsertTool.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_text_XBookmarkInsertTool_idl__ 
 #define __com_sun_star_text_XBookmarkInsertTool_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextRange_idl__ 
 #include <com/sun/star/text/XTextRange.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XBookmarksSupplier.idl b/offapi/com/sun/star/text/XBookmarksSupplier.idl
index 3fcf3cffb..3d52417bc 100644
--- a/offapi/com/sun/star/text/XBookmarksSupplier.idl
+++ b/offapi/com/sun/star/text/XBookmarksSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XBookmarksSupplier_idl__ 
 #define __com_sun_star_text_XBookmarksSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XChapterNumberingSupplier.idl b/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
index 038bf4adb..80c30cdad 100644
--- a/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
+++ b/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__ 
 #define __com_sun_star_text_XChapterNumberingSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexReplace_idl__ 
 #include <com/sun/star/container/XIndexReplace.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XDefaultNumberingProvider.idl b/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
index 0cc607ec2..fcc74ec42 100644
--- a/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
+++ b/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_text_XDefaultNumberingProvider_idl__
 #define __com_sun_star_text_XDefaultNumberingProvider_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 module com { module sun { module star { module text {
 
diff --git a/offapi/com/sun/star/text/XDependentTextField.idl b/offapi/com/sun/star/text/XDependentTextField.idl
index dca26be13..c4ab9c032 100644
--- a/offapi/com/sun/star/text/XDependentTextField.idl
+++ b/offapi/com/sun/star/text/XDependentTextField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_text_XDependentTextField_idl__ 
 #define __com_sun_star_text_XDependentTextField_idl__ 
  
-#ifndef __com_sun_star_text_XTextField_idl__ 
 #include <com/sun/star/text/XTextField.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XDocumentIndex.idl b/offapi/com/sun/star/text/XDocumentIndex.idl
index 05b24a8a5..ef6578b3b 100644
--- a/offapi/com/sun/star/text/XDocumentIndex.idl
+++ b/offapi/com/sun/star/text/XDocumentIndex.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XDocumentIndex_idl__ 
 #define __com_sun_star_text_XDocumentIndex_idl__ 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XDocumentIndexMark.idl b/offapi/com/sun/star/text/XDocumentIndexMark.idl
index 8748b19d7..84f601921 100644
--- a/offapi/com/sun/star/text/XDocumentIndexMark.idl
+++ b/offapi/com/sun/star/text/XDocumentIndexMark.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XDocumentIndexMark_idl__ 
 #define __com_sun_star_text_XDocumentIndexMark_idl__ 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl b/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
index 2da7deb2f..817fc41bc 100644
--- a/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
+++ b/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XDocumentIndexesSupplier_idl__ 
 #define __com_sun_star_text_XDocumentIndexesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl b/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
index c3c12d9dc..1b60b24f1 100644
--- a/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
+++ b/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XEndnotesSettingsSupplier_idl__ 
 #define __com_sun_star_text_XEndnotesSettingsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XEndnotesSupplier.idl b/offapi/com/sun/star/text/XEndnotesSupplier.idl
index 5eb2b48fd..5baefeb6e 100644
--- a/offapi/com/sun/star/text/XEndnotesSupplier.idl
+++ b/offapi/com/sun/star/text/XEndnotesSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_text_XEndnotesSupplier_idl__ 
 #define __com_sun_star_text_XEndnotesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XFlatParagraph.idl b/offapi/com/sun/star/text/XFlatParagraph.idl
index 2f5b709a7..da2624826 100644
--- a/offapi/com/sun/star/text/XFlatParagraph.idl
+++ b/offapi/com/sun/star/text/XFlatParagraph.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_text_XFlatParagraph_idl__
 #define __com_sun_star_text_XFlatParagraph_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextMarkup_idl__
 #include <com/sun/star/text/XTextMarkup.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XFlatParagraphIterator.idl b/offapi/com/sun/star/text/XFlatParagraphIterator.idl
index b0b75b7d8..12f2f3438 100644
--- a/offapi/com/sun/star/text/XFlatParagraphIterator.idl
+++ b/offapi/com/sun/star/text/XFlatParagraphIterator.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_text_XFlatParagraphIterator_idl__
 #define __com_sun_star_text_XFlatParagraphIterator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
 #include <com/sun/star/text/XFlatParagraph.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl b/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
index 1cc7c440a..0c5e7e492 100644
--- a/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
+++ b/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_text_XFlatParagraphIteratorProvider_idl__
 #define __com_sun_star_text_XFlatParagraphIteratorProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraphIterator_idl__
 #include <com/sun/star/text/XFlatParagraphIterator.idl>
-#endif
 
 //---------------------------------------Note----------------------------------
 //    allows for different iterators for grammar checking and smart tags,
diff --git a/offapi/com/sun/star/text/XFootnote.idl b/offapi/com/sun/star/text/XFootnote.idl
index 7f0d6f6fc..850aec555 100644
--- a/offapi/com/sun/star/text/XFootnote.idl
+++ b/offapi/com/sun/star/text/XFootnote.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XFootnote_idl__ 
 #define __com_sun_star_text_XFootnote_idl__ 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl b/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
index d7ed6af1f..f8453bd6f 100644
--- a/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
+++ b/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XFootnotesSettingsSupplier_idl__ 
 #define __com_sun_star_text_XFootnotesSettingsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XFootnotesSupplier.idl b/offapi/com/sun/star/text/XFootnotesSupplier.idl
index 3405469e5..8da81c810 100644
--- a/offapi/com/sun/star/text/XFootnotesSupplier.idl
+++ b/offapi/com/sun/star/text/XFootnotesSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_text_XFootnotesSupplier_idl__ 
 #define __com_sun_star_text_XFootnotesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XHeaderFooter.idl b/offapi/com/sun/star/text/XHeaderFooter.idl
index 592be757e..553fecc18 100644
--- a/offapi/com/sun/star/text/XHeaderFooter.idl
+++ b/offapi/com/sun/star/text/XHeaderFooter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_XHeaderFooter_idl__ 
 #define __com_sun_star_text_XHeaderFooter_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_XText_idl__ 
 #include <com/sun/star/text/XText.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl b/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
index b87178c22..126d0a3f7 100644
--- a/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
+++ b/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_XHeaderFooterPageStyle_idl__ 
 #define __com_sun_star_text_XHeaderFooterPageStyle_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_XHeaderFooter_idl__ 
 #include <com/sun/star/text/XHeaderFooter.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XLineNumberingProperties.idl b/offapi/com/sun/star/text/XLineNumberingProperties.idl
index 952c737ec..0e4824d57 100644
--- a/offapi/com/sun/star/text/XLineNumberingProperties.idl
+++ b/offapi/com/sun/star/text/XLineNumberingProperties.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_XLineNumberingProperties_idl__
 #define __com_sun_star_text_XLineNumberingProperties_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XLineNumberingSupplier.idl b/offapi/com/sun/star/text/XLineNumberingSupplier.idl
index d910c6f11..5bbea0a08 100644
--- a/offapi/com/sun/star/text/XLineNumberingSupplier.idl
+++ b/offapi/com/sun/star/text/XLineNumberingSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XLineNumberingSupplier_idl__ 
 #define __com_sun_star_text_XLineNumberingSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XMailMergeBroadcaster.idl b/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
index 83dfdbd8c..209adf8b2 100644
--- a/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
+++ b/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
@@ -28,12 +28,8 @@
 #define __com_sun_star_text_XMailMergeBroadcaster_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_XMailMergeListener_idl__
 #include <com/sun/star/text/XMailMergeListener.idl>
-#endif
 
 //module com { module sun { module star { module text {
 //     published interface XMailMergeListener;
diff --git a/offapi/com/sun/star/text/XMailMergeListener.idl b/offapi/com/sun/star/text/XMailMergeListener.idl
index 105acf96a..38cfa75a2 100644
--- a/offapi/com/sun/star/text/XMailMergeListener.idl
+++ b/offapi/com/sun/star/text/XMailMergeListener.idl
@@ -28,12 +28,8 @@
 #define __com_sun_star_text_XMailMergeListener_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_MailMergeEvent_idl__
 #include <com/sun/star/text/MailMergeEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XModule.idl b/offapi/com/sun/star/text/XModule.idl
index ed6aa4ceb..cc6c8d125 100644
--- a/offapi/com/sun/star/text/XModule.idl
+++ b/offapi/com/sun/star/text/XModule.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XModule_idl__ 
 #define __com_sun_star_text_XModule_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XMultiTextMarkup.idl b/offapi/com/sun/star/text/XMultiTextMarkup.idl
index 21ecac2f3..8132aa09b 100644
--- a/offapi/com/sun/star/text/XMultiTextMarkup.idl
+++ b/offapi/com/sun/star/text/XMultiTextMarkup.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_text_XMultiTextMarkup_idl__
 #define __com_sun_star_text_XMultiTextMarkup_idl__
 
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
 #include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextMarkupDescriptor_idl__
 #include <com/sun/star/text/TextMarkupDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XNumberingFormatter.idl b/offapi/com/sun/star/text/XNumberingFormatter.idl
index c45306c5c..f4684b8e3 100644
--- a/offapi/com/sun/star/text/XNumberingFormatter.idl
+++ b/offapi/com/sun/star/text/XNumberingFormatter.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_text_XNumberingFormatter_idl__
 #define __com_sun_star_text_XNumberingFormatter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com { module sun { module star { module text {
 /**
diff --git a/offapi/com/sun/star/text/XNumberingRulesSupplier.idl b/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
index 92d557370..bb5129957 100644
--- a/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
+++ b/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_XNumberingRulesSupplier_idl__
 #define __com_sun_star_text_XNumberingRulesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XNumberingTypeInfo.idl b/offapi/com/sun/star/text/XNumberingTypeInfo.idl
index 7bb9da59d..f7470953a 100644
--- a/offapi/com/sun/star/text/XNumberingTypeInfo.idl
+++ b/offapi/com/sun/star/text/XNumberingTypeInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XNumberingTypeInfo_idl__
 #define __com_sun_star_text_XNumberingTypeInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module text {
 
diff --git a/offapi/com/sun/star/text/XPageCursor.idl b/offapi/com/sun/star/text/XPageCursor.idl
index a40332968..7704a56ee 100644
--- a/offapi/com/sun/star/text/XPageCursor.idl
+++ b/offapi/com/sun/star/text/XPageCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XPageCursor_idl__ 
 #define __com_sun_star_text_XPageCursor_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XPagePrintable.idl b/offapi/com/sun/star/text/XPagePrintable.idl
index 34be2d78d..9210cb3aa 100644
--- a/offapi/com/sun/star/text/XPagePrintable.idl
+++ b/offapi/com/sun/star/text/XPagePrintable.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_XPagePrintable_idl__
 #define __com_sun_star_text_XPagePrintable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XParagraphAppend.idl b/offapi/com/sun/star/text/XParagraphAppend.idl
index e88ccc329..fd6a1d9ef 100644
--- a/offapi/com/sun/star/text/XParagraphAppend.idl
+++ b/offapi/com/sun/star/text/XParagraphAppend.idl
@@ -27,25 +27,13 @@
 #ifndef __com_sun_star_text_XParagraphAppend_idl__ 
 #define __com_sun_star_text_XParagraphAppend_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
 #include <com/sun/star/beans/UnknownPropertyException.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextRange_idl__ 
 #include <com/sun/star/text/XTextRange.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XParagraphCursor.idl b/offapi/com/sun/star/text/XParagraphCursor.idl
index b2b807d4a..ab0828d91 100644
--- a/offapi/com/sun/star/text/XParagraphCursor.idl
+++ b/offapi/com/sun/star/text/XParagraphCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XParagraphCursor_idl__ 
 #define __com_sun_star_text_XParagraphCursor_idl__ 
  
-#ifndef __com_sun_star_text_XTextCursor_idl__ 
 #include <com/sun/star/text/XTextCursor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XRedline.idl b/offapi/com/sun/star/text/XRedline.idl
index 8bd9aff0c..264296ee2 100644
--- a/offapi/com/sun/star/text/XRedline.idl
+++ b/offapi/com/sun/star/text/XRedline.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_XRedline_idl__ 
 #define __com_sun_star_text_XRedline_idl__ 
  
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XReferenceMarksSupplier.idl b/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
index db2f40ea8..300177086 100644
--- a/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
+++ b/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__ 
 #define __com_sun_star_text_XReferenceMarksSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XRelativeTextContentInsert.idl b/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
index 42461cd05..469e1927f 100644
--- a/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
+++ b/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_XRelativeTextContentInsert_idl__ 
 #define __com_sun_star_text_XRelativeTextContentInsert_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XRelativeTextContentRemove.idl b/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
index 8175f8567..234a12255 100644
--- a/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
+++ b/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_XRelativeTextContentRemove_idl__ 
 #define __com_sun_star_text_XRelativeTextContentRemove_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XRubySelection.idl b/offapi/com/sun/star/text/XRubySelection.idl
index e33da3718..b306330f3 100644
--- a/offapi/com/sun/star/text/XRubySelection.idl
+++ b/offapi/com/sun/star/text/XRubySelection.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_XRubySelection_idl__
 #define __com_sun_star_text_XRubySelection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/text/XSentenceCursor.idl b/offapi/com/sun/star/text/XSentenceCursor.idl
index 00f0e54af..fa45cbefa 100644
--- a/offapi/com/sun/star/text/XSentenceCursor.idl
+++ b/offapi/com/sun/star/text/XSentenceCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XSentenceCursor_idl__ 
 #define __com_sun_star_text_XSentenceCursor_idl__ 
  
-#ifndef __com_sun_star_text_XTextCursor_idl__ 
 #include <com/sun/star/text/XTextCursor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XSimpleText.idl b/offapi/com/sun/star/text/XSimpleText.idl
index f65308af0..b617ffa96 100644
--- a/offapi/com/sun/star/text/XSimpleText.idl
+++ b/offapi/com/sun/star/text/XSimpleText.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_text_XSimpleText_idl__ 
 #define __com_sun_star_text_XSimplText_idl__ 
  
-#ifndef __com_sun_star_text_XTextRange_idl__ 
 #include <com/sun/star/text/XTextRange.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextCursor_idl__ 
 #include <com/sun/star/text/XTextCursor.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XText.idl b/offapi/com/sun/star/text/XText.idl
index 114daf009..31326f273 100644
--- a/offapi/com/sun/star/text/XText.idl
+++ b/offapi/com/sun/star/text/XText.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_text_XText_idl__ 
 #define __com_sun_star_text_XText_idl__ 
  
-#ifndef __com_sun_star_text_XSimpleText_idl__ 
 #include <com/sun/star/text/XSimpleText.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextCursor_idl__ 
 #include <com/sun/star/text/XTextCursor.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextAppend.idl b/offapi/com/sun/star/text/XTextAppend.idl
index 1631a0eef..a639920f1 100644
--- a/offapi/com/sun/star/text/XTextAppend.idl
+++ b/offapi/com/sun/star/text/XTextAppend.idl
@@ -28,15 +28,9 @@
 #define __com_sun_star_text_XTextAppend_idl__ 
  
 
-#ifndef __com_sun_star_text_XText_idl__ 
 #include <com/sun/star/text/XText.idl> 
-#endif 
-#ifndef __com_sun_star_text_XTextPortionAppend_idl__ 
 #include <com/sun/star/text/XTextPortionAppend.idl> 
-#endif 
-#ifndef __com_sun_star_text_XParagraphAppend_idl__ 
 #include <com/sun/star/text/XParagraphAppend.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XTextAppendAndConvert.idl b/offapi/com/sun/star/text/XTextAppendAndConvert.idl
index 9be7f2a10..2e9589b1f 100644
--- a/offapi/com/sun/star/text/XTextAppendAndConvert.idl
+++ b/offapi/com/sun/star/text/XTextAppendAndConvert.idl
@@ -28,15 +28,9 @@
 #define __com_sun_star_text_XTextAppendAndConvert_idl__ 
 
 
-#ifndef __com_sun_star_text_XTextAppend_idl__ 
 #include <com/sun/star/text/XTextAppend.idl> 
-#endif 
-#ifndef __com_sun_star_text_XTextContentAppend_idl__ 
 #include <com/sun/star/text/XTextContentAppend.idl> 
-#endif 
-#ifndef __com_sun_star_text_XTextConvert_idl__ 
 #include <com/sun/star/text/XTextConvert.idl> 
-#endif 
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/text/XTextColumns.idl b/offapi/com/sun/star/text/XTextColumns.idl
index 70fa27a5f..d127a1891 100644
--- a/offapi/com/sun/star/text/XTextColumns.idl
+++ b/offapi/com/sun/star/text/XTextColumns.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextColumns_idl__ 
 #define __com_sun_star_text_XTextColumns_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_TextColumn_idl__ 
 #include <com/sun/star/text/TextColumn.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextContent.idl b/offapi/com/sun/star/text/XTextContent.idl
index f20f0b6b4..5bfdbe9fd 100644
--- a/offapi/com/sun/star/text/XTextContent.idl
+++ b/offapi/com/sun/star/text/XTextContent.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_XTextContent_idl__
 #define __com_sun_star_text_XTextContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextContentAppend.idl b/offapi/com/sun/star/text/XTextContentAppend.idl
index 15bb02003..fb120c285 100644
--- a/offapi/com/sun/star/text/XTextContentAppend.idl
+++ b/offapi/com/sun/star/text/XTextContentAppend.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_text_XTextContentAppend_idl__ 
 #define __com_sun_star_text_XTextContentAppend_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
 #include <com/sun/star/beans/UnknownPropertyException.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XTextConvert.idl b/offapi/com/sun/star/text/XTextConvert.idl
index f3d175acc..7a867c2d3 100644
--- a/offapi/com/sun/star/text/XTextConvert.idl
+++ b/offapi/com/sun/star/text/XTextConvert.idl
@@ -27,31 +27,14 @@
 #ifndef __com_sun_star_text_XTextConvert_idl__ 
 #define __com_sun_star_text_XTextConvert_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
 #include <com/sun/star/beans/UnknownPropertyException.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_XTextRange_idl__ 
 #include <com/sun/star/text/XTextRange.idl> 
-#endif 
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
-#ifndef __com_sun_star_text_XTextTable_idl__
 #include <com/sun/star/text/XTextTable.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/text/XTextCopy.idl b/offapi/com/sun/star/text/XTextCopy.idl
index 1fe7721d6..481e16273 100644
--- a/offapi/com/sun/star/text/XTextCopy.idl
+++ b/offapi/com/sun/star/text/XTextCopy.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XText_idl__ 
 #define __com_sun_star_text_XText_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XTextCursor.idl b/offapi/com/sun/star/text/XTextCursor.idl
index f522db16f..6eeb5a1ef 100644
--- a/offapi/com/sun/star/text/XTextCursor.idl
+++ b/offapi/com/sun/star/text/XTextCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XTextCursor_idl__
 #define __com_sun_star_text_XTextCursor_idl__
 
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextDocument.idl b/offapi/com/sun/star/text/XTextDocument.idl
index 5c268c073..e185f411d 100644
--- a/offapi/com/sun/star/text/XTextDocument.idl
+++ b/offapi/com/sun/star/text/XTextDocument.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextDocument_idl__ 
 #define __com_sun_star_text_XTextDocument_idl__ 
  
-#ifndef __com_sun_star_frame_XModel_idl__ 
 #include <com/sun/star/frame/XModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XText_idl__ 
 #include <com/sun/star/text/XText.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObject.idl b/offapi/com/sun/star/text/XTextEmbeddedObject.idl
index 2b9503cb9..990ad0785 100644
--- a/offapi/com/sun/star/text/XTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/XTextEmbeddedObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextEmbeddedObject_idl__ 
 #define __com_sun_star_text_XTextEmbeddedObject_idl__ 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl b/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
index d813afe7c..4e15ae2e1 100644
--- a/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__ 
 #define __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextField.idl b/offapi/com/sun/star/text/XTextField.idl
index 8dcb00e8f..32047f021 100644
--- a/offapi/com/sun/star/text/XTextField.idl
+++ b/offapi/com/sun/star/text/XTextField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XTextField_idl__ 
 #define __com_sun_star_text_XTextField_idl__ 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextFieldsSupplier.idl b/offapi/com/sun/star/text/XTextFieldsSupplier.idl
index 084e9c5d1..cf30414b3 100644
--- a/offapi/com/sun/star/text/XTextFieldsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextFieldsSupplier.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_XTextFieldsSupplier_idl__ 
 #define __com_sun_star_text_XTextFieldsSupplier_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextFrame.idl b/offapi/com/sun/star/text/XTextFrame.idl
index e6ef16459..822378cac 100644
--- a/offapi/com/sun/star/text/XTextFrame.idl
+++ b/offapi/com/sun/star/text/XTextFrame.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_XTextFrame_idl__ 
 #define __com_sun_star_text_XTextFrame_idl__ 
 
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_XText_idl__ 
 #include <com/sun/star/text/XText.idl> 
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextFramesSupplier.idl b/offapi/com/sun/star/text/XTextFramesSupplier.idl
index 5092b0c4d..736dd9539 100644
--- a/offapi/com/sun/star/text/XTextFramesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextFramesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextFramesSupplier_idl__ 
 #define __com_sun_star_text_XTextFramesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl b/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
index 872d19a9c..4d46e9ebf 100644
--- a/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__ 
 #define __com_sun_star_text_XTextGraphicObjectsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextMarkup.idl b/offapi/com/sun/star/text/XTextMarkup.idl
index e9ab744cd..f4afbfbc8 100644
--- a/offapi/com/sun/star/text/XTextMarkup.idl
+++ b/offapi/com/sun/star/text/XTextMarkup.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_text_XTextMarkup_idl__
 #define __com_sun_star_text_XTextMarkup_idl__
 
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
 #include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextMarkupType_idl__
 #include <com/sun/star/text/TextMarkupType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XTextPortionAppend.idl b/offapi/com/sun/star/text/XTextPortionAppend.idl
index e113e1baf..20e0ffdd2 100644
--- a/offapi/com/sun/star/text/XTextPortionAppend.idl
+++ b/offapi/com/sun/star/text/XTextPortionAppend.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_text_XTextPortionAppend_idl__ 
 #define __com_sun_star_text_XTextPortionAppend_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
 #include <com/sun/star/beans/UnknownPropertyException.idl> 
-#endif 
-
-#ifndef __com_sun_star_text_XTextRange_idl__ 
 #include <com/sun/star/text/XTextRange.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XTextRange.idl b/offapi/com/sun/star/text/XTextRange.idl
index 7eee212ef..49a781c10 100644
--- a/offapi/com/sun/star/text/XTextRange.idl
+++ b/offapi/com/sun/star/text/XTextRange.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XTextRange_idl__ 
 #define __com_sun_star_text_XTextRange_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XTextRangeCompare.idl b/offapi/com/sun/star/text/XTextRangeCompare.idl
index 862dd6c93..22a1be095 100644
--- a/offapi/com/sun/star/text/XTextRangeCompare.idl
+++ b/offapi/com/sun/star/text/XTextRangeCompare.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextRangeCompare_idl__ 
 #define __com_sun_star_text_XTextRangeCompare_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/text/XTextRangeMover.idl b/offapi/com/sun/star/text/XTextRangeMover.idl
index b50cb81db..25e34fb83 100644
--- a/offapi/com/sun/star/text/XTextRangeMover.idl
+++ b/offapi/com/sun/star/text/XTextRangeMover.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextRangeMover_idl__ 
 #define __com_sun_star_text_XTextRangeMover_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextRange_idl__ 
 #include <com/sun/star/text/XTextRange.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextSection.idl b/offapi/com/sun/star/text/XTextSection.idl
index 039fce87f..4f6cde1b0 100644
--- a/offapi/com/sun/star/text/XTextSection.idl
+++ b/offapi/com/sun/star/text/XTextSection.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XTextSection_idl__ 
 #define __com_sun_star_text_XTextSection_idl__ 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextSectionsSupplier.idl b/offapi/com/sun/star/text/XTextSectionsSupplier.idl
index b099d3c0e..570276744 100644
--- a/offapi/com/sun/star/text/XTextSectionsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextSectionsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextSectionsSupplier_idl__ 
 #define __com_sun_star_text_XTextSectionsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextShapesSupplier.idl b/offapi/com/sun/star/text/XTextShapesSupplier.idl
index 5cb1fd2b5..124e7ee2a 100644
--- a/offapi/com/sun/star/text/XTextShapesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextShapesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextShapesSupplier_idl__ 
 #define __com_sun_star_text_XTextShapesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextTable.idl b/offapi/com/sun/star/text/XTextTable.idl
index 025729062..3a21727fd 100644
--- a/offapi/com/sun/star/text/XTextTable.idl
+++ b/offapi/com/sun/star/text/XTextTable.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_text_XTextTable_idl__ 
 #define __com_sun_star_text_XTextTable_idl__ 
  
-#ifndef __com_sun_star_text_XTextContent_idl__ 
 #include <com/sun/star/text/XTextContent.idl> 
-#endif 
  
-#ifndef __com_sun_star_table_XTableRows_idl__ 
 #include <com/sun/star/table/XTableRows.idl> 
-#endif 
  
-#ifndef __com_sun_star_table_XTableColumns_idl__ 
 #include <com/sun/star/table/XTableColumns.idl> 
-#endif 
  
-#ifndef __com_sun_star_table_XCell_idl__ 
 #include <com/sun/star/table/XCell.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextTableCursor_idl__ 
 #include <com/sun/star/text/XTextTableCursor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextTableCursor.idl b/offapi/com/sun/star/text/XTextTableCursor.idl
index a1cbd3bb2..068f6e28b 100644
--- a/offapi/com/sun/star/text/XTextTableCursor.idl
+++ b/offapi/com/sun/star/text/XTextTableCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XTextTableCursor_idl__
 #define __com_sun_star_text_XTextTableCursor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextTablesSupplier.idl b/offapi/com/sun/star/text/XTextTablesSupplier.idl
index c154c9456..7804182fa 100644
--- a/offapi/com/sun/star/text/XTextTablesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextTablesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextTablesSupplier_idl__ 
 #define __com_sun_star_text_XTextTablesSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextViewCursor.idl b/offapi/com/sun/star/text/XTextViewCursor.idl
index 7c8198207..897d8459d 100644
--- a/offapi/com/sun/star/text/XTextViewCursor.idl
+++ b/offapi/com/sun/star/text/XTextViewCursor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextViewCursor_idl__ 
 #define __com_sun_star_text_XTextViewCursor_idl__ 
  
-#ifndef __com_sun_star_text_XTextCursor_idl__ 
 #include <com/sun/star/text/XTextCursor.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XTextViewCursorSupplier.idl b/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
index 90d1a00db..fceb118ca 100644
--- a/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
+++ b/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextViewCursorSupplier_idl__ 
 #define __com_sun_star_text_XTextViewCursorSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_text_XTextViewCursor_idl__ 
 #include <com/sun/star/text/XTextViewCursor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/XWordCursor.idl b/offapi/com/sun/star/text/XWordCursor.idl
index e6ccfdc33..f92182446 100644
--- a/offapi/com/sun/star/text/XWordCursor.idl
+++ b/offapi/com/sun/star/text/XWordCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XWordCursor_idl__ 
 #define __com_sun_star_text_XWordCursor_idl__ 
  
-#ifndef __com_sun_star_text_XTextCursor_idl__ 
 #include <com/sun/star/text/XTextCursor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/text/fieldmaster/makefile.mk b/offapi/com/sun/star/text/fieldmaster/makefile.mk
deleted file mode 100644
index ad0a5d8af..000000000
--- a/offapi/com/sun/star/text/fieldmaster/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfieldmaster
-PACKAGE=com$/sun$/star$/text$/fieldmaster
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Database.idl\
-    DDE.idl\
-    Bibliography.idl\
-    SetExpression.idl\
-    User.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/text/makefile.mk b/offapi/com/sun/star/text/makefile.mk
deleted file mode 100644
index 4e6d24746..000000000
--- a/offapi/com/sun/star/text/makefile.mk
+++ /dev/null
@@ -1,278 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csstext
-PACKAGE=com$/sun$/star$/text
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleEndnoteView.idl\
-    AccessibleFootnoteView.idl\
-    AccessibleHeaderFooterView.idl\
-    AccessiblePageView.idl\
-    AccessibleParagraphView.idl\
-    AccessibleTextDocumentPageView.idl\
-    AccessibleTextDocumentView.idl\
-    AccessibleTextEmbeddedObject.idl\
-    AccessibleTextFrameView.idl\
-    AccessibleTextGraphicObject.idl\
-    AdvancedTextDocument.idl\
-    AuthorDisplayFormat.idl\
-    AutoTextContainer.idl\
-    AutoTextEntry.idl\
-    AutoTextGroup.idl\
-    BaseFrame.idl\
-    BaseFrameProperties.idl\
-    BaseIndex.idl\
-    BaseIndexMark.idl\
-    Bibliography.idl\
-    BibliographyDataType.idl\
-    BibliographyDataField.idl\
-    Bookmark.idl\
-    Bookmarks.idl\
-    Cell.idl\
-    CellProperties.idl\
-    CellRange.idl\
-    ChainedTextFrame.idl\
-    ChapterFormat.idl\
-    ChapterNumberingRule.idl\
-    CharacterCompressionType.idl\
-    ContentIndex.idl\
-    ContentIndexMark.idl\
-    ControlCharacter.idl\
-    DateDisplayFormat.idl\
-    DefaultNumberingProvider.idl\
-    Defaults.idl\
-    DependentTextField.idl\
-    DocumentIndex.idl\
-    DocumentIndexes.idl\
-    DocumentIndexFormat.idl\
-    DocumentIndexLevelFormat.idl\
-    DocumentIndexMark.idl\
-    DocumentIndexMarkAsian.idl\
-    DocumentIndexParagraphStyles.idl\
-    DocumentSettings.idl\
-    DocumentStatistic.idl\
-    Endnote.idl\
-        EndnoteSettings.idl\
-    FilenameDisplayFormat.idl\
-    FontEmphasis.idl\
-    FontRelief.idl\
-    Footnote.idl\
-     FootnoteNumbering.idl\
-     Footnotes.idl\
-     FootnoteSettings.idl\
-    GenericTextDocument.idl\
-    GlobalDocument.idl\
-     GlobalSettings.idl\
-     GraphicCrop.idl\
-     HoriOrientation.idl\
-     HoriOrientationFormat.idl\
-     HorizontalAdjust.idl\
-     HypertextDocument.idl\
-    IllustrationsIndex.idl\
-    InContentMetadata.idl\
-     InvalidTextContentException.idl\
-        LabelFollow.idl\
-     LineNumberingProperties.idl\
-     LineNumberingSettings.idl\
-        MailMerge.idl\
-        MailMergeEvent.idl\
-        MailMergeType.idl\
-     NotePrintMode.idl\
-     NumberingLevel.idl\
-     NumberingRules.idl\
-     NumberingStyle.idl\
-     ObjectIndex.idl\
-     PageFootnoteInfo.idl\
-     PageNumberType.idl\
-     PagePrintSettings.idl\
-     Paragraph.idl\
-     ParagraphEnumeration.idl\
-     ParagraphVertAlign.idl\
-     PlaceholderType.idl\
-        PositionAndSpaceMode.idl\
-        PositionLayoutDir.idl\
-        PrintPreviewSettings.idl\
-     PrintSettings.idl\
-     RedlinePortion.idl\
-     ReferenceFieldPart.idl\
-     ReferenceFieldSource.idl\
-     ReferenceMark.idl\
-     ReferenceMarks.idl\
-     RelOrientation.idl\
-     RubyAdjust.idl\
-     SectionFileLink.idl\
-     SetVariableType.idl\
-     Shape.idl\
-     SizeType.idl\
-        TableColumns.idl\
-     TableColumnSeparator.idl\
-     TableIndex.idl\
-        TableRows.idl\
-     TemplateDisplayFormat.idl\
-     Text.idl\
-     TextColumn.idl\
-    TextColumns.idl\
-     TextColumnSequence.idl\
-     TextContent.idl\
-     TextContentAnchorType.idl\
-     TextContentCollection.idl\
-     TextCursor.idl\
-     TextDocument.idl\
-     TextDocumentView.idl\
-     TextEmbeddedObject.idl\
-     TextEmbeddedObjects.idl\
-     TextField.idl\
-     TextFieldEnumeration.idl\
-     TextFieldMaster.idl\
-     TextFieldMasters.idl\
-     TextFields.idl\
-     TextFrame.idl\
-     TextFrames.idl\
-     TextGraphicObject.idl\
-     TextGraphicObjects.idl\
-     TextGridMode.idl\
-      TextLayoutCursor.idl\
-    TextMarkupDescriptor.idl\
-    TextMarkupType.idl \
-      TextPageStyle.idl\
-      TextPortion.idl\
-      TextPortionEnumeration.idl\
-      TextRange.idl\
-      TextRanges.idl\
-      TextRangeContentProperties.idl\
-      TextSection.idl\
-      TextSections.idl\
-      TextSortable.idl\
-      TextSortDescriptor.idl\
-        TextSortDescriptor2.idl\
-      TextTable.idl\
-      TextTableCursor.idl\
-      TextTableRow.idl\
-      TextTables.idl\
-      TextViewCursor.idl\
-      TimeDisplayFormat.idl\
-      UserDataPart.idl\
-      UserDefinedIndex.idl\
-      UserFieldFormat.idl\
-      UserIndex.idl\
-      UserIndexMark.idl\
-      VertOrientation.idl\
-      VertOrientationFormat.idl\
-      ViewSettings.idl\
-    WebDocument.idl\
-        WrapInfluenceOnPosition.idl\
-        WrapTextMode.idl\
-      WritingMode.idl\
-      WritingMode2.idl\
-      XAutoTextContainer.idl\
-      XAutoTextEntry.idl\
-      XAutoTextGroup.idl\
-      XBookmarkInsertTool.idl\
-      XBookmarksSupplier.idl\
-      XChapterNumberingSupplier.idl\
-      XDefaultNumberingProvider.idl\
-      XDependentTextField.idl\
-      XDocumentIndex.idl\
-      XDocumentIndexesSupplier.idl\
-      XDocumentIndexMark.idl\
-      XEndnotesSettingsSupplier.idl\
-      XEndnotesSupplier.idl\
-      XFootnote.idl\
-      XFootnotesSettingsSupplier.idl\
-      XFootnotesSupplier.idl\
-      XHeaderFooter.idl\
-      XHeaderFooterPageStyle.idl\
-      XLineNumberingSupplier.idl\
-      XLineNumberingProperties.idl\
-        XMailMergeBroadcaster.idl\
-        XMailMergeListener.idl\
-      XModule.idl\
-      XNumberingFormatter.idl\
-      XNumberingRulesSupplier.idl\
-      XNumberingTypeInfo.idl\
-      XPageCursor.idl\
-      XPagePrintable.idl\
-      XParagraphCursor.idl\
-    XRedline.idl\
-      XReferenceMarksSupplier.idl\
-      XRelativeTextContentInsert.idl\
-      XRelativeTextContentRemove.idl\
-      XRubySelection.idl\
-      XSentenceCursor.idl\
-      XSimpleText.idl\
-      XText.idl\
-      XTextColumns.idl\
-      XTextContent.idl\
-      XTextCursor.idl\
-    XTextCopy.idl\
-      XTextDocument.idl\
-      XTextEmbeddedObject.idl\
-      XTextEmbeddedObjectsSupplier.idl\
-      XTextField.idl\
-      XTextFieldsSupplier.idl\
-      XTextFrame.idl\
-      XTextFramesSupplier.idl\
-      XTextGraphicObjectsSupplier.idl\
-    XTextMarkup.idl\
-    XMultiTextMarkup.idl\
-      XTextRange.idl\
-      XTextRangeCompare.idl\
-      XTextRangeMover.idl\
-      XTextSection.idl\
-      XTextSectionsSupplier.idl\
-      XTextShapesSupplier.idl\
-      XTextTable.idl\
-      XTextTableCursor.idl\
-      XTextTablesSupplier.idl\
-      XTextViewCursor.idl\
-      XTextViewCursorSupplier.idl\
-    XWordCursor.idl \
-    XParagraphAppend.idl \
-    XTextPortionAppend.idl \
-    XTextContentAppend.idl \
-    XTextConvert.idl \
-    XTextAppendAndConvert.idl \
-    XTextAppend.idl \
-    XFormField.idl \
-    XFlatParagraph.idl \
-    XFlatParagraphIterator.idl \
-    XFlatParagraphIteratorProvider.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/text/textfield/MetadataField.idl b/offapi/com/sun/star/text/textfield/MetadataField.idl
index c288f52f9..2424b3aca 100644
--- a/offapi/com/sun/star/text/textfield/MetadataField.idl
+++ b/offapi/com/sun/star/text/textfield/MetadataField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_text_textfield_MetadataField_idl__
 #define __com_sun_star_text_textfield_MetadataField_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextField_idl__
 #include <com/sun/star/text/TextField.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
 #include <com/sun/star/rdf/XMetadatable.idl>
-#endif
 
 
 //=============================================================================
@@ -61,7 +47,7 @@ module com { module sun { module star { module text { module textfield {
 
     @see com::sun::star::rdf
 */
-service MetadataField
+published service MetadataField
 {
     //-------------------------------------------------------------------------
     /** None of the properties of
diff --git a/offapi/com/sun/star/text/textfield/docinfo/makefile.mk b/offapi/com/sun/star/text/textfield/docinfo/makefile.mk
deleted file mode 100644
index 47381e570..000000000
--- a/offapi/com/sun/star/text/textfield/docinfo/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csstextfielddocinfo
-PACKAGE=com$/sun$/star$/text$/textfield$/docinfo
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ChangeAuthor.idl\
-    ChangeDateTime.idl\
-    CreateAuthor.idl\
-    CreateDateTime.idl\
-    Custom.idl\
-    Description.idl\
-    EditTime.idl\
-    Info0.idl\
-    Info1.idl\
-    Info2.idl\
-    Info3.idl\
-    Keywords.idl\
-    PrintAuthor.idl\
-    PrintDateTime.idl\
-    Revision.idl\
-    Subject.idl\
-    Title.idl\
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/text/textfield/makefile.mk b/offapi/com/sun/star/text/textfield/makefile.mk
deleted file mode 100644
index 475d6b019..000000000
--- a/offapi/com/sun/star/text/textfield/makefile.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csstextfield
-PACKAGE=com$/sun$/star$/text$/textfield
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    URL.idl\
-    Annotation.idl\
-    Author.idl\
-    Bibliography.idl\
-    Chapter.idl\
-    CharacterCount.idl\
-    CombinedCharacters.idl\
-    ConditionalText.idl\
-    Database.idl\
-    DatabaseName.idl\
-    DatabaseNextSet.idl\
-    DatabaseNumberOfSet.idl\
-    DatabaseSetNumber.idl\
-    DateTime.idl\
-    DDE.idl\
-    DropDown.idl\
-    EmbeddedObjectCount.idl\
-    ExtendedUser.idl\
-    FileName.idl\
-    GetExpression.idl\
-    GetReference.idl\
-    GraphicObjectCount.idl\
-    HiddenParagraph.idl\
-    HiddenText.idl\
-    Input.idl\
-    InputUser.idl\
-    JumpEdit.idl\
-    Macro.idl\
-    MetadataField.idl\
-    PageCount.idl\
-    PageNumber.idl\
-    ParagraphCount.idl\
-    ReferencePageGet.idl\
-    ReferencePageSet.idl\
-    Script.idl\
-    SetExpression.idl\
-    TableCount.idl\
-    TableFormula.idl\
-    TemplateName.idl\
-    User.idl\
-    WordCount.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/ucb/AlreadyInitializedException.idl b/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
index e51e1901f..bfd1bc311 100644
--- a/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
+++ b/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_AlreadyInitializedException_idl__
 #define __com_sun_star_ucb_AlreadyInitializedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/AnyCompareFactory.idl b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
index a29ebcb42..4edb23e1a 100644
--- a/offapi/com/sun/star/ucb/AnyCompareFactory.idl
+++ b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_AnyCompareFactory_idl__
 #define __com_sun_star_ucb_AnyCompareFactory_idl__
 
-#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
 #include <com/sun/star/ucb/XAnyCompareFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/AuthenticationRequest.idl b/offapi/com/sun/star/ucb/AuthenticationRequest.idl
index 3a9a79099..9a2b58534 100644
--- a/offapi/com/sun/star/ucb/AuthenticationRequest.idl
+++ b/offapi/com/sun/star/ucb/AuthenticationRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_AuthenticationRequest_idl__
 #define __com_sun_star_ucb_AuthenticationRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/CHAOSProgressStart.idl b/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
index 838085de3..318cc125a 100644
--- a/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
+++ b/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_CHAOSProgressStart_idl__
 #define __com_sun_star_ucb_CHAOSProgressStart_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSet.idl b/offapi/com/sun/star/ucb/CachedContentResultSet.idl
index 7c719214f..5420ede33 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSet.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_CachedContentResultSet_idl__
 #define __com_sun_star_ucb_CachedContentResultSet_idl__
 
-#ifndef __com_sun_star_ucb_ContentResultSet_idl__
 #include <com/sun/star/ucb/ContentResultSet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl b/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
index 12169f1ca..9f1ce4f2f 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_CachedContentResultSetFactory_idl__
 #define __com_sun_star_ucb_CachedContentResultSetFactory_idl__
 
-#ifndef __com_sun_star_ucb_XCachedContentResultSetFactory_idl__
 #include <com/sun/star/ucb/XCachedContentResultSetFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl b/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
index b7fec4742..fd089dc13 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_CachedContentResultSetStub_idl__
 #define __com_sun_star_ucb_CachedContentResultSetStub_idl__
 
-#ifndef __com_sun_star_ucb_ContentResultSet_idl__
 #include <com/sun/star/ucb/ContentResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XFetchProvider_idl__
 #include <com/sun/star/ucb/XFetchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XFetchProviderForContentAccess_idl__
 #include <com/sun/star/ucb/XFetchProviderForContentAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl b/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
index a6d35b1e1..86a5fb96b 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_CachedContentResultSetStubFactory_idl__
 #define __com_sun_star_ucb_CachedContentResultSetStubFactory_idl__
 
-#ifndef __com_sun_star_ucb_XCachedContentResultSetStubFactory_idl__
 #include <com/sun/star/ucb/XCachedContentResultSetStubFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
index 7757add47..cc94571da 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_CachedDynamicResultSet_idl__
 #define __com_sun_star_ucb_CachedDynamicResultSet_idl__
 
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XSourceInitialization_idl__
 #include <com/sun/star/ucb/XSourceInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
index 8ebe7f541..693b63181 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_CachedDynamicResultSetFactory_idl__
 #define __com_sun_star_ucb_CachedDynamicResultSetFactory_idl__
 
-#ifndef __com_sun_star_ucb_XCachedDynamicResultSetFactory_idl__
 #include <com/sun/star/ucb/XCachedDynamicResultSetFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
index faf4d41e0..ec3f762cb 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_CachedDynamicResultSetStub_idl__
 #define __com_sun_star_ucb_CachedDynamicResultSetStub_idl__
 
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XSourceInitialization_idl__
 #include <com/sun/star/ucb/XSourceInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
index 098ef87a9..b71782239 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_CachedDynamicResultSetStubFactory_idl__
 #define __com_sun_star_ucb_CachedDynamicResultSetStubFactory_idl__
 
-#ifndef __com_sun_star_ucb_XCachedDynamicResultSetStubFactory_idl__
 #include <com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CertificateValidationRequest.idl b/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
index 74531f6ab..4a61b8ef0 100644
--- a/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
+++ b/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,22 +27,17 @@
 #ifndef __com_sun_star_ucb_CertificateValidationRequest_idl__
 #define __com_sun_star_ucb_CertificateValidationRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_security_XCertificate_idl__
 #include <com/sun/star/security/XCertificate.idl>
-#endif
 
 //=============================================================================
 
-module com { module sun { module star { module ucb { 
+module com { module sun { module star { module ucb {
 
 //=============================================================================
 /** An error specifying an invalid certificate.
 */
-exception CertificateValidationRequest: com::sun::star::task::ClassifiedInteractionRequest
+published exception CertificateValidationRequest: com::sun::star::task::ClassifiedInteractionRequest
 {
     //-------------------------------------------------------------------------
     /** This value describes the validity of the certificate.
@@ -50,16 +45,19 @@ exception CertificateValidationRequest: com::sun::star::task::ClassifiedInteract
     long CertificateValidity;
 
     //-------------------------------------------------------------------------
-    /** The certificate himself. 
+    /** The certificate himself.
      */
     com::sun::star::security::XCertificate Certificate;
 
+    //-------------------------------------------------------------------------
+    /** The host name.
+     */
     string HostName;
 
 };
 
 //=============================================================================
 
-}; }; }; }; 
+}; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/ucb/Command.idl b/offapi/com/sun/star/ucb/Command.idl
index bfa76158d..bf47124d1 100644
--- a/offapi/com/sun/star/ucb/Command.idl
+++ b/offapi/com/sun/star/ucb/Command.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_Command_idl__
 #define __com_sun_star_ucb_Command_idl__
 
-#ifndef __com_sun_star_ucb_CommandInfo_idl__
 #include <com/sun/star/ucb/CommandInfo.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandAbortedException.idl b/offapi/com/sun/star/ucb/CommandAbortedException.idl
index 49d0d3b0d..eadfa5707 100644
--- a/offapi/com/sun/star/ucb/CommandAbortedException.idl
+++ b/offapi/com/sun/star/ucb/CommandAbortedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_CommandAbortedException_idl__
 #define __com_sun_star_ucb_CommandAbortedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandFailedException.idl b/offapi/com/sun/star/ucb/CommandFailedException.idl
index 3b0487798..61ca4b154 100644
--- a/offapi/com/sun/star/ucb/CommandFailedException.idl
+++ b/offapi/com/sun/star/ucb/CommandFailedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_CommandFailedException_idl__
 #define __com_sun_star_ucb_CommandFailedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandInfo.idl b/offapi/com/sun/star/ucb/CommandInfo.idl
index f4b45e05d..3f23798d8 100644
--- a/offapi/com/sun/star/ucb/CommandInfo.idl
+++ b/offapi/com/sun/star/ucb/CommandInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_CommandInfo_idl__
 #define __com_sun_star_ucb_CommandInfo_idl__
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl b/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
index acc2032a6..7f7cb47c4 100644
--- a/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
+++ b/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_CommandInfoChangeEvent_idl__
 #define __com_sun_star_ucb_CommandInfoChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/Content.idl b/offapi/com/sun/star/ucb/Content.idl
index 82dc07a26..fa4773e4f 100644
--- a/offapi/com/sun/star/ucb/Content.idl
+++ b/offapi/com/sun/star/ucb/Content.idl
@@ -28,49 +28,17 @@
 #ifndef __com_sun_star_ucb_Content_idl__
 #define __com_sun_star_ucb_Content_idl__
 
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentCreationException.idl b/offapi/com/sun/star/ucb/ContentCreationException.idl
index 64d058d23..9c2591dc7 100644
--- a/offapi/com/sun/star/ucb/ContentCreationException.idl
+++ b/offapi/com/sun/star/ucb/ContentCreationException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_ContentCreationException_idl__
 #define __com_sun_star_ucb_ContentCreationException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentCreationError_idl__
 #include <com/sun/star/ucb/ContentCreationError.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentEvent.idl b/offapi/com/sun/star/ucb/ContentEvent.idl
index 25a1fb4c2..e2907a927 100644
--- a/offapi/com/sun/star/ucb/ContentEvent.idl
+++ b/offapi/com/sun/star/ucb/ContentEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ContentEvent_idl__
 #define __com_sun_star_ucb_ContentEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentInfo.idl b/offapi/com/sun/star/ucb/ContentInfo.idl
index c06cb3285..bb31004e9 100644
--- a/offapi/com/sun/star/ucb/ContentInfo.idl
+++ b/offapi/com/sun/star/ucb/ContentInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ContentInfo_idl__
 #define __com_sun_star_ucb_ContentInfo_idl__
 
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentProvider.idl b/offapi/com/sun/star/ucb/ContentProvider.idl
index bb5e1f87d..456680fb2 100644
--- a/offapi/com/sun/star/ucb/ContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ContentProvider.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_ucb_ContentProvider_idl__
 #define __com_sun_star_ucb_ContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
 #include <com/sun/star/ucb/XContentIdentifierFactory.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
 #include <com/sun/star/ucb/XParameterizedContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProviderSupplier_idl__
 #include <com/sun/star/ucb/XContentProviderSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentProviderInfo.idl b/offapi/com/sun/star/ucb/ContentProviderInfo.idl
index 033dbba5d..fabae3813 100644
--- a/offapi/com/sun/star/ucb/ContentProviderInfo.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ContentProviderInfo_idl__
 #define __com_sun_star_ucb_ContentProviderInfo_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentProviderProxy.idl b/offapi/com/sun/star/ucb/ContentProviderProxy.idl
index bc41677b6..b2e048649 100644
--- a/offapi/com/sun/star/ucb/ContentProviderProxy.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderProxy.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_ContentProviderProxy_idl__
 #define __com_sun_star_ucb_ContentProviderProxy_idl__
 
-#ifndef __com_sun_star_ucb_XContentProviderSupplier_idl__
 #include <com/sun/star/ucb/XContentProviderSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
 #include <com/sun/star/ucb/XParameterizedContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl b/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
index eb1fb452d..b93107032 100644
--- a/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ContentProviderProxyFactory_idl__
 #define __com_sun_star_ucb_ContentProviderProxyFactory_idl__
 
-#ifndef __com_sun_star_ucb_XContentProviderFactory_idl__
 #include <com/sun/star/ucb/XContentProviderFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentResultSet.idl b/offapi/com/sun/star/ucb/ContentResultSet.idl
index f93f6686a..fad6c27c6 100644
--- a/offapi/com/sun/star/ucb/ContentResultSet.idl
+++ b/offapi/com/sun/star/ucb/ContentResultSet.idl
@@ -27,37 +27,14 @@
 #ifndef __com_sun_star_ucb_ContentResultSet_idl__
 #define __com_sun_star_ucb_ContentResultSet_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XRow_idl__
 #include <com/sun/star/sdbc/XRow.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XCloseable_idl__
 #include <com/sun/star/sdbc/XCloseable.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentAccess_idl__
 #include <com/sun/star/ucb/XContentAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
 #include <com/sun/star/sdbc/ResultSet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentTransmitter.idl b/offapi/com/sun/star/ucb/ContentTransmitter.idl
index 68af6dc68..d16bb3910 100644
--- a/offapi/com/sun/star/ucb/ContentTransmitter.idl
+++ b/offapi/com/sun/star/ucb/ContentTransmitter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ContentTransmitter_idl__
 #define __com_sun_star_ucb_ContentTransmitter_idl__
 
-#ifndef __com_sun_star_ucb_XContentTransmitter_idl__
 #include <com/sun/star/ucb/XContentTransmitter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/Cookie.idl b/offapi/com/sun/star/ucb/Cookie.idl
index c15727662..4b1150a13 100644
--- a/offapi/com/sun/star/ucb/Cookie.idl
+++ b/offapi/com/sun/star/ucb/Cookie.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_Cookie_idl__
 #define __com_sun_star_ucb_Cookie_idl__
 
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CookiePolicy_idl__
 #include <com/sun/star/ucb/CookiePolicy.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl b/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
index f31bc26b8..a77b0dde4 100644
--- a/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
+++ b/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_DefaultHierarchyDataSource_idl__
 #define __com_sun_star_ucb_DefaultHierarchyDataSource_idl__
 
-#ifndef __com_sun_star_ucb_HierarchyDataSource_idl__
 #include <com/sun/star/ucb/HierarchyDataSource.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl b/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
index e802585ab..66a783c5f 100644
--- a/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
+++ b/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_DuplicateCommandIdentifierException_idl__
 #define __com_sun_star_ucb_DuplicateCommandIdentifierException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/DuplicateProviderException.idl b/offapi/com/sun/star/ucb/DuplicateProviderException.idl
index 888fbef6d..2922824d9 100644
--- a/offapi/com/sun/star/ucb/DuplicateProviderException.idl
+++ b/offapi/com/sun/star/ucb/DuplicateProviderException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_DuplicateProviderException_idl__
 #define __com_sun_star_ucb_DuplicateProviderException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/DynamicResultSet.idl b/offapi/com/sun/star/ucb/DynamicResultSet.idl
index 313079159..61a06b4cd 100644
--- a/offapi/com/sun/star/ucb/DynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/DynamicResultSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_DynamicResultSet_idl__
 #define __com_sun_star_ucb_DynamicResultSet_idl__
 
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ExportStreamInfo.idl b/offapi/com/sun/star/ucb/ExportStreamInfo.idl
index a231e7384..0cbdd7340 100644
--- a/offapi/com/sun/star/ucb/ExportStreamInfo.idl
+++ b/offapi/com/sun/star/ucb/ExportStreamInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ExportStreamInfo_idl__
 #define __com_sun_star_ucb_ExportStreamInfo_idl__
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/FTPContent.idl b/offapi/com/sun/star/ucb/FTPContent.idl
index 1fb21da61..34a842a27 100644
--- a/offapi/com/sun/star/ucb/FTPContent.idl
+++ b/offapi/com/sun/star/ucb/FTPContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_FTPContent_idl__
 #define __com_sun_star_ucb_FTPContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/FTPContentProvider.idl b/offapi/com/sun/star/ucb/FTPContentProvider.idl
index daef77e82..7786ae671 100644
--- a/offapi/com/sun/star/ucb/FTPContentProvider.idl
+++ b/offapi/com/sun/star/ucb/FTPContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_FTPContentProvider_idl__
 #define __com_sun_star_ucb_FTPContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/FileContent.idl b/offapi/com/sun/star/ucb/FileContent.idl
index f75e1b9a2..ac6f7d3db 100644
--- a/offapi/com/sun/star/ucb/FileContent.idl
+++ b/offapi/com/sun/star/ucb/FileContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_FileContent_idl__
 #define __com_sun_star_ucb_FileContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/FileContentProvider.idl b/offapi/com/sun/star/ucb/FileContentProvider.idl
index 65768107f..adcb209c5 100644
--- a/offapi/com/sun/star/ucb/FileContentProvider.idl
+++ b/offapi/com/sun/star/ucb/FileContentProvider.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ucb_FileContentProvider_idl__
 #define __com_sun_star_ucb_FileContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-#ifndef __com_sun_star_ucb_XFileIdentifierConverter_idl__
 #include <com/sun/star/ucb/XFileIdentifierConverter.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
 #include <com/sun/star/ucb/XContentIdentifierFactory.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/FolderList.idl b/offapi/com/sun/star/ucb/FolderList.idl
index 790150d0f..04de482bb 100644
--- a/offapi/com/sun/star/ucb/FolderList.idl
+++ b/offapi/com/sun/star/ucb/FolderList.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_FolderList_idl__
 #define __com_sun_star_ucb_FolderList_idl__
 
-#ifndef __com_sun_star_ucb_FolderListCommand_idl__
 #include <com/sun/star/ucb/FolderListCommand.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_FolderListEntry_idl__
 #include <com/sun/star/ucb/FolderListEntry.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/GIOContentProvider.idl b/offapi/com/sun/star/ucb/GIOContentProvider.idl
index 356fd6a5c..d6823c9cf 100644
--- a/offapi/com/sun/star/ucb/GIOContentProvider.idl
+++ b/offapi/com/sun/star/ucb/GIOContentProvider.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_ucb_GIOContentProvider_idl__
 #define __com_sun_star_ucb_GIOContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 service GIOContentProvider
diff --git a/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl b/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
index b88f43677..2aa28f90e 100644
--- a/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_GlobalTransferCommandArgument_idl__
 #define __com_sun_star_ucb_GlobalTransferCommandArgument_idl__
 
-#ifndef __com_sun_star_ucb_TransferCommandOperation_idl__
 #include <com/sun/star/ucb/TransferCommandOperation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl b/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
index 2e6276dca..cd6070a00 100644
--- a/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
+++ b/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_ucb_GnomeVFSContentProvider_idl__
 #define __com_sun_star_ucb_GnomeVFSContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl b/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
index 4cda47bc3..eaf4171ae 100644
--- a/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
@@ -1,41 +1,15 @@
 #ifndef __com_sun_star_ucb_GnomeVFSDocumentContent_idl__
 #define __com_sun_star_ucb_GnomeVFSDocumentContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl b/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
index fe105e2f4..86917ad83 100644
--- a/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
+++ b/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
@@ -1,45 +1,16 @@
 #ifndef __com_sun_star_ucb_GnomeVFSFolderContent_idl__
 #define __com_sun_star_ucb_GnomeVFSFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
index c81bea8f6..a05ebf206 100644
--- a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
+++ b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_HandleCookiesRequest_idl__
 #define __com_sun_star_ucb_HandleCookiesRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_Cookie_idl__
 #include <com/sun/star/ucb/Cookie.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CookieRequest_idl__
 #include <com/sun/star/ucb/CookieRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/HelpContent.idl b/offapi/com/sun/star/ucb/HelpContent.idl
index e10e612fa..fad9d7802 100644
--- a/offapi/com/sun/star/ucb/HelpContent.idl
+++ b/offapi/com/sun/star/ucb/HelpContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_HelpContent_idl__
 #define __com_sun_star_ucb_HelpContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HelpContentProvider.idl b/offapi/com/sun/star/ucb/HelpContentProvider.idl
index 691dbea72..8cb14987d 100644
--- a/offapi/com/sun/star/ucb/HelpContentProvider.idl
+++ b/offapi/com/sun/star/ucb/HelpContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_HelpContentProvider_idl__
 #define __com_sun_star_ucb_HelpContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/HierarchyContentProvider.idl b/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
index a5971e998..b0b208c57 100644
--- a/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
+++ b/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_HierarchyContentProvider_idl__
 #define __com_sun_star_ucb_HierarchyContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl b/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
index 639705def..c97b8ea91 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ucb_HierarchyDataReadAccess_idl__
 #define __com_sun_star_ucb_HierarchyDataReadAccess_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-#ifndef __com_sun_star_util_XChangesNotifier_idl__
 #include <com/sun/star/util/XChangesNotifier.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl b/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
index 5933b3561..0601428b9 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ucb_HierarchyDataReadWriteAccess_idl__
 #define __com_sun_star_ucb_HierarchyDataReadWriteAccess_idl__
 
-#ifndef __com_sun_star_ucb_HierarchyDataReadAccess_idl__
 #include <com/sun/star/ucb/HierarchyDataReadAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_util_XChangesBatch_idl__
 #include <com/sun/star/util/XChangesBatch.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HierarchyDataSource.idl b/offapi/com/sun/star/ucb/HierarchyDataSource.idl
index 12c2bb28e..ee068891b 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataSource.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataSource.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_HierarchyDataSource_idl__
 #define __com_sun_star_ucb_HierarchyDataSource_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HierarchyFolderContent.idl b/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
index 295d35aa5..08377d333 100644
--- a/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_HierarchyFolderContent_idl__
 #define __com_sun_star_ucb_HierarchyFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HierarchyLinkContent.idl b/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
index a448f4cff..770abb64e 100644
--- a/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_HierarchyLinkContent_idl__
 #define __com_sun_star_ucb_HierarchyLinkContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl b/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
index 0c89050d6..a49977303 100644
--- a/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_HierarchyRootFolderContent_idl__
 #define __com_sun_star_ucb_HierarchyRootFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/IllegalIdentifierException.idl b/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
index fd923fde1..ae2d25d03 100644
--- a/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
+++ b/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_IllegalIdentifierException_idl__
 #define __com_sun_star_ucb_IllegalIdentifierException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InsertCommandArgument.idl b/offapi/com/sun/star/ucb/InsertCommandArgument.idl
index 6aa2034ef..5cd0f439f 100644
--- a/offapi/com/sun/star/ucb/InsertCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/InsertCommandArgument.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_InsertCommandArgument_idl__
 #define __com_sun_star_ucb_InsertCommandArgument_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/InteractiveAppException.idl b/offapi/com/sun/star/ucb/InteractiveAppException.idl
index e37f1188d..dd2677734 100644
--- a/offapi/com/sun/star/ucb/InteractiveAppException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveAppException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_InteractiveIOException_idl__
 #define __com_sun_star_ucb_InteractiveIOException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IOErrorCode_idl__
 #include <com/sun/star/ucb/IOErrorCode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl b/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
index a2d6b772b..90afb1f7d 100644
--- a/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveAugmentedIOException_idl__
 #define __com_sun_star_ucb_InteractiveAugmentedIOException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
 #include <com/sun/star/ucb/InteractiveIOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl b/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
index cd5c1e92c..e9568af23 100644
--- a/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveBadTransferURLException_idl__
 #define __com_sun_star_ucb_InteractiveBadTransferURLException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl b/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
index 9b667af55..8f9385987 100644
--- a/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveCHAOSException_idl__
 #define __com_sun_star_ucb_InteractiveCHAOSException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveFileIOException.idl b/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
index 379082596..bc8e9f71a 100644
--- a/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_InteractiveFileIOException_idl__
 #define __com_sun_star_ucb_InteractiveFileIOException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
 #include <com/sun/star/ucb/InteractiveIOException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IOErrorCode_idl__
 #include <com/sun/star/ucb/IOErrorCode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveIOException.idl b/offapi/com/sun/star/ucb/InteractiveIOException.idl
index 0de89b238..35b11927e 100644
--- a/offapi/com/sun/star/ucb/InteractiveIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveIOException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_InteractiveIOException_idl__
 #define __com_sun_star_ucb_InteractiveIOException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IOErrorCode_idl__
 #include <com/sun/star/ucb/IOErrorCode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingException.idl b/offapi/com/sun/star/ucb/InteractiveLockingException.idl
index 496ccd8da..b28707f16 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
 #define __com_sun_star_ucb_InteractiveLockingException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl b/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
index 90aff3a29..2d73ccd39 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveLockingLockExpiredException_idl__
 #define __com_sun_star_ucb_InteractiveLockingLockExpiredException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
 #include <com/sun/star/ucb/InteractiveLockingException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl b/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
index 875306816..c036f377e 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveLockingLockedException_idl__
 #define __com_sun_star_ucb_InteractiveLockingLockedException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
 #include <com/sun/star/ucb/InteractiveLockingException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl b/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
index 19cd19102..be6b25c3f 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveLockingNotLockedException_idl__
 #define __com_sun_star_ucb_InteractiveLockingNotLockedException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
 #include <com/sun/star/ucb/InteractiveLockingException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
index ff63a8f35..938513ea7 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkConnectException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkConnectException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
index 131f5ba7f..599f2ec4d 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
index 6f8e0e6a4..0ce6abd0e 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkGeneralException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkGeneralException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
index 2cbe35219..7c0d782e4 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkOffLineException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkOffLineException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
index dd3b64a5f..dad8cf05f 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkReadException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkReadException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
index bc39c8b89..e1cf424ae 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkResolveNameException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkResolveNameException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
index 08759633b..4088ce4c9 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkWriteException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkWriteException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl b/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
index 1a4ec3fa3..c7b259a20 100644
--- a/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveWrongMediumException_idl__
 #define __com_sun_star_ucb_InteractiveWrongMediumException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ListEvent.idl b/offapi/com/sun/star/ucb/ListEvent.idl
index c2be0dbb6..8f834f954 100644
--- a/offapi/com/sun/star/ucb/ListEvent.idl
+++ b/offapi/com/sun/star/ucb/ListEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_ListEvent_idl__
 #define __com_sun_star_ucb_ListEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ListAction_idl__
 #include <com/sun/star/ucb/ListAction.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl b/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
index c4176fb4d..ebe7a673a 100644
--- a/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
+++ b/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ListenerAlreadySetException_idl__
 #define __com_sun_star_ucb_ListenerAlreadySetException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/Lock.idl b/offapi/com/sun/star/ucb/Lock.idl
index b026812af..a5edb82b7 100644
--- a/offapi/com/sun/star/ucb/Lock.idl
+++ b/offapi/com/sun/star/ucb/Lock.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_Lock_idl__
 #define __com_sun_star_ucb_Lock_idl__
 
-#ifndef __com_sun_star_ucb_LockEntry_idl__
 #include <com/sun/star/ucb/LockEntry.idl>
-#endif
-#ifndef __com_sun_star_ucb_LockDepth_idl__
 #include <com/sun/star/ucb/LockDepth.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/LockEntry.idl b/offapi/com/sun/star/ucb/LockEntry.idl
index 2e42ede37..2d872c4d8 100644
--- a/offapi/com/sun/star/ucb/LockEntry.idl
+++ b/offapi/com/sun/star/ucb/LockEntry.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_LockEntry_idl__
 #define __com_sun_star_ucb_LockEntry_idl__
 
-#ifndef __com_sun_star_ucb_LockScope_idl__
 #include <com/sun/star/ucb/LockScope.idl>
-#endif
-#ifndef __com_sun_star_ucb_LockType_idl__
 #include <com/sun/star/ucb/LockType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/MissingInputStreamException.idl b/offapi/com/sun/star/ucb/MissingInputStreamException.idl
index 07277e43f..3da5a4315 100644
--- a/offapi/com/sun/star/ucb/MissingInputStreamException.idl
+++ b/offapi/com/sun/star/ucb/MissingInputStreamException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_MissingInputStreamException_idl__
 #define __com_sun_star_ucb_MissingInputStreamException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/MissingPropertiesException.idl b/offapi/com/sun/star/ucb/MissingPropertiesException.idl
index a9442897d..14d8e9cf5 100644
--- a/offapi/com/sun/star/ucb/MissingPropertiesException.idl
+++ b/offapi/com/sun/star/ucb/MissingPropertiesException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_MissingPropertiesException_idl__
 #define __com_sun_star_ucb_MissingPropertiesException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/NameClashException.idl b/offapi/com/sun/star/ucb/NameClashException.idl
index 29748df6a..a2403e32b 100644
--- a/offapi/com/sun/star/ucb/NameClashException.idl
+++ b/offapi/com/sun/star/ucb/NameClashException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_NameClashException_idl__
 #define __com_sun_star_ucb_NameClashException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/NameClashResolveRequest.idl b/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
index d295dbda8..c5c9c1dc6 100644
--- a/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
+++ b/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_NameClashResolveRequest_idl__
 #define __com_sun_star_ucb_NameClashResolveRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/ODMAContent.idl b/offapi/com/sun/star/ucb/ODMAContent.idl
index f662e5f45..ff4b1f543 100644
--- a/offapi/com/sun/star/ucb/ODMAContent.idl
+++ b/offapi/com/sun/star/ucb/ODMAContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_ODMAContent_idl__
 #define __com_sun_star_ucb_ODMAContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ODMAContentProvider.idl b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
index 5f6812817..723aa9955 100644
--- a/offapi/com/sun/star/ucb/ODMAContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ODMAContentProvider_idl__
 #define __com_sun_star_ucb_ODMAContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/OpenCommandArgument.idl b/offapi/com/sun/star/ucb/OpenCommandArgument.idl
index e4f2b4122..3a01b5171 100644
--- a/offapi/com/sun/star/ucb/OpenCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/OpenCommandArgument.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_OpenCommandArgument_idl__
 #define __com_sun_star_ucb_OpenCommandArgument_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/OpenCommandArgument2.idl b/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
index a6298a1e7..c7a8f9ee9 100644
--- a/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
+++ b/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_OpenCommandArgument2_idl__
 #define __com_sun_star_ucb_OpenCommandArgument2_idl__
 
-#ifndef __com_sun_star_ucb_OpenCommandArgument_idl__
 #include <com/sun/star/ucb/OpenCommandArgument.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
 #include <com/sun/star/ucb/NumberedSortingInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/PackageContentProvider.idl b/offapi/com/sun/star/ucb/PackageContentProvider.idl
index 4f70607fc..e8f26fa15 100644
--- a/offapi/com/sun/star/ucb/PackageContentProvider.idl
+++ b/offapi/com/sun/star/ucb/PackageContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_PackageContentProvider_idl__
 #define __com_sun_star_ucb_PackageContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/PackageFolderContent.idl b/offapi/com/sun/star/ucb/PackageFolderContent.idl
index 0ef08a87a..87be42dc6 100644
--- a/offapi/com/sun/star/ucb/PackageFolderContent.idl
+++ b/offapi/com/sun/star/ucb/PackageFolderContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_PackageFolderContent_idl__
 #define __com_sun_star_ucb_PackageFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/PackageStreamContent.idl b/offapi/com/sun/star/ucb/PackageStreamContent.idl
index 9a1784763..28709ff63 100644
--- a/offapi/com/sun/star/ucb/PackageStreamContent.idl
+++ b/offapi/com/sun/star/ucb/PackageStreamContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_PackageStreamContent_idl__
 #define __com_sun_star_ucb_PackageStreamContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/PersistentPropertySet.idl b/offapi/com/sun/star/ucb/PersistentPropertySet.idl
index 2815ffeba..47d73bfdd 100644
--- a/offapi/com/sun/star/ucb/PersistentPropertySet.idl
+++ b/offapi/com/sun/star/ucb/PersistentPropertySet.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ucb_PersistentPropertySet_idl__
 #define __com_sun_star_ucb_PersistentPropertySet_idl__
 
-#ifndef __com_sun_star_ucb_XPersistentPropertySet_idl__
 #include <com/sun/star/ucb/XPersistentPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
 #include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/PostCommandArgument.idl b/offapi/com/sun/star/ucb/PostCommandArgument.idl
index 977d5da90..ba8a0c51e 100644
--- a/offapi/com/sun/star/ucb/PostCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/PostCommandArgument.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_PostCommandArgument_idl__
 #define __com_sun_star_ucb_PostCommandArgument_idl__
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/PostCommandArgument2.idl b/offapi/com/sun/star/ucb/PostCommandArgument2.idl
index 8a8c86977..5fda10a62 100644
--- a/offapi/com/sun/star/ucb/PostCommandArgument2.idl
+++ b/offapi/com/sun/star/ucb/PostCommandArgument2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_PostCommandArgument2_idl__
 #define __com_sun_star_ucb_PostCommandArgument2_idl__
 
-#ifndef __com_sun_star_ucb_PostCommandArgument_idl__
 #include <com/sun/star/ucb/PostCommandArgument.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/PropertiesManager.idl b/offapi/com/sun/star/ucb/PropertiesManager.idl
index 910c45a86..506e21a69 100644
--- a/offapi/com/sun/star/ucb/PropertiesManager.idl
+++ b/offapi/com/sun/star/ucb/PropertiesManager.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_PropertiesManager_idl__
 #define __com_sun_star_ucb_PropertiesManager_idl__
 
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
 #include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/PropertySetRegistry.idl b/offapi/com/sun/star/ucb/PropertySetRegistry.idl
index 0aed9c4cd..c8b3c5b92 100644
--- a/offapi/com/sun/star/ucb/PropertySetRegistry.idl
+++ b/offapi/com/sun/star/ucb/PropertySetRegistry.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_PropertySetRegistry_idl__
 #define __com_sun_star_ucb_PropertySetRegistry_idl__
 
-#ifndef __com_sun_star_ucb_XPropertySetRegistry_idl__
 #include <com/sun/star/ucb/XPropertySetRegistry.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/PropertyValueInfo.idl b/offapi/com/sun/star/ucb/PropertyValueInfo.idl
index e2a4e2d0f..c05b4e7a9 100644
--- a/offapi/com/sun/star/ucb/PropertyValueInfo.idl
+++ b/offapi/com/sun/star/ucb/PropertyValueInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_PropertyValueInfo_idl__
 #define __com_sun_star_ucb_PropertyValueInfo_idl__
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_PropertyValueState_idl__
 #include <com/sun/star/ucb/PropertyValueState.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/RecipientInfo.idl b/offapi/com/sun/star/ucb/RecipientInfo.idl
index dca4a71ab..8fc23c5c0 100644
--- a/offapi/com/sun/star/ucb/RecipientInfo.idl
+++ b/offapi/com/sun/star/ucb/RecipientInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_RecipientInfo_idl__
 #define __com_sun_star_ucb_RecipientInfo_idl__
 
-#ifndef __com_sun_star_ucb_OutgoingMessageState_idl__
 #include <com/sun/star/ucb/OutgoingMessageState.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl b/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
index 6425ed6e2..e682fc767 100644
--- a/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
+++ b/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_RemoteAccessContentProvider_idl__
 #define __com_sun_star_ucb_RemoteAccessContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_ContentProvider_idl__
 #include <com/sun/star/ucb/ContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
 #include <com/sun/star/ucb/XParameterizedContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl b/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
index 1e0bb5ce9..2f041b0e2 100644
--- a/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
+++ b/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_ucb_RemoteContentProviderChangeEvent_idl__
 #define __com_sun_star_ucb_RemoteContentProviderChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_ucb_RemoteContentProviderChangeAction_idl__
 #include <com/sun/star/ucb/RemoteContentProviderChangeAction.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 
diff --git a/offapi/com/sun/star/ucb/ResultSetException.idl b/offapi/com/sun/star/ucb/ResultSetException.idl
index a54cfeaa3..175c648ab 100644
--- a/offapi/com/sun/star/ucb/ResultSetException.idl
+++ b/offapi/com/sun/star/ucb/ResultSetException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ResultSetException_idl__
 #define __com_sun_star_ucb_ResultSetException_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/Rule.idl b/offapi/com/sun/star/ucb/Rule.idl
index f646b5746..f29b5125a 100644
--- a/offapi/com/sun/star/ucb/Rule.idl
+++ b/offapi/com/sun/star/ucb/Rule.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_Rule_idl__
 #define __com_sun_star_ucb_Rule_idl__
 
-#ifndef __com_sun_star_ucb_RuleTerm_idl__
 #include <com/sun/star/ucb/RuleTerm.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/RuleSet.idl b/offapi/com/sun/star/ucb/RuleSet.idl
index b76615d70..11f85a958 100644
--- a/offapi/com/sun/star/ucb/RuleSet.idl
+++ b/offapi/com/sun/star/ucb/RuleSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_RuleSet_idl__
 #define __com_sun_star_ucb_RuleSet_idl__
 
-#ifndef __com_sun_star_ucb_Rule_idl__
 #include <com/sun/star/ucb/Rule.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/SearchCommandArgument.idl b/offapi/com/sun/star/ucb/SearchCommandArgument.idl
index b7645b5dd..ffee9758e 100644
--- a/offapi/com/sun/star/ucb/SearchCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/SearchCommandArgument.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_SearchCommandArgument_idl__
 #define __com_sun_star_ucb_SearchCommandArgument_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_SearchInfo_idl__
 #include <com/sun/star/ucb/SearchInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/SearchCriterium.idl b/offapi/com/sun/star/ucb/SearchCriterium.idl
index 433a90c3b..2033973f7 100644
--- a/offapi/com/sun/star/ucb/SearchCriterium.idl
+++ b/offapi/com/sun/star/ucb/SearchCriterium.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_SearchCriterium_idl__
 #define __com_sun_star_ucb_SearchCriterium_idl__
 
-#ifndef __com_sun_star_ucb_RuleTerm_idl__
 #include <com/sun/star/ucb/RuleTerm.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/SearchInfo.idl b/offapi/com/sun/star/ucb/SearchInfo.idl
index d308c73a2..51faecd7b 100644
--- a/offapi/com/sun/star/ucb/SearchInfo.idl
+++ b/offapi/com/sun/star/ucb/SearchInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_SearchInfo_idl__
 #define __com_sun_star_ucb_SearchInfo_idl__
 
-#ifndef __com_sun_star_ucb_SearchCriterium_idl__
 #include <com/sun/star/ucb/SearchCriterium.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_SearchRecursion_idl__
 #include <com/sun/star/ucb/SearchRecursion.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/ServiceNotFoundException.idl b/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
index 76b9a3c06..6d100b980 100644
--- a/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
+++ b/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ServiceNotFoundException_idl__
 #define __com_sun_star_ucb_ServiceNotFoundException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/SimpleFileAccess.idl b/offapi/com/sun/star/ucb/SimpleFileAccess.idl
index 6d079fbe1..fc4e21200 100644
--- a/offapi/com/sun/star/ucb/SimpleFileAccess.idl
+++ b/offapi/com/sun/star/ucb/SimpleFileAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_SimpleFileAccess_idl__
 #define __com_sun_star_ucb_SimpleFileAccess_idl__
 
-#ifndef __com_sun_star_ucb_XSimpleFileAccess2_idl__
 #include <com/sun/star/ucb/XSimpleFileAccess2.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
index 08b64d8b2..8b6f13e87 100644
--- a/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_SortedDynamicResultSetFactory_idl__
 #define __com_sun_star_ucb_SortedDynamicResultSetFactory_idl__
 
-#ifndef __com_sun_star_ucb_XSortedDynamicResultSetFactory_idl__
 #include <com/sun/star/ucb/XSortedDynamicResultSetFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/Store.idl b/offapi/com/sun/star/ucb/Store.idl
index 8926d17fd..0bf0cc337 100644
--- a/offapi/com/sun/star/ucb/Store.idl
+++ b/offapi/com/sun/star/ucb/Store.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_Store_idl__
 #define __com_sun_star_ucb_Store_idl__
 
-#ifndef __com_sun_star_ucb_XPropertySetRegistryFactory_idl__
 #include <com/sun/star/ucb/XPropertySetRegistryFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl b/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
index fe5a136e1..b9f1c92bd 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_TransientDocumentsContentProvider_idl__
 #define __com_sun_star_ucb_TransientDocumentsContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
index 429eb859c..f2a1994f1 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_TransientDocumentsDocumentContent_idl__
 #define __com_sun_star_ucb_TransientDocumentsDocumentContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
index 5942752c2..4f0395d7f 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_TransientDocumentsFolderContent_idl__
 #define __com_sun_star_ucb_TransientDocumentsFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
index 853dc6b12..8def9bde7 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_TransientDocumentsRootContent_idl__
 #define __com_sun_star_ucb_TransientDocumentsRootContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
index c66d923f9..3612f7b4e 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_TransientDocumentsStreamContent_idl__
 #define __com_sun_star_ucb_TransientDocumentsStreamContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
index 8a37bcca0..268c709eb 100644
--- a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
+++ b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_URLAuthenticationRequest_idl__
 #define __com_sun_star_ucb_URLAuthenticationRequest_idl__
 
-#ifndef __com_sun_star_ucb_AuthenticationRequest_idl__
 #include <com/sun/star/ucb/AuthenticationRequest.idl>
-#endif
 
 
 //=============================================================================
@@ -42,7 +40,7 @@ module com { module sun { module star { module ucb {
 
     @since OOo 3.2
 */
-/*published*/ exception URLAuthenticationRequest : AuthenticationRequest
+published exception URLAuthenticationRequest : AuthenticationRequest
 {
     //-------------------------------------------------------------------------
     /** The URL for which authentication is requested.
diff --git a/offapi/com/sun/star/ucb/UniversalContentBroker.idl b/offapi/com/sun/star/ucb/UniversalContentBroker.idl
index c52e54717..b33cd5354 100644
--- a/offapi/com/sun/star/ucb/UniversalContentBroker.idl
+++ b/offapi/com/sun/star/ucb/UniversalContentBroker.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_ucb_UniversalContentBroker_idl__
 #define __com_sun_star_ucb_UniversalContentBroker_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProviderManager_idl__
 #include <com/sun/star/ucb/XContentProviderManager.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
 #include <com/sun/star/ucb/XContentIdentifierFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/UnsupportedCommandException.idl b/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
index bbbb9bd07..c6d72d37e 100644
--- a/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_UnsupportedCommandException_idl__
 #define __com_sun_star_ucb_UnsupportedCommandException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl b/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
index 7de88248e..d9699f592 100644
--- a/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_ucb_UnsupportedDataSinkException_idl__
 #define __com_sun_star_ucb_UnsupportedDataSinkException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl b/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
index 4b84c604b..58b82cfa4 100644
--- a/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_UnsupportedNameClashException_idl__
 #define __com_sun_star_ucb_UnsupportedNameClashException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl b/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
index e720ec90b..e82be49c5 100644
--- a/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_UnsupportedOpenModeException_idl__
 #define __com_sun_star_ucb_UnsupportedOpenModeException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/WebDAVContentProvider.idl b/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
index 8784e68f1..3fe44a48f 100644
--- a/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
+++ b/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_WebDAVContentProvider_idl__
 #define __com_sun_star_ucb_WebDAVContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl b/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
index 16c966aa7..64cc5bef8 100644
--- a/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_WebDAVDocumentContent_idl__
 #define __com_sun_star_ucb_WebDAVDocumentContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/WebDAVFolderContent.idl b/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
index 010e43bb1..2d7dd0283 100644
--- a/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
+++ b/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_WebDAVFolderContent_idl__
 #define __com_sun_star_ucb_WebDAVFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl b/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
index 0290aa888..e4b79dfd0 100644
--- a/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
+++ b/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_WelcomeDynamicResultSetStruct_idl__
 #define __com_sun_star_ucb_WelcomeDynamicResultSetStruct_idl__
 
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XAnyCompare.idl b/offapi/com/sun/star/ucb/XAnyCompare.idl
index 8ac004308..3e148c3ba 100644
--- a/offapi/com/sun/star/ucb/XAnyCompare.idl
+++ b/offapi/com/sun/star/ucb/XAnyCompare.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XAnyCompare_idl__
 #define __com_sun_star_ucb_XAnyCompare_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XAnyCompareFactory.idl b/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
index f15c55475..32a3fe528 100644
--- a/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
+++ b/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
 #define __com_sun_star_ucb_XAnyCompareFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XAnyCompare_idl__
 #include <com/sun/star/ucb/XAnyCompare.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl b/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
index 24a8fc615..295c4c102 100644
--- a/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XCachedContentResultSetFactory_idl__
 #define __com_sun_star_ucb_XCachedContentResultSetFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierMapping_idl__
 #include <com/sun/star/ucb/XContentIdentifierMapping.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl b/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
index 0f5ef7946..9e13b0928 100644
--- a/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XCachedContentResultSetStubFactory_idl__
 #define __com_sun_star_ucb_XCachedContentResultSetStubFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
index 54ba0397b..ceec413b8 100644
--- a/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XCachedDynamicResultSetFactory_idl__
 #define __com_sun_star_ucb_XCachedDynamicResultSetFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierMapping_idl__
 #include <com/sun/star/ucb/XContentIdentifierMapping.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl b/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
index a8b0c9627..3214db9b0 100644
--- a/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_ucb_XCachedDynamicResultSetStubFactory_idl__
 #define __com_sun_star_ucb_XCachedDynamicResultSetStubFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
 #include <com/sun/star/ucb/NumberedSortingInfo.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
 #include <com/sun/star/ucb/XAnyCompareFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCommandEnvironment.idl b/offapi/com/sun/star/ucb/XCommandEnvironment.idl
index adf7985b3..59d23e974 100644
--- a/offapi/com/sun/star/ucb/XCommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/XCommandEnvironment.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_ucb_XCommandEnvironment_idl__
 #define __com_sun_star_ucb_XCommandEnvironment_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XProgressHandler_idl__
 #include <com/sun/star/ucb/XProgressHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCommandInfo.idl b/offapi/com/sun/star/ucb/XCommandInfo.idl
index 62fa6d789..f7a9b9f3c 100644
--- a/offapi/com/sun/star/ucb/XCommandInfo.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfo.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XCommandInfo_idl__
 #define __com_sun_star_ucb_XCommandInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandInfo_idl__
 #include <com/sun/star/ucb/CommandInfo.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_UnsupportedCommandException_idl__
 #include <com/sun/star/ucb/UnsupportedCommandException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl b/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
index 13bf2b7da..dffd3a3bf 100644
--- a/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XCommandInfoChangeListener_idl__
 #define __com_sun_star_ucb_XCommandInfoChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandInfoChangeEvent_idl__
 #include <com/sun/star/ucb/CommandInfoChangeEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl b/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
index aa6d1df60..4e4a46be9 100644
--- a/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #define __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_ucb_XCommandInfoChangeListener_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCommandProcessor.idl b/offapi/com/sun/star/ucb/XCommandProcessor.idl
index d2c075e10..e9728bb5d 100644
--- a/offapi/com/sun/star/ucb/XCommandProcessor.idl
+++ b/offapi/com/sun/star/ucb/XCommandProcessor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #define __com_sun_star_ucb_XCommandProcessor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandEnvironment_idl__
 #include <com/sun/star/ucb/XCommandEnvironment.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_Command_idl__
 #include <com/sun/star/ucb/Command.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandAbortedException_idl__
 #include <com/sun/star/ucb/CommandAbortedException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCommandProcessor2.idl b/offapi/com/sun/star/ucb/XCommandProcessor2.idl
index 3064d1fec..41c9bca3e 100644
--- a/offapi/com/sun/star/ucb/XCommandProcessor2.idl
+++ b/offapi/com/sun/star/ucb/XCommandProcessor2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #define __com_sun_star_ucb_XCommandProcessor2_idl__
 
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 
diff --git a/offapi/com/sun/star/ucb/XContent.idl b/offapi/com/sun/star/ucb/XContent.idl
index d19e6fd8a..a094b7975 100644
--- a/offapi/com/sun/star/ucb/XContent.idl
+++ b/offapi/com/sun/star/ucb/XContent.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XContent_idl__
 #define __com_sun_star_ucb_XContent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
 #include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentEventListener_idl__
 #include <com/sun/star/ucb/XContentEventListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentAccess.idl b/offapi/com/sun/star/ucb/XContentAccess.idl
index c9ebbd5af..239da4364 100644
--- a/offapi/com/sun/star/ucb/XContentAccess.idl
+++ b/offapi/com/sun/star/ucb/XContentAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XContentAccess_idl__
 #define __com_sun_star_ucb_XContentAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XContentCreator.idl b/offapi/com/sun/star/ucb/XContentCreator.idl
index e726150a2..ba1c8bfdd 100644
--- a/offapi/com/sun/star/ucb/XContentCreator.idl
+++ b/offapi/com/sun/star/ucb/XContentCreator.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XContentCreator_idl__
 #define __com_sun_star_ucb_XContentCreator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentInfo_idl__
 #include <com/sun/star/ucb/ContentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentEventListener.idl b/offapi/com/sun/star/ucb/XContentEventListener.idl
index 3eea9036e..c2db3a059 100644
--- a/offapi/com/sun/star/ucb/XContentEventListener.idl
+++ b/offapi/com/sun/star/ucb/XContentEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XContentEventListener_idl__
 #define __com_sun_star_ucb_XContentEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentEvent_idl__
 #include <com/sun/star/ucb/ContentEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XContentIdentifier.idl b/offapi/com/sun/star/ucb/XContentIdentifier.idl
index 3adfee152..a23be6841 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifier.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XContentIdentifier_idl__
 #define __com_sun_star_ucb_XContentIdentifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl b/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
index 1237b89fd..027c28945 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
 #define __com_sun_star_ucb_XContentIdentifierFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
 #include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl b/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
index 44ffdf71d..94a13db93 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XContentIdentifierMapping_idl__
 #define __com_sun_star_ucb_XContentIdentifierMapping_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XContentProvider.idl b/offapi/com/sun/star/ucb/XContentProvider.idl
index d36529956..8a08f1686 100644
--- a/offapi/com/sun/star/ucb/XContentProvider.idl
+++ b/offapi/com/sun/star/ucb/XContentProvider.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_ucb_XContentProvider_idl__
 #define __com_sun_star_ucb_XContentProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
 #include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IllegalIdentifierException_idl__
 #include <com/sun/star/ucb/IllegalIdentifierException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XContentProviderFactory.idl b/offapi/com/sun/star/ucb/XContentProviderFactory.idl
index c62659edb..2f46f4a2a 100644
--- a/offapi/com/sun/star/ucb/XContentProviderFactory.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderFactory.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XContentProviderFactory_idl__
 #define __com_sun_star_ucb_XContentProviderFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XContentProviderManager.idl b/offapi/com/sun/star/ucb/XContentProviderManager.idl
index 32ebe0be1..be6f25ea3 100644
--- a/offapi/com/sun/star/ucb/XContentProviderManager.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderManager.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_ucb_XContentProviderManager_idl__
 #define __com_sun_star_ucb_XContentProviderManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_DuplicateProviderException_idl__
 #include <com/sun/star/ucb/DuplicateProviderException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentProviderInfo_idl__
 #include <com/sun/star/ucb/ContentProviderInfo.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentProviderSupplier.idl b/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
index 4ee752b8a..4d2e46484 100644
--- a/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XContentProviderSupplier_idl__
 #define __com_sun_star_ucb_XContentProviderSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XContentTransmitter.idl b/offapi/com/sun/star/ucb/XContentTransmitter.idl
index 40ed1e402..e7c0b062f 100644
--- a/offapi/com/sun/star/ucb/XContentTransmitter.idl
+++ b/offapi/com/sun/star/ucb/XContentTransmitter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XContentTransmitter_idl__
 #define __com_sun_star_ucb_XContentTransmitter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XDataContainer.idl b/offapi/com/sun/star/ucb/XDataContainer.idl
index 525827ad2..848f07715 100644
--- a/offapi/com/sun/star/ucb/XDataContainer.idl
+++ b/offapi/com/sun/star/ucb/XDataContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XDataContainer_idl__
 #define __com_sun_star_ucb_XDataContainer_idl__
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XDynamicResultSet.idl b/offapi/com/sun/star/ucb/XDynamicResultSet.idl
index dd3caea97..bbd07ecc2 100644
--- a/offapi/com/sun/star/ucb/XDynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/XDynamicResultSet.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #define __com_sun_star_ucb_XDynamicResultSet_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSetListener_idl__
 #include <com/sun/star/ucb/XDynamicResultSetListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ListenerAlreadySetException_idl__
 #include <com/sun/star/ucb/ListenerAlreadySetException.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_AlreadyInitializedException_idl__
 #include <com/sun/star/ucb/AlreadyInitializedException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ServiceNotFoundException_idl__
 #include <com/sun/star/ucb/ServiceNotFoundException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl b/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
index 9200cda36..02eca3062 100644
--- a/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
+++ b/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XDynamicResultSetListener_idl__
 #define __com_sun_star_ucb_XDynamicResultSetListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ListEvent_idl__
 #include <com/sun/star/ucb/ListEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XFetchProvider.idl b/offapi/com/sun/star/ucb/XFetchProvider.idl
index 5e8f28756..417a35a97 100644
--- a/offapi/com/sun/star/ucb/XFetchProvider.idl
+++ b/offapi/com/sun/star/ucb/XFetchProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XFetchProvider_idl__
 #define __com_sun_star_ucb_XFetchProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_FetchResult_idl__
 #include <com/sun/star/ucb/FetchResult.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl b/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
index 04a261d73..3ee5e3f90 100644
--- a/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
+++ b/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XFetchProviderForContentAccess_idl__
 #define __com_sun_star_ucb_XFetchProviderForContentAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_FetchResult_idl__
 #include <com/sun/star/ucb/FetchResult.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl b/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
index bb48b506f..56be59caa 100644
--- a/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
+++ b/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XFileIdentifierConverter_idl__
 #define __com_sun_star_ucb_XFileIdentifierConverter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
index 2916d7794..d5050fc5f 100644
--- a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
+++ b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XInteractionCookieHandling_idl__
 #define __com_sun_star_ucb_XInteractionCookieHandling_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CookiePolicy_idl__
 #include <com/sun/star/ucb/CookiePolicy.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_Cookie_idl__
 #include <com/sun/star/ucb/Cookie.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl b/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
index 599585170..7d6b04942 100644
--- a/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
+++ b/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XInteractionHandlerSupplier_idl__
 #define __com_sun_star_ucb_XInteractionHandlerSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl b/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
index d869f81d7..f04347d3a 100644
--- a/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
+++ b/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XInteractionReplaceExistingData_idl__
 #define __com_sun_star_ucb_XInteractionReplaceExistingData_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
index 63e1fba7f..34fe0bb0a 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication_idl__
 #define __com_sun_star_ucb_XInteractionSupplyAuthentication_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_RememberAuthentication_idl__
 #include <com/sun/star/ucb/RememberAuthentication.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
index 536b482b5..cba4ac81a 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication2_idl__
 #define __com_sun_star_ucb_XInteractionSupplyAuthentication2_idl__
 
-#ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication_idl__
 #include <com/sun/star/ucb/XInteractionSupplyAuthentication.idl>
-#endif
 
 
 
@@ -45,7 +43,7 @@ module com { module sun { module star { module ucb {
 
     @since OOo 3.2
 */
-/*published*/ interface XInteractionSupplyAuthentication2 : XInteractionSupplyAuthentication
+published interface XInteractionSupplyAuthentication2 : XInteractionSupplyAuthentication
 {
     //-------------------------------------------------------------------------
     /** Specifies if "system credentials" can be obtained and used by the issuer
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyName.idl b/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
index 6ce73f1a2..46f95919c 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XInteractionSupplyName_idl__
 #define __com_sun_star_ucb_XInteractionSupplyName_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl b/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
index 1b03be7b7..774b63084 100644
--- a/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
+++ b/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
 #define __com_sun_star_ucb_XParameterizedContentProvider_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XPersistentPropertySet.idl b/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
index e77908061..544f9c4d7 100644
--- a/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
+++ b/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XPersistentPropertySet_idl__
 #define __com_sun_star_ucb_XPersistentPropertySet_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XProgressHandler.idl b/offapi/com/sun/star/ucb/XProgressHandler.idl
index e1c8de960..34562a207 100644
--- a/offapi/com/sun/star/ucb/XProgressHandler.idl
+++ b/offapi/com/sun/star/ucb/XProgressHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XProgressHandler_idl__
 #define __com_sun_star_ucb_XProgressHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XPropertyMatcher.idl b/offapi/com/sun/star/ucb/XPropertyMatcher.idl
index b3905f7bd..8a0d4ba3b 100644
--- a/offapi/com/sun/star/ucb/XPropertyMatcher.idl
+++ b/offapi/com/sun/star/ucb/XPropertyMatcher.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XPropertyMatcher_idl__
 #define __com_sun_star_ucb_XPropertyMatcher_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandEnvironment_idl__
 #include <com/sun/star/ucb/XCommandEnvironment.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl b/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
index 5f4cce062..971ca5f7d 100644
--- a/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
+++ b/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XPropertyMatcherFactory_idl__
 #define __com_sun_star_ucb_XPropertyMatcherFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XPropertyMatcher_idl__
 #include <com/sun/star/ucb/XPropertyMatcher.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_SearchCriterium_idl__
 #include <com/sun/star/ucb/SearchCriterium.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XPropertySetRegistry.idl b/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
index 2b5a2338c..a875ba40a 100644
--- a/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
+++ b/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XPropertySetRegistry_idl__
 #define __com_sun_star_ucb_XPropertySetRegistry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XPersistentPropertySet_idl__
 #include <com/sun/star/ucb/XPersistentPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl b/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
index 572991705..109b887d8 100644
--- a/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
+++ b/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XPropertySetRegistryFactory_idl__
 #define __com_sun_star_ucb_XPropertySetRegistryFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XPropertySetRegistry_idl__
 #include <com/sun/star/ucb/XPropertySetRegistry.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XRecycler.idl b/offapi/com/sun/star/ucb/XRecycler.idl
index 6a0693c16..5b6242d63 100644
--- a/offapi/com/sun/star/ucb/XRecycler.idl
+++ b/offapi/com/sun/star/ucb/XRecycler.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XRecycler_idl__
 #define __com_sun_star_ucb_XRecycler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
 #include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
index b1d4851e7..ae1431e97 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderAcceptor_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderAcceptor_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
index 623ab154e..a79697e51 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderActivator_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderActivator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
index a14ed6637..08334124a 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderChangeListener_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_ucb_RemoteContentProviderChangeEvent_idl__
 #include <com/sun/star/ucb/RemoteContentProviderChangeEvent.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
index 8936a1a9f..b28770b81 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderChangeNotifier_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderChangeNotifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module ucb {
      published interface XRemoteContentProviderChangeListener;
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
index 5ff3db6da..2fae32556 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderConnectionControl_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderConnectionControl_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module ucb {
      published interface XRemoteContentProviderAcceptor;
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
index 826baee54..9159c5bbc 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderDistributor_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderDistributor_idl__
 
-#ifndef __com_sun_star_connection_ConnectionSetupException_idl__
 #include <com/sun/star/connection/ConnectionSetupException.idl>
-#endif
-
-#ifndef __com_sun_star_connection_NoConnectException_idl__
 #include <com/sun/star/connection/NoConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
index 02bc4b1b9..5dd0ffc93 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderDoneListener_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderDoneListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
index e3b0ed610..6dfbe2c08 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderSupplier_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderSupplier_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
index 8b89be7ab..65155c2c5 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_XSimpleFileAccess_idl__
 #define __com_sun_star_ucb_XSimpleFileAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandAbortedException_idl__
 #include <com/sun/star/ucb/CommandAbortedException.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
index c5b1eca74..297f60146 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_ucb_XSimpleFileAccess2_idl__
 #define __com_sun_star_ucb_XSimpleFileAccess2_idl__
 
-#ifndef __com_sun_star_ucb_XSimpleFileAccess_idl__
 #include <com/sun/star/ucb/XSimpleFileAccess.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
index 5a1370e0e..f2406a6f1 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_ucb_XSimpleFileAccess3_idl__
 #define __com_sun_star_ucb_XSimpleFileAccess3_idl__
 
-#ifndef __com_sun_star_ucb_XSimpleFileAccess2_idl__
 #include <com/sun/star/ucb/XSimpleFileAccess2.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
index 73386fe1b..c913d0844 100644
--- a/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
@@ -27,19 +27,10 @@
 #ifndef __com_sun_star_ucb_XSortedDynamicResultSetFactory_idl__
 #define __com_sun_star_ucb_XSortedDynamicResultSetFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
 #include <com/sun/star/ucb/NumberedSortingInfo.idl>
-#endif
-#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
 #include <com/sun/star/ucb/XAnyCompareFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XSourceInitialization.idl b/offapi/com/sun/star/ucb/XSourceInitialization.idl
index f738ee79b..269331f9e 100644
--- a/offapi/com/sun/star/ucb/XSourceInitialization.idl
+++ b/offapi/com/sun/star/ucb/XSourceInitialization.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XSourceInitialization_idl__
 #define __com_sun_star_ucb_XSourceInitialization_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_AlreadyInitializedException_idl__
 #include <com/sun/star/ucb/AlreadyInitializedException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
index d586a8f58..9a22ebf7f 100644
--- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__
 #define __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
@@ -40,20 +36,19 @@ module com { module sun { module star { module ucb {
 
 //=============================================================================
 /** A command environment that can be used to deal with WebDAV/HTTP specific
-    commands. 
+    commands.
 
     <p>Supply an implementation of this interface together with an
     <type>XCommandEnvironment</type> implementation, when executing a command
     using <type>XCommandProcessor</type>.
 */
-/* published */ 
-interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface
+published interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** This method gets called while assembling an WebDAV/HTTP request.
         The returned headername-headervalue pairs will be appended to
         the list of request headers before the request is dispatched.
-          
+
     @param aURI
     The request URI.
 
@@ -61,13 +56,13 @@ interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface
     The WebDAV/HTTP method ("GET","PUT","MKCOL",...).
 
     @return
-        A sequence of header name, header value pairs. The header 
-        names must be the plain names and contain no trailing ":". 
+        A sequence of header name, header value pairs. The header
+        names must be the plain names and contain no trailing ":".
         The header value must be an Any containing a string.
     */
     sequence<com::sun::star::beans::NamedValue> getUserRequestHeaders(
-    [in] string aURI,
-    [in] string aMethod);
+        [in] string aURI,
+        [in] string aMethod);
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/makefile.mk b/offapi/com/sun/star/ucb/makefile.mk
deleted file mode 100644
index d5cd58ff6..000000000
--- a/offapi/com/sun/star/ucb/makefile.mk
+++ /dev/null
@@ -1,274 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssucb
-PACKAGE=com$/sun$/star$/ucb
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AlreadyInitializedException.idl\
-    AnyCompareFactory.idl\
-    AuthenticationRequest.idl\
-    URLAuthenticationRequest.idl\
-    CachedContentResultSet.idl\
-    CachedContentResultSetFactory.idl\
-    CachedContentResultSetStub.idl\
-    CachedContentResultSetStubFactory.idl\
-    CachedDynamicResultSet.idl\
-    CachedDynamicResultSetFactory.idl\
-    CachedDynamicResultSetStub.idl\
-    CachedDynamicResultSetStubFactory.idl\
-    CHAOSProgressStart.idl\
-    CertificateValidationRequest.idl\
-    Command.idl\
-    CommandAbortedException.idl\
-    CommandEnvironment.idl\
-    CommandFailedException.idl\
-    CommandInfo.idl\
-    CommandInfoChange.idl\
-    CommandInfoChangeEvent.idl\
-    ConnectionMode.idl\
-    Content.idl\
-    ContentAction.idl\
-    ContentCreationError.idl\
-    ContentCreationException.idl\
-    ContentEvent.idl\
-    ContentInfo.idl\
-    ContentInfoAttribute.idl\
-    ContentProvider.idl\
-    ContentProviderInfo.idl\
-    ContentProviderProxy.idl\
-    ContentProviderProxyFactory.idl\
-    ContentResultSet.idl\
-    ContentResultSetCapability.idl\
-    ContentTransmitter.idl\
-    Cookie.idl\
-    CookiePolicy.idl\
-    CookieRequest.idl\
-    CrossReference.idl\
-    DefaultHierarchyDataSource.idl\
-    DocumentHeaderField.idl\
-    DocumentStoreMode.idl\
-    DuplicateCommandIdentifierException.idl\
-    DuplicateProviderException.idl\
-    DynamicResultSet.idl\
-    Error.idl\
-    ExpandContentProvider.idl\
-    ExportStreamInfo.idl\
-    FetchError.idl\
-    FetchResult.idl\
-    FileContent.idl\
-    FileContentProvider.idl\
-    FileSystemNotation.idl\
-    FolderList.idl\
-    FolderListCommand.idl\
-    FolderListEntry.idl\
-    FTPContent.idl\
-    FTPContentProvider.idl\
-    GlobalTransferCommandArgument.idl\
-    GIOContentProvider.idl\
-    GnomeVFSContentProvider.idl\
-    GnomeVFSDocumentContent.idl\
-    GnomeVFSFolderContent.idl\
-    HandleCookiesRequest.idl\
-    HelpContent.idl\
-    HelpContentProvider.idl\
-    HierarchyContentProvider.idl\
-    HierarchyDataReadAccess.idl\
-    HierarchyDataReadWriteAccess.idl\
-    HierarchyDataSource.idl\
-    HierarchyFolderContent.idl\
-    HierarchyLinkContent.idl\
-    HierarchyRootFolderContent.idl\
-    IllegalIdentifierException.idl\
-    InsertCommandArgument.idl\
-    InteractiveAppException.idl\
-    InteractiveAugmentedIOException.idl\
-    InteractiveBadTransferURLException.idl\
-    InteractiveCHAOSException.idl\
-    InteractiveFileIOException.idl\
-    InteractiveIOException.idl\
-    InteractiveLockingException.idl\
-    InteractiveLockingLockedException.idl\
-    InteractiveLockingLockExpiredException.idl\
-    InteractiveLockingNotLockedException.idl\
-    InteractiveNetworkConnectException.idl\
-    InteractiveNetworkException.idl\
-    InteractiveNetworkGeneralException.idl\
-    InteractiveNetworkOffLineException.idl\
-    InteractiveNetworkReadException.idl\
-    InteractiveNetworkResolveNameException.idl\
-    InteractiveNetworkWriteException.idl\
-    InteractiveWrongMediumException.idl\
-    IOErrorCode.idl\
-    Link.idl\
-    ListAction.idl\
-    ListActionType.idl\
-    ListenerAlreadySetException.idl\
-    ListEvent.idl\
-    Lock.idl\
-    LockDepth.idl\
-    LockEntry.idl\
-    LockScope.idl\
-    LockType.idl\
-    MissingInputStreamException.idl\
-    MissingPropertiesException.idl\
-    NameClash.idl\
-    NameClashException.idl\
-    NameClashResolveRequest.idl\
-    NumberedSortingInfo.idl\
-    ODMAContent.idl\
-    ODMAContentProvider.idl\
-    OpenCommandArgument.idl\
-    OpenCommandArgument2.idl\
-    OpenMode.idl\
-    OutgoingMessageState.idl\
-    PackageContentProvider.idl\
-    PackageFolderContent.idl\
-    PackageStreamContent.idl\
-    PersistentPropertySet.idl\
-    PostCommandArgument.idl\
-    PostCommandArgument2.idl\
-    Priority.idl\
-    PropertiesManager.idl\
-    PropertySetRegistry.idl\
-    PropertyValueInfo.idl\
-    PropertyValueState.idl\
-    RecipientInfo.idl\
-    RememberAuthentication.idl\
-    RemoteAccessContentProvider.idl\
-    RemoteContentProviderAcceptor.idl\
-    RemoteContentProviderChangeAction.idl\
-    RemoteContentProviderChangeEvent.idl\
-    RemoteProxyContentProvider.idl\
-    ResultSetException.idl\
-    Rule.idl\
-    RuleAction.idl\
-    RuleOperator.idl\
-    RuleSet.idl\
-    RuleTerm.idl\
-    SearchCommandArgument.idl\
-    SearchCriterium.idl\
-    SearchInfo.idl\
-    SearchRecursion.idl\
-    SendInfo.idl\
-    SendMediaTypes.idl\
-    ServiceNotFoundException.idl\
-    SimpleFileAccess.idl\
-    SortedDynamicResultSetFactory.idl\
-    SortingInfo.idl\
-    Store.idl\
-    SynchronizePolicy.idl\
-    TransferCommandOperation.idl\
-    TransferInfo.idl\
-    TransferResult.idl\
-    TransientDocumentsContentProvider.idl\
-    TransientDocumentsRootContent.idl\
-    TransientDocumentsDocumentContent.idl\
-    TransientDocumentsFolderContent.idl\
-    TransientDocumentsStreamContent.idl\
-    UniversalContentBroker.idl\
-    UnsupportedCommandException.idl\
-    UnsupportedDataSinkException.idl\
-    UnsupportedNameClashException.idl\
-    UnsupportedOpenModeException.idl\
-    VerificationMode.idl\
-    WebDAVContentProvider.idl\
-    WebDAVDocumentContent.idl\
-    WebDAVFolderContent.idl\
-    WelcomeDynamicResultSetStruct.idl\
-    XAnyCompare.idl\
-    XAnyCompareFactory.idl\
-    XCachedContentResultSetFactory.idl\
-    XCachedContentResultSetStubFactory.idl\
-    XCachedDynamicResultSetFactory.idl\
-    XCachedDynamicResultSetStubFactory.idl\
-    XCommandEnvironment.idl\
-    XCommandInfo.idl\
-    XCommandInfoChangeListener.idl\
-    XCommandInfoChangeNotifier.idl\
-    XCommandProcessor.idl\
-    XCommandProcessor2.idl\
-    XContent.idl\
-    XContentAccess.idl\
-    XContentCreator.idl\
-    XContentEventListener.idl\
-    XContentIdentifier.idl\
-    XContentIdentifierFactory.idl\
-    XContentIdentifierMapping.idl\
-    XContentProvider.idl\
-    XContentProviderFactory.idl\
-    XContentProviderManager.idl\
-    XContentProviderSupplier.idl\
-    XContentTransmitter.idl\
-    XDataContainer.idl\
-    XDynamicResultSet.idl\
-    XDynamicResultSetListener.idl\
-    XFetchProvider.idl\
-    XFetchProviderForContentAccess.idl\
-    XFileIdentifierConverter.idl\
-    XInteractionCookieHandling.idl\
-    XInteractionHandlerSupplier.idl\
-    XInteractionReplaceExistingData.idl\
-    XInteractionSupplyAuthentication.idl\
-    XInteractionSupplyAuthentication2.idl\
-    XInteractionSupplyName.idl\
-    XParameterizedContentProvider.idl\
-    XPersistentPropertySet.idl\
-    XProgressHandler.idl\
-    XPropertyMatcher.idl\
-    XPropertyMatcherFactory.idl\
-    XPropertySetRegistry.idl\
-    XPropertySetRegistryFactory.idl\
-    XRecycler.idl\
-    XRemoteContentProviderAcceptor.idl\
-    XRemoteContentProviderActivator.idl\
-    XRemoteContentProviderChangeListener.idl\
-    XRemoteContentProviderChangeNotifier.idl\
-    XRemoteContentProviderConnectionControl.idl\
-    XRemoteContentProviderDistributor.idl\
-    XRemoteContentProviderDoneListener.idl\
-    XRemoteContentProviderSupplier.idl\
-    XSimpleFileAccess.idl\
-    XSimpleFileAccess2.idl\
-    XSimpleFileAccess3.idl\
-    XSortedDynamicResultSetFactory.idl\
-    XSourceInitialization.idl\
-    XWebDAVCommandEnvironment.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/ucb/smart/makefile.mk b/offapi/com/sun/star/ucb/smart/makefile.mk
deleted file mode 100644
index 37172e9e6..000000000
--- a/offapi/com/sun/star/ucb/smart/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssucbs
-PACKAGE=com$/sun$/star$/ucb$/smart
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Content.idl\
-    XFactory.idl\
-    XContent.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/ui/ActionTrigger.idl b/offapi/com/sun/star/ui/ActionTrigger.idl
index 0c1262b9d..1d2ae0bde 100644
--- a/offapi/com/sun/star/ui/ActionTrigger.idl
+++ b/offapi/com/sun/star/ui/ActionTrigger.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_ui_ActionTrigger_idl__
 #define __com_sun_star_ui_ActionTrigger_idl__
 
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/ActionTriggerContainer.idl b/offapi/com/sun/star/ui/ActionTriggerContainer.idl
index d8069f124..572634c08 100644
--- a/offapi/com/sun/star/ui/ActionTriggerContainer.idl
+++ b/offapi/com/sun/star/ui/ActionTriggerContainer.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ui_ActionTriggerContainer_idl__
 #define __com_sun_star_ui_ActionTriggerContainer_idl__
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/ConfigurableUIElement.idl b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
index 3ccab5861..0762335d5 100644
--- a/offapi/com/sun/star/ui/ConfigurableUIElement.idl
+++ b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_ui_ConfigurableUIElement_idl__
 #define __com_sun_star_ui_ConfigurableUIElement_idl__
 
-#ifndef __com_sun_star_ui_UIElement_idl__
 #include <com/sun/star/ui/UIElement.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElementSettings_idl__
 #include <com/sun/star/ui/XUIElementSettings.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_ui_UIElementType_idl__
 #include <com/sun/star/ui/UIElementType.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/ui/ConfigurationEvent.idl b/offapi/com/sun/star/ui/ConfigurationEvent.idl
index 110275178..2b44b4e31 100644
--- a/offapi/com/sun/star/ui/ConfigurationEvent.idl
+++ b/offapi/com/sun/star/ui/ConfigurationEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_ConfigurationEvent_idl__
 #define __com_sun_star_ui_ConfigurationEvent_idl__
 
-#ifndef __com_sun_star_container_ContainerEvent_idl__ 
 #include <com/sun/star/container/ContainerEvent.idl>
-#endif
 
 module com { module sun { module star { module ui { 
 
diff --git a/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl b/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
index 0e8fc3b92..5dbfc01ee 100644
--- a/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
+++ b/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ui_ContextMenuExecuteEvent_idl__
 #define __com_sun_star_ui_ContextMenuExecuteEvent_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/DockingArea.idl b/offapi/com/sun/star/ui/DockingArea.idl
index 3812eeeac..7880efb8e 100644
--- a/offapi/com/sun/star/ui/DockingArea.idl
+++ b/offapi/com/sun/star/ui/DockingArea.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,11 +28,11 @@
 #ifndef __com_sun_star_ui_DockingArea_idl__
 #define __com_sun_star_ui_DockingArea_idl__
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module ui {
 
-//============================================================================= 
+//=============================================================================
 
 /** specifies different docking areas a frame based layout manager
     supports.
@@ -40,27 +40,27 @@ module com { module sun { module star { module ui {
     <p>
     A frame based layout manager supports four different docking areas where
     dockable user interface elements can be docked.
-    
+
     @see com::sun::star::frame::XLayoutManager
     </p>
-    
+
     @since OOo 2.0
 */
 
-enum DockingArea
+published enum DockingArea
 {
     /** the top docking area below the menu bar.
     */
     DOCKINGAREA_TOP,
-    
+
     /** the bottom docking area above the status bar.
     */
     DOCKINGAREA_BOTTOM,
-    
+
     /** the left side docking area.
     */
     DOCKINGAREA_LEFT,
-    
+
     /** the right side docking area.
     */
     DOCKINGAREA_RIGHT,
diff --git a/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
index 0d573bd15..3615f59e2 100644
--- a/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ui_GlobalAcceleratorConfiguration_idl__
 #define __com_sun_star_ui_GlobalAcceleratorConfiguration_idl__
 
-#ifndef __com_sun_star_ui_XAcceleratorConfiguration_idl__
 #include <com/sun/star/ui/XAcceleratorConfiguration.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/ItemDescriptor.idl b/offapi/com/sun/star/ui/ItemDescriptor.idl
index 231f2aa5c..577b5daa6 100644
--- a/offapi/com/sun/star/ui/ItemDescriptor.idl
+++ b/offapi/com/sun/star/ui/ItemDescriptor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_ItemDescriptor_idl__
 #define __com_sun_star_ui_ItemDescriptor_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
index 5ce6f9e7f..9550cbe88 100644
--- a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
 #define __com_sun_star_ui_ModuleUICommandDescription_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/ui/ModuleUICommandDescription.idl b/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
index 4d0bddd60..cdbf0db78 100644
--- a/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
 #define __com_sun_star_ui_ModuleUICommandDescription_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
index c915edc40..93293ba98 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_ui_ModuleUIConfigurationManager_idl__
 #define __com_sun_star_ui_ModuleUIConfigurationManager_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
 #include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XModuleUIConfigurationManager_idl__
 #include <com/sun/star/ui/XModuleUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
 #include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
 
 module com { module sun { module star { module ui { 
 
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
index 998e2fc63..a93f4c694 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,29 +27,24 @@
 #ifndef __com_sun_star_ui_ModuleUIConfigurationManagerSupplier_idl__
 #define __com_sun_star_ui_ModuleUIConfigurationManagerSupplier_idl__
 
-#ifndef __com_sun_star_ui_XModuleUIConfigurationManagerSupplier_idl__
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-module com { module sun { module star { module ui { 
+module com { module sun { module star { module ui {
 
 /** specifies a central user interface configuration provider which gives
     access to module based user interface configuration managers.
-    
+
     @since OOo 2.0
 */
 
-service ModuleUIConfigurationManagerSupplier
+published service ModuleUIConfigurationManagerSupplier
 {
     /** controls module based user interface configuration managers.
-        
+
         <p>
-        There can only exists one user interface configuration manager for 
-        a module. A user interface configuration manager supports to get and set 
+        There can only exists one user interface configuration manager for
+        a module. A user interface configuration manager supports to get and set
         user interface configuration data for configurable user interface elements.
 
         @see ConfigurableUIElement
diff --git a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
index 611bc6af4..d111899e9 100644
--- a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
 #define __com_sun_star_ui_ModuleUICommandDescription_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/ui/UICategoryDescription.idl b/offapi/com/sun/star/ui/UICategoryDescription.idl
index c45bbeca0..ee8e5af16 100644
--- a/offapi/com/sun/star/ui/UICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/UICategoryDescription.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ui_UICategoryDescription_idl__
 #define __com_sun_star_ui_UICategoryDescription_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/UICommandDescription.idl b/offapi/com/sun/star/ui/UICommandDescription.idl
index 0beeeac66..31253f6aa 100644
--- a/offapi/com/sun/star/ui/UICommandDescription.idl
+++ b/offapi/com/sun/star/ui/UICommandDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_UICommandDescription_idl__
 #define __com_sun_star_ui_UICommandDescription_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/ui/UIConfigurationManager.idl b/offapi/com/sun/star/ui/UIConfigurationManager.idl
index bdf6b4ce0..132e45c70 100644
--- a/offapi/com/sun/star/ui/UIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/UIConfigurationManager.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_ui_UIConfigurationManager_idl__
 #define __com_sun_star_ui_UIConfigurationManager_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
 #include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
 #include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationStorage_idl__
 #include <com/sun/star/ui/XUIConfigurationStorage.idl>
-#endif
 
 module com { module sun { module star { module ui { 
 
diff --git a/offapi/com/sun/star/ui/UIElement.idl b/offapi/com/sun/star/ui/UIElement.idl
index 17461b18a..0b99732c0 100644
--- a/offapi/com/sun/star/ui/UIElement.idl
+++ b/offapi/com/sun/star/ui/UIElement.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_ui_UIElement_idl__
 #define __com_sun_star_ui_UIElement_idl__
 
-#ifndef __com_sun_star_ui_XUIElement_idl__
 #include <com/sun/star/ui/XUIElement.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
 #include <com/sun/star/util/XUpdatable.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/ui/UIElementFactory.idl b/offapi/com/sun/star/ui/UIElementFactory.idl
index acc58c713..a446bb9f3 100644
--- a/offapi/com/sun/star/ui/UIElementFactory.idl
+++ b/offapi/com/sun/star/ui/UIElementFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,35 +28,33 @@
 #ifndef __com_sun_star_ui_UIElementFactory_idl__
 #define __com_sun_star_ui_UIElementFactory_idl__
 
-#ifndef __com_sun_star_ui_XUIElementFactory_idl__
 #include <com/sun/star/ui/XUIElementFactory.idl>
-#endif
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module ui {
 
-//============================================================================= 
+//=============================================================================
 
 /** specifies a user interface element factory that can create and initialize
     a user interface element type.
-    
+
     <p>
-    It depends on the implementation which user interface element types can be 
-    created. It is also possible that a factory is only able to create one 
-    special user interface element. User interface element factories must be 
-    registered at the single instance <type>UIElementFactoryManager</type> 
+    It depends on the implementation which user interface element types can be
+    created. It is also possible that a factory is only able to create one
+    special user interface element. User interface element factories must be
+    registered at the single instance <type>UIElementFactoryManager</type>
     service to provide access to itself.
     </p>
-    
+
     @since OOo 2.0
 */
 
-service UIElementFactory
+published service UIElementFactory
 {
     /** this interface provides a function to create and initialize new 
         instances of user interface elements.
-    
+
         @see XUIElementFactory
      */
     interface com::sun::star::ui::XUIElementFactory;
diff --git a/offapi/com/sun/star/ui/UIElementFactoryManager.idl b/offapi/com/sun/star/ui/UIElementFactoryManager.idl
index 3a6231894..25b60910d 100644
--- a/offapi/com/sun/star/ui/UIElementFactoryManager.idl
+++ b/offapi/com/sun/star/ui/UIElementFactoryManager.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_UIElementFactory_idl__
 #define __com_sun_star_ui_UIElementFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
 #include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElementFactoryRegistration_idl__
 #include <com/sun/star/ui/XUIElementFactoryRegistration.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/ui/UIElementSettings.idl b/offapi/com/sun/star/ui/UIElementSettings.idl
index 8e647581e..ae7aa724c 100644
--- a/offapi/com/sun/star/ui/UIElementSettings.idl
+++ b/offapi/com/sun/star/ui/UIElementSettings.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_UIElementSettings_idl__
 #define __com_sun_star_ui_UIElementSettings_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleComponentFactory_idl__
 #include <com/sun/star/lang/XSingleComponentFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/WindowContentFactory.idl b/offapi/com/sun/star/ui/WindowContentFactory.idl
index e4c323a4b..5369770bc 100644
--- a/offapi/com/sun/star/ui/WindowContentFactory.idl
+++ b/offapi/com/sun/star/ui/WindowContentFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_WindowContentFactory_idl__
 #define __com_sun_star_ui_WindowContentFactory_idl__
 
-#ifndef __com_sun_star_lang_XSingleComponentFactory_idl__
 #include <com/sun/star/lang/XSingleComponentFactory.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/ui/WindowStateConfiguration.idl b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
index 755699c87..f8e299fe1 100644
--- a/offapi/com/sun/star/ui/WindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,19 +28,17 @@
 #ifndef __com_sun_star_ui_WindowStateConfiguration_idl__
 #define __com_sun_star_ui_WindowStateConfiguration_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module ui {
 
-//============================================================================= 
+//=============================================================================
 
-/** a service which provides window based information about user interface 
+/** a service which provides window based information about user interface
     elements.
-    
+
     <p>
     OpenOffice.org has an amount of user interface elements that can be positioned,
     resized, closed and their style can be changed. This service provides access
@@ -51,18 +49,18 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-service WindowStateConfiguration
+published service WindowStateConfiguration
 {
-    /** provides access to window based information about user interface elements 
+    /** provides access to window based information about user interface elements
         of all installed application modules.
 
         <p>
-        To access the window based information of a module, a unique module specifier 
+        To access the window based information of a module, a unique module specifier
         must be provided to <member scope="com::sun::star::container">XNameAccess::getByName()</member> function.
         The module specifier can be retrieved from the <type scope="com::sun::star::frame">ModuleManager</type>
         service. The interface provides references to a <type scope="com::sun:star::ui">ModuleWindowStateConfiguration</type>.
         </p>
-        
+
         @see com::sun::star::frame::ModuleManager
     */
 
diff --git a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
index 51d2fa07b..a94e5b6ec 100644
--- a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_ui_XAcceleratorConfiguration_idl__
 #define __com_sun_star_ui_XAcceleratorConfiguration_idl__
 
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
 #include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
 #include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationStorage_idl__
 #include <com/sun/star/ui/XUIConfigurationStorage.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
 #include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/XContextMenuInterception.idl b/offapi/com/sun/star/ui/XContextMenuInterception.idl
index ac92a2b36..15e730d67 100644
--- a/offapi/com/sun/star/ui/XContextMenuInterception.idl
+++ b/offapi/com/sun/star/ui/XContextMenuInterception.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ui_XContextMenuInterception_idl__
 #define __com_sun_star_ui_XContextMenuInterception_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/XContextMenuInterceptor.idl b/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
index da3708347..0b0287de9 100644
--- a/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
+++ b/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
@@ -27,16 +27,9 @@
 #ifndef __com_sun_star_ui_XContextMenuInterceptor_idl__
 #define __com_sun_star_ui_XContextMenuInterceptor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_ContextMenuInterceptorAction_idl__
 #include <com/sun/star/ui/ContextMenuInterceptorAction.idl>
-#endif
-#ifndef __com_sun_star_ui_ContextMenuExecuteEvent_idl__
 #include <com/sun/star/ui/ContextMenuExecuteEvent.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
index 65478487c..02565db35 100644
--- a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
+++ b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,32 +28,24 @@
 #ifndef __com_sun_star_ui_XDockingAreaAcceptor_idl__
 #define __com_sun_star_ui_XDockingAreaAcceptor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module ui {
 
-//============================================================================= 
+//=============================================================================
 
 /** this interface enables developer to implement different docking area
     acceptors which are used by the frame based layout manager.
 
     <p>
     A docking area acceptor is responsible to control the docking area of a
-    container window. As OLE for example supports inplace and outplace editing, 
-    there are different parts of code responsible for the container window. 
-    This interface enables developer to make support implementations for these 
+    container window. As OLE for example supports inplace and outplace editing,
+    there are different parts of code responsible for the container window.
+    This interface enables developer to make support implementations for these
     scenarios.
 
     @see com::sun::star::frame::XFrame
@@ -63,25 +55,25 @@ module com { module sun { module star { module ui {
 */
 
 
-interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
+published interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
 {
-    /** provide the container window where the layout manager can request border 
+    /** provide the container window where the layout manager can request border
         space for docking windows.
-        
+
         <p>
-        Additionally the layout manager uses this window to create its own child 
+        Additionally the layout manager uses this window to create its own child
         windows for docking purposes.
         </p>
     */
     com::sun::star::awt::XWindow getContainerWindow();
-    
-    /** method to ask an implementation if the provided space for docking windows 
+
+    /** method to ask an implementation if the provided space for docking windows
         is available or not.
-        
+
         <p>
-        The <type scope="com::sun::star::awt">Rectangle</type> parameter is 
-        filled by the caller with pixel data. The members of 
-        <type scope="com::sun::star::awt">Rectangle</type> must be filled 
+        The <type scope="com::sun::star::awt">Rectangle</type> parameter is
+        filled by the caller with pixel data. The members of
+        <type scope="com::sun::star::awt">Rectangle</type> must be filled
         as following:
         <ul>
             <li>X      = requested area on left side (in pixel)</li>
@@ -96,10 +88,10 @@ interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
     /** method to brief an implementation that we need new border space.
 
         <p>
-        The callee must size its document window so that we have the amount 
+        The callee must size its document window so that we have the amount
         of space we have provided. The <type scope="com::sun::star::awt">Rectangle</type>
-        parameter is filled by the caller with pixel data. The members of 
-        <type scope="com::sun::star::awt">Rectangle</type> must be filled as 
+        parameter is filled by the caller with pixel data. The members of
+        <type scope="com::sun::star::awt">Rectangle</type> must be filled as
         following:
         <ul>
             <li>X      = new area on left side (in pixel)</li>
@@ -114,6 +106,6 @@ interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
 
 }; }; }; };
 
-//============================================================================= 
+//=============================================================================
 
 #endif
diff --git a/offapi/com/sun/star/ui/XImageManager.idl b/offapi/com/sun/star/ui/XImageManager.idl
index 42e79b832..d01cf72bb 100644
--- a/offapi/com/sun/star/ui/XImageManager.idl
+++ b/offapi/com/sun/star/ui/XImageManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,70 +28,44 @@
 #ifndef __com_sun_star_ui_XImageManager_idl__
 #define __com_sun_star_ui_XImageManager_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
 #include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
 #include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
 #include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
-
-#ifndef __com_sun_star_ui_ImageType_idl__
 #include <com/sun/star/ui/ImageType.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
 #include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
 
-module com { module sun { module star { module ui { 
+module com { module sun { module star { module ui {
 
-/** specifies access functions to an images manager interface to add, 
+/** specifies access functions to an images manager interface to add,
     replace and remove images associations to command URLs.
 
     <p>
-    An image manager controls a number of image sets which are specified 
+    An image manager controls a number of image sets which are specified
     by a <type>ImageType</type>.
     </p>
 */
-    
-interface XImageManager
+
+published interface XImageManager
 {
-    /** resets the image manager to default data. 
-        
+    /** resets the image manager to default data.
+
         <p>
         This means that all user images of the instance will be removed.
         </p>
     */
     void reset();
-    
+
     /** retrieves the list of command URLs which have images associated.
 
         @param nImageType
             specifies the image type for this operation.
-        
+
         @return
-            all command URLs within the images manager that have an image 
+            all command URLs within the images manager that have an image
             associated.
     */
     sequence< string > getAllImageNames( [in] short nImageType );
@@ -100,7 +74,7 @@ interface XImageManager
 
         @param nImageType
             specifies the image type for this operation.
-        
+
         @param ResourceURL
             a command URL that should be checked for an associated image.
 
@@ -113,16 +87,16 @@ interface XImageManager
 
         @param nImageType
             specifies the image type for this association operation.
-        
+
         @param aCommandURLSequence
             a sequence of command URLs for which the images are requested.
 
         @return
-            a sequence of graphics object which are associated with the 
-            provided command URLs. If an unknown command URL is provided or 
-            a command URL has no associated image a graphics object with an 
-            empty image is provided. If the sequence 
-            <var>aCommandURLSequence</var> contains an invalid command 
+            a sequence of graphics object which are associated with the
+            provided command URLs. If an unknown command URL is provided or
+            a command URL has no associated image a graphics object with an
+            empty image is provided. If the sequence
+            <var>aCommandURLSequence</var> contains an invalid command
             URL a <type scope="com::sun::star::lang">IllegalArgumentException</type>
             is thrown.
     */
@@ -132,20 +106,20 @@ interface XImageManager
 
         @param nImageType
             specifies the image type for this association operation.
-        
+
         @param aCommandURLSequence
             a sequence of command URLs for which images should be replaced.
 
         @param aGraphicsSequence
-            a sequence of graphic objects which should replace the old images 
+            a sequence of graphic objects which should replace the old images
             of the provided command URLs.
 
         <p>
-        If a command URL cannot be found the replace call will be omitted. If 
-        <var>aCommandURLSequence</var> contains an invalid command URL a 
-        <type scope="com::sun::star::lang">IllegalArgumentException</type> 
-        is thrown. If the image manager is  associated with a read-only configuration 
-        manager a <type scope="com::sun::star::lang">IllegalAccessException</type> 
+        If a command URL cannot be found the replace call will be omitted. If
+        <var>aCommandURLSequence</var> contains an invalid command URL a
+        <type scope="com::sun::star::lang">IllegalArgumentException</type>
+        is thrown. If the image manager is  associated with a read-only configuration
+        manager a <type scope="com::sun::star::lang">IllegalAccessException</type>
         is thrown.
         </p>
     */
@@ -155,38 +129,38 @@ interface XImageManager
 
         @param nImageType
             specifies the image type for this association operation.
-        
+
         @param aCommandURLSequence
             a sequence of command URLs for which the images should be removed.
-            
+
         <p>
-        If the <var>aCommandURLSequence</var> contains an invalid command URL a 
-        <type scope="com::sun::star::lang">IllegalArgumentException</type> is 
-        thrown. If  the image manager is associated with a read-only configuration 
-        manager a <type scope="com::sun::star::lang">IllegalAccessException</type> 
+        If the <var>aCommandURLSequence</var> contains an invalid command URL a
+        <type scope="com::sun::star::lang">IllegalArgumentException</type> is
+        thrown. If  the image manager is associated with a read-only configuration
+        manager a <type scope="com::sun::star::lang">IllegalAccessException</type>
         is thrown.
         </p>
     */
     void removeImages( [in] short nImageType, [in] sequence< string > aResourceURLSequence ) raises ( com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalAccessException );
-        
+
     /** inserts new image/command associations to a image manager.
 
         @param nImageType
             specifies the image type for this association operation.
-        
+
         @param aCommandURLSequence
             a sequence of command URLs which specify which commands get an new image.
 
         @param aGraphicSequence
-            a sequence of graphic objects which should be associated with the provided 
+            a sequence of graphic objects which should be associated with the provided
             command URLs.
 
         <p>
-        If an association is already present it is replaced. If 
-        <var>aCommandURLSequence</var> contains an invalid command URL a 
+        If an association is already present it is replaced. If
+        <var>aCommandURLSequence</var> contains an invalid command URL a
         <type scope="com::sun::star::lang">IllegalArgumentException</type>
-        is thrown. If the configuration manager is read-only a 
-        <type scope="com::sun::star::lang">IllegalAccessException</type> is 
+        is thrown. If the configuration manager is read-only a
+        <type scope="com::sun::star::lang">IllegalAccessException</type> is
         thrown.
         </p>
     */
@@ -203,14 +177,14 @@ interface XImageManager
         <p>
         An image manager implementation notifies its listener whenever an image
         set has been changed, due to insert, remove or replace operations. To
-        minimize the overhead for notifications an image manager places all 
-        inserted and/or replaced images into a single notify call. A container 
-        which implements <type scope="com::sun::star::container">XNameAccess</type> 
-        holds the information. The access key is a command URL and provides a 
-        <type scope="::com::sun::star::graphic">XGraphic</type>. This container 
-        is placed into  the 
+        minimize the overhead for notifications an image manager places all
+        inserted and/or replaced images into a single notify call. A container
+        which implements <type scope="com::sun::star::container">XNameAccess</type>
+        holds the information. The access key is a command URL and provides a
+        <type scope="::com::sun::star::graphic">XGraphic</type>. This container
+        is placed into  the
         <member scope="com::sun::star::ui">ConfigurationEvent::Element</member>.
-        The image set which has been changed is put into the 
+        The image set which has been changed is put into the
         <member scope="com::sun::star::ui">ConfigurationEvent::aInfo</member>.
         </p>
     */
@@ -219,28 +193,28 @@ interface XImageManager
     /** allows controlling or observing the lifetime of an image manager 
         instance.
 
-    <p>The owner of the object may dispose of this object using 
+    <p>The owner of the object may dispose of this object using
     <member scope="com::sun::star::lang">XComponent::dispose()</member>.
     </p>
     */
     interface ::com::sun::star::lang::XComponent;
 
-    /** initializes an image manager instance. 
-    
-        An image manager instance must be initialized using 
-        <member scope=com::sun::star::lang>XInitialization::initialize</member> 
+    /** initializes an image manager instance.
+
+        An image manager instance must be initialized using
+        <member scope=com::sun::star::lang>XInitialization::initialize</member>
         before it can be used.<br>
         The following property must be provided if the image manager is
         related to a module:
         <ul>
-            <li><b>ModuleIdentifier</b>specifies a string property which is the 
+            <li><b>ModuleIdentifier</b>specifies a string property which is the
             unique identifier of module.
             </li>
-            <li><b>UserConfigStorage</b>specifies a 
-            <type scope="com::sun::star::embed">XStorage</type> property which 
+            <li><b>UserConfigStorage</b>specifies a
+            <type scope="com::sun::star::embed">XStorage</type> property which
             provides access to the configuration storage of the module.
             </li>
-            <li><b>UserRootCommit</b>specifies an optional 
+            <li><b>UserRootCommit</b>specifies an optional
             <type scope="com::sun::star::embed">XTransactedObject</type>
             property which makes it possible to commit a root storage.
             </li>
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
index d1d19f981..0f80fbce5 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_ui_XModuleUIConfigurationManager_idl__
 #define __com_sun_star_ui_XModuleUIConfigurationManager_idl__
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
 #include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
index a99ddf869..527611b13 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,36 +28,31 @@
 #ifndef __com_sun_star_ui_XModuleUIConfigurationManagerSupplier_idl__
 #define __com_sun_star_ui_XModuleUIConfigurationManagerSupplier_idl__
 
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-module com { module sun { module star { module ui { 
+module com { module sun { module star { module ui {
 
 /** allows to retrieve user interface configuration managers related to
     OpenOffice.org modules.
 
     @since OOo 2.0
 */
-    
-interface XModuleUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
+
+published interface XModuleUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
 {
     //----------------------------------------------------------------------
     /** returns the requested module based user interface configuration manager.
 
         @param ModuleIdentifier
-            a module identifier which identifies an OpenOffice.org module. The 
-            module identifier can be retrieved from the 
+            a module identifier which identifies an OpenOffice.org module. The
+            module identifier can be retrieved from the
             <type scope=com::sun::star::frame>ModuleManager</type> service.
 
-        @returns 
-            an object implementing 
-            <type scope="::com::sun::star::ui">ModuleUIConfigurationManager</type> 
-            service. If the provided module identifier is unknown a 
+        @returns
+            an object implementing
+            <type scope="::com::sun::star::ui">ModuleUIConfigurationManager</type>
+            service. If the provided module identifier is unknown a
             <type scope="com::sun::star::container">NoSuchElementException</type>
             is thrown.
     */
diff --git a/offapi/com/sun/star/ui/XToolPanel.idl b/offapi/com/sun/star/ui/XToolPanel.idl
index fb10ddece..6b485d1b8 100644
--- a/offapi/com/sun/star/ui/XToolPanel.idl
+++ b/offapi/com/sun/star/ui/XToolPanel.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,13 +32,13 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ui { 
+module com { module sun { module star { module ui {
 
 //=============================================================================
 
 /** describes the basic interface to be implemented by a tool panel
  */
-interface XToolPanel
+published interface XToolPanel
 {
     /** provides access to the tool panel's main window.
 
diff --git a/offapi/com/sun/star/ui/XUIConfiguration.idl b/offapi/com/sun/star/ui/XUIConfiguration.idl
index 2f2b6fd00..dd5db8035 100644
--- a/offapi/com/sun/star/ui/XUIConfiguration.idl
+++ b/offapi/com/sun/star/ui/XUIConfiguration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,50 +28,48 @@
 #ifndef __com_sun_star_ui_XUIConfiguration_idl__
 #define __com_sun_star_ui_XUIConfiguration_idl__
 
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
 #include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
 
-module com { module sun { module star { module ui { 
+module com { module sun { module star { module ui {
 
-/** supports to notify other implementations about changes of a user 
+/** supports to notify other implementations about changes of a user
     interface configuration manager.
 
     <p>
-    The <type>XUIConfiguration</type> interface is provided for user 
-    interface configuration managers which need to broadcast changes 
-    within the container; that means the actions of adding, replacing 
+    The <type>XUIConfiguration</type> interface is provided for user
+    interface configuration managers which need to broadcast changes
+    within the container; that means the actions of adding, replacing
     and removing elements are broadcast to listeners.
     </p>
 
-    <p>This can be useful for UI to enable/disable some functions without 
+    <p>This can be useful for UI to enable/disable some functions without
     actually accessing the data.</p>
 
     @since OOo 2.0
 */
-    
-interface XUIConfiguration : ::com::sun::star::uno::XInterface
+
+published interface XUIConfiguration : ::com::sun::star::uno::XInterface
 {
-    /** adds the specified listener to receive events when elements are 
+    /** adds the specified listener to receive events when elements are
         changed, inserted or removed.
 
         <p>
-        It is suggested to allow multiple registration of the same 
-        listener, thus for each time a listener is added, it has to be 
+        It is suggested to allow multiple registration of the same
+        listener, thus for each time a listener is added, it has to be
         removed.
 
         @see XUIConfigurationListener
-        </p>      
+        </p>
     */
     void addConfigurationListener( [in] ::com::sun::star::ui::XUIConfigurationListener Listener );
 
-    /** removes the specified listener so it does not receive any events 
+    /** removes the specified listener so it does not receive any events
         from this user interface configuration manager.
 
-        <p>It is suggested to allow multiple registration of the same 
-        listener, thus for each time a listener is added, it has to be 
+        <p>It is suggested to allow multiple registration of the same
+        listener, thus for each time a listener is added, it has to be
         removed.
-        
+
         @see XUIConfigurationListener
         </p>
      */
diff --git a/offapi/com/sun/star/ui/XUIConfigurationListener.idl b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
index f3fd87752..8c48b5fa3 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationListener.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,56 +28,51 @@
 #ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
 #define __com_sun_star_ui_XUIConfigurationListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_ConfigurationEvent_idl__
 #include <com/sun/star/ui/ConfigurationEvent.idl>
-#endif
 
-//============================================================================= 
+//=============================================================================
 
-module com { module sun { module star { module ui { 
+module com { module sun { module star { module ui {
 
-//============================================================================= 
+//=============================================================================
 
-/** supplies information about changes of a user interface 
+/** supplies information about changes of a user interface
     configuration manager.
 
     @since OOo 2.0
 */
 
-interface XUIConfigurationListener : com::sun::star::lang::XEventListener
+published interface XUIConfigurationListener : com::sun::star::lang::XEventListener
 {
-    //------------------------------------------------------------------------- 
-     
+    //-------------------------------------------------------------------------
+
     /** is invoked when a configuration has inserted an user interface element.
 
         @param Event
             provides information about the element which has been inserted.
      */
-    [oneway] void elementInserted( [in] ::com::sun::star::ui::ConfigurationEvent Event ); 
- 
-    //------------------------------------------------------------------------- 
-     
+    [oneway] void elementInserted( [in] ::com::sun::star::ui::ConfigurationEvent Event );
+
+    //-------------------------------------------------------------------------
+
     /** is invoked when a configuration has removed an user interface element.
-        
+
         @param Event
             provides information about the element which has been removed.
      */
-    [oneway] void elementRemoved( [in] ::com::sun::star::ui::ConfigurationEvent Event ); 
- 
-    //------------------------------------------------------------------------- 
-     
+    [oneway] void elementRemoved( [in] ::com::sun::star::ui::ConfigurationEvent Event );
+
+    //-------------------------------------------------------------------------
+
     /** is invoked when a configuration has replaced an user interface element.
-        
+
         @param Event
-            provides information about the element which has been 
+            provides information about the element which has been
             inserted/replaced.
      */
-    [oneway] void elementReplaced( [in] ::com::sun::star::ui::ConfigurationEvent Event ); 
- 
+    [oneway] void elementReplaced( [in] ::com::sun::star::ui::ConfigurationEvent Event );
+
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManager.idl b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
index 7b84dd1f0..78a692d6a 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,87 +28,61 @@
 #ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #define __com_sun_star_ui_XUIConfigurationManager_idl__
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
 #include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
 #include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
 
-module com { module sun { module star { module ui { 
+module com { module sun { module star { module ui {
 
-/** specifies a user interface configuration manager interface which 
-    controls the structure of all customizable user interface 
+/** specifies a user interface configuration manager interface which
+    controls the structure of all customizable user interface
     elements.
-    
+
     @since OOo 2.0
 */
-    
-interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
+
+published interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
 {
-    /** resets the configuration manager to the default user interface 
-        configuration data. 
+    /** resets the configuration manager to the default user interface
+        configuration data.
         <p>
-        This means that all user interface configuration data of the 
-        instance will be removed. A module based user interface 
+        This means that all user interface configuration data of the
+        instance will be removed. A module based user interface
         configuration manager removes user defined elements, but set all
-        other elements back to default. It is not possible to remove 
-        default elements from a module user interface configuration 
+        other elements back to default. It is not possible to remove
+        default elements from a module user interface configuration
         manager.
         </p>
     */
     void reset();
 
-    /** retrieves information about all user interface elements within 
+    /** retrieves information about all user interface elements within
         the user interface configuration manager.
 
         @param ElementType
-            makes it possible to narrow the result set to only one type 
-            of user interface elements. If all user interface element 
-            types should be returned 
-            <value scope=com::sun::star::ui>UIElementType::UNKNOWN</value> 
+            makes it possible to narrow the result set to only one type
+            of user interface elements. If all user interface element
+            types should be returned
+            <value scope=com::sun::star::ui>UIElementType::UNKNOWN</value>
             must be provided.
 
         @return
-            returns all user interface elements within the user interface 
-            configuration manager that meet the given ElementType 
-            specification. <p>The following 
-            <type scope="com::sun::star::beans">PropertyValue</type> entries 
+            returns all user interface elements within the user interface
+            configuration manager that meet the given ElementType
+            specification. <p>The following
+            <type scope="com::sun::star::beans">PropertyValue</type> entries
             are defined inside the sequence for every user interface element.
             <ul>
-                <li><b>ResourceURL<b/>specifies the unique resource URL for 
+                <li><b>ResourceURL<b/>specifies the unique resource URL for
                 the user interface element.</li>
-                <li><b>UIName<b/>specifies the user interface name for the 
-                user interface element. Not all user interface elements have 
+                <li><b>UIName<b/>specifies the user interface name for the
+                user interface element. Not all user interface elements have
                 set UIName. At least menubars do not.</li>
             </ul>
             <p>
@@ -120,19 +94,19 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
     /** creates an empty settings data container.
 
         @return
-            an empty user interface element settings data container, which 
+            an empty user interface element settings data container, which
             implements <type>UIElementSettings</type>.
     */
     ::com::sun::star::container::XIndexContainer createSettings();
 
-    /** determines if the settings of a user interface element is part the 
+    /** determines if the settings of a user interface element is part the
         user interface configuration manager.
 
         @param ResourceURL
-            a resource URL which identifies the user interface element. A 
-            resource URL must meet the following syntax: 
-            "private:resource/$type/$name. It is only allowed to use ASCII 
-            characters for type and name. 
+            a resource URL which identifies the user interface element. A
+            resource URL must meet the following syntax:
+            "private:resource/$type/$name. It is only allowed to use ASCII
+            characters for type and name.
 
         @return
             <TRUE/> if settings have been found, otherwise <FALSE/>.
@@ -142,23 +116,23 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
     /** retrieves the settings of a user interface element.
 
         @param ResourceURL
-            a resource URL which identifies the user interface element. A 
-            resource URL must meet the following syntax: 
-            "private:resource/$type/$name. It is only allowed to use ASCII 
-            characters for type and name. 
+            a resource URL which identifies the user interface element. A
+            resource URL must meet the following syntax:
+            "private:resource/$type/$name. It is only allowed to use ASCII
+            characters for type and name.
 
         @param bWriteable
-            must be <TRUE/> if the retrieved settings should be a writable. 
-            Otherwise <FALSE/> should be provided to get a shareable reference 
+            must be <TRUE/> if the retrieved settings should be a writable.
+            Otherwise <FALSE/> should be provided to get a shareable reference
             to the settings data.
 
         @return
-            settings data of an existing user interface element, which 
-            implements <type>UIElementSettings</type>. If the settings data 
-            cannot be found a 
-            <type scope="com::sun::star::container">NoSuchElementException</type> 
-            is thrown.  If the <member>ResourceURL</member> is not valid or 
-            describes an unknown type a 
+            settings data of an existing user interface element, which
+            implements <type>UIElementSettings</type>. If the settings data
+            cannot be found a
+            <type scope="com::sun::star::container">NoSuchElementException</type>
+            is thrown.  If the <member>ResourceURL</member> is not valid or
+            describes an unknown type a
             <type scope="com::sun::star::lang">IllegalArgumentException</type>
             is thrown.
     */
@@ -167,70 +141,70 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
     /** replaces the settings of a user interface element with new settings.
 
         @param ResourceURL
-            a resource URL which identifies the user interface element to 
-            be replaced. If no element with the given resource URL exists a 
-            <type scope="com::sun::star::container">NoSuchElementException</type> 
+            a resource URL which identifies the user interface element to
+            be replaced. If no element with the given resource URL exists a
+            <type scope="com::sun::star::container">NoSuchElementException</type>
             is thrown.
 
         @param aNewData
-            the new settings data of an existing user interface element, which 
+            the new settings data of an existing user interface element, which
             implements <type>UIElementSettings</type>.
 
         <p>
-        If the settings data cannot be found a 
-        <type scope="com::sun::star::container">NoSuchElementException</type> 
-        is thrown. If the <member>ResourceURL</member> is not valid or describes 
-        an unknown type a 
+        If the settings data cannot be found a
+        <type scope="com::sun::star::container">NoSuchElementException</type>
+        is thrown. If the <member>ResourceURL</member> is not valid or describes
+        an unknown type a
         <type scope="com::sun::star::lang">IllegalArgumentException</type>
-        is thrown. If the configuration manager is read-only a 
-        <type scope="com::sun::star::lang">IllegalAccessException</type> is 
+        is thrown. If the configuration manager is read-only a
+        <type scope="com::sun::star::lang">IllegalAccessException</type> is
         thrown.
         </p>
     */
     void replaceSettings( [in] string ResourceURL, [in] ::com::sun::star::container::XIndexAccess aNewData ) raises ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalAccessException );
 
-    /** removes the settings of an existing user interface element. 
+    /** removes the settings of an existing user interface element.
 
         @param ResourceURL
-            a resource URL which identifies the user interface element settings 
-            to be removed. 
-            
+            a resource URL which identifies the user interface element settings
+            to be removed.
+
         <p>
-        If the settings data cannot be found a 
-        <type scope="com::sun::star::container">NoSuchElementException</type> is 
-        thrown. If the <member>ResourceURL</member> is not valid or describes an 
-        unknown type a <type scope="com::sun::star::lang">IllegalArgumentException</type> 
-        is thrown. If the configuration manager is read-only a 
+        If the settings data cannot be found a
+        <type scope="com::sun::star::container">NoSuchElementException</type> is
+        thrown. If the <member>ResourceURL</member> is not valid or describes an
+        unknown type a <type scope="com::sun::star::lang">IllegalArgumentException</type>
+        is thrown. If the configuration manager is read-only a
         <type scope="com::sun::star::lang">IllegalAccessException</type> is thrown.
         </p>
     */
     void removeSettings( [in] string ResourceURL ) raises ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalAccessException );
-        
+
     /** inserts the settings of a new user interface element.
 
         @param ResourceURL
             a resource URL which identifies the new user interface element.
 
         @param aNewData
-            the settings data of the new user interface element, which implements 
+            the settings data of the new user interface element, which implements
             <type>UIElementSettings</type>.
 
         <p>
-        If the settings data is already present a 
-        <type scope="com::sun::star::container">ElementExistException</type> 
-        is thrown. If the <member>ResourceURL</member> is not valid or describes 
+        If the settings data is already present a
+        <type scope="com::sun::star::container">ElementExistException</type>
+        is thrown. If the <member>ResourceURL</member> is not valid or describes
         an unknown type a <type scope="com::sun::star::lang">IllegalArgumentException</type>
-        is thrown. If the configuration manager is read-only a 
+        is thrown. If the configuration manager is read-only a
         <type scope="com::sun::star::lang">IllegalAccessException</type> is thrown.
         </p>
     */
     void insertSettings( [in] string NewResourceURL, [in] ::com::sun::star::container::XIndexAccess aNewData ) raises ( com::sun::star::container::ElementExistException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalAccessException );
 
-    /** retrieves the image manager from the user interface configuration 
+    /** retrieves the image manager from the user interface configuration
         manager.
-    
+
         <p>
-        Every user interface configuration manager has one image manager 
+        Every user interface configuration manager has one image manager
         instance which controls all images of a module or document.
         </p>
 
@@ -239,11 +213,11 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
     */
     com::sun::star::uno::XInterface getImageManager();
 
-    /** retrieves the keyboard short cut manager from the user interface 
-        configuration manager. 
-    
+    /** retrieves the keyboard short cut manager from the user interface
+        configuration manager.
+
         <p>
-        Every user interface configuration manager has one keyboard short cut 
+        Every user interface configuration manager has one keyboard short cut
         manager instance which controls all short cuts of a module or document.
         </p>
 
@@ -252,16 +226,16 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
     */
     com::sun::star::uno::XInterface getShortCutManager();
 
-    /** retrieves the events manager from the user interface configuration manager. 
-    
+    /** retrieves the events manager from the user interface configuration manager.
+
         <p>
-        Every user interface configuration manager has one events manager 
-        instance which controls the mapping of events to script URLs of a module 
+        Every user interface configuration manager has one events manager
+        instance which controls the mapping of events to script URLs of a module
         or document.
         </p>
 
         @return
-            the events manager of the user interface configuration 
+            the events manager of the user interface configuration
             manager, if one exists.
     */
     com::sun::star::uno::XInterface getEventsManager();
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
index c1f731508..8cb28e871 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,27 +28,25 @@
 #ifndef __com_sun_star_ui_XUIConfigurationManagerSupplier_idl__
 #define __com_sun_star_ui_XUIConfigurationManagerSupplier_idl__
 
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
 
-module com { module sun { module star { module ui { 
+module com { module sun { module star { module ui {
 
 /** allows to retrieve the user interface configuration manager related to
     an object.
-    
+
     @since OOo 2.0
 */
-    
-interface XUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
+
+published interface XUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
 {
     //----------------------------------------------------------------------
-    /** returns the user interface configuration manager related to the 
+    /** returns the user interface configuration manager related to the
         object.
 
-        @returns 
-            an object implementing 
-            <type scope="::com::sun::star::ui">UIConfigurationManager</type> 
+        @returns
+            an object implementing
+            <type scope="::com::sun::star::ui">UIConfigurationManager</type>
             service.
     */
     XUIConfigurationManager getUIConfigurationManager();
diff --git a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
index ae417a6f2..32df8e0e6 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,46 +28,44 @@
 #ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
 #define __com_sun_star_ui_XUIConfigurationPersistence_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
 
-module com { module sun { module star { module ui { 
+module com { module sun { module star { module ui {
 
-/** specifies a persistence interface which supports to load/store user 
-    interface configuration data to a storage and to retrieve information 
+/** specifies a persistence interface which supports to load/store user
+    interface configuration data to a storage and to retrieve information
     about the current state.
 
     @since OOo 2.0
 */
 
-interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
+published interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
 {
-    /** reloads the configuration data from the storage and reinitialize 
+    /** reloads the configuration data from the storage and reinitialize
         the user interface configuration manager instance with this data.
 
         <p>
-        It is up to the implementation if it defers the first loading process 
-        until the first data request using <type>XUIConfigurationManager</type> 
+        It is up to the implementation if it defers the first loading process
+        until the first data request using <type>XUIConfigurationManager</type>
         interface.
         </p>
     */
     void reload() raises ( ::com::sun::star::uno::Exception );
-    
-    /** stores the configuration data to the storage provided by 
-        <member>setStorage</member> from the storage and initialize the 
-        user interface configuration manager instance with the newly 
-        data. This call can throw an 
-        <type scope="com::sun::star::io">IOException</type> if 
-        <member>store</member> cannot store its data into the internal 
+
+    /** stores the configuration data to the storage provided by
+        <member>setStorage</member> from the storage and initialize the
+        user interface configuration manager instance with the newly
+        data. This call can throw an
+        <type scope="com::sun::star::io">IOException</type> if
+        <member>store</member> cannot store its data into the internal
         storage.
     */
     void store() raises ( ::com::sun::star::uno::Exception );
-        
-    /** stores the configuration data to the provided storage, ignoring 
-        the previously set storage by <member>setStorage</member>. Can 
-        be used to make copy of the current user interface configuration 
-        data to another storage. This call will throw an  
+
+    /** stores the configuration data to the provided storage, ignoring
+        the previously set storage by <member>setStorage</member>. Can
+        be used to make copy of the current user interface configuration
+        data to another storage. This call will throw an
         <type scope="com::sun::star::io">IOException</type> if the provided
         storage is in read-only mode.
 
@@ -76,23 +74,23 @@ interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
     */
     void storeToStorage( [in] ::com::sun::star::embed::XStorage Storage ) raises ( ::com::sun::star::uno::Exception );
 
-    /** provides the current modify state of the configuration manager 
+    /** provides the current modify state of the configuration manager
         instance.
 
         @return
-            <TRUE/> if the configuration manager has changed since the 
-            last <member>store</member> call. <FALSE/> if the configuration 
+            <TRUE/> if the configuration manager has changed since the
+            last <member>store</member> call. <FALSE/> if the configuration
             manager has not been changed.
     */
     boolean isModified();
 
-    /** provides the current read-only state of the user configuration 
-        manager. Storing a user interface configuration to a read-only storage 
-        is not possible. A read-only configuration manager instance will also 
+    /** provides the current read-only state of the user configuration
+        manager. Storing a user interface configuration to a read-only storage
+        is not possible. A read-only configuration manager instance will also
         not support any changes to its configuration settings.
 
         @return
-            <TRUE/> if the configuration manager storage is read-only otherwise 
+            <TRUE/> if the configuration manager storage is read-only otherwise
             <FALSE/>.
     */
     boolean isReadOnly();
diff --git a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
index 6cc0f6ea4..1638ba73e 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_XUIConfigurationStorage_idl__
 #define __com_sun_star_ui_XUIConfigurationStorage_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/ui/XUIElement.idl b/offapi/com/sun/star/ui/XUIElement.idl
index 63467eb67..3b71cf86d 100644
--- a/offapi/com/sun/star/ui/XUIElement.idl
+++ b/offapi/com/sun/star/ui/XUIElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,53 +28,45 @@
 #ifndef __com_sun_star_ui_XUIElement_idl__
 #define __com_sun_star_ui_XUIElement_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module ui {
 
-//============================================================================= 
+//=============================================================================
 
 /** provides a function to retrieve a special purpose interface dependent
     on the user interface element type.
 
     <p>
-    The type of the interface depends on the real type of the user interface 
-    element. A menubar user interface element provides access to its 
+    The type of the interface depends on the real type of the user interface
+    element. A menubar user interface element provides access to its
     <type scope="com::sun::star::awt">XSystemDependentMenuBarPeer</type>
     which supports to retrieve the system dependent menu handle.
-    A floating window or a toolbar user interface element return a 
+    A floating window or a toolbar user interface element return a
     <type scope=com::sun::star::awt>XWindow</type>
     interface.
     </p>
 */
 
-interface XUIElement : com::sun::star::uno::XInterface
+published interface XUIElement : com::sun::star::uno::XInterface
 {
     /** returns an interface to get access to user interface type specific functions.
-    
+
         @return
             a special purpose interface which depends on the type of the user
-            interface element. 
+            interface element.
     */
     ::com::sun::star::uno::XInterface getRealInterface();
 
-    /** determines the document frame to which this element is bound to. 
-    
-        <p>The life time of a user interface element does not explicitly depend on the 
-        frame itself but on the visible component attached to the frame. It is possible 
-        to exchange the visible component of a frame and that will lead to the end of 
+    /** determines the document frame to which this element is bound to.
+
+        <p>The life time of a user interface element does not explicitly depend on the
+        frame itself but on the visible component attached to the frame. It is possible
+        to exchange the visible component of a frame and that will lead to the end of
         life of all user interface elements.</p>
     */
     [readonly, attribute] ::com::sun::star::frame::XFrame Frame;
@@ -92,6 +84,6 @@ interface XUIElement : com::sun::star::uno::XInterface
 
 }; }; }; };
 
-//============================================================================= 
+//=============================================================================
 
 #endif
diff --git a/offapi/com/sun/star/ui/XUIElementFactory.idl b/offapi/com/sun/star/ui/XUIElementFactory.idl
index cbab4614b..328bd8779 100644
--- a/offapi/com/sun/star/ui/XUIElementFactory.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,33 +28,22 @@
 #ifndef __com_sun_star_ui_XUIElementFactory_idl__
 #define __com_sun_star_ui_XUIElementFactory_idl__
 
-#ifndef __com_sun_star_ui_XUIElement_idl__
 #include <com/sun/star/ui/XUIElement.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module ui {
 
-//============================================================================= 
+//=============================================================================
+
+/** specifies a user interface element factory that can create and initialize
+    user interface elements.
 
-/** specifies a user interface element factory that can create and initialize 
-    user interface elements. 
-    
     <p>
-    User interface element factories must be registered at a 
+    User interface element factories must be registered at a
     <type>UIElementFactoryManager</type> service to provide access to itself.
 
     Currently the following user interface element types are defined:
@@ -70,31 +59,31 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIElementFactory : ::com::sun::star::uno::XInterface
+published interface XUIElementFactory : ::com::sun::star::uno::XInterface
 {
     /** creates a new instances of a specific user interface element.
-    
+
         @param ResourceURL
-            specifies which unique user interface element should be created 
-            by the factory. A resource URL must meet the following syntax: 
+            specifies which unique user interface element should be created
+            by the factory. A resource URL must meet the following syntax:
             "private:resource/$type/$name. It is only allowed to use ASCII
-            characters for type and name. This argument must not be empty to 
-            have a working user interface element instance.The implementation 
-            can throw an 
-            <type scope="com::sun::star::container">NoSuchElementException</type> 
-            if it doesn't know how to create the request user interface 
+            characters for type and name. This argument must not be empty to
+            have a working user interface element instance.The implementation
+            can throw an
+            <type scope="com::sun::star::container">NoSuchElementException</type>
+            if it doesn't know how to create the request user interface
             element.
 
         @param Args
-            The following arguments are supported:            
+            The following arguments are supported:
             <ul>
                 <li><b>Frame</b><br>
-                    specifies the <type scope="com::sun::star::frame">XFrame</type> 
-                    instance to which the user interface element belongs to. To 
-                    create a configurable user interface element the frame 
-                    instance must contain a visible component. Otherwise it is 
-                    not possible to determine the correct user interface 
-                    configuration manager. This argument is <b>mandatory</b> to 
+                    specifies the <type scope="com::sun::star::frame">XFrame</type>
+                    instance to which the user interface element belongs to. To
+                    create a configurable user interface element the frame
+                    instance must contain a visible component. Otherwise it is
+                    not possible to determine the correct user interface
+                    configuration manager. This argument is <b>mandatory</b> to
                     have a working configurable user interface element instance.
                 </li>
                 <li><b>ParentWindow</b><br/>
@@ -102,20 +91,20 @@ interface XUIElementFactory : ::com::sun::star::uno::XInterface
                     the UI element. Depending on the concrete UI element type, this parameter
                     might be required or ignored by an implementation.
                 </li>
-                <li><b>Persistent</b><br>specifies if changes to a configurable 
-                    user interface element should be persistent. This is an 
+                <li><b>Persistent</b><br>specifies if changes to a configurable
+                    user interface element should be persistent. This is an
                     optional argument. The default value is <TRUE/>.</li>
             </ul>
-        
+
         <p>
-        An implementation is responsible to initialize every newly created user 
-        interface element if the necessary properties are provided. Especially 
-        it must connect a configurable user interface element to the correct user 
-        interface configuration manager. Without this connection the configurable 
-        user interface element cannot retrieve its structure data and changes to 
-        the user interface element structure won't be persistent. It is up to the 
-        implementation to throw an 
-        <type scope="com::sun::star::lang">IllegalArgumentException</type> 
+        An implementation is responsible to initialize every newly created user
+        interface element if the necessary properties are provided. Especially
+        it must connect a configurable user interface element to the correct user
+        interface configuration manager. Without this connection the configurable
+        user interface element cannot retrieve its structure data and changes to
+        the user interface element structure won't be persistent. It is up to the
+        implementation to throw an
+        <type scope="com::sun::star::lang">IllegalArgumentException</type>
         if it cannot create a user interface element with the provided arguments.
 
         @see ConfigurableUIElement
diff --git a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
index a4f59dbf9..2d9847ae4 100644
--- a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_frame_XUIElementFactoryRegistration_idl__
 #define __com_sun_star_frame_XUIElementFactoryRegistration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElementFactory_idl__
 #include <com/sun/star/ui/XUIElementFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/ui/XUIElementSettings.idl b/offapi/com/sun/star/ui/XUIElementSettings.idl
index deabaab65..9e07affcf 100644
--- a/offapi/com/sun/star/ui/XUIElementSettings.idl
+++ b/offapi/com/sun/star/ui/XUIElementSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,47 +28,42 @@
 #ifndef __com_sun_star_ui_XUIElementSettings_idl__
 #define __com_sun_star_ui_XUIElementSettings_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif  
 
-//============================================================================= 
+//=============================================================================
 
 module com { module sun { module star { module ui {
 
-//============================================================================= 
+//=============================================================================
 
-/** provides functions to retrieve and change user interface element structure 
+/** provides functions to retrieve and change user interface element structure
     data and to update its visible representation.
-    
+
     @since OOo 2.0
 */
 
-interface XUIElementSettings : com::sun::star::uno::XInterface
+published interface XUIElementSettings : com::sun::star::uno::XInterface
 {
-    /** forces the user interface element to retrieve new settings from its 
-        configuration source. 
-        
+    /** forces the user interface element to retrieve new settings from its
+        configuration source.
+
         <p>
-        This is not done automatically as configurable user interface elements 
-        are controlled by layout managers. It is more efficient to let the 
-        responsible layout manager to control the update process in a single 
+        This is not done automatically as configurable user interface elements
+        are controlled by layout managers. It is more efficient to let the
+        responsible layout manager to control the update process in a single
         task.
         </p>
     */
     void updateSettings();
-    
-    /** provides a <type>UIElementSettings</type> instance that provides access 
-        to the structure of user interface element if the user interface element 
+
+    /** provides a <type>UIElementSettings</type> instance that provides access
+        to the structure of user interface element if the user interface element
         type supports it.
-        
+
         @param bWriteable
-            must be <TRUE/> if the retrieved settings should be a writable. 
-            Otherwise <FALSE/> should be provided to get a shareable reference 
+            must be <TRUE/> if the retrieved settings should be a writable.
+            Otherwise <FALSE/> should be provided to get a shareable reference
             to the settings data.
 
         @return
@@ -76,20 +71,20 @@ interface XUIElementSettings : com::sun::star::uno::XInterface
     */
     com::sun::star::container::XIndexAccess getSettings( [in] boolean bWriteable );
 
-    /** set changes to the structure of the user interface element. 
-    
+    /** set changes to the structure of the user interface element.
+
         @param UISettings
-            new data settings for the configurable user interface element. 
-        
+            new data settings for the configurable user interface element.
+
 
         <p>
-        User interface elements cannot be changed directly. The changed structure 
-        data has to be set again. This speeds up the configuration process if many 
-        changes have to be made on the structure. The persistence of changes are 
+        User interface elements cannot be changed directly. The changed structure
+        data has to be set again. This speeds up the configuration process if many
+        changes have to be made on the structure. The persistence of changes are
         controlled by the boolean property <member>Persistent</member>.
 
         </p>
-        
+
         @see com::sun::star::ui::UIElementSettings
     */
     void setSettings( [in] com::sun::star::container::XIndexAccess UISettings );
@@ -97,6 +92,6 @@ interface XUIElementSettings : com::sun::star::uno::XInterface
 
 }; }; }; };
 
-//============================================================================= 
+//=============================================================================
 
 #endif
diff --git a/offapi/com/sun/star/ui/XUIFunctionListener.idl b/offapi/com/sun/star/ui/XUIFunctionListener.idl
index d252c610d..66c4d47b8 100644
--- a/offapi/com/sun/star/ui/XUIFunctionListener.idl
+++ b/offapi/com/sun/star/ui/XUIFunctionListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XUIFunctionListener_idl__
 #define __com_sun_star_frame_XUIFunctionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif  
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl b/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
index 87ccc292a..cc7aaaee0 100644
--- a/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
+++ b/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_dialogs_DialogClosedEvent_idl__
 #define __com_sun_star_ui_dialogs_DialogClosedEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl b/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
index a7a1c4bb8..7cc4c8f22 100644
--- a/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
+++ b/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_dialogs_ExecutableDialogException_idl__
 #define __com_sun_star_ui_dialogs_ExecutableDialogException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/FilePicker.idl b/offapi/com/sun/star/ui/dialogs/FilePicker.idl
index 99347e337..60a7ea1fe 100644
--- a/offapi/com/sun/star/ui/dialogs/FilePicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilePicker.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_ui_dialogs_FilePicker_idl__
 #define __com_sun_star_ui_dialogs_FilePicker_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__ 
 #include <com/sun/star/util/XCancellable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl b/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
index 5bfa3c115..fc306e5f0 100644
--- a/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_dialogs_FilePickerEvent_idl__
 #define __com_sun_star_ui_dialogs_FilePickerEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
index 5f34ff6db..20f6f0bab 100644
--- a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
 #define __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
 
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
 #include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
index c80a29eb1..88d71025f 100644
--- a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_ui_dialogs_FolderPicker_idl__
 #define __com_sun_star_ui_dialogs_FolderPicker_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__ 
 #include <com/sun/star/util/XCancellable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/Wizard.idl b/offapi/com/sun/star/ui/dialogs/Wizard.idl
index b3237be3f..d15819a73 100644
--- a/offapi/com/sun/star/ui/dialogs/Wizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/Wizard.idl
@@ -32,15 +32,15 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module ui { module dialogs { 
+module com { module sun { module star { module ui { module dialogs {
 
-interface XWizardController;
+published interface XWizardController;
 
 //==================================================================================================================
 
 /** provides a framework for implementing a wizard dialog.
  */
-service Wizard : XWizard
+published service Wizard : XWizard
 {
     /** creates a wizard with a single execution path
         @param PageIds
@@ -68,7 +68,7 @@ service Wizard : XWizard
 
 //==================================================================================================================
 
-}; }; }; }; }; 
+}; }; }; }; };
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl b/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
index eb0680ed4..25dfca326 100644
--- a/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XAsynchronousExecutableDialog_idl__
 #define __com_sun_star_ui_dialogs_XAsynchronousExecutableDialog_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XDialogClosedListener_idl__
 #include <com/sun/star/ui/dialogs/XDialogClosedListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XControlAccess.idl b/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
index 21b8c674f..842b6511c 100644
--- a/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
+++ b/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XControlAccess_idl__
 #define __com_sun_star_ui_dialogs_XControlAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XControlInformation.idl b/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
index 12c8e4268..50e1c42e2 100644
--- a/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
+++ b/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XControlInformation_idl__
 #define __com_sun_star_ui_dialogs_XControlInformation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl b/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
index fcf9cf500..b98c89086 100644
--- a/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
+++ b/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XDialogClosedListener_idl__
 #define __com_sun_star_ui_dialogs_XDialogClosedListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_DialogClosedEvent_idl__
 #include <com/sun/star/ui/dialogs/DialogClosedEvent.idl>
-#endif
 
 module com { module sun { module star { module ui { module dialogs {
 
diff --git a/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl b/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
index 21d27aaf8..cfe491ad0 100644
--- a/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #define __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
index cc5c9e649..d2660c6a6 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePicker_idl__
 #define __com_sun_star_ui_dialogs_XFilePicker_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
index 6f128b4a8..cee36db73 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePicker2_idl__
 #define __com_sun_star_ui_dialogs_XFilePicker2_idl__
 
-#ifndef __com_sun_star_ui_dialogs_XFilePicker_idl__
 #include <com/sun/star/ui/dialogs/XFilePicker.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
index a50a3e959..6e858e6f9 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePickerControlAccess_idl__
 #define __com_sun_star_ui_dialogs_XFilePickerControlAccess_idl__
 
-#ifndef __com_sun_star_ui_dialogs_XFilePicker_idl__
 #include <com/sun/star/ui/dialogs/XFilePicker.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
index 2f00bad21..481512a7f 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePickerListener_idl__
 #define __com_sun_star_ui_dialogs_XFilePickerListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_FilePickerEvent_idl__
 #include <com/sun/star/ui/dialogs/FilePickerEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
index 658a24aa6..e6ef346ca 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePickerNotifier_idl__
 #define __com_sun_star_ui_dialogs_XFilePickerNotifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XFilePickerListener_idl__
 #include <com/sun/star/ui/dialogs/XFilePickerListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
index b35b57b2e..3f6c2e0ff 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePreview_idl__
 #define __com_sun_star_ui_dialogs_XFilePreview_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XFilterManager.idl b/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
index 66251101f..dd23db094 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XFilterManager_idl__
 #define __com_sun_star_ui_dialogs_XFilterManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl b/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
index cc2279254..f83120d2c 100644
--- a/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ui_dialogs_XFolderPicker_idl__
 #define __com_sun_star_ui_dialogs_XFolderPicker_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XWizard.idl b/offapi/com/sun/star/ui/dialogs/XWizard.idl
index 445f7bbf2..debe91072 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizard.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui { module dialogs {
 
 //==================================================================================================================
 
-interface XWizardPage;
+published interface XWizardPage;
 
 /** is the main interface implemented by the <type>Wizard</type> services.
 
@@ -79,7 +79,7 @@ interface XWizardPage;
     @see XWizardController
     @see XWizardPage
  */
-interface XWizard
+published interface XWizard
 {
     interface   XExecutableDialog;
 
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardController.idl b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
index 6304e7085..063873aa5 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardController.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui { module dialogs {
 
 /** is the interface of a client-provided controller of a custom <type>Wizard</type>.
  */
-interface XWizardController
+published interface XWizardController
 {
     /** creates a page
 
@@ -78,7 +78,7 @@ interface XWizardController
 
 //==================================================================================================================
 
-}; }; }; }; }; 
+}; }; }; }; };
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
index 0186b79f8..aa872a454 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui { module dialogs {
 
 /** is a single page of a <type>Wizard</type>
  */
-interface XWizardPage : ::com::sun::star::lang::XComponent
+published interface XWizardPage : ::com::sun::star::lang::XComponent
 {
     /** provides read-only access to the window of the page
     */
@@ -79,7 +79,7 @@ interface XWizardPage : ::com::sun::star::lang::XComponent
 
 //==================================================================================================================
 
-}; }; }; }; }; 
+}; }; }; }; };
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/makefile.mk b/offapi/com/sun/star/ui/dialogs/makefile.mk
deleted file mode 100644
index 07d762fb0..000000000
--- a/offapi/com/sun/star/ui/dialogs/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssuidialogs
-PACKAGE=com$/sun$/star$/ui$/dialogs
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    FilterOptionsDialog.idl\
-    ControlActions.idl\
-    ExecutableDialogException.idl\
-    ExecutableDialogResults.idl\
-    XExecutableDialog.idl\
-    CommonFilePickerElementIds.idl\
-    ExtendedFilePickerElementIds.idl\
-    FilePicker.idl\
-    FilePickerEvent.idl\
-    FilePreviewImageFormats.idl\
-    FolderPicker.idl\
-    ListboxControlActions.idl\
-    TemplateDescription.idl\
-    XFilePicker.idl\
-    XFilePicker2.idl\
-    XFilePickerControlAccess.idl	\
-    XFilePickerListener.idl\
-    XFilePickerNotifier.idl\
-    XFilePreview.idl\
-    XFilterGroupManager.idl\
-    XFilterManager.idl\
-    XFolderPicker.idl\
-        XControlAccess.idl\
-        XControlInformation.idl \
-        XAsynchronousExecutableDialog.idl \
-        XDialogClosedListener.idl \
-        DialogClosedEvent.idl \
-    XWizard.idl \
-    XWizardController.idl \
-    Wizard.idl \
-    XWizardPage.idl \
-    WizardButton.idl \
-    WizardTravelType.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/ui/makefile.mk b/offapi/com/sun/star/ui/makefile.mk
deleted file mode 100644
index 313d74dcd..000000000
--- a/offapi/com/sun/star/ui/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssui
-PACKAGE=com$/sun$/star$/ui
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ActionTrigger.idl                           \
-    ActionTriggerContainer.idl                  \
-    ActionTriggerSeparator.idl                  \
-    ActionTriggerSeparatorType.idl              \
-    ConfigurableUIElement.idl                   \
-    ConfigurationEvent.idl                      \
-    ContextMenuExecuteEvent.idl                 \
-    ContextMenuInterceptorAction.idl            \
-    DockingArea.idl                             \
-    GlobalAcceleratorConfiguration.idl          \
-    ImageType.idl                               \
-    ItemDescriptor.idl                          \
-    ItemStyle.idl                               \
-    ItemType.idl                                \
-    ModuleUICategoryDescription.idl             \
-    ModuleUICommandDescription.idl              \
-    ModuleUIConfigurationManager.idl            \
-    ModuleUIConfigurationManagerSupplier.idl    \
-    ModuleWindowStateConfiguration.idl          \
-    UICategoryDescription.idl                   \
-    UICommandDescription.idl                    \
-    UIConfigurationManager.idl                  \
-    UIElement.idl                               \
-    UIElementFactory.idl                        \
-    UIElementFactoryManager.idl                 \
-    UIElementSettings.idl                       \
-    UIElementType.idl                           \
-    WindowContentFactory.idl					\
-    WindowStateConfiguration.idl                \
-    XAcceleratorConfiguration.idl               \
-    XContextMenuInterception.idl                \
-    XContextMenuInterceptor.idl                 \
-    XDockingAreaAcceptor.idl                    \
-    XImageManager.idl                           \
-    XModuleUIConfigurationManager.idl           \
-    XModuleUIConfigurationManagerSupplier.idl   \
-    XUIConfiguration.idl                        \
-    XUIConfigurationListener.idl                \
-    XUIConfigurationManager.idl                 \
-    XUIConfigurationManagerSupplier.idl         \
-    XUIConfigurationPersistence.idl             \
-    XUIConfigurationStorage.idl                 \
-    XUIElement.idl                              \
-    XUIElementFactory.idl                       \
-    XUIElementFactoryRegistration.idl           \
-    XUIElementSettings.idl                      \
-    XUIFunctionListener.idl                     \
-    XToolPanel.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/util/ChangesEvent.idl b/offapi/com/sun/star/util/ChangesEvent.idl
index 08fff08fe..d1fa48ec7 100644
--- a/offapi/com/sun/star/util/ChangesEvent.idl
+++ b/offapi/com/sun/star/util/ChangesEvent.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_ChangesEvent_idl__ 
 #define __com_sun_star_util_ChangesEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_ElementChange_idl__ 
 #include <com/sun/star/util/ElementChange.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_ChangesSet_idl__ 
 #include <com/sun/star/util/ChangesSet.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/ChangesSet.idl b/offapi/com/sun/star/util/ChangesSet.idl
index 9d3e72332..47bf72aea 100644
--- a/offapi/com/sun/star/util/ChangesSet.idl
+++ b/offapi/com/sun/star/util/ChangesSet.idl
@@ -27,14 +27,10 @@
 #ifndef __com_sun_star_util_ChangesSet_idl__
 #define __com_sun_star_util_ChangesSet_idl__
 
-#ifndef __com_sun_star_util_ElementChange_idl__
 #include <com/sun/star/util/ElementChange.idl>
-#endif
 
 /*
-#ifndef __com_sun_star_util_XChangesSet_idl__
 #include <com/sun/star/util/XChangesSet.idl>
-#endif
 */
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/CloseVetoException.idl b/offapi/com/sun/star/util/CloseVetoException.idl
index f46909311..00d656bd9 100644
--- a/offapi/com/sun/star/util/CloseVetoException.idl
+++ b/offapi/com/sun/star/util/CloseVetoException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_CloseVetoException_idl__
 #define __com_sun_star_util_CloseVetoException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/DataEditorEvent.idl b/offapi/com/sun/star/util/DataEditorEvent.idl
index bcfb2c12e..dedcd3ddc 100644
--- a/offapi/com/sun/star/util/DataEditorEvent.idl
+++ b/offapi/com/sun/star/util/DataEditorEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_DataEditorEvent_idl__ 
 #define __com_sun_star_util_DataEditorEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_DataEditorEventType_idl__ 
 #include <com/sun/star/util/DataEditorEventType.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/DiskFullException.idl b/offapi/com/sun/star/util/DiskFullException.idl
index 39abb8363..e329cc78d 100644
--- a/offapi/com/sun/star/util/DiskFullException.idl
+++ b/offapi/com/sun/star/util/DiskFullException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_DiskFullException_idl__ 
 #define __com_sun_star_util_DiskFullException_idl__ 
  
-#ifndef __com_sun_star_util_FileIOException_idl__ 
 #include <com/sun/star/util/FileIOException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/FileIOException.idl b/offapi/com/sun/star/util/FileIOException.idl
index 11f07fde7..47967d767 100644
--- a/offapi/com/sun/star/util/FileIOException.idl
+++ b/offapi/com/sun/star/util/FileIOException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_FileIOException_idl__ 
 #define __com_sun_star_util_FileIOException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/InvalidStateException.idl b/offapi/com/sun/star/util/InvalidStateException.idl
index 58e368bd4..3f4b28dbd 100644
--- a/offapi/com/sun/star/util/InvalidStateException.idl
+++ b/offapi/com/sun/star/util/InvalidStateException.idl
@@ -27,17 +27,17 @@
 #ifndef __com_sun_star_util_InvalidStateException_idl__
 #define __com_sun_star_util_InvalidStateException_idl__
 
-#include <com/sun/star/uno/Exception.idl> 
+#include <com/sun/star/uno/Exception.idl>
 
 //==================================================================================================================
 
-module com { module sun { module star { module util { 
+module com { module sun { module star { module util {
 
 //==================================================================================================================
 
 /** is thrown when an object's state does not allow to call requested functionality.
  */
-exception InvalidStateException : com::sun::star::uno::Exception
+published exception InvalidStateException : com::sun::star::uno::Exception
 {
 };
 
diff --git a/offapi/com/sun/star/util/JobManager.idl b/offapi/com/sun/star/util/JobManager.idl
index 5ee635d22..cce794001 100644
--- a/offapi/com/sun/star/util/JobManager.idl
+++ b/offapi/com/sun/star/util/JobManager.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun__star_util_JobManager_idl__
 #define __com_sun__star_util_JobManager_idl__
 
-#ifndef __com_sun_star_util_XJobManager_idl__
 #include <com/sun/star/util/XJobManager.idl>
-#endif
 
 module com { module sun { module star { module util {
 
diff --git a/offapi/com/sun/star/util/MalformedNumberFormatException.idl b/offapi/com/sun/star/util/MalformedNumberFormatException.idl
index dbf06dcf6..89da1a629 100644
--- a/offapi/com/sun/star/util/MalformedNumberFormatException.idl
+++ b/offapi/com/sun/star/util/MalformedNumberFormatException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_MalformedNumberFormatException_idl__ 
 #define __com_sun_star_util_MalformedNumberFormatException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/ModeChangeEvent.idl b/offapi/com/sun/star/util/ModeChangeEvent.idl
index 7d38c6963..e5eadd6a0 100644
--- a/offapi/com/sun/star/util/ModeChangeEvent.idl
+++ b/offapi/com/sun/star/util/ModeChangeEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_ModeChangeEvent_idl__
 #define __com_sun_star_util_ModeChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/NotLockedException.idl b/offapi/com/sun/star/util/NotLockedException.idl
index a8865c25b..9819fde69 100644
--- a/offapi/com/sun/star/util/NotLockedException.idl
+++ b/offapi/com/sun/star/util/NotLockedException.idl
@@ -31,13 +31,13 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module util { 
+module com { module sun { module star { module util {
 
 //==================================================================================================================
 
 /** is raised when attempt is made to unlock a lockable component which actually is not locked.
  */
-exception NotLockedException : ::com::sun::star::util::InvalidStateException
+published exception NotLockedException : ::com::sun::star::util::InvalidStateException
 {
 };
 
diff --git a/offapi/com/sun/star/util/NotNumericException.idl b/offapi/com/sun/star/util/NotNumericException.idl
index 0bf9369f9..c8191135c 100644
--- a/offapi/com/sun/star/util/NotNumericException.idl
+++ b/offapi/com/sun/star/util/NotNumericException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_NotNumericException_idl__ 
 #define __com_sun_star_util_NotNumericException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/NumberFormatProperties.idl b/offapi/com/sun/star/util/NumberFormatProperties.idl
index d017ff999..cf61e8bae 100644
--- a/offapi/com/sun/star/util/NumberFormatProperties.idl
+++ b/offapi/com/sun/star/util/NumberFormatProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_NumberFormatProperties_idl__ 
 #define __com_sun_star_util_NumberFormatProperties_idl__ 
  
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/NumberFormatSettings.idl b/offapi/com/sun/star/util/NumberFormatSettings.idl
index 74a83cbab..885e79f87 100644
--- a/offapi/com/sun/star/util/NumberFormatSettings.idl
+++ b/offapi/com/sun/star/util/NumberFormatSettings.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_NumberFormatSettings_idl__ 
 #define __com_sun_star_util_NumberFormatSettings_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Date_idl__ 
 #include <com/sun/star/util/Date.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/NumberFormats.idl b/offapi/com/sun/star/util/NumberFormats.idl
index ff46c0b30..d718a56fb 100644
--- a/offapi/com/sun/star/util/NumberFormats.idl
+++ b/offapi/com/sun/star/util/NumberFormats.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_NumberFormats_idl__ 
 #define __com_sun_star_util_NumberFormats_idl__ 
  
-#ifndef __com_sun_star_util_XNumberFormats_idl__ 
 #include <com/sun/star/util/XNumberFormats.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XNumberFormatTypes_idl__ 
 #include <com/sun/star/util/XNumberFormatTypes.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/NumberFormatsSupplier.idl b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
index 077a09372..f2a0c438f 100644
--- a/offapi/com/sun/star/util/NumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_util_NumberFormatsSupplier_idl__
 #define __com_sun_star_util_NumberFormatsSupplier_idl__
 
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/NumberFormatter.idl b/offapi/com/sun/star/util/NumberFormatter.idl
index 6c02eddd2..7364a34ea 100644
--- a/offapi/com/sun/star/util/NumberFormatter.idl
+++ b/offapi/com/sun/star/util/NumberFormatter.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_NumberFormatter_idl__ 
 #define __com_sun_star_util_NumberFormatter_idl__ 
  
-#ifndef __com_sun_star_util_XNumberFormatter_idl__ 
 #include <com/sun/star/util/XNumberFormatter.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__ 
 #include <com/sun/star/util/XNumberFormatPreviewer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
index 302330fb2..c6bee6191 100644
--- a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_OfficeInstallationDirectories_idl__
 #define __com_sun_star_util_OfficeInstallationDirectories_idl__
 
-#ifndef __com_sun_star_util_XOfficeInstallationDirectories_idl__
 #include <com/sun/star/util/XOfficeInstallationDirectories.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/util/PathSettings.idl b/offapi/com/sun/star/util/PathSettings.idl
index 5fa53128b..09ecfe9c9 100644
--- a/offapi/com/sun/star/util/PathSettings.idl
+++ b/offapi/com/sun/star/util/PathSettings.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_util_PathSettings_idl__ 
 #define __com_sun_star_util_PathSettings_idl__ 
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__ 
 #include <com/sun/star/beans/XFastPropertySet.idl> 
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__ 
 #include <com/sun/star/beans/XMultiPropertySet.idl> 
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/util/PathSubstitution.idl b/offapi/com/sun/star/util/PathSubstitution.idl
index 03a167112..f1df40d85 100644
--- a/offapi/com/sun/star/util/PathSubstitution.idl
+++ b/offapi/com/sun/star/util/PathSubstitution.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_util_PathSubstitution_idl__
 #define __com_sun_star_util_PathSubstitution_idl__
 
-#ifndef __com_sun_star_util_XStringSubstitution_idl__
 #include <com/sun/star/util/XStringSubstitution.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerListener_idl__
 #include <com/sun/star/container/XContainerListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/ReplaceDescriptor.idl b/offapi/com/sun/star/util/ReplaceDescriptor.idl
index 7f1e79145..e3f21a1f8 100644
--- a/offapi/com/sun/star/util/ReplaceDescriptor.idl
+++ b/offapi/com/sun/star/util/ReplaceDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_ReplaceDescriptor_idl__ 
 #define __com_sun_star_util_ReplaceDescriptor_idl__ 
  
-#ifndef __com_sun_star_util_SearchDescriptor_idl__ 
 #include <com/sun/star/util/SearchDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__ 
 #include <com/sun/star/util/XReplaceDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/SearchAlgorithms.idl b/offapi/com/sun/star/util/SearchAlgorithms.idl
new file mode 100644
index 000000000..f83b4404e
--- /dev/null
+++ b/offapi/com/sun/star/util/SearchAlgorithms.idl
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_lang_SearchAlgorithms_idl__
+#define __com_sun_star_lang_SearchAlgorithms_idl__
+
+
+//=============================================================================
+
+module com { module sun { module star { module util {
+
+//=============================================================================
+
+published enum SearchAlgorithms
+{
+    /// Literal
+    ABSOLUTE,   // implemented as a kind of Boyer-Moore
+    /// Regular expression
+    REGEXP,
+    /// Weighted Levenshtein Distance
+    APPROXIMATE
+};
+
+//=============================================================================
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/util/SearchDescriptor.idl b/offapi/com/sun/star/util/SearchDescriptor.idl
index 68d3d5720..e63c67ae2 100644
--- a/offapi/com/sun/star/util/SearchDescriptor.idl
+++ b/offapi/com/sun/star/util/SearchDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_SearchDescriptor_idl__ 
 #define __com_sun_star_util_SearchDescriptor_idl__ 
  
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__ 
 #include <com/sun/star/util/XSearchDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/SearchFlags.idl b/offapi/com/sun/star/util/SearchFlags.idl
new file mode 100644
index 000000000..452b5d45d
--- /dev/null
+++ b/offapi/com/sun/star/util/SearchFlags.idl
@@ -0,0 +1,140 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_lang_SearchFlags_idl__
+#define __com_sun_star_lang_SearchFlags_idl__
+
+
+//=============================================================================
+
+module com { module sun { module star { module util {
+
+//=============================================================================
+
+/// Flags for search methods
+published constants SearchFlags
+{
+    /**
+        @deprecated The constant ALL_IGNORE_CASE is never supported - use
+                    <const scope="com::sun::star::i18n">TransliterationModules::IGNORE_CASE</const>
+                    with
+                    <member>SearchOptions::transliterateFlags</member>
+                    instead.
+
+        @see <type scope="com::sun::star::i18n">TransliterationModules</type>
+    */
+    const long  ALL_IGNORE_CASE     = 0x00000001;
+
+    /** Flag for normal (Boyer-Moore) search / Search for word only. */
+    const long  NORM_WORD_ONLY      = 0x00000010;
+
+    /** Flag for "regular expression" search / Interpret as extended
+        regular expression.
+
+        @deprecated The flag is currently not supported by OOo.
+    */
+    const long  REG_EXTENDED        = 0x00000100;
+
+    /** Flag for "regular expression" search / No register information
+        or backreferences, i.e., avoid sub expressions. Return only
+        true/false if matched or not.
+
+        @deprecated The flag is currently not supported by OOo.
+    */
+    const long  REG_NOSUB           = 0x00000200;
+
+    /** Flag for "regular expression" search / Special new line
+        treatment.
+
+        @deprecated The flag is currently not supported by OOo.
+
+        <p> A NEWLINE character in string will not be matched by a
+        period outside bracket expression or by any form of a non
+        matching list. </p>
+
+        <p> A circumflex (^) in pattern when used to specify expression
+        anchoring will match the zero length string immediately after a
+        newline in string, regardless of the setting of
+        REG_NOT_BEGINOFLINE. </p>
+
+        <p> A dollar-sign ($) in pattern when used to specify expression
+        anchoring, will match zero-length string immediately before a
+        new line in string, regardless of the setting of
+        REG_NOT_ENDOFLINE. </p>
+    */
+    const long  REG_NEWLINE         = 0x00000400;
+
+    /** The first character in the string is not the beginning of the
+        line therefore ^ will not match with first character of the
+        string.
+    */
+    const long  REG_NOT_BEGINOFLINE = 0x00000800;
+
+    /** The last character in the string is not the end of the line
+        therefore $ will not match with last character of the string.
+    */
+    const long  REG_NOT_ENDOFLINE   = 0x00001000;
+
+    /** Flag for "Weighted Levenshtein Distance" search / Relaxed
+        checking of limit, split weigh pools.
+
+        <p> If not specified (<b>strict</b>), the search is sucessful if
+        the WLD is within a calculated limit where each insertion,
+        deletion and replacement adds a weight to a common pool of
+        weights. This is the mathematically correct WLD. </p>
+
+        <p> From a user's point of view the strict WLD is an
+        exclusive-OR of the arguments given, for example if allowed
+        insertions=2 and allowed replacements=2, the search fails if 2
+        characters had been inserted and an additional operation would
+        be needed to match. Depending on the weights it may also fail if
+        1 character was inserted and 1 character replaced and an
+        additional operation would be needed to match. The strict
+        algorithm may match less than expected from a first glance of
+        the specified arguments, but does not return false positives. </p>
+
+        <p> If specified (<b>relaxed</b>), the search is also successful
+        if the combined pool for insertions and deletions is below a
+        doubled calculated limit and replacements are treated
+        differently. Additionally, swapped characters are counted as one
+        replacement. </p>
+
+        <p> From a user's point of view the relaxed WLD is an
+        inclusive-OR of the arguments given, for example if allowed
+        insertions=2 and allowed replacements=2, the search succeeds if
+        2 characters had been inserted and an additional replacement is
+        needed to match. The relaxed algorithm may return false
+        positives, but meets user expectation better. </p>
+    */
+    const long  LEV_RELAXED     = 0x00010000;
+};
+
+//=============================================================================
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/util/SearchOptions.idl b/offapi/com/sun/star/util/SearchOptions.idl
new file mode 100644
index 000000000..b4784720c
--- /dev/null
+++ b/offapi/com/sun/star/util/SearchOptions.idl
@@ -0,0 +1,86 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_lang_SearchOptions_idl__
+#define __com_sun_star_lang_SearchOptions_idl__
+
+
+#include <com/sun/star/lang/Locale.idl>
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/util/SearchAlgorithms.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module util {
+
+//=============================================================================
+
+published  struct SearchOptions  {
+    //-------------------------------------------------------------------------
+    /** search type */
+    SearchAlgorithms    algorithmType;
+
+    /** some flags - can be mixed
+
+        @see <type>SearchFlags</type>
+    */
+    long             searchFlag;
+
+    /** The text or pattern to be searched. */
+    string            searchString;
+
+    /** The replacement text
+        (is for optional replacing - SearchOption is only the data container for it) */
+    string            replaceString;
+
+    /** The locale for case insensitive search. */
+    ::com::sun::star::lang::Locale  Locale;
+
+    /** This many characters can be different (as a replacement) between
+        the found word and the search pattern in a "Weighted Levenshtein
+        Distance" search. */
+    long            changedChars;
+
+    /** This many characters can be missing in the found word in a
+        "Weighted Levenshtein Distance" search. */
+    long            deletedChars;
+
+    /** This many characters can be additional in the found word in a
+        "Weighted Levenshtein Distance" search. */
+    long            insertedChars;
+
+    /** Flags for the transliteration. Same meaning as the enum of
+        <type scope="com::sun::star::i18n">TransliterationModules</type>
+    */
+    long            transliterateFlags;
+};
+
+//=============================================================================
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/util/SearchResult.idl b/offapi/com/sun/star/util/SearchResult.idl
new file mode 100644
index 000000000..784d35478
--- /dev/null
+++ b/offapi/com/sun/star/util/SearchResult.idl
@@ -0,0 +1,64 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_lang_SearchResult_idl__
+#define __com_sun_star_lang_SearchResult_idl__
+
+
+//=============================================================================
+
+module com { module sun { module star { module util {
+
+//=============================================================================
+
+published  struct SearchResult  {
+    //-------------------------------------------------------------------------
+    /** Number of subexpressions,
+    if it is 0, then no match found; this value is 1 for ABSOLUTE and APPROXIMATE match.
+    The start and endOffset are always dependent on the search direction.
+    For example:
+    if you search "X" in the text "-X-" the offset are:
+        for forward:     start = 1, end = 2
+        for backward:   start = 2, end = 1
+    Forward, the startOffset is inclusive, the endOffset exclusive.
+    Backward, the startOffset is exclusive, the endOffset inclusive.
+
+    For regular expressions it can be greater than 1.
+    If the value is 1, startoffset[0] and endoffset[0] points to the matching sub string
+    if value is > 1, still startoffset[0] and endoffset[0] points to the matching substring for whole regular expression
+    startoffset[i] and endoffset[i] points to the matching substring of i th matching substring.
+    */
+    long subRegExpressions;
+    sequence<long> startOffset;        // inclusive
+    sequence<long> endOffset;          // exclusive
+};
+
+//=============================================================================
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/util/SortDescriptor.idl b/offapi/com/sun/star/util/SortDescriptor.idl
index 77d8dfe00..8d7b5e387 100644
--- a/offapi/com/sun/star/util/SortDescriptor.idl
+++ b/offapi/com/sun/star/util/SortDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_SortDescriptor_idl__ 
 #define __com_sun_star_util_SortDescriptor_idl__ 
   
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/SortField.idl b/offapi/com/sun/star/util/SortField.idl
index d1d15582f..f7d658ecd 100644
--- a/offapi/com/sun/star/util/SortField.idl
+++ b/offapi/com/sun/star/util/SortField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_SortField_idl__ 
 #define __com_sun_star_util_SortField_idl__ 
  
-#ifndef __com_sun_star_util_SortFieldType_idl__ 
 #include <com/sun/star/util/SortFieldType.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/Sortable.idl b/offapi/com/sun/star/util/Sortable.idl
index 98d384d60..b44ee59f2 100644
--- a/offapi/com/sun/star/util/Sortable.idl
+++ b/offapi/com/sun/star/util/Sortable.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_Sortable_idl__ 
 #define __com_sun_star_util_Sortable_idl__ 
   
-#ifndef __com_sun_star_util_SortDescriptor_idl__ 
 #include <com/sun/star/util/SortDescriptor.idl> 
-#endif 
-
-#ifndef __com_sun_star_util_XSortable_idl__ 
 #include <com/sun/star/util/XSortable.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/TextSearch.idl b/offapi/com/sun/star/util/TextSearch.idl
index eba0b8bef..7c5421a0f 100644
--- a/offapi/com/sun/star/util/TextSearch.idl
+++ b/offapi/com/sun/star/util/TextSearch.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_TextSearch_idl__
 #define __com_sun_star_util_TextSearch_idl__
 
-#ifndef __com_sun_star_lang_XTextSearch_idl__
 #include <com/sun/star/util/XTextSearch.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/TriState.idl b/offapi/com/sun/star/util/TriState.idl
index a093300c9..322174216 100644
--- a/offapi/com/sun/star/util/TriState.idl
+++ b/offapi/com/sun/star/util/TriState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_TriState_idl__ 
-#define __com_sun_star_util_TriState_idl__ 
- 
- 
-//============================================================================= 
- 
-module com {  module sun {  module star {  module util {  
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_util_TriState_idl__
+#define __com_sun_star_util_TriState_idl__
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module util {
+
+//=============================================================================
+
 /** This enumeration represents a tristate value.<p>
 
     This enumeration defines three values, <TRUE/>, <FALSE/> and a don't know
     value.<p>
  */
-enum TriState
+published enum TriState
 {
     /** The value is equivalent to <FALSE/>.
      */
     NO,
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** The value is equivalent to <TRUE/>.
      */
     YES,
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** The value is indeterminate.
      */
     INDETERMINATE
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/util/URLTransformer.idl b/offapi/com/sun/star/util/URLTransformer.idl
index 5a1f62352..5e5f3935a 100644
--- a/offapi/com/sun/star/util/URLTransformer.idl
+++ b/offapi/com/sun/star/util/URLTransformer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_URLTransformer_idl__ 
 #define __com_sun_star_util_URLTransformer_idl__ 
  
-#ifndef __com_sun_star_util_XURLTransformer_idl__ 
 #include <com/sun/star/util/XURLTransformer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/UriAbbreviation.idl b/offapi/com/sun/star/util/UriAbbreviation.idl
index 2145738a7..fe5f1c933 100644
--- a/offapi/com/sun/star/util/UriAbbreviation.idl
+++ b/offapi/com/sun/star/util/UriAbbreviation.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun__star_util_UriAbbreviation_idl__
 #define __com_sun__star_util_UriAbbreviation_idl__
 
-#ifndef __com_sun_star_util_XStringAbbreviation_idl__
 #include <com/sun/star/util/XStringAbbreviation.idl>
-#endif
 
 module com { module sun { module star { module util {
 
diff --git a/offapi/com/sun/star/util/VetoException.idl b/offapi/com/sun/star/util/VetoException.idl
index e5ee621cd..739a1033e 100644
--- a/offapi/com/sun/star/util/VetoException.idl
+++ b/offapi/com/sun/star/util/VetoException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_VetoException_idl__
 #define __com_sun_star_util_VetoException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XArchiver.idl b/offapi/com/sun/star/util/XArchiver.idl
index 8c374f658..2fc10f3c7 100644
--- a/offapi/com/sun/star/util/XArchiver.idl
+++ b/offapi/com/sun/star/util/XArchiver.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XArchiver_idl__ 
 #define __com_sun_star_util_XArchiver_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XAtomServer.idl b/offapi/com/sun/star/util/XAtomServer.idl
index bf9973619..c372f0ed2 100644
--- a/offapi/com/sun/star/util/XAtomServer.idl
+++ b/offapi/com/sun/star/util/XAtomServer.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_util_XAtomServer_idl__
 #define __com_sun_star_util_XAtomServer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_AtomDescription_idl__
 #include <com/sun/star/util/AtomDescription.idl>
-#endif
-
-#ifndef __com_sun_star_util_AtomClassRequest_idl__
 #include <com/sun/star/util/AtomClassRequest.idl>
-#endif
 
 
 module com
diff --git a/offapi/com/sun/star/util/XBroadcaster.idl b/offapi/com/sun/star/util/XBroadcaster.idl
index 9fdcabd60..40421224b 100644
--- a/offapi/com/sun/star/util/XBroadcaster.idl
+++ b/offapi/com/sun/star/util/XBroadcaster.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XBroadcaster_idl__ 
 #define __com_sun_star_util_XBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/XCancelManager.idl b/offapi/com/sun/star/util/XCancelManager.idl
index a4d92010a..229ca8ad7 100644
--- a/offapi/com/sun/star/util/XCancelManager.idl
+++ b/offapi/com/sun/star/util/XCancelManager.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XCancelManager_idl__ 
 #define __com_sun_star_util_XCancelManager_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XCancellable_idl__ 
 #include <com/sun/star/util/XCancellable.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XCancellable.idl b/offapi/com/sun/star/util/XCancellable.idl
index b021279bd..a036206cb 100644
--- a/offapi/com/sun/star/util/XCancellable.idl
+++ b/offapi/com/sun/star/util/XCancellable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XCancellable_idl__ 
 #define __com_sun_star_util_XCancellable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XChainable.idl b/offapi/com/sun/star/util/XChainable.idl
index c93010e3f..779a47e9d 100644
--- a/offapi/com/sun/star/util/XChainable.idl
+++ b/offapi/com/sun/star/util/XChainable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XChainable_idl__ 
 #define __com_sun_star_util_XChainable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XChangesBatch.idl b/offapi/com/sun/star/util/XChangesBatch.idl
index 6290e226b..55e6e73d8 100644
--- a/offapi/com/sun/star/util/XChangesBatch.idl
+++ b/offapi/com/sun/star/util/XChangesBatch.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XChangesBatch_idl__ 
 #define __com_sun_star_util_XChangesBatch_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_ChangesSet_idl__ 
 #include <com/sun/star/util/ChangesSet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XChangesListener.idl b/offapi/com/sun/star/util/XChangesListener.idl
index ce44f3b84..336ca1960 100644
--- a/offapi/com/sun/star/util/XChangesListener.idl
+++ b/offapi/com/sun/star/util/XChangesListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XChangesListener_idl__ 
 #define __com_sun_star_util_XChangesListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_ChangesEvent_idl__ 
 #include <com/sun/star/util/ChangesEvent.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XChangesNotifier.idl b/offapi/com/sun/star/util/XChangesNotifier.idl
index fd0ad2e55..2fbd89324 100644
--- a/offapi/com/sun/star/util/XChangesNotifier.idl
+++ b/offapi/com/sun/star/util/XChangesNotifier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XChangesNotifier_idl__ 
 #define __com_sun_star_util_XChangesNotifier_idl__ 
  
-#ifndef __com_sun_star_util_XChangesListener_idl__ 
 #include <com/sun/star/util/XChangesListener.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/XChangesSet.idl b/offapi/com/sun/star/util/XChangesSet.idl
index ad2db0514..80471afdc 100644
--- a/offapi/com/sun/star/util/XChangesSet.idl
+++ b/offapi/com/sun/star/util/XChangesSet.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XChangesSet_idl__ 
 #define __com_sun_star_util_XChangesSet_idl__ 
  
-#ifndef __com_sun_star_container_XElementAccess_idl__ 
 #include <com/sun/star/container/XElementAccess.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_ElementChange_idl__ 
 #include <com/sun/star/util/ElementChange.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XCloneable.idl b/offapi/com/sun/star/util/XCloneable.idl
index 062fdba17..5fe1c75a2 100644
--- a/offapi/com/sun/star/util/XCloneable.idl
+++ b/offapi/com/sun/star/util/XCloneable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XCloneable_idl__ 
 #define __com_sun_star_util_XCloneable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XCloseBroadcaster.idl b/offapi/com/sun/star/util/XCloseBroadcaster.idl
index 45fa99ac8..76dc0abba 100644
--- a/offapi/com/sun/star/util/XCloseBroadcaster.idl
+++ b/offapi/com/sun/star/util/XCloseBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XCloseBroadcaster_idl__
 #define __com_sun_star_util_XCloseBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseListener_idl__
 #include <com/sun/star/util/XCloseListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XCloseListener.idl b/offapi/com/sun/star/util/XCloseListener.idl
index 8cf8080e4..76df1c800 100644
--- a/offapi/com/sun/star/util/XCloseListener.idl
+++ b/offapi/com/sun/star/util/XCloseListener.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_util_XCloseListener_idl__
 #define __com_sun_star_util_XCloseListener_idl__
 
-#ifndef __com_sun_star_util_CloseVetoException_idl__
 #include <com/sun/star/util/CloseVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XCloseable.idl b/offapi/com/sun/star/util/XCloseable.idl
index 049908e55..e95641308 100644
--- a/offapi/com/sun/star/util/XCloseable.idl
+++ b/offapi/com/sun/star/util/XCloseable.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XClosable_idl__
 #define __com_sun_star_util_XClosable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseBroadcaster_idl__
 #include <com/sun/star/util/XCloseBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XDataEditor.idl b/offapi/com/sun/star/util/XDataEditor.idl
index a395e04f8..b8768407d 100644
--- a/offapi/com/sun/star/util/XDataEditor.idl
+++ b/offapi/com/sun/star/util/XDataEditor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XDataEditor_idl__ 
 #define __com_sun_star_util_XDataEditor_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XDataEditorListener_idl__ 
 #include <com/sun/star/util/XDataEditorListener.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/XDataEditorListener.idl b/offapi/com/sun/star/util/XDataEditorListener.idl
index 088bb43c5..981348b85 100644
--- a/offapi/com/sun/star/util/XDataEditorListener.idl
+++ b/offapi/com/sun/star/util/XDataEditorListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XDataEditorListener_idl__ 
 #define __com_sun_star_util_XDataEditorListener_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_DataEditorEvent_idl__ 
 #include <com/sun/star/util/DataEditorEvent.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/XFlushListener.idl b/offapi/com/sun/star/util/XFlushListener.idl
index 9e4560377..8e04aa7c6 100644
--- a/offapi/com/sun/star/util/XFlushListener.idl
+++ b/offapi/com/sun/star/util/XFlushListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XFlushListener_idl__ 
 #define __com_sun_star_util_XFlushListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XFlushable.idl b/offapi/com/sun/star/util/XFlushable.idl
index 4365cd742..6bcdf1dc0 100644
--- a/offapi/com/sun/star/util/XFlushable.idl
+++ b/offapi/com/sun/star/util/XFlushable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XFlushable_idl__ 
 #define __com_sun_star_util_XFlushable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XFlushListener_idl__ 
 #include <com/sun/star/util/XFlushListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XImportable.idl b/offapi/com/sun/star/util/XImportable.idl
index 4163ad64b..1cf5084f2 100644
--- a/offapi/com/sun/star/util/XImportable.idl
+++ b/offapi/com/sun/star/util/XImportable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XImportable_idl__ 
 #define __com_sun_star_util_XImportable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XIndent.idl b/offapi/com/sun/star/util/XIndent.idl
index 55e1c7c7b..dd05aaa4c 100644
--- a/offapi/com/sun/star/util/XIndent.idl
+++ b/offapi/com/sun/star/util/XIndent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XIndent_idl__ 
 #define __com_sun_star_util_XIndent_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XJobManager.idl b/offapi/com/sun/star/util/XJobManager.idl
index 3e68106e6..a4c7793d6 100644
--- a/offapi/com/sun/star/util/XJobManager.idl
+++ b/offapi/com/sun/star/util/XJobManager.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_util_XJobManager_idl__
 #define __com_sun_star_util_XJobManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
 #include <com/sun/star/util/XCancellable.idl>
-#endif
 
 module com { module sun { module star { module util {
 
diff --git a/offapi/com/sun/star/util/XLinkUpdate.idl b/offapi/com/sun/star/util/XLinkUpdate.idl
index 200ccbe48..afb8800bd 100644
--- a/offapi/com/sun/star/util/XLinkUpdate.idl
+++ b/offapi/com/sun/star/util/XLinkUpdate.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XLinkUpdate_idl__
 #define __com_sun_star_util_XLinkUpdate_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XLocalizedAliases.idl b/offapi/com/sun/star/util/XLocalizedAliases.idl
index 6d6fbfbbe..05bf95128 100644
--- a/offapi/com/sun/star/util/XLocalizedAliases.idl
+++ b/offapi/com/sun/star/util/XLocalizedAliases.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_util_XLocalizedAliases_idl__ 
 #define __com_sun_star_util_XLocalizedAliases_idl__ 
  
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_AliasProgrammaticPair_idl__ 
 #include <com/sun/star/util/AliasProgrammaticPair.idl> 
-#endif 
  
 //============================================================================= 
 module com {  module sun {  module star {  module util { 
diff --git a/offapi/com/sun/star/util/XLockable.idl b/offapi/com/sun/star/util/XLockable.idl
index 5616a42c2..0e52cc96c 100644
--- a/offapi/com/sun/star/util/XLockable.idl
+++ b/offapi/com/sun/star/util/XLockable.idl
@@ -31,7 +31,7 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module util { 
+module com { module sun { module star { module util {
 
 //==================================================================================================================
 
@@ -41,7 +41,7 @@ module com { module sun { module star { module util {
     pairs. As long as there has been one more call to <code>lock</code> than to <code>unlock</code>, the
     component is considered locked, which is reflected by <member>isLocked</member> returning <TRUE/>.</p>
  */
-interface XLockable
+published interface XLockable
 {
     /** locks</a> the component
 
@@ -54,7 +54,7 @@ interface XLockable
 
         @throws NotLockedException
             if the component is not currently locked.
-    
+
         @see lock
         @see isLocked
     */
diff --git a/offapi/com/sun/star/util/XMergeable.idl b/offapi/com/sun/star/util/XMergeable.idl
index 55612d39a..6996c84d4 100644
--- a/offapi/com/sun/star/util/XMergeable.idl
+++ b/offapi/com/sun/star/util/XMergeable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XMergeable_idl__ 
 #define __com_sun_star_util_XMergeable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XModeChangeApproveListener.idl b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
index 4012a4f0f..a42de133e 100644
--- a/offapi/com/sun/star/util/XModeChangeApproveListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_util_XModeChangeApproveListener_idl__
 #define __com_sun_star_util_XModeChangeApproveListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_ModeChangeEvent_idl__
 #include <com/sun/star/util/ModeChangeEvent.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
index f4c45dc18..74cbe25a5 100644
--- a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_util_XModeChangeBroadcaster_idl__
 #define __com_sun_star_util_XModeChangeBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeChangeListener_idl__
 #include <com/sun/star/util/XModeChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeChangeApproveListener_idl__
 #include <com/sun/star/util/XModeChangeApproveListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XModeChangeListener.idl b/offapi/com/sun/star/util/XModeChangeListener.idl
index ed6a1f36c..69a985082 100644
--- a/offapi/com/sun/star/util/XModeChangeListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeListener.idl
@@ -28,13 +28,9 @@
 #ifndef __com_sun_star_util_XModeChangeListener_idl__ 
 #define __com_sun_star_util_XModeChangeListener_idl__ 
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
  
-#ifndef __com_sun_star_util_ModeChangeEvent_idl__
 #include <com/sun/star/util/ModeChangeEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XModeSelector.idl b/offapi/com/sun/star/util/XModeSelector.idl
index d8916b6bd..e3bc39973 100644
--- a/offapi/com/sun/star/util/XModeSelector.idl
+++ b/offapi/com/sun/star/util/XModeSelector.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XModeSelector_idl__ 
 #define __com_sun_star_util_XModeSelector_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_NoSupportException_idl__ 
 #include <com/sun/star/lang/NoSupportException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XModifiable.idl b/offapi/com/sun/star/util/XModifiable.idl
index 6b3dc7b19..5d9c5df04 100644
--- a/offapi/com/sun/star/util/XModifiable.idl
+++ b/offapi/com/sun/star/util/XModifiable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XModifiable_idl__ 
 #define __com_sun_star_util_XModifiable_idl__ 
  
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__ 
 #include <com/sun/star/util/XModifyBroadcaster.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
 #include <com/sun/star/beans/PropertyVetoException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XModifiable2.idl b/offapi/com/sun/star/util/XModifiable2.idl
index e4934d1dd..bcc9335d3 100644
--- a/offapi/com/sun/star/util/XModifiable2.idl
+++ b/offapi/com/sun/star/util/XModifiable2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
 ************************************************************************/
-#ifndef __com_sun_star_util_XModifiable2_idl__ 
-#define __com_sun_star_util_XModifiable2_idl__ 
- 
-#ifndef __com_sun_star_util_XModifiable_idl__ 
-#include <com/sun/star/util/XModifiable.idl> 
-#endif 
- 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
-#include <com/sun/star/beans/PropertyVetoException.idl> 
-#endif 
- 
- 
-//============================================================================= 
- 
-module com {  module sun {  module star {  module util {  
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_util_XModifiable2_idl__
+#define __com_sun_star_util_XModifiable2_idl__
+
+#include <com/sun/star/util/XModifiable.idl>
+
+#include <com/sun/star/beans/PropertyVetoException.idl>
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module util {
+
+//=============================================================================
+
 /** allows to control modifiable state change.
-    
+
     <p>
     This interface allows to prevent changing of the modified state of the
     object. It is introduced for performance optimizations, to allow to prevent
@@ -51,9 +47,9 @@ module com {  module sun {  module star {  module util {
     Please use this interface very carefully.
     </p>
  */
-interface XModifiable2: com::sun::star::util::XModifiable
-{ 
-    //------------------------------------------------------------------------- 
+published interface XModifiable2: com::sun::star::util::XModifiable
+{
+    //-------------------------------------------------------------------------
     /** disable possibility to change modified state of the document
 
         @returns the value that says whether the modified state change was
@@ -64,7 +60,7 @@ interface XModifiable2: com::sun::star::util::XModifiable
      */
     boolean disableSetModified();
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
     /** enable possibility to change modified state of the document
 
         @returns the value that says whether the modified state change was
@@ -74,15 +70,15 @@ interface XModifiable2: com::sun::star::util::XModifiable
      */
     boolean enableSetModified();
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
     /** allows to detect whether the modified state change is enabled
      */
     boolean isSetModifiedEnabled();
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
 
diff --git a/offapi/com/sun/star/util/XModifyBroadcaster.idl b/offapi/com/sun/star/util/XModifyBroadcaster.idl
index 8f29139b2..841cd557e 100644
--- a/offapi/com/sun/star/util/XModifyBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModifyBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XModifyBroadcaster_idl__ 
 #define __com_sun_star_util_XModifyBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XModifyListener_idl__ 
 #include <com/sun/star/util/XModifyListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XModifyListener.idl b/offapi/com/sun/star/util/XModifyListener.idl
index 01a6a98a9..2a9b5623b 100644
--- a/offapi/com/sun/star/util/XModifyListener.idl
+++ b/offapi/com/sun/star/util/XModifyListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XModifyListener_idl__ 
 #define __com_sun_star_util_XModifyListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XNumberFormatPreviewer.idl b/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
index 4abd7d1dc..16fc9d018 100644
--- a/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
+++ b/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
@@ -27,25 +27,14 @@
 #ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__ 
 #define __com_sun_star_util_XNumberFormatPreviewer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__ 
 #include <com/sun/star/util/MalformedNumberFormatException.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__ 
 #include <com/sun/star/util/Color.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XNumberFormatTypes.idl b/offapi/com/sun/star/util/XNumberFormatTypes.idl
index 285453eb0..dc53f7418 100644
--- a/offapi/com/sun/star/util/XNumberFormatTypes.idl
+++ b/offapi/com/sun/star/util/XNumberFormatTypes.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XNumberFormatTypes_idl__
 #define __com_sun_star_util_XNumberFormatTypes_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormats.idl b/offapi/com/sun/star/util/XNumberFormats.idl
index f499b5c53..5633bb6bb 100644
--- a/offapi/com/sun/star/util/XNumberFormats.idl
+++ b/offapi/com/sun/star/util/XNumberFormats.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_util_XNumberFormats_idl__ 
 #define __com_sun_star_util_XNumberFormats_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__ 
 #include <com/sun/star/util/MalformedNumberFormatException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XNumberFormatsSupplier.idl b/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
index b600d6c12..911481c32 100644
--- a/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__ 
 #define __com_sun_star_util_XNumberFormatsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XNumberFormats_idl__ 
 #include <com/sun/star/util/XNumberFormats.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XNumberFormatter.idl b/offapi/com/sun/star/util/XNumberFormatter.idl
index b32a5ba46..90a1c39ef 100644
--- a/offapi/com/sun/star/util/XNumberFormatter.idl
+++ b/offapi/com/sun/star/util/XNumberFormatter.idl
@@ -27,25 +27,14 @@
 #ifndef __com_sun_star_util_XNumberFormatter_idl__ 
 #define __com_sun_star_util_XNumberFormatter_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__ 
 #include <com/sun/star/util/XNumberFormatsSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_NotNumericException_idl__ 
 #include <com/sun/star/util/NotNumericException.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_Color_idl__ 
 #include <com/sun/star/util/Color.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
index 93d994eb6..ea729b478 100644
--- a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_XOfficeInstallationDirectories_idl__
 #define __com_sun_star_util_XOfficeInstallationDirectories_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module util {
 
diff --git a/offapi/com/sun/star/util/XPropertyReplace.idl b/offapi/com/sun/star/util/XPropertyReplace.idl
index 8875aed8c..9773a5b40 100644
--- a/offapi/com/sun/star/util/XPropertyReplace.idl
+++ b/offapi/com/sun/star/util/XPropertyReplace.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_util_XPropertyReplace_idl__ 
 #define __com_sun_star_util_XPropertyReplace_idl__ 
  
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__ 
 #include <com/sun/star/util/XReplaceDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
 #include <com/sun/star/beans/UnknownPropertyException.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XProtectable.idl b/offapi/com/sun/star/util/XProtectable.idl
index f46e99b77..bb01977d3 100644
--- a/offapi/com/sun/star/util/XProtectable.idl
+++ b/offapi/com/sun/star/util/XProtectable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XProtectable_idl__ 
 #define __com_sun_star_util_XProtectable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XRefreshListener.idl b/offapi/com/sun/star/util/XRefreshListener.idl
index 403616c63..b061621d6 100644
--- a/offapi/com/sun/star/util/XRefreshListener.idl
+++ b/offapi/com/sun/star/util/XRefreshListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XRefreshListener_idl__ 
 #define __com_sun_star_util_XRefreshListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XRefreshable.idl b/offapi/com/sun/star/util/XRefreshable.idl
index d3e6ccd63..418b2d836 100644
--- a/offapi/com/sun/star/util/XRefreshable.idl
+++ b/offapi/com/sun/star/util/XRefreshable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XRefreshable_idl__ 
 #define __com_sun_star_util_XRefreshable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XRefreshListener_idl__ 
 #include <com/sun/star/util/XRefreshListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XReplaceDescriptor.idl b/offapi/com/sun/star/util/XReplaceDescriptor.idl
index 38b5ce40e..260e55eda 100644
--- a/offapi/com/sun/star/util/XReplaceDescriptor.idl
+++ b/offapi/com/sun/star/util/XReplaceDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XReplaceDescriptor_idl__ 
 #define __com_sun_star_util_XReplaceDescriptor_idl__ 
  
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__ 
 #include <com/sun/star/util/XSearchDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XReplaceable.idl b/offapi/com/sun/star/util/XReplaceable.idl
index b0d1ab284..209a8324b 100644
--- a/offapi/com/sun/star/util/XReplaceable.idl
+++ b/offapi/com/sun/star/util/XReplaceable.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XReplaceable_idl__ 
 #define __com_sun_star_util_XReplaceable_idl__ 
  
-#ifndef __com_sun_star_util_XSearchable_idl__ 
 #include <com/sun/star/util/XSearchable.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__ 
 #include <com/sun/star/util/XReplaceDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__ 
 #include <com/sun/star/util/XSearchDescriptor.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XSearchDescriptor.idl b/offapi/com/sun/star/util/XSearchDescriptor.idl
index cc374cf4e..6cd5a5f1a 100644
--- a/offapi/com/sun/star/util/XSearchDescriptor.idl
+++ b/offapi/com/sun/star/util/XSearchDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XSearchDescriptor_idl__ 
 #define __com_sun_star_util_XSearchDescriptor_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XSearchable.idl b/offapi/com/sun/star/util/XSearchable.idl
index 021829244..b5d04a245 100644
--- a/offapi/com/sun/star/util/XSearchable.idl
+++ b/offapi/com/sun/star/util/XSearchable.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XSearchable_idl__ 
 #define __com_sun_star_util_XSearchable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__ 
 #include <com/sun/star/util/XSearchDescriptor.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XSimpleErrorHandler.idl b/offapi/com/sun/star/util/XSimpleErrorHandler.idl
index 67464ef7f..51388e9e4 100644
--- a/offapi/com/sun/star/util/XSimpleErrorHandler.idl
+++ b/offapi/com/sun/star/util/XSimpleErrorHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XSimpleErrorHandler_idl__ 
 #define __com_sun_star_util_XSimpleErrorHandler_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/XSortable.idl b/offapi/com/sun/star/util/XSortable.idl
index 6ac77ead5..4a21065ab 100644
--- a/offapi/com/sun/star/util/XSortable.idl
+++ b/offapi/com/sun/star/util/XSortable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XSortable_idl__ 
 #define __com_sun_star_util_XSortable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/util/XStringAbbreviation.idl b/offapi/com/sun/star/util/XStringAbbreviation.idl
index a746816e4..97842a52e 100644
--- a/offapi/com/sun/star/util/XStringAbbreviation.idl
+++ b/offapi/com/sun/star/util/XStringAbbreviation.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_XStringAbbreviation_idl__
 #define __com_sun_star_util_XStringAbbreviation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module util {
      published interface XStringWidth;
diff --git a/offapi/com/sun/star/util/XStringEscape.idl b/offapi/com/sun/star/util/XStringEscape.idl
index e3d473bf6..bf8e39cf4 100644
--- a/offapi/com/sun/star/util/XStringEscape.idl
+++ b/offapi/com/sun/star/util/XStringEscape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XStringEscape_idl__ 
 #define __com_sun_star_util_XStringEscape_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/XStringMapping.idl b/offapi/com/sun/star/util/XStringMapping.idl
index bd06ad1c4..cdb6b92f4 100644
--- a/offapi/com/sun/star/util/XStringMapping.idl
+++ b/offapi/com/sun/star/util/XStringMapping.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XStringMapping_idl__ 
 #define __com_sun_star_util_XStringMapping_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/XStringSubstitution.idl b/offapi/com/sun/star/util/XStringSubstitution.idl
index f406573e4..2e561acc3 100644
--- a/offapi/com/sun/star/util/XStringSubstitution.idl
+++ b/offapi/com/sun/star/util/XStringSubstitution.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_util_XStringSubstitution_idl__ 
 #define __com_sun_star_util_XStringSubstitution_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //============================================================================= 
 
diff --git a/offapi/com/sun/star/util/XStringWidth.idl b/offapi/com/sun/star/util/XStringWidth.idl
index 503c30157..88f2e9e3d 100644
--- a/offapi/com/sun/star/util/XStringWidth.idl
+++ b/offapi/com/sun/star/util/XStringWidth.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_XStringWidth_idl__
 #define __com_sun_star_util_XStringWidth_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module util {
 
diff --git a/offapi/com/sun/star/util/XTextSearch.idl b/offapi/com/sun/star/util/XTextSearch.idl
index 38f44aa7c..136366465 100644
--- a/offapi/com/sun/star/util/XTextSearch.idl
+++ b/offapi/com/sun/star/util/XTextSearch.idl
@@ -31,184 +31,12 @@
 
 #include <com/sun/star/lang/Locale.idl>
 #include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/util/SearchOptions.idl>
+#include <com/sun/star/util/SearchResult.idl>
 
 
 module com { module sun { module star { module util {
 
-published enum SearchAlgorithms
-{
-    /// Literal
-    ABSOLUTE,   // implemented as a kind of Boyer-Moore
-    /// Regular expression
-    REGEXP,
-    /// Weighted Levenshtein Distance
-    APPROXIMATE
-};
-
-/// Flags for search methods
-published constants SearchFlags
-{
-    /**
-        @deprecated The constant ALL_IGNORE_CASE is never supported - use
-                    <const scope="com::sun::star::i18n">TransliterationModules::IGNORE_CASE</const> 
-                    with 
-                    <member>SearchOptions::transliterateFlags</member> 
-                    instead.
-
-        @see <type scope="com::sun::star::i18n">TransliterationModules</type> 
-    */
-    const long  ALL_IGNORE_CASE     = 0x00000001;
-
-    /** Flag for normal (Boyer-Moore) search / Search for word only. */
-    const long  NORM_WORD_ONLY      = 0x00000010;
-
-    /** Flag for "regular expression" search / Interpret as extended 
-        regular expression.
-
-        @deprecated The flag is currently not supported by OOo.
-    */
-    const long  REG_EXTENDED        = 0x00000100;
-
-    /** Flag for "regular expression" search / No register information 
-        or backreferences, i.e., avoid sub expressions. Return only 
-        true/false if matched or not.
-
-        @deprecated The flag is currently not supported by OOo.
-    */
-    const long  REG_NOSUB           = 0x00000200;
-
-    /** Flag for "regular expression" search / Special new line 
-        treatment.
-
-        @deprecated The flag is currently not supported by OOo.
-
-        <p> A NEWLINE character in string will not be matched by a 
-        period outside bracket expression or by any form of a non 
-        matching list. </p>
-
-        <p> A circumflex (^) in pattern when used to specify expression 
-        anchoring will match the zero length string immediately after a 
-        newline in string, regardless of the setting of 
-        REG_NOT_BEGINOFLINE. </p>
-
-        <p> A dollar-sign ($) in pattern when used to specify expression 
-        anchoring, will match zero-length string immediately before a 
-        new line in string, regardless of the setting of 
-        REG_NOT_ENDOFLINE. </p>
-    */
-    const long  REG_NEWLINE         = 0x00000400;
-
-    /** The first character in the string is not the beginning of the 
-        line therefore ^ will not match with first character of the 
-        string.
-    */
-    const long  REG_NOT_BEGINOFLINE = 0x00000800;
-
-    /** The last character in the string is not the end of the line 
-        therefore $ will not match with last character of the string. 
-    */
-    const long  REG_NOT_ENDOFLINE   = 0x00001000;
-
-    /** Flag for "Weighted Levenshtein Distance" search / Relaxed 
-        checking of limit, split weigh pools.
-
-        <p> If not specified (<b>strict</b>), the search is sucessful if 
-        the WLD is within a calculated limit where each insertion, 
-        deletion and replacement adds a weight to a common pool of 
-        weights. This is the mathematically correct WLD. </p>
-
-        <p> From a user's point of view the strict WLD is an 
-        exclusive-OR of the arguments given, for example if allowed 
-        insertions=2 and allowed replacements=2, the search fails if 2 
-        characters had been inserted and an additional operation would 
-        be needed to match. Depending on the weights it may also fail if 
-        1 character was inserted and 1 character replaced and an 
-        additional operation would be needed to match. The strict 
-        algorithm may match less than expected from a first glance of 
-        the specified arguments, but does not return false positives. </p>
-
-        <p> If specified (<b>relaxed</b>), the search is also successful 
-        if the combined pool for insertions and deletions is below a 
-        doubled calculated limit and replacements are treated 
-        differently. Additionally, swapped characters are counted as one 
-        replacement. </p>
-
-        <p> From a user's point of view the relaxed WLD is an 
-        inclusive-OR of the arguments given, for example if allowed 
-        insertions=2 and allowed replacements=2, the search succeeds if 
-        2 characters had been inserted and an additional replacement is 
-        needed to match. The relaxed algorithm may return false 
-        positives, but meets user expectation better. </p>
-    */
-    const long  LEV_RELAXED     = 0x00010000;
-};
-
-
-published  struct SearchOptions  {
-    //-------------------------------------------------------------------------
-    /** search type */
-    SearchAlgorithms	algorithmType;
-
-    /** some flags - can be mixed
-
-        @see <type>SearchFlags</type>
-    */
-    long 			searchFlag;
-
-    /** The text or pattern to be searched. */
-    string			searchString;
-
-    /** The replacement text
-        (is for optional replacing - SearchOption is only the data container for it) */
-    string			replaceString;
-
-    /** The locale for case insensitive search. */
-    ::com::sun::star::lang::Locale  Locale;
-
-    /** This many characters can be different (as a replacement) between 
-        the found word and the search pattern in a "Weighted Levenshtein 
-        Distance" search. */
-    long			changedChars;
-
-    /** This many characters can be missing in the found word in a 
-        "Weighted Levenshtein Distance" search. */
-    long			deletedChars;
-
-    /** This many characters can be additional in the found word in a 
-        "Weighted Levenshtein Distance" search. */
-    long			insertedChars;
-
-    /** Flags for the transliteration. Same meaning as the enum of
-        <type scope="com::sun::star::i18n">TransliterationModules</type>
-    */
-    long			transliterateFlags;
-};
-
-
-published  struct SearchResult  {
-    //-------------------------------------------------------------------------
-    /** Number of subexpressions,
-    if it is 0, then no match found; this value is 1 for ABSOLUTE and APPROXIMATE match.
-    The start and endOffset are always dependent on the search direction.
-    For example:
-    if you search "X" in the text "-X-" the offset are:
-        for forward: 	start = 1, end = 2
-        for backward:   start = 2, end = 1
-    Forward, the startOffset is inclusive, the endOffset exclusive.
-    Backward, the startOffset is exclusive, the endOffset inclusive.
-
-    For regular expressions it can be greater than 1.
-    If the value is 1, startoffset[0] and endoffset[0] points to the matching sub string
-    if value is > 1, still startoffset[0] and endoffset[0] points to the matching substring for whole regular expression
-    startoffset[i] and endoffset[i] points to the matching substring of i th matching substring.
-    */
-    long subRegExpressions;
-    sequence<long> startOffset;		// inclusive
-    sequence<long> endOffset;  		// exclusive
-};
-
-
-
 /** enables an object to search in its content.
  */
 published interface XTextSearch : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/util/XTimeStamped.idl b/offapi/com/sun/star/util/XTimeStamped.idl
index 1650f0571..94bd4bbf5 100644
--- a/offapi/com/sun/star/util/XTimeStamped.idl
+++ b/offapi/com/sun/star/util/XTimeStamped.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_XTimeStamped_idl__
 #define __com_sun_star_util_XTimeStamped_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module util {
 
diff --git a/offapi/com/sun/star/util/XURLTransformer.idl b/offapi/com/sun/star/util/XURLTransformer.idl
index c088a9e78..641bd7778 100644
--- a/offapi/com/sun/star/util/XURLTransformer.idl
+++ b/offapi/com/sun/star/util/XURLTransformer.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XURLTransformer_idl__
 #define __com_sun_star_util_XURLTransformer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XUniqueIDFactory.idl b/offapi/com/sun/star/util/XUniqueIDFactory.idl
index 86fb527fc..039fe4a95 100644
--- a/offapi/com/sun/star/util/XUniqueIDFactory.idl
+++ b/offapi/com/sun/star/util/XUniqueIDFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_container_XUniqueIDFactory_idl__ 
 #define __com_sun_star_container_XUniqueIDFactory_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/util/XUpdatable.idl b/offapi/com/sun/star/util/XUpdatable.idl
index 173229d01..970fc4ade 100644
--- a/offapi/com/sun/star/util/XUpdatable.idl
+++ b/offapi/com/sun/star/util/XUpdatable.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XUpdatable_idl__
 #define __com_sun_star_util_XUpdatable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshListener_idl__
 #include <com/sun/star/util/XRefreshListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/makefile.mk b/offapi/com/sun/star/util/makefile.mk
deleted file mode 100644
index 87dc2d078..000000000
--- a/offapi/com/sun/star/util/makefile.mk
+++ /dev/null
@@ -1,154 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssutil
-PACKAGE=com$/sun$/star$/util
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MeasureUnit.idl\
-    AliasProgrammaticPair.idl \
-    CellProtection.idl\
-    ChangesEvent.idl\
-    ChangesSet.idl \
-    CloseVetoException.idl\
-    Color.idl\
-    Date.idl\
-    DateTime.idl\
-    DateTimeRange.idl\
-    DiskFullException.idl\
-    Duration.idl\
-    ElementChange.idl \
-    Endianness.idl \
-    FileIOException.idl\
-    InvalidStateException.idl\
-    Language.idl\
-    NumberFormat.idl\
-    NumberFormatProperties.idl\
-    NumberFormats.idl\
-    NumberFormatSettings.idl\
-    NumberFormatsSupplier.idl\
-    NumberFormatter.idl\
-    ModeChangeEvent.idl\
-    ReplaceDescriptor.idl\
-    SearchDescriptor.idl\
-    Sortable.idl\
-    SortDescriptor.idl\
-    SortDescriptor2.idl\
-    SortField.idl\
-    SortFieldType.idl\
-    TextSearch.idl\
-    Time.idl\
-    TriState.idl\
-    URL.idl\
-    URLTransformer.idl\
-    XArchiver.idl\
-    XCancellable.idl\
-    XCancelManager.idl\
-    XChainable.idl\
-    XChangesBatch.idl \
-    XChangesListener.idl \
-    XChangesNotifier.idl \
-    XChangesSet.idl	\
-    XCloneable.idl\
-    XCloseable.idl\
-    XCloseBroadcaster.idl\
-    XCloseListener.idl\
-    XFlushable.idl\
-    XFlushListener.idl\
-    XImportable.idl\
-    XIndent.idl\
-    XLinkUpdate.idl\
-    XLocalizedAliases.idl\
-    XMergeable.idl\
-    XModeChangeBroadcaster.idl\
-    XModeChangeListener.idl\
-    XModeChangeApproveListener.idl\
-    XModeSelector.idl\
-    XModifiable.idl\
-    XModifiable2.idl\
-    XModifyBroadcaster.idl\
-    XBroadcaster.idl\
-    XModifyListener.idl\
-    XNumberFormatPreviewer.idl\
-    XNumberFormats.idl\
-    XNumberFormatsSupplier.idl\
-    XNumberFormatter.idl\
-    XNumberFormatTypes.idl\
-    XPropertyReplace.idl\
-    XProtectable.idl\
-    XRefreshable.idl\
-    XRefreshListener.idl\
-    XReplaceable.idl\
-    XReplaceDescriptor.idl\
-    XSearchable.idl\
-    XSearchDescriptor.idl\
-    XSimpleErrorHandler.idl\
-    XSortable.idl\
-    XStringAbbreviation.idl\
-    XStringWidth.idl\
-    XStringMapping.idl\
-    XStringEscape.idl\
-    XTextSearch.idl\
-    XUpdatable.idl\
-    XURLTransformer.idl\
-    XUniqueIDFactory.idl\
-    VetoException.idl\
-    DataEditorEventType.idl\
-    DataEditorEvent.idl\
-    XDataEditorListener.idl\
-    XDataEditor.idl\
-    MalformedNumberFormatException.idl\
-    NotNumericException.idl\
-    XAtomServer.idl\
-    AtomClassRequest.idl\
-    AtomDescription.idl\
-    XStringSubstitution.idl\
-    PathSettings.idl\
-    PathSubstitution.idl\
-    XTimeStamped.idl\
-    OfficeInstallationDirectories.idl\
-    XOfficeInstallationDirectories.idl\
-    RevisionTag.idl\
-    UriAbbreviation.idl\
-    XJobManager.idl\
-    JobManager.idl\
-    XLockable.idl\
-    NotLockedException.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/view/OfficeDocumentView.idl b/offapi/com/sun/star/view/OfficeDocumentView.idl
index 1678fe786..baa21277b 100644
--- a/offapi/com/sun/star/view/OfficeDocumentView.idl
+++ b/offapi/com/sun/star/view/OfficeDocumentView.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_view_OfficeDocumentView_idl__ 
 #define __com_sun_star_view_OfficeDocumentView_idl__ 
  
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
 #include <com/sun/star/view/XSelectionSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__ 
 #include <com/sun/star/view/XViewSettingsSupplier.idl> 
-#endif 
  
-#ifndef __com_sun_star_view_XControlAccess_idl__ 
 #include <com/sun/star/view/XControlAccess.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/PrintJobEvent.idl b/offapi/com/sun/star/view/PrintJobEvent.idl
index e7f49b3b4..144461f7d 100644
--- a/offapi/com/sun/star/view/PrintJobEvent.idl
+++ b/offapi/com/sun/star/view/PrintJobEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_view_PrintJobEvent_idl__
 #define __com_sun_star_view_PrintJobEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_view_PrintableState_idl__
 #include <com/sun/star/view/PrintableState.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/PrintableStateEvent.idl b/offapi/com/sun/star/view/PrintableStateEvent.idl
index 9123ce5e5..d108c1d4e 100644
--- a/offapi/com/sun/star/view/PrintableStateEvent.idl
+++ b/offapi/com/sun/star/view/PrintableStateEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_view_PrintableStateEvent_idl__ 
 #define __com_sun_star_view_PrintableStateEvent_idl__ 
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_view_PrintableState_idl__
 #include <com/sun/star/view/PrintableState.idl>
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/view/PrinterDescriptor.idl b/offapi/com/sun/star/view/PrinterDescriptor.idl
index 178a31e2f..35b14aec7 100644
--- a/offapi/com/sun/star/view/PrinterDescriptor.idl
+++ b/offapi/com/sun/star/view/PrinterDescriptor.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_view_PrinterDescriptor_idl__ 
 #define __com_sun_star_view_PrinterDescriptor_idl__ 
  
-#ifndef __com_sun_star_view_PaperOrientation_idl__ 
 #include <com/sun/star/view/PaperOrientation.idl> 
-#endif 
  
-#ifndef __com_sun_star_view_PaperFormat_idl__ 
 #include <com/sun/star/view/PaperFormat.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/RenderDescriptor.idl b/offapi/com/sun/star/view/RenderDescriptor.idl
index 9f9121f5f..787afcf29 100644
--- a/offapi/com/sun/star/view/RenderDescriptor.idl
+++ b/offapi/com/sun/star/view/RenderDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_RenderDescriptor_idl__ 
 #define __com_sun_star_view_RenderDescriptor_idl__ 
  
-#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/view/RenderOptions.idl b/offapi/com/sun/star/view/RenderOptions.idl
index 9f27a4d47..da47c2f4a 100644
--- a/offapi/com/sun/star/view/RenderOptions.idl
+++ b/offapi/com/sun/star/view/RenderOptions.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_RenderOptions_idl__ 
 #define __com_sun_star_view_RenderOptions_idl__ 
  
-#ifndef __com_sun_star_awt_XDevice_idl__ 
 #include <com/sun/star/awt/XDevice.idl> 
-#endif 
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/view/SelectionType.idl b/offapi/com/sun/star/view/SelectionType.idl
index b179d6460..56fe2b036 100644
--- a/offapi/com/sun/star/view/SelectionType.idl
+++ b/offapi/com/sun/star/view/SelectionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_SelectionType_idl__ 
-#define __com_sun_star_view_SelectionType_idl__ 
- 
-//============================================================================= 
- 
-module com {  module sun {  module star {  module view {  
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_view_SelectionType_idl__
+#define __com_sun_star_view_SelectionType_idl__
+
+//=============================================================================
+
+module com {  module sun {  module star {  module view {
+
+//=============================================================================
+
 /** Specifies a selection type for a view that supports a selection model.
  */
-enum SelectionType
-{ 
-    //------------------------------------------------------------------------- 
-        
+published enum SelectionType
+{
+    //-------------------------------------------------------------------------
+
     /** No selection is possible.
     <p>The selection is always empty.</p>
      */
     NONE,
 
-    //------------------------------------------------------------------------- 
-        
+    //-------------------------------------------------------------------------
+
     /** The selection can only contain one or zero objects.
      */
     SINGLE,
 
-    //------------------------------------------------------------------------- 
-        
+    //-------------------------------------------------------------------------
+
     /** The selection can contain zero or more objects.
      */
     MULTI,
 
-    //------------------------------------------------------------------------- 
-        
+    //-------------------------------------------------------------------------
+
     /** The selection can contain zero or more objects.
         <p>all selected objects must be part of a continues range</p>
      */
     RANGE
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
+};
+
+//=============================================================================
+
+}; }; }; };
+
 
-#endif 
+#endif
diff --git a/offapi/com/sun/star/view/ViewSettings.idl b/offapi/com/sun/star/view/ViewSettings.idl
index d48b80aad..37719683f 100644
--- a/offapi/com/sun/star/view/ViewSettings.idl
+++ b/offapi/com/sun/star/view/ViewSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_ViewSettings_idl__ 
 #define __com_sun_star_view_ViewSettings_idl__ 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/view/XControlAccess.idl b/offapi/com/sun/star/view/XControlAccess.idl
index 27c35eeca..073da71d9 100644
--- a/offapi/com/sun/star/view/XControlAccess.idl
+++ b/offapi/com/sun/star/view/XControlAccess.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_view_XControlAccess_idl__ 
 #define __com_sun_star_view_XControlAccess_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XControl_idl__ 
 #include <com/sun/star/awt/XControl.idl> 
-#endif 
  
-#ifndef __com_sun_star_awt_XControlModel_idl__ 
 #include <com/sun/star/awt/XControlModel.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/XFormLayerAccess.idl b/offapi/com/sun/star/view/XFormLayerAccess.idl
index cb5fe632e..8346a1c9a 100644
--- a/offapi/com/sun/star/view/XFormLayerAccess.idl
+++ b/offapi/com/sun/star/view/XFormLayerAccess.idl
@@ -28,18 +28,10 @@
 #ifndef __offapi_com_sun_star_view_XFormLayerAccess_idl__
 #define __offapi_com_sun_star_view_XFormLayerAccess_idl__
 
-#ifndef __com_sun_star_view_XControlAccess_idl__ 
 #include <com/sun/star/view/XControlAccess.idl>
-#endif
-#ifndef __com_sun_star_form_XForm_idl__ 
 #include <com/sun/star/form/XForm.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__ 
 #include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XLineCursor.idl b/offapi/com/sun/star/view/XLineCursor.idl
index faf7c9396..21439ce57 100644
--- a/offapi/com/sun/star/view/XLineCursor.idl
+++ b/offapi/com/sun/star/view/XLineCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_XLineCursor_idl__ 
 #define __com_sun_star_view_XLineCursor_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
index 2e05e84ed..f5358aa7d 100644
--- a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
+++ b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XMultiSelectionSupplier_idl__ 
-#define __com_sun_star_view_XMultiSelectionSupplier_idl__ 
- 
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
-#include <com/sun/star/view/XSelectionSupplier.idl> 
-#endif 
-#ifndef __com_sun_star_container_XEnumeration_idl__
+#ifndef __com_sun_star_view_XMultiSelectionSupplier_idl__
+#define __com_sun_star_view_XMultiSelectionSupplier_idl__
+
+#include <com/sun/star/view/XSelectionSupplier.idl>
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
-//============================================================================= 
- 
-module com {  module sun {  module star {  module view {  
- 
-//============================================================================= 
- 
+//=============================================================================
+
+module com {  module sun {  module star {  module view {
+
+//=============================================================================
+
 /** makes it possible to append and remove objects from a selection.
 
-    <p>The method <method>XSelectionSupplier::setSelection</method> for an 
+    <p>The method <method>XSelectionSupplier::setSelection</method> for an
     instance that also supports <type>XMultiSelectionSupplier</method> should
     be implemented that it also takes either a selectable object or a sequence
     of selectable objects.</p>
@@ -50,82 +46,82 @@ module com {  module sun {  module star {  module view {
     <p>Adding an object more than once to a selection should not toggle the
     selection for that object but only select it once</p>
  */
-interface XMultiSelectionSupplier: XSelectionSupplier
-{ 
-    //------------------------------------------------------------------------- 
+published interface XMultiSelectionSupplier: XSelectionSupplier
+{
+    //-------------------------------------------------------------------------
 
     /** adds the object or the objects represented by <var>Selection</var> to the selection
         of this <type>XMultiSelectionSupplier</type>.
-        
+
         @param Selection
             either an Object that is selectable or a sequence of objects that are selectable.
-        
+
         @returns
             <TRUE/>/, if <var>Selection</var> was added to the current selection.
             <FALSE/>, if <var>Selection</var> or parts of <var>Selection</var> could not be
             added to the current selection. For example, if the selection already contains
             objects that are forbidden to be selected together with <var>Selection</var>
-        
+
         @throws com::sun::star::lang::IllegalArgumentException
             If <var>Selection</var> is not a selectable object for this <type>XMultiSelectionSupplier</type>.
             <p>Adding an object to the selection that is already part of the selection should not raise this exception</p>
      */
-    boolean addSelection( [in] any Selection ) 
-                raises( com::sun::star::lang::IllegalArgumentException ); 
- 
-    //------------------------------------------------------------------------- 
+    boolean addSelection( [in] any Selection )
+                raises( com::sun::star::lang::IllegalArgumentException );
+
+    //-------------------------------------------------------------------------
 
     /** remove the object or objects represented by <var>Selection</var> from the
         selection of this <type>XMultiSelectionSupplier</type>.
-        
+
         @param Selection
             either an Object that is selectable or a sequence of objects that are selectable.
-        
+
         @returns
             <TRUE/>/, if <var>Selection</var> was added to the current selection.
             <FALSE/>, if <var>Selection</var> or parts of <var>Selection</var> could not be
             added to the current selection. For example, if the selection already contains
             objects that are forbidden to be selected together with <var>Selection</var>.
-        
+
         @throws com::sun::star::lang::IllegalArgumentException
             If <var>Selection</var> is not a selectable object for this <type>XMultiSelectionSupplier</type>.
             <p>Removing an object from the selection that is not part of the selection should not raise this exception</p>
      */
-    void removeSelection( [in] any Selection ) 
-                raises( com::sun::star::lang::IllegalArgumentException ); 
+    void removeSelection( [in] any Selection )
+                raises( com::sun::star::lang::IllegalArgumentException );
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** clears the selection of this <type>XMultiSelectionSupplier</type>.
     */
     void clearSelection();
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
     /** returns the number of selected objects of this <type>XMultiSelectionSupplier</type>.
     */
     long getSelectionCount();
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
 
-    /** @returns		 
+    /** @returns
             a new object to enumerate the selection of this <type>XMultiSelectionSupplier</type>.
             It returns NULL if there are no objects in the selection.
      */
-    com::sun::star::container::XEnumeration createSelectionEnumeration(); 
+    com::sun::star::container::XEnumeration createSelectionEnumeration();
 
 
-    /** @returns		 
+    /** @returns
             a new object to enumerate the selection of this <type>XMultiSelectionSupplier</type>
             in reverse order. If the order of the selected objects
             It returns NULL if there are no objects in the selection.
      */
-    com::sun::star::container::XEnumeration createReverseSelectionEnumeration(); 
-
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+    com::sun::star::container::XEnumeration createReverseSelectionEnumeration();
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/view/XPrintJob.idl b/offapi/com/sun/star/view/XPrintJob.idl
index edb33e842..e144c45ba 100644
--- a/offapi/com/sun/star/view/XPrintJob.idl
+++ b/offapi/com/sun/star/view/XPrintJob.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_view_XPrintJob_idl__
 #define __com_sun_star_view_XPrintJob_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XPrintable_idl__
 #include <com/sun/star/view/XPrintable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintJobBroadcaster.idl b/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
index 7ed4d57c4..623b1aac4 100644
--- a/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
+++ b/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_view_XPrintJobBroadcaster_idl__
 #define __com_sun_star_view_XPrintJobBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XPrintJobListener_idl__
 #include <com/sun/star/view/XPrintJobListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XPrintJobListener.idl b/offapi/com/sun/star/view/XPrintJobListener.idl
index 18865c755..455465778 100644
--- a/offapi/com/sun/star/view/XPrintJobListener.idl
+++ b/offapi/com/sun/star/view/XPrintJobListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_view_XPrintJobListener_idl__
 #define __com_sun_star_view_XPrintJobListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_view_PrintJobEvent_idl__
 #include <com/sun/star/view/PrintJobEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XPrintPreview.idl b/offapi/com/sun/star/view/XPrintPreview.idl
index 1b5827756..d746284fd 100644
--- a/offapi/com/sun/star/view/XPrintPreview.idl
+++ b/offapi/com/sun/star/view/XPrintPreview.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_XPrintPreview_idl__
 #define __com_sun_star_view_XPrintPreview_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintSettingsSupplier.idl b/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
index 83b864be9..b123c6a01 100644
--- a/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
+++ b/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_view_XPrintSettingsSupplier_idl__ 
 #define __com_sun_star_view_XPrintSettingsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/XPrintable.idl b/offapi/com/sun/star/view/XPrintable.idl
index 500881389..638a61a7a 100644
--- a/offapi/com/sun/star/view/XPrintable.idl
+++ b/offapi/com/sun/star/view/XPrintable.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_view_XPrintable_idl__ 
 #define __com_sun_star_view_XPrintable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/XPrintableBroadcaster.idl b/offapi/com/sun/star/view/XPrintableBroadcaster.idl
index 0d07578f5..8d55128e9 100644
--- a/offapi/com/sun/star/view/XPrintableBroadcaster.idl
+++ b/offapi/com/sun/star/view/XPrintableBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_view_XPrintableBroadcaster_idl__ 
 #define __com_sun_star_view_XPrintableBroadcaster_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
-
-#ifndef __com_sun_star_view_XPrintableListener_idl__
 #include <com/sun/star/view/XPrintableListener.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/view/XPrintableListener.idl b/offapi/com/sun/star/view/XPrintableListener.idl
index d80c83c11..adf1a6524 100644
--- a/offapi/com/sun/star/view/XPrintableListener.idl
+++ b/offapi/com/sun/star/view/XPrintableListener.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_view_XPrintableListener_idl__ 
 #define __com_sun_star_view_XPrintableListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif
-
-#ifndef __com_sun_star_view_XPrintable_idl__
 #include <com/sun/star/view/XPrintable.idl>
-#endif
  
-#ifndef __com_sun_star_view_PrintableState_idl__
 #include <com/sun/star/view/PrintableStateEvent.idl>
-#endif
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/view/XRenderable.idl b/offapi/com/sun/star/view/XRenderable.idl
index 1aed140ee..e300cabdd 100644
--- a/offapi/com/sun/star/view/XRenderable.idl
+++ b/offapi/com/sun/star/view/XRenderable.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_view_XRenderable_idl__ 
 #define __com_sun_star_view_XRenderable_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/view/XScreenCursor.idl b/offapi/com/sun/star/view/XScreenCursor.idl
index 3b377dd94..0f0dee310 100644
--- a/offapi/com/sun/star/view/XScreenCursor.idl
+++ b/offapi/com/sun/star/view/XScreenCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_XScreenCursor_idl__ 
 #define __com_sun_star_view_XScreenCursor_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/XSelectionChangeListener.idl b/offapi/com/sun/star/view/XSelectionChangeListener.idl
index e80ca5a64..252bc57c3 100644
--- a/offapi/com/sun/star/view/XSelectionChangeListener.idl
+++ b/offapi/com/sun/star/view/XSelectionChangeListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_view_XSelectionChangeListener_idl__ 
 #define __com_sun_star_view_XSelectionChangeListener_idl__ 
  
-#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/XSelectionSupplier.idl b/offapi/com/sun/star/view/XSelectionSupplier.idl
index 43eaa6c7b..2361f6352 100644
--- a/offapi/com/sun/star/view/XSelectionSupplier.idl
+++ b/offapi/com/sun/star/view/XSelectionSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
 #define __com_sun_star_view_XSelectionSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__ 
 #include <com/sun/star/view/XSelectionChangeListener.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/XViewCursor.idl b/offapi/com/sun/star/view/XViewCursor.idl
index 084f7415e..f63ce62be 100644
--- a/offapi/com/sun/star/view/XViewCursor.idl
+++ b/offapi/com/sun/star/view/XViewCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_XViewCursor_idl__ 
 #define __com_sun_star_view_XViewCursor_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/XViewSettingsSupplier.idl b/offapi/com/sun/star/view/XViewSettingsSupplier.idl
index 7d2dc8fb5..70f0e7d32 100644
--- a/offapi/com/sun/star/view/XViewSettingsSupplier.idl
+++ b/offapi/com/sun/star/view/XViewSettingsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_view_XViewSettingsSupplier_idl__ 
 #define __com_sun_star_view_XViewSettingsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/view/makefile.mk b/offapi/com/sun/star/view/makefile.mk
deleted file mode 100644
index d07b67a6d..000000000
--- a/offapi/com/sun/star/view/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssview
-PACKAGE=com$/sun$/star$/view
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    DocumentZoomType.idl\
-    OfficeDocumentView.idl\
-    PaperFormat.idl\
-    PaperOrientation.idl\
-    PrintableState.idl\
-    PrintableStateEvent.idl\
-    PrinterDescriptor.idl\
-    PrintOptions.idl\
-    PrintSettings.idl\
-    RenderDescriptor.idl\
-    RenderOptions.idl\
-    ViewSettings.idl\
-    XControlAccess.idl\
-    XFormLayerAccess.idl\
-    XLineCursor.idl\
-    XPrintable.idl\
-    XPrintableBroadcaster.idl\
-    XPrintableListener.idl\
-    XPrintPreview.idl\
-    XPrintSettingsSupplier.idl\
-    XRenderable.idl\
-    XScreenCursor.idl\
-    XSelectionChangeListener.idl\
-    XSelectionSupplier.idl\
-    XViewCursor.idl\
-    XViewSettingsSupplier.idl\
-    PrintJobEvent.idl\
-    XPrintJob.idl\
-    XPrintJobBroadcaster.idl\
-    XPrintJobListener.idl\
-    XMultiSelectionSupplier.idl\
-    SelectionType.idl\
-    DuplexMode.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xforms/Binding.idl b/offapi/com/sun/star/xforms/Binding.idl
index b7fff3f8e..b8d6d910e 100644
--- a/offapi/com/sun/star/xforms/Binding.idl
+++ b/offapi/com/sun/star/xforms/Binding.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_xforms_Binding_idl__
 #define __com_sun_star_xforms_Binding_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_ValueBinding_idl__
 #include <com/sun/star/form/binding/ValueBinding.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_ListEntrySource_idl__
 #include <com/sun/star/form/binding/ListEntrySource.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidator_idl__
 #include <com/sun/star/form/validation/XValidator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl b/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
index 569d59f2d..30cee4e3e 100644
--- a/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
+++ b/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xforms_InvalidDataOnSubmitException_idl__
 #define __com_sun_star_xforms_InvalidDataOnSubmitException_idl__
 
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xforms/XDataTypeRepository.idl b/offapi/com/sun/star/xforms/XDataTypeRepository.idl
index dd2448589..c05ce1f41 100644
--- a/offapi/com/sun/star/xforms/XDataTypeRepository.idl
+++ b/offapi/com/sun/star/xforms/XDataTypeRepository.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_xsd_XDataTypeRepository_idl__
 #define __com_sun_star_xsd_XDataTypeRepository_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl> 
-#endif 
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl> 
-#endif 
-#ifndef __com_sun_star_util_VetoException_idl__ 
 #include <com/sun/star/util/VetoException.idl> 
-#endif 
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xforms/XFormsSupplier.idl b/offapi/com/sun/star/xforms/XFormsSupplier.idl
index 896db4d85..7a693c5b2 100644
--- a/offapi/com/sun/star/xforms/XFormsSupplier.idl
+++ b/offapi/com/sun/star/xforms/XFormsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_xforms_XFormsSupplier_idl__ 
 #define __com_sun_star_xforms_XFormsSupplier_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xforms/XFormsUIHelper1.idl b/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
index e2dcc691c..f2f90c901 100644
--- a/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
+++ b/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
@@ -27,41 +27,16 @@
 #ifndef __com_sun_star_xforms_XFormsUIHelper1_idl__ 
 #define __com_sun_star_xforms_XFormsUIHelper1_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif 
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XSet.idl> 
-#endif 
-
-#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__ 
 #include <com/sun/star/xforms/XDataTypeRepository.idl> 
-#endif 
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__ 
 #include <com/sun/star/xml/dom/XDocument.idl> 
-#endif 
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif 
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif 
-
-#ifndef __com_sun_star_xforms_XModel_idl__
 #include <com/sun/star/xforms/XModel.idl>
-#endif 
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/xforms/XModel.idl b/offapi/com/sun/star/xforms/XModel.idl
index c79e2ae2c..9e6de0989 100644
--- a/offapi/com/sun/star/xforms/XModel.idl
+++ b/offapi/com/sun/star/xforms/XModel.idl
@@ -27,37 +27,15 @@
 #ifndef __com_sun_star_xforms_XModel_idl__ 
 #define __com_sun_star_xforms_XModel_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl> 
-#endif 
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XSet.idl> 
-#endif 
-
-#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__ 
 #include <com/sun/star/xforms/XDataTypeRepository.idl> 
-#endif 
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__ 
 #include <com/sun/star/xml/dom/XDocument.idl> 
-#endif 
-
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/xforms/XSubmission.idl b/offapi/com/sun/star/xforms/XSubmission.idl
index 48d2e6017..013e24e34 100644
--- a/offapi/com/sun/star/xforms/XSubmission.idl
+++ b/offapi/com/sun/star/xforms/XSubmission.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_xsd_XSubmission_idl__
 #define __com_sun_star_xsd_XSubmission_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_form_submission_XSubmission_idl__
 #include <com/sun/star/form/submission/XSubmission.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xforms {
diff --git a/offapi/com/sun/star/xforms/makefile.mk b/offapi/com/sun/star/xforms/makefile.mk
deleted file mode 100644
index ff09cb535..000000000
--- a/offapi/com/sun/star/xforms/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssxforms
-PACKAGE=com$/sun$/star$/xforms
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XFormsSupplier.idl\
-    XModel.idl \
-    XDataTypeRepository.idl \
-    XFormsEvent.idl \
-    XFormsUIHelper1.idl \
-    XSubmission.idl \
-    Binding.idl \
-    InvalidDataOnSubmitException.idl \
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/AttributeContainer.idl b/offapi/com/sun/star/xml/AttributeContainer.idl
index cebb0f8bb..21c4a26ab 100644
--- a/offapi/com/sun/star/xml/AttributeContainer.idl
+++ b/offapi/com/sun/star/xml/AttributeContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_NamespaceContainer_idl__
 #define __com_sun_star_drawing_NamespaceContainer_idl__
 
-#ifndef __com_sun_star_container_xnamecontainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/ExportFilter.idl b/offapi/com/sun/star/xml/ExportFilter.idl
index d64d29f2f..19b398b23 100644
--- a/offapi/com/sun/star/xml/ExportFilter.idl
+++ b/offapi/com/sun/star/xml/ExportFilter.idl
@@ -28,9 +28,7 @@
 #ifndef _COM_SUN_STAR_XML_EXPORTFILTER_IDL__
 #define _COM_SUN_STAR_XML_EXPORTFILTER_IDL__
 
-#ifndef _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
 #include <com/sun/star/xml/XExportFilter.idl>
-#endif
 
 
 module com { module sun { module star { module xml { 
diff --git a/offapi/com/sun/star/xml/ImportFilter.idl b/offapi/com/sun/star/xml/ImportFilter.idl
index 14b239b49..7bbe441b1 100644
--- a/offapi/com/sun/star/xml/ImportFilter.idl
+++ b/offapi/com/sun/star/xml/ImportFilter.idl
@@ -28,9 +28,7 @@
 #ifndef _COM_SUN_STAR_XML_IMPORTFILTER_IDL__
 #define _COM_SUN_STAR_XML_IMPORTFILTER_IDL__
 
-#ifndef _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
 #include <com/sun/star/xml/XImportFilter.idl>
-#endif
 
 
 module com { module sun { module star { module xml { 
diff --git a/offapi/com/sun/star/xml/NamespaceContainer.idl b/offapi/com/sun/star/xml/NamespaceContainer.idl
index f8909be9d..d6ac2a7b4 100644
--- a/offapi/com/sun/star/xml/NamespaceContainer.idl
+++ b/offapi/com/sun/star/xml/NamespaceContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_NamespaceContainer_idl__
 #define __com_sun_star_drawing_NamespaceContainer_idl__
 
-#ifndef __com_sun_star_container_xnamecontainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
index 946b79015..7284bd43d 100644
--- a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
 #define _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 module com { module sun { module star { module xml { 
 
diff --git a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
index b13b47485..dc19a9032 100644
--- a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
 #define _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 module com { module sun { module star { module xml { 
 
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
index d647b94cd..488e6c3c7 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #define _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 module com { module sun { module star { module xml { 
 
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
index 9a74daee2..ae82d1ee4 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #define _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 module com { module sun { module star { module xml { 
 
diff --git a/offapi/com/sun/star/xml/XExportFilter.idl b/offapi/com/sun/star/xml/XExportFilter.idl
index d07c7b50a..d08b20df1 100644
--- a/offapi/com/sun/star/xml/XExportFilter.idl
+++ b/offapi/com/sun/star/xml/XExportFilter.idl
@@ -28,10 +28,7 @@
 #ifndef _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
 #define _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/beans/PropertyValue.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
diff --git a/offapi/com/sun/star/xml/XImportFilter.idl b/offapi/com/sun/star/xml/XImportFilter.idl
index f343e1d06..2b36ff984 100644
--- a/offapi/com/sun/star/xml/XImportFilter.idl
+++ b/offapi/com/sun/star/xml/XImportFilter.idl
@@ -28,10 +28,7 @@
 #ifndef _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
 #define _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/beans/PropertyValue.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
diff --git a/offapi/com/sun/star/xml/XMLExportFilter.idl b/offapi/com/sun/star/xml/XMLExportFilter.idl
index 0a284b342..595c6075a 100644
--- a/offapi/com/sun/star/xml/XMLExportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLExportFilter.idl
@@ -29,9 +29,7 @@
 #define __com_sun_star_xml_XMLExportFilter_idl__
 
 
-#ifndef __com_sun_star_document_ExportFilter_idl__
 #include <com/sun/star/document/ExportFilter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/XMLImportFilter.idl b/offapi/com/sun/star/xml/XMLImportFilter.idl
index ac68698ab..4fb4d6fe3 100644
--- a/offapi/com/sun/star/xml/XMLImportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLImportFilter.idl
@@ -29,13 +29,8 @@
 #define __com_sun_star_xml_XMLImportFilter_idl__
 
 
-#ifndef __com_sun_star_document_ImportFilter_idl__
 #include <com/sun/star/document/ImportFilter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/crypto/CipherID.idl b/offapi/com/sun/star/xml/crypto/CipherID.idl
new file mode 100644
index 000000000..10b058167
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/CipherID.idl
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_CipherID_idl__
+#define __com_sun_star_xml_crypto_CipherID_idl__
+
+
+//============================================================================
+
+module com { module sun { module star { module xml { module crypto {
+
+//============================================================================
+/** The constant set contains identifiers of supported cipher-creation
+    algorithms.
+
+    @see <type>XCipherContextSupplier</type>
+    @since OOo 3.4
+*/
+constants CipherID
+{
+    //------------------------------------------------------------------------
+    /** identifier of AES algorithm in CBC mode with W3C padding
+     */
+    const long AES_CBC_W3C_PADDING = 1;
+
+    //------------------------------------------------------------------------
+    /** identifier of the Blowfish algorithm in 8-bit CFB mode
+     */
+    const long BLOWFISH_CFB_8 = 2;
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/DigestID.idl b/offapi/com/sun/star/xml/crypto/DigestID.idl
new file mode 100644
index 000000000..14eb822de
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/DigestID.idl
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_DigestID_idl__
+#define __com_sun_star_xml_crypto_DigestID_idl__
+
+
+//============================================================================
+
+module com { module sun { module star { module xml { module crypto {
+
+//============================================================================
+/** The constant set contains identifiers of supported digest-creation
+    algorithms.
+
+    @see <type>XDigestContextSupplier</type>
+    @since OOo 3.4
+*/
+constants DigestID
+{
+    //------------------------------------------------------------------------
+    /** identifier of SHA-1 algorithm
+     */
+    const long SHA1 = 1;
+
+    //------------------------------------------------------------------------
+    /** identifier of SHA-256 algorithm
+     */
+    const long SHA256 = 2;
+
+    //------------------------------------------------------------------------
+    /** identifier of SHA-1 algorithm that is applied to the first kilobyte
+        of data.
+     */
+    const long SHA1_1K = 3;
+
+    //------------------------------------------------------------------------
+    /** identifier of SHA-256 algorithm that is applied to the first kilobyte
+        of data.
+     */
+    const long SHA256_1K = 4;
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/SEInitializer.idl b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
index beec5efa9..fb415bd9b 100644
--- a/offapi/com/sun/star/xml/crypto/SEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- 
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
 
 #ifndef __com_sun_star_xml_crypto_seinitializer_idl_
 #define __com_sun_star_xml_crypto_seinitializer_idl_
 
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XSEInitializer.idl>
-
-#include <com/sun/star/lang/XServiceInfo.idl>
+#include <com/sun/star/xml/crypto/XCipherContextSupplier.idl>
+#include <com/sun/star/xml/crypto/XDigestContextSupplier.idl>
 
 module com { module sun { module star { module xml { module crypto {
 
@@ -45,8 +38,9 @@ module com { module sun { module star { module xml { module crypto {
  * Service of SEInitializer
  */
 service SEInitializer {
-    interface com::sun::star::xml::crypto::XSEInitializer ;
-    interface com::sun::star::lang::XServiceInfo ;
+    interface ::com::sun::star::xml::crypto::XSEInitializer;
+    interface ::com::sun::star::xml::crypto::XDigestContextSupplier;
+    interface ::com::sun::star::xml::crypto::XCipherContextSupplier;
 };
 
 } ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
index ebfbb0df6..aff74e5f5 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
-
 #include <com/sun/star/lang/XUnoTunnel.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XCipherContext.idl b/offapi/com/sun/star/xml/crypto/XCipherContext.idl
new file mode 100644
index 000000000..d2c086163
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XCipherContext.idl
@@ -0,0 +1,89 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_xciphercontext_idl_
+#define __com_sun_star_xml_crypto_xciphercontext_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+#ifndef __com_sun_star_lang_DisposedException_idl__
+#include <com/sun/star/lang/DisposedException.idl>
+#endif
+
+//============================================================================
+
+ module com {  module sun {  module star {  module xml { module crypto {
+
+//============================================================================
+/** This interface allows to encrypt/decrypt data using the cipher context.
+    <p>
+    The algorithm as well as encryption data are specified on object creation.
+    </p>
+
+    @see <type>XCipherContextSupplier</type>
+    @since OOo 3.4
+ */
+interface XCipherContext : com::sun::star::uno::XInterface
+{
+    //------------------------------------------------------------------------
+    /** encrypts/decrypts the data using the cipher.
+        <p>
+        Please have in mind, the cipher object state might depend from the
+        already encrypted/decrypted data ( it depends from the used
+        algorithm ).
+        </p>
+
+        <p>
+        Whether the object does encryption or decryption is specified by
+        creation of the object.
+        </p>
+
+        @param aData
+            data that should be encrypted/decrypted
+     */
+    sequence<byte> convertWithCipherContext( [in] sequence< byte > aData )
+        raises( ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::lang::DisposedException );
+
+    //------------------------------------------------------------------------
+    /** finalizes cipher and disposes context.
+     */
+    sequence<byte> finalizeCipherContextAndDispose()
+        raises( ::com::sun::star::lang::DisposedException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl b/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl
new file mode 100644
index 000000000..115cf7b0e
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_xciphercontextsupplier_idl_
+#define __com_sun_star_xml_crypto_xciphercontextsupplier_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
+
+#ifndef __com_sun_star_xml_crypto_XCipherContext_idl__
+#include <com/sun/star/xml/crypto/XCipherContext.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+//============================================================================
+
+ module com {  module sun {  module star {  module xml { module crypto {
+
+//============================================================================
+/** This interface allows to get an object that allows to encrypt/decrypt data
+    using the specified algorithm.
+
+    @since OOo 3.4
+ */
+interface XCipherContextSupplier : com::sun::star::uno::XInterface
+{
+    //------------------------------------------------------------------------
+    /** returns an object that allows to encrypt/decrypt data.
+
+        @param nCipherID
+            the internal ID specifying the algorithm,
+            should take value from <type>CipherID</type>
+
+        @param aKey
+            the key that should be used for the encryption
+
+        @param aInitializationVector
+            the initialization vector that should be used for the encryption
+
+        @param bEncryption
+            whether an encryption or decryption cipher should be created
+            <TRUE/> - Encryption
+            <FALSE/> - Decryption
+
+        @param aParams
+            optional parameters that could be used to initialize the cipher,
+
+        @throws ::com::sun::star::lang::IllegalArgumentException
+            one of provided arguments is illegal
+     */
+
+    XCipherContext getCipherContext( [in] long nCipherID, [in] sequence< byte > aKey, [in] sequence< byte > aInitializationVector, [in] boolean bEncryption, [in] sequence< ::com::sun::star::beans::NamedValue > aParams )
+        raises( ::com::sun::star::lang::IllegalArgumentException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/xml/crypto/XDigestContext.idl b/offapi/com/sun/star/xml/crypto/XDigestContext.idl
new file mode 100644
index 000000000..f6218d9b6
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XDigestContext.idl
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_xdigestcontext_idl_
+#define __com_sun_star_xml_crypto_xdigestcontext_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_DisposedException_idl__
+#include <com/sun/star/lang/DisposedException.idl>
+#endif
+
+//============================================================================
+
+ module com {  module sun {  module star {  module xml { module crypto {
+
+//============================================================================
+/** This interface allows to generate the digest.
+    <p>
+    The algorithm to generate the digest is specified on object creation.
+    </p>
+
+    @see <type>XDigestContextSupplier</type>
+    @since OOo 3.4
+ */
+interface XDigestContext : com::sun::star::uno::XInterface
+{
+    //------------------------------------------------------------------------
+    /** update the digest with the given data.
+
+        @param aData
+            data that should be used to update the digest
+     */
+    void updateDigest( [in] sequence< byte > aData )
+        raises( ::com::sun::star::lang::DisposedException );
+
+    //------------------------------------------------------------------------
+    /** finalizes digest and disposes context.
+     */
+    sequence<byte> finalizeDigestAndDispose()
+        raises( ::com::sun::star::lang::DisposedException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl b/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl
new file mode 100644
index 000000000..f421d8ff9
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_xdigestcontextsupplier_idl_
+#define __com_sun_star_xml_crypto_xdigestcontextsupplier_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
+
+#ifndef __com_sun_star_xml_crypto_XDigestContext_idl__
+#include <com/sun/star/xml/crypto/XDigestContext.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+//============================================================================
+
+ module com {  module sun {  module star {  module xml { module crypto {
+
+//============================================================================
+/** This interface allows to get an object to generate a digest of a specified
+    format.
+
+    @since OOo 3.4
+ */
+interface XDigestContextSupplier : com::sun::star::uno::XInterface
+{
+    //------------------------------------------------------------------------
+    /** returns an object that allows to generate the specified digest.
+
+        @param nDigestID
+            the internal ID specifying the algorithm,
+            should take value from <type>DigestID</type>
+
+        @param aParams
+            optional parameters that could be used to initialize the digest,
+            for example, it could contain a key and etc.
+
+        @throws ::com::sun::star::lang::IllegalArgumentException
+            one of provided arguments is illegal
+     */
+    XDigestContext getDigestContext(
+                [in] long nDigestID,
+                [in] sequence< ::com::sun::star::beans::NamedValue > aParams )
+        raises( ::com::sun::star::lang::IllegalArgumentException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
index bc749dc09..83b9edf1c 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XXMLEncryption.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
index d7703b034..8123473ce 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_xml_crypto_XMLEncryptionException_idl__
 #define __com_sun_star_xml_crypto_XMLEncryptionException_idl__ 
  
-#ifndef __com_sun_star_security_EncryptionException_idl__
 #include <com/sun/star/security/EncryptionException.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
index bcb3fed1b..6c5a0b9bc 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
index abaa91fb6..1ecc1ae1a 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignature.idl b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
index 775d8f8d8..551ae4de0 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XXMLSignature.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
index 1abd32143..72e552b1e 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_xml_crypto_XMLSignatureException_idl__
 #define __com_sun_star_xml_crypto_XMLSignatureException_idl__ 
  
-#ifndef __com_sun_star_security_SignatureException_idl__
 #include <com/sun/star/security/SignatureException.idl> 
-#endif
 
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
index 6477a227a..110321bf2 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XSEInitializer.idl b/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
index 6069d50dc..bb0422148 100644
--- a/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,10 +24,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- 
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
 
 #ifndef __com_sun_star_xml_crypto_xseinitializer_idl_
 #define __com_sun_star_xml_crypto_xseinitializer_idl_
@@ -37,21 +33,22 @@
 
 module com { module sun { module star { module xml { module crypto {
 
-interface XXMLSecurityContext;
+published interface XXMLSecurityContext;
 
 /**
  * Interface to manipulate Security Environment
  */
-interface XSEInitializer : com::sun::star::uno::XInterface
+published interface XSEInitializer : com::sun::star::uno::XInterface
 {
     /**
-     * Creates a security context.
-     *
-     * @param certificateDatabase      the file or directory of the key materials
-     * @return            the security context created
+       Creates a security context.
+
+       @param aString
+            reserved for internal use.
+
+       @return            the security context created
      */
-    com::sun::star::xml::crypto::XXMLSecurityContext createSecurityContext(
-        [in] string certificateDatabase);
+    ::com::sun::star::xml::crypto::XXMLSecurityContext createSecurityContext( [in] string aString );
 
     /**
      * Frees a security context.
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index 6937f92a7..1e8575c00 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,11 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- 
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
 
 #ifndef __com_sun_star_xml_crypto_xsecurityenvironment_idl_
 #define __com_sun_star_xml_crypto_xsecurityenvironment_idl_
 
-#ifndef __com_sun_star_uno_SecurityException_idl__
-#include <com/sun/star/uno/SecurityException.idl> 
-#endif
-
+#include <com/sun/star/uno/SecurityException.idl>
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/security/XCertificate.idl>
@@ -47,7 +40,7 @@ module com { module sun { module star { module xml { module crypto {
 /**
  * Interface of Security Environment
  */
-interface XSecurityEnvironment : com::sun::star::uno::XInterface
+published interface XSecurityEnvironment : com::sun::star::uno::XInterface
 {
     /**
      * Get personal certificate from the environment
@@ -76,7 +69,7 @@ interface XSecurityEnvironment : com::sun::star::uno::XInterface
 
     /**
       Verify a certificate.
-     
+
       The method provides a way to verify a certificate.
       @param xEECertificate
           The certificate which is to be validated.
@@ -103,17 +96,17 @@ interface XSecurityEnvironment : com::sun::star::uno::XInterface
      * 1. Whether or not the certificate have a private key in the user profile.
      * 2. Whether or not the certificate is a trusted certificate.
      * 3. Whether or not the certificate is a self-signed certificate.
-     * 
+     *
      * The certificate characters is defined as bit-wise long, please refer to
      * CertificateCharacters definition.
      */
     long getCertificateCharacters( [in] com::sun::star::security::XCertificate xCertificate ) raises( com::sun::star::uno::SecurityException ) ;
-    
+
     /**
      * Get the Environment detail infos
      */
     string getSecurityEnvironmentInformation ( );
-    
+
 } ;
 
 } ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
index 7e3357c6e..bb3179948 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
@@ -35,13 +35,11 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/uno/SecurityException.idl>
-
 #include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
 #include <com/sun/star/xml/crypto/XMLEncryptionException.idl>
 
-
 module com { module sun { module star { module xml { module crypto {
 
 /**
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
index 692e5a6af..171145a28 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
@@ -34,7 +34,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
 #include <com/sun/star/xml/crypto/XXMLSecurityTemplate.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
index 772d975c4..a96057107 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,17 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- 
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
 
 #ifndef __com_sun_star_xml_crypto_xxmlsecuritycontext_idl_
 #define __com_sun_star_xml_crypto_xxmlsecuritycontext_idl_
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/security/SecurityInfrastructureException.idl>
-
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
 
 module com { module sun { module star { module xml { module crypto {
@@ -45,7 +40,7 @@ module com { module sun { module star { module xml { module crypto {
  * <p>This interface specifies a certain signature context. By signature
  * context, the signer or verifier retrieves key specification.</p>
  */
-interface XXMLSecurityContext : com::sun::star::uno::XInterface
+published interface XXMLSecurityContext : com::sun::star::uno::XInterface
 {
     /**
      * Add personal security environment , and return the index of the added environment.
@@ -73,7 +68,7 @@ interface XXMLSecurityContext : com::sun::star::uno::XInterface
      * Get the ID of the internal security environment
      */
     long getDefaultSecurityEnvironmentIndex( ) ;
-    
+
     /**
      * set the ID of the internal security environment
      */
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
index 1aef70e39..e4d58b5bd 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
@@ -34,7 +34,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
 #include <com/sun/star/xml/crypto/XUriBinding.idl>
 #include <com/sun/star/xml/crypto/SecurityOperationStatus.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
index 7e59f6adf..e5b69ade0 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
@@ -34,7 +34,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/SecurityException.idl>
-
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
 #include <com/sun/star/xml/crypto/XMLSignatureException.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
index eef95fda0..fdf903232 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
@@ -34,7 +34,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
 #include <com/sun/star/xml/crypto/XUriBinding.idl>
 #include <com/sun/star/xml/crypto/XXMLSecurityTemplate.idl>
diff --git a/offapi/com/sun/star/xml/crypto/makefile.mk b/offapi/com/sun/star/xml/crypto/makefile.mk
index 4aa3957ac..c03b2a76d 100644
--- a/offapi/com/sun/star/xml/crypto/makefile.mk
+++ b/offapi/com/sun/star/xml/crypto/makefile.mk
@@ -58,6 +58,12 @@ IDLFILES=\
     XMLSignatureException.idl     \
     XMLEncryptionException.idl     \
     XUriBinding.idl    \
+    CipherID.idl \
+    DigestID.idl \
+    XCipherContext.idl \
+    XCipherContextSupplier.idl \
+    XDigestContext.idl \
+    XDigestContextSupplier.idl \
     SecurityOperationStatus.idl
 
 # ------------------------------------------------------------------
diff --git a/sal/osl/os2/procimpl.h b/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl
index 3dd7e1e3d..f015e6692 100644
--- a/sal/osl/os2/procimpl.h
+++ b/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl
@@ -1,8 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,29 +25,24 @@
  *
  ************************************************************************/
 
-#ifndef _OSL_PROCIMPL_H_
-#define _OSL_PROCIMPL_H_
+//i20156 - new file for xmlsecurity module
 
+/** -- idl definition -- **/
 
-#include <osl/process.h>
+#ifndef __com_sun_star_xml_crypto_sax_constofsecurityid_idl_
+#define __com_sun_star_xml_crypto_sax_constofsecurityid_idl_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+module com { module sun { module star { module xml { module crypto { module sax {
 
-typedef struct _oslProcessImpl {
+/**
+ * Represents the undefined security id
+ */
+constants ConstOfSecurityId
+{
+    const long UNDEFINEDSECURITYID = -1;
+};
 
-    PID pProcess;
-    sal_uInt32 nSessionID;
-    sal_uInt32 nResultCode;
-    BOOL bResultCodeValid;
-} oslProcessImpl;
+} ; } ; } ; } ; } ; } ;
 
-#ifdef __cplusplus
-}
 #endif
 
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
index c6e3f4753..ebb07a3f5 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
@@ -34,10 +34,8 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include "XReferenceResolvedListener.idl"
 #include "XBlockerMonitor.idl"
 #include "XDecryptionResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
new file mode 100644
index 000000000..a6b725f47
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
@@ -0,0 +1,64 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_
+#define __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_
+
+module com { module sun { module star { module xml { module crypto { module sax {
+
+/**
+ * Defines priority for the element mark's notification.
+ * <p>
+ * The PRI_MINIMUM priority is a value less than any practical
+ * priority value, it is used when compare between different
+ * priority values.
+ * <p>
+ * The PRI_AFTERMODIFY priority represents the notification will be
+ * sent after any internal modification has finished.
+ * <p>
+ * The PRI_BEFOREMODIFY proirity represents the notification will be
+ * sent before any internal modification happens.
+ * <p>
+ * So an element mark with PRI_BEFOREMODIFY will be handled first,
+ * and one with PRI_AFTERMODIFY will be handled at last.
+ */
+enum ElementMarkPriority
+{
+    MINIMUM = 1,
+    AFTERMODIFY,
+    BEFOREMODIFY
+};
+
+} ; } ; } ; } ; } ; } ;
+
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
new file mode 100644
index 000000000..0dc048a05
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
@@ -0,0 +1,53 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_xml_crypto_sax_elementmarktype_idl_
+#define __com_sun_star_xml_crypto_sax_elementmarktype_idl_
+
+module com { module sun { module star { module xml { module crypto { module sax {
+
+/**
+ * Defines types of element mark.
+ * <p>
+ * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
+ * type represents a element collector.
+ */
+enum ElementMarkType
+{
+    ELEMENTMARK = 1,
+    ELEMENTCOLLECTOR
+};
+
+
+} ; } ; } ; } ; } ; } ;
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl b/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl
new file mode 100644
index 000000000..00d710a40
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl
@@ -0,0 +1,64 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_xml_crypto_sax_xelementstackitem_idl_
+#define __com_sun_star_xml_crypto_sax_xelementstackitem_idl_
+
+#include <com/sun/star/xml/sax/XDocumentHandler.idl>
+
+module com { module sun { module star { module xml { module crypto { module sax {
+
+/**
+ * A struct to keep a startElement/endElement SAX event.
+ */
+struct ElementStackItem
+{
+    /**
+     * whether it is a startElement event
+     */
+    boolean isStartElementEvent;
+
+    /**
+     * the name of the element
+     */
+    string elementName;
+
+    /**
+     * attribute list for a startElement event
+     */
+    com::sun::star::xml::sax::XAttributeList xAttributes;
+};
+
+} ; } ; } ; } ; } ; } ;
+
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
index 55dd81d53..70e9c1fe0 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
@@ -34,10 +34,8 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include "XReferenceResolvedListener.idl"
 #include "XReferenceCollector.idl"
 #include "XBlockerMonitor.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
index 167ae0efa..475065719 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
@@ -34,11 +34,9 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include "XSecuritySAXEventKeeper.idl"
 #include "XReferenceResolvedBroadcaster.idl"
 #include "XSAXEventKeeperStatusChangeBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
index b55b11fba..2f302830a 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
@@ -35,9 +35,7 @@
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include <com/sun/star/xml/crypto/XUriBinding.idl>
-
 #include "XReferenceResolvedListener.idl"
 #include "XReferenceCollector.idl"
 #include "XSignatureCreationResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
index 3493d9bad..6ea35087a 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
@@ -36,9 +36,7 @@
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include <com/sun/star/xml/crypto/XUriBinding.idl>
-
 #include "XReferenceResolvedListener.idl"
 #include "XReferenceCollector.idl"
 #include "XSignatureVerifyResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
index 654a1b9e7..f3463bf70 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
@@ -35,31 +35,11 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#include <com/sun/star/xml/crypto/sax/ElementStackItem.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
 /**
- * A struct to keep a startElement/endElement SAX event.
- */
-struct ElementStackItem
-{
-    /**
-     * whether it is a startElement event
-     */
-    boolean isStartElementEvent;
-    
-    /**
-     * the name of the element
-     */
-    string elementName;
-    
-    /**
-     * attribute list for a startElement event
-     */
-    com::sun::star::xml::sax::XAttributeList xAttributes;
-}; 
-
-/**
  * Manipulate the "key SAX events" in a SAX event stream.
  *
  * @see   XSecurityController
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
index e4b059292..380da18e4 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
@@ -35,7 +35,6 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
index fd27b0dd4..25d99b2ff 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
@@ -35,53 +35,13 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl>
+#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkType.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
 /**
- * Represents the undefined security id
- */
-constants ConstOfSecurityId
-{
-    const long UNDEFINEDSECURITYID = -1;
-};
-
-/**
- * Defines priority for the element mark's notification.
- * <p>
- * The PRI_MINIMUM priority is a value less than any practical
- * priority value, it is used when compare between different
- * priority values.
- * <p>
- * The PRI_AFTERMODIFY priority represents the notification will be 
- * sent after any internal modification has finished.
- * <p>
- * The PRI_BEFOREMODIFY priority represents the notification will be
- * sent before any internal modification happens.
- * <p>
- * So an element mark with PRI_BEFOREMODIFY will be handled first,
- * and one with PRI_AFTERMODIFY will be handled at last.
- */
-enum ElementMarkPriority
-{
-    MINIMUM = 1,
-    AFTERMODIFY,
-    BEFOREMODIFY
-};
-
-/**
- * Defines types of element mark.
- * <p>
- * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
- * type represents a element collector.
- */
-enum ElementMarkType
-{
-    ELEMENTMARK = 1,
-    ELEMENTCOLLECTOR
-};
-
-/**
  * Interface of Security SAX Event Keeper.
  * <p>
  * This interface is an extension of the XSAXEventKeeper interface,
diff --git a/offapi/com/sun/star/xml/crypto/sax/makefile.mk b/offapi/com/sun/star/xml/crypto/sax/makefile.mk
deleted file mode 100644
index a95aef560..000000000
--- a/offapi/com/sun/star/xml/crypto/sax/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#i20156 - new file for xmlsecurity module
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=xsec-sax
-PACKAGE=com$/sun$/star$/xml$/crypto$/sax
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XSecurityController.idl       \
-    XElementStackKeeper.idl       \
-    XSAXEventKeeper.idl        \
-    XSecuritySAXEventKeeper.idl        \
-    XSAXEventKeeperStatusChangeBroadcaster.idl        \
-    XSAXEventKeeperStatusChangeListener.idl        \
-    XKeyCollector.idl        \
-    XReferenceCollector.idl        \
-    XBlockerMonitor.idl        \
-    XMissionTaker.idl        \
-    XEncryptionResultBroadcaster.idl        \
-    XEncryptionResultListener.idl        \
-    XDecryptionResultBroadcaster.idl        \
-    XDecryptionResultListener.idl        \
-    XSignatureCreationResultBroadcaster.idl        \
-    XSignatureCreationResultListener.idl        \
-    XSignatureVerifyResultBroadcaster.idl        \
-    XSignatureVerifyResultListener.idl        \
-    XReferenceResolvedBroadcaster.idl        \
-    XReferenceResolvedListener.idl        \
-    SignatureCreator.idl        \
-    SignatureVerifier.idl        \
-    Decryptor.idl        \
-    Encryptor.idl        \
-    SAXEventKeeper.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
index 3f422bd04..6ba80c954 100644
--- a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
@@ -32,27 +32,12 @@
 
 #include <com/sun/star/uno/XInterface.idl> 
 #include <com/sun/star/xml/sax/SAXException.idl> 
+#include <com/sun/star/xml/csax/XMLAttribute.idl>
  
  
 module com { module sun { module star { module xml { module csax {
 
 /**
- * A struct to keep information of an element's attribute.
- */
-struct XMLAttribute
-{
-    /**
-     * the attribute name
-     */
-    string sName;
-    
-    /**
-     * the attribute value
-     */
-    string sValue;
-}; 
-
-/**
  * A compressed XDocumentHandler interface.
  * <p>
  * All methods in this interface have the same function with methods
diff --git a/offapi/com/sun/star/xml/csax/XMLAttribute.idl b/offapi/com/sun/star/xml/csax/XMLAttribute.idl
new file mode 100644
index 000000000..a302a30c4
--- /dev/null
+++ b/offapi/com/sun/star/xml/csax/XMLAttribute.idl
@@ -0,0 +1,53 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+//i20156 - new file for xmlsecurity module
+
+#ifndef __com_sun_star_xml_csax_XMLAttribute_idl__
+#define __com_sun_star_xml_csax_XMLAttribute_idl__
+
+module com { module sun { module star { module xml { module csax {
+
+/**
+ * A struct to keep information of an element's attribute.
+ */
+struct XMLAttribute
+{
+    /**
+     * the attribute name
+     */
+    string sName;
+
+    /**
+     * the attribute value
+     */
+    string sValue;
+};
+
+} ; } ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/xml/csax/makefile.mk b/offapi/com/sun/star/xml/csax/makefile.mk
deleted file mode 100644
index 8f41b5426..000000000
--- a/offapi/com/sun/star/xml/csax/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#i20156 - new file for xmlsecurity module
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=xsec-csax
-PACKAGE=com$/sun$/star$/xml$/csax
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XCompressedDocumentHandler.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/dom/DOMException.idl b/offapi/com/sun/star/xml/dom/DOMException.idl
index 62b8cadba..4d44417e7 100644
--- a/offapi/com/sun/star/xml/dom/DOMException.idl
+++ b/offapi/com/sun/star/xml/dom/DOMException.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xml_dom_DOMException_idl__ 
 #define __com_sun_star_xml_dom_DOMException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
-#ifndef __com_sun_star_xml_dom_DOMExceptionType_idl__
 #include <com/sun/star/xml/dom/DOMExceptionType.idl>
-#endif
  
 module com {  module sun {  module star {  module xml {  module dom {  
  
diff --git a/offapi/com/sun/star/xml/dom/DocumentBuilder.idl b/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
index 0804dc6df..d280f0183 100644
--- a/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
@@ -1,8 +1,6 @@
 #ifndef __com_sun_star_xml_dom_documentbuilder_idl
 #define __com_sun_star_xml_dom_documentbuilder_idl
-#ifndef __com_sun_star_xml_dom_xdocumentbuilder_idl
 #include <com/sun/star/xml/dom/XDocumentBuilder.idl>
-#endif
 module com {  module sun {  module star {  module xml { module dom {
 
     service DocumentBuilder
diff --git a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
index 4c9dffd36..c530d479e 100644
--- a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
@@ -1,11 +1,7 @@
 #ifndef __com_sun_star_xml_dom_documentbuilder_idl
 #define __com_sun_star_xml_dom_documentbuilder_idl
-#ifndef __com_sun_star_xml_sax_xdocumenthandler_idl
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl
 #include <com/sun/star/xml/dom/XSAXDocumentBuilder.idl>
-#endif
 
 module com {  module sun {  module star {  module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XAttr.idl b/offapi/com/sun/star/xml/dom/XAttr.idl
index e0be5e1e4..d1e8e5aba 100644
--- a/offapi/com/sun/star/xml/dom/XAttr.idl
+++ b/offapi/com/sun/star/xml/dom/XAttr.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XAttr_idl__ 
 #define __com_sun_star_xml_sax_XAttr_idl__ 
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XCDATASection.idl b/offapi/com/sun/star/xml/dom/XCDATASection.idl
index 10b2d0807..84f69c1e8 100644
--- a/offapi/com/sun/star/xml/dom/XCDATASection.idl
+++ b/offapi/com/sun/star/xml/dom/XCDATASection.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XCDATASection_idl__ 
 #define __com_sun_star_xml_dom_XCDATASection_idl__
 
-#ifndef __com_sun_star_xml_dom_XText_idl__ 
 #include <com/sun/star/xml/dom/XText.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XCharacterData.idl b/offapi/com/sun/star/xml/dom/XCharacterData.idl
index dd7100c93..b36c7d627 100644
--- a/offapi/com/sun/star/xml/dom/XCharacterData.idl
+++ b/offapi/com/sun/star/xml/dom/XCharacterData.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XCharacterData_idl__
 #define __com_sun_star_xml_dom_XCharacterData_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XComment.idl b/offapi/com/sun/star/xml/dom/XComment.idl
index 418dfe510..ab8432104 100644
--- a/offapi/com/sun/star/xml/dom/XComment.idl
+++ b/offapi/com/sun/star/xml/dom/XComment.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XComment_idl__
 #define __com_sun_star_xml_dom_XCComment_idl__
 
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__ 
 #include <com/sun/star/xml/dom/XCharacterData.idl> 
-#endif
 
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
index 0f00082e2..4f42acbbf 100644
--- a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
+++ b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
 #define __com_sun_star_xml_dom_XDOMImplementation_idl__
 
-#ifndef __com_sun_star_uno__XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
 #include <com/sun/star/xml/dom/DOMException.idl>
-#endif
 
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocument.idl b/offapi/com/sun/star/xml/dom/XDocument.idl
index 3a0ee7374..854e37c8a 100644
--- a/offapi/com/sun/star/xml/dom/XDocument.idl
+++ b/offapi/com/sun/star/xml/dom/XDocument.idl
@@ -28,33 +28,15 @@
 #ifndef __com_sun_star_xml_dom_XDocument_idl__
 #define __com_sun_star_xml_dom_XDocument_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__ 
 #include <com/sun/star/xml/dom/XAttr.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XCDATASection_idl__ 
 #include <com/sun/star/xml/dom/XCDATASection.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XComment_idl__ 
 #include <com/sun/star/xml/dom/XComment.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragemnt_idl__ 
 #include <com/sun/star/xml/dom/XDocumentFragment.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XEntityReference_idl__ 
 #include <com/sun/star/xml/dom/XEntityReference.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__ 
 #include <com/sun/star/xml/dom/XProcessingInstruction.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentType_idl__ 
 #include <com/sun/star/xml/dom/XDocumentType.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__ 
 #include <com/sun/star/xml/dom/XDOMImplementation.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
index 68de037b6..b959f1da8 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
@@ -28,35 +28,16 @@
 #ifndef __com_sun_star_xml_dom_XDocumentBuilder_idl__
 #define __com_sun_star_xml_dom_XDocumentBuilder_idl__
 
-#ifndef __com_sun_star_uno__XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__ 
 #include <com/sun/star/xml/dom/XDocumentType.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__ 
 #include <com/sun/star/xml/dom/XDOMImplementation.idl> 
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__ 
 #include <com/sun/star/io/XInputStream.idl> 
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #include <com/sun/star/xml/sax/SAXException.idl> 
-#endif 
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__ 
 #include <com/sun/star/xml/sax/XErrorHandler.idl> 
-#endif 
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__ 
 #include <com/sun/star/xml/sax/XEntityResolver.idl> 
-#endif 
 
 
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
index 3a80bf98e..0fadf2d82 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
 #define __com_sun_star_xml_dom_XDocumentFragment_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XDocumentType.idl b/offapi/com/sun/star/xml/dom/XDocumentType.idl
index 6cbf97e59..bbd0eee18 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentType.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentType.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XDocumentType_idl__
 #define __com_sun_star_xml_dom_XDocumentType_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__ 
 #include <com/sun/star/xml/dom/XNamedNodeMap.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XElement.idl b/offapi/com/sun/star/xml/dom/XElement.idl
index c1d5b0e5d..b0086a813 100644
--- a/offapi/com/sun/star/xml/dom/XElement.idl
+++ b/offapi/com/sun/star/xml/dom/XElement.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XElement_idl__
 #define __com_sun_star_xml_dom_XElement_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__ 
 #include <com/sun/star/xml/dom/XAttr.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XEntity.idl b/offapi/com/sun/star/xml/dom/XEntity.idl
index 366971592..90a4a7b67 100644
--- a/offapi/com/sun/star/xml/dom/XEntity.idl
+++ b/offapi/com/sun/star/xml/dom/XEntity.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XEntety_idl__
 #define __com_sun_star_xml_dom_XEntety_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XEntityReference.idl b/offapi/com/sun/star/xml/dom/XEntityReference.idl
index f4b1871fa..69572fd5d 100644
--- a/offapi/com/sun/star/xml/dom/XEntityReference.idl
+++ b/offapi/com/sun/star/xml/dom/XEntityReference.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XEntetyReference_idl__
 #define __com_sun_star_xml_dom_XEntetyReference_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
index bc968d5b9..348550939 100644
--- a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
+++ b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
 #define __com_sun_star_xml_dom_XNamedNodeMap_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
 #include <com/sun/star/xml/dom/DOMException.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XNode.idl b/offapi/com/sun/star/xml/dom/XNode.idl
index 8dbe2bc4b..8f78adcea 100644
--- a/offapi/com/sun/star/xml/dom/XNode.idl
+++ b/offapi/com/sun/star/xml/dom/XNode.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_xml_dom_XNode_idl__
 #define __com_sun_star_xml_dom_XNode_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_NodeType_idl__ 
 #include <com/sun/star/xml/dom/NodeType.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__ 
 #include <com/sun/star/xml/dom/XNodeList.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__ 
 #include <com/sun/star/xml/dom/XNamedNodeMap.idl> 
-#endif
 
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNodeList.idl b/offapi/com/sun/star/xml/dom/XNodeList.idl
index 95596ace8..7061d7bb6 100644
--- a/offapi/com/sun/star/xml/dom/XNodeList.idl
+++ b/offapi/com/sun/star/xml/dom/XNodeList.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XNodeList_idl__
 #define __com_sun_star_xml_dom_XNodeList_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
 
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNotation.idl b/offapi/com/sun/star/xml/dom/XNotation.idl
index d3b38e6a9..05d400b48 100644
--- a/offapi/com/sun/star/xml/dom/XNotation.idl
+++ b/offapi/com/sun/star/xml/dom/XNotation.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XNotation_idl__
 #define __com_sun_star_xml_dom_XNotation_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
index 39f320b7b..1d250d22c 100644
--- a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
+++ b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
 #define __com_sun_star_xml_dom_XProcessingInstruction_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
index ee3ad62db..98eef5684 100644
--- a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
@@ -28,19 +28,10 @@
 #ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
 #define __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
 
-#ifndef __com_sun_star_uno__XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__ 
 #include <com/sun/star/xml/dom/XDocument.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__ 
 #include <com/sun/star/xml/dom/XDocumentFragment.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_SAXDocumentBuilderState_idl__ 
 #include <com/sun/star/xml/dom/SAXDocumentBuilderState.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XText.idl b/offapi/com/sun/star/xml/dom/XText.idl
index 296a22325..8ecf859ea 100644
--- a/offapi/com/sun/star/xml/dom/XText.idl
+++ b/offapi/com/sun/star/xml/dom/XText.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XText_idl__
 #define __com_sun_star_xml_dom_XText_idl__
 
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__ 
 #include <com/sun/star/xml/dom/XCharacterData.idl> 
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/events/EventException.idl b/offapi/com/sun/star/xml/dom/events/EventException.idl
index 4cdbae544..3e5ede5f5 100644
--- a/offapi/com/sun/star/xml/dom/events/EventException.idl
+++ b/offapi/com/sun/star/xml/dom/events/EventException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_dom_events_EventException_idl__
 #define __com_sun_star_xml_dom_events_EventException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom { module events {  
 
diff --git a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
index a6a08f1f1..3814abb65 100644
--- a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
@@ -32,7 +32,6 @@
 #include <com/sun/star/xml/dom/events/XEvent.idl>
 #include <com/sun/star/xml/dom/events/XEventTarget.idl>
 #include <com/sun/star/xml/dom/events/XEventListener.idl>
-
 #include <com/sun/star/xml/dom/XNode.idl>
 
 module com { module sun { module star { module xml { module dom { module events {  
diff --git a/offapi/com/sun/star/xml/dom/events/makefile.mk b/offapi/com/sun/star/xml/dom/events/makefile.mk
deleted file mode 100644
index b03cf793c..000000000
--- a/offapi/com/sun/star/xml/dom/events/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdomevents
-PACKAGE=com$/sun$/star$/xml$/dom$/events
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AttrChangeType.idl \
-    EventException.idl \
-    EventType.idl \
-    PhaseType.idl \
-    XDocumentEvent.idl \
-    XEvent.idl \
-    XEventListener.idl \
-    XEventTarget.idl \
-    XMouseEvent.idl \
-    XMutationEvent.idl \
-    XUIEvent.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-
-
-
-
diff --git a/offapi/com/sun/star/xml/dom/makefile.mk b/offapi/com/sun/star/xml/dom/makefile.mk
deleted file mode 100644
index 3468e2685..000000000
--- a/offapi/com/sun/star/xml/dom/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdom
-PACKAGE=com$/sun$/star$/xml$/dom
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    DOMException.idl \
-    DOMExceptionType.idl \
-    NodeType.idl \
-    XNode.idl \
-    XAttr.idl \
-    XCharacterData.idl \
-    XText.idl \
-    XCDATASection.idl \
-    XComment.idl \
-    XDOMImplementation.idl \
-    XDocument.idl \
-    XDocumentBuilder.idl \
-    XDocumentFragment.idl \
-    XDocumentType.idl \
-    XElement.idl \
-    XEntity.idl \
-    XEntityReference.idl \
-    XNamedNodeMap.idl \
-    XNodeList.idl \
-    XNotation.idl \
-    XProcessingInstruction.idl \
-    SAXDocumentBuilder.idl \
-    XSAXDocumentBuilder.idl \
-    SAXDocumentBuilderState.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-
-
-
-
diff --git a/offapi/com/sun/star/xml/dom/views/makefile.mk b/offapi/com/sun/star/xml/dom/views/makefile.mk
deleted file mode 100644
index 77f45f004..000000000
--- a/offapi/com/sun/star/xml/dom/views/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdomviews
-PACKAGE=com$/sun$/star$/xml$/dom$/views
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XAbstractView.idl \
-    XDocumentView.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-
-
-
-
diff --git a/offapi/com/sun/star/xml/input/makefile.mk b/offapi/com/sun/star/xml/input/makefile.mk
deleted file mode 100644
index d0f7b0aa2..000000000
--- a/offapi/com/sun/star/xml/input/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET = cssxmlinput
-PACKAGE = com$/sun$/star$/xml$/input
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------
-
-IDLFILES = \
-        XRoot.idl                               \
-        XElement.idl                            \
-        XAttributes.idl                         \
-        XNamespaceMapping.idl                   \
-        SaxDocumentHandler.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/makefile.mk b/offapi/com/sun/star/xml/makefile.mk
deleted file mode 100644
index 4aa46f6c4..000000000
--- a/offapi/com/sun/star/xml/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssxml
-PACKAGE=com$/sun$/star$/xml
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AttributeContainer.idl \
-    AttributeData.idl \
-    Attribute.idl \
-    ExportFilter.idl \
-    FastAttribute.idl \
-    ImportFilter.idl \
-    NamespaceContainer.idl \
-    ParaUserDefinedAttributesSupplier.idl \
-    TextUserDefinedAttributesSupplier.idl \
-    UserDefinedAttributesSupplier.idl \
-    UserDefinedAttributeSupplier.idl \
-    XExportFilter.idl \
-    XImportFilter.idl \
-    XMLExportFilter.idl \
-    XMLImportFilter.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
index 81ccb762b..38480c19f 100644
--- a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_FastShapeContextHandler_idl__
 #define __com_sun_star_xml_sax_FastShapeContextHandler_idl__
 
-#ifndef __com_sun_star_xml_sax_XFastShapeContextHandler_idl__
 #include <com/sun/star/xml/sax/XFastShapeContextHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/sax/FastToken.idl b/offapi/com/sun/star/xml/sax/FastToken.idl
index 6d0bbbfef..d9d3cca70 100644
--- a/offapi/com/sun/star/xml/sax/FastToken.idl
+++ b/offapi/com/sun/star/xml/sax/FastToken.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_XFastToken_idl__ 
 #define __com_sun_star_xml_sax_XFastToken_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/xml/sax/InputSource.idl b/offapi/com/sun/star/xml/sax/InputSource.idl
index ae3379e54..699e1b42d 100644
--- a/offapi/com/sun/star/xml/sax/InputSource.idl
+++ b/offapi/com/sun/star/xml/sax/InputSource.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_InputSource_idl__ 
 #define __com_sun_star_xml_sax_InputSource_idl__ 
  
-#ifndef __com_sun_star_io_XInputStream_idl__ 
 #include <com/sun/star/io/XInputStream.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/SAXException.idl b/offapi/com/sun/star/xml/sax/SAXException.idl
index 0fcda1c1b..2009854a1 100644
--- a/offapi/com/sun/star/xml/sax/SAXException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #define __com_sun_star_xml_sax_SAXException_idl__ 
  
-#ifndef __com_sun_star_uno_Exception_idl__ 
 #include <com/sun/star/uno/Exception.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
index e8eebe5c8..7dbe27263 100644
--- a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_SAXInvalidCharacterException_idl__
 #define __com_sun_star_xml_sax_SAXInvalidCharacterException_idl__
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/SAXParseException.idl b/offapi/com/sun/star/xml/sax/SAXParseException.idl
index 9634c0674..32db43a38 100644
--- a/offapi/com/sun/star/xml/sax/SAXParseException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXParseException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_SAXParseException_idl__ 
 #define __com_sun_star_xml_sax_SAXParseException_idl__ 
  
-#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #include <com/sun/star/xml/sax/SAXException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XAttributeList.idl b/offapi/com/sun/star/xml/sax/XAttributeList.idl
index a299ba425..d8b4a12d0 100644
--- a/offapi/com/sun/star/xml/sax/XAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XAttributeList.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_XAttributeList_idl__ 
 #define __com_sun_star_xml_sax_XAttributeList_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/xml/sax/XDTDHandler.idl b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
index 4c0977011..1095f35f9 100644
--- a/offapi/com/sun/star/xml/sax/XDTDHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_XDTDHandler_idl__ 
 #define __com_sun_star_xml_sax_XDTDHandler_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
index 1f3301241..fc2935e91 100644
--- a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
 #define __com_sun_star_xml_sax_XDocumentHandler_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #include <com/sun/star/xml/sax/SAXException.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XAttributeList_idl__ 
 #include <com/sun/star/xml/sax/XAttributeList.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XLocator_idl__ 
 #include <com/sun/star/xml/sax/XLocator.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XEntityResolver.idl b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
index d0210ac21..0282c62c6 100644
--- a/offapi/com/sun/star/xml/sax/XEntityResolver.idl
+++ b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_xml_sax_XEntityResolver_idl__ 
 #define __com_sun_star_xml_sax_XEntityResolver_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_InputSource_idl__ 
 #include <com/sun/star/xml/sax/InputSource.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XErrorHandler.idl b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
index 6f9879a59..a42b477c5 100644
--- a/offapi/com/sun/star/xml/sax/XErrorHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_xml_sax_XErrorHandler_idl__ 
 #define __com_sun_star_xml_sax_XErrorHandler_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #include <com/sun/star/xml/sax/SAXException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
index 86c78b298..71f43fbef 100644
--- a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__ 
 #define __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__ 
  
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XDocumentHandler.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #include <com/sun/star/xml/sax/SAXException.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
index 99f0aa163..bb35dbffa 100644
--- a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__ 
 #define __com_sun_star_xml_sax_XFastAttributeList_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
-
-#ifndef __com_sun_star_xml_Attribute_idl__
 #include <com/sun/star/xml/Attribute.idl>
-#endif
-
-#ifndef __com_sun_star_xml_FastAttribute_idl__
 #include <com/sun/star/xml/FastAttribute.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
index 0094cb6bc..66fed94f0 100644
--- a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__ 
 #define __com_sun_star_xml_sax_XFastContextHandler_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #include <com/sun/star/xml/sax/SAXException.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__ 
 #include <com/sun/star/xml/sax/XFastAttributeList.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XLocator_idl__ 
 #include <com/sun/star/xml/sax/XLocator.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
index fd3e89c35..4ae10c03b 100644
--- a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
@@ -27,25 +27,13 @@
 #ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__ 
 #define __com_sun_star_xml_sax_XFastDocumentHandler_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #include <com/sun/star/xml/sax/SAXException.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__ 
 #include <com/sun/star/xml/sax/XFastAttributeList.idl> 
-#endif 
-
-#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__ 
 #include <com/sun/star/xml/sax/XFastContextHandler.idl> 
-#endif 
-
-#ifndef __com_sun_star_xml_sax_XLocator_idl__ 
 #include <com/sun/star/xml/sax/XLocator.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XFastParser.idl b/offapi/com/sun/star/xml/sax/XFastParser.idl
index 3a16d65fe..fb533abb1 100644
--- a/offapi/com/sun/star/xml/sax/XFastParser.idl
+++ b/offapi/com/sun/star/xml/sax/XFastParser.idl
@@ -27,49 +27,25 @@
 #ifndef __com_sun_star_xml_sax_XFastParser_idl__ 
 #define __com_sun_star_xml_sax_XFastParser_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_InputSource_idl__ 
 #include <com/sun/star/xml/sax/InputSource.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #include <com/sun/star/xml/sax/SAXException.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XFastDocumentHandler.idl> 
-#endif 
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__ 
 #include <com/sun/star/xml/sax/XFastTokenHandler.idl> 
-#endif 
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__ 
 #include <com/sun/star/xml/sax/XErrorHandler.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__ 
 #include <com/sun/star/xml/sax/XDTDHandler.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__ 
 #include <com/sun/star/xml/sax/XEntityResolver.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif 
  
 //============================================================================= 
  
@@ -186,7 +162,12 @@ interface XFastParser: com::sun::star::uno::XInterface
         <p>Set the language of the error messages. Useful when the parsing 
         errors will be presented to the user.</p>
      */
-    void setLocale( [in] com::sun::star::lang::Locale locale ); 
+    void setLocale( [in] com::sun::star::lang::Locale locale );
+
+    /** Gets the namespace url string.
+      */
+    string getNamespaceURL( [in] string prefix )
+        raises( com::sun::star::lang::IllegalArgumentException );
 }; 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
index c79d5e893..a0f505f40 100644
--- a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_xml_sax_XFastSAXSerializable_idl__
 #define __com_sun_star_xml_sax_XFastSAXSerializable_idl__
 
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__ 
 #include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__ 
 #include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Pair_idl__ 
 #include <com/sun/star/beans/Pair.idl>
-#endif
 
 module com { module sun { module star { module xml { module sax {
 
diff --git a/offapi/com/sun/star/xml/sax/XFastSerializer.idl b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
index a0fe7e64c..5c59c13ab 100644
--- a/offapi/com/sun/star/xml/sax/XFastSerializer.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
@@ -27,26 +27,11 @@
 #ifndef __com_sun_star_xml_sax_XFastSerializer_idl__ 
 #define __com_sun_star_xml_sax_XFastSerializer_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
- 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #include <com/sun/star/xml/sax/SAXException.idl> 
-#endif 
- 
-#ifndef __com_sun_star_xml_sax_XFastDocumentHanlder_idl__ 
 #include <com/sun/star/xml/sax/XFastDocumentHandler.idl> 
-#endif 
- 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__ 
 #include <com/sun/star/xml/sax/XFastTokenHandler.idl> 
-#endif 
-
  
 //============================================================================= 
  
diff --git a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
index b7a0e8f83..6e320f22e 100644
--- a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
 #define __com_sun_star_xml_sax_XFastTokenHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/sax/XLocator.idl b/offapi/com/sun/star/xml/sax/XLocator.idl
index 0bc74e766..95f0731c4 100644
--- a/offapi/com/sun/star/xml/sax/XLocator.idl
+++ b/offapi/com/sun/star/xml/sax/XLocator.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_XLocator_idl__ 
 #define __com_sun_star_xml_sax_XLocator_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XParser.idl b/offapi/com/sun/star/xml/sax/XParser.idl
index a1d104e81..119164b0a 100644
--- a/offapi/com/sun/star/xml/sax/XParser.idl
+++ b/offapi/com/sun/star/xml/sax/XParser.idl
@@ -27,41 +27,23 @@
 #ifndef __com_sun_star_xml_sax_XParser_idl__ 
 #define __com_sun_star_xml_sax_XParser_idl__ 
  
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_InputSource_idl__ 
 #include <com/sun/star/xml/sax/InputSource.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
 #include <com/sun/star/xml/sax/SAXException.idl> 
-#endif 
  
-#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XDocumentHandler.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__ 
 #include <com/sun/star/xml/sax/XErrorHandler.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__ 
 #include <com/sun/star/xml/sax/XDTDHandler.idl> 
-#endif 
  
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__ 
 #include <com/sun/star/xml/sax/XEntityResolver.idl> 
-#endif 
  
-#ifndef __com_sun_star_lang_Locale_idl__ 
 #include <com/sun/star/lang/Locale.idl> 
-#endif 
  
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
index e0dffb3a9..472fffe76 100644
--- a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_xml_sax_XSAXSerializable_idl__
 #define __com_sun_star_xml_sax_XSAXSerializable_idl__
 
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__ 
 #include <com/sun/star/beans/StringPair.idl>
-#endif
 
 module com { module sun { module star { module xml { module sax {
 
diff --git a/offapi/com/sun/star/xml/sax/makefile.mk b/offapi/com/sun/star/xml/sax/makefile.mk
deleted file mode 100644
index 812d92cc9..000000000
--- a/offapi/com/sun/star/xml/sax/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssax
-PACKAGE=com$/sun$/star$/xml$/sax
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    InputSource.idl\
-    SAXException.idl\
-    SAXInvalidCharacterException.idl\
-    SAXParseException.idl\
-    XAttributeList.idl\
-    XDocumentHandler.idl\
-    XDTDHandler.idl\
-    XEntityResolver.idl\
-    XErrorHandler.idl\
-    XExtendedDocumentHandler.idl\
-    XLocator.idl\
-    XParser.idl\
-    XSAXSerializable.idl\
-    XFastParser.idl\
-    XFastDocumentHandler.idl\
-    XFastContextHandler.idl\
-    XFastSAXSerializable.idl\
-    XFastSerializer.idl\
-    XFastShapeContextHandler.idl\
-    XFastTokenHandler.idl\
-    XFastAttributeList.idl\
-    FastToken.idl \
-    FastShapeContextHandler.idl \
-    FastTokenHandler.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
index 543a75aeb..b3e146d12 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
index 61d0de996..b1fe82cd3 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
-
 #include <com/sun/star/lang/XUnoTunnel.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/wrapper/makefile.mk b/offapi/com/sun/star/xml/wrapper/makefile.mk
deleted file mode 100644
index e3690cd38..000000000
--- a/offapi/com/sun/star/xml/wrapper/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#i20156 - new file for xmlsecurity module
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=xsec-wrapper
-PACKAGE=com$/sun$/star$/xml$/wrapper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XMLElementWrapper.idl          \
-    XMLDocumentWrapper.idl          \
-    XXMLElementWrapper.idl          \
-    XXMLDocumentWrapper.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/xpath/XPathAPI.idl b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
index 67d771b3e..99842d954 100644
--- a/offapi/com/sun/star/xml/xpath/XPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
@@ -1,8 +1,6 @@
 #ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
 #define __com_sun_star_xml_xpath_XPathExtension_idl__
-#ifndef __com_sun_star_xml_xpath_XXPathAPI_idl
 #include <com/sun/star/xml/xpath/XXPathAPI.idl>
-#endif
 module com {  module sun {  module star {  module xml { module xpath {
 
     service XPathExtension
diff --git a/offapi/com/sun/star/xml/xpath/XPathException.idl b/offapi/com/sun/star/xml/xpath/XPathException.idl
index 9e9499370..d0a7b7bc2 100644
--- a/offapi/com/sun/star/xml/xpath/XPathException.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_XPath_XPathException_idl__
 #define __com_sun_star_xml_XPath_XPathException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XPathExtension.idl b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
index d286cc0a8..e5c827b84 100644
--- a/offapi/com/sun/star/xml/xpath/XPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
@@ -1,8 +1,6 @@
 #ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
 #define __com_sun_star_xml_xpath_XPathExtension_idl__
-#ifndef __com_sun_star_xml_xpath_XXPathExtension_idl
 #include <com/sun/star/xml/xpath/XXPathExtension.idl>
-#endif
 module com {  module sun {  module star {  module xml { module xpath {
 
     service XPathExtension
diff --git a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
index ee4e18e82..feda93bb7 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_xml_XPath_XXPathAPI_idl__
 #define __com_sun_star_xml_XPath_XXPathAPI_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
 #include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_xpath_XXPathObject_idl__
 #include <com/sun/star/xml/xpath/XXPathObject.idl>
-#endif
-#ifndef __com_sun_star_xml_xpath_XXPathExtension_idl__
 #include <com/sun/star/xml/xpath/XXPathExtension.idl>
-#endif
-#ifndef __com_sun_star_xml_XPath_XPathException_idl__
 #include <com/sun/star/xml/xpath/XPathException.idl>
-#endif
 
 
 module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
index b6c8bca35..e79cd54e1 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
@@ -27,12 +27,8 @@
 
 #ifndef __com_sun_star_xml_XPath_XXPathExtension_idl__
 #define __com_sun_star_xml_XPath_XXPathExtension_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com__sun_star_xml_xpath_Libxml2ExtensionHandle_idl__
 #include <com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl>
-#endif
  
 module com { module sun { module star { module xml { module xpath {
 
diff --git a/offapi/com/sun/star/xml/xpath/XXPathObject.idl b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
index 479f8c59f..8a9b54eee 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathObject.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_xml_XPath_XXPathObject_idl__
 #define __com_sun_star_xml_XPath_XXPathObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__ 
 #include <com/sun/star/xml/dom/XNode.idl> 
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__ 
 #include <com/sun/star/xml/dom/XNodeList.idl> 
-#endif
-#ifndef __com_sun_star_xml_XPath_XObjectType_idl__
 #include <com/sun/star/xml/xpath/XPathObjectType.idl> 
-#endif
 
 module com { module sun { module star { module xml { module xpath {
 
diff --git a/offapi/com/sun/star/xml/xpath/makefile.mk b/offapi/com/sun/star/xml/xpath/makefile.mk
deleted file mode 100644
index 60b70c9d7..000000000
--- a/offapi/com/sun/star/xml/xpath/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssxpath
-PACKAGE=com$/sun$/star$/xml$/xpath
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XPathException.idl \
-    XPathObjectType.idl \
-    XXPathObject.idl \
-    XXPathAPI.idl \
-    XXPathExtension.idl \
-    Libxml2ExtensionHandle.idl \
-    XPathExtension.idl \
-    XPathAPI.idl \
-    Libxml2ExtensionHandle.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-
-
-
-
diff --git a/offapi/com/sun/star/xsd/Boolean.idl b/offapi/com/sun/star/xsd/Boolean.idl
index 4909e30f2..3a2b1d4b6 100644
--- a/offapi/com/sun/star/xsd/Boolean.idl
+++ b/offapi/com/sun/star/xsd/Boolean.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_Boolean_idl__
 #define __com_sun_star_xsd_Boolean_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Date.idl b/offapi/com/sun/star/xsd/Date.idl
index a6875079a..2674e29e2 100644
--- a/offapi/com/sun/star/xsd/Date.idl
+++ b/offapi/com/sun/star/xsd/Date.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xsd_Date_idl__
 #define __com_sun_star_xsd_Date_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/DateTime.idl b/offapi/com/sun/star/xsd/DateTime.idl
index 0d5f1c11e..a5d338c78 100644
--- a/offapi/com/sun/star/xsd/DateTime.idl
+++ b/offapi/com/sun/star/xsd/DateTime.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xsd_DateTime_idl__
 #define __com_sun_star_xsd_DateTime_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Day.idl b/offapi/com/sun/star/xsd/Day.idl
index 81c5c7781..798d2c5c2 100644
--- a/offapi/com/sun/star/xsd/Day.idl
+++ b/offapi/com/sun/star/xsd/Day.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_Day_idl__
 #define __com_sun_star_xsd_Day_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Decimal.idl b/offapi/com/sun/star/xsd/Decimal.idl
index bfe1e0fe7..cc0917b2a 100644
--- a/offapi/com/sun/star/xsd/Decimal.idl
+++ b/offapi/com/sun/star/xsd/Decimal.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_Decimal_idl__
 #define __com_sun_star_xsd_Decimal_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Month.idl b/offapi/com/sun/star/xsd/Month.idl
index eaeaf0803..6bbf51a7f 100644
--- a/offapi/com/sun/star/xsd/Month.idl
+++ b/offapi/com/sun/star/xsd/Month.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_Month_idl__
 #define __com_sun_star_xsd_Month_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/String.idl b/offapi/com/sun/star/xsd/String.idl
index 6b4080524..d55c83895 100644
--- a/offapi/com/sun/star/xsd/String.idl
+++ b/offapi/com/sun/star/xsd/String.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_String_idl__
 #define __com_sun_star_xsd_String_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Time.idl b/offapi/com/sun/star/xsd/Time.idl
index 51711ca72..b6ab30e8d 100644
--- a/offapi/com/sun/star/xsd/Time.idl
+++ b/offapi/com/sun/star/xsd/Time.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xsd_Time_idl__
 #define __com_sun_star_xsd_Time_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
 #include <com/sun/star/util/Time.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/XDataType.idl b/offapi/com/sun/star/xsd/XDataType.idl
index dc0e665ea..aac9d9f85 100644
--- a/offapi/com/sun/star/xsd/XDataType.idl
+++ b/offapi/com/sun/star/xsd/XDataType.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_xsd_XDataType_idl__
 #define __com_sun_star_xsd_XDataType_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Year.idl b/offapi/com/sun/star/xsd/Year.idl
index 9d02b1f1f..9f133039f 100644
--- a/offapi/com/sun/star/xsd/Year.idl
+++ b/offapi/com/sun/star/xsd/Year.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_Year_idl__
 #define __com_sun_star_xsd_Year_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/makefile.mk b/offapi/com/sun/star/xsd/makefile.mk
deleted file mode 100644
index 56f791bd1..000000000
--- a/offapi/com/sun/star/xsd/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssxsd
-PACKAGE=com$/sun$/star$/xsd
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    WhiteSpaceTreatment.idl\
-    Boolean.idl\
-    DataTypeClass.idl\
-    Date.idl\
-    DateTime.idl\
-    Day.idl\
-    Decimal.idl\
-    Month.idl\
-    String.idl\
-    Time.idl\
-    XDataType.idl\
-    Year.idl\
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index c3a5f06d4..22cd4e591 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -1,109 +1,2 @@
-oa	offapi	:	udkapi idlc solenv NULL
-oa	offapi									usr1	-	all	oa_mkout NULL
-oa	offapi\com\sun\star\script				nmake	-	all	oa_script oa_embed NULL
-oa	offapi\com\sun\star\script\browse	nmake	-	all	oa_sfbrowse NULL
-oa	offapi\com\sun\star\script\provider	nmake	-	all	oa_sfprovider NULL
-oa	offapi\com\sun\star\script\vba		nmake	-	all	oa_script_vba NULL
-oa	offapi\com\sun\star\auth				nmake	-	all	oa_auth NULL
-oa	offapi\com\sun\star\accessibility       nmake	-	all	oa_accessibility oa_awt NULL
-oa	offapi\com\sun\star\awt					nmake	-	all	oa_awt NULL
-oa	offapi\com\sun\star\awt\tree			nmake	-	all	oa_awttree NULL
-oa	offapi\com\sun\star\awt\grid			nmake	-	all	oa_awtgrid NULL
-oa	offapi\com\sun\star\awt\tab				nmake	-	all	oa_awttab NULL
-oa	offapi\com\sun\star\chart				nmake	-	all	oa_chart NULL
-oa	offapi\com\sun\star\chart2       		nmake	-	all	oa_chart2 NULL
-oa	offapi\com\sun\star\chart2\data       	nmake	-	all	oa_chart2_data NULL
-oa	offapi\com\sun\star\configuration		nmake	-	all	oa_config NULL
-oa	offapi\com\sun\star\configuration\bootstrap	nmake	-	all	oa_configbootstrap NULL
-oa	offapi\com\sun\star\configuration\backend	nmake	-	all	oa_configbackend NULL
-oa	offapi\com\sun\star\configuration\backend\xml	nmake	-	all	oa_configbackend_xml NULL
-oa	offapi\com\sun\star\datatransfer		nmake	-	all	oa_datatransfer NULL
-oa	offapi\com\sun\star\datatransfer\clipboard			nmake	-	all	oa_datatrans_clip NULL
-oa	offapi\com\sun\star\datatransfer\dnd	nmake	-	all	oa_datatrans_dnd oa_awt NULL
-oa	offapi\com\sun\star\deployment				nmake	-	all	oa_deployment oa_ucb oa_xml_input NULL
-oa	offapi\com\sun\star\deployment\test			nmake	-	all	oa_deploymenttest oa_ucb  NULL
-oa	offapi\com\sun\star\deployment\ui			nmake	-	all	oa_deployment_ui oa_awt oa_ui_dialogs NULL
-oa	offapi\com\sun\star\document			nmake	-	all	oa_docu oa_embed NULL
-oa	offapi\com\sun\star\drawing				nmake	-	all	oa_draw NULL
-oa	offapi\com\sun\star\drawing\framework	nmake	-	all	oa_draw_framework NULL
-oa	offapi\com\sun\star\embed				nmake	-	all	oa_embed NULL
-oa	offapi\com\sun\star\form				nmake	-	all	oa_form oa_inspection NULL
-oa	offapi\com\sun\star\form\component		nmake	-	all	oa_fcomp oa_form oa_form_submission NULL
-oa	offapi\com\sun\star\form\inspection     nmake   -   all	oa_finsp oa_fcomp oa_inspection NULL
-oa	offapi\com\sun\star\form\binding        nmake	-	all	oa_form_binding oa_fcomp NULL
-oa	offapi\com\sun\star\form\validation     nmake   -   all oa_form_validation oa_form_binding NULL
-oa	offapi\com\sun\star\form\submission     nmake   -   all oa_form_submission NULL
-oa	offapi\com\sun\star\form\control		nmake	-	all	oa_fcontr oa_form_submission NULL
-oa  offapi\com\sun\star\form\runtime        nmake   -   all oa_fruntime oa_fcomp NULL
-oa	offapi\com\sun\star\xforms				nmake	-	all	oa_xforms oa_xsd oa_form_submission NULL
-oa	offapi\com\sun\star\formula				nmake	-	all	oa_formula NULL
-oa	offapi\com\sun\star\frame\status		nmake	-	all	oa_frame_status NULL
-oa	offapi\com\sun\star\frame				nmake	-	all	oa_frame NULL
-oa	offapi\com\sun\star\gallery				nmake	-	all	oa_gallery NULL
-oa	offapi\com\sun\star\graphic				nmake	-	all	oa_graphic NULL
-oa	offapi\com\sun\star\i18n				nmake	-	all	oa_i18n NULL
-oa	offapi\com\sun\star\installation		nmake	-	all	oa_inst NULL
-oa	offapi\com\sun\star\ldap			    nmake	-	all	oa_ldap NULL
-oa	offapi\com\sun\star\linguistic2			nmake	-	all	oa_ling2 NULL
-oa  offapi\com\sun\star\logging             nmake   -   all oa_logging NULL
-oa	offapi\com\sun\star\mail    			nmake	-	all	oa_mail NULL
-oa	offapi\com\sun\star\media				nmake	-	all	oa_media NULL
-oa	offapi\com\sun\star\mozilla				nmake	-	all	oa_mozilla NULL
-oa	offapi\com\sun\star\oooimprovement		nmake	-	all	oa_oooimprovement NULL
-oa	offapi\com\sun\star\packages			nmake	-	all	oa_packages NULL
-oa	offapi\com\sun\star\packages\manifest	nmake	-	all	oa_manifest NULL
-oa	offapi\com\sun\star\packages\zip	    nmake	-	all	oa_zippackage NULL
-oa	offapi\com\sun\star\plugin				nmake	-	all	oa_plug NULL
-oa	offapi\com\sun\star\presentation		nmake	-	all	oa_pres NULL
-oa	offapi\com\sun\star\animations			nmake	-	all oa_animations oa_pres NULL
-oa	offapi\com\sun\star\presentation\textfield		nmake	-	all	oa_prestextfield NULL
-oa	offapi\com\sun\star\resource			nmake	-	all	oa_resrc NULL
-oa	offapi\com\sun\star\xml\sax				nmake	-	all	oa_sax NULL
-oa	offapi\com\sun\star\xml					nmake	-	all	oa_xml NULL
-oa	offapi\com\sun\star\xml\input			nmake	-	all	oa_xml_input oa_sax NULL
-oa	offapi\com\sun\star\xml\dom				nmake	-	all	oa_xml_dom oa_sax NULL
-oa	offapi\com\sun\star\xml\xpath			nmake	-	all	oa_xml_xpath oa_xml_dom NULL
-oa	offapi\com\sun\star\xml\dom\views			nmake	-	all	oa_xml_views NULL
-oa	offapi\com\sun\star\xml\dom\events			nmake	-	all	oa_xml_events oa_xml_views oa_xml_dom NULL
-oa	offapi\com\sun\star\scanner				nmake	-	all	oa_scan NULL
-oa	offapi\com\sun\star\setup				nmake	-	all	oa_setup NULL
-oa	offapi\com\sun\star\sheet				nmake	-	all	oa_sheet NULL
-oa  offapi\com\sun\star\smarttags           nmake   -   all oa_smarttags NULL
-oa  offapi\com\sun\star\style               nmake   -   all oa_style NULL
-oa	offapi\com\sun\star\svg					nmake	-	all	oa_svg NULL
-oa	offapi\com\sun\star\sync				nmake	-	all	oa_sync NULL
-oa	offapi\com\sun\star\sync2				nmake	-	all	oa_sync2 NULL
-oa	offapi\com\sun\star\system				nmake	-	all	oa_system NULL
-oa	offapi\com\sun\star\table				nmake	-	all	oa_table oa_form_binding NULL
-oa	offapi\com\sun\star\task				nmake	-	all	oa_task NULL
-oa	offapi\com\sun\star\text				nmake	-	all	oa_text NULL
-oa	offapi\com\sun\star\text\textfield		nmake	-	all	oa_textfield NULL
-oa  offapi\com\sun\star\text\textfield\docinfo     nmake   -   all oa_docinfo NULL
-oa  offapi\com\sun\star\text\fieldmaster    nmake   -   all oa_fieldmaster NULL
-oa	offapi\com\sun\star\ucb					nmake	-	all	oa_ucb NULL
-oa	offapi\com\sun\star\util				nmake	-	all	oa_putil NULL
-oa	offapi\com\sun\star\view				nmake	-	all	oa_view NULL
-oa	offapi\com\sun\star\report				nmake	-	all	oa_report NULL
-oa	offapi\com\sun\star\report\inspection	nmake	-	all	oa_reportins oa_report  NULL
-oa	offapi\com\sun\star\report\meta	        nmake	-	all	oa_reportmeta oa_report  NULL
-oa	offapi\com\sun\star\sdbcx				nmake	-	all	oa_sdbcx NULL
-oa	offapi\com\sun\star\sdbc				nmake	-	all	oa_sdbc NULL
-oa	offapi\com\sun\star\sdb					nmake	-	all	oa_sdb NULL
-oa	offapi\com\sun\star\sdb\tools           nmake	-	all	oa_sdbtools NULL
-oa  offapi\com\sun\star\sdb\application     nmake   -   all oa_sdbapp NULL
-oa	offapi\com\sun\star\image				nmake	-	all	oa_image NULL
-oa  offapi\com\sun\star\xsd                 nmake   -   all oa_xsd NULL
-oa  offapi\com\sun\star\inspection          nmake   -   all oa_inspection NULL
-oa	offapi\com\sun\star\ui  				nmake	-	all	oa_ui NULL
-oa	offapi\com\sun\star\ui\dialogs			nmake	-	all	oa_ui_dialogs NULL
-oa	offapi\com\sun\star  				    nmake	-	all	oa_starme NULL
-oa	offapi\com\sun\star\security            nmake	-	all	oa_security NULL
-oa	offapi\com\sun\star\xml\crypto\sax     	nmake	-	all	oa_crypto_sax oa_wrapper oa_csax NULL
-oa	offapi\com\sun\star\xml\crypto     	    nmake	-	all	oa_crypto oa_wrapper oa_security NULL
-oa	offapi\com\sun\star\xml\csax     	    nmake	-	all	oa_csax oa_sax NULL
-oa	offapi\com\sun\star\xml\wrapper		    nmake	-	all	oa_wrapper oa_sax NULL
-oa	offapi\com\sun\star\geometry		    nmake	-	all	oa_geometry NULL
-oa	offapi\com\sun\star\rendering	        nmake	-	all oa_rendering oa_geometry NULL
-oa	offapi\com\sun\star\rdf	                nmake	-	all oa_rdf  oa_datatransfer oa_text NULL
-oa	offapi\com\sun\star\office              nmake	-	all oa_office oa_text NULL
-oa  offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_awttree oa_awtgrid oa_awttab oa_chart oa_chart2 oa_chart2_data oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_draw_framework oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_logging oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbapp oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_fruntime oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement oa_office oa_prestextfield oa_starme oa_script_vba NULL
+oa	offapi	:	udkapi DESKTOP:idlc solenv NULL
+oa	offapi/prj									nmake	-	all	oa_prj NULL
diff --git a/offapi/prj/d.lst b/offapi/prj/d.lst
index ab0e4eb7a..f57cb678b 100644
--- a/offapi/prj/d.lst
+++ b/offapi/prj/d.lst
@@ -4,221 +4,221 @@
 #
 ##############################################################################
 
-mkdir: %COMMON_DEST%\idl%_EXT%\com
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\accessibility
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\animations
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\auth
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tree
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\grid
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tab
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2\data
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend\xml
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\bootstrap
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\clipboard
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\dnd
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment\ui
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\document
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing\framework
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\embed
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\binding
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\component
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\control
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\inspection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\runtime
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\submission
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\validation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\formula
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\frame
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\frame\status
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\gallery
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\geometry
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\graphic
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\i18n
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\image
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\inspection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\installation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ldap
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\linguistic2
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\logging
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\mail
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\media
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\mozilla
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\oooimprovement
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\packages
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\manifest
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\zip
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\plugin
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\presentation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\rdf
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\rendering
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\report
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\report\inspection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\report\meta
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\resource
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\scanner
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\browse
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\provider
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\vba
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\application
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\tools
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbc
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbcx
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\setup
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sheet
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\smarttags
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\style
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\svg
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sync
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sync2
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\system
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\table
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text\fieldmaster
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield\docinfo
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb\smart
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ui
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ui\dialogs
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\view
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xforms
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto\sax
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\csax
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\views
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\events
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\input
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\sax
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\wrapper
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\xpath
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xsd
+mkdir: %COMMON_DEST%\idl\com
+mkdir: %COMMON_DEST%\idl\com\sun
+mkdir: %COMMON_DEST%\idl\com\sun\star
+mkdir: %COMMON_DEST%\idl\com\sun\star\accessibility
+mkdir: %COMMON_DEST%\idl\com\sun\star\animations
+mkdir: %COMMON_DEST%\idl\com\sun\star\auth
+mkdir: %COMMON_DEST%\idl\com\sun\star\awt
+mkdir: %COMMON_DEST%\idl\com\sun\star\awt\tree
+mkdir: %COMMON_DEST%\idl\com\sun\star\awt\grid
+mkdir: %COMMON_DEST%\idl\com\sun\star\awt\tab
+mkdir: %COMMON_DEST%\idl\com\sun\star\chart
+mkdir: %COMMON_DEST%\idl\com\sun\star\chart2
+mkdir: %COMMON_DEST%\idl\com\sun\star\chart2\data
+mkdir: %COMMON_DEST%\idl\com\sun\star\configuration
+mkdir: %COMMON_DEST%\idl\com\sun\star\configuration\backend
+mkdir: %COMMON_DEST%\idl\com\sun\star\configuration\backend\xml
+mkdir: %COMMON_DEST%\idl\com\sun\star\configuration\bootstrap
+mkdir: %COMMON_DEST%\idl\com\sun\star\datatransfer
+mkdir: %COMMON_DEST%\idl\com\sun\star\datatransfer\clipboard
+mkdir: %COMMON_DEST%\idl\com\sun\star\datatransfer\dnd
+mkdir: %COMMON_DEST%\idl\com\sun\star\deployment
+mkdir: %COMMON_DEST%\idl\com\sun\star\deployment\ui
+mkdir: %COMMON_DEST%\idl\com\sun\star\document
+mkdir: %COMMON_DEST%\idl\com\sun\star\drawing
+mkdir: %COMMON_DEST%\idl\com\sun\star\drawing\framework
+mkdir: %COMMON_DEST%\idl\com\sun\star\embed
+mkdir: %COMMON_DEST%\idl\com\sun\star\form
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\binding
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\component
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\control
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\inspection
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\runtime
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\submission
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\validation
+mkdir: %COMMON_DEST%\idl\com\sun\star\formula
+mkdir: %COMMON_DEST%\idl\com\sun\star\frame
+mkdir: %COMMON_DEST%\idl\com\sun\star\frame\status
+mkdir: %COMMON_DEST%\idl\com\sun\star\gallery
+mkdir: %COMMON_DEST%\idl\com\sun\star\geometry
+mkdir: %COMMON_DEST%\idl\com\sun\star\graphic
+mkdir: %COMMON_DEST%\idl\com\sun\star\i18n
+mkdir: %COMMON_DEST%\idl\com\sun\star\image
+mkdir: %COMMON_DEST%\idl\com\sun\star\inspection
+mkdir: %COMMON_DEST%\idl\com\sun\star\installation
+mkdir: %COMMON_DEST%\idl\com\sun\star\ldap
+mkdir: %COMMON_DEST%\idl\com\sun\star\linguistic2
+mkdir: %COMMON_DEST%\idl\com\sun\star\logging
+mkdir: %COMMON_DEST%\idl\com\sun\star\mail
+mkdir: %COMMON_DEST%\idl\com\sun\star\media
+mkdir: %COMMON_DEST%\idl\com\sun\star\mozilla
+mkdir: %COMMON_DEST%\idl\com\sun\star\oooimprovement
+mkdir: %COMMON_DEST%\idl\com\sun\star\packages
+mkdir: %COMMON_DEST%\idl\com\sun\star\packages\manifest
+mkdir: %COMMON_DEST%\idl\com\sun\star\packages\zip
+mkdir: %COMMON_DEST%\idl\com\sun\star\plugin
+mkdir: %COMMON_DEST%\idl\com\sun\star\presentation
+mkdir: %COMMON_DEST%\idl\com\sun\star\rdf
+mkdir: %COMMON_DEST%\idl\com\sun\star\rendering
+mkdir: %COMMON_DEST%\idl\com\sun\star\report
+mkdir: %COMMON_DEST%\idl\com\sun\star\report\inspection
+mkdir: %COMMON_DEST%\idl\com\sun\star\report\meta
+mkdir: %COMMON_DEST%\idl\com\sun\star\resource
+mkdir: %COMMON_DEST%\idl\com\sun\star\scanner
+mkdir: %COMMON_DEST%\idl\com\sun\star\script
+mkdir: %COMMON_DEST%\idl\com\sun\star\script\browse
+mkdir: %COMMON_DEST%\idl\com\sun\star\script\provider
+mkdir: %COMMON_DEST%\idl\com\sun\star\script\vba
+mkdir: %COMMON_DEST%\idl\com\sun\star\sdb
+mkdir: %COMMON_DEST%\idl\com\sun\star\sdb\application
+mkdir: %COMMON_DEST%\idl\com\sun\star\sdb\tools
+mkdir: %COMMON_DEST%\idl\com\sun\star\sdbc
+mkdir: %COMMON_DEST%\idl\com\sun\star\sdbcx
+mkdir: %COMMON_DEST%\idl\com\sun\star\security
+mkdir: %COMMON_DEST%\idl\com\sun\star\setup
+mkdir: %COMMON_DEST%\idl\com\sun\star\sheet
+mkdir: %COMMON_DEST%\idl\com\sun\star\smarttags
+mkdir: %COMMON_DEST%\idl\com\sun\star\style
+mkdir: %COMMON_DEST%\idl\com\sun\star\svg
+mkdir: %COMMON_DEST%\idl\com\sun\star\sync
+mkdir: %COMMON_DEST%\idl\com\sun\star\sync2
+mkdir: %COMMON_DEST%\idl\com\sun\star\system
+mkdir: %COMMON_DEST%\idl\com\sun\star\table
+mkdir: %COMMON_DEST%\idl\com\sun\star\task
+mkdir: %COMMON_DEST%\idl\com\sun\star\text
+mkdir: %COMMON_DEST%\idl\com\sun\star\text\fieldmaster
+mkdir: %COMMON_DEST%\idl\com\sun\star\text\textfield
+mkdir: %COMMON_DEST%\idl\com\sun\star\text\textfield\docinfo
+mkdir: %COMMON_DEST%\idl\com\sun\star\ucb
+mkdir: %COMMON_DEST%\idl\com\sun\star\ucb\smart
+mkdir: %COMMON_DEST%\idl\com\sun\star\ui
+mkdir: %COMMON_DEST%\idl\com\sun\star\ui\dialogs
+mkdir: %COMMON_DEST%\idl\com\sun\star\util
+mkdir: %COMMON_DEST%\idl\com\sun\star\view
+mkdir: %COMMON_DEST%\idl\com\sun\star\xforms
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\crypto
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\crypto\sax
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\csax
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\dom
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\dom\views
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\dom\events
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\input
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\sax
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\wrapper
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\xpath
+mkdir: %COMMON_DEST%\idl\com\sun\star\xsd
 
-..\%__SRC%\ucr\offapi.db %_DEST%\bin%_EXT%\offapi.rdb
-..\%__SRC%\ucrdoc\offapi_doc.db %_DEST%\bin%_EXT%\offapi_doc.rdb
-..\%__SRC%\ucr\types.db %_DEST%\bin%_EXT%\types.rdb
-..\%__SRC%\ucrdoc\types_doc.db %_DEST%\bin%_EXT%\types_doc.rdb
+..\%__SRC%\ucr\offapi.db %_DEST%\bin\offapi.rdb
+..\%__SRC%\ucrdoc\offapi_doc.db %_DEST%\bin\offapi_doc.rdb
+..\%__SRC%\ucr\types.db %_DEST%\bin\types.rdb
+..\%__SRC%\ucrdoc\types_doc.db %_DEST%\bin\types_doc.rdb
 
-..\%__SRC%\misc\unotype_statistics.txt %_DEST%\bin%_EXT%\unotype_statistics.txt
+..\%__SRC%\misc\unotype_statistics.txt %_DEST%\bin\unotype_statistics.txt
 
-..\com\sun\star\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star
-..\com\sun\star\accessibility\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\accessibility
-..\com\sun\star\animations\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\animations
-..\com\sun\star\auth\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\auth
-..\com\sun\star\awt\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt
-..\com\sun\star\awt\tree\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tree
-..\com\sun\star\awt\grid\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\grid
-..\com\sun\star\awt\tab\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tab
-..\com\sun\star\chart\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart
-..\com\sun\star\chart2\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2
-..\com\sun\star\chart2\data\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2\data
-..\com\sun\star\configuration\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration
-..\com\sun\star\configuration\backend\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend
-..\com\sun\star\configuration\backend\xml\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend\xml
-..\com\sun\star\configuration\bootstrap\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\bootstrap
-..\com\sun\star\datatransfer\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer
-..\com\sun\star\datatransfer\clipboard\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\clipboard
-..\com\sun\star\datatransfer\dnd\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\dnd
-..\com\sun\star\deployment\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment
-..\com\sun\star\deployment\ui\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment\ui
-..\com\sun\star\document\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\document
-..\com\sun\star\drawing\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing
-..\com\sun\star\drawing\framework\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing\framework
-..\com\sun\star\embed\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\embed
-..\com\sun\star\form\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form
-..\com\sun\star\form\binding\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\binding
-..\com\sun\star\form\component\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\component
-..\com\sun\star\form\control\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\control
-..\com\sun\star\form\inspection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\inspection
-..\com\sun\star\form\runtime\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\runtime
-..\com\sun\star\form\submission\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\submission
-..\com\sun\star\form\validation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\validation
-..\com\sun\star\formula\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\formula
-..\com\sun\star\frame\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\frame
-..\com\sun\star\frame\status\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\frame\status
-..\com\sun\star\gallery\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\gallery
-..\com\sun\star\geometry\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\geometry
-..\com\sun\star\graphic\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\graphic
-..\com\sun\star\i18n\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\i18n
-..\com\sun\star\image\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\image
-..\com\sun\star\inspection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\inspection
-..\com\sun\star\installation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\installation
-..\com\sun\star\ldap\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ldap
-..\com\sun\star\linguistic2\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\linguistic2
-..\com\sun\star\logging\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\logging
-..\com\sun\star\mail\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\mail
-..\com\sun\star\media\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\media
-..\com\sun\star\mozilla\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\mozilla
-..\com\sun\star\oooimprovement\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\oooimprovement
-..\com\sun\star\packages\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\packages
-..\com\sun\star\packages\manifest\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\manifest
-..\com\sun\star\packages\zip\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\zip
-..\com\sun\star\plugin\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\plugin
-..\com\sun\star\presentation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\presentation
-..\com\sun\star\rdf\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\rdf
-..\com\sun\star\rendering\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\rendering
-..\com\sun\star\report\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\report
-..\com\sun\star\report\inspection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\report\inspection
-..\com\sun\star\report\meta\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\report\meta
-..\com\sun\star\resource\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\resource
-..\com\sun\star\scanner\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\scanner
-..\com\sun\star\script\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-..\com\sun\star\script\browse\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\browse
-..\com\sun\star\script\provider\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\provider
-..\com\sun\star\script\vba\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\vba
-..\com\sun\star\sdb\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb
-..\com\sun\star\sdb\application\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\application
-..\com\sun\star\sdb\tools\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\tools
-..\com\sun\star\sdbc\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbc
-..\com\sun\star\sdbcx\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbcx
-..\com\sun\star\security\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-..\com\sun\star\setup\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\setup
-..\com\sun\star\sheet\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sheet
-..\com\sun\star\smarttags\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\smarttags
-..\com\sun\star\style\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\style
-..\com\sun\star\svg\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\svg
-..\com\sun\star\sync\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sync
-..\com\sun\star\sync2\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sync2
-..\com\sun\star\system\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\system
-..\com\sun\star\table\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\table
-..\com\sun\star\task\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-..\com\sun\star\text\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text
-..\com\sun\star\text\fieldmaster\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text\fieldmaster
-..\com\sun\star\text\textfield\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield
-..\com\sun\star\text\textfield\docinfo\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield\docinfo
-..\com\sun\star\ucb\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb
-..\com\sun\star\ucb\smart\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb\smart
-..\com\sun\star\ui\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ui
-..\com\sun\star\ui\dialogs\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ui\dialogs
-..\com\sun\star\util\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-..\com\sun\star\view\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\view
-..\com\sun\star\xforms\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xforms
-..\com\sun\star\xml\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml
-..\com\sun\star\xml\crypto\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto
-..\com\sun\star\xml\crypto\sax\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto\sax
-..\com\sun\star\xml\csax\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\csax
-..\com\sun\star\xml\dom\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom
-..\com\sun\star\xml\dom\views\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\views
-..\com\sun\star\xml\dom\events\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\events
-..\com\sun\star\xml\input\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\input
-..\com\sun\star\xml\sax\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\sax
-..\com\sun\star\xml\wrapper\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\wrapper
-..\com\sun\star\xml\xpath\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\xpath
-..\com\sun\star\xsd\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xsd
+..\com\sun\star\*.idl %COMMON_DEST%\idl\com\sun\star
+..\com\sun\star\accessibility\*.idl %COMMON_DEST%\idl\com\sun\star\accessibility
+..\com\sun\star\animations\*.idl %COMMON_DEST%\idl\com\sun\star\animations
+..\com\sun\star\auth\*.idl %COMMON_DEST%\idl\com\sun\star\auth
+..\com\sun\star\awt\*.idl %COMMON_DEST%\idl\com\sun\star\awt
+..\com\sun\star\awt\tree\*.idl %COMMON_DEST%\idl\com\sun\star\awt\tree
+..\com\sun\star\awt\grid\*.idl %COMMON_DEST%\idl\com\sun\star\awt\grid
+..\com\sun\star\awt\tab\*.idl %COMMON_DEST%\idl\com\sun\star\awt\tab
+..\com\sun\star\chart\*.idl %COMMON_DEST%\idl\com\sun\star\chart
+..\com\sun\star\chart2\*.idl %COMMON_DEST%\idl\com\sun\star\chart2
+..\com\sun\star\chart2\data\*.idl %COMMON_DEST%\idl\com\sun\star\chart2\data
+..\com\sun\star\configuration\*.idl %COMMON_DEST%\idl\com\sun\star\configuration
+..\com\sun\star\configuration\backend\*.idl %COMMON_DEST%\idl\com\sun\star\configuration\backend
+..\com\sun\star\configuration\backend\xml\*.idl %COMMON_DEST%\idl\com\sun\star\configuration\backend\xml
+..\com\sun\star\configuration\bootstrap\*.idl %COMMON_DEST%\idl\com\sun\star\configuration\bootstrap
+..\com\sun\star\datatransfer\*.idl %COMMON_DEST%\idl\com\sun\star\datatransfer
+..\com\sun\star\datatransfer\clipboard\*.idl %COMMON_DEST%\idl\com\sun\star\datatransfer\clipboard
+..\com\sun\star\datatransfer\dnd\*.idl %COMMON_DEST%\idl\com\sun\star\datatransfer\dnd
+..\com\sun\star\deployment\*.idl %COMMON_DEST%\idl\com\sun\star\deployment
+..\com\sun\star\deployment\ui\*.idl %COMMON_DEST%\idl\com\sun\star\deployment\ui
+..\com\sun\star\document\*.idl %COMMON_DEST%\idl\com\sun\star\document
+..\com\sun\star\drawing\*.idl %COMMON_DEST%\idl\com\sun\star\drawing
+..\com\sun\star\drawing\framework\*.idl %COMMON_DEST%\idl\com\sun\star\drawing\framework
+..\com\sun\star\embed\*.idl %COMMON_DEST%\idl\com\sun\star\embed
+..\com\sun\star\form\*.idl %COMMON_DEST%\idl\com\sun\star\form
+..\com\sun\star\form\binding\*.idl %COMMON_DEST%\idl\com\sun\star\form\binding
+..\com\sun\star\form\component\*.idl %COMMON_DEST%\idl\com\sun\star\form\component
+..\com\sun\star\form\control\*.idl %COMMON_DEST%\idl\com\sun\star\form\control
+..\com\sun\star\form\inspection\*.idl %COMMON_DEST%\idl\com\sun\star\form\inspection
+..\com\sun\star\form\runtime\*.idl %COMMON_DEST%\idl\com\sun\star\form\runtime
+..\com\sun\star\form\submission\*.idl %COMMON_DEST%\idl\com\sun\star\form\submission
+..\com\sun\star\form\validation\*.idl %COMMON_DEST%\idl\com\sun\star\form\validation
+..\com\sun\star\formula\*.idl %COMMON_DEST%\idl\com\sun\star\formula
+..\com\sun\star\frame\*.idl %COMMON_DEST%\idl\com\sun\star\frame
+..\com\sun\star\frame\status\*.idl %COMMON_DEST%\idl\com\sun\star\frame\status
+..\com\sun\star\gallery\*.idl %COMMON_DEST%\idl\com\sun\star\gallery
+..\com\sun\star\geometry\*.idl %COMMON_DEST%\idl\com\sun\star\geometry
+..\com\sun\star\graphic\*.idl %COMMON_DEST%\idl\com\sun\star\graphic
+..\com\sun\star\i18n\*.idl %COMMON_DEST%\idl\com\sun\star\i18n
+..\com\sun\star\image\*.idl %COMMON_DEST%\idl\com\sun\star\image
+..\com\sun\star\inspection\*.idl %COMMON_DEST%\idl\com\sun\star\inspection
+..\com\sun\star\installation\*.idl %COMMON_DEST%\idl\com\sun\star\installation
+..\com\sun\star\ldap\*.idl %COMMON_DEST%\idl\com\sun\star\ldap
+..\com\sun\star\linguistic2\*.idl %COMMON_DEST%\idl\com\sun\star\linguistic2
+..\com\sun\star\logging\*.idl %COMMON_DEST%\idl\com\sun\star\logging
+..\com\sun\star\mail\*.idl %COMMON_DEST%\idl\com\sun\star\mail
+..\com\sun\star\media\*.idl %COMMON_DEST%\idl\com\sun\star\media
+..\com\sun\star\mozilla\*.idl %COMMON_DEST%\idl\com\sun\star\mozilla
+..\com\sun\star\oooimprovement\*.idl %COMMON_DEST%\idl\com\sun\star\oooimprovement
+..\com\sun\star\packages\*.idl %COMMON_DEST%\idl\com\sun\star\packages
+..\com\sun\star\packages\manifest\*.idl %COMMON_DEST%\idl\com\sun\star\packages\manifest
+..\com\sun\star\packages\zip\*.idl %COMMON_DEST%\idl\com\sun\star\packages\zip
+..\com\sun\star\plugin\*.idl %COMMON_DEST%\idl\com\sun\star\plugin
+..\com\sun\star\presentation\*.idl %COMMON_DEST%\idl\com\sun\star\presentation
+..\com\sun\star\rdf\*.idl %COMMON_DEST%\idl\com\sun\star\rdf
+..\com\sun\star\rendering\*.idl %COMMON_DEST%\idl\com\sun\star\rendering
+..\com\sun\star\report\*.idl %COMMON_DEST%\idl\com\sun\star\report
+..\com\sun\star\report\inspection\*.idl %COMMON_DEST%\idl\com\sun\star\report\inspection
+..\com\sun\star\report\meta\*.idl %COMMON_DEST%\idl\com\sun\star\report\meta
+..\com\sun\star\resource\*.idl %COMMON_DEST%\idl\com\sun\star\resource
+..\com\sun\star\scanner\*.idl %COMMON_DEST%\idl\com\sun\star\scanner
+..\com\sun\star\script\*.idl %COMMON_DEST%\idl\com\sun\star\script
+..\com\sun\star\script\browse\*.idl %COMMON_DEST%\idl\com\sun\star\script\browse
+..\com\sun\star\script\provider\*.idl %COMMON_DEST%\idl\com\sun\star\script\provider
+..\com\sun\star\script\vba\*.idl %COMMON_DEST%\idl\com\sun\star\script\vba
+..\com\sun\star\sdb\*.idl %COMMON_DEST%\idl\com\sun\star\sdb
+..\com\sun\star\sdb\application\*.idl %COMMON_DEST%\idl\com\sun\star\sdb\application
+..\com\sun\star\sdb\tools\*.idl %COMMON_DEST%\idl\com\sun\star\sdb\tools
+..\com\sun\star\sdbc\*.idl %COMMON_DEST%\idl\com\sun\star\sdbc
+..\com\sun\star\sdbcx\*.idl %COMMON_DEST%\idl\com\sun\star\sdbcx
+..\com\sun\star\security\*.idl %COMMON_DEST%\idl\com\sun\star\security
+..\com\sun\star\setup\*.idl %COMMON_DEST%\idl\com\sun\star\setup
+..\com\sun\star\sheet\*.idl %COMMON_DEST%\idl\com\sun\star\sheet
+..\com\sun\star\smarttags\*.idl %COMMON_DEST%\idl\com\sun\star\smarttags
+..\com\sun\star\style\*.idl %COMMON_DEST%\idl\com\sun\star\style
+..\com\sun\star\svg\*.idl %COMMON_DEST%\idl\com\sun\star\svg
+..\com\sun\star\sync\*.idl %COMMON_DEST%\idl\com\sun\star\sync
+..\com\sun\star\sync2\*.idl %COMMON_DEST%\idl\com\sun\star\sync2
+..\com\sun\star\system\*.idl %COMMON_DEST%\idl\com\sun\star\system
+..\com\sun\star\table\*.idl %COMMON_DEST%\idl\com\sun\star\table
+..\com\sun\star\task\*.idl %COMMON_DEST%\idl\com\sun\star\task
+..\com\sun\star\text\*.idl %COMMON_DEST%\idl\com\sun\star\text
+..\com\sun\star\text\fieldmaster\*.idl %COMMON_DEST%\idl\com\sun\star\text\fieldmaster
+..\com\sun\star\text\textfield\*.idl %COMMON_DEST%\idl\com\sun\star\text\textfield
+..\com\sun\star\text\textfield\docinfo\*.idl %COMMON_DEST%\idl\com\sun\star\text\textfield\docinfo
+..\com\sun\star\ucb\*.idl %COMMON_DEST%\idl\com\sun\star\ucb
+..\com\sun\star\ucb\smart\*.idl %COMMON_DEST%\idl\com\sun\star\ucb\smart
+..\com\sun\star\ui\*.idl %COMMON_DEST%\idl\com\sun\star\ui
+..\com\sun\star\ui\dialogs\*.idl %COMMON_DEST%\idl\com\sun\star\ui\dialogs
+..\com\sun\star\util\*.idl %COMMON_DEST%\idl\com\sun\star\util
+..\com\sun\star\view\*.idl %COMMON_DEST%\idl\com\sun\star\view
+..\com\sun\star\xforms\*.idl %COMMON_DEST%\idl\com\sun\star\xforms
+..\com\sun\star\xml\*.idl %COMMON_DEST%\idl\com\sun\star\xml
+..\com\sun\star\xml\crypto\*.idl %COMMON_DEST%\idl\com\sun\star\xml\crypto
+..\com\sun\star\xml\crypto\sax\*.idl %COMMON_DEST%\idl\com\sun\star\xml\crypto\sax
+..\com\sun\star\xml\csax\*.idl %COMMON_DEST%\idl\com\sun\star\xml\csax
+..\com\sun\star\xml\dom\*.idl %COMMON_DEST%\idl\com\sun\star\xml\dom
+..\com\sun\star\xml\dom\views\*.idl %COMMON_DEST%\idl\com\sun\star\xml\dom\views
+..\com\sun\star\xml\dom\events\*.idl %COMMON_DEST%\idl\com\sun\star\xml\dom\events
+..\com\sun\star\xml\input\*.idl %COMMON_DEST%\idl\com\sun\star\xml\input
+..\com\sun\star\xml\sax\*.idl %COMMON_DEST%\idl\com\sun\star\xml\sax
+..\com\sun\star\xml\wrapper\*.idl %COMMON_DEST%\idl\com\sun\star\xml\wrapper
+..\com\sun\star\xml\xpath\*.idl %COMMON_DEST%\idl\com\sun\star\xml\xpath
+..\com\sun\star\xsd\*.idl %COMMON_DEST%\idl\com\sun\star\xsd
diff --git a/xmlreader/inc/makefile.mk b/offapi/prj/makefile.mk
index 9f8443470..88cd9dfe0 100644
--- a/xmlreader/inc/makefile.mk
+++ b/offapi/prj/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -23,18 +23,18 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#***********************************************************************/
-
-PRJ = ..
-PRJNAME = xmlreader
-TARGET = inc
+#*************************************************************************
 
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
+PRJ=..
+TARGET=prj
 
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_PCH)" != ""
-ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
 .ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index f61fa6c4c..4138067fd 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -151,7 +151,7 @@ REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag
 
 UNOTYPE_STATISTICS=$(MISC)$/unotype_statistics.txt
 
-REGVIEWTOOL=$(SOLARBINDIR)$/regview$(EXECPOST)
+REGVIEWTOOL=$(SOLARBINDIR)$/regview
 
 # --- Targets ------------------------------------------------------
 
@@ -179,9 +179,12 @@ $(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udk
 #
 #Use the types-whitelist to exclude published API from signalling incompatibility.
 #Handle with care.
+
 $(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db types-whitelist
-    $(COMMAND_ECHO)$(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db @types-whitelist \
-        && echo > $(REGISTRYCHECKFLAG)
+# FIXME: disabled. fails without OS2 support
+#    $(COMMAND_ECHO)$(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db @types-whitelist \
+#        && echo > $(REGISTRYCHECKFLAG)
+	echo "" > $(REGISTRYCHECKFLAG)
 
 #JSC: new target to prepare some UNO type statistics, the ouput will be later used
 #     for versioning of UNO cli type libraries
diff --git a/offuh/prj/build.lst b/offuh/prj/build.lst
deleted file mode 100644
index e98f3565b..000000000
--- a/offuh/prj/build.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-ou	offuh	::	offapi oovbaapi codemaker NULL
-ou	offuh									usr1	-	all	ou_mkout NULL
-ou	offuh\prj								get		-	all	ou_prj NULL
-ou	offuh\source							nmake	-	all	ou_source NULL
diff --git a/offuh/prj/d.lst b/offuh/prj/d.lst
deleted file mode 100644
index 464dfca14..000000000
--- a/offuh/prj/d.lst
+++ /dev/null
@@ -1,423 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\offuh
-mkdir: %_DEST%\inc%_EXT%\offuh\com
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star
-
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\auth
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\accessibility
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tab
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\beans
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\oleautomation
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\chart
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2\data
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\container
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration\backend
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\connection
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\data
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment\ui
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\clipboard
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\dnd
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\daemons
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\document
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing\framework
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\geometry
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rendering
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\embed
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xforms
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form\binding
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form\validation
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form\submission
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form\runtime
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form\inspection
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\formula
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\frame
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\frame\status
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\gallery
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\graphic
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\i18n
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\installation
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\io
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\java
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\lang
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\logging
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\office
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\mail
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\media
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\packages
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\manifest
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\zip
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\presentation
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\animations
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\reflection
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\registry
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\report
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\report\inspection
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\report\meta
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\resource
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\tools
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\application
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbc
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbcx
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\scanner
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\script
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\script\vba
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sheet
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\smarttags
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\style
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\svg
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sync2
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\system
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\table
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony\DIALER
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\text
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xsd
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\inspection
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\ui
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\ui\dialogs
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\uno
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\uri
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\util
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\util\logging
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\view
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\input
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\sax
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\xpath
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\events
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\views
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\loader
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\task
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\ucb
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\plugin
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\setup
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\client
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sadmind
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sofficed
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\system
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\mozilla
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\ldap
-
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star
-
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\i18n
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\ui
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\form
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\script
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\script\browse
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\script\provider
-#i20156 - add xmlsecurity module related
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\security
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto\sax
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\csax
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\wrapper
-#i20156 - end
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf
-
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\access
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\adodb
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\dao
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\excel
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\msforms
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\office
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\powerpoint
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\stdole
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\word
-mkdir: %_DEST%\inc%_EXT%\offuh\msforms
-
-
-
-..\%__SRC%\inc\offuh\com\sun\star\auth\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\auth\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\auth\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\auth\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\accessibility\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\accessibility\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\accessibility\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\accessibility\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\awt\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\awt\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\awt\tab\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tab\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\awt\tab\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tab\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\beans\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\beans\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\beans\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\beans\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\bridge\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\bridge\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\bridge\oleautomation\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\oleautomation\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\bridge\oleautomation\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\oleautomation\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\chart\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\chart\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\chart\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\chart\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\chart2\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\chart2\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\chart2\data\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2\data\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\chart2\data\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2\data\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\configuration\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\configuration\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\configuration\backend\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration\backend\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\configuration\backend\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration\backend\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\container\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\container\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\container\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\container\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\connection\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\connection\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\connection\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\connection\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\data\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\data\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\data\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\data\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\deployment\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\deployment\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\deployment\ui\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment\ui\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\deployment\ui\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment\ui\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\clipboard\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\clipboard\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\dnd\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\dnd\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\dnd\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\dnd\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\daemons\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\daemons\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\daemons\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\daemons\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\document\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\document\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\document\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\document\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\drawing\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\drawing\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\drawing\framework\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing\framework\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\drawing\framework\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing\framework\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\geometry\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\geometry\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\geometry\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\geometry\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\rendering\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\rendering\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\rendering\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\rendering\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\embed\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\embed\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\embed\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\embed\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xforms\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xforms\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xforms\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xforms\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\binding\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\binding\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\binding\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\binding\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\validation\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\validation\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\validation\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\validation\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\submission\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\submission\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\submission\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\submission\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\runtime\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\runtime\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\runtime\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\runtime\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\inspection\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\inspection\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\inspection\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\inspection\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\formula\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\formula\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\formula\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\formula\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\frame\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\frame\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\frame\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\frame\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\frame\status\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\frame\status\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\frame\status\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\frame\status\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\gallery\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\gallery\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\gallery\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\gallery\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\graphic\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\graphic\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\graphic\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\graphic\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\i18n\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\i18n\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\i18n\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\i18n\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\installation\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\installation\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\installation\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\installation\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\io\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\io\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\io\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\io\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\java\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\java\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\java\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\java\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\lang\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\lang\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\lang\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\lang\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\logging\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\logging\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\logging\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\logging\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\office\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\office\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\office\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\office\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\mail\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\mail\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\mail\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\mail\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\media\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\media\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\media\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\media\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\packages\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\packages\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\packages\manifest\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\manifest\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\packages\manifest\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\manifest\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\packages\zip\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\zip\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\packages\zip\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\zip\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\presentation\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\presentation\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\presentation\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\presentation\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\animations\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\animations\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\animations\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\animations\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\reflection\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\reflection\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\reflection\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\reflection\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\registry\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\registry\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\registry\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\registry\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\report\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\report\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\report\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\report\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\report\inspection\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\report\inspection\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\report\inspection\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\report\inspection\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\report\meta\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\report\meta\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\report\meta\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\report\meta\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\resource\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\resource\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\resource\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\resource\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdb\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdb\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sdb\tools\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\tools\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdb\tools\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\tools\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sdb\application\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\application\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdb\application\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\application\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sdbc\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbc\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdbc\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbc\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sdbcx\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbcx\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdbcx\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbcx\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\scanner\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\scanner\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\scanner\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\scanner\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\script\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\script\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\script\vba\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\vba\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\script\vba\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\vba\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sheet\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sheet\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sheet\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sheet\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\smarttags\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\smarttags\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\smarttags\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\smarttags\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\svg\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\svg\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\svg\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\svg\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\style\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\style\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\style\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\style\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sync2\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sync2\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sync2\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sync2\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\system\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\system\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\system\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\system\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\table\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\table\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\table\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\table\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\telephony\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\telephony\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\telephony\DIALER\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony\DIALER\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\telephony\DIALER\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony\DIALER\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\text\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\text\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\text\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\text\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xsd\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xsd\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xsd\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xsd\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\inspection\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\inspection\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\inspection\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\inspection\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\ui\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\ui\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\ui\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\ui\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\ui\dialogs\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\ui\dialogs\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\ui\dialogs\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\ui\dialogs\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\uno\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\uno\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\uno\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\uno\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\uri\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\uri\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\uri\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\uri\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\util\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\util\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\util\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\util\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\util\logging\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\util\logging\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\util\logging\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\util\logging\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\view\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\view\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\view\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\view\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\input\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\input\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\input\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\input\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\sax\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\sax\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\sax\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\sax\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\events\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\events\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\events\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\events\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\views\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\views\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\views\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\views\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\xpath\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\xpath\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\xpath\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\xpath\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\loader\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\loader\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\loader\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\loader\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\task\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\task\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\task\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\task\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\ucb\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\ucb\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\ucb\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\ucb\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\plugin\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\plugin\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\plugin\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\plugin\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\setup\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\setup\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\setup\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\setup\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\portal\client\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\client\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\portal\client\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\client\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sadmind\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sadmind\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sofficed\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sofficed\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\portal\system\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\system\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\portal\system\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\system\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\mozilla\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\mozilla\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\mozilla\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\mozilla\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\ldap\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\ldap\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\ldap\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\ldap\*.hdl
-
-..\%__SRC%\inc\offuh\drafts\com\sun\star\i18n\*.hpp %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\i18n\*.hpp
-..\%__SRC%\inc\offuh\drafts\com\sun\star\i18n\*.hdl %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\i18n\*.hdl
-
-..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\browse\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\browse\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\provider\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\provider\*.hdl
-
-..\%__SRC%\inc\offuh\drafts\com\sun\star\form\*.hpp %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\form\*.hpp
-..\%__SRC%\inc\offuh\drafts\com\sun\star\form\*.hdl %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\form\*.hdl
-
-#i20156 - add xmlsecurity module related
-..\%__SRC%\inc\offuh\com\sun\star\security\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\security\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\security\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\security\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\sax\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto\sax\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\sax\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto\sax\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\csax\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\csax\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\csax\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\csax\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\wrapper\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\wrapper\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\wrapper\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\wrapper\*.hdl
-#i20156 - end
-
-..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf\*.hdl
-
-..\%__SRC%\inc\offuh\ooo\vba\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\access\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\access\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\access\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\access\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\adodb\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\adodb\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\adodb\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\adodb\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\dao\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\dao\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\dao\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\dao\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\excel\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\excel\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\excel\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\excel\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\msforms\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\msforms\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\msforms\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\msforms\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\office\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\office\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\office\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\office\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\powerpoint\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\powerpoint\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\powerpoint\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\powerpoint\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\stdole\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\stdole\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\stdole\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\stdole\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\word\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\word\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\word\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\word\*.hdl
-..\%__SRC%\inc\offuh\msforms\*.hpp %_DEST%\inc%_EXT%\offuh\msforms\*.hpp
-..\%__SRC%\inc\offuh\msforms\*.hdl %_DEST%\inc%_EXT%\offuh\msforms\*.hdl
-
diff --git a/offuh/source/makefile.mk b/offuh/source/makefile.mk
deleted file mode 100644
index 230dc750a..000000000
--- a/offuh/source/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=	offuh
-TARGET=		offuh
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Targets ------------------------------------------------------
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)$/oovbaapi.don $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(UNOUCRRDB)
-    @@-$(RM) $@
-    $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
-
-$(MISC)$/oovbaapi.don : $(SOLARBINDIR)$/oovbaapi.rdb
-    @@-$(RM) $@
-        $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
diff --git a/pyuno/demo/biblioaccess.py b/pyuno/demo/biblioaccess.py
index ac9cf6404..59d843ad6 100644
--- a/pyuno/demo/biblioaccess.py
+++ b/pyuno/demo/biblioaccess.py
@@ -1,35 +1,36 @@
-import uno
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 
+import uno
 from com.sun.star.sdb.CommandType import COMMAND
 
 def main():
-
     connectionString = "socket,host=localhost,port=2002"
-    
-    url = "uno:"+connectionString + ";urp;StarOffice.ComponentContext"
-    
+
+    url = "uno:" + connectionString + ";urp;StarOffice.ComponentContext"
+
     localCtx = uno.getComponentContext()
     localSmgr = localCtx.ServiceManager
     resolver = localSmgr.createInstanceWithContext(
         "com.sun.star.bridge.UnoUrlResolver", localCtx)
-    ctx = resolver.resolve( url )
+    ctx = resolver.resolve(url)
     smgr = ctx.ServiceManager
 
-    rowset =smgr.createInstanceWithContext( "com.sun.star.sdb.RowSet", ctx )
+    rowset =smgr.createInstanceWithContext("com.sun.star.sdb.RowSet", ctx)
     rowset.DataSourceName = "Bibliography"
     rowset.CommandType = COMMAND
     rowset.Command = "SELECT IDENTIFIER, AUTHOR FROM biblio"
 
     rowset.execute();
 
-    print "Identifier\tAuthor"
+    print("Identifier\tAuthor")
 
-    id = rowset.findColumn( "IDENTIFIER" )
-    author = rowset.findColumn( "AUTHOR" )
+    id = rowset.findColumn("IDENTIFIER")
+    author = rowset.findColumn("AUTHOR")
     while rowset.next():
-        print rowset.getString( id ) + "\t" + repr( rowset.getString( author ) )
-
+        print(rowset.getString(id) + "\t" + repr(rowset.getString(author)))
 
     rowset.dispose();
 
 main()
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/hello_world_comp.py b/pyuno/demo/hello_world_comp.py
index a9bc48885..32f405628 100644
--- a/pyuno/demo/hello_world_comp.py
+++ b/pyuno/demo/hello_world_comp.py
@@ -1,3 +1,5 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
 import uno
 import unohelper
 
@@ -5,36 +7,37 @@ from com.sun.star.task import XJobExecutor
 
 # implement a UNO component by deriving from the standard unohelper.Base class
 # and from the interface(s) you want to implement.
-class HelloWorldJob( unohelper.Base, XJobExecutor ):
-    def __init__( self, ctx ):
+class HelloWorldJob(unohelper.Base, XJobExecutor):
+    def __init__(self, ctx):
         # store the component context for later use
         self.ctx = ctx
-        
-    def trigger( self, args ):
+
+    def trigger(self, args):
         # note: args[0] == "HelloWorld", see below config settings
-    
+
         # retrieve the desktop object
         desktop = self.ctx.ServiceManager.createInstanceWithContext(
-            "com.sun.star.frame.Desktop", self.ctx )
-	    
+            "com.sun.star.frame.Desktop", self.ctx)
+
         # get current document model
         model = desktop.getCurrentComponent()
 
-	# access the document's text property
-	text = model.Text
+        # access the document's text property
+        text = model.Text
 
-	# create a cursor
-	cursor = text.createTextCursor()
+        # create a cursor
+        cursor = text.createTextCursor()
 
-	# insert the text into the document
-	text.insertString( cursor, "Hello World", 0 )
+        # insert the text into the document
+        text.insertString(cursor, "Hello World", 0)
 
 # pythonloader looks for a static g_ImplementationHelper variable
 g_ImplementationHelper = unohelper.ImplementationHelper()
 
-# 
 g_ImplementationHelper.addImplementation( \
-	HelloWorldJob,                        # UNO object class
-	"org.openoffice.comp.pyuno.demo.HelloWorld", # implemenation name 
-	("com.sun.star.task.Job",),)          # list of implemented services
-	                                      # (the only service)
+    HelloWorldJob,                               # UNO object class
+    "org.openoffice.comp.pyuno.demo.HelloWorld", # implemenation name
+    ("com.sun.star.task.Job",),)                 # list of implemented services
+                                                 # (the only service)
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/makefile.mk b/pyuno/demo/makefile.mk
index 7911048f8..e00a2fb7c 100644
--- a/pyuno/demo/makefile.mk
+++ b/pyuno/demo/makefile.mk
@@ -4,41 +4,39 @@ PRJ=..
 .INCLUDE : settings.mk
 .INCLUDE : pyversion.mk
 
-ROOT=$(MISC)$/pyuno-doc
-
+ROOT=$(MISC)/pyuno-doc
 
 FILES=\
-    $(ROOT)$/python-bridge.html 		\
-    $(ROOT)$/customized_setup.png 		\
-    $(ROOT)$/mode_component.png 		\
-    $(ROOT)$/mode_ipc.png			\
-    $(ROOT)$/modes.sxd			\
-    $(ROOT)$/optional_components.png       	\
-    $(ROOT)$/samples$/swriter.py		\
-    $(ROOT)$/samples$/swritercomp.py	\
-    $(ROOT)$/samples$/ooextract.py		\
-    $(ROOT)$/samples$/biblioaccess.py	\
-    $(ROOT)$/samples$/swritercompclient.py	\
-    $(ROOT)$/samples$/hello_world_pyuno.zip	
-
-
-
-$(MISC)$/pyuno-doc.zip : dirs $(FILES) 
-    -rm -f $@
-    cd $(MISC) && zip -r pyuno-doc.zip pyuno-doc
-dirs .PHONY : 
-    -mkdir $(ROOT)
-    -mkdir $(ROOT)$/samples
-
-
-$(ROOT)$/samples$/hello_world_pyuno.zip : hello_world_comp.py Addons.xcu
-    -rm -f $@
-    zip $@ hello_world_comp.py Addons.xcu
-
-$(ROOT)$/samples$/% : %
-    -rm -f $@
-    cat $? > $@
-
-$(ROOT)$/% : ..$/doc$/%
-    -rm -f $@
-    cat $? > $@
+    $(ROOT)/python-bridge.html \
+    $(ROOT)/customized_setup.png \
+    $(ROOT)/mode_component.png \
+    $(ROOT)/mode_ipc.png \
+    $(ROOT)/modes.sxd \
+    $(ROOT)/optional_components.png \
+    $(ROOT)/samples/swriter.py \
+    $(ROOT)/samples/swritercomp.py \
+    $(ROOT)/samples/ooextract.py \
+    $(ROOT)/samples/biblioaccess.py \
+    $(ROOT)/samples/swritercompclient.py \
+    $(ROOT)/samples/hello_world_pyuno.zip
+
+
+$(MISC)/pyuno-doc.zip : dirs $(FILES)
+	-rm -f $@
+	cd $(MISC) && zip -r pyuno-doc.zip pyuno-doc
+
+dirs .PHONY :
+	-mkdir $(ROOT)
+	-mkdir $(ROOT)/samples
+
+$(ROOT)/samples/hello_world_pyuno.zip : hello_world_comp.py Addons.xcu
+	-rm -f $@
+	zip $@ hello_world_comp.py Addons.xcu
+
+$(ROOT)/samples/% : %
+	-rm -f $@
+	$(COPY) $? $@
+
+$(ROOT)/% : ../doc/%
+	-rm -f $@
+	$(COPY) $? $@
diff --git a/pyuno/demo/ooextract.py b/pyuno/demo/ooextract.py
index 057fa0496..3959bf74b 100644
--- a/pyuno/demo/ooextract.py
+++ b/pyuno/demo/ooextract.py
@@ -1,3 +1,5 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
 import getopt,sys
 import uno
 from unohelper import Base,systemPathToFileUrl, absolutize
@@ -8,26 +10,25 @@ from com.sun.star.beans.PropertyState import DIRECT_VALUE
 from com.sun.star.uno import Exception as UnoException
 from com.sun.star.io import IOException,XInputStream, XOutputStream
 
-class OutputStream( Base, XOutputStream ):
-      def __init__( self ):
-	  self.closed = 0
-	  
-      def closeOutput(self):
-	  self.closed = 1
+class OutputStream(Base, XOutputStream):
+    def __init__(self):
+        self.closed = 0
+
+    def closeOutput(self):
+        self.closed = 1
 
-      def writeBytes( self, seq ):
-	  sys.stdout.write( seq.value )
+    def writeBytes(self, seq):
+        sys.stdout.write(seq.value)
 
-      def flush( self ):
-	  pass
-      
+    def flush(self):
+        pass
 
 def main():
     retVal = 0
     doc = None
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "hc:",["help", "connection-string=" , "html"])
+        opts, args = getopt.getopt(sys.argv[1:], "hc:", ["help", "connection-string=", "html"])
         format = None
         url = "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext"
         filterName = "Text (Encoded)"
@@ -35,61 +36,61 @@ def main():
             if o in ("-h", "--help"):
                 usage()
                 sys.exit()
-            if o in ("-c", "--connection-string" ):
+            if o in ("-c", "--connection-string"):
                 url = "uno:" + a + ";urp;StarOffice.ComponentContext"
             if o == "--html":
                 filterName = "HTML (StarWriter)"
-            
-        print filterName
-        if not len( args ):
-              usage()
-              sys.exit()
-              
+
+        print(filterName)
+        if not len(args):
+            usage()
+            sys.exit()
+
         ctxLocal = uno.getComponentContext()
         smgrLocal = ctxLocal.ServiceManager
 
         resolver = smgrLocal.createInstanceWithContext(
-                 "com.sun.star.bridge.UnoUrlResolver", ctxLocal )
-        ctx = resolver.resolve( url )
+                 "com.sun.star.bridge.UnoUrlResolver", ctxLocal)
+        ctx = resolver.resolve(url)
         smgr = ctx.ServiceManager
 
-        desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", ctx )
+        desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", ctx)
 
-        cwd = systemPathToFileUrl( getcwd() )
+        cwd = systemPathToFileUrl(getcwd())
         outProps = (
-            PropertyValue( "FilterName" , 0, filterName , 0 ),
-            PropertyValue( "OutputStream",0, OutputStream(),0))
-        inProps = PropertyValue( "Hidden" , 0 , True, 0 ),
+            PropertyValue("FilterName" , 0, filterName, 0),
+            PropertyValue("OutputStream", 0, OutputStream(), 0))
+        inProps = PropertyValue("Hidden", 0 , True, 0),
         for path in args:
             try:
-                fileUrl = uno.absolutize( cwd, systemPathToFileUrl(path) )
-                doc = desktop.loadComponentFromURL( fileUrl , "_blank", 0,inProps)
+                fileUrl = uno.absolutize(cwd, systemPathToFileUrl(path))
+                doc = desktop.loadComponentFromURL(fileUrl , "_blank", 0, inProps)
 
                 if not doc:
-                    raise UnoException( "Couldn't open stream for unknown reason", None )
+                    raise UnoException("Could not open stream for unknown reason", None)
 
-                doc.storeToURL("private:stream",outProps)
-            except IOException, e:
-                sys.stderr.write( "Error during conversion: " + e.Message + "\n" )
+                doc.storeToURL("private:stream", outProps)
+            except IOException as e:
+                sys.stderr.write("Error during conversion: " + e.Message + "\n")
                 retVal = 1
-            except UnoException, e:
-                sys.stderr.write( "Error ("+repr(e.__class__)+") during conversion:" + e.Message + "\n" )
+            except UnoException as e:
+                sys.stderr.write("Error (" + repr(e.__class__) + ") during conversion: " + e.Message + "\n")
                 retVal = 1
             if doc:
                 doc.dispose()
 
-    except UnoException, e:
-        sys.stderr.write( "Error ("+repr(e.__class__)+") :" + e.Message + "\n" )
+    except UnoException as e:
+        sys.stderr.write("Error (" + repr(e.__class__) + "): " + e.Message + "\n")
         retVal = 1
-    except getopt.GetoptError,e:
-        sys.stderr.write( str(e) + "\n" )
+    except getopt.GetoptError as e:
+        sys.stderr.write(str(e) + "\n")
         usage()
         retVal = 1
 
     sys.exit(retVal)
-    
+
 def usage():
-    sys.stderr.write( "usage: ooextract.py --help |\n"+
+    sys.stderr.write("usage: ooextract.py --help |\n"+
                   "       [-c <connection-string> | --connection-string=<connection-string>\n"+
                   "       file1 file2 ...\n"+
                   "\n" +
@@ -106,4 +107,6 @@ def usage():
                   "        Instead of the text filter, the writer html filter is used\n"
                   )
 
-main()    
+main()
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/pyunoenv.tcsh b/pyuno/demo/pyunoenv.tcsh
index 038cf2ddb..dbe69d0ec 100644
--- a/pyuno/demo/pyunoenv.tcsh
+++ b/pyuno/demo/pyunoenv.tcsh
@@ -18,13 +18,15 @@ setenv LD_LIBRARY_PATH
 endif
 
 if( "$PYTHONPATH" != "" ) then
-	setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH
+    setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH
 else
-	setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib
+    setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib
 endif
-	
+
 setenv LD_LIBRARY_PATH $OOOHOME/program:$LD_LIBRARY_PATH
 
 if( $?PYTHONHOME ) then
 setenv PATH $PYTHONHOME/bin:$PATH
 endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/swriter.py b/pyuno/demo/swriter.py
index 05ab332fd..bf40a56e9 100644
--- a/pyuno/demo/swriter.py
+++ b/pyuno/demo/swriter.py
@@ -1,8 +1,10 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 
-# bootstrap uno component context 	
+# bootstrap uno component context
 import uno
 import unohelper
 
+from com.sun.star.lang import IllegalArgumentException
 
 # a UNO struct later needed to create a document
 from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
@@ -17,9 +19,9 @@ def insertTextIntoCell( table, cellName, text, color ):
     tableText.setString( text )
 
 localContext = uno.getComponentContext()
-				   
+
 resolver = localContext.ServiceManager.createInstanceWithContext(
-				"com.sun.star.bridge.UnoUrlResolver", localContext )
+           "com.sun.star.bridge.UnoUrlResolver", localContext )
 
 smgr = resolver.resolve( "uno:socket,host=localhost,port=2002;urp;StarOffice.ServiceManager" )
 remoteContext = smgr.getPropertyValue( "DefaultContext" )
@@ -41,15 +43,15 @@ text.insertString( cursor, "Now we are in the second line\n" , 0 )
 table = doc.createInstance( "com.sun.star.text.TextTable" )
 
 # with 4 rows and 4 columns
-table.initialize( 4,4)
+table.initialize(4, 4)
 
 text.insertTextContent( cursor, table, 0 )
 rows = table.Rows
 
-table.setPropertyValue( "BackTransparent", uno.Bool(0) )
+table.setPropertyValue( "BackTransparent", False )
 table.setPropertyValue( "BackColor", 13421823 )
 row = rows.getByIndex(0)
-row.setPropertyValue( "BackTransparent", uno.Bool(0) )
+row.setPropertyValue( "BackTransparent", False )
 row.setPropertyValue( "BackColor", 6710932 )
 
 textColor = 16777215
@@ -59,9 +61,6 @@ insertTextIntoCell( table, "B1", "SecondColumn", textColor )
 insertTextIntoCell( table, "C1", "ThirdColumn", textColor )
 insertTextIntoCell( table, "D1", "SUM", textColor )
 
-values = ( (22.5,21.5,121.5),
-	   (5615.3,615.3,-615.3),
-	   (-2315.7,315.7,415.7) )
 table.getCellByName("A2").setValue(22.5)
 table.getCellByName("B2").setValue(5615.3)
 table.getCellByName("C2").setValue(-2315.7)
@@ -79,7 +78,7 @@ table.getCellByName("D4").setFormula("sum <A4:C4>")
 
 
 cursor.setPropertyValue( "CharColor", 255 )
-cursor.setPropertyValue( "CharShadowed", uno.Bool(1) )
+cursor.setPropertyValue( "CharShadowed", True )
 
 text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
 text.insertString( cursor, " This is a colored Text - blue with shadow\n" , 0 )
@@ -99,7 +98,8 @@ textInTextFrame.insertString( cursorInTextFrame, "\nWith this second line the he
 text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
 
 cursor.setPropertyValue( "CharColor", 65536 )
-cursor.setPropertyValue( "CharShadowed", uno.Bool(0) )
+cursor.setPropertyValue( "CharShadowed", False )
 
-text.insertString( cursor, " That's all for now !!" , 0 )
+text.insertString( cursor, " That's all for now!" , 0 )
 
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/swritercomp.py b/pyuno/demo/swritercomp.py
index 6f8f30607..fd7025f04 100644
--- a/pyuno/demo/swritercomp.py
+++ b/pyuno/demo/swritercomp.py
@@ -1,3 +1,5 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
 # just a simple copy of the swriter.py demo, but implemented as a component. The advantage is,
 # that the component may run within the office process which may give a performance improvement.
 
@@ -21,92 +23,89 @@ def insertTextIntoCell( table, cellName, text, color ):
 # implementing the interface com.sun.star.lang.XMain
 # unohelper.Base implements the XTypeProvider interface
 class SWriterComp(XMain,unohelper.Base):
-      def __init__( self, ctx ):
-	  self.ctx = ctx
-
-      # implementation for XMain.run( [in] sequence< any > )	  
-      def run( self,args ):
+    def __init__( self, ctx ):
+        self.ctx = ctx
 
-	 ctx = self.ctx
-	 smgr = ctx.ServiceManager
-	 desktop = smgr.createInstanceWithContext( "com.sun.star.frame.Desktop",ctx)
+    # implementation for XMain.run( [in] sequence< any > )
+    def run( self,args ):
+        ctx = self.ctx
+        smgr = ctx.ServiceManager
+        desktop = smgr.createInstanceWithContext( "com.sun.star.frame.Desktop",ctx)
 
-	 # open a writer document
-	 doc = desktop.loadComponentFromURL( "private:factory/swriter","_blank", 0, () )
+        # open a writer document
+        doc = desktop.loadComponentFromURL( "private:factory/swriter","_blank", 0, () )
 
-	 text = doc.Text
-	 cursor = text.createTextCursor()
-	 text.insertString( cursor, "The first line in the newly created text document.\n", 0 )
-	 text.insertString( cursor, "Now we are in the second line\n" , 0 )
+        text = doc.Text
+        cursor = text.createTextCursor()
+        text.insertString( cursor, "The first line in the newly created text document.\n", 0 )
+        text.insertString( cursor, "Now we are in the second line\n" , 0 )
 
-	 # create a text table
-	 table = doc.createInstance( "com.sun.star.text.TextTable" )
+        # create a text table
+        table = doc.createInstance( "com.sun.star.text.TextTable" )
 
-	 # with 4 rows and 4 columns
-	 table.initialize( 4,4)
+        # with 4 rows and 4 columns
+        table.initialize( 4,4)
 
-	 text.insertTextContent( cursor, table, 0 )
-	 rows = table.Rows
+        text.insertTextContent( cursor, table, 0 )
+        rows = table.Rows
 
-	 table.setPropertyValue( "BackTransparent", uno.Bool(0) )
-	 table.setPropertyValue( "BackColor", 13421823 )
-	 row = rows.getByIndex(0)
-	 row.setPropertyValue( "BackTransparent", uno.Bool(0) )
-	 row.setPropertyValue( "BackColor", 6710932 )
+        table.setPropertyValue( "BackTransparent", uno.Bool(0) )
+        table.setPropertyValue( "BackColor", 13421823 )
+        row = rows.getByIndex(0)
+        row.setPropertyValue( "BackTransparent", uno.Bool(0) )
+        row.setPropertyValue( "BackColor", 6710932 )
 
-	 textColor = 16777215
+        textColor = 16777215
 
-	 insertTextIntoCell( table, "A1", "FirstColumn", textColor )
-	 insertTextIntoCell( table, "B1", "SecondColumn", textColor )
-	 insertTextIntoCell( table, "C1", "ThirdColumn", textColor )
-	 insertTextIntoCell( table, "D1", "SUM", textColor )
+        insertTextIntoCell( table, "A1", "FirstColumn", textColor )
+        insertTextIntoCell( table, "B1", "SecondColumn", textColor )
+        insertTextIntoCell( table, "C1", "ThirdColumn", textColor )
+        insertTextIntoCell( table, "D1", "SUM", textColor )
 
-	 values = ( (22.5,21.5,121.5),
-	 	   (5615.3,615.3,-615.3),
-		   (-2315.7,315.7,415.7) )
-         table.getCellByName("A2").setValue(22.5)
-	 table.getCellByName("B2").setValue(5615.3)
-	 table.getCellByName("C2").setValue(-2315.7)
-	 table.getCellByName("D2").setFormula("sum <A2:C2>")
+        table.getCellByName("A2").setValue(22.5)
+        table.getCellByName("B2").setValue(5615.3)
+        table.getCellByName("C2").setValue(-2315.7)
+        table.getCellByName("D2").setFormula("sum <A2:C2>")
 
-	 table.getCellByName("A3").setValue(21.5)
-	 table.getCellByName("B3").setValue(615.3)
-	 table.getCellByName("C3").setValue(-315.7)
-	 table.getCellByName("D3").setFormula("sum <A3:C3>")
+        table.getCellByName("A3").setValue(21.5)
+        table.getCellByName("B3").setValue(615.3)
+        table.getCellByName("C3").setValue(-315.7)
+        table.getCellByName("D3").setFormula("sum <A3:C3>")
 
-	 table.getCellByName("A4").setValue(121.5)
-	 table.getCellByName("B4").setValue(-615.3)
-	 table.getCellByName("C4").setValue(415.7)
-	 table.getCellByName("D4").setFormula("sum <A4:C4>")
+        table.getCellByName("A4").setValue(121.5)
+        table.getCellByName("B4").setValue(-615.3)
+        table.getCellByName("C4").setValue(415.7)
+        table.getCellByName("D4").setFormula("sum <A4:C4>")
 
 
-	 cursor.setPropertyValue( "CharColor", 255 )
-	 cursor.setPropertyValue( "CharShadowed", uno.Bool(1) )
+        cursor.setPropertyValue( "CharColor", 255 )
+        cursor.setPropertyValue( "CharShadowed", uno.Bool(1) )
 
-	 text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
-	 text.insertString( cursor, " This is a colored Text - blue with shadow\n" , 0 )
-	 text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
+        text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
+        text.insertString( cursor, " This is a colored Text - blue with shadow\n" , 0 )
+        text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
 
-	 textFrame = doc.createInstance( "com.sun.star.text.TextFrame" )
-	 textFrame.setSize( Size(15000,400))
-	 textFrame.setPropertyValue( "AnchorType" , AS_CHARACTER )
+        textFrame = doc.createInstance( "com.sun.star.text.TextFrame" )
+        textFrame.setSize( Size(15000,400))
+        textFrame.setPropertyValue( "AnchorType" , AS_CHARACTER )
 
-	 text.insertTextContent( cursor, textFrame, 0 )
+        text.insertTextContent( cursor, textFrame, 0 )
 
-	 textInTextFrame = textFrame.getText()
-	 cursorInTextFrame = textInTextFrame.createTextCursor()
-	 textInTextFrame.insertString( cursorInTextFrame, "The first line in the newly created text frame.", 0 )
-	 textInTextFrame.insertString( cursorInTextFrame, "\nWith this second line the height of the rame raises.",0)
-	 text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
+        textInTextFrame = textFrame.getText()
+        cursorInTextFrame = textInTextFrame.createTextCursor()
+        textInTextFrame.insertString( cursorInTextFrame, "The first line in the newly created text frame.", 0 )
+        textInTextFrame.insertString( cursorInTextFrame, "\nWith this second line the height of the rame raises.",0)
+        text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
 
-	 cursor.setPropertyValue( "CharColor", 65536 )
-	 cursor.setPropertyValue( "CharShadowed", uno.Bool(0) )
-
-	 text.insertString( cursor, " That's all for now !!" , 0 )
-	 return 0
+        cursor.setPropertyValue( "CharColor", 65536 )
+        cursor.setPropertyValue( "CharShadowed", uno.Bool(0) )
 
+        text.insertString( cursor, " That's all for now!" , 0 )
+        return 0
 
 # pythonloader looks for a static g_ImplementationHelper variable
 g_ImplementationHelper = unohelper.ImplementationHelper()
 g_ImplementationHelper.addImplementation( \
-	SWriterComp,"org.openoffice.comp.pyuno.swriter",("org.openoffice.demo.SWriter",),)
+    SWriterComp,"org.openoffice.comp.pyuno.swriter",("org.openoffice.demo.SWriter",),)
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/swritercompclient.py b/pyuno/demo/swritercompclient.py
index 1076a69eb..19ca6b5c1 100644
--- a/pyuno/demo/swritercompclient.py
+++ b/pyuno/demo/swritercompclient.py
@@ -1,9 +1,10 @@
-# instantiating
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
 import uno
 
 localContext = uno.getComponentContext()
 resolver = localContext.ServiceManager.createInstanceWithContext(
-				"com.sun.star.bridge.UnoUrlResolver", localContext )
+           "com.sun.star.bridge.UnoUrlResolver", localContext )
 remoteContext = resolver.resolve( "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext" )
 remoteSmgr = remoteContext.ServiceManager
 
@@ -11,3 +12,4 @@ pyComp = remoteSmgr.createInstanceWithContext( "org.openoffice.demo.SWriter" , r
 
 pyComp.run( (), )
 
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx
index fcb051c33..6ccf1d374 100644
--- a/pyuno/inc/pyuno/pyuno.hxx
+++ b/pyuno/inc/pyuno/pyuno.hxx
@@ -45,8 +45,12 @@
     preconditions: python has been initialized before and
                    the global interpreter lock is held 
 */
-extern "C" PY_DLLEXPORT void SAL_CALL initpyuno();
-
+extern "C" PY_DLLEXPORT
+#if PY_MAJOR_VERSION >= 3
+    PyObject* SAL_CALL PyInit_pyuno();
+#else
+   void SAL_CALL initpyuno();
+#endif
 
 namespace pyuno
 {
diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst
index 5a3b2c179..e6e0914eb 100644
--- a/pyuno/prj/build.lst
+++ b/pyuno/prj/build.lst
@@ -1,5 +1,5 @@
-bgpu	pyuno	:	stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
-pu	pyuno				  usr1	-	all	br_mkout NULL
-pu	pyuno\zipcore	nmake	-	all	pu_zipcore NULL
-pu	pyuno\source\module	nmake	-	all	pu_module NULL
-pu	pyuno\source\loader	nmake	-	all	pu_loader pu_module NULL
+bgpu  pyuno : stoc DESKTOP:cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
+pu    pyuno usr1 - all br_mkout NULL
+pu    pyuno\zipcore nmake - all pu_zipcore NULL
+pu    pyuno\source\module nmake - all pu_module NULL
+pu    pyuno\source\loader nmake - all pu_loader pu_module NULL
diff --git a/pyuno/prj/d.lst b/pyuno/prj/d.lst
index 1dd212ea9..38ae95de2 100644
--- a/pyuno/prj/d.lst
+++ b/pyuno/prj/d.lst
@@ -1,26 +1,27 @@
-mkdir: %_DEST%\bin%_EXT%\pyuno
-mkdir: %_DEST%\lib%_EXT%\pyuno
+mkdir: %_DEST%\bin\pyuno
+mkdir: %_DEST%\lib\pyuno
 
-..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so
-..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib
-..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so
-..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so
-..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib
-..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\pyuno\unohelper.py
-..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pyuno\pythonloader.py
-..\%__SRC%\lib\uno.py %_DEST%\lib%_EXT%\pyuno\uno.py
+..\%__SRC%\lib\libpyuno.so %_DEST%\lib\libpyuno.so
+..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib\libpyuno.dylib
+..\%__SRC%\lib\pyuno.so %_DEST%\lib\pyuno.so
+..\%__SRC%\lib\pyuno.dylib %_DEST%\lib\pyuno.dylib
+..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib\pythonloader.uno.so
+..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib\pythonloader.uno.dylib
+..\%__SRC%\lib\unohelper.py %_DEST%\lib\pyuno\unohelper.py
+..\%__SRC%\lib\pythonloader.py %_DEST%\lib\pyuno\pythonloader.py
+..\%__SRC%\lib\uno.py %_DEST%\lib\pyuno\uno.py
 ..\%__SRC%\misc\pythonloader.component %_DEST%\xml\pythonloader.component
 
-..\%__SRC%\bin\unohelper.py %_DEST%\bin%_EXT%\pyuno\unohelper.py
-..\%__SRC%\bin\pythonloader.py %_DEST%\bin%_EXT%\pyuno\pythonloader.py
-..\%__SRC%\bin\uno.py %_DEST%\bin%_EXT%\pyuno\uno.py
-..\%__SRC%\bin\pyuno.pyd %_DEST%\bin%_EXT%\pyuno.pyd
-..\%__SRC%\bin\pyuno.dll %_DEST%\bin%_EXT%\pyuno.dll
-..\%__SRC%\bin\pythonl*.dll %_DEST%\bin%_EXT%\pythonl*.dll
+..\%__SRC%\bin\unohelper.py %_DEST%\bin\pyuno\unohelper.py
+..\%__SRC%\bin\pythonloader.py %_DEST%\bin\pyuno\pythonloader.py
+..\%__SRC%\bin\uno.py %_DEST%\bin\pyuno\uno.py
+..\%__SRC%\bin\pyuno.pyd %_DEST%\bin\pyuno.pyd
+..\%__SRC%\bin\pyuno.dll %_DEST%\bin\pyuno.dll
+..\%__SRC%\bin\pythonl*.dll %_DEST%\bin\pythonl*.dll
 
-..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc
-..\%__SRC%\misc\pyuno.ini %_DEST%\bin%_EXT%\pyuno.ini
-..\%__SRC%\bin\python-core-*.zip %_DEST%\bin%_EXT%\python-core-*.zip
-..\%__SRC%\bin\python.bin %_DEST%\bin%_EXT%\python.bin
-..\%__SRC%\bin\python.sh %_DEST%\bin%_EXT%\pyuno\python
-..\%__SRC%\bin\python.exe %_DEST%\bin%_EXT%\pyuno\python.exe
+..\%__SRC%\misc\pyunorc %_DEST%\lib\pyunorc
+..\%__SRC%\misc\pyuno.ini %_DEST%\bin\pyuno.ini
+..\%__SRC%\bin\python-core-*.zip %_DEST%\bin\python-core-*.zip
+..\%__SRC%\bin\python.bin %_DEST%\bin\python.bin
+..\%__SRC%\bin\python.sh %_DEST%\bin\pyuno\python
+..\%__SRC%\bin\python.exe %_DEST%\bin\pyuno\python.exe
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index 65ec8116f..3f7a33ced 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -24,7 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
+PRJ=../..
 
 PRJNAME=pyuno
 TARGET=pythonloader.uno
@@ -32,15 +32,15 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  settings.mk
+.INCLUDE : settings.mk
 .IF "$(L10N_framework)"==""
-DLLPRE = 
+DLLPRE =
 
 #-------------------------------------------------------------------
 
 .IF "$(OS)$(COMEX)" == "SOLARIS4"
 # no -Bdirect for SunWS CC
-DIRECT = $(LINKFLAGSDEFS)
+DIRECT= $(LINKFLAGSDEFS)
 .ENDIF
 
 .IF "$(SYSTEM_PYTHON)" == "YES"
@@ -50,45 +50,45 @@ CFLAGS+=$(PYTHON_CFLAGS)
 PYTHONLIB+=-framework Python
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ELSE
-.INCLUDE :  pyversion.mk
+.INCLUDE : pyversion.mk
 
-CFLAGS+=-I$(SOLARINCDIR)$/python
+CFLAGS+=-I$(SOLARINCDIR)/python
 .ENDIF
 
-SHL1TARGET=	$(TARGET)
+SHL1TARGET=$(TARGET)
 
 SHL1STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)		\
-        $(PYUNOLIB)		\
+        $(CPPULIB) \
+        $(CPPUHELPERLIB) \
+        $(SALLIB) \
+        $(PYUNOLIB) \
         $(PYTHONLIB)
 
-SHL1VERSIONMAP=$(SOLARENV)$/src$/component.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+SHL1IMPLIB=i$(TARGET)
+SHL1LIBS=$(SLB)/$(TARGET).lib
+SHL1DEF=$(MISC)/$(SHL1TARGET).def
 
-DEF1NAME=	$(SHL1TARGET)
-SLOFILES=       $(SLO)$/pyuno_loader.obj
+DEF1NAME=$(SHL1TARGET)
+SLOFILES=$(SLO)/pyuno_loader.obj
 
 # --- Targets ------------------------------------------------------
 
 ALL : ALLTAR \
-    $(DLLDEST)$/pythonloader.py
+    $(DLLDEST)/pythonloader.py
 .ENDIF # L10N_framework
 
 .INCLUDE :  target.mk
 .IF "$(L10N_framework)"==""
-$(DLLDEST)$/%.py: %.py
-    cp $? $@
+$(DLLDEST)/%.py: %.py
+	cp $? $@
 .ENDIF # L10N_framework
 
 ALLTAR : $(MISC)/pythonloader.component
 
 $(MISC)/pythonloader.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt pythonloader.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt pythonloader.component
+	$(SOLARENV)/bin/createcomponent.xslt pythonloader.component
+	$(XSLTPROC) --nonet --stringparam uri \
+	    'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)' -o $@ \
+	$(SOLARENV)/bin/createcomponent.xslt pythonloader.component
diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py
index 15fe57481..ad72cca86 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -1,3 +1,4 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,112 +41,112 @@ g_supportedServices  = "com.sun.star.loader.Python",      # referenced by the na
 g_implementationName = "org.openoffice.comp.pyuno.Loader" # referenced by the native C++ loader !
 
 def splitUrl( url ):
-      nColon = url.find( ":" )
-      if -1 == nColon:
-            raise RuntimeException( "PythonLoader: No protocol in url " + url, None )
-      return url[0:nColon], url[nColon+1:len(url)]
+    nColon = url.find( ":" )
+    if -1 == nColon:
+        raise RuntimeException( "PythonLoader: No protocol in url " + url, None )
+    return url[0:nColon], url[nColon+1:len(url)]
 
 g_loadedComponents = {}
 def checkForPythonPathBesideComponent( url ):
-      path = unohelper.fileUrlToSystemPath( url+"/pythonpath.zip" );
-      if DEBUG == 1:
-            print "checking for existence of " + encfile( path )
-      if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
-            if DEBUG == 1:
-                  print "adding " + encfile( path ) + " to sys.path"
-            sys.path.append( path )
-
-      path = unohelper.fileUrlToSystemPath( url+"/pythonpath" );
-      if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
-            if DEBUG == 1:
-                  print "adding " + encfile( path ) + " to sys.path"
-            sys.path.append( path )
+    path = unohelper.fileUrlToSystemPath( url+"/pythonpath.zip" );
+    if DEBUG == 1:
+        print("checking for existence of " + encfile( path ))
+    if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
+        if DEBUG == 1:
+            print("adding " + encfile( path ) + " to sys.path")
+        sys.path.append( path )
+
+    path = unohelper.fileUrlToSystemPath( url+"/pythonpath" );
+    if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
+        if DEBUG == 1:
+            print("adding " + encfile( path ) + " to sys.path")
+        sys.path.append( path )
 
 def encfile(uni):
     return uni.encode( sys.getfilesystemencoding())
 
 class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
-      def __init__(self, ctx ):
-	  if DEBUG:
-	     print "pythonloader.Loader ctor" 
-	  self.ctx = ctx
-
-      def getModuleFromUrl( self, url ):
-          if DEBUG:
-                print "pythonloader: interpreting url " +url
-          protocol, dependent = splitUrl( url )
-          if "vnd.sun.star.expand" == protocol:
-                exp = self.ctx.getValueByName( "/singletons/com.sun.star.util.theMacroExpander" )
-                url = exp.expandMacros(dependent)
-                protocol,dependent = splitUrl( url )
-
-          if DEBUG:
-                print "pythonloader: after expansion " +protocol +":" + dependent
-                
-          try:
-                if "file" == protocol:
-                      # remove \..\ sequence, which may be useful e.g. in the build env
-                      url = unohelper.absolutize( url, url )
-
-                      # did we load the module already ?
-                      mod = g_loadedComponents.get( url )
-                      if not mod:
-                            mod = imp.new_module("uno_component")
-
-                            # check for pythonpath.zip beside .py files
-                            checkForPythonPathBesideComponent( url[0:url.rfind('/')] )
-                            
-                            # read the file
-                            filename = unohelper.fileUrlToSystemPath( url )
-                            fileHandle = file( filename )
-                            src = fileHandle.read().replace("\r","")
-                            if not src.endswith( "\n" ):
-                                  src = src + "\n"
-
-                            # compile and execute the module
-                            codeobject = compile( src, encfile(filename), "exec" )
-                            exec codeobject in mod.__dict__
-                            mod.__file__ = encfile(filename)
-                            g_loadedComponents[url] = mod
-                      return mod
-                elif "vnd.openoffice.pymodule" == protocol:
-                      return  __import__( dependent )
-                else:
-                      raise RuntimeException( "PythonLoader: Unknown protocol " +
-                                              protocol + " in url " +url, self )
-          except ImportError, e:
-                raise RuntimeException( "Couldn't load "+url+ " for reason "+str(e), None)
-          return None
-	   
-      def activate( self, implementationName, dummy, locationUrl, regKey ):
-	  if DEBUG:
-	     print "pythonloader.Loader.activate"
-
-	  mod = self.getModuleFromUrl( locationUrl )
-          implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
-          if implHelper == None:
-		return mod.getComponentFactory( implementationName, self.ctx.ServiceManager, regKey )
-          else:
-		return implHelper.getComponentFactory( implementationName,regKey,self.ctx.ServiceManager)
-	     
-      def writeRegistryInfo( self, regKey, dummy, locationUrl ):
-	  if DEBUG:
-	     print "pythonloader.Loader.writeRegistryInfo"
-             
-	  mod = self.getModuleFromUrl( locationUrl )
-          implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
-          if implHelper == None:
-	        return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey )
-          else:
-	        return implHelper.writeRegistryInfo( regKey, self.ctx.ServiceManager )
-
-      def getImplementationName( self ):
-	  return g_implementationName
-
-      def supportsService( self, ServiceName ):
-	  return ServiceName in self.serviceNames
-
-      def getSupportedServiceNames( self ):
-	  return g_supportedServices
-
-
+    def __init__(self, ctx ):
+        if DEBUG:
+            print("pythonloader.Loader ctor")
+        self.ctx = ctx
+
+    def getModuleFromUrl( self, url ):
+        if DEBUG:
+            print("pythonloader: interpreting url " + url)
+        protocol, dependent = splitUrl( url )
+        if "vnd.sun.star.expand" == protocol:
+            exp = self.ctx.getValueByName( "/singletons/com.sun.star.util.theMacroExpander" )
+            url = exp.expandMacros(dependent)
+            protocol,dependent = splitUrl( url )
+
+        if DEBUG:
+            print("pythonloader: after expansion " + protocol + ":" + dependent)
+
+        try:
+            if "file" == protocol:
+                # remove \..\ sequence, which may be useful e.g. in the build env
+                url = unohelper.absolutize( url, url )
+
+                # did we load the module already ?
+                mod = g_loadedComponents.get( url )
+                if not mod:
+                    mod = imp.new_module("uno_component")
+
+                    # check for pythonpath.zip beside .py files
+                    checkForPythonPathBesideComponent( url[0:url.rfind('/')] )
+
+                    # read the file
+                    filename = unohelper.fileUrlToSystemPath( url )
+                    fileHandle = file( filename )
+                    src = fileHandle.read().replace("\r","")
+                    if not src.endswith( "\n" ):
+                        src = src + "\n"
+
+                    # compile and execute the module
+                    codeobject = compile( src, encfile(filename), "exec" )
+                    exec(codeobject, mod.__dict__)
+                    mod.__file__ = encfile(filename)
+                    g_loadedComponents[url] = mod
+                return mod
+            elif "vnd.openoffice.pymodule" == protocol:
+                return  __import__( dependent )
+            else:
+                raise RuntimeException( "PythonLoader: Unknown protocol " +
+                                         protocol + " in url " +url, self )
+        except ImportError as e:
+            raise RuntimeException( "Couldn't load " + url + " for reason " + str(e), None )
+        return None
+
+    def activate( self, implementationName, dummy, locationUrl, regKey ):
+        if DEBUG:
+            print("pythonloader.Loader.activate")
+
+        mod = self.getModuleFromUrl( locationUrl )
+        implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
+        if implHelper == None:
+            return mod.getComponentFactory( implementationName, self.ctx.ServiceManager, regKey )
+        else:
+            return implHelper.getComponentFactory( implementationName,regKey,self.ctx.ServiceManager)
+
+    def writeRegistryInfo( self, regKey, dummy, locationUrl ):
+        if DEBUG:
+            print( "pythonloader.Loader.writeRegistryInfo" )
+
+        mod = self.getModuleFromUrl( locationUrl )
+        implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
+        if implHelper == None:
+            return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey )
+        else:
+            return implHelper.writeRegistryInfo( regKey, self.ctx.ServiceManager )
+
+    def getImplementationName( self ):
+        return g_implementationName
+
+    def supportsService( self, ServiceName ):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames( self ):
+        return g_supportedServices
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 771f2c5a9..49ad71c75 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -118,8 +118,26 @@ static void setPythonHome ( const OUString & pythonHome )
     OUString systemPythonHome;
     osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) );
     OString o = rtl::OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() );
-    rtl_string_acquire(o.pData); // leak this string (thats the api!)
-    Py_SetPythonHome( o.pData->buffer);
+#if PY_MAJOR_VERSION >= 3
+    // static because Py_SetPythonHome just copies the "wide" pointer
+    // PATH_MAX is defined in Python.h
+    static wchar_t wide[PATH_MAX + 1];
+    size_t len = mbstowcs(wide, o.pData->buffer, PATH_MAX + 1);
+    if(len == (size_t)-1)
+    {
+        PyErr_SetString(PyExc_SystemError, "invalid multibyte sequence in python home path");
+        return;
+    }
+    if(len == PATH_MAX + 1)
+    {
+        PyErr_SetString(PyExc_SystemError, "python home path is too long");
+        return;
+    }
+    Py_SetPythonHome(wide);
+#else
+    rtl_string_acquire(o.pData); // increase reference count
+    Py_SetPythonHome(o.pData->buffer);
+#endif
 }
 
 static void prependPythonPath( const OUString & pythonPathBootstrap )
@@ -178,7 +196,11 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
 
         if( pythonPath.getLength() )
             prependPythonPath( pythonPath );
-        
+#if PY_MAJOR_VERSION >= 3
+        PyImport_AppendInittab( (char*)"pyuno", PyInit_pyuno );
+#else
+        PyImport_AppendInittab( (char*)"pyuno", initpyuno );
+#endif
         // initialize python 
         Py_Initialize();
         PyEval_InitThreads();
@@ -223,14 +245,7 @@ static struct cppu::ImplementationEntry g_entries[] =
 extern "C"
 {
 
-//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk
index 5afc85b0d..f72e1c303 100644
--- a/pyuno/source/module/makefile.mk
+++ b/pyuno/source/module/makefile.mk
@@ -24,7 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
+PRJ=../..
 
 PRJNAME=pyuno
 TARGET=pyuno
@@ -36,6 +36,7 @@ LINKFLAGSDEFS = # do not fail with missing symbols
 
 .INCLUDE :  settings.mk
 .IF "$(L10N_framework)"==""
+
 #-------------------------------------------------------------------
 
 .IF "$(OS)$(COMEX)" == "SOLARIS4"
@@ -49,15 +50,11 @@ EXTRA_FRAMEWORK_FLAG=-framework Python
 .ENDIF # .IF "$(EXTRA_CFLAGS)"!=""
 
 .IF "$(GUI)" == "UNX"
-# python expects modules without the lib prefix 
-# pyuno.so even on Mac OS X, because it is a python module
-PYUNO_MODULE=$(DLLDEST)$/pyuno.so
 PYUNORC=pyunorc
-.ELIF "$(GUI)" == "OS2"
-.INCLUDE :  pyversion.mk
-PYUNORC=pyuno.ini
 .ELSE
+.IF "$(CROSS_COMPILING)" != "YES"
 .INCLUDE :  pyversion.mk
+.ENDIF
 PYUNORC=pyuno.ini
 DLLPOST=.pyd
 .ENDIF
@@ -67,43 +64,42 @@ PYTHONLIB=$(PYTHON_LIBS)
 CFLAGS+=$(PYTHON_CFLAGS)
 .ELSE # "$(SYSTEM_PYTHON)" == "YES"
 .INCLUDE :  pyversion.mk
-CFLAGS+=-I$(SOLARINCDIR)$/python
+CFLAGS+=-I$(SOLARINCDIR)/python
 .ENDIF # "$(SYSTEM_PYTHON)" == "YES"
 
 SHL1TARGET=$(TARGET)
 SLOFILES= \
-        $(SLO)$/pyuno_runtime.obj 	\
-        $(SLO)$/pyuno.obj 		\
-        $(SLO)$/pyuno_callable.obj 	\
-        $(SLO)$/pyuno_module.obj 	\
-        $(SLO)$/pyuno_type.obj 		\
-        $(SLO)$/pyuno_util.obj		\
-        $(SLO)$/pyuno_except.obj	\
-        $(SLO)$/pyuno_adapter.obj	\
-        $(SLO)$/pyuno_gc.obj
+        $(SLO)/pyuno_runtime.obj \
+        $(SLO)/pyuno.obj \
+        $(SLO)/pyuno_callable.obj \
+        $(SLO)/pyuno_module.obj \
+        $(SLO)/pyuno_type.obj \
+        $(SLO)/pyuno_util.obj \
+        $(SLO)/pyuno_except.obj \
+        $(SLO)/pyuno_adapter.obj \
+        $(SLO)/pyuno_gc.obj
 
 # remove this, when issue i35064 is integrated
 .IF "$(COM)"=="GCC"
 NOOPTFILES= \
-    $(SLO)$/pyuno_module.obj
-.ENDIF			# "$(COM)"=="GCC"
-
+    $(SLO)/pyuno_module.obj
+.ENDIF # "$(COM)"=="GCC"
 
 SHL1STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)		\
-        $(PYTHONLIB) 		\
-        $(EXTRA_FRAMEWORK_FLAG) 
-
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
+        $(CPPULIB) \
+        $(CPPUHELPERLIB) \
+        $(SALLIB) \
+        $(PYTHONLIB) \
+        $(EXTRA_FRAMEWORK_FLAG)
+
+SHL1DEPN=$(eq,$(OS),MACOSX $(MISC)/framework_link $(NULL))
+SHL1LIBS=$(SLB)/$(TARGET).lib
 SHL1IMPLIB=i$(TARGET)
 
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+SHL1DEF=$(MISC)/$(SHL1TARGET).def
 
-DEF1NAME=	$(SHL1TARGET)
-DEF1DEPN=	$(MISC)$/pyuno.flt
+DEF1NAME=$(SHL1TARGET)
+DEF1DEPN=$(MISC)/pyuno.flt
 
 DEFLIB1NAME=$(TARGET)
 
@@ -111,59 +107,53 @@ DEFLIB1NAME=$(TARGET)
 
 .IF "$(GUI)$(COM)"=="WNTGCC"
 ALLTAR : \
-    $(DLLDEST)$/uno.py 		\
-    $(DLLDEST)$/unohelper.py	\
-    $(PYUNO_MODULE)			\
-    $(MISC)$/$(PYUNORC)		\
-    $(LB)$/lib$(TARGET).a
-
-$(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
-    dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a
+    $(DLLDEST)/uno.py \
+    $(DLLDEST)/unohelper.py \
+    $(MISC)/$(PYUNORC) \
+    $(LB)/lib$(TARGET).a
+
+$(LB)/lib$(TARGET).a: $(MISC)/$(TARGET).def
+	$(DLLTOOL) --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)/$(TARGET).def --kill-at --output-lib=$(LB)/lib$(TARGET).a
 .ELSE
+
+.IF "$(GUI)"!="WNT"
+# For some reason the build breaks on Windows if this is listed in the
+# prerequisite list of ALLTAR, but pyuno.pyd still gets produced. Go
+# figure. But we need it on non-Windows.
+targetdll=$(LB)/$(TARGET)$(DLLPOST)
+.ENDIF
+
 ALLTAR : \
-    $(DLLDEST)$/uno.py 		\
-    $(DLLDEST)$/unohelper.py	\
-    $(PYUNO_MODULE)			\
-    $(MISC)$/$(PYUNORC)		
-.ENDIF 
+    $(DLLDEST)/uno.py \
+    $(DLLDEST)/unohelper.py \
+    $(targetdll) \
+    $(MISC)/$(PYUNORC)
+.ENDIF
 .ENDIF
 
 .INCLUDE :  target.mk
 .IF "$(L10N_framework)"==""
-$(DLLDEST)$/%.py: %.py
-    cp $? $@
-
-
-.IF "$(GUI)" == "UNX"
-$(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
-.IF "$(OS)" == "LINUX"
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ELIF "$(OS)" == "SOLARIS"
-    @echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ELIF "$(OS)" == "FREEBSD"
-    @echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ELIF "$(OS)" == "NETBSD"
-    @echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ELIF "$(OS)" == "OPENBSD"
-    @echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ELIF "$(OS)" == "DRAGONFLY"
-    @echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ELIF "$(OS)" == "MACOSX"
-    @echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) > $(MISC)$/$(@:b).cmd
-.ELSE
-    @echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+$(DLLDEST)/%.py: %.py
+	cp $? $@
+
+# make checkdll happy
+$(MISC)/framework_link :
+	$(COMMAND_ECHO)ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework
+	@touch $@
+
+$(MISC)/$(PYUNORC) : pyuno
+	-rm -f $@
+	cat pyuno > $@
+
+$(MISC)/pyuno.flt : pyuno.flt
+	-rm -f $@
+	cat $? > $@
+
+.IF "$(DLLPRE)"!=""
+# python does not accept the "lib" prefix in the module library
+$(LB)/$(TARGET)$(DLLPOST) : $(LB)/$(DLLPRE)$(TARGET)$(DLLPOST)
+	-rm -f $@
+	ln -s $? $@
 .ENDIF
-    cat $(MISC)$/$(@:b).cmd
-    @+source $(MISC)$/$(@:b).cmd
-.ENDIF
-
 
-$(MISC)$/$(PYUNORC) : pyuno
-    -rm -f $@
-    cat pyuno > $@ 
-
-$(MISC)$/pyuno.flt : pyuno.flt
-    -rm -f $@
-    cat $? > $@
 .ENDIF # L10N_framework
-
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 2a3914061..662679606 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -135,13 +135,6 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
     }
     case typelib_TypeClass_UNION:
     {
-//  		typelib_TypeDescription * pTypeDescr = 0;
-//  		TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
-//  		buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") );
-//  		buf.append( val2str( (char *)pVal + ((typelib_UnionTypeDescription *)pTypeDescr)->nValueOffset,
-//  							 union_getSetType( pVal, pTypeDescr ) ) );
-//  		buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" }") );
-//  		TYPELIB_DANGER_RELEASE( pTypeDescr );
         break;
     }
     case typelib_TypeClass_STRUCT:
@@ -193,7 +186,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
         TYPELIB_DANGER_GET( &pElementTypeDescr, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType );
         
         sal_Int32 nElementSize = pElementTypeDescr->nSize;
-        sal_Int32 nElements	   = pSequence->nElements;
+        sal_Int32 nElements = pSequence->nElements;
         
         if (nElements)
         {
@@ -600,11 +593,17 @@ int PyUNO_setattr (PyObject* self, char* name, PyObject* value)
 }
 
 // ensure object identity and struct equality
-static int PyUNO_cmp( PyObject *self, PyObject *that )
+static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op )
 {
-    if( self == that )
+    if(op != Py_EQ && op != Py_NE)
+    {
+        PyErr_SetString(PyExc_TypeError, "only '==' and '!=' comparisions are defined");
         return 0;
-    int retDefault = self > that ? 1 : -1;
+    }
+    if( self == that )
+    {
+        return (op == Py_EQ ? Py_True : Py_False);
+    }
     try
     {
         Runtime runtime;
@@ -624,13 +623,16 @@ static int PyUNO_cmp( PyObject *self, PyObject *that )
                     Reference< XMaterialHolder > xMe( me->members->xInvocation,UNO_QUERY);
                     Reference< XMaterialHolder > xOther( other->members->xInvocation,UNO_QUERY );
                     if( xMe->getMaterial() == xOther->getMaterial() )
-                        return 0;
+                    {
+                        return (op == Py_EQ ? Py_True : Py_False);
+                    }
                 }
                 else if( tcMe == com::sun::star::uno::TypeClass_INTERFACE )
                 {
                     if( me->members->wrappedObject == other->members->wrappedObject )
-//                     if( me->members->xInvocation == other->members->xInvocation )
-                        return 0;
+                    {
+                        return (op == Py_EQ ? Py_True : Py_False);
+                    }
                 }
             }
         }
@@ -639,13 +641,12 @@ static int PyUNO_cmp( PyObject *self, PyObject *that )
     {
         raisePyExceptionWithAny( makeAny( e ) );
     }
-    return retDefault;
+    return Py_False;
 }
 
 static PyTypeObject PyUNOType =
 {
-    PyObject_HEAD_INIT (&PyType_Type)
-    0,
+    PyVarObject_HEAD_INIT( &PyType_Type, 0 )
     const_cast< char * >("pyuno"),
     sizeof (PyUNO),
     0,
@@ -653,7 +654,7 @@ static PyTypeObject PyUNOType =
     (printfunc) 0,
     (getattrfunc) PyUNO_getattr,
     (setattrfunc) PyUNO_setattr,
-    (cmpfunc) PyUNO_cmp,
+    0,
     (reprfunc) PyUNO_repr,
     0,
     0,
@@ -668,7 +669,7 @@ static PyTypeObject PyUNOType =
     NULL,
     (traverseproc)0,
     (inquiry)0,
-    (richcmpfunc)0,
+    (richcmpfunc) PyUNO_cmp,
     0,
     (getiterfunc)0,
     (iternextfunc)0,
@@ -707,14 +708,14 @@ PyObject* PyUNO_new (
     Reference<XInterface> tmp_interface;
   
     targetInterface >>= tmp_interface;
+
     if (!tmp_interface.is ())
     {
         // empty reference !
         Py_INCREF( Py_None );
         return Py_None;
     }
-
-    return PyUNO_new_UNCHECKED (targetInterface, ssf);
+   return PyUNO_new_UNCHECKED (targetInterface, ssf);
 }
 
 
@@ -728,14 +729,27 @@ PyObject* PyUNO_new_UNCHECKED (
 
     self = PyObject_New (PyUNO, &PyUNOType);
     if (self == NULL)
-        return NULL; //NULL == error
+        return NULL; // == error
     self->members = new PyUNOInternals();
 
     arguments[0] <<= targetInterface;
     {
         PyThreadDetach antiguard;
         tmp_interface = ssf->createInstanceWithArguments (arguments);
+
+        if (!tmp_interface.is ())
+        {
+            Py_INCREF( Py_None );
+            return Py_None;
+        }
+
         Reference<XInvocation2> tmp_invocation (tmp_interface, UNO_QUERY);
+        if (!tmp_invocation.is()) {
+            throw RuntimeException (rtl::OUString::createFromAscii (
+                "XInvocation2 not implemented, cannot interact with object"),
+                Reference< XInterface > ());
+        }
+
         self->members->xInvocation = tmp_invocation;
         self->members->wrappedObject = targetInterface;
     }
diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx
index 74bf7e94e..2da996822 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -196,8 +196,7 @@ PyObject* PyUNO_callable_call (PyObject* self, PyObject* args, PyObject*)
 
 static PyTypeObject PyUNO_callable_Type =
 {
-    PyObject_HEAD_INIT (&PyType_Type)
-    0,
+    PyVarObject_HEAD_INIT( &PyType_Type, 0 )
     const_cast< char * >("PyUNO_callable"),
     sizeof (PyUNO_callable),
     0,
@@ -205,7 +204,7 @@ static PyTypeObject PyUNO_callable_Type =
     (printfunc) 0,
     (getattrfunc) 0,
     (setattrfunc) 0,
-    (cmpfunc) 0,
+    0,
     (reprfunc) 0,
     0,
     0,
@@ -213,7 +212,7 @@ static PyTypeObject PyUNO_callable_Type =
     (hashfunc) 0,
     (ternaryfunc) ::pyuno::PyUNO_callable_call,
     (reprfunc) 0,
-        (getattrofunc)0,
+    (getattrofunc)0,
     (setattrofunc)0,
     NULL,
     0,
@@ -256,7 +255,9 @@ PyRef PyUNO_callable_new (
     enum ConversionMode mode )
 {
     PyUNO_callable* self;
-  
+
+    OSL_ENSURE (my_inv.is(), "XInvocation must be valid");
+
     self = PyObject_New (PyUNO_callable, &PyUNO_callable_Type);
     if (self == NULL)
         return NULL; //NULL == Error!
diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx
index 0a2f70ad1..e31fe11bc 100644
--- a/pyuno/source/module/pyuno_except.cxx
+++ b/pyuno/source/module/pyuno_except.cxx
@@ -167,7 +167,7 @@ static PyRef createClass( const OUString & name, const Runtime &runtime )
     PyTuple_SetItem( args.get(), 2, PyDict_New() );
     
     PyRef ret(
-        PyObject_CallObject(reinterpret_cast<PyObject *>(&PyClass_Type) , args.get()),
+        PyObject_CallObject(reinterpret_cast<PyObject *>(&PyType_Type) , args.get()),
         SAL_NO_ACQUIRE );
 
     // now overwrite ctor and attrib functions
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index 744fb8160..ff6ca8716 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,6 +28,13 @@
 #ifndef _PYUNO_IMPL_
 #define _PYUNO_IMPL_
 
+#include <Python.h>
+
+//Must define PyVarObject_HEAD_INIT for Python 2.5 or older
+#ifndef PyVarObject_HEAD_INIT
+#define PyVarObject_HEAD_INIT(type, size)  PyObject_HEAD_INIT(type) size,
+#endif
+
 #include <pyuno/pyuno.hxx>
 
 #include <boost/unordered_map.hpp>
@@ -48,6 +55,49 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/weakref.hxx>
 
+// In Python 3, the PyString_* functions have been replaced by PyBytes_*
+// and PyUnicode_* functions.
+#if PY_MAJOR_VERSION >= 3
+inline char* PyString_AsString(PyObject *object)
+{
+    // check whether object is already of type "PyBytes"
+    if(PyBytes_Check(object))
+    {
+        return PyBytes_AsString(object);
+    }
+
+    // object is not encoded yet, so encode it to utf-8
+    PyObject *pystring;
+    pystring = PyUnicode_AsUTF8String(object);
+    if(!pystring)
+    {
+       PyErr_SetString(PyExc_ValueError, "cannot utf-8 decode string");
+       return 0;
+    }
+    return PyBytes_AsString(pystring);
+}
+
+inline PyObject* PyString_FromString(const char *string)
+{
+    return PyUnicode_FromString(string);
+}
+
+inline int PyString_Check(PyObject *object)
+{
+    return PyBytes_Check(object);
+}
+
+inline Py_ssize_t PyString_Size(PyObject *object)
+{
+    return PyBytes_Size(object);
+}
+
+inline PyObject* PyString_FromStringAndSize(const char *string, Py_ssize_t len)
+{
+    return PyBytes_FromStringAndSize(string, len);
+}
+#endif /* PY_MAJOR_VERSION >= 3 */
+
 namespace pyuno
 {
 
@@ -132,7 +182,7 @@ PyRef ustring2PyUnicode( const rtl::OUString &source );
 PyRef ustring2PyString( const ::rtl::OUString & source );
 rtl::OUString pyString2ustring( PyObject *str );
 
-    
+
 PyRef AnyToPyObject (const com::sun::star::uno::Any & a, const Runtime &r )
     throw ( com::sun::star::uno::RuntimeException );
 
@@ -142,9 +192,6 @@ com::sun::star::uno::Any PyObjectToAny (PyObject* o)
 void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime )
     throw ( com::sun::star::reflection::InvocationTargetException );
 
-// bool CheckPyObjectTypes (PyObject* o, Sequence<Type> types);
-// bool CheckPyObjectType (PyObject* o, Type type); //Only check 1 object.
-
 com::sun::star::uno::TypeClass StringToTypeClass (char* string);
 
 PyRef PyUNO_callable_new (
@@ -244,7 +291,7 @@ public:
     PyRef getWrappedObject() { return mWrappedObject; }
     com::sun::star::uno::Sequence< com::sun::star::uno::Type > getWrappedTypes() { return mTypes; }
     virtual ~Adapter();
-    
+
     // XInvocation
     virtual com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >
            SAL_CALL getIntrospection(  ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index 669a39c31..65e160b84 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -230,7 +230,7 @@ PyObject * extractOneStringArg( PyObject *args, char const *funcName )
         return NULL;
     }
     PyObject *obj = PyTuple_GetItem( args, 0 );
-    if( !PyString_Check( obj ) && ! PyUnicode_Check(obj))
+    if(!PyString_Check(obj) && !PyUnicode_Check(obj))
     {
         OStringBuffer buf;
         buf.append( funcName ).append( ": expecting one string argument" );
@@ -244,16 +244,17 @@ static PyObject *createUnoStructHelper(PyObject *, PyObject* args )
 {
     Any IdlStruct;
     PyRef ret;
-
     try
     {
         Runtime runtime;
         if( PyTuple_Size( args ) == 2 )
         {
-            PyObject *structName = PyTuple_GetItem( args,0 );
-            PyObject *initializer = PyTuple_GetItem( args ,1 );
-            
-            if( PyString_Check( structName ) )
+            PyObject *structName = PyTuple_GetItem(args, 0);
+            PyObject *initializer = PyTuple_GetItem(args, 1);
+
+            // Perhaps in Python 3, only PyUnicode_Check returns true and
+            // in Python 2, only PyString_Check returns true.
+            if(PyString_Check(structName) || PyUnicode_Check(structName))
             {
                 if( PyTuple_Check( initializer ) )
                 {
@@ -491,9 +492,9 @@ static PyObject *isInterface( PyObject *, PyObject *args )
     {
         PyObject *obj = PyTuple_GetItem( args, 0 );
         Runtime r;
-        return PyInt_FromLong( isInterfaceClass( r, obj ) );
+        return PyLong_FromLong( isInterfaceClass( r, obj ) );
     }
-    return PyInt_FromLong( 0 );
+    return PyLong_FromLong( 0 );
 }
 
 static PyObject * generateUuid( PyObject *, PyObject * )
@@ -592,41 +593,42 @@ static PyObject * absolutize( PyObject *, PyObject * args )
     return 0;
 }
 
-static PyObject * invoke ( PyObject *, PyObject * args )
+static PyObject * invoke(PyObject *, PyObject *args)
 {
     PyObject *ret = 0;
-    if( PyTuple_Check( args ) && PyTuple_Size( args ) == 3 )
+    if(PyTuple_Check(args) && PyTuple_Size(args) == 3)
     {
-        PyObject *object = PyTuple_GetItem( args, 0 );
-
-        if( PyString_Check( PyTuple_GetItem( args, 1 ) ) )
+        PyObject *object = PyTuple_GetItem(args, 0);
+        PyObject *item1 = PyTuple_GetItem(args, 1);
+        if(PyString_Check(item1) || PyUnicode_Check(item1))
         {
-            const char *name = PyString_AsString( PyTuple_GetItem( args, 1 ) );
-            if( PyTuple_Check( PyTuple_GetItem( args , 2 )))
+            const char *name = PyString_AsString(item1);
+            PyObject *item2 = PyTuple_GetItem(args, 2);
+            if(PyTuple_Check(item2))
             {
-                ret = PyUNO_invoke( object, name , PyTuple_GetItem( args, 2 ) );
+                ret = PyUNO_invoke(object, name, item2);
             }
             else
             {
                 OStringBuffer buf;
-                buf.append( "uno.invoke expects a tuple as 3rd argument, got " );
-                buf.append( PyString_AsString( PyObject_Str( PyTuple_GetItem( args, 2) ) ) );
-                PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
+                buf.append("uno.invoke expects a tuple as 3rd argument, got ");
+                buf.append(PyString_AsString(PyObject_Str(item2)));
+                PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
             }
         }
         else
         {
             OStringBuffer buf;
-            buf.append( "uno.invoke expected a string as 2nd argument, got " );
-            buf.append( PyString_AsString( PyObject_Str( PyTuple_GetItem( args, 1) ) ) );
-            PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
+            buf.append("uno.invoke expected a string as 2nd argument, got ");
+            buf.append(PyString_AsString(PyObject_Str(item1)));
+            PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
         }
     }
     else
     {
         OStringBuffer buf;
-        buf.append( "uno.invoke expects object, name, (arg1, arg2, ... )\n" );
-        PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
+        buf.append("uno.invoke expects object, name, (arg1, arg2, ... )\n");
+        PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
     }
     return ret;
 }
@@ -690,31 +692,52 @@ static PyObject *setCurrentContext( PyObject *, PyObject * args )
 
 struct PyMethodDef PyUNOModule_methods [] =
 {
-    {const_cast< char * >("getComponentContext"), getComponentContext, 1, NULL}, 
-    {const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, 2, NULL},
-    {const_cast< char * >("getTypeByName"), getTypeByName, 1, NULL},
-    {const_cast< char * >("getConstantByName"), getConstantByName,1, NULL},
-    {const_cast< char * >("getClass"), getClass,1, NULL},
-    {const_cast< char * >("checkEnum"), checkEnum, 1, NULL},
-    {const_cast< char * >("checkType"), checkType, 1, NULL},
-    {const_cast< char * >("generateUuid"), generateUuid,0, NULL},
-    {const_cast< char * >("systemPathToFileUrl"),systemPathToFileUrl,1, NULL},
-    {const_cast< char * >("fileUrlToSystemPath"),fileUrlToSystemPath,1, NULL},
-    {const_cast< char * >("absolutize"),absolutize,2, NULL},
-    {const_cast< char * >("isInterface"),isInterface,1, NULL},
-    {const_cast< char * >("invoke"),invoke, 2, NULL},
-    {const_cast< char * >("setCurrentContext"),setCurrentContext,1, NULL},
-    {const_cast< char * >("getCurrentContext"),getCurrentContext,1, NULL},
+    {const_cast< char * >("getComponentContext"), getComponentContext, METH_VARARGS, NULL},
+    {const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, METH_VARARGS | METH_KEYWORDS, NULL},
+    {const_cast< char * >("getTypeByName"), getTypeByName, METH_VARARGS, NULL},
+    {const_cast< char * >("getConstantByName"), getConstantByName, METH_VARARGS, NULL},
+    {const_cast< char * >("getClass"), getClass, METH_VARARGS, NULL},
+    {const_cast< char * >("checkEnum"), checkEnum, METH_VARARGS, NULL},
+    {const_cast< char * >("checkType"), checkType, METH_VARARGS, NULL},
+    {const_cast< char * >("generateUuid"), generateUuid, METH_VARARGS, NULL},
+    {const_cast< char * >("systemPathToFileUrl"), systemPathToFileUrl, METH_VARARGS, NULL},
+    {const_cast< char * >("fileUrlToSystemPath"), fileUrlToSystemPath, METH_VARARGS, NULL},
+    {const_cast< char * >("absolutize"), absolutize, METH_VARARGS | METH_KEYWORDS, NULL},
+    {const_cast< char * >("isInterface"), isInterface, METH_VARARGS, NULL},
+    {const_cast< char * >("invoke"), invoke, METH_VARARGS | METH_KEYWORDS, NULL},
+    {const_cast< char * >("setCurrentContext"), setCurrentContext, METH_VARARGS, NULL},
+    {const_cast< char * >("getCurrentContext"), getCurrentContext, METH_VARARGS, NULL},
     {NULL, NULL, 0, NULL}
 };
 
 }
 
-extern "C" PY_DLLEXPORT void initpyuno()
+extern "C" PY_DLLEXPORT
+#if PY_MAJOR_VERSION >= 3
+PyObject* PyInit_pyuno()
 {
     // noop when called already, otherwise needed to allow multiple threads
     PyEval_InitThreads();
+    static struct PyModuleDef moduledef =
+    {
+        PyModuleDef_HEAD_INIT,
+        "pyuno",             // module name
+        0,                   // module documentation
+        -1,                  // module keeps state in global variables,
+        PyUNOModule_methods, // modules methods
+        0,                   // m_reload (must be 0)
+        0,                   // m_traverse
+        0,                   // m_clear
+        0,                   // m_free
+    };
+    return PyModule_Create(&moduledef);
+}
+#else
+void initpyuno()
+{
+    PyEval_InitThreads();
     Py_InitModule (const_cast< char * >("pyuno"), PyUNOModule_methods);
 }
+#endif /* PY_MAJOR_VERSION >= 3 */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index ed34ddf3b..61d05d832 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -72,8 +72,7 @@ namespace pyuno
 
 static PyTypeObject RuntimeImpl_Type =
 {
-    PyObject_HEAD_INIT (&PyType_Type)
-    0,
+    PyVarObject_HEAD_INIT (&PyType_Type, 0)
     const_cast< char * >("pyuno_runtime"),
     sizeof (RuntimeImpl),
     0,
@@ -81,7 +80,7 @@ static PyTypeObject RuntimeImpl_Type =
     (printfunc) 0,
     (getattrfunc) 0,
     (setattrfunc) 0,
-    (cmpfunc) 0,
+    0,
     (reprfunc) 0,
     0,
     0,
@@ -445,7 +444,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
     {
         sal_Int32 l = 0;
         a >>= l;
-        return PyRef( PyInt_FromLong (l), SAL_NO_ACQUIRE );
+        return PyRef( PyLong_FromLong (l), SAL_NO_ACQUIRE );
     }
     case typelib_TypeClass_UNSIGNED_LONG:
     {
@@ -666,6 +665,8 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
     {
 
     }
+    // In Python 3, there is no PyInt type.
+#if PY_MAJOR_VERSION < 3
     else if (PyInt_Check (o))
     {
         if( o == Py_True )
@@ -680,7 +681,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
         }
         else
         {
-            sal_Int32 l = (sal_Int32) PyInt_AsLong( o );
+            sal_Int32 l = (sal_Int32) PyLong_AsLong( o );
             if( l < 128 && l >= -128 )
             {
                 sal_Int8 b = (sal_Int8 ) l;
@@ -697,8 +698,24 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
             }
         }
     }
+#endif /* PY_MAJOR_VERSION < 3 */
     else if (PyLong_Check (o))
     {
+#if PY_MAJOR_VERSION >= 3
+        // Convert the Python 3 booleans that are actually of type PyLong.
+        if(o == Py_True)
+        {
+            sal_Bool b = sal_True;
+            a = Any(&b, getBooleanCppuType());
+        }
+        else if(o == Py_False)
+        {
+            sal_Bool b = sal_False;
+            a = Any(&b, getBooleanCppuType());
+        }
+        else
+        {
+#endif /* PY_MAJOR_VERSION >= 3 */
         sal_Int64 l = (sal_Int64)PyLong_AsLong (o);
         if( l < 128 && l >= -128 )
         {
@@ -720,16 +737,19 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
         {
             a <<= l;
         }
+#if PY_MAJOR_VERSION >= 3
+        }
+#endif
     }
     else if (PyFloat_Check (o))
     {
         double d = PyFloat_AsDouble (o);
         a <<= d;
     }
-    else if (PyString_Check (o))
-    a <<= pyString2ustring(o);
-    else if( PyUnicode_Check( o ) )
-    a <<= pyString2ustring(o);
+    else if (PyString_Check(o) || PyUnicode_Check(o))
+    {
+        a <<= pyString2ustring(o);
+    }
     else if (PyTuple_Check (o))
     {
         Sequence<Any> s (PyTuple_Size (o));
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index f61b3c925..bb9720568 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -1,3 +1,4 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,7 +28,12 @@
 import sys
 
 import pyuno
-import __builtin__
+
+try:
+    import __builtin__
+except ImportError:
+    import builtins as __builtin__
+
 import socket # since on Windows sal3.dll no longer calls WSAStartup
 
 # all functions and variables starting with a underscore (_) must be considered private
@@ -149,9 +155,9 @@ class Bool(object):
        Note: This class is deprecated. Use python's True and False directly instead
     """
     def __new__(cls, value):
-        if isinstance(value, (str, unicode)) and value == "true":
+        if isinstance(value, str) and value == "true":
             return True
-        if isinstance(value, (str, unicode)) and value == "false":
+        if isinstance(value, str) and value == "false":
             return False
         if value:
             return True
@@ -161,7 +167,7 @@ class Char:
     "Represents a UNO char, use an instance of this class to explicitly pass a char to UNO"
     # @param value pass a Unicode string with length 1
     def __init__(self,value):
-        assert isinstance(value, unicode)
+        assert isinstance(value, str)
         assert len(value) == 1
         self.value=value
 
@@ -169,7 +175,7 @@ class Char:
         return "<Char instance %s>" % (self.value, )
         
     def __eq__(self, that):
-        if isinstance(that, (str, unicode)):
+        if isinstance(that, str):
             if len(that) > 1:
                 return False
             return self.value == that[0]
@@ -260,7 +266,7 @@ def _uno_import( name, *optargs, **kwargs ):
     mod = None
     d = sys.modules
     for x in modnames:
-        if d.has_key(x):
+        if x in d:
            mod = d[x]
         else:
            mod = pyuno.__class__(x)  # How to create a module ??
@@ -268,25 +274,25 @@ def _uno_import( name, *optargs, **kwargs ):
 
     RuntimeException = pyuno.getClass( "com.sun.star.uno.RuntimeException" )
     for x in fromlist:
-       if not d.has_key(x):
+       if x not in d:
           if x.startswith( "typeOf" ):
              try: 
                 d[x] = pyuno.getTypeByName( name + "." + x[6:len(x)] )
-             except RuntimeException,e:
+             except RuntimeException as e:
                 raise ImportError( "type " + name + "." + x[6:len(x)] +" is unknown" )
           else:
             try:
                 # check for structs, exceptions or interfaces
                 d[x] = pyuno.getClass( name + "." + x )
-            except RuntimeException,e:
+            except RuntimeException as e:
                 # check for enums 
                 try:
                    d[x] = Enum( name , x )
-                except RuntimeException,e2:
+                except RuntimeException as e2:
                    # check for constants
                    try:
                       d[x] = getConstantByName( name + "." + x )
-                   except RuntimeException,e3:
+                   except RuntimeException as e3:
                       # no known uno type !
                       raise ImportError( "type "+ name + "." +x + " is unknown" )
     return mod
@@ -296,7 +302,7 @@ __builtin__.__dict__["__import__"] = _uno_import
         
 # private function, don't use
 def _impl_extractName(name):
-    r = range (len(name)-1,0,-1)
+    r = list(range(len(name)-1,0,-1))
     for i in r:
         if name[i] == ".":
            name = name[i+1:len(name)]
@@ -336,7 +342,7 @@ def _uno_extract_printable_stacktrace( trace ):
     mod = None
     try:
         mod = __import__("traceback")
-    except ImportError,e:
+    except ImportError as e:
         pass
     ret = ""
     if mod:
@@ -350,3 +356,5 @@ def _uno_extract_printable_stacktrace( trace ):
     else:
         ret = "Couldn't import traceback module"
     return ret
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/source/module/unohelper.py b/pyuno/source/module/unohelper.py
index c59df0597..ee5f3712d 100644
--- a/pyuno/source/module/unohelper.py
+++ b/pyuno/source/module/unohelper.py
@@ -1,3 +1,4 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,7 +79,7 @@ def _propertymode_to_str( mode ):
     if PROP_ATTR_MAYBEVOID & mode:
         ret = ret + "maybevoid "
     return ret.rstrip()
-    
+
 def inspect( obj , out ):
     if isinstance( obj, uno.Type ) or \
        isinstance( obj, uno.Char ) or \
@@ -108,7 +109,7 @@ def inspect( obj , out ):
             out.write( "  " + ii.typeName + "\n" )
     else:
         out.write( "  unknown\n" )
-        
+
     access = introspection.inspect( obj )
     methods = access.getMethods( METHOD_CONCEPT_ALL )
     out.write( "Methods:\n" )
@@ -132,56 +133,56 @@ def createSingleServiceFactory( clazz, implementationName, serviceNames ):
     return _FactoryHelper_( clazz, implementationName, serviceNames )
 
 class _ImplementationHelperEntry:
-      def __init__(self, ctor,serviceNames):
-	  self.ctor = ctor
-	  self.serviceNames = serviceNames
-	  
+    def __init__(self, ctor,serviceNames):
+        self.ctor = ctor
+        self.serviceNames = serviceNames
+
 class ImplementationHelper:
-      def __init__(self):
-	  self.impls = {}
-	  
-      def addImplementation( self, ctor, implementationName, serviceNames ):
-          self.impls[implementationName] =  _ImplementationHelperEntry(ctor,serviceNames)
-	  
-      def writeRegistryInfo( self, regKey, smgr ):
-          for i in self.impls.items():
-	      keyName = "/"+ i[0] + "/UNO/SERVICES"
-	      key = regKey.createKey( keyName )
-	      for serviceName in i[1].serviceNames:
-		  key.createKey( serviceName )
-          return 1
-
-      def getComponentFactory( self, implementationName , regKey, smgr ):
-	  entry = self.impls.get( implementationName, None )
-	  if entry == None:
-	     raise RuntimeException( implementationName + " is unknown" , None )
-	  return createSingleServiceFactory( entry.ctor, implementationName, entry.serviceNames )
-
-      def getSupportedServiceNames( self, implementationName ):
-	  entry = self.impls.get( implementationName, None )
-	  if entry == None:
-	     raise RuntimeException( implementationName + " is unknown" , None )
-	  return entry.serviceNames	     
-	  
-      def supportsService( self, implementationName, serviceName ):
-	  entry = self.impls.get( implementationName,None )
-	  if entry == None:
-	     raise RuntimeException( implementationName + " is unknown", None )
-          return serviceName in entry.serviceNames	     
-
-	  
+    def __init__(self):
+        self.impls = {}
+
+    def addImplementation( self, ctor, implementationName, serviceNames ):
+        self.impls[implementationName] =  _ImplementationHelperEntry(ctor,serviceNames)
+
+    def writeRegistryInfo( self, regKey, smgr ):
+        for i in list(self.impls.items()):
+            keyName = "/"+ i[0] + "/UNO/SERVICES"
+            key = regKey.createKey( keyName )
+            for serviceName in i[1].serviceNames:
+                key.createKey( serviceName )
+        return 1
+
+    def getComponentFactory( self, implementationName , regKey, smgr ):
+        entry = self.impls.get( implementationName, None )
+        if entry == None:
+            raise RuntimeException( implementationName + " is unknown" , None )
+        return createSingleServiceFactory( entry.ctor, implementationName, entry.serviceNames )
+
+    def getSupportedServiceNames( self, implementationName ):
+        entry = self.impls.get( implementationName, None )
+        if entry == None:
+            raise RuntimeException( implementationName + " is unknown" , None )
+        return entry.serviceNames
+
+    def supportsService( self, implementationName, serviceName ):
+        entry = self.impls.get( implementationName,None )
+        if entry == None:
+            raise RuntimeException( implementationName + " is unknown", None )
+        return serviceName in entry.serviceNames
+
+
 class ImplementationEntry:
-      def __init__(self, implName, supportedServices, clazz ):
-	  self.implName = implName
-	  self.supportedServices = supportedServices
-	  self.clazz = clazz
+    def __init__(self, implName, supportedServices, clazz ):
+        self.implName = implName
+        self.supportedServices = supportedServices
+        self.clazz = clazz
 
 def writeRegistryInfoHelper( smgr, regKey, seqEntries ):
     for entry in seqEntries:
         keyName = "/"+ entry.implName + "/UNO/SERVICES"
-	key = regKey.createKey( keyName )
-	for serviceName in entry.supportedServices:
-	    key.createKey( serviceName )
+        key = regKey.createKey( keyName )
+        for serviceName in entry.supportedServices:
+            key.createKey( serviceName )
 
 def systemPathToFileUrl( systemPath ):
     "returns a file-url for the given system path"
@@ -194,11 +195,11 @@ def fileUrlToSystemPath( url ):
 def absolutize( path, relativeUrl ):
     "returns an absolute file url from the given urls"
     return pyuno.absolutize( path, relativeUrl )
-        
+
 def getComponentFactoryHelper( implementationName, smgr, regKey, seqEntries ):
     for x in seqEntries:
-	if x.implName == implementationName:
-	   return createSingleServiceFactory( x.clazz, implementationName, x.supportedServices )
+        if x.implName == implementationName:
+            return createSingleServiceFactory( x.clazz, implementationName, x.supportedServices )
 
 def addComponentsToContext( toBeExtendedContext, contextRuntime, componentUrls, loaderName ):
     smgr = contextRuntime.ServiceManager
@@ -210,56 +211,56 @@ def addComponentsToContext( toBeExtendedContext, contextRuntime, componentUrls,
     #   create a temporary registry
     for componentUrl in componentUrls:
         reg = smgr.createInstanceWithContext( "com.sun.star.registry.SimpleRegistry", contextRuntime )
-	reg.open( "", 0, 1 )
+        reg.open( "", 0, 1 )
         if not isWin and componentUrl.endswith( ".uno" ):  # still allow platform independent naming
             if isMac:
-               componentUrl = componentUrl + ".dylib"
+                componentUrl = componentUrl + ".dylib"
             else:
-               componentUrl = componentUrl + ".so"
-
-	implReg.registerImplementation( loaderName,componentUrl, reg )
-	rootKey = reg.getRootKey()
-	implementationKey = rootKey.openKey( "IMPLEMENTATIONS" )
-	implNames = implementationKey.getKeyNames()
-	extSMGR = toBeExtendedContext.ServiceManager
-	for x in implNames:
-	    fac = loader.activate( max(x.split("/")),"",componentUrl,rootKey)
-	    extSMGR.insert( fac )
-	reg.close()
-	    	    
+                componentUrl = componentUrl + ".so"
+
+        implReg.registerImplementation( loaderName,componentUrl, reg )
+        rootKey = reg.getRootKey()
+        implementationKey = rootKey.openKey( "IMPLEMENTATIONS" )
+        implNames = implementationKey.getKeyNames()
+        extSMGR = toBeExtendedContext.ServiceManager
+        for x in implNames:
+            fac = loader.activate( max(x.split("/")),"",componentUrl,rootKey)
+            extSMGR.insert( fac )
+        reg.close()
+
 # never shrinks !
 _g_typeTable = {}
 def _unohelper_getHandle( self):
-   ret = None
-   if _g_typeTable.has_key( self.__class__ ):
-     ret = _g_typeTable[self.__class__]
-   else:
-     names = {}
-     traverse = list(self.__class__.__bases__)
-     while len( traverse ) > 0:
-         item = traverse.pop()
-         bases = item.__bases__
-         if uno.isInterface( item ):
-             names[item.__pyunointerface__] = None
-         elif len(bases) > 0:
-             # the "else if", because we only need the most derived interface
-             traverse = traverse + list(bases)#
-
-     lst = names.keys()
-     types = []
-     for x in lst:
-         t = uno.getTypeByName( x )
-         types.append( t )
-         
-     ret = tuple(types) , uno.generateUuid()
-     _g_typeTable[self.__class__] = ret
-   return ret
-  
+    ret = None
+    if self.__class__ in _g_typeTable:
+        ret = _g_typeTable[self.__class__]
+    else:
+        names = {}
+        traverse = list(self.__class__.__bases__)
+        while len( traverse ) > 0:
+            item = traverse.pop()
+            bases = item.__bases__
+            if uno.isInterface( item ):
+                names[item.__pyunointerface__] = None
+            elif len(bases) > 0:
+                # the "else if", because we only need the most derived interface
+                traverse = traverse + list(bases)#
+
+        lst = list(names.keys())
+        types = []
+        for x in lst:
+            t = uno.getTypeByName( x )
+            types.append( t )
+
+        ret = tuple(types) , uno.generateUuid()
+        _g_typeTable[self.__class__] = ret
+    return ret
+
 class Base(XTypeProvider):
-      def getTypes( self ):
-	  return _unohelper_getHandle( self )[0]
-      def getImplementationId(self):
-	  return _unohelper_getHandle( self )[1]
+    def getTypes( self ):
+        return _unohelper_getHandle( self )[0]
+    def getImplementationId(self):
+        return _unohelper_getHandle( self )[1]
 
 class CurrentContext(XCurrentContext, Base ):
     """a current context implementation, which first does a lookup in the given
@@ -277,28 +278,29 @@ class CurrentContext(XCurrentContext, Base ):
             return self.oldContext.getValueByName( name )
         else:
             return None
-        
+
 # -------------------------------------------------
 # implementation details
 # -------------------------------------------------
 class _FactoryHelper_( XSingleComponentFactory, XServiceInfo, Base ):
-      def __init__( self, clazz, implementationName, serviceNames ):
-	  self.clazz = clazz
-	  self.implementationName = implementationName
-	  self.serviceNames = serviceNames
-	  
-      def getImplementationName( self ):
-	  return self.implementationName
-
-      def supportsService( self, ServiceName ):
-	  return ServiceName in self.serviceNames
-
-      def getSupportedServiceNames( self ):
-	  return self.serviceNames
-
-      def createInstanceWithContext( self, context ):
-	  return self.clazz( context )
-	      
-      def createInstanceWithArgumentsAndContext( self, args, context ):
-	  return self.clazz( context, *args )
-      
+    def __init__( self, clazz, implementationName, serviceNames ):
+        self.clazz = clazz
+        self.implementationName = implementationName
+        self.serviceNames = serviceNames
+
+    def getImplementationName( self ):
+        return self.implementationName
+
+    def supportsService( self, ServiceName ):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames( self ):
+        return self.serviceNames
+
+    def createInstanceWithContext( self, context ):
+        return self.clazz( context )
+
+    def createInstanceWithArgumentsAndContext( self, args, context ):
+        return self.clazz( context, *args )
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk
index bad3058a4..abc42b3b8 100755
--- a/pyuno/zipcore/makefile.mk
+++ b/pyuno/zipcore/makefile.mk
@@ -35,98 +35,99 @@ LIBTARGET=NO
 .IF "$(L10N_framework)"==""
 UWINAPILIB =
 
-.IF "$(SYSTEM_PYTHON)" == "YES" || "$(GUI)" == "OS2"
+.IF "$(SYSTEM_PYTHON)" == "YES"
 systempython:
-        @echo "Not building python-core because system python is being used"
+	@echo "Not building python-core because system python is being used"
 .ELSE
 
 .INCLUDE : pyversion.mk
 
 PYDIRNAME=python-core-$(PYVERSION)
-DESTROOT=$(BIN)$/$(PYDIRNAME)
+DESTROOT=$(BIN)/$(PYDIRNAME)
 .IF "$(GUI)" == "UNX"
-PYTHONBINARY=$(BIN)$/python$(EXECPOST).bin
+PYTHONBINARY=$(BIN)/python$(EXECPOST).bin
 .ELSE
 .IF "$(COM)" == "GCC"
-PYTHONBINARY=$(DESTROOT)$/bin$/python.bin
+PYTHONBINARY=$(DESTROOT)/bin/python.bin
 .ELSE
-PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST)
+PYTHONBINARY=$(DESTROOT)/bin/python$(EXECPOST)
 .ENDIF
 .ENDIF
 
-FINDLIBFILES_TMP:=$(subst,/,$/ \
-    $(shell @$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v "\.pyc" |$(GREP) -v "\.py~" |$(GREP) -v .orig | $(GREP) -v _failed))
-FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP))
+.IF "$(OS)" != "MACOSX"
+FINDLIBFILES:=$(subst,$(SOLARLIBDIR)/python, \
+    $(shell @$(FIND) $(SOLARLIBDIR)/python -type f| $(GREP) -v "\.pyc" |$(GREP) -v "\.py~" |$(GREP) -v .orig | $(GREP) -v _failed))
 
 FILES=\
-    $(PYTHONBINARY)	\
-    $(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) 
+    $(PYTHONBINARY) \
+    $(foreach,i,$(FINDLIBFILES) $(DESTROOT)/lib$(i))
 
 .IF "$(OS)" == "WNT"
-APP1TARGET = python
-APP1OBJS = $(OBJFILES) $(SOLARLIBDIR)$/pathutils-obj.obj
-APP1STDLIBS =
-APP1RPATH = BRAND
-OBJFILES = $(OBJ)$/python.obj
+APP1TARGET=python
+APP1OBJS=$(OBJFILES) $(SOLARLIBDIR)/pathutils-obj.obj
+APP1STDLIBS=
+APP1RPATH=BRAND
+OBJFILES=$(OBJ)/python.obj
 .ENDIF
 
 
 .INCLUDE: target.mk
 
 ALLTAR: \
-    $(BIN)$/$(PYDIRNAME).zip
+    $(BIN)/$(PYDIRNAME).zip
+.ENDIF
 
 .IF "$(GUI)" == "UNX"
-ALLTAR : $(BIN)$/python.sh
-$(BIN)$/python.sh : python.sh
-    -rm -f $@
-    cat $? > $@
-    sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ | sed 's/%%OOO_LIBRARY_PATH_VAR%%/$(OOO_LIBRARY_PATH_VAR)/g'  > $@.new
-    mv $@.new $@
-    chmod +x $@
+ALLTAR : $(BIN)/python.sh
+
+STRIPMAC=-e '/^NONMACSECTION/d' -e '/^MACSECTION/,$$d'
+STRIPNONMAC=-e '/^NONMACSECTION/,/^MACSECTION/d'
+
+$(BIN)/python.sh : python.sh
+	$(COMMAND_ECHO)sed -e 's/%%PYVERSION%%/$(eq,$(OS),MACOSX $(PYMAJOR).$(PYMINOR) $(PYVERSION))/g' -e 's/%%OOO_LIBRARY_PATH_VAR%%/$(OOO_LIBRARY_PATH_VAR)/g' \
+		$(eq,$(OS),MACOSX $(STRIPNONMAC) $(STRIPMAC)) < $? > $@
+	@chmod +x $@
 .ENDIF
 
-$(OBJ)$/python.obj: $(OUT)$/inc$/pyversion.hxx
+$(OBJ)/python.obj: $(OUT)/inc/pyversion.hxx
 
-$(OUT)$/inc$/pyversion.hxx: pyversion.inc
-    $(SED) $(USQ)s/@/$(PYVERSION)/g$(USQ) < $< > $@
+$(OUT)/inc/pyversion.hxx: pyversion.inc
+	$(SED) $(USQ)s/@/$(PYVERSION)/g$(USQ) < $< > $@
 
-$(BIN)$/$(PYDIRNAME).zip : $(FILES)
+$(BIN)/$(PYDIRNAME).zip : $(FILES)
 .IF "$(GUI)" == "UNX"
-.IF "$(OS)" != "MACOSX" && "$(OS)" != "AIX"
-    cd $(DESTROOT) && find . -name '*$(DLLPOST)' | xargs strip
+.IF "$(OS)" != "AIX"
+	cd $(DESTROOT) && find . -name '*$(DLLPOST)' | xargs strip
 .ENDIF
 .ENDIF
-    -rm -f $@
-    cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME)
+	-rm -f $@
+	cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME)
 
-$(DESTROOT)$/lib$/% : $(SOLARLIBDIR)$/python$/%
-    -$(MKDIRHIER) $(@:d) 
-    -rm -f $@
-    cat $< > $@
+$(DESTROOT)/lib/% : $(SOLARLIBDIR)/python/%
+	-$(MKDIRHIER) $(@:d)
+	-rm -f $@
+	cat $< > $@
 
 .IF "$(GUI)"== "UNX"
-$(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
-    -$(MKDIRHIER) $(@:d)
-    -rm -f $@
-    cat $< > $@
+$(BIN)/python$(EXECPOST).bin : $(SOLARBINDIR)/python$(EXECPOST)
+	-$(MKDIRHIER) $(@:d)
+	-rm -f $@
+	cat $< > $@
 .IF "$(OS)" != "MACOSX" && "$(OS)" != "AIX"
-    strip $@
+	strip $@
 .ENDIF
-    chmod +x $@
+	chmod +x $@
 .ELSE
 .IF "$(COM)" == "GCC"
-$(DESTROOT)$/bin$/python.bin : $(SOLARBINDIR)$/python$(EXECPOST)
+$(DESTROOT)/bin/python.bin : $(SOLARBINDIR)/python$(EXECPOST)
 .ELSE
-$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
+$(DESTROOT)/bin/python$(EXECPOST) : $(SOLARBINDIR)/python$(EXECPOST)
 .ENDIF
-    -$(MKDIRHIER) $(@:d)
-    -rm -f $@
-    cat $< > $@
+	-$(MKDIRHIER) $(@:d)
+	-rm -f $@
+	cat $< > $@
 .ENDIF
 
 .ENDIF
 .ELSE
-ivo:
-    $(ECHO)
 .ENDIF # L10N_framework
diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index 219e7379a..4d2e37cc2 100644
--- a/pyuno/zipcore/python.sh
+++ b/pyuno/zipcore/python.sh
@@ -30,7 +30,7 @@
 sd_cwd="`pwd`"
 if [ -h "$0" ] ; then
     sd_basename=`basename "$0"`
-     sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` 
+    sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
     cd "`dirname "$0"`"
     cd "`dirname "$sd_script"`"
 else
@@ -56,6 +56,7 @@ export UNO_PATH
 : ${URE_BOOTSTRAP=vnd.sun.star.pathname:$sd_prog/fundamentalrc}
 export URE_BOOTSTRAP
 
+NONMACSECTION
 PYTHONPATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
 export PYTHONPATH
 PYTHONHOME=$sd_prog/../basis-link/program/python-core-%%PYVERSION%%
@@ -63,3 +64,13 @@ export PYTHONHOME
 
 # execute binary
 exec "$sd_prog/../basis-link/program/python.bin" "$@"
+MACSECTION
+PYTHONHOME=$sd_prog/../basis-link/program/OOoPython.framework
+export PYTHONHOME
+
+pybasislibdir=$PYTHONHOME/Versions/%%PYVERSION%%/lib/python%%PYVERSION%%
+PYTHONPATH=$sd_prog/../basis-link/program:$pybasislibdir:$pybasislibdir/lib-dynload:$pybasislibdir/lib-tk:$pybasislibdir/site-packages${PYTHONPATH+:$PYTHONPATH}
+export PYTHONPATH
+
+# execute binary
+exec "$PYTHONHOME/Versions/%%PYVERSION%%/Resources/Python.app/Contents/MacOS/OOoPython" "$@"
diff --git a/rdbmaker/prj/d.lst b/rdbmaker/prj/d.lst
index 4476addfa..67afbfb68 100644
--- a/rdbmaker/prj/d.lst
+++ b/rdbmaker/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\rdbmaker.exe %_DEST%\bin%_EXT%\rdbmaker.exe
-..\%__SRC%\bin\rdbmaker.pdb %_DEST%\bin%_EXT%\rdbmaker.pdb
+..\%__SRC%\bin\rdbmaker.exe %_DEST%\bin\rdbmaker.exe
+..\%__SRC%\bin\rdbmaker.pdb %_DEST%\bin\rdbmaker.pdb
 
-..\%__SRC%\bin\rdbmaker %_DEST%\bin%_EXT%\rdbmaker
+..\%__SRC%\bin\rdbmaker %_DEST%\bin\rdbmaker
diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx
index b531f6b90..ae56562f2 100644
--- a/rdbmaker/source/codemaker/global.cxx
+++ b/rdbmaker/source/codemaker/global.cxx
@@ -33,7 +33,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #include <direct.h>
 #include <errno.h>
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index d6b1c8d99..24009dd32 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -34,7 +34,7 @@
 
 #include <rtl/strbuf.hxx>
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #include <direct.h>
 #include <errno.h>
@@ -226,7 +226,7 @@ OString createFileName(const OString& path)
             continue;
         }
 
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
         if (mkdir((char*)nameBuffer.getStr(), 0777) == -1)
 #else
            if (mkdir((char*)nameBuffer.getStr()) == -1)
@@ -297,7 +297,7 @@ sal_Bool produceAllTypes(const OString& typeName,
 }
 
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
diff --git a/registry/prj/d.lst b/registry/prj/d.lst
index 644f28e5c..f1dfa729c 100644
--- a/registry/prj/d.lst
+++ b/registry/prj/d.lst
@@ -1,19 +1,19 @@
-mkdir: %_DEST%\inc%_EXT%\registry
+mkdir: %_DEST%\inc\registry
 
-..\inc\registry\*.h %_DEST%\inc%_EXT%\registry\*.h
-..\inc\registry\*.hxx %_DEST%\inc%_EXT%\registry\*.hxx
+..\inc\registry\*.h %_DEST%\inc\registry\*.h
+..\inc\registry\*.hxx %_DEST%\inc\registry\*.hxx
 
-..\%__SRC%\lib\ireg.lib %_DEST%\lib%_EXT%\ireg.lib
-..\%__SRC%\lib\libreg.*.* %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\reg*.dll %_DEST%\bin%_EXT%\reg*.dll
+..\%__SRC%\lib\ireg.lib %_DEST%\lib\ireg.lib
+..\%__SRC%\lib\libreg.* %_DEST%\lib\*
+..\%__SRC%\bin\reg*.dll %_DEST%\bin\reg*.dll
 
-..\%__SRC%\bin\checksingleton.exe %_DEST%\bin%_EXT%\checksingleton.exe
-..\%__SRC%\bin\regcompare.exe %_DEST%\bin%_EXT%\regcompare.exe
-..\%__SRC%\bin\regmerge.exe %_DEST%\bin%_EXT%\regmerge.exe
-..\%__SRC%\bin\regview.exe %_DEST%\bin%_EXT%\regview.exe
-..\%__SRC%\bin\checksingleton %_DEST%\bin%_EXT%\checksingleton
-..\%__SRC%\bin\regcompare %_DEST%\bin%_EXT%\regcompare
-..\%__SRC%\bin\regmerge %_DEST%\bin%_EXT%\regmerge
-..\%__SRC%\bin\regview %_DEST%\bin%_EXT%\regview
+..\%__SRC%\bin\checksingleton.exe %_DEST%\bin\checksingleton.exe
+..\%__SRC%\bin\regcompare.exe %_DEST%\bin\regcompare.exe
+..\%__SRC%\bin\regmerge.exe %_DEST%\bin\regmerge.exe
+..\%__SRC%\bin\regview.exe %_DEST%\bin\regview.exe
+..\%__SRC%\bin\checksingleton %_DEST%\bin\checksingleton
+..\%__SRC%\bin\regcompare %_DEST%\bin\regcompare
+..\%__SRC%\bin\regmerge %_DEST%\bin\regmerge
+..\%__SRC%\bin\regview %_DEST%\bin\regview
 
 linklib: libreg.*.*
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index fdb0caa97..5c2c01c8c 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -35,7 +35,7 @@
 #include    <string.h>
 #include	<stdio.h>
 
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
 #include    <unistd.h>
 #endif
 #ifdef __MINGW32__
@@ -468,6 +468,7 @@ ORegistry::~ORegistry()
 //
 RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMode)
 {
+    RegError eRet = REG_INVALID_REGISTRY;
     OStoreFile      rRegFile;
     storeAccessMode sAccessMode = REG_MODE_OPEN;
     storeError      errCode;
@@ -475,8 +476,8 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
     if (accessMode & REG_CREATE)
     {
         sAccessMode = REG_MODE_CREATE;
-    } else
-    if (accessMode & REG_READONLY)
+    }
+    else if (accessMode & REG_READONLY)
     {
         sAccessMode = REG_MODE_OPENREAD;
         m_readOnly = sal_True;
@@ -496,17 +497,21 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
     {
         switch (errCode)
         {
-            case  store_E_NotExists:
-                return REG_REGISTRY_NOT_EXISTS;
+            case store_E_NotExists:
+                eRet = REG_REGISTRY_NOT_EXISTS;
+                break;
             case store_E_LockingViolation:
-                return REG_CANNOT_OPEN_FOR_READWRITE;
+                eRet = REG_CANNOT_OPEN_FOR_READWRITE;
+                break;
             default:
-                return REG_INVALID_REGISTRY;
+                eRet = REG_INVALID_REGISTRY;
+                break;
         }
-    } else
+    }
+    else
     {
         OStoreDirectory rStoreDir;
-        storeError      _err = rStoreDir.create(rRegFile, OUString(), OUString(), sAccessMode);
+        storeError _err = rStoreDir.create(rRegFile, OUString(), OUString(), sAccessMode);
 
         if ( _err == store_E_None )
         {
@@ -515,14 +520,13 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
             m_isOpen = sal_True;
 
             m_openKeyTable[ROOT] = new ORegKey(ROOT, this);
-            return REG_NO_ERROR;
-        } else
-            return REG_INVALID_REGISTRY;
+            eRet = REG_NO_ERROR;
+        }
+        else
+            eRet = REG_INVALID_REGISTRY;
     }
 
-    // this line is never accessed
-    // just workaround to avoid warning: control reaches end of non-void function
-    return REG_INVALID_REGISTRY;
+    return eRet;
 }
 
 
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index 8d8fed3ce..01845dcdf 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -37,7 +37,7 @@
 #include "regimpl.hxx"
 #include "regkey.hxx"
 
-#if defined(WIN32) || defined(WNT) || defined(OS2)
+#if defined(WIN32) || defined(WNT)
 #include <io.h>
 #endif
 
diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx
index 586a74ea1..02122ea5a 100644
--- a/registry/tools/checksingleton.cxx
+++ b/registry/tools/checksingleton.cxx
@@ -231,7 +231,7 @@ static sal_Bool checkSingletons(Options_Impl const & options, RegistryKey& singl
     return bRet;
 }	
 
-#if (defined UNX) || (defined OS2) || (defined __MINGW32__)
+#if (defined UNX) || (defined __MINGW32__)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -344,4 +344,4 @@ int _cdecl main( int argc, char * argv[] )
     }
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk
index 06ca753ff..6a759b128 100644
--- a/registry/tools/makefile.mk
+++ b/registry/tools/makefile.mk
@@ -39,6 +39,8 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE :  ..$/version.mk
 
+.IF "$(OS)"!="IOS"
+
 # --- Files --------------------------------------------------------
 CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
 
@@ -85,4 +87,6 @@ APP5STDLIBS=\
 
 OBJFILES = $(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS)
 
+.ENDIF
+
 .INCLUDE :  target.mk
diff --git a/registry/tools/rdbedit.cxx b/registry/tools/rdbedit.cxx
index 08b6f5f27..8651e426d 100644
--- a/registry/tools/rdbedit.cxx
+++ b/registry/tools/rdbedit.cxx
@@ -262,7 +262,7 @@ OString Options::prepareVersion()
 static Options options;
 
 
-#if (defined UNX) || (defined OS2) || (defined __MINGW32__)
+#if (defined UNX) || (defined __MINGW32__)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 9c27ee448..887a43659 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -1962,7 +1962,7 @@ static sal_uInt32 compareKeys(
     return nError;
 }	
 
-#if (defined UNX) || (defined OS2) || defined __MINGW32__
+#if (defined UNX) || defined __MINGW32__
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -2090,4 +2090,4 @@ int _cdecl main( int argc, char * argv[] )
     return ((nError > 0) ? 11 : 0);
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index b947f3938..453847358 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -92,7 +92,7 @@ bool Options_Impl::initOptions_Impl (std::vector< std::string > & rArgs)
     return true;
 }
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -179,4 +179,4 @@ int _cdecl main( int argc, char * argv[] )
     return(0);
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 7c6b24968..f8ec81edf 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -40,7 +40,7 @@
 using rtl::OUString;
 using namespace registry::tools;
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
diff --git a/registry/util/makefile.mk b/registry/util/makefile.mk
index 0b6be7e6e..ecc356c7b 100644
--- a/registry/util/makefile.mk
+++ b/registry/util/makefile.mk
@@ -53,7 +53,11 @@ LIB1TARGET= $(SLB)$/$(TARGET).lib
 LIB1FILES= 	$(SLB)$/$(TARGET)cpp.lib
 
 SHL1TARGET= $(TARGET)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= ireg
+.ELSE
+SHL1IMPLIB= $(TARGET)
+.ENDIF
 SHL1STDLIBS= \
     $(SALLIB) \
     $(STORELIB)
diff --git a/registry/workben/makefile.mk b/registry/workben/makefile.mk
index 2813d6965..b7b8037f6 100644
--- a/registry/workben/makefile.mk
+++ b/registry/workben/makefile.mk
@@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS := TRUE
 CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
 
 RGTLIB = rgt.lib
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="UNX"
 RGTLIB = -lrgt$(DLLPOSTFIX)
 .ENDIF
 
diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx
index 85c76ac1a..dea6d957c 100644
--- a/registry/workben/regspeed.cxx
+++ b/registry/workben/regspeed.cxx
@@ -67,11 +67,7 @@ public:
     };
 
 protected:
-#ifdef OS2
-    struct timeb m_start, m_stop;
-#else
     struct _timeb m_start, m_stop;
-#endif
     double m_diff;
 };
 #else
@@ -106,7 +102,7 @@ protected:
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx
index 97711e72a..5e6c8d55d 100644
--- a/registry/workben/regtest.cxx
+++ b/registry/workben/regtest.cxx
@@ -41,7 +41,7 @@ using namespace std;
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main()
 #else
 int _cdecl main()
diff --git a/registry/workben/test.cxx b/registry/workben/test.cxx
index add3421d4..70d1296fe 100644
--- a/registry/workben/test.cxx
+++ b/registry/workben/test.cxx
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main()
 #else
 int _cdecl main()
diff --git a/remotebridges/examples/exports.dxp b/remotebridges/examples/exports.dxp
index 9630d7e06..51703a046 100644
--- a/remotebridges/examples/exports.dxp
+++ b/remotebridges/examples/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
 component_writeInfo
 component_getFactory
diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx
index 25e1611b6..9341fc436 100644
--- a/remotebridges/examples/officeclient.cxx
+++ b/remotebridges/examples/officeclient.cxx
@@ -278,12 +278,6 @@ using namespace remotebridges_officeclient;
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 sal_Bool SAL_CALL component_writeInfo(
     void * pServiceManager, void * pRegistryKey )
 {
@@ -310,7 +304,7 @@ sal_Bool SAL_CALL component_writeInfo(
     return sal_False;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pRet = 0;
diff --git a/remotebridges/prj/build.lst b/remotebridges/prj/build.lst
index 5f2a661dd..ae454aa89 100644
--- a/remotebridges/prj/build.lst
+++ b/remotebridges/prj/build.lst
@@ -1,2 +1,2 @@
-rb	remotebridges	: LIBXSLT:libxslt cppu cppuhelper offuh rdbmaker sal NULL
+rb	remotebridges	: LIBXSLT:libxslt cppu cppuhelper offapi DESKTOP:rdbmaker sal NULL
 rb	remotebridges\source\unourl_resolver	nmake	-	all	rb_urlresolv NULL
diff --git a/remotebridges/prj/d.lst b/remotebridges/prj/d.lst
index b8b46ae70..8f9c063f1 100644
--- a/remotebridges/prj/d.lst
+++ b/remotebridges/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\uuresolver.uno.dll %_DEST%\bin%_EXT%\uuresolver.uno.dll
-..\%__SRC%\lib\uuresolver.uno.dylib %_DEST%\lib%_EXT%\uuresolver.uno.dylib
-..\%__SRC%\lib\uuresolver.uno.so %_DEST%\lib%_EXT%\uuresolver.uno.so
-..\%__SRC%\misc\uuresolver.component %_DEST%\xml%_EXT%\uuresolver.component
+..\%__SRC%\bin\uuresolver.uno.dll %_DEST%\bin\uuresolver.uno.dll
+..\%__SRC%\lib\uuresolver.uno.dylib %_DEST%\lib\uuresolver.uno.dylib
+..\%__SRC%\lib\uuresolver.uno.so %_DEST%\lib\uuresolver.uno.so
+..\%__SRC%\misc\uuresolver.component %_DEST%\xml\uuresolver.component
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index 7c8898604..d3b2f0cdc 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -63,34 +63,14 @@ namespace unourl_resolver
 //--------------------------------------------------------------------------------------------------
 Sequence< OUString > resolver_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString resolver_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName(
-                RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
     
 //==================================================================================================
@@ -235,13 +215,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/ridljar/prj/build.lst b/ridljar/prj/build.lst
index ac91c68bd..b0aca0888 100644
--- a/ridljar/prj/build.lst
+++ b/ridljar/prj/build.lst
@@ -1,4 +1,4 @@
-ri ridljar : codemaker solenv udkapi NULL
+ri ridljar : DESKTOP:codemaker solenv udkapi NULL
 ri ridljar\javamaker nmake - all javamaker NULL
 ri ridljar\com nmake - all com javamaker NULL
 ri ridljar\util nmake - all util javamaker com NULL
diff --git a/ridljar/prj/d.lst b/ridljar/prj/d.lst
index 12cde6f28..007fd9dd4 100644
--- a/ridljar/prj/d.lst
+++ b/ridljar/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\ridl_src.zip %COMMON_DEST%\bin%_EXT%\ridl_src.zip
-..\%__SRC%\class\ridl.jar %_DEST%\bin%_EXT%\ridl.jar
-..\%__SRC%\class\unoloader\unoloader.jar %_DEST%\bin%_EXT%\unoloader.jar
-..\%__SRC%\bin\unoloader_src.zip %COMMON_DEST%\bin%_EXT%\unoloader_src.zip
+..\%__SRC%\bin\ridl_src.zip %COMMON_DEST%\bin\ridl_src.zip
+..\%__SRC%\class\ridl.jar %_DEST%\bin\ridl.jar
+..\%__SRC%\class\unoloader\unoloader.jar %_DEST%\bin\unoloader.jar
+..\%__SRC%\bin\unoloader_src.zip %COMMON_DEST%\bin\unoloader_src.zip
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 96d23472c..b351870b6 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -37,7 +37,6 @@
 #include <iostream>
 #include <limits>
 #include <string>
-
 #include "cppunittester/protectorfactory.hxx"
 #include "osl/module.h"
 #include "osl/module.hxx"
@@ -58,6 +57,8 @@
 #include "cppunit/plugin/PlugInManager.h"
 #include "cppunit/portability/Stream.h"
 
+#include "boost/noncopyable.hpp"
+
 namespace {
 
 void usageFailure() {
@@ -84,6 +85,39 @@ std::string convertLazy(rtl::OUString const & s16) {
          : static_cast< std::string::size_type >(s8.getLength())));
 }
 
+//Allow the whole uniting testing framework to be run inside a "Protector"
+//which knows about uno exceptions, so it can print the content of the
+//exception before falling over and dying
+class CPPUNIT_API ProtectedFixtureFunctor : public CppUnit::Functor, private boost::noncopyable
+{
+private:
+    const std::string &testlib;
+    const std::string &args;
+    CppUnit::TestResult &result;
+public:
+    ProtectedFixtureFunctor(const std::string& testlib_, const std::string &args_, CppUnit::TestResult &result_)
+        : testlib(testlib_)
+        , args(args_)
+        , result(result_)
+    {
+    }
+    bool run() const
+    {
+        CppUnit::PlugInManager manager;
+        manager.load(testlib, args);
+        CppUnit::TestRunner runner;
+        runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+        CppUnit::TestResultCollector collector;
+        result.addListener(&collector);
+        runner.run(result);
+        CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
+        return collector.wasSuccessful();
+    }
+    virtual bool operator()() const
+    {
+        return run();
+    }
+};
 }
 
 SAL_IMPLEMENT_MAIN() {
@@ -95,12 +129,27 @@ SAL_IMPLEMENT_MAIN() {
 #endif
 
     CppUnit::TestResult result;
+    cppunittester::LibreOfficeProtector *throw_protector = 0;
+    std::string args;
+    std::string testlib;
     sal_uInt32 index = 0;
-    for (; index < rtl_getAppCommandArgCount(); index += 3) {
-        if (!getArgument(index).equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM("--protector")))
+    while (index < rtl_getAppCommandArgCount())
+    {
+        rtl::OUString arg = getArgument(index);
+        if (!arg.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("--protector")))
         {
-            break;
+            if (testlib.empty())
+            {
+                testlib = rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
+                args += testlib;
+            }
+            else
+            {
+                args += ' ';
+                args += rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
+            }
+            ++index;
+            continue;
         }
         if (rtl_getAppCommandArgCount() - index < 3) {
             usageFailure();
@@ -109,45 +158,29 @@ SAL_IMPLEMENT_MAIN() {
         rtl::OUString sym(getArgument(index + 2));
         oslGenericFunction fn = (new osl::Module(lib, SAL_LOADMODULE_GLOBAL))
             ->getFunctionSymbol(sym);
-        CppUnit::Protector * p = fn == 0
+        throw_protector = fn == 0
             ? 0
             : (*reinterpret_cast< cppunittester::ProtectorFactory * >(fn))();
-        if (p == 0) {
+        if (throw_protector == 0) {
             std::cerr
                 << "Failure instantiating protector \"" << convertLazy(lib)
                 << "\", \"" << convertLazy(sym) << '"' << std::endl;
             std::exit(EXIT_FAILURE);
         }
-        result.pushProtector(p);
-    }
-    if (rtl_getAppCommandArgCount() - index < 1) {
-        usageFailure();
+        result.pushProtector(throw_protector);
+        index+=3;
     }
 
-    std::string testlib;
-    {
-        rtl::OUString path;
-        rtl_getAppCommandArg(index, &path.pData);
-        testlib = rtl::OUStringToOString(path, osl_getThreadTextEncoding()).getStr();
-    }
-    std::string args = testlib;
-    for (sal_uInt32 i = index + 1; i < rtl_getAppCommandArgCount(); ++i)
-    {
-        rtl::OUString arg;
-        rtl_getAppCommandArg(i, &arg.pData);
-        args += ' ';
-        args += rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
-    }
+    bool ok = false;
+    ProtectedFixtureFunctor tests(testlib, args, result);
+    //if the unoprotector was given on the command line, use it to catch
+    //and report the error message of exceptions
+    if (throw_protector)
+        ok = throw_protector->protect(tests);
+    else
+        ok = tests.run();
 
-    CppUnit::PlugInManager manager;
-    manager.load(testlib, args);
-    CppUnit::TestRunner runner;
-    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-    CppUnit::TestResultCollector collector;
-    result.addListener(&collector);
-    runner.run(result);
-    CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
-    return collector.wasSuccessful() ? EXIT_SUCCESS : EXIT_FAILURE;
+    return ok ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index 61fe7868c..7c43bab6b 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -33,15 +33,12 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
+.ENDIF
+
 OBJFILES = $(APP1OBJS)
 
 APP1OBJS = $(OBJ)/cppunittester.obj
diff --git a/sal/inc/cppunittester/protectorfactory.hxx b/sal/inc/cppunittester/protectorfactory.hxx
index c309dbe8a..916f89f74 100644
--- a/sal/inc/cppunittester/protectorfactory.hxx
+++ b/sal/inc/cppunittester/protectorfactory.hxx
@@ -32,14 +32,20 @@
 
 #include "sal/types.h"
 
-namespace CppUnit { class Protector; }
-
-namespace cppunittester {
-
-// The type of CppUnit::Protector factory functions that can be plugged into
-// cppunittester:
-extern "C" typedef CppUnit::Protector * SAL_CALL ProtectorFactory();
-
+#include <cppunit/Protector.h>
+
+namespace cppunittester
+{
+    class LibreOfficeProtector : public CppUnit::Protector
+    {
+    public:
+        virtual bool protect(CppUnit::Functor const & functor) = 0;
+        using CppUnit::Protector::protect;
+    };
+
+    // The type of CppUnit::Protector factory functions that can be plugged into
+    // cppunittester:
+    extern "C" typedef LibreOfficeProtector * SAL_CALL ProtectorFactory();
 }
 
 #endif
diff --git a/sal/inc/internal/once.h b/sal/inc/internal/once.h
index 440be0eb8..536ddb168 100644
--- a/sal/inc/internal/once.h
+++ b/sal/inc/internal/once.h
@@ -33,7 +33,7 @@
  *  (platform dependent)
  */
 
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
 
 #include <pthread.h>
 
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index 6cba3f74b..62e37f6b2 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -192,8 +192,6 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 #define OSL_THIS_FUNC __FUNCSIG__
 #elif (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 600)) || (defined(__IBMCPP__) && (__IBMCPP__ >= 500))
 #define OSL_THIS_FUNC __FUNCTION__
-#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x550)
-#define OSL_THIS_FUNC __FUNC__
 #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
 #define OSL_THIS_FUNC __func__
 #else
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index 1a447cfec..3d9bba828 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -66,6 +66,21 @@ extern "C" {
 #	endif
 #endif
 
+#ifdef ANDROID
+#	include <endian.h>
+#	if __BYTE_ORDER == __LITTLE_ENDIAN
+#           ifndef _LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
+#           endif
+#	elif __BYTE_ORDER == __BIG_ENDIAN
+#           ifndef _BIG_ENDIAN
+#		define _BIG_ENDIAN
+#           endif
+#	elif __BYTE_ORDER == __PDP_ENDIAN
+#		define _PDP_ENDIAN
+#	endif
+#endif
+
 #ifdef NETBSD
 #   include <machine/endian.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
@@ -109,10 +124,6 @@ extern "C" {
 #   endif
 #endif
 
-#ifdef OS2
-#	include <machine/endian.h>
-#endif
-
 #ifdef SOLARIS
 #	include <sys/isa_defs.h>
 #endif
@@ -134,13 +145,31 @@ extern "C" {
 #	endif
 #endif
 
+#ifdef IOS
+#	include <machine/endian.h>
+#	if BYTE_ORDER == LITTLE_ENDIAN
+#		ifndef _LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
+#		endif
+#	elif BYTE_ORDER == BIG_ENDIAN
+#		ifndef _BIG_ENDIAN
+#		define _BIG_ENDIAN
+#		endif
+#	elif BYTE_ORDER == PDP_ENDIAN
+#		ifndef _PDP_ENDIAN
+#		define _PDP_ENDIAN
+#		endif
+#	endif
+#endif
+
 /** Check supported platform.
  */
-#if !defined(_WIN32)  && !defined(OS2)     && \
+#if !defined(_WIN32)  && \
     !defined(LINUX)   && !defined(NETBSD) && \
     !defined(AIX)     && !defined(OPENBSD) && \
     !defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD) && \
-    !defined(DRAGONFLY)
+    !defined(DRAGONFLY) && \
+    !defined(IOS)     && !defined(ANDROID)
 #	error "Target platform not specified !"
 #endif
 
diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h
index bdb7693f5..b90ea3548 100644
--- a/sal/inc/osl/file.h
+++ b/sal/inc/osl/file.h
@@ -732,7 +732,7 @@ oslFileError SAL_CALL osl_openFile( rtl_uString *pustrFileURL, oslFileHandle *pH
     @see	osl_getFilePos()
 */
 
-oslFileError SAL_CALL osl_setFilePos( oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uPos );
+oslFileError SAL_CALL osl_setFilePos( oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uPos ) SAL_WARN_UNUSED_RESULT;
 
 
 /**	Retrieve the current position of the internal pointer of an open file.
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index d72dfc49b..df57e24ff 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -333,15 +333,9 @@ public:
 
     @see VolumeInfo
 */
-#ifdef OS2
-class VolumeInfo;
-#endif
 
 class VolumeDevice : public FileBase
 {
-#ifdef OS2
-public:
-#endif
     oslVolumeDeviceHandle	_aHandle;
 
 public:
@@ -441,15 +435,6 @@ public:
 
 // -----------------------------------------------------------------------------
 
-#define VolumeInfoMask_Attributes             osl_VolumeInfo_Mask_Attributes
-#define VolumeInfoMask_TotalSpace             osl_VolumeInfo_Mask_TotalSpace
-#define VolumeInfoMask_UsedSpace              osl_VolumeInfo_Mask_UsedSpace
-#define VolumeInfoMask_FreeSpace              osl_VolumeInfo_Mask_FreeSpace
-#define VolumeInfoMask_MaxNameLength          osl_VolumeInfo_Mask_MaxNameLength
-#define VolumeInfoMask_MaxPathLength          osl_VolumeInfo_Mask_MaxPathLength
-#define VolumeInfoMask_FileSystemName         osl_VolumeInfo_Mask_FileSystemName
-#define VolumeInfoMask_FileSystemCaseHandling osl_VolumeInfo_Mask_FileSystemCaseHandling
-
 class Directory;
 
 /** The VolumeInfo class.
@@ -481,7 +466,7 @@ public:
     /** Constructor.
 
         @param nMask 
-        Set of flaggs decribing the demanded information.
+        Set of flags decribing the demanded information.
     */
 
     VolumeInfo( sal_uInt32 nMask ): _nMask( nMask )
@@ -691,32 +676,6 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-
-#define	FileStatusMask_Type				osl_FileStatus_Mask_Type
-#define FileStatusMask_Attributes		osl_FileStatus_Mask_Attributes
-#define FileStatusMask_CreationTime		osl_FileStatus_Mask_CreationTime
-#define FileStatusMask_AccessTime		osl_FileStatus_Mask_AccessTime
-#define FileStatusMask_ModifyTime		osl_FileStatus_Mask_ModifyTime
-#define FileStatusMask_FileSize			osl_FileStatus_Mask_FileSize
-#define FileStatusMask_FileName			osl_FileStatus_Mask_FileName
-#define FileStatusMask_FileURL			osl_FileStatus_Mask_FileURL
-#define FileStatusMask_LinkTargetURL	osl_FileStatus_Mask_LinkTargetURL
-#define FileStatusMask_All				osl_FileStatus_Mask_All
-#define FileStatusMask_Validate			osl_FileStatus_Mask_Validate
-
-#define Attribute_ReadOnly     osl_File_Attribute_ReadOnly
-#define Attribute_Hidden       osl_File_Attribute_Hidden
-#define Attribute_Executable   osl_File_Attribute_Executable
-#define Attribute_GrpWrite     osl_File_Attribute_GrpWrite
-#define Attribute_GrpRead      osl_File_Attribute_GrpRead
-#define Attribute_GrpExe       osl_File_Attribute_GrpExe
-#define Attribute_OwnWrite     osl_File_Attribute_OwnWrite
-#define Attribute_OwnRead      osl_File_Attribute_OwnRead
-#define Attribute_OwnExe       osl_File_Attribute_OwnExe
-#define Attribute_OthWrite     osl_File_Attribute_OthWrite
-#define Attribute_OthRead      osl_File_Attribute_OthRead
-#define Attribute_OthExe       osl_File_Attribute_OthExe
-
 class DirectoryItem;
 
 /** The FileStatus class.
@@ -755,7 +714,7 @@ public:
     /** Constructor.
 
         @param nMask
-        Set of flaggs decribing the demanded information.
+        Set of flags decribing the demanded information.
     */
 
     FileStatus( sal_uInt32 nMask ): _nMask( nMask ) 
@@ -798,7 +757,7 @@ public:
     */
     inline Type getFileType() const
     {
-        return (_aStatus.uValidFields & FileStatusMask_Type) ?  (Type) _aStatus.eType : Unknown;
+        return (_aStatus.uValidFields & osl_FileStatus_Mask_Type) ?  (Type) _aStatus.eType : Unknown;
     }
 
     /** Get the file attributes.
@@ -1012,11 +971,6 @@ public:
         return (RC) Error;
     }
 
-
-    #define Pos_Absolut osl_Pos_Absolut
-    #define Pos_Current osl_Pos_Current
-    #define Pos_End     osl_Pos_End
-
     /** Set the internal position pointer of an open file.
         
         @param uHow [in] 
@@ -1034,7 +988,7 @@ public:
         @see getPos()
     */
 
-    inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos )
+    inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos ) SAL_WARN_UNUSED_RESULT
     {
         return (RC) osl_setFilePos( _pData, uHow, uPos );
     }
diff --git a/sal/inc/osl/module.h b/sal/inc/osl/module.h
index 349ecdf60..803b0b6f4 100644
--- a/sal/inc/osl/module.h
+++ b/sal/inc/osl/module.h
@@ -44,7 +44,7 @@ extern "C" {
 #define SAL_MODULENAME(name) name SAL_DLLEXTENSION
 #endif
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #define SAL_MODULENAME_WITH_VERSION(name, version) name version SAL_DLLEXTENSION
 
 #elif defined(SAL_UNX)
diff --git a/sal/inc/osl/process.h b/sal/inc/osl/process.h
index 0bdb95858..642690706 100644
--- a/sal/inc/osl/process.h
+++ b/sal/inc/osl/process.h
@@ -90,8 +90,6 @@ typedef sal_Int32 oslDescriptorFlag;
 
 #ifdef SAL_W32
 #	pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#	pragma pack(push, 4)
 #endif
 
 typedef struct {
@@ -104,7 +102,7 @@ typedef struct {
     sal_uInt32				HeapUsage;
 } oslProcessInfo;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #	pragma pack(pop)
 #endif
 
diff --git a/sal/inc/osl/signal.h b/sal/inc/osl/signal.h
index 37088227c..f14d092df 100644
--- a/sal/inc/osl/signal.h
+++ b/sal/inc/osl/signal.h
@@ -67,8 +67,6 @@ typedef enum
 
 #ifdef SAL_W32
 #	pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#	pragma pack(push, 4)
 #endif
 
 typedef struct
@@ -78,7 +76,7 @@ typedef struct
     void* 		UserData;
 } oslSignalInfo;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #	pragma pack(pop)
 #endif
 
diff --git a/sal/inc/osl/thread.h b/sal/inc/osl/thread.h
index 4cd058b28..9e088e6e4 100644
--- a/sal/inc/osl/thread.h
+++ b/sal/inc/osl/thread.h
@@ -68,7 +68,7 @@ typedef enum
 
 typedef sal_uInt32 oslThreadIdentifier;
 
-typedef sal_uInt32 oslThreadKey;
+typedef void* oslThreadKey;
 
 /** Create the thread, using the function-ptr pWorker as
     its main (worker) function. This functions receives in
diff --git a/sal/inc/osl/time.h b/sal/inc/osl/time.h
index b9e39279a..6b1139717 100644
--- a/sal/inc/osl/time.h
+++ b/sal/inc/osl/time.h
@@ -41,8 +41,6 @@ extern "C" {
 
 #ifdef SAL_W32
 #	pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#	pragma pack(push, 4)
 #endif
 
 /* Time since Jan-01-1970 */
@@ -52,7 +50,7 @@ typedef struct {
     sal_uInt32 Nanosec;
 } TimeValue;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined(SAL_W32)
 #	pragma pack(pop)
 #endif
 
diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx
index 15277da90..f5f6e6313 100644
--- a/sal/inc/rtl/instance.hxx
+++ b/sal/inc/rtl/instance.hxx
@@ -323,6 +323,31 @@ public:
         return p;
     }
 
+    static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor,
+                                const Data &rData)
+    {
+#if defined _MSC_VER
+        static Inst * m_pInstance = 0;
+#endif // _MSC_VER
+        Inst * p = m_pInstance;
+        if (!p)
+        {
+            Guard aGuard(aGuardCtor());
+            p = m_pInstance;
+            if (!p)
+            {
+                p = aInstCtor(rData);
+                OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+                m_pInstance = p;
+            }
+        }
+        else
+        {
+            OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+        }
+        return p;
+    }
+
 private:
 #if !defined _MSC_VER
     static Inst * m_pInstance;
@@ -361,6 +386,22 @@ namespace rtl {
               using the outer class
               (the one that derives from this base class)
 */
+#if (__GNUC__ >= 4)
+template<typename T, typename Unique>
+class Static {
+public:
+    /** Gets the static.  Mutual exclusion is implied by a functional
+        -fthreadsafe-statics
+
+        @return
+                static variable
+    */
+    static T & get() {
+        static T instance;
+        return instance;
+    }
+};
+#else
 template<typename T, typename Unique>
 class Static {
 public:
@@ -384,6 +425,100 @@ private:
         }
     };
 };
+#endif
+
+/** Helper base class for a late-initialized (default-constructed)
+    static variable, implementing the double-checked locking pattern correctly.
+
+    @derive
+    Derive from this class (common practice), e.g.
+    <pre>
+    struct MyStatic : public rtl::Static<MyType, MyStatic> {};
+    ...
+    MyType & rStatic = MyStatic::get();
+    ...
+    </pre>
+
+    @tplparam T
+              variable's type
+    @tplparam Unique
+              Implementation trick to make the inner static holder unique,
+              using the outer class
+              (the one that derives from this base class)
+*/
+#if (__GNUC__ >= 4)
+template<typename T, typename Data, typename Unique>
+class StaticWithArg {
+public:
+    /** Gets the static.  Mutual exclusion is implied by a functional
+        -fthreadsafe-statics
+
+        @return
+                static variable
+    */
+    static T & get(const Data& rData) {
+        static T instance(rData);
+        return instance;
+    }
+
+    /** Gets the static.  Mutual exclusion is implied by a functional
+        -fthreadsafe-statics
+
+        @return
+                static variable
+    */
+    static T & get(Data& rData) {
+        static T instance(rData);
+        return instance;
+    }
+};
+#else
+template<typename T, typename Data, typename Unique>
+class StaticWithArg {
+public:
+    /** Gets the static.  Mutual exclusion is performed using the
+        osl global mutex.
+
+        @return
+                static variable
+    */
+    static T & get(const Data& rData) {
+        return *rtl_Instance<
+            T, StaticInstanceWithArg,
+            ::osl::MutexGuard, ::osl::GetGlobalMutex,
+            Data >::create( StaticInstanceWithArg(),
+                                      ::osl::GetGlobalMutex(),
+                                      rData );
+    }
+
+    /** Gets the static.  Mutual exclusion is performed using the
+        osl global mutex.
+
+        @return
+                static variable
+    */
+    static T & get(Data& rData) {
+        return *rtl_Instance<
+            T, StaticInstanceWithArg,
+            ::osl::MutexGuard, ::osl::GetGlobalMutex,
+            Data >::create( StaticInstanceWithArg(),
+                                      ::osl::GetGlobalMutex(),
+                                      rData );
+    }
+private:
+    struct StaticInstanceWithArg {
+        T * operator () (const Data& rData) {
+            static T instance(rData);
+            return &instance;
+        }
+
+        T * operator () (Data& rData) {
+            static T instance(rData);
+            return &instance;
+         }
+    };
+};
+#endif
 
 /** Helper class for a late-initialized static aggregate, e.g. an array,
     implementing the double-checked locking pattern correctly.
@@ -393,6 +528,23 @@ private:
     @tplparam InitAggregate
               initializer functor class
 */
+#if (__GNUC__ >= 4)
+template<typename T, typename InitAggregate>
+class StaticAggregate {
+public:
+    /** Gets the static aggregate, late-initializing.
+        Mutual exclusion is implied by a functional
+        -fthreadsafe-statics
+
+        @return
+                aggregate
+    */
+    static T * get() {
+        static T *instance = InitAggregate()();
+        return instance;
+    }
+};
+#else
 template<typename T, typename InitAggregate>
 class StaticAggregate {
 public:
@@ -409,7 +561,7 @@ public:
                 InitAggregate(), ::osl::GetGlobalMutex() );
     }
 };
-
+#endif
 /** Helper base class for a late-initialized static variable,
     implementing the double-checked locking pattern correctly.
     
@@ -441,6 +593,23 @@ public:
               Initializer functor's return type.
               Default is T (common practice).
 */
+#if (__GNUC__ >= 4)
+template<typename T, typename InitData,
+         typename Unique = InitData, typename Data = T>
+class StaticWithInit {
+public:
+    /** Gets the static.  Mutual exclusion is implied by a functional
+        -fthreadsafe-statics
+
+        @return
+                static variable
+    */
+    static T & get() {
+        static T instance = InitData()();
+        return instance;
+    }
+};
+#else
 template<typename T, typename InitData,
          typename Unique = InitData, typename Data = T>
 class StaticWithInit {
@@ -467,7 +636,7 @@ private:
         }
     };
 };
-
+#endif
 } // namespace rtl
 
 #endif // INCLUDED_RTL_INSTANCE_HXX
diff --git a/sal/inc/rtl/locale.h b/sal/inc/rtl/locale.h
index 8c978bb8b..51459d9cd 100644
--- a/sal/inc/rtl/locale.h
+++ b/sal/inc/rtl/locale.h
@@ -37,8 +37,6 @@ extern "C" {
 
 #ifdef SAL_W32
 #	pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#	pragma pack(push, 4)
 #endif
 
 /**
@@ -67,7 +65,7 @@ typedef struct _rtl_Locale
     sal_Int32		HashCode;
 } rtl_Locale;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx
index f7ef3b5bb..82fab5b87 100644
--- a/sal/inc/rtl/math.hxx
+++ b/sal/inc/rtl/math.hxx
@@ -142,8 +142,8 @@ inline void doubleToUStringBuffer( rtl::OUStringBuffer& rBuffer, double fValue,
  */
 inline double stringToDouble(rtl::OString const & rString,
                              sal_Char cDecSeparator, sal_Char cGroupSeparator,
-                             rtl_math_ConversionStatus * pStatus,
-                             sal_Int32 * pParsedEnd)
+                             rtl_math_ConversionStatus * pStatus = 0,
+                             sal_Int32 * pParsedEnd = 0)
 {
     sal_Char const * pBegin = rString.getStr();
     sal_Char const * pEnd;
@@ -161,8 +161,8 @@ inline double stringToDouble(rtl::OString const & rString,
 inline double stringToDouble(rtl::OUString const & rString,
                              sal_Unicode cDecSeparator,
                              sal_Unicode cGroupSeparator,
-                             rtl_math_ConversionStatus * pStatus,
-                             sal_Int32 * pParsedEnd)
+                             rtl_math_ConversionStatus * pStatus = 0,
+                             sal_Int32 * pParsedEnd = 0)
 {
     sal_Unicode const * pBegin = rString.getStr();
     sal_Unicode const * pEnd;
diff --git a/sal/inc/rtl/strbuf.h b/sal/inc/rtl/strbuf.h
index 0156e6ed7..9543b9a57 100644
--- a/sal/inc/rtl/strbuf.h
+++ b/sal/inc/rtl/strbuf.h
@@ -105,7 +105,6 @@ void SAL_CALL rtl_stringbuffer_ensureCapacity(	/*inout*/rtl_String ** This,
     @param 	offset  	the offset.
     @param 	ch      	a character array.
     @param	len    		the number of characters to append.
-    @return	this string buffer.
  */
 void SAL_CALL rtl_stringbuffer_insert( /*inout*/rtl_String ** This, 
                                        /*inout*/sal_Int32 * capacity,
@@ -113,6 +112,21 @@ void SAL_CALL rtl_stringbuffer_insert( /*inout*/rtl_String ** This,
                                        const sal_Char * str, 
                                        sal_Int32 len);
 
+/**
+    Removes the characters in a substring of this sequence.
+
+    The substring begins at the specified <code>start</code> and
+    is <code>len</code> characters long.
+
+    start must be >= 0 && <= This->length
+
+    @param 	start      	The beginning index, inclusive
+    @param	len    		The substring length
+ */
+void SAL_CALL rtl_stringbuffer_remove( /*inout*/rtl_String ** This,
+                                       sal_Int32 start,
+                                       sal_Int32 len );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 21ff60391..3a26c1b74 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -54,7 +54,7 @@ namespace rtl
     is compiled to the equivalent of:
     <p><blockquote><pre>
         x = new OStringBuffer().append("a").append(4).append("c")
-                              .toString()
+                              .makeStringAndClear()
     </pre></blockquote><p>
     The principal operations on a <code>OStringBuffer</code> are the
     <code>append</code> and <code>insert</code> methods, which are
@@ -135,6 +135,25 @@ public:
         rtl_stringbuffer_newFromStr_WithLength( &pData, value.getStr(), value.getLength() );
     }
 
+    /**
+        Constructs a string buffer so that it represents the same
+        sequence of characters as the string argument.
+
+        The initial
+        capacity of the string buffer is <code>16</code> plus length
+
+        @param    value       a character array.
+        @param    length      the number of character which should be copied.
+                              The character array length must be greater or
+                              equal than this value.
+     */
+    OStringBuffer(const sal_Char * value, sal_Int32 length)
+        : pData(NULL)
+        , nCapacity( length + 16 )
+    {
+        rtl_stringbuffer_newFromStr_WithLength( &pData, value, length );
+    }
+
     /** Assign to this a copy of value.
      */
     OStringBuffer& operator = ( const OStringBuffer& value )
@@ -651,6 +670,25 @@ public:
         sal_Char sz[RTL_STR_MAX_VALUEOFDOUBLE];
         return insert( offset, sz, rtl_str_valueOfDouble( sz, d ) );
     }
+
+    /**
+        Removes the characters in a substring of this sequence.
+
+        The substring begins at the specified <code>start</code> and
+        is <code>len</code> characters long.
+
+        start must be >= 0 && <= getLength() && <= end
+
+        @param 	start      	The beginning index, inclusive
+        @param	len    		The substring length
+        @return this string buffer.
+     */
+    OStringBuffer & remove( sal_Int32 start, sal_Int32 len )
+    {
+        rtl_stringbuffer_remove( &pData, start, len );
+        return *this;
+    }
+
 private:
     /**
         A pointer to the data structur which contains the data.
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h
index 2a7a2d943..5f7719019 100644
--- a/sal/inc/rtl/string.h
+++ b/sal/inc/rtl/string.h
@@ -742,8 +742,6 @@ double SAL_CALL rtl_str_toDouble( const sal_Char * str ) SAL_THROW_EXTERN_C();
 
 #ifdef SAL_W32
 #	pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#	pragma pack(push, 4)
 #endif
 
 /** The implementation of a byte string.
@@ -757,7 +755,7 @@ typedef struct _rtl_String
     sal_Char            buffer[1];
 } rtl_String;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined(SAL_W32)
 #pragma pack(pop)
 #endif
 
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 186b515ca..ba66e0958 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -341,6 +341,30 @@ public:
     }
 
     /**
+      Perform a comparison of two strings.
+
+      The result is true if and only if second string
+      represents the same sequence of characters as the first string.
+      The ASCII string must be NULL-terminated and must be greater or
+      equal as length.
+      This function can't be used for language specific comparison.
+
+
+      @param    value       a character array.
+      @param    length      the length of the character array.
+      @return   sal_True if the strings are equal;
+                sal_False, otherwise.
+    */
+    sal_Bool equalsL( const sal_Char* value, sal_Int32 length ) const SAL_THROW(())
+    {
+        if ( pData->length != length )
+            return sal_False;
+
+        return rtl_str_reverseCompare_WithLength( pData->buffer, pData->length,
+                                                  value, length ) == 0;
+    }
+
+    /**
       Perform a ASCII lowercase comparison of two strings.
 
       The result is true if and only if second string
diff --git a/sal/inc/rtl/ustrbuf.h b/sal/inc/rtl/ustrbuf.h
index dfd8019ee..260db4f30 100644
--- a/sal/inc/rtl/ustrbuf.h
+++ b/sal/inc/rtl/ustrbuf.h
@@ -159,6 +159,21 @@ void SAL_CALL rtl_uStringbuffer_insert_ascii(   /*inout*/rtl_uString ** This,
                                                 const sal_Char * str,
                                                 sal_Int32 len);
 
+/**
+    Removes the characters in a substring of this sequence.
+
+    The substring begins at the specified <code>start</code> and
+    is <code>len</code> characters long.
+
+    start must be >= 0 && <= This->length
+
+    @param 	start      	The beginning index, inclusive
+    @param	len    		The substring length
+ */
+void SAL_CALL rtl_uStringbuffer_remove( /*inout*/rtl_uString ** This,
+                                       sal_Int32 start,
+                                       sal_Int32 len );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index b6160ccc9..756959748 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -53,7 +53,7 @@ namespace rtl
     is compiled to the equivalent of:
     <p><blockquote><pre>
         x = new OUStringBuffer().append("a").append(4).append("c")
-                              .toString()
+                              .makeStringAndClear()
     </pre></blockquote><p>
     The principal operations on a <code>OUStringBuffer</code> are the
     <code>append</code> and <code>insert</code> methods, which are
@@ -95,7 +95,7 @@ public:
         Allocates a new string buffer that contains the same sequence of
         characters as the string buffer argument.
 
-        @param   value   a <code>OStringBuffer</code>.
+        @param   value   a <code>OUStringBuffer</code>.
      */
     OUStringBuffer( const OUStringBuffer & value )
         : pData(NULL)
@@ -280,7 +280,6 @@ public:
      */
     const OUString toString() const { return OUString(pData->buffer); }
 
-
     /**
         The character at the specified index of this string buffer is set
         to <code>ch</code>.
@@ -739,6 +738,24 @@ public:
         return *this;
     }
 
+    /**
+        Removes the characters in a substring of this sequence.
+
+        The substring begins at the specified <code>start</code> and
+        is <code>len</code> characters long.
+
+        start must be >= 0 && <= This->length
+
+        @param 	start      	The beginning index, inclusive
+        @param	len    		The substring length
+        @return this string buffer.
+     */
+    OUStringBuffer & remove( sal_Int32 start, sal_Int32 len )
+    {
+        rtl_uStringbuffer_remove( &pData, start, len );
+        return *this;
+    }
+
     /** Allows access to the internal data of this OUStringBuffer, for effective
         manipulation.
 
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index 723117c03..e52242d68 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -1062,7 +1062,7 @@ double SAL_CALL rtl_ustr_toDouble( const sal_Unicode * str ) SAL_THROW_EXTERN_C(
 
 /* ======================================================================= */
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined(SAL_W32)
 #pragma pack(push, 4)
 #endif
 
@@ -1077,7 +1077,7 @@ typedef struct _rtl_uString
     sal_Unicode         buffer[1];
 } rtl_uString;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined(SAL_W32)
 #pragma pack(pop)
 #endif
 
diff --git a/sal/inc/sal/alloca.h b/sal/inc/sal/alloca.h
index 23282807e..087746ff7 100644
--- a/sal/inc/sal/alloca.h
+++ b/sal/inc/sal/alloca.h
@@ -29,7 +29,7 @@
 #ifndef INCLUDED_SAL_ALLOCA_H
 #define INCLUDED_SAL_ALLOCA_H
 
-#if defined (SOLARIS) || defined (LINUX) || defined(__EMX__) || defined(AIX)
+#if defined (SOLARIS) || defined (LINUX) || defined(__EMX__) || defined(AIX) || defined(ANDROID)
 
 #ifndef INCLUDED_ALLOCA_H
 #include <alloca.h>
@@ -50,6 +50,13 @@
 #define INCLUDED_SYS_TYPES_H
 #endif
 
+#elif defined (IOS)
+
+#ifndef INCLUDED_SYS_TYPES_H
+#include <sys/types.h>
+#define INCLUDED_SYS_TYPES_H
+#endif
+
 #elif defined (WNT)
 
 #ifndef INCLUDED_MALLOC_H
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 70f6f1117..fdeaf85b4 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -41,7 +41,6 @@
 #define SAL_PATHSEPARATOR ';'
 #define SAL_PATHDELIMITER '\\'
 #define SAL_CONFIGFILE( name ) name ".ini"
-#define SAL_SYSCONFIGFILE( name ) name ".ini"
 
 #ifdef _MSC_VER
 
@@ -75,25 +74,8 @@
 
 #endif /* defined WIN32 */
 
-/* BR: 16bit fuer Borland-Compiler */
-#ifdef __BORLANDC__
-#define SAL_W16
-#define SAL_DLLEXTENSION ".dll"
-#endif
-/* BR: 16bit fuer Borland-Compiler */
-
-#ifdef OS2
-#define SAL_OS2
-#define SAL_DLLEXTENSION ".dll"
-#define SAL_PRGEXTENSION ".exe"
-#define SAL_PATHSEPARATOR ';'
-#define SAL_PATHDELIMITER '\\'
-#define SAL_CONFIGFILE( name ) name ".ini"
-#define SAL_SYSCONFIGFILE( name ) name ".ini"
-#endif
-
 #if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || \
-    defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY)
+    defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY) || defined(ANDROID)
 #define SAL_UNX
 #define SAL_DLLEXTENSION ".so"
 #define SAL_DLLPREFIX "lib"
@@ -101,7 +83,6 @@
 #define SAL_PATHSEPARATOR ':'
 #define SAL_PATHDELIMITER '/'
 #define SAL_CONFIGFILE( name ) name "rc"
-#define SAL_SYSCONFIGFILE( name ) "." name "rc"
 #endif
 
 #ifdef MACOSX
@@ -112,7 +93,22 @@
 #define SAL_PATHSEPARATOR ':'
 #define SAL_PATHDELIMITER '/'
 #define SAL_CONFIGFILE( name ) name "rc"
-#define SAL_SYSCONFIGFILE( name ) "." name "rc"
+#endif
+
+#ifdef IOS
+#define SAL_UNX
+/* SAL_DLLEXTENSION should not really be used on iOS, as iOS apps are
+ * not allowed to load own dynamic libraries.
+ */
+#define SAL_DLLEXTENSION ".dylib" 
+#define SAL_DLLPREFIX "lib"
+/* This is fairly pointless too, an iOS app consists of a single
+ * executable (plus data files).
+ */
+#define SAL_PRGEXTENSION ".bin"
+#define SAL_PATHSEPARATOR ':'
+#define SAL_PATHDELIMITER '/'
+#define SAL_CONFIGFILE( name ) name "rc"
 #endif
 
 #ifdef sun
diff --git a/sal/inc/sal/cppunit.h b/sal/inc/sal/cppunit.h
index d0b3e6099..41c465d62 100644
--- a/sal/inc/sal/cppunit.h
+++ b/sal/inc/sal/cppunit.h
@@ -35,6 +35,18 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/Protector.h>
+
+namespace cppunittester
+{
+    class LibreOfficeProtecter : public CppUnit::Protector
+    {
+    public:
+        virtual bool protect(CppUnit::Functor const & functor) = 0;
+        using CppUnit::Protector::protect;
+    };
+}
+
 #undef CPPUNIT_PLUGIN_EXPORT
 #define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
 
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index bf7a82821..370cba4db 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -41,6 +41,82 @@ extern "C" {
 void SAL_CALL sal_detail_initialize(int argc, char ** argv);
 void SAL_CALL sal_detail_deinitialize();
 
+#ifdef IOS
+
+#include <premac.h>
+#import <UIKit/UIKit.h>
+#include <postmac.h>
+
+#define SAL_MAIN_WITH_ARGS_IMPL \
+int SAL_CALL main(int argc, char ** argv) \
+{ \
+    sal_detail_initialize(argc, argv);   \
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \
+    int retVal = UIApplicationMain (argc, argv, @"UIApplication", @"salAppDelegate"); \
+    [pool release]; \
+    sal_detail_deinitialize(); \
+    return retVal; \
+} \
+ \
+static int sal_main_with_args(int argc, char **argv); \
+ \
+static int \
+sal_main(void) \
+{ \
+    char *argv[] = { NULL }; \
+    return sal_main_with_args(0, argv); \
+}
+
+#define SAL_MAIN_IMPL \
+int SAL_CALL main(int argc, char ** argv) \
+{ \
+    sal_detail_initialize(argc, argv);   \
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \
+    int retVal = UIApplicationMain (argc, argv, @"UIApplication", @"salAppDelegate"); \
+    [pool release]; \
+    sal_detail_deinitialize(); \
+    return retVal; \
+}
+
+#define SAL_MAIN_WITH_GUI_IMPL \
+int SAL_CALL main(int argc, char ** argv) \
+{ \
+    sal_detail_initialize(argc, argv);   \
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \
+    int retVal = sal_main(); \
+    [pool release]; \
+    sal_detail_deinitialize(); \
+    return retVal; \
+}
+
+@interface salAppDelegate : NSObject <UIApplicationDelegate> {
+}
+@property (nonatomic, retain) UIWindow *window;
+@end
+
+static int sal_main(void);
+
+@implementation salAppDelegate
+
+@synthesize window=_window;
+
+- (BOOL)application: (UIApplication *) application didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
+{
+  UIWindow *uiw = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+  uiw.backgroundColor = [UIColor redColor];
+  self.window = uiw;
+  [uiw release];
+
+  sal_main();
+
+  [self.window makeKeyAndVisible];
+  return YES;
+}
+
+@end
+
+#else
+
 #define SAL_MAIN_WITH_ARGS_IMPL \
 int SAL_CALL main(int argc, char ** argv) \
 { \
@@ -61,6 +137,11 @@ int SAL_CALL main(int argc, char ** argv) \
     return ret; \
 }
 
+#define SAL_MAIN_WITH_GUI_IMPL SAL_MAIN_IMPL
+
+#endif
+
+
 /* Definition macros for CRT entries */
 
 #ifdef SAL_W32
@@ -118,6 +199,19 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh
     SAL_WIN_WinMain \
     static int SAL_CALL sal_main(void)
 
+/* Use SAL_IMPLEMENT_MAIN_WITH_GUI in programs that actually have a
+ * VCL GUI. The difference is meaningful only for iOS support, which
+ * of course is a highly experimental work in progress. So actually,
+ * don't bother, just let developers who care for iOS take care of it
+ * when/if necessary.
+ */
+
+#define SAL_IMPLEMENT_MAIN_WITH_GUI() \
+    static int  SAL_CALL sal_main(void); \
+    SAL_MAIN_WITH_GUI_IMPL \
+    SAL_WIN_WinMain \
+    static int SAL_CALL sal_main(void)
+
 /*
     "How to use" Examples:
 
diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index 5f6537dcf..f180369a9 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -61,11 +61,16 @@ extern "C" {
 /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
 #if defined( WNT)
 #define SAL_MATH_FINITE(d) _finite(d)
-#elif defined OS2
-#define SAL_MATH_FINITE(x) 				\
-    ((sizeof (x) == sizeof (float)) ? __isfinitef(x)	\
-    : (sizeof (x) == sizeof (double)) ? __isfinite(x)	\
-    : __isfinitel(x))
+#elif defined IOS
+/* C++ is so nice. This is the only way I could come up with making
+ * this actually work in all cases (?), even when <cmath> has been
+ * included which #undefs isfinite: copy the definition of isfinite()
+ * from <architecture/arm/math.h>
+ */
+#define SAL_MATH_FINITE(d) \
+  ( sizeof (d) == sizeof(float ) ?  __inline_isfinitef((float)(d)) \
+  : sizeof (d) == sizeof(double) ?  __inline_isfinited((double)(d)) \
+                                 :  __inline_isfinite ((long double)(d)))
 #elif defined LINUX || defined UNX
 #define SAL_MATH_FINITE(d) finite(d)
 #else /* WNT, LINUX, UNX */
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 24f6b1050..33ff2d989 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -35,7 +35,7 @@
 /* Grab __SIZEOFxxx constants from typesconfig tool on Unix */
 #if defined UNX
   #include <sal/typesizes.h>
-#elif defined(WNT) || defined(OS2)
+#elif defined(WNT)
   /* FIXME: autogeneration of type sizes on Win32/Win64? */
   #define SAL_TYPES_ALIGNMENT2		1
   #define SAL_TYPES_ALIGNMENT4		1
@@ -239,10 +239,8 @@ typedef void *                   sal_Handle;
 #define SAL_MAX_SIZE		SAL_MAX_UINT64
 #endif
 
-#if defined(SAL_W32) || defined(SAL_OS2) || defined(SAL_UNX)
+#if defined(SAL_W32) || defined(SAL_UNX)
 #   define SAL_MAX_ENUM 0x7fffffff
-#elif defined(SAL_W16)
-#   define SAL_MAX_ENUM 0x7fff
 #endif
 
 #if defined(_MSC_VER) || defined(__MINGW32__)
@@ -260,13 +258,6 @@ typedef void *                   sal_Handle;
 #   define SAL_CALL
 #   define SAL_CALL_ELLIPSE
 #endif
-#elif defined SAL_OS2 // YD
-/* YD 25/09/2007 gcc doesn't like imports inside class members */
-#   define SAL_DLLPUBLIC_EXPORT
-#   define SAL_DLLPUBLIC_IMPORT
-#   define SAL_DLLPRIVATE
-#   define SAL_CALL
-#   define SAL_CALL_ELLIPSE
 #elif defined SAL_UNX
 #   if   defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550)
 #     define SAL_DLLPUBLIC_EXPORT  __global
@@ -305,6 +296,18 @@ typedef void *                   sal_Handle;
 #define SAL_EXCEPTION_DLLPRIVATE
 #endif
 
+/** Use this as markup for functions and methods whose return value must be
+    checked.
+
+    Compilers that support a construct of this nature will emit a compile
+    time warning on unchecked return value.
+*/
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#   define SAL_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+#else
+#   define SAL_WARN_UNUSED_RESULT
+#endif
+
 /** Use this for pure virtual classes, e.g. class SAL_NO_VTABLE Foo { ...
     This hinders the compiler from setting a generic vtable stating that
     a pure virtual function was called and thus slightly reduces code size.
@@ -317,8 +320,6 @@ typedef void *                   sal_Handle;
 
 #ifdef SAL_W32
 #   pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#	pragma pack(push, 4)
 #endif
 
 /** This is the binary specification of a SAL sequence.
@@ -339,7 +340,7 @@ typedef struct _sal_Sequence
 
 #define SAL_SEQUENCE_HEADER_SIZE ((sal_Size)&((sal_Sequence *)0)->elements)
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
@@ -350,7 +351,7 @@ typedef struct _sal_Sequence
  */
 #ifdef __cplusplus
 #if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || \
-    defined FREEBSD || defined NETBSD || defined AIX || defined OS2 || \
+    defined FREEBSD || defined NETBSD || defined AIX || \
     defined OPENBSD || defined DRAGONFLY
 #define SAL_CONST_CAST(type, expr) (const_cast< type >(expr))
 #define SAL_REINTERPRET_CAST(type, expr) (reinterpret_cast< type >(expr))
diff --git a/sal/inc/systools/win32/StrConvert.h b/sal/inc/systools/win32/StrConvert.h
deleted file mode 100644
index 25ebec06e..000000000
--- a/sal/inc/systools/win32/StrConvert.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _STRCONVERT_H_
-#define _STRCONVERT_H_
-
-#include <windows.h>
-
-#ifdef NDEBUG
-#define STRCONVERT_H_HAD_NDEBUG
-#undef NDEBUG
-#endif
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-int  AllocNecessarySpaceAndCopyWStr2Str( LPCWSTR lpcwstrString, LPSTR* lppStr );
-int  AllocSpaceAndCopyWStr2Str( LPCWSTR lpcwstrString, DWORD nWCharsToCopy, LPSTR* lppStr );
-int  CalcLenDblNullTerminatedWStr( LPCWSTR lpcwstrString );
-int  CalcLenDblNullTerminatedStr( LPCSTR lpcstrString );
-void FreeSpaceStr( LPSTR lpszString );
-
-/* WC2MB allocates a sufficient amount of memory on stack and converts
-   the wide char parameter to multi byte string using the actual code
-   page.
-
-   @Param: wcStr - a wide char string
-           mbStr - the corresponding multi byte string
-
-   NOTE: due to the use of _alloca, this must be a macro and no function
-*/
-
-#define WC2MB( wcStr, mbStr ) \
-if( wcStr ) \
-{ \
-    int needed = WideCharToMultiByte( CP_ACP, 0, wcStr, -1, NULL, 0, NULL, NULL ); \
-    if( needed > 0 ) \
-    { \
-        int copied; \
-        mbStr = _alloca( needed * sizeof( CHAR ) ); \
-        copied = WideCharToMultiByte( CP_ACP, 0, wcStr, -1, mbStr, needed, NULL, NULL ); \
-        assert( copied == needed ); \
-    } \
-}
-
-
-/* WideCharListGetMultiByteLength
-   calculates the needed length of a corresponding the multi byte string
-   list for a wide char string list.
-
-   @Param: cp - the code page to use for convertion.
-           wcList - a double '\0' terminated wide char string list.
-*/
-
-int WideCharListGetMultiByteLength( UINT codepage, LPCWSTR wcList );
-
-/* WideCharListToMultiByteList
-   converts a double '\0' terminated list of wide char strings to a
-   multi byte string list.
-
-   @Param: cp - the code page to use for convertion.
-           wcList - a double '\0' terminated wide char string list.
-           mbList - a double '\0' terminated multi byte string list.
-           dwSize - size of buffer for multi byte string list.
-*/
-
-int WideCharListToMultiByteList( UINT codepage, LPCWSTR wcList, LPSTR mbList, DWORD dwSize );
-
-
-/* WCL2MBL allocates a sufficient amount of memory on stack and converts
-   the wide char list parameter to multi byte string list using the actual
-   code page.
-
-   @Param: wcList - a wide char string list
-           mbList - the corresponding multi byte string list
-
-   NOTE: due to the use of _alloca, this must be a macro and no function
-*/
-
-#define WCL2MBL( wcList, mbList ) \
-if( wcList ) \
-{ \
-    int needed = WideCharListGetMultiByteLength( CP_ACP, wcList ); \
-    if( needed > 0 ) \
-    { \
-        int copied; \
-        mbList = _alloca( needed * sizeof( CHAR ) ); \
-        copied = WideCharListToMultiByteList( CP_ACP, wcList, mbList, needed ); \
-        assert( copied == needed ); \
-    } \
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-// Restore NDEBUG state
-#ifdef STRCONVERT_H_HAD_NDEBUG
-#define NDEBUG
-#else
-#undef NDEBUG
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/SyncObjects.hxx b/sal/inc/systools/win32/SyncObjects.hxx
deleted file mode 100644
index 273321581..000000000
--- a/sal/inc/systools/win32/SyncObjects.hxx
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef _SYNCOBJECTS_HXX_
-#define _SYNCOBJECTS_HXX_
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
-#include <windows.h>
-
-//------------------------------------------------------------------------
-// a simple helper template for automatic locking/unlocking 
-//------------------------------------------------------------------------
-
-template< class LOCK >
-class CLockGuard
-{
-public:
-    CLockGuard( LOCK* aLock ) : 
-        m_pLock( aLock )
-    {
-        m_pLock->Lock( );
-    }
-
-    ~CLockGuard( )
-    {
-        m_pLock->Unlock( );
-    }
-
-private:
-    LOCK* m_pLock;
-};
-
-//------------------------------------------------------------------------
-// a interface base class for different locking sub classes
-//------------------------------------------------------------------------
-
-class CSyncObject
-{
-public:
-    virtual ~CSyncObject( ) = 0;
-
-    virtual int Lock( )     = 0;
-    virtual int Unlock( )   = 0;
-};
-
-//------------------------------------------------------------------------
-// if no synchronization is necessary this class will be used 
-// declaring the functions as inline safes runtime overhead
-//------------------------------------------------------------------------
-
-class CNullLock
-{
-public:
-    inline virtual ~CNullLock ( ) {};
-    inline virtual int Lock( )    {};
-    inline virtual int Unlock()   {};
-};
-
-//------------------------------------------------------------------------
-// a minimal wrapper for a win32 critical section
-//------------------------------------------------------------------------
-
-class CCriticalSection : public CSyncObject
-{
-public:
-    CCriticalSection( );
-    virtual ~CCriticalSection( );
-
-    // both functions return always 0
-    // because the win32 critsec functions
-    // don't return any return code
-    virtual int Lock( );
-    virtual int Unlock( );
-
-private:
-    CRITICAL_SECTION m_critSec;
-};
-
-
-typedef CLockGuard< CSyncObject > SyncObjLockGuard_t;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/advapi9x.h b/sal/inc/systools/win32/advapi9x.h
deleted file mode 100644
index 6dc64f633..000000000
--- a/sal/inc/systools/win32/advapi9x.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#pragma once 
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines 
-//------------------------------------------------------------------------
-
-// begin obsolete Win32 API functions --> 
-#ifdef RegOpenKey
-#undef RegOpenKey
-#endif
-#ifdef RegEnumKey
-#undef RegEnumKey
-#endif
-#ifdef RegCreateKey
-#undef RegCreateKey
-#endif
-#ifdef RegQueryValue
-#undef RegQueryValue
-#endif
-#ifdef RegSetValue
-#undef RegSetValue
-#endif
-// <-- end obsolete Win32 functions
-
-#ifdef RegOpenKeyExW
-#undef RegOpenKeyExW
-#endif
-#ifdef RegEnumKeyExW
-#undef RegEnumKeyExW
-#endif
-#ifdef RegCreateKeyExW
-#undef RegCreateKeyExW
-#endif
-#ifdef RegDeleteKeyW
-#undef RegDeleteKeyW
-#endif
-#ifdef RegEnumValueW
-#undef RegEnumValueW
-#endif
-#ifdef RegQueryValueExW
-#undef RegQueryValueExW
-#endif
-#ifdef RegSetValueExW
-#undef RegSetValueExW
-#endif
-#ifdef RegDeleteValueW
-#undef RegDeleteValueW
-#endif
-#ifdef RegQueryInfoKeyW
-#undef RegQueryInfoKeyW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define ADVAPI9X_API extern
-
-    //------------------------------------------------------------------------
-// declare function pointers to the appropriate shell functions
-//------------------------------------------------------------------------
-
-ADVAPI9X_API LONG (WINAPI * lpfnRegOpenKeyExW) (
-  HKEY hKey,         // handle to open key
-  LPCWSTR lpSubKey,  // subkey name
-  DWORD ulOptions,   // reserved
-  REGSAM samDesired, // security access mask
-  PHKEY phkResult    // handle to open key
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegEnumKeyExW) (
-  HKEY hKey,                  // handle to key to enumerate
-  DWORD dwIndex,              // subkey index
-  LPWSTR lpName,              // subkey name
-  LPDWORD lpcName,            // size of subkey buffer
-  LPDWORD lpReserved,         // reserved
-  LPWSTR lpClass,             // class string buffer
-  LPDWORD lpcClass,           // size of class string buffer
-  PFILETIME lpftLastWriteTime // last write time
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegCreateKeyExW)(
-  HKEY hKey,                                  // handle to open key
-  LPCWSTR lpSubKey,                           // subkey name
-  DWORD Reserved,                             // reserved
-  LPWSTR lpClass,                             // class string
-  DWORD dwOptions,                            // special options
-  REGSAM samDesired,                          // desired security access
-  LPSECURITY_ATTRIBUTES lpSecurityAttributes, // inheritance
-  PHKEY phkResult,                            // key handle 
-  LPDWORD lpdwDisposition                     // disposition value buffer
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegDeleteKeyW) (
-  HKEY hKey,         // handle to open key
-  LPCWSTR lpSubKey   // subkey name
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegEnumValueW) (
-  HKEY hKey,             // handle to key to query
-  DWORD dwIndex,         // index of value to query
-  LPWSTR lpValueName,    // value buffer
-  LPDWORD lpcValueName,  // size of value buffer
-  LPDWORD lpReserved,    // reserved
-  LPDWORD lpType,        // type buffer
-  LPBYTE lpData,         // data buffer
-  LPDWORD lpcbData       // size of data buffer
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegQueryValueExW) (
-  HKEY hKey,            // handle to key
-  LPCWSTR lpValueName,  // value name
-  LPDWORD lpReserved,   // reserved
-  LPDWORD lpType,       // type buffer
-  LPBYTE lpData,        // data buffer
-  LPDWORD lpcbData      // size of data buffer
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegSetValueExW)(
-  HKEY hKey,           // handle to key
-  LPCWSTR lpValueName, // value name
-  DWORD Reserved,      // reserved
-  DWORD dwType,        // value type
-  CONST BYTE *lpData,  // value data
-  DWORD cbData         // size of value data
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegDeleteValueW) (
-  HKEY hKey,            // handle to key
-  LPCWSTR lpValueName   // value name
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegQueryInfoKeyW) (
-    HKEY hKey,						// handle to key to query
-    LPWSTR lpClassW,				// address of buffer for class string
-    LPDWORD lpcbClass,				// address of size of class string buffer
-    LPDWORD lpReserved,				// reserved
-    LPDWORD lpcSubKeys,				// address of buffer for number of 
-                                    // subkeys
-    LPDWORD lpcbMaxSubKeyLen,		// address of buffer for longest subkey 
-                                    // name length
-    LPDWORD lpcbMaxClassLen,		// address of buffer for longest class 
-                                    // string length
-    LPDWORD lpcValues,				// address of buffer for number of value 
-                                    // entries
-    LPDWORD lpcbMaxValueNameLen,	// address of buffer for longest 
-                                    // value name length
-    LPDWORD lpcbMaxValueLen,		// address of buffer for longest value 
-                                    // data length
-    LPDWORD lpcbSecurityDescriptor,	// address of buffer for security 
-                                    // descriptor length
-    PFILETIME lpftLastWriteTime		// address of buffer for last write time
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define RegOpenKeyExW    lpfnRegOpenKeyExW
-#define RegEnumKeyExW    lpfnRegEnumKeyExW
-#define RegCreateKeyExW  lpfnRegCreateKeyExW
-#define RegDeleteKeyW    lpfnRegDeleteKeyW
-#define RegEnumValueW    lpfnRegEnumValueW
-#define RegQueryValueExW lpfnRegQueryValueExW
-#define RegSetValueExW   lpfnRegSetValueExW
-#define RegDeleteValueW  lpfnRegDeleteValueW
-#define RegQueryInfoKeyW lpfnRegQueryInfoKeyW
-
-#ifdef __cplusplus
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/comdlg9x.h b/sal/inc/systools/win32/comdlg9x.h
deleted file mode 100644
index e12fe895b..000000000
--- a/sal/inc/systools/win32/comdlg9x.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once 
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifndef _COMMDLG_H_
-#include <commdlg.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines 
-//------------------------------------------------------------------------
-
-#ifdef GetOpenFileNameW
-#undef GetOpenFileNameW
-#endif
-
-#ifdef GetSaveFileNameW
-#undef GetSaveFileNameW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define COMDLG9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate comdlg functions
-//------------------------------------------------------------------------
-
-COMDLG9X_API BOOL ( WINAPI * lpfnGetOpenFileNameW ) ( LPOPENFILENAMEW lpofn );
-COMDLG9X_API BOOL ( WINAPI * lpfnGetSaveFileNameW ) ( LPOPENFILENAMEW lpofn );
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define GetOpenFileNameW	lpfnGetOpenFileNameW
-#define GetSaveFileNameW	lpfnGetSaveFileNameW
-
-#ifdef __cplusplus
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/kernel9x.h b/sal/inc/systools/win32/kernel9x.h
deleted file mode 100644
index 799ac5e17..000000000
--- a/sal/inc/systools/win32/kernel9x.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the winbase.h file in order to avoid
-// warnings because of multiple defines 
-//------------------------------------------------------------------------
-
-#ifdef LoadLibraryW
-#undef LoadLibraryW
-#endif
-
-#ifdef LoadLibraryExW
-#undef LoadLibraryExW
-#endif
-
-#ifdef GetModuleFileNameW
-#undef GetModuleFileNameW
-#endif
-
-#ifdef GetLogicalDriveStringsW
-#undef GetLogicalDriveStringsW
-#endif
-
-#ifdef DeleteFileW
-#undef DeleteFileW
-#endif
-
-#ifdef CopyFileW
-#undef CopyFileW
-#endif
-
-#ifdef MoveFileW
-#undef MoveFileW
-#endif
-
-#ifdef MoveFileExW
-#undef MoveFileExW
-#endif
-
-#ifdef CreateFileW
-#undef CreateFileW
-#endif
-
-#ifdef RemoveDirectoryW
-#undef RemoveDirectoryW
-#endif
-
-#ifdef CreateDirectoryW
-#undef CreateDirectoryW
-#endif
-
-#ifdef CreateDirectoryExW
-#undef CreateDirectoryExW
-#endif
-
-#ifdef CreateFileW
-#undef CreateFileW
-#endif
-
-#ifdef GetLongPathNameW
-#undef GetLongPathNameW
-#endif
-
-#ifdef GetLocaleInfoW
-#undef GetLocaleInfoW
-#endif
-
-#ifdef GetFullPathNameW
-#undef GetFullPathNameW
-#endif
-
-#ifdef CreateProcessW
-#undef CreateProcessW
-#endif
-
-#ifdef CreateProcessAsUserW
-#undef CreateProcessAsUserW
-#endif
-
-#ifdef GetEnvironmentVariableW
-#undef GetEnvironmentVariableW
-#endif
-
-#ifdef GetDriveTypeW
-#undef GetDriveTypeW
-#endif
-
-#ifdef GetCurrentDirectoryW
-#undef GetCurrentDirectoryW
-#endif
-
-#ifdef SetCurrentDirectoryW
-#undef SetCurrentDirectoryW
-#endif
-
-#ifdef GetVolumeInformationW
-#undef GetVolumeInformationW
-#endif
-
-
-#ifdef GetDiskFreeSpaceExA
-#undef GetDiskFreeSpaceExA
-#endif
-
-#ifdef GetDiskFreeSpaceExW
-#undef GetDiskFreeSpaceExW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define KERNEL9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate kernel functions
-//------------------------------------------------------------------------
-
-//BOOL WINAPI RegisterServiceProcess( DWORD dwProcessID, BOOL fRegister );
-
-KERNEL9X_API HMODULE (WINAPI *lpfnLoadLibraryExW ) (
-    LPCWSTR lpLibFileName,  // file name of module
-    HANDLE hFile,           // reserved, must be NULL
-    DWORD dwFlags           // entry-point execution option
-);
-
-KERNEL9X_API DWORD (WINAPI *lpfnGetModuleFileNameW ) (
-    HMODULE hModule,    // handle to module
-    LPWSTR lpFilename,  // file name of module
-    DWORD nSize         // size of buffer 
-);
-
-KERNEL9X_API DWORD (WINAPI *lpfnGetLogicalDriveStringsW ) (
-    DWORD nBufferLength,	// size of buffer
-    LPWSTR lpBuffer			// drive strings buffer
-);
-
-KERNEL9X_API HANDLE ( WINAPI *lpfnCreateFileW )(
-    LPCWSTR	lpFileName,
-    DWORD	dwDesiredAccess,
-    DWORD	dwShareMode,
-    LPSECURITY_ATTRIBUTES	lpSecurityAttributes,
-    DWORD	dwCreationDisposition,
-    DWORD	dwFlagsAndAttributes,
-    HANDLE	hTemplateFile
-);
-
-KERNEL9X_API DWORD WINAPI GetCanonicalPathNameA(
-    LPCSTR lpszPath,			// file name
-    LPSTR lpszCanonicalPath,	// path buffer
-    DWORD cchBuffer				// size of path buffer
-);
-
-KERNEL9X_API DWORD WINAPI GetCanonicalPathNameW(
-    LPCWSTR lpszPath,			// file name
-    LPWSTR lpszCanonicalPath,	// path buffer
-    DWORD cchBuffer				// size of path buffer
-);
-
-KERNEL9X_API HANDLE ( WINAPI * lpfnCreateFileW ) (
-    LPCWSTR	lpFileName,
-    DWORD	dwDesiredAccess,
-    DWORD	dwShareMode,
-    LPSECURITY_ATTRIBUTES	lpSecurityAttributes,
-    DWORD	dwCreationDisposition,
-    DWORD	dwFlagsAndAttributes,
-    HANDLE	hTemplateFile );
-
-KERNEL9X_API BOOL (WINAPI *lpfnDeleteFileW ) (
-    LPCWSTR	lpFileName			// file name
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnCopyFileW ) (
-    LPCWSTR lpExistingFileName,	// file name
-    LPCWSTR lpNewFileName,		// new file name
-    BOOL	bFailIfExist		// operation if file exists
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnMoveFileW ) (
-    LPCWSTR lpExistingFileName,	// file name
-    LPCWSTR lpNewFileName		// new file name
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnMoveFileExW ) (
-  LPCWSTR lpExistingFileName,	// file name
-  LPCWSTR lpNewFileName,		// new file name
-  DWORD dwFlags					// move options
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnRemoveDirectoryW ) (
-    LPCWSTR	lpPathName			// directory name
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateDirectoryW ) (
-    LPCWSTR	lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes );
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateDirectoryExW ) (
-    LPCWSTR	lpTemplateDirectory,
-    LPCWSTR	lpNewDirectory,
-    LPSECURITY_ATTRIBUTES	lpSecurityAttributes );
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetLongPathNameW ) (
-  LPCWSTR lpszShortPath, // file name
-  LPWSTR lpszLongPath,   // path buffer
-  DWORD cchBuffer        // size of path buffer 
-);
-
-// GetCanonicalPath is a tool function with no exact counterpart
-// in the win32 api; we use nevertheless a function pointer 
-// because every variable etc. must root in the Kernel9x.lib else
-// we loose our AutoSystoolInit object during linking
-KERNEL9X_API DWORD ( WINAPI * lpfnGetCanonicalPathW ) (
-    LPCWSTR lpszPath,			// file name
-    LPWSTR lpszCanonicalPath,	// path buffer
-    DWORD cchBuffer				// size of path buffer 
-);
-
-KERNEL9X_API int ( WINAPI* lpfnGetLocaleInfoW ) (
-    LCID Locale,        // locale identifier
-    LCTYPE LCType,      // information type 
-    LPWSTR lpLCData,    // information buffer
-    int cchData         // size of buffer
-);
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetFullPathNameW )(
-    LPCWSTR	lpFileName,		// file name
-    DWORD	nBufferLength,	// size of path buffer
-    LPWSTR	lpBuffer,		// path buffer
-    LPWSTR	*lpFilePart		// address of file name in path
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateProcessW )(
-    LPCWSTR lpApplicationName,                 // name of executable module
-    LPWSTR lpCommandLine,                      // command line string
-    LPSECURITY_ATTRIBUTES lpProcessAttributes, // SD
-    LPSECURITY_ATTRIBUTES lpThreadAttributes,  // SD
-    BOOL bInheritHandles,                      // handle inheritance option
-    DWORD dwCreationFlags,                     // creation flags
-    LPVOID lpEnvironment,                      // new environment block
-    LPCWSTR lpCurrentDirectory,                // current directory name
-    LPSTARTUPINFOW lpStartupInfo,              // startup information
-    LPPROCESS_INFORMATION lpProcessInformation // process information
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateProcessAsUserW )(
-    HANDLE hToken,                             // handle to user token
-    LPCWSTR lpApplicationName,                 // name of executable module
-    LPWSTR lpCommandLine,                      // command-line string
-    LPSECURITY_ATTRIBUTES lpProcessAttributes, // SD
-    LPSECURITY_ATTRIBUTES lpThreadAttributes,  // SD
-    BOOL bInheritHandles,                      // inheritance option
-    DWORD dwCreationFlags,                     // creation flags
-    LPVOID lpEnvironment,                      // new environment block
-    LPCWSTR lpCurrentDirectory,                // current directory name
-    LPSTARTUPINFOW lpStartupInfo,              // startup information
-    LPPROCESS_INFORMATION lpProcessInformation // process information
-);
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetEnvironmentVariableW )(
-    LPCWSTR lpName,  // environment variable name
-    LPWSTR lpBuffer, // buffer for variable value
-    DWORD nSize      // size of buffer
-);
-
-
-KERNEL9X_API UINT ( WINAPI * lpfnGetDriveTypeW )(
-    LPCWSTR lpRootPathName	// root directory
-);
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetCurrentDirectoryW )(
-    DWORD  nBufferLength,   // size of directory buffer
-    LPWSTR lpBuffer         // directory buffer
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnSetCurrentDirectoryW )(
-    LPCWSTR lpPathName  // new directory name
-);
-
-// GetVolumeInformation
-KERNEL9X_API BOOL ( WINAPI* lpfnGetVolumeInformationW )(
-    LPCWSTR	lpRootPathName,				// root directory
-    LPWSTR	lpVolumeNameBuffer,			// volume name buffer
-    DWORD	nVolumeNameSize,			// length of name buffer
-    LPDWORD	lpVolumeSerialNumber,		// volume serial number
-    LPDWORD	lpMaximumComponentLength,	// maximum file name length
-    LPDWORD	lpFileSystemFlags,			// file system options
-    LPWSTR	lpFileSystemName,			// file system name buffer
-    DWORD	nFileSystemNameSize			// length of file system name buffer
-);
-
-// GetDiskFreeSpaceExA
-KERNEL9X_API BOOL (WINAPI *lpfnGetDiskFreeSpaceExA)(
-  LPCSTR lpDirectoryName,                  // directory name
-  PULARGE_INTEGER lpFreeBytesAvailable,    // bytes available to caller
-  PULARGE_INTEGER lpTotalNumberOfBytes,    // bytes on disk
-  PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
-);
-
-// GetDiskFreeSpaceExW
-KERNEL9X_API BOOL (WINAPI *lpfnGetDiskFreeSpaceExW)(
-  LPCWSTR lpDirectoryName,                 // directory name
-  PULARGE_INTEGER lpFreeBytesAvailable,    // bytes available to caller
-  PULARGE_INTEGER lpTotalNumberOfBytes,    // bytes on disk
-  PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define LoadLibraryExW				lpfnLoadLibraryExW
-#define LoadLibraryW(c)				LoadLibraryExW(c, NULL, 0)
-#define GetModuleFileNameW			lpfnGetModuleFileNameW
-#define GetLogicalDriveStringsW		lpfnGetLogicalDriveStringsW
-#define CreateFileW					lpfnCreateFileW
-#define DeleteFileW					lpfnDeleteFileW
-#define CopyFileW					lpfnCopyFileW
-#define MoveFileW					lpfnMoveFileW
-#define MoveFileExW					lpfnMoveFileExW
-#define RemoveDirectoryW			lpfnRemoveDirectoryW
-#define CreateDirectoryW			lpfnCreateDirectoryW
-#define CreateDirectoryExW			lpfnCreateDirectoryExW
-#define GetLongPathNameW			lpfnGetLongPathNameW
-#define GetFullPathNameW			lpfnGetFullPathNameW
-
-#define GetCanonicalPath			lpfnGetCanonicalPathW
-#define GetLocaleInfoW              lpfnGetLocaleInfoW      
-
-#define CreateProcessW              lpfnCreateProcessW
-#define CreateProcessAsUserW        lpfnCreateProcessAsUserW
-#define GetEnvironmentVariableW     lpfnGetEnvironmentVariableW
-#define GetDriveTypeW				lpfnGetDriveTypeW
-
-#define GetCurrentDirectoryW        lpfnGetCurrentDirectoryW
-#define SetCurrentDirectoryW        lpfnSetCurrentDirectoryW
-
-#define GetVolumeInformationW		lpfnGetVolumeInformationW
-#define GetDiskFreeSpaceExA			lpfnGetDiskFreeSpaceExA
-#define GetDiskFreeSpaceExW			lpfnGetDiskFreeSpaceExW
-
-#ifdef __cplusplus
-}
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/mpr9x.h b/sal/inc/systools/win32/mpr9x.h
deleted file mode 100644
index c8a53d11a..000000000
--- a/sal/inc/systools/win32/mpr9x.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once 
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the winuser.h file in order to avoid
-// warnings because of multiple defines 
-//------------------------------------------------------------------------
-
-#ifdef WNetGetConnectionW
-#undef WNetGetConnectionW
-#endif
-
-//------------------------------------------------------------------------
-// defines
-//------------------------------------------------------------------------
-
-#define MPR9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate user32 functions
-//------------------------------------------------------------------------
-
-MPR9X_API DWORD (WINAPI *lpfnWNetGetConnectionW)(
-    LPCWSTR	lpLocalName,	// pointer to local name
-    LPWSTR	lpRemoteName,	// pointer to buffer for remote name
-    LPDWORD	lpnLength		// pointer to buffer size, in characters
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define WNetGetConnectionW			lpfnWNetGetConnectionW
-
-#ifdef __cplusplus
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/shell9x.h b/sal/inc/systools/win32/shell9x.h
deleted file mode 100644
index 4e4fa350a..000000000
--- a/sal/inc/systools/win32/shell9x.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once 
-
-#ifndef _SHELL9X_H_
-#define _SHELL9X_H_
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifndef _SHLOBJ_H_
-#include <shlobj.h>
-#endif
-
-#include <shellapi.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines 
-//------------------------------------------------------------------------
-
-#ifdef CommandLineToArgvW
-#undef CommandLineToArgvW
-#endif
-
-#ifdef SHBrowseForFolderW
-#undef SHBrowseForFolderW
-#endif
-
-#ifdef SHGetPathFromIDListW
-#undef SHGetPathFromIDListW
-#endif
-
-#ifdef ShellExecuteExW
-#undef ShellExecuteExW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define SHELL9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate shell functions
-//------------------------------------------------------------------------
-
-SHELL9X_API LPWSTR *     ( WINAPI * lpfnCommandLineToArgvW ) ( LPCWSTR lpCmdLine, int *pNumArgs );
-SHELL9X_API LPITEMIDLIST ( WINAPI * lpfnSHBrowseForFolderW ) ( LPBROWSEINFOW lpbi );	
-SHELL9X_API BOOL         ( WINAPI * lpfnSHGetPathFromIDListW ) ( LPCITEMIDLIST pidl, LPWSTR pszPath );
-
-SHELL9X_API BOOL ( WINAPI * lpfnShellExecuteExW ) ( LPSHELLEXECUTEINFOW lpExecInfo );
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define CommandLineToArgvW   lpfnCommandLineToArgvW
-#define SHBrowseForFolderW   lpfnSHBrowseForFolderW
-#define SHGetPathFromIDListW lpfnSHGetPathFromIDListW
-
-#define ShellExecuteExW lpfnShellExecuteExW
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/user9x.h b/sal/inc/systools/win32/user9x.h
deleted file mode 100644
index d50225160..000000000
--- a/sal/inc/systools/win32/user9x.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once 
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the winuser.h file in order to avoid
-// warnings because of multiple defines 
-//------------------------------------------------------------------------
-
-#ifdef SendMessageW
-#undef SendMessageW
-#endif
-
-#ifdef CreateWindowExW
-#undef CreateWindowExW
-#endif
-
-#ifdef RegisterClassExW
-#undef RegisterClassExW
-#endif
-
-#ifdef UnregisterClassW
-#undef UnregisterClassW
-#endif
-
-#ifdef RegisterClipboardFormatW
-#undef RegisterClipboardFormatW
-#endif
-
-#ifdef GetClipboardFormatNameW
-#undef GetClipboardFormatNameW
-#endif
-
-#ifdef SetWindowTextW
-#undef SetWindowTextW
-#endif
-
-#ifdef GetWindowTextW
-#undef GetWindowTextW
-#endif
-
-#ifdef InsertMenuItemW
-#undef InsertMenuItemW
-#endif
-
-#ifndef DrawTextW
-#undef DrawTextW
-#endif
-
-//------------------------------------------------------------------------
-// defines
-//------------------------------------------------------------------------
-
-#define USER9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate user32 functions
-//------------------------------------------------------------------------
-
-USER9X_API LRESULT ( WINAPI * lpfnSendMessageW) (
-    HWND hWnd,		// handle to the destination window
-    UINT Msg,		// message
-    WPARAM wParam,	// first message parameter
-    LPARAM lParam	// second message parameter
-);
-
-USER9X_API HWND ( WINAPI * lpfnCreateWindowExW ) (
-    DWORD dwExStyle,      // extended window style
-    LPCWSTR lpClassName,  // registered class name
-    LPCWSTR lpWindowName, // window name
-    DWORD dwStyle,        // window style
-    int x,                // horizontal position of window
-    int y,                // vertical position of window
-    int nWidth,           // window width
-    int nHeight,          // window height
-    HWND hWndParent,      // handle to parent or owner window
-    HMENU hMenu,          // menu handle or child identifier
-    HINSTANCE hInstance,  // handle to application instance
-    LPVOID lpParam        // window-creation data
-);
-
-USER9X_API ATOM ( WINAPI * lpfnRegisterClassExW ) ( 
-    CONST WNDCLASSEXW* lpwcx // class data
-);
-
-USER9X_API BOOL ( WINAPI * lpfnUnregisterClassW ) (
-    LPCWSTR lpClassName, // class name
-    HINSTANCE hInstance	 // handle to application instance
-);
-
-USER9X_API UINT (WINAPI * lpfnRegisterClipboardFormatW) (
-    LPCWSTR lpszFormat // name of new format
-);
-
-USER9X_API int ( WINAPI * lpfnGetClipboardFormatNameW ) (
-    UINT   format,			// clipboard format to retrieve
-    LPWSTR lpszFormatName,	// format name
-    int    cchMaxCount		// length of format name buffer
-);
-
-USER9X_API BOOL ( WINAPI * lpfnSetWindowTextW ) (
-    HWND hWnd,
-    LPCWSTR lpString
-);
-
-USER9X_API int ( WINAPI * lpfnGetWindowTextW ) (
-    HWND hWnd,			// handle to the window or control
-    LPWSTR lpString,	// text buffer
-    int    nMaxCount		// length of text buffer
-);
-
-USER9X_API BOOL ( WINAPI * lpfnInsertMenuItemW ) (
-    HMENU hMenu,            // handle to menu
-    UINT uItem,             // identifier or position
-    BOOL fByPosition,       // meaning of uItem
-    LPCMENUITEMINFOW lpmii  // menu item information
-);
-
-USER9X_API int ( WINAPI * lpfnDrawTextW ) (
-  HDC hDC,          // handle to DC
-  LPCWSTR lpString, // text to draw
-  int nCount,       // text length
-  LPRECT lpRect,    // formatting dimensions
-  UINT uFormat      // text-drawing options
-);
-
-USER9X_API BOOL ( WINAPI * lpfnDrawStateW ) (
-  HDC hdc,                     // handle to device context
-  HBRUSH hbr,                  // handle to brush
-  DRAWSTATEPROC lpOutputFunc,  // callback function
-  LPARAM lData,                // image information
-  WPARAM wData,                // more image information
-  int x,                       // horizontal location
-  int y,                       // vertical location
-  int cx,                      // image width
-  int cy,                      // image height
-  UINT fuFlags                 // image type and state
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define SendMessageW				lpfnSendMessageW
-#define CreateWindowExW				lpfnCreateWindowExW
-#define RegisterClassExW			lpfnRegisterClassExW
-#define UnregisterClassW			lpfnUnregisterClassW
-#define RegisterClipboardFormatW	lpfnRegisterClipboardFormatW
-#define GetClipboardFormatNameW		lpfnGetClipboardFormatNameW
-#define SetWindowTextW				lpfnSetWindowTextW
-#define GetWindowTextW              lpfnGetWindowTextW
-#define InsertMenuItemW				lpfnInsertMenuItemW
-#define DrawTextW                   lpfnDrawTextW
-#define DrawStateW                  lpfnDrawStateW
-
-#ifdef __cplusplus
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/uwinapi.h b/sal/inc/systools/win32/uwinapi.h
index a9e6a9fde..6c7e76304 100644
--- a/sal/inc/systools/win32/uwinapi.h
+++ b/sal/inc/systools/win32/uwinapi.h
@@ -51,58 +51,6 @@
 #endif
 #endif
 
-/**	GetUserDomain
-
-The GetUserDomain function retrieves the name of the NT domain the user	is
-logged in.
-
-Parameters
-    @param lpBuffer
-        [out] Pointer to a buffer that receives a null-terminated string
-        containing the domain name.
-    @param nBufferSize
-        [in] Specifies the size, in TCHARs, of the buffer pointed to
-        by the lpBuffer parameter.
-
-
-Return Values
-    @return
-    If the function succeeds, the return value is the number of TCHARs stored
-    into the buffer pointed to by lpBuffer, not including the terminating
-    null character.
-
-    If the domain name can't be retrieved, the return value is zero.
-
-    If the buffer pointed to by lpBuffer is not large enough, the return value
-    is the buffer size, in TCHARs, required to hold the value string and its
-    terminating null character.
-
-Remarks
-    Windows 95/98/Me: If the user is not logged in onto a NT domain server
-    the name of the workgroup is returned.
-
-Requirements
-  Windows NT/2000/XP: Included in Windows NT 4 and later.
-  Windows 95/98/Me: Included in Windows 95 and later.
-  Header: Declared in Uwinapi.h; include Uwinapi.h.
-  Library: Use Uwinapi.lib.
-  Unicode: Implemented as Unicode and ANSI versions on Windows 95/98/Me/NT/2000/XP.
-
-See Also
-@see
-*/
-
-EXTERN_C WINBASEAPI DWORD WINAPI GetUserDomainA( LPSTR lpBuffer, DWORD nBuffserSize );
-EXTERN_C WINBASEAPI DWORD WINAPI GetUserDomainW( LPWSTR lpBuffer, DWORD nBuffserSize );
-
-#ifdef UNICODE
-#define GetUserDomain	GetUserDomainW
-#else
-#define GetUserDomain	GetUserDomainA
-#endif
-
-EXTERN_C WINBASEAPI DWORD WINAPI GetProcessId( HANDLE hProcess );
-
 #ifdef __cplusplus
 
 inline bool IsValidHandle(HANDLE handle)
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 126932447..15d6a60a5 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -51,8 +51,8 @@ namespace {
 typedef std::vector<rtl::OString, rtl::Allocator<rtl::OString> > OStringVec;
 
 struct StaticDebugBaseAddressFilter
-    : rtl::StaticWithInit<OStringVec const, StaticDebugBaseAddressFilter> {
-    OStringVec const operator()() const {
+    : rtl::StaticWithInit<OStringVec, StaticDebugBaseAddressFilter> {
+    OStringVec operator()() const {
         OStringVec vec;
         rtl_uString * pStr = 0;
         rtl::OUString const name(
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index 3d08754c6..b510a032c 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -57,7 +57,7 @@ oslModule SAL_CALL osl_loadModuleRelative(
     ::rtl::OUString abs;
     try {
         abs = ::rtl::Uri::convertRelToAbs(base, relativePath);
-    } catch (::rtl::MalformedUriException & e) {
+    } catch (const ::rtl::MalformedUriException & e) {
         (void) e; // avoid warnings
         OSL_TRACE(
             "rtl::MalformedUriException <%s>",
diff --git a/sal/osl/all/makefile.mk b/sal/osl/all/makefile.mk
index 2d1b7ec82..fa928412f 100644
--- a/sal/osl/all/makefile.mk
+++ b/sal/osl/all/makefile.mk
@@ -38,10 +38,6 @@ PROJECTPCHSOURCE=cont_pch
 
 MULTITHREAD_OBJ=TRUE
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
diff --git a/sal/osl/os2/conditn.c b/sal/osl/os2/conditn.c
deleted file mode 100644
index 08b6da69a..000000000
--- a/sal/osl/os2/conditn.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-
-#include <osl/conditn.h>
-#include <osl/diagnose.h>
-#include <osl/time.h>
-
-
-
-/*
-    under WIN32, we use the void* oslCondition
-    as a WIN32 HANDLE (which is also a 32-bit value)
-*/
-
-/*****************************************************************************/
-/* osl_createCondition */
-/*****************************************************************************/
-oslCondition SAL_CALL osl_createCondition()
-{
-    HEV hevCondition;
-    APIRET rc;
-
-    rc = DosCreateEventSem( NULL,       /* unnamed semaphore */
-                            &hevCondition,  /* pointer to variable */
-                                                   /* for the sem-handle */
-                            DC_SEM_SHARED,  /* shared semaphore */
-                            FALSE );         /* initial state is posted */
-
-    if( rc == NO_ERROR )
-        return (oslCondition)hevCondition;
-    else
-        return NULL;
-}
-
-/*****************************************************************************/
-/* osl_destroyCondition */
-/*****************************************************************************/
-void SAL_CALL osl_destroyCondition(oslCondition Condition)
-{
-    if( Condition )
-        DosCloseEventSem( (HEV) Condition );
-}
-
-/*****************************************************************************/
-/* osl_setCondition */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
-{
-    OSL_ASSERT(Condition);
-
-    return DosPostEventSem((HEV)Condition) == NO_ERROR;
-}
-
-/*****************************************************************************/
-/* osl_resetCondition */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition)
-{
-    ULONG ulPostCount;
-
-    OSL_ASSERT(Condition);
-
-    return DosResetEventSem((HEV)Condition, &ulPostCount) == NO_ERROR;
-}
-
-/*****************************************************************************/
-/* osl_waitCondition */
-/*****************************************************************************/
-oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const TimeValue * pTimeout )
-{
-    long nTimeout;
-    APIRET rc;
-    OSL_ASSERT(Condition);
-
-    if( pTimeout )
-        nTimeout = pTimeout->Seconds * 1000 + pTimeout->Nanosec / 1000000;
-    else
-        nTimeout = SEM_INDEFINITE_WAIT;
-
-    rc = DosWaitEventSem((HEV)Condition, nTimeout );
-    if( rc == ERROR_TIMEOUT )
-        return osl_cond_result_timeout;
-    if( rc != NO_ERROR )
-        return osl_cond_result_error;
-
-    return osl_cond_result_ok;
-}
-
-/*****************************************************************************/
-/* osl_checkCondition */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
-{
-    OSL_ASSERT(Condition);
-
-    return( DosWaitEventSem((HEV)Condition, SEM_IMMEDIATE_RETURN) == NO_ERROR);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/debug.c b/sal/osl/os2/debug.c
deleted file mode 100644
index ccf1cc03a..000000000
--- a/sal/osl/os2/debug.c
+++ /dev/null
@@ -1,2153 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *@@sourcefile debug.c:
- *      this file contains debugging functions for the
- *      exception handlers in except.c.
- *
- *      This code is capable of unwinding the stack from
- *      a given address and trying to get function names
- *      and source line numbers, either from the respective
- *      module's debug code (if present) or from a SYM file,
- *      which is searched for in the directory of the module
- *      or in ?:\OS2\PDPSI\PMDF\WARP4.
- *
- *      This file incorporates code from the following:
- *      -- Marc Fiammante, John Currier, Kim Rasmussen,
- *         Anthony Cruise (EXCEPT3.ZIP package for a generic
- *         exception handling DLL, available at Hobbes).
- *
- *      Usage: All OS/2 programs.
- *
- *      Note: Version numbering in this file relates to XWorkplace version
- *            numbering.
- *
- *@@changed V0.9.0 [umoeller]: made some declarations C++-compatible
- *@@changed V0.9.1 (2000-01-30) [umoeller]: greatly cleaned up this file
- *
- *@@header "helpers\debug.h"
- */
-
-/*
- *      This file Copyright (C) 1992-99 Ulrich M�ller,
- *                                      Kim Rasmussen,
- *                                      Marc Fiammante,
- *                                      John Currier,
- *                                      Anthony Cruise.
- *      This file is part of the "XWorkplace helpers" source package.
- *
- *      2009-06-15 published under LGPL3 with Ulrich M�ller permission.
- *
- */
-
-//#define DEBUG_SYMDUMP // enable to dump sym file to log
-
-//YD commented, since we need unsigned char BYTE!
-//#define OS2EMX_PLAIN_CHAR
-//Also gcc char is signed, while most structures requires unsigned data!
-//Raised limits for all fields!
-
-    // this is needed for "os2emx.h"; if this is defined,
-    // emx will define PSZ as _signed_ char, otherwise
-    // as unsigned char
-
-#define INCL_DOSPROCESS
-#define INCL_DOSMODULEMGR
-#define INCL_DOSMISC
-#define INCL_DOSERRORS
-#include <os2.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#define DONT_REPLACE_MALLOC
-#include "helpers\setup.h"                      // code generation and debugging options
-
-#include "helpers\debug.h"
-#include "helpers\dosh.h"
-
-#pragma hdrstop
-
-#include <fcntl.h>
-#ifdef __EMX__
-    #include <sys\types.h>      // required for sys\stat.h; UM 99-10-22
-#endif
-#include <sys\stat.h>
-#include <share.h>
-#include <io.h>
-
-#ifndef DWORD
-#define DWORD unsigned long
-#endif
-#ifndef WORD
-#define WORD  unsigned short
-#endif
-
-#pragma stack16(512)
-#define HF_STDERR 2
-
-/*
- *@@category: Helpers\Control program helpers\Exceptions/debugging
- *      See except.c and debug.c.
- */
-
-/* ******************************************************************
- *
- *   Global variables
- *
- ********************************************************************/
-
-// this specifies whether we're dealing with 32-bit code;
-// this gets changed whenever 16-bit count is detected
-static BOOL     f32bit = TRUE;
-
-/*
- * Global variables for Read32PmDebug:
- *
- */
-
-ULONG           func_ofs;
-ULONG           pubfunc_ofs;
-//YD 17/07/06 c++ namespace can generate really long
-//YD names, use a large buffer!
-char            func_name[16*1024];
-ULONG           var_ofs = 0;
-
-struct {
-    BYTE            name[128];
-    ULONG           stack_offset;
-    USHORT          type_idx;
-} autovar_def[1024];
-
-#pragma pack(1)
-
-BYTE           *type_name[] =
-{
-    "8 bit signed                     ",
-    "16 bit signed                    ",
-    "32 bit signed                    ",
-    "Unknown (0x83)                   ",
-    "8 bit unsigned                   ",
-    "16 bit unsigned                  ",
-    "32 bit unsigned                  ",
-    "Unknown (0x87)                   ",
-    "32 bit real                      ",
-    "64 bit real                      ",
-    "80 bit real                      ",
-    "Unknown (0x8B)                   ",
-    "64 bit complex                   ",
-    "128 bit complex                  ",
-    "160 bit complex                  ",
-    "Unknown (0x8F)                   ",
-    "8 bit boolean                    ",
-    "16 bit boolean                   ",
-    "32 bit boolean                   ",
-    "Unknown (0x93)                   ",
-    "8 bit character                  ",
-    "16 bit characters                ",
-    "32 bit characters                ",
-    "void                             ",
-    "15 bit unsigned                  ",
-    "24 bit unsigned                  ",
-    "31 bit unsigned                  ",
-    "Unknown (0x9B)                   ",
-    "Unknown (0x9C)                   ",
-    "Unknown (0x9D)                   ",
-    "Unknown (0x9E)                   ",
-    "Unknown (0x9F)                   ",
-    "near pointer to 8 bit signed     ",
-    "near pointer to 16 bit signed    ",
-    "near pointer to 32 bit signed    ",
-    "Unknown (0xA3)                   ",
-    "near pointer to 8 bit unsigned   ",
-    "near pointer to 16 bit unsigned  ",
-    "near pointer to 32 bit unsigned  ",
-    "Unknown (0xA7)                   ",
-    "near pointer to 32 bit real      ",
-    "near pointer to 64 bit real      ",
-    "near pointer to 80 bit real      ",
-    "Unknown (0xAB)                   ",
-    "near pointer to 64 bit complex   ",
-    "near pointer to 128 bit complex  ",
-    "near pointer to 160 bit complex  ",
-    "Unknown (0xAF)                   ",
-    "near pointer to 8 bit boolean    ",
-    "near pointer to 16 bit boolean   ",
-    "near pointer to 32 bit boolean   ",
-    "Unknown (0xB3)                   ",
-    "near pointer to 8 bit character  ",
-    "near pointer to 16 bit characters",
-    "near pointer to 32 bit characters",
-    "near pointer to void             ",
-    "near pointer to 15 bit unsigned  ",
-    "near pointer to 24 bit unsigned  ",
-    "near pointer to 31 bit unsigned  ",
-    "Unknown (0xBB)                   ",
-    "Unknown (0xBC)                   ",
-    "Unknown (0xBD)                   ",
-    "Unknown (0xBE)                   ",
-    "Unknown (0xBF)                   ",
-    "far pointer to 8 bit signed      ",
-    "far pointer to 16 bit signed     ",
-    "far pointer to 32 bit signed     ",
-    "Unknown (0xC3)                   ",
-    "far pointer to 8 bit unsigned    ",
-    "far pointer to 16 bit unsigned   ",
-    "far pointer to 32 bit unsigned   ",
-    "Unknown (0xC7)                   ",
-    "far pointer to 32 bit real       ",
-    "far pointer to 64 bit real       ",
-    "far pointer to 80 bit real       ",
-    "Unknown (0xCB)                   ",
-    "far pointer to 64 bit complex    ",
-    "far pointer to 128 bit complex   ",
-    "far pointer to 160 bit complex   ",
-    "Unknown (0xCF)                   ",
-    "far pointer to 8 bit boolean     ",
-    "far pointer to 16 bit boolean    ",
-    "far pointer to 32 bit boolean    ",
-    "Unknown (0xD3)                   ",
-    "far pointer to 8 bit character   ",
-    "far pointer to 16 bit characters ",
-    "far pointer to 32 bit characters ",
-    "far pointer to void              ",
-    "far pointer to 15 bit unsigned   ",
-    "far pointer to 24 bit unsigned   ",
-    "far pointer to 31 bit unsigned   ",
-};
-
-// Thanks to John Currier:
-// Do not call 16 bit code in myHandler function to prevent call
-// to __EDCThunkProlog and problems is guard page exception handling
-// Also reduce the stack size to 1K for true 16 bit calls.
-// 16 bit calls thunk will now only occur on fatal exceptions
-#pragma stack16(1024)
-
-// ------------------------------------------------------------------
-// Last 8 bytes of 16:16 file when CODEVIEW debugging info is present
-#pragma pack(1)
-struct _eodbug
-{
-    unsigned short  dbug;       // 'NB' signature
-    unsigned short  ver;        // version
-    unsigned long   dfaBase;    // size of codeview info
-} G_eodbug;
-
-#define         DBUGSIG         0x424E
-#define         SSTMODULES      0x0101
-#define         SSTPUBLICS      0x0102
-#define         SSTTYPES        0x0103
-#define         SSTSYMBOLS      0x0104
-#define         SSTSRCLINES     0x0105
-#define         SSTLIBRARIES    0x0106
-#define         SSTSRCLINES2    0x0109
-#define         SSTSRCLINES32   0x010B
-
-typedef struct _SYMBASE
-{
-    unsigned short  dbug;       // 'NB' signature
-    unsigned short  ver;        // version
-    unsigned long   lfoDir;     // file offset to dir entries
-} SYMBASE;
-
-typedef struct _SSDIR
-{
-    unsigned short  sst;        // SubSection Type
-    unsigned short  modindex;   // Module index number
-    unsigned long   lfoStart;   // Start of section
-    unsigned short  cb;         // Size of section
-} SSDIR;
-
-typedef struct _SSDIR32
-{
-    unsigned short  sst;        // SubSection Type
-    unsigned short  modindex;   // Module index number
-    unsigned long   lfoStart;   // Start of section
-    unsigned long   cb;         // Size of section
-} SSDIR32;
-
-typedef struct _SSMODULE
-{
-    unsigned short  csBase;     // code segment base
-    unsigned short  csOff;      // code segment offset
-    unsigned short  csLen;      // code segment length
-    unsigned short  ovrNum;     // overlay number
-    unsigned short  indxSS;     // Index into sstLib or 0
-    unsigned short  reserved;
-    BYTE            csize;      // size of prefix string
-} SSMODULE;
-
-typedef struct _SSMOD32
-{
-    unsigned short  csBase;     // code segment base
-    unsigned long   csOff;      // code segment offset
-    unsigned long   csLen;      // code segment length
-    unsigned long   ovrNum;     // overlay number
-    unsigned short  indxSS;     // Index into sstLib or 0
-    unsigned long   reserved;
-    BYTE            csize;      // size of prefix string
-} SSMOD32;
-
-typedef struct _SSPUBLIC
-{
-    unsigned short  offset;
-    unsigned short  segment;
-    unsigned short  type;
-    BYTE            csize;
-} SSPUBLIC;
-
-typedef struct _SSPUBLIC32
-{
-    unsigned long   offset;
-    unsigned short  segment;
-    unsigned short  type;
-    BYTE            csize;
-} SSPUBLIC32;
-
-typedef struct _SSLINEENTRY32
-{
-    unsigned short  LineNum;
-    unsigned short  FileNum;
-    unsigned long   Offset;
-} SSLINEENTRY32;
-
-typedef struct _FIRSTLINEENTRY32
-{
-    unsigned short  LineNum;
-    unsigned char   entry_type;
-    unsigned char   reserved;
-    unsigned short  numlines;
-    unsigned short  segnum;
-} FIRSTLINEENTRY32;
-
-typedef struct _SSFILENUM32
-{
-    unsigned long   first_displayable;  // Not used
-    unsigned long   number_displayable;     // Not used
-    unsigned long   file_count; // number of source files
-} SSFILENUM32;
-
-/*
- *@@ XDEBUGINFO:
- *      buffers for Read... funcs.
- *
- *@@added V0.9.4 (2000-06-15) [umoeller]
- */
-
-typedef struct _XDEBUGINFO
-{
-    char            szNrFile[300];      // receives source file
-    char            szNrLine[300];      // receives line number
-    //YD 17/07/06 c++ namespace can generate really long
-    //YD names, use a large buffer!
-    char            szNrPub[16*1024]; 	// receives function name
-
-    struct new_seg  *pseg;
-    struct o32_obj  *pobj;              // flat .EXE object table entry
-
-    SYMBASE         base;
-
-    SSDIR           *pDirTab;
-    SSDIR32         *pDirTab32;
-    unsigned char   *pEntTab;
-    unsigned long   lfaBase;
-    SSMOD32         ssmod32;
-    SSPUBLIC32      sspub32;
-
-    SSMODULE        ssmod;
-    SSPUBLIC        sspub;
-} XDEBUGINFO, *PXDEBUGINFO;
-
-
-USHORT _THUNK_FUNCTION (Dos16SizeSeg) ();
-//APIRET16 APIENTRY16 DOS16SIZESEG(USHORT Seg, PULONG16 Size);
-USHORT DosSizeSeg (USHORT Seg, PULONG16 Size)
-{
-  return ((USHORT)
-          (_THUNK_PROLOG (2+4);
-           _THUNK_SHORT (Seg);
-           _THUNK_FLAT (Size);
-           _THUNK_CALL (Dos16SizeSeg)));
-}
-
-#pragma pack()
-
-/* ******************************************************************
- *
- *   PART 1: ANALYZE DEBUG CODE
- *
- ********************************************************************/
-
-static int Read16CodeView(FILE *LogFile, PXDEBUGINFO pxdi, int fh, int TrapSeg, int TrapOff, CHAR *FileName);
-static int Read32PmDebug(FILE *LogFile, PXDEBUGINFO pxdi, int fh, int TrapSeg, int TrapOff, CHAR *FileName);
-
-/*
- *@@ WriteAddressInfo:
- *      formats and writes a line into the trap log
- *      file.
- *
- *      This gets called for each line from the
- *      stack dump. At this point, the line in the
- *      trap log already has:
- *
- +          CS:EIP  : 000109FF  XMLVIEW :0
- +                                          ^^^ and we write here
- *      After this call, we have.
- *
- +          CS:EIP  : 000109FF  XMLVIEW :0  xxx.c  123 ConfirmCreate__Fv
- +                                          ^^^ and we write here
- *
- *@@added V0.9.12 (2001-05-12) [umoeller]
- */
-
-static VOID WriteDebugInfo(FILE *LogFile,              // in: open log file
-                           PXDEBUGINFO pxdi)           // in: debug info
-{
-    fprintf(LogFile,
-            "%s%s%s",
-            pxdi->szNrFile,
-            pxdi->szNrLine,
-            pxdi->szNrPub);
-}
-
-/*
- *@@ dbgPrintDebugInfo:
- *      this is the main entry point into analyzing debug
- *      code.
- *
- *      This analyzes a given address and tries to find
- *      debug code descriptions for this address. If found,
- *      the information is written to the given log file.
- *
- *      Gets called from dbgPrintStack.
- *
- *      This returns NO_ERROR if the could was successfully
- *      analyzed or something != 0 if we failed.
- *
- *      New with V0.84.
- */
-
-APIRET dbgPrintDebugInfo(FILE *LogFile,         // out: log file to write to
-                         CHAR *FileName,        // in: EXE/DLL module file name
-                         ULONG Object,          // in: trapping object (from DosQueryModFromEIP)
-                         ULONG TrapOffset)      // in: trapping address (from DosQueryModFromEIP)
-{
-    APIRET                  rc = 0;
-    int                     ModuleFile = 0;
-    static struct exe_hdr   OldExeHeader;
-    static struct new_exe   NewExeHeader;
-
-    ULONG                   ulSegment = Object + 1;     // segment no. is object no. + 1
-
-    XDEBUGINFO              xdi;
-    memset(&xdi, 0, sizeof(xdi));
-
-    // open the module file for reading to analyze the code
-    ModuleFile = sopen(FileName, O_RDONLY | O_BINARY, SH_DENYNO);
-
-    if (ModuleFile != -1)
-    {
-        // file found:
-        // read old Exe header
-        if (read(ModuleFile, (void*)&OldExeHeader, 64) == -1L)
-        {
-            fprintf(LogFile, "errno %d reading old exe header\n", errno);
-            close(ModuleFile);
-            return 2;
-        }
-        // seek to new Exe header
-        if (lseek(ModuleFile, (long)E_LFANEW(OldExeHeader), SEEK_SET) == -1L)
-        {
-            fprintf(LogFile, "errno %d seeking to new exe header\n", errno);
-            close(ModuleFile);
-            return 3;
-        }
-        if (read(ModuleFile, (void *)&NewExeHeader, 64) == -1L)
-        {
-            fprintf(LogFile, "errno %d reading new exe header\n", errno);
-            close(ModuleFile);
-            return 4;
-        }
-
-        // check EXE signature
-        if (NE_MAGIC(NewExeHeader) == E32MAGIC)
-        {
-            /*
-             * flat 32 executable:
-             *
-             */
-
-            // do analysis for 32-bit code
-            if (!(rc = Read32PmDebug(LogFile,
-                                     &xdi,                // output
-                                     ModuleFile,
-                                     ulSegment,
-                                     TrapOffset,
-                                     FileName)))
-                WriteDebugInfo(LogFile, &xdi);
-
-            close(ModuleFile);
-
-            // rc !=0 try with DBG file
-            if (rc != 0)
-            {
-                strcpy(FileName + strlen(FileName) - 3, "DBG");     // Build DBG File name
-                ModuleFile = sopen(FileName, O_RDONLY | O_BINARY, SH_DENYNO);
-                if (ModuleFile != -1)
-                {
-                    if (!(rc = Read32PmDebug(LogFile,
-                                             &xdi,
-                                             ModuleFile,
-                                             ulSegment,
-                                             TrapOffset,
-                                             FileName)))
-                        WriteDebugInfo(LogFile, &xdi);
-
-                    close(ModuleFile);
-                }
-            }
-
-            return rc;
-        }
-        else
-        {
-            if (NE_MAGIC(NewExeHeader) == NEMAGIC)
-            {
-                /*
-                 * 16:16 executable:
-                 *
-                 */
-
-                if ((xdi.pseg = (struct new_seg *)calloc(NE_CSEG(NewExeHeader),
-                                                         sizeof(struct new_seg)))
-                            == NULL)
-                {
-                    fprintf(LogFile, "Out of memory!");
-                    close(ModuleFile);
-                    return -1;
-                }
-                if (  lseek(ModuleFile,
-                            E_LFANEW(OldExeHeader) + NE_SEGTAB(NewExeHeader),
-                            SEEK_SET) == -1L)
-                {
-                    fprintf(LogFile, "Error %u seeking segment table in %s\n", errno, FileName);
-                    free(xdi.pseg);
-                    close(ModuleFile);
-                    return 9;
-                }
-
-                if (read(ModuleFile,
-                         (void *)xdi.pseg,
-                         NE_CSEG(NewExeHeader) * sizeof(struct new_seg))
-                      == -1)
-                {
-                    fprintf(LogFile, "Error %u reading segment table from %s\n", errno, FileName);
-                    free(xdi.pseg);
-                    close(ModuleFile);
-                    return 10;
-                }
-
-                if (!(rc = Read16CodeView(LogFile,
-                                          &xdi,
-                                          ModuleFile,
-                                          ulSegment,
-                                          TrapOffset,
-                                          FileName)))
-                    WriteDebugInfo(LogFile, &xdi);
-
-                free(xdi.pseg);
-                close(ModuleFile);
-
-                // rc !=0 try with DBG file
-                if (rc != 0)
-                {
-                    strcpy(FileName + strlen(FileName) - 3, "DBG");     // Build DBG File name
-                    ModuleFile = sopen(FileName,
-                                       O_RDONLY | O_BINARY, SH_DENYNO);
-                    if (ModuleFile != -1)
-                    {
-                        if (!(rc = Read16CodeView(LogFile,
-                                                  &xdi,
-                                                  ModuleFile,
-                                                  ulSegment,
-                                                  TrapOffset,
-                                                  FileName)))
-                            WriteDebugInfo(LogFile, &xdi);
-
-                        close(ModuleFile);
-                    }
-                }
-                return rc;
-            }
-            else
-            {
-                /*
-                 * Unknown executable:
-                 *
-                 */
-
-                fprintf(LogFile, "Error, could not find exe signature");
-                close(ModuleFile);
-                return 11;
-            }
-        }
-    } // end if (ModuleFile != -1)
-    else
-    {
-        fprintf(LogFile, "Error %d opening module file %s", errno, FileName);
-        return 1;
-    }                           // endif
-
-    // return 0;        we never get here
-}
-
-char            fname[256],
-                ModName[80];
-char            ename[256],
-                dummy[256];
-
-#define MAX_USERDEFS 300        // raised from 150 V0.9.1 (2000-01-30) [umoeller]
-#define MAX_POINTERS 300        // raised from 150 V0.9.1 (2000-01-30) [umoeller]
-
-USHORT          userdef_count;
-USHORT          pointer_count;
-
-struct one_userdef_rec
-{
-    USHORT          idx;
-    USHORT          type_index;
-    BYTE            name[33];
-} one_userdef[MAX_USERDEFS];
-
-struct one_pointer_rec
-{
-    USHORT          idx;
-    USHORT          type_index;
-    BYTE            type_qual;
-    BYTE            name[33];
-} one_pointer[MAX_POINTERS];
-
-/*
- * Read32PmDebug:
- *      parses 32-bit debug code.
- *      Called from dbgPrintDebugInfo for 32-bit modules.
- */
-
-static int Read32PmDebug(FILE *LogFile,        // in: text log file to write to
-                         PXDEBUGINFO pxdi,
-                         int ModuleFile,       // in: module file opened with sopen()
-                         int TrapSeg,
-                         int TrapOff,
-                         CHAR *FileName)
-{
-    static unsigned int CurrSymSeg, NrSymbol,
-                        /* offset, */ NrPublic,
-                        NrFile, NrLine, /* NrEntry */
-                        numdir, namelen,
-                        numlines /* , line */;
-    static int      ModIndex;
-    static int      bytesread, i, j;
-    static SSLINEENTRY32 LineEntry;
-    static SSFILENUM32 FileInfo;
-    static FIRSTLINEENTRY32 FirstLine;
-    static BYTE     dump_vars = FALSE;
-    static USHORT   idx;
-    static BOOL     read_types;
-    static LONG     lSize;
-
-    ModIndex = 0;
-    // See if any CODEVIEW info
-    if (lseek(ModuleFile, -8L, SEEK_END) == -1)
-    {
-        fprintf(LogFile, "Error %u seeking CodeView table in %s\n", errno, FileName);
-        return (18);
-    }
-
-    if (read(ModuleFile,
-             (void *)&G_eodbug, 8)
-            == -1)
-    {
-        fprintf(LogFile, "Error %u reading debug info from %s\n", errno, FileName);
-        return (19);
-    }
-    if (G_eodbug.dbug != DBUGSIG)
-    {
-        // fprintf(LogFile,"\nNo CodeView information stored.\n");
-        return (100);
-    }
-
-    if (    (pxdi->lfaBase = lseek(ModuleFile,
-                                   -(LONG)G_eodbug.dfaBase,
-                                   SEEK_END))
-         == -1L)
-    {
-        fprintf(LogFile, "Error %u seeking base codeview data in %s\n", errno, FileName);
-        return (20);
-    }
-
-    if (read(ModuleFile,
-             (void *)&pxdi->base, 8)
-        == -1)
-    {
-        fprintf(LogFile, "Error %u reading base codeview data in %s\n", errno, FileName);
-        return (21);
-    }
-
-    if (lseek(ModuleFile,
-              pxdi->base.lfoDir - 8 + 4,
-              SEEK_CUR)
-        == -1)
-    {
-        fprintf(LogFile, "Error %u seeking dir codeview data in %s\n", errno, FileName);
-        return (22);
-    }
-
-    if (read(ModuleFile,
-             (void *)&numdir, 4)
-        == -1)
-    {
-        fprintf(LogFile, "Error %u reading dir codeview data in %s\n", errno, FileName);
-        return (23);
-    }
-
-    // Read dir table into buffer
-    if (    (pxdi->pDirTab32 = (SSDIR32*)calloc(numdir,
-                                             sizeof(SSDIR32)))
-        == NULL)
-    {
-        fprintf(LogFile, "Out of memory!");
-        return (-1);
-    }
-
-    if (read(ModuleFile,
-             (void*)pxdi->pDirTab32,
-             numdir * sizeof(SSDIR32))
-        == -1)
-    {
-        fprintf(LogFile, "Error %u reading codeview dir table from %s\n", errno, FileName);
-        free(pxdi->pDirTab32);
-        return (24);
-    }
-
-    i = 0;
-    while (i < numdir)
-    {
-        if (pxdi->pDirTab32[i].sst != SSTMODULES)
-        {
-            i++;
-            continue;
-        }
-
-        NrPublic = 0x0;
-        NrSymbol = 0;
-        NrLine = 0x0;
-        NrFile = 0x0;
-        CurrSymSeg = 0;
-        // point to subsection
-        lseek(ModuleFile,
-              pxdi->pDirTab32[i].lfoStart + pxdi->lfaBase,
-              SEEK_SET);
-        read(ModuleFile,
-             (void*)&pxdi->ssmod32.csBase,
-             sizeof(SSMOD32));
-        read(ModuleFile,
-             (void*)ModName,
-             (unsigned)pxdi->ssmod32.csize);
-        ModIndex = pxdi->pDirTab32[i].modindex;
-        ModName[pxdi->ssmod32.csize] = '\0';
-        i++;
-
-        read_types = FALSE;
-
-        while (     (pxdi->pDirTab32[i].modindex == ModIndex)
-                 && (i < numdir)
-              )
-        {
-            // point to subsection
-            lseek(ModuleFile,
-                  pxdi->pDirTab32[i].lfoStart + pxdi->lfaBase,
-                  SEEK_SET);
-
-            switch (pxdi->pDirTab32[i].sst)
-            {
-                case SSTPUBLICS:
-                    bytesread = 0;
-                    while (bytesread < pxdi->pDirTab32[i].cb)
-                    {
-                        bytesread += read(ModuleFile,
-                                          (void *)&pxdi->sspub32.offset,
-                                          sizeof(pxdi->sspub32));
-                        bytesread += read(ModuleFile,
-                                          (void*)ename,
-                                          (unsigned)pxdi->sspub32.csize);
-                        ename[pxdi->sspub32.csize] = '\0';
-                        if (    (pxdi->sspub32.segment == TrapSeg)
-                             && (pxdi->sspub32.offset <= TrapOff)
-                             && (pxdi->sspub32.offset >= NrPublic)
-                           )
-                        {
-                            NrPublic = pubfunc_ofs = pxdi->sspub32.offset;
-                            read_types = TRUE;
-                            sprintf(pxdi->szNrPub,
-                                    "%s %s (%s)\n",
-                                    (pxdi->sspub32.type == 1)
-                                            ? " Abs"
-                                            : " ",
-                                    ename,
-                                    ModName
-                                );
-                            // but continue, because there might be a
-                            // symbol that comes closer
-                        }
-                    }
-                    break;
-
-                // Read symbols, so we can dump the variables on the stack
-                case SSTSYMBOLS:
-                    if (TrapSeg != pxdi->ssmod32.csBase)
-                        break;
-
-                    bytesread = 0;
-                    while (bytesread < pxdi->pDirTab32[i].cb)
-                    {
-                        static USHORT   usLength;
-                        static USHORT   usLengthSym;
-                        static BYTE     b1,
-                                        b2;
-                        static BYTE     bType;
-                                       // *ptr;
-                        static ULONG    ofs;
-                        // static ULONG    last_addr = 0;
-                        //YD 17/07/06 c++ namespace can generate really long
-                        //YD names, use a large buffer!
-                        static BYTE     str[16*1024];
-                        static struct symseg_rec symseg;
-                        static struct symauto_rec symauto;
-                        static struct symproc_rec symproc;
-
-                        // Read the length of this subentry
-                        bytesread += read(ModuleFile, &b1, 1);
-                        if (b1 & 0x80)
-                        {
-                            bytesread += read(ModuleFile, &b2, 1);
-                            usLength = ((b1 & 0x7F) << 8) + b2;
-                        }
-                        else
-                            usLength = b1;
-
-                        ofs = tell(ModuleFile);
-
-                        bytesread += read(ModuleFile, &bType, 1);
-
-                        switch (bType)
-                        {
-                            case SYM_CHANGESEG:
-                                read(ModuleFile, &symseg, sizeof(symseg));
-                                CurrSymSeg = symseg.seg_no;
-                                break;
-
-                            case SYM_PROC:
-                            case SYM_CPPPROC:
-                                read(ModuleFile, &symproc, sizeof(symproc));
-                                if (symproc.name_len & 0x80)
-                                {
-                                    read(ModuleFile, &b2, 1);
-                                       usLengthSym  = ((symproc.name_len & 0x7F) << 8) + b2;
-                                }
-                                else
-                                {
-                                   usLengthSym  = symproc.name_len;
-                                }
-                                read(ModuleFile, str, usLengthSym);
-                                 str[usLengthSym] = 0;
-
-                                if ((CurrSymSeg == TrapSeg) &&
-                                    (symproc.offset <= TrapOff) &&
-                                    (symproc.offset >= NrSymbol))
-                                {
-
-                                    dump_vars = TRUE;
-                                    var_ofs = 0;
-                                    NrSymbol = symproc.offset;
-                                    func_ofs = symproc.offset;
-
-                                    strcpy(func_name, str);
-                                }
-                                else
-                                {
-                                    dump_vars = FALSE;
-                                }
-                                break;
-
-                            case SYM_AUTO:
-                                if (!dump_vars)
-                                    break;
-
-                                read(ModuleFile, &symauto, sizeof(symauto));
-                                read(ModuleFile, str, symauto.name_len);
-                                if (symauto.name_len==0x80)
-                                    printf("symauto.name_len==0x80\n");
-                                str[symauto.name_len] = 0;
-
-                                strcpy(autovar_def[var_ofs].name, str);
-                                autovar_def[var_ofs].stack_offset = symauto.stack_offset;
-                                autovar_def[var_ofs].type_idx = symauto.type_idx;
-                                var_ofs++;
-                                break;
-
-                        }
-
-                        bytesread += usLength;
-
-                        lseek(ModuleFile, ofs + usLength, SEEK_SET);
-                    }
-                    break;
-
-                case SSTTYPES:
-                    // if (ModIndex != TrapSeg)
-                    if (!read_types)
-                        break;
-
-                    bytesread = 0;
-                    idx = 0x200;
-                    userdef_count = 0;
-                    pointer_count = 0;
-                    while (bytesread < pxdi->pDirTab32[i].cb)
-                    {
-                        static struct type_rec type;
-                        static struct type_userdefrec udef;
-                        static struct type_pointerrec point;
-                        static ULONG    ofs;
-                        static BYTE     str[256];
-
-                        // Read the length of this subentry
-                        ofs = tell(ModuleFile);
-
-                        read(ModuleFile, &type, sizeof(type));
-                        bytesread += sizeof(type);
-
-                        switch (type.type)
-                        {
-                            case TYPE_USERDEF:
-                                if (userdef_count >= MAX_USERDEFS)
-                                    break;
-
-                                read(ModuleFile, &udef, sizeof(udef));
-                                read(ModuleFile, str, udef.name_len);
-                                str[udef.name_len] = 0;
-
-                                // Insert userdef in table
-                                one_userdef[userdef_count].idx = idx;
-                                one_userdef[userdef_count].type_index = udef.type_index;
-                                memcpy(one_userdef[userdef_count].name,
-                                       str,
-                                       _min(udef.name_len + 1, 32));
-                                one_userdef[userdef_count].name[32] = 0;
-                                userdef_count++;
-                                break;
-
-                            case TYPE_POINTER:
-                                if (pointer_count >= MAX_POINTERS)
-                                    break;
-
-                                read(ModuleFile, &point, sizeof(point));
-                                read(ModuleFile, str, point.name_len);
-                                str[point.name_len] = 0;
-
-                                // Insert userdef in table
-                                one_pointer[pointer_count].idx = idx;
-                                one_pointer[pointer_count].type_index = point.type_index;
-                                memcpy(one_pointer[pointer_count].name,
-                                       str,
-                                       _min(point.name_len + 1, 32));
-                                one_pointer[pointer_count].name[32] = 0;
-                                one_pointer[pointer_count].type_qual = type.type_qual;
-                                pointer_count++;
-                                break;
-                        }
-
-                        ++idx;
-
-                        bytesread += type.length;
-
-                        lseek(ModuleFile, ofs + type.length + 2, SEEK_SET);
-                    }
-                    break;
-
-                case SSTSRCLINES32:
-                    if (TrapSeg != pxdi->ssmod32.csBase)
-                        break;
-
-                    // read first line
-                    do
-                    {
-                        read(ModuleFile, (void *)&FirstLine, sizeof(FirstLine));
-
-                        if (FirstLine.LineNum != 0)
-                        {
-                            fprintf(LogFile, "Missing Line table information\n");
-                            break;
-                        }       // endif
-                        numlines = FirstLine.numlines;
-                        // Other type of data skip 4 more bytes
-                        if (FirstLine.entry_type < 4)
-                        {
-                            read(ModuleFile, (void *)&lSize, 4);
-                            if (FirstLine.entry_type == 3)
-                                lseek(ModuleFile, lSize, SEEK_CUR);
-                        }
-                    }
-                    while (FirstLine.entry_type == 3);
-
-                    for (j = 0; j < numlines; j++)
-                    {
-                        switch (FirstLine.entry_type)
-                        {
-                            case 0:
-                                read(ModuleFile, (void *)&LineEntry, sizeof(LineEntry));
-                                // Changed by Kim Rasmussen 26/06 1996 to ignore linenumber 0
-                                // if (LineEntry.Offset+ssmod32.csOff<=TrapOff && LineEntry.Offset+ssmod32.csOff>=NrLine) {
-                                if (    (LineEntry.LineNum)
-                                     && (LineEntry.Offset + pxdi->ssmod32.csOff
-                                            <= TrapOff)
-                                     && (LineEntry.Offset + pxdi->ssmod32.csOff >= NrLine)
-                                   )
-                                {
-                                    NrLine = LineEntry.Offset;
-                                    NrFile = LineEntry.FileNum;
-                                    /*pOffset =sprintf(szNrLine,"%04X:%08X  line #%hu ",
-                                     * ssmod32.csBase,LineEntry.Offset,
-                                     * LineEntry.LineNum); */
-                                    sprintf(pxdi->szNrLine, "% 6hu", LineEntry.LineNum);
-                                }
-                                break;
-
-                            case 1:
-                                lseek(ModuleFile, sizeof(struct linlist_rec), SEEK_CUR);
-                                break;
-
-                            case 2:
-                                lseek(ModuleFile, sizeof(struct linsourcelist_rec), SEEK_CUR);
-                                break;
-
-                            case 3:
-                                lseek(ModuleFile, sizeof(struct filenam_rec), SEEK_CUR);
-                                break;
-
-                            case 4:
-                                lseek(ModuleFile, sizeof(struct pathtab_rec), SEEK_CUR);
-                                break;
-
-                        }
-                    }
-
-                    if (NrFile != 0)
-                    {
-                        // file found:
-                        read(ModuleFile, (void*)&FileInfo, sizeof(FileInfo));
-                        namelen = 0;
-                        for (j = 1; j <= FileInfo.file_count; j++)
-                        {
-                            namelen = 0;
-                            read(ModuleFile, (void *)&namelen, 1);
-                            read(ModuleFile, (void *)ename, namelen);
-                            if (j == NrFile)
-                                break;
-                        }
-                        ename[namelen] = '\0';
-                        //  pOffset=sprintf(szNrLine+pOffset," (%s) (%s)\n",ename,ModName);
-                        sprintf(pxdi->szNrFile, "%11.11s ", ename);
-                    }
-                    else
-                    {
-                        // strcat(szNrLine,"\n"); avoid new line for empty name fill
-                        strcpy(pxdi->szNrFile, "file?       ");
-                    } // endif
-                    break;
-            } // end switch
-
-            i++;
-        } // end while modindex
-    } // End While i < numdir
-    free(pxdi->pDirTab32);
-    return (0);
-}
-
-/*
- * Read16CodeView:
- *      parses 16-bit debug code.
- *      Called from dbgPrintDebugInfo for 16-bit modules.
- */
-
-static int Read16CodeView(FILE *LogFile,       // in: text log file to write to
-                          PXDEBUGINFO pxdi,
-                          int fh,
-                          int TrapSeg,
-                          int TrapOff,
-                          CHAR *FileName)
-{
-    static unsigned short int offset,
-                    NrPublic, NrLine,
-                    numdir,
-                    namelen, numlines,
-                    line;
-    static int      ModIndex;
-    static int      bytesread, i, j;
-
-    ModIndex = 0;
-    // See if any CODEVIEW info
-    if (lseek(fh, -8L, SEEK_END) == -1)
-    {
-        fprintf(LogFile, "Error %u seeking CodeView table in %s\n", errno, FileName);
-        return (18);
-    }
-
-    if (read(fh, (void *)&G_eodbug, 8) == -1)
-    {
-        fprintf(LogFile, "Error %u reading debug info from %s\n", errno, FileName);
-        return (19);
-    }
-    if (G_eodbug.dbug != DBUGSIG)
-    {
-        // fprintf(LogFile,"\nNo CodeView information stored.\n");
-        return (100);
-    }
-
-    if ((pxdi->lfaBase = lseek(fh, -(LONG)G_eodbug.dfaBase, SEEK_END)) == -1L)
-    {
-        fprintf(LogFile, "Error %u seeking base codeview data in %s\n", errno, FileName);
-        return (20);
-    }
-
-    if (read(fh, (void *)&pxdi->base, 8) == -1)
-    {
-        fprintf(LogFile, "Error %u reading base codeview data in %s\n", errno, FileName);
-        return (21);
-    }
-
-    if (lseek(fh, pxdi->base.lfoDir - 8, SEEK_CUR) == -1)
-    {
-        fprintf(LogFile, "Error %u seeking dir codeview data in %s\n", errno, FileName);
-        return (22);
-    }
-
-    if (read(fh, (void *)&numdir, 2) == -1)
-    {
-        fprintf(LogFile, "Error %u reading dir codeview data in %s\n", errno, FileName);
-        return (23);
-    }
-
-    // Read dir table into buffer
-    if ((pxdi->pDirTab = (SSDIR*)calloc(numdir, sizeof(SSDIR))) == NULL)
-    {
-        fprintf(LogFile, "Out of memory!");
-        return (-1);
-    }
-
-    if (read(fh, (void*)pxdi->pDirTab, numdir * sizeof(SSDIR)) == -1)
-    {
-        fprintf(LogFile, "Error %u reading codeview dir table from %s\n", errno, FileName);
-        free(pxdi->pDirTab);
-        return (24);
-    }
-
-    i = 0;
-    while (i < numdir)
-    {
-        if (pxdi->pDirTab[i].sst != SSTMODULES)
-        {
-            i++;
-            continue;
-        }
-        NrPublic = 0x0;
-        NrLine = 0x0;
-        // point to subsection
-        lseek(fh, pxdi->pDirTab[i].lfoStart + pxdi->lfaBase, SEEK_SET);
-        read(fh, (void *)&pxdi->ssmod.csBase, sizeof(SSMODULE));
-        read(fh, (void *)ModName, (unsigned)pxdi->ssmod.csize);
-        ModIndex = pxdi->pDirTab[i].modindex;
-        ModName[pxdi->ssmod.csize] = '\0';
-        i++;
-        while (pxdi->pDirTab[i].modindex == ModIndex && i < numdir)
-        {
-            // point to subsection
-            lseek(fh, pxdi->pDirTab[i].lfoStart + pxdi->lfaBase, SEEK_SET);
-            switch (pxdi->pDirTab[i].sst)
-            {
-                case SSTPUBLICS:
-                    bytesread = 0;
-                    while (bytesread < pxdi->pDirTab[i].cb)
-                    {
-                        bytesread += read(fh, (void *)&pxdi->sspub.offset, sizeof(pxdi->sspub));
-                        bytesread += read(fh, (void *)ename, (unsigned)pxdi->sspub.csize);
-                        ename[pxdi->sspub.csize] = '\0';
-                        if ((pxdi->sspub.segment == TrapSeg) &&
-                            (pxdi->sspub.offset <= TrapOff) &&
-                            (pxdi->sspub.offset >= NrPublic))
-                        {
-                            NrPublic = pxdi->sspub.offset;
-                            sprintf(pxdi->szNrPub, "%s %s (%s) %04hX:%04hX\n",
-                                    (pxdi->sspub.type == 1) ? " Abs" : " ", ename,
-                                    ModName, // ()
-                                    pxdi->sspub.segment,
-                                    pxdi->sspub.offset
-                                );
-                        }
-                    }
-                    break;
-
-                case SSTSRCLINES2:
-                case SSTSRCLINES:
-                    if (TrapSeg != pxdi->ssmod.csBase)
-                        break;
-                    namelen = 0;
-                    read(fh, (void *)&namelen, 1);
-                    read(fh, (void *)ename, namelen);
-                    ename[namelen] = '\0';
-                    // skip 2 zero bytes
-                    if (pxdi->pDirTab[i].sst == SSTSRCLINES2)
-                        read(fh, (void *)&numlines, 2);
-                    read(fh, (void *)&numlines, 2);
-                    for (j = 0; j < numlines; j++)
-                    {
-                        read(fh, (void *)&line, 2);
-                        read(fh, (void *)&offset, 2);
-                        if (offset <= TrapOff && offset >= NrLine)
-                        {
-                            NrLine = offset;
-                            sprintf(pxdi->szNrFile, "% 12.12s ", ename);
-                            sprintf(pxdi->szNrLine, "% 6hu", line);
-                            /*sprintf(szNrLine,"%04hX:%04hX  line #%hu  (%s) (%s)\n",
-                             * ssmod.csBase,offset,line,ModName,ename); */
-                        }
-                    }
-                    break;
-            }                   // end switch
-            i++;
-        }                       // end while modindex
-    }                           // End While i < numdir
-    free(pxdi->pDirTab);
-    return (0);
-}
-
-/* ******************************************************************
- *
- *   PART 2: ANALYZE VARIABLES
- *
- ********************************************************************/
-
-/*
- * var_value:
- *      writes a description of a variable type to
- *      the specified buffer, depending on "type".
- *
- *@@changed V0.9.1 (2000-01-30) [umoeller]: changed prototype to use external buffer
- */
-
-static VOID var_value(void *varptr,        // in: address of the variable on the stack
-                      char *pszBuf,        // out: information
-                      BYTE type)           // in: type; if >= 32, we'll call DosQueryMem
-{
-    ULONG           Size = 1,
-                    Attr = 0;
-
-    if (DosQueryMem(varptr, &Size, &Attr) != NO_ERROR)
-    {
-        sprintf(pszBuf, "type %d, DosQueryMem failed", type);
-        return;
-    }
-
-    if ((Attr & PAG_READ) == 0)
-    {
-        sprintf(pszBuf, "type %d, read-access to value denied", type);
-        return;
-    }
-
-    if (type == 0)
-        sprintf(pszBuf, "%hd", *(signed char*)varptr);
-    else if (type == 1)
-        sprintf(pszBuf, "%hd", *(signed short*)varptr);
-    else if (type == 2)
-        sprintf(pszBuf, "%ld", *(signed long*)varptr);
-    else if (type == 4)
-        sprintf(pszBuf, "%hu", *(BYTE*) varptr);
-    else if (type == 5)
-        sprintf(pszBuf, "%hu", *(USHORT*)varptr);
-    else if (type == 6)
-        sprintf(pszBuf, "0x%lX (%lu)", *((ULONG*)varptr), *((ULONG*)varptr));
-    else if (type == 8)
-        sprintf(pszBuf, "%f", *(float*)varptr);
-    else if (type == 9)
-        sprintf(pszBuf, "%f", *(double*)varptr);
-    else if (type == 10)
-        sprintf(pszBuf, "%f", (double)(*(long double*)varptr));
-    else if (type == 16)
-        sprintf(pszBuf, "%s", *(char*)varptr ? "TRUE" : "FALSE");
-    else if (type == 17)
-        sprintf(pszBuf, "%s", *(short*)varptr ? "TRUE" : "FALSE");
-    else if (type == 18)
-        sprintf(pszBuf, "%s", *(long*)varptr ? "TRUE" : "FALSE");
-    else if (type == 20)
-        sprintf(pszBuf, "%c", *(char*)varptr);
-    else if (type == 21)
-        sprintf(pszBuf, "%hd", (*(short*)varptr));
-    else if (type == 22)
-        sprintf(pszBuf, "%ld", *(long*)varptr);
-    else if (type == 23)
-        sprintf(pszBuf, "void");
-    else if (type >= 32)
-    {
-        sprintf(pszBuf, "0x%p", (void*)(*(ULONG*)varptr));
-        if (Attr & PAG_FREE)
-        {
-            strcat(pszBuf, " unallocated memory");
-        }
-        else
-        {
-            if ((Attr & PAG_COMMIT) == 0x0U)
-            {
-                strcat(pszBuf, " uncommitted");
-            }               // endif
-            if ((Attr & PAG_WRITE) == 0x0U)
-            {
-                strcat(pszBuf, " unwritable");
-            }               // endif
-            if ((Attr & PAG_READ) == 0x0U)
-            {
-                strcat(pszBuf, " unreadable");
-            }               // endif
-        }                   // endif
-    }                       // endif
-    else
-        sprintf(pszBuf, "Unknown type %d", type);
-}
-
-/*
- * search_userdefs:
- *      searches the table of userdef's-
- *      Return TRUE if found.
- */
-
-static BOOL search_userdefs(FILE *LogFile,     // in: text log file to write to
-                            ULONG stackofs,
-                            USHORT var_no)
-{
-    USHORT          pos;
-
-    for (pos = 0;
-         pos < userdef_count;
-         pos++)
-    {
-        if (one_userdef[pos].idx == autovar_def[var_no].type_idx)
-        {
-            if (    (one_userdef[pos].type_index >= 0x80)
-                // &&  (one_userdef[pos].type_index <= 0xDA)
-               )
-            {
-                static char sszVar3[500] = "complex";
-                if (one_userdef[pos].type_index <= 0xDA)
-                    var_value((void*)(stackofs + autovar_def[var_no].stack_offset),
-                              sszVar3,
-                              one_userdef[pos].type_index - 0x80);
-
-                fprintf(LogFile,
-                        "     %- 6ld %- 20.20s %- 33.33s %s (user)\n",
-                        autovar_def[var_no].stack_offset,       // stack offset
-                        autovar_def[var_no].name,               // identifier
-                        one_userdef[pos].name,                  // type name
-                        sszVar3                                 // composed by var_value
-                       );
-                return TRUE;
-            }
-            else
-                return FALSE;
-        }
-    }
-
-    return FALSE;
-}
-
-/*
- * search_pointers:
- *
- */
-
-static BOOL search_pointers(FILE *LogFile,     // in: text log file to write to
-                            ULONG stackofs,
-                            USHORT var_no)
-{
-    USHORT          pos, upos;
-    static BYTE     str[35];
-    static char     sszVar[500];
-
-    // BYTE            type_index;
-
-    for (pos = 0;
-         (   (pos < pointer_count)
-          && (one_pointer[pos].idx != autovar_def[var_no].type_idx)
-         );
-         pos++);
-
-    if (pos < pointer_count)
-    {
-        if (    (one_pointer[pos].type_index >= 0x80)
-             && (one_pointer[pos].type_index <= 0xDA)
-           )
-        {
-            strcpy(str, type_name[one_pointer[pos].type_index - 0x80]);
-            strcat(str, " *");
-            var_value((void*)(stackofs + autovar_def[var_no].stack_offset),
-                      sszVar,
-                      32);
-            fprintf(LogFile, "     %- 6ld %- 20.20s %- 33.33s %s (ptr1)\n",
-                    autovar_def[var_no].stack_offset,
-                    autovar_def[var_no].name,
-                    str,
-                    sszVar);
-            return TRUE;
-        }
-        else
-        {
-            // If the result isn't a simple type, look for it in the other lists
-            for (upos = 0;
-                 (   (upos < userdef_count)
-                  && (one_userdef[upos].idx != one_pointer[pos].type_index)
-                 );
-                 upos++)
-                ;
-
-            if (upos < userdef_count)
-            {
-                strcpy(str, one_userdef[upos].name);
-                strcat(str, " *");
-                var_value((void *)(stackofs + autovar_def[var_no].stack_offset),
-                          sszVar,
-                          32);
-                fprintf(LogFile, "     %- 6ld %- 20.20s %- 33.33s %s (ptr2)\n",
-                        autovar_def[var_no].stack_offset,
-                        autovar_def[var_no].name,
-                        str,
-                        sszVar);
-                return TRUE;
-            }
-            else
-            {
-                // if it isn't a userdef, for now give up and just print
-                // as much as we know
-                sprintf(str, "Pointer to type 0x%X", one_pointer[pos].type_index);
-
-                var_value((void *)(stackofs + autovar_def[var_no].stack_offset),
-                          sszVar,
-                          32);
-                fprintf(LogFile, "     %- 6ld %- 20.20s %- 33.33s %s (ptr3)\n",
-                        autovar_def[var_no].stack_offset,
-                        autovar_def[var_no].name,
-                        str,
-                        sszVar);
-
-                return TRUE;
-            }
-        }
-    }
-
-    return FALSE;
-}
-
-/*
- *@@ dbgPrintVariables:
- *      Dumps variables for the specified stack offset
- *      to the specified log file.
- *
- *      New with V0.84.
- */
-
-void dbgPrintVariables(FILE *LogFile,   // in: text log file to write to
-                       ULONG stackofs)
-{
-    USHORT          n; // , pos;
-    BOOL            AutoVarsFound = FALSE;
-
-    if (/* 1 || */ func_ofs == pubfunc_ofs)
-    {
-        for (n = 0;
-             n < var_ofs;
-             n++)
-        {
-            if (AutoVarsFound == FALSE)
-            {
-                AutoVarsFound = TRUE;
-                fprintf(LogFile, "     List of auto variables at EBP %p in %s:\n",
-                        (PVOID)stackofs,
-                        func_name);
-                fprintf(LogFile, "     Offset Name                 Type                              Value            \n");
-                fprintf(LogFile, "     ������ �������������������� ��������������������������������� �����������������\n");
-            }
-
-            // If it's one of the simple types
-            if (   (autovar_def[n].type_idx >= 0x80)
-                && (autovar_def[n].type_idx <= 0xDA)
-                )
-            {
-                static char sszVar2[500];
-
-                var_value((void *)(stackofs + autovar_def[n].stack_offset),
-                          sszVar2,
-                          autovar_def[n].type_idx - 0x80);
-
-                fprintf(LogFile, "     %- 6ld %- 20.20s %- 33.33s %s (simple)\n",
-                        autovar_def[n].stack_offset,
-                        autovar_def[n].name,
-                        type_name[autovar_def[n].type_idx - 0x80],
-                        sszVar2);
-            }
-            else
-            {                   // Complex type, check if we know what it is
-                if (!search_userdefs(LogFile, stackofs, n))
-                {
-                    if (!search_pointers(LogFile, stackofs, n))
-                    {
-                        fprintf(LogFile, "     %- 6ld %-20.20s 0x%X (unknown)\n",
-                                autovar_def[n].stack_offset,
-                                autovar_def[n].name,
-                                autovar_def[n].type_idx);
-                    }
-                }
-            }
-        }
-        /* if (AutoVarsFound == FALSE)
-        {
-            fprintf(LogFile, "  No auto variables found in %s.\n", func_name);
-        } */
-        fprintf(LogFile, "\n");
-    }
-}
-
-/* ******************************************************************
- *
- *   PART 3: ANALYZE SYMBOL (.SYM) FILE
- *
- ********************************************************************/
-
-/*
- *@@ dbgPrintSYMInfo:
- *      this gets called by dbgPrintStack if dbgPrintDebugInfo
- *      failed (because no debug code was found) to check if
- *      maybe a SYM file with the same filename exists and try
- *      to get the info from there.
- *
- *      This gets called for every line of the stack
- *      walk, but only if getting the information from
- *      the debug code failed, e.g. because no debug code
- *      was available for an address.
- *
- *      The file pointer is in the "Source file" column
- *      every time this gets called.
- *
- *      New with V0.84.
- *
- *      Returns 0 if reading the SYM file was successful.
- *
- *@@changed V0.9.1 (2000-01-30) [umoeller]: added return code; this used to be VOID
- */
-
-int dbgPrintSYMInfo(FILE *LogFile,      // in: text log file to write to
-                    CHAR *SymFileName,  // in: SYM file name (can be fully q'fied)
-                    ULONG Object,
-                    ULONG TrapOffset)
-{
-    static FILE    *SymFile;
-    static MAPDEF   MapDef;
-    static SEGDEF   SegDef;
-    static SYMDEF32 SymDef32;
-    static SYMDEF16 SymDef16;
-    static char     Buffer[256];
-    static int      SegNum, SymNum, LastVal;
-    static unsigned long int SegOffset,
-                    SymOffset, SymPtrOffset;
-
-    // open .SYM file
-#ifdef DEBUG_SYMDUMP
-    fprintf(LogFile,"Dump of '%s' for object %d\n",SymFileName,Object);
-#endif
-    SymFile = fopen(SymFileName, "rb");
-    if (SymFile == 0)
-        return (2);
-
-    // read in first map definition
-    fread(&MapDef, sizeof(MAPDEF), 1, SymFile);
-#ifdef DEBUG_SYMDUMP
-    Buffer[0] = MapDef.achModName[0];
-    fread(&Buffer[1], 1, MapDef.cbModName-1, SymFile);
-    Buffer[MapDef.cbModName] = 0x00;
-    fprintf(LogFile,"Module name '%s'\n",Buffer);
-#endif
-   
-    SegOffset = SEGDEFOFFSET(MapDef);
-#ifdef DEBUG_SYMDUMP
-    fprintf(LogFile,"SegOffset %0x\n",SegOffset);
-#endif
-
-    // go thru all segments
-    for (SegNum = 0;
-         SegNum < MapDef.cSegs;
-         SegNum++)
-    {
-#ifdef DEBUG_SYMDUMP
-        fprintf(LogFile,"Scanning segment #%d Offset %08X\n",SegNum,SegOffset);
-#endif
-        if (fseek(SymFile, SegOffset, SEEK_SET))
-            // seek error
-            return (3);
-
-        // read in segment definition
-        fread(&SegDef, sizeof(SEGDEF), 1, SymFile);
-#ifdef DEBUG_SYMDUMP
-        Buffer[0] = 0x00;
-        if (SegDef.cbSegName>0) {
-            Buffer[0] = SegDef.achSegName[0];
-            fread(&Buffer[1], 1, SegDef.cbSegName-1, SymFile);
-            Buffer[SegDef.cbSegName] = 0x00;
-        }
-        fprintf(LogFile,"Segment name '%s', number %d, flags %02x\n",Buffer,SegNum,SegDef.bFlags);
-#endif
-
-        if (SegNum == Object)
-        {
-            // stack object found:
-            Buffer[0] = 0x00;
-            LastVal = 0;
-
-            // go thru all symbols in this object
-#ifdef DEBUG_SYMDUMP
-            fprintf(LogFile,"Scanning #%d symbols\n",SegDef.cSymbols);
-#endif
-            for (SymNum = 0; SymNum < SegDef.cSymbols; SymNum++)
-            {
-                SymPtrOffset=SYMDEFOFFSET(SegOffset,SegDef,SymNum);
-                fseek(SymFile,SymPtrOffset,SEEK_SET);
-                fread(&SymOffset,sizeof(unsigned short int),1,SymFile);
-                fseek(SymFile,SymOffset+SegOffset,SEEK_SET);
-                if (SegDef.bFlags & 0x01)
-                {
-                    // 32-bit symbol:
-                    fread(&SymDef32, sizeof(SYMDEF32), 1, SymFile);
-                    if (SymDef32.wSymVal > TrapOffset)
-                    {
-                        // symbol found
-                        fprintf(LogFile,
-                                "between %s + 0x%lX ",
-                                Buffer,
-                                TrapOffset - LastVal);
-                        /* fprintf(LogFile, "(ppLineDef: 0x%lX) ",
-                                    LINEDEFOFFSET(SegDef)
-                                    ); */
-                        fprintf(LogFile, "\n");
-                    }
-
-                    LastVal = SymDef32.wSymVal;
-                    Buffer[0] = SymDef32.achSymName[0];
-                    fread(&Buffer[1], 1, SymDef32.cbSymName-1, SymFile);
-                    Buffer[SymDef32.cbSymName] = 0x00;
-#ifdef DEBUG_SYMDUMP
-                    fprintf(LogFile,"32 Bit Symbol Address %08p <%s> \n",SymDef32.wSymVal,Buffer);
-#endif
-
-                    if (SymDef32.wSymVal > TrapOffset)
-                    {
-                        // symbol found, as above
-                        fprintf(LogFile,
-                                "                                     "
-                                "and %s - 0x%lX ",
-                                Buffer,
-                                LastVal - TrapOffset);
-                        fprintf(LogFile, "\n");
-                        break;
-                    }
-                }
-                else
-                {
-                    // 16-bit symbol:
-                    fread(&SymDef16, sizeof(SYMDEF16), 1, SymFile);
-                    if (SymDef16.wSymVal > TrapOffset)
-                    {
-                        fprintf(LogFile,
-                                "between %s + %lX\n",
-                                Buffer,
-                                TrapOffset - LastVal);
-                    }
-                    LastVal = SymDef16.wSymVal;
-                    Buffer[0] = SymDef16.achSymName[0];
-                    fread(&Buffer[1], 1, SymDef16.cbSymName-1, SymFile);
-                    Buffer[SymDef16.cbSymName] = 0x00;
-                    if (SymDef16.wSymVal > TrapOffset)
-                    {
-                        fprintf(LogFile,
-                                "                                     "
-                                "and %s - %lX\n",
-                                Buffer,
-                                LastVal - TrapOffset);
-                        break;
-                    }
-#ifdef DEBUG_SYMDUMP
-                    fprintf(LogFile,"16 Bit Symbol <%s> Address %p\n",Buffer,SymDef16.wSymVal);
-#endif
-                }               // endif
-            }
-            break;
-        }                       // endif
-        SegOffset = NEXTSEGDEFOFFSET(SegDef);
-    }                           // endwhile
-    fclose(SymFile);
-    return (0);         // no error
-}
-
-/* ******************************************************************
- *
- *   PART 4: dbgPrintStack
- *
- ********************************************************************/
-
-/*
- *@@ dbgPrintStackFrame:
- *      parses and dumps one stack frame.
- *      Called from excPrintStackFrame.
- *
- *      This calls dbgPrintDebugInfo and, if
- *      that fails, dbgPrintSYMInfo.
- *
- *@@added V0.9.2 (2000-03-10) [umoeller]
- *@@changed V0.9.3 (2000-04-10) [umoeller]: added support for non-Warp 4 SYM files
- *@@changed V0.9.3 (2000-04-26) [umoeller]: this broke Warp 4 FP 13, fixed
- */
-
-BOOL dbgPrintStackFrame(FILE *LogFile,
-                        PSZ pszModuleName,  // in: module name (fully q'fied)
-                        ULONG ulObject,
-                        ULONG ulOffset)
-{
-    APIRET arc = 0;
-    // "Source file"... columns
-
-//YD do not use debug info
-#define ENABLE_DEBUG_INFO
-#ifdef ENABLE_DEBUG_INFO
-    // first attempt to analyze the debug code
-    arc = dbgPrintDebugInfo(LogFile,
-                            pszModuleName,
-                            ulObject,
-                            ulOffset);
-#else
-    arc = 1;
-#endif
-
-    // if no debug code is available, analyze
-    // the SYM file instead
-    if (arc != NO_ERROR)
-    {
-        CHAR szSymName[CCHMAXPATH];
-        strcpy(szSymName, pszModuleName);
-        strcpy(szSymName + strlen(szSymName) - 3, "SYM");
-        arc = dbgPrintSYMInfo(LogFile,
-                              szSymName,
-                              ulObject,
-                              ulOffset);
-        if (arc != 0)
-        {
-            // SYM file not found in current directory:
-            // check the SYM files in the \OS2 directory,
-            // depending on the OS/2 version level:
-            CHAR szSymFile2[CCHMAXPATH];
-            PSZ  pszFilename = strrchr(szSymName, '\\');
-            if (pszFilename)
-            {
-                PSZ         pszVersionDir = "WARP4";
-                ULONG       aulBuf[3];
-
-                DosQuerySysInfo(QSV_VERSION_MAJOR,      // 11
-                                QSV_VERSION_MINOR,      // 12
-                                &aulBuf, sizeof(aulBuf));
-                // Warp 3 is reported as 20.30
-                // Warp 4 is reported as 20.40
-                // Aurora is reported as 20.45
-
-                if (aulBuf[0] == 20)
-                {
-                    if (aulBuf[1] == 30)
-                        // Warp 3:
-                        pszVersionDir = "WARP3";
-                    else if (aulBuf[1] >= 40)
-                        // Warp 4 or higher:
-                        // (NOTE: Warp 4 FP 13 now returns 45 also,
-                        // but the SYM files are still in the WARP4 directory...)
-                        // V0.9.3 (2000-04-26) [umoeller]
-                        pszVersionDir = "WARP4";
-                }
-
-                pszFilename++;
-                sprintf(szSymFile2,
-                        "%c:\\OS2\\PDPSI\\PMDF\\%s\\%s",
-                        doshQueryBootDrive(),
-                        pszVersionDir,
-                        pszFilename);
-                arc = dbgPrintSYMInfo(LogFile,
-                                      szSymFile2,
-                                      ulObject,
-                                      ulOffset);
-
-                // V0.9.3 (2000-04-26) [umoeller]
-                if (    (arc != 0)  // still not found
-                     && (aulBuf[1] == 45) // and running Aurora or Warp 4 FP13?
-                   )
-                {
-                    // Warp Server for e-Business (aka Warp 4.5):
-                    // we use the SYM files for the UNI kernel,
-                    // I have found no way to find out whether
-                    // we're running on an SMP kernel
-                    sprintf(szSymFile2,
-                            "%c:\\OS2\\PDPSI\\PMDF\\%s\\%s",
-                            doshQueryBootDrive(),
-                            "WARP45_U",
-                            pszFilename);
-                    arc = dbgPrintSYMInfo(LogFile,
-                                          szSymFile2,
-                                          ulObject,
-                                          ulOffset);
-                }
-            }
-        }
-
-        if (arc == 2)       // file not found
-            fprintf(LogFile,
-                    "Cannot find symbol file %s\n",
-                    szSymName);
-        else if (arc != 0)
-            fprintf(LogFile,
-                    "Error %lu reading symbol file %s\n",
-                    arc,
-                    szSymName);
-    }
-
-    return (arc == NO_ERROR);
-}
-
-/*
- *@@ dbgPrintStack:
- *      this takes stack data from the TIB and
- *      context record data structures and tries
- *      to analyse what the different stack frames
- *      point to.
- *
- *      For each stack frame, this calls dbgPrintDebugInfo,
- *      and, if that fails, dbgPrintSYMInfo.
- *
- *      New with V0.84.
- *
- *@@changed V0.9.2 (2000-03-08) [umoeller]: now searching OS2\PDPSI\PMDF for SYM files also
- */
-
-VOID dbgPrintStack(FILE *LogFile,           // in: text log file to write to
-                   PUSHORT StackBottom,
-                   PUSHORT StackTop,
-                   PUSHORT Ebp,
-                   PUSHORT ExceptionAddress)
-{
-    PUSHORT         RetAddr = 0;
-    PUSHORT         LastEbp = 0;
-    APIRET          rc = 0;
-    ULONG           Size = 0,
-                    Attr = 0;
-    USHORT          Cs = 0,
-                    Ip = 0,
-                    // Bp,
-                    Sp = 0;
-    static char     Name[CCHMAXPATH];
-    HMODULE         hMod = 0;
-    ULONG           ObjNum = 0;
-    ULONG           Offset = 0;
-    BOOL            fExceptionAddress = TRUE;   // Use Exception Addr 1st time thru
-
-    // Note: we can't handle stacks bigger than 64K for now...
-    Sp = (USHORT) (((ULONG) StackBottom) >> 16);
-    // Bp = ;
-
-    if (!f32bit)
-        Ebp = (PUSHORT) MAKEULONG(((USHORT)(ULONG)Ebp), Sp);
-
-    fprintf(LogFile, "\n\nCall stack:\n");
-    fprintf(LogFile, "                                        Source    Line      Nearest\n");
-    fprintf(LogFile, "   EBP      Address    Module  Obj#      File     Numbr  Public Symbol\n");
-    fprintf(LogFile, " ��������  ��������-  �������� ����  ������������ �����  ������������-\n");
-
-    do
-    {
-        Size = 10;
-        rc = DosQueryMem((PVOID) (Ebp + 2), &Size, &Attr);
-        if (rc != NO_ERROR)
-        {
-            fprintf(LogFile, "Invalid EBP %8.8lX (DosQueryMem returned %lu)\n", (ULONG)Ebp, rc);
-            break;
-        }
-        if (!(Attr & PAG_COMMIT))
-        {
-            fprintf(LogFile, "Invalid EBP %8.8lX (not committed)\n", (ULONG)Ebp);
-            break;
-        }
-        if (Size < 10)
-        {
-            fprintf(LogFile, "Invalid EBP %8.8lX (mem block size < 10)\n", (ULONG)Ebp);
-            break;
-        }
-
-        if (fExceptionAddress)
-            RetAddr = ExceptionAddress;
-        else
-            RetAddr = (PUSHORT) (*((PULONG) (Ebp + 2)));
-
-        if (RetAddr == (PUSHORT) 0x00000053)
-        {
-            // For some reason there's a "return address" of 0x53 following
-            // EBP on the stack and we have to adjust EBP by 44 bytes to get
-            // at the real return address.  This has something to do with
-            // thunking from 32bits to 16bits...
-            // Serious kludge, and it's probably dependent on versions of C(++)
-            // runtime or OS, but it works for now!
-            Ebp += 22;
-            RetAddr = (PUSHORT) (*((PULONG) (Ebp + 2)));
-        }
-
-        // Get the (possibly) 16bit CS and IP
-        if (fExceptionAddress)
-        {
-            Cs = (USHORT) (((ULONG) ExceptionAddress) >> 16);
-            Ip = (USHORT) (ULONG) ExceptionAddress;
-        }
-        else
-        {
-            Cs = *(Ebp + 2);
-            Ip = *(Ebp + 1);
-        }
-
-        // if the return address points to the stack then it's really just
-        // a pointer to the return address (UGH!).
-        if (    (USHORT) (((ULONG) RetAddr) >> 16) == Sp
-           )
-            RetAddr = (PUSHORT) (*((PULONG) RetAddr));
-
-        if (Ip == 0 && *Ebp == 0)
-        {
-            // End of the stack so these are both shifted by 2 bytes:
-            Cs = *(Ebp + 3);
-            Ip = *(Ebp + 2);
-        }
-
-        // 16bit programs have on the stack:
-        //   BP:IP:CS
-        //   where CS may be thunked
-        //
-        //         in dump                 swapped
-        //    BP        IP   CS          BP   CS   IP
-        //   4677      53B5 F7D0        7746 D0F7 B553
-        //
-        // 32bit programs have:
-        //   EBP:EIP
-        // and you'd have something like this (with SP added) (not
-        // accurate values)
-        //
-        //         in dump               swapped
-        //      EBP       EIP         EBP       EIP
-        //   4677 2900 53B5 F7D0   0029 7746 D0F7 B553
-        //
-        // So the basic difference is that 32bit programs have a 32bit
-        // EBP and we can attempt to determine whether we have a 32bit
-        // EBP by checking to see if its 'selector' is the same as SP.
-        // Note that this technique limits us to checking stacks < 64K.
-        //
-        // Soooo, if IP (which maps into the same USHORT as the swapped
-        // stack page in EBP) doesn't point to the stack (i.e. it could
-        // be a 16bit IP) then see if CS is valid (as is or thunked).
-        //
-        // Note that there's the possibility of a 16bit return address
-        // that has an offset that's the same as SP so we'll think it's
-        // a 32bit return address and won't be able to successfully resolve
-        // its details.
-        if (Ip != Sp)
-        {
-            if (DosSizeSeg(Cs, &Size) == NO_ERROR)
-            {
-                RetAddr = (USHORT * _Seg16) MAKEULONG(Ip, Cs);
-                f32bit = FALSE;
-            }
-            else if (DosSizeSeg((Cs << 3) + 7, &Size) == NO_ERROR)
-            {
-                Cs = (Cs << 3) + 7;
-                RetAddr = (USHORT * _Seg16) MAKEULONG(Ip, Cs);
-                f32bit = FALSE;
-            }
-            else
-                f32bit = TRUE;
-        }
-        else
-            f32bit = TRUE;
-
-
-        // "EBP" column
-        if (fExceptionAddress)
-            fprintf(LogFile, " Trap  ->  ");
-        else
-            fprintf(LogFile, " %8.8lX  ", (ULONG)Ebp);
-
-        // "Address" column
-        if (f32bit)
-            fprintf(LogFile, ":%8.8lX  ", (ULONG)RetAddr);
-        else
-            fprintf(LogFile, "%04.04X:%04.04X  ", Cs, Ip);
-
-        // Version check omitted; the following requires
-        // OS/2 2.10 or later (*UM)
-        // if (Version[0] >= 20 && Version[1] >= 10)
-        {
-            // Make a 'tick' sound to let the user know we're still alive
-            DosBeep(2000, 10);
-
-            Size = 10;    // Inserted by Kim Rasmussen 26/06 1996 to avoid error 87 when Size is 0
-
-            // "Module"/"Object" columns
-            rc = DosQueryMem((PVOID) RetAddr, &Size, &Attr);
-            if (rc != NO_ERROR || !(Attr & PAG_COMMIT))
-            {
-                fprintf(LogFile, "Invalid RetAddr: %8.8lX\n", (ULONG)RetAddr);
-                break;          // avoid infinite loops
-            }
-            else
-            {
-                rc = DosQueryModFromEIP(&hMod,
-                                        &ObjNum,
-                                        sizeof(Name), Name,
-                                        &Offset,
-                                        (PVOID)RetAddr);
-                if (    (rc == NO_ERROR)
-                     // && (ObjNum != -1)
-                   )
-                {
-                    // static char     szJunk[_MAX_FNAME];
-                    static char     szName[_MAX_FNAME];
-
-                    DosQueryModuleName(hMod, sizeof(Name), Name);
-                    // _splitpath(Name, szJunk, szJunk, szName, szJunk);
-
-                    // print module and object
-                    fprintf(LogFile, "%-8s %04lX  ", szName, ObjNum + 1);
-
-                    if (strlen(Name) > 3)
-                    {
-                        dbgPrintStackFrame(LogFile,
-                                           Name,
-                                           ObjNum,
-                                           Offset);
-                    }
-                }
-                else
-                    fprintf(LogFile,
-                            "DosQueryModFromEIP failed, returned %lu\n",
-                            rc);
-            }
-        }
-
-        if (    ((*Ebp) == 0)
-             && ((*Ebp + 1) == 0)
-           )
-        {
-            fprintf(LogFile, "End of call stack\n");
-            break;
-        }
-
-        if (!fExceptionAddress)
-        {
-            LastEbp = Ebp;
-
-            if (f32bit)
-                Ebp = (PUSHORT) *(PULONG) LastEbp;
-            else
-                Ebp = (PUSHORT) MAKEULONG((*Ebp), Sp);
-
-            if (f32bit)
-            {
-                dbgPrintVariables(LogFile, (ULONG) Ebp);
-            }                   // endif
-
-            if (Ebp < LastEbp)
-            {
-                fprintf(LogFile, "... lost stack chain - new EBP below previous\n");
-                break;
-            }
-        }
-        else
-            fExceptionAddress = FALSE;
-
-        Size = 4;
-        rc = DosQueryMem((PVOID) Ebp, &Size, &Attr);
-        if ((rc != NO_ERROR) || (Size < 4))
-        {
-            fprintf(LogFile, "... lost stack chain - invalid EBP: %8.8lX\n", (ULONG)Ebp);
-            break;
-        }
-    } while (TRUE);
-
-    fprintf(LogFile, "\n");
-}
-
-/*
- *@@ doshQueryBootDrive:
- *      returns the letter of the boot drive as a
- *      single (capital) character, which is useful for
- *      constructing file names using sprintf and such.
- *
- *@@changed V0.9.16 (2002-01-13) [umoeller]: optimized
- */
-
-CHAR doshQueryBootDrive(VOID)
-{
-    // this can never change, so query this only once
-    // V0.9.16 (2002-01-13) [umoeller]
-    static CHAR     cBootDrive = '\0';
-
-    if (!cBootDrive)
-    {
-        ULONG ulBootDrive;
-        DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE,
-                        &ulBootDrive,
-                        sizeof(ulBootDrive));
-        cBootDrive = (CHAR)ulBootDrive + 'A' - 1;
-    }
-
-    return (cBootDrive);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/diagnose.c b/sal/osl/os2/diagnose.c
deleted file mode 100644
index 6853ac9ad..000000000
--- a/sal/osl/os2/diagnose.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "system.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include <osl/diagnose.h>
-#include <osl/thread.h>
-
-#include "printtrace.h"
-
-BYTE oslTraceEnv[] = "OSL_TRACE_TO_FILE";
-
-typedef pfunc_osl_printDebugMessage oslDebugMessageFunc;
-static oslDebugMessageFunc volatile g_pDebugMessageFunc = 0;
-
-typedef pfunc_osl_printDetailedDebugMessage oslDetailedDebugMessageFunc;
-static oslDetailedDebugMessageFunc volatile g_pDetailedDebugMessageFunc = 0;
-
-/*----------------------------------------------------------------------------*/
-
-void SAL_CALL osl_breakDebug()
-{
-    __asm__("int $3\n");
-}
-
-/************************************************************************/
-/* osl_trace */
-/************************************************************************/
-void osl_trace(char const * pszFormat, ...) {
-    va_list args;
-    va_start(args, pszFormat);
-    printTrace(0, pszFormat, args); /* TODO: pid */
-    va_end(args);
-}
-
-/*----------------------------------------------------------------------------*/
-
-void SAL_CALL osl_trace__yd_os2(const sal_Char* lpszFormat, ...)
-{
-
-    int     nBuf;
-    sal_Char    szBuffer[512];
-    sal_Char    szPID[ 12 ];
-    va_list args;
-    FILE*   pFile;
-    PID     pid;
-    PSZ     pszOslTraceFile;
-
-    /* if environment variable not set, do nothing */
-    if(DosScanEnv(oslTraceEnv, (PSZ*)&pszOslTraceFile))
-    {
-        return;
-    }
-    
-    va_start(args, lpszFormat);
-
-    nBuf = vsprintf(szBuffer, lpszFormat, args);
-    OSL_ASSERT(nBuf < sizeof(szBuffer));
-
-    va_end(args);
-
-    /* get process ID */
-    {
-    PTIB pptib = NULL;
-    PPIB pppib = NULL;
-
-    DosGetInfoBlocks( &pptib, &pppib );
-    pid = pppib->pib_ulpid;
-    }
-
-    pFile = fopen( (const char*)pszOslTraceFile, "a+" );
-    fputs(_itoa( pid, szPID, 10 ), pFile );
-    fputs( ": ", pFile );
-    fputs(szBuffer, pFile);
-    fclose( pFile );
-
-}
-
-/*----------------------------------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_assertFailedLine( const sal_Char* pszFileName, sal_Int32 nLine, const sal_Char* pszMessage)
-{
-    sal_Char szMessage[512];
-
-    /* get app name or NULL if unknown (don't call assert) */
-    sal_Char* lpszAppName = "OSL";
-
-    /* format message into buffer */
-    sprintf(szMessage, "Assertion Failed: %s: File %s, Line %d:\n",
-            lpszAppName, pszFileName, nLine);
-    if(pszMessage != 0)
-        strcat( szMessage, pszMessage );
-
-    szMessage[sizeof(szMessage)-1] = '\0';
-
-    fputs(szMessage, stderr);
-
-    char const * env = getenv( "SAL_DIAGNOSE_ABORT" );
-    return ( ( env != NULL ) && ( *env != '\0' ) );
-}
-
-/*----------------------------------------------------------------------------*/
-
-sal_Int32 SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszMessage)
-{
-    fputs(pszMessage, stderr);
-
-    return 0;
-}
-
-/*----------------------------------------------------------------------------*/
-
-
-/************************************************************************/
-/* osl_setDebugMessageFunc */
-/************************************************************************/
-oslDebugMessageFunc SAL_CALL osl_setDebugMessageFunc (
-    oslDebugMessageFunc pNewFunc)
-{
-    oslDebugMessageFunc pOldFunc = g_pDebugMessageFunc;
-    g_pDebugMessageFunc = pNewFunc;
-    return pOldFunc;
-}
-
-/************************************************************************/
-/* osl_setDetailedDebugMessageFunc */
-/************************************************************************/
-pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc (
-    pfunc_osl_printDetailedDebugMessage pNewFunc)
-{
-    oslDetailedDebugMessageFunc pOldFunc = g_pDetailedDebugMessageFunc;
-    g_pDetailedDebugMessageFunc = pNewFunc;
-    return pOldFunc;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/dllentry.c b/sal/osl/os2/dllentry.c
deleted file mode 100644
index 8375c35ba..000000000
--- a/sal/osl/os2/dllentry.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-#include "sockimpl.h"
-#include "secimpl.h"
-
-#include <osl/diagnose.h>
-
-#ifndef GCC
-sal_uInt32 _System _DLL_InitTerm( sal_uInt32 nModule,
-                                     sal_uInt32 nFlag )
-{
-    switch( nFlag )
-    {
-        case 0:
-        {
-            /* initialize C runtime library */
-            _CRT_init();
-            {
-                LONG fhToAdd = 0;
-                ULONG fhOld = 0;
-                ULONG ngLastError = DosSetRelMaxFH(&fhToAdd, &fhOld);
-                if (fhOld < 200)
-                    ngLastError = DosSetMaxFH(200);
-            }
-
-            /* turn off hardware-errors and exception popups */
-            DosError(FERR_DISABLEHARDERR | FERR_DISABLEEXCEPTION);
-
-            break;
-        }
-
-        case 1:
-        {
-            /* unload libs (sockets) */
-            ImplFreeTCPIP();
-
-            /* unload libs (security) */
-            ImplFreeUPM();
-
-            break;
-        }
-    }
-
-    return (sal_True);
-}
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/except.c b/sal/osl/os2/except.c
deleted file mode 100644
index 5683aa21c..000000000
--- a/sal/osl/os2/except.c
+++ /dev/null
@@ -1,1061 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *@@sourcefile except.c:
- *      this file contains powerful exception handlers.
- *      except.h also defines easy-to-use macros for them.
- *
- *      Usage: All OS/2 programs, PM or text mode.
- *
- *      <B>Introduction</B>
- *
- *      OS/2 exception handlers are a mess to program and,
- *      if installed wrongly, almost impossible to debug.
- *      The problem is that for any program that does a bit
- *      more than showing a message box, using exception
- *      handlers is a must to avoid system hangs. This
- *      especially applies to multi-thread programs using
- *      mutex semaphores (more on that below). The functions
- *      and macros in here are designed to make that more
- *      simple.
- *
- *      The macros in except.h automatically insert code for
- *      properly registering and deregistering the handlers
- *      in except.c. You should ALWAYS use these macros
- *      instead  of directly registering the handlers to avoid
- *      accidentally  forgetting to deregister them. If you
- *      forget to deregister an exception handler, this can
- *      lead to really strange errors (crashes, hangs) which
- *      are nearly impossible to debug because the thread's
- *      stack probably got completely messed up.
- *
- *      The general idea of these macros is to define
- *      TRY / CATCH blocks similar to C++. If an exception
- *      occurs in the TRY block, execution is transferred to
- *      the CATCH block. (This works in both C and C++, by the
- *      way.)
- *
- *      The "OnKill" function that was added with V0.9.0 has
- *      been removed again with V0.9.7.
- *
- *      The general usage is like this:
- *
- +          int your_protected_func(int ...)
- +          {
- +              TRY_LOUD(excptid)         // or: TRY_QUIET(excptid)
- +              {
- +                  char *p = NULL;
- +
- +                  ....        // the stuff in here is protected by
- +                              // the excHandlerLoud or excHandlerQuiet
- +                              // exception handler
- +                  *p = "A";
- +              }
- +              CATCH(excptid)
- +              {
- +                  ....        // exception occurred: react here
- +              } END_CATCH();  // always needed!
- +          } // end of your_func
- *
- *      TRY_LOUD  is for installing excHandlerLoud.
- *      TRY_QUIET is for installing excHandlerQuiet.
- *      CATCH / END_CATCH are the same for the two. This
- *      is where the exception handler jumps to if an
- *      exception occurs.
- *      The CATCH block is _required_ even if you do nothing
- *      in there, because the CATCH() macro will deregister
- *      the handler.
- *
- *      "excptid" can be any C identifier which is not used in
- *      your current variable scope, e.g. "excpt1". This
- *      is used for creating an EXCEPTSTRUCT variable of
- *      that name on the stack. The "excptid"'s in TRY_* and
- *      CATCH must match, since this is where the macros
- *      store the exception handler data.
- *
- *      These macros may be nested if you use different
- *      "excptid"'s for sub-macros.
- *
- *      Inside the TRY and CATCH blocks, you must not use
- *      "goto" (to a location outside the block) or "return",
- *      because this will not deregister the handler.
- *
- *      Keep in mind that all the code in the TRY_* block is
- *      protected by the handler, including all functions that
- *      get called. So if you enclose your main() code in a
- *      TRY_* block, your entire application is protected.
- *      If any subfunction fails, execution is transferred to
- *      the closest CATCH() that was installed (as with C++
- *      try and catch).
- *
- *      <B>Asynchronous exceptions</B>
- *
- *      The exception handlers in this file (which are installed
- *      with the TRY/CATCH mechanism) only intercept synchronous
- *      exceptions, most importantly, XCPT_ACCESS_VIOLATION (see
- *      excHandlerLoud for a list). They do not protect your code
- *      against asynchronous exceptions.
- *
- *      OS/2 defines asynchronous exceptions to be those that
- *      can be delayed. With OS/2, there are only three of these:
- *
- *      -- XCPT_PROCESS_TERMINATE
- *      -- XCPT_ASYNC_PROCESS_TERMINATE
- *      -- XCPT_SIGNAL (thread 1 only)
- *
- *      To protect yourself against these also, put the section
- *      in question in a DosEnterMustComplete/DosExitMustComplete
- *      block as well.
- *
- *      <B>Mutex semaphores</B>
- *
- *      The problem with OS/2 mutex semaphores is that they are
- *      sometimes not automatically released when a thread terminates.
- *      If there are several mutexes involved and they are released
- *      in improper order, you can get zombie threads on exit.
- *      Even worse, if this happens to a PM thread, this will hang
- *      the system.
- *
- *      As a result, you should protect any section of code which
- *      requests a semaphore with the exception handlers.
- *
- *      So _whenever_ you request a mutex semaphore, enclose
- *      the block with TRY/CATCH in case the code crashes.
- *      Besides, enclose the TRY/CATCH block in a must-complete
- *      section, like this:
- *
- +          HMTX hmtx = ...
- +
- +          int your_func(int)
- +          {
- +              BOOL    fSemOwned = FALSE;
- +
- +              TRY_QUIET(excpt1)           // or TRY_LOUD
- +              {
- +                  if (fSemOwned = !DosRequestMutexSem(hmtx, ...))
- +                  {       ... // work on your protected data
- +                  }
- +                  // mutex gets released below
- +              }
- +              CATCH(excpt1) { } END_CATCH();    // always needed!
- +
- +              if (fSemOwned)
- +                  // this gets executed always, even if an exception occurred
- +                  DosReleaseMutexSem(hmtx);
- +          } // end of your_func
- *
- *      This way your mutex semaphore gets released in every
- *      possible condition.
- *
- *      <B>Customizing</B>
- *
- *      As opposed to versions before 0.9.0, this code is now
- *      completely independent of XWorkplace. This file now
- *      contains "pure" exception handlers only.
- *
- *      However, you can customize these exception handlers by
- *      calling excRegisterHooks. This is what XWorkplace does now.
- *      This should be done upon initialization of your application.
- *      If excRegisterHooks is not called, the following safe
- *      defaults are used:
- *
- *          --  the trap log file is TRAP.LOG in the root
- *              directory of your boot drive.
- *
- *      For details on the provided exception handlers, refer
- *      to excHandlerLoud and excHandlerQuiet.
- *
- *      More useful debug information can be found in the "OS/2 Debugging
- *      Handbook", which is now available in INF format on the IBM
- *      DevCon site ("http://service2.boulder.ibm.com/devcon/").
- *      This book shows worked examples of how to unwind a stack dump.
- *
- *      This file incorporates code from the following:
- *      -- Monte Copeland, IBM Boca Ration, Florida, USA (1993)
- *      -- Roman Stangl, from the Program Commander/2 sources
- *         (1997-98)
- *      -- Marc Fiammante, John Currier, Kim Rasmussen,
- *         Anthony Cruise (EXCEPT3.ZIP package for a generic
- *         exception handling DLL, available at Hobbes).
- *
- *      If not explicitly stated otherwise, the code has been written
- *      by me, Ulrich M�ller.
- *
- *      Note: Version numbering in this file relates to XWorkplace version
- *            numbering.
- *
- *@@header "helpers\except.h"
- */
-
-/*
- *      This file Copyright (C) 1992-99 Ulrich M�ller,
- *                                      Monte Copeland,
- *                                      Roman Stangl,
- *                                      Kim Rasmussen,
- *                                      Marc Fiammante,
- *                                      John Currier,
- *                                      Anthony Cruise.
- *      This file is part of the "XWorkplace helpers" source package.
- *
- *      2009-06-15 published under LGPL3 with Ulrich M�ller permission.
- *
- */
-
-#define OS2EMX_PLAIN_CHAR
-    // this is needed for "os2emx.h"; if this is defined,
-    // emx will define PSZ as _signed_ char, otherwise
-    // as unsigned char
-
-#define INCL_DOSMODULEMGR
-#define INCL_DOSEXCEPTIONS
-#define INCL_DOSPROCESS
-#define INCL_DOSMISC
-#define INCL_DOSERRORS
-#include <os2.h>
-
-// C library headers
-#include <stdio.h>              // needed for except.h
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-#include <setjmp.h>             // needed for except.h
-#include <assert.h>             // needed for except.h
-
-#define DONT_REPLACE_MALLOC
-#include "helpers\setup.h"                      // code generation and debugging options
-
-// headers in /helpers
-#include "helpers\dosh.h"               // Control Program helper routines
-#include "helpers\except.h"             // exception handling
-#include "helpers\debug.h"              // symbol/debug code analysis
-
-#pragma hdrstop
-
-/* ******************************************************************
- *
- *   Global variables
- *
- ********************************************************************/
-
-// hooks to be registered using excRegisterHooks
-PFNEXCOPENFILE  G_pfnExcOpenFile = 0;
-PFNEXCHOOK      G_pfnExcHook = 0;
-PFNEXCHOOKERROR G_pfnExcHookError = 0;
-// beep flag for excHandlerLoud
-BOOL            G_fBeepOnException = TRUE;
-
-ULONG           G_ulExplainExceptionRunning = 0;
-    // global flag which is != 0 if some exception handler
-    // is inside excExplainException, so that XShutdown can
-    // wait until the trap log is done;
-    // this is exported thru except.h
-    // V0.9.13 (2001-06-19) [umoeller]
-
-/*
- *@@category: Helpers\Control program helpers\Exceptions/debugging
- *      See except.c.
- */
-
-/* ******************************************************************
- *
- *   Exception helper routines
- *
- ********************************************************************/
-
-/*
- *@@ excDescribePage:
- *
- */
-
-VOID excDescribePage(FILE *file, ULONG ulCheck)
-{
-    APIRET arc;
-    ULONG ulCountPages = 1;
-    ULONG ulFlagsPage = 0;
-    arc = DosQueryMem((PVOID)ulCheck, &ulCountPages, &ulFlagsPage);
-
-    if (arc == NO_ERROR)
-    {
-        fprintf(file, "valid, flags: ");
-        if (ulFlagsPage & PAG_READ)
-            fprintf(file, "read ");
-        if (ulFlagsPage & PAG_WRITE)
-            fprintf(file, "write ");
-        if (ulFlagsPage & PAG_EXECUTE)
-            fprintf(file, "execute ");
-        if (ulFlagsPage & PAG_GUARD)
-            fprintf(file, "guard ");
-        if (ulFlagsPage & PAG_COMMIT)
-            fprintf(file, "committed ");
-        if (ulFlagsPage & PAG_SHARED)
-            fprintf(file, "shared ");
-        if (ulFlagsPage & PAG_FREE)
-            fprintf(file, "free ");
-        if (ulFlagsPage & PAG_BASE)
-            fprintf(file, "base ");
-    }
-    else if (arc == ERROR_INVALID_ADDRESS)
-        fprintf(file, "invalid");
-}
-
-/*
- *@@ excPrintStackFrame:
- *      wrapper for dbgPrintStackFrame to format
- *      output stuff right.
- *
- *@@added V0.9.2 (2000-03-10) [umoeller]
- *@@changed V0.9.12 (2001-05-12) [umoeller]: added seg:ofs to output always
- */
-
-VOID excPrintStackFrame(FILE *file,         // in: output log file
-                        PSZ pszDescription, // in: description for stack frame (should be eight chars)
-                        ULONG ulAddress)    // in: address to debug
-{
-    APIRET  arc = NO_ERROR;
-    HMODULE hmod1 = NULLHANDLE;
-    CHAR    szMod1[2*CCHMAXPATH] = "unknown";
-    ULONG   ulObject = 0,
-            ulOffset = 0;
-    fprintf(file,
-            "    %-8s: %08lX ",
-            pszDescription,
-            ulAddress);
-    arc = DosQueryModFromEIP(&hmod1,
-                             &ulObject,
-                             sizeof(szMod1), szMod1,
-                             &ulOffset,
-                             ulAddress);
-
-    if (arc != NO_ERROR)
-    {
-        // error:
-        fprintf(file,
-                " %-8s Error: DosQueryModFromEIP returned %lu\n",
-                szMod1,
-                arc);
-    }
-    else
-    {
-        CHAR szFullName[2*CCHMAXPATH];
-
-        fprintf(file,
-                " %-8s %02lX:%08lX\n                                 ",
-                szMod1,
-                ulObject + 1,       // V0.9.12 (2001-05-12) [umoeller]
-                ulOffset);          // V0.9.12 (2001-05-12) [umoeller]
-
-        DosQueryModuleName(hmod1, sizeof(szFullName), szFullName);
-        dbgPrintStackFrame(file,
-                           szFullName,
-                           ulObject,
-                           ulOffset);
-
-        fprintf(file, "\n");
-
-        // make a 'tick' sound to let the user know we're still alive
-        DosBeep(2000, 10);
-    }
-}
-
-/*
- *@@ excDumpStackFrames:
- *      called from excExplainException to dump the
- *      thread's stack frames. This calls excPrintStackFrame
- *      for each stack frame found.
- *
- *@@added V0.9.4 (2000-06-15) [umoeller]
- */
-
-VOID excDumpStackFrames(FILE *file,                   // in: logfile from fopen()
-                        PTIB ptib,
-                        PCONTEXTRECORD pContextRec)   // in: excpt info
-{
-    PULONG pulStackWord = 0;
-
-    fprintf(file, "\n\nStack frames:\n              Address   Module   seg:ofs\n");
-
-    // first the trapping address itself
-    excPrintStackFrame(file,
-                       "CS:EIP  ",
-                       pContextRec->ctx_RegEip);
-
-
-    pulStackWord = (PULONG)pContextRec->ctx_RegEbp;
-    /* if (pContextRec->ctx_RegEbp < pContextRec->ctx_RegEsp)
-        pulStackWord = (PULONG)(pContextRec->ctx_RegEbp & 0xFFFFFFF0);
-    else
-        pulStackWord = (PULONG)(pContextRec->ctx_RegEsp & 0xFFFFFFF0); */
-
-    while (    (pulStackWord != 0)
-            && (pulStackWord < (PULONG)ptib->tib_pstacklimit)
-          )
-    {
-        CHAR szAddress[20];
-
-        if (((ULONG)pulStackWord & 0x00000FFF) == 0x00000000)
-        {
-            // we're on a page boundary: check access
-            ULONG ulCountPages = 0x1000;
-            ULONG ulFlagsPage = 0;
-            APIRET arc = DosQueryMem((void *)pulStackWord,
-                                     &ulCountPages,
-                                     &ulFlagsPage);
-            if (    (arc != NO_ERROR)
-                 || (   (arc == NO_ERROR)
-                      && ( !( ((ulFlagsPage & (PAG_COMMIT|PAG_READ))
-                               == (PAG_COMMIT|PAG_READ)
-                              )
-                            )
-                         )
-                    )
-               )
-            {
-                fprintf(file, "\n    %08lX: ", (ULONG)pulStackWord);
-                fprintf(file, "Page inaccessible");
-                pulStackWord += 0x1000;
-                continue; // for
-            }
-        }
-
-        sprintf(szAddress, "%08lX",
-                (ULONG)pulStackWord);
-        excPrintStackFrame(file,
-                           szAddress,
-                           *(pulStackWord+1));
-        pulStackWord = (PULONG)*(pulStackWord);
-
-        if (pulStackWord == 0)
-            fprintf(file, "\n    pulStackWord == 0");
-        else if (pulStackWord >= (PULONG)ptib->tib_pstacklimit)
-            fprintf(file, "\n    pulStackWord >= (PULONG)ptib->tib_pstacklimit");
-    } // end while
-}
-
-/*
- *@@ excExplainException:
- *      used by the exception handlers below to write
- *      LOTS of information about the exception into a logfile.
- *
- *      This calls excPrintStackFrame for each stack frame.
- *
- *@@changed V0.9.0 [umoeller]: added support for application hook
- *@@changed V0.9.0 (99-11-02) [umoeller]: added TID to dump
- *@@changed V0.9.2 (2000-03-10) [umoeller]: now using excPrintStackFrame
- *@@changed V0.9.3 (2000-05-03) [umoeller]: fixed crashes
- *@@changed V0.9.6 (2000-11-06) [umoeller]: added more register dumps
- *@@changed V0.9.13 (2001-06-19) [umoeller]: added global flag for whether this is running
- *@@changed V0.9.16 (2001-11-02) [pr]: make object display signed
- *@@changed V0.9.19 (2002-03-28) [umoeller]: added thread ordinal
- */
-
-VOID excExplainException(FILE *file,                   // in: logfile from fopen()
-                         PSZ pszHandlerName,           // in: descriptive string
-                         PEXCEPTIONREPORTRECORD pReportRec, // in: excpt info
-                         PCONTEXTRECORD pContextRec)   // in: excpt info
-{
-    ULONG       aulBuf[3];
-    const char  *pcszVersion = "unknown";
-
-    PTIB        ptib = NULL;
-    PPIB        ppib = NULL;
-    HMODULE     hMod1, hMod2;
-    CHAR        szMod1[CCHMAXPATH] = "unknown",
-                szMod2[CCHMAXPATH] = "unknown";
-    ULONG       ulObjNum,
-                ulOffset;
-    ULONG       ul;
-
-    ULONG       ulOldPriority = 0x0100; // regular, delta 0
-
-    // raise global flag for whether this func is running
-    // V0.9.13 (2001-06-19) [umoeller]
-    G_ulExplainExceptionRunning++;
-
-    // raise this thread's priority, because this
-    // might take some time
-    if (DosGetInfoBlocks(&ptib, &ppib) == NO_ERROR)
-        if (ptib)
-            if (ptib->tib_ptib2)
-            {
-                ulOldPriority = ptib->tib_ptib2->tib2_ulpri;
-                DosSetPriority(PRTYS_THREAD,
-                               PRTYC_REGULAR,
-                               PRTYD_MAXIMUM,
-                               0);     // current thread
-            }
-
-    // make some noise
-#ifndef __NOEXCEPTIONBEEPS__        // V0.9.19 (2002-04-17) [umoeller]
-    if (G_fBeepOnException)
-    {
-        DosBeep( 250, 30);
-        DosBeep( 500, 30);
-        DosBeep(1000, 30);
-        DosBeep(2000, 30);
-        DosBeep(4000, 30);
-        DosBeep(2000, 30);
-        DosBeep(1000, 30);
-        DosBeep( 500, 30);
-        DosBeep( 250, 30);
-    }
-#endif
-
-    // generic exception info
-    DosQuerySysInfo(QSV_VERSION_MAJOR,      // 11
-                    QSV_VERSION_MINOR,      // 12
-                    &aulBuf, sizeof(aulBuf));
-    // Warp 3 is reported as 20.30
-    // Warp 4 is reported as 20.40
-    // Aurora is reported as 20.45
-
-    if (aulBuf[0] == 20)
-    {
-        switch (aulBuf[1])
-        {
-            case 30: pcszVersion = "Warp 3"; break;
-            case 40: pcszVersion = "Warp 4"; break;
-            case 45: pcszVersion = "WSeB kernel"; break;
-        }
-    }
-    fprintf(file,
-            "Running OS/2 version: %u.%u (%s)\n",
-            aulBuf[0],                      // major
-            aulBuf[1],
-            pcszVersion);
-
-
-    // generic exception info
-    fprintf(file,
-            "\n%s:\n    Exception type: %08lX\n    Address:        %08lX\n    Params:         ",
-            pszHandlerName,
-            pReportRec->ExceptionNum,
-            (ULONG)pReportRec->ExceptionAddress);
-    for (ul = 0;  ul < pReportRec->cParameters;  ul++)
-    {
-        fprintf(file, "%08lX  ",
-                pReportRec->ExceptionInfo[ul]);
-    }
-
-    // now explain the exception in a bit more detail;
-    // depending on the exception, pReportRec->ExceptionInfo
-    // contains some useful data
-    switch (pReportRec->ExceptionNum)
-    {
-        case XCPT_ACCESS_VIOLATION:
-            fprintf(file, "\nXCPT_ACCESS_VIOLATION: ");
-            if (pReportRec->ExceptionInfo[0] & XCPT_READ_ACCESS)
-                fprintf(file, "Invalid read access from 0x%04lX:%08lX.\n",
-                        pContextRec->ctx_SegDs, pReportRec->ExceptionInfo[1]);
-            else if (pReportRec->ExceptionInfo[0] & XCPT_WRITE_ACCESS)
-                fprintf(file, "Invalid write access to 0x%04lX:%08lX.\n",
-                        pContextRec->ctx_SegDs, pReportRec->ExceptionInfo[1]);
-            else if (pReportRec->ExceptionInfo[0] & XCPT_SPACE_ACCESS)
-                fprintf(file, "Invalid space access at 0x%04lX.\n",
-                        pReportRec->ExceptionInfo[1]);
-            else if (pReportRec->ExceptionInfo[0] & XCPT_LIMIT_ACCESS)
-                fprintf(file, "Invalid limit access occurred.\n");
-            else if (pReportRec->ExceptionInfo[0] == XCPT_UNKNOWN_ACCESS)
-                fprintf(file, "unknown at 0x%04lX:%08lX\n",
-                            pContextRec->ctx_SegDs, pReportRec->ExceptionInfo[1]);
-            fprintf(file,
-                    "Explanation: An attempt was made to access a memory object which does\n"
-                    "             not belong to the current process. Most probable causes\n"
-                    "             for this are that an invalid pointer was used, there was\n"
-                    "             confusion with administering memory or error conditions \n"
-                    "             were not properly checked for.\n");
-        break;
-
-        case XCPT_INTEGER_DIVIDE_BY_ZERO:
-            fprintf(file, "\nXCPT_INTEGER_DIVIDE_BY_ZERO.\n");
-            fprintf(file,
-                    "Explanation: An attempt was made to divide an integer value by zero,\n"
-                    "             which is not defined.\n");
-        break;
-
-        case XCPT_ILLEGAL_INSTRUCTION:
-            fprintf(file, "\nXCPT_ILLEGAL_INSTRUCTION.\n");
-            fprintf(file,
-                    "Explanation: An attempt was made to execute an instruction that\n"
-                    "             is not defined on this machine's architecture.\n");
-        break;
-
-        case XCPT_PRIVILEGED_INSTRUCTION:
-            fprintf(file, "\nXCPT_PRIVILEGED_INSTRUCTION.\n");
-            fprintf(file,
-                    "Explanation: An attempt was made to execute an instruction that\n"
-                    "             is not permitted in the current machine mode or that\n"
-                    "             the program had no permission to execute.\n");
-        break;
-
-        case XCPT_INTEGER_OVERFLOW:
-            fprintf(file, "\nXCPT_INTEGER_OVERFLOW.\n");
-            fprintf(file,
-                    "Explanation: An integer operation generated a carry-out of the most\n"
-                    "             significant bit. This is a sign of an attempt to store\n"
-                    "             a value which does not fit into an integer variable.\n");
-        break;
-
-        default:
-            fprintf(file, "\nUnknown OS/2 exception number %d.\n", pReportRec->ExceptionNum);
-            fprintf(file, "Look this up in the OS/2 header files.\n");
-        break;
-    }
-
-    // V0.9.16 (2001-11-02) [pr]: We already got this info. above - this overwrites the
-    // original values before the priority change, which is rather confusing.
-    // if (DosGetInfoBlocks(&ptib, &ppib) == NO_ERROR)
-    {
-        /*
-         * process info:
-         *
-         */
-
-        if ((ptib) && (ppib))       // (99-11-01) [umoeller]
-        {
-            if (pContextRec->ContextFlags & CONTEXT_CONTROL)
-            {
-                // get the main module
-                hMod1 = ppib->pib_hmte;
-                DosQueryModuleName(hMod1,
-                                   sizeof(szMod1),
-                                   szMod1);
-
-                // get the trapping module
-                DosQueryModFromEIP(&hMod2,
-                                   &ulObjNum,
-                                   sizeof(szMod2),
-                                   szMod2,
-                                   &ulOffset,
-                                   pContextRec->ctx_RegEip);
-                DosQueryModuleName(hMod2,
-                                   sizeof(szMod2),
-                                   szMod2);
-            }
-
-            fprintf(file,
-                    "\nProcess information:"
-                    "\n    Process ID:      0x%lX"
-                    "\n    Process module:  0x%lX (%s)"
-                    "\n    Trapping module: 0x%lX (%s)"
-                    "\n    Object: %ld\n",  // V0.9.16 (2001-11-02) [pr]: make this display signed
-                    ppib->pib_ulpid,
-                    hMod1, szMod1,
-                    hMod2, szMod2,
-                    ulObjNum);
-
-            fprintf(file,
-                    "\nTrapping thread information:"
-                    "\n    Thread ID:       0x%lX (%lu)"
-                    "\n    Thread slot ID:  0x%lX (%lu)"        // added V0.9.19 (2002-03-28) [umoeller]
-                    "\n    Priority:        0x%lX\n",
-                    ptib->tib_ptib2->tib2_ultid, ptib->tib_ptib2->tib2_ultid,
-                    ptib->tib_ordinal, ptib->tib_ordinal,
-                    ulOldPriority);
-        }
-        else
-            fprintf(file, "\nProcess information was not available.");
-
-        /*
-         *  now call the hook, if one has been defined,
-         *  so that the application can write additional
-         *  information to the traplog (V0.9.0)
-         */
-
-        if (G_pfnExcHook)
-            G_pfnExcHook(file, ptib, ulOldPriority);  // V0.9.16 (2001-12-02) [pr]
-
-        // *** registers
-
-        fprintf(file, "\nRegisters:");
-        if (pContextRec->ContextFlags & CONTEXT_INTEGER)
-        {
-            // DS the following 4 added V0.9.6 (2000-11-06) [umoeller]
-            fprintf(file, "\n    DS  = %08lX  ", pContextRec->ctx_SegDs);
-            excDescribePage(file, pContextRec->ctx_SegDs);
-            // ES
-            fprintf(file, "\n    ES  = %08lX  ", pContextRec->ctx_SegEs);
-            excDescribePage(file, pContextRec->ctx_SegEs);
-            // FS
-            fprintf(file, "\n    FS  = %08lX  ", pContextRec->ctx_SegFs);
-            excDescribePage(file, pContextRec->ctx_SegFs);
-            // GS
-            fprintf(file, "\n    GS  = %08lX  ", pContextRec->ctx_SegGs);
-            excDescribePage(file, pContextRec->ctx_SegGs);
-
-            // EAX
-            fprintf(file, "\n    EAX = %08lX  ", pContextRec->ctx_RegEax);
-            excDescribePage(file, pContextRec->ctx_RegEax);
-            // EBX
-            fprintf(file, "\n    EBX = %08lX  ", pContextRec->ctx_RegEbx);
-            excDescribePage(file, pContextRec->ctx_RegEbx);
-            // ECX
-            fprintf(file, "\n    ECX = %08lX  ", pContextRec->ctx_RegEcx);
-            excDescribePage(file, pContextRec->ctx_RegEcx);
-            // EDX
-            fprintf(file, "\n    EDX = %08lX  ", pContextRec->ctx_RegEdx);
-            excDescribePage(file, pContextRec->ctx_RegEdx);
-            // ESI
-            fprintf(file, "\n    ESI = %08lX  ", pContextRec->ctx_RegEsi);
-            excDescribePage(file, pContextRec->ctx_RegEsi);
-            // EDI
-            fprintf(file, "\n    EDI = %08lX  ", pContextRec->ctx_RegEdi);
-            excDescribePage(file, pContextRec->ctx_RegEdi);
-            fprintf(file, "\n");
-        }
-        else
-            fprintf(file, " not available\n");
-
-        if (pContextRec->ContextFlags & CONTEXT_CONTROL)
-        {
-
-            // *** instruction
-
-            fprintf(file, "Instruction pointer (where exception occurred):\n    CS:EIP = %04lX:%08lX  ",
-                    pContextRec->ctx_SegCs,
-                    pContextRec->ctx_RegEip);
-            excDescribePage(file, pContextRec->ctx_RegEip);
-
-            // *** CPU flags
-
-            fprintf(file, "\n    EFLAGS = %08lX", pContextRec->ctx_EFlags);
-
-            /*
-             * stack:
-             *
-             */
-
-            fprintf(file, "\nStack:\n    Base:         %08lX\n    Limit:        %08lX",
-                   (ULONG)(ptib ? ptib->tib_pstack : 0),
-                   (ULONG)(ptib ? ptib->tib_pstacklimit : 0));
-            fprintf(file, "\n    SS:ESP = %04lX:%08lX  ",
-                    pContextRec->ctx_SegSs,
-                    pContextRec->ctx_RegEsp);
-            excDescribePage(file, pContextRec->ctx_RegEsp);
-
-            fprintf(file, "\n    EBP    =      %08lX  ", pContextRec->ctx_RegEbp);
-            excDescribePage(file, pContextRec->ctx_RegEbp);
-
-            /*
-             * stack dump:
-             */
-
-            if (ptib != 0)
-            {
-                excDumpStackFrames(file, ptib, pContextRec);
-            }
-        }
-    }
-    fprintf(file, "\n");
-
-    // reset old priority
-    DosSetPriority(PRTYS_THREAD,
-                   (ulOldPriority & 0x0F00) >> 8,
-                   (UCHAR)ulOldPriority,
-                   0);     // current thread
-
-    // lower global flag again V0.9.13 (2001-06-19) [umoeller]
-    G_ulExplainExceptionRunning--;
-}
-
-/* ******************************************************************
- *
- *   Exported routines
- *
- ********************************************************************/
-
-/*
- *@@ excRegisterHooks:
- *      this registers hooks which get called for
- *      exception handlers. You can set any of the
- *      hooks to NULL for safe defaults (see top of
- *      except.c for details). You can set none,
- *      one, or both of the hooks, and you can call
- *      this function several times.
- *
- *      Both hooks get called whenever an exception
- *      occurs, so there better be no bugs in these
- *      routines. ;-) They only get called from
- *      within excHandlerLoud (because excHandlerQuiet
- *      writes no trap logs).
- *
- *      The hooks are as follows:
- *
- *      --  pfnExcOpenFileNew gets called to open
- *          the trap log file. This must return a FILE*
- *          pointer from fopen(). If this is not defined,
- *          ?:\TRAP.LOG is used. Use this to specify a
- *          different file and have some notes written
- *          into it before the actual exception info.
- *
- *      --  pfnExcHookNew gets called while the trap log
- *          is being written. At this point,
- *          the following info has been written into
- *          the trap log already:
- *          -- exception type/address block
- *          -- exception explanation
- *          -- process information
- *
- *          _After_ the hook, the exception handler
- *          continues with the "Registers" information
- *          and stack dump/analysis.
- *
- *          Use this hook to write additional application
- *          info into the trap log, such as the state
- *          of your own threads and mutexes.
- *
- *      --  pfnExcHookError gets called when the TRY_* macros
- *          fail to install an exception handler (when
- *          DosSetExceptionHandler fails). I've never seen
- *          this happen.
- *
- *@@added V0.9.0 [umoeller]
- *@@changed V0.9.2 (2000-03-10) [umoeller]: pfnExcHookError added
- */
-
-VOID excRegisterHooks(PFNEXCOPENFILE pfnExcOpenFileNew,
-                      PFNEXCHOOK pfnExcHookNew,
-                      PFNEXCHOOKERROR pfnExcHookError,
-                      BOOL fBeepOnExceptionNew)
-{
-    // adjust the global variables
-    G_pfnExcOpenFile = pfnExcOpenFileNew;
-    G_pfnExcHook = pfnExcHookNew;
-    G_pfnExcHookError = pfnExcHookError;
-    G_fBeepOnException = fBeepOnExceptionNew;
-}
-
-/*
- *@@ excHandlerLoud:
- *      this is the "sophisticated" exception handler;
- *      which gives forth a loud sequence of beeps thru the
- *      speaker, writes a trap log and then returns back
- *      to the thread to continue execution, i.e. the
- *      default OS/2 exception handler will never get
- *      called.
- *
- *      This requires a setjmp() call on
- *      EXCEPTIONREGISTRATIONRECORD2.jmpThread before
- *      being installed. The TRY_LOUD macro will take
- *      care of this for you (see except.c).
- *
- *      This intercepts the following exceptions (see
- *      the OS/2 Control Program Reference for details):
- *
- *      --  XCPT_ACCESS_VIOLATION         (traps 0x0d, 0x0e)
- *      --  XCPT_INTEGER_DIVIDE_BY_ZERO   (trap 0)
- *      --  XCPT_ILLEGAL_INSTRUCTION      (trap 6)
- *      --  XCPT_PRIVILEGED_INSTRUCTION
- *      --  XCPT_INTEGER_OVERFLOW         (trap 4)
- *
- *      For these exceptions, we call the functions in debug.c
- *      to try to find debug code or SYM file information about
- *      what source code corresponds to the error.
- *
- *      See excRegisterHooks for the default setup of this.
- *
- *      Note that to get meaningful debugging information
- *      in this handler's traplog, you need the following:
- *
- *      a)  have a MAP file created at link time (/MAP)
- *
- *      b)  convert the MAP to a SYM file using MAPSYM
- *
- *      c)  put the SYM file in the same directory of
- *          the module (EXE or DLL). This must have the
- *          same filestem as the module.
- *
- *      All other exceptions are passed to the next handler
- *      in the exception handler chain. This might be the
- *      C/C++ compiler handler or the default OS/2 handler,
- *      which will probably terminate the process.
- *
- *@@changed V0.9.0 [umoeller]: added support for thread termination
- *@@changed V0.9.2 (2000-03-10) [umoeller]: switched date format to ISO
- *@@changed V0.9.19 (2002-05-07) [umoeller]: added EXCEPTIONREPORTRECORD info so that catch block can check that
- */
-
-ULONG _System excHandlerLoud(PEXCEPTIONREPORTRECORD pReportRec,
-                             PEXCEPTIONREGISTRATIONRECORD2 pRegRec2,
-                             PCONTEXTRECORD pContextRec,
-                             PVOID pv)
-{
-    /* From the VAC++3 docs:
-     *     "The first thing an exception handler should do is check the
-     *     exception flags. If EH_EXIT_UNWIND is set, meaning
-     *     the thread is ending, the handler tells the operating system
-     *     to pass the exception to the next exception handler. It does the
-     *     same if the EH_UNWINDING flag is set, the flag that indicates
-     *     this exception handler is being removed.
-     *     The EH_NESTED_CALL flag indicates whether the exception
-     *     occurred within an exception handler. If the handler does
-     *     not check this flag, recursive exceptions could occur until
-     *     there is no stack remaining."
-     * So for all these conditions, we exit immediately.
-     */
-
-    if (pReportRec->fHandlerFlags & EH_EXIT_UNWIND)
-       return (XCPT_CONTINUE_SEARCH);
-    if (pReportRec->fHandlerFlags & EH_UNWINDING)
-       return (XCPT_CONTINUE_SEARCH);
-    if (pReportRec->fHandlerFlags & EH_NESTED_CALL)
-       return (XCPT_CONTINUE_SEARCH);
-
-    switch (pReportRec->ExceptionNum)
-    {
-        case XCPT_ACCESS_VIOLATION:
-        case XCPT_INTEGER_DIVIDE_BY_ZERO:
-        case XCPT_ILLEGAL_INSTRUCTION:
-        case XCPT_PRIVILEGED_INSTRUCTION:
-        case XCPT_INVALID_LOCK_SEQUENCE:
-        case XCPT_INTEGER_OVERFLOW:
-        {
-            // "real" exceptions:
-            FILE *file;
-
-            // open traplog file;
-            if (G_pfnExcOpenFile)
-                // hook defined for this: call it
-                file = (*G_pfnExcOpenFile)();
-            else
-            {
-                CHAR szFileName[100];
-                // no hook defined: open some
-                // default traplog file in root directory of
-                // boot drive
-                sprintf(szFileName, "%c:\\trap.log", doshQueryBootDrive());
-                file = fopen(szFileName, "a");
-
-                if (file)
-                {
-                    DATETIME DT;
-                    DosGetDateTime(&DT);
-                    fprintf(file,
-                            "\nTrap message -- Date: %04d-%02d-%02d, Time: %02d:%02d:%02d\n",
-                            DT.year, DT.month, DT.day,
-                            DT.hours, DT.minutes, DT.seconds);
-                    fprintf(file, "------------------------------------------------\n");
-
-                }
-            }
-
-            // write error log
-            excExplainException(file,
-                                "excHandlerLoud",
-                                pReportRec,
-                                pContextRec);
-            fclose(file);
-
-            // copy report rec to user buffer
-            // V0.9.19 (2002-05-07) [umoeller]
-            memcpy(&pRegRec2->err,
-                   pReportRec,
-                   sizeof(EXCEPTIONREPORTRECORD));
-
-            // jump back to failing routine
-            longjmp(pRegRec2->jmpThread, pReportRec->ExceptionNum);
-        break; }
-    }
-
-    // not handled
-    return (XCPT_CONTINUE_SEARCH);
-}
-
-/*
- *@@ excHandlerQuiet:
- *      "quiet" xcpt handler, which simply suppresses exceptions;
- *      this is useful for certain error-prone functions, where
- *      exceptions are likely to appear, for example used by
- *      wpshCheckObject to implement a fail-safe SOM object check.
- *
- *      This does _not_ write an error log and makes _no_ sound.
- *      This simply jumps back to the trapping thread or
- *      calls EXCEPTIONREGISTRATIONRECORD2.pfnOnKill.
- *
- *      Other than that, this behaves like excHandlerLoud.
- *
- *      This is best registered thru the TRY_QUIET macro
- *      (new with V0.84, described in except.c), which
- *      does the necessary setup.
- *
- *@@changed V0.9.0 [umoeller]: added support for thread termination
- *@@changed V0.9.19 (2002-05-07) [umoeller]: added EXCEPTIONREPORTRECORD info so that catch block can check that
- */
-
-ULONG _System excHandlerQuiet(PEXCEPTIONREPORTRECORD pReportRec,
-                              PEXCEPTIONREGISTRATIONRECORD2 pRegRec2,
-                              PCONTEXTRECORD pContextRec,
-                              PVOID pv)
-{
-    if (pReportRec->fHandlerFlags & EH_EXIT_UNWIND)
-       return (XCPT_CONTINUE_SEARCH);
-    if (pReportRec->fHandlerFlags & EH_UNWINDING)
-       return (XCPT_CONTINUE_SEARCH);
-    if (pReportRec->fHandlerFlags & EH_NESTED_CALL)
-       return (XCPT_CONTINUE_SEARCH);
-
-    switch (pReportRec->ExceptionNum)
-    {
-        case XCPT_ACCESS_VIOLATION:
-        case XCPT_INTEGER_DIVIDE_BY_ZERO:
-        case XCPT_ILLEGAL_INSTRUCTION:
-        case XCPT_PRIVILEGED_INSTRUCTION:
-        case XCPT_INVALID_LOCK_SEQUENCE:
-        case XCPT_INTEGER_OVERFLOW:
-            // write excpt explanation only if the
-            // resp. debugging #define is set (setup.h)
-            #ifdef DEBUG_WRITEQUIETEXCPT
-            {
-                FILE *file = excOpenTraplogFile();
-                excExplainException(file,
-                                    "excHandlerQuiet",
-                                    pReportRec,
-                                    pContextRec);
-                fclose(file);
-            }
-            #endif
-
-            // copy report rec to user buffer
-            // V0.9.19 (2002-05-07) [umoeller]
-            memcpy(&pRegRec2->err,
-                   pReportRec,
-                   sizeof(EXCEPTIONREPORTRECORD));
-
-            // jump back to failing routine
-            longjmp(pRegRec2->jmpThread, pReportRec->ExceptionNum);
-        break;
-
-        default:
-             break;
-    }
-
-    return (XCPT_CONTINUE_SEARCH);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx
deleted file mode 100644
index 60a4951db..000000000
--- a/sal/osl/os2/file.cxx
+++ /dev/null
@@ -1,2912 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-/************************************************************************
- *   ToDo
- *
- *   Fix osl_getCanonicalName
- *
- *   - Fix: check for corresponding struct sizes in exported functions
- *   - check size/use of oslDirectory
- *   - check size/use of oslDirectoryItem
- *   - check size/use of oslFileStatus
- *   - check size/use of oslVolumeDeviceHandle
- *   - check size/use of oslVolumeInfo
- *   - check size/use of oslFileHandle
- ***********************************************************************/
-
-#define INCL_DOSDEVIOCTL                        // OS2 device definitions
-
-#include "system.h"
-#include <rtl/alloc.h>
-
-#include "osl/file.hxx"
-
-
-#include <sal/types.h>
-#include <osl/thread.h>
-#include <osl/diagnose.h>
-#include "file_error_transl.h"
-#include <osl/time.h>
-#include <sal/macros.h>
-
-#include "file_url.h"
-
-#include "file_path_helper.hxx"
-#include "uunxapi.hxx"
-
-#include <string.h>
-
-#include <ctype.h>
-
-#include <wchar.h>
-
-#if OSL_DEBUG_LEVEL > 1
-    extern void debug_ustring(rtl_uString*);
-#endif
-
-
-#ifdef DEBUG_OSL_FILE
-#	define PERROR( a, b ) perror( a ); fprintf( stderr, b )
-#else
-#	define PERROR( a, b )
-#endif
-
-extern "C" oslFileHandle osl_createFileHandleFromFD( int fd );
-
-    struct errentry errtable[] = {
-        {  NO_ERROR,			 osl_File_E_None     },  /* 0 */
-        {  ERROR_INVALID_FUNCTION,       osl_File_E_INVAL    },  /* 1 */
-        {  ERROR_FILE_NOT_FOUND,         osl_File_E_NOENT    },  /* 2 */
-        {  ERROR_PATH_NOT_FOUND,         osl_File_E_NOENT    },  /* 3 */
-        {  ERROR_TOO_MANY_OPEN_FILES,    osl_File_E_MFILE    },  /* 4 */
-        {  ERROR_ACCESS_DENIED,          osl_File_E_ACCES    },  /* 5 */
-        {  ERROR_INVALID_HANDLE,         osl_File_E_BADF     },  /* 6 */
-        {  ERROR_ARENA_TRASHED,          osl_File_E_NOMEM    },  /* 7 */
-        {  ERROR_NOT_ENOUGH_MEMORY,      osl_File_E_NOMEM    },  /* 8 */
-        {  ERROR_INVALID_BLOCK,          osl_File_E_NOMEM    },  /* 9 */
-        {  ERROR_BAD_ENVIRONMENT,        osl_File_E_2BIG     },  /* 10 */
-        {  ERROR_BAD_FORMAT,             osl_File_E_NOEXEC   },  /* 11 */
-        {  ERROR_INVALID_ACCESS,         osl_File_E_INVAL    },  /* 12 */
-        {  ERROR_INVALID_DATA,           osl_File_E_INVAL    },  /* 13 */
-        {  ERROR_INVALID_DRIVE,          osl_File_E_NOENT    },  /* 15 */
-        {  ERROR_CURRENT_DIRECTORY,      osl_File_E_ACCES    },  /* 16 */
-        {  ERROR_NOT_SAME_DEVICE,        osl_File_E_XDEV     },  /* 17 */
-        {  ERROR_NO_MORE_FILES,          osl_File_E_NOENT    },  /* 18 */
-        {  ERROR_NOT_READY,              osl_File_E_NOTREADY },  /* 21 */
-        {  ERROR_LOCK_VIOLATION,         osl_File_E_ACCES    },  /* 33 */
-        {  ERROR_BAD_NETPATH,            osl_File_E_NOENT    },  /* 53 */
-        {  ERROR_NETWORK_ACCESS_DENIED,  osl_File_E_ACCES    },  /* 65 */
-        {  ERROR_BAD_NET_NAME,           osl_File_E_NOENT    },  /* 67 */
-        {  ERROR_FILE_EXISTS,            osl_File_E_EXIST    },  /* 80 */
-        {  ERROR_CANNOT_MAKE,            osl_File_E_ACCES    },  /* 82 */
-        {  ERROR_FAIL_I24,               osl_File_E_ACCES    },  /* 83 */
-        {  ERROR_INVALID_PARAMETER,      osl_File_E_INVAL    },  /* 87 */
-        {  ERROR_NO_PROC_SLOTS,          osl_File_E_AGAIN    },  /* 89 */
-        {  ERROR_DRIVE_LOCKED,           osl_File_E_ACCES    },  /* 108 */
-        {  ERROR_BROKEN_PIPE,            osl_File_E_PIPE     },  /* 109 */
-        {  ERROR_DISK_FULL,              osl_File_E_NOSPC    },  /* 112 */
-        {  ERROR_INVALID_TARGET_HANDLE,  osl_File_E_BADF     },  /* 114 */
-        {  ERROR_INVALID_HANDLE,         osl_File_E_INVAL    },  /* 124 */
-        {  ERROR_WAIT_NO_CHILDREN,       osl_File_E_CHILD    },  /* 128 */
-        {  ERROR_CHILD_NOT_COMPLETE,     osl_File_E_CHILD    },  /* 129 */
-        {  ERROR_DIRECT_ACCESS_HANDLE,   osl_File_E_BADF     },  /* 130 */
-        {  ERROR_NEGATIVE_SEEK,          osl_File_E_INVAL    },  /* 131 */
-        {  ERROR_SEEK_ON_DEVICE,         osl_File_E_ACCES    },  /* 132 */
-        {  ERROR_DIR_NOT_EMPTY,          osl_File_E_NOTEMPTY },  /* 145 */
-        {  ERROR_NOT_LOCKED,             osl_File_E_ACCES    },  /* 158 */
-        {  ERROR_BAD_PATHNAME,           osl_File_E_NOENT    },  /* 161 */
-        {  ERROR_MAX_THRDS_REACHED,      osl_File_E_AGAIN    },  /* 164 */
-        {  ERROR_LOCK_FAILED,            osl_File_E_ACCES    },  /* 167 */
-        {  ERROR_ALREADY_EXISTS,         osl_File_E_EXIST    },  /* 183 */
-        {  ERROR_FILENAME_EXCED_RANGE,   osl_File_E_NOENT    },  /* 206 */
-        {  ERROR_NESTING_NOT_ALLOWED,    osl_File_E_AGAIN    },  /* 215 */
-        {  ERROR_DIRECTORY,              osl_File_E_NOENT    },  /* 267 */
-        //{  ERROR_NOT_ENOUGH_QUOTA,       osl_File_E_NOMEM    }    /* 1816 */
-    };
-    
-    //#####################################################
-    oslFileError MapError(APIRET dwError)
-    {        
-        for (int i = 0; i < SAL_N_ELEMENTS(errtable); ++i )
-        {
-            if (dwError == errtable[i].oscode)
-                return static_cast<oslFileError>(errtable[i].errnocode);
-        }
-        return osl_File_E_INVAL;
-    }
-
-/******************************************************************************
- *
- *                  static members
- *
- *****************************************************************************/
-
-static const char * pFileLockEnvVar = (char *) -1;
-
-
-/******************************************************************************
- *
- *                  C-String Function Declarations
- *
- *****************************************************************************/
-
-static oslFileError osl_psz_getVolumeInformation(const sal_Char* , oslVolumeInfo* pInfo, sal_uInt32 uFieldMask);
-static oslFileError osl_psz_removeFile(const sal_Char* pszPath);
-static oslFileError osl_psz_createDirectory(const sal_Char* pszPath);
-static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath);
-static oslFileError osl_psz_copyFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
-static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
-static oslFileError osl_psz_setFileTime(const sal_Char* strFilePath, const TimeValue* pCreationTime, const TimeValue* pLastAccessTime, const TimeValue* pLastWriteTime);
-
-
-/******************************************************************************
- *
- *                  Static Module Utility Function Declarations
- *
- *****************************************************************************/
-
-static oslFileError  oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, mode_t nMode, size_t nSourceSize, int DestFileExists);
-static oslFileError  oslChangeFileModes(const sal_Char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID);
-static int           oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName);
-static int           oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode);
-static oslFileError  oslDoMoveFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
-rtl_uString*  oslMakeUStrFromPsz(const sal_Char* pszStr,rtl_uString** uStr);
-
-/******************************************************************************
- *
- *                  Non-Static Utility Function Declarations
- *
- *****************************************************************************/
-
-extern "C" int UnicodeToText( char *, size_t, const sal_Unicode *, sal_Int32 );
-extern "C" int TextToUnicode(
-    const char* text, size_t text_buffer_size,	sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
-
-/******************************************************************************
- *
- *                  'removeable device' aka floppy functions
- *
- *****************************************************************************/
-
-static oslVolumeDeviceHandle  osl_isFloppyDrive(const sal_Char* pszPath);
-static oslFileError   osl_mountFloppy(oslVolumeDeviceHandle hFloppy);
-static oslFileError   osl_unmountFloppy(oslVolumeDeviceHandle hFloppy);
-
-#ifdef DEBUG_OSL_FILE
-static void           osl_printFloppyHandle(oslVolumeDeviceHandleImpl* hFloppy);
-#endif
-
-/**********************************************
- * _osl_openLocalRoot
- * enumerate available drives
- *********************************************/
-static oslFileError _osl_openLocalRoot( rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
-{
-    rtl_uString		*ustrSystemPath = NULL;
-    oslFileError	error;
-    
-    if ( !pDirectory )
-        return osl_File_E_INVAL;
-
-    *pDirectory = NULL;
-
-    error = osl_getSystemPathFromFileURL_Ex( strDirectoryPath, &ustrSystemPath, sal_False );
-
-    if ( osl_File_E_None == error )
-    {
-        /* create and initialize impl structure */
-        DirectoryImpl* pDirImpl = (DirectoryImpl*) rtl_allocateMemory( sizeof(DirectoryImpl) );
-        if( pDirImpl )
-        {
-            ULONG   ulDriveNum;
-            APIRET  rc;			
-            pDirImpl->uType = DIRECTORYTYPE_LOCALROOT;
-            pDirImpl->ustrPath = ustrSystemPath;
-            rc = DosQueryCurrentDisk (&ulDriveNum, &pDirImpl->ulDriveMap);
-            pDirImpl->pDirStruct = 0;
-            pDirImpl->ulNextDrive = 1;
-            pDirImpl->ulNextDriveMask = 1;
-            
-            // determine number of floppy-drives
-            BYTE nFloppies;
-            rc = DosDevConfig( (void*) &nFloppies, DEVINFO_FLOPPY );
-            if (nFloppies == 0) {
-                // if no floppies, start with 3rd drive (C:)
-                pDirImpl->ulNextDrive = 3;
-                pDirImpl->ulNextDriveMask <<= 2;
-            } else if (nFloppies == 1) {
-                // mask drive B (second bit) in this case
-                pDirImpl->ulDriveMap &= ~0x02;
-            }
-            *pDirectory = (oslDirectory) pDirImpl;
-            return osl_File_E_None;
-        }
-        else
-        {
-            errno = osl_File_E_NOMEM;
-        }
-
-    }
-
-    rtl_uString_release( ustrSystemPath );
-    return error;
-}
-
-/**********************************************
- * _osl_getNextDrive
- *********************************************/
-static oslFileError SAL_CALL _osl_getNextDrive( 
-    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint )
-{
-    DirectoryImpl	*pDirImpl = (DirectoryImpl *)Directory;
-    DirectoryItem_Impl	*pItemImpl = NULL;
-    rtl_uString			* ustrDrive = NULL;
-    BOOL				fSuccess;
-    char				buffer[3];
-
-    uHint = uHint; /* avoid warnings */
-            
-    if ( !pItem )
-        return osl_File_E_INVAL;
-
-    *pItem = NULL;
-
-    if ( !pDirImpl )
-        return osl_File_E_INVAL;
-
-    while( pDirImpl->ulNextDrive <= 26)
-    {
-        // exit if  bit==1 -> drive found
-        if (pDirImpl->ulDriveMap & pDirImpl->ulNextDriveMask) {
-
-            /* convert file name to unicode */
-            buffer[0] = '@' + pDirImpl->ulNextDrive;
-            buffer[1] = ':';
-            buffer[2] = 0;
-
-            pItemImpl = (DirectoryItem_Impl*) rtl_allocateMemory(sizeof(DirectoryItem_Impl));
-            if ( !pItemImpl )
-                return osl_File_E_NOMEM;
-
-            memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-            pItemImpl->uType = DIRECTORYITEM_DRIVE;
-            pItemImpl->nRefCount = 1;
-
-            rtl_string2UString( &pItemImpl->ustrDrive, buffer, 3,
-                osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-            OSL_ASSERT(pItemImpl->ustrDrive != 0);
-
-            /* use drive as directory item */
-            *pItem = (oslDirectoryItem) pItemImpl;
-        }
-        // scan next bit position
-        pDirImpl->ulNextDrive++;
-        pDirImpl->ulNextDriveMask <<= 1;
-        
-        if (*pItem)	// item assigned, return now.
-            return osl_File_E_None;
-    }
-
-    // no more items
-    return osl_File_E_NOENT;
-}
-
-/**********************************************
- * _osl_readdir_impl_
- *
- * readdir wrapper, filters out "." and ".."
- * on request
- *********************************************/
-
-static struct dirent* _osl_readdir_impl_(DIR* pdir, sal_Bool bFilterLocalAndParentDir)
-{
-    struct dirent* pdirent;
-
-    while ((pdirent = readdir(pdir)) != NULL)
-    {
-        if (bFilterLocalAndParentDir &&
-            ((0 == strcmp(pdirent->d_name, ".")) || (0 == strcmp(pdirent->d_name, ".."))))
-            continue;
-        else
-            break;
-    }
-
-    return pdirent;
-}
-
-/*******************************************************************
- *	osl_openDirectory
- ******************************************************************/
-
-oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirectory* pDirectory)
-{
-    rtl_uString* ustrSystemPath = NULL;
-    oslFileError eRet;
-
-    char path[PATH_MAX];
-
-    OSL_ASSERT(ustrDirectoryURL && (ustrDirectoryURL->length > 0));
-    OSL_ASSERT(pDirectory);
-
-    if (0 == ustrDirectoryURL->length )
-        return osl_File_E_INVAL;
-
-    if ( 0 == rtl_ustr_compareIgnoreAsciiCase( ustrDirectoryURL->buffer, (const sal_Unicode*)L"file:///" ) )
-        return _osl_openLocalRoot( ustrDirectoryURL, pDirectory );
-    
-    /* convert file URL to system path */
-    eRet = osl_getSystemPathFromFileURL_Ex(ustrDirectoryURL, &ustrSystemPath, sal_False);
-
-    if( osl_File_E_None != eRet )
-        return eRet;
-
-    osl_systemPathRemoveSeparator(ustrSystemPath);
-
-    /* convert unicode path to text */
-    if ( UnicodeToText( path, PATH_MAX, ustrSystemPath->buffer, ustrSystemPath->length ) )
-    {
-        // if only the drive is specified (x:), add a \ (x:\) otherwise current
-        // directory is browsed instead of root.
-        if (strlen( path) == 2 && path[1] == ':')
-            strcat( path, "\\");
-        /* open directory */
-        DIR *pdir = opendir( path );
-
-        if( pdir )
-        {
-            /* create and initialize impl structure */
-            DirectoryImpl* pDirImpl = (DirectoryImpl*) rtl_allocateMemory( sizeof(DirectoryImpl) );
-
-            if( pDirImpl )
-            {
-                pDirImpl->uType = DIRECTORYTYPE_FILESYSTEM;
-                pDirImpl->pDirStruct = pdir;
-                pDirImpl->ustrPath = ustrSystemPath;
-
-                *pDirectory = (oslDirectory) pDirImpl;
-                return osl_File_E_None;
-            }
-            else
-            {
-                errno = ENOMEM;
-                closedir( pdir );
-            }
-        }
-        else
-            /* should be removed by optimizer in product version */
-            PERROR( "osl_openDirectory", path );
-    }
-
-    rtl_uString_release( ustrSystemPath );
-
-    return oslTranslateFileError(OSL_FET_ERROR, errno);
-}
-
-
-/****************************************************************************
- *	osl_getNextDirectoryItem
- ***************************************************************************/
-
-oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, sal_uInt32 uHint)
-{
-    DirectoryImpl* pDirImpl     = (DirectoryImpl*)Directory;
-    DirectoryItem_Impl	*pItemImpl = NULL;
-    rtl_uString*      ustrFileName = NULL;
-    rtl_uString*      ustrFilePath = NULL;
-    struct dirent*    pEntry;
-
-    OSL_ASSERT(Directory);
-    OSL_ASSERT(pItem);
-
-    if ((NULL == Directory) || (NULL == pItem))
-        return osl_File_E_INVAL;
-
-    if ( pDirImpl->uType == DIRECTORYTYPE_LOCALROOT)
-        return _osl_getNextDrive( Directory, pItem, uHint );
-
-    pEntry = _osl_readdir_impl_(pDirImpl->pDirStruct, sal_True);
-
-    if (NULL == pEntry)
-        return osl_File_E_NOENT;
-
-    pItemImpl = (DirectoryItem_Impl*) rtl_allocateMemory(sizeof(DirectoryItem_Impl));
-    if ( !pItemImpl )
-        return osl_File_E_NOMEM;
-    
-    memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-    pItemImpl->uType = DIRECTORYITEM_FILE;
-    pItemImpl->nRefCount = 1;
-    pItemImpl->d_attr = pEntry->d_attr;
-
-    /* convert file name to unicode */
-    rtl_string2UString( &ustrFileName, pEntry->d_name, strlen( pEntry->d_name ),
-        osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-    OSL_ASSERT(ustrFileName != 0);
-
-    osl_systemPathMakeAbsolutePath(pDirImpl->ustrPath, ustrFileName, &pItemImpl->ustrFilePath);
-    rtl_uString_release( ustrFileName );
-
-    *pItem = (oslDirectoryItem)pItemImpl;
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*	osl_closeDirectory */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_closeDirectory( oslDirectory Directory )
-{
-    DirectoryImpl* pDirImpl = (DirectoryImpl*) Directory;
-    oslFileError err = osl_File_E_None;
-
-    OSL_ASSERT( Directory );
-
-    if( NULL == pDirImpl )
-        return osl_File_E_INVAL;
-
-    switch ( pDirImpl->uType )
-    {
-    case DIRECTORYTYPE_FILESYSTEM:
-        if( closedir( pDirImpl->pDirStruct ) )
-            err = oslTranslateFileError(OSL_FET_ERROR, errno);
-        break;
-    case DIRECTORYTYPE_LOCALROOT:
-        err = osl_File_E_None;
-        break;
-    default:
-        OSL_FAIL( "Invalid directory type" );
-        break;
-    }
-
-    /* cleanup members */
-    rtl_uString_release( pDirImpl->ustrPath );
-
-    rtl_freeMemory( pDirImpl );
-
-    return err;
-}
-
-/****************************************************************************/
-/*	osl_getDirectoryItem */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirectoryItem* pItem )
-{
-    rtl_uString* 	strSysFilePath = NULL;
-    oslFileError 	error      = osl_File_E_INVAL;
-    ULONG			dwPathType;
-    PATHTYPE		type = PATHTYPE_FILE;
-
-    OSL_ASSERT(ustrFileURL);
-    OSL_ASSERT(pItem);
-
-    /* Assume failure */
-    if ( !pItem )
-        return osl_File_E_INVAL;
-    *pItem = NULL;
-
-    if (0 == ustrFileURL->length || NULL == pItem)
-        return osl_File_E_INVAL;
-
-    error = osl_getSystemPathFromFileURL_Ex(ustrFileURL, &strSysFilePath, sal_False);
-
-    if (osl_File_E_None != error)
-        return error;
-
-    dwPathType = IsValidFilePath( strSysFilePath->buffer, NULL, VALIDATEPATH_NORMAL );
-
-    if ( dwPathType & PATHTYPE_IS_VOLUME )
-        type = PATHTYPE_VOLUME;
-    else if ( dwPathType & PATHTYPE_IS_SERVER )
-        type = PATHTYPE_NETSERVER;
-    else
-        type = PATHTYPE_FILE;
-
-    switch ( type )
-    {
-    case PATHTYPE_NETSERVER:
-        {
-            DirectoryItem_Impl*	pItemImpl = 
-                reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-
-            if ( !pItemImpl )
-                error = osl_File_E_NOMEM;
-
-            if ( osl_File_E_None == error )
-            {
-                memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-                pItemImpl->uType = DIRECTORYITEM_SERVER;
-                pItemImpl->nRefCount = 1;
-                rtl_uString_assign( &pItemImpl->ustrFilePath, strSysFilePath );
-
-                *pItem = pItemImpl;
-            }
-        }
-        break;
-    case PATHTYPE_VOLUME:
-        {
-            DirectoryItem_Impl*	pItemImpl = 
-                reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-
-            if ( !pItemImpl )
-                error = osl_File_E_NOMEM;
-
-            if ( osl_File_E_None == error )
-            {
-                memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-                pItemImpl->uType = DIRECTORYITEM_DRIVE;
-                pItemImpl->nRefCount = 1;
-                rtl_uString_assign( &pItemImpl->ustrDrive, strSysFilePath );
-
-                if ( pItemImpl->ustrDrive->buffer[pItemImpl->ustrDrive->length-1] != sal_Unicode('\\') )
-                    rtl_uString_newConcat( &pItemImpl->ustrDrive, 
-                                            pItemImpl->ustrDrive, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\")).pData);
-
-                *pItem = pItemImpl;
-            }
-        }
-        break;
-    default:
-    case PATHTYPE_FILE:
-        {
-            if ( strSysFilePath->length > 0 && strSysFilePath->buffer[strSysFilePath->length - 1] == '\\' )
-                rtl_uString_newFromStr_WithLength( &strSysFilePath, strSysFilePath->buffer, strSysFilePath->length - 1 );
-
-            if (0 == access_u(strSysFilePath, F_OK))
-            {
-                DirectoryItem_Impl	*pItemImpl = 
-                    reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-
-                memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-                pItemImpl->uType = DIRECTORYITEM_FILE;
-                pItemImpl->nRefCount = 1;
-                rtl_uString_assign( &pItemImpl->ustrFilePath, strSysFilePath );
-
-                *pItem = pItemImpl;
-            }
-            else
-                error = oslTranslateFileError(OSL_FET_ERROR, errno);
-        }
-        break;
-    }
-
-    if ( strSysFilePath )
-        rtl_uString_release( strSysFilePath );
-
-    return error;
-}
-
-/****************************************************************************/
-/*	osl_acquireDirectoryItem */
-/****************************************************************************/
-
-oslFileError osl_acquireDirectoryItem( oslDirectoryItem Item )
-{
-    OSL_ASSERT( Item );
-    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    pItemImpl->nRefCount++;
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*	osl_releaseDirectoryItem */
-/****************************************************************************/
-
-oslFileError osl_releaseDirectoryItem( oslDirectoryItem Item )
-{
-    OSL_ASSERT( Item );
-    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    if ( ! --pItemImpl->nRefCount )
-    {
-        if (pItemImpl->ustrFilePath)
-            rtl_uString_release( pItemImpl->ustrFilePath );
-        if (pItemImpl->ustrDrive)
-            rtl_uString_release( pItemImpl->ustrDrive );
-        rtl_freeMemory( pItemImpl );
-    }
-    return osl_File_E_None;
-}
-
-/****************************************************************************
- *	osl_createFileHandleFromFD
- ***************************************************************************/
-
-oslFileHandle osl_createFileHandleFromFD( int fd )
-{
-    oslFileHandleImpl* pHandleImpl = NULL;
-
-    if ( fd >= 0 )
-    {
-        pHandleImpl = (oslFileHandleImpl*) rtl_allocateMemory( sizeof(oslFileHandleImpl) );
-
-        if( pHandleImpl )
-        {
-            pHandleImpl->ustrFilePath = NULL;
-            rtl_uString_new( &pHandleImpl->ustrFilePath );
-            pHandleImpl->fd = fd;
-
-            /* FIXME: should detect whether the file has been locked */
-            pHandleImpl->bLocked = sal_True;
-        }
-    }
-
-    return (oslFileHandle)pHandleImpl;
-}
-
-/****************************************************************************
- *	osl_openFile
- ***************************************************************************/
-
-oslFileError osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal_uInt32 uFlags )
-{
-    oslFileHandleImpl* pHandleImpl = NULL;
-    oslFileError eRet;
-    rtl_uString* ustrFilePath = NULL;
-
-    char buffer[PATH_MAX];
-    int  fd;
-    int  mode  = S_IRUSR | S_IRGRP | S_IROTH;
-    int  flags = O_RDONLY;
-
-    struct flock aflock;
-
-    /* locking the complete file */
-    aflock.l_type = 0;
-    aflock.l_whence = SEEK_SET;
-    aflock.l_start = 0;
-    aflock.l_len = 0;
-
-    OSL_ASSERT( ustrFileURL );
-    OSL_ASSERT( pHandle );
-
-    if( ( 0 == ustrFileURL->length ) )
-        return osl_File_E_INVAL;
-
-    /* convert file URL to system path */
-    eRet = osl_getSystemPathFromFileURL( ustrFileURL, &ustrFilePath );
-
-    if( osl_File_E_None != eRet )
-        return eRet;
-
-    osl_systemPathRemoveSeparator(ustrFilePath);
-
-    /* convert unicode path to text */
-    if( UnicodeToText( buffer, PATH_MAX, ustrFilePath->buffer, ustrFilePath->length ) )
-    {
-        /* we do not open devices or such here */
-        if( !( uFlags & osl_File_OpenFlag_Create ) )
-        {
-            struct stat aFileStat;
-
-            if( 0 > stat( buffer, &aFileStat ) )
-            {
-                PERROR( "osl_openFile", buffer );
-                eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-            }
-
-            else if( !S_ISREG( aFileStat.st_mode ) )
-            {
-                eRet = osl_File_E_INVAL;
-            }
-        }
-
-        if( osl_File_E_None == eRet )
-        {
-            /*
-             * set flags and mode
-             */
-
-            if ( uFlags & osl_File_OpenFlag_Write )
-            {
-                mode |= S_IWUSR | S_IWGRP | S_IWOTH;
-                flags = O_RDWR;
-                aflock.l_type = F_WRLCK;
-            }
-
-            if ( uFlags & osl_File_OpenFlag_Create )
-            {
-                mode |= S_IWUSR | S_IWGRP | S_IWOTH;
-                flags = O_CREAT | O_EXCL | O_RDWR;
-            }
-
-            /* open the file */
-            fd = open( buffer, flags | O_BINARY, mode);
-            if ( fd >= 0 )
-            {
-                sal_Bool bNeedsLock = ( ( uFlags & osl_File_OpenFlag_NoLock ) == 0 );
-                sal_Bool bLocked = sal_False;
-                if( bNeedsLock )
-                {
-                    /* check if file lock is enabled and clear l_type member of flock otherwise */
-                    if( (char *) -1 == pFileLockEnvVar )
-                    {
-                        /* FIXME: this is not MT safe */
-                        pFileLockEnvVar = getenv("SAL_ENABLE_FILE_LOCKING");
-
-                        if( NULL == pFileLockEnvVar)
-                            pFileLockEnvVar = getenv("STAR_ENABLE_FILE_LOCKING");
-                    }
-
-                    if( NULL == pFileLockEnvVar )
-                        aflock.l_type = 0;
-
-                    /* lock the file if flock.l_type is set */
-                    bLocked = ( F_WRLCK != aflock.l_type || -1 != fcntl( fd, F_SETLK, &aflock ) );
-                }
-
-                if ( !bNeedsLock || bLocked )
-                {
-                    /* allocate memory for impl structure */
-                    pHandleImpl = (oslFileHandleImpl*) rtl_allocateMemory( sizeof(oslFileHandleImpl) );
-                    if( pHandleImpl )
-                    {
-                        pHandleImpl->ustrFilePath = ustrFilePath;
-                        pHandleImpl->fd = fd;
-                        pHandleImpl->bLocked = bLocked;
-
-                        *pHandle = (oslFileHandle) pHandleImpl;
-
-                        return osl_File_E_None;
-                    }
-                    else
-                    {
-                        errno = ENOMEM;
-                    }
-                }
-
-                close( fd );
-            }
-
-            PERROR( "osl_openFile", buffer );
-            eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-        }
-    }
-    else
-        eRet = osl_File_E_INVAL;
-
-    rtl_uString_release( ustrFilePath );
-    return eRet;
-}
-
-/****************************************************************************/
-/*	osl_closeFile */
-/****************************************************************************/
-
-oslFileError osl_closeFile( oslFileHandle Handle )
-{
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl *) Handle;
-    oslFileError eRet = osl_File_E_INVAL;
-
-    OSL_ASSERT( Handle );
-
-    if( pHandleImpl )
-    {
-        rtl_uString_release( pHandleImpl->ustrFilePath );
-
-        /* release file lock if locking is enabled */
-        if( pFileLockEnvVar )
-        {
-            struct flock aflock;
-
-            aflock.l_type = F_UNLCK;
-            aflock.l_whence = SEEK_SET;
-            aflock.l_start = 0;
-            aflock.l_len = 0;
-
-            if ( pHandleImpl->bLocked )
-            {
-                /* FIXME: check if file is really locked ?  */
-
-                /* release the file share lock on this file */
-                if( -1 == fcntl( pHandleImpl->fd, F_SETLK, &aflock ) )
-                    PERROR( "osl_closeFile", "unlock failed" );
-            }
-        }
-
-        if( 0 > close( pHandleImpl->fd ) )
-        {
-            eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-        }
-        else
-            eRet = osl_File_E_None;
-
-        rtl_freeMemory( pHandleImpl );
-    }
-
-    return eRet;
-}
-
-/****************************************************************************/
-/*	osl_isEndOfFile */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_isEndOfFile( oslFileHandle Handle, sal_Bool *pIsEOF )
-{
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl *) Handle;
-    oslFileError eRet = osl_File_E_INVAL;
-
-    if ( pHandleImpl)
-    {
-        long curPos = lseek( pHandleImpl->fd, 0, SEEK_CUR );
-
-        if ( curPos >= 0 )
-        {
-            long endPos = lseek( pHandleImpl->fd, 0, SEEK_END  );
-
-            if ( endPos >= 0 )
-            {
-                *pIsEOF = ( curPos == endPos );
-                curPos = lseek( pHandleImpl->fd, curPos, SEEK_SET );
-
-                if ( curPos >= 0 )
-                    eRet = osl_File_E_None;
-                else
-                    eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-            }
-            else
-                eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-        }
-        else
-            eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-    }
-
-    return eRet;
-}
-
-
-/****************************************************************************/
-/*	osl_moveFile */
-/****************************************************************************/
-
-oslFileError osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
-{
-    char srcPath[PATH_MAX];
-    char destPath[PATH_MAX];
-    oslFileError eRet;
-    APIRET rc;
-
-    OSL_ASSERT( ustrFileURL );
-    OSL_ASSERT( ustrDestURL );
-
-    /* convert source url to system path */
-    eRet = FileURLToPath( srcPath, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    /* convert destination url to system path */
-    eRet = FileURLToPath( destPath, PATH_MAX, ustrDestURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    //YD 01/05/06 rename() can overwrite existing files.
-    rc = DosDelete( (PCSZ)destPath);
-    rc = DosMove( (PCSZ)srcPath, (PCSZ)destPath);
-    if (!rc)
-        eRet = osl_File_E_None;
-    else
-        eRet = MapError( rc);
-
-    return eRet;
-}
-
-/****************************************************************************/
-/*	osl_copyFile */
-/****************************************************************************/
-
-#define TMP_DEST_FILE_EXTENSION ".osl-tmp"
-
-static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, mode_t nMode, size_t nSourceSize, int DestFileExists)
-{
-    int      nRet=0;
-    sal_Char pszTmpDestFile[PATH_MAX];
-    size_t   size_tmp_dest_buff = sizeof(pszTmpDestFile);
-
-    /* Quick fix for #106048, the whole copy file function seems
-       to be erroneous anyway and needs to be rewritten.
-       Besides osl_copyFile	is currently not used from OO/SO code.
-    */
-    memset(pszTmpDestFile, 0, size_tmp_dest_buff);
-
-    if ( DestFileExists )
-    {
-        strncpy(pszTmpDestFile, pszDestFileName, size_tmp_dest_buff - 1);
-
-        if ((strlen(pszTmpDestFile) + strlen(TMP_DEST_FILE_EXTENSION)) >= size_tmp_dest_buff)
-            return osl_File_E_NAMETOOLONG;
-
-        strncat(pszTmpDestFile, TMP_DEST_FILE_EXTENSION, strlen(TMP_DEST_FILE_EXTENSION));
-
-        /* FIXME: what if pszTmpDestFile already exists? */
-        /*        with getcanonical??? */
-        nRet=rename(pszDestFileName,pszTmpDestFile);
-    }
-
-    /* mfe: should be S_ISREG */
-    if ( !S_ISLNK(nMode) )
-    {
-        /* copy SourceFile to DestFile */
-        nRet = oslDoCopyFile(pszSourceFileName,pszDestFileName,nSourceSize, nMode);
-    }
-    /* mfe: OK redundant at the moment */
-    else if ( S_ISLNK(nMode) )
-    {
-        nRet = oslDoCopyLink(pszSourceFileName,pszDestFileName);
-    }
-    else
-    {
-        /* mfe: what to do here? */
-        nRet=ENOSYS;
-    }
-
-    if ( nRet > 0 && DestFileExists == 1 )
-    {
-        unlink(pszDestFileName);
-        rename(pszTmpDestFile,pszDestFileName);
-    }
-
-    if ( nRet > 0 )
-    {
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    if ( DestFileExists == 1 )
-    {
-        unlink(pszTmpDestFile);
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * oslChangeFileModes
- ****************************************/
-
-static oslFileError oslChangeFileModes( const sal_Char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID)
-{
-    int nRet=0;
-    struct utimbuf aTimeBuffer;
-
-    nRet = chmod(pszFileName,nMode);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    aTimeBuffer.actime=nAcTime;
-    aTimeBuffer.modtime=nModTime;
-    nRet=utime(pszFileName,&aTimeBuffer);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    if ( nUID != getuid() )
-    {
-        nUID=getuid();
-    }
-
-    nRet=chown(pszFileName,nUID,nGID);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-
-        /* mfe: do not return an error here! */
-        /* return oslTranslateFileError(nRet);*/
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * oslDoCopyLink
- ****************************************/
-
-static int oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName)
-{
-    int nRet=0;
-
-    /* mfe: if dest file is symbolic link remove the link and place the file instead (hro says so) */
-    /* mfe: if source is a link copy the link and not the file it points to (hro says so) */
-    sal_Char pszLinkContent[PATH_MAX];
-
-    pszLinkContent[0] = '\0';
-
-    nRet = readlink(pszSourceFileName,pszLinkContent,PATH_MAX);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return nRet;
-    }
-    else
-        pszLinkContent[ nRet ] = 0;
-
-    nRet = symlink(pszLinkContent,pszDestFileName);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return nRet;
-    }
-
-    return 0;
-}
-
-/*****************************************
- * oslDoCopyFile
- ****************************************/
-
-static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode)
-{    
-    int SourceFileFD=0;
-    int DestFileFD=0;
-    int nRet=0;
-    void* pSourceFile=0;
-    char	buffer[ 4096];
-
-    SourceFileFD=open(pszSourceFileName,O_RDONLY | O_BINARY);
-    if ( SourceFileFD < 0 )
-    {		
-        nRet=errno;
-        return nRet;
-    }
-    
-    DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT | O_BINARY, mode);
-    if ( DestFileFD < 0 )
-    {
-        nRet=errno;
-        close(SourceFileFD);
-        return nRet;
-    }
-
-    /* HACK: because memory mapping fails on various 
-       platforms if the size of the source file is  0 byte */
-    if (0 == nSourceSize)
-    {						
-        close(SourceFileFD);
-        close(DestFileFD);
-        return 0;
-    }
-    
-    while( (nRet = read(SourceFileFD, buffer, sizeof(buffer))) !=0 )
-    {
-        nRet = write( DestFileFD, buffer, nRet);
-    }
-    
-    close(SourceFileFD);
-    close(DestFileFD);
-
-    return nRet;
-}
-
-static oslFileError osl_psz_copyFile( const sal_Char* pszPath, const sal_Char* pszDestPath )
-{
-    time_t nAcTime=0;
-    time_t nModTime=0;
-    uid_t nUID=0;
-    gid_t nGID=0;
-    int nRet=0;
-    mode_t nMode=0;
-    struct stat aFileStat;
-    oslFileError tErr=osl_File_E_invalidError;
-    size_t nSourceSize=0;
-    int DestFileExists=1;
-
-    /* mfe: does the source file really exists? */
-    nRet = lstat(pszPath,&aFileStat);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    /* mfe: we do only copy files here! */
-    if ( S_ISDIR(aFileStat.st_mode) )
-    {
-        return osl_File_E_ISDIR;
-    }
-
-    nSourceSize=(size_t)aFileStat.st_size;
-    nMode=aFileStat.st_mode;
-    nAcTime=aFileStat.st_atime;
-    nModTime=aFileStat.st_mtime;
-    nUID=aFileStat.st_uid;
-    nGID=aFileStat.st_gid;
-
-    nRet = stat(pszDestPath,&aFileStat);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-
-        if ( nRet == ENOENT )
-        {
-            DestFileExists=0;
-        }
-/*        return oslTranslateFileError(nRet);*/
-    }
-
-    /* mfe: the destination file must not be a directory! */
-    if ( nRet == 0 && S_ISDIR(aFileStat.st_mode) )
-    {
-        return osl_File_E_ISDIR;
-    }
-    else
-    {
-        /* mfe: file does not exists or is no dir */
-    }
-
-    tErr = oslDoCopy(pszPath,pszDestPath,nMode,nSourceSize,DestFileExists);
-
-    if ( tErr != osl_File_E_None )
-    {
-        return tErr;
-    }
-
-    /*
-     *   mfe: ignore return code
-     *        since only  the success of the copy is
-     *        important
-     */
-    oslChangeFileModes(pszDestPath,nMode,nAcTime,nModTime,nUID,nGID);
-
-    return tErr;
-}
-
-oslFileError osl_copyFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
-{
-    char srcPath[PATH_MAX];
-    char destPath[PATH_MAX];
-    oslFileError eRet;
-    APIRET rc;
-
-    OSL_ASSERT( ustrFileURL );
-    OSL_ASSERT( ustrDestURL );
-
-    /* convert source url to system path */
-    eRet = FileURLToPath( srcPath, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    /* convert destination url to system path */
-    eRet = FileURLToPath( destPath, PATH_MAX, ustrDestURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    return osl_psz_copyFile( srcPath, destPath );
-}
-
-/****************************************************************************/
-/*	osl_removeFile */
-/****************************************************************************/
-
-oslFileError osl_removeFile( rtl_uString* ustrFileURL )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-    APIRET rc;
-
-    OSL_ASSERT( ustrFileURL );
-
-    /* convert file url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    rc = DosDelete( (PCSZ)path);
-    if (!rc)
-        eRet = osl_File_E_None;
-    else
-        eRet = MapError( rc);
-
-    return eRet;
-}
-
-/****************************************************************************/
-/*	osl_getVolumeInformation */
-/****************************************************************************/
-
-#define TXFSDC_BLOCKR         0x00              // block device removable
-#define TXFSDC_GETBPB         0x00              // get device bpb info
-#define TXFSBPB_REMOVABLE     0x08              // BPB attribute for removable
-
-typedef struct drivecmd
-{
-   BYTE                cmd;                     // 0=unlock 1=lock 2=eject
-   BYTE                drv;                     // 0=A, 1=B 2=C ...
-} DRIVECMD;                                     // end of struct "drivecmd"
-
-#pragma pack(push, 1)                           // byte packing
-typedef struct txfs_ebpb                        // ext. boot parameter block
-{                                               // at offset 0x0b in bootsector
-   USHORT              SectSize;                // 0B bytes per sector
-   BYTE                ClustSize;               // 0D sectors per cluster
-   USHORT              FatOffset;               // 0E sectors to 1st FAT
-   BYTE                NrOfFats;                // 10 nr of FATS     (FAT only)
-   USHORT              RootEntries;             // 11 Max entries \ (FAT only)
-   USHORT              Sectors;                 // 13 nr of sectors if <  64K
-   BYTE                MediaType;               // 15 mediatype (F8 for HD)
-   USHORT              FatSectors;              // 16 sectors/FAT (FAT only)
-   USHORT              LogGeoSect;              // 18 sectors/Track
-   USHORT              LogGeoHead;              // 1a nr of heads
-   ULONG               HiddenSectors;           // 1c sector-offset from MBR/EBR
-   ULONG               BigSectors;              // 20 nr of sectors if >= 64K
-} TXFS_EBPB;                                    // last byte is at offset 0x23
-
-typedef struct drivebpb
-{
-   TXFS_EBPB           ebpb;                    // extended BPB
-   BYTE                reserved[6];
-   USHORT              cyls;
-   BYTE                type;
-   USHORT              attributes;              // device attributes
-   BYTE                fill[6];                 // documented for IOCtl
-} DRIVEBPB;                                     // end of struct "drivebpb"
-
-struct CDInfo {
-    USHORT usCount;
-    USHORT usFirst;
-};
-
-#pragma pack(pop)
-
-/*****************************************************************************/
-// Get number of cdrom readers
-/*****************************************************************************/
-BOOL GetCDInfo( CDInfo * pCDInfo )
-{
-    HFILE hFileCD;
-    ULONG ulAction;
-
-    if( NO_ERROR == DosOpen( (PCSZ)"\\DEV\\CD-ROM2$",
-                            &hFileCD, &ulAction, 0, FILE_NORMAL,
-                            OPEN_ACTION_OPEN_IF_EXISTS,
-                            OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, NULL )) {
-        ULONG  ulDataSize = sizeof(CDInfo);
-        APIRET rc = DosDevIOCtl( hFileCD, 0x82, 0x60, NULL, 0,
-                                 NULL, (PVOID)pCDInfo, ulDataSize, &ulDataSize);
-        DosClose( hFileCD);
-        if(rc == NO_ERROR)
-            return TRUE;
-    }
-    // failed
-    pCDInfo->usFirst = 0;
-    pCDInfo->usCount = 0;
-    return FALSE;
-}
-
-/*****************************************************************************/
-// Determine if unit is a cdrom or not
-/*****************************************************************************/
-BOOL DriveIsCDROM(UINT uiDrive, CDInfo *pCDInfo)
-{
-    return (uiDrive >= pCDInfo->usFirst)
-            && (uiDrive < (pCDInfo->usFirst + pCDInfo->usCount));
-}
-
-/*****************************************************************************/
-// Determine attached fstype, e.g. HPFS for specified drive
-/*****************************************************************************/
-BOOL TxFsType                                   // RET   FS type resolved
-(
-   char               *drive,                   // IN    Drive specification
-   char               *fstype,                  // OUT   Attached FS type
-   char               *details                  // OUT   details (UNC) or NULL
-)
-{
-   BOOL                rc = FALSE;
-   FSQBUFFER2         *fsinfo;                     // Attached FS info
-   ULONG               fsdlen = 2048;              // Fs info data length
-
-   strcpy(fstype, "none");
-   if (details)
-   {
-      strcpy(details, "");
-   }
-   if ((fsinfo = (FSQBUFFER2*)calloc(1, fsdlen)) != NULL)
-   {
-      if (DosQFSAttach((PCSZ)drive, 0, 1, fsinfo, &fsdlen) == NO_ERROR)
-      {
-         strcpy(fstype, (char*) fsinfo->szName + fsinfo->cbName +1);
-         if (details && (fsinfo->cbFSAData != 0))
-         {
-            strcpy( details, (char*) fsinfo->szName + fsinfo->cbName +
-                                              fsinfo->cbFSDName +2);
-         }
-         rc = TRUE;
-      }
-      free(fsinfo);
-   }
-   return (rc);
-}                                               // end 'TxFsType'
-/*---------------------------------------------------------------------------*/
-
-
-/*****************************************************************************/
-// Determine if a driveletter represents a removable medium/device
-/*****************************************************************************/
-BOOL TxFsIsRemovable                            // RET   drive is removable
-(
-   char               *drive                    // IN    Driveletter to test
-)
-{
-   BOOL                rc = FALSE;
-   DRIVECMD            IOCtl;
-   DRIVEBPB            RemAt;
-   ULONG               DataLen;
-   ULONG               ParmLen;
-   BYTE                NoRem;
-
-   DosError( FERR_DISABLEHARDERR);              // avoid 'not ready' popups
-
-   ParmLen   = sizeof(IOCtl);
-   IOCtl.cmd = TXFSDC_BLOCKR;
-   IOCtl.drv = toupper(drive[0]) - 'A';
-   DataLen   = sizeof(NoRem);
-
-   if (DosDevIOCtl((HFILE) -1, IOCTL_DISK,
-                               DSK_BLOCKREMOVABLE,
-                               &IOCtl, ParmLen, &ParmLen,
-                               &NoRem, DataLen, &DataLen) == NO_ERROR)
-   {
-      if (NoRem)                                // non-removable sofar, check
-      {                                         // BPB as well (USB devices)
-         ParmLen   = sizeof(IOCtl);
-         IOCtl.cmd = TXFSDC_GETBPB;
-         IOCtl.drv = toupper(drive[0]) - 'A';
-         DataLen   = sizeof(RemAt);
-
-         if (DosDevIOCtl((HFILE) -1, IOCTL_DISK,
-                                     DSK_GETDEVICEPARAMS,
-                                     &IOCtl, ParmLen, &ParmLen,
-                                     &RemAt, DataLen, &DataLen) == NO_ERROR)
-
-         {
-            if (RemAt.attributes & TXFSBPB_REMOVABLE)
-            {
-               rc = TRUE;                       // removable, probably USB
-            }
-         }
-      }
-      else
-      {
-         rc = TRUE;                             // removable block device
-      }
-   }
-   DosError( FERR_ENABLEHARDERR);               // enable criterror handler
-   return (rc);
-}                                               // end 'TxFsIsRemovable'
-/*---------------------------------------------------------------------------*/
-
-static oslFileError get_drive_type(const char* path, oslVolumeInfo* pInfo)
-{
-    char		Drive_Letter = toupper( *path);
-    char		fstype[ 64];
-
-    pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;		
-
-    // check for floppy A/B
-    BYTE 	nFloppies;
-    APIRET	rc;
-    rc = DosDevConfig( (void*) &nFloppies, DEVINFO_FLOPPY );
-    if ((Drive_Letter - 'A') < nFloppies) {
-        pInfo->uAttributes |= osl_Volume_Attribute_Removeable;
-        pInfo->uAttributes |= osl_Volume_Attribute_FloppyDisk;
-        return osl_File_E_None;    
-    }
-
-    // query system for CD drives
-    CDInfo cdInfo;
-    GetCDInfo(&cdInfo);
-
-    // query if drive is a CDROM
-    if (DriveIsCDROM( Drive_Letter - 'A', &cdInfo))
-        pInfo->uAttributes |= osl_Volume_Attribute_CompactDisc | osl_Volume_Attribute_Removeable;
-
-    if (TxFsIsRemovable( (char*)path))
-        pInfo->uAttributes |= osl_Volume_Attribute_Removeable;
-
-    if (TxFsType( (char*)path, fstype, NULL) == FALSE) {
-        // query failed, assume fixed disk
-        pInfo->uAttributes |= osl_Volume_Attribute_FixedDisk;
-        return osl_File_E_None;    
-    }
-
-    //- Note, connected Win-NT drives use the REAL FS-name like NTFS!
-    if ((strncasecmp( fstype, "LAN", 3) == 0) 			//- OS/2 LAN drives
-        || (strncasecmp( fstype, "NDFS", 4) == 0)  	//- NetDrive
-        || (strncasecmp( fstype, "REMOTE", 5) == 0)  )  //- NT disconnected
-        pInfo->uAttributes |= osl_Volume_Attribute_Remote;
-    else if (strncasecmp( fstype, "RAMFS", 5) == 0)
-        pInfo->uAttributes |= osl_Volume_Attribute_RAMDisk;
-    else if ((strncasecmp( fstype, "CD",  2) == 0)	 	// OS2:CDFS, DOS/WIN:CDROM
-        || (strncasecmp( fstype, "UDF", 3) == 0)   ) 	// OS2:UDF DVD's
-        pInfo->uAttributes |= osl_Volume_Attribute_CompactDisc | osl_Volume_Attribute_Removeable;
-    else
-        pInfo->uAttributes |= osl_Volume_Attribute_FixedDisk;
-
-    return osl_File_E_None;    
-}
-
-//#############################################
-inline bool is_volume_space_info_request(sal_uInt32 field_mask)
-{
-    return (field_mask & 
-            (osl_VolumeInfo_Mask_TotalSpace | 
-             osl_VolumeInfo_Mask_UsedSpace  | 
-             osl_VolumeInfo_Mask_FreeSpace));
-}
-
-//#############################################
-static void get_volume_space_information(const char* path, oslVolumeInfo *pInfo)
-{
-    FSALLOCATE aFSInfoBuf;
-    ULONG nDriveNumber = toupper( *path) - 'A' + 1;
-
-    // disable error popups
-    DosError(FERR_DISABLEHARDERR);
-    APIRET rc = DosQueryFSInfo( nDriveNumber, FSIL_ALLOC,
-                                &aFSInfoBuf, sizeof(aFSInfoBuf) );
-    // enable error popups
-    DosError(FERR_ENABLEHARDERR);
-    if (!rc)
-    {			    			    
-        uint64_t aBytesPerCluster( uint64_t(aFSInfoBuf.cbSector) *
-                                 uint64_t(aFSInfoBuf.cSectorUnit) );
-        pInfo->uFreeSpace = aBytesPerCluster * uint64_t(aFSInfoBuf.cUnitAvail);
-        pInfo->uTotalSpace = aBytesPerCluster * uint64_t(aFSInfoBuf.cUnit);
-        pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace | 
-                               osl_VolumeInfo_Mask_UsedSpace | 
-                               osl_VolumeInfo_Mask_FreeSpace;
-    }
-}
-
-//#############################################
-inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
-{
-    return (field_mask & 
-            (osl_VolumeInfo_Mask_MaxNameLength | 
-             osl_VolumeInfo_Mask_MaxPathLength | 
-             osl_VolumeInfo_Mask_FileSystemName | 
-             osl_VolumeInfo_Mask_FileSystemCaseHandling));
-}
-
-//#############################################
-inline bool is_drivetype_request(sal_uInt32 field_mask)
-{
-    return (field_mask & osl_VolumeInfo_Mask_Attributes);
-}
-
-typedef struct _FSQBUFFER_
-{
-    FSQBUFFER2  aBuf;
-    UCHAR       sBuf[64];
-} FSQBUFFER_;
-
-//#############################################
-static oslFileError get_filesystem_attributes(const char* path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
-{
-    pInfo->uAttributes = 0;
-    
-    oslFileError osl_error = osl_File_E_None;
-    
-    // osl_get_drive_type must be called first because
-    // this function resets osl_VolumeInfo_Mask_Attributes
-    // on failure
-    if (is_drivetype_request(field_mask))
-        osl_error = get_drive_type(path, pInfo);
-            
-    if ((osl_File_E_None == osl_error) && is_filesystem_attributes_request(field_mask))
-    {
-        FSQBUFFER_	aBuf;
-        ULONG       nBufLen;
-        APIRET      nRet;
-
-        nBufLen = sizeof( aBuf );
-        // disable error popups
-        DosError(FERR_DISABLEHARDERR);
-        nRet = DosQueryFSAttach( (PCSZ)path, 0, FSAIL_QUERYNAME, (_FSQBUFFER2*) &aBuf, &nBufLen );
-        if ( !nRet )
-        {
-            char *pType = (char*)(aBuf.aBuf.szName + aBuf.aBuf.cbName + 1);
-            pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxNameLength;
-            pInfo->uMaxNameLength  = _MAX_FNAME;
-        
-            pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxPathLength;
-            pInfo->uMaxPathLength  = _MAX_PATH;
-
-            pInfo->uValidFields   |= osl_VolumeInfo_Mask_FileSystemName;
-            rtl_uString_newFromAscii(&pInfo->ustrFileSystemName, pType);
-
-            // case is preserved always except for FAT
-            if (strcmp( pType, "FAT" ))
-                pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
-                
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
-        }
-        // enable error popups
-        DosError(FERR_ENABLEHARDERR);
-    }
-    return osl_error;
-}
-
-oslFileError SAL_CALL osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask )
-{
-    char volume_root[PATH_MAX];
-    oslFileError error;
-
-    OSL_ASSERT( ustrDirectoryURL );
-    OSL_ASSERT( pInfo );
-
-    /* convert directory url to system path */
-    error = FileURLToPath( volume_root, PATH_MAX, ustrDirectoryURL );
-    if( error != osl_File_E_None )
-        return error;
-
-    if (!pInfo)
-        return osl_File_E_INVAL;
-
-    pInfo->uValidFields = 0;
-    
-    if ((error = get_filesystem_attributes(volume_root, uFieldMask, pInfo)) != osl_File_E_None)
-        return error;
-
-    if (is_volume_space_info_request(uFieldMask)) 
-        get_volume_space_information(volume_root, pInfo);
-
-    if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
-    {
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_DeviceHandle;
-        rtl_uString* uVolumeRoot;
-        rtl_uString_newFromAscii( &uVolumeRoot, volume_root);
-        osl_getFileURLFromSystemPath( uVolumeRoot, (rtl_uString**)&pInfo->pDeviceHandle);
-        rtl_uString_release( uVolumeRoot);
-    }
-
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*	osl_getFileStatus */
-/****************************************************************************/
-static oslFileError _osl_getDriveInfo(
-    oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask)
-{
-    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
-    sal_Unicode			cDrive[3];
-    sal_Unicode			cRoot[4];
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    pStatus->uValidFields = 0;
-
-    cDrive[0] = pItemImpl->ustrDrive->buffer[0];
-    cDrive[1] = (sal_Unicode)':';
-    cDrive[2] = 0;
-    cRoot[0] = pItemImpl->ustrDrive->buffer[0];
-    cRoot[1] = (sal_Unicode)':';
-    cRoot[2] = 0;
-
-    if ( uFieldMask & osl_FileStatus_Mask_FileName )
-    {
-        if ( pItemImpl->ustrDrive->buffer[0] == '\\' &&
-            pItemImpl->ustrDrive->buffer[1] == '\\' )
-        {
-            LPCWSTR	lpFirstBkSlash = wcschr( (const wchar_t*)&pItemImpl->ustrDrive->buffer[2], '\\' );
-
-            if ( lpFirstBkSlash && lpFirstBkSlash[1] )
-            {
-                LPCWSTR	lpLastBkSlash = wcschr( (const wchar_t*)&lpFirstBkSlash[1], '\\' );
-
-                if ( lpLastBkSlash )
-                    rtl_uString_newFromStr_WithLength( &pStatus->ustrFileName, (sal_Unicode*)&lpFirstBkSlash[1], lpLastBkSlash - lpFirstBkSlash - 1 );
-                else
-                    rtl_uString_newFromStr( &pStatus->ustrFileName, (sal_Unicode*)&lpFirstBkSlash[1] );
-                pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-            }
-        }
-        else 
-        {
-            FSINFO	aFSInfoBuf;
-            ULONG   ulFSInfoLevel = FSIL_VOLSER;
-            ULONG   nDriveNumber;
-            char	szFileName[ _MAX_PATH];
-
-            nDriveNumber = toupper(*cDrive) - 'A' + 1;
-            memset( &aFSInfoBuf, 0, sizeof(FSINFO) );
-            // disable error popups
-            DosError(FERR_DISABLEHARDERR);
-            APIRET rc = DosQueryFSInfo( nDriveNumber, ulFSInfoLevel, &aFSInfoBuf, sizeof(FSINFO) );
-            // enable error popups
-            DosError(FERR_ENABLEHARDERR);
-            memset( szFileName, 0, sizeof( szFileName));
-            *szFileName = toupper(*cDrive);
-            strcat( szFileName, ": [");
-            if ( !rc || aFSInfoBuf.vol.cch)
-                strncat( szFileName, aFSInfoBuf.vol.szVolLabel, aFSInfoBuf.vol.cch);
-            strcat( szFileName, "]");
-            rtl_uString_newFromAscii( &pStatus->ustrFileName, szFileName );
-
-            pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-        }
-    }
-
-    pStatus->eType = osl_File_Type_Volume;
-    pStatus->uValidFields |= osl_FileStatus_Mask_Type;
-
-    if ( uFieldMask & osl_FileStatus_Mask_FileURL )
-    {
-        rtl_uString	*ustrSystemPath = NULL;
-
-        rtl_uString_newFromStr( &ustrSystemPath, pItemImpl->ustrDrive->buffer );
-        osl_getFileURLFromSystemPath( ustrSystemPath, &pStatus->ustrFileURL );
-        rtl_uString_release( ustrSystemPath );
-        pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
-    }
-
-    return osl_File_E_None;
-}
-
-oslFileError SAL_CALL osl_getFileStatus( 
-    oslDirectoryItem Item, 
-    oslFileStatus *pStatus, 
-    sal_uInt32 uFieldMask )
-{
-    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
-    struct stat file_stat;
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    if ( pItemImpl->uType == DIRECTORYITEM_DRIVE)
-        return _osl_getDriveInfo( Item, pStatus, uFieldMask );
-
-    osl::lstat(pItemImpl->ustrFilePath, file_stat);
-    if ( uFieldMask & osl_FileStatus_Mask_Validate )
-    {
-        uFieldMask &= ~	osl_FileStatus_Mask_Validate;
-    }
-
-    /* If no fields to retrieve left ignore pStatus */
-    if ( !uFieldMask )
-        return osl_File_E_None;
-
-    /* Otherwise, this must be a valid pointer */
-    if ( !pStatus )
-        return osl_File_E_INVAL;
-
-    if ( pStatus->uStructSize != sizeof(oslFileStatus) )
-        return osl_File_E_INVAL;
-
-    pStatus->uValidFields = 0;
-
-    /* File time stamps */
-
-    if ( (uFieldMask & osl_FileStatus_Mask_ModifyTime))
-    {
-        pStatus->aModifyTime.Seconds  = file_stat.st_mtime;
-        pStatus->aModifyTime.Nanosec  = 0;
-        pStatus->uValidFields |= osl_FileStatus_Mask_ModifyTime;
-    }
-
-    if ( (uFieldMask & osl_FileStatus_Mask_AccessTime))
-    {
-        pStatus->aAccessTime.Seconds  = file_stat.st_atime;
-        pStatus->aAccessTime.Nanosec  = 0;
-        pStatus->uValidFields |= osl_FileStatus_Mask_AccessTime;
-    }
-
-    if ( (uFieldMask & osl_FileStatus_Mask_CreationTime))
-    {
-        pStatus->aAccessTime.Seconds  = file_stat.st_birthtime;
-        pStatus->aAccessTime.Nanosec  = 0;
-        pStatus->uValidFields |= osl_FileStatus_Mask_CreationTime;
-    }
-
-    /* Most of the fields are already set, regardless of requiered fields */
-
-    osl_systemPathGetFileNameOrLastDirectoryPart(pItemImpl->ustrFilePath, &pStatus->ustrFileName);
-    pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-
-    if (S_ISLNK(file_stat.st_mode)) 
-       pStatus->eType = osl_File_Type_Link;              
-    else if (S_ISDIR(file_stat.st_mode))                	   
-       pStatus->eType = osl_File_Type_Directory;       
-    else if (S_ISREG(file_stat.st_mode))       
-       pStatus->eType = osl_File_Type_Regular;
-    else if (S_ISFIFO(file_stat.st_mode)) 
-       pStatus->eType = osl_File_Type_Fifo;      
-    else if (S_ISSOCK(file_stat.st_mode)) 
-       pStatus->eType = osl_File_Type_Socket;       
-    else if (S_ISCHR(file_stat.st_mode) || S_ISBLK(file_stat.st_mode))        
-       pStatus->eType = osl_File_Type_Special;    
-    else 
-       pStatus->eType = osl_File_Type_Unknown;
-        
-    pStatus->uValidFields |= osl_FileStatus_Mask_Type;
-
-    pStatus->uAttributes = pItemImpl->d_attr;
-    pStatus->uValidFields |= osl_FileStatus_Mask_Attributes;
-
-    pStatus->uFileSize = file_stat.st_size;
-    pStatus->uValidFields |= osl_FileStatus_Mask_FileSize;
-
-    if ( uFieldMask & osl_FileStatus_Mask_LinkTargetURL )
-    {
-        rtl_uString	*ustrFullPath = NULL;
-
-        rtl_uString_newFromStr( &ustrFullPath, rtl_uString_getStr(pItemImpl->ustrFilePath) );
-        osl_getFileURLFromSystemPath( ustrFullPath, &pStatus->ustrLinkTargetURL );
-        rtl_uString_release( ustrFullPath );
-
-        pStatus->uValidFields |= osl_FileStatus_Mask_LinkTargetURL;
-    }
-
-    if ( uFieldMask & osl_FileStatus_Mask_FileURL )
-    {
-        rtl_uString	*ustrFullPath = NULL;
-
-        rtl_uString_newFromStr( &ustrFullPath, rtl_uString_getStr(pItemImpl->ustrFilePath) );
-        osl_getFileURLFromSystemPath( ustrFullPath, &pStatus->ustrFileURL );
-        rtl_uString_release( ustrFullPath );
-        pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
-    }
-
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*	osl_createDirectory */
-/****************************************************************************/
-
-oslFileError osl_createDirectory( rtl_uString* ustrDirectoryURL )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-    APIRET rc;
-
-    OSL_ASSERT( ustrDirectoryURL );
-
-    /* convert directory url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrDirectoryURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    rc = DosCreateDir( (PCSZ)path, NULL);
-    if (rc == ERROR_ACCESS_DENIED) 
-       rc=ERROR_FILE_EXISTS;
-
-    if (!rc)
-        eRet = osl_File_E_None;
-    else
-        eRet = MapError( rc);
-
-    return eRet;
-}
-
-/****************************************************************************/
-/*	osl_removeDirectory */
-/****************************************************************************/
-
-oslFileError osl_removeDirectory( rtl_uString* ustrDirectoryURL )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-    APIRET rc;
-
-    OSL_ASSERT( ustrDirectoryURL );
-
-    /* convert directory url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrDirectoryURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    rc = DosDeleteDir( (PCSZ)path);
-    if (!rc)
-        eRet = osl_File_E_None;
-    else
-        eRet = MapError( rc);
-
-    return eRet;
-}
-
-//#############################################
-int path_make_parent(sal_Unicode* path)
-{
-    int i = rtl_ustr_lastIndexOfChar(path, '/');
-    
-    if (i > 0)
-    {
-        *(path + i) = 0;
-        return i;
-    }
-    else
-        return 0;
-}
-
-//#############################################
-int create_dir_with_callback(
-    sal_Unicode* directory_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
-    void* pData)
-{
-    int mode = S_IRWXU | S_IRWXG | S_IRWXO;
-    
-    if (osl::mkdir(directory_path, mode) == 0)
-    {
-        if (aDirectoryCreationCallbackFunc)
-        {
-            rtl::OUString url;                
-            osl::FileBase::getFileURLFromSystemPath(directory_path, url);                                
-            aDirectoryCreationCallbackFunc(pData, url.pData);
-        }                
-        return 0;
-    }
-    return errno;
-}
-
-//#############################################
-oslFileError create_dir_recursively_(
-    sal_Unicode* dir_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
-    void* pData)
-{   
-    OSL_PRECOND((rtl_ustr_getLength(dir_path) > 0) && ((dir_path + (rtl_ustr_getLength(dir_path) - 1)) != (dir_path + rtl_ustr_lastIndexOfChar(dir_path, '/'))), \
-    "Path must not end with a slash");
-         
-    int native_err = create_dir_with_callback(
-        dir_path, aDirectoryCreationCallbackFunc, pData);
-        
-    if (native_err == 0)    
-        return osl_File_E_None;
-                        
-    if (native_err != ENOENT)
-        return oslTranslateFileError(OSL_FET_ERROR, native_err);
-    
-    // we step back until '/a_dir' at maximum because
-    // we should get an error unequal ENOENT when
-    // we try to create 'a_dir' at '/' and would so 
-    // return before	    
-    int pos = path_make_parent(dir_path);
-                    
-    oslFileError osl_error = create_dir_recursively_(
-        dir_path, aDirectoryCreationCallbackFunc, pData);
-                    
-    if (osl_File_E_None != osl_error)
-        return osl_error;
-                    
-       dir_path[pos] = '/';
-                               
-    return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData);     
-}
-
-//#######################################
-oslFileError SAL_CALL osl_createDirectoryPath(
-    rtl_uString* aDirectoryUrl, 
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
-    void* pData)
-{
-    if (aDirectoryUrl == NULL)
-        return osl_File_E_INVAL;
-    
-    rtl::OUString sys_path;         
-    oslFileError osl_error = osl_getSystemPathFromFileURL_Ex(
-        aDirectoryUrl, &sys_path.pData, sal_False);        
-    
-    if (osl_error != osl_File_E_None)
-        return osl_error;
-                                                                
-    osl::systemPathRemoveSeparator(sys_path);
-    
-    // const_cast because sys_path is a local copy which we want to modify inplace instead of 
-    // coyp it into another buffer on the heap again
-    return create_dir_recursively_(sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData);			
-}
-
-/****************************************************************************/
-/*	osl_getCanonicalName */
-/****************************************************************************/
-
-oslFileError osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uString** pustrValidURL )
-{
-    OSL_FAIL("osl_getCanonicalName not implemented");
-
-    rtl_uString_newFromString(pustrValidURL, ustrFileURL);
-    return osl_File_E_None;
-}
-
-
-/****************************************************************************/
-/*	osl_setFileAttributes */
-/****************************************************************************/
-
-oslFileError osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt64 uAttributes )
-{
-    char         path[PATH_MAX];
-    oslFileError eRet;
-    FILESTATUS3  fsts3ConfigInfo;
-    ULONG        ulBufSize     = sizeof(FILESTATUS3);
-    APIRET       rc            = NO_ERROR;
-
-    OSL_ASSERT( ustrFileURL );
-
-    /* convert file url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
- 
-    /* query current attributes */
-    rc = DosQueryPathInfo( (PCSZ)path, FIL_STANDARD, &fsts3ConfigInfo, ulBufSize);
-    if (rc != NO_ERROR)
-        return MapError( rc);
-
-    /* set/reset readonly/hidden (see w32\file.cxx) */
-    fsts3ConfigInfo.attrFile &= ~(FILE_READONLY | FILE_HIDDEN);
-    if ( uAttributes & osl_File_Attribute_ReadOnly )
-        fsts3ConfigInfo.attrFile |= FILE_READONLY;
-    if ( uAttributes & osl_File_Attribute_Hidden )
-        fsts3ConfigInfo.attrFile |= FILE_HIDDEN;
-
-    /* write new attributes */
-    rc = DosSetPathInfo( (PCSZ)path, FIL_STANDARD, &fsts3ConfigInfo, ulBufSize, 0);
-    if (rc != NO_ERROR)
-        return MapError( rc);
-
-    /* everything ok */
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*	osl_setFileTime */
-/****************************************************************************/
-
-oslFileError osl_setFileTime( rtl_uString* ustrFileURL, const TimeValue* pCreationTime,
-                              const TimeValue* pLastAccessTime, const TimeValue* pLastWriteTime )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-
-    OSL_ASSERT( ustrFileURL );
-
-    /* convert file url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    return osl_psz_setFileTime( path, pCreationTime, pLastAccessTime, pLastWriteTime );
-}
-
-/******************************************************************************
- *
- *                  Exported Module Functions
- *             (independent of C or Unicode Strings)
- *
- *****************************************************************************/
-
-
-/*******************************************
-    osl_readFile
-********************************************/
-
-oslFileError osl_readFile(oslFileHandle Handle, void* pBuffer, sal_uInt64 uBytesRequested, sal_uInt64* pBytesRead)
-{
-    ssize_t            nBytes      = 0;
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl*)Handle;
-
-    if ((0 == pHandleImpl) || (pHandleImpl->fd < 0) || (0 == pBuffer) || (0 == pBytesRead))
-        return osl_File_E_INVAL;
-    
-    nBytes = read(pHandleImpl->fd, pBuffer, uBytesRequested);
-
-    if (-1 == nBytes)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pBytesRead = nBytes;
-    return osl_File_E_None;
-}
-
-/*******************************************
-    osl_writeFile
-********************************************/
-
-oslFileError osl_writeFile(oslFileHandle Handle, const void* pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64* pBytesWritten)
-{
-    ssize_t            nBytes      = 0;
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl*)Handle;
-
-    OSL_ASSERT(pHandleImpl);
-    OSL_ASSERT(pBuffer);
-    OSL_ASSERT(pBytesWritten);
-
-    if ((0 == pHandleImpl) || (0 == pBuffer) || (0 == pBytesWritten))
-        return osl_File_E_INVAL;
-
-    OSL_ASSERT(pHandleImpl->fd >= 0);
-
-    if (pHandleImpl->fd < 0)
-        return osl_File_E_INVAL;
-
-    nBytes = write(pHandleImpl->fd, pBuffer, uBytesToWrite);
-
-    if (-1 == nBytes)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pBytesWritten = nBytes;
-    return osl_File_E_None;
-}
-
-/*******************************************
-    osl_writeFile
-********************************************/
-
-oslFileError osl_setFilePos( oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uPos )
-{
-    oslFileHandleImpl* pHandleImpl=0;
-    int nRet=0;
-    off_t nOffset=0;
-
-    pHandleImpl = (oslFileHandleImpl*) Handle;
-    if ( pHandleImpl == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pHandleImpl->fd < 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    /* FIXME mfe: setFilePos: Do we have any runtime function to determine LONG_MAX? */
-    if ( uPos > LONG_MAX )
-    {
-        return osl_File_E_OVERFLOW;
-    }
-
-    nOffset=(off_t)uPos;
-
-    switch(uHow)
-    {
-        case osl_Pos_Absolut:
-            nOffset = lseek(pHandleImpl->fd,nOffset,SEEK_SET);
-            break;
-
-        case osl_Pos_Current:
-            nOffset = lseek(pHandleImpl->fd,nOffset,SEEK_CUR);
-            break;
-
-        case osl_Pos_End:
-            nOffset = lseek(pHandleImpl->fd,nOffset,SEEK_END);
-            break;
-
-        default:
-            return osl_File_E_INVAL;
-    }
-
-    if ( nOffset < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-
-/************************************************
- * osl_getFilePos
- ***********************************************/
-
-oslFileError osl_getFilePos( oslFileHandle Handle, sal_uInt64* pPos )
-{
-    oslFileHandleImpl* pHandleImpl=0;
-    off_t nOffset=0;
-    int nRet=0;
-
-    pHandleImpl = (oslFileHandleImpl*) Handle;
-    if ( pHandleImpl == 0 || pPos == 0)
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pHandleImpl->fd < 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    nOffset = lseek(pHandleImpl->fd,0,SEEK_CUR);
-
-    if (nOffset < 0)
-    {
-        nRet  =errno;
-
-        /* *pPos =0; */
-
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    *pPos=nOffset;
-
-    return osl_File_E_None;
-}
-
-/****************************************************************************
- *	osl_getFileSize
- ****************************************************************************/
-
-oslFileError osl_getFileSize( oslFileHandle Handle, sal_uInt64* pSize )
-{	
-    oslFileHandleImpl* pHandleImpl=(oslFileHandleImpl*) Handle;
-    if (pHandleImpl == 0)
-        return osl_File_E_INVAL;
-
-    struct stat file_stat;
-    if (fstat(pHandleImpl->fd, &file_stat) == -1)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pSize = file_stat.st_size;
-    return osl_File_E_None;
-}
-
-/************************************************
- * osl_setFileSize
- ***********************************************/
-
-oslFileError osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize )
-{
-    oslFileHandleImpl* pHandleImpl=0;
-    off_t nOffset=0;
-
-    pHandleImpl = (oslFileHandleImpl*) Handle;
-    if ( pHandleImpl == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pHandleImpl->fd < 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    /* FIXME: mfe: setFileSize: Do we have any runtime function to determine LONG_MAX? */
-    if ( uSize > LONG_MAX )
-    {
-        return osl_File_E_OVERFLOW;
-    }
-
-    nOffset = (off_t)uSize;
-    if (ftruncate (pHandleImpl->fd, nOffset) < 0)
-    {
-        /* Failure. Try fallback algorithm */
-        oslFileError result;
-        struct stat  aStat;
-        off_t        nCurPos;
-
-        /* Save original result */
-        result = oslTranslateFileError (OSL_FET_ERROR, errno);
-        PERROR("ftruncate", "Try osl_setFileSize [fallback]\n");
-
-        /* Check against current size. Fail upon 'shrink' */
-        if (fstat (pHandleImpl->fd, &aStat) < 0)
-        {
-            PERROR("ftruncate: fstat", "Out osl_setFileSize [error]\n");
-            return (result);
-        }
-        if ((0 <= nOffset) && (nOffset <= aStat.st_size))
-        {
-            /* Failure upon 'shrink'. Return original result */
-            return (result);
-        }
-
-        /* Save current position */
-        nCurPos = (off_t)lseek (pHandleImpl->fd, (off_t)0, SEEK_CUR);
-        if (nCurPos == (off_t)(-1))
-        {
-            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]\n");
-            return (result);
-        }
-
-        /* Try 'expand' via 'lseek()' and 'write()' */
-        if (lseek (pHandleImpl->fd, (off_t)(nOffset - 1), SEEK_SET) < 0)
-        {
-            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]\n");
-            return (result);
-        }
-        if (write (pHandleImpl->fd, (char*)"", (size_t)1) < 0)
-        {
-            /* Failure. Restore saved position */
-            PERROR("ftruncate: write", "Out osl_setFileSize [error]\n");
-            if (lseek (pHandleImpl->fd, (off_t)nCurPos, SEEK_SET) < 0)
-            {
-#ifdef DEBUG_OSL_FILE
-                perror("ftruncate: lseek");
-#endif /* DEBUG_OSL_FILE */
-            }
-            return (result);
-        }
-
-        /* Success. Restore saved position */
-        if (lseek (pHandleImpl->fd, (off_t)nCurPos, SEEK_SET) < 0)
-        {
-            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]");
-            return (result);
-        }
-    }
-
-    return (osl_File_E_None);
-}
-
-/*###############################################*/
-oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
-{
-    oslFileHandleImpl* handle_impl = (oslFileHandleImpl*)Handle;
-    
-    if (handle_impl == 0)
-        return osl_File_E_INVAL;
-    
-    if (fsync(handle_impl->fd) == -1)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-    
-    return osl_File_E_None;
-}
-
-/******************************************************************************
- *
- *                  C-String Versions of Exported Module Functions
- *
- *****************************************************************************/
-
-#ifdef HAVE_STATFS_H
-
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-#   define __OSL_STATFS_STRUCT      			struct statfs
-#   define __OSL_STATFS(dir, sfs)   			statfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)   			((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_TYPENAME(a) 			((a).f_fstypename)
-#   define __OSL_STATFS_ISREMOTE(a) 			(((a).f_type & MNT_LOCAL) == 0)
-
-/* always return true if queried for the properties of
-   the file system. If you think this is wrong under any
-   of the target platforms fix it!!!! */
-#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
-#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* FREEBSD || NETBSD */
-
-#if defined(LINUX)
-#	define __OSL_NFS_SUPER_MAGIC				 0x6969
-#	define __OSL_SMB_SUPER_MAGIC				 0x517B
-#	define __OSL_MSDOS_SUPER_MAGIC  			 0x4d44
-#	define __OSL_NTFS_SUPER_MAGIC				 0x5346544e
-#   define __OSL_STATFS_STRUCT       		     struct statfs
-#   define __OSL_STATFS(dir, sfs)    			 statfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)    			 ((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_IS_NFS(a)     			 (__OSL_NFS_SUPER_MAGIC == (a).f_type) 
-#   define __OSL_STATFS_IS_SMB(a)     			 (__OSL_SMB_SUPER_MAGIC == (a).f_type) 
-#   define __OSL_STATFS_ISREMOTE(a)  			 (__OSL_STATFS_IS_NFS((a)) || __OSL_STATFS_IS_SMB((a)))
-#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
-#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
-#endif /* LINUX */
-
-#if defined(SOLARIS)
-#   define __OSL_STATFS_STRUCT          		 struct statvfs
-#   define __OSL_STATFS(dir, sfs)	    		 statvfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)       		 ((sal_uInt64)((a).f_frsize))
-#   define __OSL_STATFS_TYPENAME(a)     		 ((a).f_basetype)
-#   define __OSL_STATFS_ISREMOTE(a)     		 (rtl_str_compare((a).f_basetype, "nfs") == 0)
-
-/* always return true if queried for the properties of
-   the file system. If you think this is wrong under any
-   of the target platforms fix it!!!! */
-#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
-#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* SOLARIS */
-
-#   define __OSL_STATFS_INIT(a) 	    (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))
-
-#else /* no statfs available */
-
-#   define __OSL_STATFS_STRUCT        			 struct dummy {int i;}
-#   define __OSL_STATFS_INIT(a)       			 ((void)0)
-#   define __OSL_STATFS(dir, sfs)     		     (1)
-#   define __OSL_STATFS_ISREMOTE(sfs) 			 (0)
-#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
-#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* HAVE_STATFS_H */
-
-
-static oslFileError osl_psz_getVolumeInformation (
-    const sal_Char* pszDirectory, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask)
-{
-    __OSL_STATFS_STRUCT sfs;
-
-    if (!pInfo)   
-        return osl_File_E_INVAL;
-    
-    __OSL_STATFS_INIT(sfs);
-    
-    pInfo->uValidFields = 0;
-    pInfo->uAttributes  = 0;
-    
-    if ((__OSL_STATFS(pszDirectory, &sfs)) < 0)
-    {	
-        oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno);		
-        return (result);
-    }
-
-    /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */
-    if (uFieldMask & osl_VolumeInfo_Mask_Attributes)
-    {	
-        if (__OSL_STATFS_ISREMOTE(sfs))
-            pInfo->uAttributes  |= osl_Volume_Attribute_Remote;
-                        
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
-    }
-
-    if (uFieldMask & osl_VolumeInfo_Mask_FileSystemCaseHandling)
-    {
-        if (__OSL_STATFS_IS_CASE_SENSITIVE_FS(sfs))
-            pInfo->uAttributes |= osl_Volume_Attribute_Case_Sensitive;
-        
-        if (__OSL_STATFS_IS_CASE_PRESERVING_FS(sfs))
-            pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
-            
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
-    }
-    
-    pInfo->uTotalSpace = 0;
-    pInfo->uFreeSpace  = 0;
-    pInfo->uUsedSpace  = 0;
-    
-#if defined(__OSL_STATFS_BLKSIZ)
-    
-    if ((uFieldMask & osl_VolumeInfo_Mask_TotalSpace) ||
-        (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
-    {
-        pInfo->uTotalSpace   = __OSL_STATFS_BLKSIZ(sfs);
-        pInfo->uTotalSpace  *= (sal_uInt64)(sfs.f_blocks);
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace;
-    }
-    
-    if ((uFieldMask & osl_VolumeInfo_Mask_FreeSpace) ||
-        (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
-    {
-        pInfo->uFreeSpace = __OSL_STATFS_BLKSIZ(sfs);
-        
-        if (getuid() == 0)		
-            pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bfree);
-        else			
-            pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bavail);
-    
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_FreeSpace;
-    }
-
-#endif  /* __OSL_STATFS_BLKSIZ */
-    
-    if ((pInfo->uValidFields & osl_VolumeInfo_Mask_TotalSpace) &&
-        (pInfo->uValidFields & osl_VolumeInfo_Mask_FreeSpace ))
-    {
-        pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_UsedSpace;
-    }
-    
-    pInfo->uMaxNameLength = 0;
-    if (uFieldMask & osl_VolumeInfo_Mask_MaxNameLength)
-    {
-        long nLen = pathconf(pszDirectory, _PC_NAME_MAX);
-        if (nLen > 0)
-        {
-            pInfo->uMaxNameLength = (sal_uInt32)nLen;
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_MaxNameLength;
-        }
-    }
-
-    pInfo->uMaxPathLength = 0;
-    if (uFieldMask & osl_VolumeInfo_Mask_MaxPathLength)
-    {
-        long nLen = pathconf (pszDirectory, _PC_PATH_MAX);
-        if (nLen > 0)
-        {
-            pInfo->uMaxPathLength  = (sal_uInt32)nLen;
-            pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxPathLength;
-        }
-    }
-
-#if defined(__OSL_STATFS_TYPENAME)
-
-    if (uFieldMask & osl_VolumeInfo_Mask_FileSystemName)
-    {
-        rtl_string2UString(
-            &(pInfo->ustrFileSystemName),
-            __OSL_STATFS_TYPENAME(sfs),
-            rtl_str_getLength(__OSL_STATFS_TYPENAME(sfs)),
-            osl_getThreadTextEncoding(),
-            OUSTRING_TO_OSTRING_CVTFLAGS);
-        OSL_ASSERT(pInfo->ustrFileSystemName != 0);
-            
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_FileSystemName;
-    }
-    
-#endif /* __OSL_STATFS_TYPENAME */
-    
-    if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
-    {
-        /* FIXME: check also entries in mntent for the device
-           and fill it with correct values */
-        
-        *pInfo->pDeviceHandle = osl_isFloppyDrive(pszDirectory);
-
-        if (*pInfo->pDeviceHandle)
-        {
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_DeviceHandle;
-            pInfo->uAttributes  |= osl_Volume_Attribute_Removeable;
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
-        }
-    }
-    return osl_File_E_None;
-}
-
-/******************************************
- * osl_psz_setFileTime
- *****************************************/
-
-static oslFileError osl_psz_setFileTime( const sal_Char* pszFilePath,
-                                  const TimeValue* /*pCreationTime*/,
-                                  const TimeValue* pLastAccessTime,
-                                  const TimeValue* pLastWriteTime )
-{
-    int nRet=0;
-    struct utimbuf aTimeBuffer;
-    struct stat aFileStat;
-#ifdef DEBUG_OSL_FILE
-    struct tm* pTM=0;
-#endif
-
-    nRet = lstat(pszFilePath,&aFileStat);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"File Times are (in localtime):\n");
-    pTM=localtime(&aFileStat.st_ctime);
-    fprintf(stderr,"CreationTime is '%s'\n",asctime(pTM));
-    pTM=localtime(&aFileStat.st_atime);
-    fprintf(stderr,"AccessTime   is '%s'\n",asctime(pTM));
-    pTM=localtime(&aFileStat.st_mtime);
-    fprintf(stderr,"Modification is '%s'\n",asctime(pTM));
-
-    fprintf(stderr,"File Times are (in UTC):\n");
-    fprintf(stderr,"CreationTime is '%s'\n",ctime(&aFileStat.st_ctime));
-    fprintf(stderr,"AccessTime   is '%s'\n",ctime(&aTimeBuffer.actime));
-    fprintf(stderr,"Modification is '%s'\n",ctime(&aTimeBuffer.modtime));
-#endif
-
-    if ( pLastAccessTime != 0 )
-    {
-        aTimeBuffer.actime=pLastAccessTime->Seconds;
-    }
-    else
-    {
-        aTimeBuffer.actime=aFileStat.st_atime;
-    }
-
-    if ( pLastWriteTime != 0 )
-    {
-        aTimeBuffer.modtime=pLastWriteTime->Seconds;
-    }
-    else
-    {
-        aTimeBuffer.modtime=aFileStat.st_mtime;
-    }
-
-    /* mfe: Creation time not used here! */
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"File Times are (in localtime):\n");
-    pTM=localtime(&aFileStat.st_ctime);
-    fprintf(stderr,"CreationTime now '%s'\n",asctime(pTM));
-    pTM=localtime(&aTimeBuffer.actime);
-    fprintf(stderr,"AccessTime   now '%s'\n",asctime(pTM));
-    pTM=localtime(&aTimeBuffer.modtime);
-    fprintf(stderr,"Modification now '%s'\n",asctime(pTM));
-
-    fprintf(stderr,"File Times are (in UTC):\n");
-    fprintf(stderr,"CreationTime now '%s'\n",ctime(&aFileStat.st_ctime));
-    fprintf(stderr,"AccessTime   now '%s'\n",ctime(&aTimeBuffer.actime));
-    fprintf(stderr,"Modification now '%s'\n",ctime(&aTimeBuffer.modtime));
-#endif
-
-    nRet=utime(pszFilePath,&aTimeBuffer);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-
-
-/******************************************************************************
- *
- *                  Utility Functions
- *
- *****************************************************************************/
-
-
-/*****************************************
- * oslMakeUStrFromPsz
- ****************************************/
-
-rtl_uString* oslMakeUStrFromPsz(const sal_Char* pszStr, rtl_uString** ustrValid)
-{
-    rtl_string2UString(
-        ustrValid,
-        pszStr,
-        rtl_str_getLength( pszStr ),
-        osl_getThreadTextEncoding(),
-        OUSTRING_TO_OSTRING_CVTFLAGS );
-    OSL_ASSERT(*ustrValid != 0);
-
-    return *ustrValid;
-}
-
-/*****************************************************************************
- * UnicodeToText
- * converting unicode to text manually saves us the penalty of a temporary
- * rtl_String object.
- ****************************************************************************/
-
-int UnicodeToText( char * buffer, size_t bufLen, const sal_Unicode * uniText, sal_Int32 uniTextLen )
-{
-    rtl_UnicodeToTextConverter hConverter;
-    sal_uInt32   nInfo;
-    sal_Size   nSrcChars, nDestBytes;
-
-    /* stolen from rtl/string.c */
-    hConverter = rtl_createUnicodeToTextConverter( osl_getThreadTextEncoding() );
-
-    nDestBytes = rtl_convertUnicodeToText( hConverter, 0, uniText, uniTextLen,
-                                           buffer, bufLen,
-                                           OUSTRING_TO_OSTRING_CVTFLAGS | RTL_UNICODETOTEXT_FLAGS_FLUSH,
-                                           &nInfo, &nSrcChars );
-
-    rtl_destroyUnicodeToTextConverter( hConverter );
-
-    if( nInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL )
-    {
-        errno = EOVERFLOW;
-        return 0;
-    }
-
-    /* ensure trailing '\0' */
-    buffer[nDestBytes] = '\0';
-
-    return nDestBytes;
-}
-
-/*****************************************************************************
-   TextToUnicode
-
-   @param text
-          The text to convert.
-
-   @param text_buffer_size
-          The number of characters.
-
-   @param unic_text
-          The unicode buffer.
-
-   @param unic_text_buffer_size
-             The size in characters of the unicode buffer.
-
- ****************************************************************************/
-
-int TextToUnicode(
-    const char*  text,
-    size_t       text_buffer_size,
-    sal_Unicode* unic_text,
-    sal_Int32    unic_text_buffer_size)
-{
-    rtl_TextToUnicodeConverter hConverter;
-    sal_uInt32 nInfo;
-    sal_Size nSrcChars;
-    sal_Size nDestBytes;
-
-    /* stolen from rtl/string.c */
-    hConverter = rtl_createTextToUnicodeConverter(osl_getThreadTextEncoding());
-
-    nDestBytes = rtl_convertTextToUnicode(hConverter,
-                                          0,
-                                          text,  text_buffer_size,
-                                          unic_text, unic_text_buffer_size,
-                                          OSTRING_TO_OUSTRING_CVTFLAGS | RTL_TEXTTOUNICODE_FLAGS_FLUSH,
-                                          &nInfo, &nSrcChars);
-
-    rtl_destroyTextToUnicodeConverter(hConverter);
-
-    if (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)
-    {
-        errno = EOVERFLOW;
-        return 0;
-    }
-
-    /* ensure trailing '\0' */
-    unic_text[nDestBytes] = '\0';
-
-    return nDestBytes;
-}
-
-/******************************************************************************
- *
- *                  GENERIC FLOPPY FUNCTIONS
- *
- *****************************************************************************/
-
-
-/*****************************************
- * osl_unmountVolumeDevice
- ****************************************/
-
-oslFileError osl_unmountVolumeDevice( oslVolumeDeviceHandle Handle )
-{
-    oslFileError tErr = osl_File_E_NOSYS;
-
-    tErr = osl_unmountFloppy(Handle);
-
-     /* Perhaps current working directory is set to mount point */
-
-     if ( tErr )
-    {
-        sal_Char *pszHomeDir = getenv("HOME");
-
-        if ( pszHomeDir && strlen( pszHomeDir ) && 0 == chdir( pszHomeDir ) )
-        {
-            /* try again */
-
-            tErr = osl_unmountFloppy(Handle);
-
-            OSL_ENSURE( tErr, "osl_unmountvolumeDevice: CWD was set to volume mount point" );
-        }
-    }
-
-    return tErr;
-}
-
-/*****************************************
- * osl_automountVolumeDevice
- ****************************************/
-
-oslFileError osl_automountVolumeDevice( oslVolumeDeviceHandle Handle )
-{
-    oslFileError tErr = osl_File_E_NOSYS;
-
-    tErr = osl_mountFloppy(Handle);
-
-    return tErr;
-}
-
-/*****************************************
- * osl_getVolumeDeviceMountPath
- ****************************************/
-
-oslFileError osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uString **pstrPath )
-{
-    oslVolumeDeviceHandleImpl* pItem = (oslVolumeDeviceHandleImpl*) Handle;
-    sal_Char Buffer[PATH_MAX];
-
-    Buffer[0] = '\0';
-
-    if ( pItem == 0 || pstrPath == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-        return osl_File_E_INVAL;
-    }
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"Handle is:\n");
-    osl_printFloppyHandle(pItem);
-#endif
-
-    snprintf(Buffer, sizeof(Buffer), "file://%s", pItem->pszMountPoint);
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"Mount Point is: '%s'\n",Buffer);
-#endif
-
-    oslMakeUStrFromPsz(Buffer, pstrPath);
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_acquireVolumeDeviceHandle
- ****************************************/
-
-oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
-{
-    oslVolumeDeviceHandleImpl* pItem =(oslVolumeDeviceHandleImpl*) Handle;
-
-    if ( pItem == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    ++pItem->RefCount;
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_releaseVolumeDeviceHandle
- ****************************************/
-
-oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
-{
-    oslVolumeDeviceHandleImpl* pItem =(oslVolumeDeviceHandleImpl*) Handle;
-
-    if ( pItem == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    --pItem->RefCount;
-    
-    if ( pItem->RefCount == 0 )
-    {
-        rtl_freeMemory(pItem);
-    }
-    
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_newVolumeDeviceHandleImpl
- ****************************************/
- 
-static oslVolumeDeviceHandleImpl* osl_newVolumeDeviceHandleImpl()
-{
-    oslVolumeDeviceHandleImpl* pHandle;
-    const size_t               nSizeOfHandle = sizeof(oslVolumeDeviceHandleImpl);
- 
-    pHandle = (oslVolumeDeviceHandleImpl*) rtl_allocateMemory (nSizeOfHandle);
-    if (pHandle != NULL)
-    {
-        pHandle->ident[0]         = 'O';
-        pHandle->ident[1]         = 'V';
-        pHandle->ident[2]         = 'D';
-        pHandle->ident[3]         = 'H';
-        pHandle->pszMountPoint[0] = '\0';
-        pHandle->pszFilePath[0]   = '\0';
-        pHandle->pszDevice[0]     = '\0';
-        pHandle->RefCount         = 1;
-    }
-    return pHandle;   
-}
-
-/*****************************************
- * osl_freeVolumeDeviceHandleImpl
- ****************************************/
- 
-static void osl_freeVolumeDeviceHandleImpl (oslVolumeDeviceHandleImpl* pHandle)
-{
-    if (pHandle != NULL)
-        rtl_freeMemory (pHandle);
-}
-
-
-/******************************************************************************
- *
- *                  OS/2 FLOPPY FUNCTIONS
- *
- *****************************************************************************/
-
-#if defined(OS2)
-static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
-{
-    return NULL;
-}
-
-static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-    return osl_File_E_BUSY;
-}
-
-static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-    return osl_File_E_BUSY;
-}
-
-static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
-{
-    return sal_False;
-}
-
-static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
-{
-    return sal_False;
-}
-
-
-#ifdef DEBUG_OSL_FILE
-static void osl_printFloppyHandle(oslVolumeDeviceHandleImpl* pItem)
-{
-    if (pItem == 0 )
-    {
-        fprintf(stderr,"NULL Handle\n");
-        return;
-    }
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Invalid Handle]\n");
-#endif
-        return;
-    }
-    
-
-    fprintf(stderr,"MountPoint : '%s'\n",pItem->pszMountPoint);
-    fprintf(stderr,"FilePath   : '%s'\n",pItem->pszFilePath);
-    fprintf(stderr,"Device     : '%s'\n",pItem->pszDevice);
-
-    return;    
-}
-#endif
-
-#endif /* OS2 */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_error_transl.cxx b/sal/osl/os2/file_error_transl.cxx
deleted file mode 100644
index ffd83345a..000000000
--- a/sal/osl/os2/file_error_transl.cxx
+++ /dev/null
@@ -1,255 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
- #ifndef _ERRNO_H
- #include <errno.h>
- #endif
- 
- #ifndef _FILE_ERROR_TRANSL_H_
- #include "file_error_transl.h"
- #endif
- 
- #ifndef _OSL_DIAGNOSE_H_
- #include <osl/diagnose.h>
- #endif
-  
- 
-/********************************************
- * oslTranslateFileError
- *******************************************/
-  
-oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
-{
-    oslFileError osl_error = osl_File_E_invalidError;
-
-    OSL_ENSURE((bIsError && (0 != Errno)) || (!bIsError && (0 == Errno)), "oslTranslateFileError strange input combination!");
-    
-    /* Have a look at file_error_transl.h for 
-       the reason that we do this here */    
-    if (bIsError && (0 == Errno))
-        return osl_error;
-        
-    switch(Errno)
-    {
-        case 0:
-            osl_error = osl_File_E_None;
-            break;
-            
-        case EPERM:
-            osl_error = osl_File_E_PERM;
-            break;
-
-        case ENOENT:
-            osl_error = osl_File_E_NOENT;
-            break;
-
-        case ESRCH:
-            osl_error = osl_File_E_SRCH;
-            break;
-
-        case EINTR:
-            osl_error = osl_File_E_INTR;
-            break;
-
-        case EIO:
-            osl_error = osl_File_E_IO;
-            break;
-
-        case ENXIO:
-            osl_error = osl_File_E_IO;
-            break;
-            
-        case E2BIG:
-            osl_error = osl_File_E_2BIG;
-            break;
-            
-        case ENOEXEC:
-            osl_error = osl_File_E_NOEXEC;
-            break;
-
-        case EBADF:
-            osl_error = osl_File_E_BADF;
-            break;
-
-        case ECHILD:
-            osl_error = osl_File_E_CHILD;
-            break;
-
-        case EAGAIN:
-            osl_error = osl_File_E_AGAIN;
-            break;
-
-        case ENOMEM:
-            osl_error = osl_File_E_NOMEM;
-            break;
-
-        case EACCES:
-            osl_error = osl_File_E_ACCES;
-            break;
-
-        case EFAULT:
-            osl_error = osl_File_E_FAULT;
-            break;
-
-        case EBUSY:
-            osl_error = osl_File_E_BUSY;
-            break;
-
-        case EEXIST:
-            osl_error = osl_File_E_EXIST;
-            break;
-            
-        case EXDEV:
-            osl_error = osl_File_E_XDEV;
-            break;
-            
-        case ENODEV:
-            osl_error = osl_File_E_NODEV;
-            break;
-            
-        case ENOTDIR:
-            osl_error = osl_File_E_NOTDIR;
-            break;
-
-        case EISDIR:
-            osl_error = osl_File_E_ISDIR;
-            break;
-
-        case EINVAL:
-            osl_error = osl_File_E_INVAL;
-            break;
-            
-        case ENFILE:
-            osl_error = osl_File_E_NFILE;
-            break;
-
-        case EMFILE:
-            osl_error = osl_File_E_MFILE;
-            break;
-
-        case ENOTTY:
-            osl_error = osl_File_E_NOTTY;
-            break;
-
-        case EFBIG:
-            osl_error = osl_File_E_FBIG;
-            break;
-
-        case ENOSPC:
-            osl_error = osl_File_E_NOSPC;
-            break;
-
-        case ESPIPE:
-            osl_error = osl_File_E_SPIPE;
-            break;
-            
-        case EROFS:
-            osl_error = osl_File_E_ROFS;
-            break;
-
-        case EMLINK:
-            osl_error = osl_File_E_MLINK;
-            break;
-            
-        case EPIPE:
-            osl_error = osl_File_E_PIPE;
-            break;
-
-        case EDOM:
-            osl_error = osl_File_E_DOM;
-            break;
-
-        case ERANGE:
-            osl_error = osl_File_E_RANGE;
-            break;
-
-        case EDEADLK:
-            osl_error = osl_File_E_DEADLK;
-            break;
-            
-        case ENAMETOOLONG:
-            osl_error = osl_File_E_NAMETOOLONG;
-            break;
-            
-        case ENOLCK:
-            osl_error = osl_File_E_NOLCK;
-            break;
-
-        case ENOSYS: 
-           osl_error = osl_File_E_NOSYS;
-            break;
-
-        case ENOTEMPTY:
-            osl_error = osl_File_E_NOTEMPTY;
-            break;
-
-        case ELOOP:
-            osl_error = osl_File_E_LOOP;
-            break;
-
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-        case EILSEQ:
-            osl_error = osl_File_E_ILSEQ;
-            break;
-#endif /* MACOSX */
-            
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2))
-        case ENOLINK:
-            osl_error = osl_File_E_NOLINK;
-            break;
-#endif /* MACOSX */
-            
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2))
-        case EMULTIHOP:
-            osl_error = osl_File_E_MULTIHOP;
-            break;
-#endif /* MACOSX */
-
-        case EUSERS:
-            osl_error = osl_File_E_USERS;
-            break;
-
-        case EOVERFLOW:
-            osl_error = osl_File_E_OVERFLOW;
-            break;
-        
-        case ETIMEDOUT:
-            osl_error = osl_File_E_TIMEDOUT;
-            break;
-        
-        default:
-            /* FIXME translateFileError: is this alright? Or add a new one: osl_File_E_Unknown? */
-            osl_error = osl_File_E_invalidError;
-            break;
-    }
-
-    return osl_error;
-}
- 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_error_transl.h b/sal/osl/os2/file_error_transl.h
deleted file mode 100644
index fbaf054fb..000000000
--- a/sal/osl/os2/file_error_transl.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
-#ifndef _FILE_ERROR_TRANSL_H_
-#define _FILE_ERROR_TRANSL_H_
-
-#include <osl/file.h>
-#include <sal/types.h>
- 
-#ifdef __cplusplus
-extern "C" 
-{
-#endif
-
-/*********************************************
-   oslTranslateFileError 
-   Translate errno's to osl file errors
-   
-   @param bIsError [in] specifies if nErrno 
-           should be interpreted as error, 
-          some libc functions signaling an error 
-           but errno is nevertheless 0 in this
-           case the function should at least
-           return osl_File_E_Unknown but in no
-           case osl_File_E_None!
-          
-   @param nErrno [in] the errno if errno is 0
-            and bIsError is true the function
-           returns osl_File_E_Unknown
-  
-   @returns the osl error code appropriate to
-              the errno
-            
- *********************************************/
-
-#define OSL_FET_SUCCESS sal_False
-#define OSL_FET_ERROR   sal_True
- 
-oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_path_helper.cxx b/sal/osl/os2/file_path_helper.cxx
deleted file mode 100644
index 6a9e66441..000000000
--- a/sal/osl/os2/file_path_helper.cxx
+++ /dev/null
@@ -1,380 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
- /*******************************************
-     Includes
-  ******************************************/
-
- #ifndef _OSL_THREAD_H_
- #include "osl/thread.h"
- #endif
-  
- #ifndef _OSL_FILE_PATH_HELPER_H_
- #include "file_path_helper.h"
- #endif
- 
- #ifndef _OSL_FILE_PATH_HELPER_HXX_
- #include "file_path_helper.hxx"
- #endif
- 
- #ifndef _OSL_UUNXAPI_HXX_
- #include "uunxapi.hxx"
- #endif
- 
- #ifndef _OSL_DIAGNOSE_H_
- #include <osl/diagnose.h>
- #endif
- 
- #ifndef _RTL_USTRING_HXX_
- #include <rtl/ustring.hxx>
- #endif
-
- /*******************************************
-     Constants
-  ******************************************/
-  
-  const sal_Unicode FPH_CHAR_PATH_SEPARATOR = (sal_Unicode)'\\';
-  const sal_Unicode FPH_CHAR_DOT            = (sal_Unicode)'.';
-  const sal_Unicode FPH_CHAR_COLON          = (sal_Unicode)':';
-  
-  inline const rtl::OUString FPH_PATH_SEPARATOR()
-      { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\")); }
-  inline const rtl::OUString FPH_LOCAL_DIR_ENTRY()
-      { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); }
-  inline const rtl::OUString FPH_PARENT_DIR_ENTRY()
-      { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")); }
-  
- /*******************************************
-  *  osl_systemPathRemoveSeparator   
-  ******************************************/
-  
- void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath)
- {
-     OSL_PRECOND(pustrPath, "osl_systemPathRemoveSeparator: Invalid parameter");
-        
-    // maybe there are more than one separator at end 
-    // so we run in a loop
-    while ((pustrPath->length > 1) && (FPH_CHAR_PATH_SEPARATOR == pustrPath->buffer[pustrPath->length - 1]))
-    {
-        pustrPath->length--;
-        pustrPath->buffer[pustrPath->length] = (sal_Unicode)'\0';
-    }
-    
-    OSL_POSTCOND((0 == pustrPath->length) || (1 == pustrPath->length) || \
-                 (pustrPath->length > 1 && pustrPath->buffer[pustrPath->length - 1] != FPH_CHAR_PATH_SEPARATOR), \
-                 "osl_systemPathRemoveSeparator: Post condition failed");	
- }
- 
- /*******************************************
-    osl_systemPathEnsureSeparator   
-  ******************************************/
-  
- void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath)
- {
-     OSL_PRECOND(ppustrPath && (NULL != *ppustrPath), \
-                "osl_systemPathEnsureSeparator: Invalid parameter");
-    
-     rtl::OUString path(*ppustrPath);
-    sal_Int32	  lp = path.getLength();
-    sal_Int32     i  = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);
-    
-    if ((lp > 1 && i != (lp - 1)) || ((lp < 2) && i < 0))
-    {
-        path += FPH_PATH_SEPARATOR(); 
-        rtl_uString_assign(ppustrPath, path.pData);			
-    }
-    
-    OSL_POSTCOND(path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR) == (path.getLength() - 1), \
-                 "osl_systemPathEnsureSeparator: Post condition failed");
- }
- 
- /*******************************************
-  *  osl_systemPathIsRelativePath
-  ******************************************/
-  
- sal_Bool SAL_CALL osl_systemPathIsRelativePath(const rtl_uString* pustrPath)
- {
-     OSL_PRECOND(pustrPath, "osl_systemPathIsRelativePath: Invalid parameter");
-     return (!osl_systemPathIsAbsolutePath(pustrPath));
- }
- 
- /******************************************
-  *  osl_systemPathIsAbsolutePath   		 
-  *****************************************/
-  
- sal_Bool SAL_CALL osl_systemPathIsAbsolutePath(const rtl_uString* pustrPath)
- {
-     OSL_PRECOND(pustrPath, "osl_systemPathIsAbsolutePath: Invalid parameter");
-    if (pustrPath->length == 0)
-        return sal_False;
-    if (pustrPath->buffer[0] == FPH_CHAR_PATH_SEPARATOR)
-        return sal_True;
-    if (pustrPath->buffer[1] == FPH_CHAR_COLON
-            && pustrPath->buffer[2] == FPH_CHAR_PATH_SEPARATOR)
-        return sal_True;
-    return sal_False;
- }
- 
- /******************************************
-    osl_systemPathMakeAbsolutePath
-  *****************************************/
-  
- void SAL_CALL osl_systemPathMakeAbsolutePath(
-     const rtl_uString* pustrBasePath, 
-    const rtl_uString* pustrRelPath, 
-    rtl_uString** 	   ppustrAbsolutePath)
-{
-    rtl::OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
-    rtl::OUString rel(const_cast<rtl_uString*>(pustrRelPath));
-    
-    if (base.getLength() > 0)
-        osl_systemPathEnsureSeparator(&base.pData);		
-        
-    base += rel;
-    
-    rtl_uString_acquire(base.pData);
-    *ppustrAbsolutePath = base.pData; 
-}
-
- 
- /*****************************************
-    osl_systemPathGetParent	
-  ****************************************/
-  
- sal_Int32 SAL_CALL osl_systemPathGetParent(rtl_uString* pustrPath)
- {
-     return 0;
- }
-  
- /*******************************************
-     osl_systemPathGetFileOrLastDirectoryPart
-  ******************************************/
-  
- void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
-     const rtl_uString* 	pustrPath,
-    rtl_uString** 		ppustrFileNameOrLastDirPart)
-{
-    OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart, \
-                "osl_systemPathGetFileNameOrLastDirectoryPart: Invalid parameter");
-    
-    rtl::OUString path(const_cast<rtl_uString*>(pustrPath));	
-    
-    osl_systemPathRemoveSeparator(path.pData);
-                
-    rtl::OUString last_part;
-        
-    if (path.getLength() > 1 || (1 == path.getLength() && *path.getStr() != FPH_CHAR_PATH_SEPARATOR))
-    {
-        sal_Int32 idx_ps = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);		
-        idx_ps++; // always right to increment by one even if idx_ps == -1!
-        last_part = rtl::OUString(path.getStr() + idx_ps); 
-    }							
-    rtl_uString_assign(ppustrFileNameOrLastDirPart, last_part.pData);		
-}
-    
-
- /********************************************
-     osl_systemPathIsHiddenFileOrDirectoryEntry	
- *********************************************/
- 
- sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
-     const rtl_uString* pustrPath)
-{
-    OSL_PRECOND(pustrPath, "osl_systemPathIsHiddenFileOrDirectoryEntry: Invalid parameter");
-
-    sal_Bool is_hidden = sal_False;
-    
-    if (pustrPath->length > 0)
-    {
-        rtl::OUString fdp;
-    
-        osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &fdp.pData);
-        
-        is_hidden = ((fdp.pData->length > 0) && (fdp.pData->buffer[0] == FPH_CHAR_DOT) && 
-                     !osl_systemPathIsLocalOrParentDirectoryEntry(fdp.pData));					 
-     }
-    
-    return is_hidden;
-}
-    
- 
- /************************************************
-     osl_systemPathIsLocalOrParentDirectoryEntry
- ************************************************/
-
-sal_Bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
-    const rtl_uString* pustrPath)
-{
-    OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter");
-    
-    rtl::OUString dirent;
-    
-    osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &dirent.pData);
-        
-    return (
-            (dirent == FPH_LOCAL_DIR_ENTRY()) || 
-            (dirent == FPH_PARENT_DIR_ENTRY())
-           );
-}
-    
-/***********************************************
- Simple iterator for a path list separated by 
- the specified character
- **********************************************/
- 
-class path_list_iterator
-{
-public:
-    
-    /******************************************
-      constructor
-     
-     after construction get_current_item 
-     returns the first path in list, no need
-     to call reset first
-     *****************************************/	 
-    path_list_iterator(const rtl::OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) : 
-        m_path_list(path_list),
-        m_end(m_path_list.getStr() + m_path_list.getLength() + 1),
-        m_separator(list_separator)
-    {
-        reset();
-    }
-    
-    /******************************************
-     reset the iterator
-     *****************************************/	 
-    void reset()
-    {
-        m_path_segment_begin = m_path_segment_end = m_path_list.getStr();
-        advance();				
-    }
-    
-    /******************************************
-     move the iterator to the next position
-     *****************************************/	 
-    void next()
-    {
-        OSL_PRECOND(!done(), "path_list_iterator: Already done!");
-        
-        m_path_segment_begin = ++m_path_segment_end;				
-        advance();		
-    }
-    
-    /******************************************
-     check if done
-     *****************************************/	 
-    bool done() const
-    {
-        return (m_path_segment_end >= m_end);
-    }
-    
-    /******************************************
-     return the current item
-     *****************************************/	 
-    rtl::OUString get_current_item() const
-    {
-        return rtl::OUString(
-            m_path_segment_begin, 
-            (m_path_segment_end - m_path_segment_begin));
-    }
-        
-private:
-    
-    /******************************************
-     move m_path_end to the next separator or
-     to the edn of the string
-     *****************************************/	 
-    void advance()
-    {
-        while (!done() && *m_path_segment_end && (*m_path_segment_end != m_separator))
-            ++m_path_segment_end;
-            
-        OSL_ASSERT(m_path_segment_end <= m_end);
-    }
-    
-private:
-    rtl::OUString 		m_path_list;	
-    const sal_Unicode*  m_end;
-    const sal_Unicode 	m_separator;
-    const sal_Unicode*  m_path_segment_begin;
-    const sal_Unicode*  m_path_segment_end;	
-    
-// prevent copy and assignment	
-private:
-    /******************************************
-     copy constructor
-     remember: do not simply copy m_path_begin
-     and m_path_end because they point to 
-     the memory of other.m_path_list!
-     *****************************************/	 
-    path_list_iterator(const path_list_iterator& other);
-    
-    /******************************************
-     assignment operator
-      remember: do not simply copy m_path_begin
-     and m_path_end because they point to 
-     the memory of other.m_path_list!
-     *****************************************/	 
-    path_list_iterator& operator=(const path_list_iterator& other);
-};
-
- /************************************************
-      osl_searchPath
-  ***********************************************/
-  
-sal_Bool SAL_CALL osl_searchPath( 	
-     const rtl_uString* pustrFilePath,
-    const rtl_uString* pustrSearchPathList,
-    rtl_uString**      ppustrPathFound)
-{
-    OSL_PRECOND(pustrFilePath && pustrSearchPathList && ppustrPathFound, "osl_searchPath: Invalid parameter");
-    
-    bool               bfound = false;
-    rtl::OUString      fp(const_cast<rtl_uString*>(pustrFilePath));	
-    rtl::OUString      pl = rtl::OUString(const_cast<rtl_uString*>(pustrSearchPathList));
-    path_list_iterator pli(pl);
-    
-    while (!pli.done())
-    {
-        rtl::OUString p = pli.get_current_item();						
-        osl::systemPathEnsureSeparator(p);		
-        p += fp;
-        
-        if (osl::access(p, F_OK) > -1)
-        {
-            bfound = true;
-            rtl_uString_assign(ppustrPathFound, p.pData);
-            break;
-        }					
-        pli.next();
-    }	
-    return bfound;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_path_helper.h b/sal/osl/os2/file_path_helper.h
deleted file mode 100644
index 94faf0556..000000000
--- a/sal/osl/os2/file_path_helper.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
- #ifndef _OSL_FILE_PATH_HELPER_H_
- #define _OSL_FILE_PATH_HELPER_H_
- 
- 
- #ifndef _SAL_TYPES_H_
- #include <sal/types.h>
- #endif
- 
- #ifndef _RTL_USTRING_H_
- #include <rtl/ustring.h>
- #endif
- 
- 
- #ifdef __cplusplus
- extern "C"
- {
- #endif
- 
- 
- /*******************************************
-    osl_systemPathRemoveSeparator
-    Removes the last separator from the 
-    given system path if any and if the path
-    is not the root path '/'
-   
-    @param	ppustrPath [inout] a system path
-            if the path is not the root path
-            and the last character is a 
-            path separator it will be cut off
-               ppustrPath must not be NULL and
-            must point to a valid rtl_uString
-            
-    @returns nothing
-    
-  ******************************************/
-  
- void SAL_CALL osl_systemPathRemoveSeparator(
-     /*inout*/ rtl_uString* pustrPath);
- 
- /*******************************************
-    osl_systemPathEnsureSeparator
-    Adds a trailing path separator to the
-    given system path if not already there
-    and if the path is not the root path '/'
-  
-      @param 	pustrPath [inout] a system path
-            if the path is not the root path
-            '/' and has no trailing separator
-            a separator will be added
-            ppustrPath must not be NULL and
-            must point to a valid rtl_uString
-            
-    @returns nothing
-    
-  ******************************************/
-  
- void SAL_CALL osl_systemPathEnsureSeparator(
-     /*inout*/ rtl_uString** ppustrPath);
- 
- /*******************************************
-    osl_systemPathIsRelativePath
-    Returns true if the given path is a 
-    relative path and so starts not with '/'
-    
-    @param 	pustrPath [in] a system path 
-            pustrPath must not be NULL
-            
-    @returns sal_True if the given path 
-             doesn't start with a separator
-             else sal_False will be returned
-             
-  ******************************************/
-  
- sal_Bool SAL_CALL osl_systemPathIsRelativePath(
-     const rtl_uString* pustrPath);
- 
- /******************************************
-    osl_systemPathIsAbsolutePath
-    Returns true if the given path is an 
-    absolute path and so starts with a '/'
-    
-    @param pustrPath [in] a system path
-           pustrPath must not be NULL
-           
-    @returns sal_True if the given path 
-             start's with a separator else
-             sal_False will be returned
-             
-  *****************************************/
-  
- sal_Bool SAL_CALL osl_systemPathIsAbsolutePath(
-     const rtl_uString* pustrPath);
- 
- /******************************************
-    osl_systemPathMakeAbsolutePath
-    Append a relative path to a base path 
-    
-    @param	pustrBasePath [in] a system
-            path that will be considered as
-            base path
-            pustrBasePath must not be NULL 
-            
-    @param	pustrRelPath [in] a system path
-            that will be considered as 
-            relative path 
-            pustrBasePath must not be NULL
-            
-    @param	ppustrAbsolutePath [out] the 
-            resulting path which is a 
-            concatination of the base and 
-            the relative path
-            if base path is empty the 
-            resulting absolute path is the
-            relative path
-            if relative path is empty the
-            resulting absolute path is the
-            base path
-            if base and relative path are 
-            empty the resulting absolute 
-            path is also empty
-            ppustrAbsolutePath must not be
-            NULL and *ppustrAbsolutePath
-            must be 0 or point to a valid
-            rtl_uString
-            
-  *****************************************/
-  
- void SAL_CALL osl_systemPathMakeAbsolutePath(
-     const rtl_uString* pustrBasePath, 
-    const rtl_uString* pustrRelPath, 
-    rtl_uString** 	   ppustrAbsolutePath);
- 
- /*****************************************
-    osl_systemPathGetParent
-    Replaces the last occurrence of a path
-    separator with '\0' and returns the 
-    position where the '/' was replaced
-    
-    @param	pustrPath [inout] a system
-            path, the last separator of
-            this path will be replaced by
-            a '\0' 
-            if the path is the root path 
-            '/' or the path is considered 
-            as to have no parent, e.g. 
-            '/NoParent' or 'NoParent' or
-            the path is empty no 
-            replacement will be made
-            pustrPath must not be NULL
-            
-    @returns the position of the last path
-             separator that was replaced 
-             or 0 if no replacement took
-             place
-             
-  ****************************************/
-  
- sal_Int32 SAL_CALL osl_systemPathGetParent(
-    /*inout*/ rtl_uString* pustrPath);
-  
- /*****************************************
-     osl_systemPathGetFileOrLastDirectoryPart
-    Returns the file or the directory part
-    of the given path
-    
-    @param pustrPath [in] a system path,
-           must not be NULL
-           
-    @param ppustrFileOrDirPart [out] on
-           return receives the last part 
-           of the given directory or the 
-           file name 
-           if pustrPath is the root path
-           '/' an empty string will be 
-           returned
-           if pustrPath has a trailing 
-           '/' the last part before the
-           '/' will be returned else 
-           the part after the last '/'
-           will be returned
-                
-    @returns nothing
-    
-  ****************************************/
- void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
-     const rtl_uString* 	pustrPath,
-    rtl_uString** 		ppustrFileNameOrLastDirPart);
-    
-
- /********************************************
-     osl_systemPathIsHiddenFileOrDirectoryEntry
-    Returns sal_True if the last part of 
-    given system path is not '.' or '..'
-    alone and starts with a '.' 
-    
-    @param pustrPath [in] a system path,
-           must not be NULL
-          
-    @returns sal_True if the last part of
-             the given system path starts
-             with '.' or sal_False the last
-             part is '.' or	'..' alone or
-             doesn't start with a dot
-             
- *********************************************/
- 
- sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
-     const rtl_uString* pustrPath);
- 
-
- /************************************************
-     osl_systemPathIsLocalOrParentDirectoryEntry
-    Returns sal_True if the last part of the given
-    system path is the local directory entry '.'
-    or the parent directory entry '..'
-    
-    @param pustrPath [in] a system path,
-           must not be NULL
-           
-    @returns sal_True if the last part of the 
-             given system path is '.' or '..'
-             else sal_False
-             
- ************************************************/
-
- sal_Bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
-     const rtl_uString* pustrPath);
- 
-
- /************************************************
-      osl_searchPath
-    Searches for a file name or path name in all
-    directories specified by a given path list.
-    Symbolic links in the resulting path will not be 
-    resolved, it's up to the caller to do this.
-    
-    @param pustrFilePath [in] a file name or
-    directory name to search for, the name must
-    be provided as system path not as a file URL
-    
-    @param pustrSearchPathList [in] a ':' 
-    separated list of paths in which to search for
-    the file or directory name
-    
-    @ppustrPathFound [out] on success receives the
-    complete path of the file or directory found
-    as a system path
-    
-    @returns sal_True if the specified file or 
-    directory was found else sal_False
-  ***********************************************/
-  
- sal_Bool SAL_CALL osl_searchPath(
-     const rtl_uString* pustrFilePath,
-    const rtl_uString* pustrSearchPathList,
-    rtl_uString**      ppustrPathFound);
- 
- 
- #ifdef __cplusplus
- }
- #endif
- 
- 
- #endif /* #ifndef _OSL_PATH_HELPER_H_ */
- 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_path_helper.hxx b/sal/osl/os2/file_path_helper.hxx
deleted file mode 100644
index eb4ff975b..000000000
--- a/sal/osl/os2/file_path_helper.hxx
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
-#ifndef _OSL_FILE_PATH_HELPER_HXX_
-#define _OSL_FILE_PATH_HELPER_HXX_
-
-
-#include "file_path_helper.h"
- 
-#include <rtl/ustring.hxx>
-
-
-namespace osl
-{
- 
- /*******************************************
-    systemPathRemoveSeparator
-    Removes the last separator from the 
-    given system path if any and if the path
-    is not the root path '/'
-   
-    @param	ppustrPath [inout] a system path
-            if the path is not the root path
-            and the last character is a 
-            path separator it will be cut off
-               ppustrPath must not be NULL and
-            must point to a valid rtl_uString
-            
-    @returns nothing
-    
-  ******************************************/
-  
- inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
- {
-     osl_systemPathRemoveSeparator(Path.pData);
- }
- 
- /*******************************************
-    systemPathEnsureSeparator
-    Adds a trailing path separator to the
-    given system path if not already there
-    and if the path is not the root path '/'
-  
-      @param 	pustrPath [inout] a system path
-            if the path is not the root path
-            '/' and has no trailing separator
-            a separator will be added
-            ppustrPath must not be NULL and
-            must point to a valid rtl_uString
-            
-    @returns nothing
-    
-  ******************************************/
-  
- inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
- {
-     osl_systemPathEnsureSeparator(&Path.pData);
- }
- 
- /*******************************************
-    systemPathIsRelativePath
-    Returns true if the given path is a 
-    relative path and so starts not with '/'
-    
-    @param 	pustrPath [in] a system path 
-            pustrPath must not be NULL
-            
-    @returns sal_True if the given path 
-             doesn't start with a separator
-             else sal_False will be returned
-             
-  ******************************************/
-  
- inline bool systemPathIsRelativePath(const rtl::OUString& Path)
- {
-    return osl_systemPathIsRelativePath(Path.pData);
- }
- 
- /******************************************
-    systemPathIsAbsolutePath
-    Returns true if the given path is an 
-    absolute path and so starts with a '/'
-    
-    @param pustrPath [in] a system path
-           pustrPath must not be NULL
-           
-    @returns sal_True if the given path 
-             start's with a separator else
-             sal_False will be returned
-             
-  *****************************************/
-  
- inline bool systemPathIsAbsolutePath(const rtl::OUString& Path)
- {
-     return osl_systemPathIsAbsolutePath(Path.pData);
- }
- 
- /******************************************
-    systemPathMakeAbsolutePath
-    Append a relative path to a base path 
-    
-    @param	pustrBasePath [in] a system
-            path that will be considered as
-            base path
-            pustrBasePath must not be NULL 
-            
-    @param	pustrRelPath [in] a system path
-            that will be considered as 
-            relative path 
-            pustrBasePath must not be NULL
-            
-    @param	ppustrAbsolutePath [out] the 
-            resulting path which is a 
-            concatination of the base and 
-            the relative path
-            if base path is empty the 
-            resulting absolute path is the
-            relative path
-            if relative path is empty the
-            resulting absolute path is the
-            base path
-            if base and relative path are 
-            empty the resulting absolute 
-            path is also empty
-            ppustrAbsolutePath must not be
-            NULL and *ppustrAbsolutePath
-            must be 0 or point to a valid
-            rtl_uString
-            
-  *****************************************/
-  
- inline void systemPathMakeAbsolutePath(
-     const rtl::OUString& BasePath, 
-    const rtl::OUString& RelPath, 
-    rtl::OUString& 	     AbsolutePath)
- {
-    osl_systemPathMakeAbsolutePath(
-        BasePath.pData, RelPath.pData, &AbsolutePath.pData);
- }
- 
- /*****************************************
-    systemPathGetParent
-    Replaces the last occurrence of a path
-    separator with '\0' and returns the 
-    position where the '/' was replaced
-    
-    @param	pustrPath [inout] a system
-            path, the last separator of
-            this path will be replaced by
-            a '\0' 
-            if the path is the root path 
-            '/' or the path is considered 
-            as to have no parent, e.g. 
-            '/NoParent' or 'NoParent' or
-            the path is empty no 
-            replacement will be made
-            pustrPath must not be NULL
-            
-    @returns the position of the last path
-             separator that was replaced 
-             or 0 if no replacement took
-             place
-             
-  ****************************************/
-  
- inline sal_Int32 systemPathGetParent(/*inout*/ rtl::OUString& Path)
- {
-    return osl_systemPathGetParent(Path.pData); 
- }
-  
- /*****************************************
-     systemPathGetFileOrLastDirectoryPart
-    Returns the file or the directory part
-    of the given path
-    
-    @param pustrPath [in] a system path,
-           must not be NULL
-           
-    @param ppustrFileOrDirPart [out] on
-           return receives the last part 
-           of the given directory or the 
-           file name 
-           if pustrPath is the root path
-           '/' an empty string will be 
-           returned
-           if pustrPath has a trailing 
-           '/' the last part before the
-           '/' will be returned else 
-           the part after the last '/'
-           will be returned
-                
-    @returns nothing
-    
-  ****************************************/
-   
- inline void systemPathGetFileNameOrLastDirectoryPart(
-     const rtl::OUString& Path,
-    rtl::OUString& 		 FileNameOrLastDirPart)
- {
-    osl_systemPathGetFileNameOrLastDirectoryPart(
-        Path.pData, &FileNameOrLastDirPart.pData);
- }
-    
-
- /********************************************
-     systemPathIsHiddenFileOrDirectoryEntry
-    Returns sal_True if the last part of 
-    given system path is not '.' or '..'
-    alone and starts with a '.' 
-    
-    @param pustrPath [in] a system path,
-           must not be NULL
-          
-    @returns sal_True if the last part of
-             the given system path starts
-             with '.' or sal_False the last
-             part is '.' or	'..' alone or
-             doesn't start with a dot
-             
- *********************************************/
- 
- inline bool systemPathIsHiddenFileOrDirectoryEntry(
-     const rtl::OUString& Path)
- {
-    return osl_systemPathIsHiddenFileOrDirectoryEntry(Path.pData);
- }
- 
-
- /************************************************
-     systemPathIsLocalOrParentDirectoryEntry
-    Returns sal_True if the last part of the given
-    system path is the local directory entry '.'
-    or the parent directory entry '..'
-    
-    @param pustrPath [in] a system path,
-           must not be NULL
-           
-    @returns sal_True if the last part of the 
-             given system path is '.' or '..'
-             else sal_False
-             
- ************************************************/
-
- inline bool systemPathIsLocalOrParentDirectoryEntry(
-     const rtl::OUString& Path)
- {
-    return osl_systemPathIsLocalOrParentDirectoryEntry(Path.pData); 
- }	
- 
- /************************************************
-  searchPath
-  ***********************************************/
- 
- inline bool searchPath(
-     const rtl::OUString& ustrFilePath,
-    const rtl::OUString& ustrSearchPathList,
-    rtl::OUString& ustrPathFound)
- {
-     return osl_searchPath(
-        ustrFilePath.pData, 
-        ustrSearchPathList.pData,
-        &ustrPathFound.pData);
- }
-               
-            
- } // namespace osl
- 
- 
- #endif /* #ifndef _OSL_PATH_HELPER_HXX_ */
- 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_url.cxx b/sal/osl/os2/file_url.cxx
deleted file mode 100644
index 7abcaaa01..000000000
--- a/sal/osl/os2/file_url.cxx
+++ /dev/null
@@ -1,999 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <ctype.h>
-#include "system.h"
-
-#include <limits.h>
-
-#include <errno.h>
-
-#include <stdlib.h>
-
-#include <strings.h>
-
-#include <unistd.h>
-#include <osl/file.h>
-#include <osl/security.h>
-#include <rtl/uri.h>
-#include <osl/diagnose.h>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.h>
-
-#include <osl/thread.h>
-#include <osl/file.hxx>
-#include <osl/mutex.h>
-#include <osl/process.h>
-#include "file_error_transl.h"
-
-#include "file_url.h"
-#include <sal/macros.h>
-#include "file_path_helper.hxx"
- 
-#include "uunxapi.hxx"
-
-#include <wchar.h>
-#include <wctype.h>
-
-/***************************************************
- 
- General note
- 
- This file contains the part that handles File URLs.
- 
- File URLs as scheme specific notion of URIs 
- (RFC2396) may be handled platform independend, but
- will not in osl which is considered wrong.
- Future version of osl should handle File URLs this
- way. In rtl/uri there is already an URI parser etc.
- so this code should be consolidated.
- 
- **************************************************/
- 
-oslMutex g_CurrentDirectoryMutex;
- 
- 
-/***************************************************
- * forward
- **************************************************/
- 
-void _osl_warnFile(const char*, rtl_uString*);
-rtl_uString*  oslMakeUStrFromPsz(const sal_Char* pszStr,rtl_uString** uStr);
- 
-extern "C" int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
-extern "C" int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
-
-/***************************************************
- * namespace directives
- **************************************************/
- 
-using namespace osl;
-
-/******************************************************************************
- *
- *                  Exported Module Functions
- *
- *****************************************************************************/
-
-/* a slightly modified version of Pchar in rtl/source/uri.c */
-const sal_Bool uriCharClass[128] =  
-{ 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* Pchar but without encoding slashes */
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* !"#$%&'()*+,-./  */
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, /* 0123456789:;<=>? */
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* @ABCDEFGHIJKLMNO */
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* PQRSTUVWXYZ[\]^_ */
-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* `abcdefghijklmno */
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0  /* pqrstuvwxyz{|}~  */
-};
-
-
-/* check for top wrong usage strings */
-/*
-static sal_Bool findWrongUsage( const sal_Unicode *path, sal_Int32 len )
-{
-    rtl_uString *pTmp = NULL;
-    sal_Bool bRet;
-    
-    rtl_uString_newFromStr_WithLength( &pTmp, path, len );
-    
-    rtl_ustr_toAsciiLowerCase_WithLength( pTmp->buffer, pTmp->length );
-        
-    bRet = ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "ftp://", 6 ) ) ||
-           ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "http://", 7 ) ) ||
-           ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "vnd.sun.star", 12 ) ) ||
-           ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "private:", 8 ) ) ||
-           ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "slot:", 5) );
-           
-    rtl_uString_release( pTmp );
-    return bRet;
-}
-*/
-
-
-/****************************************************************************/
-/*	osl_getFileURLFromSystemPath */
-/****************************************************************************/
-
-BOOL WINAPI IsValidFilePathComponent(
-    LPCTSTR lpComponent, LPCTSTR *lppComponentEnd, DWORD dwFlags)
-{
-    LPCTSTR	lpComponentEnd = NULL;
-    LPCTSTR	lpCurrent = lpComponent;
-    BOOL	fValid = TRUE;	/* Assume success */
-    TCHAR	cLast = 0;
-
-    /* Path component length must not exceed MAX_PATH */
-
-    while ( !lpComponentEnd && lpCurrent && lpCurrent - lpComponent < _MAX_PATH )
-    {
-        switch ( *lpCurrent )
-        {
-            /* Both backslash and slash determine the end of a path component */
-        case '\0':
-        case '/':
-        case '\\':
-            switch ( cLast )
-            {
-                /* Component must not end with '.' or blank and can't be empty */
-
-            case '.':
-                if ( dwFlags & VALIDATEPATH_ALLOW_ELLIPSE )
-                {
-                    if ( 1 == lpCurrent - lpComponent )
-                    {
-                        /* Current directory is O.K. */
-                        lpComponentEnd = lpCurrent;
-                        break;
-                    }
-                    else if ( 2 == lpCurrent - lpComponent && '.' == *lpComponent )
-                    {
-                        /* Parent directory is O.K. */
-                        lpComponentEnd = lpCurrent;
-                        break;
-                    }
-                }
-            case 0:
-            case ' ':
-                lpComponentEnd = lpCurrent - 1;
-                fValid = FALSE;
-                break;
-            default:
-                lpComponentEnd = lpCurrent;
-                break;
-            }
-            break;
-            /* '?' and '*' are valid wildcards but not valid file name characters */
-        case '?':
-        case '*':
-            if ( dwFlags & VALIDATEPATH_ALLOW_WILDCARDS )
-                break;
-            /* The following characters are reserved */
-        case '<':
-        case '>':
-        case '\"':
-        case '|':
-        case ':':
-            lpComponentEnd = lpCurrent;
-            fValid = FALSE;
-            break;
-        default:
-            /* Characters below ASCII 32 are not allowed */
-            if ( *lpCurrent < ' ' )
-            {
-                lpComponentEnd = lpCurrent;
-                fValid = FALSE;
-            }
-            break;
-        }
-        cLast = *lpCurrent++;
-    }
-
-    /*	If we don't reached the end of the component the length of the component was to long 
-        ( See condition of while loop ) */
-    if ( !lpComponentEnd )
-    {
-        fValid = FALSE;
-        lpComponentEnd = lpCurrent;
-    }
-
-    /* Test wether the component specifies a device name what is not allowed */
-    
-    // MT: PERFORMANCE: 
-    // This is very expensive. A lot of calls to _tcsicmp.
-    // in SRC6870m71 67.000 calls of this method while empty office start result into more than 1.500.00 calls of _tcsicmp!
-    // Possible optimizations
-    // - Array should be const static
-    // - Sorted array, use binary search
-    // - More intelligent check for com1-9, lpt1-9
-    // Maybe make szComponent upper case, don't search case intensitive
-    // Talked to HRO: Could be removed. Shouldn't be used in OOo, and if used for something like a filename, it will lead to an error anyway.
-    /*
-    if ( fValid )
-    {
-        LPCTSTR	alpDeviceNames[] =
-        {
-            TEXT("CON"),
-            TEXT("PRN"),
-            TEXT("AUX"),
-            TEXT("CLOCK$"),
-            TEXT("NUL"),
-            TEXT("LPT1"),
-            TEXT("LPT2"),
-            TEXT("LPT3"),
-            TEXT("LPT4"),
-            TEXT("LPT5"),
-            TEXT("LPT6"),
-            TEXT("LPT7"),
-            TEXT("LPT8"),
-            TEXT("LPT9"),
-            TEXT("COM1"),
-            TEXT("COM2"),
-            TEXT("COM3"),
-            TEXT("COM4"),
-            TEXT("COM5"),
-            TEXT("COM6"),
-            TEXT("COM7"),
-            TEXT("COM8"),
-            TEXT("COM9")
-        };
-        
-        TCHAR	szComponent[MAX_PATH];
-        int		nComponentLength;
-        LPCTSTR	lpDot;
-        int		i;
-
-        // A device name with an extension is also invalid
-        lpDot = _tcschr( lpComponent, '.' );
-
-        if ( !lpDot || lpDot > lpComponentEnd )
-            nComponentLength = lpComponentEnd - lpComponent;
-        else
-            nComponentLength = lpDot - lpComponent;
-
-        _tcsncpy( szComponent, lpComponent, nComponentLength );
-        szComponent[nComponentLength] = 0;
-
-        for ( i = 0; i < sizeof( alpDeviceNames ) / sizeof(LPCTSTR); i++ )
-        {
-            if ( 0 == _tcsicmp( szComponent, alpDeviceNames[i] ) )
-            {
-                lpComponentEnd = lpComponent;
-                fValid = FALSE;
-                break;
-            }
-        }
-    }
-    */
-
-    if ( fValid )
-    {
-        // Empty components are not allowed
-        if ( lpComponentEnd - lpComponent < 1 )
-            fValid = FALSE;
-
-        // If we reached the end of the string NULL is returned
-        else if ( !*lpComponentEnd )
-            lpComponentEnd = NULL;
-
-    }
-
-    if ( lppComponentEnd )
-        *lppComponentEnd = lpComponentEnd;
-
-    return fValid;
-}
-
-//##################################################### 
-DWORD WINAPI IsValidFilePath(LPCTSTR lpszPath, LPCTSTR *lppError, DWORD dwFlags)
-{
-    LPCTSTR	lpComponent;
-    BOOL	fValid = TRUE;
-    DWORD	dwPathType = PATHTYPE_ERROR;
-
-    if ( dwFlags & VALIDATEPATH_ALLOW_RELATIVE )
-        dwFlags |= VALIDATEPATH_ALLOW_ELLIPSE;
-
-    if ( !lpszPath )
-    {
-        fValid = FALSE;
-        lpComponent = lpszPath;
-    }
-
-    /* Test for UNC path notation */
-    if ( 2 == _tcsspn( lpszPath, CHARSET_SEPARATOR ) )
-    {
-        /* Place the pointer behind the leading to backslashes */
-
-        lpComponent = lpszPath + 2;
-
-        fValid = IsValidFilePathComponent( lpComponent, &lpComponent, VALIDATEPATH_ALLOW_ELLIPSE );
-
-        /* So far we have a valid servername. Now let's see if we also have a network resource */
-
-        dwPathType = PATHTYPE_ABSOLUTE_UNC;
-
-        if ( fValid )
-        {
-            if ( lpComponent &&	 !*++lpComponent )
-                lpComponent = NULL;
-            
-            if ( !lpComponent )
-            {
-                dwPathType |= PATHTYPE_IS_SERVER;
-            }
-            else
-            {
-                /* Now test the network resource */
-
-                fValid = IsValidFilePathComponent( lpComponent, &lpComponent, 0 );
-
-                /* If we now reached the end of the path, everything is O.K. */
-
-
-                if ( fValid && (!lpComponent || lpComponent && !*++lpComponent ) )
-                {
-                    lpComponent = NULL;
-                    dwPathType |= PATHTYPE_IS_VOLUME;
-                }
-            }
-        }
-    }
-
-    /* Local path verification. Must start with <drive>: */
-    else if ( _istalpha( lpszPath[0] ) && ':' == lpszPath[1] )
-    {
-        /* Place pointer behind correct drive specification */
-
-        lpComponent = lpszPath + 2;
-
-        if ( 1 == _tcsspn( lpComponent, CHARSET_SEPARATOR ) )
-            lpComponent++;
-        else if ( *lpComponent )
-            fValid = FALSE;
-
-        dwPathType = PATHTYPE_ABSOLUTE_LOCAL;
-
-        /* Now we are behind the backslash or it was a simple drive without backslash */
-
-        if ( fValid && !*lpComponent )
-        {
-            lpComponent = NULL;
-            dwPathType |= PATHTYPE_IS_VOLUME;
-        }
-    }
-
-    /* Can be a relative path */
-    else if ( dwFlags & VALIDATEPATH_ALLOW_RELATIVE )
-    {
-        lpComponent = lpszPath;
-
-        /* Relative path can start with a backslash */
-
-        if ( 1 == _tcsspn( lpComponent, CHARSET_SEPARATOR ) )
-        {
-            lpComponent++;
-            if ( !*lpComponent )
-                lpComponent = NULL;
-        }
-
-        dwPathType = PATHTYPE_RELATIVE;
-    }
-
-    /* Anything else is an error */
-    else
-    {
-        fValid = FALSE;
-        lpComponent = lpszPath;
-    }
-
-    /* Now validate each component of the path */
-    while ( fValid && lpComponent )
-    {
-        fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags );
-
-        if ( fValid && lpComponent )
-        {
-            lpComponent++;
-
-            /* If the string behind the backslash is empty, we've done */
-
-            if ( !*lpComponent )
-                lpComponent = NULL;
-        }
-    }
-    
-    if ( fValid && _tcslen( lpszPath ) >= _MAX_PATH )
-    {
-        fValid = FALSE;
-        lpComponent = lpszPath + _MAX_PATH;
-    }
-
-    if ( lppError )
-        *lppError = lpComponent;
-
-    return fValid ? dwPathType : PATHTYPE_ERROR;
-}
-
-sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedURL )
-{
-    sal_Char		*pBuffer;
-    const sal_Char	*pSrcEnd;
-    const sal_Char	*pSrc;
-    sal_Char		*pDest;
-    sal_Int32		nSrcLen;
-    sal_Bool		bValidEncoded = sal_True;	/* Assume success */
-
-    /* The resulting decoded string length is shorter or equal to the source length */
-
-    nSrcLen = rtl_string_getLength(strUTF8);
-    pBuffer = reinterpret_cast<sal_Char*>(rtl_allocateMemory(nSrcLen + 1));
-
-    pDest = pBuffer;
-    pSrc = rtl_string_getStr(strUTF8);
-    pSrcEnd = pSrc + nSrcLen;
-
-    /* Now decode the URL what should result in an UTF8 string */
-    while ( bValidEncoded && pSrc < pSrcEnd )
-    {
-        switch ( *pSrc )
-        {
-        case '%':
-            {
-                sal_Char	aToken[3];
-                sal_Char	aChar;
-
-                pSrc++;
-                aToken[0] = *pSrc++;
-                aToken[1] = *pSrc++;
-                aToken[2] = 0;
-
-                aChar = (sal_Char)strtoul( aToken, NULL, 16 );
-
-                /* The chars are path delimiters and must not be encoded */
-
-                if ( 0 == aChar || '\\' == aChar || '/' == aChar || ':' == aChar )
-                    bValidEncoded = sal_False;
-                else
-                    *pDest++ = aChar;
-            }
-            break;
-        default:
-            *pDest++ = *pSrc++;
-            break;
-        }
-    }
-
-    *pDest++ = 0;
-    
-    if ( bValidEncoded ) {
-        rtl_string2UString( pstrDecodedURL, pBuffer, rtl_str_getLength(pBuffer), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
-        OSL_ASSERT(*pstrDecodedURL != 0);
-    }
-    
-    rtl_freeMemory( pBuffer );
-
-    return bValidEncoded;
-}
-
-//############################################# 
-void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
-{
-    /* Encode non ascii characters within the URL */
-
-    rtl_String		*strUTF8 = NULL;
-    sal_Char		*pszEncodedURL;
-    const sal_Char	*pURLScan;
-    sal_Char		*pURLDest;
-    sal_Int32		nURLScanLen;
-    sal_Int32		nURLScanCount;
-    
-    rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
-
-    pszEncodedURL = (sal_Char*) rtl_allocateMemory( (rtl_string_getLength( strUTF8 ) * 3 + 1)  * sizeof(sal_Char) );
-
-    pURLDest = pszEncodedURL;
-    pURLScan = rtl_string_getStr( strUTF8 );
-    nURLScanLen = rtl_string_getLength( strUTF8 );
-    nURLScanCount = 0;
-
-    while ( nURLScanCount < nURLScanLen )
-    {
-        sal_Char	cCurrent = *pURLScan;
-
-        switch ( cCurrent )
-        {
-        default:
-            if (!( ( cCurrent >= 'a' && cCurrent <= 'z' ) || ( cCurrent >= 'A' && cCurrent <= 'Z' ) || ( cCurrent >= '0' && cCurrent <= '9' ) ) )
-            {
-                sprintf( pURLDest, "%%%02X", (unsigned char)cCurrent );
-                pURLDest += 3;
-                break;
-            }
-        case '!':
-        case '\'':
-        case '(':
-        case ')':
-        case '*':
-        case '-':
-        case '.':
-        case '_':
-        case '~':
-        case '$':
-        case '&':
-        case '+':
-        case ',':
-        case '=':
-        case '@':
-        case ':':
-        case '/':
-        case '\\':
-        case '|':
-            *pURLDest++ = cCurrent;
-            break;
-        case 0:
-            break;
-        }
-
-        pURLScan++;
-        nURLScanCount++;
-    }
-
-
-    *pURLDest = 0;	    
-
-    rtl_string_release( strUTF8 );        	  
-    rtl_string_newFromStr( pstrEncodedURL, pszEncodedURL );	    
-    rtl_freeMemory( pszEncodedURL );
-}
-
-//#############################################      
-oslFileError SAL_CALL _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** pstrURL )
-{
-    oslFileError nError = osl_File_E_INVAL; /* Assume failure */
-    rtl_uString	*strTempURL = NULL;
-    DWORD dwPathType = PATHTYPE_ERROR;
-
-    if (strPath)
-        dwPathType = IsValidFilePath(strPath->buffer, NULL, VALIDATEPATH_ALLOW_RELATIVE);
-            
-    if (dwPathType)
-    {
-        rtl_uString	*strTempPath = NULL;
-
-        /* Replace backslashes */
-
-        rtl_uString_newReplace( &strTempPath, strPath, '\\', '/' );
-
-        switch ( dwPathType & PATHTYPE_MASK_TYPE )
-        {
-        case PATHTYPE_RELATIVE:
-            rtl_uString_assign( &strTempURL, strTempPath );
-            nError = osl_File_E_None;
-            break;
-        case PATHTYPE_ABSOLUTE_UNC:
-            rtl_uString_newFromAscii( &strTempURL, "file:" );
-            rtl_uString_newConcat( &strTempURL, strTempURL, strTempPath );
-            nError = osl_File_E_None;
-            break;
-        case PATHTYPE_ABSOLUTE_LOCAL:
-            rtl_uString_newFromAscii( &strTempURL, "file:///" );
-            rtl_uString_newConcat( &strTempURL, strTempURL, strTempPath );
-            nError = osl_File_E_None;
-            break;
-        default:
-            break;
-        }
-
-        /* Release temp path */
-
-        rtl_uString_release( strTempPath );
-    }
-
-    if ( osl_File_E_None == nError )
-    {
-        rtl_String	*strEncodedURL = NULL;
-
-        /* Encode the URL */
-
-        _osl_encodeURL( strTempURL, &strEncodedURL );
-
-        /* Provide URL via unicode string */
-
-        rtl_string2UString( pstrURL, rtl_string_getStr(strEncodedURL), rtl_string_getLength(strEncodedURL), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-        OSL_ASSERT(*pstrURL != 0);
-        rtl_string_release( strEncodedURL );
-    }
-
-    /* Release temp URL */
-
-    if ( strTempURL )
-        rtl_uString_release( strTempURL );
-
-    /*
-    OSL_ENSURE_FILE( !nError, "osl_getFileURLFromSystemPath: \"%s\" is not a systemPath !!!", strPath );
-    */
-
-    return nError;
-}
-
-oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, rtl_uString **pustrFileURL )
-{
-    return _osl_getFileURLFromSystemPath( ustrSystemPath, pustrFileURL );
-}
-
-//#############################################      
-oslFileError SAL_CALL _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **pustrPath, sal_Bool bAllowRelative )
-{
-    rtl_String			*strUTF8 = NULL;
-    rtl_uString			*strDecodedURL = NULL;
-    rtl_uString			*strTempPath = NULL;
-    const sal_Unicode	*pDecodedURL;
-    sal_uInt32			nDecodedLen;
-    sal_Bool			bValidEncoded;
-    oslFileError		nError = osl_File_E_INVAL;	/* Assume failure */
-
-    /*  If someone hasn't encoded the complete URL we convert it to UTF8 now to prevent from
-        having a mixed encoded URL later */
-
-    rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
-
-    /* If the length of strUTF8 and strURL differs it indicates that the URL was not correct encoded */
-
-    OSL_ENSURE_FILE( 
-        strUTF8->length == strURL->length || 
-        0 != rtl_ustr_ascii_shortenedCompare_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 )
-        ,"osl_getSystemPathFromFileURL: \"%s\" is not encoded !!!", strURL );
-
-    bValidEncoded = _osl_decodeURL( strUTF8, &strDecodedURL );
-
-    /* Release the encoded UTF8 string */
-
-    rtl_string_release( strUTF8 );
-
-
-    if ( bValidEncoded )
-    {
-        /* Replace backslashes and pipes */
-
-        rtl_uString_newReplace( &strDecodedURL, strDecodedURL, '/', '\\' );
-        rtl_uString_newReplace( &strDecodedURL, strDecodedURL, '|', ':' );
-
-        pDecodedURL = rtl_uString_getStr( strDecodedURL );
-        nDecodedLen = rtl_uString_getLength( strDecodedURL );
-
-        /* Must start with "file://" */
-
-        if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\", 7 ) )
-        {
-            sal_uInt32	nSkip;
-
-            if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\\\", 8 ) )
-                nSkip = 8;
-            else if ( 
-                0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\localhost\\", 17 ) ||
-                0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\127.0.0.1\\", 17 ) 
-            )
-                nSkip = 17;
-            else 
-                nSkip = 5;
-
-            /* Indicates local root */
-            if ( nDecodedLen == nSkip )
-                rtl_uString_newFromStr_WithLength( &strTempPath, (const sal_Unicode*)WSTR_SYSTEM_ROOT_PATH, SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1 );
-            else
-                rtl_uString_newFromStr_WithLength( &strTempPath, pDecodedURL + nSkip, nDecodedLen - nSkip );
-
-            if ( IsValidFilePath( strTempPath->buffer, NULL, VALIDATEPATH_ALLOW_ELLIPSE ) )
-                nError = osl_File_E_None;
-        }
-        else if ( bAllowRelative )	/* This maybe a relative file URL */
-        {
-            rtl_uString_assign( &strTempPath, strDecodedURL );
-
-            if ( IsValidFilePath( strTempPath->buffer, NULL, VALIDATEPATH_ALLOW_RELATIVE | VALIDATEPATH_ALLOW_ELLIPSE ) )
-                nError = osl_File_E_None;
-        }
-    /*
-        else
-            OSL_ENSURE_FILE( !nError, "osl_getSystemPathFromFileURL: \"%s\" is not an absolute FileURL !!!", strURL );
-     */
-
-    }
-    
-    if ( strDecodedURL )
-        rtl_uString_release( strDecodedURL );
-        
-    if ( osl_File_E_None == nError )
-        rtl_uString_assign( pustrPath, strTempPath );
-  
-    if ( strTempPath )
-        rtl_uString_release( strTempPath );
-
-    /*
-    OSL_ENSURE_FILE( !nError, "osl_getSystemPathFromFileURL: \"%s\" is not a FileURL !!!", strURL );
-    */
-
-    return nError;
-}
-
-/****************************************************************************/
-/*	osl_getSystemPathFromFileURL */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath )
-{
-    return _osl_getSystemPathFromFileURL( ustrFileURL, pustrSystemPath, sal_True );
-}
-
-        
-/****************************************************************************
- * osl_getSystemPathFromFileURL_Ex - helper function                          
- * clients may specify if they want to accept relative                      
- * URLs or not                                                              
- ****************************************************************************/
-
-oslFileError osl_getSystemPathFromFileURL_Ex(
-    rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath, sal_Bool bAllowRelative)
-{
-    return _osl_getSystemPathFromFileURL( ustrFileURL, pustrSystemPath, bAllowRelative);
-}
-
-
-#if OSL_DEBUG_LEVEL > 0
-
-    //##################################################### 
-    void _osl_warnFile( const char *message, rtl_uString *ustrFile )
-    {
-        char szBuffer[2048];
-
-        if (ustrFile)
-        {
-            rtl_String	*strFile = NULL;
-
-            rtl_uString2String( &strFile, rtl_uString_getStr( ustrFile ), rtl_uString_getLength( ustrFile ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-            snprintf( szBuffer, sizeof(szBuffer), message, strFile->buffer );
-            rtl_string_release( strFile );
-
-            message = szBuffer;
-        }
-        OSL_FAIL( message );
-    }
-
-#endif // OSL_DEBUG_LEVEL > 0
-
-/******************************************************
- * osl_getAbsoluteFileURL
- ******************************************************/
- 
-//oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL)
-oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL )
-{
-    oslFileError	eError;
-    rtl_uString		*ustrRelSysPath = NULL;
-    rtl_uString		*ustrBaseSysPath = NULL;
-
-    if ( ustrBaseURL && ustrBaseURL->length )
-    {
-        eError = _osl_getSystemPathFromFileURL( ustrBaseURL, &ustrBaseSysPath, sal_False );
-        OSL_ENSURE( osl_File_E_None == eError, "osl_getAbsoluteFileURL called with relative or invalid base URL" );
-
-        eError = _osl_getSystemPathFromFileURL( ustrRelativeURL, &ustrRelSysPath, sal_True );
-    }
-    else
-    {
-        eError = _osl_getSystemPathFromFileURL( ustrRelativeURL, &ustrRelSysPath, sal_False );
-        OSL_ENSURE( osl_File_E_None == eError, "osl_getAbsoluteFileURL called with empty base URL and/or invalid relative URL" );
-    }
-
-    if ( !eError )
-    {
-        CHAR	szBuffer[_MAX_PATH];
-        CHAR	szRelSysPath[_MAX_PATH];
-        CHAR	szCurrentDir[_MAX_PATH];
-        int		result;
-        char*	cwd;
-        int		rc;
-
-/*@@@ToDo
-  Bad, bad hack, this only works if the base path
-  really exists which is not necessary according
-  to RFC2396
-  The whole FileURL implementation should be merged 
-  with the rtl/uri class.
-*/
-        if ( ustrBaseSysPath )
-        {
-            CHAR	szBaseSysPath[_MAX_PATH];
-            
-            if (!g_CurrentDirectoryMutex)
-                g_CurrentDirectoryMutex = osl_createMutex();
-
-            osl_acquireMutex( g_CurrentDirectoryMutex );
-
-            cwd = getcwd( szCurrentDir, sizeof(szCurrentDir) );
-            UnicodeToText( szBaseSysPath, sizeof(szBaseSysPath), ustrBaseSysPath->buffer, ustrBaseSysPath->length);
-            rc = chdir( szBaseSysPath);
-        }
-
-        UnicodeToText( szRelSysPath, sizeof(szRelSysPath), ustrRelSysPath->buffer, ustrRelSysPath->length);
-        result = !_abspath( szBuffer, szRelSysPath, sizeof(szBuffer));
-
-        if ( ustrBaseSysPath )
-        {
-            rc = chdir( szCurrentDir );
-
-            osl_releaseMutex( g_CurrentDirectoryMutex );
-        }
-
-        if ( result )
-        {
-                rtl_uString	*ustrAbsSysPath = NULL;
-
-                oslMakeUStrFromPsz( szBuffer, &ustrAbsSysPath);
-
-                eError = osl_getFileURLFromSystemPath( ustrAbsSysPath, pustrAbsoluteURL );
-
-                if ( ustrAbsSysPath )
-                    rtl_uString_release( ustrAbsSysPath );
-        }
-        else
-            eError = osl_File_E_INVAL;
-    }
-
-    if ( ustrBaseSysPath )
-        rtl_uString_release( ustrBaseSysPath );
-
-    if ( ustrRelSysPath )
-        rtl_uString_release( ustrRelSysPath );
-
-    return	eError;
-}  
-
-
-namespace /* private */
-{
-                        
-    /*********************************************
-     No separate error code if unicode to text
-     conversion or getenv fails because for the
-     caller there is no difference why a file
-     could not be found in $PATH 
-     ********************************************/
- 
-    bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result)
-    {	
-        bool          bfound = false;		
-        rtl::OUString path(RTL_CONSTASCII_USTRINGPARAM("PATH"));
-        rtl::OUString env_path;
-        
-        if (osl_Process_E_None == osl_getEnvironment(path.pData, &env_path.pData))
-            bfound = osl::searchPath(file_path, env_path, result);
-        
-        return bfound;
-    }
-
-    /*********************************************
-     No separate error code if unicode to text
-     conversion or getcwd fails because for the
-     caller there is no difference why a file
-     could not be found in CDW
-     ********************************************/
- 
-    bool find_in_CWD(const rtl::OUString& file_path, rtl::OUString& result)
-    {		
-        bool bfound = false;		
-        rtl::OUString cwd_url;
-        
-        if (osl_Process_E_None == osl_getProcessWorkingDir(&cwd_url.pData))
-        {
-            rtl::OUString cwd;
-            FileBase::getSystemPathFromFileURL(cwd_url, cwd);			
-            bfound = osl::searchPath(file_path, cwd, result);
-        }
-        return bfound;
-    }
-    
-    /*********************************************
-
-     ********************************************/
- 
-    bool find_in_searchPath(const rtl::OUString& file_path, rtl_uString* search_path, rtl::OUString& result)
-    {
-        return (search_path && osl::searchPath(file_path, rtl::OUString(search_path), result));
-    }
-
-} // end namespace private
-
-
-/****************************************************************************
- *	osl_searchFileURL 
- ***************************************************************************/
- 
-oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearchPath, rtl_uString** pustrURL)
-{
-    OSL_PRECOND(ustrFilePath && pustrURL, "osl_searchFileURL: invalid parameter");
-    
-    FileBase::RC  rc;
-    rtl::OUString file_path;
-        
-    // try to interpret search path as file url else assume it's a system path list
-    rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrFilePath), file_path);
-    if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))
-        file_path = ustrFilePath; 
-    else if (FileBase::E_None != rc)
-        return oslFileError(rc);
-
-    bool          bfound = false;	
-    rtl::OUString result;	
-            
-    if (find_in_searchPath(file_path, ustrSearchPath, result) || 
-        find_in_PATH(file_path, result) || 
-        find_in_CWD(file_path, result))	
-    { 
-        rtl::OUString resolved;
-        
-        if (osl::realpath(result, resolved))
-        {
-#if OSL_DEBUG_LEVEL > 0            
-            oslFileError osl_error = 
-#endif             
-                osl_getFileURLFromSystemPath(resolved.pData, pustrURL);		
-            OSL_ASSERT(osl_File_E_None == osl_error);
-            bfound = true;
-        }
-    }    
-    return bfound ? osl_File_E_None : osl_File_E_NOENT;
-}
-
-
-/****************************************************************************
- * FileURLToPath 
- ***************************************************************************/
-
-oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL)
-{
-    rtl_uString* ustrSystemPath = NULL;
-    oslFileError osl_error		= osl_getSystemPathFromFileURL(ustrFileURL, &ustrSystemPath);
-            
-    if(osl_File_E_None != osl_error)
-        return osl_error;
-
-    osl_systemPathRemoveSeparator(ustrSystemPath);
-        
-    /* convert unicode path to text */
-    if(!UnicodeToText( buffer, bufLen, ustrSystemPath->buffer, ustrSystemPath->length))
-        osl_error = oslTranslateFileError(OSL_FET_ERROR, errno); 
-        
-    rtl_uString_release(ustrSystemPath);
-    
-    return osl_error;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_url.h b/sal/osl/os2/file_url.h
deleted file mode 100644
index bd4f31788..000000000
--- a/sal/osl/os2/file_url.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
- /***************************************************
-  * Internal header file, declares all functions 
-  * that are not part of the offical API and are 
-  * not defined in the osl header files
-  **************************************************/
- 
- #ifndef _FILE_URL_H_
- #define _FILE_URL_H_
- 
- #ifndef _FILE_H_
- #include <osl/file.h>
- #endif
- 
-
-/***************************************************
- * constants
- **************************************************/
-
-#define _tcslen(a)		wcslen((const wchar_t *) a)
-#define _tcsspn(a,b)	wcsspn((const wchar_t *) a, (const wchar_t *) b)
-#define _istalpha(a)	iswalpha((wint_t) a)
-
-const sal_Unicode UNICHAR_SLASH = ((sal_Unicode)'/');
-const sal_Unicode UNICHAR_COLON = ((sal_Unicode)':');
-const sal_Unicode UNICHAR_DOT   = ((sal_Unicode)'.');
-
-#if OSL_DEBUG_LEVEL > 0
-#define OSL_ENSURE_FILE( cond, msg, file ) ( (cond) ?  (void)0 : _osl_warnFile( msg, file ) )
-#else
-#define OSL_ENSURE_FILE( cond, msg, file ) ((void)0)
-#endif
-
-typedef sal_Unicode            				TCHAR;
-typedef sal_Unicode           				*LPTSTR;
-typedef const sal_Unicode     				*LPCTSTR;
-typedef wchar_t           				*LPWSTR;
-typedef const wchar_t     				*LPCWSTR;
-typedef sal_Unicode							DWORD;
-#define WINAPI
-
-#define	CHARSET_SEPARATOR					L"\\/"
-#define WSTR_SYSTEM_ROOT_PATH				L"\\\\.\\"
-
-
-/******************************************************************************
- *
- *                  Data Type Definition
- *
- ******************************************************************************/
-
-#define PATHTYPE_ERROR						0
-#define PATHTYPE_RELATIVE					1
-#define PATHTYPE_ABSOLUTE_UNC				2
-#define PATHTYPE_ABSOLUTE_LOCAL				3
-#define PATHTYPE_MASK_TYPE					0xFF
-#define PATHTYPE_IS_VOLUME					0x0100
-#define PATHTYPE_IS_SERVER					0x0200
-
-#define VALIDATEPATH_NORMAL					0x0000
-#define VALIDATEPATH_ALLOW_WILDCARDS		0x0001
-#define VALIDATEPATH_ALLOW_ELLIPSE			0x0002
-#define VALIDATEPATH_ALLOW_RELATIVE			0x0004
-#define VALIDATEPATH_ALLOW_UNC				0x0008
-
-typedef struct {
-    UINT			uType;
-    rtl_uString* 	ustrDrive;
-    rtl_uString* 	ustrFilePath;	/* holds native directory path */
-    int				d_attr;			/* OS/2 file attributes */
-    int				nRefCount;
-}DirectoryItem_Impl;
-
-#define	DIRECTORYTYPE_LOCALROOT	    0
-#define	DIRECTORYTYPE_NETROOT		1
-#define	DIRECTORYTYPE_NETRESORCE	2
-#define	DIRECTORYTYPE_FILESYSTEM	3
-
-#define DIRECTORYITEM_DRIVE		0
-#define DIRECTORYITEM_FILE		1
-#define DIRECTORYITEM_SERVER	2
-
-typedef struct
-{
-    UINT		 uType;
-    rtl_uString* ustrPath;           /* holds native directory path */
-    DIR*         pDirStruct;
-    ULONG		 ulDriveMap;
-    ULONG		 ulNextDrive;
-    ULONG		 ulNextDriveMask;
-} DirectoryImpl;
-
-/* Different types of paths */
-typedef enum _PATHTYPE
-{
-    PATHTYPE_SYNTAXERROR = 0,
-    PATHTYPE_NETROOT,
-    PATHTYPE_NETSERVER,
-    PATHTYPE_VOLUME,
-    PATHTYPE_FILE
-} PATHTYPE;
-
-DWORD WINAPI IsValidFilePath(LPCTSTR, LPCTSTR*, DWORD);
-
-typedef struct
-{
-    rtl_uString* ustrFilePath;      /* holds native file path */
-    int fd;
-    sal_Bool bLocked;
-} oslFileHandleImpl;
-
-
-typedef struct _oslVolumeDeviceHandleImpl
-{
-    sal_Char pszMountPoint[PATH_MAX];
-    sal_Char pszFilePath[PATH_MAX];
-    sal_Char pszDevice[PATH_MAX];
-    sal_Char ident[4];
-    sal_uInt32   RefCount;
-} oslVolumeDeviceHandleImpl;
-
-/* OS error to errno values mapping table */
-struct errentry {
-    unsigned long oscode;	/* OS return value */
-    int errnocode;			/* System V error code */
-};
-
-#ifdef __cplusplus
-extern "C" 
-{
-#endif
- 
-/**************************************************
-* _osl_getSystemPathFromFileURL
-*************************************************/
-
-#define FURL_ALLOW_RELATIVE sal_True
-#define FURL_DENY_RELATIVE  sal_False
-
-oslFileError osl_getSystemPathFromFileURL_Ex(rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath, sal_Bool bAllowRelative);
-
-/**************************************************
-* FileURLToPath
-*************************************************/
-
-oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* #define _FILE_URL_H_ */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/helpers/debug.h b/sal/osl/os2/helpers/debug.h
deleted file mode 100644
index 5c17aec9e..000000000
--- a/sal/osl/os2/helpers/debug.h
+++ /dev/null
@@ -1,1771 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *@@sourcefile debug.h:
- *      header file for debug.c (exception handling and debugging).
- *      See remarks there.
- *
- *      Note: Version numbering in this file relates to XWorkplace version
- *            numbering.
- *
- *@@changed V0.9.0: included contents of newexe.h
- *
- *@@include #define INCL_BASE
- *@@include #include <os2.h>
- *@@include #include <stdio.h>
- *@@include #include "helpers\debug.h"
- */
-
-/*
- *      This file incorporates code from the following:
- *      -- Marc Fiammante, John Currier, Kim Rasmussen,
- *         Anthony Cruise (EXCEPT3.ZIP package for a generic
- *         exception handling DLL, available at Hobbes).
- *
- *      This file Copyright (C) 1992-99 Ulrich M�ller,
- *                                      Kim Rasmussen,
- *                                      Marc Fiammante,
- *                                      John Currier,
- *                                      Anthony Cruise.
- *
- *      2009-06-15 published under LGPL3 with Ulrich M�ller permission.
- *
- */
-
-#ifndef DEBUG_HEADER_INCLUDED
-    #define DEBUG_HEADER_INCLUDED
-
-    /********************************************************************
-     *
-     *   SYM file declarations
-     *
-     ********************************************************************/
-
-    // Pointer means offset from beginning of file or beginning of struct
-    #pragma pack(1)
-
-    typedef struct
-    {
-        unsigned short int ppNextMap;     // paragraph pointer to next map
-        unsigned char      bFlags;        // symbol types
-        unsigned char      bReserved1;    // reserved
-        unsigned short int pSegEntry;     // segment entry point value
-        unsigned short int cConsts;       // count of constants in map
-        unsigned short int pConstDef;     // pointer to constant chain
-        unsigned short int cSegs;         // count of segments in map
-        unsigned short int ppSegDef;      // paragraph pointer to first segment
-        unsigned char      cbMaxSym;      // maximum symbol-name length
-        unsigned char      cbModName;     // length of module name
-        char               achModName[1]; // cbModName Bytes of module-name member
-    } MAPDEF;
-
-    typedef struct
-    {
-        unsigned short int ppNextMap;     // always zero
-        unsigned char      release;       // release number (minor version number)
-        unsigned char      version;       // major version number
-    } LAST_MAPDEF;
-
-    typedef struct
-    {
-        unsigned short int ppNextSeg;     // paragraph pointer to next segment
-        unsigned short int cSymbols;      // count of symbols in list
-        unsigned short int pSymDef;       // offset of symbol chain
-        unsigned short int wReserved1;    // reserved
-        unsigned short int wReserved2;    // reserved
-        unsigned short int wReserved3;    // reserved
-        unsigned short int wReserved4;    // reserved
-        unsigned char      bFlags;        // symbol types; bit 0 signals 32-bit (*UM)
-        unsigned char      bReserved1;    // reserved
-        unsigned short int ppLineDef;     // offset of line number record
-        unsigned char      bReserved2;    // reserved
-        unsigned char      bReserved3;    // reserved
-        unsigned char      cbSegName;     // length of segment name
-        char               achSegName[1]; /* cbSegName Bytes of segment-name member*/
-    } SEGDEF;
-
-    typedef struct
-    {
-        unsigned short int wSymVal;       // symbol address or constant
-        unsigned char      cbSymName;     // length of symbol name
-        char               achSymName[1]; // cbSymName Bytes of symbol-name member
-    } SYMDEF16;
-
-    typedef struct
-    {
-        unsigned       int wSymVal;       // symbol address or constant
-        unsigned char      cbSymName;     // length of symbol name
-        char               achSymName[1]; // cbSymName Bytes of symbol-name member
-    } SYMDEF32;
-
-    typedef struct
-    {
-        unsigned short int ppNextLine;    // ptr to next linedef (0 if last)
-        unsigned short int wReserved1;    // reserved
-        unsigned short int pLines;        // pointer to line numbers
-        unsigned short int cLines;        // reserved
-        unsigned char      cbFileName;    // length of filename
-        char               achFileName[1];// cbFileName Bytes of filename
-    } LINEDEF;
-
-    typedef struct
-    {
-        unsigned short int wCodeOffset;   // executable offset
-        unsigned short int dwFileOffset;  // source offset
-    } LINEINF;
-
-    #define SEGDEFOFFSET(MapDef)     (MapDef.ppSegDef*16)
-    #define NEXTSEGDEFOFFSET(SegDef)  (SegDef.ppNextSeg*16)
-
-    #define ASYMPTROFFSET(SegDefOffset,Segdef) (SegDefOffset+SegDef.pSymDef)
-    #define SYMDEFOFFSET(SegDefOffset,SegDef,n) (ASYMPTROFFSET(SegDefOffset,SegDef)+(n)*(sizeof(unsigned short int)))
-
-    #define ACONSTPTROFFSET(MapDef) (MapDef.ppConstDef)
-    #define CONSTDEFOFFSET(MapDef,n) ((MapDef.ppConstDef)+(n)*(sizeof(unsigned short int)))
-
-    #define LINEDEFOFFSET(SegDef) (SegDef.ppLineDef*16)
-    #define NEXTLINEDEFOFFSET(LineDef) (LineDef.ppNextLine*16)
-    #define LINESOFFSET(LinedefOffset,LineDef) ((LinedefOffset)+LineDef.pLines)
-
-    /********************************************************************
-     *
-     *   EXE declarations taken from exe.h
-     *
-     ********************************************************************/
-
-    #ifndef WORD
-    typedef unsigned short WORD;
-    #endif
-
-    typedef WORD bbmask;
-
-    struct exe {
-            WORD eid;                       // contains EXEID, below
-            WORD elast;                     // # of bytes in last page
-            WORD epagsiz;                   // # of pages in whole file
-            WORD erelcnt;                   // # of relocation entrys
-            WORD ehdrsiz;                   // size of header, in paragraphs
-            WORD eminfre;                   // min # of free paragraphs needed
-            WORD emaxfre;                   // max # of free paragraphs needed
-            WORD eiSS;                      // initial SS value
-            WORD eiSP;                      // initial SP value
-            WORD enegsum;                   // negative sum of entire file
-            WORD eiIP;                      // initial IP value
-            WORD eiCS;                      // initial CS value
-            WORD ereloff;                   // offset in file of relocation table
-            WORD eovlnum;                   // number of the overlay
-
-    /*      the following fields may not be present.
-     *              ereloff = 28            not present
-     *                      = 30            exe.ever present and valid
-     *                      = 32            exe.ever field contains garbage
-     *              ereloff > 32            exe.ever present and valid
-     *                                              = 0 if "don't know"
-     */
-
-            WORD ever;                      // version # of producing linker
-            WORD dumy;                      // unused
-
-    /*      the following fields may not be present - if the exe.ereloff
-     *      value encompasses the fields then they are present and valid.
-     */
-
-            bbmask  ebb;                    // behavior bits
-            WORD dumy2[7];                  // must be 0 until defined
-    };
-
-
-    #define EXEID 0x5a4d                    // magic ID value
-
-    /********************************************************************
-     *
-     *   Object Module Format (OMF) declarations
-     *
-     ********************************************************************/
-
-    struct exehdr_rec
-    {
-       BYTE     signature[2];              // Must be "MZ"
-       USHORT   image_len;                 // Image Length
-       USHORT   pages;                     // Pages
-       USHORT   reloc_items;               // Relocation table items
-       USHORT   min_paragraphs;            // Mininum 16-bytes paragraphs
-       USHORT   max_paragraphs;            // Maximum 16-bytes paragraphs
-       USHORT   stack_pos;                 // Stack position
-       USHORT   offset_in_sp;              // Offset in SP
-       USHORT   checksum;                  // Checksum
-       USHORT   offset_in_ip;              // Offset in IP
-       USHORT   code_pos;                  // Code segment pos.
-       USHORT   reloc_item_pos;            // Position of first relocation item
-       USHORT   overlay_number;            // Overlay number
-       BYTE     unused[8];                 // Unused bytes
-       USHORT   oem_id;                    // OEM Identifier
-       BYTE     oem_info[24];              // OEM Info
-       ULONG    lexe_offset;               // Offset to linear header
-    };
-
-    struct lexehdr_rec
-    {
-       BYTE     signature[2];              // Must be "LX"
-       BYTE     b_ord;                     // Byte ordering
-       BYTE     w_ord;                     // Word ordering
-       ULONG    format_level;              // Format level
-       USHORT   cpu_type;                  // CPU Type
-       USHORT   os_type;                   // Operating system
-       ULONG    module_version;            // Module version
-       ULONG    mod_flags;                 // Module flags
-       ULONG    mod_pages;                 // Module pages
-       ULONG    EIP_object;                // EIP Object no.
-       ULONG    EIP;                       // EIP Value
-       ULONG    ESP_object;                // ESP Object no
-       ULONG    ESP;                       // ESP Value
-       ULONG    page_size;                 // Page size
-       ULONG    page_ofs_shift;            // Page offset shift
-       ULONG    fixup_sect_size;           // Fixup section size
-       ULONG    fixup_sect_checksum;       // Fixup section checksum
-       ULONG    loader_sect_size;          // Loader section size
-       ULONG    loader_sect_checksum;      // Loader section checksum
-       ULONG    obj_table_ofs;             // Object table offset
-       ULONG    obj_count;                 // Object count
-       ULONG    obj_page_tab_ofs;          // Object page table offset
-       ULONG    obj_iter_page_ofs;         // Object iteration pages offset
-       ULONG    res_tab_ofs;               // Resource table offset
-       ULONG    res_table_entries;         // Resource table entries
-       ULONG    res_name_tab_ofs;          // Resident name table offset;
-       ULONG    ent_tab_ofs;               // Entry table offset
-       ULONG    mod_dir_ofs;               // Module directives offset
-       ULONG    mod_dir_count;             // Number of module directives
-       ULONG    fixup_page_tab_ofs;        // Fixup page table offset
-       ULONG    fixup_rec_tab_ofs;         // Fixup record table offset
-       ULONG    imp_tab_ofs;               // Import module table offset
-       ULONG    imp_mod_entries;           // Import module entries
-       ULONG    imp_proc_tab_ofs;          // Import proc table offset
-       ULONG    per_page_check_ofs;        // Per page checksum offset
-       ULONG    data_page_offset;          // Data pages offset
-       ULONG    preload_page_count;        // Preload pages count
-       ULONG    nonres_tab_ofs;            // Nonresident name table offset
-       ULONG    nonres_tab_len;            // Nonresident name table len
-       ULONG    nonres_tab_check;          // Nonresident tables checksum
-       ULONG    auto_ds_objectno;          // Auto DS object number
-       ULONG    debug_info_ofs;            // Debug info offset
-       ULONG    debug_info_len;            // Debug info length
-       ULONG    inst_preload_count;        // Instance preload count
-       ULONG    inst_demand_count;         // Instance demand count
-       ULONG    heapsize;                  // Heap size
-       ULONG    stacksize;                 // Stack size
-    };
-
-    struct debug_head_rec
-    {
-       BYTE signature[3];                  // Debug signature
-       BYTE type;                          // Debug info type
-    };
-
-    struct dir_inf_rec
-    {
-       USHORT   dirstruct_size;            // Size of directory structure
-       USHORT   number_of_entries;         // Number of dnt_rec's in the array
-       USHORT   unknown;                   // Unknown data
-       // Followed by an array of dnt_rec structures
-    };
-
-    struct dnt_rec
-    {
-       USHORT   subsect_type;              // sst Subsection type
-       USHORT   mod_index;                 // Module index (1-based)
-       ULONG    offset;                    // Offset of start of section
-       ULONG    size;                      // Size of section
-    };
-
-    // Modules subsection
-    struct modules_rec
-    {
-       USHORT   code_seg_base;             // Code segment base
-       ULONG    code_seg_offset;           // Code segment offset
-       ULONG    code_seg_len;              // Code segment length
-       USHORT   overlay_no;                // Overlay number
-       USHORT   lib_idx;                   // Index into library section or 0
-       BYTE     segments;                  // Number of segments
-       BYTE     reserved;
-       BYTE     debug_style[2];            // "HL" for HLL, "CV" or 0 for CodeView
-       BYTE     debug_version[2];          // 00 01 or 00 03 for HLL, 00 00 for CV
-       BYTE     name_len;                  // Length of name (which follows)
-    };
-
-    // Publics subsection
-    struct publics_rec
-    {
-       ULONG    offset;                    // Offset
-       USHORT   segment;                   // Segment
-       USHORT   type;                      // Type index
-       BYTE     name_len;                  // Length of name (wich follows)
-    };
-
-    // First linenumber record
-    struct linfirst_rec
-    {
-       USHORT   lineno;                    // Line number (0)
-       BYTE     entry_type;                // Entry type
-       BYTE     reserved;                  // Reserved
-       USHORT   entries_count;             // Number of table entries
-       USHORT   segment_no;                // Segment number
-       ULONG    filename_tabsize;          // File names table size
-    };
-
-    // Source line numbers
-    struct linsource_rec
-    {
-       USHORT   source_line;               // Source file line number
-       USHORT   source_idx;                // Source file index
-       ULONG    offset;                    // Offset into segment
-    };
-
-    // Listing statement numbers
-    struct linlist_rec
-    {
-       ULONG    list_line;                 // Listing file linenumber
-       ULONG    statement;                 // Listing file statement number
-       ULONG    offset;                    // Offset into segment
-    };
-
-    // Source and Listing statement numbers
-    struct linsourcelist_rec
-    {
-       USHORT   source_line;               // Source file line number
-       USHORT   source_idx;                // Source file index
-       ULONG    list_line;                 // Listing file linenumber
-       ULONG    statement;                 // Listing file statement number
-       ULONG    offset;                    // Offset into segment
-    };
-
-    // Path table
-    struct pathtab_rec
-    {
-       ULONG    offset;                    // Offset into segment
-       USHORT   path_code;                 // Path code
-       USHORT   source_idx;                // Source file index
-    };
-
-    // File names table
-    struct filenam_rec
-    {
-       ULONG    first_char;                // First displayable char in list file
-       ULONG    disp_chars;                // Number of displayable chars in list line
-       ULONG    filecount;                 // Number of source/listing files
-    };
-
-    // Symbol types
-    #define SYM_BEGIN          0x00        // Begin block
-    #define SYM_PROC           0x01        // Function
-    #define SYM_END            0x02        // End block of function
-    #define SYM_AUTO           0x04        // Auto variable
-    #define SYM_STATIC         0x05        // Static variable
-    #define SYM_LABEL          0x0B        // Label
-    #define SYM_WITH           0x0C        // With start symbol (not used)
-    #define SYM_REG            0x0D        // Register variable
-    #define SYM_CONST          0x0E        // Constant
-    #define SYM_ENTRY          0x0F        // Secondary entry (not in C)
-    #define SYM_SKIP           0x10        // For incremental linking (not used)
-    #define SYM_CHANGESEG      0x11        // Change segment (#pragma alloc_text)
-    #define SYM_TYPEDEF        0x12        // Typedef variable
-    #define SYM_PUBLIC         0x13        // Public reference
-    #define SYM_MEMBER         0x14        // Member of minor or major structure
-    #define SYM_BASED          0x15        // Based variable
-    #define SYM_TAG            0x16        // Tag in struct, union, enum ...
-    #define SYM_TABLE          0x17        // Table (used in RPG - not C)
-    #define SYM_MAP            0x18        // Map variable (extern in C)
-    #define SYM_CLASS          0x19        // Class symbol (C++)
-    #define SYM_MEMFUNC        0x1A        // Member function
-    #define SYM_AUTOSCOPE      0x1B        // Scoped auto for C++ (not used)
-    #define SYM_STATICSCOPE    0x1C        // scoped static for C++ (not used)
-    #define SYM_CPPPROC        0x1D        // C++ Proc
-    #define SYM_CPPSTAT        0x1E        // C++ Static var
-    #define SYM_COMP           0x40        // Compiler information
-
-    // Symbolic begin record
-    struct symbegin_rec
-    {
-       ULONG    offset;                    // Segment offset
-       ULONG    length;                    // Length of block
-       BYTE     name_len;                  // Length of block name
-       // Block name follows
-    };
-
-    // Symbolic auto var record
-    struct symauto_rec
-    {
-       ULONG    stack_offset;              // Stack offset
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Var name follows
-    };
-
-    // Symbolic procedure record
-    struct symproc_rec
-    {
-       ULONG    offset;                    // Segment offset
-       USHORT   type_idx;                  // Type index
-       ULONG    length;                    // Length of procedure
-       USHORT   pro_len;                   // Length of prologue
-       ULONG    pro_bodylen;               // Length of prologue + body
-       USHORT   class_type;                // Class type
-       BYTE     near_far;                  // Near or far
-       BYTE     name_len;                  // Length of name
-       // Function name follows
-    };
-
-    // Symbolic static var record
-    struct symstatic_rec
-    {
-       ULONG    offset;                    // Segment offset
-       USHORT   segaddr;                   // Segment address
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Var name follows
-    };
-
-    // Symbolic label var record
-    struct symlabel_rec
-    {
-       ULONG    offset;                    // Segment offset
-       BYTE     near_far;                  // Near or far
-       BYTE     name_len;                  // Length of name
-       // Var name follows
-    };
-
-    // Symbolic register var record
-    struct symreg_rec
-    {
-       USHORT   type_idx;                  // Type index
-       BYTE     reg_no;                    // Register number
-       BYTE     name_len;                  // Length of name
-       // Var name follows
-    };
-
-    // Symbolic change-segment record
-    struct symseg_rec
-    {
-       USHORT   seg_no;                    // Segment number
-    };
-
-    // Symbolic typedef record
-    struct symtypedef_rec
-    {
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Symbolic public record
-    struct sympublic_rec
-    {
-       ULONG    offset;                    // Segment offset
-       USHORT   segaddr;                   // Segment address
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Symbolic member record
-    struct symmember_rec
-    {
-       ULONG    offset;                    // Offset to subrecord
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Symbolic based record
-    struct symbased_rec
-    {
-       ULONG    offset;                    // Offset to subrecord
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Symbolic tag record
-    struct symtag_rec
-    {
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Symbolic table record
-    struct symtable_rec
-    {
-       ULONG    offset;                    // Segment offset
-       USHORT   segaddr;                   // Segment address
-       USHORT   type_idx;                  // Type index
-       ULONG    idx_ofs;                   // Index offset to subrecord
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Type record
-    struct type_rec
-    {
-       USHORT   length;                    // Length of sub-record
-       BYTE     type;                      // Sub-record type
-       BYTE     type_qual;                 // Type qualifier
-    };
-
-    // Types
-    #define TYPE_CLASS         0x40        // Class
-    #define TYPE_BASECLASS     0x41        // Base class
-    #define TYPE_FRIEND        0x42        // Friend
-    #define TYPE_CLASSDEF      0x43        // Class definition
-    #define TYPE_MEMBERFUNC    0x45        // Member function
-    #define TYPE_CLASSMEMBER   0x46        // Class member
-    #define TYPE_REF           0x48        // Reference
-    #define TYPE_MEMBERPTR     0x49        // Member pointer
-    #define TYPE_SCALARS       0x51        // Scalars
-    #define TYPE_SET           0x52        // Set
-    #define TYPE_ENTRY         0x53        // Entry
-    #define TYPE_FUNCTION      0x54        // Function
-    #define TYPE_AREA          0x55        // Area
-    #define TYPE_LOGICAL       0x56        // Logical
-    #define TYPE_STACK         0x57        // Stack
-    #define TYPE_MACRO         0x59        // Macro
-    #define TYPE_BITSTRING     0x5C        // Bit string
-    #define TYPE_USERDEF       0x5D        // User defined
-    #define TYPE_CHARSTR       0x60        // Character string
-    #define TYPE_PICTURE       0x61        // Picture
-    #define TYPE_GRAPHIC       0x62        // Graphic
-    #define TYPE_FORMATLAB     0x65        // Format label
-    #define TYPE_FILE          0x67        // File
-    #define TYPE_SUBRANGE      0x6F        // Subrange
-    #define TYPE_CODELABEL     0x72        // Code label
-    #define TYPE_PROCEDURE     0x75        // Procedure
-    #define TYPE_ARRAY         0x78        // Array
-    #define TYPE_STRUCT        0x79        // Structure / Union / Record
-    #define TYPE_POINTER       0x7A        // Pointer
-    #define TYPE_ENUM          0x7B        // Enum
-    #define TYPE_LIST          0x7F        // List
-
-    // Type userdef
-    struct type_userdefrec
-    {
-       BYTE     FID_index;                 // Field ID
-       USHORT   type_index;                // Type index
-       BYTE     FID_string;                // String ID
-       BYTE     name_len;                  // Length of name which follows
-    };
-
-    // Type function
-    struct type_funcrec
-    {
-       USHORT   params;
-       USHORT   max_params;
-       BYTE     FID_index;                 // Field ID
-       USHORT   type_index;                // Type index of return value
-       BYTE     FID_index1;                // String ID
-       USHORT   typelist_index;            // Index of list of params
-    };
-
-    // Type struct
-    struct type_structrec
-    {
-       ULONG    size;                      // Size of structure
-       USHORT   field_count;               // Number of fields in structure
-       BYTE     FID_index;                 // Field ID
-       USHORT   type_list_idx;             // Index to type list
-       BYTE     FID_index1;                // Field ID
-       USHORT   type_name_idx;             // Index to names / offsets
-       BYTE     dont_know;                 // Haven't a clue, but it seems to be needed
-       BYTE     name_len;                  // Length of structure name which follows
-    };
-
-    // Type list, type qualifier 1: contains types for structures
-    // This record is repeated for the number of items in the structure definition
-    struct type_list1
-    {
-       BYTE     FID_index;                 // Field identifier for index
-       USHORT   type_index;                // Type index.
-    };
-
-    // Type list, type qualifier 2: contains names and offsets for structure items
-    // This record is repeated for the number of items in the structure definition
-    struct type_list2
-    {
-       BYTE     FID_string;                // String identifier
-       BYTE     name_len;                  // Length of name which follows
-    };
-
-    // Type list, subrecord to the above, contains offset of variable in the structure
-    struct type_list2_1
-    {
-       BYTE     FID_span;                  // Defines what type of variable follows
-       union {
-          BYTE   b_len;
-          USHORT s_len;
-          ULONG  l_len;
-       } u;
-    };
-
-    // Type pointer
-    struct type_pointerrec
-    {
-       BYTE     FID_index;                 // Index identifier
-       USHORT   type_index;                // Type index
-       BYTE     FID_string;                // String identifier
-       BYTE     name_len;                  // Length of name which follows
-    };
-
-    /********************************************************************
-     *
-     *   Prototypes
-     *
-     ********************************************************************/
-
-    BOOL dbgPrintStackFrame(FILE *LogFile,
-                            PSZ pszModuleName,  // in: module name (fully q'fied)
-                            ULONG ulObject,
-                            ULONG ulOffset);
-
-    VOID dbgPrintStack(FILE *file,
-                       PUSHORT StackBottom,
-                       PUSHORT StackTop,
-                       PUSHORT Ebp,
-                       PUSHORT ExceptionAddress);
-
-    APIRET APIENTRY DosQueryModFromEIP(HMODULE *phMod,   // out: trapping module
-                                       ULONG *pulObjNum, // out: object/segment number
-                                       ULONG ulBuffLen,  // in:  sizeof(*pszBuff)
-                                       CHAR *pszBuff,    // out: module name
-                                       ULONG *pulOffset, // out: offset in module
-                                       ULONG ulAddress); // in:  address to be analyzed
-
-    APIRET APIENTRY DOSQUERYMODFROMEIP(HMODULE * phMod,
-                                       ULONG * pObjNum,
-                                       ULONG BuffLen,
-                                       PCHAR pBuff,
-                                       ULONG * pOffset,
-                                       PVOID Address);
-
-    typedef ULONG  *_Seg16 PULONG16;
-    APIRET16 APIENTRY16 DOS16SIZESEG(USHORT Seg, PULONG16 Size);
-    typedef         APIRET16(APIENTRY16 _PFN16) (VOID);
-    ULONG APIENTRY  DosSelToFlat(ULONG);
-
-    APIRET16 APIENTRY16 DOSQPROCSTATUS(ULONG * _Seg16 pBuf, USHORT cbBuf);
-
-    #define CONVERT(fp,QSsel) MAKEP((QSsel),OFFSETOF(fp))
-
-    #pragma pack()              // added V0.9.0
-
-
-    /********************************************************************
-     *
-     *   Executable definitions
-     *
-     ********************************************************************/
-
-    #define EXE386 1
-
-    #ifndef __NEWEXE__
-        #define __NEWEXE__
-
-        #pragma pack(1)
-
-        /*_________________________________________________________________*
-         |                                                                 |
-         |                                                                 |
-         |  DOS3 .EXE FILE HEADER DEFINITION                               |
-         |                                                                 |
-         |_________________________________________________________________|
-         *                                                                 */
-
-
-        #define EMAGIC          0x5A4D          // Old magic number
-        #define ENEWEXE         sizeof(struct exe_hdr)
-                                                // Value of E_LFARLC for new .EXEs
-        #define ENEWHDR         0x003C          // Offset in old hdr. of ptr. to new
-        #define ERESWDS         0x0010          // No. of reserved words (OLD)
-        #define ERES1WDS        0x0004          // No. of reserved words in e_res
-        #define ERES2WDS        0x000A          // No. of reserved words in e_res2
-        #define ECP             0x0004          // Offset in struct of E_CP
-        #define ECBLP           0x0002          // Offset in struct of E_CBLP
-        #define EMINALLOC       0x000A          // Offset in struct of E_MINALLOC
-
-        /*
-         *@@ exe_hdr:
-         *      DOS 1, 2, 3 .EXE header.
-         */
-
-        struct exe_hdr
-        {
-            unsigned short      e_magic;        // Magic number
-            unsigned short      e_cblp;         // Bytes on last page of file
-            unsigned short      e_cp;           // Pages in file
-            unsigned short      e_crlc;         // Relocations
-            unsigned short      e_cparhdr;      // Size of header in paragraphs
-            unsigned short      e_minalloc;     // Minimum extra paragraphs needed
-            unsigned short      e_maxalloc;     // Maximum extra paragraphs needed
-            unsigned short      e_ss;           // Initial (relative) SS value
-            unsigned short      e_sp;           // Initial SP value
-            unsigned short      e_csum;         // Checksum
-            unsigned short      e_ip;           // Initial IP value
-            unsigned short      e_cs;           // Initial (relative) CS value
-            unsigned short      e_lfarlc;       // File address of relocation table
-            unsigned short      e_ovno;         // Overlay number
-            unsigned short      e_res[ERES1WDS];// Reserved words
-            unsigned short      e_oemid;        // OEM identifier (for e_oeminfo)
-            unsigned short      e_oeminfo;      // OEM information; e_oemid specific
-            unsigned short      e_res2[ERES2WDS];// Reserved words
-            long                e_lfanew;       // File address of new exe header
-        };
-
-        #define E_MAGIC(x)      (x).e_magic
-        #define E_CBLP(x)       (x).e_cblp
-        #define E_CP(x)         (x).e_cp
-        #define E_CRLC(x)       (x).e_crlc
-        #define E_CPARHDR(x)    (x).e_cparhdr
-        #define E_MINALLOC(x)   (x).e_minalloc
-        #define E_MAXALLOC(x)   (x).e_maxalloc
-        #define E_SS(x)         (x).e_ss
-        #define E_SP(x)         (x).e_sp
-        #define E_CSUM(x)       (x).e_csum
-        #define E_IP(x)         (x).e_ip
-        #define E_CS(x)         (x).e_cs
-        #define E_LFARLC(x)     (x).e_lfarlc
-        #define E_OVNO(x)       (x).e_ovno
-        #define E_RES(x)        (x).e_res
-        #define E_OEMID(x)      (x).e_oemid
-        #define E_OEMINFO(x)    (x).e_oeminfo
-        #define E_RES2(x)       (x).e_res2
-        #define E_LFANEW(x)     (x).e_lfanew
-
-
-            /*_________________________________________________________________*
-             |                                                                 |
-             |                                                                 |
-             |  OS/2 & WINDOWS .EXE FILE HEADER DEFINITION - 286 version       |
-             |                                                                 |
-             |_________________________________________________________________|
-             *                                                                 */
-
-        #define NEMAGIC         0x454E          // New magic number
-        #define NERESBYTES      8               // Eight bytes reserved (now)
-        #define NECRC           8               // Offset into new header of NE_CRC
-
-        /*
-         *@@ new_exe:
-         *      New Executable (NE) header.
-         *      Follows DOS header in the executable file.
-         */
-
-        struct new_exe
-        {
-            unsigned short      ne_magic;       // Magic number NE_MAGIC
-            unsigned char       ne_ver;         // Version number
-            unsigned char       ne_rev;         // Revision number
-            unsigned short      ne_enttab;      // Offset of Entry Table
-            unsigned short      ne_cbenttab;    // Number of bytes in Entry Table
-            long                ne_crc;         // Checksum of whole file
-            unsigned short      ne_flags;       // Flag word
-            unsigned short      ne_autodata;    // Automatic data segment number
-            unsigned short      ne_heap;        // Initial heap allocation
-            unsigned short      ne_stack;       // Initial stack allocation
-            long                ne_csip;        // Initial CS:IP setting
-            long                ne_sssp;        // Initial SS:SP setting
-            unsigned short      ne_cseg;        // Count of file segments
-            unsigned short      ne_cmod;        // Entries in Module Reference Table
-            unsigned short      ne_cbnrestab;   // Size of non-resident name table
-            unsigned short      ne_segtab;      // Offset of Segment Table
-            unsigned short      ne_rsrctab;     // Offset of Resource Table
-            unsigned short      ne_restab;      // Offset of resident name table
-            unsigned short      ne_modtab;      // Offset of Module Reference Table
-            unsigned short      ne_imptab;      // Offset of Imported Names Table
-            long                ne_nrestab;     // Offset of Non-resident Names Table
-            unsigned short      ne_cmovent;     // Count of movable entries
-            unsigned short      ne_align;       // Segment alignment shift count
-            unsigned short      ne_cres;        // Count of resource entries
-            unsigned char       ne_exetyp;      // Target operating system
-            unsigned char       ne_flagsothers; // Other .EXE flags
-            char                ne_res[NERESBYTES]; // Pad structure to 64 bytes
-        };
-
-        #pragma pack()
-
-        #define NE_MAGIC(x)         (x).ne_magic
-        #define NE_VER(x)           (x).ne_ver
-        #define NE_REV(x)           (x).ne_rev
-        #define NE_ENTTAB(x)        (x).ne_enttab
-        #define NE_CBENTTAB(x)      (x).ne_cbenttab
-        #define NE_CRC(x)           (x).ne_crc
-        #define NE_FLAGS(x)         (x).ne_flags
-        #define NE_AUTODATA(x)      (x).ne_autodata
-        #define NE_HEAP(x)          (x).ne_heap
-        #define NE_STACK(x)         (x).ne_stack
-        #define NE_CSIP(x)          (x).ne_csip
-        #define NE_SSSP(x)          (x).ne_sssp
-        #define NE_CSEG(x)          (x).ne_cseg
-        #define NE_CMOD(x)          (x).ne_cmod
-        #define NE_CBNRESTAB(x)     (x).ne_cbnrestab
-        #define NE_SEGTAB(x)        (x).ne_segtab
-        #define NE_RSRCTAB(x)       (x).ne_rsrctab
-        #define NE_RESTAB(x)        (x).ne_restab
-        #define NE_MODTAB(x)        (x).ne_modtab
-        #define NE_IMPTAB(x)        (x).ne_imptab
-        #define NE_NRESTAB(x)       (x).ne_nrestab
-        #define NE_CMOVENT(x)       (x).ne_cmovent
-        #define NE_ALIGN(x)         (x).ne_align
-        #define NE_CRES(x)          (x).ne_cres
-        #define NE_RES(x)           (x).ne_res
-        #define NE_EXETYP(x)        (x).ne_exetyp
-        #define NE_FLAGSOTHERS(x)   (x).ne_flagsothers
-
-        #define NE_USAGE(x)     (WORD)*((WORD *)(x)+1)
-        #define NE_PNEXTEXE(x)  (WORD)(x).ne_cbenttab
-        #define NE_ONEWEXE(x)   (WORD)(x).ne_crc
-        #define NE_PFILEINFO(x) (WORD)((DWORD)(x).ne_crc >> 16)
-
-
-        /*
-         *  Target operating systems
-         */
-
-        #define NE_UNKNOWN      0x0             /* Unknown (any "new-format" OS) */
-        #define NE_OS2          0x1             /* OS/2 (default)  */
-        #define NE_WINDOWS      0x2             /* Windows */
-        #define NE_DOS4         0x3             /* DOS 4.x */
-        #define NE_DEV386       0x4             /* Windows 386 */
-
-
-        /*
-         *  Format of NE_FLAGS(x):
-         *
-         *  p                                   Not-a-process
-         *   x                                  Unused
-         *    e                                 Errors in image
-         *     x                                Unused
-         *      b                               Bound Family/API
-         *       ttt                            Application type
-         *          f                           Floating-point instructions
-         *           3                          386 instructions
-         *            2                         286 instructions
-         *             0                        8086 instructions
-         *              P                       Protected mode only
-         *               p                      Per-process library initialization
-         *                i                     Instance data
-         *                 s                    Solo data
-         */
-        #define NENOTP          0x8000          /* Not a process */
-        #define NEIERR          0x2000          /* Errors in image */
-        #define NEBOUND         0x0800          /* Bound Family/API */
-        #define NEAPPTYP        0x0700          /* Application type mask */
-        #define NENOTWINCOMPAT  0x0100          /* Not compatible with P.M. Windowing */
-        #define NEWINCOMPAT     0x0200          /* Compatible with P.M. Windowing */
-        #define NEWINAPI        0x0300          /* Uses P.M. Windowing API */
-        #define NEFLTP          0x0080          /* Floating-point instructions */
-        #define NEI386          0x0040          /* 386 instructions */
-        #define NEI286          0x0020          /* 286 instructions */
-        #define NEI086          0x0010          /* 8086 instructions */
-        #define NEPROT          0x0008          /* Runs in protected mode only */
-        #define NEPPLI          0x0004          /* Per-Process Library Initialization */
-        #define NEINST          0x0002          /* Instance data */
-        #define NESOLO          0x0001          /* Solo data */
-
-        /*
-         *  Format of NE_FLAGSOTHERS(x):
-         *
-         *      7 6 5 4 3 2 1 0  - bit no
-         *      |         | | |
-         *      |         | | +---------------- Support for long file names
-         *      |         | +------------------ Windows 2.x app runs in prot mode
-         *      |         +-------------------- Windows 2.x app gets prop. font
-         *      +------------------------------ WLO appl on OS/2 (markwlo.exe)
-         *
-         */
-
-        #define NELONGNAMES     0x01
-        #define NEWINISPROT     0x02
-        #define NEWINGETPROPFON 0x04
-        #define NEWLOAPPL       0x80
-
-
-
-        struct new_seg                          /* New .EXE segment table entry */
-          {
-            unsigned short      ns_sector;      /* File sector of start of segment */
-            unsigned short      ns_cbseg;       /* Number of bytes in file */
-            unsigned short      ns_flags;       /* Attribute flags */
-            unsigned short      ns_minalloc;    /* Minimum allocation in bytes */
-          };
-
-        #define NS_SECTOR(x)    (x).ns_sector
-        #define NS_CBSEG(x)     (x).ns_cbseg
-        #define NS_FLAGS(x)     (x).ns_flags
-        #define NS_MINALLOC(x)  (x).ns_minalloc
-
-
-        /*
-         *  Format of NS_FLAGS(x)
-         *
-         *  Flag word has the following format:
-         *
-         *      15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0  - bit no
-         *          |  |  |  |  | | | | | | | | | | |
-         *          |  |  |  |  | | | | | | | | +-+-+--- Segment type DATA/CODE
-         *          |  |  |  |  | | | | | | | +--------- Iterated segment
-         *          |  |  |  |  | | | | | | +----------- Movable segment
-         *          |  |  |  |  | | | | | +------------- Segment can be shared
-         *          |  |  |  |  | | | | +--------------- Preload segment
-         *          |  |  |  |  | | | +----------------- Execute/read-only for code/data segment
-         *          |  |  |  |  | | +------------------- Segment has relocations
-         *          |  |  |  |  | +--------------------- Code conforming/Data is expand down
-         *          |  |  |  +--+----------------------- I/O privilege level
-         *          |  |  +----------------------------- Discardable segment
-         *          |  +-------------------------------- 32-bit code segment
-         *          +----------------------------------- Huge segment/GDT allocation requested
-         *
-         */
-
-        #define NSTYPE          0x0007          /* Segment type mask */
-
-        #ifdef EXE386
-            #define NSCODE          0x0000          /* Code segment */
-            #define NSDATA          0x0001          /* Data segment */
-            #define NSITER          0x0008          /* Iterated segment flag */
-            #define NSMOVE          0x0010          /* Movable segment flag */
-            #define NSSHARED        0x0020          /* Shared segment flag */
-            #define NSPRELOAD       0x0040          /* Preload segment flag */
-            #define NSEXRD          0x0080          /* Execute-only (code segment), or
-                                                    *  read-only (data segment)
-                                                    */
-            #define NSRELOC         0x0100          /* Segment has relocations */
-            #define NSCONFORM       0x0200          /* Conforming segment */
-            #define NSEXPDOWN       0x0200          /* Data segment is expand down */
-            #define NSDPL           0x0C00          /* I/O privilege level (286 DPL bits) */
-            #define SHIFTDPL        10              /* Left shift count for SEGDPL field */
-            #define NSDISCARD       0x1000          /* Segment is discardable */
-            #define NS32BIT         0x2000          /* 32-bit code segment */
-            #define NSHUGE          0x4000          /* Huge memory segment, length of
-                                                     * segment and minimum allocation
-                                                     * size are in segment sector units
-                                                     */
-            #define NSGDT           0x8000          /* GDT allocation requested */
-
-            #define NSPURE          NSSHARED        /* For compatibility */
-
-            #define NSALIGN 9       /* Segment data aligned on 512 byte boundaries */
-
-            #define NSLOADED    0x0004      /* ns_sector field contains memory addr */
-        #endif
-
-
-        struct new_segdata                      /* Segment data */
-          {
-            union
-              {
-                struct
-                  {
-                    unsigned short      ns_niter;       /* number of iterations */
-                    unsigned short      ns_nbytes;      /* number of bytes */
-                    char                ns_iterdata;    /* iterated data bytes */
-                  } ns_iter;
-                struct
-                  {
-                    char                ns_data;        /* data bytes */
-                  } ns_noniter;
-              } ns_union;
-          };
-
-        struct new_rlcinfo                      /* Relocation info */
-          {
-            unsigned short      nr_nreloc;      /* number of relocation items that */
-          };                                    /* follow */
-
-        #pragma pack(1)
-
-
-        struct new_rlc                          /* Relocation item */
-          {
-            char                nr_stype;       /* Source type */
-            char                nr_flags;       /* Flag byte */
-            unsigned short      nr_soff;        /* Source offset */
-            union
-              {
-                struct
-                  {
-                    char        nr_segno;       /* Target segment number */
-                    char        nr_res;         /* Reserved */
-                    unsigned short nr_entry;    /* Target Entry Table offset */
-                  }             nr_intref;      /* Internal reference */
-                struct
-                  {
-                    unsigned short nr_mod;      /* Index into Module Reference Table */
-                    unsigned short nr_proc;     /* Procedure ordinal or name offset */
-                  }             nr_import;      /* Import */
-                struct
-                  {
-                    unsigned short nr_ostype;   /* OSFIXUP type */
-                    unsigned short nr_osres;    /* reserved */
-                  }             nr_osfix;       /* Operating system fixup */
-              }                 nr_union;       /* Union */
-          };
-
-        #pragma pack()
-
-
-        #define NR_STYPE(x)     (x).nr_stype
-        #define NR_FLAGS(x)     (x).nr_flags
-        #define NR_SOFF(x)      (x).nr_soff
-        #define NR_SEGNO(x)     (x).nr_union.nr_intref.nr_segno
-        #define NR_RES(x)       (x).nr_union.nr_intref.nr_res
-        #define NR_ENTRY(x)     (x).nr_union.nr_intref.nr_entry
-        #define NR_MOD(x)       (x).nr_union.nr_import.nr_mod
-        #define NR_PROC(x)      (x).nr_union.nr_import.nr_proc
-        #define NR_OSTYPE(x)    (x).nr_union.nr_osfix.nr_ostype
-        #define NR_OSRES(x)     (x).nr_union.nr_osfix.nr_osres
-
-
-
-        /*
-         *  Format of NR_STYPE(x) and R32_STYPE(x):
-         *
-         *       7 6 5 4 3 2 1 0  - bit no
-         *               | | | |
-         *               +-+-+-+--- source type
-         *
-         */
-
-        #define NRSTYP          0x0f            /* Source type mask */
-        #define NRSBYT          0x00            /* lo byte (8-bits)*/
-        #define NRSSEG          0x02            /* 16-bit segment (16-bits) */
-        #define NRSPTR          0x03            /* 16:16 pointer (32-bits) */
-        #define NRSOFF          0x05            /* 16-bit offset (16-bits) */
-        #define NRPTR48         0x06            /* 16:32 pointer (48-bits) */
-        #define NROFF32         0x07            /* 32-bit offset (32-bits) */
-        #define NRSOFF32        0x08            /* 32-bit self-relative offset (32-bits) */
-
-
-        /*
-         *  Format of NR_FLAGS(x) and R32_FLAGS(x):
-         *
-         *       7 6 5 4 3 2 1 0  - bit no
-         *                 | | |
-         *                 | +-+--- Reference type
-         *                 +------- Additive fixup
-         */
-
-        #define NRADD           0x04            /* Additive fixup */
-        #define NRRTYP          0x03            /* Reference type mask */
-        #define NRRINT          0x00            /* Internal reference */
-        #define NRRORD          0x01            /* Import by ordinal */
-        #define NRRNAM          0x02            /* Import by name */
-        #define NRROSF          0x03            /* Operating system fixup */
-
-
-        #if (EXE386 == 0)
-
-        /* Resource type or name string */
-        struct rsrc_string
-            {
-            char rs_len;            /* number of bytes in string */
-            char rs_string[ 1 ];    /* text of string */
-            };
-
-        #define RS_LEN( x )    (x).rs_len
-        #define RS_STRING( x ) (x).rs_string
-
-        /* Resource type information block */
-        struct rsrc_typeinfo
-            {
-            unsigned short rt_id;
-            unsigned short rt_nres;
-            long rt_proc;
-            };
-
-        #define RT_ID( x )   (x).rt_id
-        #define RT_NRES( x ) (x).rt_nres
-        #define RT_PROC( x ) (x).rt_proc
-
-        /* Resource name information block */
-        struct rsrc_nameinfo
-            {
-            /* The following two fields must be shifted left by the value of  */
-            /* the rs_align field to compute their actual value.  This allows */
-            /* resources to be larger than 64k, but they do not need to be    */
-            /* aligned on 512 byte boundaries, the way segments are           */
-            unsigned short rn_offset;   /* file offset to resource data */
-            unsigned short rn_length;   /* length of resource data */
-            unsigned short rn_flags;    /* resource flags */
-            unsigned short rn_id;       /* resource name id */
-            unsigned short rn_handle;   /* If loaded, then global handle */
-            unsigned short rn_usage;    /* Initially zero.  Number of times */
-                                        /* the handle for this resource has */
-                                        /* been given out */
-            };
-
-        #define RN_OFFSET( x ) (x).rn_offset
-        #define RN_LENGTH( x ) (x).rn_length
-        #define RN_FLAGS( x )  (x).rn_flags
-        #define RN_ID( x )     (x).rn_id
-        #define RN_HANDLE( x ) (x).rn_handle
-        #define RN_USAGE( x )  (x).rn_usage
-
-        #define RSORDID     0x8000      /* if high bit of ID set then integer id */
-                                        /* otherwise ID is offset of string from
-                                           the beginning of the resource table */
-
-                                        /* Ideally these are the same as the */
-                                        /* corresponding segment flags */
-        #define RNMOVE      0x0010      /* Moveable resource */
-        #define RNPURE      0x0020      /* Pure (read-only) resource */
-        #define RNPRELOAD   0x0040      /* Preloaded resource */
-        #define RNDISCARD   0xF000      /* Discard priority level for resource */
-
-        /* Resource table */
-        struct new_rsrc
-            {
-            unsigned short rs_align;    /* alignment shift count for resources */
-            struct rsrc_typeinfo rs_typeinfo;
-            };
-
-        #define RS_ALIGN( x ) (x).rs_align
-
-
-        #endif /* NOT EXE386 */
-
-    #endif /* __NEWEXE__ */
-
-    #ifndef DWORD
-    #define DWORD long int
-    #endif
-
-    #ifndef WORD
-    #define WORD  short int
-    #endif
-
-    #ifndef __EXE386__
-        #define __EXE386__
-
-        #pragma pack(1)    /* Force byte alignment */
-
-            /*_________________________________________________________________*
-             |                                                                 |
-             |                                                                 |
-             |  OS/2 .EXE FILE HEADER DEFINITION - 386 version 0:32            |
-             |                                                                 |
-             |_________________________________________________________________|
-             *                                                                 */
-
-        #define BITPERWORD      16
-        #define BITPERBYTE      8
-        #define OBJPAGELEN      4096
-        #define E32MAGIC1       'L'        /* New magic number  "LX" */
-        #define E32MAGIC2       'X'        /* New magic number  "LX" */
-        #define E32MAGIC        0x584c     /* New magic number  "LX" */
-        #define E32RESBYTES1    0          /* First bytes reserved */
-        #define E32RESBYTES2    0          /* Second bytes reserved */
-        #define E32RESBYTES3    20         /* Third bytes reserved */
-        #define E32LEBO         0x00       /* Little Endian Byte Order */
-        #define E32BEBO         0x01       /* Big Endian Byte Order */
-        #define E32LEWO         0x00       /* Little Endian Word Order */
-        #define E32BEWO         0x01       /* Big Endian Word Order */
-        #define E32LEVEL        0L         /* 32-bit EXE format level */
-        #define E32CPU286       0x001      /* Intel 80286 or upwardly compatibile */
-        #define E32CPU386       0x002      /* Intel 80386 or upwardly compatibile */
-        #define E32CPU486       0x003      /* Intel 80486 or upwardly compatibile */
-
-
-
-        struct e32_exe                          /* New 32-bit .EXE header */
-        {
-            unsigned char       e32_magic[2];   /* Magic number E32_MAGIC */
-            unsigned char       e32_border;     /* The byte ordering for the .EXE */
-            unsigned char       e32_worder;     /* The word ordering for the .EXE */
-            unsigned long       e32_level;      /* The EXE format level for now = 0 */
-            unsigned short      e32_cpu;        /* The CPU type */
-            unsigned short      e32_os;         /* The OS type */
-            unsigned long       e32_ver;        /* Module version */
-            unsigned long       e32_mflags;     /* Module flags */
-            unsigned long       e32_mpages;     /* Module # pages */
-            unsigned long       e32_startobj;   /* Object # for instruction pointer */
-            unsigned long       e32_eip;        /* Extended instruction pointer */
-            unsigned long       e32_stackobj;   /* Object # for stack pointer */
-            unsigned long       e32_esp;        /* Extended stack pointer */
-            unsigned long       e32_pagesize;   /* .EXE page size */
-            unsigned long       e32_pageshift;  /* Page alignment shift in .EXE */
-            unsigned long       e32_fixupsize;  /* Fixup section size */
-            unsigned long       e32_fixupsum;   /* Fixup section checksum */
-            unsigned long       e32_ldrsize;    /* Loader section size */
-            unsigned long       e32_ldrsum;     /* Loader section checksum */
-            unsigned long       e32_objtab;     /* Object table offset */
-            unsigned long       e32_objcnt;     /* Number of objects in module */
-            unsigned long       e32_objmap;     /* Object page map offset */
-            unsigned long       e32_itermap;    /* Object iterated data map offset */
-            unsigned long       e32_rsrctab;    /* Offset of Resource Table */
-            unsigned long       e32_rsrccnt;    /* Number of resource entries */
-            unsigned long       e32_restab;     /* Offset of resident name table */
-            unsigned long       e32_enttab;     /* Offset of Entry Table */
-            unsigned long       e32_dirtab;     /* Offset of Module Directive Table */
-            unsigned long       e32_dircnt;     /* Number of module directives */
-            unsigned long       e32_fpagetab;   /* Offset of Fixup Page Table */
-            unsigned long       e32_frectab;    /* Offset of Fixup Record Table */
-            unsigned long       e32_impmod;     /* Offset of Import Module Name Table */
-            unsigned long       e32_impmodcnt;  /* Number of entries in Import Module Name Table */
-            unsigned long       e32_impproc;    /* Offset of Import Procedure Name Table */
-            unsigned long       e32_pagesum;    /* Offset of Per-Page Checksum Table */
-            unsigned long       e32_datapage;   /* Offset of Enumerated Data Pages */
-            unsigned long       e32_preload;    /* Number of preload pages */
-            unsigned long       e32_nrestab;    /* Offset of Non-resident Names Table */
-            unsigned long       e32_cbnrestab;  /* Size of Non-resident Name Table */
-            unsigned long       e32_nressum;    /* Non-resident Name Table Checksum */
-            unsigned long       e32_autodata;   /* Object # for automatic data object */
-            unsigned long       e32_debuginfo;  /* Offset of the debugging information */
-            unsigned long       e32_debuglen;   /* The length of the debugging info. in bytes */
-            unsigned long       e32_instpreload;/* Number of instance pages in preload section of .EXE file */
-            unsigned long       e32_instdemand; /* Number of instance pages in demand load section of .EXE file */
-            unsigned long       e32_heapsize;   /* Size of heap - for 16-bit apps */
-            unsigned long       e32_stacksize;  /* Size of stack */
-            unsigned char       e32_res3[E32RESBYTES3];
-                                                /* Pad structure to 196 bytes */
-          };
-
-
-
-        #define E32_MAGIC1(x)       (x).e32_magic[0]
-        #define E32_MAGIC2(x)       (x).e32_magic[1]
-        #define E32_BORDER(x)       (x).e32_border
-        #define E32_WORDER(x)       (x).e32_worder
-        #define E32_LEVEL(x)        (x).e32_level
-        #define E32_CPU(x)          (x).e32_cpu
-        #define E32_OS(x)           (x).e32_os
-        #define E32_VER(x)          (x).e32_ver
-        #define E32_MFLAGS(x)       (x).e32_mflags
-        #define E32_MPAGES(x)       (x).e32_mpages
-        #define E32_STARTOBJ(x)     (x).e32_startobj
-        #define E32_EIP(x)          (x).e32_eip
-        #define E32_STACKOBJ(x)     (x).e32_stackobj
-        #define E32_ESP(x)          (x).e32_esp
-        #define E32_PAGESIZE(x)     (x).e32_pagesize
-        #define E32_PAGESHIFT(x)    (x).e32_pageshift
-        #define E32_FIXUPSIZE(x)    (x).e32_fixupsize
-        #define E32_FIXUPSUM(x)     (x).e32_fixupsum
-        #define E32_LDRSIZE(x)      (x).e32_ldrsize
-        #define E32_LDRSUM(x)       (x).e32_ldrsum
-        #define E32_OBJTAB(x)       (x).e32_objtab
-        #define E32_OBJCNT(x)       (x).e32_objcnt
-        #define E32_OBJMAP(x)       (x).e32_objmap
-        #define E32_ITERMAP(x)      (x).e32_itermap
-        #define E32_RSRCTAB(x)      (x).e32_rsrctab
-        #define E32_RSRCCNT(x)      (x).e32_rsrccnt
-        #define E32_RESTAB(x)       (x).e32_restab
-        #define E32_ENTTAB(x)       (x).e32_enttab
-        #define E32_DIRTAB(x)       (x).e32_dirtab
-        #define E32_DIRCNT(x)       (x).e32_dircnt
-        #define E32_FPAGETAB(x)     (x).e32_fpagetab
-        #define E32_FRECTAB(x)      (x).e32_frectab
-        #define E32_IMPMOD(x)       (x).e32_impmod
-        #define E32_IMPMODCNT(x)    (x).e32_impmodcnt
-        #define E32_IMPPROC(x)      (x).e32_impproc
-        #define E32_PAGESUM(x)      (x).e32_pagesum
-        #define E32_DATAPAGE(x)     (x).e32_datapage
-        #define E32_PRELOAD(x)      (x).e32_preload
-        #define E32_NRESTAB(x)      (x).e32_nrestab
-        #define E32_CBNRESTAB(x)    (x).e32_cbnrestab
-        #define E32_NRESSUM(x)      (x).e32_nressum
-        #define E32_AUTODATA(x)     (x).e32_autodata
-        #define E32_DEBUGINFO(x)    (x).e32_debuginfo
-        #define E32_DEBUGLEN(x)     (x).e32_debuglen
-        #define E32_INSTPRELOAD(x)  (x).e32_instpreload
-        #define E32_INSTDEMAND(x)   (x).e32_instdemand
-        #define E32_HEAPSIZE(x)     (x).e32_heapsize
-        #define E32_STACKSIZE(x)    (x).e32_stacksize
-
-
-
-        /*
-         *  Format of E32_MFLAGS(x):
-         *
-         *  Low word has the following format:
-         *
-         *  15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0  - bit no
-         *   |     |          | |     | | | |
-         *   |     |          | |     | | | +------- Per-Process Library Initialization
-         *   |     |          | |     | | +--------- SystemDLL (internal fixups discarded)
-         *   |     |          | |     | +----------- No Internal Fixups for Module in .EXE
-         *   |     |          | |     +------------- No External Fixups for Module in .EXE
-         *   |     |          | +------------------- Incompatible with PM Windowing
-         *   |     |          +--------------------- Compatible with PM Windowing
-         *   |     |                                 Uses PM Windowing API
-         *   |     +-------------------------------- Module not Loadable
-         *   +-------------------------------------- Library Module
-         */
-
-
-        #define E32NOTP          0x8000L        /* Library Module - used as NENOTP */
-        #define E32NOLOAD        0x2000L        /* Module not Loadable */
-        #define E32PMAPI         0x0300L        /* Uses PM Windowing API */
-        #define E32PMW           0x0200L        /* Compatible with PM Windowing */
-        #define E32NOPMW         0x0100L        /* Incompatible with PM Windowing */
-        #define E32NOEXTFIX      0x0020L        /* NO External Fixups in .EXE */
-        #define E32NOINTFIX      0x0010L        /* NO Internal Fixups in .EXE */
-        #define E32SYSDLL        0x0008L        /* System DLL, Internal Fixups discarded*/
-        #define E32LIBINIT       0x0004L        /* Per-Process Library Initialization */
-        #define E32LIBTERM       0x40000000L    /* Per-Process Library Termination */
-        #define E32APPMASK       0x0300L        /* Application Type Mask */
-
-
-        /*
-         *  Format of E32_MFLAGS(x):
-         *
-         *  High word has the following format:
-         *
-         *  15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0  - bit no
-         *                                    | |
-         *                                    | +--- Protected memory library module
-         *                                    +----- Device driver
-         */
-
-        #define E32PROTDLL       0x10000L       /* Protected memory library module */
-        #define E32DEVICE        0x20000L       /* Device driver                   */
-        #define E32MODEXE        0x00000L       /* .EXE module                     */
-        #define E32MODDLL        0x08000L       /* .DLL module                     */
-        #define E32MODPROTDLL    0x18000L       /* Protected memory library module */
-        #define E32MODPDEV       0x20000L       /* Physical device driver          */
-        #define E32MODVDEV       0x28000L       /* Virtual device driver           */
-        #define E32MODMASK       0x38000L       /* Module type mask                */
-
-        /*
-         *  RELOCATION DEFINITIONS - RUN-TIME FIXUPS
-         */
-
-        typedef union _RELOC_OFS
-        {
-            unsigned short offset16;
-            unsigned long  offset32;
-        } RELOC_OFS;                            /* 16-bit or 32-bit offset */
-
-
-        /***ET+ r32_rlc - Relocation item */
-
-        struct r32_rlc                          /* Relocation item */
-        {
-            unsigned char       nr_stype;       /* Source type - field shared with new_rlc */
-            unsigned char       nr_flags;       /* Flag byte - field shared with new_rlc */
-            short               r32_soff;       /* Source offset */
-            unsigned short      r32_objmod;     /* Target object number or Module ordinal */
-
-            union targetid
-            {
-                RELOC_OFS         intref;      /* Internal fixup */
-
-                union extfixup
-                {
-                    RELOC_OFS      proc;        /* Procedure name offset */
-                    unsigned long  ord;         /* Procedure odrinal */
-                } extref;      /* External fixup */
-
-                struct addfixup
-                {
-                    unsigned short entry;       /* Entry ordinal */
-                    RELOC_OFS      addval;      /* Value added to the address */
-                } addfix;      /* Additive fixup */
-            }
-                                r32_target;     /* Target data */
-            unsigned short      r32_srccount;   /* Number of chained fixup records */
-            unsigned short      r32_chain;      /* Chain head */
-        };
-
-        /*
-         *  In 32-bit .EXE file run-time relocations are written as varying size
-         *  records, so we need many size definitions.
-         */
-
-        #define RINTSIZE16      8
-        #define RINTSIZE32      10
-        #define RORDSIZE        8
-        #define RNAMSIZE16      8
-        #define RNAMSIZE32      10
-        #define RADDSIZE16      10
-        #define RADDSIZE32      12
-
-        #if FALSE
-        /*
-         *  Access macros defined in NEWEXE.H !!!
-         */
-        #define NR_STYPE(x)      (x).nr_stype
-        #define NR_FLAGS(x)      (x).nr_flags
-        #endif
-
-        #define R32_SOFF(x)      (x).r32_soff
-        #define R32_OBJNO(x)     (x).r32_objmod
-        #define R32_MODORD(x)    (x).r32_objmod
-        #define R32_OFFSET16(x)  (x).r32_target.intref.offset16
-        #define R32_OFFSET32(x)  (x).r32_target.intref.offset32
-        #define R32_PROCOFF16(x) (x).r32_target.extref.proc.offset16
-        #define R32_PROCOFF32(x) (x).r32_target.extref.proc.offset32
-        #define R32_PROCORD(x)   (x).r32_target.extref.ord
-        #define R32_ENTRY(x)     (x).r32_target.addfix.entry
-        #define R32_ADDVAL16(x)  (x).r32_target.addfix.addval.offset16
-        #define R32_ADDVAL32(x)  (x).r32_target.addfix.addval.offset32
-        #define R32_SRCCNT(x)    (x).r32_srccount
-        #define R32_CHAIN(x)     (x).r32_chain
-
-
-
-        /*
-         *  Format of NR_STYPE(x)
-         *
-         *       7 6 5 4 3 2 1 0  - bit no
-         *           | | | | | |
-         *           | | +-+-+-+--- Source type
-         *           | +----------- Fixup to 16:16 alias
-         *           +------------- List of source offset follows fixup record
-         */
-
-        #if FALSE
-
-                    /* DEFINED in newexe.h !!! */
-
-        #define NRSTYP          0x0f            /* Source type mask */
-        #define NRSBYT          0x00            /* lo byte (8-bits)*/
-        #define NRSSEG          0x02            /* 16-bit segment (16-bits) */
-        #define NRSPTR          0x03            /* 16:16 pointer (32-bits) */
-        #define NRSOFF          0x05            /* 16-bit offset (16-bits) */
-        #define NRPTR48         0x06            /* 16:32 pointer (48-bits) */
-        #define NROFF32         0x07            /* 32-bit offset (32-bits) */
-        #define NRSOFF32        0x08            /* 32-bit self-relative offset (32-bits) */
-        #endif
-
-
-        #define NRSRCMASK       0x0f            /* Source type mask */
-        #define NRALIAS         0x10            /* Fixup to alias */
-        #define NRCHAIN         0x20            /* List of source offset follows */
-                                                /* fixup record, source offset field */
-                                                /* in fixup record contains number */
-                                                /* of elements in list */
-
-        /*
-         *  Format of NR_FLAGS(x) and R32_FLAGS(x):
-         *
-         *       7 6 5 4 3 2 1 0  - bit no
-         *       | | | |   | | |
-         *       | | | |   | +-+--- Reference type
-         *       | | | |   +------- Additive fixup
-         *       | | | +----------- 32-bit Target Offset Flag (1 - 32-bit; 0 - 16-bit)
-         *       | | +------------- 32-bit Additive Flag (1 - 32-bit; 0 - 16-bit)
-         *       | +--------------- 16-bit Object/Module ordinal (1 - 16-bit; 0 - 8-bit)
-         *       +----------------- 8-bit import ordinal (1 - 8-bit;
-         *                                                0 - NR32BITOFF toggles
-         *                                                    between 16 and 32 bit
-         *                                                    ordinal)
-         */
-
-        #ifdef NEVER_INCLUDE_THE_FOLLWING
-                    /* DEFINED in newexe.h !!! */
-            #define NRRTYP          0x03            /* Reference type mask */
-            #define NRRINT          0x00            /* Internal reference */
-            #define NRRORD          0x01            /* Import by ordinal */
-            #define NRRNAM          0x02            /* Import by name */
-            #define NRADD           0x04            /* Additive fixup */
-        #endif
-
-        #define NRRENT          0x03            /* Internal entry table fixup */
-
-        #define NR32BITOFF      0x10            /* 32-bit Target Offset */
-        #define NR32BITADD      0x20            /* 32-bit Additive fixup */
-        #define NR16OBJMOD      0x40            /* 16-bit Object/Module ordinal */
-        #define NR8BITORD       0x80            /* 8-bit import ordinal */
-        /*end*/
-
-        /*
-         *  Data structures for storing run-time fixups in linker virtual memory.
-         *
-         *  Each object has a list of Object Page Directories which specify
-         *  fixups for given page. Each page has its own hash table which is
-         *  used to detect fixups to the same target.
-         */
-
-        #define PAGEPERDIR      62
-        #define LG2DIR          7
-
-
-        typedef struct _OBJPAGEDIR
-        {
-            DWORD   next;                       /* Virtual pointer to next dir on list */
-            WORD    ht[PAGEPERDIR];             /* Pointers to individual hash tables */
-        }
-            OBJPAGEDIR;
-
-        /*
-         *  OBJECT TABLE
-         */
-
-        /***ET+ o32_obj Object Table Entry */
-
-        struct o32_obj                          /* Flat .EXE object table entry */
-        {
-            unsigned long       o32_size;       /* Object virtual size */
-            unsigned long       o32_base;       /* Object base virtual address */
-            unsigned long       o32_flags;      /* Attribute flags */
-            unsigned long       o32_pagemap;    /* Object page map index */
-            unsigned long       o32_mapsize;    /* Number of entries in object page map */
-            unsigned long       o32_reserved;   /* Reserved */
-        };
-
-
-        #define O32_SIZE(x)     (x).o32_size
-        #define O32_BASE(x)     (x).o32_base
-        #define O32_FLAGS(x)    (x).o32_flags
-        #define O32_PAGEMAP(x)  (x).o32_pagemap
-        #define O32_MAPSIZE(x)  (x).o32_mapsize
-        #define O32_RESERVED(x) (x).o32_reserved
-
-        /*
-         *  Format of O32_FLAGS(x)
-         *
-         *  High word of dword flag field is not used for now.
-         *  Low word has the following format:
-         *
-         *  15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0  - bit no
-         *   |  |  |  |     | | | | | | | | | | |
-         *   |  |  |  |     | | | | | | | | | | +--- Readable Object
-         *   |  |  |  |     | | | | | | | | | +----- Writeable Object
-         *   |  |  |  |     | | | | | | | | +------- Executable Object
-         *   |  |  |  |     | | | | | | | +--------- Resource Object
-         *   |  |  |  |     | | | | | | +----------- Object is Discardable
-         *   |  |  |  |     | | | | | +------------- Object is Shared
-         *   |  |  |  |     | | | | +--------------- Object has preload pages
-         *   |  |  |  |     | | | +----------------- Object has invalid pages
-         *   |  |  |  |     | | +------------------- Object is permanent and swappable
-         *   |  |  |  |     | +--------------------- Object is permanent and resident
-         *   |  |  |  |     +----------------------- Object is permanent and long lockable
-         *   |  |  |  +----------------------------- 16:16 alias required (80x86 specific)
-         *   |  |  +-------------------------------- Big/Default bit setting (80x86 specific)
-         *   |  +----------------------------------- Object is conforming for code (80x86 specific)
-         *   +-------------------------------------- Object I/O privilege level (80x86 specific)
-         *
-         */
-
-        #define OBJREAD         0x0001L             /* Readable Object   */
-        #define OBJWRITE        0x0002L             /* Writeable Object  */
-        #define OBJRSRC         0x0008L             /* Resource Object   */
-        #define OBJINVALID      0x0080L             /* Object has invalid pages  */
-        #define LNKNONPERM      0x0600L             /* Object is nonpermanent - should be */
-        #define OBJNONPERM      0x0000L             /* zero in the .EXE but LINK386 uses 6 */
-        #define OBJPERM         0x0100L             /* Object is permanent and swappable */
-        #define OBJRESIDENT     0x0200L             /* Object is permanent and resident */
-        #define OBJCONTIG       0x0300L             /* Object is resident and contiguous */
-        #define OBJDYNAMIC      0x0400L             /* Object is permanent and long locable */
-        #define OBJTYPEMASK     0x0700L             /* Object type mask */
-        #define OBJALIAS16      0x1000L             /* 16:16 alias required (80x86 specific)           */
-        #define OBJBIGDEF       0x2000L             /* Big/Default bit setting (80x86 specific)        */
-        #define OBJIOPL         0x8000L             /* Object I/O privilege level (80x86 specific)     */
-        #if FOR_EXEHDR
-        /*
-         *  Name these flags differently for EXEHDR.EXE - avoid conflicts with 286 version
-         */
-        #define OBJDISCARD       0x0010L            /* Object is Discardable */
-        #define OBJSHARED        0x0020L            /* Object is Shared */
-        #define OBJPRELOAD       0x0040L            /* Object has preload pages  */
-        #define OBJEXEC          0x0004L            /* Executable Object */
-        #define OBJCONFORM       0x4000L            /* Object is conforming for code (80x86 specific)  */
-        #else
-        /*
-         *  Life will be easier, if we keep the same names for the following flags:
-         */
-        #ifndef NSDISCARD
-            #define NSDISCARD       0x0010L             /* Object is Discardable */
-        #endif
-        #ifndef NSMOVE
-            #define NSMOVE          NSDISCARD           /* Moveable object is for sure Discardable */
-        #endif
-        #ifndef NSSHARED
-            #define NSSHARED        0x0020L             /* Object is Shared */
-        #endif
-        #ifndef NSPRELOAD
-            #define NSPRELOAD       0x0040L             /* Object has preload pages  */
-        #endif
-        #ifndef NSEXRD
-            #define NSEXRD          0x0004L             /* Executable Object */
-        #endif
-        #ifndef NSCONFORM
-            #define NSCONFORM       0x4000L             /* Object is conforming for code (80x86 specific)  */
-        #endif
-        #endif
-        /*end*/
-
-        /***ET+ o32_map - Object Page Map entry */
-
-        struct o32_map                              /* Object Page Table entry */
-        {
-            unsigned long   o32_pagedataoffset;     /* file offset of page */
-            unsigned short  o32_pagesize;           /* # bytes of page data */
-            unsigned short  o32_pageflags;          /* Per-Page attributes */
-        };
-
-
-        #define GETPAGEIDX(x)    ((x).o32_pagedataoffset)
-
-        #define PUTPAGEIDX(x,i)  ((x).o32_pagedataoffset = ((unsigned long)(i)))
-
-        #define PUTPAGESIZ(x,i)  ((x).o32_pagesize = ((unsigned int)(i)))
-
-        #define GETPAGESIZ(x)    ((x).o32_pagesize)
-
-        #define PAGEFLAGS(x)    (x).o32_pageflags
-
-
-        #define VALID           0x0000                /* Valid Physical Page in .EXE */
-        #define ITERDATA        0x0001                /* Iterated Data Page */
-        #define INVALID         0x0002                /* Invalid Page */
-        #define ZEROED          0x0003                /* Zero Filled Page */
-        #define RANGE           0x0004                /* Range of pages */
-        #define ITERDATA2       0x0005                /* Iterated Data Page Type II */
-        /*end*/
-
-        /*
-         *  RESOURCE TABLE
-         */
-
-        /***ET+ rsrc32 - Resource Table Entry */
-
-        struct rsrc32                               /* Resource Table Entry */
-        {
-            unsigned short      type;               /* Resource type */
-            unsigned short      name;               /* Resource name */
-            unsigned long       cb;                 /* Resource size */
-            unsigned short      obj;                /* Object number */
-            unsigned long       offset;             /* Offset within object */
-        };
-        /*end*/
-
-
-         /*
-          * Iteration Record format for 'EXEPACK'ed pages.
-          */
-        struct LX_Iter
-        {
-            unsigned short LX_nIter;            /* number of iterations */
-            unsigned short LX_nBytes;           /* number of bytes */
-            unsigned char  LX_Iterdata;         /* iterated data byte(s) */
-        };
-
-
-        /*
-         *  ENTRY TABLE DEFINITIONS
-         */
-
-        /***ET+ b32_bundle - Entry Table */
-
-        struct b32_bundle
-        {
-            unsigned char       b32_cnt;        /* Number of entries in this bundle */
-            unsigned char       b32_type;       /* Bundle type */
-            unsigned short      b32_obj;        /* Object number */
-        };                                      /* Follows entry types */
-
-        struct e32_entry
-        {
-            unsigned char       e32_flags;      /* Entry point flags */
-            union entrykind
-            {
-                RELOC_OFS       e32_offset;     /* 16-bit/32-bit offset entry */
-                struct callgate
-                {
-                    unsigned short offset;      /* Offset in segment */
-                    unsigned short callgate;    /* Callgate selector */
-                }
-                                e32_callgate;   /* 286 (16-bit) call gate */
-                struct fwd
-                {
-                    unsigned short  modord;     /* Module ordinal number */
-                    unsigned long   value;      /* Proc name offset or ordinal */
-                }
-                                e32_fwd;        /* Forwarder */
-            }
-                                e32_variant;    /* Entry variant */
-        };
-
-
-
-        #define B32_CNT(x)      (x).b32_cnt
-        #define B32_TYPE(x)     (x).b32_type
-        #define B32_OBJ(x)      (x).b32_obj
-
-        #define E32_EFLAGS(x)   (x).e32_flags
-        #define E32_OFFSET16(x) (x).e32_variant.e32_offset.offset16
-        #define E32_OFFSET32(x) (x).e32_variant.e32_offset.offset32
-        #define E32_GATEOFF(x)  (x).e32_variant.e32_callgate.offset
-        #define E32_GATE(x)     (x).e32_variant.e32_callgate.callgate
-        #define E32_MODORD(x)   (x).e32_variant.e32_fwd.modord
-        #define E32_VALUE(x)    (x).e32_variant.e32_fwd.value
-
-        #define FIXENT16        3
-        #define FIXENT32        5
-        #define GATEENT16       5
-        #define FWDENT          7
-
-        /*
-         *  BUNDLE TYPES
-         */
-
-        #define EMPTY        0x00               /* Empty bundle */
-        #define ENTRY16      0x01               /* 16-bit offset entry point */
-        #define GATE16       0x02               /* 286 call gate (16-bit IOPL) */
-        #define ENTRY32      0x03               /* 32-bit offset entry point */
-        #define ENTRYFWD     0x04               /* Forwarder entry point */
-        #define TYPEINFO     0x80               /* Typing information present flag */
-
-
-        /*
-         *  Format for E32_EFLAGS(x)
-         *
-         *       7 6 5 4 3 2 1 0  - bit no
-         *       | | | | | | | |
-         *       | | | | | | | +--- exported entry
-         *       | | | | | | +----- uses shared data
-         *       +-+-+-+-+-+------- parameter word count
-         */
-
-        #define E32EXPORT       0x01            /* Exported entry */
-        #define E32SHARED       0x02            /* Uses shared data */
-        #define E32PARAMS       0xf8            /* Parameter word count mask */
-
-        /*
-         *  Flags for forwarders only:
-         */
-
-        #define FWD_ORDINAL     0x01            /* Imported by ordinal */
-
-
-        #pragma pack()       /* Restore default alignment */
-
-        /*end*/
-
-    #endif /* __EXE386__ */
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/helpers/except.h b/sal/osl/os2/helpers/except.h
deleted file mode 100644
index 0bc742cee..000000000
--- a/sal/osl/os2/helpers/except.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *@@sourcefile except.h:
- *      header file for except.c. See remarks there.
- *
- *      Note: Version numbering in this file relates to XWorkplace version
- *            numbering.
- *
- *@@include #define INCL_DOSEXCEPTIONS
- *@@include #define INCL_DOSPROCESS
- *@@include #include <os2.h>
- *@@include #include <stdio.h>
- *@@include #include <setjmp.h>
- *@@include #include "helpers\except.h"
- */
-
-/*
- *      Copyright (C) 1999-2000 Ulrich M�ller.
- *
- *      2009-06-15 published under LGPL3 with Ulrich M�ller permission.
- *
- */
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#ifndef EXCEPT_HEADER_INCLUDED
-    #define EXCEPT_HEADER_INCLUDED
-
-    #if defined __IBMCPP__ || defined __IBMC__
-        #ifndef INCL_DOSEXCEPTIONS
-            #error except.h requires INCL_DOSEXCEPTIONS to be defined.
-        #endif
-        #ifndef INCL_DOSPROCESS
-            #error except.h requires INCL_DOSPROCESS to be defined.
-        #endif
-
-        #ifndef __stdio_h
-            #error except.h requires stdio.h to be included.
-        #endif
-        #ifndef __setjmp_h
-            #error except.h requires setjmp.h to be included.
-        #endif
-    #endif
-
-    /********************************************************************
-     *
-     *   Declarations
-     *
-     ********************************************************************/
-
-    // forward declaration
-    typedef struct _EXCEPTIONREGISTRATIONRECORD2 *PEXCEPTIONREGISTRATIONRECORD2;
-
-    // "OnKill" function prototype for EXCEPTIONREGISTRATIONRECORD2
-    // added V0.9.0 (99-10-22) [umoeller]
-    // removed V0.9.7 (2000-12-08) [umoeller]
-    // typedef VOID APIENTRY FNEXCONKILL(PEXCEPTIONREGISTRATIONRECORD2);
-    // typedef FNEXCONKILL *PFNEXCONKILL;
-
-    /*
-     *@@ EXCEPTIONREGISTRATIONRECORD2:
-     *      replacement EXCEPTIONREGISTRATIONRECORD
-     *      struct for thread exception handling.
-     *
-     *@@changed V0.9.0 (99-10-22) [umoeller]: pfnOnKill added
-     *@@changed V0.9.0 (99-10-22) [umoeller]: renamed from REGREC2
-     */
-
-    typedef struct _EXCEPTIONREGISTRATIONRECORD2
-    {
-        PVOID           pNext;              // as in EXCEPTIONREGISTRATIONRECORD
-        PFN             pfnHandler;         // as in EXCEPTIONREGISTRATIONRECORD
-        jmp_buf         jmpThread;          // additional buffer for setjmp
-        EXCEPTIONREPORTRECORD err;          // exception handlers copy the report rec here
-        PVOID           pvUser;             // user ptr
-    } EXCEPTIONREGISTRATIONRECORD2;
-
-    /*
-     *@@ EXCEPTSTRUCT:
-     *      structure used with TRY_xxx macros.
-     */
-
-    typedef struct _EXCEPTSTRUCT
-    {
-        EXCEPTIONREGISTRATIONRECORD2 RegRec2;
-        ULONG                 ulExcpt;  // != NULL if exception caught
-        APIRET                arc;      // rc of DosSetExceptionHandler
-    } EXCEPTSTRUCT, *PEXCEPTSTRUCT;
-
-    // function prototypes for exception hooks (V0.9.0)
-
-    // "open traplog file" hook
-    typedef FILE* APIENTRY FNEXCOPENFILE(VOID);
-    typedef FNEXCOPENFILE *PFNEXCOPENFILE;
-
-    // "exception" hook
-    typedef VOID APIENTRY FNEXCHOOK(FILE*, PTIB, ULONG);  // V0.9.16 (2001-12-02) [pr]
-    typedef FNEXCHOOK *PFNEXCHOOK;
-
-    // "error" hook
-    typedef VOID APIENTRY FNEXCHOOKERROR(const char *pcszFile,
-                                         ULONG ulLine,
-                                         const char *pcszFunction,
-                                         APIRET arc);
-    typedef FNEXCHOOKERROR *PFNEXCHOOKERROR;
-
-    /********************************************************************
-     *
-     *   Prototypes
-     *
-     ********************************************************************/
-
-    VOID excExplainException(FILE *file,
-                                      PSZ pszHandlerName,
-                                      PEXCEPTIONREPORTRECORD pReportRec,
-                                      PCONTEXTRECORD pContextRec);
-
-    VOID excRegisterHooks(PFNEXCOPENFILE pfnExcOpenFileNew,
-                          PFNEXCHOOK pfnExcHookNew,
-                          PFNEXCHOOKERROR pfnExcHookError,
-                          BOOL fBeepOnExceptionNew);
-
-    ULONG _System excHandlerLoud(PEXCEPTIONREPORTRECORD pReportRec,
-                                 PEXCEPTIONREGISTRATIONRECORD2 pRegRec2,
-                                 PCONTEXTRECORD pContextRec,
-                                 PVOID pv);
-
-    ULONG _System excHandlerQuiet(PEXCEPTIONREPORTRECORD pReportRec,
-                                  PEXCEPTIONREGISTRATIONRECORD2 pRegRec2,
-                                  PCONTEXTRECORD pContextRec,
-                                  PVOID pv);
-
-    extern PFNEXCHOOKERROR G_pfnExcHookError;
-
-    extern ULONG G_ulExplainExceptionRunning;
-
-    /********************************************************************
-     *
-     *   Macros
-     *
-     ********************************************************************/
-
-    /* See except.c for explanations how to use these. */
-
-    #ifdef __NO_EXCEPTION_HANDLERS__
-        // exception handlers can completely be disabled
-        #define TRY_LOUD(excptstruct)
-    #else
-        #ifdef __NO_LOUD_EXCEPTION_HANDLERS__
-            #define TRY_LOUD(e) TRY_QUIET(e)
-        #else // __NO_LOUD_EXCEPTION_HANDLERS__
-        #define TRY_LOUD(excptstruct)                                           \
-                {                                                               \
-                    EXCEPTSTRUCT          excptstruct = {0};                    \
-                    excptstruct.RegRec2.pfnHandler = (PFN)excHandlerLoud;       \
-                    excptstruct.arc = DosSetExceptionHandler(                   \
-                                (PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2)); \
-                    if (excptstruct.arc)                                        \
-                        if (G_pfnExcHookError)                                  \
-                            G_pfnExcHookError(__FILE__, __LINE__, __FUNCTION__, excptstruct.arc);  \
-                        else                                                    \
-                            DosBeep(1000, 1000);                                \
-                    excptstruct.ulExcpt = setjmp(excptstruct.RegRec2.jmpThread); \
-                    if (excptstruct.ulExcpt == 0)                               \
-                    {
-
-        #endif // __NO_LOUD_EXCEPTION_HANDLERS__
-    #endif
-
-    #ifdef __NO_EXCEPTION_HANDLERS__
-        // exception handlers can completely be disabled
-        #define TRY_QUIET(excptstruct)
-    #else
-        #define TRY_QUIET(excptstruct)                                          \
-                {                                                               \
-                    EXCEPTSTRUCT          excptstruct = {0};                    \
-                    excptstruct.RegRec2.pfnHandler = (PFN)excHandlerQuiet;      \
-                    excptstruct.arc = DosSetExceptionHandler(                   \
-                                (PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2)); \
-                    if (excptstruct.arc)                                        \
-                        if (G_pfnExcHookError)                                  \
-                            G_pfnExcHookError(__FILE__, __LINE__, __FUNCTION__, excptstruct.arc);  \
-                        else                                                    \
-                            DosBeep(1000, 1000);                                \
-                    excptstruct.ulExcpt = setjmp(excptstruct.RegRec2.jmpThread); \
-                    if (excptstruct.ulExcpt == 0)                               \
-                    {
-
-    #endif
-
-    #ifdef __NO_EXCEPTION_HANDLERS__
-        // exception handlers can completely be disabled
-        #define CATCH(excptstruct) if (FALSE) {
-    #else
-        #define CATCH(excptstruct)                                              \
-                        DosUnsetExceptionHandler(                               \
-                                (PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2)); \
-                    } /* end of TRY block */                                    \
-                    else                                                        \
-                    { /* exception occurred: */                                  \
-                        DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2));
-    #endif
-
-    #ifdef __NO_EXCEPTION_HANDLERS__
-        // exception handlers can completely be disabled
-        #define END_CATCH() }
-    #else
-        #define END_CATCH()                                                     \
-                    } /* end of exception-occurred block */                      \
-                }
-    #endif
-
-    /*
-     * CRASH:
-     *      this macro is helpful for testing
-     *      the exception handlers.
-     *      This is not for general use. ;-)
-     */
-
-    #define CRASH {PSZ p = NULL; *p = 'a'; }
-
-#endif // EXCEPT_HEADER_INCLUDED
-
-#if __cplusplus
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/helpers/setup.h b/sal/osl/os2/helpers/setup.h
deleted file mode 100644
index 61c7a3f17..000000000
--- a/sal/osl/os2/helpers/setup.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *  setup.h:
- *      sample master include file which gets included
- *      from all helpers *.c sources.
- */
-
-#ifndef SETUP_HEADER_INCLUDED
-    #define SETUP_HEADER_INCLUDED
-
-    // XWPEXPORT defines the standard linkage for the
-    // XWorkplace helpers.
-    #ifdef __EMX__
-        #define XWPENTRY
-    #elif defined (__IBMCPP__) || defined (__IBMC__)
-        #define XWPENTRY _Optlink
-    #endif
-
-    /*************************************************************
-     *                                                           *
-     *   Additional stuff for EMX                                *
-     *                                                           *
-     *************************************************************/
-
-    #ifdef __EMX__
-        // EMX doesn't have all these 16-bit typedefs;
-        // added (99-10-22) [umoeller]
-        #define APIENTRY16  _Far16 _Pascal
-        #define PASCAL16    _Far16 _Pascal
-        #define CDECL16     _Far16 _Cdecl
-
-        typedef unsigned short APIRET16;
-        typedef unsigned long  APIRET32;
-
-    #endif
-
-    // the following is a VAC++-specific macro, which doesn't exist
-    // with EMX, so we need to implement this... this was one of
-    // the "undefined symbols" we got (99-10-23) [umoeller]
-    // changed this to prefix underscore, because the STL apparently
-    // redefines this V0.9.3 (2000-05-15) [umoeller]
-    #define _min(a,b) ( ((a) > (b)) ? b : a )
-    #define _max(a,b) ( ((a) > (b)) ? a : b )
-
-    // Uncomment the following if you have trouble with the
-    // exception handlers in helpers\except.c; WarpIN will
-    // then install _no_ additional exception handlers at all
-    // (include\helpers\except.h reacts to these defines).
-    // I'm not sure if the handlers work well with EMX.
-
-    #ifdef __EMX__00
-        #define __NO_EXCEPTION_HANDLERS__
-    #endif
-
-    /*************************************************************
-     *                                                           *
-     *   Additional stuff for VAC++ 3.0                          *
-     *                                                           *
-     *************************************************************/
-
-    // all this added V0.9.2 (2000-03-10) [umoeller]
-    #if ( defined (  __IBMCPP__ ) && (  __IBMCPP__ < 400 ) )
-        typedef int bool;
-        #define true 1
-        #define false 0
-        #define _BooleanConst    // needed for some VAC headers, which define bool also
-    #endif
-
-    #ifndef __stdlib_h          // <stdlib.h>
-        #include <stdlib.h>
-    #endif
-    #ifndef __string_h          // <string.h>
-        #include <string.h>
-    #endif
-
-    /*************************************************************
-     *                                                           *
-     *   Debugging                                               *
-     *                                                           *
-     *************************************************************/
-
-    // All the following redone (99-10-23) [umoeller]:
-    // __DEBUG__ is defined as a macro on the compiler
-    // command line by the makefiles if DEBUG was enabled
-    // in \setup.in
-    #ifdef __DEBUG__
-
-        // with debug code, disable the exception handlers
-        #define __NO_EXCEPTION_HANDLERS__
-
-        // If the following is commented out, no PMPRINTF will be
-        // used at all. WarpIN uses Dennis Bareis' PMPRINTF
-        // package to do this.
-
-        // NOTE: We cannot use PmPrintf with EMX,
-        // because pmprintf.lib imports the VAC++ runtimes.
-        // That's the strange errors I was reporting yesterday.
-        #ifndef __EMX__
-            #ifdef OS2_INCLUDED
-                #define _PMPRINTF_
-                #include "helpers/pmprintf.h"
-            #endif
-        #endif
-    #endif
-
-    #ifndef _PMPRINTF_
-        // not defined: define empty macro so we don't
-        // get compiler errors
-        #define _Pmpf(x)
-    #endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/interlck.c b/sal/osl/os2/interlck.c
deleted file mode 100644
index 6de04783a..000000000
--- a/sal/osl/os2/interlck.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <386/builtin.h>
-
-#include "system.h"
-
-#include <osl/interlck.h>
-#include <osl/diagnose.h>
-
-/*****************************************************************************/
-/* osl_incrementInterlockedCount */
-/*****************************************************************************/
-oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
-{
-    return __atomic_increment_s32( pCount);
-}
-
-/*****************************************************************************/
-/* osl_decrementInterlockedCount */
-/*****************************************************************************/
-oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
-{
-    return __atomic_decrement_s32( pCount);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/makefile.mk b/sal/osl/os2/makefile.mk
deleted file mode 100644
index d67786694..000000000
--- a/sal/osl/os2/makefile.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sal
-TARGET=cpposl
-USE_LDUMP2=TRUE
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
-MULTITHREAD_OBJ=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# Uncomment the following line if you want to compile with -Wall 
-# it disables lots of unnecessary warnings comming from the Win32
-# header files (disabling warnings via command line only works with
-# MSVC >= 7.x)
-#
-# CFLAGS+=/wd4668 /wd4711 /wd4201 /wd4710 /wd4619 /wd4514 /wd4820
-
-# --- Files --------------------------------------------------------
-
-.IF "$(header)" == ""
-
-SLOFILES=   $(SLO)$/conditn.obj  \
-            $(SLO)$/diagnose.obj \
-            $(SLO)$/dllentry.obj \
-            $(SLO)$/semaphor.obj \
-            $(SLO)$/interlck.obj \
-            $(SLO)$/nlsupport.obj\
-            $(SLO)$/mutex.obj    \
-            $(SLO)$/module.obj   \
-            $(SLO)$/process.obj  \
-            $(SLO)$/time.obj     \
-            $(SLO)$/signal.obj   \
-            $(SLO)$/pipe.obj     \
-            $(SLO)$/util.obj     \
-            $(SLO)$/socket.obj   \
-            $(SLO)$/thread.obj   \
-            $(SLO)$/security.obj \
-            $(SLO)$/profile.obj  \
-            $(SLO)$/tempfile.obj  \
-        $(SLO)$/process_impl.obj\
-        $(SLO)$/uunxapi.obj\
-        $(SLO)$/file.obj     \
-        $(SLO)$/file_url.obj \
-        $(SLO)$/file_error_transl.obj \
-        $(SLO)$/file_path_helper.obj \
-        $(SLO)$/debug.obj \
-        $(SLO)$/except.obj \
-        $(SLO)$/salinit.obj
-
-OBJFILES=   $(OBJ)$/conditn.obj  \
-            $(OBJ)$/diagnose.obj \
-            $(OBJ)$/semaphor.obj \
-            $(OBJ)$/interlck.obj \
-            $(OBJ)$/nlsupport.obj\
-            $(OBJ)$/mutex.obj    \
-            $(OBJ)$/module.obj   \
-            $(OBJ)$/process.obj  \
-            $(OBJ)$/time.obj     \
-            $(OBJ)$/signal.obj   \
-            $(OBJ)$/pipe.obj     \
-            $(OBJ)$/util.obj     \
-            $(OBJ)$/socket.obj   \
-            $(OBJ)$/thread.obj   \
-            $(OBJ)$/security.obj \
-            $(OBJ)$/profile.obj  \
-            $(OBJ)$/tempfile.obj  \
-        $(OBJ)$/process_impl.obj\
-        $(OBJ)$/uunxapi.obj\
-        $(OBJ)$/file.obj     \
-        $(OBJ)$/file_url.obj \
-        $(OBJ)$/file_error_transl.obj \
-        $(OBJ)$/file_path_helper.obj \
-        $(OBJ)$/debug.obj \
-        $(OBJ)$/except.obj \
-        $(SLO)$/salinit.obj
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
diff --git a/sal/osl/os2/module.c b/sal/osl/os2/module.c
deleted file mode 100644
index f1a99b2ab..000000000
--- a/sal/osl/os2/module.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "system.h"
-
-#include <osl/module.h>
-#include <osl/diagnose.h>
-#include <osl/file.h>
-#include <osl/thread.h>
-
-#include <stdlib.h>
-
-int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
-
-// static data for holding SAL dll module and full path
-static HMODULE hModSal;
-static char	szSalDir[ _MAX_PATH];
-static char	szSalDrive[ _MAX_PATH];
-
-/*****************************************************************************/
-/* osl_loadModule */
-/*****************************************************************************/
-
-ULONG APIENTRY _DosLoadModule (PSZ pszObject, ULONG uObjectLen, PCSZ pszModule,
-    PHMODULE phmod)
-{
-    APIRET	rc;
-    rc = DosLoadModule( pszObject, uObjectLen, pszModule, phmod);
-    // YD 22/05/06 issue again if first call fails (why?)
-    if (rc == ERROR_INVALID_PARAMETER)
-        rc = DosLoadModule( pszObject, uObjectLen, pszModule, phmod);
-    return rc;
-}
-
-oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMode)
-{
-    HMODULE hModule;
-    BYTE szErrorMessage[256];
-    APIRET rc;
-    oslModule pModule=0;
-    rtl_uString* ustrTmp = NULL;
-
-    OSL_ENSURE(ustrModuleName,"osl_loadModule : string is not valid");
-
-    /* ensure ustrTmp hold valid string */
-    if( osl_File_E_None != osl_getSystemPathFromFileURL( ustrModuleName, &ustrTmp ) )
-        rtl_uString_assign( &ustrTmp, ustrModuleName );
-
-    if( ustrTmp )
-    {
-        char buffer[PATH_MAX];
-
-        if( UnicodeToText( buffer, PATH_MAX, ustrTmp->buffer, ustrTmp->length ) )
-        {
-            char drive[_MAX_DRIVE], dir[_MAX_DIR];
-            char fname[_MAX_FNAME], ext[_MAX_EXT];
-            char* dot;
-            // 21/02/2006 YD dll names must be 8.3: since .uno.dll files
-            // have hardcoded names, I'm truncating names here and also in
-            // the build system
-            _splitpath (buffer, drive, dir, fname, ext);
-            if (strlen(fname)>8)
-                fname[8] = 0;	// truncate to 8.3
-            dot = strchr( fname, '.');
-            if (dot)
-                *dot = '\0';	// truncate on dot
-            // if drive is not specified, remove starting \ from dir name
-            // so dll is loaded from LIBPATH
-            if (drive[0] == 0 && dir[0] == '\\' && dir[1] == '\\') {
-                while( dir[0] == '\\')
-                    strcpy( dir, dir+1);
-            }
-            _makepath( buffer, drive, dir, fname, ext);
-
-            rc = _DosLoadModule( szErrorMessage, sizeof( szErrorMessage), (PCSZ)buffer, &hModule);
-            if (rc == NO_ERROR )
-                pModule = (oslModule)hModule;
-            else
-            {
-                if (rc == NO_ERROR )
-                    pModule = (oslModule)hModule;
-                else
-                {
-                    sal_Char szError[ PATH_MAX*2 ];
-                    sprintf( szError, "Module: %s; rc: %d;\nReason: %s;\n"
-                            "Please contact technical support and report above informations.\n\n", 
-                            buffer, rc, szErrorMessage );
-#if OSL_DEBUG_LEVEL > 0
-                    fprintf( stderr, szError);
-#else
-                    WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
-                        szError, "Critical error: DosLoadModule failed",
-                        0, MB_ERROR | MB_OK | MB_MOVEABLE);
-#endif
-                }
-            }
-        }
-    }
-
-    rtl_uString_release( ustrTmp );
-
-    return pModule;
-}
-
-/*****************************************************************************/
-/* osl_getModuleHandle */
-/*****************************************************************************/
-
-sal_Bool SAL_CALL 
-osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
-{
-    HMODULE hmod;
-    APIRET  rc;
-    rc = DosQueryModuleHandle(pModuleName->buffer, &hmod);
-    if( rc == NO_ERROR)
-    {
-        *pResult = (oslModule) hmod;
-        return sal_True;
-    }
-    
-    return sal_False;
-}
-
-/*****************************************************************************/
-/* osl_unloadModule */
-/*****************************************************************************/
-void SAL_CALL osl_unloadModule(oslModule Module)
-{
-#if OSL_DEBUG_LEVEL > 0
-    if (!Module)
-       fprintf( stderr, "osl_unloadModule NULL HANDLE.\n");
-#endif
-
-    DosFreeModule((HMODULE)Module);
-}
-
-/*****************************************************************************/
-/* osl_getSymbol */
-/*****************************************************************************/
-void* SAL_CALL 
-osl_getSymbol(oslModule Module, rtl_uString* pSymbolName)
-{
-    return (void *) osl_getFunctionSymbol(Module, pSymbolName);
-}
-
-/*****************************************************************************/
-/* osl_getFunctionSymbol */
-/*****************************************************************************/
-oslGenericFunction SAL_CALL osl_getFunctionSymbol( oslModule Module, rtl_uString *strSymbolName )
-{
-    rtl_String *symbolName = NULL;
-    oslGenericFunction address;
-
-    OSL_ASSERT(Module);
-    OSL_ASSERT(strSymbolName);
-
-    rtl_uString2String( 
-        &symbolName, 
-        strSymbolName->buffer, 
-        strSymbolName->length, 
-        RTL_TEXTENCODING_UTF8,
-        OUSTRING_TO_OSTRING_CVTFLAGS
-    );
-
-    address=osl_getAsciiFunctionSymbol(Module, rtl_string_getStr(symbolName));
-    rtl_string_release(symbolName);
-
-    return address;
-}
-
-/*****************************************************************************/
-/* osl_getAsciiFunctionSymbol */
-/*****************************************************************************/
-oslGenericFunction SAL_CALL 
-osl_getAsciiFunctionSymbol( oslModule Module, const sal_Char *pSymbol )
-{
-    PFN  pFunction;
-    APIRET rc;
-    void* pHandle=0;
-
-    OSL_ENSURE(Module,"osl_getSymbol : module handle is not valid");
-    OSL_ENSURE(Module,"osl_getSymbol : ustrSymbolName");
-
-    if ( Module!= 0 && pSymbol != 0 )
-    {
-
-        rc = DosQueryProcAddr( (HMODULE) Module, 0, (PCSZ)pSymbol, &pFunction );
-        if( rc == NO_ERROR )
-        {
-            pHandle = (void*)pFunction;
-        }
-        else
-        {
-            // YD try again adding the '_' prefix
-            char _pszSymbolName[255];
-            strcpy( _pszSymbolName, "_");
-            strcat( _pszSymbolName, pSymbol);
-            rc = DosQueryProcAddr( (HMODULE) Module, 0, (PCSZ)_pszSymbolName, &pFunction );
-            if( rc == NO_ERROR )
-                pHandle = (void*)pFunction;
-        }
-
-    }
-
-    return pHandle;
-}
-
-/*****************************************************************************/
-/* osl_getModuleURLFromAddress */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibraryUrl)
-{
-    //APIRET APIENTRY DosQueryModFromEIP (HMODULE *phMod, ULONG *pObjNum, 
-    //          ULONG BuffLen, PCHAR pBuff, ULONG *pOffset, ULONG Address) 
-    HMODULE	hMod;
-    ULONG	ObjNum;
-    CHAR	Buff[2*_MAX_PATH];
-    ULONG	Offset;
-    APIRET	rc;
-
-    // get module handle (and name)
-    rc = DosQueryModFromEIP( &hMod, &ObjNum, sizeof( Buff), Buff, &Offset, (ULONG)addr);
-    if (rc)
-        return sal_False;
-
-    // get module full path
-    rc = DosQueryModuleName( hMod, sizeof( Buff), Buff);
-    if (rc)
-        return sal_False;
-
-#if OSL_DEBUG_LEVEL > 1
-    OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s\n", Buff);
-#endif
-
-    // convert to URL
-    rtl_uString	*ustrSysPath = NULL;
-    rtl_string2UString( &ustrSysPath, Buff, strlen(Buff), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-    OSL_ASSERT(ustrSysPath != NULL);
-    osl_getFileURLFromSystemPath( ustrSysPath, ppLibraryUrl );
-    rtl_uString_release( ustrSysPath );
-
-    return sal_True;
-}
-
-/*****************************************************************************/
-/* osl_getModuleURLFromFunctionAddress */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress( oslGenericFunction addr, rtl_uString ** ppLibraryUrl )
-{
-    return osl_getModuleURLFromAddress( ( void * )addr, ppLibraryUrl ); 
-}
-
-/*****************************************************************************/
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/mutex.c b/sal/osl/os2/mutex.c
deleted file mode 100644
index 4fba13880..000000000
--- a/sal/osl/os2/mutex.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <sys/fmutex.h>
-
-#include "system.h"
-
-#include <osl/mutex.h>
-#include <osl/diagnose.h>
-
-/*
-    Implementation notes:
-    The void* hidden by oslMutex points to an OS/2 mutex semaphore.
-*/
-typedef struct _oslMutexImpl {
-    HMTX				m_Mutex;
-    int 				m_Locks;
-    ULONG				m_Owner;
-    ULONG				m_Requests;
-} oslMutexImpl;
-
-// static mutex to control access to private members of oslMutexImpl
-static HMTX MutexLock = 0;
-
-/*****************************************************************************/
-/* osl_createMutex */
-/*****************************************************************************/
-oslMutex SAL_CALL osl_createMutex()
-{
-    oslMutexImpl *pMutexImpl;
-    HMTX hMutex;
-    APIRET rc;
-
-    pMutexImpl= (oslMutexImpl*)calloc(sizeof(oslMutexImpl), 1);
-    OSL_ASSERT(pMutexImpl); /* alloc successful? */
-    
-    /* create semaphore */
-    rc = DosCreateMutexSem( NULL, &pMutexImpl->m_Mutex, 0, FALSE );
-    if( rc != 0 )
-    {
-        free(pMutexImpl);
-        return NULL;
-    }
-
-    // create static mutex for private members
-    if (MutexLock == 0)
-        DosCreateMutexSem( NULL, &MutexLock, 0, FALSE );
-
-    return (oslMutex)pMutexImpl;
-}
-
-/*****************************************************************************/
-/* osl_destroyMutex */
-/*****************************************************************************/
-void SAL_CALL osl_destroyMutex(oslMutex Mutex)
-{
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
-    if (pMutexImpl)
-    {
-        DosCloseMutexSem( pMutexImpl->m_Mutex);
-        free(pMutexImpl);
-    }
-}
-
-/*****************************************************************************/
-/* osl_acquireMutex */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex)
-{
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
-    APIRET rc = 0;
-    OSL_ASSERT(Mutex);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    pMutexImpl->m_Requests++;
-    DosReleaseMutexSem( MutexLock);
-
-    rc = DosRequestMutexSem( pMutexImpl->m_Mutex, SEM_INDEFINITE_WAIT );
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    pMutexImpl->m_Requests--;
-    if (pMutexImpl->m_Locks++ == 0)
-        pMutexImpl->m_Owner = _gettid();
-    DosReleaseMutexSem( MutexLock);
-
-    return( rc == 0 );
-}
-
-/*****************************************************************************/
-/* osl_tryToAcquireMutex */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex)
-{
-    sal_Bool 	 ret = sal_False;
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
-    OSL_ASSERT(Mutex);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-    if ( ((pMutexImpl->m_Requests == 0) && (pMutexImpl->m_Locks == 0)) ||
-         (pMutexImpl->m_Owner == _gettid()) )
-        ret = osl_acquireMutex(Mutex);
-
-    DosReleaseMutexSem( MutexLock);
-    
-    return ret;
-}
-
-/*****************************************************************************/
-/* osl_releaseMutex */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_releaseMutex(oslMutex Mutex)
-{
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
-    APIRET rc;
-    OSL_ASSERT(Mutex);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-    if (--(pMutexImpl->m_Locks) == 0)
-        pMutexImpl->m_Owner = 0;
-
-    DosReleaseMutexSem( MutexLock);
-
-    rc = DosReleaseMutexSem( pMutexImpl->m_Mutex);
-
-    return sal_True;
-}
-
-
-
-/*****************************************************************************/
-/* osl_getGlobalMutex */
-/*****************************************************************************/
-
-oslMutex g_Mutex = NULL;
-
-oslMutex * SAL_CALL osl_getGlobalMutex(void) 
-{
-    if (g_Mutex == NULL)
-        g_Mutex = osl_createMutex();
-    return &g_Mutex;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/nlsupport.c b/sal/osl/os2/nlsupport.c
deleted file mode 100644
index 116714814..000000000
--- a/sal/osl/os2/nlsupport.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define INCL_WIN
-#include "svpm.h"
-
-#include <osl/nlsupport.h>
-#include <osl/diagnose.h>
-#include <osl/process.h>
-#include <rtl/memory.h>
-
-#include <string.h>
-
-/*****************************************************************************
- typedefs
- *****************************************************************************/
-
-
-typedef struct {
-    const char              *key;
-    const rtl_TextEncoding   value;
-} _pair;
-
-
-/*****************************************************************************
- compare function for binary search   
- *****************************************************************************/
-
-static int
-_pair_compare (const char *key, const _pair *pair)
-{
-    int result = rtl_str_compareIgnoreAsciiCase( key, pair->key );
-    return result;
-}
-
-/*****************************************************************************
- binary search on encoding tables
- *****************************************************************************/
-
-static const _pair*
-_pair_search (const char *key, const _pair *base, unsigned int member )
-{
-    unsigned int lower = 0;
-    unsigned int upper = member;
-    unsigned int current;
-    int comparison;
-
-    /* check for validity of input */
-    if ( (key == NULL) || (base == NULL) || (member == 0) )
-        return NULL;
-
-    /* binary search */
-    while ( lower < upper )
-    {
-        current = (lower + upper) / 2;
-        comparison = _pair_compare( key, base + current );
-        if (comparison < 0)
-            upper = current;
-        else if (comparison > 0)
-            lower = current + 1;
-        else
-            return base + current;
-    }
-
-    return NULL;
-}
-
-
-/*****************************************************************************
- convert rtl_Locale to locale string
- *****************************************************************************/
-
-static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n )
-{
-    /* check if a valid locale is specified */
-    if( pLocale && pLocale->Language && (pLocale->Language->length == 2) )
-    {
-        size_t offset = 0;
-        
-        /* convert language code to ascii */
-        {
-            rtl_String *pLanguage = NULL;
-            
-            rtl_uString2String( &pLanguage, 
-                pLocale->Language->buffer, pLocale->Language->length,
-                RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-            
-            if( pLanguage->length < n )
-            {    
-                strcpy( buffer, pLanguage->buffer );
-                offset = pLanguage->length;
-            }
-            
-            rtl_string_release( pLanguage );
-        }
-        
-        /* convert country code to ascii */
-        if( pLocale->Country && (pLocale->Country->length == 2) )
-        {
-            rtl_String *pCountry = NULL;
-            
-            rtl_uString2String( &pCountry, 
-                pLocale->Country->buffer, pLocale->Country->length,
-                RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-             
-            if( offset + pCountry->length + 1 < n )
-            {    
-                strcpy( buffer + offset++, "_" );   
-                strcpy( buffer + offset, pCountry->buffer );
-                offset += pCountry->length;
-            }
-            
-            rtl_string_release( pCountry );
-        }
-        
-        /* convert variant to ascii - check if there is enough space for the variant string */
-        if( pLocale->Variant && pLocale->Variant->length &&
-            ( pLocale->Variant->length < n - 6 ) )
-        {
-            rtl_String *pVariant = NULL;
-            
-            rtl_uString2String( &pVariant,
-                pLocale->Variant->buffer, pLocale->Variant->length,
-                RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-             
-            if( offset + pVariant->length + 1 < n )
-            {    
-                strcpy( buffer + offset, pVariant->buffer );
-                offset += pVariant->length;
-            }
-
-            rtl_string_release( pVariant );
-        }
-        
-        return buffer;
-    }
-    
-    return NULL;
-}
-
-/*****************************************************************************
- convert locale string to rtl_Locale
- *****************************************************************************/
-
-static rtl_Locale * _parse_locale( const char * locale )
-{
-    static sal_Unicode c_locale[2] = { (sal_Unicode) 'C', 0 };
-    
-    /* check if locale contains a valid string */
-    if( locale )
-    {
-        size_t len = strlen( locale );
-
-        if( len >= 2 )
-        {
-            rtl_uString * pLanguage = NULL;
-            rtl_uString * pCountry  = NULL;
-            rtl_uString * pVariant  = NULL;
-    
-            size_t offset = 2;
-
-            /* convert language code to unicode */
-            rtl_string2UString( &pLanguage, locale, 2, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS );
-            OSL_ASSERT(pLanguage != NULL);
-
-            /* convert country code to unicode */
-            if( len >= 5 && '_' == locale[2] )
-            {
-                rtl_string2UString( &pCountry, locale + 3, 2, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS );
-                OSL_ASSERT(pCountry != NULL);
-                offset = 5;
-            }
-
-            /* convert variant code to unicode - do not rely on "." as delimiter */
-            if( len > offset ) {
-                rtl_string2UString( &pVariant, locale + offset, len - offset, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS );
-                OSL_ASSERT(pVariant != NULL);
-            }
-
-            rtl_Locale * ret =  rtl_locale_register( pLanguage->buffer, pCountry ? pCountry->buffer : c_locale + 1, pVariant ? pVariant->buffer : c_locale + 1 );
-
-            if (pVariant) rtl_uString_release(pVariant);
-            if (pCountry) rtl_uString_release(pCountry);
-            if (pLanguage) rtl_uString_release(pLanguage);
-
-            return ret;
-        }
-        else
-            return rtl_locale_register( c_locale, c_locale + 1, c_locale + 1 ); 
-    }
-    
-    return NULL;
-}
-        
-/*
- * This implementation of osl_getTextEncodingFromLocale maps 
- * from the ISO language codes.
- */
-
-const _pair _full_locale_list[] = {
-    { "ja_JP.eucJP",  RTL_TEXTENCODING_EUC_JP      },
-    { "ja_JP.EUC",    RTL_TEXTENCODING_EUC_JP      },
-    { "ko_KR.EUC",    RTL_TEXTENCODING_EUC_KR      },
-    { "zh_CN.EUC",    RTL_TEXTENCODING_EUC_CN      },
-    { "zh_TW.EUC",    RTL_TEXTENCODING_EUC_TW      }
-};
- 
-const _pair _locale_extension_list[] = {
-    { "big5",         RTL_TEXTENCODING_BIG5        },
-    { "big5hk",       RTL_TEXTENCODING_BIG5_HKSCS  },
-    { "gb18030",      RTL_TEXTENCODING_GB_18030    },
-    { "euc",          RTL_TEXTENCODING_EUC_JP      },
-    { "iso8859-1",    RTL_TEXTENCODING_ISO_8859_1  },
-    { "iso8859-10",   RTL_TEXTENCODING_ISO_8859_10 }, 
-    { "iso8859-13",   RTL_TEXTENCODING_ISO_8859_13 }, 
-    { "iso8859-14",   RTL_TEXTENCODING_ISO_8859_14 },
-    { "iso8859-15",   RTL_TEXTENCODING_ISO_8859_15 },
-    { "iso8859-2",    RTL_TEXTENCODING_ISO_8859_2  },
-    { "iso8859-3",    RTL_TEXTENCODING_ISO_8859_3  },
-    { "iso8859-4",    RTL_TEXTENCODING_ISO_8859_4  },
-    { "iso8859-5",    RTL_TEXTENCODING_ISO_8859_5  },
-    { "iso8859-6",    RTL_TEXTENCODING_ISO_8859_6  },
-    { "iso8859-7",    RTL_TEXTENCODING_ISO_8859_7  },
-    { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
-    { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
-    { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
-    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
-    { "pck",          RTL_TEXTENCODING_MS_932      },
-#if (0)
-    { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },
-#endif
-    { "utf-16",       RTL_TEXTENCODING_UNICODE     },
-    { "utf-7",        RTL_TEXTENCODING_UTF7        },
-    { "utf-8",        RTL_TEXTENCODING_UTF8        }
-};
-
-const _pair _iso_language_list[] = {
-    { "af",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "ar",  RTL_TEXTENCODING_ISO_8859_6 }, 
-    { "az",  RTL_TEXTENCODING_ISO_8859_9 }, 
-    { "be",  RTL_TEXTENCODING_ISO_8859_5 }, 
-    { "bg",  RTL_TEXTENCODING_ISO_8859_5 }, 
-    { "ca",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "cs",  RTL_TEXTENCODING_ISO_8859_2 }, 
-    { "da",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "de",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "el",  RTL_TEXTENCODING_ISO_8859_7 }, 
-    { "en",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "es",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "et",  RTL_TEXTENCODING_ISO_8859_4 }, 
-    { "eu",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "fa",  RTL_TEXTENCODING_ISO_8859_6 }, 
-    { "fi",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "fo",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "fr",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "gr",  RTL_TEXTENCODING_ISO_8859_7 }, 
-    { "he",  RTL_TEXTENCODING_ISO_8859_8 },
-    { "hi",  RTL_TEXTENCODING_DONTKNOW }, 
-    { "hr",  RTL_TEXTENCODING_ISO_8859_2 }, 
-    { "hu",  RTL_TEXTENCODING_ISO_8859_2 }, 
-    { "hy",  RTL_TEXTENCODING_DONTKNOW }, 
-    { "id",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "is",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "it",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "iw",  RTL_TEXTENCODING_ISO_8859_8 }, 
-    { "ja",  RTL_TEXTENCODING_EUC_JP }, 
-    { "ka",  RTL_TEXTENCODING_DONTKNOW }, 
-    { "kk",  RTL_TEXTENCODING_ISO_8859_5 }, 
-    { "ko",  RTL_TEXTENCODING_EUC_KR }, 
-    { "lt",  RTL_TEXTENCODING_ISO_8859_4 }, 
-    { "lv",  RTL_TEXTENCODING_ISO_8859_4 }, 
-    { "mk",  RTL_TEXTENCODING_ISO_8859_5 }, 
-    { "mr",  RTL_TEXTENCODING_DONTKNOW }, 
-    { "ms",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "nl",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "no",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "pl",  RTL_TEXTENCODING_ISO_8859_2 }, 
-    { "pt",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "ro",  RTL_TEXTENCODING_ISO_8859_2 }, 
-    { "ru",  RTL_TEXTENCODING_ISO_8859_5 }, 
-    { "sa",  RTL_TEXTENCODING_DONTKNOW }, 
-    { "sk",  RTL_TEXTENCODING_ISO_8859_2 }, 
-    { "sl",  RTL_TEXTENCODING_ISO_8859_2 }, 
-    { "sq",  RTL_TEXTENCODING_ISO_8859_2 }, 
-    { "sv",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "sw",  RTL_TEXTENCODING_ISO_8859_1 }, 
-    { "ta",  RTL_TEXTENCODING_DONTKNOW }, 
-    { "th",  RTL_TEXTENCODING_DONTKNOW }, 
-    { "tr",  RTL_TEXTENCODING_ISO_8859_9 }, 
-    { "tt",  RTL_TEXTENCODING_ISO_8859_5 }, 
-    { "uk",  RTL_TEXTENCODING_ISO_8859_5 }, 
-    { "ur",  RTL_TEXTENCODING_ISO_8859_6 }, 
-    { "uz",  RTL_TEXTENCODING_ISO_8859_9 }, 
-    { "vi",  RTL_TEXTENCODING_DONTKNOW }, 
-    { "zh",  RTL_TEXTENCODING_BIG5 }
-};
-
-/*****************************************************************************
- return the text encoding corresponding to the given locale
- *****************************************************************************/
-
-rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
-{
-    const _pair *language = 0;
-    char locale_buf[64] = "";
-    char *cp;
-
-    WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
-        "Please contact technical support and report above informations.\n\n",
-        "Critical error: osl_getTextEncodingFromLocale",
-        0, MB_ERROR | MB_OK | MB_MOVEABLE);
-
-    /* default to process locale if pLocale == NULL */
-    if( NULL == pLocale )
-        osl_getProcessLocale( &pLocale );
-
-    /* convert rtl_Locale to locale string */
-    if( _compose_locale( pLocale, locale_buf, 64 ) )
-    {
-        /* check special handling list (EUC) first */
-        const unsigned int members = sizeof( _full_locale_list ) / sizeof( _pair );
-        language = _pair_search( locale_buf, _full_locale_list, members);
-
-        if( NULL == language )
-        {
-            /*
-             *  check if there is a charset qualifier at the end of the given locale string
-             *  e.g. de.ISO8859-15 or de.ISO8859-15@euro which strongly indicates what
-             *  charset to use
-             */
-            cp = strrchr( locale_buf, '.' );
-
-            if( NULL != cp )
-            {
-                const unsigned int members = sizeof( _locale_extension_list ) / sizeof( _pair );
-                language = _pair_search( cp + 1, _locale_extension_list, members);
-            }
-        }
-
-        /* use iso language code to determine the charset */
-        if( NULL == language )
-        {
-            const unsigned int members = sizeof( _iso_language_list ) / sizeof( _pair );
-
-            /* iso lang codes have 2 charaters */
-            locale_buf[2] = '\0';
-
-            language = _pair_search( locale_buf, _iso_language_list, members);
-        }
-    }
-
-    /* a matching item in our list provides a mapping from codeset to
-     * rtl-codeset */
-    if ( language != NULL )
-        return language->value;
-   
-    return RTL_TEXTENCODING_DONTKNOW;
-}
-
-/*****************************************************************************
- return the current process locale
- *****************************************************************************/
-
-void _imp_getProcessLocale( rtl_Locale ** ppLocale )
-{
-    /* simulate behavior off setlocale */
-    char * locale = getenv( "LC_ALL" );
-    
-    if( NULL == locale )
-        locale = getenv( "LC_CTYPE" );
-
-    if( NULL == locale )
-        locale = getenv( "LANG" );
-
-    if( NULL == locale )
-        locale = "C";
-
-    *ppLocale = _parse_locale( locale );
-}
-
-/*****************************************************************************
- set the current process locale
- *****************************************************************************/
-
-int _imp_setProcessLocale( rtl_Locale * pLocale )
-{
-    char locale_buf[64];
-    
-    /* convert rtl_Locale to locale string */
-    if( NULL != _compose_locale( pLocale, locale_buf, 64 ) )
-    {
-        /* only change env vars that exist already */
-        if( getenv( "LC_ALL" ) ) {
-#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
-            setenv( "LC_ALL", locale_buf, 1);
-#else
-            setenv( "LC_ALL", locale_buf );
-#endif
-        }
-
-        if( getenv( "LC_CTYPE" ) ) {
-#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
-            setenv("LC_CTYPE", locale_buf, 1 );
-#else
-            setenv( "LC_CTYPE", locale_buf );
-#endif
-        }
-
-        if( getenv( "LANG" ) ) {
-#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
-            setenv("LC_CTYPE", locale_buf, 1 );
-#else
-            setenv( "LANG", locale_buf );
-#endif
-        }
-    }
-
-    return 0;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/path_helper.cxx b/sal/osl/os2/path_helper.cxx
deleted file mode 100644
index 0b0d6c618..000000000
--- a/sal/osl/os2/path_helper.cxx
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*******************************************************************
- Includes
- ******************************************************************/
- 
-#include "path_helper.hxx"
-#include <osl/diagnose.h>
-#include <rtl/ustring.hxx>
-
-#include <algorithm>
-#include <wchar.h>
-#include <wctype.h>
-
-/*******************************************************************
- Constants
- ******************************************************************/
- 
-const rtl::OUString BACKSLASH (RTL_CONSTASCII_USTRINGPARAM("\\"));
-const rtl::OUString SLASH     (RTL_CONSTASCII_USTRINGPARAM("/"));
-
-/*******************************************************************
- osl_systemPathEnsureSeparator
- ******************************************************************/
- 
-void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
-{
-    OSL_PRECOND(ppustrPath && (NULL != *ppustrPath), \
-                "osl_systemPathEnsureSeparator: Invalid parameter");
-    
-     rtl::OUString path(*ppustrPath);	
-    sal_Int32     i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
-    
-    if (i < (path.getLength()-1))
-    {
-        path += BACKSLASH; 
-        rtl_uString_assign(ppustrPath, path.pData);			
-    }
-    
-    OSL_POSTCOND(path.lastIndexOf(BACKSLASH) == (path.getLength() - 1), \
-                 "osl_systemPathEnsureSeparator: Post condition failed");
-}
-
-/*******************************************************************
- osl_systemPathRemoveSeparator
- ******************************************************************/
- 
-void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
-{
-    rtl::OUString path(*ppustrPath);
-    
-    if (!osl::systemPathIsLogicalDrivePattern(path))
-    {        
-        sal_Int32 i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
-        
-        if (i > -1 && (i == (path.getLength() - 1)))        
-        {
-            path = rtl::OUString(path.getStr(), path.getLength() - 1);                    
-            rtl_uString_assign(ppustrPath, path.pData);
-        }
-    }
-}
-
-/*******************************************************************
- osl_is_logical_drive_pattern
- ******************************************************************/
-
-// is [A-Za-z]:[/|\]\0
-const sal_Unicode* LDP                    = L":";
-const sal_Unicode* LDP_WITH_BACKSLASH     = L":\\";
-const sal_Unicode* LDP_WITH_SLASH         = L":/";
-   
-// degenerated case returned by the Windows FileOpen dialog 
-// when someone enters for instance "x:filename", the Win32
-// API accepts this case
-const sal_Unicode* LDP_WITH_DOT_BACKSLASH = L":.\\";
-     
-sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath)
-{
-    const sal_Unicode* p = rtl_uString_getStr(const_cast<rtl_uString*>(pustrPath));
-    if (iswalpha(*p++))
-    {                           
-        return ((0 == wcscmp(p, LDP)) || 
-                (0 == wcscmp(p, LDP_WITH_BACKSLASH)) || 
-                (0 == wcscmp(p, LDP_WITH_SLASH)) ||
-                (0 == wcscmp(p, LDP_WITH_DOT_BACKSLASH)));
-    }   
-    return 0;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/path_helper.h b/sal/osl/os2/path_helper.h
deleted file mode 100644
index 41a0f4330..000000000
--- a/sal/osl/os2/path_helper.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _PATH_HELPER_H_
-#define _PATH_HELPER_H_
-
-#include <sal/types.h>
-#include <rtl/ustring.h>
-#include <osl/file.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/*******************************************************************
- osl_systemPathEnsureSeparator
- Adds a trailing path separator to the given system path if not 
- already there and if the path is not the root path or a logical
- drive alone
- ******************************************************************/
- 
-void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath);
-
-/*******************************************************************
- osl_systemPathRemoveSeparator
- Removes the last separator from the given system path if any and 
- if the path is not the root path '\'
- ******************************************************************/
- 
-void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath);
-
-/*******************************************************************
- osl_is_logical_drive_pattern
- Returns whether a given path is only a logical drive pattern or not.
- A logical drive pattern is something like "a:\", "c:\".
- No logical drive pattern is something like "c:\test"
- ******************************************************************/
- 
-sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath);
-          
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/path_helper.hxx b/sal/osl/os2/path_helper.hxx
deleted file mode 100644
index 9fde55ee9..000000000
--- a/sal/osl/os2/path_helper.hxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// YD #pragma warning (disable : 4800)
-
-#ifndef _PATH_HELPER_HXX_
-#define _PATH_HELPER_HXX_
-
-#include "path_helper.h"
-#include <rtl/ustring.hxx>
-
-namespace osl
-{
-
-/*******************************************************************
- osl_systemPathEnsureSeparator
- Adds a trailing path separator to the given system path if not 
- already there and if the path is not the root path or a logical
- drive alone
- ******************************************************************/
- 
-inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
-{
-    osl_systemPathEnsureSeparator(&Path.pData);
-}
-
-/*******************************************************************
- osl_systemPathRemoveSeparator
- Removes the last separator from the given system path if any and 
- if the path is not the root path '\'
- ******************************************************************/
- 
-inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
-{
-    osl_systemPathRemoveSeparator(&Path.pData);
-}
-
-/*******************************************************************
- osl_systemPathIsLogicalDrivePattern 
- ******************************************************************/
- 
-inline bool systemPathIsLogicalDrivePattern(/*in*/ const rtl::OUString& path)
-{
-    return osl_systemPathIsLogicalDrivePattern(path.pData);
-}
-          
-} // end namespace osl
-
-#endif 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/pipe.cxx b/sal/osl/os2/pipe.cxx
deleted file mode 100644
index bb873b0bf..000000000
--- a/sal/osl/os2/pipe.cxx
+++ /dev/null
@@ -1,557 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-//#define INCL_DOSERRORS
-#include "system.h"
-
-#include <osl/pipe.h>
-#include <osl/diagnose.h>
-#include <osl/thread.h>
-#include <osl/mutex.h>
-#include <osl/semaphor.h>
-#include <osl/conditn.h>
-#include <osl/interlck.h>
-#include <osl/process.h>
-#include <rtl/ustring.hxx>
-
-#define PIPENAMEMASK	"OSL_PIPE_%s"
-#define SECPIPENAMEMASK	"OSL_PIPE_%s_%s"
-
-typedef enum {
-    MSG_SYN,
-    MSG_FIN,
-    MSG_DATA,
-    MSG_UNKNOWN
-} MessageType;
-
-struct oslPipeImpl {
-    oslInterlockedCount m_Reference;
-    HPIPE  				hPipe;
-    HMTX				m_NamedObject;
-    APIRET 				nLastError;
-    //oslSecurity  		m_Security;
-    sal_Bool            m_bClosed;
-};
-
-/* default size for input/output buffer */
-static const ULONG ulBufSize = 4096;
-
-/* OS/2 path for pipes */
-static const CHAR  pszPipePath[] = "\\PIPE\\";
-static const UCHAR nPipePathLen  = sizeof (pszPipePath) - 1;
-
-/* global last error value to be returned from oslGetLastPipeError */
-static APIRET ngLastError;
-
-using rtl::OString;
-using rtl::OUString;
-using rtl::OUStringToOString;
-
-/*****************************************************************************/
-/* osl_create/destroy-PipeImpl */
-/*****************************************************************************/
-
-static oslInterlockedCount nPipes = 0;
-
-oslPipe __osl_createPipeImpl(void)
-{
-    oslPipe pPipe;
-
-    pPipe = (oslPipe) calloc(1,sizeof(struct oslPipeImpl));
-
-    pPipe->m_bClosed = sal_False;
-    pPipe->m_Reference = 1;
-    pPipe->hPipe = NULL;
-    pPipe->m_NamedObject = NULL;
-
-    return pPipe;
-}
-
-void __osl_destroyPipeImpl(oslPipe pPipe)
-{
-    if (pPipe != NULL)
-    {
-        DosCloseMutexSem( pPipe->m_NamedObject);
-        free(pPipe);
-    }
-}
-
-
-/*****************************************************************************/
-/* osl_createPipe  */
-/*****************************************************************************/
-oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions Options, 
-                       oslSecurity Security)
-{
-    oslPipe pPipe;
-    
-    ULONG  ulAction;
-    CHAR   strPipeNameBuffer [CCHMAXPATHCOMP];
-    rtl_String* strPipeName=0;
-    sal_Char* pszPipeName=0;
-
-    /* check parameters */
-    OSL_ASSERT( ustrPipeName );
-    //YD 17/04/06 OSL_ASSERT( Security == 0 );
-
-    /* allocate impl-structure */
-    pPipe = __osl_createPipeImpl();
-    if (!pPipe)
-    {
-        OSL_TRACE( "osl_createPipe failed allocating memory.\n" );
-        return NULL;
-    }
-
-    /* create pipe name */
-    OString sPipe = OUStringToOString(ustrPipeName, RTL_TEXTENCODING_ASCII_US);
-#if OSL_DEBUG_LEVEL > 0
-    debug_printf("osl_createPipe options 0x%x\n", Options);
-#endif
-
-    switch( Options )
-    {
-    case osl_Pipe_OPEN:
-        {
-            APIRET	fPipeAvailable;
-
-            sprintf (strPipeNameBuffer, "\\PIPE\\OSL_PIPE_%s", sPipe.getStr());
-#if OSL_DEBUG_LEVEL > 0
-            debug_printf("osl_createPipe %s\n", strPipeNameBuffer);
-#endif
-            ngLastError = DosOpen( (PCSZ)strPipeNameBuffer,
-                                &(pPipe->hPipe), &ulAction,
-                                0, FILE_NORMAL,	FILE_OPEN,
-                                OPEN_ACCESS_READWRITE |	OPEN_SHARE_DENYREADWRITE,
-                                (PEAOP2) NULL);
-            // if pipe is busy, wait for it
-            if (ngLastError == ERROR_PIPE_BUSY)
-                do
-                {
-                    /* free instance should be available first */
-                    fPipeAvailable = DosWaitNPipe( (PCSZ)strPipeNameBuffer, -1);
-                    /* first try to open system pipe */
-                    if ( fPipeAvailable == NO_ERROR )
-                    {
-                        // We got it !
-                        ngLastError = NO_ERROR;
-                        break;
-                    }
-                    // Pipe instance maybe catched by another client -> try again
-                    printf("osl_createPipe wait for Pipe available\n");
-                } while ( fPipeAvailable );
-        }
-        break;
-    case osl_Pipe_CREATE:
-        {
-            sprintf (strPipeNameBuffer, "\\SEM32\\OSL_SEM_%s", sPipe.getStr());
-            // check if semaphore exists (pipe create must fail for existig pipes)
-            ngLastError = DosCreateMutexSem( (PCSZ)strPipeNameBuffer, &(pPipe->m_NamedObject), 0, TRUE );
-            if (ngLastError)
-                break;
-
-            sprintf (strPipeNameBuffer, "\\PIPE\\OSL_PIPE_%s", sPipe.getStr());
-#if OSL_DEBUG_LEVEL > 0
-            debug_printf("osl_createPipe %s\n", strPipeNameBuffer);
-#endif
-            ngLastError = DosCreateNPipe( (PCSZ)strPipeNameBuffer,
-                            &(pPipe->hPipe),
-                            NP_ACCESS_DUPLEX,    /* open pipe for read and write access */
-                            0xFF,                /* allow unlimited number of instances */
-                            ulBufSize,           /* output buffer size */
-                            ulBufSize,           /* input buffer size */
-                            0L                   /* use default time-out time */
-                          );
-        }
-        break;
-    default:
-        ngLastError = ERROR_INVALID_PARAMETER;
-    }
-
-    /* if failed, release allocated memory */
-    if (ngLastError)
-    {
-        OSL_TRACE( "osl_createPipe failed %s the pipe %s, Error Code %d.\n",
-                   Options == osl_Pipe_OPEN ? "opening" : "creating",
-                   strPipeNameBuffer,
-                   ngLastError );
-        __osl_destroyPipeImpl(pPipe);
-        return NULL;
-    }
-
-    pPipe->m_Reference= 1;
-    pPipe->m_bClosed  = sal_False;
-    //pPipe->m_Security = Security;
-    pPipe->nLastError = NO_ERROR;
-    return (oslPipe)pPipe;
-}
-
-/*****************************************************************************/
-/* osl_copyPipe  */
-/*****************************************************************************/
-oslPipe SAL_CALL osl_copyPipe(oslPipe pPipe)
-{
-    //oslPipe* pPipe = (oslPipe*) Pipe;
-    oslPipe pNewPipe;
-
-    
-    /* check parameter */
-    OSL_ASSERT (pPipe);
-
-    /* allocate impl-structure */
-    pNewPipe = __osl_createPipeImpl();
-    if (!pNewPipe) return NULL;
-
-    /* create new handle */
-    pNewPipe->hPipe = (HPIPE) -1;
-    ngLastError  = DosDupHandle( pPipe->hPipe, &(pNewPipe->hPipe) );
-
-    /* if failed, release allocated memory */
-    if (ngLastError)
-    {
-        OSL_TRACE( "osl_copyPipe failed duplicating pipe handle, Error-Code: %d.\n",
-                   ngLastError );
-        free (pNewPipe);
-        return NULL;
-    }
-
-    pNewPipe->nLastError = NO_ERROR;
-    return (oslPipe)pNewPipe;
-}
-
-void SAL_CALL osl_acquirePipe( oslPipe pPipe )
-{
-    osl_incrementInterlockedCount( &(pPipe->m_Reference) );
-}
-
-void SAL_CALL osl_releasePipe( oslPipe pPipe )
-{
-//  	OSL_ASSERT( pPipe );
-    
-    if( 0 == pPipe )
-        return;
-    
-    if( 0 == osl_decrementInterlockedCount( &(pPipe->m_Reference) ) )
-    {
-        if( ! pPipe->m_bClosed )
-            osl_closePipe( pPipe );
-        
-        __osl_destroyPipeImpl( pPipe );
-    }
-}
-
-/*****************************************************************************/
-/* osl_destroyPipe  */
-/*************close****************************************************************/
-void SAL_CALL osl_closePipe(oslPipe pPipe)
-{
-    //oslPipe* pPipe = (oslPipe*) Pipe;
-    /* check parameter */
-    OSL_ASSERT (pPipe);
-
-    if( pPipe && ! pPipe->m_bClosed )
-    {
-        pPipe->m_bClosed = sal_True;
-        /* if we have a system pipe close it */
-        if (pPipe->hPipe != 0)
-        {
-            /* disconnect client */
-            DosDisConnectNPipe (pPipe->hPipe);
-            
-            /* close the pipe */
-            DosClose (pPipe->hPipe);
-        }
-    }
-}
-
-/*****************************************************************************/
-/* osl_acceptPipe  */
-/*****************************************************************************/
-oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
-{
-    
-#define PINFO ((PIPEINFO *) &PipeInfoBuffer)
-    
-    ///oslPipe* pPipe = (oslPipe*) Pipe;
-    oslPipe pNewPipe;
-    BYTE     PipeInfoBuffer[sizeof(PIPEINFO) + CCHMAXPATHCOMP];
-
-    /* check parameter */
-    OSL_ASSERT (pPipe);
-
-    /* get pipe information */
-    pPipe->nLastError = DosQueryNPipeInfo(pPipe->hPipe,
-                                         1,
-                                         (PVOID) &PipeInfoBuffer,
-                                         sizeof(PipeInfoBuffer));
-    
-    if (pPipe->nLastError)
-    {
-        OSL_TRACE( "osl_acceptPipe failed for requesting pipe information.\n",
-                   pPipe->nLastError );
-        return NULL;
-    }
-
-    /* create a new instance of the pipe if possible */
-    if (PINFO->cbMaxInst == -1 ||                   /* unlimited instances */
-        PINFO->cbMaxInst > PINFO->cbCurInst)
-    {
-        HPIPE hPipe;
-        
-        pNewPipe = __osl_createPipeImpl();
-
-        if (!pNewPipe)
-        {
-            OSL_TRACE( "osl_acceptPipe failed creating new instance.\n", ngLastError );
-            free(pNewPipe);
-            return NULL;
-        }
-
-        //pNewPipe->m_Security = pPipe->m_Security;
-        
-        pNewPipe->nLastError =
-            DosCreateNPipe( (PCSZ)PINFO->szName,
-                            &(pNewPipe->hPipe),
-                            NP_ACCESS_DUPLEX,    /* open pipe for read and write access */
-                            0xFF,                /* allow unlimited number of instances */
-                            ulBufSize,           /* output buffer size */
-                            ulBufSize,           /* input buffer size */
-                            0L                   /* use default time-out time */
-                          );
-        
-        if (pNewPipe->nLastError)
-        {
-            OSL_TRACE( "osl_acceptPipe failed creating new named pipe, Error-Code: %d.\n",
-                       pNewPipe->nLastError );
-            free(pNewPipe);
-            return NULL;
-        }
-        
-        /* switch pipe handles */
-        hPipe = pPipe->hPipe;
-        pPipe->hPipe  = pNewPipe->hPipe;
-        pNewPipe->hPipe = hPipe;
-        
-        /* connect new handle to client */
-        pNewPipe->nLastError = DosConnectNPipe( pNewPipe->hPipe );
-    
-        /* if failed, release allocated memory */
-        if (pNewPipe->nLastError)
-        {
-            OSL_TRACE( "osl_acceptPipe failed connecting pipe to client, Error-Code: %d.\n",
-                       pNewPipe->nLastError );
-            
-            osl_closePipe((oslPipe)pNewPipe);
-            return NULL;
-        }
-        return (oslPipe)pNewPipe;
-    }
-    else
-    {
-        /* connect original handle to client */
-        pPipe->nLastError = DosConnectNPipe( pPipe->hPipe );
-    
-        if (pPipe->nLastError)
-        {
-            OSL_TRACE( "osl_acceptPipe failed connecting pipe to client, Error-Code: %d.\n",
-                       pPipe->nLastError );
-            return NULL;
-        }
-    
-        return (oslPipe)pPipe;
-    }
-}
-
-/*****************************************************************************/
-/* osl_receivePipe  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe,
-                        void* pBuffer,
-                        sal_Int32 BytesToRead)
-{
-    //oslPipe* pPipe = (oslPipe*) Pipe;
-    ULONG  ulActual;
-    
-    /* check parameter */
-    OSL_ASSERT (pPipe);
-
-    /* read data from pipe */
-    pPipe->nLastError = DosRead( pPipe->hPipe, pBuffer, BytesToRead, &ulActual );
-
-    /* return -1 if failed */
-    if( pPipe->nLastError )
-    {
-        OSL_TRACE( "osl_receivePipe failed receiving from Pipe, Error-Code: %d.\n",
-                   pPipe->nLastError );
-        return -1;
-    }
-
-    return ulActual;
-}
-
-
-/*****************************************************************************/
-/* osl_sendPipe  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe,
-                       const void* pBuffer,
-                       sal_Int32 BytesToSend)
-{
-    //oslPipe* pPipe = (oslPipe*) Pipe;
-    ULONG  ulActual;
-    
-    /* check parameter */
-    OSL_ASSERT (pPipe);
-
-    /* read data from pipe */
-    pPipe->nLastError = DosWrite( pPipe->hPipe, (PVOID) pBuffer, BytesToSend, &ulActual );
-
-    /* return -1 if failed */
-    if( pPipe->nLastError )
-    {
-        OSL_TRACE( "osl_receivePipe failed writing to Pipe, Error-Code: %d.\n",
-                   pPipe->nLastError );
-        return -1;
-    }
-
-    return ulActual;
-}
-
-
-/*****************************************************************************/
-/* osl_getLastPipeError  */
-/*****************************************************************************/
-
-oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe)
-{
-    //oslPipe* pPipe = (oslPipe*) Pipe;
-    APIRET rc;
-
-    /* return local error value if possible */
-    if (pPipe)
-    {
-        rc = pPipe->nLastError;
-        pPipe->nLastError = NO_ERROR;
-    } else
-        rc = ngLastError;
-    
-    /* map OS/2 error values */
-    switch (rc)
-    {
-    case NO_ERROR:                return osl_Pipe_E_None;
-    case ERROR_PATH_NOT_FOUND:    return osl_Pipe_E_NotFound;
-    case ERROR_NOT_ENOUGH_MEMORY: return osl_Pipe_E_NoBufferSpace;
-    default:                      return osl_Pipe_E_invalidError;
-    }
-}
-
-/*****************************************************************************/
-
-sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 n )
-{
-    /* loop until all desired bytes were send or an error occurred */
-    sal_Int32 BytesSend= 0;
-    sal_Int32 BytesToSend= n;
-
-    OSL_ASSERT(pPipe);
-    while (BytesToSend > 0)
-    {
-        sal_Int32 RetVal;
-
-        RetVal= osl_sendPipe(pPipe, pBuffer, BytesToSend);
-
-        /* error occurred? */
-        if(RetVal <= 0)
-        {
-            break;
-        }
-
-        BytesToSend -= RetVal;
-        BytesSend += RetVal;
-        pBuffer= (sal_Char*)pBuffer + RetVal;
-    }
-
-    return BytesSend;
-}
-
-sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
-{
-    /* loop until all desired bytes were read or an error occurred */
-    sal_Int32 BytesRead= 0;
-    sal_Int32 BytesToRead= n;
-
-    OSL_ASSERT( pPipe );
-    while (BytesToRead > 0)
-    {
-        sal_Int32 RetVal;
-        RetVal= osl_receivePipe(pPipe, pBuffer, BytesToRead);
-
-        /* error occurred? */
-        if(RetVal <= 0)
-        {
-            break;
-        }
-
-        BytesToRead -= RetVal;
-        BytesRead += RetVal;
-        pBuffer= (sal_Char*)pBuffer + RetVal;
-    }
-    return BytesRead;
-}
-
-
-/******************************************************************************
- *
- *                  New io resource transfer functions
- *
- *****************************************************************************/
-
-
-/**********************************************
- osl_sendResourcePipe
- *********************************************/
- 
-sal_Bool osl_sendResourcePipe(oslPipe pPipe, oslSocket pSocket)
-{
-    sal_Bool bRet = sal_False;
-
-    return bRet;
-}
-
-/**********************************************
- osl_receiveResourcePipe
- *********************************************/
- 
-oslSocket osl_receiveResourcePipe(oslPipe pPipe)
-{
-    oslSocket pSocket=0;
-
-    return (oslSocket) pSocket;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/pipeimpl.cxx b/sal/osl/os2/pipeimpl.cxx
deleted file mode 100644
index f8a5acd35..000000000
--- a/sal/osl/os2/pipeimpl.cxx
+++ /dev/null
@@ -1,742 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#	include "pipeimpl.h"
-
-#ifndef _INC_MALLOC
-#	include <malloc.h>
-#endif
-
-#ifndef _INC_TCHAR
-#	ifdef UNICODE
-#		define _UNICODE
-#	endif
-#	include <tchar.h>
-#endif
-
-const TCHAR PIPE_NAME_PREFIX_MAPPING[] = TEXT("PIPE_FILE_MAPPING_");
-const TCHAR PIPE_NAME_PREFIX_SYNCHRONIZE[] = TEXT("PIPE_SYNCHRONIZE_MUTEX_");
-const TCHAR PIPE_NAME_PREFIX_CONNECTION[] = TEXT("PIPE_CONNECTION_SEMAPHORE_");
-
-const DWORD PIPE_BUFFER_SIZE = 4096;
-
-
-//============================================================================
-//	PipeData
-//============================================================================
-
-struct PipeData
-{
-    DWORD	dwProcessId;
-    HANDLE	hReadPipe;
-    HANDLE	hWritePipe;
-};
-
-//============================================================================
-//	Pipe
-//============================================================================
-
-#ifdef UNICODE
-#define Pipe		PipeW
-#define ClientPipe	ClientPipeW
-#define ServerPipe	ServerPipeW
-#else
-#define Pipe		PipeA
-#define ClientPipe	ClientPipeA
-#define ServerPipe	ServerPipeA
-#endif
-
-class Pipe
-{
-protected:
-    HANDLE	m_hReadPipe;	// Handle to use for reading
-    HANDLE	m_hWritePipe;	// Handle to use for writing
-
-    Pipe( HANDLE hReadPipe, HANDLE hWritePipe );
-
-    static HANDLE CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner );
-    static HANDLE CreatePipeDataMapping( LPCTSTR lpName );
-    static HANDLE OpenPipeDataMapping( LPCTSTR lpName );
-    static HANDLE CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount, LONG lMaximumcount );
-
-public:
-    Pipe( const Pipe& );
-    const Pipe& operator = ( const Pipe& );
-    virtual ~Pipe();
-
-    virtual bool Close();
-    virtual bool Write( LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, bool bWait = true );
-    virtual bool Read( LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, bool bWait = true );
-
-    virtual Pipe *AcceptConnection()
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return NULL;
-    }
-
-    void * operator new( size_t nBytes )
-    {
-        return HeapAlloc( GetProcessHeap(), 0, nBytes );
-    }
-
-    void operator delete( void *ptr )
-    {
-        HeapFree( GetProcessHeap(), 0, ptr );
-    }
-
-    bool is() const
-    {
-        return (FALSE != HeapValidate( GetProcessHeap(), 0, this ));
-    }
-
-};
-
-//============================================================================
-//	ClientPipe
-//============================================================================
-
-class ClientPipe : public Pipe
-{
-protected:
-    ClientPipe( HANDLE hReadPipe, HANDLE hWritePipe );
-public:
-    static ClientPipe* Create( LPCTSTR lpName );
-};
-
-//============================================================================
-//	ServerPipe
-//============================================================================
-
-class ServerPipe : public Pipe
-{
-protected:
-    HANDLE	m_hMapping;
-    HANDLE	m_hSynchronize;
-    LPTSTR	m_lpName;
-
-    ServerPipe( LPCTSTR lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe );
-public:
-    virtual ~ServerPipe();
-
-    static ServerPipe *Create( LPCTSTR lpName );
-
-    virtual Pipe *AcceptConnection();
-};
-
-HANDLE	Pipe::CreatePipeDataMapping( LPCTSTR lpName )
-{
-    HANDLE	hMapping = NULL;
-    LPTSTR	lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
-
-    if ( lpMappingName )
-    {
-        _tcscpy( lpMappingName, PIPE_NAME_PREFIX_MAPPING );
-        _tcscat( lpMappingName, lpName );
-
-        LPTSTR	lpMappingFileName = (LPTSTR)alloca( MAX_PATH * sizeof(TCHAR) );
-
-        if ( lpMappingFileName )
-        {
-            DWORD	nChars = GetTempPath( MAX_PATH, lpMappingFileName );
-
-            if ( MAX_PATH + _tcslen(lpName) < nChars + 1 )
-            {
-                lpMappingFileName = (LPTSTR)alloca( (nChars + 1 + _tcslen(lpName)) * sizeof(TCHAR) );
-                if ( lpMappingFileName )
-                    nChars = GetTempPath( nChars, lpMappingFileName );
-                else
-                {
-                    nChars = 0;
-                    SetLastError( ERROR_NOT_ENOUGH_MEMORY );
-                }
-            }
-
-            if ( nChars )
-            {
-                _tcscat( lpMappingFileName, lpMappingName );
-
-                HANDLE hFile = CreateFile( 
-                    lpMappingFileName, 
-                    GENERIC_READ | GENERIC_WRITE, 
-                    FILE_SHARE_READ | FILE_SHARE_WRITE, 
-                    NULL, 
-                    OPEN_ALWAYS, 
-                    FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE, 
-                    NULL );
-
-                if ( IsValidHandle(hFile) )
-                {
-                    hMapping = CreateFileMapping(
-                        (HANDLE)hFile,
-                        (LPSECURITY_ATTRIBUTES)NULL,
-                        PAGE_READWRITE,
-                        0,
-                        sizeof(PipeData),
-                        lpMappingName );
-
-                    CloseHandle( hFile );
-                }
-            }
-        }
-        else
-            SetLastError( ERROR_NOT_ENOUGH_MEMORY );
-    }
-
-    return hMapping;
-}
-
-HANDLE	Pipe::OpenPipeDataMapping( LPCTSTR lpName )
-{
-    HANDLE	hMapping = NULL;
-    LPTSTR	lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
-
-    if ( lpMappingName )
-    {
-        _tcscpy( lpMappingName, PIPE_NAME_PREFIX_MAPPING );
-        _tcscat( lpMappingName, lpName );
-
-        hMapping = OpenFileMapping( FILE_MAP_ALL_ACCESS, FALSE, lpMappingName );
-    }
-
-    return hMapping;
-}
-
-HANDLE	Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
-{
-    HANDLE	hMutex = NULL;
-    LPTSTR	lpMutexName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_SYNCHRONIZE) );
-
-    if ( lpMutexName )
-    {
-        _tcscpy( lpMutexName, PIPE_NAME_PREFIX_SYNCHRONIZE );
-        _tcscat( lpMutexName, lpName );
-
-        hMutex = CreateMutex( NULL, bInitialOwner, lpMutexName );
-    }
-
-    return hMutex;
-}
-
-HANDLE Pipe::CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount, LONG lMaximumCount )
-{
-    HANDLE	hSemaphore = NULL;
-    LPTSTR	lpSemaphoreName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_CONNECTION) );
-
-    if ( lpSemaphoreName )
-    {
-        _tcscpy( lpSemaphoreName, PIPE_NAME_PREFIX_CONNECTION );
-        _tcscat( lpSemaphoreName, lpName );
-
-        hSemaphore = CreateSemaphore( NULL, lInitialCount, lMaximumCount, lpSemaphoreName );
-    }
-
-    return hSemaphore;
-}
-
-
-//----------------------------------------------------------------------------
-//	Pipe copy ctor
-//----------------------------------------------------------------------------
-
-Pipe::Pipe( const Pipe& rPipe ) :
-m_hReadPipe( INVALID_HANDLE_VALUE ),
-m_hWritePipe( INVALID_HANDLE_VALUE )
-{
-    DuplicateHandle( 
-        GetCurrentProcess(),
-        rPipe.m_hReadPipe,
-        GetCurrentProcess(),
-        &m_hReadPipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle( 
-        GetCurrentProcess(),
-        rPipe.m_hWritePipe,
-        GetCurrentProcess(),
-        &m_hWritePipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-}
-
-//----------------------------------------------------------------------------
-//	Pipe assignment operator
-//----------------------------------------------------------------------------
-
-const Pipe& Pipe::operator = ( const Pipe& rPipe )
-{
-    Close();
-
-    DuplicateHandle( 
-        GetCurrentProcess(),
-        rPipe.m_hReadPipe,
-        GetCurrentProcess(),
-        &m_hReadPipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle( 
-        GetCurrentProcess(),
-        rPipe.m_hWritePipe,
-        GetCurrentProcess(),
-        &m_hWritePipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-    
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-//	Pipe ctor
-//----------------------------------------------------------------------------
-
-Pipe::Pipe( HANDLE hReadPipe, HANDLE hWritePipe ) :
-m_hReadPipe( INVALID_HANDLE_VALUE ),
-m_hWritePipe( INVALID_HANDLE_VALUE )
-{
-    DuplicateHandle( 
-        GetCurrentProcess(),
-        hReadPipe,
-        GetCurrentProcess(),
-        &m_hReadPipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle( 
-        GetCurrentProcess(),
-        hWritePipe,
-        GetCurrentProcess(),
-        &m_hWritePipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-}
-
-//----------------------------------------------------------------------------
-//	Pipe dtor
-//----------------------------------------------------------------------------
-
-Pipe::~Pipe()
-{
-    Close();
-}
-
-//----------------------------------------------------------------------------
-//	Pipe Close
-//----------------------------------------------------------------------------
-
-bool Pipe::Close()
-{
-    bool	fSuccess = false;	// Assume failure
-
-    if ( IsValidHandle(m_hReadPipe) )
-    {
-        CloseHandle( m_hReadPipe );
-        m_hReadPipe = INVALID_HANDLE_VALUE;
-    }
-
-    if ( IsValidHandle(m_hWritePipe) )
-    {
-        CloseHandle( m_hWritePipe );
-        m_hWritePipe = INVALID_HANDLE_VALUE;
-    }
-
-    return fSuccess;
-}
-
-//----------------------------------------------------------------------------
-//	Pipe Write
-//----------------------------------------------------------------------------
-
-bool Pipe::Write( LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, bool bWait )
-{
-    DWORD	dwBytesAvailable = 0;
-    BOOL	fSuccess = TRUE;
-
-    if ( !bWait )
-        fSuccess = PeekNamedPipe( m_hReadPipe, NULL, 0, NULL, &dwBytesAvailable, NULL );
-
-    if ( fSuccess )
-    {
-        if ( !bWait && dwBytesToWrite > PIPE_BUFFER_SIZE - dwBytesAvailable )
-            dwBytesToWrite = PIPE_BUFFER_SIZE - dwBytesAvailable ;
-
-        return !!WriteFile( m_hWritePipe, lpBuffer, dwBytesToWrite, lpBytesWritten, NULL );
-    }
-
-    return false;
-}
-
-//----------------------------------------------------------------------------
-//	Pipe Read
-//----------------------------------------------------------------------------
-
-bool Pipe::Read( LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, bool bWait )
-{
-    DWORD	dwBytesAvailable = 0;
-    BOOL	fSuccess = TRUE;
-
-    if ( !bWait )
-        fSuccess = PeekNamedPipe( m_hReadPipe, NULL, 0, NULL, &dwBytesAvailable, NULL );
-
-    if ( fSuccess )
-    {
-        if ( bWait || dwBytesAvailable )
-            return !!ReadFile( m_hReadPipe, lpBuffer, dwBytesToRead, lpBytesRead, NULL );
-        else
-        {
-            *lpBytesRead = 0;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-
-//----------------------------------------------------------------------------
-//	Client pipe dtor
-//----------------------------------------------------------------------------
-
-ClientPipe::ClientPipe( HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe )
-{
-}
-
-//----------------------------------------------------------------------------
-//	Client pipe creation
-//----------------------------------------------------------------------------
-
-ClientPipe *ClientPipe::Create( LPCTSTR lpName )
-{
-    ClientPipe	*pPipe = NULL;	// Assume failure
-
-    HANDLE	hMapping = OpenPipeDataMapping( lpName );
-
-    if ( IsValidHandle(hMapping) )
-    {
-        PipeData	*pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
-
-        if ( pData )
-        {
-            HANDLE	hSourceProcess = OpenProcess( PROCESS_DUP_HANDLE, FALSE, pData->dwProcessId );
-
-            if ( IsValidHandle(hSourceProcess) )
-            {
-                BOOL fSuccess;
-                HANDLE	hReadPipe = INVALID_HANDLE_VALUE, hWritePipe = INVALID_HANDLE_VALUE;
-                
-                fSuccess = DuplicateHandle( 
-                    hSourceProcess,
-                    pData->hReadPipe,
-                    GetCurrentProcess(),
-                    &hReadPipe,
-                    0,
-                    FALSE,
-                    DUPLICATE_SAME_ACCESS );
-
-                fSuccess = fSuccess && DuplicateHandle( 
-                    hSourceProcess,
-                    pData->hWritePipe,
-                    GetCurrentProcess(),
-                    &hWritePipe,
-                    0,
-                    FALSE,
-                    DUPLICATE_SAME_ACCESS );
-
-                if ( fSuccess )
-                    pPipe = new ClientPipe( hReadPipe, hWritePipe );
-
-                if ( IsValidHandle(hWritePipe) )
-                    CloseHandle( hWritePipe );
-
-                if ( IsValidHandle(hReadPipe) )
-                    CloseHandle( hReadPipe );
-
-                HANDLE	hConnectionRequest = CreatePipeConnectionSemaphore( lpName, 0, 1 );
-
-                ReleaseSemaphore( hConnectionRequest, 1, NULL );
-
-                CloseHandle( hConnectionRequest );
-                
-                CloseHandle( hSourceProcess );
-            }
-
-            UnmapViewOfFile( pData );
-        }
-
-        CloseHandle( hMapping );
-    }
-
-    return pPipe;
-}
-
-
-
-//----------------------------------------------------------------------------
-//	ServerPipe ctor
-//----------------------------------------------------------------------------
-
-ServerPipe::ServerPipe( LPCTSTR	lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe ),
-m_hMapping( NULL ),
-m_hSynchronize( NULL ),
-m_lpName( NULL )
-{
-    DuplicateHandle( 
-        GetCurrentProcess(),
-        hMapping,
-        GetCurrentProcess(),
-        &m_hMapping,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        hSynchronize,
-        GetCurrentProcess(),
-        &m_hSynchronize,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS
-        );
-    m_lpName = new TCHAR[_tcslen(lpName) + 1];
-    if ( m_lpName )
-        _tcscpy( m_lpName, lpName );
-}
-
-//----------------------------------------------------------------------------
-//	ServerPipe dtor
-//----------------------------------------------------------------------------
-
-ServerPipe::~ServerPipe()
-{
-    if ( IsValidHandle(m_hMapping) )
-        CloseHandle( m_hMapping );
-    if ( m_lpName )
-        delete[]m_lpName;
-}
-
-//----------------------------------------------------------------------------
-//	ServerPipe AcceptConnection
-//----------------------------------------------------------------------------
-
-Pipe *ServerPipe::AcceptConnection()
-{
-    Pipe	*pPipe = NULL;	// Assume failure;
-
-    HANDLE	hConnectionRequest = CreatePipeConnectionSemaphore( m_lpName, 0, 1 );
-
-    if ( WAIT_OBJECT_0 == WaitForSingleObject( hConnectionRequest, INFINITE ) )
-    {
-        pPipe = new Pipe( *this );
-        Close();
-
-        // Create new inbound Pipe
-
-        HANDLE	hClientWritePipe = NULL, hServerReadPipe = NULL;
-
-        BOOL	fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
-
-
-        if ( fSuccess )
-        {
-            // Create outbound pipe
-
-            HANDLE	hClientReadPipe = NULL, hServerWritePipe = NULL;
-
-            if ( CreatePipe( &hClientReadPipe, &hServerWritePipe, NULL, PIPE_BUFFER_SIZE ) )
-            {
-                m_hReadPipe = hServerReadPipe;
-                m_hWritePipe = hServerWritePipe;
-
-                PipeData	*pData = (PipeData *)MapViewOfFile( m_hMapping, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(PipeData) );
-
-                HANDLE	hSynchronize = CreatePipeDataMutex( m_lpName, TRUE );
-
-                CloseHandle( pData->hReadPipe );
-                CloseHandle( pData->hWritePipe );
-
-                pData->hReadPipe = hClientReadPipe;
-                pData->hWritePipe = hClientWritePipe;
-
-                ReleaseMutex( hSynchronize );
-
-                CloseHandle( hSynchronize );
-
-            }
-            else
-            {
-                CloseHandle( hClientWritePipe );
-                CloseHandle( hServerWritePipe );	
-            }
-        }
-
-        ReleaseMutex( hConnectionRequest );
-    }
-
-    CloseHandle( hConnectionRequest );
-
-    return pPipe;
-}
-
-//----------------------------------------------------------------------------
-//	Pipe creation
-//----------------------------------------------------------------------------
-
-ServerPipe *ServerPipe::Create( LPCTSTR lpName )
-{
-    ServerPipe	*pPipe = NULL;
-
-    HANDLE	hMapping = CreatePipeDataMapping( lpName );
-
-    if ( IsValidHandle(hMapping) )
-    {
-        if ( ERROR_FILE_EXISTS != GetLastError() )
-        {
-            HANDLE	hSynchronize = CreatePipeDataMutex( lpName, FALSE);
-            
-            WaitForSingleObject( hSynchronize, INFINITE );
-
-            PipeData	*pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
-
-            if ( pData )
-            {
-
-                // Initialize pipe data
-
-                pData->dwProcessId = 0;
-                pData->hReadPipe = NULL;
-                pData->hWritePipe = NULL;
-
-                // Create inbound pipe
-
-                HANDLE	hServerReadPipe = NULL, hClientWritePipe = NULL;
-
-                BOOL	fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
-
-                if ( fSuccess )
-                {
-                    // Create outbound pipe
-
-                    HANDLE	hServerWritePipe = NULL, hClientReadPipe = NULL;
-
-                    fSuccess = CreatePipe( &hClientReadPipe, &hServerWritePipe, NULL, PIPE_BUFFER_SIZE );
-
-                    if ( fSuccess )
-                    {
-                        pData->dwProcessId = GetCurrentProcessId();
-                        pData->hReadPipe = hClientReadPipe;
-                        pData->hWritePipe = hClientWritePipe;
-                        pPipe = new ServerPipe( lpName, hMapping, hSynchronize, hServerReadPipe, hServerWritePipe );
-
-                        CloseHandle( hServerWritePipe );
-                        CloseHandle( hServerReadPipe );
-                    }
-                    else
-                    {
-                        CloseHandle( hServerReadPipe );
-                        CloseHandle( hClientWritePipe );
-                    }
-                }
-
-                UnmapViewOfFile( pData );
-            }
-
-            ReleaseMutex( hSynchronize );
-            CloseHandle( hSynchronize );
-        }
-
-        CloseHandle( hMapping );
-    }
-
-    return pPipe;
-}
-
-
-//----------------------------------------------------------------------------
-//	C style API
-//----------------------------------------------------------------------------
-
-const TCHAR	LOCAL_PIPE_PREFIX[] = TEXT("\\\\.\\PIPE\\" );
-
-extern "C" HANDLE WINAPI CreateSimplePipe( LPCTSTR lpName )
-{
-    int	nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
-    if ( 0 == _tcsnicmp( lpName, LOCAL_PIPE_PREFIX, nPrefixLen ) )
-        lpName += nPrefixLen;
-    return (HANDLE)ServerPipe::Create( lpName );
-}
-
-extern "C" HANDLE WINAPI OpenSimplePipe( LPCTSTR lpName )
-{
-    int	nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
-    if ( 0 == _tcsnicmp( lpName, LOCAL_PIPE_PREFIX, nPrefixLen ) )
-        lpName += nPrefixLen;
-    return (HANDLE)ClientPipe::Create( lpName );
-}
-
-extern "C" HANDLE WINAPI AcceptSimplePipeConnection( HANDLE hPipe )
-{
-    Pipe	*pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-        return (HANDLE)pPipe->AcceptConnection();
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return NULL;
-    }
-}
-
-extern "C" BOOL WINAPI WaitForSimplePipe( LPCTSTR /*lpName*/, DWORD /*dwTimeOut*/ )
-{
-    return FALSE;
-}
-
-extern "C" BOOL WINAPI WriteSimplePipe( HANDLE hPipe, LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, BOOL bWait )
-{
-    Pipe	*pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-        return pPipe->Write( lpBuffer, dwBytesToWrite, lpBytesWritten, bWait );
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return FALSE;
-    }
-}
-
-extern "C" BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, BOOL bWait )
-{
-    Pipe	*pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-        return pPipe->Read( lpBuffer, dwBytesToRead, lpBytesRead, bWait );
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return FALSE;
-    }
-}
-
-extern "C" BOOL WINAPI CloseSimplePipe( HANDLE hPipe )
-{
-    Pipe	*pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-    {
-        delete pPipe;
-        return TRUE;
-    }
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return FALSE;
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/pipeimpl.h b/sal/osl/os2/pipeimpl.h
deleted file mode 100644
index c73412421..000000000
--- a/sal/osl/os2/pipeimpl.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef _PIPEIMPL_H_
-#define _PIPEIMPL_H_
-
-#ifndef _WINDOWS_
-#	include <windows.h>
-#endif
-
-#ifndef _INC_MALLOC
-#	include <malloc.h>
-#endif
-
-#ifndef _INC_TCHAR
-#	ifdef UNICODE
-#		define _UNICODE
-#	endif
-#	include <tchar.h>
-#endif
-
-#define EXPORT_PIPE_API
-
-//============================================================================
-//	Helper functions
-//============================================================================
-
-// Because the value of an invalid HANDLE returned by API functions differs 
-// between different functions and differs on different Windows platforms,
-// this function checks wether the handle has a meaningfull value.
-#ifndef __cplusplus
-
-#define IsValidHandle( handle ) ((DWORD)(handle) + 1 > 1)
-
-#else
-
-inline bool IsValidHandle( HANDLE handle )
-{
-    return INVALID_HANDLE_VALUE != handle && NULL != handle;
-}
-
-extern "C" {
-
-#endif	// __cplusplus
-
-
-EXPORT_PIPE_API HANDLE WINAPI CreateSimplePipeA( LPCSTR lpName );
-EXPORT_PIPE_API HANDLE WINAPI CreateSimplePipeW( LPCWSTR lpName );
-
-#ifdef UNICODE
-#define CreateSimplePipe	CreateSimplePipeW
-#else
-#define CreateSimplePipe	CreateSimplePipeA
-#endif
-
-EXPORT_PIPE_API HANDLE WINAPI OpenSimplePipeA( LPCSTR lpName );
-EXPORT_PIPE_API HANDLE WINAPI OpenSimplePipeW( LPCWSTR lpName );
-
-#ifdef UNICODE
-#define OpenSimplePipe	OpenSimplePipeW
-#else
-#define OpenSimplePipe	OpenSimplePipeA
-#endif
-
-EXPORT_PIPE_API HANDLE WINAPI AcceptSimplePipeConnection( HANDLE hPipe );
-
-EXPORT_PIPE_API BOOL WINAPI WaitForSimplePipeA( LPCSTR lpName, DWORD dwTimeOut );
-EXPORT_PIPE_API BOOL WINAPI WaitForSimplePipeW( LPCWSTR lpName, DWORD dwTimeOut );
-
-#ifdef UNICODE
-#define WaitForSimplePipe	WaitForSimplePipeW
-#else
-#define WaitForSimplePipe	WaitForSimplePipeA
-#endif
-
-
-EXPORT_PIPE_API BOOL WINAPI WriteSimplePipe( HANDLE hPipe, LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, BOOL bWait );
-EXPORT_PIPE_API BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, BOOL bWait );
-EXPORT_PIPE_API BOOL WINAPI CloseSimplePipe( HANDLE hPipe );
-
-#ifdef __cplusplus
-}	// extern "C"
-#endif
-
-#endif	// _PIPEIMPL_H_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/process.c b/sal/osl/os2/process.c
deleted file mode 100644
index d65dd736d..000000000
--- a/sal/osl/os2/process.c
+++ /dev/null
@@ -1,990 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-#include <osl/thread.h>
-
-#include <osl/diagnose.h>
-
-#ifndef _OSL_FILE_PATH_HELPER_H_
-#include "file_path_helper.h"
-#endif
-
-#include "procimpl.h"
-
-#include <ctype.h>
-
-#include <rtl/ustring.hxx>
-
-// for exception logging
-#include <stdio.h>
-#include <setjmp.h>
-#include "helpers/except.h"
-
-
-#define MAX_ARGS 255
-#define PIPENAMEMASK  "\\PIPE\\OSL_PIPE_%u"
-#define SEMNAMEMASK   "\\SEM32\\OSL_SEM_%u"
-
-typedef enum {
-    MSG_DATA,
-    MSG_END,
-    MSG_ACK,
-    MSG_REL,
-    MSG_UNKNOWN
-} MessageType;
-
-typedef struct {
-    MessageType		  m_Type;
-    oslDescriptorFlag m_Flags;
-    oslDescriptorType m_Data;
-    HANDLE			  m_Value;
-} Message;
-
-typedef struct {
-    HPIPE	m_hPipe;
-} Pipe;
-
-typedef struct _oslSocketCallbackArg {
-    HANDLE	m_socket;
-    Pipe*	m_pipe;
-} oslSocketCallbackArg;
-
-/* process termination queue */
-static sal_Bool            bInitSessionTerm = sal_False;
-static const sal_Char * const SessionTermQueueName = "\\QUEUES\\SESSIONS.QUE";
-static HQUEUE             SessionTermQueue;
-
-/******************************************************************************
- *
- *                  Function Declarations
- *
- *****************************************************************************/
-
-oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
-                                                sal_Char *pszArguments[],
-                                                oslProcessOption Options,
-                                                oslSecurity Security,
-                                                sal_Char *pszDirectory,
-                                                sal_Char *pszEnvironments[],
-                                                oslProcess *pProcess,
-                                                oslFileHandle *pInputWrite,
-                                                oslFileHandle *pOutputRead,
-                                                oslFileHandle *pErrorRead );
-
-/* implemented in file.c */
-extern oslFileError FileURLToPath( char *, size_t, rtl_uString* );
-
-static sal_Bool InitSessionTerm( void )
-{
-    DosCreateQueue( &SessionTermQueue, QUE_FIFO, (PCSZ) SessionTermQueueName );
-
-    return sal_True;
-}
-
-/******************************************************************************
- *
- *                  Functions for starting a process
- *
- *****************************************************************************/
-
-/**********************************************
- osl_executeProcess_WithRedirectedIO
- *********************************************/
- 
-oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
-                                            rtl_uString *ustrImageName,
-                                            rtl_uString *ustrArguments[],
-                                            sal_uInt32   nArguments,
-                                            oslProcessOption Options,
-                                            oslSecurity Security,
-                                            rtl_uString *ustrWorkDir,
-                                            rtl_uString *ustrEnvironment[],
-                                            sal_uInt32   nEnvironmentVars,
-                                            oslProcess *pProcess,
-                                            oslFileHandle	*pInputWrite,
-                                            oslFileHandle	*pOutputRead,
-                                            oslFileHandle	*pErrorRead
-                                            )
-{
-
-    oslProcessError Error;
-    sal_Char* pszWorkDir=0;
-    sal_Char** pArguments=0;
-    sal_Char** pEnvironment=0;
-    unsigned int index;
-    
-    char szImagePath[PATH_MAX] = "";
-    char szWorkDir[PATH_MAX] = "";
-
-
-    if ( ustrImageName && ustrImageName->length )
-    {
-        FileURLToPath( szImagePath, PATH_MAX, ustrImageName );
-    }
-
-    if ( ustrWorkDir != 0 && ustrWorkDir->length )
-    {
-        FileURLToPath( szWorkDir, PATH_MAX, ustrWorkDir );
-        pszWorkDir = szWorkDir;
-    }
-
-    if ( pArguments == 0 && nArguments > 0 )
-    {
-        pArguments = (sal_Char**) malloc( ( nArguments + 2 ) * sizeof(sal_Char*) );
-    }
-
-
-    for ( index = 0 ; index < nArguments ; ++index )
-    {
-        rtl_String* strArg =0;
-
-
-        rtl_uString2String( &strArg,
-                            rtl_uString_getStr(ustrArguments[index]),
-                            rtl_uString_getLength(ustrArguments[index]),
-                            osl_getThreadTextEncoding(),
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-
-        pArguments[index]=strdup(rtl_string_getStr(strArg));
-        rtl_string_release(strArg);
-        pArguments[index+1]=0;
-    }
-
-    for ( index = 0 ; index < nEnvironmentVars ; ++index )
-    {
-        rtl_String* strEnv=0;
-
-        if ( pEnvironment == 0 )
-        {
-            pEnvironment = (sal_Char**) malloc( ( nEnvironmentVars + 2 ) * sizeof(sal_Char*) );
-        }
-
-        rtl_uString2String( &strEnv,
-                            rtl_uString_getStr(ustrEnvironment[index]),
-                            rtl_uString_getLength(ustrEnvironment[index]),
-                            osl_getThreadTextEncoding(),
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-
-        pEnvironment[index]=strdup(rtl_string_getStr(strEnv));
-        rtl_string_release(strEnv);
-        pEnvironment[index+1]=0;
-    }
-
-    int		rc, pid;
-    int		saveOutput = -1, saveInput = -1, saveError = -1;
-    int		stdOutput[2] = { -1, -1 }, stdInput[2] = { -1, -1 }, stdError[2] = { -1, -1 };
-    FILE	*i, *o, *e;
-
-    if (pInputWrite)
-        pipe( stdInput);
-    if (pOutputRead)
-        pipe( stdOutput);
-    if (pErrorRead)
-        pipe( stdError);
-
-    fcntl( stdInput[0], F_SETFD, FD_CLOEXEC);
-    fcntl( stdInput[1], F_SETFD, FD_CLOEXEC);
-    fcntl( stdOutput[0], F_SETFD, FD_CLOEXEC);
-    fcntl( stdOutput[1], F_SETFD, FD_CLOEXEC);
-    fcntl( stdError[0], F_SETFD, FD_CLOEXEC);
-    fcntl( stdError[1], F_SETFD, FD_CLOEXEC);
-
-    saveInput = dup( STDIN_FILENO);
-    fcntl( saveInput, F_SETFD, FD_CLOEXEC);
-    dup2( stdInput[0], STDIN_FILENO );
-    close( stdInput[0] );
-
-    saveOutput = dup( STDOUT_FILENO);
-    fcntl( saveOutput, F_SETFD, FD_CLOEXEC);
-    dup2( stdOutput[1], STDOUT_FILENO );
-    close( stdOutput[1] );
-
-    saveError = dup( STDERR_FILENO);
-    fcntl( saveError, F_SETFD, FD_CLOEXEC);
-    dup2( stdError[1], STDERR_FILENO );
-    close( stdError[1] );
-
-    Error = osl_psz_executeProcess(szImagePath,
-                                   pArguments,
-                                   Options,
-                                   Security,
-                                   pszWorkDir,
-                                   pEnvironment,
-                                   pProcess,
-                                   pInputWrite,
-                                   pOutputRead,
-                                   pErrorRead
-                                   );
-
-    if ( pInputWrite )
-        *(pInputWrite) = osl_createFileHandleFromFD( stdInput[1] );
-        
-    if ( pOutputRead )
-        *(pOutputRead) = osl_createFileHandleFromFD( stdOutput[0] );
-        
-    if ( pErrorRead )
-        *(pErrorRead) = osl_createFileHandleFromFD( stdError[0] );
-
-    // restore handles
-    dup2( saveInput, STDIN_FILENO);
-    close( saveInput);
-    dup2( saveOutput, STDOUT_FILENO);
-    close( saveOutput);
-    dup2( saveError, STDERR_FILENO);
-    close( saveError);
-
-    if ( pArguments != 0 )
-    {
-        for ( index = 0 ; index < nArguments ; ++index )
-        {
-            if ( pArguments[index] != 0 )
-            {
-                free(pArguments[index]);
-            }
-        }
-        free(pArguments);
-    }
-
-    if ( pEnvironment != 0 )
-    {
-        for ( index = 0 ; index < nEnvironmentVars ; ++index )
-        {
-            if ( pEnvironment[index] != 0 )
-            {
-                free(pEnvironment[index]);
-            }
-        }
-        free(pEnvironment);
-    }
-
-    return Error;
-}
-
-/**********************************************
- osl_executeProcess
- *********************************************/
- 
-oslProcessError SAL_CALL osl_executeProcess(
-                                            rtl_uString *ustrImageName,
-                                            rtl_uString *ustrArguments[],
-                                            sal_uInt32   nArguments,
-                                            oslProcessOption Options,
-                                            oslSecurity Security,
-                                            rtl_uString *ustrWorkDir,
-                                            rtl_uString *ustrEnvironment[],
-                                            sal_uInt32   nEnvironmentVars,
-                                            oslProcess *pProcess
-                                            )
-{
-    return osl_executeProcess_WithRedirectedIO(
-        ustrImageName,
-        ustrArguments,
-        nArguments,
-        Options,
-        Security,
-        ustrWorkDir,
-        ustrEnvironment,
-        nEnvironmentVars,
-        pProcess,
-        NULL,
-        NULL,
-        NULL
-        );
-}
-
-/**********************************************
- osl_psz_executeProcess
- *********************************************/
- 
-oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
-                                                sal_Char *pszArguments[],
-                                                oslProcessOption Options,
-                                                oslSecurity Security,
-                                                sal_Char *pszDirectory,
-                                                sal_Char *pszEnvironments[],
-                                                oslProcess *pProcess,
-                                                oslFileHandle	*pInputWrite,
-                                                oslFileHandle	*pOutputRead,
-                                                oslFileHandle	*pErrorRead
-                                                )
-{
-    ULONG ulSessID	= 0;		  /* Session ID returned		  */
-    PID pidProcess;
-    APIRET rc;
-    sal_Char* pStr;
-    sal_Char*		 args;
-    sal_Char*		 envs;
-    int i;
-    int n = 1;
-    oslProcessImpl* pProcImpl;
-    ULONG nAppType, nOwnAppType;
-    ULONG nCurrentDisk, nDriveMap, nBufSize;
-       int	 first = 0;
-    sal_Char path[ _MAX_PATH ];
-    sal_Char currentDir[ _MAX_PATH ];
-    sal_Char ownfilename[ _MAX_PATH ];
-    RESULTCODES resultCode;
-    char** p;
-
-    /* get imagename from arg list, if not specified */
-    if (pszImageName == NULL)
-        pszImageName = pszArguments[first++];
-
-    OSL_ASSERT(pszImageName != NULL);
-
-    /* check application type */
-    rc = DosQueryAppType( (PCSZ) pszImageName, &nAppType );
-    if( rc != NO_ERROR )
-    {
-        if( (rc == ERROR_FILE_NOT_FOUND) || (rc == ERROR_PATH_NOT_FOUND) )
-            return osl_Process_E_NotFound;
-        else
-            return osl_Process_E_Unknown;
-    }
-
-    /* backup current disk information */
-    if(DosQueryCurrentDisk(&nCurrentDisk, &nDriveMap))
-    {
-        nCurrentDisk = 0;
-    }
-
-    /* backup current directory information */
-    nBufSize = _MAX_PATH;
-    if(DosQueryCurrentDir(0, (BYTE*)currentDir, &nBufSize))
-    {
-        *currentDir = '\0';
-    }
-
-    /* change to working directory */
-    if(pszDirectory && pszDirectory[1] == ':')
-    {
-        BYTE nDrive = toupper(pszDirectory[0]) - 'A' + 1;
-
-        if(NO_ERROR == DosSetDefaultDisk(nDrive))
-        {
-            DosSetCurrentDir((PSZ) pszDirectory);
-        }
-    }
-
-    /* query current executable filename and application type */
-    {
-        CHAR    szName[CCHMAXPATH];
-        PPIB    ppib;
-        PTIB    ptib;
-        APIRET	rc;
-        rc = DosGetInfoBlocks(&ptib, &ppib);
-        rc = DosQueryModuleName(ppib->pib_hmte, sizeof(szName), szName);
-        DosQueryAppType( (PCSZ)szName, &nOwnAppType );
-    }
-
-    /* combination of flags WAIT and DETACHED not supported */
-    if( (Options & osl_Process_DETACHED) && (Options & osl_Process_WAIT) )
-        Options &= !osl_Process_DETACHED;
-
-    /* start in same session if possible and detached flag not set */
-    if( ((nAppType & 0x00000007) == (nOwnAppType & 0x00000007))
-/*	    && ((Options & osl_Process_DETACHED) == 0) */ )
-    {
-        CHAR szbuf[CCHMAXPATH];
-
-        /* calculate needed space for arguments */
-        n = strlen( pszImageName ) + 1;
-        if( pszArguments )
-               for (i = first; pszArguments[i] != NULL; i++)
-                   n += strlen(pszArguments[i]) + 1;
-
-        /* allocate space for arguments */
-        args = (sal_Char*)malloc(n + 1);
-        pStr = args;
-
-        /* add program name as first string to arguments */
-        memcpy(pStr, pszImageName, strlen( pszImageName ) );
-        pStr += strlen( pszImageName );
-        *pStr++ = '\0';
-
-        /* add given strings to arguments */
-        if( pszArguments )
-            for (i = first; pszArguments[i] != NULL; i++)
-            {
-                memcpy(pStr, pszArguments[i], strlen( pszArguments[i] ) );
-                pStr += strlen( pszArguments[i] );
-                if (pszArguments[i+1] != NULL)
-                    *pStr++ = ' ';
-            }
-
-        /* set end marker for arguments */
-        *pStr++ = '\0';
-        *pStr = '\0';
-
-        OSL_TRACE( "osl_executeProcess with DosExecPgm (args: %s)\n", args );
-
-        /* calculate needed space for environment: since enviroment var search
-           is a linear scan of the current enviroment, we place new variables
-           before existing ones; so the child will find new definitions before
-           olders; this doesn't require us to replace existing vars */
-        // existing enviroment size
-        n = 0;
-        p = environ;
-        while( *p) 
-        {
-            int l = strlen( *p);
-            n += l + 1;
-            p++;
-        }
-        // new env size (if exists)
-        if( pszEnvironments )
-        {
-            for (i = 0; pszEnvironments[i] != NULL; i++)
-                   n += strlen(pszEnvironments[i]) + 1;
-        }
-        /* allocate space for environment */
-        envs = (sal_Char*)malloc(n + 1);
-        pStr = envs;
-
-        // add new vars
-        if( pszEnvironments )
-        {
-            /* add given strings to environment */
-            for (i = 0; pszEnvironments[i] != NULL; i++)
-            {
-                memcpy(pStr, pszEnvironments[i], strlen( pszEnvironments[i] ) );
-                pStr += strlen( pszEnvironments[i] );
-                *pStr++ = '\0';
-            }
-        }
-        // add existing vars
-        p = environ;
-        while( *p) 
-        {
-            memcpy(pStr, *p, strlen( *p ) );
-            pStr += strlen( *p );
-            *pStr++ = '\0';
-            p++;
-        }
-        /* set end marker for environment */
-        *pStr = '\0';
-
-
-        if(Options & osl_Process_DETACHED)
-        {
-            rc = DosExecPgm( szbuf, sizeof( szbuf ), EXEC_BACKGROUND,
-                             (PSZ) args, (PSZ) envs, &resultCode, (PSZ) pszImageName );
-        }
-        else
-        {
-            rc = DosExecPgm( szbuf, sizeof( szbuf ), EXEC_ASYNCRESULT,
-                             (PSZ) args, (PSZ) envs, &resultCode, (PSZ) pszImageName );
-        }
-
-        pidProcess = resultCode.codeTerminate;
-
-        /* cleanup */
-        free(envs);
-           free(args);
-
-        /* error handling */
-        if( rc != NO_ERROR )
-            return osl_Process_E_Unknown;
-    }
-
-    else
-    {
-        STARTDATA SData = { 0 };
-        UCHAR achObjBuf[ 256 ] = { 0 };
-
-        /* combine arguments separated by spaces */
-        if( pszArguments )
-        {
-            for (i = first; pszArguments[i] != NULL; i++)
-                n += strlen(pszArguments[i]) + 1;
-            // YD DosStartSession requires low-mem buffers!
-            args = (sal_Char*)_tmalloc(n);
-            *args = '\0';
-            for (i = first; pszArguments[i] != NULL; i++)
-            {
-                strcat(args, pszArguments[i]);
-                strcat(args, " ");
-            }
-        }
-        else
-            args = NULL;
-
-        /* combine environment separated by NULL */
-        if( pszEnvironments )
-        {
-            for (i = 0; pszEnvironments[i] != NULL; i++)
-                n += strlen(pszEnvironments[i]) + 1;
-            // YD DosStartSession requires low-mem buffers!
-            envs = (sal_Char*)_tmalloc(n + 1);
-            pStr = (sal_Char*)envs;
-            for (i = 0; pszEnvironments[i] != NULL; i++)
-            {
-                memcpy(pStr, pszEnvironments[i], strlen( pszEnvironments[i] ) );
-                pStr += strlen( pszEnvironments[i] );
-                *pStr = '\0';
-                pStr++;
-            }
-            *pStr = '\0';
-        }
-        else
-            envs = NULL;
-
-        /* initialize data structure */
-        memset( &SData, 0, sizeof( STARTDATA ) );
-        SData.Length  = sizeof(STARTDATA);
-
-        OSL_TRACE( "osl_executeProcess with DosStartSession (args: %s)\n", args );
-
-        /* OS/2 Application ? */
-        if(nAppType & 0x00000007)
-        {
-        
-            /* inherit options from parent */
-            SData.InheritOpt = SSF_INHERTOPT_PARENT;
-
-            switch (Options & (osl_Process_NORMAL | osl_Process_MINIMIZED |
-                            osl_Process_MAXIMIZED | osl_Process_FULLSCREEN))
-            {
-                case osl_Process_MINIMIZED:
-                    SData.SessionType = SSF_TYPE_DEFAULT;
-                    SData.PgmControl |= SSF_CONTROL_MINIMIZE;
-                    break;
-
-                case osl_Process_MAXIMIZED:
-                    SData.SessionType = SSF_TYPE_DEFAULT;
-                    SData.PgmControl |= SSF_CONTROL_MAXIMIZE;
-                    break;
-
-                case osl_Process_FULLSCREEN:
-                    SData.SessionType = SSF_TYPE_FULLSCREEN;
-                    break;
-
-                default:
-                    SData.SessionType = SSF_TYPE_DEFAULT;
-            } /* switch */
-        }
-
-
-        if( Options & osl_Process_DETACHED )
-        {
-            /* start an independent session */
-            SData.Related = SSF_RELATED_INDEPENDENT;
-            SData.TermQ = NULL;
-        }
-        else
-        {
-            /* start a child session and set Termination Queue */
-            SData.Related = SSF_RELATED_CHILD;
-
-            if(! bInitSessionTerm)
-                bInitSessionTerm = InitSessionTerm();
-
-            SData.TermQ = (BYTE*) SessionTermQueueName;
-        }
-
-        SData.FgBg	= SSF_FGBG_FORE;	  /* start session in foreground  */
-        SData.TraceOpt = SSF_TRACEOPT_NONE;	  /* No trace				 */
-
-        SData.PgmTitle = NULL;
-        SData.PgmInputs = (BYTE*)args;
-        SData.PgmName = (PSZ) pszImageName;
-        SData.Environment = (BYTE*)envs;
-
-        if( Options & osl_Process_HIDDEN )
-            SData.PgmControl |= SSF_CONTROL_INVISIBLE;
-        else
-            SData.PgmControl |= SSF_CONTROL_VISIBLE;
-
-        SData.ObjectBuffer  = (PSZ) achObjBuf;
-        SData.ObjectBuffLen = (ULONG) sizeof(achObjBuf);
-
-
-        /* Start the session */
-        rc = DosStartSession( &SData, &ulSessID, &pidProcess );
-
-        /* ignore error "session started in background" */
-        if( rc == ERROR_SMG_START_IN_BACKGROUND )
-            rc = NO_ERROR;
-
-    
-        if(envs)
-            _tfree(envs);
-        if(args)
-            _tfree(args);
-
-        if( rc != NO_ERROR )
-            return osl_Process_E_Unknown;
-
-    } /* else */
-
-
-    /* restore current disk */
-    if(nCurrentDisk)
-    {
-        DosSetDefaultDisk(nCurrentDisk);
-    }
-
-    /* restore current drive information */
-    if(*currentDir)
-    {
-        DosSetCurrentDir((PCSZ)currentDir);
-    }
-
-    /* allocate intern process structure and store child process ID */
-    pProcImpl = (oslProcessImpl*)malloc(sizeof(oslProcessImpl));
-    pProcImpl->pProcess = pidProcess;
-    pProcImpl->nSessionID = ulSessID;
-
-       pProcImpl->bResultCodeValid = FALSE;
-
-    if( Options & osl_Process_WAIT )
-        osl_joinProcess(pProcImpl);
-
-    *pProcess = (oslProcess)pProcImpl;
-
-    if( rc == NO_ERROR )
-        return osl_Process_E_None;
-    else
-
-        return osl_Process_E_Unknown;
-}
-
-/*----------------------------------------------------------------------------*/
-
-oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process)
-{
-    if (Process == NULL)
-        return osl_Process_E_Unknown;
-
-    /* Stop the session */
-    DosStopSession( STOP_SESSION_SPECIFIED, ((oslProcessImpl*)Process)->nSessionID );
-
-    return osl_Process_E_None;
-}
-
-/*----------------------------------------------------------------------------*/
-
-oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident)
-{
-    HANDLE		  hProcess;
-    oslProcessImpl* pProcImpl;
-
-    /* check, if given PID is a valid process */
-    if (FALSE)
-    {
-        pProcImpl = (oslProcessImpl*)malloc(sizeof(oslProcessImpl));
-/*		
-        pProcImpl->pProcess = pidProcess;
-        pProcImpl->nSessionID = ulSessID;
-*/		
-    }
-    else
-        pProcImpl = NULL;
-
-    return (pProcImpl);
-}
-
-/*----------------------------------------------------------------------------*/
-
-void SAL_CALL osl_freeProcessHandle(oslProcess Process)
-{
-    /* free intern process structure */
-    if (Process != NULL)
-        free((oslProcessImpl*)Process);
-}
-
-/*----------------------------------------------------------------------------*/
-
-oslProcessError SAL_CALL osl_joinProcess(oslProcess Process)
-{
-    oslProcessImpl* pProcImpl = (oslProcessImpl*) Process;
-    APIRET rc;
-
-    if (Process == NULL)
-        return osl_Process_E_Unknown;
-
-    /* process of same session ? */
-    if( pProcImpl->nSessionID == 0 )
-    {
-        RESULTCODES resultCode;
-        PID pidEnded;
-            
-        rc = DosWaitChild( DCWA_PROCESS, DCWW_WAIT, &resultCode,
-                &pidEnded, pProcImpl->pProcess );
-
-        if( rc == NO_ERROR )
-        {
-            pProcImpl->nResultCode = resultCode.codeResult;
-            pProcImpl->bResultCodeValid = TRUE;
-
-            return osl_Process_E_None;
-        }
-    }
-    else
-    {
-        ULONG pcbData, ulElement = 0;
-        REQUESTDATA rdData;
-        BYTE bPriority;
-        struct {
-            USHORT SessionID;
-            USHORT ReturnValue;
-        } *pvBuffer;
-
-        /* search/wait for the correct entry in termination queue */
-        while( ( rc = DosPeekQueue( SessionTermQueue, &rdData, &pcbData,
-                        (PPVOID) &pvBuffer, &ulElement, DCWW_WAIT,
-                        &bPriority, NULLHANDLE )) == NO_ERROR )
-        {
-
-            if( pvBuffer->SessionID == pProcImpl->nSessionID )
-            {
-                pProcImpl->nResultCode = pvBuffer->ReturnValue;
-                pProcImpl->bResultCodeValid = TRUE;
-
-                /* remove item from queue */
-                rc = DosReadQueue( SessionTermQueue, &rdData, &pcbData,
-                       (PPVOID)&pvBuffer, ulElement, DCWW_WAIT,
-                       &bPriority, NULLHANDLE );
-
-                if( rc == NO_ERROR )
-                    return osl_Process_E_None;
-                else
-                    return osl_Process_E_Unknown;
-            }
-        } /* while */
-    }
-    return osl_Process_E_Unknown;
-}
-
-/***************************************************************************/
-
-//YD FIXME incomplete!
-oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const TimeValue* pTimeout)
-{
-    return osl_joinProcess( Process);
-}
-
-/*----------------------------------------------------------------------------*/
-
-oslProcessError SAL_CALL osl_getCommandArgs( sal_Char* pszBuffer, sal_uInt32 Max)
-{
-
-    static int  CmdLen = -1;
-    static sal_Char CmdLine[_MAX_CMD];
-
-    OSL_ASSERT(pszBuffer);
-    OSL_ASSERT(Max > 1);
-
-    /* Query commandline during first call of function only */
-    if (CmdLen < 0)
-    {
-        sal_Bool bEscaped = sal_False;
-        sal_Bool bSeparated = sal_True;
-        sal_Char* pszBufferOrg = pszBuffer;
-        sal_Char* pszCmdLine;
-
-        /* get pointer to commandline */
-        {
-            PTIB pptib = NULL;
-            PPIB pppib = NULL;
-
-            DosGetInfoBlocks(&pptib, &pppib);
-            pszCmdLine = pppib->pib_pchcmd;
-        }
-
-        /* skip first string */
-        while( *pszCmdLine )
-            pszCmdLine++;
-
-        /* concatenate commandline arguments for the given string */
-        Max -= 2;
-        while ( !((*pszCmdLine == '\0') && (*(pszCmdLine + 1) == '\0')) && (Max > 0))
-        {
-            /*
-             *  C-Runtime expects char to be unsigned and so to be
-             *  preceeded with 00 instead of FF when converting to int
-             */
-            int n = *((unsigned char *) pszCmdLine);
-            if (! (isspace(n) || (*pszCmdLine == '\0')) )
-            {
-                if (*pszCmdLine == '"')
-                {
-                    if (*(pszCmdLine + 1) != '"')
-                        bEscaped = ! bEscaped;
-                    else
-                    {
-                        pszCmdLine++;
-                        *pszBuffer++ = *pszCmdLine;
-                        Max--;
-                    }
-                }
-                else
-                {
-                    *pszBuffer++ = *pszCmdLine;
-                    Max--;
-                }
-                bSeparated = sal_False;
-            }
-            else
-            {
-                if (bEscaped)
-                    *pszBuffer++ = *pszCmdLine;
-                else
-                    if (! bSeparated)
-                    {
-                        *pszBuffer++ = '\0';
-                        bSeparated = sal_True;
-                    }
-                Max--;
-            }
-
-            pszCmdLine++;
-        }
-
-        *pszBuffer++ = '\0';
-        *pszBuffer++ = '\0';
-
-        /* restore pointer and save commandline for next query */
-        CmdLen = pszBuffer - pszBufferOrg;
-        pszBuffer = pszBufferOrg;
-        memcpy( CmdLine, pszBuffer, CmdLen );
-    }
-    else
-       memcpy( pszBuffer, CmdLine, CmdLen );
-
-    OSL_TRACE( "osl_getCommandArgs (args: %s)\n", pszBuffer );
-
-    return osl_Process_E_None;
-}
-
-/*----------------------------------------------------------------------------*/
-
-oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData Fields,
-                                   oslProcessInfo* pInfo)
-{
-    if (! pInfo || (pInfo->Size != sizeof(oslProcessInfo)))
-        return osl_Process_E_Unknown;
-
-    pInfo->Fields = 0;		
-
-    if (Fields & osl_Process_IDENTIFIER)
-    {
-        if( Process == NULL )
-        {
-            PTIB pptib = NULL;
-            PPIB pppib = NULL;
-
-            DosGetInfoBlocks( &pptib, &pppib );
-            pInfo->Ident = pppib->pib_ulpid;
-        }
-        else
-            pInfo->Ident = ((oslProcessImpl*)Process)->pProcess;
-            
-        pInfo->Fields |= osl_Process_IDENTIFIER;		
-    }
-
-    if (Fields & osl_Process_EXITCODE)
-    {
-        oslProcessImpl* pProcImpl = (oslProcessImpl*) Process;
-        
-        if( pProcImpl->bResultCodeValid )
-        {
-            pInfo->Code = pProcImpl->nResultCode;
-            pInfo->Fields |= osl_Process_EXITCODE;
-        }
-        else
-        {
-            APIRET rc;
-
-            if( pProcImpl->nSessionID == 0 )
-            {
-                RESULTCODES resultCode;
-                PID pidEnded;
-                    
-                rc = DosWaitChild( DCWA_PROCESS, DCWW_WAIT, &resultCode,
-                        &pidEnded, pProcImpl->pProcess );
-
-                if( rc == NO_ERROR )
-                {
-                    pProcImpl->nResultCode = resultCode.codeResult;
-                    pProcImpl->bResultCodeValid = TRUE;
-
-                    pInfo->Code = pProcImpl->nResultCode;
-                    pInfo->Fields |= osl_Process_EXITCODE;
-
-                    return osl_Process_E_None;
-                }
-            }
-            else
-            {
-                ULONG pcbData, ulElement = 0;
-                REQUESTDATA rdData;
-                BYTE bPriority;
-                struct {
-                    USHORT SessionID;
-                    USHORT ReturnValue;
-                } *pvBuffer;
-
-                /* search/wait for the correct entry in termination queue */
-                while( ( rc = DosPeekQueue( SessionTermQueue, &rdData, &pcbData,
-                                (PPVOID) &pvBuffer, &ulElement, DCWW_WAIT,
-                                &bPriority, NULLHANDLE )) == NO_ERROR )
-                {
-
-                    if( pvBuffer->SessionID == pProcImpl->nSessionID )
-                    {
-                        pProcImpl->nResultCode = pvBuffer->ReturnValue;
-                        pProcImpl->bResultCodeValid = TRUE;
-
-                        pInfo->Code = pProcImpl->nResultCode;
-                        pInfo->Fields |= osl_Process_EXITCODE;
-
-                        /* remove item from queue */
-                        rc = DosReadQueue( SessionTermQueue, &rdData, &pcbData,
-                               (PPVOID)&pvBuffer, ulElement, DCWW_WAIT,
-                               &bPriority, NULLHANDLE );
-
-                        break;
-                    }
-                }
-            } 
-        } 
-    }
-
-    if (Fields & osl_Process_HEAPUSAGE)
-    {
-    }
-    if (Fields & osl_Process_CPUTIMES)
-    {
-    }
-
-    return (pInfo->Fields == Fields) ? osl_Process_E_None : osl_Process_E_Unknown;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/process_impl.cxx b/sal/osl/os2/process_impl.cxx
deleted file mode 100644
index 0c9730d68..000000000
--- a/sal/osl/os2/process_impl.cxx
+++ /dev/null
@@ -1,461 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#define INCL_DOS
-#include <os2.h>
-
-#include "osl/process.h"
-#include <osl/mutex.h>
-
-#ifndef INCLUDED_LIMITS_H
-#include <limits.h>
-#define INCLUDED_LIMITS_H
-#endif
-
-#ifndef INCLUDED_PTHREAD_H
-#include <pthread.h>
-#define INCLUDED_PTHREAD_H
-#endif
-
-#ifndef INCLUDED_STDLIB_H
-#include <stdlib.h>
-#define INCLUDED_STDLIB_H
-#endif
-
-#ifndef INCLUDED_STRING_H
-#include <string.h>
-#define INCLUDED_STRING_H
-#endif
-#include "osl/diagnose.h"
-#include <osl/file.h>
-#include "osl/module.h"
-#include "osl/thread.h"
-#include "rtl/ustring.hxx"
-
-#include "file_path_helper.h"
-
-#include "uunxapi.h"
-
-/***************************************
-  osl_bootstrap_getExecutableFile_Impl().
-
-  @internal
-  @see rtl_bootstrap
-  @see #i37371#
-
- **************************************/
-
-extern "C" oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
-    rtl_uString ** ppFileURL
-) SAL_THROW_EXTERN_C();
-
-
-oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
-    rtl_uString ** ppFileURL
-) SAL_THROW_EXTERN_C()
-{
-    oslProcessError result = osl_Process_E_NotFound;
-    CHAR    szName[CCHMAXPATH];
-    PPIB    ppib;
-    PTIB    ptib;
-    APIRET	rc;
-
-    rc = DosGetInfoBlocks(&ptib, &ppib);
-    rc = DosQueryModuleName(ppib->pib_hmte, sizeof(szName), szName);
-    
-    if (rc == 0)
-    {
-        rtl_uString * pAbsPath = 0;
-        
-        rtl_string2UString( 
-            &pAbsPath, 
-            szName, strlen(szName), osl_getThreadTextEncoding(),
-            OSTRING_TO_OUSTRING_CVTFLAGS);
-        
-        if (pAbsPath)
-        {
-            /* Convert from path to url. */
-            if (osl_getFileURLFromSystemPath (pAbsPath, ppFileURL) == osl_File_E_None)
-            {
-                /* Success. */
-                result = osl_Process_E_None;
-            }
-            rtl_uString_release (pAbsPath);
-        }
-    }
-
-    return (result);
-}
-
-/***************************************
- CommandArgs_Impl.
- **************************************/
-struct CommandArgs_Impl
-{
-    oslMutex		m_mutex;
-    sal_uInt32      m_nCount;
-    rtl_uString **  m_ppArgs;
-};
-
-static struct CommandArgs_Impl g_command_args =
-{
-    osl_createMutex(),
-    0,
-    0
-};
-
-/***************************************
-  osl_getExecutableFile().
- **************************************/
-oslProcessError SAL_CALL osl_getExecutableFile (rtl_uString ** ppustrFile)
-{
-    oslProcessError result = osl_Process_E_NotFound;
-
-    osl_acquireMutex(g_command_args.m_mutex);
-    OSL_ASSERT(g_command_args.m_nCount > 0);
-    if (g_command_args.m_nCount > 0)
-    {
-        /* CommandArgs set. Obtain argv[0]. */
-        rtl_uString_assign (ppustrFile, g_command_args.m_ppArgs[0]);
-        result = osl_Process_E_None;
-    }
-    osl_releaseMutex(g_command_args.m_mutex);
-
-    return (result);
-}
-
-/***************************************
- osl_getCommandArgCount().
- **************************************/
-sal_uInt32 SAL_CALL osl_getCommandArgCount (void)
-{
-    sal_uInt32 result = 0;
-
-    osl_acquireMutex(g_command_args.m_mutex);
-    OSL_ASSERT(g_command_args.m_nCount > 0);
-    if (g_command_args.m_nCount > 0)
-        result = g_command_args.m_nCount - 1;
-    osl_releaseMutex(g_command_args.m_mutex);
-
-    return (result);
-}
-
-/***************************************
- osl_getCommandArg().
- **************************************/
-oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 nArg, rtl_uString ** strCommandArg)
-{
-    oslProcessError result = osl_Process_E_NotFound;
-
-    osl_acquireMutex(g_command_args.m_mutex);
-    OSL_ASSERT(g_command_args.m_nCount > 0);
-    if (g_command_args.m_nCount > (nArg + 1))
-    {
-        rtl_uString_assign (strCommandArg, g_command_args.m_ppArgs[nArg + 1]);
-        result = osl_Process_E_None;
-    }
-    osl_releaseMutex(g_command_args.m_mutex);
-
-    return (result);
-}
-
-/***************************************
- osl_setCommandArgs().
- **************************************/
-void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
-{
-    OSL_ASSERT(argc > 0);
-    osl_acquireMutex(g_command_args.m_mutex);
-    OSL_ENSURE (g_command_args.m_nCount == 0, "osl_setCommandArgs(): CommandArgs already set.");
-    if (g_command_args.m_nCount == 0)
-    {
-        rtl_uString** ppArgs = (rtl_uString**)rtl_allocateZeroMemory (argc * sizeof(rtl_uString*));
-        if (ppArgs != 0)
-        {
-            rtl_TextEncoding encoding = osl_getThreadTextEncoding();
-            for (int i = 0; i < argc; i++)
-            {
-                rtl_string2UString (
-                    &(ppArgs[i]),
-                    argv[i], rtl_str_getLength (argv[i]), encoding,
-                    OSTRING_TO_OUSTRING_CVTFLAGS);
-            }
-            if (ppArgs[0] != 0)
-            {
-                /* see @ osl_getExecutableFile(). */
-                if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), sal_Unicode('/')) == -1)
-                {
-                    const rtl::OUString PATH (RTL_CONSTASCII_USTRINGPARAM("PATH"));
-
-                    rtl_uString * pSearchPath = 0;
-                    osl_getEnvironment (PATH.pData, &pSearchPath);
-                    if (pSearchPath)
-                    {
-                        rtl_uString * pSearchResult = 0;
-                        osl_searchPath (ppArgs[0], pSearchPath, &pSearchResult);
-                        if (pSearchResult)
-                        {
-                            rtl_uString_assign (&(ppArgs[0]), pSearchResult);
-                            rtl_uString_release (pSearchResult);
-                        }
-                        rtl_uString_release (pSearchPath);
-                    }
-                }
-
-                rtl_uString * pArg0 = 0;
-                if (realpath_u (ppArgs[0], &pArg0))
-                {
-                    osl_getFileURLFromSystemPath (pArg0, &(ppArgs[0]));
-                    rtl_uString_release (pArg0);
-                }
-            }
-            g_command_args.m_nCount = argc;
-            g_command_args.m_ppArgs = ppArgs;
-        }
-    }
-    osl_releaseMutex(g_command_args.m_mutex);
- 
-}
-
-/***************************************
- osl_getEnvironment().
- **************************************/
-oslProcessError SAL_CALL osl_getEnvironment(rtl_uString* pustrEnvVar, rtl_uString** ppustrValue)
-{
-    oslProcessError  result   = osl_Process_E_NotFound;
-    rtl_TextEncoding encoding = osl_getThreadTextEncoding();
-    rtl_String* pstr_env_var  = 0;
-
-    OSL_PRECOND(pustrEnvVar, "osl_getEnvironment(): Invalid parameter");
-    OSL_PRECOND(ppustrValue, "osl_getEnvironment(): Invalid parameter");
-
-    rtl_uString2String(
-        &pstr_env_var,
-        rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
-        OUSTRING_TO_OSTRING_CVTFLAGS);
-    if (pstr_env_var != 0)
-    {
-        const char* p_env_var = getenv (rtl_string_getStr (pstr_env_var));
-        if (p_env_var != 0)
-        {
-            rtl_string2UString(
-                ppustrValue,
-                p_env_var, strlen(p_env_var), encoding,
-                OSTRING_TO_OUSTRING_CVTFLAGS);
-            OSL_ASSERT(*ppustrValue != NULL);
-
-            result = osl_Process_E_None;
-        }
-        rtl_string_release(pstr_env_var);
-    }
-
-    return (result);
-}
-
-/***************************************
- osl_setEnvironment().
- **************************************/
-oslProcessError SAL_CALL osl_setEnvironment(rtl_uString* pustrEnvVar, rtl_uString* pustrValue)
-{
-    oslProcessError  result   = osl_Process_E_Unknown;
-    rtl_TextEncoding encoding = osl_getThreadTextEncoding();
-    rtl_String* pstr_env_var  = 0;
-    rtl_String* pstr_val  = 0;
-
-    OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
-    OSL_PRECOND(pustrValue, "osl_setEnvironment(): Invalid parameter");
-
-    rtl_uString2String(
-        &pstr_env_var,
-        rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
-        OUSTRING_TO_OSTRING_CVTFLAGS);
-
-    rtl_uString2String(
-        &pstr_val,
-        rtl_uString_getStr(pustrValue), rtl_uString_getLength(pustrValue), encoding,
-        OUSTRING_TO_OSTRING_CVTFLAGS);
-
-    if (pstr_env_var != 0 && pstr_val != 0)
-    {
-        //Can't determine if OS/2 EMX has a working setenv or not, so use putenv,
-        //feel free to use setenv here if its available and works
-        rtl_String * pBuffer = NULL;
-
-        sal_Int32 nCapacity = rtl_stringbuffer_newFromStringBuffer( &pBuffer,
-            rtl_string_getLength(pstr_env_var) + rtl_string_getLength(pstr_val) + 1,
-            pstr_env_var );
-        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, "=", 1);
-        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length,
-            rtl_string_getStr(pstr_val), rtl_string_getLength(pstr_val) );
-
-        rtl_string_acquire(pBuffer); // argument to putenv must leak on success
-
-        if (putenv(rtl_string_getStr(pBuffer)) == 0)
-            result = osl_Process_E_None;
-        else
-            rtl_string_release(pBuffer);
-    }
-
-    if (pstr_val)
-        rtl_string_release(pstr_val);
-
-    if (pstr_env_var != 0)
-        rtl_string_release(pstr_env_var);
-
-    return (result);
-}
-
-/***************************************
- osl_clearEnvironment().
- **************************************/
-oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString* pustrEnvVar)
-{
-    oslProcessError  result   = osl_Process_E_Unknown;
-    rtl_TextEncoding encoding = osl_getThreadTextEncoding();
-    rtl_String* pstr_env_var  = 0;
-
-    OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
-
-    rtl_uString2String(
-        &pstr_env_var,
-        rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
-        OUSTRING_TO_OSTRING_CVTFLAGS);
-
-    if (pstr_env_var)
-    {
-        //Can't determine if OS/2 EMX has a working unsetenv or not, so use putenv,
-        //feel free to use unsetenv here if its available and works
-        rtl_String * pBuffer = NULL;
-
-        sal_Int32 nCapacity = rtl_stringbuffer_newFromStringBuffer( &pBuffer,
-            rtl_string_getLength(pstr_env_var) + 1, pstr_env_var );
-        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, "=", 1);
-
-        rtl_string_acquire(pBuffer); // argument to putenv must leak on success
-
-        if (putenv(rtl_string_getStr(pBuffer)) == 0)
-            result = osl_Process_E_None;
-        else
-            rtl_string_release(pBuffer);
-
-        rtl_string_release(pstr_env_var);
-    }
-
-    return (result);
-}
-
-/***************************************
- osl_getProcessWorkingDir().
- **************************************/
-oslProcessError SAL_CALL osl_getProcessWorkingDir(rtl_uString **ppustrWorkingDir)
-{
-    oslProcessError result = osl_Process_E_Unknown;
-    char buffer[PATH_MAX];
-    
-    OSL_PRECOND(ppustrWorkingDir, "osl_getProcessWorkingDir(): Invalid parameter");
-
-    if (getcwd (buffer, sizeof(buffer)) != 0)
-    {
-        rtl_uString* ustrTmp = 0;
-
-        rtl_string2UString( 
-            &ustrTmp, 
-            buffer, strlen(buffer), osl_getThreadTextEncoding(),
-            OSTRING_TO_OUSTRING_CVTFLAGS);
-        if (ustrTmp != 0)
-        {
-            if (osl_getFileURLFromSystemPath (ustrTmp, ppustrWorkingDir) == osl_File_E_None)
-                result = osl_Process_E_None;
-            rtl_uString_release (ustrTmp);
-        }
-    }
-
-    return (result);
-}
-
-/******************************************************************************
- *
- *              new functions to set/return the current process locale
- *
- *****************************************************************************/
-
-struct ProcessLocale_Impl
-{
-    oslMutex		m_mutex;
-    rtl_Locale *    m_pLocale;
-};
-
-static struct ProcessLocale_Impl g_process_locale =
-{
-    osl_createMutex(),
-    0
-};
-
-extern "C" void _imp_getProcessLocale( rtl_Locale ** );
-extern "C" int  _imp_setProcessLocale( rtl_Locale * );
-
-/**********************************************
- osl_getProcessLocale().
- *********************************************/
-oslProcessError SAL_CALL osl_getProcessLocale( rtl_Locale ** ppLocale )
-{
-    OSL_PRECOND(ppLocale, "osl_getProcessLocale(): Invalid parameter.");
-
-    osl_acquireMutex(g_process_locale.m_mutex);
-
-    if (g_process_locale.m_pLocale == 0)
-        _imp_getProcessLocale (&(g_process_locale.m_pLocale));
-    *ppLocale = g_process_locale.m_pLocale;
-
-    osl_releaseMutex(g_process_locale.m_mutex);
-
-    return (osl_Process_E_None);
-}
-
-/**********************************************
- osl_setProcessLocale().
- *********************************************/
-oslProcessError SAL_CALL osl_setProcessLocale( rtl_Locale * pLocale )
-{
-    oslProcessError result = osl_Process_E_Unknown;
-
-    OSL_PRECOND(pLocale, "osl_setProcessLocale(): Invalid parameter.");
-
-    osl_acquireMutex(g_process_locale.m_mutex);
-    if (_imp_setProcessLocale (pLocale) == 0)
-    {
-        g_process_locale.m_pLocale = pLocale;
-        result = osl_Process_E_None;
-    }
-    osl_releaseMutex(g_process_locale.m_mutex);
-
-    return (result);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/profile.c b/sal/osl/os2/profile.c
deleted file mode 100644
index 1615d0905..000000000
--- a/sal/osl/os2/profile.c
+++ /dev/null
@@ -1,1770 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-#include <sal/macros.h>
-
-#include <osl/security.h>
-#include <osl/diagnose.h>
-#include <osl/profile.h>
-#include <osl/process.h>
-#include <osl/thread.h>
-#include <osl/file.h>
-
-#define LINES_INI       32
-#define LINES_ADD       10
-#define SECTIONS_INI    5
-#define SECTIONS_ADD    3
-#define ENTRIES_INI     5
-#define ENTRIES_ADD     3
-
-
-#define STR_INI_EXTENSION   ".ini"
-#define STR_INI_METAHOME    "?~"
-#define STR_INI_METASYS	    "?$"
-#define STR_INI_METACFG	    "?^"
-#define STR_INI_METAINS		"?#"
-
-#define STR_INI_BOOLYES     "yes"
-#define STR_INI_BOOLON      "on"
-#define STR_INI_BOOLONE     "1"
-#define STR_INI_BOOLNO      "no"
-#define STR_INI_BOOLOFF     "off"
-#define STR_INI_BOOLZERO    "0"
-
-#define FLG_USER            0x00FF
-#define FLG_AUTOOPEN        0x0100
-#define FLG_MODIFIED        0x0200
-
-#define SVERSION_LOCATION   STR_INI_METACFG
-#define SVERSION_FALLBACK   STR_INI_METASYS
-#define SVERSION_NAME   	"sversion"
-#define SVERSION_SECTION    "Versions"
-#define SVERSION_SOFFICE    "StarOffice"
-#define SVERSION_PROFILE    "soffice.ini"
-#define SVERSION_OPTION     "userid:"
-#define SVERSION_DIRS		{ "bin", "program" }
-#define SVERSION_USER       "user"
-
-#define _BUILD_STR_(n)	# n
-#define BUILD_STR(n)	_BUILD_STR_(n)
-
-/* implemented in file.c */
-extern oslFileError FileURLToPath( char *, size_t, rtl_uString* );
-
-/*****************************************************************************/
-/* Data Type Definition */
-/*****************************************************************************/
-
-typedef struct _osl_TStamp
-{
-    FDATE  m_Date;
-    FTIME  m_Time;
-} osl_TStamp;
-
-typedef enum _osl_TLockMode
-{
-    un_lock, read_lock, write_lock
-} osl_TLockMode;
-
-typedef struct _osl_TFile
-{
-    HFILE   m_Handle;
-/*
-    sal_Char*   m_pReadPtr;
-    sal_Char    m_ReadBuf[512];
-    sal_Char*   m_pWritePtr;
-    sal_Char    m_WriteBuf[512];
-*/
-    sal_Char*   m_pReadPtr;
-    sal_Char    m_ReadBuf[512];
-/*  	sal_Char*   m_pWritePtr; */
-/*  	sal_Char    m_WriteBuf[512]; */
-    sal_Char*   m_pWriteBuf;
-    sal_uInt32  m_nWriteBufLen;
-    sal_uInt32  m_nWriteBufFree;
-} osl_TFile;
-
-typedef struct _osl_TProfileEntry
-{
-    sal_uInt32    m_Line;
-    sal_uInt32    m_Offset;
-    sal_uInt32    m_Len;
-} osl_TProfileEntry;
-
-typedef struct _osl_TProfileSection
-{
-    sal_uInt32            m_Line;
-    sal_uInt32            m_Offset;
-    sal_uInt32            m_Len;
-    sal_uInt32            m_NoEntries;
-    sal_uInt32            m_MaxEntries;
-    osl_TProfileEntry*  m_Entries;
-} osl_TProfileSection;
-
-
-/*
-    Profile-data structure hidden behind oslProfile:
-*/
-typedef struct _osl_TProfileImpl
-{
-    sal_uInt32	m_Flags;
-    osl_TFile*	m_pFile;
-    osl_TStamp  m_Stamp;
-    //sal_Char    m_Filename[_MAX_PATH + 1];
-    sal_uInt32  m_NoLines;
-    sal_uInt32  m_MaxLines;
-    sal_uInt32  m_NoSections;
-    sal_uInt32  m_MaxSections;
-    sal_Char**  m_Lines;
-    rtl_uString *m_strFileName;
-    osl_TProfileSection*	m_Sections;
-    HINI        			m_hIni;
-} osl_TProfileImpl;
-
-
-/*****************************************************************************/
-/* Static Module Function Declarations */
-/*****************************************************************************/
-
-//static osl_TFile* openFile(rtl_uString* pszFilename, sal_Bool bWriteable);
-//static osl_TStamp closeFile(osl_TFile* pFile);
-static osl_TFile*           openFileImpl(rtl_uString * strFileName, oslProfileOption ProfileFlags  );
-static osl_TStamp           closeFileImpl(osl_TFile* pFile);
-static sal_Bool   lockFile(const osl_TFile* pFile, osl_TLockMode eMode);
-static sal_Bool   rewindFile(osl_TFile* pFile, sal_Bool bTruncate);
-static osl_TStamp getFileStamp(osl_TFile* pFile);
-
-static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen);
-static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine);
-static const sal_Char* stripBlanks(const sal_Char* String, sal_uInt32* pLen);
-static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line);
-static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo);
-static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo);
-static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection,
-                     sal_uInt32 NoEntry, sal_uInt32 Line,
-                     const sal_Char* Entry, sal_uInt32 Len);
-static sal_Bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection,
-                         int Line, const sal_Char* Entry, sal_uInt32 Len);
-static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry);
-static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len);
-static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection);
-static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char* Section,
-                                      const sal_Char* Entry, sal_uInt32 *pNoEntry);
-static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile);
-static sal_Bool storeProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile, sal_Bool bCleanup);
-static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable);
-static sal_Bool releaseProfile(osl_TProfileImpl* pProfile);
-static sal_Bool lookupProfile(const sal_Char *pszPath, const sal_Char *pszFile, sal_Char *pPath);
-
-
-static sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName);
-
-sal_Bool SAL_CALL osl_getFullPath(rtl_uString* pszFilename, sal_Char* pszPath, sal_uInt32 MaxLen)
-{
-    return NO_ERROR == DosQueryPathInfo( (PCSZ)pszFilename, FIL_QUERYFULLNAME, pszPath, MaxLen);
-}
-
-
-
-/*****************************************************************************/
-/* Exported Module Functions */
-/*****************************************************************************/
-
-oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flags)
-{
-    osl_TFile*        pFile;
-    osl_TProfileImpl* pProfile;
-    rtl_uString		  *FileName=NULL;
-    
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_openProfile\n");
-#endif
-    OSL_VERIFY(strProfileName);
-
-/*	if (rtl_uString_getLength(strProfileName) == 0 )
-    {
-        OSL_VERIFY(osl_getProfileName(NULL, NULL, &FileName));
-    }
-    else
-*/
-    {
-        rtl_uString_assign(&FileName, strProfileName);
-    }
-
-    osl_getSystemPathFromFileURL(FileName, &FileName);
-
-#ifdef DEBUG_OSL_PROFILE
-    Flags=osl_Profile_FLUSHWRITE;
-
-    // OSL_TRACE("opening '%s'\n",FileName);
-    if ( Flags == osl_Profile_DEFAULT )
-    {
-        OSL_TRACE("with osl_Profile_DEFAULT \n");
-    }
-    if ( Flags & osl_Profile_SYSTEM )
-    {
-        OSL_TRACE("with osl_Profile_SYSTEM \n");
-    }
-    if ( Flags & osl_Profile_READLOCK )
-    {
-        OSL_TRACE("with osl_Profile_READLOCK \n");
-    }
-    if ( Flags & osl_Profile_WRITELOCK )
-    {
-        OSL_TRACE("with osl_Profile_WRITELOCK \n");
-    }
-/*      if ( Flags & osl_Profile_READWRITE ) */
-/*      { */
-/*          OSL_TRACE("with osl_Profile_READWRITE \n"); */
-/*      } */
-    if ( Flags & osl_Profile_FLUSHWRITE )
-    {
-        OSL_TRACE("with osl_Profile_FLUSHWRITE \n");
-    }
-#endif
-
-    if ((! (Flags & osl_Profile_SYSTEM)) &&
-        ((pFile = openFileImpl(FileName, (Flags & osl_Profile_WRITELOCK) ? sal_True : sal_False)) == NULL))
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_openProfile [not opened]\n");
-#endif
-        if( FileName)
-            rtl_uString_release( FileName);
-
-        return (NULL);
-    }
-
-    pProfile = (osl_TProfileImpl*)calloc(1, sizeof(osl_TProfileImpl));
-
-    pProfile->m_Flags = Flags & FLG_USER;
-    osl_getSystemPathFromFileURL(strProfileName, &pProfile->m_strFileName);
-//	rtl_uString_assign(&pProfile->m_strFileName, strProfileName);
-
-    if (Flags & (osl_Profile_READLOCK | osl_Profile_WRITELOCK))
-        pProfile->m_pFile = pFile;
-
-    pProfile->m_Stamp = getFileStamp(pFile);
-
-    loadProfile(pFile, pProfile);
-
-    if (pProfile->m_pFile == NULL)
-        closeFileImpl(pFile);
-    
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_openProfile [ok]\n");
-#endif
-    if( FileName)
-        rtl_uString_release( FileName);
-
-    return pProfile;
-}
-
-sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
-{
-    osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_closeProfile\n");
-#endif
-
-    if ( pProfile == 0 )
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_closeProfile [profile==0]\n");
-#endif
-        return sal_False;
-    }
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        pProfile = acquireProfile(Profile,sal_True);
-
-        if ( pProfile != 0 )
-        {
-            if ( !( pProfile->m_Flags & osl_Profile_READLOCK )  && ( pProfile->m_Flags & FLG_MODIFIED ) )
-            {
-/*  				if (pProfile->m_pFile == NULL) */
-/*  					pProfile->m_pFile = openFileImpl(pProfile->m_Filename, sal_True); */
-
-                storeProfile(pProfile->m_pFile, pProfile, sal_False);
-            }
-        }
-        else
-        {
-            pProfile = acquireProfile(Profile,sal_False);
-        }
-
-        if ( pProfile == 0 )
-        {
-#ifdef TRACE_OSL_PROFILE
-            OSL_TRACE("Out osl_closeProfile [pProfile==0]\n");
-#endif
-            return sal_False;
-        }
-
-        if (pProfile->m_pFile != NULL)
-            closeFileImpl(pProfile->m_pFile);
-    }
-
-    pProfile->m_pFile = NULL;
-    rtl_uString_release(pProfile->m_strFileName);
-    pProfile->m_strFileName = NULL;
-
-    /* release whole profile data types memory */
-    if ( pProfile->m_NoLines > 0)
-    {
-        unsigned int index=0;
-        if ( pProfile->m_Lines != 0 )
-        {
-            for ( index = 0 ; index < pProfile->m_NoLines ; ++index)
-            {
-                if ( pProfile->m_Lines[index] != 0 )
-                {
-                    free(pProfile->m_Lines[index]);
-                }
-            }
-            free(pProfile->m_Lines);
-        }
-        if ( pProfile->m_Sections != 0 )
-        {
-            /*osl_TProfileSection* pSections=pProfile->m_Sections;*/
-            for ( index = 0 ; index < pProfile->m_NoSections ; ++index )
-            {
-                if ( pProfile->m_Sections[index].m_Entries != 0 )
-                {
-                    free(pProfile->m_Sections[index].m_Entries);
-                }
-            }
-            free(pProfile->m_Sections);
-        }
-
-    }
-    free(pProfile);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_closeProfile [ok]\n");
-#endif
-    return (sal_True);
-}
-
-sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
-{
-    osl_TProfileImpl* pProfile = (osl_TProfileImpl*) Profile;
-    osl_TFile* pFile;
-    sal_Bool bRet = sal_False;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_flushProfile()\n");
-#endif
-
-    if ( pProfile == 0 )
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_flushProfile() [pProfile == 0]\n");
-#endif
-        return sal_False;
-    }
-
-    pFile = pProfile->m_pFile;
-    if ( !( pFile != 0 && pFile->m_Handle >= 0 ) )
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_flushProfile() [invalid file]\n");
-#endif
-        return sal_False;
-    }
-
-    if ( pProfile->m_Flags & FLG_MODIFIED )
-    {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("swapping to storeprofile\n");
-#endif
-        bRet = storeProfile(pFile,pProfile,sal_False);
-    }
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_flushProfile() [ok]\n");
-#endif
-    return bRet;
-}
-
-sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
-                                        const sal_Char* pszSection, const sal_Char* pszEntry,
-                                        sal_Char* pszString, sal_uInt32 MaxLen,
-                                        const sal_Char* pszDefault)
-{
-    sal_uInt32    NoEntry;
-    const sal_Char* pStr = 0;
-    osl_TProfileSection* pSec;
-    osl_TProfileImpl*    pProfile = 0;
-
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_readProfileString\n");
-#endif
-
-    pProfile = acquireProfile(Profile, sal_False);
-
-    if (pProfile == NULL)
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_readProfileString [pProfile==0]\n");
-#endif
-
-
-        return (sal_False);
-    }
-
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != NULL) &&
-            (NoEntry < pSec->m_NoEntries) &&
-            ((pStr = strchr(pProfile->m_Lines[pSec->m_Entries[NoEntry].m_Line],
-                            '=')) != NULL))
-            pStr++;
-        else
-            pStr = pszDefault;
-
-        if ( pStr != 0 )
-        {
-            pStr = stripBlanks(pStr, NULL);
-            MaxLen = (MaxLen - 1 < strlen(pStr)) ? (MaxLen - 1) : strlen(pStr);
-            pStr = stripBlanks(pStr, &MaxLen);
-            strncpy(pszString, pStr, MaxLen);
-            pszString[MaxLen] = '\0';
-        }
-    }
-    else
-        PrfQueryProfileString(pProfile->m_hIni, (PCSZ)pszSection,
-                              (PCSZ)pszEntry, (PCSZ)pszDefault,
-                              pszString, MaxLen);
-
-    releaseProfile(pProfile);
-
-    if ( pStr == 0 )
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_readProfileString [pStr==0]\n");
-#endif
-
-
-        return (sal_False);
-    }
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_readProfileString [ok]\n");
-#endif
-
-    return (sal_True);
-}
-
-
-sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
-                            const sal_Char* pszSection, const sal_Char* pszEntry,
-                            sal_Bool Default)
-{
-    sal_Char Line[32];
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_readProfileBool\n");
-#endif
-
-    if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
-    {
-        if ((stricmp(Line, STR_INI_BOOLYES) == 0) ||
-            (stricmp(Line, STR_INI_BOOLON)  == 0) ||
-            (stricmp(Line, STR_INI_BOOLONE) == 0))
-            Default = sal_True;
-        else
-            if ((stricmp(Line, STR_INI_BOOLNO)   == 0) ||
-                (stricmp(Line, STR_INI_BOOLOFF)  == 0) ||
-                (stricmp(Line, STR_INI_BOOLZERO) == 0))
-                Default = sal_False;
-    }
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_readProfileBool [ok]\n");
-#endif
-
-    return (Default);
-}
-
-
-sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
-                              const sal_Char* pszSection, const sal_Char* pszEntry,
-                              sal_uInt32 FirstId, const sal_Char* Strings[],
-                              sal_uInt32 Default)
-{
-    sal_uInt32    i;
-    sal_Char        Line[256];
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_readProfileIdent\n");
-#endif
-
-    if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
-    {
-        i = 0;
-        while (Strings[i] != NULL)
-        {
-            if (stricmp(Line, Strings[i]) == 0)
-            {
-                Default = i + FirstId;
-                break;
-            }
-            i++;
-        }
-    }
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_readProfileIdent [ok]\n");
-#endif
-    return (Default);
-}
-
-
-sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
-                               const sal_Char* pszSection, const sal_Char* pszEntry,
-                               const sal_Char* pszString)
-{
-    sal_uInt32    i;
-    sal_Bool bRet = sal_False;
-    sal_uInt32    NoEntry;
-    const sal_Char* pStr;
-    sal_Char        Line[4096];
-    osl_TProfileSection* pSec;
-    osl_TProfileImpl*    pProfile = 0;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_writeProfileString\n");
-#endif
-
-    pProfile = acquireProfile(Profile, sal_True);
-
-    if (pProfile == NULL)
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_writeProfileString [pProfile==0]\n");
-#endif
-        return (sal_False);
-    }
-
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if ((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) == NULL)
-        {
-            Line[0] = '\0';
-            addLine(pProfile, Line);
-
-            Line[0] = '[';
-            strcpy(&Line[1], pszSection);
-            Line[1 + strlen(pszSection)] = ']';
-            Line[2 + strlen(pszSection)] = '\0';
-
-            if (((pStr = addLine(pProfile, Line)) == NULL) ||
-                (! addSection(pProfile, pProfile->m_NoLines - 1, &pStr[1], strlen(pszSection))))
-            {
-                releaseProfile(pProfile);
-#ifdef TRACE_OSL_PROFILE
-                OSL_TRACE("Out osl_writeProfileString [not added]\n");
-#endif
-                return (sal_False);
-            }
-
-            pSec = &pProfile->m_Sections[pProfile->m_NoSections - 1];
-            NoEntry = pSec->m_NoEntries;
-        }
-
-        Line[0] = '\0';
-        strcpy(&Line[0], pszEntry);
-        Line[0 + strlen(pszEntry)] = '=';
-        strcpy(&Line[1 + strlen(pszEntry)], pszString);
-
-        if (NoEntry >= pSec->m_NoEntries)
-        {
-            if (pSec->m_NoEntries > 0)
-                i = pSec->m_Entries[pSec->m_NoEntries - 1].m_Line + 1;
-            else
-                i = pSec->m_Line + 1;
-
-            if (((pStr = insertLine(pProfile, Line, i)) == NULL) ||
-                (! addEntry(pProfile, pSec, i, pStr, strlen(pszEntry))))
-            {
-                releaseProfile(pProfile);
-#ifdef TRACE_OSL_PROFILE
-                OSL_TRACE("Out osl_writeProfileString [not inserted]\n");
-#endif
-                return (sal_False);
-            }
-
-            pProfile->m_Flags |= FLG_MODIFIED;
-        }
-        else
-        {
-            i = pSec->m_Entries[NoEntry].m_Line;
-            free(pProfile->m_Lines[i]);
-            pProfile->m_Lines[i] = strdup(Line);
-            setEntry(pProfile, pSec, NoEntry, i, pProfile->m_Lines[i], strlen(pszEntry));
-
-            pProfile->m_Flags |= FLG_MODIFIED;
-        }
-    }
-    else
-        PrfWriteProfileString(pProfile->m_hIni, (PCSZ)pszSection,
-                              (PCSZ)pszEntry, (PCSZ)pszString);
-
-    bRet = releaseProfile(pProfile);
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_writeProfileString [ok]\n");
-#endif
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
-                             const sal_Char* pszSection, const sal_Char* pszEntry,
-                             sal_Bool Value)
-{
-    sal_Bool bRet = sal_False;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_writeProfileBool\n");
-#endif
-
-    if (Value)
-        bRet=osl_writeProfileString(Profile, pszSection, pszEntry, STR_INI_BOOLONE);
-    else
-        bRet=osl_writeProfileString(Profile, pszSection, pszEntry, STR_INI_BOOLZERO);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_writeProfileBool [ok]\n");
-#endif
-
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
-                              const sal_Char* pszSection, const sal_Char* pszEntry,
-                              sal_uInt32 FirstId, const sal_Char* Strings[],
-                              sal_uInt32 Value)
-{
-    int i, n;
-    sal_Bool bRet = sal_False;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_writeProfileIdent\n");
-#endif
-
-    for (n = 0; Strings[n] != NULL; n++);
-
-    if ((i = Value - FirstId) >= n)
-        bRet=sal_False;
-    else
-        bRet=osl_writeProfileString(Profile, pszSection, pszEntry, Strings[i]);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_writeProfileIdent\n");
-#endif
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
-                               const sal_Char *pszSection, const sal_Char *pszEntry)
-{
-    sal_uInt32    NoEntry;
-    osl_TProfileSection* pSec;
-    osl_TProfileImpl*    pProfile = 0;
-    sal_Bool bRet = sal_False;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_removeProfileEntry\n");
-#endif
-
-    pProfile = acquireProfile(Profile, sal_True);
-
-    if (pProfile == NULL)
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]\n");
-#endif
-
-
-        return (sal_False);
-    }
-
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != NULL) &&
-            (NoEntry < pSec->m_NoEntries))
-        {
-            removeLine(pProfile, pSec->m_Entries[NoEntry].m_Line);
-            removeEntry(pSec, NoEntry);
-            if (pSec->m_NoEntries == 0)
-            {
-                removeLine(pProfile, pSec->m_Line);
-
-                /* remove any empty separation line */
-                if ((pSec->m_Line > 0) && (pProfile->m_Lines[pSec->m_Line - 1][0] == '\0'))
-                    removeLine(pProfile, pSec->m_Line - 1);
-
-                removeSection(pProfile, pSec);
-            }
-
-            pProfile->m_Flags |= FLG_MODIFIED;
-        }
-    }
-    else
-        PrfWriteProfileString(pProfile->m_hIni, (PCSZ)pszSection, (PCSZ)pszEntry, NULL);
-
-    bRet = releaseProfile(pProfile);
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_removeProfileEntry [ok]\n");
-#endif
-    return bRet;
-}
-
-
-sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_Char *pszSection,
-                                      sal_Char* pszBuffer, sal_uInt32 MaxLen)
-{
-    sal_uInt32    i, n = 0;
-    sal_uInt32    NoEntry;
-    osl_TProfileSection* pSec;
-    osl_TProfileImpl*    pProfile = 0;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_getProfileSectionEntries\n");
-#endif
-
-    pProfile = acquireProfile(Profile, sal_False);
-
-    if (pProfile == NULL)
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]\n");
-#endif
-
-
-        return (0);
-    }
-
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if ((pSec = findEntry(pProfile, pszSection, "", &NoEntry)) != NULL)
-        {
-            if (MaxLen != 0)
-            {
-                for (i = 0; i < pSec->m_NoEntries; i++)
-                {
-                    if ((n + pSec->m_Entries[i].m_Len + 1) < MaxLen)
-                    {
-                        strncpy(&pszBuffer[n], &pProfile->m_Lines[pSec->m_Entries[i].m_Line]
-                                [pSec->m_Entries[i].m_Offset], pSec->m_Entries[i].m_Len);
-                        n += pSec->m_Entries[i].m_Len;
-                        pszBuffer[n++] = '\0';
-                    }
-                    else
-                        break;
-
-                }
-
-                pszBuffer[n++] = '\0';
-            }
-            else
-            {
-                for (i = 0; i < pSec->m_NoEntries; i++)
-                    n += pSec->m_Entries[i].m_Len + 1;
-
-                n += 1;
-            }
-        }
-        else
-            n = 0;
-    }
-    else
-        n = PrfQueryProfileString(pProfile->m_hIni, (PCSZ)pszSection, NULL, NULL,
-                                    pszBuffer, MaxLen );
-
-    releaseProfile(pProfile);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_getProfileSectionEntries [ok]\n");
-#endif
-
-    return (n);
-}
-
-sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuffer, sal_uInt32 MaxLen)
-{
-    sal_uInt32    i, n = 0;
-    osl_TProfileSection* pSec;
-    osl_TProfileImpl*    pProfile = acquireProfile(Profile, sal_False);
-
-    if (pProfile == NULL)
-        return (0);
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if (MaxLen != 0)
-        {
-             for (i = 0; i < pProfile->m_NoSections; i++)
-            {
-                pSec = &pProfile->m_Sections[i];
-
-                if ((n + pSec->m_Len + 1) < MaxLen)
-                {
-                    strncpy(&pszBuffer[n], &pProfile->m_Lines[pSec->m_Line][pSec->m_Offset],
-                            pSec->m_Len);
-                    n += pSec->m_Len;
-                    pszBuffer[n++] = '\0';
-                }
-                else
-                    break;
-            }
-
-            pszBuffer[n++] = '\0';
-        }
-        else
-        {
-             for (i = 0; i < pProfile->m_NoSections; i++)
-                n += pProfile->m_Sections[i].m_Len + 1;
-
-            n += 1;
-        }
-    }
-    else
-        n = PrfQueryProfileString(pProfile->m_hIni, NULL, NULL, NULL,
-                                    pszBuffer, MaxLen );
-
-    releaseProfile(pProfile);
-
-    return (n);
-}
-
-/*****************************************************************************/
-/* Static Module Functions */
-/*****************************************************************************/
-
-static osl_TStamp getFileStamp(osl_TFile* pFile)
-{
-    osl_TStamp  FileTime;
-    FILESTATUS3	FileStatus;
-    sal_uInt32  Bytes;
-
-    Bytes = sizeof( FILESTATUS3 );
-    if ( (!pFile->m_Handle) ||
-        DosQueryFileInfo(pFile->m_Handle, FIL_STANDARD, &FileStatus, Bytes))
-        memset(&FileTime, 0, sizeof(FileTime));
-    else
-    {
-        FileTime.m_Date = FileStatus.fdateLastWrite;
-        FileTime.m_Time = FileStatus.ftimeLastWrite;
-    }
-
-    return (FileTime);
-}
-
-static sal_Bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
-{
-    sal_uInt32  status = 1;
-    FILELOCK 	Lock;
-
-    if (!pFile->m_Handle)
-        return (sal_False);
-
-    Lock.lOffset = 0;
-    Lock.lRange  = 0xFFFFFFFF;
-
-    switch (eMode)
-    {
-        case un_lock:
-            status = DosSetFileLocks(pFile->m_Handle, &Lock, NULL, 1000, 0);
-            break;
-
-        case read_lock:
-            status = DosSetFileLocks(pFile->m_Handle, NULL, &Lock, 1000, 1);
-            break;
-
-        case write_lock:
-            status = DosSetFileLocks(pFile->m_Handle, NULL, &Lock, 1000, 0);
-            break;
-    }
-
-    return (status == 0);
-}
-
-//static osl_TFile* openFile(rtl_uString* pszFilename, sal_Bool bWriteable)
-static osl_TFile* openFileImpl(rtl_uString *ustrFileName, oslProfileOption ProfileFlags )
-{
-    sal_uInt32 	action;
-    APIRET 		rc;
-    osl_TFile* 	pFile = (osl_TFile*)calloc(1, sizeof(osl_TFile));
-
-        ULONG attributes;
-        ULONG flags;
-        ULONG mode;
-    sal_Bool bWriteable = sal_False;
-    rtl_String* strFileName=0;
-    sal_Char* pszFileName=0;
-
-    /* check parameters */
-    OSL_ASSERT( ustrFileName );
-    
-    rtl_uString2String( &strFileName,
-                            rtl_uString_getStr(ustrFileName),
-                            rtl_uString_getLength(ustrFileName),
-                            osl_getThreadTextEncoding(),
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-    pszFileName = rtl_string_getStr(strFileName);
-
-/*    if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE | osl_Profile_READWRITE ) )*/
-    if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) )
-    {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("setting bWriteable to TRUE\n");
-#endif
-        bWriteable=sal_True;
-    }
-        
-        if (bWriteable)
-        {
-            flags = FILE_NORMAL | FILE_ARCHIVED;
-            attributes = OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS;
-            mode = OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE;
-        }
-        else
-        {
-            flags = FILE_NORMAL;
-            attributes = OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS;
-               mode = OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY;
-        }
-
-        if (rc = DosOpen((PCSZ)pszFileName, &pFile->m_Handle, &action, 0, flags, attributes, mode, NULL))
-        {
-            if (rc == ERROR_TOO_MANY_OPEN_FILES)
-            {
-                LONG fhToAdd = 10;
-                ULONG fhOld = 0;
-                rc = DosSetRelMaxFH(&fhToAdd, &fhOld);
-                rc = DosOpen((PCSZ)pszFileName, &pFile->m_Handle, &action, 0, flags, attributes, mode, NULL);
-            }
-        }
-
-        if ( (rc != NO_ERROR) && bWriteable)
-        {
-            free(pFile);
-            rtl_string_release(strFileName);
-              return (NULL);
-        }
-
-    rtl_string_release(strFileName);
-        
-    pFile->m_pWriteBuf=0;
-    pFile->m_nWriteBufFree=0;
-    pFile->m_nWriteBufLen=0;
-
-    if ( ProfileFlags & (osl_Profile_WRITELOCK | osl_Profile_READLOCK ) )
-    {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("locking '%s' file\n",pszFilename);
-#endif
-
-        lockFile(pFile, bWriteable ? write_lock : read_lock);
-    }
-
-    /* mfe: new WriteBuf obsolete */
-/*	pFile->m_pWritePtr = pFile->m_Buf;*/
-/*	pFile->m_pReadPtr  = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);*/
-
-    return (pFile);
-}
-
-//static osl_TStamp closeFile(osl_TFile* pFile)
-static osl_TStamp closeFileImpl(osl_TFile* pFile)
-{
-    osl_TStamp stamp = {0, 0};
-
-    if ( pFile == 0 )
-    {
-        return stamp;
-    }
-        
-    if (pFile->m_Handle)
-    {
-        /* mfe: new WriteBuf obsolete */
-        /* we just closing the file here, DO NOT write, it has to be handled in higher levels */
-        //if (pFile->m_pWritePtr > pFile->m_WriteBuf)
-        //{
-        //	sal_uInt32 Bytes;
-
-        //	DosWrite(pFile->m_Handle, pFile->m_WriteBuf,
-        //			 pFile->m_pWritePtr - pFile->m_WriteBuf,
-        //			 &Bytes);
-        //}
-
-        stamp = getFileStamp(pFile);
-
-        lockFile(pFile, un_lock);
-
-        DosClose(pFile->m_Handle);
-    }
-
-    if ( pFile->m_pWriteBuf != 0 )
-    {
-        free(pFile->m_pWriteBuf);
-    }
-    
-    free(pFile);
-
-    return(stamp);
-}
-
-static sal_Bool rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
-{
-    if (pFile->m_Handle)
-    {
-        sal_uInt32 Position;
-
-        /* mfe: new WriteBuf obsolete */
-        /* we just closing the file here, DO NOT write, it has to be handled in higher levels */
-        /* if (pFile->m_pWritePtr > pFile->m_WriteBuf)
-        {
-            sal_uInt32 Bytes;
-
-            DosWrite(pFile->m_Handle, pFile->m_WriteBuf,
-                     pFile->m_pWritePtr - pFile->m_WriteBuf,
-                     &Bytes);
-
-            pFile->m_pWritePtr = pFile->m_WriteBuf;
-        } */
-
-        pFile->m_pReadPtr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);
-        
-        DosSetFilePtr(pFile->m_Handle, 0, FILE_BEGIN, &Position);
-        
-        if (bTruncate)
-            DosSetFileSize(pFile->m_Handle, 0);
-    }
-
-    return (sal_True);
-}
-
-static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen)
-{
-    int   Free, Bytes;
-    sal_Char* pChr;
-    sal_Char* pLine = (sal_Char *)pszLine;
-    sal_uInt32 	Max;
-
-    if (pFile->m_Handle == 0)
-        return (sal_False);
-
-    MaxLen -= 1;
-
-    do
-    {
-        Bytes = sizeof(pFile->m_ReadBuf) - (pFile->m_pReadPtr - pFile->m_ReadBuf);
-
-        if (Bytes <= 1)
-        {
-            /* refill buffer */
-            memcpy(pFile->m_ReadBuf, pFile->m_pReadPtr, Bytes);
-            pFile->m_pReadPtr = pFile->m_ReadBuf;
-
-            Free = sizeof(pFile->m_ReadBuf) - Bytes;
-
-            if (DosRead(pFile->m_Handle, &pFile->m_ReadBuf[Bytes], Free, &Max))
-            {
-                *pLine = '\0';
-                return (sal_False);
-            }
-
-            if (Max < Free)
-            {
-                if ((Max == 0) && (pLine == pszLine))
-                {
-                    *pLine = '\0';
-                    return (sal_False);
-                }
-
-                pFile->m_ReadBuf[Bytes + Max] = '\0';
-            }
-        }
-
-        for (pChr = pFile->m_pReadPtr;
-             (*pChr != '\n') && (*pChr != '\r') && (*pChr != '\0') &&
-             (pChr < (pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf) - 1));
-             pChr++);
-
-        Max = SAL_MIN(pChr - pFile->m_pReadPtr, MaxLen);
-        memcpy(pLine, pFile->m_pReadPtr, Max);
-        MaxLen -= Max;
-        pLine  += Max;
-
-        if (pChr < (pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf) - 1))
-        {
-            if (*pChr != '\0')
-            {
-                if ((pChr[0] == '\r') && (pChr[1] == '\n'))
-                    pChr += 2;
-                else
-                    pChr += 1;
-            }
-
-            if ((pChr < (pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf))) &&
-                (*pChr == '\0'))
-                pChr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);
-
-            *pLine = '\0';
-
-            /* setting MaxLen to -1 indicates terminating read loop */
-            MaxLen = -1;
-        }
-
-        pFile->m_pReadPtr = pChr;
-    }
-    while (MaxLen > 0);
-
-    return (sal_True);
-}
-
-static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine)
-{
-    unsigned int Len = strlen(pszLine);
-
-#ifdef DEBUG_OSL_PROFILE
-    int strLen=0;
-#endif
-
-    if ( pFile == 0 || pFile->m_Handle < 0 )
-    {
-        return (sal_False);
-    }
-
-    if ( pFile->m_pWriteBuf == 0 )
-    {
-        pFile->m_pWriteBuf = (sal_Char*) malloc(Len+3);
-        pFile->m_nWriteBufLen = Len+3;
-        pFile->m_nWriteBufFree = Len+3;
-    }
-    else
-    {
-        if ( pFile->m_nWriteBufFree <= Len + 3 )
-        {
-            sal_Char* pTmp;
-
-            pTmp=(sal_Char*) realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len ) * 2) );
-            if ( pTmp == 0 )
-            {
-                return sal_False;
-            }
-            pFile->m_pWriteBuf = pTmp;
-            pFile->m_nWriteBufFree = pFile->m_nWriteBufFree + pFile->m_nWriteBufLen + ( 2 * Len );
-            pFile->m_nWriteBufLen = ( pFile->m_nWriteBufLen + Len ) * 2;
-            memset( (pFile->m_pWriteBuf) + ( pFile->m_nWriteBufLen - pFile->m_nWriteBufFree ), 0, pFile->m_nWriteBufFree);
-        }
-    }
-
-
-
-    memcpy(pFile->m_pWriteBuf + ( pFile->m_nWriteBufLen - pFile->m_nWriteBufFree ),pszLine,Len+1);
-#ifdef DEBUG_OSL_PROFILE
-    strLen = strlen(pFile->m_pWriteBuf);
-#endif
-    pFile->m_pWriteBuf[pFile->m_nWriteBufLen - pFile->m_nWriteBufFree + Len]='\r';
-    pFile->m_pWriteBuf[pFile->m_nWriteBufLen - pFile->m_nWriteBufFree + Len + 1]='\n';
-    pFile->m_pWriteBuf[pFile->m_nWriteBufLen - pFile->m_nWriteBufFree + Len + 2]='\0';
-
-    pFile->m_nWriteBufFree-=Len+2;
-
-#ifdef DEBUG_OSL_PROFILE
-/*    OSL_TRACE("File Buffer in _putLine '%s' '%i'(%i)\n",pFile->m_pWriteBuf,strlen(pFile->m_pWriteBuf),pFile->m_nWriteBufLen - pFile->m_nWriteBufFree);*/
-#endif
-
-    return (sal_True);
-}
-
-/* platform specific end */
-
-static const sal_Char* stripBlanks(const sal_Char* String, sal_uInt32* pLen)
-{
-    if  ( (pLen != NULL) && ( *pLen != 0 ) ) 
-    {
-        while ((String[*pLen - 1] == ' ') || (String[*pLen - 1] == '\t'))
-            (*pLen)--;
-
-        while ((*String == ' ') || (*String == '\t'))
-        {
-            String++;
-            (*pLen)--;
-        }
-    }
-    else
-        while ((*String == ' ') || (*String == '\t'))
-            String++;
-
-    return (String);
-}
-
-static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line)
-{
-    if (pProfile->m_NoLines >= pProfile->m_MaxLines)
-    {
-        if (pProfile->m_Lines == NULL)
-        {
-            pProfile->m_MaxLines = LINES_INI;
-            pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines * sizeof(sal_Char *));
-        }
-        else
-        {
-            pProfile->m_MaxLines += LINES_ADD;
-            pProfile->m_Lines = (sal_Char **)realloc(pProfile->m_Lines,
-                                                 pProfile->m_MaxLines * sizeof(sal_Char *));
-        }
-
-        if (pProfile->m_Lines == NULL)
-        {
-            pProfile->m_NoLines  = 0;
-            pProfile->m_MaxLines = 0;
-            return (NULL);
-        }
-
-    }
-    
-    pProfile->m_Lines[pProfile->m_NoLines++] = strdup(Line);
-
-    return (pProfile->m_Lines[pProfile->m_NoLines - 1]);
-}
-
-static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo)
-{
-    if (pProfile->m_NoLines >= pProfile->m_MaxLines)
-    {
-        if (pProfile->m_Lines == NULL)
-        {
-            pProfile->m_MaxLines = LINES_INI;
-            pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines * sizeof(sal_Char *));
-        }
-        else
-        {
-            pProfile->m_MaxLines += LINES_ADD;
-            pProfile->m_Lines = (sal_Char **)realloc(pProfile->m_Lines,
-                                                 pProfile->m_MaxLines * sizeof(sal_Char *));
-        }
-
-        if (pProfile->m_Lines == NULL)
-        {
-            pProfile->m_NoLines  = 0;
-            pProfile->m_MaxLines = 0;
-            return (NULL);
-        }
-
-    }
-
-    LineNo = LineNo > pProfile->m_NoLines ? pProfile->m_NoLines : LineNo;
-
-    if (LineNo < pProfile->m_NoLines)
-    {
-        sal_uInt32 i, n;
-        osl_TProfileSection* pSec;
-
-        memmove(&pProfile->m_Lines[LineNo + 1], &pProfile->m_Lines[LineNo],
-                (pProfile->m_NoLines - LineNo) * sizeof(sal_Char *));
-
-        /* adjust line references */
-        for (i = 0; i < pProfile->m_NoSections; i++)
-        {
-            pSec = &pProfile->m_Sections[i];
-            
-            if (pSec->m_Line >= LineNo)
-                pSec->m_Line++;
-
-            for (n = 0; n < pSec->m_NoEntries; n++)
-                if (pSec->m_Entries[n].m_Line >= LineNo)
-                    pSec->m_Entries[n].m_Line++;
-        }
-    }
-    
-    pProfile->m_NoLines++;
-    
-    pProfile->m_Lines[LineNo] = strdup(Line);
-
-    return (pProfile->m_Lines[LineNo]);
-}
-
-static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo)
-{
-    if (LineNo < pProfile->m_NoLines)
-    {
-        free(pProfile->m_Lines[LineNo]);
-        if (pProfile->m_NoLines - LineNo > 1)
-        {
-            sal_uInt32 i, n;
-            osl_TProfileSection* pSec;
-
-            memmove(&pProfile->m_Lines[LineNo], &pProfile->m_Lines[LineNo + 1],
-                    (pProfile->m_NoLines - LineNo - 1) * sizeof(sal_Char *));
-
-            /* adjust line references */
-            for (i = 0; i < pProfile->m_NoSections; i++)
-            {
-                pSec = &pProfile->m_Sections[i];
-                
-                if (pSec->m_Line > LineNo)
-                    pSec->m_Line--;
-
-                for (n = 0; n < pSec->m_NoEntries; n++)
-                    if (pSec->m_Entries[n].m_Line > LineNo)
-                        pSec->m_Entries[n].m_Line--;
-            }
-        }
-        else
-        {
-            pProfile->m_Lines[LineNo] = 0;
-        }
-
-        pProfile->m_NoLines--;
-    }
-
-    return;
-}
-
-static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection,
-                     sal_uInt32 NoEntry, sal_uInt32 Line,
-                     const sal_Char* Entry, sal_uInt32 Len)
-{
-    Entry = stripBlanks(Entry, &Len);
-    pSection->m_Entries[NoEntry].m_Line   = Line;
-    pSection->m_Entries[NoEntry].m_Offset = Entry - pProfile->m_Lines[Line];
-    pSection->m_Entries[NoEntry].m_Len    = Len;
-
-    return;
-}
-
-static sal_Bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection,
-                        int Line, const sal_Char* Entry, sal_uInt32 Len)
-{
-    if (pSection != NULL)
-    {
-        if (pSection->m_NoEntries >= pSection->m_MaxEntries)
-        {
-            if (pSection->m_Entries == NULL)
-            {
-                pSection->m_MaxEntries = ENTRIES_INI;
-                pSection->m_Entries = (osl_TProfileEntry *)malloc(
-                                pSection->m_MaxEntries * sizeof(osl_TProfileEntry));
-            }
-            else
-            {
-                pSection->m_MaxEntries += ENTRIES_ADD;
-                pSection->m_Entries = (osl_TProfileEntry *)realloc(pSection->m_Entries,
-                                pSection->m_MaxEntries * sizeof(osl_TProfileEntry));
-            }
-
-            if (pSection->m_Entries == NULL)
-            {
-                pSection->m_NoEntries  = 0;
-                pSection->m_MaxEntries = 0;
-                return (sal_False);
-            }
-        }
-
-        pSection->m_NoEntries++;
-
-        Entry = stripBlanks(Entry, &Len);
-        setEntry(pProfile, pSection, pSection->m_NoEntries - 1, Line,
-                 Entry, Len);
-
-        return (sal_True);
-    }
-
-    return (sal_False);
-}
-
-static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry)
-{
-    if (NoEntry < pSection->m_NoEntries)
-    {
-        if (pSection->m_NoEntries - NoEntry > 1)
-            memmove(&pSection->m_Entries[NoEntry],
-                    &pSection->m_Entries[NoEntry + 1],
-                    (pSection->m_NoEntries - NoEntry - 1) * sizeof(osl_TProfileEntry));
-        pSection->m_NoEntries--;
-    }
-
-    return;
-}
-
-static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len)
-{
-    if (pProfile->m_NoSections >= pProfile->m_MaxSections)
-    {
-        if (pProfile->m_Sections == NULL)
-        {
-            pProfile->m_MaxSections = SECTIONS_INI;
-            pProfile->m_Sections = (osl_TProfileSection *)malloc(pProfile->m_MaxSections * sizeof(osl_TProfileSection));
-        }
-        else
-        {
-            pProfile->m_MaxSections += SECTIONS_ADD;
-            pProfile->m_Sections = (osl_TProfileSection *)realloc(pProfile->m_Sections,
-                                          pProfile->m_MaxSections * sizeof(osl_TProfileSection));
-        }
-
-        if (pProfile->m_Sections == NULL)
-        {
-            pProfile->m_NoSections = 0;
-            pProfile->m_MaxSections = 0;
-            return (sal_False);
-        }
-    }
-
-    pProfile->m_NoSections++;
-
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_Entries    = NULL;
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_NoEntries  = 0;
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_MaxEntries = 0;
-
-    Section = (sal_Char *)stripBlanks(Section, &Len);
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_Line = Line;
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_Offset = Section - pProfile->m_Lines[Line];
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_Len = Len;
-
-    return (sal_True);
-}
-
-static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection)
-{
-    sal_uInt32 Section;
-
-    if ((Section = pSection - pProfile->m_Sections) < pProfile->m_NoSections)
-    {
-        free (pSection->m_Entries);
-        if (pProfile->m_NoSections - Section > 1)
-        {
-            memmove(&pProfile->m_Sections[Section], &pProfile->m_Sections[Section + 1],
-                    (pProfile->m_NoSections - Section - 1) * sizeof(osl_TProfileSection));
-        }
-        else
-        {
-            pSection->m_Entries = 0;
-        }
-
-        pProfile->m_NoSections--;
-    }
-    
-    return;
-}
-
-static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char* Section,
-                                      const sal_Char* Entry, sal_uInt32 *pNoEntry)
-{
-static  sal_uInt32    Sect = 0;
-        sal_uInt32    i, n;
-        sal_uInt32    Len;
-        const sal_Char* pStr;
-        osl_TProfileSection* pSec;
-
-    Len = strlen(Section);
-    Section = (sal_Char *)stripBlanks(Section, &Len);
-
-    n = Sect;
-
-    for (i = 0; i < pProfile->m_NoSections; i++)
-    {
-        n %= pProfile->m_NoSections;
-        pSec = &pProfile->m_Sections[n];
-        if ((Len == pSec->m_Len) &&
-            (strnicmp(Section, &pProfile->m_Lines[pSec->m_Line][pSec->m_Offset], pSec->m_Len)
-             == 0))
-            break;
-        n++;
-    }
-
-    Sect = n;
-
-    if (i < pProfile->m_NoSections)
-    {
-        Len = strlen(Entry);
-        Entry = stripBlanks(Entry, &Len);
-        
-        *pNoEntry = pSec->m_NoEntries;
-
-        for (i = 0; i < pSec->m_NoEntries; i++)
-        {
-            pStr = &pProfile->m_Lines[pSec->m_Entries[i].m_Line]
-                                     [pSec->m_Entries[i].m_Offset];
-            if ((Len == pSec->m_Entries[i].m_Len) &&
-                (strnicmp(Entry, pStr, pSec->m_Entries[i].m_Len)
-                 == 0))
-            {
-                *pNoEntry = i;
-                break;
-            }
-        }
-    }
-    else
-        pSec = NULL;
-
-    return (pSec);
-}
-
-static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
-{
-    sal_uInt32    i;
-    sal_Char*       pStr;
-    sal_Char*       pChar;
-    sal_Char        Line[1024];
-
-    pProfile->m_NoLines    = 0;
-    pProfile->m_NoSections = 0;
-
-    OSL_VERIFY(rewindFile(pFile, sal_False));
-
-    while (getLine(pFile, Line, sizeof(Line)))
-    {
-        if (! addLine(pProfile, Line))
-            return (sal_False);
-    }
-
-    for (i = 0; i < pProfile->m_NoLines; i++)
-    {
-        pStr = (sal_Char *)stripBlanks(pProfile->m_Lines[i], NULL);
-
-        if ((*pStr == '\0') || (*pStr == ';'))
-            continue;
-
-        if ((*pStr != '[') || ((pChar = strrchr(pStr, ']')) == NULL) ||
-            ((pChar - pStr) <= 2))
-        {
-            /* insert entry */
-
-            if (pProfile->m_NoSections < 1)
-                continue;
-
-            if ((pChar = strchr(pStr, '=')) == NULL)
-                pChar = pStr + strlen(pStr);
-
-            if (! addEntry(pProfile, &pProfile->m_Sections[pProfile->m_NoSections - 1],
-                           i, pStr, pChar - pStr))
-                return (sal_False);
-        }
-        else
-        {
-            /* new section */
-
-            if (! addSection(pProfile, i, pStr + 1, pChar - pStr - 1))
-                return (sal_False);
-        }
-    }
-
-    return (sal_True);
-}
-
-static sal_Bool storeProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile, sal_Bool bCleanup)
-{
-    if (pProfile->m_Lines != NULL)
-    {
-        if (pProfile->m_Flags & FLG_MODIFIED)
-        {
-            sal_uInt32 i;
-
-            OSL_VERIFY(rewindFile(pFile, sal_True));
-
-            for (i = 0; i < pProfile->m_NoLines; i++)
-                OSL_VERIFY(putLine(pFile, pProfile->m_Lines[i]));
-
-            pProfile->m_Flags &= ~FLG_MODIFIED;
-        }
-
-        if (bCleanup)
-        {
-            while (pProfile->m_NoLines > 0)
-                removeLine(pProfile, pProfile->m_NoLines - 1);
-
-            free(pProfile->m_Lines);
-            pProfile->m_Lines = NULL;
-            pProfile->m_MaxLines = 0;
-
-            while (pProfile->m_NoSections > 0)
-                removeSection(pProfile, &pProfile->m_Sections[pProfile->m_NoSections - 1]);
-
-            free(pProfile->m_Sections);
-            pProfile->m_Sections = NULL;
-            pProfile->m_MaxSections = 0;
-        }
-    }
-
-    return (sal_True);
-}
-
-static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
-{
-    osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
-    oslProfileOption PFlags=0;
-
-
-    if ( bWriteable )
-    {
-/*          PFlags = osl_Profile_DEFAULT | osl_Profile_READWRITE; */
-        PFlags = osl_Profile_DEFAULT | osl_Profile_WRITELOCK;
-    }
-    else
-    {
-        PFlags = osl_Profile_DEFAULT;
-    }
-
-
-    if (pProfile == NULL)
-    {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("AUTOOPEN MODE\n");
-#endif
-
-        if ((pProfile = (osl_TProfileImpl*)osl_openProfile(NULL, PFlags)) != NULL )
-        {
-            pProfile->m_Flags |= FLG_AUTOOPEN;
-        }
-    }
-    else
-    {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("try to acquire\n");
-#endif
-
-
-
-        if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-        {
-            if (! (pProfile->m_Flags & (osl_Profile_READLOCK |
-                                        osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE)))
-            {
-                osl_TStamp Stamp;
-#ifdef DEBUG_OSL_PROFILE
-                OSL_TRACE("DEFAULT MODE\n");
-#endif
-                if (! (pProfile->m_pFile = openFileImpl(pProfile->m_strFileName, pProfile->m_Flags | PFlags)))
-                    return NULL;
-
-                Stamp = getFileStamp(pProfile->m_pFile);
-
-                if (memcmp(&Stamp, &(pProfile->m_Stamp), sizeof(osl_TStamp)))
-                {
-                    pProfile->m_Stamp = Stamp;
-
-                    loadProfile(pProfile->m_pFile, pProfile);
-                }
-            }
-            else
-            {
-#ifdef DEBUG_OSL_PROFILE
-                OSL_TRACE("READ/WRITELOCK MODE\n");
-#endif
-
-
-                /* A readlock file could not be written */
-                if ((pProfile->m_Flags & osl_Profile_READLOCK) && bWriteable)
-                {
-                    return (NULL);
-                }
-            }
-        }
-        else
-        {
-            sal_Bool bWriteable = sal_False;
-            char pszFilename[PATH_MAX] = "";
-        
-            if ( pProfile->m_strFileName != 0  && pProfile->m_strFileName->buffer[0] != 0 )
-                FileURLToPath( pszFilename, PATH_MAX, pProfile->m_strFileName );
-            /* hack: usualy you have a specific HAB, but NULL works here... */
-            pProfile->m_hIni = PrfOpenProfile(NULL, (PCSZ)pszFilename);
-            if (! pProfile->m_hIni)
-                return (NULL);
-        }
-    }
-
-    return (pProfile);
-}
-
-static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
-{
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  releaseProfile\n");
-#endif
-
-    if ( pProfile == 0 )
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out releaseProfile [profile==0]\n");
-#endif
-        return sal_False;
-    }
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if (pProfile->m_Flags & FLG_AUTOOPEN)
-        {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out releaseProfile [AUTOOPEN]\n");
-#endif
-            return (osl_closeProfile((oslProfile)pProfile));
-        }
-        else
-        {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("DEFAULT MODE\n");
-#endif
-        if (! (pProfile->m_Flags & (osl_Profile_READLOCK |
-                                    osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE)))
-            {
-                if (pProfile->m_Flags & FLG_MODIFIED)
-                    storeProfile(pProfile->m_pFile, pProfile, sal_False);
-
-                closeFileImpl(pProfile->m_pFile);
-                pProfile->m_pFile = NULL;
-            }
-        }
-    }
-    else
-        PrfCloseProfile(pProfile->m_hIni);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out releaseProfile [ok]\n");
-#endif
-    return (sal_True);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/salinit.cxx b/sal/osl/os2/salinit.cxx
deleted file mode 100644
index 9768ad800..000000000
--- a/sal/osl/os2/salinit.cxx
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define INCL_DOS
-#include <os2.h>
-
-#include "precompiled_sal.hxx"
-#include "sal/config.h"
-
-#include "osl/process.h"
-#include "sal/main.h"
-#include "sal/types.h"
-
-// for exception logging
-#include <stdio.h>
-#include <string.h>
-#include <setjmp.h>
-#include "helpers/except.h"
-
-extern "C" {
-
-/*----------------------------------------------------------------------------*/
-
-static CHAR        szOOoExe[CCHMAXPATH];
-
-static FILE* APIENTRY _oslExceptOpenLogFile(VOID)
-{
-   FILE        *file;
-   DATETIME    DT;
-   PPIB        pib;
-   PSZ         slash;
-
-   // get executable fullpath
-   DosGetInfoBlocks(NULL, &pib);
-   DosQueryModuleName(pib->pib_hmte, sizeof(szOOoExe), szOOoExe);
-   // truncate to exe name
-   slash = (PSZ)strrchr( szOOoExe, '.');
-   *slash = '\0';
-   // make log path
-   strcat( szOOoExe, ".log");
-
-   file = fopen( szOOoExe, "a");
-   if (!file) { // e.g. readonly drive
-      // try again, usually C exist and is writable
-      file = fopen( "c:\\OOo.log", "a"); 
-   }
-   if (file) {
-        DosGetDateTime(&DT);
-        fprintf(file, "\nTrap message -- Date: %04d-%02d-%02d, Time: %02d:%02d:%02d\n",
-            DT.year, DT.month, DT.day,
-            DT.hours, DT.minutes, DT.seconds);
-        fprintf(file, "-------------------------------------------------------\n"
-                      "\nAn internal error occurred (Built " __DATE__ "-" __TIME__ ").\n");
-
-   }
-
-   // ok, return handle
-   return (file);
-}
-
-/*----------------------------------------------------------------------------*/
-
-static EXCEPTSTRUCT 	g_excptstruct = {0};
-
-void SAL_CALL sal_detail_initialize(int argc, char ** argv) 
-{
-    APIRET rc = -1;
-
-#if OSL_DEBUG_LEVEL == 0
-    excRegisterHooks(_oslExceptOpenLogFile, NULL, NULL, FALSE); 
-
-    g_excptstruct.RegRec2.pfnHandler = (PFN)excHandlerLoud;
-    g_excptstruct.arc = DosSetExceptionHandler( 
-               (PEXCEPTIONREGISTRATIONRECORD)&(g_excptstruct.RegRec2));
-
-    if (g_excptstruct.arc) 
-        if (G_pfnExcHookError)
-            G_pfnExcHookError(__FILE__, __LINE__, __FUNCTION__, g_excptstruct.arc);
-        else
-            DosBeep(1000, 1000);
-    g_excptstruct.ulExcpt = setjmp(g_excptstruct.RegRec2.jmpThread);
-#endif
-
-    osl_setCommandArgs(argc, argv);
-}
-
-void SAL_CALL sal_detail_deinitialize()
-{
-    APIRET rc = -1;
-
-#if OSL_DEBUG_LEVEL == 0
-    rc = DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)&(g_excptstruct.RegRec2));
-#endif
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/security.c b/sal/osl/os2/security.c
deleted file mode 100644
index 1c0f78dea..000000000
--- a/sal/osl/os2/security.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "system.h"
-
-#include <osl/security.h>
-#include <osl/diagnose.h>
-#include <osl/module.h>
-
-#include "osl/thread.h"
-#include "osl/file.h"
-
-#ifdef SOLARIS
-#include <crypt.h>
-#endif
-
-#include "secimpl.h"
-
-extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
-extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
-extern oslSecurityError SAL_CALL 
-osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd,
-                  oslSecurity* pSecurity);
-sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax);
-sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32  nMax);
-sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
-sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
-
-
-
-oslSecurity SAL_CALL osl_getCurrentSecurity()
-{
-    
-    oslSecurityImpl *pSecImpl = (oslSecurityImpl*) malloc(sizeof(oslSecurityImpl));
-    struct passwd	*pPasswd  = getpwuid(getuid());
-
-    if (pPasswd)
-    {
-        memcpy(&pSecImpl->m_pPasswd, pPasswd, sizeof(pSecImpl->m_pPasswd));
-        pSecImpl->m_isValid = sal_True;
-    }
-    else
-    {
-        /* Some UNIX-OS don't implement getpwuid, e.g. NC OS (special NetBSD) 1.2.1 */
-        /* so we have to catch this in this else branch */
-        pSecImpl->m_pPasswd.pw_name		= getenv("USER");
-        pSecImpl->m_pPasswd.pw_dir		= getenv("HOME");
-        if (pSecImpl->m_pPasswd.pw_name && pSecImpl->m_pPasswd.pw_dir)
-            pSecImpl->m_isValid				= sal_True;
-        else 
-        {
-            pSecImpl->m_pPasswd.pw_name		= "unknown";
-            pSecImpl->m_pPasswd.pw_dir		= "/tmp";
-            pSecImpl->m_isValid				= sal_False;
-        }
-        pSecImpl->m_pPasswd.pw_passwd	= NULL;
-        pSecImpl->m_pPasswd.pw_uid		= getuid();
-        pSecImpl->m_pPasswd.pw_gid		= getgid();
-        pSecImpl->m_pPasswd.pw_gecos	= "unknown";
-        pSecImpl->m_pPasswd.pw_shell	= "unknown";
-    }
-
-
-    return ((oslSecurity)pSecImpl);
-}
-
-
-oslSecurityError SAL_CALL osl_loginUser(
-    rtl_uString *ustrUserName,
-    rtl_uString *ustrPassword,
-    oslSecurity *pSecurity
-    )
-{
-    oslSecurityError ret;
-
-    *pSecurity = osl_getCurrentSecurity();
-    ret = osl_Security_E_None;
-
-    return ret;
-}
-
-    
-
-oslSecurityError SAL_CALL osl_loginUserOnFileServer(
-    rtl_uString *strUserName,
-    rtl_uString *strPasswd,
-    rtl_uString *strFileServer,
-    oslSecurity *pSecurity
-    )
-{
-    oslSecurityError erg;
-    return erg = osl_Security_E_UserUnknown;   
-}
-
-
-oslSecurityError SAL_CALL osl_psz_loginUserOnFileServer( const sal_Char*  pszUserName,
-                                                     const sal_Char*  pszPasswd,
-                                                     const sal_Char*  pszFileServer,
-                                                     oslSecurity*     pSecurity )
-{
-    oslSecurityError erg;
-    return erg = osl_Security_E_UserUnknown;
-}
-
-sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent)
-{
-    sal_Bool bRet=sal_False;
-    sal_Char pszIdent[1024];
-
-    pszIdent[0] = '\0';
-    
-    bRet = osl_psz_getUserIdent(Security,pszIdent,sizeof(pszIdent));
-
-    rtl_string2UString( ustrIdent, pszIdent, rtl_str_getLength( pszIdent ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-    OSL_ASSERT(*ustrIdent != NULL);
-    
-    return bRet;    
-}
-
-
-sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax)
-{
-    sal_Char  buffer[32];
-    sal_Int32 nChr;
-
-    oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
-
-    if (pSecImpl == NULL)
-        return sal_False;
-
-    nChr = snprintf(buffer, sizeof(buffer), "%u", pSecImpl->m_pPasswd.pw_uid);
-    if ( nChr < 0 || nChr >= sizeof(buffer) || nChr >= nMax )
-        return sal_False; /* leave *pszIdent unmodified in case of failure */
-
-    memcpy(pszIdent, buffer, nChr+1);
-    return sal_True;
-}
-
-sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName)
-{
-    sal_Bool bRet=sal_False;
-    sal_Char pszName[1024];
-
-    pszName[0] = '\0';
-    
-    bRet = osl_psz_getUserName(Security,pszName,sizeof(pszName));
-    
-    rtl_string2UString( ustrName, pszName, rtl_str_getLength( pszName ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-    OSL_ASSERT(*ustrName != NULL);
-    
-    return bRet;
-}
-
-
- 
-sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32  nMax)
-{
-    oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
-
-    if ((pSecImpl == NULL) || (! pSecImpl->m_isValid))
-        return sal_False;
-
-    strncpy(pszName, pSecImpl->m_pPasswd.pw_name, nMax);
-
-    return sal_True;
-}
-
-sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirectory)
-{
-    sal_Bool bRet=sal_False;
-    sal_Char pszDirectory[PATH_MAX];
-
-    pszDirectory[0] = '\0';
-    
-    bRet = osl_psz_getHomeDir(Security,pszDirectory,sizeof(pszDirectory));
-
-    if ( bRet == sal_True )
-    {
-        rtl_string2UString( pustrDirectory, pszDirectory, rtl_str_getLength( pszDirectory ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-        OSL_ASSERT(*pustrDirectory != NULL);
-        osl_getFileURLFromSystemPath( *pustrDirectory, pustrDirectory );
-    }
-    
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
-{
-    oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
-
-    if (pSecImpl == NULL)
-        return sal_False;
-
-    /* if current user, check also environment for HOME */
-    if (getuid() == pSecImpl->m_pPasswd.pw_uid)
-    {
-        sal_Char *pStr = NULL;
-#ifdef SOLARIS
-        char	buffer[8192];
-
-        struct passwd pwd;
-        struct passwd *ppwd;
-
-#ifdef _POSIX_PTHREAD_SEMANTICS
-        if ( 0 != getpwuid_r(getuid(), &pwd, buffer, sizeof(buffer), &ppwd ) )
-            ppwd = NULL;
-#else
-        ppwd = getpwuid_r(getuid(), &pwd, buffer, sizeof(buffer) );
-#endif
-
-        if ( ppwd )
-            pStr = ppwd->pw_dir;
-#else
-        pStr = getenv("HOME");
-#endif
-
-        if ((pStr != NULL) && (strlen(pStr) > 0) &&
-            (access(pStr, 0) == 0))
-            strncpy(pszDirectory, pStr, nMax);
-        else
-            if (pSecImpl->m_isValid)
-                strncpy(pszDirectory, pSecImpl->m_pPasswd.pw_dir, nMax);
-            else
-                return sal_False;
-    }
-    else
-        strncpy(pszDirectory, pSecImpl->m_pPasswd.pw_dir, nMax);
-
-    return sal_True;
-}
-
-sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDirectory)
-{
-    sal_Bool bRet = sal_False;
-    sal_Char pszDirectory[PATH_MAX];
-
-    pszDirectory[0] = '\0';
-    
-    bRet = osl_psz_getConfigDir(Security,pszDirectory,sizeof(pszDirectory));
-
-    if ( bRet == sal_True )
-    {
-        rtl_string2UString( pustrDirectory, pszDirectory, rtl_str_getLength( pszDirectory ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-        OSL_ASSERT(*pustrDirectory != NULL);
-        osl_getFileURLFromSystemPath( *pustrDirectory, pustrDirectory );
-    }
-
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
-{
-    return (osl_psz_getHomeDir(Security, pszDirectory, nMax));
-}
-
-sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security)
-{
-    oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
-
-    if (pSecImpl == NULL)
-        return sal_False;
-
-    if (pSecImpl->m_pPasswd.pw_uid != 0)
-        return (sal_False);
-
-    return (sal_True);
-}
-
-void SAL_CALL osl_freeSecurityHandle(oslSecurity Security)
-{
-    if (Security)
-        free ((oslSecurityImpl*)Security);
-}
-
-
-sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security)
-{
-    return sal_False;
-}
-
-void SAL_CALL osl_unloadUserProfile(oslSecurity Security)
-{
-    return;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/semaphor.c b/sal/osl/os2/semaphor.c
deleted file mode 100644
index 65373a970..000000000
--- a/sal/osl/os2/semaphor.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-
-#include <osl/diagnose.h>
-#include <osl/semaphor.h>
-
-/*
-    Implemetation notes:
-    The void* represented by oslSemaphore is used
-    to store a OS/2 HANDLE.
-*/
-
-typedef struct _oslSemaphoreImpl
-{
-    HEV hevReachedZero;
-    int nCount;
-} oslSemaphoreImpl;
-
-// static mutex to control access to private members of oslMutexImpl
-static HMTX MutexLock = NULL;
-
-/*****************************************************************************/
-/* osl_createSemaphore */
-/*****************************************************************************/
-
-/*
-- Erzeugen der Semaphore
-- Z„hler auf initialCount setzen
-*/
-oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
-{
-    APIRET rc;
-    oslSemaphoreImpl * pSemaphoreImpl;
-
-    /* alloc mem. for our internal data structure */
-    pSemaphoreImpl = (oslSemaphoreImpl *) malloc(sizeof(oslSemaphoreImpl));
-    if( pSemaphoreImpl == NULL )
-        return NULL;
-
-    /* create semaphore */
-    rc = DosCreateEventSem( NULL,
-                            &pSemaphoreImpl->hevReachedZero,
-                            DC_SEM_SHARED,
-                            FALSE );
-    if( rc != NO_ERROR )
-    {
-        free( pSemaphoreImpl );
-        return NULL;
-    }
-
-    pSemaphoreImpl->nCount = initialCount;
-
-    // create static mutex for private members
-    if (MutexLock == NULL)
-        DosCreateMutexSem( NULL, &MutexLock, 0, FALSE );
-
-    return (oslSemaphore) pSemaphoreImpl;
-}
-
-/*****************************************************************************/
-/* osl_destroySemaphore */
-/*****************************************************************************/
-
-/*
-- Semaphore l”schen
-*/
-
-void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore)
-{
-    oslSemaphoreImpl* pSemaphoreImpl = (oslSemaphoreImpl*)Semaphore;
-    OSL_ASSERT(Semaphore != 0);
-
-    DosCloseEventSem( pSemaphoreImpl->hevReachedZero );
-
-    free( pSemaphoreImpl );
-}
-
-/*****************************************************************************/
-/* osl_acquireSemaphore */
-/*****************************************************************************/
-/*
-- Z„hler -1
-- wenn Z„hler < 0: blockieren
-*/
-
-sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore)
-{
-    APIRET rc;
-    oslSemaphoreImpl* pSemaphoreImpl = (oslSemaphoreImpl*)Semaphore;
-    int nCount;
-    OSL_ASSERT(Semaphore != 0);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-    while( pSemaphoreImpl->nCount < 1 )
-    {
-        sal_uInt32 nPostCount;
-
-        DosReleaseMutexSem( MutexLock);
-
-        rc = DosWaitEventSem(pSemaphoreImpl->hevReachedZero, SEM_INDEFINITE_WAIT );
-        DosResetEventSem(pSemaphoreImpl->hevReachedZero, &nPostCount);
-
-        DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    }
-
-    pSemaphoreImpl->nCount--;
-    DosReleaseMutexSem( MutexLock);
-
-    return( rc == NO_ERROR );
-}
-
-/*****************************************************************************/
-/* osl_tryToAcquireSemaphore */
-/*****************************************************************************/
-/*
-- Z„hler -1, wenn vorher > 0
-- wenn Z„hler < 0: mit FALSE zurueck
-*/
-sal_Bool SAL_CALL osl_tryToAcquireSemaphore(oslSemaphore Semaphore)
-{
-    APIRET rc;
-    oslSemaphoreImpl* pSemaphoreImpl = (oslSemaphoreImpl*)Semaphore;
-    int nCount;
-    OSL_ASSERT(Semaphore != 0);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-    nCount = pSemaphoreImpl->nCount;
-    if( pSemaphoreImpl->nCount > 0 )
-        pSemaphoreImpl->nCount--;
-
-    DosReleaseMutexSem( MutexLock);
-
-    return( nCount > 0 );
-}
-
-/*****************************************************************************/
-/* osl_releaseSemaphore */
-/*****************************************************************************/
-/*
-- Z„hler +1
-*/
-sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore)
-{
-    APIRET rc;
-    oslSemaphoreImpl* pSemaphoreImpl = (oslSemaphoreImpl*)Semaphore;
-    int nCount;
-    OSL_ASSERT(Semaphore != 0);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-    nCount = pSemaphoreImpl->nCount;
-    pSemaphoreImpl->nCount++;
-
-    DosReleaseMutexSem( MutexLock);
-
-    if( nCount == 0 )
-        DosPostEventSem(pSemaphoreImpl->hevReachedZero);
-
-    return( rc == NO_ERROR );
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/signal.c b/sal/osl/os2/signal.c
deleted file mode 100644
index 22ddf7433..000000000
--- a/sal/osl/os2/signal.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-/* system headers */
-#include "system.h"
-
-#include <osl/diagnose.h>
-#include <osl/mutex.h>
-#include <osl/signal.h>
-
-typedef struct _oslSignalHandlerImpl
-{
-    oslSignalHandlerFunction      Handler;
-    void*			        	  pData;
-    struct _oslSignalHandlerImpl* pNext;
-} oslSignalHandlerImpl;
-
-static sal_Bool				  bErrorReportingEnabled = sal_True;
-static sal_Bool  			  bInitSignal = sal_False;
-static oslMutex 			  SignalListMutex;
-static oslSignalHandlerImpl*  SignalList;
-
-/*static*//* ULONG _Export APIENTRY SignalHandlerFunction(PEXCEPTIONREPORTRECORD pERepRec,
-                                            PEXCEPTIONREGISTRATIONRECORD,
-                                            PCONTEXTRECORD, PVOID);
-*/
-/*static*/ ULONG __declspec(dllexport) APIENTRY SignalHandlerFunction(PEXCEPTIONREPORTRECORD pERepRec,
-                                            PEXCEPTIONREGISTRATIONRECORD,
-                                            PCONTEXTRECORD, PVOID);
-static EXCEPTIONREGISTRATIONRECORD ExcptHandler = { 0, SignalHandlerFunction };
-
-static sal_Bool InitSignal( void )
-{
-    SignalListMutex = osl_createMutex();
-
-    ExcptHandler.ExceptionHandler = (_ERR *) &SignalHandlerFunction;
-    /* DosSetExceptionHandler(&ExcptHandler); */
-
-    return sal_True;
-}
-
-static sal_Bool DeInitSignal( void )
-{
-    /* DosUnsetExceptionHandler(&ExcptHandler); */
-
-    osl_destroyMutex(SignalListMutex);
-
-    return sal_False;
-}
-
-static oslSignalAction CallSignalHandler(oslSignalInfo *pInfo)
-{
-    oslSignalHandlerImpl* pHandler = SignalList;
-    oslSignalAction Action = osl_Signal_ActCallNextHdl;
-
-    while (pHandler != NULL)
-    {
-        if ((Action = pHandler->Handler(pHandler->pData, pInfo)) != osl_Signal_ActCallNextHdl)
-            break;
-
-        pHandler = pHandler->pNext;
-    }
-
-    return Action;
-}
-
-/*****************************************************************************/
-/* SignalHandlerFunction	*/
-/*****************************************************************************/
-/*static*/ ULONG __declspec(dllexport) APIENTRY SignalHandlerFunction(PEXCEPTIONREPORTRECORD pERepRec,
-                                            PEXCEPTIONREGISTRATIONRECORD pERegRec,
-                                            PCONTEXTRECORD pConRec, PVOID pReserved)
-{
-    oslSignalInfo	 Info;
-
-    Info.UserSignal = pERepRec->ExceptionNum;
-    Info.UserData   = NULL;
-
-    switch (pERepRec->ExceptionNum)
-    {
-        case XCPT_ACCESS_VIOLATION:
-            Info.Signal = osl_Signal_AccessViolation;
-            break;
-
-        case XCPT_INTEGER_DIVIDE_BY_ZERO:
-            Info.Signal = osl_Signal_IntegerDivideByZero;
-            break;
-
-        case XCPT_BREAKPOINT: 
-            Info.Signal = osl_Signal_DebugBreak;
-            break; 
-
-        default:
-            Info.Signal = osl_Signal_System;
-            break;
-    }
-
-    switch (CallSignalHandler(&Info))
-    {
-        case osl_Signal_ActCallNextHdl:
-            return (XCPT_CONTINUE_SEARCH);
-
-        case osl_Signal_ActAbortApp:
-            return (XCPT_CONTINUE_SEARCH);
-
-        case osl_Signal_ActKillApp:
-            exit(255);
-            break;
-    }
-
-    return (XCPT_CONTINUE_SEARCH);
-}
-
-/*****************************************************************************/
-/* osl_addSignalHandler */
-/*****************************************************************************/
-oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction Handler, void* pData)
-{
-    oslSignalHandlerImpl* pHandler;
-
-    OSL_ASSERT(Handler != NULL);
-
-    if (! bInitSignal)
-        bInitSignal = InitSignal();
-
-    pHandler = (oslSignalHandlerImpl*) calloc(1, sizeof(oslSignalHandlerImpl));
-
-    if (pHandler != NULL)
-    {
-        pHandler->Handler = Handler;
-        pHandler->pData   = pData;
-
-        osl_acquireMutex(SignalListMutex);
-
-        pHandler->pNext = SignalList;
-        SignalList      = pHandler;
-
-        osl_releaseMutex(SignalListMutex);
-
-        return (pHandler);
-    }
-
-    return (NULL);
-}
-
-/*****************************************************************************/
-/* osl_removeSignalHandler */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler)
-{
-    oslSignalHandlerImpl *pHandler, *pPrevious = NULL;
-
-    OSL_ASSERT(Handler != NULL);
-
-    if (! bInitSignal)
-        bInitSignal = InitSignal();
-
-    osl_acquireMutex(SignalListMutex);
-
-    pHandler = SignalList;
-
-    while (pHandler != NULL)
-    {
-        if (pHandler == Handler)
-        {
-            if (pPrevious)
-                pPrevious->pNext = pHandler->pNext;
-            else
-                SignalList = pHandler->pNext;
-
-            osl_releaseMutex(SignalListMutex);
-
-            if (SignalList == NULL )
-                bInitSignal = DeInitSignal();
-
-            free(pHandler);
-
-            return (sal_True);
-        }
-
-        pPrevious = pHandler;
-        pHandler  = pHandler->pNext;
-    }
-
-    osl_releaseMutex(SignalListMutex);
-
-    return (sal_False);
-}
-
-/*****************************************************************************/
-/* osl_raiseSignal */
-/*****************************************************************************/
-oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData)
-{
-    oslSignalInfo   Info;
-    oslSignalAction Action;
-
-    if (! bInitSignal)
-        bInitSignal = InitSignal();
-
-    osl_acquireMutex(SignalListMutex);
-
-    Info.Signal     = osl_Signal_User;
-    Info.UserSignal = UserSignal;
-    Info.UserData   = UserData;
-
-    Action = CallSignalHandler(&Info);
-
-    osl_releaseMutex(SignalListMutex);
-
-    return (Action);
-}
-
-/*****************************************************************************/
-/* osl_setErrorReporting */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable )
-{
-    sal_Bool bOld = bErrorReportingEnabled;
-    bErrorReportingEnabled = bEnable;
-
-    return bOld;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/socket.c b/sal/osl/os2/socket.c
deleted file mode 100644
index fd00d18de..000000000
--- a/sal/osl/os2/socket.c
+++ /dev/null
@@ -1,2851 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-
-#include <osl/socket.h>
-#include <osl/diagnose.h>
-#include <osl/mutex.h>
-#include <osl/signal.h>
-
-#include <rtl/alloc.h>
-
-#include <ctype.h>
-#include <sal/types.h>
-
-#include "sockimpl.h"
-
-
-/* defines for poll */
-#ifdef HAVE_POLL_H
-#undef HAVE_POLL_H
-#endif
-
-#if defined(LINUX) || defined(NETBSD) || defined ( FREEBSD ) || defined (MACOSX)
-#include <sys/poll.h>
-#define HAVE_POLL_H
-#endif /* HAVE_POLL_H */
-
-#if defined(SOLARIS)
-#include <poll.h>
-#define HAVE_POLL_H
-#endif /* SOLARIS */
-
-#ifndef HAVE_POLL_H
-#define POLLIN  0x0001
-#define POLLOUT 0x0002
-#define POLLPRI 0x0004
-#endif /* HAVE_POLL_H */
-
-
-/* defines for shutdown */
-#define SD_RECEIVE 0
-#define SD_SEND 1
-#define SD_BOTH 2
-
-
-/*
-    oslSocketAddr is a pointer to a Berkeley struct sockaddr.
-    I refrained from using sockaddr_in because of possible further
-    extensions of this socket-interface (IP-NG?).
-    The intention was to hide all Berkeley data-structures from
-    direct access past the osl-interface.
-
-    The current implementation is internet (IP) centered. All
-    the constructor-functions (osl_create...) take parameters
-    that will probably make sense only in the IP-environment
-    (e.g. because of using the dotted-address-format).
-
-    If the interface will be extended to host other protocol-
-    families, I expect no externally visible changes in the
-    existing functions. You'll probably need only new
-    constructor-functions who take the different address
-    formats into consideration (maybe a long dotted address
-    or whatever).
-*/
-
-/* _Note_ that I rely on the fact that oslSocketAddr and struct sockaddr */
-/* are the same! I don't like it very much but see no other easy way to  */
-/* conceal the struct sockaddr from the eyes of the user. */
-
-
-#define OSL_INVALID_SOCKET		-1
-#define OSL_SOCKET_ERROR		-1
-
-
-/* Buffer size for gethostbyname */
-#define MAX_HOSTBUFFER_SIZE 2048
-
-/*****************************************************************************/
-/* enum oslAddrFamily */
-/*****************************************************************************/
-
-/* map */
-static unsigned long FamilyMap[]= {
-    AF_INET,					/* osl_Socket_FamilyInet    */
-    AF_IPX,						/* osl_Socket_FamilyIpx     */
-    0							/* osl_Socket_FamilyInvalid */
-};
-
-/* reverse map */
-static oslAddrFamily osl_AddrFamilyFromNative(sal_uInt32 nativeType)
-{
-    oslAddrFamily i= (oslAddrFamily)0;
-
-    while(i != osl_Socket_FamilyInvalid)
-    {
-        if(FamilyMap[i] == nativeType)
-            return i;
-        i = (oslAddrFamily) ( i + 1 );
-    }
-
-    return i;
-}
-
-/* macros */
-#define FAMILY_FROM_NATIVE(y) osl_AddrFamilyFromNative(y)
-#define FAMILY_TO_NATIVE(x)	(short)FamilyMap[x]
-
-/*****************************************************************************/
-/* enum oslProtocol */
-/*****************************************************************************/
-
-/* map */
-static sal_uInt32 ProtocolMap[]= {
-    0,							/* osl_Socket_ProtocolIp	  */
-    NSPROTO_IPX,				/* osl_Socket_ProtocolIpx	  */
-    NSPROTO_SPX,				/* osl_Socket_ProtocolSpx	  */
-    NSPROTO_SPXII,				/* osl_Socket_ProtocolSpxII   */
-    0							/* osl_Socket_ProtocolInvalid */
-};
-
-/* reverse map */
-/* mfe: NOT USED
-static oslProtocol osl_ProtocolFromNative(sal_uInt32 nativeType)
-{
-    oslProtocol i= (oslProtocol)0;
-
-    while(i != osl_Socket_ProtocolInvalid)
-    {
-        if(ProtocolMap[i] == nativeType)
-            return i;
-        i = (oslProtocol) ( i + 1);
-    }
-
-    return i;
-}
-*/
-
-/* macros */
-#define PROTOCOL_FROM_NATIVE(y) osl_ProtocolFromNative(y)
-#define PROTOCOL_TO_NATIVE(x)	ProtocolMap[x]
-
-
-/*****************************************************************************/
-/* enum oslSocketType */
-/*****************************************************************************/
-
-/* map */
-static sal_uInt32 TypeMap[]= {
-    SOCK_STREAM,				/* osl_Socket_TypeStream    */
-    SOCK_DGRAM,					/* osl_Socket_TypeDgram     */
-    SOCK_RAW,					/* osl_Socket_TypeRaw       */
-    SOCK_RDM,					/* osl_Socket_TypeRdm       */
-    SOCK_SEQPACKET,				/* osl_Socket_TypeSeqPacket */
-    0							/* osl_Socket_TypeInvalid   */
-};
-
-/* reverse map */
-static oslSocketType osl_SocketTypeFromNative(sal_uInt32 nativeType)
-{
-    oslSocketType i= (oslSocketType)0;
-
-    while(i != osl_Socket_TypeInvalid)
-    {
-        if(TypeMap[i] == nativeType)
-            return i;
-        i = (oslSocketType)(i + 1);
-    }
-
-    return i;
-}
-
-/* macros */
-#define TYPE_TO_NATIVE(x)		TypeMap[x]
-#define TYPE_FROM_NATIVE(y)		osl_SocketTypeFromNative(y)
-
-
-/*****************************************************************************/
-/* enum oslSocketOption */
-/*****************************************************************************/
-
-/* map */
-static sal_uInt32 OptionMap[]= {
-    SO_DEBUG,					/* osl_Socket_OptionDebug 		*/
-    SO_ACCEPTCONN,				/* osl_Socket_OptionAcceptConn  */
-    SO_REUSEADDR,				/* osl_Socket_OptionReuseAddr   */
-    SO_KEEPALIVE,				/* osl_Socket_OptionKeepAlive   */
-    SO_DONTROUTE,				/* osl_Socket_OptionDontRoute   */
-    SO_BROADCAST,				/* osl_Socket_OptionBroadcast   */
-    SO_USELOOPBACK,				/* osl_Socket_OptionUseLoopback */
-    SO_LINGER,					/* osl_Socket_OptionLinger		*/
-    SO_OOBINLINE,				/* osl_Socket_OptionOOBinLine   */
-    SO_SNDBUF,					/* osl_Socket_OptionSndBuf      */
-    SO_RCVBUF,					/* osl_Socket_OptionRcvBuf      */
-    SO_SNDLOWAT,				/* osl_Socket_OptionSndLowat    */
-    SO_RCVLOWAT,				/* osl_Socket_OptionRcvLowat    */
-    SO_SNDTIMEO,				/* osl_Socket_OptionSndTimeo    */
-    SO_RCVTIMEO,				/* osl_Socket_OptionRcvTimeo    */
-    SO_ERROR,					/* osl_Socket_OptionError       */
-    SO_TYPE,					/* osl_Socket_OptionType        */
-    TCP_NODELAY,				/* osl_Socket_OptionTcpNoDelay  */
-    0							/* osl_Socket_OptionInvalid     */
-};
-
-/* reverse map */
-/* mfe: NOT USED
-static oslSocketOption osl_SocketOptionFromNative(sal_uInt32 nativeType)
-{
-    oslSocketOption i= (oslSocketOption)0;
-
-    while(i != osl_Socket_OptionInvalid)
-    {
-        if(OptionMap[i] == nativeType)
-            return i;
-        i = (oslSocketOption) ( i + 1 );
-    }
-
-    return i;
-}
-*/
-/* macros */
-#define OPTION_TO_NATIVE(x)		OptionMap[x]
-#define OPTION_FROM_NATIVE(y)		osl_SocketOptionFromNative(y)
-
-
-/*****************************************************************************/
-/* enum oslSocketOptionLevel */
-/*****************************************************************************/
-
-static sal_uInt32 OptionLevelMap[]= {
-    SOL_SOCKET,					/* osl_Socket_LevelSocket  */
-    IPPROTO_TCP,				/* osl_Socket_LevelTcp     */
-    0							/* osl_Socket_LevelInvalid */
-};
-
-/* reverse map */
-/* mfe: NOT USED
-static oslSocketOptionLevel osl_SocketOptionLevelFromNative(sal_uInt32 nativeType)
-{
-    oslSocketOptionLevel i= (oslSocketOptionLevel)0;
-
-    while(i != osl_Socket_LevelInvalid)
-    {
-        if(OptionLevelMap[i] == nativeType)
-            return i;
-        i = (oslSocketOptionLevel) ( i + 1 );
-    }
-
-    return i;
-}
-*/
-/* macros */
-#define OPTION_LEVEL_TO_NATIVE(x)		OptionLevelMap[x]
-#define OPTION_LEVEL_FROM_NATIVE(y)		osl_SocketOptionLevelFromNative(y)
-
-/*****************************************************************************/
-/* enum oslSocketMsgFlag */
-/*****************************************************************************/
-
-static sal_uInt32 SocketMsgFlagMap[]= {
-    0,							/* osl_Socket_MsgNormal    */
-    MSG_OOB,					/* osl_Socket_MsgOOB       */
-    MSG_PEEK,					/* osl_Socket_MsgPeek      */
-    MSG_DONTROUTE,				/* osl_Socket_MsgDontRoute */
-    MSG_MAXIOVLEN,				/* osl_Socket_MsgMaxIOVLen */
-    0							/* osl_Socket_MsgInvalid   */
-};
-
-/* reverse map */
-/* mfe: NOT USED
-static oslSocketMsgFlag osl_SocketMsgFlagFromNative(sal_uInt32 nativeType)
-{
-    oslSocketMsgFlag i= (oslSocketMsgFlag)0;
-
-    while(i != osl_Socket_MsgInvalid)
-    {
-        if(SocketMsgFlagMap[i] == nativeType)
-            return i;
-        i = (oslSocketMsgFlag) ( i + 1 );
-    }
-
-    return i;
-}
-*/
-
-/* macros */
-#define MSG_FLAG_TO_NATIVE(x)		SocketMsgFlagMap[x]
-#define MSG_FLAG_FROM_NATIVE(y)		osl_SocketMsgFlagFromNative(y)
-
-
-/*****************************************************************************/
-/* enum oslSocketDirection */
-/*****************************************************************************/
-
-static sal_uInt32 SocketDirection[]= {
-    SD_RECEIVE,					/* osl_Socket_DirRead      */
-    SD_SEND,					/* osl_Socket_DirWrite     */
-    SD_BOTH,					/* osl_Socket_DirReadWrite */
-    0							/* osl_Socket_DirInvalid   */
-};
-
-/* reverse map */
-/* mfe: NOT USED
-static oslSocketDirection osl_SocketDirectionFromNative(sal_uInt32 nativeType)
-{
-    oslSocketDirection i= (oslSocketDirection)0;
-
-    while(i != osl_Socket_DirInvalid)
-    {
-        if(SocketDirection[i] == nativeType)
-            return i;
-        i = (oslSocketDirection) ( i + 1 );
-    }
-
-    return i;
-}
-*/
-
-/* macros */
-#define DIRECTION_TO_NATIVE(x)		SocketDirection[x]
-#define DIRECTION_FROM_NATIVE(y)	osl_SocketDirectionFromNative(y)
-
-/*****************************************************************************/
-/* enum oslSocketError */
-/*****************************************************************************/
-
-static struct
-{
-    int            errcode;
-    oslSocketError error;
-} SocketError[]= {
-    { 0,			   osl_Socket_E_None 			  }, /* no error */
-    { ENOTSOCK,		   osl_Socket_E_NotSocket 		  }, /* Socket operation on non-socket */
-    { EDESTADDRREQ,	   osl_Socket_E_DestAddrReq 	  }, /* Destination address required */
-    { EMSGSIZE,		   osl_Socket_E_MsgSize 		  }, /* Message too long */
-    { EPROTOTYPE,	   osl_Socket_E_Prototype 		  }, /* Protocol wrong type for socket */
-    { ENOPROTOOPT,	   osl_Socket_E_NoProtocol 		  }, /* Protocol not available */
-    { EPROTONOSUPPORT, osl_Socket_E_ProtocolNoSupport }, /* Protocol not supported */
-    { ESOCKTNOSUPPORT, osl_Socket_E_TypeNoSupport 	  }, /* Socket type not supported */
-    { EOPNOTSUPP,	   osl_Socket_E_OpNotSupport 	  }, /* Operation not supported on socket */
-    { EPFNOSUPPORT,	   osl_Socket_E_PfNoSupport 	  }, /* Protocol family not supported */
-    { EAFNOSUPPORT,	   osl_Socket_E_AfNoSupport 	  }, /* Address family not supported by */
-                                                            /* protocol family */
-    { EADDRINUSE,	   osl_Socket_E_AddrInUse 		  }, /* Address already in use */
-    { EADDRNOTAVAIL,   osl_Socket_E_AddrNotAvail 	  }, /* Can't assign requested address */
-    { ENETDOWN,		   osl_Socket_E_NetDown 		  }, /* Network is down */
-    { ENETUNREACH,	   osl_Socket_E_NetUnreachable    }, /* Network is unreachable */
-    { ENETRESET,	   osl_Socket_E_NetReset 		  }, /* Network dropped connection because */
-                                                             /* of reset */
-    { ECONNABORTED,	   osl_Socket_E_ConnAborted 	  }, /* Software caused connection abort */
-    { ECONNRESET,	   osl_Socket_E_ConnReset 		  }, /* Connection reset by peer */
-    { ENOBUFS,		   osl_Socket_E_NoBufferSpace 	  }, /* No buffer space available */
-    { EISCONN,		   osl_Socket_E_IsConnected 	  }, /* Socket is already connected */
-    { ENOTCONN,		   osl_Socket_E_NotConnected 	  }, /* Socket is not connected */
-    { ESHUTDOWN,	   osl_Socket_E_Shutdown 		  }, /* Can't send after socket shutdown */
-    { ETOOMANYREFS,	   osl_Socket_E_TooManyRefs 	  }, /* Too many references: can't splice */
-    { ETIMEDOUT,	   osl_Socket_E_TimedOut 		  }, /* Connection timed out */
-    { ECONNREFUSED,	   osl_Socket_E_ConnRefused 	  }, /* Connection refused */
-    { EHOSTDOWN,	   osl_Socket_E_HostDown 		  }, /* Host is down */
-    { EHOSTUNREACH,	   osl_Socket_E_HostUnreachable   }, /* No route to host */
-    { EWOULDBLOCK,	   osl_Socket_E_WouldBlock 		  }, /* call would block on non-blocking socket */
-    { EALREADY,		   osl_Socket_E_Already 		  }, /* operation already in progress */
-    { EINPROGRESS,	   osl_Socket_E_InProgress 		  }, /* operation now in progress */
-    { EAGAIN,		   osl_Socket_E_WouldBlock 		  }, /* same as EWOULDBLOCK */
-    { -1,		   	   osl_Socket_E_InvalidError      }
-};
-
-/* map */
-/* mfe: NOT USED
-static int osl_NativeFromSocketError(oslSocketError errorCode)
-{
-    int i = 0;
-
-    while ((SocketError[i].error != osl_Socket_E_InvalidError) &&
-           (SocketError[i].error != errorCode)) i++;
-
-    return SocketError[i].errcode;
-}
-*/
-
-/* reverse map */
-static oslSocketError osl_SocketErrorFromNative(int nativeType)
-{
-    int i = 0;
-
-    while ((SocketError[i].error != osl_Socket_E_InvalidError) &&
-           (SocketError[i].errcode != nativeType)) i++;
-
-    return SocketError[i].error;
-}
-
-/* macros */
-#define ERROR_TO_NATIVE(x)		osl_NativeFromSocketError(x)
-#define ERROR_FROM_NATIVE(y)	osl_SocketErrorFromNative(y)
-
-/*****************************************************************************/
-/* local function prototypes */
-/*****************************************************************************/
-
-oslSocketAddr SAL_CALL osl_psz_createInetSocketAddr (
-    const sal_Char* pszDottedAddr, sal_Int32 Port);
-
-oslSocketAddr SAL_CALL osl_psz_createIpxSocketAddr (
-    const sal_Char NetNumber[4],
-    const sal_Char NodeNumber[6],
-    sal_uInt32 SocketNumber);
-
-oslHostAddr SAL_CALL osl_psz_createHostAddr (
-    const sal_Char *pszHostname, const oslSocketAddr Addr);
-
-oslHostAddr SAL_CALL osl_psz_createHostAddrByName (
-    const sal_Char *pszHostname);
-
-const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr (
-    const oslHostAddr Addr);
-
-oslSocketResult SAL_CALL osl_psz_getLocalHostname (
-    sal_Char *pBuffer, sal_uInt32 nBufLen);
-
-oslSocketAddr SAL_CALL osl_psz_resolveHostname (
-    const sal_Char* pszHostname);
-
-sal_Int32 SAL_CALL osl_psz_getServicePort (
-    const sal_Char* pszServicename, const sal_Char* pszProtocol);
-
-oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr (
-    oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize);
-
-oslSocketResult	SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr (
-    oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize);
-
-void SAL_CALL osl_psz_getLastSocketErrorDescription (
-    oslSocket Socket, sal_Char* pBuffer, sal_uInt32 BufferSize);
-
-/*****************************************************************************/
-/* osl_create/destroy-SocketImpl */
-/*****************************************************************************/
-
-#if OSL_DEBUG_LEVEL > 1
-static sal_uInt32 g_nSocketImpl = 0;
-static sal_uInt32 g_nSocketAddr = 0;
-
-#endif /* OSL_DEBUG_LEVEL */
-
-
-oslSocket __osl_createSocketImpl(int Socket)
-{
-    oslSocket pSocket;
-
-    pSocket = (oslSocket)calloc(1, sizeof(struct oslSocketImpl));
-
-    pSocket->m_Socket = Socket;
-    pSocket->m_nLastError = 0;
-    pSocket->m_CloseCallback = 0;
-    pSocket->m_CallbackArg = 0;
-    pSocket->m_nRefCount = 1;
-
-#if defined(LINUX)
-    pSocket->m_bIsAccepting = sal_False;
-#endif
-
-#if OSL_DEBUG_LEVEL > 1
-    g_nSocketImpl ++;
-#endif
-    return pSocket;
-}
-
-void __osl_destroySocketImpl(oslSocket Socket)
-{
-    if ( Socket != NULL)
-        free((struct oslSocketImpl *) Socket);
-#if OSL_DEBUG_LEVEL > 1
-    g_nSocketImpl --;
-#endif
-}
-
-static oslSocketAddr __osl_createSocketAddr(  )
-{
-    oslSocketAddr pAddr = (oslSocketAddr) rtl_allocateZeroMemory( sizeof( struct oslSocketAddrImpl ));
-#if OSL_DEBUG_LEVEL > 1
-    g_nSocketAddr ++;
-#endif
-    return pAddr;
-}
-
-static oslSocketAddr __osl_createSocketAddrWithFamily(
-    oslAddrFamily family, sal_Int32 port, sal_uInt32 nAddr )
-{
-    oslSocketAddr pAddr;
-
-    OSL_ASSERT( family == osl_Socket_FamilyInet );
-
-    pAddr = __osl_createSocketAddr();
-    switch( family )
-    {
-    case osl_Socket_FamilyInet:
-    {
-        struct sockaddr_in* pInetAddr= (struct sockaddr_in*)&(pAddr->m_sockaddr);
-
-        pInetAddr->sin_family = FAMILY_TO_NATIVE(osl_Socket_FamilyInet);
-        pInetAddr->sin_addr.s_addr = nAddr;
-        pInetAddr->sin_port = (sal_uInt16)(port&0xffff);
-        break;
-       }
-    default:
-        pAddr->m_sockaddr.sa_family = FAMILY_TO_NATIVE(family);
-    }
-    return pAddr;
-}
-
-static oslSocketAddr __osl_createSocketAddrFromSystem( struct sockaddr *pSystemSockAddr )
-{
-    oslSocketAddr pAddr = __osl_createSocketAddr();
-    memcpy( &(pAddr->m_sockaddr), pSystemSockAddr, sizeof( struct sockaddr ) );
-    return pAddr;
-}
-
-static void __osl_destroySocketAddr( oslSocketAddr addr )
-{
-#if OSL_DEBUG_LEVEL > 1
-    g_nSocketAddr --;
-#endif
-    rtl_freeMemory( addr );
-}
-
-/*****************************************************************************/
-/* osl_createEmptySocketAddr */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_createEmptySocketAddr(oslAddrFamily Family)
-{
-    oslSocketAddr pAddr = 0;
-
-    /* is it an internet-Addr? */
-    if (Family == osl_Socket_FamilyInet)
-    {
-        pAddr = __osl_createSocketAddrWithFamily(Family, 0 , htonl(INADDR_ANY) );
-    }
-    else
-    {
-        pAddr = __osl_createSocketAddrWithFamily( Family , 0 , 0 );
-    }
-
-    return pAddr;
-}
-
-/*****************************************************************************/
-/* osl_copySocketAddr */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_copySocketAddr(oslSocketAddr Addr)
-{
-    oslSocketAddr pCopy = 0;
-    if (Addr)
-    {
-        pCopy = __osl_createSocketAddr();
-
-        if (pCopy)
-            memcpy(&(pCopy->m_sockaddr),&(Addr->m_sockaddr), sizeof(struct sockaddr));
-    }
-    return pCopy;
-}
-
-/*****************************************************************************/
-/* osl_isEqualSocketAddr */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isEqualSocketAddr (
-    oslSocketAddr Addr1,
-    oslSocketAddr Addr2)
-{
-    struct sockaddr* pAddr1= &(Addr1->m_sockaddr);
-    struct sockaddr* pAddr2= &(Addr2->m_sockaddr);
-
-    OSL_ASSERT(pAddr1);
-    OSL_ASSERT(pAddr2);
-
-    if (pAddr1->sa_family == pAddr2->sa_family)
-    {
-        switch (pAddr1->sa_family)
-        {
-            case AF_INET:
-            {
-                struct sockaddr_in* pInetAddr1= (struct sockaddr_in*)pAddr1;
-                struct sockaddr_in* pInetAddr2= (struct sockaddr_in*)pAddr2;
-
-                if ((pInetAddr1->sin_family == pInetAddr2->sin_family) &&
-                    (pInetAddr1->sin_addr.s_addr == pInetAddr2->sin_addr.s_addr) &&
-                    (pInetAddr1->sin_port == pInetAddr2->sin_port))
-                    return (sal_True);
-            }
-
-            default:
-            {
-                return (memcmp(pAddr1, Addr2, sizeof(struct sockaddr)) == 0);
-            }
-        }
-    }
-
-    return (sal_False);
-}
-
-/*****************************************************************************/
-/* osl_createInetBroadcastAddr */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_createInetBroadcastAddr (
-    rtl_uString *strDottedAddr,
-    sal_Int32    Port)
-{
-    sal_uInt32    nAddr = OSL_INADDR_NONE;
-    oslSocketAddr pAddr;
-
-    if (strDottedAddr && strDottedAddr->length)
-    {
-        /* Dotted host address for limited broadcast */
-        rtl_String *pDottedAddr = NULL;
-
-        rtl_uString2String (
-            &pDottedAddr, strDottedAddr->buffer, strDottedAddr->length,
-            RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
-
-        nAddr = inet_addr (pDottedAddr->buffer);
-        rtl_string_release (pDottedAddr);
-    }
-
-    if (nAddr != OSL_INADDR_NONE)
-    {
-        /* Limited broadcast */
-        nAddr = ntohl(nAddr);
-        if (IN_CLASSA(nAddr))
-        {
-            nAddr &= IN_CLASSA_NET;
-            nAddr |= IN_CLASSA_HOST;
-        }
-        else if (IN_CLASSB(nAddr))
-        {
-            nAddr &= IN_CLASSB_NET;
-            nAddr |= IN_CLASSB_HOST;
-        }
-        else if (IN_CLASSC(nAddr))
-        {
-            nAddr &= IN_CLASSC_NET;
-            nAddr |= IN_CLASSC_HOST;
-        }
-        else
-        {
-            /* No broadcast in class D */
-            return ((oslSocketAddr)NULL);
-        }
-        nAddr = htonl(nAddr);
-    }
-
-    pAddr = __osl_createSocketAddrWithFamily( osl_Socket_FamilyInet, htons(Port), nAddr );
-    return pAddr;
-}
-
-/*****************************************************************************/
-/* osl_createInetSocketAddr */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_createInetSocketAddr (
-    rtl_uString *ustrDottedAddr,
-    sal_Int32    Port)
-{
-    rtl_String* strDottedAddr=0;
-    oslSocketAddr Addr;
-    sal_Char* pszDottedAddr=0;
-
-    if ( ustrDottedAddr != 0 )
-    {
-        rtl_uString2String( &strDottedAddr,
-                            rtl_uString_getStr(ustrDottedAddr),
-                            rtl_uString_getLength(ustrDottedAddr),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS);
-        pszDottedAddr = rtl_string_getStr(strDottedAddr);
-    }
-
-
-    Addr = osl_psz_createInetSocketAddr(pszDottedAddr, Port);
-
-    if ( strDottedAddr != 0 )
-    {
-        rtl_string_release(strDottedAddr);
-    }
-
-    return Addr;
-}
-
-oslSocketAddr SAL_CALL osl_psz_createInetSocketAddr (
-    const sal_Char* pszDottedAddr,
-    sal_Int32       Port)
-{
-    oslSocketAddr pAddr = 0;
-    sal_Int32 Addr = inet_addr(pszDottedAddr);
-    if(Addr != -1)
-    {
-        /* valid dotted addr */
-        pAddr = __osl_createSocketAddrWithFamily( osl_Socket_FamilyInet, htons(Port) , Addr );
-    }
-    return pAddr;
-}
-
-/*****************************************************************************/
-/* osl_setAddrOfSocketAddr */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_setAddrOfSocketAddr( oslSocketAddr pAddr, sal_Sequence *pByteSeq )
-{
-    oslSocketResult res = osl_Socket_Error;
-
-    OSL_ASSERT( pAddr );
-    OSL_ASSERT( pByteSeq );
-
-    if( pAddr && pByteSeq )
-    {
-        struct sockaddr_in * pSystemInetAddr;
-
-        OSL_ASSERT( pAddr->m_sockaddr.sa_family == FAMILY_TO_NATIVE( osl_Socket_FamilyInet ) );
-        OSL_ASSERT( pByteSeq->nElements == 4 );
-
-        pSystemInetAddr = (struct sockaddr_in * ) &(pAddr->m_sockaddr);
-        memcpy( &(pSystemInetAddr->sin_addr) , pByteSeq->elements , 4 );
-        res = osl_Socket_Ok;
-    }
-    return res;
-}
-
-/*****************************************************************************/
-/* osl_getAddrOfSocketAddr */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_getAddrOfSocketAddr( oslSocketAddr pAddr, sal_Sequence **ppByteSeq )
-{
-    oslSocketResult res = osl_Socket_Error;
-
-    OSL_ASSERT( pAddr );
-    OSL_ASSERT( ppByteSeq );
-
-    if( pAddr && ppByteSeq )
-    {
-        struct sockaddr_in * pSystemInetAddr = (struct sockaddr_in * ) &(pAddr->m_sockaddr);
-        rtl_byte_sequence_constructFromArray( ppByteSeq , (sal_Int8 *) &(pSystemInetAddr->sin_addr),4);
-        res = osl_Socket_Ok;
-    }
-    return res;
-}
-
-
-/*****************************************************************************/
-/* _osl_getFullQualifiedDomainName */
-/*****************************************************************************/
-
-/** try to figure out a full-qualified hostname, by adding the current domain
-    as given by the domainname program to the given hostname.
-    This function MUST NOT call gethostbyname since pHostName allready points
-    to data returned by gethostname and would be garbled: use gethostname_r
-    instead!
- */
-
-/* wrap around different interfaces to reentrant gethostbyname */
-static struct hostent* _osl_gethostbyname_r (
-    const char *name, struct hostent *result,
-    char *buffer, int buflen, int *h_errnop)
-{
-
-#ifdef LINUX
-    struct hostent *__result; /* will be the same as result */
-    int __error;
-    __error = gethostbyname_r (name, result, buffer, buflen,
-                 &__result, h_errnop);
-    return __error ? NULL : __result ;
-#elif defined OS2
-    // YD FIXME!!!
-    return 0;
-#else
-    return gethostbyname_r( name, result, buffer, buflen, h_errnop);
-#endif
-}
-
-static sal_Bool  _osl_getDomainName (sal_Char *buffer, sal_Int32 bufsiz)
-{
-    sal_Bool result;
-    int      p[2];
-
-    result = sal_False;
-
-    return (result);
-}
-
-static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
-{
-#	define DOMAINNAME_LENGTH 512
-    sal_uInt32 			nLengthOfHostName;
-    static sal_uInt32 	nLengthOfDomainName = 0;
-    static sal_Char    *pDomainName = NULL;
-
-    sal_Char  *pFullQualifiedName;
-
-    /* get a '\0' terminated domainname */
-
-    /* read default domainname default from environment */
-    if (nLengthOfDomainName == 0)
-    {
-        sal_Char *pEnvDomain;
-
-        pEnvDomain = getenv ("STAR_OVERRIDE_DOMAINNAME");
-        if (pEnvDomain)
-        {
-            pDomainName = strdup (pEnvDomain);
-            nLengthOfDomainName = strlen (pDomainName);
-        }
-    }
-
-#if 1  /* NEW */
-    if (nLengthOfDomainName == 0)
-    {
-        sal_Char pDomainNameBuffer[ DOMAINNAME_LENGTH ];
-
-        pDomainNameBuffer[0] = '\0';
-
-        if (_osl_getDomainName (pDomainNameBuffer, DOMAINNAME_LENGTH))
-        {
-            pDomainName = strdup (pDomainNameBuffer);
-            nLengthOfDomainName = strlen (pDomainName);
-        }
-    }
-
-#endif /* NEW */
-
-    /* compose hostname and domainname */
-    nLengthOfHostName = strlen( pHostName );
-    pFullQualifiedName = (sal_Char*) malloc( (nLengthOfHostName + 1
-                            + nLengthOfDomainName + 1) * sizeof(sal_Char) );
-    memcpy( pFullQualifiedName, pHostName,
-        (nLengthOfHostName + 1) * sizeof(sal_Char) );
-
-    if ( nLengthOfDomainName > 0 )
-    {
-        /* fqdn = hostname + '.' + domainname + '\0' */
-        pFullQualifiedName[ nLengthOfHostName ] = '.';
-        memcpy( pFullQualifiedName + nLengthOfHostName + 1, pDomainName,
-            nLengthOfDomainName + 1 );
-    }
-
-    /* check whether full-qualified name and hostname point to the same host
-     * should almost always be true */
-    if ( nLengthOfDomainName > 0 )
-    {
-        struct hostent *pQualifiedHostByName;
-        struct hostent *pHostByName;
-        sal_Bool        bHostsAreEqual;
-
-        /* buffer for calls to reentrant version of gethostbyname */
-        struct hostent 	aHostByName, aQualifiedHostByName;
-        sal_Char		pHostBuffer[ MAX_HOSTBUFFER_SIZE ];
-        sal_Char        pQualifiedHostBuffer[ MAX_HOSTBUFFER_SIZE ];
-        int		nErrorNo;
-
-        pHostBuffer[0] = '\0';
-        pQualifiedHostBuffer[0] = '\0';
-
-        /* get list of addresses */
-        pQualifiedHostByName = _osl_gethostbyname_r (
-            pFullQualifiedName,
-            &aQualifiedHostByName, pQualifiedHostBuffer,
-            sizeof(pQualifiedHostBuffer), &nErrorNo );
-        pHostByName = _osl_gethostbyname_r (
-            pHostName,
-            &aHostByName, pHostBuffer,
-            sizeof(pHostBuffer), &nErrorNo );
-
-        /* compare addresses */
-        bHostsAreEqual = sal_False;
-        if ( pQualifiedHostByName && pHostByName )
-        {
-            sal_Char **p, **q;
-            struct in_addr in;
-
-            /* lists are expected to be (very) short */
-            for ( p = pQualifiedHostByName->h_addr_list; *p != NULL; p++ )
-            {
-                for ( q = pHostByName->h_addr_list; *q != NULL; q++ )
-                {
-                    /* in.s_addr may be in_addr_t or uint32_t or heaven knows */
-                    if ( memcmp( *p, *q, sizeof(in.s_addr) ) == 0 )
-                    {
-                        bHostsAreEqual = sal_True;
-                        break;
-                    }
-                }
-                if ( bHostsAreEqual )
-                    break;
-            }
-        }
-
-        /* very strange case, but have to believe it: reduce the
-         * full qualified name to the unqualified host name */
-        if ( !bHostsAreEqual )
-        {
-            sal_Char *pTmp;
-
-            OSL_TRACE("_osl_getFullQualifiedDomainName: "
-                      "suspect FQDN: %s\n", pFullQualifiedName);
-            pFullQualifiedName[ nLengthOfHostName ] = '\0';
-            pTmp = (sal_Char*)realloc ( pFullQualifiedName,
-                                (nLengthOfHostName + 1) * sizeof( sal_Char ));
-            if (pTmp)
-                pFullQualifiedName = pTmp;
-        }
-    }
-
-    /* always return a hostname looked up as carefully as possible
-     * this string must be freed by the caller */
-    return pFullQualifiedName;
-}
-
-/*****************************************************************************/
-/* _osl_isFullQualifiedDomainName */
-/*****************************************************************************/
-static sal_Bool _osl_isFullQualifiedDomainName (const sal_Char *pHostName)
-{
-    /* a FQDN (aka 'hostname.domain.top_level_domain' )
-     * is a name which contains a dot '.' in it ( would
-     * match as well for 'hostname.' but is good enough
-     * for now )*/
-    return (sal_Bool)( strchr( pHostName, (int)'.' ) != NULL );
-}
-
-/*****************************************************************************/
-/* oslHostAddr */
-/*****************************************************************************/
-struct oslHostAddrImpl
-{
-    sal_Char        *pHostName;
-    oslSocketAddr   pSockAddr;
-};
-
-static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he)
-{
-    oslHostAddr pAddr= NULL;
-    oslSocketAddr pSockAddr = 0;
-
-
-    if ((he == NULL) || (he->h_name == NULL) || (he->h_addr_list[0] == NULL))
-        return ((oslHostAddr)NULL);
-
-    //YD 18/06/2006 win32 does this with unicode, see socket.cxx
-    sal_Char        *cn;
-    cn= (sal_Char *)malloc(strlen (he->h_name) + 1);
-    OSL_ASSERT(cn);
-    if (cn == NULL)
-        return ((oslHostAddr)NULL);
-
-    strcpy(cn, he->h_name);
-
-    pSockAddr = __osl_createSocketAddr();
-    OSL_ASSERT(pSockAddr);
-    if (pSockAddr == NULL)
-    {
-        free(cn);
-        return ((oslHostAddr)NULL);
-    }
-
-    pSockAddr->m_sockaddr.sa_family= he->h_addrtype;
-    if (pSockAddr->m_sockaddr.sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
-    {
-        struct sockaddr_in *sin= (struct sockaddr_in *)&(pSockAddr->m_sockaddr);
-        memcpy (
-            &(sin->sin_addr.s_addr),
-            he->h_addr_list[0],
-            he->h_length);
-    }
-    else
-    {
-        /* unknown address family */
-        /* future extensions for new families might be implemented here */
-
-        OSL_TRACE("_osl_hostentToHostAddr: unknown address family.\n");
-        OSL_ASSERT(sal_False);
-
-        __osl_destroySocketAddr( pSockAddr );
-        free (cn);
-        return ((oslHostAddr)NULL);
-    }
-
-    pAddr= (oslHostAddr) malloc(sizeof(struct oslHostAddrImpl));
-    OSL_ASSERT(pAddr);
-    if (pAddr == NULL)
-    {
-        __osl_destroySocketAddr( pSockAddr );
-        free (cn);
-        return ((oslHostAddr)NULL);
-    }
-
-    pAddr->pHostName= cn;
-    pAddr->pSockAddr= pSockAddr;
-
-    return pAddr;
-}
-
-/*****************************************************************************/
-/* osl_createHostAddr */
-/*****************************************************************************/
-oslHostAddr SAL_CALL osl_createHostAddr (
-    rtl_uString        *ustrHostname,
-    const oslSocketAddr Addr)
-{
-    oslHostAddr HostAddr;
-    rtl_String* strHostname=0;
-    sal_Char* pszHostName=0;
-
-    if ( ustrHostname != 0 )
-    {
-        rtl_uString2String( &strHostname,
-                            rtl_uString_getStr(ustrHostname),
-                            rtl_uString_getLength(ustrHostname),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-        pszHostName = rtl_string_getStr(strHostname);
-    }
-
-    HostAddr = osl_psz_createHostAddr(pszHostName,Addr);
-
-    if ( strHostname != 0 )
-    {
-        rtl_string_release(strHostname);
-    }
-
-
-    return HostAddr;
-}
-
-oslHostAddr SAL_CALL osl_psz_createHostAddr (
-    const sal_Char     *pszHostname,
-    const oslSocketAddr pAddr)
-{
-    oslHostAddr pHostAddr;
-    sal_Char            *cn;
-
-    OSL_ASSERT(pszHostname && pAddr);
-    if ((pszHostname == NULL) || (pAddr == NULL))
-        return ((oslHostAddr)NULL);
-
-    cn = (sal_Char *)malloc(strlen (pszHostname) + 1);
-    OSL_ASSERT(cn);
-    if (cn == NULL)
-        return ((oslHostAddr)NULL);
-
-    strcpy (cn, pszHostname);
-
-    pHostAddr= (oslHostAddr) malloc(sizeof(struct oslHostAddrImpl));
-    OSL_ASSERT(pHostAddr);
-    if (pAddr == NULL)
-    {
-        free (cn);
-        return ((oslHostAddr)NULL);
-    }
-
-    pHostAddr->pHostName= cn;
-    pHostAddr->pSockAddr= osl_copySocketAddr( pAddr );
-
-    return pHostAddr;
-}
-
-/*****************************************************************************/
-/* osl_createHostAddrByName */
-/*****************************************************************************/
-oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *ustrHostname)
-{
-    oslHostAddr HostAddr;
-    rtl_String* strHostname=0;
-    sal_Char* pszHostName=0;
-
-    if ( ustrHostname != 0 )
-    {
-        rtl_uString2String( &strHostname,
-                            rtl_uString_getStr(ustrHostname),
-                            rtl_uString_getLength(ustrHostname),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-        pszHostName=rtl_string_getStr(strHostname);
-    }
-
-    HostAddr = osl_psz_createHostAddrByName(pszHostName);
-
-    if ( strHostname != 0 )
-    {
-        rtl_string_release(strHostname);
-    }
-
-    return HostAddr;
-}
-
-oslHostAddr SAL_CALL osl_psz_createHostAddrByName (const sal_Char *pszHostname)
-{
-    struct hostent *he;
-        oslHostAddr	addr;
-
-    static oslMutex mutex = NULL;
-
-    if (mutex == NULL)
-        mutex = osl_createMutex();
-
-    osl_acquireMutex(mutex);
-
-    he = gethostbyname((sal_Char *)pszHostname);
-    addr = _osl_hostentToHostAddr (he);
-
-    osl_releaseMutex(mutex);
-
-    return addr;
-}
-
-/*****************************************************************************/
-/* osl_createHostAddrByAddr */
-/*****************************************************************************/
-oslHostAddr SAL_CALL osl_createHostAddrByAddr (const oslSocketAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-
-    if (pAddr == NULL)
-        return ((oslHostAddr)NULL);
-
-    if (pAddr->m_sockaddr.sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
-    {
-        const struct sockaddr_in *sin= (const struct sockaddr_in *)&(pAddr->m_sockaddr);
-        struct hostent *he;
-
-        if (sin->sin_addr.s_addr == htonl(INADDR_ANY))
-            return ((oslHostAddr)NULL);
-
-        he= gethostbyaddr((sal_Char *)&(sin->sin_addr),
-                          sizeof (sin->sin_addr),
-                          sin->sin_family);
-        return _osl_hostentToHostAddr (he);
-    }
-
-    return ((oslHostAddr)NULL);
-}
-
-/*****************************************************************************/
-/* osl_copyHostAddr */
-/*****************************************************************************/
-oslHostAddr SAL_CALL osl_copyHostAddr (const oslHostAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-
-    if (pAddr)
-        return osl_psz_createHostAddr (pAddr->pHostName, pAddr->pSockAddr);
-    else
-        return ((oslHostAddr)NULL);
-}
-
-/*****************************************************************************/
-/* osl_getHostnameOfHostAddr */
-/*****************************************************************************/
-void SAL_CALL osl_getHostnameOfHostAddr (
-    const oslHostAddr   Addr,
-    rtl_uString       **ustrHostname)
-{
-    const sal_Char* pHostname=0;
-
-    pHostname = osl_psz_getHostnameOfHostAddr(Addr);
-
-    rtl_uString_newFromAscii (ustrHostname, pHostname);
-
-    return;
-}
-
-const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-
-    if (pAddr)
-        return pAddr->pHostName;
-    else
-        return NULL;
-}
-
-/*****************************************************************************/
-/* osl_getSocketAddrOfHostAddr */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_getSocketAddrOfHostAddr (const oslHostAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-
-    if (pAddr)
-        return ((oslSocketAddr)(pAddr->pSockAddr));
-    else
-        return NULL;
-}
-
-/*****************************************************************************/
-/* osl_destroyHostAddr */
-/*****************************************************************************/
-void SAL_CALL osl_destroyHostAddr (oslHostAddr pAddr)
-{
-    if (pAddr)
-    {
-        if (pAddr->pHostName)
-            free (pAddr->pHostName);
-        if (pAddr->pSockAddr)
-            osl_destroySocketAddr (pAddr->pSockAddr);
-        free (pAddr);
-    }
-}
-
-/*****************************************************************************/
-/* osl_getLocalHostname */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_getLocalHostname(rtl_uString **ustrLocalHostname)
-{
-    oslSocketResult Result;
-    sal_Char pszHostname[1024];
-
-    pszHostname[0] = '\0';
-
-    Result = osl_psz_getLocalHostname(pszHostname,sizeof(pszHostname));
-
-    rtl_uString_newFromAscii(ustrLocalHostname,pszHostname);
-
-    return Result;
-}
-
-oslSocketResult SAL_CALL osl_psz_getLocalHostname (
-    sal_Char *pBuffer, sal_uInt32 nBufLen)
-{
-    static sal_Char LocalHostname[256] = "";
-
-    if (strlen(LocalHostname) == 0)
-    {
-        const sal_Char *pStr;
-
-#ifdef SYSV
-        struct utsname uts;
-
-        if (uname(&uts) < 0)
-            return osl_Socket_Error;
-
-        if ((strlen(uts.nodename) + 1) > nBufLen)
-            return osl_Socket_Error;
-
-        strncpy(LocalHostname, uts.nodename, sizeof( LocalHostname ));
-#else  /* BSD compatible */
-
-        if (gethostname(LocalHostname, sizeof(LocalHostname)-1) != 0)
-            return osl_Socket_Error;
-        LocalHostname[sizeof(LocalHostname)-1] = 0;
-#endif /* SYSV */
-
-        /* check if we have an FQDN */
-        if (strchr(LocalHostname, '.') == NULL)
-        {
-            oslHostAddr Addr;
-
-            /* no, determine it via dns */
-            Addr = osl_psz_createHostAddrByName(LocalHostname);
-
-            if (Addr && (pStr = osl_psz_getHostnameOfHostAddr(Addr)) != NULL)
-            {
-                strcpy(LocalHostname, pStr);
-            }
-            if (Addr)
-                osl_destroyHostAddr(Addr);
-        }
-    }
-
-    if (strlen(LocalHostname) > 0)
-    {
-        strncpy(pBuffer, LocalHostname, nBufLen);
-        pBuffer[nBufLen - 1] = '\0';
-
-        return osl_Socket_Ok;
-    }
-
-    return osl_Socket_Error;
-}
-
-/*****************************************************************************/
-/* osl_resolveHostname */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString *ustrHostname)
-{
-    oslSocketAddr Addr;
-    rtl_String* strHostname=0;
-    sal_Char* pszHostName=0;
-
-    if ( ustrHostname != 0 )
-    {
-        rtl_uString2String( &strHostname,
-                            rtl_uString_getStr(ustrHostname),
-                            rtl_uString_getLength(ustrHostname),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-        pszHostName = rtl_string_getStr(strHostname);
-    }
-
-
-    Addr = osl_psz_resolveHostname(pszHostName);
-
-    if ( strHostname != 0 )
-    {
-        rtl_string_release(strHostname);
-    }
-
-
-    return Addr;
-}
-
-
-oslSocketAddr SAL_CALL osl_psz_resolveHostname(const sal_Char* pszHostname)
-{
-    struct oslHostAddrImpl *pAddr = (oslHostAddr)osl_psz_createHostAddrByName(pszHostname);
-
-    if (pAddr)
-    {
-        oslSocketAddr SockAddr = osl_copySocketAddr(pAddr->pSockAddr);
-
-        osl_destroyHostAddr(pAddr);
-
-        return (SockAddr);
-    }
-
-    return ((oslSocketAddr)NULL);
-}
-
-/*****************************************************************************/
-/* osl_getServicePort */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString *ustrProtocol)
-{
-    sal_Int32 nPort;
-    rtl_String* strServicename=0;
-    rtl_String* strProtocol=0;
-    sal_Char* pszServiceName=0;
-    sal_Char* pszProtocol=0;
-
-    if ( ustrServicename != 0 )
-    {
-        rtl_uString2String( &strServicename,
-                            rtl_uString_getStr(ustrServicename),
-                            rtl_uString_getLength(ustrServicename),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-        pszServiceName = rtl_string_getStr(strServicename);
-    }
-
-    if ( ustrProtocol != 0 )
-    {
-        rtl_uString2String( &strProtocol,
-                            rtl_uString_getStr(ustrProtocol),
-                            rtl_uString_getLength(ustrProtocol),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-        pszProtocol = rtl_string_getStr(strProtocol);
-    }
-
-    nPort = osl_psz_getServicePort(pszServiceName,pszProtocol);
-
-    if ( strServicename != 0 )
-    {
-        rtl_string_release(strServicename);
-    }
-
-    if ( strProtocol != 0 )
-    {
-        rtl_string_release(strProtocol);
-    }
-
-
-    return nPort;
-}
-
-
-sal_Int32 SAL_CALL osl_psz_getServicePort(const sal_Char* pszServicename,
-                        const sal_Char* pszProtocol)
-{
-    struct servent* ps;
-
-    ps= getservbyname(pszServicename, pszProtocol);
-
-    if (ps != 0)
-        return ntohs(ps->s_port);
-
-    return OSL_INVALID_PORT;
-}
-
-/*****************************************************************************/
-/* osl_destroySocketAddr */
-/*****************************************************************************/
-void SAL_CALL osl_destroySocketAddr(oslSocketAddr pAddr)
-{
-    __osl_destroySocketAddr( pAddr );
-}
-
-/*****************************************************************************/
-/* osl_getFamilyOfSocketAddr */
-/*****************************************************************************/
-oslAddrFamily SAL_CALL osl_getFamilyOfSocketAddr(oslSocketAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-
-    if (pAddr)
-        return FAMILY_FROM_NATIVE(pAddr->m_sockaddr.sa_family);
-    else
-        return osl_Socket_FamilyInvalid;
-}
-
-/*****************************************************************************/
-/* osl_getInetPortOfSocketAddr */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_getInetPortOfSocketAddr(oslSocketAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-    if( pAddr )
-    {
-        struct sockaddr_in* pSystemInetAddr= (struct sockaddr_in*)&(pAddr->m_sockaddr);
-
-        if ( pSystemInetAddr->sin_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
-            return ntohs(pSystemInetAddr->sin_port);
-    }
-    return OSL_INVALID_PORT;
-}
-
-/*****************************************************************************/
-/* osl_setInetPortOfSocketAddr */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_setInetPortOfSocketAddr(oslSocketAddr pAddr, sal_Int32 Port)
-{
-    OSL_ASSERT(pAddr);
-    if( pAddr )
-    {
-        struct sockaddr_in* pSystemInetAddr= (struct sockaddr_in*)&(pAddr->m_sockaddr);
-        if ( pSystemInetAddr->sin_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
-        {
-            pSystemInetAddr->sin_port= htons((short)Port);
-            return sal_True;
-        }
-    }
-
-    /* this is not a inet-addr => can't set port */
-    return sal_False;
-}
-
-/*****************************************************************************/
-/* osl_getHostnameOfSocketAddr */
-/*****************************************************************************/
-oslSocketResult	SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrHostname)
-{
-    oslSocketResult Result;
-    sal_Char pszHostname[1024];
-
-    pszHostname[0] = '\0';
-
-    Result = osl_psz_getHostnameOfSocketAddr(Addr,pszHostname,sizeof(pszHostname));
-
-    rtl_uString_newFromAscii(ustrHostname,pszHostname);
-
-    return Result;
-}
-
-
-oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr(oslSocketAddr pAddr,
-                                            sal_Char *pBuffer, sal_uInt32 BufferSize)
-{
-    oslHostAddr pHostAddr= (oslHostAddr )osl_createHostAddrByAddr(pAddr);
-
-    if (pHostAddr)
-    {
-        strncpy(pBuffer, pHostAddr->pHostName, BufferSize);
-
-        pBuffer[BufferSize - 1] = '\0';
-
-        osl_destroyHostAddr(pHostAddr);
-
-        return osl_Socket_Ok;
-    }
-
-    return osl_Socket_Error;
-}
-
-/*****************************************************************************/
-/* osl_getDottedInetAddrOfSocketAddr */
-/*****************************************************************************/
-oslSocketResult	SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrDottedInetAddr)
-{
-    oslSocketResult Result;
-    sal_Char pszDottedInetAddr[1024];
-
-    pszDottedInetAddr[0] = '\0';
-
-    Result = osl_psz_getDottedInetAddrOfSocketAddr(Addr,pszDottedInetAddr,sizeof(pszDottedInetAddr));
-
-    rtl_uString_newFromAscii(ustrDottedInetAddr,pszDottedInetAddr);
-
-    return Result;
-
-}
-
-oslSocketResult	SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAddr,
-                                                  sal_Char *pBuffer, sal_uInt32 BufferSize)
-{
-    OSL_ASSERT(pAddr);
-
-    if( pAddr )
-    {
-        struct sockaddr_in* pSystemInetAddr = ( struct sockaddr_in * ) &(pAddr->m_sockaddr);
-
-        if (pSystemInetAddr->sin_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
-        {
-            strncpy(pBuffer, inet_ntoa(pSystemInetAddr->sin_addr), BufferSize);
-            pBuffer[BufferSize - 1] = '\0';
-
-            return osl_Socket_Ok;
-        }
-    }
-
-    return osl_Socket_Error;
-}
-
-/*****************************************************************************/
-/* osl_createSocket  */
-/*****************************************************************************/
-oslSocket SAL_CALL osl_createSocket(oslAddrFamily	Family,
-                           oslSocketType	Type,
-                           oslProtocol		Protocol)
-{
-    int 		   Flags;
-    oslSocket pSocket;
-
-    /* alloc memory */
-    pSocket= __osl_createSocketImpl(OSL_INVALID_SOCKET);
-
-    /* create socket */
-    pSocket->m_Socket= socket(FAMILY_TO_NATIVE(Family),
-                                TYPE_TO_NATIVE(Type),
-                                PROTOCOL_TO_NATIVE(Protocol));
-
-    /* creation failed => free memory */
-    if(pSocket->m_Socket == OSL_INVALID_SOCKET)
-    {
-        OSL_TRACE("osl_createSocket failed. Errno: %d; %s\n",
-                  errno,
-                  strerror(errno));
-
-        __osl_destroySocketImpl((pSocket));
-        pSocket= 0;
-    }
-    else
-    {
-        /* set close-on-exec flag */
-        if ((Flags = fcntl(pSocket->m_Socket, F_GETFD, 0)) != -1)
-        {
-            Flags |= FD_CLOEXEC;
-            if (fcntl(pSocket->m_Socket, F_SETFD, Flags) == -1)
-            {
-                pSocket->m_nLastError=errno;
-                OSL_TRACE("osl_createSocket failed changing socket flags. Errno: %d; %s\n",
-                          errno,
-                          strerror(errno));
-            }
-        }
-        else
-        {
-            pSocket->m_nLastError=errno;
-        }
-
-
-        pSocket->m_CloseCallback 	= NULL;
-        pSocket->m_CallbackArg	= NULL;
-    }
-
-    return pSocket;
-}
-
-void SAL_CALL osl_acquireSocket(oslSocket pSocket)
-{
-    osl_incrementInterlockedCount( &(pSocket->m_nRefCount ) );
-}
-
-void SAL_CALL osl_releaseSocket( oslSocket pSocket )
-{
-    if( pSocket && 0 == osl_decrementInterlockedCount( &(pSocket->m_nRefCount) ) )
-    {
-#if defined(LINUX)
-    if ( pSocket->m_bIsAccepting == sal_True )
-    {
-        OSL_FAIL("osl_destroySocket : attempt to destroy socket while accepting\n");
-        return;
-    }
-#endif /* LINUX */
-        osl_closeSocket( pSocket );
-        __osl_destroySocketImpl( pSocket );
-    }
-}
-
-
-
-/*****************************************************************************/
-/* osl_closeSocket  */
-/*****************************************************************************/
-void SAL_CALL osl_closeSocket(oslSocket pSocket)
-{
-    int nRet;
-    int nFD;
-
-    /* socket already invalid */
-    if(pSocket==0)
-        return;
-
-    pSocket->m_nLastError=0;
-    nFD = pSocket->m_Socket;
-
-    pSocket->m_Socket = OSL_INVALID_SOCKET;
-
-#if defined(LINUX)
-    pSocket->m_bIsInShutdown = sal_True;
-
-    if ( pSocket->m_bIsAccepting == sal_True )
-    {
-        int nConnFD;
-        struct sockaddr aSockAddr;
-        socklen_t nSockLen = sizeof(aSockAddr);
-
-        nRet = getsockname(nFD, &aSockAddr, &nSockLen);
-#if OSL_DEBUG_LEVEL > 1
-        if ( nRet < 0 )
-        {
-            perror("getsockname");
-        }
-#endif /* OSL_DEBUG_LEVEL */
-
-        if ( aSockAddr.sa_family == AF_INET )
-        {
-            struct sockaddr_in* pSockAddrIn = (struct sockaddr_in*) &aSockAddr;
-
-            if ( pSockAddrIn->sin_addr.s_addr == htonl(INADDR_ANY) )
-            {
-                pSockAddrIn->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-            }
-
-            nConnFD = socket(AF_INET, SOCK_STREAM, 0);
-#if OSL_DEBUG_LEVEL > 1
-            if ( nConnFD < 0 )
-            {
-                perror("socket");
-            }
-#endif /* OSL_DEBUG_LEVEL */
-
-            nRet = connect(nConnFD, &aSockAddr, sizeof(aSockAddr));
-#if OSL_DEBUG_LEVEL > 1
-            if ( nRet < 0 )
-            {
-                perror("connect");
-            }
-#endif /* OSL_DEBUG_LEVEL */
-            close(nConnFD);
-        }
-    }
-#endif /* LINUX */
-
-    /* registrierten Callback ausfuehren */
-    if (pSocket->m_CloseCallback != NULL)
-    {
-        pSocket->m_CloseCallback(pSocket->m_CallbackArg);
-    }
-
-    nRet=close(nFD);
-    if ( nRet != 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("closeSocket close error '%s'\n",strerror(errno));
-    }
-
-    pSocket->m_Socket = OSL_INVALID_SOCKET;
-}
-
-/*****************************************************************************/
-/* osl_getLocalAddrOfSocket  */
-/* Note that I rely on the fact that oslSocketAddr and struct sockaddr */
-/* are the same! I don't like it very much but see no other easy way to conceal */
-/* the struct sockaddr from the eyes of the user. */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket)
-{
-#if defined(LINUX) || defined(FREEBSD)
-    socklen_t AddrLen;
-#else
-    /* mfe: Solaris 'cc +w' means Addrlen should be signed! */
-    /*      it's really defined as 'int*' in /usr/include/sys/socket.h! */
-    /*      the man page says it expects a 'size_t' */
-    int AddrLen;
-#endif
-    struct sockaddr Addr;
-    oslSocketAddr  pAddr;
-
-    if (pSocket == NULL) /* ENOTSOCK */
-        return ((oslSocketAddr)NULL);
-
-    AddrLen= sizeof(struct sockaddr);
-
-    if (getsockname(pSocket->m_Socket, &Addr, PTR_SIZE_T(AddrLen)) == OSL_SOCKET_ERROR)
-        return ((oslSocketAddr)NULL);
-
-    pAddr = __osl_createSocketAddrFromSystem( &Addr );
-    return pAddr;
-}
-
-/*****************************************************************************/
-/* osl_getPeerAddrOfSocket  */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_getPeerAddrOfSocket(oslSocket pSocket)
-{
-    sal_uInt32 AddrLen;
-    struct sockaddr Addr;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return 0;
-    }
-
-    pSocket->m_nLastError=0;
-    AddrLen= sizeof(struct sockaddr);
-
-    if(getpeername(pSocket->m_Socket, &Addr, (int*)PTR_SIZE_T(AddrLen)) == OSL_SOCKET_ERROR)
-    {
-        pSocket->m_nLastError=errno;
-        return 0;
-    }
-    return __osl_createSocketAddrFromSystem( &Addr );
-}
-
-/*****************************************************************************/
-/* osl_bindAddrToSocket  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_bindAddrToSocket(oslSocket pSocket,
-                             oslSocketAddr pAddr)
-{
-    int nRet;
-
-    OSL_ASSERT(pSocket && pAddr );
-    if ( pSocket == 0 || pAddr == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    nRet = bind(pSocket->m_Socket, &(pAddr->m_sockaddr), sizeof(struct sockaddr));
-
-    if ( nRet == OSL_SOCKET_ERROR)
-    {
-        pSocket->m_nLastError=errno;
-        return sal_False;
-    }
-
-    return sal_True;
-}
-
-
-/*****************************************************************************/
-/* osl_listenOnSocket  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_listenOnSocket(oslSocket pSocket,
-                           sal_Int32 MaxPendingConnections)
-{
-    int nRet;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    nRet = listen(pSocket->m_Socket,
-                  MaxPendingConnections == -1 ?
-                  SOMAXCONN :
-                  MaxPendingConnections);
-    if ( nRet == OSL_SOCKET_ERROR)
-    {
-        pSocket->m_nLastError=errno;
-        return sal_False;
-    }
-
-    return sal_True;
-}
-
-
-/*****************************************************************************/
-/* osl_connectSocketTo  */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_connectSocketTo(oslSocket pSocket,
-                                    oslSocketAddr pAddr,
-                                    const TimeValue* pTimeout)
-{
-    fd_set   WriteSet;
-    fd_set   ExcptSet;
-    int      ReadyHandles;
-    struct timeval  tv;
-    oslSocketResult Result= osl_Socket_Ok;
-
-    OSL_PRECOND(pSocket, "osl_connectSocketTo(): need a valid socket!\n");
-
-    if ( pSocket == 0 )
-    {
-        return osl_Socket_Error;
-    }
-
-    pSocket->m_nLastError=0;
-
-    if (osl_isNonBlockingMode(pSocket))
-    {
-        if (connect(pSocket->m_Socket,
-                    &(pAddr->m_sockaddr),
-                    sizeof(struct sockaddr)) != OSL_SOCKET_ERROR)
-            return osl_Socket_Ok;
-        else
-            if (errno == EWOULDBLOCK || errno == EINPROGRESS)
-            {
-                pSocket->m_nLastError=EINPROGRESS;
-                return osl_Socket_InProgress;
-            }
-
-
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("can't connect : '%s'",strerror(errno));
-        return osl_Socket_Error;
-    }
-
-    /* set socket temporarily to non-blocking */
-    OSL_VERIFY(osl_enableNonBlockingMode(pSocket, sal_True));
-
-    /* initiate connect */
-    if(connect(pSocket->m_Socket,
-               &(pAddr->m_sockaddr),
-               sizeof(struct sockaddr)) != OSL_SOCKET_ERROR)
-    {
-       /* immediate connection */
-        osl_enableNonBlockingMode(pSocket, sal_False);
-
-        return osl_Socket_Ok;
-    }
-    else
-    {
-        /* really an error or just delayed? */
-        if (errno != EINPROGRESS)
-        {
-            pSocket->m_nLastError=errno;
-            OSL_TRACE(
-                "osl_connectSocketTo(): connect failed: errno: %d (%s)\n",
-                errno, strerror(errno));
-
-            osl_enableNonBlockingMode(pSocket, sal_False);
-            return osl_Socket_Error;
-        }
-    }
-
-
-    /* prepare select set for socket  */
-    FD_ZERO(&WriteSet);
-    FD_ZERO(&ExcptSet);
-    FD_SET(pSocket->m_Socket, &WriteSet);
-    FD_SET(pSocket->m_Socket, &ExcptSet);
-
-    /* prepare timeout */
-    if (pTimeout)
-    {
-        /* divide milliseconds into seconds and microseconds */
-        tv.tv_sec=	pTimeout->Seconds;
-        tv.tv_usec=	pTimeout->Nanosec / 1000L;
-    }
-
-    /* select */
-    ReadyHandles= select(pSocket->m_Socket+1,
-                         0,
-                         PTR_FD_SET(WriteSet),
-                         PTR_FD_SET(ExcptSet),
-                         (pTimeout) ? &tv : 0);
-
-    if (ReadyHandles > 0)  /* connected */
-    {
-        if ( FD_ISSET(pSocket->m_Socket, &WriteSet ) )
-        {
-            int nErrorCode = 0;
-#ifdef SOLARIS
-/*  mfe: Solaris 'cc +w' means 5th argument should be a 'int*'!
-         it's really defined as 'int*' in /usr/include/sys/socket.h!
-         the man page says it expects a 'size_t*'
-*/
-            int nErrorSize = sizeof( nErrorCode );
-#else
-            size_t nErrorSize = sizeof( nErrorCode );
-#endif
-
-            int nSockOpt;
-
-            nSockOpt = getsockopt ( pSocket->m_Socket, SOL_SOCKET, SO_ERROR,
-#ifdef SOLARIS
-/*  mfe: Solaris 'cc +w' means 4th argument should be a 'char*'!
-         it's really defined as 'char*' in /usr/include/sys/socket.h!
-         the man page says it expects a 'void*'
-*/
-                                    (char*)
-#endif
-                                    &nErrorCode, (int*)&nErrorSize );
-            if ( (nSockOpt == 0) && (nErrorCode == 0))
-                Result = osl_Socket_Ok;
-            else
-                Result = osl_Socket_Error;
-        }
-        else
-        {
-            Result= osl_Socket_Error;
-        }
-    }
-    else if (ReadyHandles < 0)  /* error */
-    {
-        if (errno == EBADF) /* most probably interrupted by close() */
-        {
-            /* do not access pSockImpl because it is about to be or */
-            /* already destroyed */
-            return osl_Socket_Interrupted;
-        }
-        else
-        {
-            pSocket->m_nLastError=errno;
-            Result= osl_Socket_Error;
-        }
-    }
-    else    /* timeout */
-    {
-        pSocket->m_nLastError=errno;
-        Result= osl_Socket_TimedOut;
-    }
-
-    osl_enableNonBlockingMode(pSocket, sal_False);
-
-    return Result;
-}
-
-
-/*****************************************************************************/
-/* osl_acceptConnectionOnSocket  */
-/*****************************************************************************/
-oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
-                        oslSocketAddr* ppAddr)
-{
-    struct sockaddr Addr;
-    int Connection, Flags;
-    sal_uInt32 AddrLen = sizeof(struct sockaddr);
-    oslSocket pConnectionSockImpl;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return 0;
-    }
-
-    pSocket->m_nLastError=0;
-#if defined(LINUX)
-    pSocket->m_bIsAccepting = sal_True;
-#endif /* LINUX */
-
-    if( ppAddr && *ppAddr )
-    {
-        osl_destroySocketAddr( *ppAddr );
-        *ppAddr = 0;
-    }
-
-    /* prevent Linux EINTR behaviour */
-    do
-    {
-        Connection = accept(pSocket->m_Socket, &Addr, (int*)PTR_SIZE_T(AddrLen));
-    } while (Connection == -1 && errno == EINTR);
-
-
-    /* accept failed? */
-    if( Connection == OSL_SOCKET_ERROR )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("osl_acceptConnectionOnSocket : accept error '%s'\n",strerror(errno));
-
-#if defined(LINUX)
-        pSocket->m_bIsAccepting = sal_False;
-#endif /* LINUX */
-        return 0;
-    }
-
-    OSL_ASSERT(AddrLen == sizeof(struct sockaddr));
-
-
-#if defined(LINUX)
-    if ( pSocket->m_bIsInShutdown == sal_True )
-    {
-        close(Connection);
-        OSL_TRACE("osl_acceptConnectionOnSocket : close while accept\n");
-        return 0;
-    }
-#endif /* LINUX */
-
-
-    if(ppAddr)
-    {
-        *ppAddr= __osl_createSocketAddrFromSystem(&Addr);
-    }
-
-    /* alloc memory */
-    pConnectionSockImpl= __osl_createSocketImpl(OSL_INVALID_SOCKET);
-
-    /* set close-on-exec flag */
-    if ((Flags = fcntl(Connection, F_GETFD, 0)) != -1)
-    {
-        Flags |= FD_CLOEXEC;
-        if (fcntl(Connection, F_SETFD, Flags) == -1)
-        {
-            pSocket->m_nLastError=errno;
-            OSL_TRACE("osl_acceptConnectionOnSocket failed changing socket flags. Errno: %d (%s)\n",
-                      errno,
-                      strerror(errno));
-        }
-
-    }
-
-    pConnectionSockImpl->m_Socket			= Connection;
-    pConnectionSockImpl->m_nLastError		= 0;
-    pConnectionSockImpl->m_CloseCallback	= NULL;
-    pConnectionSockImpl->m_CallbackArg		= NULL;
-#if defined(LINUX)
-    pConnectionSockImpl->m_bIsAccepting		= sal_False;
-
-    pSocket->m_bIsAccepting = sal_False;
-#endif /* LINUX */
-    return pConnectionSockImpl;
-}
-
-/*****************************************************************************/
-/* osl_receiveSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_receiveSocket(oslSocket pSocket,
-                          void* pBuffer,
-                          sal_uInt32 BytesToRead,
-                          oslSocketMsgFlag Flag)
-{
-    int nRead;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        OSL_TRACE("osl_receiveSocket : Invalid socket");
-        return -1;
-    }
-
-    pSocket->m_nLastError=0;
-
-    do
-    {
-        nRead =  recv(pSocket->m_Socket,
-                      (sal_Char*)pBuffer,
-                      BytesToRead,
-                      MSG_FLAG_TO_NATIVE(Flag));
-    } while ( nRead < 0 && errno == EINTR );
-
-    if ( nRead < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("osl_receiveSocket failed : %i '%s'",nRead,strerror(errno));
-    }
-    else if ( nRead == 0 )
-    {
-        OSL_TRACE("osl_receiveSocket failed : %i '%s'",nRead,"EOL");
-    }
-
-    return nRead;
-}
-
-
-/*****************************************************************************/
-/* osl_receiveFromSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_receiveFromSocket(oslSocket pSocket,
-                              oslSocketAddr pSenderAddr,
-                              void* pBuffer,
-                              sal_uInt32 BufferSize,
-                              oslSocketMsgFlag Flag)
-{
-    int nRead;
-    struct sockaddr *pSystemSockAddr = 0;
-    int AddrLen = 0;
-    if( pSenderAddr )
-    {
-        AddrLen = sizeof( struct sockaddr );
-        pSystemSockAddr = &(pSenderAddr->m_sockaddr);
-    }
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        OSL_TRACE("osl_receiveFromSocket : Invalid socket");
-        return -1;
-    }
-
-    pSocket->m_nLastError=0;
-
-    nRead = recvfrom(pSocket->m_Socket,
-                     (sal_Char*)pBuffer,
-                     BufferSize,
-                     MSG_FLAG_TO_NATIVE(Flag),
-                     pSystemSockAddr,
-                     PTR_SIZE_T(AddrLen));
-
-    if ( nRead < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("osl_receiveFromSocket failed : %i '%s'",nRead,strerror(errno));
-    }
-    else if ( nRead == 0 )
-    {
-        OSL_TRACE("osl_receiveSocket failed : %i '%s'",nRead,"EOL");
-    }
-
-    return nRead;
-}
-
-
-/*****************************************************************************/
-/* osl_sendSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_sendSocket(oslSocket pSocket,
-                       const void* pBuffer,
-                       sal_uInt32 BytesToSend,
-                       oslSocketMsgFlag Flag)
-{
-    int nWritten;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        OSL_TRACE("osl_sendSocket : Invalid socket");
-        return -1;
-    }
-
-    pSocket->m_nLastError=0;
-
-    do
-    {
-        nWritten = send(pSocket->m_Socket,
-                        (sal_Char*)pBuffer,
-                        BytesToSend,
-                        MSG_FLAG_TO_NATIVE(Flag));
-    } while ( nWritten < 0 && errno == EINTR );
-
-
-    if ( nWritten < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("osl_sendSocket failed : %i '%s'",nWritten,strerror(errno));
-    }
-    else if ( nWritten == 0 )
-    {
-        OSL_TRACE("osl_sendSocket failed : %i '%s'",nWritten,"EOL");
-    }
-
-    return nWritten;
-}
-
-/*****************************************************************************/
-/* osl_sendToSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_sendToSocket(oslSocket pSocket,
-                         oslSocketAddr ReceiverAddr,
-                         const void* pBuffer,
-                         sal_uInt32 BytesToSend,
-                         oslSocketMsgFlag Flag)
-{
-    int nWritten;
-
-    struct sockaddr *pSystemSockAddr = 0;
-    int AddrLen = 0;
-    if( ReceiverAddr )
-    {
-        pSystemSockAddr = &(ReceiverAddr->m_sockaddr);
-        AddrLen = sizeof( struct sockaddr );
-    }
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        OSL_TRACE("osl_sendToSocket : Invalid socket");
-        return -1;
-    }
-
-    pSocket->m_nLastError=0;
-
-    /* ReceiverAddr might be 0 when used on a connected socket. */
-    /* Then sendto should behave like send. */
-
-    nWritten = sendto(pSocket->m_Socket,
-                      (sal_Char*)pBuffer,
-                      BytesToSend,
-                      MSG_FLAG_TO_NATIVE(Flag),
-                      pSystemSockAddr,
-                      AddrLen);
-
-    if ( nWritten < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("osl_sendToSocket failed : %i '%s'",nWritten,strerror(errno));
-    }
-    else if ( nWritten == 0 )
-    {
-        OSL_TRACE("osl_sendToSocket failed : %i '%s'",nWritten,"EOL");
-    }
-
-    return nWritten;
-}
-
-/*****************************************************************************/
-/* osl_readSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_readSocket (
-    oslSocket pSocket, void *pBuffer, sal_Int32 n )
-{
-    sal_uInt8 * Ptr = (sal_uInt8 *)pBuffer;
-    sal_uInt32 BytesRead= 0;
-    sal_uInt32 BytesToRead= n;
-
-    OSL_ASSERT( pSocket);
-
-    /* loop until all desired bytes were read or an error occurred */
-    while (BytesToRead > 0)
-    {
-        sal_Int32 RetVal;
-        RetVal= osl_receiveSocket(pSocket,
-                                   Ptr,
-                                   BytesToRead,
-                                   osl_Socket_MsgNormal);
-
-        /* error occurred? */
-        if(RetVal <= 0)
-        {
-            break;
-        }
-
-        BytesToRead -= RetVal;
-        BytesRead += RetVal;
-        Ptr += RetVal;
-    }
-
-    return BytesRead;
-}
-
-/*****************************************************************************/
-/* osl_writeSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_writeSocket(
-    oslSocket pSocket, const void *pBuffer, sal_Int32 n )
-{
-    /* loop until all desired bytes were send or an error occurred */
-    sal_uInt32 BytesSend= 0;
-    sal_uInt32 BytesToSend= n;
-    sal_uInt8 *Ptr = ( sal_uInt8 * )pBuffer;
-
-    OSL_ASSERT( pSocket );
-
-    while (BytesToSend > 0)
-    {
-        sal_Int32 RetVal;
-
-        RetVal= osl_sendSocket( pSocket,Ptr,BytesToSend,osl_Socket_MsgNormal);
-
-        /* error occurred? */
-        if(RetVal <= 0)
-        {
-            break;
-        }
-
-        BytesToSend -= RetVal;
-        BytesSend += RetVal;
-        Ptr += RetVal;
-
-    }
-    return BytesSend;
-}
-
-/*****************************************************************************/
-/* __osl_socket_poll */
-/*****************************************************************************/
-
-#ifdef HAVE_POLL_H /* poll() */
-
-sal_Bool __osl_socket_poll (
-    oslSocket        pSocket,
-    const TimeValue* pTimeout,
-    short            nEvent)
-{
-    struct pollfd fds;
-    int           timeout;
-    int           result;
-
-    OSL_ASSERT(pSocket);
-    pSocket->m_nLastError = 0;
-
-    fds.fd      = pSocket->m_Socket;
-    fds.events  = nEvent;
-    fds.revents = 0;
-
-    timeout = -1;
-    if (pTimeout)
-    {
-        /* Convert to [ms] */
-        timeout  = pTimeout->Seconds * 1000;
-        timeout += pTimeout->Nanosec / (1000 * 1000);
-    }
-
-    result = poll (&fds, 1, timeout);
-    if (result < 0)
-    {
-        pSocket->m_nLastError = errno;
-        OSL_TRACE("__osl_socket_poll(): poll error: %d (%s)",
-                  errno, strerror(errno));
-        return sal_False;
-    }
-    if (result == 0)
-    {
-        /* Timeout */
-        return sal_False;
-    }
-
-    return ((fds.revents & nEvent) == nEvent);
-}
-
-#else  /* select() */
-
-sal_Bool __osl_socket_poll (
-    oslSocket        pSocket,
-    const TimeValue* pTimeout,
-    short            nEvent)
-{
-    fd_set         fds;
-    struct timeval tv;
-    int            result;
-
-    OSL_ASSERT(pSocket);
-    pSocket->m_nLastError = 0;
-
-    FD_ZERO(&fds);
-    FD_SET(pSocket->m_Socket, &fds);
-
-    if (pTimeout)
-    {
-        /* Convert to 'timeval' */
-        tv.tv_sec  = pTimeout->Seconds;
-        tv.tv_usec = pTimeout->Nanosec / 1000;
-    }
-
-    result = select (
-        pSocket->m_Socket + 1,
-        (nEvent == POLLIN ) ? PTR_FD_SET(fds) : NULL,
-        (nEvent == POLLOUT) ? PTR_FD_SET(fds) : NULL,
-        (nEvent == POLLPRI) ? PTR_FD_SET(fds) : NULL,
-        (pTimeout)          ? &tv             : NULL);
-
-    if (result < 0)
-    {
-        pSocket->m_nLastError = errno;
-        OSL_TRACE("__osl_socket_poll(): select error: %d (%s)",
-                  errno, strerror(errno));
-        return sal_False;
-    }
-    if (result == 0)
-    {
-        /* Timeout */
-        return sal_False;
-    }
-
-    return (FD_ISSET(pSocket->m_Socket, &fds) ? sal_True : sal_False);
-}
-
-#endif /* HAVE_POLL_H */
-
-/*****************************************************************************/
-/* osl_isReceiveReady  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isReceiveReady (
-    oslSocket pSocket, const TimeValue* pTimeout)
-{
-    OSL_ASSERT(pSocket);
-    if (pSocket == NULL)
-    {
-        /* ENOTSOCK */
-        return sal_False;
-    }
-
-    return __osl_socket_poll (pSocket, pTimeout, POLLIN);
-}
-
-/*****************************************************************************/
-/* osl_isSendReady  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isSendReady (
-    oslSocket pSocket, const TimeValue* pTimeout)
-{
-    OSL_ASSERT(pSocket);
-    if (pSocket == NULL)
-    {
-        /* ENOTSOCK */
-        return sal_False;
-    }
-
-    return __osl_socket_poll (pSocket, pTimeout, POLLOUT);
-}
-
-/*****************************************************************************/
-/* osl_isExceptionPending  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isExceptionPending (
-    oslSocket pSocket, const TimeValue* pTimeout)
-{
-    OSL_ASSERT(pSocket);
-    if (pSocket == NULL)
-    {
-        /* ENOTSOCK */
-        return sal_False;
-    }
-
-    return __osl_socket_poll (pSocket, pTimeout, POLLPRI);
-}
-
-/*****************************************************************************/
-/* osl_shutdownSocket  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_shutdownSocket(oslSocket pSocket,
-                           oslSocketDirection Direction)
-{
-    int nRet;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    nRet=shutdown(pSocket->m_Socket, DIRECTION_TO_NATIVE(Direction));
-    if (nRet != 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("shutdown error '%s'\n",strerror(errno));
-    }
-    return (nRet==0);
-}
-
-
-/*****************************************************************************/
-/* osl_getSocketOption  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_getSocketOption(oslSocket pSocket,
-                            oslSocketOptionLevel	Level,
-                            oslSocketOption			Option,
-                            void*					pBuffer,
-                            sal_uInt32  				BufferLen)
-{
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return -1;
-    }
-
-    pSocket->m_nLastError=0;
-
-    if(getsockopt(pSocket->m_Socket,
-                  OPTION_LEVEL_TO_NATIVE(Level),
-                  OPTION_TO_NATIVE(Option),
-                  (sal_Char*)pBuffer,
-                  (int*)PTR_SIZE_T(BufferLen)) == -1)
-    {
-        pSocket->m_nLastError=errno;
-        return -1;
-    }
-
-    return BufferLen;
-}
-
-/*****************************************************************************/
-/* osl_setSocketOption  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_setSocketOption(oslSocket pSocket,
-                            oslSocketOptionLevel	Level,
-                            oslSocketOption			Option,
-                            void*					pBuffer,
-                            sal_uInt32					BufferLen)
-{
-    int nRet;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    nRet = setsockopt(pSocket->m_Socket,
-                      OPTION_LEVEL_TO_NATIVE(Level),
-                      OPTION_TO_NATIVE(Option),
-                      (sal_Char*)pBuffer,
-                      BufferLen);
-
-    if ( nRet < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        return sal_False;
-    }
-
-    return sal_True;
-}
-
-/*****************************************************************************/
-/* osl_enableNonBlockingMode  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_enableNonBlockingMode(oslSocket pSocket,
-                                  sal_Bool On)
-{
-    int flags;
-    int nRet;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    flags = fcntl(pSocket->m_Socket, F_GETFL, 0);
-
-    if (On)
-        flags |= O_NONBLOCK;
-    else
-        flags &= ~(O_NONBLOCK);
-
-    nRet = fcntl(pSocket->m_Socket, F_SETFL, flags);
-
-    if  ( nRet < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        return sal_False;
-    }
-
-    return sal_True;
-}
-
-/*****************************************************************************/
-/* osl_isNonBlockingMode  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket pSocket)
-{
-    int flags;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    flags = fcntl(pSocket->m_Socket, F_GETFL, 0);
-
-    if (flags == -1 || !(flags & O_NONBLOCK))
-        return sal_False;
-    else
-        return sal_True;
-}
-
-/*****************************************************************************/
-/* osl_getSocketType  */
-/*****************************************************************************/
-oslSocketType SAL_CALL osl_getSocketType(oslSocket pSocket)
-{
-    int	Type=0;
-    sal_uInt32 TypeSize= sizeof(Type);
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return osl_Socket_TypeInvalid;
-    }
-
-    pSocket->m_nLastError=0;
-
-    if(getsockopt(pSocket->m_Socket,
-                  OPTION_LEVEL_TO_NATIVE(osl_Socket_LevelSocket),
-                  OPTION_TO_NATIVE(osl_Socket_OptionType),
-                  (sal_Char*)&Type,
-                  (int*)PTR_SIZE_T(TypeSize)) == -1)
-    {
-        /* error */
-        pSocket->m_nLastError=errno;
-        return osl_Socket_TypeInvalid;
-    }
-
-    return TYPE_FROM_NATIVE(Type);
-
-}
-
-/*****************************************************************************/
-/* osl_getLastSocketErrorDescription  */
-/*****************************************************************************/
-void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString **ustrError)
-{
-    sal_Char pszError[1024];
-
-    pszError[0] = '\0';
-
-    osl_psz_getLastSocketErrorDescription(Socket,pszError,sizeof(pszError));
-
-    rtl_uString_newFromAscii(ustrError,pszError);
-
-    return;
-}
-
-
-void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* pBuffer, sal_uInt32 BufferSize)
-{
-    /* make shure pBuffer will be a zero-terminated string even when strncpy has to cut */
-    pBuffer[BufferSize-1]= '\0';
-
-    if ( pSocket == 0 )
-    {
-        strncpy(pBuffer, strerror(EINVAL), BufferSize-1);
-        return;
-    }
-
-    strncpy(pBuffer, strerror(pSocket->m_nLastError), BufferSize-1);
-    return;
-}
-
-/*****************************************************************************/
-/* osl_getLastSocketError  */
-/*****************************************************************************/
-oslSocketError SAL_CALL osl_getLastSocketError(oslSocket pSocket)
-{
-    if ( pSocket == 0 )
-    {
-        return ERROR_FROM_NATIVE(EINVAL);
-    }
-
-    return ERROR_FROM_NATIVE(pSocket->m_nLastError);
-}
-
-/*****************************************************************************/
-/* SocketSet                                                                 */
-/*****************************************************************************/
-typedef struct _TSocketSetImpl
-{
-    int		m_MaxHandle;	/* for select(), the largest descriptor in the set */
-    fd_set	m_Set;			/* the set of descriptors */
-
-} TSocketSetImpl;
-
-/*****************************************************************************/
-/* osl_createSocketSet  */
-/*****************************************************************************/
-oslSocketSet SAL_CALL osl_createSocketSet()
-{
-    TSocketSetImpl* pSet;
-
-    pSet= (TSocketSetImpl*)malloc(sizeof(TSocketSetImpl));
-
-    OSL_ASSERT(pSet);
-
-    if(pSet)
-    {
-        pSet->m_MaxHandle= 0;
-        FD_ZERO(&pSet->m_Set);
-    }
-
-    return (oslSocketSet)pSet;
-}
-
-/*****************************************************************************/
-/* osl_destroySocketSet  */
-/*****************************************************************************/
-void SAL_CALL osl_destroySocketSet(oslSocketSet Set)
-{
-    if(Set)
-        free(Set);
-}
-
-/*****************************************************************************/
-/* osl_clearSocketSet  */
-/*****************************************************************************/
-void SAL_CALL osl_clearSocketSet(oslSocketSet Set)
-{
-    TSocketSetImpl* pSet;
-    OSL_ASSERT(Set);
-    if ( Set == 0 )
-    {
-        return;
-    }
-
-    pSet= (TSocketSetImpl*)Set;
-    pSet->m_MaxHandle= 0;
-
-    FD_ZERO(&pSet->m_Set);
-}
-
-/*****************************************************************************/
-/* osl_addToSocketSet  */
-/*****************************************************************************/
-void SAL_CALL osl_addToSocketSet(oslSocketSet Set, oslSocket pSocket)
-{
-    TSocketSetImpl* pSet;
-
-    OSL_ASSERT(Set);
-    OSL_ASSERT(pSocket);
-
-    if ( Set == 0 || pSocket == 0)
-    {
-        return;
-    }
-
-    pSet= (TSocketSetImpl*)Set;
-
-    /* correct max handle */
-    if(pSocket->m_Socket > pSet->m_MaxHandle)
-        pSet->m_MaxHandle= pSocket->m_Socket;
-    FD_SET(pSocket->m_Socket, &pSet->m_Set);
-
-}
-
-/*****************************************************************************/
-/* osl_removeFromSocketSet  */
-/*****************************************************************************/
-void SAL_CALL osl_removeFromSocketSet(oslSocketSet Set, oslSocket pSocket)
-{
-    TSocketSetImpl* pSet;
-
-    OSL_ASSERT(Set);
-    OSL_ASSERT(pSocket);
-
-    if ( Set == 0 || pSocket == 0)
-    {
-        return;
-    }
-
-    pSet= (TSocketSetImpl*)Set;
-
-    /* correct max handle */
-    if(pSocket->m_Socket == pSet->m_MaxHandle)
-    {
-        /* not optimal, since the next used descriptor might be */
-        /* much smaller than m_Socket-1, but it will do */
-        pSet->m_MaxHandle--;
-        if(pSet->m_MaxHandle < 0)
-        {
-            pSet->m_MaxHandle= 0;	/* avoid underflow */
-        }
-    }
-
-    FD_CLR(pSocket->m_Socket, &pSet->m_Set);
-}
-
-/*****************************************************************************/
-/* osl_isInSocketSet  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isInSocketSet(oslSocketSet Set, oslSocket pSocket)
-{
-    TSocketSetImpl* pSet;
-
-    OSL_ASSERT(Set);
-    OSL_ASSERT(pSocket);
-    if ( Set == 0 || pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSet= (TSocketSetImpl*)Set;
-
-    return (FD_ISSET(pSocket->m_Socket, &pSet->m_Set) != 0);
-}
-
-/*****************************************************************************/
-/* osl_demultiplexSocketEvents  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_demultiplexSocketEvents(oslSocketSet IncomingSet,
-                                    oslSocketSet OutgoingSet,
-                                    oslSocketSet OutOfBandSet,
-                                    const TimeValue* pTimeout)
-{
-    int MaxHandle= 0;
-    struct timeval 	tv;
-    TSocketSetImpl* pInSet;
-    TSocketSetImpl* pOutSet;
-    TSocketSetImpl* pOOBSet;
-
-    if (pTimeout)
-    {
-        /* non-blocking call */
-        tv.tv_sec  = pTimeout->Seconds;
-        tv.tv_usec = pTimeout->Nanosec / 1000L;
-    }
-
-    /* map opaque data to impl-types */
-    pInSet=  (TSocketSetImpl*)IncomingSet;
-    pOutSet= (TSocketSetImpl*)OutgoingSet;
-    pOOBSet= (TSocketSetImpl*)OutOfBandSet;
-
-    /* get max handle from all sets */
-    if (pInSet)
-        MaxHandle= pInSet->m_MaxHandle;
-
-    if (pOutSet && (pOutSet->m_MaxHandle > MaxHandle))
-        MaxHandle= pOutSet->m_MaxHandle;
-
-    if (pOOBSet && (pOOBSet->m_MaxHandle > MaxHandle))
-        MaxHandle= pOOBSet->m_MaxHandle;
-
-    return select(MaxHandle+1,
-                  pInSet  ? PTR_FD_SET(pInSet->m_Set)  : 0,
-                  pOutSet ? PTR_FD_SET(pOutSet->m_Set) : 0,
-                  pOOBSet ? PTR_FD_SET(pOOBSet->m_Set) : 0,
-                  pTimeout ? &tv : 0);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/sockimpl.h b/sal/osl/os2/sockimpl.h
deleted file mode 100644
index 3f8fbb781..000000000
--- a/sal/osl/os2/sockimpl.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _OSL_SOCKETIMPL_H_
-#define _OSL_SOCKETIMPL_H_
-
-#include <osl/pipe.h>
-#include <osl/socket.h>
-#include <osl/interlck.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* (*oslCloseCallback) (void*);
-    
-struct oslSocketImpl {
-    int					m_Socket;
-    int                 m_nLastError;
-    oslCloseCallback	m_CloseCallback;
-    void*				m_CallbackArg;
-    oslInterlockedCount m_nRefCount;
-#if defined(LINUX)
-    sal_Bool            m_bIsAccepting;
-    sal_Bool            m_bIsInShutdown;
-#endif
-};
-
-struct oslSocketAddrImpl
-{
-    sal_Int32 m_nRefCount;
-    struct sockaddr m_sockaddr;
-};
-
-/*
-struct oslPipeImpl {
-    int	 m_Socket;
-    sal_Char m_Name[PATH_MAX + 1];
-    oslInterlockedCount m_nRefCount;
-    sal_Bool m_bClosed;
-#if defined(LINUX)
-    sal_Bool m_bIsAccepting;
-    sal_Bool m_bIsInShutdown;
-#endif
-};
-*/
-    
-oslSocket __osl_createSocketImpl(int Socket);
-void __osl_destroySocketImpl(oslSocket pImpl);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
deleted file mode 100644
index f67391b3f..000000000
--- a/sal/osl/os2/system.h
+++ /dev/null
@@ -1,456 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __OSL_SYSTEM_H__
-#define __OSL_SYSTEM_H__
-
-#define PTHREAD_NONE
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <signal.h>
-#include <utime.h>
-
-#include <pwd.h>
-
-#include <netdb.h>
-
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <sys/types.h>
-
-/* OS/2 API header */
-#define INCL_WINPROGRAMLIST
-#define INCL_WINSHELLDATA
-#define INCL_BASE
-#define INCL_DOSSIGNALS
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSMODULEMGR
-#define INCL_DOSERRORS
-#define INCL_DOSSESMGR
-#define INCL_DOSPROCESS
-#define INCL_DOSNMPIPES
-#define INCL_DOSMISC
-#include <os2.h>
-
-typedef ULONG HANDLE;
-#define _MAX_ENV		2048
-#define _MAX_CMD		2048
-
-#ifdef __cplusplus
-extern "C" 
-#endif
-int debug_printf(const char *f, ...);
-
-/* Make sockets of type AF_UNIX use underlying FS rights */
-#ifdef SOLARIS
-#	define _XOPEN_SOURCE 500
-#	include <sys/socket.h>
-#	undef _XOPEN_SOURCE
-#else
-#	include <sys/socket.h>
-#endif
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#define max(a, b)	((a) < (b) ? (b) : (a))
-#define min(a, b)	((a) > (b) ? (b) : (a))
-#ifndef abs
-#define abs(x)		((x) >= 0 ? (x) : -(x))
-#endif
-
-#ifdef SYSV
-#   include <sys/utsname.h>
-#endif
-
-#ifdef LINUX
-#   ifndef __USE_GNU
-#   define __USE_GNU
-#   endif
-
-#if GLIBC >= 2
-#   include <shadow.h>
-#   if ! (defined(SPARC) || defined(X86_64))
-#       include <asm/sigcontext.h>
-#   endif
-#   include <pthread.h>
-#   include <sys/file.h>
-#   include <sys/ioctl.h>
-#	include <sys/uio.h>
-#	include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <dlfcn.h>
-#	include <endian.h>
-#	include <sys/time.h>
-#	include <semaphore.h> 
-#	if __BYTE_ORDER == __LITTLE_ENDIAN
-#		define _LITTLE_ENDIAN
-#	elif __BYTE_ORDER == __BIG_ENDIAN
-#		define _BIG_ENDIAN
-#	elif __BYTE_ORDER == __PDP_ENDIAN
-#		define _PDP_ENDIAN
-#	endif
-#	define  PTR_SIZE_T(s)				((size_t *)&(s))
-#	define 	IORESOURCE_TRANSFER_BSD 
-#	define 	IOCHANNEL_TRANSFER_BSD_RENO
-#	define	pthread_testcancel()
-#	define  NO_PTHREAD_PRIORITY
-#	define  PTHREAD_SIGACTION 			pthread_sigaction
-#else
-#   include <shadow.h>
-#   include <asm/sigcontext.h>
-#   include <pthread.h>
-#   include <sys/file.h>
-#   include <sys/ioctl.h>
-#   include <linux/net.h>
-#	include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <linux/elfcore.h>
-#   include <dlfcn.h>
-#	include <endian.h>
-#	if __BYTE_ORDER == __LITTLE_ENDIAN
-#		define _LITTLE_ENDIAN
-#	elif __BYTE_ORDER == __BIG_ENDIAN
-#		define _BIG_ENDIAN
-#	elif __BYTE_ORDER == __PDP_ENDIAN
-#		define _PDP_ENDIAN
-#	endif
-#	define 	IORESOURCE_TRANSFER_BSD 
-#	define 	IOCHANNEL_TRANSFER_BSD_RENO
-#	define	pthread_testcancel()
-#	define  NO_PTHREAD_RTL
-#	define  NO_PTHREAD_PRIORITY
-#	define  PTHREAD_SIGACTION 			pthread_sigaction
-#endif
-#endif
-
-#ifdef NETBSD
-#	define  ETIME ETIMEDOUT
-#	define _POSIX_THREAD_SYSCALL_SOFT 1
-#	include <pthread.h>
-#	include <netdb.h>
-#	include <sys/sem.h>
-#	include <sys/exec.h>
-#	include <sys/filio.h>
-#	include <sys/ioctl.h>
-#	include <sys/time.h>
-#	include <sys/un.h>
-#	include <netinet/tcp.h>
-#	include <dlfcn.h>
-#   include <machine/endian.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#   	define _LITTLE_ENDIAN_OO
-#   elif BYTE_ORDER == BIG_ENDIAN
-#   	define _BIG_ENDIAN_OO
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   	define _PDP_ENDIAN_OO
-#   endif
-#	define  PTR_SIZE_T(s)				((size_t *)&(s))
-#	define 	IORESOURCE_TRANSFER_BSD 
-#	define 	IOCHANNEL_TRANSFER_BSD_RENO
-#	define	pthread_testcancel()
-#	define  NO_PTHREAD_PRIORITY
-#     define  NO_PTHREAD_SEMAPHORES
-#	define  NO_PTHREAD_RTL
-#	define  PTHREAD_SIGACTION 			pthread_sigaction
-#endif
-
-#ifdef FREEBSD
-#   define  ETIME ETIMEDOUT
-#   include <pthread.h>
-#   include <sys/sem.h>
-#   include <semaphore.h>
-#   include <dlfcn.h>
-#   include <sys/filio.h>
-#   include <sys/ioctl.h>
-#   include <sys/param.h>
-#   include <sys/time.h>
-#   include <sys/uio.h>
-#   include <sys/exec.h>
-#   include <vm/vm.h>
-#   include <vm/vm_param.h>
-#   include <vm/pmap.h>
-#   include <vm/swap_pager.h>
-#	include <sys/un.h>
-#   include <netinet/tcp.h>
-#	define 	IORESOURCE_TRANSFER_BSD 
-#   include <machine/endian.h>
-#if __FreeBSD_version < 500000
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#   	define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#   	define _BIG_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   	define _PDP_ENDIAN
-#   endif
-#endif
-#	define  NO_PTHREAD_RTL
-#endif
-
-#ifdef AIX
-#   define AF_IPX -1
-#	include <strings.h>
-#	include <pthread.h>
-#	include <sys/time.h>
-#	include <sys/un.h>
-#	include <netinet/tcp.h>
-#	include <sys/machine.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#   	define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#   	define _BIG_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   	define _PDP_ENDIAN
-#   endif
-#	define  sched_yield() 				pthread_yield()
-#	define  SLEEP_TIMESPEC(timespec)  	nsleep(&timespec, 0)
-#	define  LIBPATH "LIBPATH"
-#	define  PTR_SIZE_T(s)				((size_t *)&(s))
-#	define  NO_PTHREAD_SEMAPHORES
-#   define  NO_DL_FUNCTIONS
-#endif
-
-#ifdef SOLARIS
-#	include <shadow.h>
-#	include <sys/procfs.h>
-#	include <sys/un.h>
-#	include <stropts.h>
-#	include <pthread.h>
-#	include <semaphore.h>
-#	include <netinet/tcp.h>
-#	include <sys/filio.h>
-#	include <dlfcn.h>
-#	include <sys/isa_defs.h>
-#	define 	IORESOURCE_TRANSFER_SYSV 
-#	define 	IOCHANNEL_TRANSFER_BSD
-#	define  LIBPATH "LD_LIBRARY_PATH"
-#	define  PTR_SIZE_T(s)				((int *)&(s))
-#endif
-
-#ifdef MACOSX
-#	define  ETIME ETIMEDOUT
-#	include <pthread.h>
-#	include <sys/file.h>
-#	include <sys/ioctl.h>
-#	include <sys/uio.h>
-#	include <sys/un.h>
-#	include <netinet/tcp.h>
-#	include <machine/endian.h>
-#	include <sys/time.h>
-#	include <sys/semaphore.h> 
-/* fixme are premac and postmac still needed here? */
-#	include <premac.h>
-#	include <mach-o/dyld.h> 
-#	include <postmac.h>
-#	if BYTE_ORDER == LITTLE_ENDIAN
-#		define _LITTLE_ENDIAN
-#	elif BYTE_ORDER == BIG_ENDIAN
-#		define _BIG_ENDIAN
-#	elif BYTE_ORDER == PDP_ENDIAN
-#		define _PDP_ENDIAN
-#	endif
-#	define 	IOCHANNEL_TRANSFER_BSD_RENO
-#	define  NO_PTHREAD_RTL
-/* for NSGetArgc/Argv/Environ */
-#       include <crt_externs.h>
-char *macxp_tempnam( const char *tmpdir, const char *prefix );
-#endif
-
-#ifdef OS2
-#	include <netinet/tcp.h>
-#endif
-
-#if !defined(_WIN32)  && !defined(OS2)  && \
-    !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && \
-    !defined(AIX)     && \
-    !defined(SOLARIS) && !defined(MACOSX)
-#	error "Target plattform not specified !"
-#endif
-
-#if defined(NETBSD)
-#if defined _LITTLE_ENDIAN_OO
-#	define _OSL_BIGENDIAN
-#elif defined _BIG_ENDIAN_OO
-#	define _OSL_LITENDIAN
-#else
-#	error undetermined endianess
-#endif
-#else
-#if defined _LITTLE_ENDIAN
-#	define _OSL_BIGENDIAN
-#elif defined _BIG_ENDIAN
-#	define _OSL_LITENDIAN
-#else
-#	error undetermined endianess
-#endif
-#endif
-
-#ifndef PTR_SIZE_T
-#	define PTR_SIZE_T(s)				(&(s))
-#endif
-
-#ifndef PTR_FD_SET
-#	define PTR_FD_SET(s)				(&(s))
-#endif
-
-#ifndef NORMALIZE_TIMESPEC
-#	define NORMALIZE_TIMESPEC(timespec) \
-          timespec . tv_sec  += timespec . tv_nsec / 1000000000; \
-          timespec . tv_nsec %= 1000000000; 
-#endif
-
-#ifndef SET_TIMESPEC
-#	define SET_TIMESPEC(timespec, sec, nsec) \
-          timespec . tv_sec  = (sec);  \
-          timespec . tv_nsec = (nsec); \
-        NORMALIZE_TIMESPEC(timespec);
-#endif
-
-#ifndef SLEEP_TIMESPEC
-#	define SLEEP_TIMESPEC(timespec) nanosleep(&timespec, 0)
-#endif
-
-#ifndef INIT_GROUPS	
-#	define  INIT_GROUPS(name, gid)	((setgid((gid)) == 0) && (initgroups((name), (gid)) == 0))
-#endif
-
-#ifndef PTHREAD_VALUE
-#	define PTHREAD_VALUE(t) 			(t)
-#endif
-#ifndef PTHREAD_NONE
-extern pthread_t _pthread_none_;
-#	define PTHREAD_NONE					_pthread_none_
-#   ifndef PTHREAD_NONE_INIT
-#		define PTHREAD_NONE_INIT		((pthread_t)-1)
-#	endif
-#endif
-
-#ifndef PTHREAD_ATTR_DEFAULT
-#	define PTHREAD_ATTR_DEFAULT 		NULL
-#endif
-#ifndef PTHREAD_MUTEXATTR_DEFAULT 
-#	define PTHREAD_MUTEXATTR_DEFAULT 	NULL
-#endif
-#ifndef PTHREAD_CONDATTR_DEFAULT
-#	define PTHREAD_CONDATTR_DEFAULT 	NULL
-#endif
-
-#ifndef PTHREAD_SIGACTION
-#	define PTHREAD_SIGACTION sigaction
-#endif
-
-#ifndef STAT_PARENT
-#	define STAT_PARENT					lstat
-#endif
-
-/* socket options which might not be defined on all unx flavors */
-#ifndef SO_ACCEPTCONN
-#	define SO_ACCEPTCONN 	0
-#endif
-#ifndef SO_SNDLOWAT
-#	define SO_SNDLOWAT 		0
-#endif
-#ifndef SO_RCVLOWAT
-#	define SO_RCVLOWAT 		0
-#endif
-#ifndef SO_SNDTIMEO
-#	define	SO_SNDTIMEO 	0
-#endif
-#ifndef SO_RCVTIMEO
-#	define SO_RCVTIMEO 		0
-#endif
-#ifndef SO_USELOOPBACK
-#	define SO_USELOOPBACK 	0
-#endif
-#ifndef MSG_MAXIOVLEN
-#	define MSG_MAXIOVLEN 	0
-#endif
-
-/* BEGIN HACK */
-/* dummy define and declarations for IPX should be replaced by */
-/* original ipx headers when these are available for this platform */
-
-#ifndef SA_FAMILY_DECL
-#	define SA_FAMILY_DECL short sa_family
-#endif
-
-typedef struct sockaddr_ipx {
-    SA_FAMILY_DECL;
-    char  sa_netnum[4];
-    char  sa_nodenum[6];
-    unsigned short sa_socket;
-} SOCKADDR_IPX;
-
-#define NSPROTO_IPX      1000
-#define NSPROTO_SPX      1256
-#define NSPROTO_SPXII    1257
-
-/* END HACK */
-
-#ifdef NO_PTHREAD_SEMAPHORES
-
-typedef struct
-{
-    pthread_mutex_t	mutex;
-    pthread_cond_t	increased;
-    int			    value;
-} sem_t;
-extern int sem_init(sem_t* sem, int pshared, unsigned int value);
-extern int sem_destroy(sem_t* sem);
-extern int sem_wait(sem_t* sem);
-extern int sem_trywait(sem_t* sem);
-extern int sem_post(sem_t* sem);
-
-#endif
-
-#ifdef NO_PTHREAD_RTL
-#if !defined FREEBSD || (__FreeBSD_version < 500112)
-struct passwd *getpwent_r(struct passwd *pwd, char *buffer,  int buflen);
-extern struct spwd *getspnam_r(const char *name, struct spwd *result,
-                               char *buffer, int buflen);
-
-struct tm *localtime_r(const time_t *timep, struct tm *buffer);
-struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
-#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-struct hostent *gethostbyname_r(const char *name, struct hostent *result,
-                                char *buffer, int buflen, int *h_errnop);
-#endif
-
-#endif /* __OSL_SYSTEM_H__ */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/tempfile.c b/sal/osl/os2/tempfile.c
deleted file mode 100644
index d119cd055..000000000
--- a/sal/osl/os2/tempfile.c
+++ /dev/null
@@ -1,363 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*****************************************************************/
-/* Includes                                                      */
-/*****************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "system.h"
-#include <osl/file.h>
-#include <osl/thread.h>
-#include <rtl/ustrbuf.h>
-#include <osl/diagnose.h>
-#include <sal/macros.h>
-
-#ifndef _FILE_URL_H_
-#include "file_url.h"
-#endif
- 
-/*****************************************************************/
-/* osl_getTempFirURL                                             */
-/*****************************************************************/
-
-oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
-{
-    const char *pValue = getenv( "TEMP" );
-
-    if ( !pValue )
-    {
-        pValue = getenv( "TMP" );
-#if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD) || defined (MACOSX)
-        if ( !pValue )
-            pValue = P_tmpdir;
-#endif
-    }
-
-    if ( pValue )
-    {
-        oslFileError error;
-        rtl_uString	*ustrTempPath = NULL;
-
-        rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-        OSL_ASSERT(ustrTempPath != NULL);
-        error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
-        rtl_uString_release( ustrTempPath );
-        
-        return error;
-    }
-    else
-        return osl_File_E_NOENT;
-}
-
-/******************************************************************
- * Generates a random unique file name. We're using the scheme   
- * from the standard c-lib function mkstemp to generate a more   
- * or less random unique file name                               
- *                                                               
- * @param rand_name                                              
- *        receives the random name                               
- ******************************************************************/
-
-static const char LETTERS[]        = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
-static const int  COUNT_OF_LETTERS = SAL_N_ELEMENTS(LETTERS) - 1;
-
-#define RAND_NAME_LENGTH 6
-
-static void osl_gen_random_name_impl_(rtl_uString** rand_name)
-{	   
-    static uint64_t value; 
-    
-    char     buffer[RAND_NAME_LENGTH];
-    struct   timeval tv;
-    uint64_t v;
-    int      i;
-    
-    gettimeofday(&tv, NULL);
-    
-    value += ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();
-    
-    v = value;
-    
-    for (i = 0; i < RAND_NAME_LENGTH; i++)
-    {
-        buffer[i] = LETTERS[v % COUNT_OF_LETTERS];
-        v        /= COUNT_OF_LETTERS;
-    }
-    
-    rtl_string2UString(
-            rand_name, 
-            buffer,
-            RAND_NAME_LENGTH,
-            RTL_TEXTENCODING_ASCII_US,
-            OSTRING_TO_OUSTRING_CVTFLAGS);
-    OSL_ASSERT(*rand_name != NULL);
-}
-
-/*****************************************************************
- * Helper function                                               
- * Either use the directory provided or the result of            
- * osl_getTempDirUrl and return it as system path and file url   
- ****************************************************************/
-
-static oslFileError osl_setup_base_directory_impl_(
-    rtl_uString*  pustrDirectoryURL,
-    rtl_uString** ppustr_base_dir)
-{
-    rtl_uString* dir_url = 0;
-    rtl_uString* dir     = 0;
-    oslFileError error   = osl_File_E_None;                     
-    
-    if (pustrDirectoryURL)
-        rtl_uString_assign(&dir_url, pustrDirectoryURL);
-    else
-        error = osl_getTempDirURL(&dir_url);
-        
-    if (osl_File_E_None == error)
-    {
-        error = osl_getSystemPathFromFileURL_Ex(dir_url, &dir, FURL_DENY_RELATIVE);       						
-        rtl_uString_release(dir_url);
-    }
-        
-    if (osl_File_E_None == error)
-    {
-        rtl_uString_assign(ppustr_base_dir, dir);
-        rtl_uString_release(dir);
-    }
-    
-    return error;	
-}
-
-/*****************************************************************
- * osl_setup_createTempFile_impl
- * validate input parameter, setup variables
- ****************************************************************/
- 
- static oslFileError osl_setup_createTempFile_impl_(
-     rtl_uString*   pustrDirectoryURL,
-    oslFileHandle* pHandle,
-    rtl_uString**  ppustrTempFileURL,
-    rtl_uString**  ppustr_base_dir,
-    sal_Bool*	   b_delete_on_close)
- {
-     oslFileError osl_error;
-    
-    OSL_PRECOND(((0 != pHandle) || (0 != ppustrTempFileURL)), "Invalid parameter!");
-    
-    if ((0 == pHandle) && (0 == ppustrTempFileURL))
-    {
-        osl_error = osl_File_E_INVAL;
-    }
-    else
-    {
-        osl_error = osl_setup_base_directory_impl_(
-            pustrDirectoryURL, ppustr_base_dir);
-            
-        *b_delete_on_close = (0 == ppustrTempFileURL);
-    }
-    
-    return osl_error;
- }
- 
-/*****************************************************************
- * Create a unique file in the specified directory and return    
- * it's name                                                     
- ****************************************************************/
-
-static oslFileError osl_create_temp_file_impl_(
-    const rtl_uString* pustr_base_directory, 
-    oslFileHandle* file_handle,
-    rtl_uString** ppustr_temp_file_name)
-{
-    rtl_uString*        rand_name        = 0;
-    sal_uInt32          len_base_dir     = 0;
-    rtl_uString*        tmp_file_path    = 0;
-    rtl_uString*        tmp_file_url     = 0;
-    sal_Int32           capacity         = 0;
-    oslFileError        osl_error        = osl_File_E_None;
-    sal_Int32           offset_file_name;
-    const sal_Unicode*  puchr;
-        
-    OSL_PRECOND(pustr_base_directory, "Invalid Parameter");
-    OSL_PRECOND(file_handle, "Invalid Parameter");
-    OSL_PRECOND(ppustr_temp_file_name, "Invalid Parameter");
-    
-    len_base_dir = rtl_uString_getLength(pustr_base_directory);
-    
-    rtl_uStringbuffer_newFromStr_WithLength(
-        &tmp_file_path, 
-        rtl_uString_getStr((rtl_uString*)pustr_base_directory),
-        len_base_dir);
-                        
-    rtl_uStringbuffer_ensureCapacity(
-        &tmp_file_path, 
-        &capacity, 
-        (len_base_dir + 1 + RAND_NAME_LENGTH));
-        
-    offset_file_name = len_base_dir;
-        
-    puchr = rtl_uString_getStr(tmp_file_path);
-    
-    /* ensure that the last character is a '\' */
-    
-    if ((sal_Unicode)'\\' != puchr[len_base_dir - 1])
-    {		
-        rtl_uStringbuffer_insert_ascii(
-            &tmp_file_path, 
-            &capacity, 
-            len_base_dir,
-            "\\",
-            1);
-        
-        offset_file_name++;					
-    }
-         
-    while(1) /* try until success */
-    {							
-        osl_gen_random_name_impl_(&rand_name);
-                    
-        rtl_uStringbuffer_insert(
-            &tmp_file_path,
-            &capacity,
-            offset_file_name,
-            rtl_uString_getStr(rand_name),
-            rtl_uString_getLength(rand_name));
-
-        osl_error = osl_getFileURLFromSystemPath(
-            tmp_file_path, &tmp_file_url);				
-        
-        if (osl_File_E_None == osl_error)
-        {
-            /* RW permission for the user only! */
-            mode_t old_mode = umask(077);
-            
-            osl_error = osl_openFile(
-                tmp_file_url, 
-                file_handle, 
-                osl_File_OpenFlag_Read | 
-                osl_File_OpenFlag_Write | 
-                osl_File_OpenFlag_Create);
-                
-            umask(old_mode);
-        }
-        
-        /* in case of error osl_File_E_EXIST we simply try again else we give up */	
-        
-        if ((osl_File_E_None == osl_error) || (osl_error != osl_File_E_EXIST))
-        {
-            if (rand_name)
-                rtl_uString_release(rand_name);
-            
-            if (tmp_file_url)
-                rtl_uString_release(tmp_file_url);
-                                
-            break;
-        }					
-    } /* while(1) */
-    
-    if (osl_File_E_None == osl_error)
-        rtl_uString_assign(ppustr_temp_file_name, tmp_file_path);
-    
-    if (tmp_file_path)
-        rtl_uString_release(tmp_file_path);
-        
-    return osl_error;
-}
-
-/*****************************************************************
- * osl_createTempFile                                            
- *****************************************************************/
-
-oslFileError SAL_CALL osl_createTempFile(
-    rtl_uString*   pustrDirectoryURL,
-    oslFileHandle* pHandle, 
-    rtl_uString**  ppustrTempFileURL)
-{
-    rtl_uString*  base_directory     = 0;	
-    rtl_uString*  temp_file_name     = 0;
-    oslFileHandle temp_file_handle;
-    sal_Bool      b_delete_on_close;
-    oslFileError  osl_error;
-    
-    osl_error = osl_setup_createTempFile_impl_(
-        pustrDirectoryURL, 
-        pHandle,
-        ppustrTempFileURL,		
-        &base_directory,
-        &b_delete_on_close);
-    
-    if (osl_File_E_None != osl_error)		
-        return osl_error;
-        
-    osl_error = osl_create_temp_file_impl_(
-        base_directory, &temp_file_handle, &temp_file_name);
-                                
-    if (osl_File_E_None == osl_error) 
-    {		
-        rtl_uString* temp_file_url = 0;		
-        
-        /* assuming this works */
-        osl_getFileURLFromSystemPath(temp_file_name, &temp_file_url);
-                                                
-        if (b_delete_on_close)
-        {			
-            osl_error = osl_removeFile(temp_file_url);
-            
-            if (osl_File_E_None == osl_error)
-                *pHandle = temp_file_handle;
-            else
-                osl_closeFile(temp_file_handle);
-        }
-        else 
-        {		
-            if (pHandle)
-                *pHandle = temp_file_handle;				
-            else
-                osl_closeFile(temp_file_handle);	
-                                     
-            rtl_uString_assign(ppustrTempFileURL, temp_file_url);                                       
-        }
-        
-        if (temp_file_url)
-            rtl_uString_release(temp_file_url);
-                
-        if (temp_file_name)
-            rtl_uString_release(temp_file_name);
-    }
-    
-    if (base_directory)
-        rtl_uString_release(base_directory);      
-        
-    return osl_error;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/thread.c b/sal/osl/os2/thread.c
deleted file mode 100644
index 0ff7f1862..000000000
--- a/sal/osl/os2/thread.c
+++ /dev/null
@@ -1,778 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "system.h"
-
-#include <osl/diagnose.h>
-#include <osl/thread.h>
-#include <osl/time.h>
-#include <rtl/alloc.h>
-#include <rtl/tencinfo.h>
-
-/*
-    Thread-data structure hidden behind oslThread:
-*/
-typedef struct _osl_TThreadImpl
-{
-
-    TID                  m_ThreadId;        /* identifier for this thread */
-    sal_Int32            m_Flags;
-    HEV                  m_hEvent;
-    sal_uInt32           m_Timeout;
-    oslWorkerFunction    m_WorkerFunction;
-    void*                m_pData;
-    sal_Bool             m_StartSuspended;
-    HAB                  m_hab;
-    HMQ                  m_hmq;
-
-} osl_TThreadImpl;
-
-#define THREADIMPL_FLAGS_TERMINATE    0x0001
-#define THREADIMPL_FLAGS_SLEEP        0x0002
-
-
-// static mutex to control access to private members of oslMutexImpl
-static HMTX MutexLock = NULL;
-
-/*****************************************************************************/
-
-HAB osl_getPMinternal_HAB(oslThread hThread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)hThread;
-
-    if(pThreadImpl == NULL) /* valid ptr? */
-    {
-        return NULL;
-    }
-    else
-    {
-        return pThreadImpl->m_hab;
-    }
-}
-
-HMQ osl_getPMinternal_HMQ(oslThread hThread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)hThread;
-
-    if(pThreadImpl == NULL) /* valid ptr? */
-    {
-        return NULL;
-    }
-    else
-    {
-        return pThreadImpl->m_hmq;
-    }
-}
-
-
-/*****************************************************************************/
-/* oslWorkerWrapperFunction */
-/*****************************************************************************/
-static void oslWorkerWrapperFunction(void* pData)
-{
-    BOOL rc;
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)pData;
-
-#if OSL_DEBUG_LEVEL > 0
-printf("oslWorkerWrapperFunction pThreadImpl %x, pThreadImpl->m_ThreadId %d\n", pThreadImpl, pThreadImpl->m_ThreadId);
-#endif
-    /* Inizialize PM for this thread */
-    pThreadImpl->m_hab = WinInitialize( 0 );
-#if OSL_DEBUG_LEVEL > 0
-printf("pThreadImpl->m_ThreadId %d, pThreadImpl->m_hab %x\n", pThreadImpl->m_ThreadId,pThreadImpl->m_hab);
-#endif
-    pThreadImpl->m_hmq = WinCreateMsgQueue( pThreadImpl->m_hab, 0 );
-#if OSL_DEBUG_LEVEL > 0
-printf("pThreadImpl->m_ThreadId %d, pThreadImpl->m_hmq %x\n", pThreadImpl->m_ThreadId,pThreadImpl->m_hmq);
-#endif
-
-    /* call worker-function with data */
-    pThreadImpl->m_WorkerFunction( pThreadImpl->m_pData );
-
-    /* Free all PM-resources for this thread */
-#if OSL_DEBUG_LEVEL > 0
-printf("pThreadImpl->m_ThreadId %d, about to destroy queue\n", pThreadImpl->m_ThreadId);
-#endif
-    rc = WinDestroyMsgQueue( pThreadImpl->m_hmq );
-#if OSL_DEBUG_LEVEL > 0
-printf("pThreadImpl->m_ThreadId %d, WinDestroyMsgQueue rc=%d (should be 1)\n", pThreadImpl->m_ThreadId, rc);
-printf("pThreadImpl->m_ThreadId %d, about to terminate hab\n", pThreadImpl->m_ThreadId);
-#endif
-    rc = WinTerminate( pThreadImpl->m_hab );
-#if OSL_DEBUG_LEVEL > 0
-printf("pThreadImpl->m_ThreadId %d, WinTerminate rc=%d (should be 1)\n", pThreadImpl->m_ThreadId, rc);
-#endif
-}
-
-
-/*****************************************************************************/
-/* oslCreateThread */
-/*****************************************************************************/
-static oslThread oslCreateThread(oslWorkerFunction pWorker,
-                                 void* pThreadData,
-                                 sal_Bool nFlags)
-{
-    osl_TThreadImpl* pThreadImpl;
-
-    /* alloc mem. for our internal data structure */
-    pThreadImpl = (osl_TThreadImpl*)malloc(sizeof(osl_TThreadImpl));
-
-    OSL_ASSERT(pThreadImpl);
-
-    pThreadImpl->m_WorkerFunction= pWorker;
-    pThreadImpl->m_pData= pThreadData;
-
-    pThreadImpl->m_Flags   = 0;
-    pThreadImpl->m_hEvent  = 0;
-    pThreadImpl->m_Timeout = 0;
-    pThreadImpl->m_StartSuspended = nFlags;
-    pThreadImpl->m_hab = 0;
-    pThreadImpl->m_hmq = 0;
-
-    if ( nFlags == sal_True )
-    {    
-        DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    }
-    
-    pThreadImpl->m_ThreadId = (TID) _beginthread( oslWorkerWrapperFunction,    /* worker-function */
-                                                  NULL,                        /* unused parameter */
-                                                  1024*1024,                   /* max. Stacksize */
-                                                  pThreadImpl );
-    if ( nFlags == sal_True )
-    {    
-        if( pThreadImpl->m_ThreadId != -1 )
-            DosSuspendThread( pThreadImpl->m_ThreadId );
-        DosReleaseMutexSem( MutexLock);
-    }
-#if OSL_DEBUG_LEVEL > 0
-printf("oslCreateThread pThreadImpl %x, pThreadImpl->m_ThreadId %d\n", pThreadImpl, pThreadImpl->m_ThreadId);
-#endif
-    if(pThreadImpl->m_ThreadId == -1)
-    {
-        /* create failed */
-        if (pThreadImpl->m_hEvent != 0)
-            DosCloseEventSem(pThreadImpl->m_hEvent);
-
-        free(pThreadImpl);
-        return 0;
-    }
-
-    pThreadImpl->m_hEvent= 0;
-
-    return pThreadImpl;
-
-}
-
-/*****************************************************************************/
-/* osl_createThread */
-/*****************************************************************************/
-oslThread SAL_CALL osl_createThread(oslWorkerFunction pWorker,
-                                 void* pThreadData)
-{
-    return oslCreateThread(pWorker,pThreadData,sal_False);
-}
-
-/*****************************************************************************/
-/* osl_createSuspendedThread */
-/*****************************************************************************/
-oslThread SAL_CALL osl_createSuspendedThread(oslWorkerFunction pWorker,
-                                          void* pThreadData)
-{
-    return oslCreateThread(pWorker,pThreadData,sal_True);
-}
-
-/*****************************************************************************/
-/* osl_getThreadIdentifier */
-/*****************************************************************************/
-oslThreadIdentifier SAL_CALL osl_getThreadIdentifier(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    if (pThreadImpl != NULL)
-        return ((oslThreadIdentifier)pThreadImpl->m_ThreadId);
-    else
-        {
-        PTIB pptib = NULL;
-        PPIB pppib = NULL;
-
-        DosGetInfoBlocks( &pptib, &pppib );
-        return ((oslThreadIdentifier) pptib->tib_ptib2->tib2_ultid );
-        }
-}
-
-/*****************************************************************************/
-/* osl_destroyThread */
-/*****************************************************************************/
-void SAL_CALL osl_destroyThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    if(Thread == 0) /* valid ptr? */
-    {
-        /* thread already destroyed or not created */
-        return;
-    }
-
-    if(pThreadImpl->m_ThreadId != -1)    /* valid handle ? */
-    {
-        /* cancel thread  */
-        DosKillThread( pThreadImpl->m_ThreadId );
-    }
-}
-
-/*****************************************************************************/
-/* osl_freeThreadHandle */
-/*****************************************************************************/
-void SAL_CALL osl_freeThreadHandle(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    if(Thread == 0)        /* valid ptr? */
-    {
-        /* thread already destroyed or not created */
-        return;
-    }
-
-    if (pThreadImpl->m_hEvent != 0)
-        DosCloseEventSem(pThreadImpl->m_hEvent);
-
-    /* free memory */
-    free(Thread);
-}
-
-/*****************************************************************************/
-/* osl_resumeThread */
-/*****************************************************************************/
-void SAL_CALL osl_resumeThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    OSL_ASSERT(pThreadImpl);        /* valid ptr? */
-
-    DosResumeThread( pThreadImpl->m_ThreadId );
-}
-
-/*****************************************************************************/
-/* osl_suspendThread */
-/*****************************************************************************/
-void SAL_CALL osl_suspendThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    OSL_ASSERT(pThreadImpl);        /* valid ptr? */
-
-    DosSuspendThread( pThreadImpl->m_ThreadId );
-}
-
-/*****************************************************************************/
-/* osl_setThreadPriority */
-/*****************************************************************************/
-void SAL_CALL osl_setThreadPriority(oslThread Thread,
-                           oslThreadPriority Priority)
-{
-    ULONG nOs2PriorityClass;
-    ULONG nOs2PriorityDelta;
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    OSL_ASSERT(pThreadImpl);        /* valid ptr? */
-
-    switch(Priority) {
-
-    case osl_Thread_PriorityHighest:
-
-        nOs2PriorityClass = PRTYC_REGULAR;
-        nOs2PriorityDelta = PRTYD_MAXIMUM;
-        break;
-
-    case osl_Thread_PriorityAboveNormal:
-
-        nOs2PriorityClass = PRTYC_REGULAR;
-        nOs2PriorityDelta = 16;
-        break;
-
-    case osl_Thread_PriorityNormal:
-
-        nOs2PriorityClass = PRTYC_REGULAR;
-        nOs2PriorityDelta = 0;
-        break;
-
-    case osl_Thread_PriorityBelowNormal:
-
-        nOs2PriorityClass = PRTYC_REGULAR;
-        nOs2PriorityDelta = -16;
-        break;
-
-    case osl_Thread_PriorityLowest:
-
-        nOs2PriorityClass = PRTYC_REGULAR;
-        nOs2PriorityDelta = PRTYD_MINIMUM;
-        break;
-
-    case osl_Thread_PriorityUnknown:
-        OSL_ASSERT(FALSE);        /* only fools try this...*/
-
-        /* let release-version behave friendly */
-        return;
-
-    default:
-        OSL_ASSERT(FALSE);        /* enum expanded, but forgotten here...*/
-
-        /* let release-version behave friendly */
-        return;
-    }
-
-    DosSetPriority( PRTYS_THREAD,
-                    nOs2PriorityClass, nOs2PriorityDelta,
-                    pThreadImpl->m_ThreadId );
-
-}
-
-/*****************************************************************************/
-/* osl_getThreadPriority  */
-/*****************************************************************************/
-
-#define BYTE1FROMULONG(ul) ((UCHAR) (ul))
-#define BYTE2FROMULONG(ul) ((UCHAR) ((ULONG) ul >> 8))
-
-oslThreadPriority  SAL_CALL osl_getThreadPriority(const oslThread Thread)
-{
-    ULONG nOs2PriorityClass;
-    ULONG nOs2PriorityDelta;
-
-    oslThreadPriority Priority;
-
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    /* invalid arguments ?*/
-    if(pThreadImpl==0 || pThreadImpl->m_ThreadId==-1)
-    {
-        return osl_Thread_PriorityUnknown;
-    }
-
-    /* get current priorities */
-    {
-    PTIB pptib = NULL;
-    PPIB pppib = NULL;
-
-    DosGetInfoBlocks( &pptib, &pppib );
-    nOs2PriorityClass = BYTE1FROMULONG( pptib->tib_ptib2->tib2_ulpri );
-    nOs2PriorityDelta = BYTE2FROMULONG( pptib->tib_ptib2->tib2_ulpri );
-    }
-
-    /* map OS2 priority to enum */
-    switch(nOs2PriorityClass)
-    {
-    case PRTYC_TIMECRITICAL:
-        Priority= osl_Thread_PriorityHighest;
-        break;
-
-    case PRTYC_REGULAR:
-
-        if( nOs2PriorityDelta == 0 )
-        {
-            Priority= osl_Thread_PriorityNormal;
-            break;
-        }
-
-        if( nOs2PriorityDelta < -16 )
-        {
-            Priority= osl_Thread_PriorityLowest;
-            break;
-        }
-
-        if( nOs2PriorityDelta < 0 )
-        {
-            Priority= osl_Thread_PriorityBelowNormal;
-            break;
-        }
-
-        if( nOs2PriorityDelta > 0 )
-        {
-            Priority= osl_Thread_PriorityAboveNormal;
-            break;
-        }
-
-        Priority= osl_Thread_PriorityHighest;
-        break;
-
-    case PRTYC_IDLETIME:
-        Priority= osl_Thread_PriorityLowest;
-        break;
-
-    default:
-        OSL_ASSERT(FALSE);        /* OS/2 API changed, incorporate new prio-level! */
-
-        /* release-version behaves friendly */
-        Priority= osl_Thread_PriorityUnknown;
-    }
-
-    return Priority;
-}
-
-/*****************************************************************************/
-/* osl_isThreadRunning */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isThreadRunning(const oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-    APIRET rc;
-
-    /* invalid arguments ?*/
-    if(pThreadImpl==0 || pThreadImpl->m_ThreadId==-1)
-    {
-        return sal_False;
-    }
-
-    if( osl_getThreadIdentifier( 0 ) == osl_getThreadIdentifier( Thread ) )
-        return sal_True;
-
-    rc = DosWaitThread( &pThreadImpl->m_ThreadId, DCWW_NOWAIT );
-
-    return( rc != ERROR_INVALID_THREADID );
-}
-
-/*****************************************************************************/
-/* osl_joinWithThread */
-/*****************************************************************************/
-void SAL_CALL osl_joinWithThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    /* invalid arguments?*/
-    if(pThreadImpl==0 || pThreadImpl->m_ThreadId==-1)
-    {
-        /* assume thread is not running */
-        return;
-    }
-
-    DosWaitThread( &pThreadImpl->m_ThreadId, DCWW_WAIT );
-}
-
-/*****************************************************************************/
-/* osl_waitThread */
-/*****************************************************************************/
-void SAL_CALL osl_waitThread(const TimeValue* pDelay)
-{
-    int millisecs;
-
-    OSL_ASSERT(pDelay);
-
-    millisecs = pDelay->Seconds * 1000 + pDelay->Nanosec / 1000000;
-
-    DosSleep(millisecs);
-}
-
-/*****************************************************************************/
-/* osl_terminateThread */
-/*****************************************************************************/
-void SAL_CALL osl_terminateThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    /* invalid arguments?*/
-    if (pThreadImpl==0 || pThreadImpl->m_ThreadId==-1)
-    {
-        /* assume thread is not running */
-        return;
-    }
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    pThreadImpl->m_Flags |= THREADIMPL_FLAGS_TERMINATE;
-    DosReleaseMutexSem( MutexLock);
-}
-
-
-/*****************************************************************************/
-/* osl_scheduleThread */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_scheduleThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    osl_yieldThread();
-
-    /* invalid arguments?*/
-    if (pThreadImpl==0 || pThreadImpl->m_ThreadId==-1)
-    {
-        /* assume thread is not running */
-        return sal_False;
-    }
-
-    if (pThreadImpl->m_Flags & THREADIMPL_FLAGS_SLEEP)
-    {
-        OSL_ASSERT (pThreadImpl->m_hEvent != 0);
-
-        DosWaitEventSem(pThreadImpl->m_hEvent, pThreadImpl->m_Timeout);
-
-        DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-        pThreadImpl->m_Timeout = 0;
-
-        pThreadImpl->m_Flags &= ~THREADIMPL_FLAGS_SLEEP;
-
-        DosReleaseMutexSem( MutexLock);
-    }
-
-    return ((pThreadImpl->m_Flags & THREADIMPL_FLAGS_TERMINATE) == 0);
-}
-
-/*****************************************************************************/
-/* osl_yieldThread */
-/*****************************************************************************/
-void SAL_CALL osl_yieldThread()
-{
-    DosSleep(0);
-}
-
-void osl_setThreadName(char const * name) {
-    (void) name;
-}
-
-typedef struct _TLS
-{
-    PULONG							pulPtr;
-    oslThreadKeyCallbackFunction	pfnCallback;
-    struct _TLS						*pNext, *pPrev;
-} TLS, *PTLS;
-
-static	PTLS		g_pThreadKeyList = NULL;
-
-static void AddKeyToList( PTLS pTls )
-{
-    if ( pTls )
-    {
-        DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-        pTls->pNext = g_pThreadKeyList;
-        pTls->pPrev = 0;
-        
-        if ( g_pThreadKeyList )
-            g_pThreadKeyList->pPrev = pTls;
-
-        g_pThreadKeyList = pTls;
-
-        DosReleaseMutexSem( MutexLock);
-    }
-}
-
-static void RemoveKeyFromList( PTLS pTls )
-{
-    if ( pTls )
-    {
-        DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-        if ( pTls->pPrev )
-            pTls->pPrev->pNext = pTls->pNext;
-        else
-        {
-            OSL_ASSERT( pTls == g_pThreadKeyList );
-            g_pThreadKeyList = pTls->pNext;
-        }
-
-        if ( pTls->pNext )
-            pTls->pNext->pPrev = pTls->pPrev;
-        DosReleaseMutexSem( MutexLock);
-    }
-}
-
-void SAL_CALL _osl_callThreadKeyCallbackOnThreadDetach(void)
-{
-    PTLS	pTls;
-    
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    pTls = g_pThreadKeyList;
-    while ( pTls )
-    {
-        if ( pTls->pfnCallback )
-        {
-            void	*pValue	= (void*)*pTls->pulPtr;
-
-            if ( pValue )
-                pTls->pfnCallback( pValue );
-        }
-
-        pTls = pTls->pNext;
-    }
-    DosReleaseMutexSem( MutexLock);
-}
-
-/*****************************************************************************/
-/* osl_createThreadKey */
-/*****************************************************************************/
-oslThreadKey SAL_CALL osl_createThreadKey(oslThreadKeyCallbackFunction pCallback)
-{
-    PTLS	pTls = (PTLS)rtl_allocateMemory( sizeof(TLS) );
-
-    if ( pTls )
-    {
-        pTls->pfnCallback = pCallback;
-        if (DosAllocThreadLocalMemory(1, &pTls->pulPtr) != NO_ERROR)
-        {
-            rtl_freeMemory( pTls );
-            pTls = 0;
-        }
-        else 
-        {
-            *pTls->pulPtr = 0;
-            AddKeyToList( pTls );
-        }
-    }
-
-    return ((oslThreadKey)pTls);
-}
-
-/*****************************************************************************/
-/* osl_destroyThreadKey */
-/*****************************************************************************/
-void SAL_CALL osl_destroyThreadKey(oslThreadKey Key)
-{
-    if (Key != 0)
-    {
-        PTLS	pTls = (PTLS)Key;
-
-        RemoveKeyFromList( pTls );
-        DosFreeThreadLocalMemory(pTls->pulPtr);     
-        rtl_freeMemory( pTls );
-    }
-}
-
-/*****************************************************************************/
-/* osl_getThreadKeyData */
-/*****************************************************************************/
-void * SAL_CALL osl_getThreadKeyData(oslThreadKey Key)
-{
-    if (Key != 0)
-    {
-        PTLS	pTls = (PTLS)Key;
-
-        return ((void *) *pTls->pulPtr);
-    }
-
-    return (NULL);
-}
-
-/*****************************************************************************/
-/* osl_setThreadKeyData */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData)
-{
-    if (Key != 0)
-    {
-        PTLS	pTls = (PTLS)Key;
-        void*	pOldData = NULL;
-        BOOL	fSuccess = TRUE; //YD cannot fail
-
-        if ( pTls->pfnCallback )
-            pOldData = (void*)*pTls->pulPtr;
-
-        *pTls->pulPtr = (ULONG)pData;
-
-        if ( fSuccess && pTls->pfnCallback && pOldData )
-            pTls->pfnCallback( pOldData );
-
-        return (sal_Bool)(fSuccess != FALSE);
-    }
-
-    return (sal_False);
-}
-
-
-
-/*****************************************************************************/
-/* osl_getThreadTextEncoding */
-/*****************************************************************************/
-
-ULONG	g_dwTLSTextEncodingIndex = (ULONG)-1;
-
-sal_uInt32 SAL_CALL _GetACP( void)
-{
-    APIRET	rc;
-    ULONG  	aulCpList[8]  = {0};
-    ULONG	ulListSize;
-    
-    rc = DosQueryCp( sizeof( aulCpList), aulCpList, &ulListSize);	
-    if (rc)
-        return 437;	// in case of error, return codepage EN_US
-    // current codepage is first of list, others are the prepared codepages.
-    return aulCpList[0];
-}
-
-rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding(void)
-{
-    rtl_TextEncoding	_encoding;
-
-    if ( (ULONG)-1 == g_dwTLSTextEncodingIndex ) {
-        rtl_TextEncoding defaultEncoding;
-        const char *     pszEncoding;
-    
-        /* create thread specific data key */
-        g_dwTLSTextEncodingIndex = osl_createThreadKey( NULL);
-    
-        /* determine default text encoding */
-        pszEncoding = getenv ("SOLAR_USER_RTL_TEXTENCODING");
-        if (pszEncoding)
-            defaultEncoding = atoi(pszEncoding);
-        else
-            defaultEncoding = rtl_getTextEncodingFromWindowsCodePage( _GetACP());
-    
-        //OSL_ASSERT(defaultEncoding != RTL_TEXTENCODING_DONTKNOW);
-        //g_thread.m_textencoding.m_default = defaultEncoding;
-        osl_setThreadKeyData( g_dwTLSTextEncodingIndex, (void*)defaultEncoding);
-    }
-
-    _encoding = (rtl_TextEncoding)osl_getThreadKeyData( g_dwTLSTextEncodingIndex );
-    if (0 == _encoding) {
-        const char *     pszEncoding;
-        /* determine default text encoding */
-        pszEncoding = getenv ("SOLAR_USER_RTL_TEXTENCODING");
-        if (pszEncoding)
-            _encoding = atoi(pszEncoding);
-        else
-            _encoding = rtl_getTextEncodingFromWindowsCodePage( _GetACP());
-        /* save for future reference */
-        osl_setThreadKeyData( g_dwTLSTextEncodingIndex, (void*)_encoding);
-    }
-
-    return _encoding;
-}
-
-/*****************************************************************************/
-/* osl_getThreadTextEncoding */
-/*****************************************************************************/
-rtl_TextEncoding SAL_CALL osl_setThreadTextEncoding( rtl_TextEncoding Encoding )
-{
-    rtl_TextEncoding oldEncoding = osl_getThreadTextEncoding();
-
-    osl_setThreadKeyData( g_dwTLSTextEncodingIndex, (void*)Encoding);
-
-    return oldEncoding;
-}
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/time.c b/sal/osl/os2/time.c
deleted file mode 100644
index 2dae526d9..000000000
--- a/sal/osl/os2/time.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "system.h"
-
-#include <osl/diagnose.h>
-#include <osl/time.h>
-
-/* FIXME: detection should be done in configure script */
-#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || defined(LINUX)
-#define STRUCT_TM_HAS_GMTOFF 1
-
-#elif defined(SOLARIS)
-#define HAS_ALTZONE 1
-#endif
-
-/*--------------------------------------------------
- * osl_getSystemTime
- *-------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_getSystemTime(TimeValue* TimeValue)
-{
-    struct timeval tp;
-
-    /* FIXME: use higher resolution */
-    gettimeofday(&tp, NULL);
-
-    TimeValue->Seconds = tp.tv_sec;
-    TimeValue->Nanosec = tp.tv_usec * 1000;
-
-    return (sal_True);
-}
-
-
-/*--------------------------------------------------
- * osl_getDateTimeFromTimeValue
- *-------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime* pDateTime )
-{
-    struct tm *pSystemTime;
-    struct tm tmBuf;
-    time_t atime;
-
-    atime = (time_t)pTimeVal->Seconds;
-    
-    /* Convert time from type time_t to struct tm */
-    pSystemTime = gmtime_r( &atime, &tmBuf );
-
-
-    /* Convert struct tm to struct oslDateTime */
-    if ( pSystemTime != NULL )
-    {
-        pDateTime->NanoSeconds	=	pTimeVal->Nanosec;
-        pDateTime->Seconds		=	pSystemTime->tm_sec;
-        pDateTime->Minutes		=	pSystemTime->tm_min;
-        pDateTime->Hours		=	pSystemTime->tm_hour;
-        pDateTime->Day			=	pSystemTime->tm_mday;
-        pDateTime->DayOfWeek	=	pSystemTime->tm_wday;
-        pDateTime->Month		=	pSystemTime->tm_mon + 1;
-        pDateTime->Year			=	pSystemTime->tm_year  + 1900;
-
-        return sal_True;
-    }
-
-    return sal_False;
-}
-
-/*--------------------------------------------------
- * osl_getTimeValueFromDateTime
- *--------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValue* pTimeVal )
-{
-    struct tm	aTime;
-    time_t		nSeconds;
-
-    /* Convert struct oslDateTime to struct tm */
-    aTime.tm_sec  = pDateTime->Seconds;
-    aTime.tm_min  = pDateTime->Minutes;
-    aTime.tm_hour = pDateTime->Hours;
-    aTime.tm_mday = pDateTime->Day;
-    aTime.tm_wday = pDateTime->DayOfWeek;
-
-    if ( pDateTime->Month > 0 )
-        aTime.tm_mon = pDateTime->Month - 1;
-    else 
-        return sal_False;
-
-    if ( pDateTime->Year >= 1900 )
-        aTime.tm_year = pDateTime->Year - 1900;
-    else 
-        return sal_False;
-
-    aTime.tm_isdst = -1;
-    aTime.tm_wday  = 0;
-    aTime.tm_yday  = 0;
-
-    /* Convert time to calendar value */
-    nSeconds = mktime( &aTime );
-
-    /*
-     * mktime expects the struct tm to be in local timezone, so we have to adjust 
-     * the returned value to be timezone neutral.
-     */
-     
-    if ( nSeconds != (time_t) -1 )
-    {
-        time_t bias;
-        
-        /* timezone corrections */
-        tzset();
-
-#if defined(STRUCT_TM_HAS_GMTOFF)
-        /* members of struct tm are corrected by mktime */
-        bias = 0 - aTime.tm_gmtoff;
-
-#elif defined(HAS_ALTZONE)
-        /* check if daylight saving time is in effect */
-        bias = aTime.tm_isdst > 0 ? altzone : timezone;
-#else
-        /* exspect daylight saving time to be one hour */
-        bias = aTime.tm_isdst > 0 ? timezone - 3600 : timezone;
-#endif
-        
-        pTimeVal->Seconds = nSeconds;
-        pTimeVal->Nanosec = pDateTime->NanoSeconds;
-
-        if ( nSeconds > bias )
-            pTimeVal->Seconds -= bias;
-           
-        return sal_True;
-    }
-
-    return sal_False;
-}
-
-
-/*--------------------------------------------------
- * osl_getLocalTimeFromSystemTime
- *--------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal )
-{ 
-    struct tm *pLocalTime;
-    struct tm tmBuf;
-    time_t bias;
-    time_t atime;
-
-    atime = (time_t) pSystemTimeVal->Seconds;
-    pLocalTime = localtime_r( &atime, &tmBuf );
-
-#if defined(STRUCT_TM_HAS_GMTOFF)
-    /* members of struct tm are corrected by mktime */
-    bias = 0 - pLocalTime->tm_gmtoff;
-       
-#elif defined(HAS_ALTZONE)
-    /* check if daylight saving time is in effect */
-    bias = pLocalTime->tm_isdst > 0 ? altzone : timezone;
-#else
-    /* exspect daylight saving time to be one hour */
-    bias = pLocalTime->tm_isdst > 0 ? timezone - 3600 : timezone;
-#endif
-
-    if ( (sal_Int64) pSystemTimeVal->Seconds > bias )
-    {
-        pLocalTimeVal->Seconds = pSystemTimeVal->Seconds - bias;
-        pLocalTimeVal->Nanosec = pSystemTimeVal->Nanosec;
-
-        return sal_True;
-    }
-
-    return sal_False;
-}
-
-/*--------------------------------------------------
- * osl_getSystemTimeFromLocalTime
- *--------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal )
-{
-    struct tm *pLocalTime;
-    struct tm tmBuf;
-    time_t bias;
-    time_t atime;
-
-    atime = (time_t) pLocalTimeVal->Seconds;
-
-    /* Convert atime, which is a local time, to it's GMT equivalent. Then, get
-     * the timezone offset for the local time for the GMT equivalent time. Note
-     * that we cannot directly use local time to determine the timezone offset
-     * because GMT is the only reliable time that we can determine timezone
-     * offset from.
-     */
-
-    atime = mktime( gmtime_r( &atime, &tmBuf ) );
-    pLocalTime = localtime_r( &atime, &tmBuf );
-
-#if defined(STRUCT_TM_HAS_GMTOFF)
-    /* members of struct tm are corrected by mktime */
-    bias = 0 - pLocalTime->tm_gmtoff;
-       
-#elif defined(HAS_ALTZONE)
-    /* check if daylight saving time is in effect */
-    bias = pLocalTime->tm_isdst > 0 ? altzone : timezone;
-#else
-    /* exspect daylight saving time to be one hour */
-    bias = pLocalTime->tm_isdst > 0 ? timezone - 3600 : timezone;
-#endif
-
-    if ( (sal_Int64) pLocalTimeVal->Seconds + bias > 0 )
-    {
-        pSystemTimeVal->Seconds = pLocalTimeVal->Seconds + bias;
-        pSystemTimeVal->Nanosec = pLocalTimeVal->Nanosec;
-
-        return sal_True;
-    }
-
-    return sal_False; 
-}
-
-
-
-static struct timeval startTime;
-static sal_Bool bGlobalTimer = sal_False;
-
-sal_uInt32 SAL_CALL osl_getGlobalTimer()
-{
-  struct timeval currentTime;
-  sal_uInt32 nSeconds;
-
-  // FIXME: not thread safe !!
-  if ( bGlobalTimer == sal_False )
-  {
-      gettimeofday( &startTime, NULL );
-      bGlobalTimer=sal_True;
-  }
-  
-  gettimeofday( &currentTime, NULL );
-  
-  nSeconds = (sal_uInt32)( currentTime.tv_sec - startTime.tv_sec );
-
-  return ( nSeconds * 1000 ) + (long) (( currentTime.tv_usec - startTime.tv_usec) / 1000 );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/uunxapi.cxx b/sal/osl/os2/uunxapi.cxx
deleted file mode 100644
index ee106d1a2..000000000
--- a/sal/osl/os2/uunxapi.cxx
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
- #ifndef _LIMITS_H
- #include <limits.h>
- #endif
-  
- #ifndef _RTL_USTRING_HXX_
- #include <rtl/ustring.hxx>
- #endif
- 
- #ifndef _OSL_THREAD_H_
- #include <osl/thread.h>
- #endif
- 
- #ifndef _OSL_UUNXAPI_HXX_
- #include "uunxapi.hxx"
- #endif 
- 
- //###########################
- //access_u     
- int access_u(const rtl_uString* pustrPath, int mode)
- { 		
-    return access(OUStringToOString(pustrPath).getStr(), mode);
- }
- 
- //#########################
- //realpath_u  
- sal_Bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedName)
- {
-     rtl::OString fn = rtl::OUStringToOString(
-        rtl::OUString(const_cast<rtl_uString*>(pustrFileName)),
-        osl_getThreadTextEncoding());
-        
-    char  rp[PATH_MAX];
-    bool  bRet = realpath(fn.getStr(), rp); 
-    
-    if (bRet)
-    {
-        rtl::OUString resolved = rtl::OStringToOUString(
-            rtl::OString(static_cast<sal_Char*>(rp)),
-            osl_getThreadTextEncoding());
-            
-        rtl_uString_assign(ppustrResolvedName, resolved.pData);
-    }
-    return bRet;
- }
- 
- //#########################
- //lstat_u 
-  int lstat_u(const rtl_uString* pustrPath, struct stat* buf)
- { 	
-    return lstat(OUStringToOString(pustrPath).getStr(), buf);
- } 
- 
- //#########################
- // @see mkdir
- int mkdir_u(const rtl_uString* path, mode_t mode)
- {    
-    return mkdir(OUStringToOString(path).getStr(), mode);     
- }
- 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/uunxapi.h b/sal/osl/os2/uunxapi.h
deleted file mode 100644
index 1082a3e7a..000000000
--- a/sal/osl/os2/uunxapi.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
- #ifndef _OSL_UUNXAPI_H_
- #define _OSL_UUNXAPI_H_
-  
- #ifndef _UNISTD_H
- #include <unistd.h>
- #endif
- 
- #ifndef _STDLIB_H
- #include <stdlib.h>
- #endif
- 
- #ifndef _TYPES_H
- #include <sys/types.h>
- #endif
- 
- #ifndef _STAT_H
- #include <sys/stat.h>
- #endif
- 
- #ifndef _RTL_USTRING_H_
- #include <rtl/ustring.h>
- #endif
- 
- 
- #ifdef __cplusplus
- extern "C"
- {
- #endif
-    
- /* @see access */   
- int access_u(const rtl_uString* pustrPath, int mode);
- 
- /***********************************  
-  @descr
-  The return value differs from the
-  realpath function
-  
-  @returns sal_True on success else
-  sal_False
-  
-  @see realpath
-  **********************************/  
- sal_Bool realpath_u(
-     const rtl_uString* pustrFileName, 
-    rtl_uString** ppustrResolvedName);
-   
- /* @see lstat */
- int lstat_u(const rtl_uString* pustrPath, struct stat* buf);
- 
- /* @see mkdir */
- int mkdir_u(const rtl_uString* path, mode_t mode);
- 
- #ifdef __cplusplus
- }
- #endif
- 
- 
- #endif /* _OSL_UUNXAPI_H_ */
- 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/uunxapi.hxx b/sal/osl/os2/uunxapi.hxx
deleted file mode 100644
index fece9240b..000000000
--- a/sal/osl/os2/uunxapi.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
- #ifndef _OSL_UUNXAPI_HXX_
- #define _OSL_UUNXAPI_HXX_
-  
- #ifndef _OSL_UUNXAPI_H_
- #include "uunxapi.h"
- #endif
- 
- #ifndef _RTL_USTRING_HXX_
- #include <rtl/ustring.hxx>
- #endif
- 
- //###########################
- inline rtl::OString OUStringToOString(const rtl_uString* s)
- {
-    return rtl::OUStringToOString(
-        rtl::OUString(const_cast<rtl_uString*>(s)),
-        osl_getThreadTextEncoding());
- }
- 
- namespace osl
- {
- 
-     /***********************************
-      osl::access 
-  
-      @see access
-      **********************************/
-  
-     inline int access(const rtl::OUString& ustrPath, int mode)
-      {
-         return access_u(ustrPath.pData, mode);
-       }
- 
-     /***********************************
-      osl::realpath
-  
-      @descr
-      The return value differs from the
-      realpath function
-  
-      @returns sal_True on success else
-      sal_False
-  
-      @see realpath
-      **********************************/
-  
-     inline sal_Bool realpath(
-         const rtl::OUString& ustrFileName, 
-        rtl::OUString& ustrResolvedName)
-     {
-         return realpath_u(ustrFileName.pData, &ustrResolvedName.pData);
-      }
- 
-     
-     /***********************************
-      osl::lstat
-  
-      @see lstat
-      **********************************/
-     
-      inline int lstat(const rtl::OUString& ustrPath, struct stat& buf)
-      {
-           return lstat_u(ustrPath.pData, &buf);
-      }
-    
-    /***********************************
-          osl::mkdir
-          @see mkdir
-          **********************************/
-    inline int mkdir(const rtl::OUString& aPath, mode_t aMode)
-    {
-        return mkdir_u(aPath.pData, aMode);
-    }
-    
- } // end namespace osl
- 
- 
- #endif /* _OSL_UUNXAPI_HXX_ */
- 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
index 041a5e66e..0f89ddd06 100644
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@ -255,8 +255,9 @@ sal_Bool SAL_CALL osl_assertFailedLine (
     /* output message buffer */
     OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
 
-    /* if SAL backtrace for assertions is disabled, skip here */
-    if ( !getenv("DISABLE_SAL_BACKTRACE") )
+    /* should we output backtrace? */
+    char const * envBacktrace = getenv( "SAL_DIAGNOSE_BACKTRACE" );
+    if( envBacktrace != NULL && *envBacktrace != '\0' )
         osl_diagnose_backtrace_Impl(f);
 
     /* release lock and leave */
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 24f631115..6507d9cd6 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -59,13 +59,15 @@
 #endif /* MACOSX */
 
 #ifdef DEBUG_OSL_FILE
-#   define OSL_FILE_TRACE 0 ? (void)(0) : osl_trace
+#   define OSL_FILE_TRACE osl_trace
 #	define PERROR( a, b ) perror( a ); fprintf( stderr, b )
 #else
-#   define OSL_FILE_TRACE 1 ? (void)(0) : osl_trace
+#   define OSL_FILE_TRACE(fmt, ...)
 #	define PERROR( a, b )
 #endif
 
+
+
 /*******************************************************************
  *
  * FileHandle_Impl interface
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index eb7b94a3c..319971bad 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -39,6 +39,7 @@
 #include "file_path_helper.hxx"
 #include "file_url.h"
 #include "uunxapi.hxx"
+#include "readwrite_helper.h"
 
 #include <sys/types.h>
 #include <errno.h>
@@ -1010,29 +1011,27 @@ static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszD
         return nRet;
     }
 
-    size_t nWritten = 0;
     size_t nRemains = nSourceSize;
    
     if ( nRemains )
     {	
         /* mmap has problems, try the direct streaming */
         char pBuffer[0x7FFF];
-        size_t nRead = 0;
 
         do
         {
-            nRead = 0;
-            nWritten = 0;
-
             size_t nToRead = std::min( sizeof(pBuffer), nRemains );
-            nRead = read( SourceFileFD, pBuffer, nToRead );
-            if ( (size_t)-1 != nRead )
-                nWritten = write( DestFileFD, pBuffer, nRead );
+            sal_Bool succeeded = safeRead( SourceFileFD, pBuffer, nToRead );
+            if ( !succeeded )
+                break;
+
+            succeeded = safeWrite( DestFileFD, pBuffer, nToRead );
+            if ( !succeeded )
+                break;
 
-            if ( (size_t)-1 != nWritten )
-                nRemains -= nWritten;
+            nRemains -= nToRead;
         }
-        while( nRemains && (size_t)-1 != nRead && nRead == nWritten );
+        while( nRemains );
     }
 
     if ( nRemains )
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 21fbe37a0..858a7d7bb 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -39,12 +39,12 @@
 #include <unistd.h>
 
 #include "osl/file.hxx"
-#include <osl/security.h>
+#include <osl/security.hxx>
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <osl/process.h>
 
-#include <rtl/uri.h>
+#include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.h>
 #include "rtl/textcvt.h"
@@ -148,153 +148,100 @@ oslFileError SAL_CALL osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uStrin
 /*	osl_getSystemPathFromFileURL */
 /****************************************************************************/
 
-oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath )
+namespace {
+
+oslFileError getSystemPathFromFileUrl(
+    rtl::OUString const & url, rtl::OUString * path, bool homeAbbreviation)
 {
-    sal_Int32 nIndex;
-    rtl_uString * pTmp = NULL;
+    OSL_ASSERT(path != 0 && path->getLength() == 0);
 
-    sal_Unicode encodedSlash[3] = { '%', '2', 'F' };
-    sal_Unicode protocolDelimiter[3] = { ':', '/', '/' };
+    sal_Unicode const * p = url.getStr();
+    sal_Unicode const * end = p + url.getLength();
 
-    /* temporary hack: if already system path, return ustrFileURL */
-    /*
-    if( (sal_Unicode) '/' == ustrFileURL->buffer[0] ) 
-    {
-        OSL_FAIL( "osl_getSystemPathFromFileURL: input is already system path" );
-        rtl_uString_assign( pustrSystemPath, ustrFileURL );
-        return osl_File_E_None;
-    }
-    */
-        
     /* a valid file url may not start with '/' */
-    if( ( 0 == ustrFileURL->length ) || ( (sal_Unicode) '/' == ustrFileURL->buffer[0] ) )
-    {
+    if ((p == end) || (*p == UNICHAR_SLASH))
         return osl_File_E_INVAL;
-    }
-
-    /* Check for non file:// protocols */
 
-    nIndex = rtl_ustr_indexOfStr_WithLength( ustrFileURL->buffer, ustrFileURL->length, protocolDelimiter, 3 );
-    if ( -1 != nIndex && (4 != nIndex || 0 != rtl_ustr_ascii_shortenedCompare_WithLength( ustrFileURL->buffer, ustrFileURL->length,"file", 4 ) ) )
-    {
-        return osl_File_E_INVAL;
-    }
-    
-    /* search for encoded slashes (%2F) and decode every single token if we find one */
-
-    nIndex = 0;
-
-    if( -1 != rtl_ustr_indexOfStr_WithLength( ustrFileURL->buffer, ustrFileURL->length, encodedSlash, 3 ) )
-    {
-        rtl_uString * ustrPathToken = NULL;
-        sal_Int32 nOffset = 7;
-        
-        do
+    for (sal_Unicode const * p1 = p; p1 != end; ++p1) {
+        if (*p1 == '?' || *p1 == '#' ||
+            (*p1 == '%' && end - p1 >= 3 && p1[1] == '2' &&
+             (p1[2] == 'F' || p1[2] == 'f')))
         {
-            nOffset += nIndex;
-
-            /* break url down in '/' devided tokens tokens */
-            nIndex = rtl_ustr_indexOfChar_WithLength( ustrFileURL->buffer + nOffset, ustrFileURL->length - nOffset, (sal_Unicode) '/' );
-            
-            /* copy token to new string */
-            rtl_uString_newFromStr_WithLength( &ustrPathToken, ustrFileURL->buffer + nOffset, 
-                -1 == nIndex ? ustrFileURL->length - nOffset : nIndex++ );
-
-            /* decode token */
-            rtl_uriDecode( ustrPathToken, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &pTmp );
-            
-            /* the result should not contain any '/' */
-            if( -1 != rtl_ustr_indexOfChar_WithLength( pTmp->buffer, pTmp->length, (sal_Unicode) '/' ) )
-            {
-                rtl_uString_release( pTmp );
-                rtl_uString_release( ustrPathToken );
-
-                return osl_File_E_INVAL;
-            }
-                
-        } while( -1 != nIndex );
-
-        /* release temporary string and restore index variable */
-        rtl_uString_release( ustrPathToken );
-        nIndex = 0;        
+            return osl_File_E_INVAL;
+        }
     }
- 
-    /* protocol and server should not be encoded, so decode the whole string */
-    rtl_uriDecode( ustrFileURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &pTmp );
-    
-    /* check if file protocol specified */    
-    /* FIXME: use rtl_ustr_ascii_shortenedCompareIgnoreCase_WithLength when available */
-    if( 7 <= pTmp->length )
-    {
-        rtl_uString * pProtocol = NULL;
-        rtl_uString_newFromStr_WithLength( &pProtocol, pTmp->buffer, 7 );
-        
-        /* protocol is case insensitive */
-        rtl_ustr_toAsciiLowerCase_WithLength( pProtocol->buffer, pProtocol->length );
-        
-        if( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pProtocol->buffer, pProtocol->length,"file://", 7 ) )
-            nIndex = 7;
-            
-        rtl_uString_release( pProtocol );
+    sal_Unicode const * p1 = p;
+    while (p1 != end && *p1 != ':' && *p1 != '/') {
+        ++p1;
     }
-     
-    /* skip "localhost" or "127.0.0.1" if "file://" is specified */
-    /* FIXME: use rtl_ustr_ascii_shortenedCompareIgnoreCase_WithLength when available */
-    if( nIndex && ( 10 <= pTmp->length - nIndex ) )
-    {
-        rtl_uString * pServer = NULL;
-        rtl_uString_newFromStr_WithLength( &pServer, pTmp->buffer + nIndex, 10 );
-
-        /* server is case insensitive */
-        rtl_ustr_toAsciiLowerCase_WithLength( pServer->buffer, pServer->length );
-        
-        if( ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pServer->buffer, pServer->length,"localhost/", 10 ) ) ||
-            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pServer->buffer, pServer->length,"127.0.0.1/", 10 ) ) )
+    if (p1 != end && *p1 == ':') {
+        if (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
+                p, p1 - p, RTL_CONSTASCII_STRINGPARAM("file")) !=
+            0)
         {
-            /* don't exclude the '/' */
-            nIndex += 9;
+            return osl_File_E_INVAL;
         }
-
-        rtl_uString_release( pServer );
+        p = p1 + 1;
     }
-                
-    if( nIndex )
-        rtl_uString_newFromStr_WithLength( &pTmp, pTmp->buffer + nIndex, pTmp->length - nIndex );
-
-    /* check if system path starts with ~ or ~user and replace it with the appropriate home dir */
-    if( (sal_Unicode) '~' == pTmp->buffer[0] )
-    {
-        /* check if another user is specified */
-        if( ( 1 == pTmp->length ) || ( (sal_Unicode)'/' == pTmp->buffer[1] ) )
-        {
-            rtl_uString *pTmp2 = NULL;
-
-            /* osl_getHomeDir returns file URL */
-            osl_getHomeDir( osl_getCurrentSecurity(), &pTmp2 );
-
-            /* remove "file://" prefix */
-            rtl_uString_newFromStr_WithLength( &pTmp2, pTmp2->buffer + 7, pTmp2->length - 7 );
-
-            /* replace '~' in original string */             
-            rtl_uString_newReplaceStrAt( &pTmp, pTmp, 0, 1, pTmp2 );
-            rtl_uString_release( pTmp2 );
-        }
-
-        else
+    if (end - p >= 2 && p[0] == '/' && p[1] == '/') {
+        p += 2;
+        sal_Int32 i = rtl_ustr_indexOfChar_WithLength(p, end - p, '/');
+        p1 = i < 0 ? end : p + i;
+        if (p1 != p &&
+            (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
+                 p, p1 - p, RTL_CONSTASCII_STRINGPARAM("localhost")) !=
+             0) &&
+            rtl_ustr_ascii_compare_WithLength(p, p1 - p, "127.0.0.1") != 0)
         {
-            /* FIXME: replace ~user with users home directory */
             return osl_File_E_INVAL;
         }
+        p = p1;
+        if (p == end) {
+            *path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+            return osl_File_E_None;
+        }
     }
-
-    /* temporary check for top 5 wrong usage strings (which are valid but unlikly filenames) */
-    /*
-    OSL_ASSERT( !findWrongUsage( pTmp->buffer, pTmp->length ) );
-    */
-        
-    *pustrSystemPath = pTmp;
+    if (homeAbbreviation && end - p >= 2 && p[0] == '/' && p[1] == '~') {
+        p += 2;
+        sal_Int32 i = rtl_ustr_indexOfChar_WithLength(p, end - p, '/');
+        p1 = i < 0 ? end : p + i;
+        if (p1 == p) {
+            rtl::OUString home;
+            if (!osl::Security().getHomeDir(home)) {
+                return osl_File_E_INVAL;
+            }
+            oslFileError e = getSystemPathFromFileUrl(home, path, false);
+            if (e != osl_File_E_None) {
+                return e;
+            }
+        } else {
+            return osl_File_E_INVAL; //TODO
+        }
+        p = p1;
+    }
+    rtl::OUString d(
+        rtl::Uri::decode(
+            rtl::OUString(p, end - p), rtl_UriDecodeWithCharset,
+            RTL_TEXTENCODING_UTF8));
+    if (d.indexOf(0) >=0) {
+        return osl_File_E_INVAL;
+    }
+    *path += d;
     return osl_File_E_None;
 }
+}
+
+oslFileError osl_getSystemPathFromFileURL(
+    rtl_uString * pustrFileURL, rtl_uString ** ppustrSystemPath)
+{
+    rtl::OUString p;
+    oslFileError e = getSystemPathFromFileUrl(
+        rtl::OUString(pustrFileURL), &p, true);
+    if (e == osl_File_E_None) {
+        rtl_uString_assign(ppustrSystemPath, p.pData);
+    }
+    return e;
+}
 
 /****************************************************************************/
 /*	osl_getFileURLFromSystemPath */
@@ -815,7 +762,7 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc
         
     // try to interpret search path as file url else assume it's a system path list
     rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrFilePath), file_path);
-    if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))
+    if (FileBase::E_INVAL == rc)
         file_path = ustrFilePath; 
     else if (FileBase::E_None != rc)
         return oslFileError(rc);
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index 94e817713..cc3008914 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -59,7 +59,6 @@
 #include <sys/mnttab.h>
 #include <sys/statvfs.h>
 #define  HAVE_STATFS_H
-#include <sys/fs/ufs_quota.h>
 static const sal_Char* MOUNTTAB="/etc/mnttab";
 
 #elif defined(LINUX)
@@ -67,7 +66,6 @@ static const sal_Char* MOUNTTAB="/etc/mnttab";
 #include <mntent.h>
 #include <sys/vfs.h>
 #define  HAVE_STATFS_H
-#include <sys/quota.h>
 static const sal_Char* MOUNTTAB="/etc/mtab";
 
 #elif defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY)
@@ -75,7 +73,6 @@ static const sal_Char* MOUNTTAB="/etc/mtab";
 #include <sys/param.h>
 #include <sys/ucred.h>
 #include <sys/mount.h>
-#include <ufs/ufs/quota.h>
 #define  HAVE_STATFS_H
 
 /* No mounting table on *BSD
@@ -84,7 +81,6 @@ static const sal_Char* MOUNTTAB="/etc/mtab";
 
 #elif defined(MACOSX)
 
-#include <ufs/ufs/quota.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #define HAVE_STATFS_H
@@ -426,7 +422,7 @@ oslFileError osl_unmountVolumeDevice( oslVolumeDeviceHandle Handle )
 
             tErr = osl_unmountFloppy(Handle);
 
-            OSL_ENSURE( tErr, "osl_unmountvolumeDevice: CWD was set to volume mount point" );
+            OSL_ENSURE( tErr, "osl_unmountVolumeDevice: CWD was set to volume mount point" );
         }
     }
 
@@ -1118,45 +1114,45 @@ osl_isFloppyMounted (oslVolumeDeviceHandleImpl* pDevice)
 
 /******************************************************************************
  *
- *                  MAC OS X FLOPPY FUNCTIONS
+ * Dummy floppy functions: no stinking floppies
  *
  *****************************************************************************/
 
-#if (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || \
+#if (defined(MACOSX) || defined(IOS) || defined(ANDROID) || defined(NETBSD) || defined(FREEBSD) || \
     defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY))
 static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
 {
     (void)pszPath;
     return NULL;
 }
-#endif /* MACOSX */
+#endif
 
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || \
+#if ( defined(MACOSX) || defined(IOS) || defined(ANDROID) || defined(NETBSD) || defined(FREEBSD) || \
     defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY))
 static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
 {
     (void)hFloppy;
     return osl_File_E_BUSY;
 }
-#endif /* MACOSX */
+#endif
 
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || \
+#if ( defined(MACOSX) || defined(IOS) || defined(ANDROID) || defined(NETBSD) || defined(FREEBSD) || \
     defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY))
 static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
 {
     (void)hFloppy;
     return osl_File_E_BUSY;
 }
-#endif /* MACOSX */
+#endif
 
-#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) )
+#if ( defined(NETBSD) || defined(IOS) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) )
 static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
 {
     return sal_False;
 }
 #endif /* NETBSD || FREEBSD || OPENBSD */
 
-#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) )
+#if ( defined(NETBSD) || defined(IOS) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) )
 static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
 {
     return sal_False;
diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c
index e5bb3ea1e..a32f67c11 100644
--- a/sal/osl/unx/interlck.c
+++ b/sal/osl/unx/interlck.c
@@ -149,17 +149,6 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
     return --nCount;
 #endif
 }
-
-#elif ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
-oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
-{
-    return __sync_add_and_fetch(pCount, 1);
-}
-
-oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
-{
-    return __sync_sub_and_fetch(pCount, 1);
-}
 #elif ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
 oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
 {
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
index 6fb676882..2ec11e16f 100644
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -41,6 +41,7 @@ PROJECTPCHSOURCE=cont_pch
 
 TARGETTYPE=CUI
 
+ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
@@ -48,6 +49,10 @@ TARGETTYPE=CUI
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX+=-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 SLOFILES= \
@@ -78,7 +83,8 @@ SLOFILES= \
             $(SLO)$/file_volume.obj \
             $(SLO)$/uunxapi.obj\
             $(SLO)$/process_impl.obj\
-            $(SLO)$/salinit.obj
+            $(SLO)$/salinit.obj \
+            $(SLO)$/readwrite_helper.obj
 
 OBJFILES=   $(OBJ)$/conditn.obj  \
             $(OBJ)$/diagnose.obj \
@@ -107,10 +113,11 @@ OBJFILES=   $(OBJ)$/conditn.obj  \
             $(OBJ)$/file_volume.obj \
             $(OBJ)$/uunxapi.obj\
             $(OBJ)$/process_impl.obj\
-            $(OBJ)$/salinit.obj
+            $(OBJ)$/salinit.obj \
+            $(OBJ)$/readwrite_helper.obj
             
 
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS"
 SLOFILES += $(SLO)$/osxlocale.obj
 .ENDIF
 
@@ -131,6 +138,10 @@ APP1STDLIBS+=-lC
 CFLAGS+=-DSAL_ENABLE_CRASH_REPORT
 .ENDIF
 
+.IF "$(OS)" == "IOS"
+CFLAGS+=-DNO_DL_FUNCTIONS -DNO_CHILD_PROCESSES
+.ENDIF
+
 .INCLUDE :  target.mk
 
 .IF "$(OS)$(CPU)"=="SOLARISU" || "$(OS)$(CPU)"=="SOLARISS" || "$(OS)$(CPU)"=="NETBSDS" || "$(OS)$(CPU)"=="LINUXS"
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index e2e06d3ef..a5beea9f6 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -112,7 +112,11 @@ sal_Bool SAL_CALL
 osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
 {
     (void) pModuleName; /* avoid warning about unused parameter */
+#ifndef NO_DL_FUNCTIONS
     *pResult = (oslModule) RTLD_DEFAULT;
+#else
+    *pResult = NULL;
+#endif
     return sal_True;
 }
 
@@ -204,6 +208,8 @@ osl_getFunctionSymbol(oslModule module, rtl_uString *puFunctionSymbolName)
 sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibraryUrl)
 {
     sal_Bool result = sal_False;
+/* Bah, we do want to use dladdr here also on iOS, I think? */
+#if !defined(NO_DL_FUNCTIONS) || defined(IOS)
 #if defined(AIX)
     int i;
     int size = 4 * 1024;
@@ -295,6 +301,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr
         }
     }
 #endif
+#endif
     return result;
 }
 
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index a52874230..563aae980 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -32,17 +32,17 @@
 #include <rtl/memory.h>
 
 #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \
-    defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \
+    defined(FREEBSD) || defined(MACOSX)  || defined(IOS) || defined(OPENBSD) || \
     defined(DRAGONFLY)
 #include <pthread.h>
-#ifndef MACOSX
+#if !defined(MACOSX) && !defined(IOS)
  #include <locale.h>
  #include <langinfo.h>
 #else
 #include <osl/module.h>
 #include <osl/thread.h>
-#endif	/* !MACOSX */
-#endif	/* LINUX || SOLARIS || NETBSD || MACOSX */
+#endif	/* !MACOSX && !IOS */
+#endif	/* LINUX || SOLARIS || NETBSD || MACOSX || IOS */
 
 #include <string.h>
 
@@ -855,7 +855,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
     return RTL_TEXTENCODING_DONTKNOW;
 }
 
-#ifdef MACOSX
+#if defined(MACOSX) || defined(IOS)
 #include "system.h"
 
 /* OS X locale discovery function */
diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index 26434ef4e..37b34b200 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -33,7 +33,9 @@
 #include <assert.h>
 
 #include <premac.h>
+#ifndef IOS
 #include <CoreServices/CoreServices.h>
+#endif
 #include <CoreFoundation/CoreFoundation.h>
 #include <postmac.h>
 
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index 1ae6fb4fc..75569e5cf 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -166,6 +166,8 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
     struct sockaddr_un addr;
 
     sal_Char  	 name[PATH_MAX + 1];
+    size_t nNameLength = 0;
+    int bNameTooLong = 0;
     oslPipe  pPipe;
 
     if (access(PIPEDEFAULTPATH, R_OK|W_OK) == 0)
@@ -176,26 +178,41 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
     {
         strncpy(name, PIPEALTERNATEPATH, sizeof(name));
     }
+    name[sizeof(name) - 1] = '\0';  // ensure the string is NULL-terminated
+    nNameLength = strlen(name);
+    bNameTooLong = nNameLength > sizeof(name) - 2;
 
+    if (!bNameTooLong)
+    {
+        size_t nRealLength = 0;
 
-    strncat(name, "/", sizeof(name));
+        strcat(name, "/");
+        ++nNameLength;
 
-    if (Security)
-    {
-        sal_Char Ident[256];
+        if (Security)
+        {
+            sal_Char Ident[256];
 
-        Ident[0] = '\0';
+            Ident[0] = '\0';
 
-        OSL_VERIFY(osl_psz_getUserIdent(Security, Ident, sizeof(Ident)));
+            OSL_VERIFY(osl_psz_getUserIdent(Security, Ident, sizeof(Ident)));
 
-        snprintf(&name[strlen(name)], sizeof(name), SECPIPENAMEMASK, Ident, pszPipeName);
+            nRealLength = snprintf(&name[nNameLength], sizeof(name) - nNameLength, SECPIPENAMEMASK, Ident, pszPipeName);
+        }
+        else
+        {
+            nRealLength = snprintf(&name[nNameLength], sizeof(name) - nNameLength, PIPENAMEMASK, pszPipeName);
+        }
+
+        bNameTooLong = nRealLength > sizeof(name) - nNameLength - 1;
     }
-    else
+
+    if (bNameTooLong)
     {
-        snprintf(&name[strlen(name)], sizeof(name), PIPENAMEMASK, pszPipeName);
+        OSL_TRACE("osl_createPipe: pipe name too long");
+        return NULL;
     }
 
-
     /* alloc memory */
     pPipe= __osl_createPipeImpl();
 
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index 7d65b5499..307cee5a5 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -64,6 +64,7 @@
 #include <grp.h>
 
 #include "procimpl.h"
+#include "readwrite_helper.h"
 #include "sockimpl.h"
 #include "secimpl.h"
 
@@ -71,7 +72,7 @@
 #define MAX_ARGS        255
 #define MAX_ENVS        255
 
-#if defined(MACOSX) || defined(IORESOURCE_TRANSFER_BSD) || defined(AIX)
+#if defined(MACOSX) || defined(IOS) || defined(IORESOURCE_TRANSFER_BSD) || defined(AIX)
 #define CONTROLLEN (sizeof(struct cmsghdr) + sizeof(int))
 #endif
 
@@ -282,15 +283,15 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
         OSL_TRACE("sendFdPipe : sending failed (%s)",strerror(errno));
     }
 
-    nSend=read(PipeFD,&RetCode,sizeof(RetCode));
+    bRet = safeRead(PipeFD, &RetCode, sizeof(RetCode));
 
-    if ( nSend > 0 && RetCode == 1 )
+    if ( bRet && RetCode == 1 )
     {
         OSL_TRACE("sendFdPipe : resource was received\n");
     }
     else
     {
-        OSL_TRACE("sendFdPipe : resource wasn't received\n");        
+        OSL_TRACE("sendFdPipe : resource wasn't received (error %s)\n", strerror(errno));
     }    
     
 #if defined(IOCHANNEL_TRANSFER_BSD_RENO)
@@ -374,7 +375,8 @@ static oslSocket receiveFdPipe(int PipeFD)
     }
 
     OSL_TRACE("receiveFdPipe : writing back %i",nRetCode);
-    nRead=write(PipeFD,&nRetCode,sizeof(nRetCode));
+    if ( !safeWrite(PipeFD, &nRetCode, sizeof(nRetCode)) )
+        OSL_TRACE("write failed (%s)", strerror(errno));
 
     if ( nRead < 0 )
     {
@@ -453,6 +455,9 @@ static void ChildStatusProc(void *pData)
        in our child process */
     memcpy(&data, pData, sizeof(data));
 
+#ifdef NO_CHILD_PROCESSES
+#define fork() (errno = EINVAL, -1)
+#endif
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == -1)
         status = errno;
 
@@ -476,7 +481,6 @@ static void ChildStatusProc(void *pData)
     {
         /* Child */
         int chstatus = 0;
-        sal_Int32 nWrote;
 
         if (channel[0] != -1) close(channel[0]);
 
@@ -554,11 +558,11 @@ static void ChildStatusProc(void *pData)
         OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);
         
         /* if we reach here, something went wrong */
-        nWrote = write(channel[1], &errno, sizeof(errno));
-        if (nWrote != sizeof(errno))
+        if ( !safeWrite(channel[1], &errno, sizeof(errno)) )
             OSL_TRACE("sendFdPipe : sending failed (%s)",strerror(errno));
 
-        if (channel[1] != -1) close(channel[1]);
+        if ( channel[1] != -1 )
+            close(channel[1]);
 
         _exit(255);
     }
@@ -1178,7 +1182,7 @@ sal_Bool osl_getProcStat(pid_t pid, struct osl_procStat* procstat)
         char* tmp=0;
         char prstatbuf[512];
         memset(prstatbuf,0,512);
-        bRet = read(fd,prstatbuf,511) == 511;
+        bRet = safeRead(fd, prstatbuf, 511);
 
         close(fd);
         /*printf("%s\n\n",prstatbuf);*/
@@ -1232,7 +1236,7 @@ sal_Bool osl_getProcStatus(pid_t pid, struct osl_procStat* procstat)
         char* tmp=0;
         char prstatusbuf[512];
         memset(prstatusbuf,0,512);
-        bRet = read(fd,prstatusbuf,511) == 511;
+        bRet = safeRead(fd, prstatusbuf, 511);
 
         close(fd);
 
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index c56c8bbaa..4a245c308 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -28,6 +28,7 @@
 
 
 #include "system.h"
+#include "readwrite_helper.h"
 
 #include <osl/diagnose.h>
 #include <osl/profile.h>
@@ -440,7 +441,6 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
 
 static sal_Bool writeProfileImpl(osl_TFile* pFile)
 {
-    int BytesWritten=0;
 #if OSL_DEBUG_LEVEL > 1
     unsigned int nLen=0;
 #endif
@@ -462,19 +462,12 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
     OSL_ASSERT(nLen == (pFile->m_nWriteBufLen - pFile->m_nWriteBufFree));
 #endif
 
-    BytesWritten = write(pFile->m_Handle, pFile->m_pWriteBuf, pFile->m_nWriteBufLen - pFile->m_nWriteBufFree);
-
-    if ( BytesWritten <= 0 )
+    if ( !safeWrite(pFile->m_Handle, pFile->m_pWriteBuf, pFile->m_nWriteBufLen - pFile->m_nWriteBufFree) )
     {
         OSL_TRACE("write failed '%s'\n",strerror(errno));
         return (sal_False);
     }
 
-#if OSL_DEBUG_LEVEL > 1
-    OSL_ASSERT(
-        BytesWritten >= 0 && SAL_INT_CAST(unsigned int, BytesWritten) == nLen);
-#endif
-
     free(pFile->m_pWriteBuf);
     pFile->m_pWriteBuf=0;
     pFile->m_nWriteBufLen=0;
diff --git a/sal/osl/unx/readwrite_helper.c b/sal/osl/unx/readwrite_helper.c
new file mode 100644
index 000000000..e2598953e
--- /dev/null
+++ b/sal/osl/unx/readwrite_helper.c
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ *
+ * The Initial Developer of the Original Code is
+ *       Julien Chaffraix <julien.chaffraix@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Major Contributor(s):
+ *
+ * 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.
+ */
+
+#include "readwrite_helper.h"
+
+#include <osl/diagnose.h>
+#include <system.h>
+
+sal_Bool safeWrite(int fd, void* data, sal_uInt32 dataSize)
+{
+    sal_Int32 nToWrite = dataSize;
+    unsigned char* dataToWrite = data;
+
+    // Check for overflow as we convert a signed to an unsigned.
+    OSL_ASSERT(dataSize == (sal_uInt32)nToWrite);
+    while ( nToWrite ) {
+        sal_Int32 nWritten = write(fd, dataToWrite, nToWrite);
+        if ( nWritten < 0 ) {
+            if ( errno == EINTR )
+                continue;
+
+            return sal_False;
+
+        }
+
+        OSL_ASSERT(nWritten > 0);
+        nToWrite -= nWritten;
+        dataToWrite += nWritten;
+    }
+
+    return sal_True;
+}
+
+sal_Bool safeRead( int fd, void* buffer, sal_uInt32 count )
+{
+    sal_Int32 nToRead = count;
+    unsigned char* bufferForReading = buffer;
+
+    // Check for overflow as we convert a signed to an unsigned.
+    OSL_ASSERT(count == (sal_uInt32)nToRead);
+    while ( nToRead ) {
+        sal_Int32 nRead = read(fd, bufferForReading, nToRead);
+        if ( nRead < 0 ) {
+            // We were interrupted before reading, retry.
+            if (errno == EINTR)
+                continue;
+
+            return sal_False;
+        }
+
+        // If we reach the EOF, we consider this a partial transfer and thus
+        // an error.
+        if ( nRead == 0 )
+            return sal_False;
+
+        nToRead -= nRead;
+        bufferForReading += nRead;
+    }
+
+    return sal_True;
+}
diff --git a/sal/osl/unx/readwrite_helper.h b/sal/osl/unx/readwrite_helper.h
new file mode 100644
index 000000000..c96c4e3bf
--- /dev/null
+++ b/sal/osl/unx/readwrite_helper.h
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ *
+ * The Initial Developer of the Original Code is
+ *       Julien Chaffraix <julien.chaffraix@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Major Contributor(s):
+ *
+ * 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.
+ */
+
+#include <sal/types.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+sal_Bool safeWrite( int fd, void* data, sal_uInt32 dataSize );
+
+// This function *will* read |count| bytes from |fd|, busy looping
+// if needed. Don't use it when you don't know if you can request enough
+// data. It will return sal_False for any partial transfer or error.
+sal_Bool safeRead( int fd, void* buffer, sal_uInt32 count );
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index dd12d2f1c..9503443fe 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -30,7 +30,6 @@
 #include "sal/config.h"
 
 #include "osl/process.h"
-#include "sal/main.h"
 #include "sal/types.h"
 
 extern "C" {
diff --git a/sal/osl/unx/security.c b/sal/osl/unx/security.c
index 8cda0876e..3a42b66d4 100644
--- a/sal/osl/unx/security.c
+++ b/sal/osl/unx/security.c
@@ -48,6 +48,11 @@
 
 #include "secimpl.h"
 
+#ifdef ANDROID
+#define getpwuid_r(uid, pwd, buf, buflen, result) (*(result) = getpwuid(uid), (*(result) ? (memcpy (buf, *(result), sizeof (struct passwd)), 0) : errno))
+#endif
+
+
 static oslSecurityError SAL_CALL 
 osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd,
                   oslSecurity* pSecurity);
@@ -360,18 +365,37 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire
 
 #ifndef MACOSX
 
+#define DOT_CONFIG "/.config"
+
 static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
 {
     sal_Char *pStr = getenv("XDG_CONFIG_HOME");
     
     if ((pStr == NULL) || (strlen(pStr) == 0) ||
         (access(pStr, 0) != 0))
-        return (osl_psz_getHomeDir(Security, pszDirectory, nMax));
+    {
+        // a default equal to $HOME/.config should be used.
+        if (!osl_psz_getHomeDir(Security, pszDirectory, nMax))
+            return sal_False;
+        size_t n = strlen(pszDirectory);
+        if (n + sizeof(DOT_CONFIG) < nMax)
+        {
+            strncpy(pszDirectory+n, DOT_CONFIG, sizeof(DOT_CONFIG));
+            if (access(pszDirectory, 0) != 0)
+            {
+                // resort to HOME
+                pszDirectory[n] = '\0';
+            }
+        }
+    }
+    else
+        strncpy(pszDirectory, pStr, nMax);
 
-    strncpy(pszDirectory, pStr, nMax);
     return sal_True;
 }
 
+#undef DOT_CONFIG
+
 #else
 
 /*
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c
index 71eefcaee..1b8a5e51d 100644
--- a/sal/osl/unx/signal.c
+++ b/sal/osl/unx/signal.c
@@ -820,22 +820,24 @@ static int ReportCrash( int Signal )
 
 static void PrintStack( int sig )
 {
-#if ! defined(MACOSX) || defined(INCLUDE_BACKTRACE)
+#ifdef INCLUDE_BACKTRACE
     void *buffer[MAX_STACK_FRAMES];
     int size = backtrace( buffer, SAL_N_ELEMENTS(buffer) );
 #endif
 
     fprintf( stderr, "\n\nFatal exception: Signal %d\n", sig );
 
-#if defined(MACOSX) && ! defined(INCLUDE_BACKTRACE)
+#if defined( MACOSX ) && !defined( INCLUDE_BACKTRACE )
     fprintf( stderr, "Please turn on Enable Crash Reporting and\nAutomatic Display of Crashlogs in the Console application\n" );
 #else
+#ifdef INCLUDE_BACKTRACE
     if ( size > 0 )
     {
         fputs( "Stack:\n", stderr );
         backtrace_symbols_fd( buffer, size, fileno(stderr) );
     }
 #endif
+#endif
 }
 
 static oslSignalAction CallSignalHandler(oslSignalInfo *pInfo)
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index b9fb92e42..bcf5a72f8 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -791,7 +791,7 @@ static struct hostent* _osl_gethostbyname_r (
     const char *name, struct hostent *result,
     char *buffer, int buflen, int *h_errnop)
 {
-#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) || defined(DRAGONFLY)
+#if defined(LINUX) || defined(ANDROID) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) || defined(DRAGONFLY)
     struct hostent *__result; /* will be the same as result */
     int __error;
     __error = gethostbyname_r (name, result, buffer, buflen,
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 24d63e135..da9af6a7c 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -33,160 +33,6 @@
 static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* struct passwd differs on some platforms */
-#if defined NETBSD && (__NetBSD_Version__ < 299001000)
-struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
-{
-      struct passwd* res;
-
-      pthread_mutex_lock(&getrtl_mutex);
-
-      if ( (res = getpwnam(name)) )
-      {
-        int nname, npasswd, nclass, ngecos, ndir;
-
-        nname= strlen(res->pw_name)+1;
-        npasswd= strlen(res->pw_passwd)+1;
-        nclass= strlen(res->pw_class)+1;
-        ngecos= strlen(res->pw_gecos)+1;
-        ndir= strlen(res->pw_dir)+1;
-
-        if (nname+npasswd+nclass+ngecos
-                +ndir+strlen(res->pw_shell) < size) 
-        {
-            memcpy(s, res, sizeof(struct passwd));
-
-            strcpy(buffer, res->pw_name);
-              s->pw_name = buffer;
-            buffer += nname;
-
-            strcpy(buffer, res->pw_passwd);
-              s->pw_passwd = buffer;
-            buffer += npasswd;
-
-            strcpy(buffer, res->pw_class);
-              s->pw_class = buffer;
-            buffer += nclass;
-
-            strcpy(buffer, res->pw_gecos);
-              s->pw_gecos = buffer;
-            buffer += ngecos;
-
-            strcpy(buffer, res->pw_dir);
-              s->pw_dir = buffer;
-            buffer += ndir;
-
-            strcpy(buffer, res->pw_shell);
-              s->pw_shell = buffer;
-
-               res = s;
-        } 
-        else 
-            res = 0;
-    }  	
-      
-    pthread_mutex_unlock(&getrtl_mutex);
-
-        return(res);
-}
-
-int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-           size_t buflen, struct passwd **result)
-{
-  struct passwd* res;
-  int retval = 0;
-
-  pthread_mutex_lock(&getrtl_mutex);
-
-  if ( (res = getpwuid(uid)) )
-  {
-    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-
-    pw_name = strlen(res->pw_name)+1;
-    pw_passwd = strlen(res->pw_passwd)+1;
-    pw_class = strlen(res->pw_class)+1;
-    pw_gecos = strlen(res->pw_gecos)+1;
-    pw_dir = strlen(res->pw_dir)+1;
-    pw_shell = strlen(res->pw_shell)+1;
-
-    if (pw_name+pw_passwd+pw_class+pw_gecos
-                                 +pw_dir+pw_shell < buflen)
-    {
-      memcpy(pwd, res, sizeof(struct passwd));
-
-      strncpy(buffer, res->pw_name, pw_name);
-      pwd->pw_name = buffer;
-      buffer += pw_name;
-
-      strncpy(buffer, res->pw_passwd, pw_passwd);
-      pwd->pw_passwd = buffer;
-      buffer += pw_passwd;
-
-      strncpy(buffer, res->pw_class, pw_class);
-      pwd->pw_class = buffer;
-      buffer += pw_class;
-
-      strncpy(buffer, res->pw_gecos, pw_gecos);
-      pwd->pw_gecos = buffer;
-      buffer += pw_gecos;
-
-      strncpy(buffer, res->pw_dir, pw_dir);
-      pwd->pw_dir = buffer;
-      buffer += pw_dir;
-
-      strncpy(buffer, res->pw_shell, pw_shell);
-      pwd->pw_shell = buffer;
-      buffer += pw_shell;
-
-      *result = pwd ;
-      retval = 0 ;
-
-    }
-    else
-        retval =  ENOMEM;
-  }
-  else
-      retval = errno ;
-
-  pthread_mutex_unlock(&getrtl_mutex);
-
-  return retval;
-}
-
-struct tm *localtime_r(const time_t *timep, struct tm *buffer)
-{
-    struct tm* res;
-
-      pthread_mutex_lock(&getrtl_mutex);
-
-    if ( (res = localtime(timep)))
-    {
-        memcpy(buffer, res, sizeof(struct tm));
-        res = buffer;
-    }
-
-    pthread_mutex_unlock(&getrtl_mutex);
-
-    return res;
-}
-
-struct tm *gmtime_r(const time_t *timep, struct tm *buffer)
-{
-    struct tm* res;
-
-      pthread_mutex_lock(&getrtl_mutex);
-
-    if ( (res = gmtime(timep)) )
-    {
-        memcpy(buffer, res, sizeof(struct tm));
-        res = buffer;
-    }
-
-    pthread_mutex_unlock(&getrtl_mutex);
-
-    return res;
-}
-#endif  /* defined NETBSD */
-
 #if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 
 extern int h_errno;
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 14ba945d2..cc4d583ac 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -135,6 +135,23 @@
 
 #endif
 
+#ifdef ANDROID
+#   include <pthread.h>
+#   include <sys/file.h>
+#   include <sys/ioctl.h>
+#	include <sys/uio.h>
+#	include <sys/un.h>
+#   include <netinet/tcp.h>
+#   include <dlfcn.h>
+#	include <endian.h>
+#	include <sys/time.h>
+#	include <semaphore.h>
+#	define 	IORESOURCE_TRANSFER_BSD
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define	pthread_testcancel()
+#	define  NO_PTHREAD_PRIORITY
+#endif
+
 #ifdef NETBSD
 #	include <sys/param.h>
 #       ifndef ETIME
@@ -333,11 +350,43 @@ int macxp_resolveAlias(char *path, int buflen);
 #endif
 #endif
 
-#if !defined(_WIN32)  && !defined(OS2)  && \
+#ifdef IOS
+#	ifndef ETIME
+#		define  ETIME ETIMEDOUT
+#	endif
+#	include <dlfcn.h>
+#	include <pthread.h>
+#	include <sys/file.h>
+#	include <sys/ioctl.h>
+#	include <sys/uio.h>
+#	include <sys/un.h>
+#	include <netinet/tcp.h>
+#	include <machine/endian.h>
+#	include <sys/time.h>
+#	include <sys/semaphore.h>
+#	if BYTE_ORDER == LITTLE_ENDIAN
+#		ifndef _LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
+#		endif
+#	elif BYTE_ORDER == BIG_ENDIAN
+#		ifndef _BIG_ENDIAN
+#		define _BIG_ENDIAN
+#		endif
+#	elif BYTE_ORDER == PDP_ENDIAN
+#		ifndef _PDP_ENDIAN
+#		define _PDP_ENDIAN
+#		endif
+#	endif
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define  NO_PTHREAD_RTL
+#endif
+
+#if !defined(_WIN32)  && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && \
     !defined(AIX)     && \
     !defined(SOLARIS) && !defined(MACOSX) && \
-    !defined(OPENBSD) && !defined(DRAGONFLY)
+    !defined(OPENBSD) && !defined(DRAGONFLY) && \
+    !defined(IOS) && !defined(ANDROID)
 #	error "Target platform not specified!"
 #endif
 
diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c
index 862aff2c8..64ce56b3d 100644
--- a/sal/osl/unx/tempfile.c
+++ b/sal/osl/unx/tempfile.c
@@ -49,53 +49,29 @@
 #include "file_url.h"
 #endif
  
-/*****************************************************************/
-/* osl_getTempFirURL                                             */
-/*****************************************************************/
-
 oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
 {
-#ifdef MACOSX
+    oslFileError error;
+    /* described in environ(7) */
     const char *pValue = getenv( "TMPDIR" );
 
-    /* If TMPDIR environment variable is not set, use "/tmp" instead
-       of P_tmpdir because its value is "/var/tmp" and it is not
-       deleted on system start up */
     if ( !pValue )
-        pValue = "/tmp";
-#else
-
-    const char *pValue = getenv( "TEMP" );
+        pValue = getenv( "TEMP" );
 
     if ( !pValue )
         pValue = getenv( "TMP" );
 
-#if defined(NETBSD)
-    if ( !pValue )
-        pValue = _PATH_TMP;
-#else
-    if ( !pValue )
-        pValue = P_tmpdir;
-#endif
-
     if ( !pValue )
         pValue = "/tmp";
-#endif /* MACOSX */
 
-    if ( pValue )
-    {
-        oslFileError error;
-        rtl_uString	*ustrTempPath = NULL;
+    rtl_uString	*ustrTempPath = NULL;
 
-        rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-        OSL_ASSERT(ustrTempPath != NULL);
-        error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
-        rtl_uString_release( ustrTempPath );
+    rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
+    OSL_ASSERT(ustrTempPath != NULL);
+    error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
+    rtl_uString_release( ustrTempPath );
         
-        return error;
-    }
-    else
-        return osl_File_E_NOENT;
+    return error;
 }
 
 /******************************************************************
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index 06730acb2..b11edb0e2 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -35,6 +35,7 @@
 #include <osl/thread.h>
 #include <osl/nlsupport.h>
 #include <rtl/textenc.h>
+#include <rtl/alloc.h>
 #include <sal/macros.h>
 
 #if defined LINUX
@@ -975,17 +976,31 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const oslThread Thread)
     return Priority;
 }
 
+typedef struct _wrapper_pthread_key
+{
+    pthread_key_t m_key;
+    oslThreadKeyCallbackFunction pfnCallback;
+} wrapper_pthread_key;
+
 /*****************************************************************************/
 /* osl_createThreadKey */
 /*****************************************************************************/
 oslThreadKey SAL_CALL osl_createThreadKey( oslThreadKeyCallbackFunction pCallback )
 {
-    pthread_key_t key;
+    wrapper_pthread_key *pKey = (wrapper_pthread_key*)rtl_allocateMemory(sizeof(wrapper_pthread_key));
+
+    if (pKey)
+    {
+        pKey->pfnCallback = pCallback;
 
-    if (pthread_key_create(&key, pCallback) != 0)
-        key = 0;
+        if (pthread_key_create(&(pKey->m_key), pKey->pfnCallback) != 0)
+        {
+            rtl_freeMemory(pKey);
+            pKey = 0;
+        }
+    }
 
-    return ((oslThreadKey)key);
+    return ((oslThreadKey)pKey);
 }
 
 /*****************************************************************************/
@@ -993,7 +1008,12 @@ oslThreadKey SAL_CALL osl_createThreadKey( oslThreadKeyCallbackFunction pCallbac
 /*****************************************************************************/
 void SAL_CALL osl_destroyThreadKey(oslThreadKey Key)
 {
-    pthread_key_delete((pthread_key_t)Key);
+    wrapper_pthread_key *pKey = (wrapper_pthread_key*)Key;
+    if (pKey)
+    {
+        pthread_key_delete(pKey->m_key);
+        rtl_freeMemory(pKey);
+    }
 }
 
 /*****************************************************************************/
@@ -1001,7 +1021,8 @@ void SAL_CALL osl_destroyThreadKey(oslThreadKey Key)
 /*****************************************************************************/
 void* SAL_CALL osl_getThreadKeyData(oslThreadKey Key)
 {
-    return (pthread_getspecific((pthread_key_t)Key));
+    wrapper_pthread_key *pKey = (wrapper_pthread_key*)Key;
+    return pKey ? pthread_getspecific(pKey->m_key) : NULL;
 }
 
 /*****************************************************************************/
@@ -1009,7 +1030,21 @@ void* SAL_CALL osl_getThreadKeyData(oslThreadKey Key)
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData)
 {
-    return (pthread_setspecific((pthread_key_t)Key, pData) == 0);
+    sal_Bool bRet;
+    void *pOldData = NULL;
+    wrapper_pthread_key *pKey = (wrapper_pthread_key*)Key;
+    if (!pKey)
+        return sal_False;
+
+    if (pKey->pfnCallback)
+        pOldData = pthread_getspecific(pKey->m_key);
+
+    bRet = (pthread_setspecific(pKey->m_key, pData) == 0);
+
+    if (bRet && pKey->pfnCallback && pOldData)
+        pKey->pfnCallback(pOldData);
+
+    return bRet;
 }
 
 /*****************************************************************************/
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index cc6361851..fe68c480d 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -162,7 +162,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
      *  And now, the real thing: the get address
      */
 
-#ifdef SIOCGIFHWADDR
+#if defined(SIOCGIFHWADDR) && !defined(SOLARIS)
     ret=ioctl(so, SIOCGIFHWADDR, &ifr);
 #else
     ret=ioctl(so, SIOCGIFADDR, &ifr); 
@@ -177,7 +177,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
 
     close(so);
 
-#ifdef SIOCGIFHWADDR
+#if defined(SIOCGIFHWADDR) && !defined(SOLARIS)
     memcpy(hard_addr,ifr.ifr_hwaddr.sa_data,8);
 #else
     memcpy(hard_addr,ifr.ifr_ifru.ifru_addr.sa_data,8);
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 2ba1f9d95..572f7a9ec 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -93,7 +93,7 @@
  sal_Bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedName)
  {
 #ifndef MACOSX // not MACOSX  
-        rtl::OString fn = OUStringToOString(pustrFileName);
+    rtl::OString fn = OUStringToOString(pustrFileName);
 #else
     rtl::OString fn = macxp_resolveAliasAndConvert(pustrFileName);
 #endif
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index cf4e2ec8f..2691cddd3 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -601,6 +601,11 @@ static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedUR
     {
         switch ( *pSrc )
         {
+        case 0:
+        case '?':
+        case '#':
+            bValidEncoded = false;
+            break;
         case '%':
             {
                 sal_Char	aToken[3];
diff --git a/sal/osl/w32/MAKEFILE.MK b/sal/osl/w32/makefile.mk
index 08e8745a9..08e8745a9 100644
--- a/sal/osl/w32/MAKEFILE.MK
+++ b/sal/osl/w32/makefile.mk
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 4b7cd202a..a332d3a36 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -26,7 +26,13 @@
 *
 ************************************************************************/
 
+#ifdef __MINGW32__
+extern "C" {
+#endif
 #include "system.h"
+#ifdef __MINGW32__
+}
+#endif
 #include <tlhelp32.h>
 
 #include "file_url.h"
@@ -81,13 +87,13 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 /*nRtldM
     {
         std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(Module->length + 1);
         DWORD len = GetShortPathNameW(reinterpret_cast<LPCWSTR>(Module->buffer), 
-                                      &vec[0], Module->length + 1);
+                                      reinterpret_cast<LPWSTR>(&vec[0]), Module->length + 1);
         if (len )
         {
-            hInstance = LoadLibraryW(&vec[0]);
+            hInstance = LoadLibraryW(reinterpret_cast<LPWSTR>(&vec[0]));
 
             if (hInstance == NULL)
-                hInstance = LoadLibraryExW(&vec[0], NULL,
+                hInstance = LoadLibraryExW(reinterpret_cast<LPWSTR>(&vec[0]), NULL,
                                   LOAD_WITH_ALTERED_SEARCH_PATH);
         }
     }
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 7cb21108b..3ac82dcc9 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -315,7 +315,7 @@ namespace /* private */
             std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(path.getLength() + 1);
             //GetShortPathNameW only works if the file can be found!
             const DWORD len = GetShortPathNameW(
-                path.getStr(), &vec[0], path.getLength() + 1);
+                reinterpret_cast<LPCWSTR>(path.getStr()), reinterpret_cast<LPWSTR>(&vec[0]), path.getLength() + 1);
 
             if (!len && GetLastError() == ERROR_FILE_NOT_FOUND
                 && extension.getLength())
@@ -324,7 +324,7 @@ namespace /* private */
                 std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec2(
                     extPath.getLength() + 1);
                 const DWORD len2 = GetShortPathNameW(
-                    extPath.getStr(), &vec2[0], extPath.getLength() + 1);
+                    reinterpret_cast<LPCWSTR>(extPath.getStr()), reinterpret_cast<LPWSTR>(&vec2[0]), extPath.getLength() + 1);
                 ret = rtl::OUString(&vec2[0], len2);
             }
             else
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index 5f97f723b..4520cbe21 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -39,7 +39,7 @@
 #ifndef __MINGW32__
 #include <DbgHelp.h>
 #endif
-#include <ErrorRep.h>
+#include <errorrep.h>
 #include <systools/win32/uwinapi.h>
 #include <sal/macros.h>
 
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 943353174..8222001e7 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,7 +1,7 @@
-sa	sal	:	xml2cmp external BOOST:boost CPPUNIT:cppunit NULL
+sa	sal	:	NATIVE:xml2cmp external BOOST:boost CPPUNIT:cppunit NULL
 sa	sal										usr1	-	all	sa_mkout NULL
 sa	sal\inc									nmake	-	all	sa_inc NULL
-sa	sal\typesconfig							nmake	-	u	sa_tc sa_inc NULL
+sa	sal\typesconfig							nmake	-	all	sa_tc sa_inc NULL
 sa	sal\cpprt								nmake	-	u	sa_cpprt sa_util sa_inc NULL
 sa	sal\rtl\source							nmake	-	all	sa_rtl sa_tc.u sa_inc NULL
 sa	sal\textenc								nmake	-	all	sa_textenc sa_tc.u sa_inc NULL
@@ -16,6 +16,7 @@ sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_onlineu
 sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL
 sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util NULL
 sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util NULL
+sa sal\qa\osl\getsystempathfromfileurl nmake - all sa_qa_osl_getsystempathfromfileurl sa_cppunittester sa_util NULL
 sa sal\qa\osl\file nmake - u sa_qa_osl_file sa_cppunittester sa_util NULL
 sa sal\qa\osl\module nmake - u sa_qa_osl_module sa_cppunittester sa_util NULL
 sa sal\qa\osl\condition nmake - all sa_qa_osl_condition sa_cppunittester sa_util NULL
@@ -29,3 +30,4 @@ sa sal\qa\rtl\cipher nmake - all sa_qa_rtl_cipher sa_cppunittester sa_util NULL
 sa sal\qa\rtl\doublelock nmake - all sa_qa_rtl_doublelock sa_cppunittester sa_util NULL
 sa sal\qa\rtl\locale nmake - all sa_qa_rtl_locale sa_cppunittester sa_util NULL
 sa sal\qa\sal nmake - all sa_qa_sal sa_cppunittester sa_util NULL
+sa sal\qa\static nmake - u sal_qa_static sa_qa_sal NULL
diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index 2083d86f8..981fc5ecb 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -1,42 +1,42 @@
-mkdir: %_DEST%\bin%_EXT%\cppunit
-mkdir: %_DEST%\inc%_EXT%\cppunittester
-mkdir: %_DEST%\inc%_EXT%\sal
-mkdir: %_DEST%\inc%_EXT%\osl
-mkdir: %_DEST%\inc%_EXT%\rtl
-mkdir: %_DEST%\inc%_EXT%\systools
-mkdir: %_DEST%\inc%_EXT%\systools\win32
+mkdir: %_DEST%\bin\cppunit
+mkdir: %_DEST%\inc\cppunittester
+mkdir: %_DEST%\inc\sal
+mkdir: %_DEST%\inc\osl
+mkdir: %_DEST%\inc\rtl
+mkdir: %_DEST%\inc\systools
+mkdir: %_DEST%\inc\systools\win32
 
-..\inc\cppunittester\protectorfactory.hxx %_DEST%\inc%_EXT%\protectorfactory.hxx
-..\%__SRC%\inc\rtlbootstrap.mk %_DEST%\inc%_EXT%\rtlbootstrap.mk
-..\inc\sal\*.h %_DEST%\inc%_EXT%\sal\*.h
-..\%__SRC%\inc\sal\typesizes.h %_DEST%\inc%_EXT%\sal\typesizes.h
-..\inc\osl\*.h %_DEST%\inc%_EXT%\osl\*.h
-..\inc\osl\*.hxx %_DEST%\inc%_EXT%\osl\*.hxx
-..\inc\rtl\*.h %_DEST%\inc%_EXT%\rtl\*.h
-..\inc\rtl\*.hxx %_DEST%\inc%_EXT%\rtl\*.hxx
-..\inc\systools\win32\*.h %_DEST%\inc%_EXT%\systools\win32\*.h
-..\inc\systools\win32\*.hxx %_DEST%\inc%_EXT%\systools\win32\*.hxx
+..\inc\cppunittester\protectorfactory.hxx %_DEST%\inc\protectorfactory.hxx
+..\%__SRC%\inc\rtlbootstrap.mk %_DEST%\inc\rtlbootstrap.mk
+..\inc\sal\*.h %_DEST%\inc\sal\*.h
+..\%__SRC%\inc\sal\typesizes.h %_DEST%\inc\sal\typesizes.h
+..\inc\osl\*.h %_DEST%\inc\osl\*.h
+..\inc\osl\*.hxx %_DEST%\inc\osl\*.hxx
+..\inc\rtl\*.h %_DEST%\inc\rtl\*.h
+..\inc\rtl\*.hxx %_DEST%\inc\rtl\*.hxx
+..\inc\systools\win32\*.h %_DEST%\inc\systools\win32\*.h
+..\inc\systools\win32\*.hxx %_DEST%\inc\systools\win32\*.hxx
 
-..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so.3
-symlink: %_DEST%\lib%_EXT%\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so
-..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib.3
-symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib
-..\%__SRC%\lib\libsal_textenc.so.3 %_DEST%\lib%_EXT%\libsal_textenc.so.3
-symlink: %_DEST%\lib%_EXT%\libsal_textenc.so.3 %_DEST%\lib%_EXT%\libsal_textenc.so
-..\%__SRC%\lib\libsal_textenc.dylib.3 %_DEST%\lib%_EXT%\libsal_textenc.dylib.3
-symlink: %_DEST%\lib%_EXT%\libsal_textenc.dylib.3 %_DEST%\lib%_EXT%\libsal_textenc.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib\libuno_sal.so.3
+symlink: %_DEST%\lib\libuno_sal.so.3 %_DEST%\lib\libuno_sal.so
+..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib\libuno_sal.dylib.3
+symlink: %_DEST%\lib\libuno_sal.dylib.3 %_DEST%\lib\libuno_sal.dylib
+..\%__SRC%\lib\libsal_textenc.so.3 %_DEST%\lib\libsal_textenc.so.3
+symlink: %_DEST%\lib\libsal_textenc.so.3 %_DEST%\lib\libsal_textenc.so
+..\%__SRC%\lib\libsal_textenc.dylib.3 %_DEST%\lib\libsal_textenc.dylib.3
+symlink: %_DEST%\lib\libsal_textenc.dylib.3 %_DEST%\lib\libsal_textenc.dylib
+..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
 
-..\%__SRC%\slb\sal.lib %_DEST%\lib%_EXT%\xsal.lib
+..\%__SRC%\slb\sal.lib %_DEST%\lib\xsal.lib
 
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\misc\*.hid %_DEST%\bin%_EXT%\*.hid
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\bin\*.bin %_DEST%\bin\*.bin
+..\%__SRC%\misc\*.hid %_DEST%\bin\*.hid
+..\%__SRC%\bin\*.res %_DEST%\bin\*.res
 
-..\%__SRC%\inc\udkversion.h %_DEST%\inc%_EXT%\sal\udkversion.h
+..\%__SRC%\inc\udkversion.h %_DEST%\inc\sal\udkversion.h
 
-..\%__SRC%\bin\cppunittester.exe %_DEST%\bin%_EXT%\cppunit\cppunittester.exe
-..\%__SRC%\bin\cppunittester %_DEST%\bin%_EXT%\cppunit\cppunittester
+..\%__SRC%\bin\cppunittester.exe %_DEST%\bin\cppunit\cppunittester.exe
+..\%__SRC%\bin\cppunittester %_DEST%\bin\cppunit\cppunittester
diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk
index b033e3194..cc2d79dbf 100644
--- a/sal/qa/ByteSequence/makefile.mk
+++ b/sal/qa/ByteSequence/makefile.mk
@@ -35,6 +35,10 @@ ENABLE_EXCEPTIONS = TRUE
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1OBJS = $(SLO)/ByteSequence.obj
 SHL1RPATH = NONE
diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index 2b29878ec..4149c5848 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -36,6 +36,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 206287b74..036a2c395 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -319,6 +319,53 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
+
+    class  remove : public CppUnit::TestFixture
+    {
+    public:
+        void setUp()
+        {
+        }
+
+        void tearDown()
+        {
+        }
+
+        void remove_001()
+        {
+            ::rtl::OStringBuffer sb(
+                RTL_CONSTASCII_STRINGPARAM("Red Hat, Inc."));
+
+            sb.remove(0, 4);
+            CPPUNIT_ASSERT(sb.toString().equalsL(
+                RTL_CONSTASCII_STRINGPARAM("Hat, Inc.")));
+
+            sb.remove(3, 6);
+            CPPUNIT_ASSERT(sb.toString().equalsL(
+                RTL_CONSTASCII_STRINGPARAM("Hat")));
+
+            sb.remove(0, 100);
+
+            CPPUNIT_ASSERT(sb.toString().isEmpty());
+
+            sb.append(RTL_CONSTASCII_STRINGPARAM("Red Hat, Inc."));
+
+            sb.remove(3, 100);
+
+            CPPUNIT_ASSERT(sb.toString().equalsL(
+                RTL_CONSTASCII_STRINGPARAM("Red")));
+
+            sb.remove(0, sb.getLength());
+
+            CPPUNIT_ASSERT(sb.toString().isEmpty());
+        }
+
+        CPPUNIT_TEST_SUITE(remove);
+        CPPUNIT_TEST(remove_001);
+        CPPUNIT_TEST_SUITE_END();
+    };
+
+
 // -----------------------------------------------------------------------------
 
     class  getLength : public CppUnit::TestFixture
@@ -16555,6 +16602,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_008_float);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_008_Float_Negative);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_009_double);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_009_Double_Negative);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::remove);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index e07299103..f6c5bb3f1 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -76,8 +76,9 @@ sal_Char* cpystr( sal_Char* dst, const sal_Char* src )
     const sal_Char* psrc = src;
     sal_Char* pdst = dst;
 
-    while( (*pdst++ = *psrc++) );
-    return ( dst );
+    while( (*pdst++ = *psrc++) ) {}
+
+    return dst;
 }
 
 sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt )
@@ -193,172 +194,6 @@ sal_Char* createName( sal_Char* dst, const sal_Char* meth, sal_uInt32 cnt )
 }
 
 //------------------------------------------------------------------------
-//  testing the method compareTo( const OString & aStr )
-//------------------------------------------------------------------------
-void makeComment( char *com, const char *str1, const char *str2,
-                                                            sal_Int32 sgn )
-{
-    cpystr(com, str1);
-    int str1Length = AStringLen( str1 );
-    const char *sign = (sgn == 0) ? " == " : (sgn > 0) ? " > " : " < " ;
-    cpystr(com + str1Length, sign);
-    int signLength = AStringLen(sign);
-    cpystr(com + str1Length + signLength, str2);
-    com[str1Length + signLength + AStringLen(str2)] = 0;
-}
-
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToFloatCompare ( const sal_Char  *pStr,
-                                 const float      nX,
-                                 const float      nEPS
-                                )
-{
-    sal_Bool cmp = sal_False;
-
-    if ( pStr != NULL )
-    {
-        ::rtl::OString aStr(pStr);
-
-        float actNum = 0;
-        float expNum = nX;
-        float eps    = nEPS;
-
-        actNum = aStr.toFloat();
-
-        if ( abs( (int)(actNum - expNum) ) <= eps )
-        {
-            cmp = sal_True;
-        } // if
-    } // if
-
-    return cmp;
-} // AStringToFloatCompare
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToDoubleCompare ( const sal_Char  *pStr,
-                                  const double     nX,
-                                  const double     nEPS
-                                )
-{
-    sal_Bool cmp = sal_False;
-
-    if ( pStr != NULL )
-    {
-        ::rtl::OString aStr(pStr);
-
-        double actNum = 0;
-        double expNum = nX;
-        double eps    = nEPS;
-
-        actNum = aStr.toDouble();
-
-        if ( abs( (int)(actNum - expNum) ) <= eps )
-        {
-            cmp = sal_True;
-        } // if
-    } // if
-
-    return cmp;
-} // AStringToDoubleCompare
-
-sal_uInt32 UStringLen( const sal_Unicode *pUStr )
-{
-    sal_uInt32 nUStrLen = 0;
-
-    if ( pUStr != NULL )
-    {
-        const sal_Unicode *pTempUStr = pUStr;
-
-        while( *pTempUStr )
-        {
-            pTempUStr++;
-        } // while
-
-        nUStrLen = (sal_uInt32)( pTempUStr - pUStr );
-    } // if
-
-    return nUStrLen;
-} // UStringLen
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringIsValid( const sal_Char  *pAStr )
-{
-    if ( pAStr != NULL )
-    {
-        sal_uInt32 nLen  = AStringLen( pAStr );
-        sal_uChar  uChar = 0;
-
-        while ( *pAStr )
-        {
-            uChar = (unsigned char)*pAStr;
-
-            if ( uChar > 127 )
-            {
-                return sal_False;
-            } // if
-
-            pAStr++;
-
-            // Since we are dealing with unsigned integers
-            // we want to make sure that the last number is
-            // indeed zero.
-
-            if ( nLen > 0 )
-            {
-                nLen--;
-            } // if
-            else
-            {
-                break;
-            } // else
-        } // while
-    } // if
-
-    return sal_True;
-} // AStringIsValid
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringNIsValid( const sal_Char   *pAStr,
-                          const sal_uInt32  nStrLen
-                        )
-{
-    sal_uInt32 nLen  = nStrLen;
-    sal_uChar  uChar = 0;
-
-    while ( *pAStr )
-    {
-        uChar = (unsigned char)*pAStr;
-
-        if ( uChar > 127 )
-        {
-            return sal_False;
-        } // if
-
-        pAStr++;
-
-        // Since we are dealing with unsigned integers
-        // we want to make sure that the last number is
-        // indeed zero.
-
-        if ( nLen > 0 )
-        {
-            nLen--;
-        } // if
-        else
-        {
-            break;
-        } // else
-    } // while
-
-    return sal_True;
-} // AStringNIsValid
-
-//------------------------------------------------------------------------
 
 static inline sal_Int32 ACharToUCharCompare( const sal_Unicode *pUStr,
                                              const sal_Char    *pAStr
@@ -373,224 +208,4 @@ static inline sal_Int32 ACharToUCharCompare( const sal_Unicode *pUStr,
     return  nCmp;
 } // ACharToUCharCompare
 
-//------------------------------------------------------------------------
-
-sal_Int32 AStringToUStringCompare( const sal_Unicode *pUStr,
-                                   const sal_Char    *pAStr
-                                 )
-{
-     sal_Int32 nCmp = kErrCompareAStringToUString;
-
-    if ( ( pUStr != NULL ) && ( pAStr != NULL ) )
-    {
-        nCmp = ACharToUCharCompare( pUStr, pAStr );
-
-        while ( ( nCmp == 0 ) && ( *pAStr ) )
-        {
-            pUStr++;
-            pAStr++;
-
-            nCmp = ACharToUCharCompare( pUStr, pAStr );
-        } // while
-    } // if
-
-    return nCmp;
-} // AStringToUStringCompare
-
-//------------------------------------------------------------------------
-
-sal_Int32 AStringToUStringNCompare( const sal_Unicode  *pUStr,
-                                    const sal_Char     *pAStr,
-                                    const sal_uInt32    nAStrCount
-                                   )
-{
-    sal_Int32 nCmp = kErrCompareNAStringToUString;
-
-    if ( ( pUStr != NULL ) && ( pAStr != NULL ) )
-    {
-        sal_uInt32 nCount = nAStrCount;
-
-        nCmp = ACharToUCharCompare( pUStr, pAStr );
-
-        while ( ( nCmp == 0 ) && ( *pAStr ) && ( nCount ) )
-        {
-            pUStr++;
-            pAStr++;
-
-            nCmp = ACharToUCharCompare( pUStr, pAStr );
-
-            // Since we are dealing with unsigned integers
-            // we want to make sure that the last number is
-            // indeed zero.
-
-            if ( nCount > 0 )
-            {
-                nCount--;
-            } // if
-            else
-            {
-                break;
-            } // else
-        } // while
-    } // if
-
-    return nCmp;
-} // AStringToUStringNCompare
-
-//------------------------------------------------------------------------
-
-sal_Int32 AStringToRTLUStringCompare( const rtl_uString  *pRTLUStr,
-                                      const sal_Char     *pAStr
-                                    )
-{
-    sal_Int32 nCmp = kErrCompareAStringToRTLUString;
-
-    if ( ( pRTLUStr != NULL ) && ( pAStr != NULL ) )
-    {
-        rtl_uString *pRTLUStrCopy = NULL;
-
-        rtl_uString_newFromString( &pRTLUStrCopy, pRTLUStr );
-
-        if ( pRTLUStrCopy != NULL )
-        {
-            const sal_Unicode *pUStr = rtl_uString_getStr( pRTLUStrCopy );
-
-            if ( pUStr != NULL )
-            {
-                nCmp = AStringToUStringCompare( pUStr, pAStr );
-            } // if
-
-            rtl_uString_release( pRTLUStrCopy );
-
-            pRTLUStrCopy = NULL;
-        } // if
-    } // if
-
-    return nCmp;
-} // AStringToRTLUStringCompare
-
-//------------------------------------------------------------------------
-
-sal_Int32 AStringToRTLUStringNCompare( const rtl_uString  *pRTLUStr,
-                                       const sal_Char     *pAStr,
-                                       const sal_uInt32    nAStrCount
-                                     )
-{
-    sal_Int32 nCmp = kErrCompareNAStringToRTLUString;
-
-    if ( ( pRTLUStr != NULL ) && ( pAStr != NULL ) )
-    {
-        rtl_uString *pRTLUStrCopy = NULL;
-
-        rtl_uString_newFromString( &pRTLUStrCopy, pRTLUStr );
-
-        if ( pRTLUStrCopy != NULL )
-        {
-            const sal_Unicode  *pUStr = rtl_uString_getStr( pRTLUStrCopy );
-
-            if ( pUStr != NULL )
-            {
-                nCmp = AStringToUStringNCompare( pUStr, pAStr, nAStrCount );
-            } // if
-
-            rtl_uString_release( pRTLUStrCopy );
-
-            pRTLUStrCopy = NULL;
-        } // if
-    } // if
-
-    return nCmp;
-} // AStringToRTLUStringNCompare
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToUStringCopy( sal_Unicode     *pDest,
-                               const sal_Char  *pSrc
-                             )
-{
-    sal_Bool    bCopied = sal_False;
-    sal_uInt32  nCount  = AStringLen( pSrc );
-    sal_uInt32  nLen    = nCount;
-
-    if (    ( pDest != NULL )
-         && ( pSrc  != NULL )
-         && ( AStringNIsValid( pSrc, nLen ) )
-       )
-    {
-        for (;;)
-        {
-            *pDest = (unsigned char)*pSrc;
-
-            pDest++;
-            pSrc++;
-
-            // Since we are dealing with unsigned integers
-            // we want to make sure that the last number is
-            // indeed zero.
-
-            if ( nCount > 0 )
-            {
-                nCount--;
-            } // if
-            else
-            {
-                break;
-            } // else
-        } // while
-
-        if ( nCount == 0 )
-        {
-            bCopied = sal_True;
-        } // if
-    } // if
-
-    return  bCopied;
-} // AStringToUStringCopy
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToUStringNCopy( sal_Unicode       *pDest,
-                                const sal_Char    *pSrc,
-                                const sal_uInt32   nSrcLen
-                              )
-{
-    sal_Bool    bCopied = sal_False;
-    sal_uInt32  nCount  = nSrcLen;
-    sal_uInt32  nLen    = nSrcLen;
-
-    if (    ( pDest != NULL )
-         && ( pSrc  != NULL )
-         && ( AStringNIsValid( pSrc, nLen ) )
-       )
-    {
-        for (;;)
-        {
-            *pDest = (unsigned char)*pSrc;
-
-            pDest++;
-            pSrc++;
-
-            // Since we are dealing with unsigned integers
-            // we want to make sure that the last number is
-            // indeed zero.
-
-            if ( nCount > 0 )
-            {
-                nCount--;
-            } // if
-            else
-            {
-                break;
-            } // else
-        } // while
-
-        if ( nCount == 0 )
-        {
-            bCopied = sal_True;
-        } // if
-    } // if
-
-    return  bCopied;
-} // AStringToUStringNCopy
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
index d9770d3fc..3eb160d7e 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
@@ -55,29 +55,12 @@ sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 l
 sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 );
 
 sal_Char* createName( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt );
-void makeComment(char *com, const char *str1, const char *str2, sal_Int32 sgn);
 
 
 sal_uInt32 AStringLen( const sal_Char *pAStr );
 
-sal_uInt32 UStringLen( const sal_Unicode *pUStr );
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToFloatCompare ( const sal_Char  *pStr,
-                                 const float      nX,
-                                 const float      nEPS
-                                );
-
-sal_Bool AStringToDoubleCompare ( const sal_Char  *pStr,
-                                  const double     nX,
-                                  const double     nEPS
-                                );
-
 //------------------------------------------------------------------------
 
-sal_Bool AStringIsValid( const sal_Char  *pAStr );
-
 sal_Bool AStringNIsValid( const sal_Char   *pAStr,
                           const sal_uInt32  nStrLen
                         );
@@ -93,26 +76,6 @@ sal_Int32 AStringToUStringNCompare( const sal_Unicode  *pUStr,
                                     const sal_uInt32    nAStrCount
                                    );
 
-sal_Int32 AStringToRTLUStringCompare( const rtl_uString  *pRTLUStr,
-                                      const sal_Char     *pAStr
-                                    );
-
-sal_Int32 AStringToRTLUStringNCompare( const rtl_uString  *pRTLUStr,
-                                       const sal_Char     *pAStr,
-                                       const sal_uInt32    nAStrCount
-                                     );
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToUStringCopy( sal_Unicode     *pDest,
-                               const sal_Char  *pSrc
-                             );
-
-sal_Bool AStringToUStringNCopy( sal_Unicode       *pDest,
-                                const sal_Char    *pSrc,
-                                const sal_uInt32   nSrcLen
-                              );
-
 #endif /* __cplusplus */
 
 #endif /* _RTL_STRING_UTILS_HXX */
diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl
index 508ab2129..8adc9f19c 100644
--- a/sal/qa/buildall.pl
+++ b/sal/qa/buildall.pl
@@ -150,11 +150,6 @@ sub initEnvironment()
           $g_sTempDir         = $ENV{TMP}  ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
           last SWITCH;
       }    
-      if ( $gui eq "OS2" ) {
-          $FS             = "\\";
-          $g_sTempDir         = $ENV{TMP}  ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
-          last SWITCH;
-      }
       if ( $gui eq "UNX" ) {
           $FS             = "/";
           $g_sTempDir         = $ENV{TMP}  ? "$ENV{TMP}${FS}" : "${FS}tmp${FS}";
@@ -181,7 +176,7 @@ sub getLibName($)
     {
         return "lib" . $sFile . ".so";
     }
-    if ($OSNAME eq "MSWin32" || $OSNAME eq "OS2")
+    if ($OSNAME eq "MSWin32")
     {
         return $sFile . ".dll";
     }
@@ -320,7 +315,7 @@ sub runASingleTest($$)
 #     }
 #     else
 #     {
-#         if ($OSNAME eq "MSWin32" || $OSNAME eq "OS2")
+#         if ($OSNAME eq "MSWin32")
 #         {
 #             # test
 #             $redirect = ">>$sLogFile 2>>$sLogFile";
diff --git a/sal/qa/cppunit_local.mk b/sal/qa/cppunit_local.mk
index 4b452b73c..eaa662877 100644
--- a/sal/qa/cppunit_local.mk
+++ b/sal/qa/cppunit_local.mk
@@ -25,6 +25,10 @@
 
 # cppunittester is built in this module; cannot use delivered version
 # this should be kept in sync with the definition in solenv/inc/settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+CPPUNITTESTER=\#
+.ELSE
 CPPUNITTESTER = $(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(BIN)/cppunittester
+.ENDIF
 
 .INCLUDE : _cppunit.mk
diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk
index 784f9c27a..9683f20a7 100644
--- a/sal/qa/osl/condition/makefile.mk
+++ b/sal/qa/osl/condition/makefile.mk
@@ -36,11 +36,13 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:Condition by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Condition.obj
 
@@ -51,10 +53,11 @@ SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-# auto generated Target:Condition
-# END ------------------------------------------------------------------
+# ------------------------------------------------------------------
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 .INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
+
diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk
index 1fad4b4d0..de85e5e5e 100644
--- a/sal/qa/osl/file/makefile.mk
+++ b/sal/qa/osl/file/makefile.mk
@@ -77,7 +77,7 @@ SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
 
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 1c6379bf1..ffa19b569 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -29,6 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
+#ifdef IOS
+#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_osl_File
+#endif
+
 //------------------------------------------------------------------------
 // include files
 //------------------------------------------------------------------------
@@ -147,29 +151,29 @@ inline void printFileType( const ::osl::FileStatus::Type nType )
 inline void printFileAttributes( const sal_Int64 nAttributes )
 {
     printf( "#printFileAttributes# This file is a: (" );
-    if ( ( nAttributes | Attribute_ReadOnly ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_ReadOnly ) == nAttributes )
             printf( " ReadOnly " );
-    if ( ( nAttributes | Attribute_Hidden ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_Hidden ) == nAttributes )
             printf( " Hidden " );
-    if ( ( nAttributes | Attribute_Executable ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_Executable ) == nAttributes )
             printf( " Executable " );
-    if ( ( nAttributes | Attribute_GrpWrite ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_GrpWrite ) == nAttributes )
             printf( " GrpWrite " );
-    if ( ( nAttributes | Attribute_GrpRead ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_GrpRead ) == nAttributes )
             printf( " GrpRead " );
-    if ( ( nAttributes | Attribute_GrpExe ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_GrpExe ) == nAttributes )
             printf( " GrpExe " );
-    if ( ( nAttributes | Attribute_OwnWrite ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_OwnWrite ) == nAttributes )
             printf( " OwnWrite " );
-    if ( ( nAttributes | Attribute_OwnRead ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_OwnRead ) == nAttributes )
             printf( " OwnRead " );
-    if ( ( nAttributes | Attribute_OwnExe ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_OwnExe ) == nAttributes )
             printf( " OwnExe " );
-    if ( ( nAttributes | Attribute_OthWrite ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_OthWrite ) == nAttributes )
             printf( " OthWrite " );
-    if ( ( nAttributes | Attribute_OthRead ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_OthRead ) == nAttributes )
             printf( " OthRead " );
-    if ( ( nAttributes | Attribute_OthExe ) == nAttributes )
+    if ( ( nAttributes | osl_File_Attribute_OthExe ) == nAttributes )
             printf( " OthExe " );
     printf( ") file!\n" );
 }
@@ -238,8 +242,9 @@ inline void printTime( TimeValue *tv )
 
 /** compare two TimeValue, unit is "ms", since Windows time precision is better than UNX.
 */
+/* FIXME: the above assertion is bogus */
 
-#if ( defined UNX ) || ( defined OS2 )                 //precision of time in Windows is better than UNX
+#if ( defined UNX )                      //precision of time in Windows is better than UNX
 #   define delta 2000                    //time precision, 2000ms
 #else
 #   define delta 1800                    //time precision, 1.8s
@@ -393,7 +398,7 @@ inline void deleteTestFile( const ::rtl::OUString filename )
     if ( !isURL( filename ) )
         ::osl::FileBase::getFileURLFromSystemPath( filename, aPathURL ); //convert if not full qualified URL
 
-    nError = ::osl::File::setAttributes( aPathURL, Attribute_GrpWrite| Attribute_OwnWrite| Attribute_OthWrite ); // if readonly, make writtenable.
+    nError = ::osl::File::setAttributes( aPathURL, osl_File_Attribute_GrpWrite| osl_File_Attribute_OwnWrite| osl_File_Attribute_OthWrite ); // if readonly, make writtenable.
     CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: set writtenable ", ( ::osl::FileBase::E_None == nError ) || ( ::osl::FileBase::E_NOENT == nError ) );
 
     nError = ::osl::File::remove( aPathURL );
@@ -643,7 +648,7 @@ inline ::rtl::OString outputError( const ::rtl::OString & returnVal, const ::rtl
 
 /** Change file mode, two version in UNIX and Windows;.
 */
-#if ( defined UNX ) || ( defined OS2 )        //chmod() method is differ in Windows
+#if ( defined UNX )         //chmod() method is differ in Windows
 inline void changeFileMode( ::rtl::OUString & filepath, sal_Int32 mode )
 {
     rtl::OString    aString;
@@ -784,7 +789,7 @@ namespace osl_FileBase
   void getAbsoluteFileURL::getAbsoluteFileURL_001_8()
   {
     rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmp/ok")) );
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
     check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",::osl::FileBase::E_None, suAssume );
 #else
     check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",::osl::FileBase::E_INVAL, suAssume );
@@ -792,7 +797,7 @@ namespace osl_FileBase
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_002()
   {
-#if ( defined UNX ) || ( defined OS2 )  //Link is not defined in Windows
+#if ( defined UNX )     //Link is not defined in Windows
         ::rtl::OUString aUStr_AbsURL, aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
         ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/link.file"));
         ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/canonical.name"));
@@ -1520,12 +1525,12 @@ namespace osl_VolumeInfo
                                     sal_True == compareFileName( aUStr, aNullURL ) );
         }
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
         void ctors_002( )
         {
-            ::osl::VolumeInfo   aVolumeInfo( VolumeInfoMask_TotalSpace |
-                                             VolumeInfoMask_UsedSpace |
-                                             VolumeInfoMask_FileSystemName );
+            ::osl::VolumeInfo   aVolumeInfo( osl_VolumeInfo_Mask_TotalSpace |
+                                             osl_VolumeInfo_Mask_UsedSpace |
+                                             osl_VolumeInfo_Mask_FileSystemName );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL4, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
             //CPPUNIT_ASSERT( aVolumeInfo.isValid( mask ) );
@@ -1549,7 +1554,7 @@ namespace osl_VolumeInfo
         void ctors_003( )
         {
 
-             sal_Int32 mask1 = VolumeInfoMask_FreeSpace;
+             sal_Int32 mask1 = osl_VolumeInfo_Mask_FreeSpace;
             ::osl::VolumeInfo aVolumeInfo1( mask1 );
             nError1 = ::osl::Directory::getVolumeInfo( aRootURL, aVolumeInfo1 );
             CPPUNIT_ASSERT( sal_True == aVolumeInfo1.isValid( mask1 ) );
@@ -1558,7 +1563,7 @@ namespace osl_VolumeInfo
             sal_uInt64 uiTotalSpace1 = aVolumeInfo1.getTotalSpace( );
             aUStr = aVolumeInfo1.getFileSystemName( );
 
-             sal_Int32 mask2 = VolumeInfoMask_TotalSpace;
+             sal_Int32 mask2 = osl_VolumeInfo_Mask_TotalSpace;
             ::osl::VolumeInfo aVolumeInfo2( mask2 );
             nError2 = ::osl::Directory::getVolumeInfo( aRootURL, aVolumeInfo2 );
             CPPUNIT_ASSERT( sal_True == aVolumeInfo2.isValid( mask2 ) );
@@ -1612,10 +1617,10 @@ namespace osl_VolumeInfo
                                       sal_True == aVolumeInfo.isValid( mask ) );
         }
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
           void isValid_002( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes | VolumeInfoMask_TotalSpace | osl_VolumeInfo_Mask_UsedSpace |
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes | osl_VolumeInfo_Mask_TotalSpace | osl_VolumeInfo_Mask_UsedSpace |
                              osl_VolumeInfo_Mask_FreeSpace | osl_VolumeInfo_Mask_MaxNameLength |
                              osl_VolumeInfo_Mask_MaxPathLength | osl_VolumeInfo_Mask_FileSystemName;
             ::osl::VolumeInfo aVolumeInfo( mask );
@@ -1636,7 +1641,7 @@ namespace osl_VolumeInfo
          void isValid_003( )
         {
              ::osl::VolumeDevice aVolumeDevice1;
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo   aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1646,7 +1651,7 @@ namespace osl_VolumeInfo
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
             sal_Bool bOk2 = aVolumeInfo.isValid( mask );
 
-            CPPUNIT_ASSERT_MESSAGE( "test for isValid function: VolumeInfoMask_Attributes, it should be valid for some volume such as /, floppy, cdrom, etc. but it did not pass",
+            CPPUNIT_ASSERT_MESSAGE( "test for isValid function: osl_VolumeInfo_Mask_Attributes, it should be valid for some volume such as /, floppy, cdrom, etc. but it did not pass",
                                      ( sal_True == bOk1 ) && ( sal_True == bOk2 ) );
         }
 
@@ -1671,7 +1676,7 @@ namespace osl_VolumeInfo
         // test code.
         void getRemoteFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1681,10 +1686,10 @@ namespace osl_VolumeInfo
                                      ( sal_False == bOk ) );
         }
 
- #if ( defined UNX ) || ( defined OS2 )	//remote Volume is different in Solaris and Windows
+ #if ( defined UNX )        //remote Volume is different in Solaris and Windows
         void getRemoteFlag_002( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL4, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1719,7 +1724,7 @@ namespace osl_VolumeInfo
         // test code.
         void getRemoveableFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1731,7 +1736,7 @@ namespace osl_VolumeInfo
 
         void getRemoveableFlag_002( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL2, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1759,7 +1764,7 @@ namespace osl_VolumeInfo
         // test code.
         void getCompactDiscFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1771,7 +1776,7 @@ namespace osl_VolumeInfo
 
         void getCompactDiscFlag_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_Attributes;
+             sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL6, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1799,7 +1804,7 @@ namespace osl_VolumeInfo
         // test code.
         void getFloppyDiskFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1811,7 +1816,7 @@ namespace osl_VolumeInfo
 
         void getFloppyDiskFlag_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_Attributes;
+             sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL2, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1839,7 +1844,7 @@ namespace osl_VolumeInfo
         // test code.
         void getFixedDiskFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL2, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1851,7 +1856,7 @@ namespace osl_VolumeInfo
 
         void getFixedDiskFlag_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_Attributes;
+             sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1878,7 +1883,7 @@ namespace osl_VolumeInfo
         // test code.
         void getRAMDiskFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1890,7 +1895,7 @@ namespace osl_VolumeInfo
 
         void getRAMDiskFlag_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_Attributes;
+             sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1918,7 +1923,7 @@ namespace osl_VolumeInfo
         // test code.
         void getTotalSpace_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_TotalSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_TotalSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1932,7 +1937,7 @@ namespace osl_VolumeInfo
  #if defined( UNX )
         void getTotalSpace_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_TotalSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_TotalSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL3, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1962,7 +1967,7 @@ namespace osl_VolumeInfo
             statvfs( name, &aStatFS);
             sal_uInt64 TotalSpace = aStatFS.f_frsize * aStatFS.f_blocks ;
 
-             sal_Int32 mask = VolumeInfoMask_TotalSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_TotalSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -1999,7 +2004,7 @@ namespace osl_VolumeInfo
         // test code.
         void getFreeSpace_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_FreeSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FreeSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2013,7 +2018,7 @@ namespace osl_VolumeInfo
 #if defined( UNX )
           void getFreeSpace_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_FreeSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_FreeSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL3, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2042,7 +2047,7 @@ namespace osl_VolumeInfo
             statvfs( name, &aStatFS);
             sal_uInt64 FreeSpace = aStatFS.f_bfree * aStatFS.f_frsize  ;
 
-             sal_Int32 mask = VolumeInfoMask_FreeSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_FreeSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2080,7 +2085,7 @@ namespace osl_VolumeInfo
         // test code.
         void getUsedSpace_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_UsedSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2094,7 +2099,7 @@ namespace osl_VolumeInfo
 #if defined( UNX )
            void getUsedSpace_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_UsedSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL3, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2124,7 +2129,7 @@ namespace osl_VolumeInfo
             sal_uInt64 UsedSpace = ( aStatFS.f_blocks - aStatFS.f_bavail ) * aStatFS.f_frsize;
 
 
-             sal_Int32 mask = VolumeInfoMask_UsedSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2163,7 +2168,7 @@ namespace osl_VolumeInfo
         // test code.
         void getMaxNameLength_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_MaxNameLength;
+            sal_Int32 mask = osl_VolumeInfo_Mask_MaxNameLength;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2175,7 +2180,7 @@ namespace osl_VolumeInfo
         }
 
 
-#if ( defined UNX ) || ( defined OS2 )
+#if defined(UNX) && !defined(ANDROID)
          void getMaxNameLength_002( )
         {
              struct statvfs aStatFS;
@@ -2185,7 +2190,7 @@ namespace osl_VolumeInfo
             statvfs( name, &aStatFS);
             sal_uInt64 MaxNameLength = aStatFS.f_namemax;
 
-             sal_Int32 mask = VolumeInfoMask_MaxNameLength;
+             sal_Int32 mask = osl_VolumeInfo_Mask_MaxNameLength;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2222,7 +2227,7 @@ namespace osl_VolumeInfo
         // test code.
         void getMaxPathLength_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_MaxPathLength;
+            sal_Int32 mask = osl_VolumeInfo_Mask_MaxPathLength;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2234,10 +2239,10 @@ namespace osl_VolumeInfo
         }
 
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
          void getMaxPathLength_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_MaxPathLength;
+             sal_Int32 mask = osl_VolumeInfo_Mask_MaxPathLength;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2276,7 +2281,7 @@ namespace osl_VolumeInfo
         // test code.
         void getFileSystemName_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_FileSystemName;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2298,7 +2303,7 @@ namespace osl_VolumeInfo
             statvfs( name, &aStatFS);
             sal_Char * astrFileSystemName = aStatFS.f_basetype;
 
-             sal_Int32 mask = VolumeInfoMask_FileSystemName;
+             sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2336,7 +2341,7 @@ namespace osl_VolumeInfo
         // test code.
         void getDeviceHandle_001( )
         {
-            ::osl::VolumeInfo   aVolumeInfo( VolumeInfoMask_Attributes );
+            ::osl::VolumeInfo   aVolumeInfo( osl_VolumeInfo_Mask_Attributes );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
 
@@ -2423,7 +2428,7 @@ namespace osl_FileStatus
         // test code.
         void ctors_001( )
         {
-             ::osl::FileStatus   rFileStatus( FileStatusMask_All );
+             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_All );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             aUStr = rFileStatus.getFileName( );
@@ -2503,35 +2508,35 @@ namespace osl_FileStatus
         void check_FileStatus(::osl::FileStatus const& _aStatus)
             {
                 rtl::OString sStat;
-                if (_aStatus.isValid(FileStatusMask_Type))
+                if (_aStatus.isValid(osl_FileStatus_Mask_Type))
                 {
                     sStat += "type ";
                 }
-                if (_aStatus.isValid(FileStatusMask_Attributes))
+                if (_aStatus.isValid(osl_FileStatus_Mask_Attributes))
                 {
                     sStat += "attributes ";
                 }
-                if (_aStatus.isValid(FileStatusMask_CreationTime))
+                if (_aStatus.isValid(osl_FileStatus_Mask_CreationTime))
                 {
                     sStat += "ctime ";
                 }
-                if (_aStatus.isValid(FileStatusMask_AccessTime))
+                if (_aStatus.isValid(osl_FileStatus_Mask_AccessTime))
                 {
                     sStat += "atime ";
                 }
-                if (_aStatus.isValid(FileStatusMask_ModifyTime))
+                if (_aStatus.isValid(osl_FileStatus_Mask_ModifyTime))
                 {
                     sStat += "mtime ";
                 }
-                if (_aStatus.isValid(FileStatusMask_FileSize))
+                if (_aStatus.isValid(osl_FileStatus_Mask_FileSize))
                 {
                     sStat += "filesize ";
                 }
-                if (_aStatus.isValid(FileStatusMask_FileName))
+                if (_aStatus.isValid(osl_FileStatus_Mask_FileName))
                 {
                     sStat += "filename ";
                 }
-                if (_aStatus.isValid(FileStatusMask_FileURL))
+                if (_aStatus.isValid(osl_FileStatus_Mask_FileURL))
                 {
                     sStat += "fileurl ";
                 }
@@ -2541,10 +2546,10 @@ namespace osl_FileStatus
         void isValid_002( )
         {
             createTestFile( aTmpName6 );
-            sal_uInt32 mask_file = ( FileStatusMask_Type | FileStatusMask_Attributes |
-                                   FileStatusMask_CreationTime | FileStatusMask_AccessTime |
-                                   FileStatusMask_ModifyTime   | FileStatusMask_FileSize   |
-                                   FileStatusMask_FileName     | FileStatusMask_FileURL) ;
+            sal_uInt32 mask_file = ( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_Attributes |
+                                   osl_FileStatus_Mask_CreationTime | osl_FileStatus_Mask_AccessTime |
+                                   osl_FileStatus_Mask_ModifyTime   | osl_FileStatus_Mask_FileSize   |
+                                   osl_FileStatus_Mask_FileName     | osl_FileStatus_Mask_FileURL) ;
              ::osl::FileStatus   rFileStatus( mask_file );
                 ::osl::FileBase::RC nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem_file );
             nError1 = rItem_file.getFileStatus( rFileStatus );
@@ -2560,7 +2565,7 @@ namespace osl_FileStatus
                 check_FileStatus(rFileStatus);
             deleteTestFile( aTmpName6 );
 
-                // CPPUNIT_ASSERT_MESSAGE( "test for isValid function: regular file mask fields test, #FileStatusMask_CreationTime# should be valid field for regular file, but feedback is invalid",
+                // CPPUNIT_ASSERT_MESSAGE( "test for isValid function: regular file mask fields test, #osl_FileStatus_Mask_CreationTime# should be valid field for regular file, but feedback is invalid",
                 //                      ( sal_True == bOk ) );
         }
 
@@ -2596,13 +2601,13 @@ namespace osl_FileStatus
             while (1) {
                 nError1 = testDirectory.getNextItem( rItem_link, 4 );
                 if (::osl::FileBase::E_None == nError1) {
-                    sal_uInt32 mask_link = FileStatusMask_FileName | FileStatusMask_LinkTargetURL;
+                    sal_uInt32 mask_link = osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_LinkTargetURL;
                     ::osl::FileStatus   rFileStatus( mask_link );
                     rItem_link.getFileStatus( rFileStatus );
                     if ( compareFileName( rFileStatus.getFileName( ), aFileName) == sal_True )
                     {
                         //printf("find the link file");
-                        if ( sal_True == rFileStatus.isValid( FileStatusMask_LinkTargetURL ) )
+                        if ( sal_True == rFileStatus.isValid( osl_FileStatus_Mask_LinkTargetURL ) )
                         {
                             bOk = sal_True;
                             break;
@@ -2623,7 +2628,7 @@ namespace osl_FileStatus
 
         void isValid_004( )
         {
-            sal_uInt32 mask_file_all = FileStatusMask_All;
+            sal_uInt32 mask_file_all = osl_FileStatus_Mask_All;
              ::osl::FileStatus   rFileStatus_all( mask_file_all );
                 ::osl::FileBase::RC nError1 = rItem_file.getFileStatus( rFileStatus_all );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -2632,7 +2637,7 @@ namespace osl_FileStatus
 // LLA: this is wrong
 //			sal_Bool bOk1 = rFileStatus_all.isValid( mask_file_all );
 
-            sal_uInt32 mask_file_val = FileStatusMask_Validate;
+            sal_uInt32 mask_file_val = osl_FileStatus_Mask_Validate;
              ::osl::FileStatus   rFileStatus_val( mask_file_val );
             nError1 = rItem_file.getFileStatus( rFileStatus_val );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -2704,7 +2709,7 @@ namespace osl_FileStatus
         // test code.
         void getFileType_001( )
         {
-             ::osl::FileStatus   rFileStatus( FileStatusMask_Type | FileStatusMask_FileName );
+             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName );
             nError1 = m_aItem_1.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT_MESSAGE("getFileStatus failed", ::osl::FileBase::E_None == nError1 );
 
@@ -2714,11 +2719,11 @@ namespace osl_FileStatus
         void check_FileType(osl::FileStatus const& _rFileStatus )
         {
             sal_Bool bOK = sal_False;
-                if ( _rFileStatus.isValid(FileStatusMask_FileName))
+                if ( _rFileStatus.isValid(osl_FileStatus_Mask_FileName))
                 {
                     rtl::OUString suFilename = _rFileStatus.getFileName();
 
-                    if ( _rFileStatus.isValid(FileStatusMask_Type))
+                    if ( _rFileStatus.isValid(osl_FileStatus_Mask_Type))
                     {
                         osl::FileStatus::Type eType = _rFileStatus.getFileType( );
 
@@ -2742,7 +2747,7 @@ namespace osl_FileStatus
 
         void getFileType_002( )
         {
-             ::osl::FileStatus   rFileStatus( FileStatusMask_Type | FileStatusMask_FileName );
+             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName );
                 nError1 = m_aItem_2.getFileStatus( rFileStatus );
 
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -2766,12 +2771,12 @@ namespace osl_FileStatus
 // LLA: 			CPPUNIT_ASSERT_MESSAGE("get Socket type file failed", ::osl::FileBase::E_None == nError1 );
 // LLA:
 // LLA: 			//check for File type
-// LLA:  			::osl::FileStatus   rFileStatus( FileStatusMask_Type );
+// LLA:  			::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Type );
 // LLA:
 // LLA:             nError1 = m_aSocketItem.getFileStatus( rFileStatus );
 // LLA: 			CPPUNIT_ASSERT_MESSAGE("getFileStatus failed", ::osl::FileBase::E_None == nError1 );
 // LLA:
-// LLA:             if (rFileStatus.isValid( FileStatusMask_Type ))
+// LLA:             if (rFileStatus.isValid( osl_FileStatus_Mask_Type ))
 // LLA:             {
 // LLA:                 osl::FileStatus::Type eType = rFileStatus.getFileType( );
 // LLA:                 printFileType(eType);
@@ -2790,7 +2795,7 @@ namespace osl_FileStatus
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //check for File type
-             ::osl::FileStatus   rFileStatus( FileStatusMask_Type );
+             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Type );
   nError1 = m_aLinkItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
@@ -2806,11 +2811,11 @@ namespace osl_FileStatus
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //check for File type
-             ::osl::FileStatus   rFileStatus( FileStatusMask_Type );
+             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Type );
             nError1 = m_aSpecialItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-            if (rFileStatus.isValid(FileStatusMask_Type))
+            if (rFileStatus.isValid(osl_FileStatus_Mask_Type))
             {
                 osl::FileStatus::Type eType = rFileStatus.getFileType( );
 
@@ -2865,18 +2870,18 @@ namespace osl_FileStatus
         }
 
         // test code.
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
 //windows only 3 file attributes: normal, readonly, hidden
         void getAttributes_001( )
         {
             changeFileMode( aTypeURL, S_IRUSR | S_IRGRP | S_IROTH );
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getAttributes function: ReadOnly, GrpRead, OwnRead, OthRead( UNX version ) ",
-                                    ( Attribute_ReadOnly | Attribute_GrpRead | Attribute_OwnRead | Attribute_OthRead ) ==
+                                    ( osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead ) ==
                                     rFileStatus.getAttributes( ) );
         }
 #else                                    //Windows version
@@ -2890,31 +2895,31 @@ namespace osl_FileStatus
 
         void getAttributes_002( )
         {
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
             changeFileMode( aTypeURL, S_IXUSR | S_IXGRP | S_IXOTH );
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getAttributes function: Executable, GrpExe, OwnExe, OthExe, the result is Readonly, Executable, GrpExe, OwnExe, OthExe, it partly not pass( Solaris version )",
-                                    ( Attribute_ReadOnly | Attribute_Executable | Attribute_GrpExe | Attribute_OwnExe | Attribute_OthExe ) ==
+                                    ( osl_File_Attribute_ReadOnly | osl_File_Attribute_Executable | osl_File_Attribute_GrpExe | osl_File_Attribute_OwnExe | osl_File_Attribute_OthExe ) ==
                                     rFileStatus.getAttributes( ) );
 #endif
         }
 
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
         void getAttributes_003( )
         {
             changeFileMode( aTypeURL, S_IWUSR | S_IWGRP | S_IWOTH );
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getAttributes function: GrpWrite, OwnWrite, OthWrite( Solaris version )",
-                                    ( Attribute_GrpWrite | Attribute_OwnWrite | Attribute_OthWrite ) ==
+                                    ( osl_File_Attribute_GrpWrite | osl_File_Attribute_OwnWrite | osl_File_Attribute_OthWrite ) ==
                                     rFileStatus.getAttributes( ) );
         }
 #else                                    //Windows version
@@ -2925,17 +2930,17 @@ namespace osl_FileStatus
         }
 #endif
 
-#if ( defined UNX ) || ( defined OS2 )	//hidden file definition may different in Windows
+#if ( defined UNX )                     //hidden file definition may different in Windows
         void getAttributes_004( )
         {
-            sal_Int32 test_Attributes = Attribute_Hidden;
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+            sal_Int32 test_Attributes = osl_File_Attribute_Hidden;
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError = rItem_hidden.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
             test_Attributes &= rFileStatus.getAttributes( );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getAttributes function: Hidden files( Solaris version )",
-                                    test_Attributes == Attribute_Hidden );
+                                    test_Attributes == osl_File_Attribute_Hidden );
         }
 #else                                    //Windows version
         void getAttributes_004( )
@@ -2943,12 +2948,12 @@ namespace osl_FileStatus
             ::rtl::OUString aUserHiddenFileURL (RTL_CONSTASCII_USTRINGPARAM("file:///c:/AUTOEXEC.BAT"));
             nError = ::osl::DirectoryItem::get( aUserHiddenFileURL, rItem_hidden );
             CPPUNIT_ASSERT_MESSAGE("get item fail", nError == FileBase::E_None );
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError = rItem_hidden.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "Hidden files(Windows version), please check if hidden file c:/AUTOEXEC.BAT exists ",
-                                    (rFileStatus.getAttributes( ) & Attribute_Hidden)!= 0 );
+                                    (rFileStatus.getAttributes( ) & osl_File_Attribute_Hidden)!= 0 );
         }
 #endif
 
@@ -2995,7 +3000,7 @@ namespace osl_FileStatus
             TimeValue *pTV_access = NULL;
             CPPUNIT_ASSERT( ( pTV_access = ( TimeValue* )malloc( sizeof( TimeValue ) ) ) != NULL );
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_AccessTime );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_AccessTime );
             nError = rItem.getFileStatus( rFileStatus );
             sal_Bool bOk = osl_getSystemTime( pTV_current );
             CPPUNIT_ASSERT( sal_True == bOk && nError == FileBase::E_None );
@@ -3045,7 +3050,7 @@ namespace osl_FileStatus
             //get instance item and filestatus
             nError = ::osl::DirectoryItem::get( aTypeURL, rItem );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
-            ::osl::FileStatus   rFileStatus( FileStatusMask_ModifyTime );
+            ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_ModifyTime );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
@@ -3098,7 +3103,7 @@ namespace osl_FileStatus
         // test code.
         void getFileSize_001( )
         {
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileSize );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileSize );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
@@ -3118,7 +3123,7 @@ namespace osl_FileStatus
 
             nError = ::osl::DirectoryItem::get( aTypeURL, rItem );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileSize );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileSize );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
             sal_uInt64 uFileSize = rFileStatus.getFileSize( );
@@ -3161,7 +3166,7 @@ namespace osl_FileStatus
         // test code.
         void getFileName_001( )
         {
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
@@ -3203,7 +3208,7 @@ namespace osl_FileStatus
         // test code.
         void getFileURL_001( )
         {
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileURL );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileURL );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
@@ -3243,7 +3248,7 @@ namespace osl_FileStatus
             deleteTestFile( aTypeURL );
         }
 
-#if ( defined UNX ) || ( defined OS2 )	       //Link file is not define in Windows
+#if ( defined UNX ) 	       //Link file is not define in Windows
         void getLinkTargetURL_001( )
         {
             //create a link file;
@@ -3263,7 +3268,7 @@ namespace osl_FileStatus
             nError = ::osl::DirectoryItem::get( aLnkURL1, rItem );
             CPPUNIT_ASSERT_MESSAGE( "in getting link file item", nError == FileBase::E_None );
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_LinkTargetURL );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_LinkTargetURL );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT_MESSAGE( "in getting link file status", nError == FileBase::E_None );
             ::rtl::OUString aFileURL = rFileStatus.getLinkTargetURL( );
@@ -3457,7 +3462,7 @@ namespace osl_File
 
             nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
             nError2 = testFile.write( buffer_write, 30, nCount_write );
-             ::osl::FileBase::RC nError4 = testFile.setPos( Pos_Absolut, 0 );
+             ::osl::FileBase::RC nError4 = testFile.setPos( osl_Pos_Absolut, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError4 );
             nError3 = testFile.read( buffer_read, 10, nCount_read );
 
@@ -3531,7 +3536,7 @@ namespace osl_File
 
             nError2 = testFile.close( );
 
-             nError3 = testFile.setPos( Pos_Absolut, 0 );
+             nError3 = testFile.setPos( osl_Pos_Absolut, 0 );
 
             CPPUNIT_ASSERT_MESSAGE( "test for close function: manipulate a file after it has been closed",
                                      ( ::osl::FileBase::E_None == nError2 ) &&
@@ -3588,14 +3593,14 @@ namespace osl_File
 
             nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-             nError1 = testFile.setPos( Pos_Absolut, 26 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, 26 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.read( buffer_read, 1, nCount_read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.close( );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for Pos_Absolut, set the position to 26, test if the 26th char in file is correct",
+            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for osl_Pos_Absolut, set the position to 26, test if the 26th char in file is correct",
                                      buffer_read[0] == pBuffer_Char[26] );
         }
 
@@ -3606,16 +3611,16 @@ namespace osl_File
 
             nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-             nError1 = testFile.setPos( Pos_Absolut, sizeof( pBuffer_Char ) - 2 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, sizeof( pBuffer_Char ) - 2 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-             nError1 = testFile.setPos( Pos_Current, 0);
+             nError1 = testFile.setPos( osl_Pos_Current, 0);
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.read( buffer_read, 1, nCount_read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.close( );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for Pos_Current, set the position to end, test if the ( end -1 ) char in file is correct",
+            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for osl_Pos_Current, set the position to end, test if the ( end -1 ) char in file is correct",
                                      buffer_read[0] == pBuffer_Char[sizeof( pBuffer_Char ) - 2] );
         }
 
@@ -3627,17 +3632,17 @@ namespace osl_File
             nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             //the file size is smaller than 100
-            nError1 = testFile.setPos( Pos_End,  -100 );
+            nError1 = testFile.setPos( osl_Pos_End,  -100 );
             CPPUNIT_ASSERT_MESSAGE( "should return error", ::osl::FileBase::E_INVAL == nError1 );
 
-             nError1 = testFile.setPos( Pos_End, -53 );
+             nError1 = testFile.setPos( osl_Pos_End, -53 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.read( buffer_read, 1, nCount_read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.close( );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for Pos_End, set the position to end, test if the first char in file is correct",
+            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for osl_Pos_End, set the position to end, test if the first char in file is correct",
                                      buffer_read[0] == pBuffer_Char[0] );
         }
 
@@ -3695,7 +3700,7 @@ namespace osl_File
             nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-             nError1 = testFile.setPos( Pos_Absolut, 26 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, 26 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
              nError1 = testFile.getPos( nFilePointer );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -3759,7 +3764,7 @@ namespace osl_File
             nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-             nError1 = testFile.setPos( Pos_End, 0 );
+             nError1 = testFile.setPos( osl_Pos_End, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.isEndOfFile( pEOF );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -3781,14 +3786,14 @@ namespace osl_File
             nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-             nError1 = testFile.setPos( Pos_Absolut, 0 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             *pEOF = sal_False;
              while ( !( *pEOF ) )
             {
                 nError1 = testFile.isEndOfFile( pEOF );
                 CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-                nError1 = testFile.setPos( Pos_Current, 1 );
+                nError1 = testFile.setPos( osl_Pos_Current, 1 );
                 CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             }
              nError1 = testFile.getPos( nFilePointer );
@@ -3859,7 +3864,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //get the file size;
-             nError1 = testFile.setPos( Pos_End, 0 );
+             nError1 = testFile.setPos( osl_Pos_End, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
              nError1 = testFile.getPos( nFilePointer );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -3887,7 +3892,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //get the file size;
-             nError1 = testFile.setPos( Pos_End, 0 );
+             nError1 = testFile.setPos( osl_Pos_End, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
              nError1 = testFile.getPos( nFilePointer );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -3974,7 +3979,7 @@ namespace osl_File
             nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-             nError1 = testFile.setPos( Pos_Absolut, 26 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, 26 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.read( buffer_read, 26, nCount_read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4034,7 +4039,7 @@ namespace osl_File
              nError1 = testFile.getPos( nFilePointer );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             //reset pointer to the begining;
-             nError1 = testFile.setPos( Pos_Absolut, 0 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.read( buffer_read, 10, nCount_read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4241,8 +4246,8 @@ namespace osl_File
         //check if is the new file
         File newFile( aTmpName4 );
         newFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Read );
-        newFile.setPos( Pos_End, 0 );
-        //		CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
+        nError1 = newFile.setPos( osl_Pos_End, 0 );
+        CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         sal_uInt64     nFilePointer;
         nError1 = newFile.getPos( nFilePointer );
         CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4543,29 +4548,29 @@ namespace osl_File
         // test code.
         void setAttributes_001( )
         {
-        //on windows, only can set 2 attributes: Attribute_ReadOnly,  Attribute_HIDDEN
+        //on windows, only can set 2 attributes: osl_File_Attribute_ReadOnly,  osl_File_Attribute_Hidden
 #ifdef UNX
             //set the file to readonly
-            nError2 = ::osl::File::setAttributes( aTmpName6, Attribute_ReadOnly | Attribute_GrpRead | Attribute_OwnRead | Attribute_OthRead );
+            nError2 = ::osl::File::setAttributes( aTmpName6, osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead );
             CPPUNIT_ASSERT( nError2 == FileBase::E_None);
             nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None);
             //get the file attributes
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setAttributes function: set file attributes and get it to verify.",
-                                    ( Attribute_ReadOnly | Attribute_GrpRead | Attribute_OwnRead | Attribute_OthRead ) ==
+                                    ( osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead ) ==
                                     rFileStatus.getAttributes( ) );
 #else
             //please see GetFileAttributes
-            nError2 = ::osl::File::setAttributes( aTmpName6, Attribute_ReadOnly );
+            nError2 = ::osl::File::setAttributes( aTmpName6, osl_File_Attribute_ReadOnly );
             CPPUNIT_ASSERT( nError2 == FileBase::E_None);
             nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None);
             //get the file attributes
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
             //here the file has 2 Attributes: FILE_ATTRIBUTE_READONLY and FILE_ATTRIBUTE_NORMAL,
@@ -4578,7 +4583,7 @@ namespace osl_File
                 printf("has readonly attribute");
             */
             CPPUNIT_ASSERT_MESSAGE( "test for setAttributes function: set file attributes READONLY and get it to verify.",
-                                    (Attribute_ReadOnly & rFileStatus.getAttributes( )) != 0  );
+                                    (osl_File_Attribute_ReadOnly & rFileStatus.getAttributes( )) != 0  );
 #endif
     }
         void setAttributes_002( )
@@ -4586,18 +4591,18 @@ namespace osl_File
         //on UNX, can not set hidden attribute to file, rename file can set the attribute
 #ifdef WNT
             //set the file to hidden
-            nError2 = ::osl::File::setAttributes( aTmpName6, Attribute_Hidden);
+            nError2 = ::osl::File::setAttributes( aTmpName6, osl_File_Attribute_Hidden);
 
             CPPUNIT_ASSERT( nError2 == FileBase::E_None);
             nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None);
             //get the file attributes
-              ::osl::FileStatus rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus rFileStatus( osl_FileStatus_Mask_Attributes );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setAttributes function: set file attributes and get it to verify.",
-                                    (Attribute_Hidden & rFileStatus.getAttributes( )) != 0 );
+                                    (osl_File_Attribute_Hidden & rFileStatus.getAttributes( )) != 0 );
 #endif
         }
 
@@ -4659,17 +4664,17 @@ namespace osl_File
             nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem );
             CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ).getStr(), nError1 == FileBase::E_None);
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_AccessTime );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_AccessTime );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ).getStr(),nError1 == FileBase::E_None );
             *pTV_access = rFileStatus.getAccessTime( );
 
-              ::osl::FileStatus   rFileStatus1( FileStatusMask_CreationTime );
+              ::osl::FileStatus   rFileStatus1( osl_FileStatus_Mask_CreationTime );
             nError1 = rItem.getFileStatus( rFileStatus1 );
             CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ).getStr(), nError1 == FileBase::E_None );
             *pTV_creation = rFileStatus1.getCreationTime( );
 
-              ::osl::FileStatus   rFileStatus2( FileStatusMask_ModifyTime );
+              ::osl::FileStatus   rFileStatus2( osl_FileStatus_Mask_ModifyTime );
             nError1 = rItem.getFileStatus( rFileStatus2 );
             CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ).getStr(), nError1 == FileBase::E_None );
             *pTV_modify = rFileStatus2.getModifyTime( );
@@ -4737,7 +4742,7 @@ namespace osl_File
             CPPUNIT_ASSERT_MESSAGE("write failed!", nError1 == FileBase::E_None);
 
             //set the file to readonly
-            nError2 = ::osl::File::setAttributes( aTmpName6, Attribute_ReadOnly | Attribute_GrpRead | Attribute_OwnRead | Attribute_OthRead );
+            nError2 = ::osl::File::setAttributes( aTmpName6, osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead );
             CPPUNIT_ASSERT( nError2 == FileBase::E_None);
 
             nError2 = tmp_file.sync();
@@ -4854,7 +4859,7 @@ namespace osl_DirectoryItem
             CPPUNIT_ASSERT( FileBase::E_None == nError1 );
 
             ::osl::DirectoryItem    copyItem( rItem ); //copy constructor
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError1 = copyItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
 
@@ -4871,7 +4876,7 @@ namespace osl_DirectoryItem
 
             ::osl::DirectoryItem    copyItem;
             copyItem = rItem;               //assinment operator
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError1 = copyItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
 
@@ -4963,7 +4968,7 @@ namespace osl_DirectoryItem
             nError2 = ::osl::DirectoryItem::get( aTmpName6, rItem );
 
             //check the file name
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
 
@@ -5032,7 +5037,7 @@ namespace osl_DirectoryItem
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //check the file name
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError2 = rItem.getFileStatus( rFileStatus );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getFileStatus function: get file status and check filename",
@@ -5047,7 +5052,7 @@ namespace osl_DirectoryItem
             nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem );
 
             //check the file name
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError2 = rItem.getFileStatus( rFileStatus );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getFileStatus function: file not existed",
@@ -5062,7 +5067,7 @@ namespace osl_DirectoryItem
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //check the file name
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError2 = rItem.getFileStatus( rFileStatus );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getFileStatus function: get directory information",
@@ -5415,7 +5420,7 @@ namespace osl_Directory
             nError1 = testDirectory.getNextItem( rItem, 1 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             //check the file name of first Item
-              ::osl::FileStatus   rFileStatusFirst( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatusFirst( osl_FileStatus_Mask_FileName );
             nError1 = rItem.getFileStatus( rFileStatusFirst );
 
             //get second Item
@@ -5430,7 +5435,7 @@ namespace osl_Directory
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //check the file name again
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError1 = rItem.getFileStatus( rFileStatus );
             //close a directory
             nError1 = testDirectory.close( );
@@ -5533,7 +5538,7 @@ namespace osl_Directory
             sal_Bool            bOk1 = sal_False;
             sal_Bool bOk2 = sal_False;
             sal_Bool bOk3 = sal_False;
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             for ( int nCount = 0; nCount < 3; nCount++ )
             {
                 //get three Items
@@ -5629,7 +5634,7 @@ namespace osl_Directory
             while (1) {
                 nError1 = testDirectory.getNextItem( rItem, 4 );
                 if (::osl::FileBase::E_None == nError1) {
-                    ::osl::FileStatus   rFileStatus( FileStatusMask_FileName | FileStatusMask_Type );
+                    ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type );
                     rItem.getFileStatus( rFileStatus );
                     if ( compareFileName( rFileStatus.getFileName( ), aFileName) == sal_True )
                     {
@@ -5674,7 +5679,7 @@ namespace osl_Directory
         // test code.
         void checkValidMask(osl::VolumeInfo const& _aVolumeInfo, sal_Int32 _nMask)
             {
-                if (_nMask == VolumeInfoMask_FileSystemName)
+                if (_nMask == osl_VolumeInfo_Mask_FileSystemName)
         {
             //get file system name
             ::rtl::OUString aFileSysName( aNullURL );
@@ -5685,7 +5690,7 @@ namespace osl_Directory
                                     ( osl::FileBase::E_None == nError1 ) &&
                                             ( sal_False == bRes2 ) );
                 }
-                if (_nMask == VolumeInfoMask_Attributes)
+                if (_nMask == osl_VolumeInfo_Mask_Attributes)
                 {
                     sal_Bool b1 = _aVolumeInfo.getRemoteFlag();
                     sal_Bool b2 = _aVolumeInfo.getRemoveableFlag();
@@ -5704,33 +5709,33 @@ namespace osl_Directory
 
                     printf("Attributes: %s\n", sAttr.getStr() );
                 }
-                if (_nMask == VolumeInfoMask_TotalSpace)
+                if (_nMask == osl_VolumeInfo_Mask_TotalSpace)
                 {
                     // within Linux, df / * 1024 bytes is the result
                     sal_uInt64 nSize = _aVolumeInfo.getTotalSpace();
                     printf("Total space: %"SAL_PRIuUINT64"\n", nSize);
                 }
-                if (_nMask == VolumeInfoMask_UsedSpace)
+                if (_nMask == osl_VolumeInfo_Mask_UsedSpace)
                 {
                     sal_uInt64 nSize = _aVolumeInfo.getUsedSpace();
                     printf(" Used space: %"SAL_PRIuUINT64"\n", nSize);
                 }
-                if (_nMask == VolumeInfoMask_FreeSpace)
+                if (_nMask == osl_VolumeInfo_Mask_FreeSpace)
                 {
                     sal_uInt64 nSize = _aVolumeInfo.getFreeSpace();
                     printf(" Free space: %"SAL_PRIuUINT64"\n", nSize);
                 }
-                if (_nMask == VolumeInfoMask_MaxNameLength)
+                if (_nMask == osl_VolumeInfo_Mask_MaxNameLength)
                 {
                     sal_uInt32 nLength = _aVolumeInfo.getMaxNameLength();
                     printf("max name length: %"SAL_PRIuUINT32"\n", nLength);
                 }
-                if (_nMask == VolumeInfoMask_MaxPathLength)
+                if (_nMask == osl_VolumeInfo_Mask_MaxPathLength)
                 {
                     sal_uInt32 nLength = _aVolumeInfo.getMaxPathLength();
                     printf("max path length: %"SAL_PRIuUINT32"\n", nLength);
                 }
-                if (_nMask == VolumeInfoMask_FileSystemCaseHandling)
+                if (_nMask == osl_VolumeInfo_Mask_FileSystemCaseHandling)
                 {
                     bool bIsCase = _aVolumeInfo.isCaseSensitiveFileSystem();
                     printf("filesystem case sensitive: %s\n", bIsCase ? "yes" : "no");
@@ -5753,48 +5758,48 @@ namespace osl_Directory
 
         void getVolumeInfo_001_1( )
         {
-            sal_Int32 mask = VolumeInfoMask_FileSystemName;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_2( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_3( )
         {
-            sal_Int32 mask = VolumeInfoMask_TotalSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_TotalSpace;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_4( )
         {
-            sal_Int32 mask = VolumeInfoMask_UsedSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_5( )
         {
-            sal_Int32 mask = VolumeInfoMask_FreeSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FreeSpace;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_6( )
         {
-            sal_Int32 mask = VolumeInfoMask_MaxNameLength;
+            sal_Int32 mask = osl_VolumeInfo_Mask_MaxNameLength;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_7( )
         {
-            sal_Int32 mask = VolumeInfoMask_MaxPathLength;
+            sal_Int32 mask = osl_VolumeInfo_Mask_MaxPathLength;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_8( )
         {
-            sal_Int32 mask = VolumeInfoMask_FileSystemCaseHandling;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemCaseHandling;
             checkVolumeInfo(mask);
         }
 
         void getVolumeInfo_002( )
         {
-            sal_Int32 mask = VolumeInfoMask_FileSystemName;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             ::osl::VolumeInfo aVolumeInfo( mask );
             //call getVolumeInfo here
 
@@ -5812,13 +5817,13 @@ namespace osl_Directory
 
         void getVolumeInfo_003( )
         {
-            sal_Int32 mask = VolumeInfoMask_FileSystemName;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             ::osl::VolumeInfo aVolumeInfo( mask );
             //call getVolumeInfo here
             nError1 = ::osl::Directory::getVolumeInfo( aTmpName3, aVolumeInfo );
 
 // LLA: in Windows, it reply no error, it did not pass in (W32).
-#ifdef UNX
+#if defined(UNX) && !defined(IOS)
             CPPUNIT_ASSERT_MESSAGE( "test for getVolumeInfo function: non-existence test. ",
                                     ( osl::FileBase::E_NOENT == nError1 ) );
 #endif
@@ -6050,7 +6055,7 @@ namespace osl_Directory
             if (tmp_x.lastIndexOf('/') != (tmp_x.getLength() - 1))
                 tmp_x += rtl::OString('/');
 
-#ifndef WNT
+#if !defined(WNT) && !defined(ANDROID)
             // FIXME would be nice to create unique dir even on Windows
             tmp_x += rtl::OString("XXXXXX");
             char *out = mkdtemp(const_cast<char*>(tmp_x.getStr()));
@@ -6293,7 +6298,7 @@ class GlobalObject
         try
         {
             //~ special clean up task in Windows and Unix seperately;
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
             //~ some clean up task  for UNIX OS
             ;
 #else
@@ -6322,7 +6327,7 @@ class GlobalObject
 #endif
 
         }
-        catch (CppUnit::Exception &e)
+        catch (const CppUnit::Exception &e)
         {
             printf("Exception caught in GlobalObject dtor(). Exception message: '%s'. Source line: %d\n", e.what(), e.sourceLine().lineNumber());
         }
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 40c2b7d62..88df98ef0 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -82,20 +82,22 @@ const sal_Char pBuffer_Blank[]  = "";
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )  //Unix
 #	include <unistd.h>
 #	include <limits.h>
 #	include <math.h>
 #	include <errno.h>
 #	include <fcntl.h>
 #	include <sys/stat.h>
-#   if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined (DRAGONFLY)
+#   if !defined(MACOSX) && !defined(IOS) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined (DRAGONFLY)
 #	    include <sys/statfs.h>
 #   else
 #       include <sys/param.h>
 #       include <sys/mount.h>
 #   endif
-#	include <sys/statvfs.h>
+#   if !defined(ANDROID)
+#        include <sys/statvfs.h>
+#   endif
 #	include <sys/types.h>
 #	define TEST_PLATFORM        ""
 #	define TEST_PLATFORM_ROOT   "/"
@@ -187,7 +189,7 @@ OSLTEST_DECLARE( FifoSys,  TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir/fifo"
 // socket, link, etc.
 // Note that this may be changed in the different platform, so be careful to use.
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )                                 //          Unix
+#if ( defined UNX )                                                    //          Unix
 OSLTEST_DECLARE( TypeURL1,  FILE_PREFIX "dev/ccv");                    //socket    Solaris/Linux
 OSLTEST_DECLARE( TypeURL2,  FILE_PREFIX "devices/pseudo/tcp@0:tcp");   //special   Solaris/Linux
 OSLTEST_DECLARE( TypeURL3,  FILE_PREFIX "lib" );                       //link      Solaris
@@ -201,7 +203,7 @@ OSLTEST_DECLARE( TypeURL3,  FILE_PREFIX "" );
 // Volume device URL, we pick some canonical volume device for test:
 // UNIX file system, Floppy Disk, Proc file system, Temp file system, Compact Disk.
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )					//			Unix
+#if ( defined UNX )                                     //			Unix
 OSLTEST_DECLARE( VolURL1,  FILE_PREFIX  "");			//ufs		Solaris/Linux
 #ifdef SOLARIS
 OSLTEST_DECLARE( VolURL2,  FILE_PREFIX  "dev/fd" );		//fd		Solaris
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx
index b68bb7acb..e18649055 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -29,6 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
+#ifdef IOS
+#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_old_test_file
+#endif
+
 // LLA:
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
@@ -61,6 +65,13 @@ namespace osl_test_file
 class oldtestfile : public CppUnit::TestFixture
 {
 public:
+    oldtestfile()
+    {
+        //SAL_ALLOW_LINKOO_SYMLINKS for the make dev-install hack breaks this test
+        rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("SAL_ALLOW_LINKOO_SYMLINKS"));
+        osl_clearEnvironment(envVar.pData);
+    }
+
     void test_file_001();
     void test_file_002();
     void test_file_003();
@@ -126,7 +137,7 @@ void oldtestfile::test_file_001()
         OUString target;
         OUString rel = OUString::createFromAscii( aSource1[i] );
         oslFileError e = osl_getAbsoluteFileURL( base1.pData, rel.pData , &target.pData );
-        // printf("%d : %s -- %s -- %s\n", i, aSource1[i], aSource1[i+1], OUStringToOString(target , RTL_TEXTENCODING_ASCII_US ).getStr() );
+        //fprintf(stderr, "%d : %s -- %s -- %s\n", i, aSource1[i], aSource1[i+1], OUStringToOString(target , RTL_TEXTENCODING_ASCII_US ).getStr() );
         CPPUNIT_ASSERT_MESSAGE("failure #1",  osl_File_E_None == e );
         if( osl_File_E_None == e )
         {
@@ -156,7 +167,7 @@ void oldtestfile::test_file_002()
         OUString target;
         OUString rel = OUString::createFromAscii( aSource2[i] );
         oslFileError e = osl_getAbsoluteFileURL( base2.pData, rel.pData , &target.pData );
-        // printf("%d : %s -- %s -- %s\n", i, aSource2[i], aSource2[i+1], OUStringToOString(target , RTL_TEXTENCODING_ASCII_US ).getStr() );
+        //fprintf(stderr, "%d : %s -- %s -- %s\n", i, aSource2[i], aSource2[i+1], OUStringToOString(target , RTL_TEXTENCODING_ASCII_US ).getStr() );
         CPPUNIT_ASSERT_MESSAGE("failure #2",  osl_File_E_None == e );
         if( osl_File_E_None == e )
         {
@@ -207,10 +218,12 @@ void oldtestfile::test_file_003()
                             CPPUNIT_ASSERT_MESSAGE("failure #4",  target.getLength() >= dir.getLength() );
                             if( target.getLength() >= dir.getLength() )
                             {
-                                                            int j;
-                                                            for( j = dir.getLength() ;
-                                     j < target.getLength() &&
-                                         aSource3[i+1][j-dir.getLength()] == target[j]  ; j++ );
+                                int j = dir.getLength();
+                                while (j < target.getLength() &&
+                                         aSource3[i+1][j-dir.getLength()] == target[j])
+                                {
+                                     ++j;
+                                }
                                 CPPUNIT_ASSERT_MESSAGE("failure #5",  j == target.getLength() );
                             }
                         }
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index 891163120..56135301e 100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -29,6 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
+#ifdef IOS
+#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_tcwf
+#endif
+
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
@@ -43,7 +47,7 @@ using ::rtl::OUStringToOString;
 using ::rtl::OString;
 
 //Use to silence OSL_ warnings for a deliberate error
-extern "C" void SAL_CALL suppressOslDebugMessage( const sal_Char *, sal_Int32, const sal_Char * )
+extern "C" void SAL_CALL suppressOslDebugMessage2( const sal_Char *, sal_Int32, const sal_Char * )
 {
 }
 
@@ -71,7 +75,7 @@ public:
         //deliberate errors, suppress run-time warning for operations on
         //un-opened File
         pfunc_osl_printDetailedDebugMessage pOldDebugMessageFunc =
-            osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage );
+            osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage2 );
 
         char buffer[1];
         sal_uInt64 written = 0;
diff --git a/xmlreader/source/makefile.mk b/sal/qa/osl/getsystempathfromfileurl/makefile.mk
index cb71e21a1..71597ba07 100644
--- a/xmlreader/source/makefile.mk
+++ b/sal/qa/osl/getsystempathfromfileurl/makefile.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,29 +25,37 @@
 #
 #***********************************************************************/
 
-PRJ = ..
-PRJNAME = xmlreader
-TARGET = xmlreader
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
+PRJ = ../../..
+PRJNAME = sal
+TARGET = qa_osl_getsystempathfromfileurl
 
 ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
 
 .INCLUDE: settings.mk
 
-CDEFS += -DOOO_DLLIMPLEMENTATION_XMLREADER
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-SLOFILES = \
-    $(SLO)/pad.obj \
-    $(SLO)/span.obj \
-    $(SLO)/xmlreader.obj
+DLLPRE =
 
 SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = URELIB
-SHL1STDLIBS = \
-    $(SALLIB)
-SHL1TARGET = xmlreader
-SHL1USE_EXPORTS = name
+SHL1OBJS = $(SLO)/test-getsystempathfromfileurl.obj
+SHL1RPATH = NONE
+SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+SHL1TARGET = test-getsystempathfromfileurl
+SHL1VERSIONMAP = version.map
 DEF1NAME = $(SHL1TARGET)
 
+SLOFILES = $(SHL1OBJS)
+
 .INCLUDE: target.mk
+.INCLUDE: _cppunit.mk
+
+.END
diff --git a/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx
new file mode 100644
index 000000000..4d9e65586
--- /dev/null
+++ b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx
@@ -0,0 +1,281 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2011 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#include "precompiled_sal.hxx"
+#include "sal/config.h"
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
+#include "osl/file.hxx"
+
+#if defined WNT
+#define MY_PATH_IN "/c:/foo/bar"
+#define MY_PATH_OUT "c:\\foo\\bar"
+#define MY_PATH_OUT_CONT MY_PATH_OUT "\\"
+#define MY_PATH_OUT_REL "foo\\bar"
+#else
+#define MY_PATH_IN "/foo/bar"
+#define MY_PATH_OUT MY_PATH_IN
+#define MY_PATH_OUT_CONT MY_PATH_OUT "/"
+#define MY_PATH_OUT_REL "foo/bar"
+#endif
+
+namespace {
+
+class Test: public CppUnit::TestFixture {
+private:
+    CPPUNIT_TEST_SUITE(Test);
+    CPPUNIT_TEST(testBadScheme);
+    CPPUNIT_TEST(testNoScheme);
+    CPPUNIT_TEST(testBadAuthority);
+    CPPUNIT_TEST(testLocalhost1Authority);
+    CPPUNIT_TEST(testLocalhost2Authority);
+    CPPUNIT_TEST(testLocalhost3Authority);
+    CPPUNIT_TEST(testNoAuthority);
+    CPPUNIT_TEST(testEmptyPath);
+    CPPUNIT_TEST(testHomeAbbreviation);
+    CPPUNIT_TEST(testOtherHomeAbbreviation);
+    CPPUNIT_TEST(testRelative);
+    CPPUNIT_TEST(testEscape);
+    CPPUNIT_TEST(testBadEscape2f);
+    CPPUNIT_TEST(testBadEscape2F);
+    CPPUNIT_TEST(testBad0);
+    CPPUNIT_TEST(testBadEscape0);
+    CPPUNIT_TEST(testBadQuery);
+    CPPUNIT_TEST(testBadFragment);
+    CPPUNIT_TEST_SUITE_END();
+
+    void testBadScheme();
+    void testNoScheme();
+    void testBadAuthority();
+    void testLocalhost1Authority();
+    void testLocalhost2Authority();
+    void testLocalhost3Authority();
+    void testNoAuthority();
+    void testEmptyPath();
+    void testHomeAbbreviation();
+    void testOtherHomeAbbreviation();
+    void testRelative();
+    void testEscape();
+    void testBadEscape2f();
+    void testBadEscape2F();
+    void testBad0();
+    void testBadEscape0();
+    void testBadQuery();
+    void testBadFragment();
+};
+
+void Test::testBadScheme() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foo:bar")), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testNoScheme() {
+#if !defined WNT //TODO
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("//" MY_PATH_IN)), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT)), p);
+#endif
+}
+
+void Test::testBadAuthority() {
+#if defined UNX
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://baz" MY_PATH_IN)), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+#endif
+}
+
+void Test::testLocalhost1Authority() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://localhost" MY_PATH_IN)),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT)), p);
+}
+
+void Test::testLocalhost2Authority() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://LOCALHOST" MY_PATH_IN)),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT)), p);
+}
+
+void Test::testLocalhost3Authority() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://127.0.0.1" MY_PATH_IN)),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT)), p);
+}
+
+void Test::testNoAuthority() {
+#if !defined WNT //TODO
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_IN)), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT)), p);
+#endif
+}
+
+void Test::testEmptyPath() {
+#if defined UNX
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://")), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")), p);
+#endif
+}
+
+void Test::testHomeAbbreviation() {
+#if defined UNX
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///~" MY_PATH_IN)), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+        // could theoretically fail due to osl::Security::getHomeDir problem
+    CPPUNIT_ASSERT(p.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(MY_PATH_OUT)));
+#endif
+}
+
+void Test::testOtherHomeAbbreviation() {
+#if defined UNX
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///~baz" MY_PATH_IN)),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e); // not supported for now
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+#endif
+}
+
+void Test::testRelative() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foo/bar")), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT(
+        p.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(MY_PATH_OUT_REL)));
+}
+
+void Test::testEscape() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "/b%61z")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT_CONT "baz")), p);
+}
+
+void Test::testBadEscape2f() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "/b%2fz")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testBadEscape2F() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "/b%2Fz")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testBad0() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "/b\x00z")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testBadEscape0() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "/b%00z")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testBadQuery() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "?baz")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testBadFragment() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "#baz")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sal/qa/osl/getsystempathfromfileurl/version.map b/sal/qa/osl/getsystempathfromfileurl/version.map
new file mode 100644
index 000000000..ef2ab497c
--- /dev/null
+++ b/sal/qa/osl/getsystempathfromfileurl/version.map
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#***********************************************************************/
+
+UDK_3_0_0 {
+    global:
+        cppunitTestPlugIn;
+
+    local:
+        *;
+};
diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk
index df444788e..7fdf0ca43 100644
--- a/sal/qa/osl/module/makefile.mk
+++ b/sal/qa/osl/module/makefile.mk
@@ -36,6 +36,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -70,10 +74,10 @@ SHL2DEF=    $(MISC)$/$(SHL2TARGET).def
 
 DEF2NAME    =$(SHL2TARGET)
 SHL2VERSIONMAP= $(PRJ)$/qa$/export.map
-# END ------------------------------------------------------------------
+
+SLOFILES = $(SHL2OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 .INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
-
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index 85af98a4d..983cfe7e9 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -148,7 +148,7 @@ inline void deleteTestFile( const ::rtl::OUString filename )
     if ( !isURL( filename ) )
         ::osl::FileBase::getFileURLFromSystemPath( filename, aPathURL ); //convert if not full qualified URL
 
-    nError = ::osl::File::setAttributes( aPathURL, Attribute_GrpWrite| Attribute_OwnWrite| Attribute_OthWrite ); // if readonly, make writtenable.
+    nError = ::osl::File::setAttributes( aPathURL, osl_File_Attribute_GrpWrite| osl_File_Attribute_OwnWrite| osl_File_Attribute_OthWrite ); // if readonly, make writtenable.
     CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: set writtenable ", ( ::osl::FileBase::E_None == nError ) || ( ::osl::FileBase::E_NOENT == nError ) );
 
     nError = ::osl::File::remove( aPathURL );
diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h
index 0cf91b599..1174c018a 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -39,7 +39,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )                      //Unix
 #	include <unistd.h>
 #endif
 #if ( defined WNT )                     // Windows
diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx
index aa436a354..fa4cdaf82 100644
--- a/sal/qa/osl/module/osl_Module_DLL.cxx
+++ b/sal/qa/osl/module/osl_Module_DLL.cxx
@@ -43,9 +43,5 @@ extern "C" sal_Bool SAL_CALL firstfunc( sal_Bool bRes )
 {
    return ( bRes = sal_True );
 }
-extern "C" void SAL_CALL secondfunc()
-{
-   printf("second func called.\n");
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 6c7779b0b..c083a184f 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -72,7 +72,7 @@ namespace ThreadHelper
 #ifdef WNT                               //Windows
         Sleep( _nSec * 1000 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )   //Unix
+#if ( defined UNX )                     //Unix
         sleep( _nSec );
 #endif
         // printf("# done\n" ); 
@@ -82,7 +82,7 @@ namespace ThreadHelper
 #ifdef WNT      //Windows
             Sleep(_nTenthSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )                     //Unix
             TimeValue nTV;
             nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 );
             nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 );
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index a6dabae75..a293ae9f8 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -884,7 +884,7 @@ namespace osl_StreamPipe
 #ifdef WNT                               //Windows
         Sleep( _nSec * 1000 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )   //Unix
+#if ( defined UNX )                     //Unix
         sleep( _nSec );
 #endif
         // printf("done\n" );
diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk
index 8e050cfbb..73360cbd0 100644
--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@ -38,10 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
     CFLAGS+=/Ob1
 .ENDIF
 
@@ -52,8 +49,6 @@ SHL1IMPLIB=i$(SHL1TARGET)
 DEF1NAME=$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
-# END ------------------------------------------------------------------
-
 SHL2OBJS=$(SLO)$/osl_process.obj
 SHL2TARGET=osl_process
 SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
@@ -61,8 +56,6 @@ SHL2IMPLIB=i$(SHL2TARGET)
 DEF2NAME=$(SHL2TARGET)
 SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
 
-# END ------------------------------------------------------------------
-
 OBJ3FILES=$(OBJ)$/osl_process_child.obj
 APP3TARGET=osl_process_child
 APP3OBJS=$(OBJ3FILES)
@@ -73,18 +66,8 @@ SHL2DEPN=$(APP3TARGETN) \
          $(BIN)/batch.bat
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-
-.IF "$(GUI)" == "OS2"
-
-SLOFILES=$(SHL2OBJS)
-
-.ELSE
-
 SLOFILES=$(SHL1OBJS) $(SHL2OBJS)
 
-.ENDIF
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 724cdbef2..de0589f45 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -29,6 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
+#ifdef IOS
+#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_Thread
+#endif
+
 #ifdef WNT
 #define NOMINMAX
 #include <windows.h>
@@ -1097,9 +1101,11 @@ namespace osl_Thread
 
                 case osl_Thread_PriorityAboveNormal:
                     sPrioStr = "AboveNormal";
+                    break;
 
                 case osl_Thread_PriorityNormal:
                     sPrioStr = "Normal";
+                    break;
 
                 case osl_Thread_PriorityBelowNormal:
                     sPrioStr = "BelowNormal";
@@ -2097,7 +2103,6 @@ namespace osl_ThreadData
                     "ThreadData setData: ",
                     cData1 == 'a' && cData2 == 'b' && aChar == 'o'
                     );
-
             }
 
         CPPUNIT_TEST_SUITE(setData);
@@ -2145,7 +2150,6 @@ namespace osl_ThreadData
                     "ThreadData setData: ",
                     cData1 == 'c' && cData2 == 'd' && aChar == 'i'
                     );
-
             }
 
         // setData then change the value in the address data pointer points,
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 13e11361d..573a12241 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -29,6 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
+#ifdef IOS
+#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_process
+#endif
+
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
@@ -70,20 +74,12 @@
 # endif
 #endif
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child.exe"));
 #else
     const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child"));
 #endif
 
-
-//########################################
-std::string OUString_to_std_string(const rtl::OUString& oustr)
-{
-    rtl::OString ostr = rtl::OUStringToOString(oustr, osl_getThreadTextEncoding());
-    return std::string(ostr.getStr());
-}
-
 //########################################
 using namespace osl;
 
@@ -477,6 +473,7 @@ public:
         );
 
         std::string line;
+        line.reserve(1024);
         while (std::getline(file, line, '\0'))
             env_container->push_back(line);
         tidy_container(*env_container);
@@ -672,7 +669,7 @@ public:
     void osl_execProc_test_batch()
     {
         oslProcess process;
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
         rtl::OUString suBatch = suCWD + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("batch.bat"));
 #else
         rtl::OUString suBatch = suCWD + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("batch.sh"));
diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk
index 9fc442fc1..85d9beb44 100755
--- a/sal/qa/osl/security/makefile.mk
+++ b/sal/qa/osl/security/makefile.mk
@@ -36,11 +36,13 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:Security by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Security.obj
 
@@ -55,8 +57,8 @@ SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:Security
-# END ------------------------------------------------------------------
+
+SLOFILES = $(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 93fa96ab2..230b27e96 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -126,12 +126,12 @@ namespace osl_Security
 
 
         CPPUNIT_TEST_SUITE( logonUser );
-        if  ( !aStringForward.equals( aNullURL )  && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) ==  aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) )
+        if  ( !aStringForward.equals( aNullUrl )  && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) ==  aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) )
         /// if user name and passwd are forwarded
         {
             CPPUNIT_TEST( logonUser_user_pwd );
         }
-        if  ( !aStringForward.equals( aNullURL )  && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) !=  aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) )
+        if  ( !aStringForward.equals( aNullUrl )  && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) !=  aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) )
         /// if user name and passwd and file server are forwarded
         {
             CPPUNIT_TEST( logonUser_user_pwd_server );
@@ -197,30 +197,6 @@ namespace osl_Security
     }; // class getUserName
 
 
-
-    /** testing the method:
-        inline sal_Bool SAL_CALL getHomeDir( ::rtl::OUString& strDirectory) const;
-    */
-    class getHomeDir : public CppUnit::TestFixture
-    {
-    public:
-        sal_Bool bRes, bRes1;
-
-        void getHomeDir_001( )
-        {
-            ::osl::Security aSec;
-            ::rtl::OUString strHome;
-            bRes = aSec.getHomeDir( strHome );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: getHomeDir and compare it with the info we get at the beginning.",
-                                     ( sal_True == strHomeDirectory.equals( strHome ) ) && ( sal_True == bRes ) );
-        }
-
-        CPPUNIT_TEST_SUITE( getHomeDir );
-        CPPUNIT_TEST( getHomeDir_001 );
-        CPPUNIT_TEST_SUITE_END( );
-    }; // class getHomeDir
-
     /** testing the method:
         inline sal_Bool Security::getConfigDir( rtl::OUString& strDirectory ) const
     */
@@ -341,7 +317,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::ctors);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::logonUser);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserIdent);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserName);
-CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHomeDir);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getConfigDir);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::isAdministrator);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHandle);
@@ -379,7 +354,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
     t_print("#if no text forwarded, this function will be skipped.\n" );
 
     /// get system information
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
     /// some initialization work for UNIX OS
 
 
@@ -612,31 +587,31 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
     t_print("#\n#Retrived system information is below:\n");
 
     t_print("Computer Name:              ");
-    if ( strComputerName == aNullURL )
+    if ( strComputerName == aNullUrl )
         t_print("Not retrived\n" );
     else
         printUString( strComputerName );
 
     t_print("Current User Name:          ");
-    if ( strUserName == aNullURL )
+    if ( strUserName == aNullUrl )
         t_print("Not retrived\n" );
     else
         printUString( strUserName );
 
     t_print("Current User Home Directory:");
-    if ( strHomeDirectory == aNullURL )
+    if ( strHomeDirectory == aNullUrl )
         t_print("Not retrived\n" );
     else
         printUString( strHomeDirectory );
 
     t_print("Current Config Directory:   ");
-    if ( strConfigDirectory == aNullURL )
+    if ( strConfigDirectory == aNullUrl )
         t_print("Not retrived\n" );
     else
         printUString( strConfigDirectory );
 
     t_print("Current UserID:             ");
-    if ( strUserID == aNullURL )
+    if ( strUserID == aNullUrl )
         t_print("Not retrived\n" );
     else
         printUString( strUserID );
@@ -649,7 +624,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
 
     /// get and display forwarded text if available.
     aStringForward = ::rtl::OUString::createFromAscii( parameters.getCommandLine().c_str() );
-    if ( !aStringForward.equals( aNullURL ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 )
+    if ( !aStringForward.equals( aNullUrl ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 )
     {
         sal_Int32 nFirstSpacePoint = aStringForward.indexOf( (sal_Unicode)' ' );;
         sal_Int32 nLastSpacePoint = aStringForward.lastIndexOf( (sal_Unicode)' ' );;
@@ -662,7 +637,8 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
 
             aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, aStringForward.getLength( ) - 1 );
             t_print("#Forwarded password: ");
-            for ( int i = nFirstSpacePoint +1; i <= aStringForward.getLength( ) - 1; i++, t_print("*") );
+            for (int i = nFirstSpacePoint+1; i <= aStringForward.getLength()-1; ++i)
+                t_print("*");
             t_print("\n" );
         }
         else
@@ -674,7 +650,8 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
 
             aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, nLastSpacePoint );
             t_print("#Forwarded password: ");
-            for ( int i = nFirstSpacePoint +1; i <= nLastSpacePoint; i++, t_print("*") );
+            for (int i = nFirstSpacePoint+1; i <= nLastSpacePoint; ++i)
+                t_print("*");
             t_print("\n" );
 
             aFileServer = aStringForward.copy( nLastSpacePoint +1, aStringForward.getLength( ) - 1 );
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index e05018baa..197745f7d 100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
 #include <unistd.h>
 #include <pwd.h>
 #endif
@@ -63,12 +63,15 @@ const char pTestString[17] = "Sun Microsystems";
 //------------------------------------------------------------------------
 // condition names
 //------------------------------------------------------------------------
-OSLTEST_DECLARE_USTRING( TestSec,  "testsecurity" );
-OSLTEST_DECLARE_USTRING( NullURL,  "" );
 
-::rtl::OUString aLogonUser( aNullURL ), aLogonPasswd( aNullURL ), aFileServer( aNullURL ), aStringForward( aNullURL );
-::rtl::OUString strUserName( aNullURL ) , strComputerName( aNullURL ) , strHomeDirectory( aNullURL );
-::rtl::OUString strConfigDirectory( aNullURL ), strUserID( aNullURL );
+// Intentionally different from the aNullURL in osl_File_Const.h to avoid
+// duplicate symbols as all the unit tests here get linked together for iOS...
+
+OSLTEST_DECLARE_USTRING( NullUrl,  "" );
+
+::rtl::OUString aLogonUser( aNullUrl ), aLogonPasswd( aNullUrl ), aFileServer( aNullUrl ), aStringForward( aNullUrl );
+::rtl::OUString strUserName( aNullUrl ) , strComputerName( aNullUrl ) , strHomeDirectory( aNullUrl );
+::rtl::OUString strConfigDirectory( aNullUrl ), strUserID( aNullUrl );
 
 sal_Bool isAdmin = sal_False;
 
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index d1c055c59..221a75824 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -242,7 +242,7 @@ void thread_sleep( sal_Int32 _nSec )
 #ifdef WNT                               //Windows
     Sleep( _nSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )   //Unix
+#if ( defined UNX )             //Unix
     usleep(_nSec * 100000);
 #endif
     t_print("# done\n" );
diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h
index e80552c86..da8d80f4c 100644
--- a/sal/qa/osl/socket/osl_Socket_Const.h
+++ b/sal/qa/osl/socket/osl_Socket_Const.h
@@ -64,7 +64,7 @@ extern "C"
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )     //Unix
 #	include <unistd.h>
 #	include <limits.h>
 #	include <string.h>
diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h
index d05252587..09569ab90 100644
--- a/sal/qa/osl/socket/osl_Socket_Const_orig.h
+++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h
@@ -64,7 +64,7 @@ extern "C"
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )     //Unix
 #	include <unistd.h>
 #	include <limits.h>
 #	include <string.h>
diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx
index 9244a1709..3b0066719 100644
--- a/sal/qa/osl/socket/sockethelper.cxx
+++ b/sal/qa/osl/socket/sockethelper.cxx
@@ -203,7 +203,7 @@ void thread_sleep( sal_Int32 _nSec )
 #ifdef WNT				 //Windows
     Sleep( _nSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )	 //Unix
+#if ( defined UNX )	 //Unix
     usleep(_nSec * 100000);
 #endif
     // t_print("# done\n" );
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index b242f180c..77553bda3 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -52,7 +52,7 @@ extern "C"
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )  //Unix
 
 #include <unistd.h>
 #include <limits.h>
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index 817554074..1a015da3b 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -35,6 +35,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -51,8 +55,7 @@ DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index c7161d500..7a432d542 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -125,7 +125,7 @@ inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename)
      rtl::OUString aDirURL(getExecutableDirectory());
      aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
      aDirURL += OUString::createFromAscii( _sFilename.getStr() );
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini"));
 #else
     aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc"));
@@ -138,7 +138,7 @@ void thread_sleep_tenth_sec(sal_Int32 _nTenthSec)
 #ifdef WNT      //Windows
     Sleep(_nTenthSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )
     TimeValue nTV;
     nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 );
     nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 );
@@ -307,7 +307,7 @@ namespace rtl_Bootstrap
             oslProcess hProcess = NULL;
            rtl::OUString suFileURL = suCWD;
             suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +  rtl::OUString::createFromAscii(process_name) ;
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
         suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe"));
 #endif
             const int nParameterCount = 3;
@@ -590,7 +590,7 @@ namespace rtl_Bootstrap
      rtl::OUString aDirURL(RTL_CONSTASCII_USTRINGPARAM("$ORIGIN"));
      aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
      aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("rtl"));
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini"));
 #else
     aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc"));
@@ -836,7 +836,7 @@ static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString co
 static void create_rtlrc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtl.ini"));
 #else
     aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtlrc"));
@@ -859,7 +859,7 @@ static void create_rtlrc()
 static void create_testshl2rc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2.ini"));
 #else
     aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2rc"));
@@ -899,7 +899,7 @@ static void create_testshl2rc()
 static void create_pseudorc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudo.ini"));
 #else
     aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudorc"));
@@ -916,7 +916,7 @@ static void create_pseudorc()
 void create_bootstrap_processrc()
 {
     rtl::OUString aDirURL(getModulePath());
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_process.ini"));
 #else
     aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_processrc"));
diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk
index ced0747ac..fd95355ac 100644
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -37,13 +37,15 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_cipher.obj
 
@@ -56,12 +58,9 @@ SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 # DEF2EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:joblist
-# END ------------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index ac05f2bf5..647d0f547 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -232,6 +232,16 @@ public:
 
             /* rtlCipherError */ aError = rtl_cipher_decode(aCipher, pCipherBuffer, nCipherLen, pPlainText2Buffer, nPlainText2Len);
             CPPUNIT_ASSERT_MESSAGE("decode should not work", aError != rtl_Cipher_E_None);
+
+            delete [] pPlainText2Buffer;
+
+            delete [] pCipherBuffer;
+            delete [] pPlainTextBuffer;
+
+            delete [] pArgBuffer;
+            delete [] pKeyBuffer;
+
+            rtl_cipher_destroy(aCipher);
         }
 
     void test_encode_and_decode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, rtl::OString const& _sPlainTextStr)
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index 149e82eb8..3820a8cf7 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -35,13 +35,15 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:jobfile by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_crc32.obj
 
@@ -54,12 +56,9 @@ SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:jobfile
-# END ------------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index 02283c9c1..a1d035673 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -35,15 +35,16 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
     CFLAGS+=/Ob1
 .ENDIF
 
@@ -57,11 +58,7 @@ SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
-# END ------------------------------------------------------------------
-
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-
 SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index bfb7ec314..2690091eb 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -54,9 +54,9 @@
 #define CONST_TEST_STRING "gregorian"
 
 namespace {
-struct Gregorian : public ::rtl::StaticWithInit<const ::rtl::OUString, Gregorian> {
-    const ::rtl::OUString operator () () {
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONST_TEST_STRING ));
+struct Gregorian : public rtl::StaticWithInit<rtl::OUString, Gregorian> {
+    const rtl::OUString operator () () {
+        return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONST_TEST_STRING ));
     }
 };
 }
@@ -79,7 +79,7 @@ namespace ThreadHelper
 #ifdef WNT      //Windows
         Sleep(_nTenthSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )
         TimeValue nTV;
         nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 );
         nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 );
@@ -208,6 +208,9 @@ namespace rtl_DoubleLocking
                 pThread->terminate();
                 p2Thread->terminate();
 
+                pThread->join();
+                p2Thread->join();
+
                 sal_Int32 nValueOK = 0;
                 nValueOK = pThread->getOK();
 
@@ -232,9 +235,6 @@ namespace rtl_DoubleLocking
                 printf("Fails in Thread #2 is %d\n", nValueFails2);
 #endif
 
-                pThread->join();
-                p2Thread->join();
-
                 delete pThread;
                 delete p2Thread;
 
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index 32e1471ee..0d1c8f83f 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -35,13 +35,15 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:locale by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_locale.obj
 
@@ -54,13 +56,9 @@ SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:locale
-# END ------------------------------------------------------------------
-
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 12ced3b15..4f2b3dda3 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -149,7 +149,7 @@ public:
     void getLanguage_002()
     {
         rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
-        rtl::OUString suLanguage = rtl_locale_getLanguage(aLocale.getData());
+        rtl::OUString suLanguage(rtl_locale_getLanguage(aLocale.getData()), SAL_NO_ACQUIRE);
         CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de"))));
     }
 
@@ -188,7 +188,7 @@ public:
     void getCountry_002()
     {
         rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
-        rtl::OUString suCountry = rtl_locale_getCountry(aLocale.getData());
+        rtl::OUString suCountry(rtl_locale_getCountry(aLocale.getData()), SAL_NO_ACQUIRE);
         CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE"))));
     }
 
@@ -227,7 +227,7 @@ public:
     void getVariant_002()
     {
         rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
-        rtl::OUString suVariant = rtl_locale_getVariant(aLocale.getData());
+        rtl::OUString suVariant(rtl_locale_getVariant(aLocale.getData()), SAL_NO_ACQUIRE);
         CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch"))));
     }
 
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index dfb8061b1..ac3dfc165 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
 #       include <unistd.h>
 #endif
 
@@ -237,7 +237,7 @@ public:
                 printf("Please remove logfile* manully! Error is Permision denied!");
 #endif
             }
-            catch (CppUnit::Exception &e)
+            catch (const CppUnit::Exception &e)
             {
                 printf("Exception caught in GlobalObject dtor(). Exception message: '%s'. Source line: %d\n", e.what(), e.sourceLine().lineNumber());
             }
diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk
index 9165daa11..0db90281a 100644
--- a/sal/qa/rtl/oustringbuffer/makefile.mk
+++ b/sal/qa/rtl/oustringbuffer/makefile.mk
@@ -34,6 +34,9 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
 
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
@@ -52,4 +55,3 @@ DEF1NAME := $(SHL1TARGET)
 
 .INCLUDE: target.mk
 .INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
-
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index 81627c3b7..f51a6edaf 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -94,7 +94,7 @@ public:
 
     void getAppCommandArg_001()
     {
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process.exe"));
 #else
     const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process"));
@@ -231,7 +231,7 @@ public:
     //different processes different pids
     void getGlobalProcessId_002()
     {
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id.exe"));
 #else
     const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id"));
diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk
index 2b07539e8..c58476e59 100644
--- a/sal/qa/rtl/strings/makefile.mk
+++ b/sal/qa/rtl/strings/makefile.mk
@@ -34,6 +34,9 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
 
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index dd6064a8d..fe8ed6c41 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -368,7 +368,7 @@ void Test::test_Uri() {
             aAbs = rtl::Uri::convertRelToAbs(
                 rtl::OUString::createFromAscii(aRelToAbsTest[i].pBase),
                 rtl::OUString::createFromAscii(aRelToAbsTest[i].pRel));
-        } catch (rtl::MalformedUriException &) {
+        } catch (const rtl::MalformedUriException &) {
             bMalformed = true;
         }
         if (bMalformed
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index ccf4588aa..26018ef88 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -155,7 +155,7 @@ namespace ThreadHelper
 #ifdef WNT      //Windows
         Sleep(_nSec * 10 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )
         sleep( _nSec );
 #endif
     }
diff --git a/sal/qa/rtl_strings/rtl_String_Const.h b/sal/qa/rtl_strings/rtl_String_Const.h
index 899b5fa67..d6fa04d24 100644
--- a/sal/qa/rtl_strings/rtl_String_Const.h
+++ b/sal/qa/rtl_strings/rtl_String_Const.h
@@ -394,7 +394,7 @@ static const sal_Int16 kSInt16Max = SHRT_MAX;
 static const sal_Int32 kUInt16Max = USHRT_MAX;
 static const sal_Int32 kSInt32Max = INT_MAX;
 static const sal_Int64 kUInt32Max = UINT_MAX;
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 static const sal_Int64 kSInt64Max = 9223372036854775807LL;
 #else
 static const sal_Int64 kSInt64Max = 9223372036854775807;
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.cxx b/sal/qa/rtl_strings/rtl_String_Utils.cxx
index 2250d98f7..62302441a 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.cxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.cxx
@@ -171,172 +171,6 @@ sal_Char* createName( sal_Char* dst, const sal_Char* meth, sal_uInt32 cnt )
 }
 
 //------------------------------------------------------------------------
-//  testing the method compareTo( const OString & aStr )
-//------------------------------------------------------------------------
-void makeComment( char *com, const char *str1, const char *str2,
-                                                            sal_Int32 sgn )
-{
-    cpystr(com, str1);
-    int str1Length = AStringLen( str1 );
-    const char *sign = (sgn == 0) ? " == " : (sgn > 0) ? " > " : " < " ;
-    cpystr(com + str1Length, sign);
-    int signLength = AStringLen(sign);
-    cpystr(com + str1Length + signLength, str2);
-    com[str1Length + signLength + AStringLen(str2)] = 0;
-}
-
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToFloatCompare ( const sal_Char  *pStr,
-                                 const float      nX,
-                                 const float      nEPS
-                                )
-{
-    sal_Bool cmp = sal_False;
-
-    if ( pStr != NULL )
-    {
-        ::rtl::OString aStr(pStr);
-
-        float actNum = 0;
-        float expNum = nX;
-        float eps    = nEPS;
-
-        actNum = aStr.toFloat();
-
-        if ( abs( (int)(actNum - expNum) ) <= eps )
-        {
-            cmp = sal_True;
-        } // if
-    } // if
-
-    return cmp;
-} // AStringToFloatCompare
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToDoubleCompare ( const sal_Char  *pStr,
-                                  const double     nX,
-                                  const double     nEPS
-                                )
-{
-    sal_Bool cmp = sal_False;
-
-    if ( pStr != NULL )
-    {
-        ::rtl::OString aStr(pStr);
-
-        double actNum = 0;
-        double expNum = nX;
-        double eps    = nEPS;
-
-        actNum = aStr.toDouble();
-
-        if ( abs( (int)(actNum - expNum) ) <= eps )
-        {
-            cmp = sal_True;
-        } // if
-    } // if
-
-    return cmp;
-} // AStringToDoubleCompare
-
-sal_uInt32 UStringLen( const sal_Unicode *pUStr )
-{
-    sal_uInt32 nUStrLen = 0;
-
-    if ( pUStr != NULL )
-    {
-        const sal_Unicode *pTempUStr = pUStr;
-
-        while( *pTempUStr )
-        {
-            pTempUStr++;
-        } // while
-
-        nUStrLen = (sal_uInt32)( pTempUStr - pUStr );
-    } // if
-
-    return nUStrLen;
-} // UStringLen
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringIsValid( const sal_Char  *pAStr )
-{
-    if ( pAStr != NULL )
-    {
-        sal_uInt32 nLen  = AStringLen( pAStr );
-        sal_uChar  uChar = 0;
-
-        while ( ( nLen >= 0 ) && ( *pAStr ) )
-        {
-            uChar = (unsigned char)*pAStr;
-
-            if ( uChar > 127 )
-            {
-                return sal_False;
-            } // if
-
-            pAStr++;
-
-            // Since we are dealing with unsigned integers
-            // we want to make sure that the last number is
-            // indeed zero.
-
-            if ( nLen > 0 )
-            {
-                nLen--;
-            } // if
-            else
-            {
-                break;
-            } // else
-        } // while
-    } // if
-
-    return sal_True;
-} // AStringIsValid
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringNIsValid( const sal_Char   *pAStr,
-                          const sal_uInt32  nStrLen
-                        )
-{
-    sal_uInt32 nLen  = nStrLen;
-    sal_uChar  uChar = 0;
-
-    while ( ( nLen >= 0 ) && ( *pAStr ) )
-    {
-        uChar = (unsigned char)*pAStr;
-
-        if ( uChar > 127 )
-        {
-            return sal_False;
-        } // if
-
-        pAStr++;
-
-        // Since we are dealing with unsigned integers
-        // we want to make sure that the last number is
-        // indeed zero.
-
-        if ( nLen > 0 )
-        {
-            nLen--;
-        } // if
-        else
-        {
-            break;
-        } // else
-    } // while
-
-    return sal_True;
-} // AStringNIsValid
-
-//------------------------------------------------------------------------
 
 static inline sal_Int32 ACharToUCharCompare( const sal_Unicode *pUStr,
                                              const sal_Char    *pAStr
@@ -351,224 +185,4 @@ static inline sal_Int32 ACharToUCharCompare( const sal_Unicode *pUStr,
     return  nCmp;
 } // ACharToUCharCompare
 
-//------------------------------------------------------------------------
-
-sal_Int32 AStringToUStringCompare( const sal_Unicode *pUStr,
-                                   const sal_Char    *pAStr
-                                 )
-{
-     sal_Int32 nCmp = kErrCompareAStringToUString;
-
-    if ( ( pUStr != NULL ) && ( pAStr != NULL ) )
-    {
-        nCmp = ACharToUCharCompare( pUStr, pAStr );
-
-        while ( ( nCmp == 0 ) && ( *pAStr ) )
-        {
-            pUStr++;
-            pAStr++;
-
-            nCmp = ACharToUCharCompare( pUStr, pAStr );
-        } // while
-    } // if
-
-    return nCmp;
-} // AStringToUStringCompare
-
-//------------------------------------------------------------------------
-
-sal_Int32 AStringToUStringNCompare( const sal_Unicode  *pUStr,
-                                    const sal_Char     *pAStr,
-                                    const sal_uInt32    nAStrCount
-                                   )
-{
-    sal_Int32 nCmp = kErrCompareNAStringToUString;
-
-    if ( ( pUStr != NULL ) && ( pAStr != NULL ) )
-    {
-        sal_uInt32 nCount = nAStrCount;
-
-        nCmp = ACharToUCharCompare( pUStr, pAStr );
-
-        while ( ( nCmp == 0 ) && ( *pAStr ) && ( nCount ) )
-        {
-            pUStr++;
-            pAStr++;
-
-            nCmp = ACharToUCharCompare( pUStr, pAStr );
-
-            // Since we are dealing with unsigned integers
-            // we want to make sure that the last number is
-            // indeed zero.
-
-            if ( nCount > 0 )
-            {
-                nCount--;
-            } // if
-            else
-            {
-                break;
-            } // else
-        } // while
-    } // if
-
-    return nCmp;
-} // AStringToUStringNCompare
-
-//------------------------------------------------------------------------
-
-sal_Int32 AStringToRTLUStringCompare( const rtl_uString  *pRTLUStr,
-                                      const sal_Char     *pAStr
-                                    )
-{
-    sal_Int32 nCmp = kErrCompareAStringToRTLUString;
-
-    if ( ( pRTLUStr != NULL ) && ( pAStr != NULL ) )
-    {
-        rtl_uString *pRTLUStrCopy = NULL;
-
-        rtl_uString_newFromString( &pRTLUStrCopy, pRTLUStr );
-
-        if ( pRTLUStrCopy != NULL )
-        {
-            const sal_Unicode *pUStr = rtl_uString_getStr( pRTLUStrCopy );
-
-            if ( pUStr != NULL )
-            {
-                nCmp = AStringToUStringCompare( pUStr, pAStr );
-            } // if
-
-            rtl_uString_release( pRTLUStrCopy );
-
-            pRTLUStrCopy = NULL;
-        } // if
-    } // if
-
-    return nCmp;
-} // AStringToRTLUStringCompare
-
-//------------------------------------------------------------------------
-
-sal_Int32 AStringToRTLUStringNCompare( const rtl_uString  *pRTLUStr,
-                                       const sal_Char     *pAStr,
-                                       const sal_uInt32    nAStrCount
-                                     )
-{
-    sal_Int32 nCmp = kErrCompareNAStringToRTLUString;
-
-    if ( ( pRTLUStr != NULL ) && ( pAStr != NULL ) )
-    {
-        rtl_uString *pRTLUStrCopy = NULL;
-
-        rtl_uString_newFromString( &pRTLUStrCopy, pRTLUStr );
-
-        if ( pRTLUStrCopy != NULL )
-        {
-            const sal_Unicode  *pUStr = rtl_uString_getStr( pRTLUStrCopy );
-
-            if ( pUStr != NULL )
-            {
-                nCmp = AStringToUStringNCompare( pUStr, pAStr, nAStrCount );
-            } // if
-
-            rtl_uString_release( pRTLUStrCopy );
-
-            pRTLUStrCopy = NULL;
-        } // if
-    } // if
-
-    return nCmp;
-} // AStringToRTLUStringNCompare
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToUStringCopy( sal_Unicode     *pDest,
-                               const sal_Char  *pSrc
-                             )
-{
-    sal_Bool    bCopied = sal_False;
-    sal_uInt32  nCount  = AStringLen( pSrc );
-    sal_uInt32  nLen    = nCount;
-
-    if (    ( pDest != NULL )
-         && ( pSrc  != NULL )
-         && ( AStringNIsValid( pSrc, nLen ) )
-       )
-    {
-        while ( nCount >= 0 )
-        {
-            *pDest = (unsigned char)*pSrc;
-
-            pDest++;
-            pSrc++;
-
-            // Since we are dealing with unsigned integers
-            // we want to make sure that the last number is
-            // indeed zero.
-
-            if ( nCount > 0 )
-            {
-                nCount--;
-            } // if
-            else
-            {
-                break;
-            } // else
-        } // while
-
-        if ( nCount == 0 )
-        {
-            bCopied = sal_True;
-        } // if
-    } // if
-
-    return  bCopied;
-} // AStringToUStringCopy
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToUStringNCopy( sal_Unicode       *pDest,
-                                const sal_Char    *pSrc,
-                                const sal_uInt32   nSrcLen
-                              )
-{
-    sal_Bool    bCopied = sal_False;
-    sal_uInt32  nCount  = nSrcLen;
-    sal_uInt32  nLen    = nSrcLen;
-
-    if (    ( pDest != NULL )
-         && ( pSrc  != NULL )
-         && ( AStringNIsValid( pSrc, nLen ) )
-       )
-    {
-        while ( nCount >= 0 )
-        {
-            *pDest = (unsigned char)*pSrc;
-
-            pDest++;
-            pSrc++;
-
-            // Since we are dealing with unsigned integers
-            // we want to make sure that the last number is
-            // indeed zero.
-
-            if ( nCount > 0 )
-            {
-                nCount--;
-            } // if
-            else
-            {
-                break;
-            } // else
-        } // while
-
-        if ( nCount == 0 )
-        {
-            bCopied = sal_True;
-        } // if
-    } // if
-
-    return  bCopied;
-} // AStringToUStringNCopy
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.hxx b/sal/qa/rtl_strings/rtl_String_Utils.hxx
index be4083bd7..fc0e29be0 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.hxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.hxx
@@ -54,29 +54,12 @@ sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 l
 sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 );
 
 sal_Char* createName( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt );
-void makeComment(char *com, const char *str1, const char *str2, sal_Int32 sgn);
 
 
 sal_uInt32 AStringLen( const sal_Char *pAStr );
 
-sal_uInt32 UStringLen( const sal_Unicode *pUStr );
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToFloatCompare ( const sal_Char  *pStr,
-                                 const float      nX,
-                                 const float      nEPS
-                                );
-
-sal_Bool AStringToDoubleCompare ( const sal_Char  *pStr,
-                                  const double     nX,
-                                  const double     nEPS
-                                );
-
 //------------------------------------------------------------------------
 
-sal_Bool AStringIsValid( const sal_Char  *pAStr );
-
 sal_Bool AStringNIsValid( const sal_Char   *pAStr,
                           const sal_uInt32  nStrLen
                         );
@@ -92,34 +75,8 @@ sal_Int32 AStringToUStringNCompare( const sal_Unicode  *pUStr,
                                     const sal_uInt32    nAStrCount
                                    );
 
-sal_Int32 AStringToRTLUStringCompare( const rtl_uString  *pRTLUStr,
-                                      const sal_Char     *pAStr
-                                    );
-
-sal_Int32 AStringToRTLUStringNCompare( const rtl_uString  *pRTLUStr,
-                                       const sal_Char     *pAStr,
-                                       const sal_uInt32    nAStrCount
-                                     );
-
-//------------------------------------------------------------------------
-
-sal_Bool AStringToUStringCopy( sal_Unicode     *pDest,
-                               const sal_Char  *pSrc
-                             );
-
-sal_Bool AStringToUStringNCopy( sal_Unicode       *pDest,
-                                const sal_Char    *pSrc,
-                                const sal_uInt32   nSrcLen
-                              );
-
 #endif /* __cplusplus */
 
 #endif /* _RTL_STRING_UTILS_HXX */
 
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index ee0e8d7d2..c08a86229 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -106,18 +106,13 @@ void oldtests::test_OString()
     s6 = s5.valueOf(n);
     TEST_ENSURE( s6.compareTo("123456789") == 0, "test_OString error 16");
 
-#ifndef SAL_OS2
 #ifdef SAL_UNX
     sal_Int64 m = -3223372036854775807LL;
-#elif defined(SAL_OS2)
-    sal_Int64 m;
-    sal_setInt64(&m, 3965190145L, -750499787L);
 #else
     sal_Int64 m = -3223372036854775807;
 #endif
     s6 = s5.valueOf(m);
     TEST_ENSURE( s6.compareTo("-3223372036854775807") == 0, "test_OString error 17");
-#endif
 
     OString s7("HaLLo");
     s7 = s7.toAsciiLowerCase();
diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
index 4afeb0425..58065e793 100644
--- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
@@ -39,9 +39,6 @@
 #ifdef UNX
 #include <wchar.h>
 #endif
-#ifdef OS2__00
-#include <wcstr.h>
-#endif
 
 #include <rtl/ustring.hxx>
 
@@ -118,18 +115,13 @@ void oldtests::test_OUString()
     s6 = s5.valueOf(n);
     TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("123456789"))) == 0, "test_OWString error 16");
 
-#ifndef SAL_OS2
 #ifdef SAL_UNX
     sal_Int64 m = -3223372036854775807LL;
-#elif defined(SAL_OS2)
-    sal_Int64 m;
-    sal_setInt64(&m, 3965190145L, -750499787L);
 #else
     sal_Int64 m = -3223372036854775807;
 #endif
     s6 = s5.valueOf(m);
     TEST_ENSURE( s6.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("-3223372036854775807")) ) == 0, "test_OWString error 17");
-#endif
 
 // LLA: locale tests removed    	::rtl::OLocale locale = ::rtl::OLocale::getDefault();
 // LLA: locale tests removed
@@ -326,7 +318,7 @@ void oldtests::test_OUString()
     // toInt64
     OUString s9( OUString(RTL_CONSTASCII_USTRINGPARAM(" -3223372036854775807")) );
     sal_Int64 ln1 = s9.toInt64();
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
     TEST_ENSURE( ln1 == -3223372036854775807LL, "test_OWString error 67" );
 #else
     TEST_ENSURE( ln1 == -3223372036854775807, "test_OWString error 67" );
@@ -336,7 +328,7 @@ void oldtests::test_OUString()
     TEST_ENSURE( ln2 == 13243, "test_OWString error 68" );
 
     sal_Int64 ln3 = s10.toInt64( 16 );
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
     TEST_ENSURE( ln3 == 0x13243A65F1LL, "test_OWString error 69" );
 #else
     TEST_ENSURE( ln3 == 0x13243A65F1, "test_OWString error 69" );
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index 9efc9971e..0c5fba5a8 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -93,12 +93,8 @@ void oldtests::test_OStringBuffer()
     b2.append(n);
     TEST_ENSURE( s1 == b2.getStr(), "test_OStringBuffer error 5");
 
-#ifndef SAL_OS2
 #ifdef SAL_UNX
     sal_Int64 m = -3223372036854775807LL;
-#elif defined(SAL_OS2)
-    sal_Int64 m;
-    sal_setInt64(&m, 3965190145L, -750499787L);
 #else
     sal_Int64 m = -3223372036854775807;
 #endif
@@ -106,7 +102,6 @@ void oldtests::test_OStringBuffer()
     b2.append(" ");
     b2.append(m);
     TEST_ENSURE( s1 == b2.getStr(), "test_OStringBuffer error 6");
-#endif
 
     OString s2(b2.makeStringAndClear());
     TEST_ENSURE( s1 == s2, "test_OStringBuffer error 7");
@@ -129,12 +124,10 @@ void oldtests::test_OStringBuffer()
     s2 = "Hier fuege ich jetzt ein > 123456789 false Hallo <\n";
     TEST_ENSURE( s2 == b2.getStr(), "test_OStringBuffer error 11");
 
-#ifndef SAL_OS2
     b2.insert(26, m);
     b2.insert(26, " ");
     s2 = "Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n";
     TEST_ENSURE( s2 == b2.getStr(), "test_OStringBuffer error 12");
-#endif
 
     printf("test_OStringBuffer OK !!!\n");
     return;
@@ -187,12 +180,8 @@ void oldtests::test_OUStringBuffer()
     b2.append(n);
     TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 5");
 
-#ifndef SAL_OS2
 #ifdef SAL_UNX
     sal_Int64 m = -3223372036854775807LL;
-#elif defined(SAL_OS2)
-    sal_Int64 m;
-    sal_setInt64(&m, 3965190145L, -750499787L);
 #else
     sal_Int64 m = -3223372036854775807;
 #endif
@@ -200,7 +189,6 @@ void oldtests::test_OUStringBuffer()
     b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
     b2.append(m);
     TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 6");
-#endif
 
     OUString s2(b2.makeStringAndClear());
     TEST_ENSURE( s1 == s2, "test_OWStringBuffer error 7");
@@ -223,12 +211,10 @@ void oldtests::test_OUStringBuffer()
     s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > 123456789 false Hallo <\n"));
     TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 11");
 
-#ifndef SAL_OS2
     b2.insert(26, m);
     b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
     s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n"));
     TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 12");
-#endif
 
     // ASCII-Schnittstelle, AB 15.10.1999
     OUString s3(OUString(RTL_CONSTASCII_USTRINGPARAM("Noch'n RTL OUString")));
diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk
index e5ccce32b..0677acc24 100644
--- a/sal/qa/sal/makefile.mk
+++ b/sal/qa/sal/makefile.mk
@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 SHL1TARGET = $(TARGET)_types
 SHL1OBJS = $(SLO)$/test_types.obj
 SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB)
diff --git a/offapi/com/sun/star/oooimprovement/makefile.mk b/sal/qa/static/makefile.mk
index c64c21951..71c308544 100644
--- a/offapi/com/sun/star/oooimprovement/makefile.mk
+++ b/sal/qa/static/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -23,22 +23,46 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
+#***********************************************************************/
+
+PRJ = ../..
+PRJNAME = sal
+TARGET = sal_cppunittester_all
+
+ENABLE_EXCEPTIONS = TRUE
+LIBTARGET = NO
+
+.INCLUDE: settings.mk
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+.IF "$(OS)" != "IOS"
+
+ALL :
+    @echo This is only for iOS
 
-PRJ := ..$/..$/..$/..
-PRJNAME := offapi
-TARGET := cssoooimprovement
+.ENDIF
 
-PACKAGE := com$/sun$/star$/oooimprovement
+CFLAGSCXX += -x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
 
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
+OBJFILES = $(APP1OBJS)
 
-IDLFILES = \
-    Core.idl \
-    CoreController.idl \
-    XCore.idl \
-    XCoreController.idl \
+APP1OBJS = $(OBJ)/sal_cppunittester_all.obj
+APP1RPATH = NONE
+APP1LIBS += \
+    $(SLB)/qa_ByteSequence.lib \
+    $(SLB)/qa_ostringbuffer.lib \
+    $(SLB)/qa_osl_condition.lib \
+    $(SLB)/qa_osl_file.lib \
+    $(SLB)/qa_osl_security.lib \
+    $(SLB)/qa_rtl_alloc.lib \
+    $(SLB)/qa_rtl_cipher.lib \
+    $(SLB)/qa_rtl_crc32.lib \
+    $(SLB)/qa_rtl_doublelock.lib \
+    $(SLB)/qa_rtl_locale.lib \
+    $(SLB)/qa_sal.lib
 
+APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+APP1TARGET = $(TARGET)
 
 .INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/sal/qa/static/sal_cppunittester_all.cxx b/sal/qa/static/sal_cppunittester_all.cxx
new file mode 100644
index 000000000..4c3d942c1
--- /dev/null
+++ b/sal/qa/static/sal_cppunittester_all.cxx
@@ -0,0 +1,161 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#include "precompiled_sal.hxx"
+#include "sal/config.h"
+
+#include <cstdlib>
+#include <iostream>
+#include <limits>
+#include <string>
+#include "cppunittester/protectorfactory.hxx"
+#include "osl/module.h"
+#include "osl/module.hxx"
+#include "osl/thread.h"
+#include "rtl/process.h"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/textcvt.h"
+#include "rtl/ustring.hxx"
+#include "sal/main.h"
+#include "sal/types.h"
+
+#include "cppunit/CompilerOutputter.h"
+#include "cppunit/TestResult.h"
+#include "cppunit/TestResultCollector.h"
+#include "cppunit/TestRunner.h"
+#include "cppunit/plugin/TestPlugIn.h"
+#include "cppunit/plugin/PlugInParameters.h"
+#include "cppunit/extensions/TestFactoryRegistry.h"
+#include "cppunit/portability/Stream.h"
+
+#include "boost/noncopyable.hpp"
+
+namespace {
+
+void usageFailure() {
+    std::cerr
+        << ("Usage: cppunittester (--protector <shared-library-path>"
+            " <function-symbol>)* <shared-library-path>")
+        << std::endl;
+    std::exit(EXIT_FAILURE);
+}
+
+rtl::OUString getArgument(sal_Int32 index) {
+    rtl::OUString arg;
+    rtl_getAppCommandArg(index, &arg.pData);
+    return arg;
+}
+
+std::string convertLazy(rtl::OUString const & s16) {
+    rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding()));
+    return std::string(
+        s8.getStr(),
+        ((static_cast< sal_uInt32 >(s8.getLength())
+          > (std::numeric_limits< std::string::size_type >::max)())
+         ? (std::numeric_limits< std::string::size_type >::max)()
+         : static_cast< std::string::size_type >(s8.getLength())));
+}
+
+//Allow the whole uniting testing framework to be run inside a "Protector"
+//which knows about uno exceptions, so it can print the content of the
+//exception before falling over and dying
+class CPPUNIT_API ProtectedFixtureFunctor : public CppUnit::Functor, private boost::noncopyable
+{
+private:
+    const std::string &args;
+    CppUnit::TestResult &result;
+public:
+    ProtectedFixtureFunctor(const std::string &args_, CppUnit::TestResult &result_)
+        : args(args_)
+        , result(result_)
+    {
+    }
+    bool run() const
+    {
+        CppUnit::TestRunner runner;
+        runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+        CppUnit::TestResultCollector collector;
+        result.addListener(&collector);
+        runner.run(result);
+        CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
+        return collector.wasSuccessful();
+    }
+    virtual bool operator()() const
+    {
+        return run();
+    }
+};
+}
+
+extern "C" CppUnitTestPlugIn *cppunitTest_qa_ByteSequence(void),
+           *cppunitTest_qa_ostringbuffer(void),
+           *cppunitTest_qa_osl_condition(void),
+           *cppunitTest_qa_osl_File(void),
+           *cppunitTest_tcwf(void),
+           *cppunitTest_osl_old_test_file(void),
+           *cppunitTest_qa_osl_security(void),
+           *cppunitTest_qa_rtl_alloc(void),
+           *cppunitTest_qa_rtl_cipher(void),
+           *cppunitTest_qa_rtl_crc32(void),
+           *cppunitTest_qa_rtl_doublelock(void),
+           *cppunitTest_qa_rtl_locale(void),
+           *cppunitTest_qa_sal(void);
+
+SAL_IMPLEMENT_MAIN() {
+    TestPlugInSignature plugs[] = {
+        cppunitTest_qa_ByteSequence,
+        cppunitTest_qa_ostringbuffer,
+        cppunitTest_qa_osl_condition,
+        cppunitTest_qa_osl_File,
+        cppunitTest_tcwf,
+        cppunitTest_osl_old_test_file,
+        cppunitTest_qa_osl_security,
+        cppunitTest_qa_rtl_alloc,
+        cppunitTest_qa_rtl_cipher,
+        cppunitTest_qa_rtl_crc32,
+        cppunitTest_qa_rtl_doublelock,
+        cppunitTest_qa_rtl_locale,
+        cppunitTest_qa_sal,
+        NULL
+    };
+    CppUnit::TestResult result;
+    std::string args;
+    bool ok = false;
+    for (TestPlugInSignature *plug = plugs; *plug != NULL; plug++) {
+        CppUnitTestPlugIn *iface;
+        iface = (*plug)();
+        iface->initialize(&CppUnit::TestFactoryRegistry::getRegistry(), CppUnit::PlugInParameters());
+    }
+    ProtectedFixtureFunctor tests(args, result);
+    ok = tests.run();
+
+    return ok ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx
index 4ec7004eb..e14debabd 100644
--- a/sal/qa/systools/test_comtools.cxx
+++ b/sal/qa/systools/test_comtools.cxx
@@ -198,7 +198,7 @@ namespace test_comtools
                 sal::systools::COMReference<IUnknown> r2 = r1.QueryInterface<IUnknown>(IID_IUnknown);
                 CPPUNIT_ASSERT_MESSAGE("Wrong reference count, 2 is expected", reinterpret_cast<COMObject*>(r2.get())->GetRefCount() == 2);
             }
-            catch(sal::systools::ComError& ex)
+            catch(const sal::systools::ComError& ex)
             {
                 CPPUNIT_ASSERT_MESSAGE("Exception should not have been thrown", false);
             }
@@ -211,7 +211,7 @@ namespace test_comtools
                 sal::systools::COMReference<IUnknown> r1 = comObjectSource();
                 sal::systools::COMReference<IPersistFile> r2 = r1.QueryInterface<IPersistFile>(IID_IPersistFile);
             }
-            catch(sal::systools::ComError& ex)
+            catch(const sal::systools::ComError& ex)
             {
                 return;
             }
diff --git a/sal/rtl/source/alloc_arena.c b/sal/rtl/source/alloc_arena.c
index 27ac970b0..6b4403414 100644
--- a/sal/rtl/source/alloc_arena.c
+++ b/sal/rtl/source/alloc_arena.c
@@ -37,13 +37,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#ifdef OS2
-#undef OSL_TRACE
-#define OSL_TRACE                  1 ? ((void)0) : _OSL_GLOBAL osl_trace
-#define INCL_DOS
-#include <os2.h>
-#endif
-
 /* ================================================================= *
  *
  * arena internals.
@@ -102,13 +95,6 @@ rtl_machdep_pagesize (void);
 rtl_arena_type * gp_default_arena = 0;
 
 
-/** rtl_arena_init()
- *  @internal
- */
-static int
-rtl_arena_init (void);
-
-
 /* ================================================================= */
 
 /** rtl_arena_segment_constructor()
@@ -921,6 +907,8 @@ rtl_arena_deactivate (
  *
  * ================================================================= */
 
+extern void ensureArenaSingleton();
+
 /** rtl_arena_create()
  */
 rtl_arena_type *
@@ -973,7 +961,8 @@ try_alloc:
     }
     else if (gp_arena_arena == 0)
     {
-        if (rtl_arena_init())
+        ensureArenaSingleton();
+        if (gp_arena_arena)
         {
             /* try again */
             goto try_alloc;
@@ -1166,7 +1155,7 @@ SAL_CALL rtl_arena_free (
 
 #if defined(SAL_UNX)
 #include <sys/mman.h>
-#elif defined(SAL_W32) || defined(SAL_OS2)
+#elif defined(SAL_W32)
 #define MAP_FAILED 0
 #endif /* SAL_UNX || SAL_W32 */
 
@@ -1202,18 +1191,7 @@ SAL_CALL rtl_machdep_alloc (
     addr = mmap (NULL, (size_t)(size), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
 #elif defined(SAL_W32)
     addr = VirtualAlloc (NULL, (SIZE_T)(size), MEM_COMMIT, PAGE_READWRITE);
-#elif defined(SAL_OS2)
-    {
-    APIRET rc;
-    addr = 0;
-    // Use DosAlloc* to get a 4KB page aligned address.
-    rc = DosAllocMem( &addr, size, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY);
-    if (rc) {
-        fprintf( stderr, "sal3::DosAllocMem failed rc=%d\n", rc);
-        addr = 0;
-    }
-    }
-#endif /* (SAL_UNX || SAL_W32 || SAL_OS2) */
+#endif /* (SAL_UNX || SAL_W32) */
 
     if (addr != MAP_FAILED)
     {
@@ -1246,8 +1224,6 @@ SAL_CALL rtl_machdep_free (
     (void) munmap(pAddr, nSize);
 #elif defined(SAL_W32)
     (void) VirtualFree ((LPVOID)(pAddr), (SIZE_T)(0), MEM_RELEASE);
-#elif defined(SAL_OS2)
-    (void) DosFreeMem( pAddr);
 #endif /* (SAL_UNX || SAL_W32) */
 }
 
@@ -1266,10 +1242,6 @@ rtl_machdep_pagesize (void)
     SYSTEM_INFO info;
     GetSystemInfo (&info);
     return ((sal_Size)(info.dwPageSize));
-#elif defined(SAL_OS2)
-    ULONG ulPageSize;
-    DosQuerySysInfo(QSV_PAGE_SIZE, QSV_PAGE_SIZE, &ulPageSize, sizeof(ULONG));
-    return ((sal_Size)ulPageSize);
 #endif /* (SAL_UNX || SAL_W32) */
 }
 
@@ -1279,8 +1251,8 @@ rtl_machdep_pagesize (void)
  *
  * ================================================================= */
 
-static void
-rtl_arena_once_init (void)
+void
+rtl_arena_init (void)
 {
     {
         /* list of arenas */
@@ -1342,36 +1314,11 @@ rtl_arena_once_init (void)
         );
         OSL_ASSERT(gp_arena_arena != 0);
     }
-}
-
-static int
-rtl_arena_init (void)
-{
-    static sal_once_type g_once = SAL_ONCE_INIT;
-    SAL_ONCE(&g_once, rtl_arena_once_init);
-    return (gp_arena_arena != 0);
+    OSL_TRACE("rtl_arena_init completed");
 }
 
 /* ================================================================= */
 
-/*
-  Issue http://udk.openoffice.org/issues/show_bug.cgi?id=92388
-
-  Mac OS X does not seem to support "__cxa__atexit", thus leading
-  to the situation that "__attribute__((destructor))__" functions
-  (in particular "rtl_{memory|cache|arena}_fini") become called
-  _before_ global C++ object d'tors.
-
-  Delegated the call to "rtl_arena_fini()" into a dummy C++ object,
-  see alloc_fini.cxx .
-*/
-#if defined(__GNUC__) && !defined(MACOSX)
-static void rtl_arena_fini (void) __attribute__((destructor));
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma fini(rtl_arena_fini)
-static void rtl_arena_fini (void);
-#endif /* __GNUC__ || __SUNPRO_C */
-
 void
 rtl_arena_fini (void)
 {
@@ -1394,6 +1341,7 @@ rtl_arena_fini (void)
         }
         RTL_MEMORY_LOCK_RELEASE(&(g_arena_list.m_lock));
     }
+    OSL_TRACE("rtl_arena_fini completed");
 }
 
 /* ================================================================= */
diff --git a/sal/rtl/source/alloc_cache.c b/sal/rtl/source/alloc_cache.c
index 06de20134..dfd86a39a 100644
--- a/sal/rtl/source/alloc_cache.c
+++ b/sal/rtl/source/alloc_cache.c
@@ -41,11 +41,6 @@
 #include <stdio.h>
 #endif
 
-#ifdef OS2
-#undef OSL_TRACE
-#define OSL_TRACE                  1 ? ((void)0) : _OSL_GLOBAL osl_trace
-#endif
-
 /* ================================================================= *
  *
  * cache internals.
@@ -60,7 +55,7 @@ struct rtl_cache_list_st
     rtl_memory_lock_type m_lock;
     rtl_cache_type       m_cache_head;
 
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
     pthread_t            m_update_thread;
     pthread_cond_t       m_update_cond;
 #elif defined(SAL_W32)
@@ -99,13 +94,6 @@ static rtl_cache_type * gp_cache_slab_cache = 0;
 static rtl_cache_type * gp_cache_bufctl_cache = 0;
 
 
-/** rtl_cache_init()
- *  @internal
- */
-static int
-rtl_cache_init (void);
-
-
 /* ================================================================= */
 
 /** RTL_CACHE_HASH_INDEX()
@@ -1119,6 +1107,8 @@ rtl_cache_deactivate (
  *
  * ================================================================= */
 
+extern void ensureCacheSingleton();
+
 /** rtl_cache_create()
  */
 rtl_cache_type *
@@ -1176,7 +1166,8 @@ try_alloc:
     }
     else if (gp_cache_arena == 0)
     {
-        if (rtl_cache_init())
+        ensureCacheSingleton();
+        if (gp_cache_arena)
         {
             /* try again */
             goto try_alloc;
@@ -1380,7 +1371,7 @@ rtl_cache_wsupdate_fini (void);
 
 /* ================================================================= */
 
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
 
 #include <sys/time.h>
 
@@ -1546,7 +1537,7 @@ rtl_cache_wsupdate (
 /** rtl_cache_wsupdate_all()
  *
  */
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
 static void *
 #elif defined(SAL_W32)
 static DWORD WINAPI
@@ -1583,8 +1574,8 @@ rtl_cache_wsupdate_all (void * arg)
  *
  * ================================================================= */
 
-static void
-rtl_cache_once_init (void)
+void
+rtl_cache_init (void)
 {
     {
         /* list of caches */
@@ -1680,36 +1671,11 @@ rtl_cache_once_init (void)
     }
 
     rtl_cache_wsupdate_init();
-}
-
-static int
-rtl_cache_init (void)
-{
-    static sal_once_type g_once = SAL_ONCE_INIT;
-    SAL_ONCE(&g_once, rtl_cache_once_init);
-    return (gp_cache_arena != 0);
+    OSL_TRACE("rtl_cache_init completed");
 }
 
 /* ================================================================= */
 
-/*
-  Issue http://udk.openoffice.org/issues/show_bug.cgi?id=92388
-
-  Mac OS X does not seem to support "__cxa__atexit", thus leading
-  to the situation that "__attribute__((destructor))__" functions
-  (in particular "rtl_{memory|cache|arena}_fini") become called
-  _before_ global C++ object d'tors.
-
-  Delegated the call to "rtl_cache_fini()" into a dummy C++ object,
-  see alloc_fini.cxx .
-*/
-#if defined(__GNUC__) && !defined(MACOSX)
-static void rtl_cache_fini (void) __attribute__((destructor));
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma fini(rtl_cache_fini)
-static void rtl_cache_fini (void);
-#endif /* __GNUC__ || __SUNPRO_C */
-
 void
 rtl_cache_fini (void)
 {
@@ -1765,6 +1731,7 @@ rtl_cache_fini (void)
         }
         RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock));
     }
+    OSL_TRACE("rtl_cache_fini completed");
 }
 
 /* ================================================================= */
diff --git a/sal/rtl/source/alloc_fini.cxx b/sal/rtl/source/alloc_fini.cxx
index 5bc174e7c..dfd359953 100644
--- a/sal/rtl/source/alloc_fini.cxx
+++ b/sal/rtl/source/alloc_fini.cxx
@@ -26,33 +26,98 @@
  *
  ************************************************************************/
 
-/*
-  Issue http://udk.openoffice.org/issues/show_bug.cgi?id=92388
-
-  Mac OS X does not seem to support "__cxa__atexit", thus leading
-  to the situation that "__attribute__((destructor))__" functions
-  (in particular "rtl_{memory|cache|arena}_fini") become called
-  _before_ global C++ object d'tors.
-
-  Using a C++ dummy object instead.
-*/
+#include <rtl/instance.hxx>
 
 extern "C" void rtl_memory_fini (void);
-extern "C" void rtl_cache_fini (void);
-extern "C" void rtl_arena_fini (void);
+extern "C" void rtl_memory_init (void);
+namespace
+{
+    struct rtlMemorySingleton
+    {
+        rtlMemorySingleton()
+        {
+            rtl_memory_init();
+        }
+        ~rtlMemorySingleton()
+        {
+            rtl_memory_fini();
+        }
+    };
+    class theMemorySingleton
+        : public rtl::Static<rtlMemorySingleton, theMemorySingleton>{};
+}
+extern "C" void ensureMemorySingleton()
+{
+    theMemorySingleton::get();
+}
 
-struct RTL_Alloc_Fini
+extern "C" void rtl_cache_fini (void);
+extern "C" void rtl_cache_init (void);
+namespace
 {
-  ~RTL_Alloc_Fini() ;
-};
+    struct rtlCacheSingleton
+    {
+        rtlCacheSingleton()
+        {
+            rtl_cache_init();
+        }
+        ~rtlCacheSingleton()
+        {
+            rtl_cache_fini();
+        }
+    };
+    class theCacheSingleton
+        : public rtl::Static<rtlCacheSingleton, theCacheSingleton>{};
+}
+extern "C" void ensureCacheSingleton()
+{
+    theCacheSingleton::get();
+}
 
-RTL_Alloc_Fini::~RTL_Alloc_Fini()
+extern "C" void rtl_arena_fini (void);
+extern "C" void rtl_arena_init (void);
+namespace
+{
+    struct rtlArenaSingleton
+    {
+        rtlArenaSingleton()
+        {
+            rtl_arena_init();
+        }
+        ~rtlArenaSingleton()
+        {
+            rtl_arena_fini();
+        }
+    };
+    class theArenaSingleton
+        : public rtl::Static<rtlArenaSingleton, theArenaSingleton>{};
+}
+extern "C" void ensureArenaSingleton()
 {
-  rtl_memory_fini();
-  rtl_cache_fini();
-  rtl_arena_fini();
+    theArenaSingleton::get();
 }
 
-static RTL_Alloc_Fini g_RTL_Alloc_Fini;
+extern "C" void rtl_locale_fini (void);
+extern "C" void rtl_locale_init (void);
+namespace
+{
+    struct rtlLocaleSingleton
+    {
+        rtlLocaleSingleton()
+        {
+            rtl_locale_init();
+        }
+        ~rtlLocaleSingleton()
+        {
+            rtl_locale_fini();
+        }
+    };
+    class theLocaleSingleton
+        : public rtl::Static<rtlLocaleSingleton, theLocaleSingleton>{};
+}
+extern "C" void ensureLocaleSingleton()
+{
+    theLocaleSingleton::get();
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/alloc_global.c b/sal/rtl/source/alloc_global.c
index 70504ac9d..fb95e83dc 100644
--- a/sal/rtl/source/alloc_global.c
+++ b/sal/rtl/source/alloc_global.c
@@ -29,6 +29,7 @@
 #include "alloc_impl.h"
 #include "rtl/alloc.h"
 #include <sal/macros.h>
+#include <osl/diagnose.h>
 
 #include <string.h>
 #include <stdio.h>
@@ -66,7 +67,6 @@ static void determine_alloc_mode(void)
 
 #include "internal/once.h"
 #include "sal/macros.h"
-#include "osl/diagnose.h"
 
 /* ================================================================= *
  *
@@ -108,60 +108,7 @@ static rtl_cache_type * g_alloc_table[RTL_MEMORY_CACHED_LIMIT >> RTL_MEMALIGN_SH
 
 static rtl_arena_type * gp_alloc_arena = 0;
 
-/* ================================================================= *
- *
- * custom allocator initialization / finalization.
- *
- * ================================================================= */
-
-static void
-rtl_memory_once_init (void)
-{
-    {
-        /* global memory arena */
-        OSL_ASSERT(gp_alloc_arena == 0);
-
-        gp_alloc_arena = rtl_arena_create (
-            "rtl_alloc_arena",
-            2048,     /* quantum */
-            0,        /* w/o quantum caching */
-            0,        /* default source */
-            rtl_arena_alloc,
-            rtl_arena_free,
-            0         /* flags */
-        );
-        OSL_ASSERT(gp_alloc_arena != 0);
-    }
-    {
-        sal_Size size;
-        int i, n = RTL_MEMORY_CACHED_SIZES;
-
-        for (i = 0; i < n; i++)
-        {
-            char name[RTL_CACHE_NAME_LENGTH + 1];
-            (void) snprintf (name, sizeof(name), "rtl_alloc_%lu", g_alloc_sizes[i]);
-            g_alloc_caches[i] = rtl_cache_create (name, g_alloc_sizes[i], 0, NULL, NULL, NULL, NULL, NULL, 0);
-        }
-
-        size = RTL_MEMALIGN;
-        for (i = 0; i < n; i++)
-        {
-            while (size <= g_alloc_sizes[i])
-            {
-                g_alloc_table[(size - 1) >> RTL_MEMALIGN_SHIFT] = g_alloc_caches[i];
-                size += RTL_MEMALIGN;
-            }
-        }
-    }
-}
-
-static int
-rtl_memory_init (void)
-{
-    static sal_once_type g_once = SAL_ONCE_INIT;
-    SAL_ONCE(&g_once, rtl_memory_once_init);
-    return (gp_alloc_arena != 0);
-}
+extern void ensureMemorySingleton();
 
 /* ================================================================= *
  *
@@ -198,7 +145,8 @@ try_alloc:
         }
         else if (gp_alloc_arena == 0)
         {
-            if (rtl_memory_init())
+            ensureMemorySingleton();
+            if (gp_alloc_arena)
             {
                 /* try again */
                 goto try_alloc;
@@ -256,28 +204,58 @@ void * SAL_CALL rtl_reallocateMemory_CUSTOM (void * p, sal_Size n) SAL_THROW_EXT
 
 #endif
 
+/* ================================================================= *
+ *
+ * custom allocator initialization / finalization.
+ *
+ * ================================================================= */
+
+void rtl_memory_init (void)
+{
+#if !defined(FORCE_SYSALLOC)
+    {
+        /* global memory arena */
+        OSL_ASSERT(gp_alloc_arena == 0);
+
+        gp_alloc_arena = rtl_arena_create (
+            "rtl_alloc_arena",
+            2048,     /* quantum */
+            0,        /* w/o quantum caching */
+            0,        /* default source */
+            rtl_arena_alloc,
+            rtl_arena_free,
+            0         /* flags */
+        );
+        OSL_ASSERT(gp_alloc_arena != 0);
+    }
+    {
+        sal_Size size;
+        int i, n = RTL_MEMORY_CACHED_SIZES;
+
+        for (i = 0; i < n; i++)
+        {
+            char name[RTL_CACHE_NAME_LENGTH + 1];
+            (void) snprintf (name, sizeof(name), "rtl_alloc_%lu", g_alloc_sizes[i]);
+            g_alloc_caches[i] = rtl_cache_create (name, g_alloc_sizes[i], 0, NULL, NULL, NULL, NULL, NULL, 0);
+        }
+
+        size = RTL_MEMALIGN;
+        for (i = 0; i < n; i++)
+        {
+            while (size <= g_alloc_sizes[i])
+            {
+                g_alloc_table[(size - 1) >> RTL_MEMALIGN_SHIFT] = g_alloc_caches[i];
+                size += RTL_MEMALIGN;
+            }
+        }
+    }
+#endif
+    OSL_TRACE("rtl_memory_init completed");
+}
+
 /* ================================================================= */
 
-/*
-  Issue http://udk.openoffice.org/issues/show_bug.cgi?id=92388
-
-  Mac OS X does not seem to support "__cxa__atexit", thus leading
-  to the situation that "__attribute__((destructor))__" functions
-  (in particular "rtl_memory_fini") become called _before_ global
-  C++ object d'tors.
-
-  Delegated the call to "rtl_memory_fini" into a dummy C++ object,
-  see memory_fini.cxx .
-*/
-#if defined(__GNUC__) && !defined(MACOSX) && !defined(AIX)
-static void rtl_memory_fini (void) __attribute__((destructor));
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma fini(rtl_memory_fini)
-static void rtl_memory_fini (void);
-#endif /* __GNUC__ || __SUNPRO_C */
-
-void
-rtl_memory_fini (void)
+void rtl_memory_fini (void)
 {
 #if !defined(FORCE_SYSALLOC)
     int i, n;
@@ -302,6 +280,7 @@ rtl_memory_fini (void)
         gp_alloc_arena = 0;
     }
 #endif
+    OSL_TRACE("rtl_memory_fini completed");
 }
 
 /* ================================================================= *
diff --git a/sal/rtl/source/alloc_impl.h b/sal/rtl/source/alloc_impl.h
index 63c284a1e..490120a3a 100644
--- a/sal/rtl/source/alloc_impl.h
+++ b/sal/rtl/source/alloc_impl.h
@@ -197,7 +197,7 @@ lowbit(sal_Size n)
 /** rtl_memory_lock_type
  *  (platform dependent)
  */
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
 
 #include <unistd.h>
 #include <pthread.h>
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index 79398dd15..a58dd0e1d 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -353,7 +353,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
 {
     OUString base_ini( getIniFileName_Impl() );
     // normalize path
-    FileStatus status( FileStatusMask_FileURL );
+    FileStatus status( osl_FileStatus_Mask_FileURL );
     DirectoryItem dirItem;
     if (DirectoryItem::E_None == DirectoryItem::get( base_ini, dirItem ) &&
         DirectoryItem::E_None == dirItem.getFileStatus( status ))
@@ -645,7 +645,7 @@ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open (
     OUString iniName( pIniName );
 
     // normalize path
-    FileStatus status( FileStatusMask_FileURL );
+    FileStatus status( osl_FileStatus_Mask_FileURL );
     DirectoryItem dirItem;
     if (DirectoryItem::E_None != DirectoryItem::get( iniName, dirItem ) ||
         DirectoryItem::E_None != dirItem.getFileStatus( status ))
@@ -993,7 +993,7 @@ rtl::OUString expandMacros(
                             try {
                                 buf.append(
                                     rtl::Uri::convertRelToAbs(seg[1], url));
-                            } catch (rtl::MalformedUriException &) {}
+                            } catch (const rtl::MalformedUriException &) {}
                         }
                     } else {
                         buf.append(
diff --git a/sal/rtl/source/gen_makefile.cxx b/sal/rtl/source/gen_makefile.cxx
deleted file mode 100644
index 1d35d168b..000000000
--- a/sal/rtl/source/gen_makefile.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
-#include "macro.hxx"
-#include <stdio.h>
-
-int main()
-{
-  printf( "RTL_OS:=%s\n", THIS_OS );
-  printf( "RTL_ARCH:=%s\n", THIS_ARCH );
-  return 0;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/locale.c b/sal/rtl/source/locale.c
index 964be0996..79f2fb8b9 100644
--- a/sal/rtl/source/locale.c
+++ b/sal/rtl/source/locale.c
@@ -58,8 +58,6 @@ static RTL_HASHTABLE* g_pLocaleTable = NULL;
 
 static rtl_Locale* g_pDefaultLocale = NULL;
 
-static int rtl_locale_init (void);
-
 /*************************************************************************
  */
 void rtl_hashentry_destroy(RTL_HASHENTRY* entry)
@@ -228,29 +226,15 @@ sal_Bool rtl_hashtable_find(RTL_HASHTABLE * table, sal_Int32 key, sal_Int32 hash
 /*************************************************************************
  *  rtl_locale_init
  */
-static void rtl_locale_once_init (void)
+void rtl_locale_init (void)
 {
   OSL_ASSERT(g_pLocaleTable == 0);
   rtl_hashtable_init(&g_pLocaleTable, 1);
 }
 
-static int rtl_locale_init (void)
-{
-  static sal_once_type g_once = SAL_ONCE_INIT;
-  SAL_ONCE(&g_once, rtl_locale_once_init);
-  return (g_pLocaleTable != 0);
-}
-
 /*************************************************************************
  *  rtl_locale_fini
  */
-#if defined(__GNUC__)
-static void rtl_locale_fini (void) __attribute__((destructor));
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma fini(rtl_locale_fini)
-static void rtl_locale_fini (void);
-#endif /* __GNUC__ || __SUNPRO_C */
-
 void rtl_locale_fini (void)
 {
   if (g_pLocaleTable != 0)
@@ -260,6 +244,8 @@ void rtl_locale_fini (void)
   }
 }
 
+extern void ensureLocaleSingleton();
+
 /*************************************************************************
  *  rtl_locale_register
  */
@@ -278,7 +264,8 @@ rtl_Locale * SAL_CALL rtl_locale_register( const sal_Unicode * language, const s
     if ( !variant )
         variant = &c;
 
-    if (!rtl_locale_init())
+    ensureLocaleSingleton();
+    if (!g_pLocaleTable)
       return NULL;
 
     hashCode = rtl_ustr_hashCode(language) ^ rtl_ustr_hashCode(country) ^ rtl_ustr_hashCode(variant);
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index 51fdcdcfc..fa1955a88 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -42,6 +42,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/alloc.h>
+#include <rtl/instance.hxx>
 #include "osl/thread.h"
 
 #include <algorithm>
@@ -90,19 +91,14 @@ LoggerGuard::~LoggerGuard()
 // g_buffer in init():
 LoggerGuard loggerGuard;
 
-Mutex & getLogMutex()
+namespace
 {
-    static Mutex *pMutex = 0;
-    if( !pMutex )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pMutex )
-        {
-            static Mutex mutex;
-            pMutex = &mutex;
-        }
-    }
-    return *pMutex;
+    class theLogMutex : public rtl::Static<osl::Mutex, theLogMutex>{};
+}
+
+static Mutex & getLogMutex()
+{
+    return theLogMutex::get();
 }
 
 OUString getFileUrl( const OUString &name )
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx
index 495d586d1..b07c7705c 100644
--- a/sal/rtl/source/macro.hxx
+++ b/sal/rtl/source/macro.hxx
@@ -35,8 +35,6 @@
 
 #if defined WIN32
 #define THIS_OS "Windows"
-#elif defined OS2
-#define THIS_OS "OS2"
 #elif defined SOLARIS
 #define THIS_OS "Solaris"
 #elif defined LINUX
@@ -45,8 +43,12 @@
 #else
 #define THIS_OS "Linux"
 #endif
+#elif defined ANDROID
+#define THIS_OS "Android"
 #elif defined MACOSX
 #define THIS_OS "MacOSX"
+#elif defined IOS
+#define THIS_OS "iOS"
 #elif defined NETBSD
 #define THIS_OS "NetBSD"
 #elif defined FREEBSD
@@ -111,8 +113,4 @@ this is inserted for the case that the preprocessor ignores error
 
 #endif
 
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index 67ae7f8d9..2f1f610a5 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -36,10 +36,6 @@ PROJECTPCH4DLL=TRUE
 PROJECTPCH=cont_pch
 PROJECTPCHSOURCE=cont_pch
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
-
 TARGETTYPE=CUI
 
 # --- Settings -----------------------------------------------------
@@ -60,10 +56,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 # --- Files --------------------------------------------------------
 
-# safe that way: gen_makefile doesn't want it,
-# no other link target here
-UWINAPILIB:=
-
 .IF "$(header)" == ""
 
 .IF "$(OS)" != "AIX"
@@ -100,12 +92,8 @@ SLOFILES=   \
             $(SLO)$/math.obj        \
             $(SLO)$/alloc_global.obj\
             $(SLO)$/alloc_cache.obj \
-            $(SLO)$/alloc_arena.obj
-
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="AIX"
-SLOFILES+=$(SLO)$/alloc_fini.obj
-.ENDIF
-
+            $(SLO)$/alloc_arena.obj \
+            $(SLO)$/alloc_fini.obj
 
 OBJFILES=   \
             $(OBJ)$/memory.obj      \
@@ -132,18 +120,10 @@ OBJFILES=   \
             $(OBJ)$/math.obj \
             $(OBJ)$/alloc_global.obj\
             $(OBJ)$/alloc_cache.obj \
-            $(OBJ)$/alloc_arena.obj
-
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="AIX"
-OBJFILES+=$(OBJ)$/alloc_fini.obj
-.ENDIF
+            $(OBJ)$/alloc_arena.obj \
+            $(OBJ)$/alloc_fini.obj
 
 
-APP1TARGET=gen_makefile
-APP1OBJS=$(SLO)$/gen_makefile.obj
-APP1LIBSALCPPRT=
-APP1RPATH=NONE
-
 .ENDIF
 
 # --- Makefile snippet  --------------------------------------------
@@ -180,6 +160,6 @@ $(ALWAYSDBGFILES):
 
 ALLTAR : $(BOOTSTRAPMK)
 
-$(BOOTSTRAPMK) : $(APP1TARGETN)
-    $(AUGMENT_LIBRARY_PATH) $< > $@
-
+$(BOOTSTRAPMK) :
+    (echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) >$(BOOTSTRAPMK).c
+    $(CC) -E $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(BOOTSTRAPMK).c | $(GREP) '^RTL_' | $(SED) -e 's/"//g' >$@
diff --git a/sal/rtl/source/strbuf.c b/sal/rtl/source/strbuf.c
index 446b1cee2..c0e9694dc 100644
--- a/sal/rtl/source/strbuf.c
+++ b/sal/rtl/source/strbuf.c
@@ -144,6 +144,36 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This,
         (*This)->length = nOldLen + len;
         pBuf[ nOldLen + len ] = 0;
     }
+}
+
+/*************************************************************************
+ *	rtl_stringbuffer_remove
+ */
+void SAL_CALL rtl_stringbuffer_remove( rtl_String ** This,
+                                       sal_Int32 start,
+                                       sal_Int32 len )
+{
+    sal_Int32 nTailLen;
+    sal_Char * pBuf;
+
+    if (len > (*This)->length - start)
+        len = (*This)->length - start;
+
+    //remove nothing
+    if (!len)
+        return;
+
+    pBuf = (*This)->buffer;
+    nTailLen = (*This)->length - ( start + len );
+
+    if (nTailLen)
+    {
+        /* move the tail */
+        rtl_moveMemory(pBuf + start, pBuf + start + len, nTailLen * sizeof(sal_Char));
+    }
+
+    (*This)->length-=len;
+    pBuf[ (*This)->length ] = 0;
 }	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/unload.cxx b/sal/rtl/source/unload.cxx
index 6bc024a62..8785baf50 100644
--- a/sal/rtl/source/unload.cxx
+++ b/sal/rtl/source/unload.cxx
@@ -31,6 +31,7 @@
 #include <rtl/unload.h>
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
+#include <rtl/instance.hxx>
 #include <osl/mutex.hxx>
 #include <boost/unordered_map.hpp>
 #include "rtl/allocator.hxx"
@@ -109,19 +110,14 @@ static sal_Bool hasEnoughTimePassed( const TimeValue* unusedSince, const TimeVal
     return retval;
 }
 
-static osl::Mutex* getUnloadingMutex()
+namespace
 {
-    static osl::Mutex * g_pMutex= NULL;
-    if (!g_pMutex)
-    {
-        MutexGuard guard( osl::Mutex::getGlobalMutex() );
-        if (!g_pMutex)
-        {
-            static osl::Mutex g_aMutex;
-            g_pMutex= &g_aMutex;
-        }
-    }
-    return g_pMutex;
+    class theUnloadingMutex : public rtl::Static<osl::Mutex, theUnloadingMutex>{};
+}
+
+static osl::Mutex& getUnloadingMutex()
+{
+    return theUnloadingMutex::get();
 }
 
 extern "C" void rtl_moduleCount_acquire(rtl_ModuleCount * that )
diff --git a/sal/rtl/source/ustrbuf.c b/sal/rtl/source/ustrbuf.c
index 33317b6f3..638b27eeb 100644
--- a/sal/rtl/source/ustrbuf.c
+++ b/sal/rtl/source/ustrbuf.c
@@ -206,5 +206,34 @@ void SAL_CALL rtl_uStringbuffer_insert_ascii(   /*inout*/rtl_uString ** This,
     }
 }
 
+/*************************************************************************
+ *	rtl_uStringbuffer_remove
+ */
+void SAL_CALL rtl_uStringbuffer_remove( rtl_uString ** This,
+                                       sal_Int32 start,
+                                       sal_Int32 len )
+{
+    sal_Int32 nTailLen;
+    sal_Unicode * pBuf;
+
+    if (len > (*This)->length - start)
+        len = (*This)->length - start;
+
+    //remove nothing
+    if (!len)
+        return;
+
+    pBuf = (*This)->buffer;
+    nTailLen = (*This)->length - ( start + len );
+
+    if (nTailLen)
+    {
+        /* move the tail */
+        rtl_moveMemory(pBuf + start, pBuf + start + len, nTailLen * sizeof(sal_Unicode));
+    }
+
+    (*This)->length-=len;
+    pBuf[ (*This)->length ] = 0;
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/onlineupdate/onlinecheck.cxx b/sal/systools/win32/onlineupdate/onlinecheck.cxx
index 67289ba8a..dd09b7d83 100644
--- a/sal/systools/win32/onlineupdate/onlinecheck.cxx
+++ b/sal/systools/win32/onlineupdate/onlinecheck.cxx
@@ -43,9 +43,6 @@
 #define _UNICODE
 #endif
 #include <tchar.h>
-#ifdef __MINGW32__
-#include <excpt.h>
-#endif
 
 // #i71984
 extern "C" sal_Bool SAL_CALL hasInternetConnection()
@@ -53,13 +50,7 @@ extern "C" sal_Bool SAL_CALL hasInternetConnection()
     DWORD	dwFlags;
     TCHAR	szConnectionName[1024];
 
-#ifdef __MINGW32__
-        jmp_buf jmpbuf;
-        __SEHandler han;
-        if (__builtin_setjmp(jmpbuf) == 0)
-        {
-        han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
+#ifndef __MINGW32__
     __try {
 #endif
     BOOL fIsConnected = InternetGetConnectedStateEx(
@@ -70,11 +61,7 @@ extern "C" sal_Bool SAL_CALL hasInternetConnection()
 
     return fIsConnected ? sal_True : sal_False;
 
-#ifdef __MINGW32__
-        }
-        else return sal_False;
-        han.Reset();
-#else
+#ifndef __MINGW32__
     } __except( EXCEPTION_EXECUTE_HANDLER )	{
         return sal_False;
     }
diff --git a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp b/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp
deleted file mode 100644
index 958206a0f..000000000
--- a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
-#endif
-
-#include "macros.h"
-
-#ifdef __cplusplus
-#define local inline
-#else
-#define local static
-#endif
-
-local LPCWSTR SkipBlanks( LPCWSTR lpScan )
-{
-    while ( ' ' == *lpScan || '\t' == *lpScan )
-        lpScan++;
-
-    return lpScan;
-}
-
-
-local LPCWSTR SkipArgument( LPCWSTR lpScan )
-{
-    BOOL	fQuoted = FALSE;
-    LPCWSTR	lpArgEnd = NULL;
-
-    do
-    {
-        switch ( *lpScan )
-        {
-        case ' ':
-        case '\t':
-            if ( fQuoted )
-                lpScan++;
-            else
-                lpArgEnd = lpScan;
-            break;
-        case '\"':
-            lpScan++;
-            fQuoted = !fQuoted;
-            break;
-        case '\0':
-            lpArgEnd = lpScan;
-            break;
-        default:
-            lpScan++;
-            break;
-        }
-    } while( *lpScan && !lpArgEnd );
-
-    return lpScan;
-}
-
-
-IMPLEMENT_THUNK( shell32, WINDOWS, LPWSTR *, WINAPI, CommandLineToArgvW, ( LPCWSTR lpCmdLineW, int *pNumArgs ) )
-{
-    LPWSTR	*lpArgvW = NULL;
-
-    if ( !lpCmdLineW || !*lpCmdLineW )
-    {
-        CHAR	szFileName[MAX_PATH];
-
-        DWORD	dwResult = GetModuleFileNameA( NULL, szFileName, MAX_PATH );
-
-        if ( dwResult && dwResult < MAX_PATH )
-        {
-            int cchNeeded = MultiByteToWideChar( CP_ACP, 0, szFileName, -1, NULL, 0 );
-
-            lpArgvW = (LPWSTR *)GlobalAlloc( 0, cchNeeded * sizeof(WCHAR) + sizeof(LPWSTR) );
-
-            if ( lpArgvW )
-            {
-                lpArgvW[0] = (LPWSTR)(lpArgvW + 1);
-
-                MultiByteToWideChar( CP_ACP, 0, szFileName, -1, lpArgvW[0], cchNeeded );
-                *pNumArgs = 1;
-            }
-            else
-                SetLastError( ERROR_OUTOFMEMORY );
-        }
-    }
-    else
-    {
-        LPCWSTR	lpScan = lpCmdLineW;
-        int		nTokens = 0;
-        int		cchNeeded = 0;
-
-        // Count arguments and required size
-
-        while ( *lpScan )
-        {
-            lpScan = SkipBlanks( lpScan );
-            if ( *lpScan )
-            {
-                LPCWSTR	lpArgEnd = SkipArgument( lpScan );
-
-                nTokens++;
-                cchNeeded += lpArgEnd - lpScan + 1;
-                lpScan = lpArgEnd;
-            }
-        }
-
-        // Allocate space for one additional NULL pointer to terminate list
-
-        lpArgvW = (LPWSTR *)GlobalAlloc( 0, sizeof(LPWSTR) * (nTokens + 1) + sizeof(WCHAR) * cchNeeded );
-
-        if ( lpArgvW )
-        {
-            // Collect arguments
-
-            LPWSTR	lpDestination = (LPWSTR)&lpArgvW[nTokens + 1];
-
-            lpScan = lpCmdLineW;
-            nTokens = 0;
-
-            while ( *lpScan )
-            {
-                lpScan = SkipBlanks( lpScan );
-                if ( *lpScan )
-                {
-                    LPCWSTR	lpArgEnd = SkipArgument( lpScan );
-
-                    lpArgvW[nTokens++] = lpDestination;
-
-                    while ( lpScan < lpArgEnd )
-                    {
-                        if ( '\"' != *lpScan )
-                            *lpDestination++ = *lpScan;
-
-                        lpScan++;
-                    }
-                    *lpDestination++ = 0;
-                }
-            }
-
-            lpArgvW[nTokens] = NULL;
-
-            *pNumArgs = nTokens;
-        }
-        else
-            SetLastError( ERROR_OUTOFMEMORY );
-
-    }
-
-    return lpArgvW;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/CopyFileExA.cpp b/sal/systools/win32/uwinapi/CopyFileExA.cpp
deleted file mode 100644
index fafc73a16..000000000
--- a/sal/systools/win32/uwinapi/CopyFileExA.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
-#endif
-
-#define _WIN32_WINNT 0x0400
-#include "macros.h"
-
-#define	BUFSIZE	16384
-
-static DWORD CALLBACK DefCopyProgressRoutine(
-    LARGE_INTEGER	TotalFileSize,	// total file size, in bytes
-    LARGE_INTEGER	TotalBytesTransferred,
-                                    // total number of bytes transferred
-    LARGE_INTEGER	StreamSize,		// total number of bytes for this stream
-    LARGE_INTEGER	StreamBytesTransferred,
-                                    // total number of bytes transferred for
-                                    // this stream
-    DWORD		dwStreamNumber,		// the current stream
-    DWORD		dwCallbackReason,	// reason for callback
-    HANDLE	hSourceFile,			// handle to the source file
-    HANDLE	hDestinationFile,		// handle to the destination file
-    LPVOID	lpData					// passed by CopyFileEx
-)
-{
-    return PROGRESS_CONTINUE;
-}
-
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExA, ( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, LPPROGRESS_ROUTINE  lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags ) )
-{
-    BOOL	fSuccess = FALSE; // Assume failure
-
-    HANDLE	hSourceFile = CreateFileA(
-        lpExistingFileNameA,
-        GENERIC_READ,
-        FILE_SHARE_READ | FILE_SHARE_WRITE,
-        NULL,
-        OPEN_EXISTING,
-        0,
-        NULL
-        );
-
-    if ( IsValidHandle(hSourceFile) )
-    {
-        LARGE_INTEGER	FileSize, BytesTransferred;
-        HANDLE	hTargetFile = NULL;
-
-        SetLastError( ERROR_SUCCESS );
-        FileSize.LowPart = GetFileSize( hSourceFile, (LPDWORD)&FileSize.HighPart );
-        BytesTransferred.QuadPart = 0;
-
-        if ( (DWORD)-1 != FileSize.LowPart || ERROR_SUCCESS == GetLastError() )
-            hTargetFile = CreateFileA(
-                lpNewFileNameA,
-                GENERIC_WRITE,
-                0,
-                NULL,
-                (DWORD) ((dwCopyFlags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS),
-                0,
-                NULL
-                );
-
-        if ( IsValidHandle(hTargetFile) )
-        {
-            DWORD dwProgressResult = PROGRESS_CONTINUE;
-
-            fSuccess = SetEndOfFile( hTargetFile );
-
-            if ( fSuccess )
-            {
-                if ( !lpProgressRoutine )
-                    lpProgressRoutine = DefCopyProgressRoutine;
-
-                dwProgressResult = lpProgressRoutine(
-                    FileSize,
-                    BytesTransferred,
-                    FileSize,
-                    BytesTransferred,
-                    1,
-                    CALLBACK_STREAM_SWITCH,
-                    hSourceFile,
-                    hTargetFile,
-                    lpData
-                    );
-
-                // Suppress further notifications
-
-                if ( PROGRESS_QUIET == dwProgressResult )
-                {
-                    lpProgressRoutine = DefCopyProgressRoutine;
-                    dwProgressResult = PROGRESS_CONTINUE;
-                }
-            }
-
-            while ( fSuccess && PROGRESS_CONTINUE == dwProgressResult )
-            {
-                BYTE	buffer[BUFSIZE];
-                DWORD	dwBytesRead, dwBytesWritten = 0;
-
-                fSuccess = ReadFile( hSourceFile, buffer, BUFSIZE, &dwBytesRead, NULL );
-
-                if ( !dwBytesRead ) break;
-
-                if ( fSuccess )
-                    fSuccess = WriteFile( hTargetFile, buffer, dwBytesRead, &dwBytesWritten, NULL );
-
-                if ( fSuccess )
-                {
-                    BytesTransferred.QuadPart += (LONGLONG)dwBytesWritten;
-
-                    if ( pbCancel && *pbCancel )
-                        dwProgressResult = PROGRESS_CANCEL;
-                    else
-                        dwProgressResult = lpProgressRoutine(
-                            FileSize,
-                            BytesTransferred,
-                            FileSize,
-                            BytesTransferred,
-                            1,
-                            CALLBACK_CHUNK_FINISHED,
-                            hSourceFile,
-                            hTargetFile,
-                            lpData
-                            );
-
-                }
-
-            }
-
-            CloseHandle( hTargetFile );
-
-            if ( PROGRESS_CANCEL == dwProgressResult )
-                DeleteFileA( lpNewFileNameA );
-        }
-
-
-        CloseHandle( hSourceFile );
-    }
-
-    return fSuccess;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DllGetVersion.cpp b/sal/systools/win32/uwinapi/DllGetVersion.cpp
deleted file mode 100644
index 7f3e4f1d0..000000000
--- a/sal/systools/win32/uwinapi/DllGetVersion.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define WIN32_LEAN_AND_MEAN
-#ifdef _MSC_VER
-#pragma warning(push,1)
-#endif
-#include <windows.h>
-#include <shlwapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#include <malloc.h>
-
-extern HMODULE		UWINAPI_BaseAddress;
-
-// This function should be exported by every DLL that wants to provide it's version number.
-// This code automaticly generates the information from the version resource
-
-extern "C" HRESULT CALLBACK DllGetVersion( DLLVERSIONINFO *pdvi )
-{
-    TCHAR	szModulePath[MAX_PATH];
-    BOOL	fSuccess = FALSE;
-
-    if ( UWINAPI_BaseAddress && GetModuleFileName( UWINAPI_BaseAddress, szModulePath, MAX_PATH ) )
-    {
-        DWORD	dwHandle = 0;
-        DWORD	dwSize = GetFileVersionInfoSize( szModulePath, &dwHandle );
-        LPVOID	lpData = _alloca( dwSize );
-
-        if ( GetFileVersionInfo( szModulePath, dwHandle, dwSize, lpData ) )
-        {
-            VS_FIXEDFILEINFO	*lpBuffer = NULL;
-            UINT	uLen = 0;
-
-            if ( VerQueryValue( lpData, TEXT("\\"), (LPVOID *)&lpBuffer, &uLen ) )
-            {
-                pdvi->dwMajorVersion = HIWORD( lpBuffer->dwFileVersionMS );
-                pdvi->dwMinorVersion = LOWORD( lpBuffer->dwFileVersionMS );
-                pdvi->dwBuildNumber = HIWORD( lpBuffer->dwFileVersionLS );
-                pdvi->dwPlatformID = (DWORD) ((lpBuffer->dwFileOS & VOS_NT) ? DLLVER_PLATFORM_NT : DLLVER_PLATFORM_WINDOWS);
-
-                fSuccess = TRUE;
-            }
-        }
-    }
-
-    return fSuccess ? HRESULT_FROM_WIN32( GetLastError() ) : HRESULT_FROM_WIN32( NO_ERROR );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DllMain.cpp b/sal/systools/win32/uwinapi/DllMain.cpp
deleted file mode 100644
index 25be14ec0..000000000
--- a/sal/systools/win32/uwinapi/DllMain.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define WIN32_LEAN_AND_MEAN
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
-#include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#include <malloc.h>
-#define _MBCS
-#include <tchar.h>
-
-
-HMODULE		UWINAPI_BaseAddress = NULL;
-const CHAR	szUnicowsModuleName[] = "UNICOWS.DLL";
-
-static HMODULE WINAPI _LoadUnicowsLibrary(VOID)
-{
-    CHAR		szModulePath[MAX_PATH];
-    HMODULE		hModuleUnicows = NULL;
-
-    // First search in the same directory as UWINAPI.DLL was loaded from. This is because
-    // UWINAPI.DLL not always resides in the same directory as the actual application.
-
-    if ( UWINAPI_BaseAddress && GetModuleFileNameA( UWINAPI_BaseAddress, szModulePath, MAX_PATH ) )
-    {
-        char	*lpLastBkSlash = _tcsrchr( szModulePath, '\\' );
-
-        if ( lpLastBkSlash )
-        {
-            size_t	nParentDirSize = (size_t) (_tcsinc( lpLastBkSlash ) - szModulePath);
-            LPSTR	lpUnicowsModulePath = (LPTSTR)_alloca( nParentDirSize + sizeof(szUnicowsModuleName) );
-
-            if ( lpUnicowsModulePath )
-            {
-                _tcsncpy( lpUnicowsModulePath, szModulePath, nParentDirSize );
-                _tcscpy( lpUnicowsModulePath + nParentDirSize, szUnicowsModuleName );
-
-                hModuleUnicows = LoadLibraryA( lpUnicowsModulePath );
-            }
-        }
-    }
-
-    // Search at the common places
-
-    if ( !hModuleUnicows )
-        hModuleUnicows = LoadLibraryA(szUnicowsModuleName);
-
-    return hModuleUnicows;
-}
-
-static HMODULE WINAPI LoadUnicowsLibrary(VOID)
-{
-    HMODULE	hModuleUnicows;
-    int		idMsg = IDOK;
-
-    do
-    {
-        hModuleUnicows = _LoadUnicowsLibrary();
-
-        if ( !hModuleUnicows )
-        {
-            LPVOID lpMsgBuf;
-
-            FormatMessageA(
-                FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                FORMAT_MESSAGE_FROM_SYSTEM |
-                FORMAT_MESSAGE_IGNORE_INSERTS,
-                NULL,
-                ERROR_DLL_NOT_FOUND /* GetLastError() */,
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-                (LPSTR)&lpMsgBuf,
-                0,
-                NULL
-            );
-            // Process any inserts in lpMsgBuf.
-            CHAR szModuleFileName[MAX_PATH];
-
-            GetModuleFileNameA( NULL, szModuleFileName, sizeof(szModuleFileName) );
-            LPSTR	lpMessage = (LPSTR)_alloca( strlen( (LPCSTR)lpMsgBuf ) + sizeof(szUnicowsModuleName) + 1 );
-            strcpy( lpMessage, (LPCSTR)lpMsgBuf );
-            strcat( lpMessage, "\n" );
-            strcat( lpMessage, szUnicowsModuleName );
-            // Free the buffer.
-            LocalFree( lpMsgBuf );
-            // Display the string.
-            idMsg = MessageBoxA( NULL, lpMessage,
-                szModuleFileName, MB_ABORTRETRYIGNORE | MB_ICONERROR | MB_TASKMODAL );
-
-            if ( IDABORT == idMsg )
-                TerminateProcess( GetCurrentProcess(), 255 );
-        }
-    } while ( !hModuleUnicows && IDRETRY == idMsg );
-
-    return hModuleUnicows;
-}
-
-extern "C" {
-FARPROC _PfnLoadUnicows = (FARPROC)LoadUnicowsLibrary;
-}
-
-#ifdef __MINGW32__
-
-extern "C" {
-
-typedef void (*func_ptr) (void);
-extern func_ptr __CTOR_LIST__[];
-extern func_ptr __DTOR_LIST__[];
-
-static void do_startup(void);
-static void do_cleanup(void);
-
-HMODULE hModuleUnicowsDLL;
-
-void
-__do_global_dtors (void)
-{
-  static func_ptr *p = __DTOR_LIST__ + 1;
-
-  /*
-   * Call each destructor in the destructor list until a null pointer
-   * is encountered.
-   */
-  while (*p)
-    {
-      (*(p)) ();
-      p++;
-    }
-}
-
-void
-__do_global_ctors (void)
-{
-  unsigned long nptrs = (unsigned long) __CTOR_LIST__[0];
-  unsigned i;
-
-  /*
-   * If the first entry in the constructor list is -1 then the list
-   * is terminated with a null entry. Otherwise the first entry was
-   * the number of pointers in the list.
-   */
-  if (nptrs == static_cast<unsigned long>(-1))
-    {
-      for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++)
-    ;
-    }
-
-  /* 
-   * Go through the list backwards calling constructors.
-   */
-  for (i = nptrs; i >= 1; i--)
-    {
-      __CTOR_LIST__[i] ();
-    }
-
-  /*
-   * Register the destructors for processing on exit.
-   */
-  atexit (__do_global_dtors);
-}
-
-static int initialized = 0;
-
-void
-__main (void)
-{
-  if (!initialized)
-    {
-      initialized = 1;
-      do_startup();
-      __do_global_ctors ();
-    }
-}
-
-static void do_startup( void )
-{
-    if (((LONG)GetVersion()&0x800000ff) == 0x80000004)
-        {
-        hModuleUnicowsDLL = LoadUnicowsLibrary();
-        if (hModuleUnicowsDLL)
-            atexit(do_cleanup);
-    }
-}
-
-void do_cleanup( void )
-{
-    FreeLibrary(hModuleUnicowsDLL);
-}
-}
-
-#endif
-
-extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID )
-{
-    switch ( dwReason )
-    {
-    case DLL_PROCESS_ATTACH:
-        UWINAPI_BaseAddress = hModule;
-#ifdef __MINGW32__
-        return TRUE;
-#else
-        return DisableThreadLibraryCalls( hModule );
-#endif
-    default:
-        return TRUE;
-    }
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DrawStateW.cpp b/sal/systools/win32/uwinapi/DrawStateW.cpp
deleted file mode 100644
index 89003c437..000000000
--- a/sal/systools/win32/uwinapi/DrawStateW.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-IMPLEMENT_THUNK( user32, WINDOWS, BOOL, WINAPI, DrawStateW,
-(
-    HDC				hdc,			// handle to device context
-    HBRUSH			hbr,			// handle to brush
-    DRAWSTATEPROC	lpOutputFunc,	// pointer to callback function
-    LPARAM			lData,			// image information
-    WPARAM			wData,			// more image information
-    int				x,				// horizontal location of image
-    int				y,				// vertical location of image
-    int				cx,				// width of image
-    int				cy,				// height of image
-    UINT			fuFlags			// image type and state
-
-))
-{
-    switch ( fuFlags & 0x000F )
-    {
-    case DST_TEXT:
-    case DST_PREFIXTEXT:
-        {
-            LPSTR	lpTextA = NULL;
-
-            if ( lData )
-            {
-                int	cchWideChar = (int) (wData ? wData : -1);
-                int	cchNeeded = WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lData, cchWideChar, NULL, 0, NULL, NULL );
-
-                lpTextA = (LPSTR)_alloca( cchNeeded * sizeof(CHAR) );
-
-                if ( !lpTextA )
-                {
-                    SetLastError( ERROR_OUTOFMEMORY );
-                    return FALSE;
-                }
-
-                WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lData, cchWideChar, lpTextA, cchNeeded, NULL, NULL );
-
-            }
-
-            return DrawStateA( hdc, hbr, lpOutputFunc, (LPARAM)lpTextA, wData, x, y, cx, cy, fuFlags );
-        }
-    default:
-        return DrawStateA( hdc, hbr, lpOutputFunc, lData, wData, x, y, cx, cy, fuFlags );
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/EnumProcesses.cpp b/sal/systools/win32/uwinapi/EnumProcesses.cpp
deleted file mode 100644
index a8b5fabef..000000000
--- a/sal/systools/win32/uwinapi/EnumProcesses.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "macros.h"
-#include <tlhelp32.h>
-
-IMPLEMENT_THUNK( psapi, WINDOWS, BOOL, WINAPI, EnumProcesses, ( LPDWORD lpProcesses, DWORD cbSize, LPDWORD lpcbCopied ) )
-{
-    BOOL	fSuccess = FALSE;
-    HANDLE	hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
-
-    if ( IsValidHandle( hSnapshot ) )
-    {
-        PROCESSENTRY32	pe;
-
-        if ( lpcbCopied )
-            *lpcbCopied = 0;
-
-        pe.dwSize = sizeof(pe);
-        if ( Process32First( hSnapshot, &pe ) )
-        {
-            fSuccess = TRUE;
-
-            while ( cbSize >= sizeof(*lpProcesses) )
-            {
-                *(lpProcesses++) = pe.th32ProcessID;
-                if ( lpcbCopied )
-                    *lpcbCopied += sizeof(*lpProcesses);
-                cbSize -= sizeof(*lpProcesses);
-
-                if ( !Process32Next( hSnapshot, &pe ) )
-                    break;
-            }
-        }
-
-        CloseHandle( hSnapshot );
-    }
-    else
-        SetLastError( ERROR_INVALID_HANDLE );
-    
-    return fSuccess;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp
deleted file mode 100644
index f9dc34131..000000000
--- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "macros.h"
-#ifdef __MINGW32__
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointA, (LPSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
-#else
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointA, (LPCSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
-#endif
-/*
-extern "C" _declspec( dllexport ) FARPROC kernel32_FindFirstVolumeMountPointA_Ptr;
-static HANDLE __stdcall FindFirstVolumeMountPointA_Failure (LPSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength);
-static _declspec ( naked ) void FindFirstVolumeMountPointA_Thunk()
-{
-     ResolveThunk_TRYLOAD( &kernel32_FindFirstVolumeMountPointA_Ptr, "kernel32" ".dll", "FindFirstVolumeMountPointA", 0, (FARPROC)FindFirstVolumeMountPointA_Failure );
-     _asm jmp [kernel32_FindFirstVolumeMountPointA_Ptr] }
-
-//extern "C" _declspec( naked ) HANDLE __stdcall
-//extern "C" HANDLE WINAPI
-extern "C" _declspec( naked ) HANDLE __stdcall FindFirstVolumeMountPointA (LPCSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength)
-{
-    _asm jmp [kernel32_FindFirstVolumeMountPointA_Ptr]
-}
-
-extern "C" _declspec( dllexport ) FARPROC kernel32_FindFirstVolumeMountPointA_Ptr = (FARPROC)FindFirstVolumeMountPointA_Thunk;
-static HANDLE __stdcall FindFirstVolumeMountPointA_Failure (LPSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength)
-{ SetLastError( 120L ); return (HANDLE)0; }
-*/
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp
deleted file mode 100644
index 5ac996cc1..000000000
--- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "macros.h"
-#ifdef __MINGW32__
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointW, (LPWSTR lpszRootPathName, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
-#else
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointW, (LPCWSTR lpszRootPathName, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeA.cpp b/sal/systools/win32/uwinapi/FindNextVolumeA.cpp
deleted file mode 100644
index 22768460d..000000000
--- a/sal/systools/win32/uwinapi/FindNextVolumeA.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp
deleted file mode 100644
index dad9cc598..000000000
--- a/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeMountPointA, (HANDLE hFindVolumeMountPoint, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp
deleted file mode 100644
index 5e15a9f2e..000000000
--- a/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeMountPointW, (HANDLE hFindVolumeMountPoint, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeW.cpp b/sal/systools/win32/uwinapi/FindNextVolumeW.cpp
deleted file mode 100644
index e7b092f27..000000000
--- a/sal/systools/win32/uwinapi/FindNextVolumeW.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeW, (HANDLE hFindVolume, LPWSTR lpszVolumeName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindVolumeClose.cpp b/sal/systools/win32/uwinapi/FindVolumeClose.cpp
deleted file mode 100644
index fe028b306..000000000
--- a/sal/systools/win32/uwinapi/FindVolumeClose.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindVolumeClose, (HANDLE hFindVolume) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp
deleted file mode 100644
index 27dee507d..000000000
--- a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-// GetDiskSpaceExA wrapper for Win 95A
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetDiskFreeSpaceExA,(
-  LPCSTR lpRootPathName,                  // directory name
-  PULARGE_INTEGER lpFreeBytesAvailable,    // bytes available to caller
-  PULARGE_INTEGER lpTotalNumberOfBytes,    // bytes on disk
-  PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
-))
-{
-    DWORD	dwSectorsPerCluster, dwBytesPerSector, dwNumberOfFreeClusters, dwTotalNumberOfClusters;
-
-    BOOL	fSuccess = GetDiskFreeSpaceA( lpRootPathName, &dwSectorsPerCluster, &dwBytesPerSector, &dwNumberOfFreeClusters, &dwTotalNumberOfClusters );
-
-    if ( fSuccess )
-    {
-        ULONGLONG	ulBytesPerCluster = (ULONGLONG)dwSectorsPerCluster * (ULONGLONG)dwBytesPerSector;
-
-        if ( lpFreeBytesAvailable )
-            lpFreeBytesAvailable->QuadPart = ulBytesPerCluster * (ULONGLONG)dwNumberOfFreeClusters;
-
-        if ( lpTotalNumberOfBytes )
-            lpTotalNumberOfBytes->QuadPart = ulBytesPerCluster * (ULONGLONG)dwTotalNumberOfClusters;
-
-        if ( lpTotalNumberOfFreeBytes )
-            lpTotalNumberOfFreeBytes->QuadPart = ulBytesPerCluster * (ULONGLONG)dwNumberOfFreeClusters;
-    }
-
-    return fSuccess;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp
deleted file mode 100644
index fd30de27c..000000000
--- a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, GetDiskFreeSpaceExW,(
-  LPCWSTR lpRootPathNameW,                  // directory name
-  PULARGE_INTEGER lpFreeBytesAvailable,    // bytes available to caller
-  PULARGE_INTEGER lpTotalNumberOfBytes,    // bytes on disk
-  PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
-))
-{
-    AUTO_WSTR2STR( lpRootPathName );
-
-    return GetDiskFreeSpaceExA( lpRootPathNameA, lpFreeBytesAvailable, lpTotalNumberOfBytes, lpTotalNumberOfFreeBytes );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp b/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp
deleted file mode 100644
index 0b14490c5..000000000
--- a/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLogicalDriveStringsW, ( DWORD cchBuffer, LPWSTR lpBufferW ) )
-{
-    AUTO_STR( lpBuffer, cchBuffer );
-
-    DWORD	dwResult = GetLogicalDriveStringsA( cchBuffer, lpBufferA );
-
-
-    if ( dwResult && dwResult < cchBuffer )
-        STRBUF2WSTR( lpBuffer, (int) (dwResult + 1), (int) cchBuffer );
-
-    return dwResult;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLongPathName.cpp b/sal/systools/win32/uwinapi/GetLongPathName.cpp
deleted file mode 100644
index 77df88a55..000000000
--- a/sal/systools/win32/uwinapi/GetLongPathName.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-{
-    DWORD	dwResult = 0;	// Assume failure
-
-    if ( IsBadStringPtr( lpShortPath, MAX_PATH ) )
-    {
-        SetLastError( ERROR_INVALID_PARAMETER );
-        return dwResult;
-    }
-
-    // Assume a not existing buffer means a bufsize of zero 
-    if ( !lpLongPath )
-        cchBuffer = 0;
-
-    if ( _tcslen( lpShortPath ) == 2 && lpShortPath[1] == ':' )
-    {
-        _tcscpy( lpLongPath, lpShortPath );
-        dwResult = _tcslen( lpLongPath );
-    }
-    else
-    {
-        HANDLE			hFind;
-        WIN32_FIND_DATA	aFindFileData;
-
-        if ( lpShortPath[_tcslen(lpShortPath)-1] == '\\' )
-        {
-            TCHAR	szFilePath[MAX_PATH];
-
-            _tcscpy( szFilePath, lpShortPath );
-            _tcscat( szFilePath, TEXT("*.*") );
-            hFind = FindFirstFile( szFilePath, &aFindFileData );;
-            aFindFileData.cFileName[0] = 0;
-        }
-        else
-        {
-            hFind = FindFirstFile( lpShortPath, &aFindFileData );
-            if ( !IsValidHandle( hFind ) )
-            {
-                TCHAR	szFilePath[MAX_PATH];
-
-                _tcscpy( szFilePath, lpShortPath );
-                _tcscat( szFilePath, TEXT("\\*.*") );
-                hFind = FindFirstFile( szFilePath, &aFindFileData );;
-                aFindFileData.cFileName[0] = 0;
-            }
-        }
-
-        if ( IsValidHandle( hFind ) )
-        {
-            FindClose( hFind );
-
-            LPCTSTR	lpLastSlash = _tcsrchr( lpShortPath, '\\' );
-
-            if ( lpLastSlash )
-            {
-                int	nParentLen = lpLastSlash - lpShortPath;
-                LPTSTR	lpParentPath = (LPTSTR)_alloca( (nParentLen + 1) * sizeof(TCHAR) );
-
-                CopyMemory( lpParentPath, lpShortPath, nParentLen * sizeof(TCHAR) ); 
-                lpParentPath[nParentLen] = 0;
-
-                dwResult = GetLongPathName( lpParentPath, lpLongPath, cchBuffer );
-
-                if ( !dwResult )
-                    _tcscpy( lpLongPath, lpParentPath );
-            }
-            else
-            {
-                _tcscpy( lpLongPath, lpShortPath );
-                dwResult = _tcslen( lpLongPath );
-            }
-
-            if ( dwResult < cchBuffer )
-            {
-                _tcscat( lpLongPath, TEXT("\\") );
-                _tcscat( lpLongPath, aFindFileData.cFileName );
-                dwResult = _tcslen( lpLongPath );
-            }
-            else
-                dwResult += _tcslen( aFindFileData.cFileName ) + 1;
-        }
-    }
-
-    return dwResult;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLongPathNameA.cpp b/sal/systools/win32/uwinapi/GetLongPathNameA.cpp
deleted file mode 100644
index 259b33117..000000000
--- a/sal/systools/win32/uwinapi/GetLongPathNameA.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLongPathNameA, ( LPCTSTR lpShortPath, LPTSTR lpLongPath, DWORD cchBuffer ) )
-#include "GetLongPathName.cpp"
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLongPathNameW.cpp b/sal/systools/win32/uwinapi/GetLongPathNameW.cpp
deleted file mode 100644
index 9a473937a..000000000
--- a/sal/systools/win32/uwinapi/GetLongPathNameW.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define UNICODE
-#include "macros.h"
-
-EXTERN_C DWORD WINAPI GetLongPathNameW_NT( LPCWSTR lpShortPath, LPWSTR lpLongPath, DWORD cchBuffer )
-#include "GetLongPathName.cpp"
-
-EXTERN_C DWORD WINAPI GetLongPathNameW_WINDOWS( LPCWSTR lpShortPathW, LPWSTR lpLongPathW, DWORD cchBuffer )
-{
-    AUTO_WSTR2STR( lpShortPath );
-    AUTO_STR( lpLongPath, cchBuffer );
-
-    DWORD	dwResult = GetLongPathNameA( lpShortPathA, lpLongPathA, cchBuffer );
-
-    if ( dwResult && dwResult < cchBuffer )
-        STR2WSTR( lpLongPath, cchBuffer );
-
-    return dwResult;
-}
-
-
-EXTERN_C void WINAPI ResolveThunk_GetLongPathNameW( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName )
-{
-    if ( (LONG)GetVersion() < 0 )
-        *lppfn = (FARPROC)GetLongPathNameW_WINDOWS;
-    else
-    {
-        FARPROC	lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
-        if ( !lpfnResult )
-            lpfnResult = (FARPROC)GetLongPathNameW_NT;
-
-        *lppfn = lpfnResult;
-    }
-}
-
-
-DEFINE_CUSTOM_THUNK( kernel32, GetLongPathNameW, DWORD, WINAPI, GetLongPathNameW, ( LPCWSTR lpShortPathW, LPWSTR lpLongPathW, DWORD cchBuffer ) );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp b/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp
deleted file mode 100644
index b765be70e..000000000
--- a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "macros.h"
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
-#include <psapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#include <tlhelp32.h>
-
-IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExA, (HANDLE hProcess, HMODULE hModule, LPSTR lpFileName, DWORD nSize ) )
-{
-    DWORD	dwProcessId = 0;
-    DWORD	dwResult = 0;
-
-    if ( !hProcess || hProcess == GetCurrentProcess() || GetCurrentProcessId() == (dwProcessId = GetProcessId( hProcess )) )
-        return GetModuleFileNameA( hModule, lpFileName, nSize );
-
-    HANDLE	hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPMODULE, dwProcessId );
-
-    if ( IsValidHandle( hSnapshot ) )
-    {
-        MODULEENTRY32	me;
-
-        me.dwSize = sizeof(me);
-        if ( Module32First( hSnapshot, &me ) )
-        {
-            BOOL	fFound = FALSE;
-
-            if ( NULL == hModule )
-                fFound = TRUE;
-            else do
-            {
-                fFound = (me.hModule == hModule);
-            } while ( !fFound && Module32Next( hSnapshot, &me ) );
-            
-            if ( fFound )
-            {
-                dwResult = _tcslen( me.szExePath );
-
-                if ( dwResult > nSize && nSize > 0 )
-                    lpFileName[nSize -1] = 0;
-
-                _tcsncpy( lpFileName, me.szExePath, nSize );
-            }
-        }
-
-        CloseHandle( hSnapshot );
-    }
-    
-    return dwResult;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp b/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp
deleted file mode 100644
index 2c476731c..000000000
--- a/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "macros.h"
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
-#include <psapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExW, (HANDLE hProcess, HMODULE hModule, LPWSTR lpFileNameW, DWORD nSize ) )
-{
-    AUTO_STR( lpFileName, 2 * nSize );
-
-    if ( GetModuleFileNameExA( hProcess, hModule, lpFileNameA, 2 * nSize ) )
-        return (DWORD) STR2WSTR( lpFileName, nSize );
-    else
-        return 0;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetProcessId.cpp b/sal/systools/win32/uwinapi/GetProcessId.cpp
deleted file mode 100644
index c0fdd07c0..000000000
--- a/sal/systools/win32/uwinapi/GetProcessId.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-#include "win95sys.h"
-#include <tlhelp32.h>
-static FARPROC WINAPI GetRealProcAddress( HMODULE hModule, LPCSTR lpProcName )
-{
-    FARPROC	lpfn = GetProcAddress( hModule, lpProcName );
-
-    if ( lpfn )
-    {
-        if ( 0x68 == *(LPBYTE)lpfn )
-        {
-            /*
-            82C9F460 68 36 49 F8 BF       push        0BFF84936h
-            82C9F465 E9 41 62 2F 3D       jmp         BFF956AB
-            */
-
-            lpfn = (FARPROC)*(LPDWORD)((LPBYTE)lpfn + 1);
-
-            /*
-            BFF956AB 9C                   pushfd
-            BFF956AC FC                   cld
-            BFF956AD 50                   push        eax
-            BFF956AE 53                   push        ebx
-            BFF956AF 52                   push        edx
-            BFF956B0 64 8B 15 20 00 00 00 mov         edx,dword ptr fs:[20h]
-            BFF956B7 0B D2                or          edx,edx
-            BFF956B9 74 09                je          BFF956C4
-            BFF956BB 8B 42 04             mov         eax,dword ptr [edx+4]
-            BFF956BE 0B C0                or          eax,eax
-            BFF956C0 74 07                je          BFF956C9
-            BFF956C2 EB 42                jmp         BFF95706
-            BFF956C4 5A                   pop         edx
-            BFF956C5 5B                   pop         ebx
-            BFF956C6 58                   pop         eax
-            BFF956C7 9D                   popfd
-            BFF956C8 C3                   ret
-            */		
-        }
-    }
-
-    return lpfn;
-}
-
-
-typedef DWORD (WINAPI OBFUSCATE)( DWORD dwPTID );
-typedef OBFUSCATE *LPOBFUSCATE;
-
-static DWORD WINAPI Obfuscate( DWORD dwPTID )
-{
-    static LPOBFUSCATE lpfnObfuscate = NULL;
-
-    if ( !lpfnObfuscate )
-    {
-        LPBYTE lpCode = (LPBYTE)GetRealProcAddress( GetModuleHandleA("KERNEL32"), "GetCurrentThreadId" );
-
-        if ( lpCode )
-        {
-            /* 
-            GetCurrentThreadId:
-            lpCode + 00 BFF84936 A1 DC 9C FC BF       mov         eax,[BFFC9CDC]	; This is the real thread id
-            lpcode + 05 BFF8493B FF 30                push        dword ptr [eax]
-            lpCode + 07 BFF8493D E8 17 C5 FF FF       call        BFF80E59			; call Obfuscate function
-            lpcode + 0C BFF84942 C3                   ret
-            */
-
-            DWORD	dwOffset = *(LPDWORD)(lpCode + 0x08);
-
-            lpfnObfuscate = (LPOBFUSCATE)(lpCode + 0x0C + dwOffset);
-            /*
-            Obfuscate:
-            BFF80E59 A1 CC 98 FC BF       mov         eax,[BFFC98CC]
-            BFF80E5E 85 C0                test        eax,eax
-            BFF80E60 75 04                jne         BFF80E66
-            BFF80E62 33 C0                xor         eax,eax
-            BFF80E64 EB 04                jmp         BFF80E6A
-            BFF80E66 33 44 24 04          xor         eax,dword ptr [esp+4]
-            BFF80E6A C2 04 00             ret         4
-            */
-        }
-        
-    }
-
-    return lpfnObfuscate ? lpfnObfuscate( dwPTID ) : 0;
-}
-
-
-EXTERN_C DWORD WINAPI GetProcessId_WINDOWS( HANDLE hProcess )
-{
-    if ( GetCurrentProcess() == hProcess )
-        return GetCurrentProcessId();
-
-    DWORD	dwProcessId = 0;
-    PPROCESS_DATABASE	pPDB = (PPROCESS_DATABASE)Obfuscate( GetCurrentProcessId() );
-
-    if ( pPDB && K32OBJ_PROCESS == pPDB->Type )
-    {
-        DWORD	dwHandleNumber = (DWORD)hProcess >> 2;
-
-        if ( 0 == ((DWORD)hProcess & 0x03) && dwHandleNumber < pPDB->pHandleTable->cEntries )
-        {
-            if ( 
-                pPDB->pHandleTable->array[dwHandleNumber].pObject && 
-                K32OBJ_PROCESS == pPDB->pHandleTable->array[dwHandleNumber].pObject->Type 
-                )
-            dwProcessId = Obfuscate( (DWORD)pPDB->pHandleTable->array[dwHandleNumber].pObject );
-        }
-
-        SetLastError( ERROR_INVALID_HANDLE );
-    }
-    
-    return dwProcessId;
-}
-
-
-EXTERN_C DWORD WINAPI GetProcessId_NT( HANDLE hProcess )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return 0;
-}
-
-
-EXTERN_C void WINAPI ResolveThunk_GetProcessId( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName )
-{
-    if ( (LONG)GetVersion() < 0 )
-        *lppfn = (FARPROC)GetProcessId_WINDOWS;
-    else
-    {
-        FARPROC	lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
-        if ( !lpfnResult )
-            lpfnResult = (FARPROC)GetProcessId_NT;
-
-        *lppfn = lpfnResult;
-    }
-}
-
-
-DEFINE_CUSTOM_THUNK( kernel32, GetProcessId, DWORD, WINAPI, GetProcessId, ( HANDLE hProcess ) );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomainA.cpp b/sal/systools/win32/uwinapi/GetUserDomainA.cpp
deleted file mode 100644
index 92cd9ea96..000000000
--- a/sal/systools/win32/uwinapi/GetUserDomainA.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "macros.h"
-
-EXTERN_C DWORD WINAPI GetUserDomainA_NT( LPSTR lpBuffer, DWORD nSize )
-#include "GetUserDomain_NT.cpp"
-
-EXTERN_C DWORD WINAPI GetUserDomainA_WINDOWS( LPSTR lpBuffer, DWORD nSize )
-#include "GetUserDomain_WINDOWS.cpp"
-
-EXTERN_C void WINAPI ResolveThunk_GetUserDomainA( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName )
-{
-    if ( (LONG)GetVersion() < 0 )
-        *lppfn = (FARPROC)GetUserDomainA_WINDOWS;
-    else
-        *lppfn = (FARPROC)GetUserDomainA_NT;
-}
-
-DEFINE_CUSTOM_THUNK( kernel32, GetUserDomainA, DWORD, WINAPI, GetUserDomainA, ( LPSTR lpBuffer, DWORD nSize ) );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomainW.cpp b/sal/systools/win32/uwinapi/GetUserDomainW.cpp
deleted file mode 100644
index 0a34fe35f..000000000
--- a/sal/systools/win32/uwinapi/GetUserDomainW.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define UNICODE
-#include "macros.h"
-
-EXTERN_C DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize )
-#include "GetUserDomain_NT.cpp"
-
-
-EXTERN_C DWORD WINAPI GetUserDomainW_WINDOWS( LPWSTR lpBuffer, DWORD nSize )
-#include "GetUserDomain_WINDOWS.cpp"
-
-EXTERN_C void WINAPI ResolveThunk_GetUserDomainW( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName )
-{
-    if ( (LONG)GetVersion() < 0 )
-        *lppfn = (FARPROC)GetUserDomainW_WINDOWS;
-    else
-        *lppfn = (FARPROC)GetUserDomainW_NT;
-}
-
-DEFINE_CUSTOM_THUNK( kernel32, GetUserDomainW, DWORD, WINAPI, GetUserDomainW, ( LPWSTR lpBuffer, DWORD cchBuffer ) );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp b/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp
deleted file mode 100644
index 2ed058d33..000000000
--- a/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-{
-    HKEY	hkeyLogon;
-    HKEY	hkeyWorkgroup;
-    DWORD	dwResult = 0;
-
-
-    if ( ERROR_SUCCESS  == RegOpenKeyEx( 
-        HKEY_LOCAL_MACHINE, 
-        TEXT("Network\\Logon"), 
-        0, KEY_READ, &hkeyLogon ) ) 
-    {
-        DWORD	dwLogon = 0;
-        DWORD	dwLogonSize = sizeof(dwLogon);
-        RegQueryValueEx( hkeyLogon, TEXT("LMLogon"), 0, NULL, (LPBYTE)&dwLogon, &dwLogonSize );
-        RegCloseKey( hkeyLogon );
-
-        if ( dwLogon )
-        {
-            HKEY	hkeyNetworkProvider;
-
-            if ( ERROR_SUCCESS  == RegOpenKeyEx( 
-                HKEY_LOCAL_MACHINE, 
-                TEXT("SYSTEM\\CurrentControlSet\\Services\\MSNP32\\NetworkProvider"), 
-                0, KEY_READ, &hkeyNetworkProvider ) )
-            {
-                DWORD	dwBufferSize = nSize;
-                LONG	lResult = RegQueryValueEx( hkeyNetworkProvider, TEXT("AuthenticatingAgent"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize );
-
-                if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult )
-                    dwResult = dwBufferSize / sizeof(TCHAR);
-
-                RegCloseKey( hkeyNetworkProvider );
-            }
-        }
-    }
-    else if ( ERROR_SUCCESS == RegOpenKeyEx(
-        HKEY_LOCAL_MACHINE,
-        TEXT("SYSTEM\\CurrentControlSet\\Services\\VxD\\VNETSUP"),
-        0, KEY_READ, &hkeyWorkgroup ) )
-    {
-        DWORD	dwBufferSize = nSize;
-        LONG	lResult = RegQueryValueEx( hkeyWorkgroup, TEXT("Workgroup"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize );
-
-        if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult )
-            dwResult = dwBufferSize / sizeof(TCHAR);
-
-        RegCloseKey( hkeyWorkgroup );
-    }
-
-
-    return dwResult;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp
deleted file mode 100644
index 895d37bfe..000000000
--- a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumeNameForVolumeMountPointA, (LPCSTR lpszVolumeMountPoint, LPSTR lpszVolumeName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp
deleted file mode 100644
index 12195a2db..000000000
--- a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumeNameForVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint, LPWSTR lpszVolumeName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp b/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp
deleted file mode 100644
index 5b236a90b..000000000
--- a/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumePathNameA, (LPCSTR lpszFileName, LPSTR lpszVolumePathName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp b/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp
deleted file mode 100644
index d333b1dd3..000000000
--- a/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumePathNameW, (LPCWSTR lpszFileName, LPWSTR lpszVolumePathName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/MCIWndCreateW.cpp b/sal/systools/win32/uwinapi/MCIWndCreateW.cpp
deleted file mode 100644
index c4fede9b4..000000000
--- a/sal/systools/win32/uwinapi/MCIWndCreateW.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-#include <vfw.h>
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, HWND, VFWAPIV, MCIWndCreateW, 
-(
-  HWND hwndParent,      
-  HINSTANCE hInstance,  
-  DWORD dwStyle,        
-  LPCWSTR lpFileW          
-))
-{
-    AUTO_WSTR2STR( lpFile );
-
-    return MCIWndCreateA( hwndParent, hInstance, dwStyle, lpFileA );
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/MoveFileExA.cpp b/sal/systools/win32/uwinapi/MoveFileExA.cpp
deleted file mode 100644
index 6c47078a4..000000000
--- a/sal/systools/win32/uwinapi/MoveFileExA.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-#include <sal/macros.h>
-
-#define	WININIT_FILENAME	"wininit.ini"
-#define RENAME_SECTION		"rename"
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, MoveFileExA, ( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWORD dwFlags ) )
-{
-    BOOL	fSuccess = FALSE;	// assume failure
-
-    // Windows 9x has a special mechanism to move files after reboot
-
-    if ( dwFlags & MOVEFILE_DELAY_UNTIL_REBOOT )
-    {
-        CHAR	szExistingFileNameA[MAX_PATH];
-        CHAR	szNewFileNameA[MAX_PATH] = "NUL";
-
-        // Path names in WININIT.INI must be in short path name form
-
-        if ( 
-            GetShortPathNameA( lpExistingFileNameA, szExistingFileNameA, MAX_PATH ) &&
-            (!lpNewFileNameA || GetShortPathNameA( lpNewFileNameA, szNewFileNameA, MAX_PATH ))
-            )
-        {
-            CHAR	szBuffer[32767];	// The buffer size must not exceed 32K
-            DWORD	dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION, szBuffer, SAL_N_ELEMENTS(szBuffer), WININIT_FILENAME );
-
-            CHAR	szRename[MAX_PATH];	// This is enough for at most to times 67 chracters
-            strcpy( szRename, szNewFileNameA );
-            strcat( szRename, "=" );
-            strcat( szRename, szExistingFileNameA );
-            size_t	lnRename = strlen(szRename);
-
-            if ( dwBufLen + lnRename + 2 <= SAL_N_ELEMENTS(szBuffer) )
-            {
-                CopyMemory( &szBuffer[dwBufLen], szRename, lnRename );
-                szBuffer[dwBufLen + lnRename ] = 0;
-                szBuffer[dwBufLen + lnRename + 1 ] = 0;
-
-                fSuccess = WritePrivateProfileSectionA( RENAME_SECTION, szBuffer, WININIT_FILENAME );
-            }
-            else
-                SetLastError( ERROR_BUFFER_OVERFLOW );
-        }
-    }
-    else
-    {
-
-        fSuccess = MoveFileA( lpExistingFileNameA, lpNewFileNameA );
-
-        if ( !fSuccess && 0 != (dwFlags & (MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING)) )
-        {
-            BOOL	bFailIfExist = 0 == (dwFlags & MOVEFILE_REPLACE_EXISTING);
-
-            fSuccess = CopyFileA( lpExistingFileNameA, lpNewFileNameA, bFailIfExist );
-
-            // In case of successfull copy do not return FALSE if delete fails.
-            // Error detection is done by GetLastError()
-
-            if ( fSuccess )
-            {
-                SetLastError( NO_ERROR );
-                DeleteFileA( lpExistingFileNameA );
-            }
-        }
-
-    }
-
-    return fSuccess;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/MoveFileExW.cpp b/sal/systools/win32/uwinapi/MoveFileExW.cpp
deleted file mode 100644
index edd3c773c..000000000
--- a/sal/systools/win32/uwinapi/MoveFileExW.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, MoveFileExW, ( LPCWSTR lpExistingFileNameW, LPCWSTR lpNewFileNameW, DWORD dwFlags ) )
-{
-    AUTO_WSTR2STR( lpExistingFileName );
-    AUTO_WSTR2STR( lpNewFileName );
-
-    return MoveFileExA( lpExistingFileNameA, lpNewFileNameA, dwFlags );
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathAddBackslashW.cpp b/sal/systools/win32/uwinapi/PathAddBackslashW.cpp
deleted file mode 100644
index 3dac9f6b0..000000000
--- a/sal/systools/win32/uwinapi/PathAddBackslashW.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-#define _SHLWAPI_
-#include <shlwapi.h>
-
-IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathAddBackslashW, 
-(
-    LPWSTR lpPathW
-))
-{
-    AUTO_WSTR2STR(lpPath);
-    PathAddBackslashA(lpPathA);
-    STR2WSTR(lpPath, MAX_PATH);
-    return lpPathW + wcslen(lpPathW);    
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathCompactPathExW.cpp b/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
deleted file mode 100644
index ef3f70c36..000000000
--- a/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-#define _SHLWAPI_
-#include <shlwapi.h>
-
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathCompactPathExW,
-(
-    LPWSTR pszOut,
-    LPCWSTR lpPathW,
-    UINT cchMax,
-    DWORD dwFlags
-))
-{
-    AUTO_WSTR2STR(lpPath);
-    char* pOutA = (LPSTR)_alloca( cchMax * sizeof(CHAR) );
-    BOOL bret = PathCompactPathExA(pOutA, lpPathA, cchMax, dwFlags);
-    MultiByteToWideChar(CP_ACP, 0, pOutA, -1, pszOut, (int) cchMax);
-    return bret;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathFileExistsW.cpp b/sal/systools/win32/uwinapi/PathFileExistsW.cpp
deleted file mode 100644
index b5a292d21..000000000
--- a/sal/systools/win32/uwinapi/PathFileExistsW.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-#define _SHLWAPI_
-#include <shlwapi.h>
-
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathFileExistsW, 
-(
-    LPCWSTR lpPathW    
-))
-{
-    AUTO_WSTR2STR(lpPath);
-    return PathFileExistsA(lpPathA);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathFindExtensionW.cpp b/sal/systools/win32/uwinapi/PathFindExtensionW.cpp
deleted file mode 100644
index 5b40591b9..000000000
--- a/sal/systools/win32/uwinapi/PathFindExtensionW.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-#define _SHLWAPI_
-#include <shlwapi.h>
-
-#include <tchar.h>
-#include <mbstring.h>
-
-IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathFindExtensionW, 
-(
-    LPCWSTR lpPathW
-))
-{
-    AUTO_WSTR2STR(lpPath);        
-    char* pExt = PathFindExtensionA(lpPathA);
-    
-    if (*pExt)        
-    { 
-        *pExt = '\0';                
-        LPWSTR pOutW = const_cast<LPWSTR>(lpPathW);
-        return (pOutW + _mbslen(reinterpret_cast<unsigned char*>(lpPathA)));      
-    }        
-    else            
-        return const_cast<LPWSTR>(lpPathW) + wcslen(lpPathW);        
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathFindFileNameW.cpp b/sal/systools/win32/uwinapi/PathFindFileNameW.cpp
deleted file mode 100644
index 975ae1dd3..000000000
--- a/sal/systools/win32/uwinapi/PathFindFileNameW.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-#define _SHLWAPI_
-#include <shlwapi.h>
-
-#include <mbstring.h>
-
-IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathFindFileNameW, 
-(
-    LPCWSTR lpPathW
-))
-{
-    AUTO_WSTR2STR(lpPath);    
-    char* pFname = PathFindFileNameA(lpPathA);
-    
-    if (pFname > lpPathA)
-    {        
-        *pFname = '\0';
-        LPWSTR pOutW = const_cast<LPWSTR>(lpPathW);
-        return (pOutW + _mbslen(reinterpret_cast<unsigned char*>(lpPathA)));      
-    }
-    else
-        return const_cast<LPWSTR>(lpPathW);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathIsUNCW.cpp b/sal/systools/win32/uwinapi/PathIsUNCW.cpp
deleted file mode 100644
index 289dbca69..000000000
--- a/sal/systools/win32/uwinapi/PathIsUNCW.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-#define _SHLWAPI_
-#include <shlwapi.h>
-
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathIsUNCW, 
-(
-    LPCWSTR lpPathW
-))
-{
-    AUTO_WSTR2STR(lpPath);
-    return PathIsUNCA(lpPathA);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp b/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp
deleted file mode 100644
index 5222cc713..000000000
--- a/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-#define _SHLWAPI_
-#include <shlwapi.h>
-
-IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathRemoveExtensionW, 
-(
-    LPWSTR lpPathW
-))
-{
-    AUTO_WSTR2STR(lpPath);
-    PathRemoveExtensionA(lpPathA);
-    STR2WSTR(lpPath, wcslen(lpPathW) + 1);        
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp b/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp
deleted file mode 100644
index e10de8987..000000000
--- a/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-#define _SHLWAPI_
-#include <shlwapi.h>
-
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathRemoveFileSpecW, 
-(
-    LPWSTR lpPathW
-))
-{
-    AUTO_WSTR2STR(lpPath);
-    BOOL bret = PathRemoveFileSpecA(lpPathA);
-    STR2WSTR(lpPath, wcslen(lpPathW) + 1);        
-    return bret;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp b/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp
deleted file mode 100644
index c87aee3c9..000000000
--- a/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-#define _SHLWAPI_
-#include <shlwapi.h>
-
-IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathSetDlgItemPathW, 
-(
-    HWND hDlg,
-    int id,
-    LPCWSTR lpPathW
-))
-{
-    AUTO_WSTR2STR(lpPath);
-    PathSetDlgItemPathA(hDlg, id, lpPathA);    
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathStripToRootW.cpp b/sal/systools/win32/uwinapi/PathStripToRootW.cpp
deleted file mode 100644
index e439561ec..000000000
--- a/sal/systools/win32/uwinapi/PathStripToRootW.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-#define _SHLWAPI_
-#include <shlwapi.h>
-
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathStripToRootW, 
-(
-    LPWSTR lpPathW
-))
-{
-    AUTO_WSTR2STR(lpPath);
-    BOOL bret = PathStripToRootA(lpPathA);
-    STR2WSTR(lpPath, wcslen(lpPathW) + 1);
-    return bret;        
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/ResolveThunk.cpp b/sal/systools/win32/uwinapi/ResolveThunk.cpp
deleted file mode 100644
index 1c8da78e2..000000000
--- a/sal/systools/win32/uwinapi/ResolveThunk.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-
-EXTERN_C void WINAPI ResolveThunk_WINDOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure )
-{
-    FARPROC	lpfnResult = (LONG)GetVersion() < 0 ? lpfnEmulate : GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
-
-    if ( !lpfnResult )
-        lpfnResult = lpfnEmulate;
-
-    if ( !lpfnResult )
-        lpfnResult = lpfnFailure;
-
-    *lppfn = lpfnResult;
-}
-
-
-EXTERN_C void WINAPI ResolveThunk_TRYLOAD( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure )
-{
-    FARPROC	lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
-
-    if ( !lpfnResult )
-        lpfnResult = lpfnEmulate;
-
-    if ( !lpfnResult )
-        lpfnResult = lpfnFailure;
-
-    *lppfn = lpfnResult;
-}
-
-
-EXTERN_C void WINAPI ResolveThunk_ALLWAYS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure )
-{
-    *lppfn = lpfnEmulate ? lpfnEmulate : lpfnFailure;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/ResolveUnicows.cpp b/sal/systools/win32/uwinapi/ResolveUnicows.cpp
deleted file mode 100644
index 194c7bea2..000000000
--- a/sal/systools/win32/uwinapi/ResolveUnicows.cpp
+++ /dev/null
@@ -1,518 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifdef __MINGW32__
-#define _GDI32_
-#include "macros.h"
-#include <w32api.h>
-#include <multimon.h>
-extern "C" {
-extern HMODULE hModuleUnicowsDLL;
-}
-
-EXTERN_C void WINAPI ResolveThunk_UNICOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnFailure )
-{
-    FARPROC	lpfnResult = (((LONG)GetVersion()&0x800000ff) == 0x80000004) ? GetProcAddress( hModuleUnicowsDLL, lpFuncName ) : GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
-
-    if ( !lpfnResult )
-        lpfnResult = lpfnFailure;
-
-    *lppfn = lpfnResult;
-}
-
-static void GetProcAddress_Thunk();
-EXTERN_C { _declspec( dllexport ) FARPROC kernel32_GetProcAddress_Ptr = (FARPROC)GetProcAddress_Thunk; }
-static FARPROC WINAPI GetProcAddress_Failure (HINSTANCE,LPCSTR);
-static void GetProcAddress_Thunk()
-{
-    ResolveThunk_UNICOWS( &kernel32_GetProcAddress_Ptr, "kernel32.dll", "GetProcAddress", (FARPROC)GetProcAddress_Failure );
-    asm("	movl	%ebp, %esp");
-    asm("	popl	%ebp");
-    asm("	jmp	*(%0)"::"m"(kernel32_GetProcAddress_Ptr));
-}
-EXTERN_C FARPROC WINAPI Internal_GetProcAddress (HINSTANCE,LPCSTR)
-{
-    asm("	popl	%ebp");
-    asm("	jmp	*(%0)"::"m"(kernel32_GetProcAddress_Ptr));
-}
-static FARPROC WINAPI GetProcAddress_Failure (HINSTANCE,LPCSTR)
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return (FARPROC)0;
-}
-
-#define DEFINE_UNICOWS_THUNK( module, rettype, calltype, func, params ) \
-static void func##_Thunk(); \
-EXTERN_C { _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; } \
-static rettype calltype func##_##Failure params; \
-static void func##_Thunk() \
-{ \
-    ResolveThunk_UNICOWS( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##Failure ); \
-    asm("	movl	%ebp, %esp"); \
-    asm("	popl	%ebp"); \
-    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
-} \
-EXTERN_C rettype calltype func params \
-{ \
-    asm("	popl	%ebp"); \
-    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
-} \
-static rettype calltype func##_##Failure params \
-{ \
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
-    return (rettype)0; \
-}
-
-DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, AddAtomW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, AddFontResourceW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddJobW, (HANDLE,DWORD,PBYTE,DWORD,PDWORD) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPortW, (LPWSTR,HWND,LPWSTR) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPrintProcessorW, (LPWSTR,LPWSTR,LPWSTR,LPWSTR) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPrintProvidorW, (LPWSTR,DWORD,PBYTE) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPrinterDriverW, (LPWSTR,DWORD,PBYTE) )
-DEFINE_UNICOWS_THUNK( winspool, HANDLE, WINAPI, AddPrinterW, (LPWSTR,DWORD,PBYTE) )
-DEFINE_UNICOWS_THUNK( winspool, LONG, WINAPI, AdvancedDocumentPropertiesW, (HWND,HANDLE,LPWSTR,PDEVMODE,PDEVMODEW) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, AppendMenuW, (HMENU,UINT,UINT_PTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, BeginUpdateResourceW, (LPCWSTR,BOOL) )
-DEFINE_UNICOWS_THUNK( user32, long, WINAPI, BroadcastSystemMessageW, (DWORD,LPDWORD,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, BuildCommDCBAndTimeoutsW, (LPCWSTR,LPDCB,LPCOMMTIMEOUTS) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, BuildCommDCBW, (LPCWSTR,LPDCB) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, CallMsgFilterW, (LPMSG,int) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CallNamedPipeW, (LPCWSTR,PVOID,DWORD,PVOID,DWORD,PDWORD,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, CallWindowProcA, (WNDPROC,HWND,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, CallWindowProcW, (WNDPROC,HWND,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, ChangeDisplaySettingsExW, (LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID) )
-DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, ChangeDisplaySettingsW, (PDEVMODEW,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, ChangeMenuW, (HMENU,UINT,LPCWSTR,UINT,UINT) )
-DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, CharLowerBuffW, (LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharLowerW, (LPWSTR) )
-DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharNextW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharPrevW, (LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, CharToOemBuffW, (LPCWSTR,LPSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, CharToOemW, (LPCWSTR,LPSTR) )
-DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, CharUpperBuffW, (LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharUpperW, (LPWSTR) )
-DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, ChooseColorW, (LPCHOOSECOLORW) )
-DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, ChooseFontW, (LPCHOOSEFONTW) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CommConfigDialogW, (LPCWSTR,HWND,LPCOMMCONFIG) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, CompareStringW, (LCID,DWORD,LPCWSTR,int,LPCWSTR,int) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, ConfigurePortW, (LPWSTR,HWND,LPWSTR) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, CopyAcceleratorTableW, (HACCEL,LPACCEL,int) )
-DEFINE_UNICOWS_THUNK( gdi32, HENHMETAFILE, WINAPI, CopyEnhMetaFileW, (HENHMETAFILE,LPCWSTR) )
-//DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CopyFileExW, (LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,LPBOOL,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CopyFileW, (LPCWSTR,LPCWSTR,BOOL) )
-DEFINE_UNICOWS_THUNK( gdi32, HMETAFILE, WINAPI, CopyMetaFileW, (HMETAFILE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HACCEL, WINAPI, CreateAcceleratorTableW, (LPACCEL,int) )
-DEFINE_UNICOWS_THUNK( gdi32, HCOLORSPACE, WINAPI, CreateColorSpaceW, (LPLOGCOLORSPACEW) )
-DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateDCW, (LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*) )
-DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateDialogIndirectParamW, (HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateDialogParamW, (HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CreateDirectoryExW, (LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CreateDirectoryW, (LPCWSTR,LPSECURITY_ATTRIBUTES) )
-DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateEnhMetaFileW, (HDC,LPCWSTR,LPCRECT,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateEventW, (LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateFileMappingW, (HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateFileW, (LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE) )
-DEFINE_UNICOWS_THUNK( gdi32, HFONT, WINAPI, CreateFontIndirectW, (const LOGFONTW*) )
-DEFINE_UNICOWS_THUNK( gdi32, HFONT, WINAPI, CreateFontW, (int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateICW, (LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*) )
-DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateMDIWindowW, (LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateMailslotW, (LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES) )
-DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateMetaFileW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateMutexW, (LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CreateProcessW, (LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,PVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, CreateScalableFontResourceW, (DWORD,LPCWSTR,LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateSemaphoreW, (LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( oeacc, HRESULT, STDAPICALLTYPE, CreateStdAccessibleProxyW, (HWND, LPCWSTR, LONG, REFIID, void**) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateWaitableTimerW, (LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateWindowExW, (DWORD,LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID) )
-DEFINE_UNICOWS_THUNK( user32, HCONV, WINAPI, DdeConnect, (DWORD,HSZ,HSZ,PCONVCONTEXT) )
-DEFINE_UNICOWS_THUNK( user32, HCONVLIST, WINAPI, DdeConnectList, (DWORD,HSZ,HSZ,HCONVLIST,PCONVCONTEXT) )
-DEFINE_UNICOWS_THUNK( user32, HSZ, WINAPI, DdeCreateStringHandleW, (DWORD,LPCWSTR,int) )
-DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, DdeInitializeW, (PDWORD,PFNCALLBACK,DWORD,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, DdeQueryConvInfo, (HCONV,DWORD,PCONVINFO) )
-DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, DdeQueryStringW, (DWORD,HSZ,LPWSTR,DWORD,int) )
-DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefDlgProcW, (HWND,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefFrameProcW, (HWND,HWND,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefMDIChildProcW, (HWND,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefWindowProcW, (HWND,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, DeleteFileW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeleteMonitorW, (LPWSTR,LPWSTR,LPWSTR) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePortW, (LPWSTR,HWND,LPWSTR) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePrintProcessorW, (LPWSTR,LPWSTR,LPWSTR) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePrintProvidorW, (LPWSTR,LPWSTR,LPWSTR) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePrinterDriverW, (LPWSTR,LPWSTR,LPWSTR) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DialogBoxIndirectParamW, (HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DialogBoxParamW, (HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, DispatchMessageW, (const MSG*) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DlgDirListComboBoxW, (HWND,LPWSTR,int,int,UINT) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DlgDirListW, (HWND,LPWSTR,int,int,UINT) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, DlgDirSelectComboBoxExW, (HWND,LPWSTR,int,int) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, DlgDirSelectExW, (HWND,LPWSTR,int,int) )
-DEFINE_UNICOWS_THUNK( shell32, UINT, WINAPI, DragQueryFileW, (HDROP,UINT,LPWSTR,UINT) )
-//DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, DrawStateW, (HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,int,int,int,int,UINT) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DrawTextExW, (HDC,LPWSTR,int,LPRECT,UINT,LPDRAWTEXTPARAMS) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DrawTextW, (HDC,LPCWSTR,int,LPRECT,UINT) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnableWindow, (HWND,BOOL) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EndUpdateResourceW, (HANDLE,BOOL) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumCalendarInfoExW, (CALINFO_ENUMPROCEXW,LCID,CALID,CALTYPE) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumCalendarInfoW, (CALINFO_ENUMPROCW,LCID,CALID,CALTYPE) )
-DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, EnumClipboardFormats, (UINT) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumDateFormatsExW, (DATEFMT_ENUMPROCEXW,LCID,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumDateFormatsW, (DATEFMT_ENUMPROCW,LCID,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnumDisplayDevicesW, (LPCWSTR,DWORD,PDISPLAY_DEVICEW,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnumDisplaySettingsExW, (LPCWSTR,DWORD,LPDEVMODEW,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnumDisplaySettingsW, (LPCWSTR,DWORD,PDEVMODEW) )
-DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumFontFamiliesExW, (HDC,PLOGFONTW,FONTENUMPROCW,LPARAM,DWORD) )
-DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumFontFamiliesW, (HDC,LPCWSTR,FONTENUMPROCW,LPARAM) )
-DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumFontsW, (HDC,LPCWSTR,FONTENUMPROCW,LPARAM) )
-DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumICMProfilesW, (HDC,ICMENUMPROCW,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsA, (HWND,PROPENUMPROCA) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsExA, (HWND,PROPENUMPROCEXA,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsExW, (HWND,PROPENUMPROCEXW,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsW, (HWND,PROPENUMPROCW) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumSystemCodePagesW, (CODEPAGE_ENUMPROCW,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumSystemLocalesW, (LOCALE_ENUMPROCW,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumTimeFormatsW, (TIMEFMT_ENUMPROCW,LCID,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, ExpandEnvironmentStringsW, (LPCWSTR,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, ExtTextOutW, (HDC,int,int,UINT,LPCRECT,LPCWSTR,UINT,const INT*) )
-DEFINE_UNICOWS_THUNK( shell32, UINT, WINAPI, ExtractIconExW, (LPCWSTR,int,HICON*,HICON*,UINT) )
-DEFINE_UNICOWS_THUNK( shell32, HICON, WINAPI, ExtractIconW, (HINSTANCE,LPCWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( kernel32, void, WINAPI, FatalAppExitW, (UINT,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FillConsoleOutputCharacterW, (HANDLE,WCHAR,DWORD,COORD,PDWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, FindAtomW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, FindFirstChangeNotificationW, (LPCWSTR,BOOL,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, FindFirstFileW, (LPCWSTR,LPWIN32_FIND_DATAW) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FindNextFileW, (HANDLE,LPWIN32_FIND_DATAW) )
-DEFINE_UNICOWS_THUNK( kernel32, HRSRC, WINAPI, FindResourceExW, (HINSTANCE,LPCWSTR,LPCWSTR,WORD) )
-DEFINE_UNICOWS_THUNK( kernel32, HRSRC, WINAPI, FindResourceW, (HINSTANCE,LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( comdlg32, HWND, WINAPI, FindTextW, (LPFINDREPLACEW) )
-DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, FindWindowExW, (HWND,HWND,LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, FindWindowW, (LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, FormatMessageW, (DWORD,PCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FreeEnvironmentStringsW, (LPWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpCreateDirectoryW, (HANDLE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpDeleteFileW, (HANDLE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, FtpFindFirstFileW, (HANDLE,LPCWSTR,LPWIN32_FIND_DATA,DWORD,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpGetCurrentDirectoryW, (HANDLE,LPWSTR,PDWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpRemoveDirectoryW, (HANDLE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpSetCurrentDirectoryW, (HANDLE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetAltTabInfoW, (HWND,int,PALTTABINFO,LPWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetAtomNameW, (ATOM,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetCPInfo, (UINT,LPCPINFO) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetCPInfoExA, (UINT,DWORD,LPCPINFOEXA) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetCPInfoExW, (UINT,DWORD,LPCPINFOEXW) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetCalendarInfoW, (LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetCharABCWidthsW, (HDC,UINT,UINT,LPABC) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetCharWidthFloatW, (HDC,UINT,UINT,PFLOAT) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetCharWidthW, (HDC,UINT,UINT,LPINT) )
-DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetCharacterPlacementW, (HDC,LPCWSTR,int,int,LPGCP_RESULTSW,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetClassInfoExW, (HINSTANCE,LPCWSTR,LPWNDCLASSEXW) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetClassInfoW, (HINSTANCE,LPCWSTR,LPWNDCLASSW) )
-DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetClassLongW, (HWND,int) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetClassNameW, (HWND,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, GetClipboardData, (UINT) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetClipboardFormatNameW, (UINT,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetComputerNameW, (LPWSTR,PDWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetConsoleTitleW, (LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetCurrencyFormatW, (LCID,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetCurrentDirectoryW, (DWORD,LPWSTR) )
-DEFINE_UNICOWS_THUNK( advapi32, BOOL, WINAPI, GetCurrentHwProfileW, (LPHW_PROFILE_INFOW) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetDateFormatW, (LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetDefaultCommConfigW, (LPCWSTR,LPCOMMCONFIG,PDWORD) )
-//DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetDiskFreeSpaceExW, (LPCWSTR,PULARGE_INTEGER,PULARGE_INTEGER,PULARGE_INTEGER) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetDiskFreeSpaceW, (LPCWSTR,PDWORD,PDWORD,PDWORD,PDWORD) )
-DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, GetDlgItemTextW, (HWND,int,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetDriveTypeW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( gdi32, UINT, WINAPI, GetEnhMetaFileDescriptionW, (HENHMETAFILE,UINT,LPWSTR) )
-DEFINE_UNICOWS_THUNK( gdi32, HENHMETAFILE, WINAPI, GetEnhMetaFileW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, GetEnvironmentStringsW, (void) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetEnvironmentVariableW, (LPCWSTR,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetFileAttributesExW, (LPCWSTR,GET_FILEEX_INFO_LEVELS,PVOID) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetFileAttributesW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( comdlg32, short, WINAPI, GetFileTitleW, (LPCWSTR,LPWSTR,WORD) )
-DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, GetFileVersionInfoSizeW, (LPWSTR,PDWORD) )
-DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, GetFileVersionInfoW, (LPWSTR,DWORD,DWORD,PVOID) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetFullPathNameW, (LPCWSTR,DWORD,LPWSTR,LPWSTR*) )
-DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetGlyphOutlineW, (HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetICMProfileW, (HDC,LPDWORD,LPWSTR) )
-DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetKerningPairsW, (HDC,DWORD,LPKERNINGPAIR) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetKeyNameTextW, (LONG,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetKeyboardLayoutNameW, (LPWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetLocaleInfoW, (LCID,LCTYPE,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetLogColorSpaceW, (HCOLORSPACE,LPLOGCOLORSPACEW,DWORD) )
-//DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetLogicalDriveStringsW, (DWORD,LPWSTR) )
-//DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetLongPathNameW, (LPCWSTR,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetMenuItemInfoW, (HMENU,UINT,BOOL,LPMENUITEMINFOW) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetMenuStringW, (HMENU,UINT,LPWSTR,int,UINT) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetMessageW, (LPMSG,HWND,UINT,UINT) )
-DEFINE_UNICOWS_THUNK( gdi32, HMETAFILE, WINAPI, GetMetaFileW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetModuleFileNameW, (HINSTANCE,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, HMODULE, WINAPI, GetModuleHandleW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetMonitorInfoW, (HMONITOR,LPMONITORINFO) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetNamedPipeHandleStateW, (HANDLE,PDWORD,PDWORD,PDWORD,PDWORD,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetNumberFormatW, (LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, GetObjectW, (HGDIOBJ,int,PVOID) )
-DEFINE_UNICOWS_THUNK( msvfw32, BOOL, WINAPI, GetOpenFileNamePreviewW, (LPOPENFILENAMEW) )
-DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, GetOpenFileNameW, (LPOPENFILENAMEW) )
-DEFINE_UNICOWS_THUNK( gdi32, UINT, WINAPI, GetOutlineTextMetricsW, (HDC,UINT,LPOUTLINETEXTMETRICW) )
-DEFINE_UNICOWS_THUNK( winspool, DWORD, WINAPI, GetPrintProcessorDirectoryW, (LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetPrivateProfileIntW, (LPCWSTR,LPCWSTR,INT,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetPrivateProfileSectionNamesW, (LPWSTR,DWORD,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetPrivateProfileSectionW, (LPCWSTR,LPWSTR,DWORD,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetPrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetPrivateProfileStructW, (LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetProfileIntW, (LPCWSTR,LPCWSTR,INT) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetProfileSectionW, (LPCWSTR,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, GetPropA, (HWND,LPCSTR) )
-DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, GetPropW, (HWND,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( oleacc, UINT, WINAPI, GetRoleTextW, (DWORD,LPWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( msvfw32, BOOL, WINAPI, GetSaveFileNamePreviewW, (LPOPENFILENAMEW) )
-DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, GetSaveFileNameW, (LPOPENFILENAMEW) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetShortPathNameW, (LPCWSTR,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, VOID, WINAPI, GetStartupInfoW, (LPSTARTUPINFOW) )
-DEFINE_UNICOWS_THUNK( oleacc, UINT, WINAPI, GetStateTextW, (DWORD,LPWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetStringTypeExW, (LCID,DWORD,LPCWSTR,int,LPWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetStringTypeW, (DWORD,LPCWSTR,int,LPWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemDirectoryW, (LPWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemWindowsDirectoryW, (LPWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetTabbedTextExtentW, (HDC,LPCWSTR,int,int,CONST INT*) )
-DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetTempFileNameW, (LPCWSTR,LPCWSTR,UINT,LPWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetTempPathW, (DWORD,LPWSTR) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentExPointW, ( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE ) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentPoint32W, ( HDC,LPCWSTR,int,LPSIZE) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentPointW, (HDC,LPCWSTR,int,LPSIZE) )
-DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, GetTextFaceW, (HDC,int,LPWSTR) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextMetricsW, (HDC,LPTEXTMETRICW) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetTimeFormatW, (LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( advapi32, BOOL, WINAPI, GetUserNameW, (LPWSTR,PDWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetVersionExW, (LPOSVERSIONINFOW) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetVolumeInformationW, (LPCWSTR,LPWSTR,DWORD,PDWORD,PDWORD,PDWORD,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, GetWindowLongA, (HWND,int) )
-DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, GetWindowLongW, (HWND,int) )
-DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, GetWindowModuleFileNameW, (HWND,LPWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetWindowTextLengthW, (HWND) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetWindowTextW, (HWND,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetWindowsDirectoryW, (LPWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, GlobalAddAtomW, ( LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, GlobalFindAtomW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GlobalGetAtomNameW, (ATOM,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, GopherFindFirstFileW, (HANDLE,LPCWSTR,LPCWSTR,LPVOID,DWORD,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GrayStringW, (HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,int,int,int,int,int) )
-DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, ImageList_LoadImageW, (HINSTANCE,LPCWSTR,int,int,COLORREF,UINT,UINT) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, InsertMenuItemW, (HMENU,UINT,BOOL,LPCMENUITEMINFOW) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, InsertMenuW, (HMENU,UINT,UINT,UINT,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, InternetFindNextFileW, (HANDLE,PVOID) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, IsBadStringPtrW, (LPCWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharAlphaNumericW, (WCHAR) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharAlphaW, (WCHAR) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharLowerW, (WCHAR) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharUpperW, (WCHAR) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsClipboardFormatAvailable, (UINT) )
-DEFINE_UNICOWS_THUNK( sensapi, BOOL, APIENTRY, IsDestinationReachableW, (LPCWSTR,LPVOID) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsDialogMessageW, (HWND,LPMSG) )
-DEFINE_UNICOWS_THUNK( advapi32, BOOL, WINAPI, IsTextUnicode, (PCVOID,int,LPINT) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, IsValidCodePage, (UINT) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsWindowUnicode, (HWND) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, LCMapStringW, (LCID,DWORD,LPCWSTR,int,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( user32, HACCEL, WINAPI, LoadAcceleratorsW, (HINSTANCE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HBITMAP, WINAPI, LoadBitmapW, (HINSTANCE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HCURSOR, WINAPI, LoadCursorFromFileW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HCURSOR, WINAPI, LoadCursorW, (HINSTANCE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HICON, WINAPI, LoadIconW, (HINSTANCE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, LoadImageW, (HINSTANCE,LPCWSTR,UINT,int,int,UINT) )
-DEFINE_UNICOWS_THUNK( user32, HKL, WINAPI, LoadKeyboardLayoutW, (LPCWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( kernel32, HINSTANCE, WINAPI, LoadLibraryExW, (LPCWSTR,HANDLE,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, HINSTANCE, WINAPI, LoadLibraryW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HMENU, WINAPI, LoadMenuIndirectW, (const MENUTEMPLATE*) )
-DEFINE_UNICOWS_THUNK( user32, HMENU, WINAPI, LoadMenuW, (HINSTANCE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, LoadStringW, (HINSTANCE,UINT,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( user32, HINSTANCE, WINAPI, MLLoadLibraryW, (LPCWSTR,HANDLE,DWORD,LPCWSTR,BOOL) )
-DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, MapVirtualKeyExW, (UINT,UINT,HKL) )
-DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, MapVirtualKeyW, (UINT,UINT) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, MessageBoxExW, (HWND,LPCWSTR,LPCWSTR,UINT,WORD) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, MessageBoxIndirectW, (CONST MSGBOXPARAMSW*) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, MessageBoxW, (HWND,LPCWSTR,LPCWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, ModifyMenuW, (HMENU,UINT,UINT,UINT,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, MoveFileW, (LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, MultiByteToWideChar, (UINT,DWORD,LPCSTR,int,LPWSTR,int) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, MultinetGetConnectionPerformanceW, (LPNETRESOURCEW,LPNETCONNECTINFOSTRUCT) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, OemToCharBuffW, (LPCSTR,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, OemToCharW, (LPCSTR,LPWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenEventW, (DWORD,BOOL,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenFileMappingW, (DWORD,BOOL,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenMutexW, (DWORD,BOOL,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, OpenPrinterW, (LPWSTR,PHANDLE,LPPRINTER_DEFAULTSW) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenSemaphoreW, (DWORD,BOOL,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenWaitableTimerW, (DWORD,BOOL,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, void, WINAPI, OutputDebugStringW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, PageSetupDlgW, (LPPAGESETUPDLGW) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, PeekConsoleInputW, (HANDLE,PINPUT_RECORD,DWORD,PDWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, PeekMessageW, (LPMSG,HWND,UINT,UINT,UINT) )
-DEFINE_UNICOWS_THUNK( winmm, BOOL, WINAPI, PlaySoundW, (LPCWSTR,HMODULE,DWORD) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, PolyTextOutW, (HDC,const POLYTEXTW*,int) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, PostMessageW, (HWND,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, PostThreadMessageW, (DWORD,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, PrintDlgW, (LPPRINTDLGW) )
-DEFINE_UNICOWS_THUNK( comdlg32, DWORD, WINAPI, PrinterMessageBoxW, (HANDLE,DWORD,HWND,LPWSTR,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, QueryDosDeviceW, (LPCWSTR,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasConnectionNotificationW, (HANDLE, HANDLE, DWORD) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasCreatePhonebookEntryW, (HWND, LPCWSTR) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasDeleteEntryW, (LPCWSTR, LPCWSTR) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasDeleteSubEntryW, (LPCWSTR, LPCWSTR, DWORD) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEditPhonebookEntryW, (HWND, LPCWSTR, LPCWSTR) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEnumConnectionsW, (LPVOID, LPDWORD, LPDWORD) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEnumDevicesW, (LPVOID, LPDWORD, LPDWORD) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEnumEntriesW, (LPCWSTR, LPCWSTR, LPVOID, LPDWORD, LPDWORD) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetConnectStatusW, (HANDLE, LPVOID) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetEntryDialParamsW, (LPCWSTR, LPVOID, LPBOOL) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetEntryPropertiesW, (LPCWSTR, LPCWSTR, LPVOID, LPDWORD, LPBYTE, LPDWORD) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetErrorStringW, (UINT, LPWSTR, DWORD) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasHangUpW, (HANDLE) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasRenameEntryW, (LPCWSTR, LPCWSTR, LPCWSTR) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasSetEntryDialParamsW, (LPCWSTR, LPVOID, BOOL) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasSetEntryPropertiesW, (LPCWSTR, LPCWSTR, LPVOID, DWORD, LPBYTE, DWORD) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasSetSubEntryPropertiesW, (LPCWSTR, LPCWSTR, DWORD, LPVOID, DWORD, LPBYTE, DWORD) )
-DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasValidateEntryNameW, (LPCWSTR, LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleInputW, (HANDLE,PINPUT_RECORD,DWORD,PDWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleOutputCharacterW, (HANDLE,LPWSTR,DWORD,COORD,PDWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleOutputW, (HANDLE,PCHAR_INFO,COORD,COORD,PSMALL_RECT) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleW, (HANDLE,PVOID,DWORD,PDWORD,PVOID) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegConnectRegistryW, (LPCWSTR,HKEY,PHKEY) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegCreateKeyExW, (HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,PDWORD) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegCreateKeyW, (HKEY,LPCWSTR,PHKEY) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegDeleteKeyW, (HKEY,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegDeleteValueW, (HKEY,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegEnumKeyExW, (HKEY,DWORD,LPWSTR,PDWORD,PDWORD,LPWSTR,PDWORD,PFILETIME) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegEnumKeyW, (HKEY,DWORD,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegEnumValueW, (HKEY,DWORD,LPWSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegLoadKeyW, (HKEY,LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegOpenKeyExW, (HKEY,LPCWSTR,DWORD,REGSAM,PHKEY) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegOpenKeyW, (HKEY,LPCWSTR,PHKEY) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryInfoKeyW, (HKEY,LPWSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryMultipleValuesW, (HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryValueExW, (HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryValueW, (HKEY,LPCWSTR,LPWSTR,PLONG) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegReplaceKeyW, (HKEY,LPCWSTR,LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegSaveKeyW, (HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegSetValueExW, (HKEY,LPCWSTR,DWORD,DWORD,const BYTE*,DWORD) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegSetValueW, (HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegUnLoadKeyW, (HKEY,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, ATOM, WINAPI, RegisterClassExW, (CONST WNDCLASSEXW*) )
-DEFINE_UNICOWS_THUNK( user32, ATOM, WINAPI, RegisterClassW, (CONST WNDCLASSW*) )
-DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, RegisterClipboardFormatW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HDEVNOTIFY, WINAPI, RegisterDeviceNotificationW, (HANDLE,LPVOID,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, RegisterWindowMessageW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, RemoveDirectoryW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, RemoveFontResourceW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, RemovePropA, (HWND,LPCSTR) )
-DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, RemovePropW, (HWND,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( comdlg32, HWND, WINAPI, ReplaceTextW, (LPFINDREPLACEW) )
-DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, ResetDCW, (HDC,const DEVMODEW*) )
-DEFINE_UNICOWS_THUNK( shell32, LPVOID, WINAPI, SHBrowseForFolderW, (LPVOID) )
-DEFINE_UNICOWS_THUNK( shell32, void, WINAPI, SHChangeNotify, (LONG,UINT,PCVOID,PCVOID) )
-DEFINE_UNICOWS_THUNK( shell32, INT, WINAPI, SHCreateDirectoryExW, (HWND,LPCWSTR,LPSECURITY_ATTRIBUTES) )
-DEFINE_UNICOWS_THUNK( shell32, int, WINAPI, SHFileOperationW, (LPSHFILEOPSTRUCTW) )
-DEFINE_UNICOWS_THUNK( shell32, DWORD, WINAPI, SHGetFileInfoW, (LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT) )
-DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, SHGetNewLinkInfoW, (LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT) )
-DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, SHGetPathFromIDListW, (LPVOID,LPWSTR) )
-DEFINE_UNICOWS_THUNK( shell32, int, __stdcall, SQLGetPrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,int,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( shell32, BOOL, __stdcall, SQLWritePrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ScrollConsoleScreenBufferW, (HANDLE,const SMALL_RECT*,const SMALL_RECT*,COORD,const CHAR_INFO*) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, SearchPathW, (LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*) )
-DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, SendDlgItemMessageW, (HWND,int,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SendMessageCallbackW, (HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, SendMessageTimeoutW, (HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD) )
-DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, SendMessageW, (HWND,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SendNotifyMessageW, (HWND,UINT,WPARAM,LPARAM) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, SetCalendarInfoW, (LCID,CALID,CALTYPE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, SetClassLongW, (HWND,int,LONG) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetComputerNameW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetConsoleTitleW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetCurrentDirectoryW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetDefaultCommConfigW, (LPCWSTR,LPCOMMCONFIG,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetDlgItemTextW, (HWND,int,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetEnvironmentVariableW, (LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetFileAttributesW, (LPCWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, SetICMProfileW, (HDC,LPWSTR) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, SetJobW, (HANDLE,DWORD,DWORD,PBYTE,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetLocaleInfoW, (LCID,LCTYPE,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetMenuItemInfoW, ( HMENU,UINT,BOOL,LPCMENUITEMINFOW) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, SetPrinterDataW, (HANDLE,LPWSTR,DWORD,PBYTE,DWORD) )
-DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, SetPrinterW, (HANDLE,DWORD,PBYTE,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetPropA, (HWND,LPCSTR,HANDLE) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetPropW, (HWND,LPCWSTR,HANDLE) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetVolumeLabelW, (LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, SetWindowLongA, (HWND,int,LONG) )
-DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, SetWindowLongW, (HWND,int,LONG) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetWindowTextW, (HWND,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( user32, HHOOK, WINAPI, SetWindowsHookExW, (int,HOOKPROC,HINSTANCE,DWORD) )
-DEFINE_UNICOWS_THUNK( user32, HHOOK, WINAPI, SetWindowsHookW, (int,HOOKPROC) )
-DEFINE_UNICOWS_THUNK( shell32, int, WINAPI, ShellAboutW, (HWND,LPCWSTR,LPCWSTR,HICON) )
-DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, ShellExecuteExW, (LPSHELLEXECUTEINFOW) )
-DEFINE_UNICOWS_THUNK( shell32, HINSTANCE, WINAPI, ShellExecuteW, (HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT) )
-DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, Shell_NotifyIconW, (DWORD,PNOTIFYICONDATAW) )
-DEFINE_UNICOWS_THUNK( winspool, DWORD, WINAPI, StartDocPrinterW, (HANDLE,DWORD,PBYTE) )
-DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, StartDocW, (HDC,const DOCINFOW*) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SystemParametersInfoW, (UINT,UINT,PVOID,UINT) )
-DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, TabbedTextOutW, (HDC,int,int,LPCWSTR,int,int,CONST INT*,int) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, TextOutW, (HDC,int,int,LPCWSTR,int) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, TranslateAcceleratorW, (HWND,HACCEL,LPMSG) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, UnregisterClassW, (LPCWSTR,HINSTANCE) )
-DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, UpdateICMRegKeyW, (DWORD,LPWSTR,LPWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, UpdateResourceW, (HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD) )
-DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerFindFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT) )
-DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerInstallFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT) )
-DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, VerLanguageNameW, (DWORD,LPWSTR,DWORD) )
-#if ( __W32API_MAJOR_VERSION > 3 ) || ( __W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION > 13 )
-DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, VerQueryValueW, (const LPVOID,LPCWSTR,LPVOID*,PUINT) )
-#else 
-DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, VerQueryValueW, (const LPVOID,LPWSTR,LPVOID*,PUINT) )
-#endif
-DEFINE_UNICOWS_THUNK( user32, SHORT, WINAPI, VkKeyScanExW, (WCHAR,HKL) )
-DEFINE_UNICOWS_THUNK( user32, SHORT, WINAPI, VkKeyScanW, (WCHAR) )
-DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, SetupDecompressOrCopyFileW, (PCWSTR,PCWSTR,PUINT) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetAddConnection2W, (LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetAddConnection3W, (HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetAddConnectionW, (LPCWSTR,LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetCancelConnection2W, (LPCWSTR,DWORD,BOOL) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetCancelConnectionW, (LPCWSTR,BOOL) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetConnectionDialog1W, (LPCONNECTDLGSTRUCTW) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetDisconnectDialog1W, (LPDISCDLGSTRUCTW) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetEnumResourceW, (HANDLE,PDWORD,PVOID,PDWORD) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetConnectionW, (LPCWSTR,LPWSTR,PDWORD) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetLastErrorW, (PDWORD,LPWSTR,DWORD,LPWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetNetworkInformationW, (LPCWSTR,LPNETINFOSTRUCT) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetProviderNameW, (DWORD,LPWSTR,PDWORD) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetResourceInformationW, (LPNETRESOURCEW,LPVOID,LPDWORD,LPWSTR*) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetResourceParentW, (LPNETRESOURCEW,LPVOID,LPDWORD) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetUniversalNameW, (LPCWSTR,DWORD,PVOID,PDWORD) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetUserW, (LPCWSTR,LPWSTR,PDWORD) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetOpenEnumW, (DWORD,DWORD,DWORD,LPNETRESOURCEW,LPHANDLE) )
-DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetUseConnectionW, (HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD,LPWSTR,PDWORD,PDWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WaitNamedPipeW, (LPCWSTR,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, WideCharToMultiByte, (UINT,DWORD,LPCWSTR,int,LPSTR,int,LPCSTR,LPBOOL) )
-DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, WinHelpW, (HWND,LPCWSTR,UINT,DWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleInputW, (HANDLE,const INPUT_RECORD*,DWORD,PDWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleOutputCharacterW, (HANDLE,LPCWSTR,DWORD,COORD,PDWORD) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleOutputW, (HANDLE,const CHAR_INFO*,COORD,COORD,PSMALL_RECT) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleW, (HANDLE,PCVOID,DWORD,PDWORD,PVOID) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WritePrivateProfileSectionW, (LPCWSTR,LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WritePrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WritePrivateProfileStructW, (LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteProfileSectionW, (LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( avicap32, HWND, WINAPI, capCreateCaptureWindowW, (LPCWSTR, DWORD, int, int, int, int, HWND, int) )
-DEFINE_UNICOWS_THUNK( avicap32, BOOL, WINAPI, capGetDriverDescriptionW, (UINT, LPWSTR, int, LPWSTR, int) )
-DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, lstrcatW, (LPWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, lstrcmpW, (LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, lstrcmpiW, ( LPCWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, lstrcpyW, (LPWSTR,LPCWSTR) )
-DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, lstrcpynW, (LPWSTR,LPCWSTR,int) )
-DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, lstrlenW, (LPCWSTR) )
-DEFINE_UNICOWS_THUNK( winmm, BOOL, WINAPI, sndPlaySoundW, (LPCWSTR,UINT) )
-DEFINE_UNICOWS_THUNK( winmm, PROC, WINAPI, wglGetProcAddress, (LPCSTR) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPIV, wsprintfW, (LPWSTR,LPCWSTR,...) )
-DEFINE_UNICOWS_THUNK( user32, int, WINAPI, wvsprintfW, (LPWSTR,LPCWSTR,va_list arglist) )
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp b/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp
deleted file mode 100644
index 1ca6733a6..000000000
--- a/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
-#endif
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( shell32, TRYLOAD, HRESULT, WINAPI, SHCreateItemFromParsingName, (PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp b/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp
deleted file mode 100644
index 5441eb3b8..000000000
--- a/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "uwinapi.h"
-
-EXTERN_C LPITEMIDLIST WINAPI SHSimpleIDListFromPathW_Failure( LPCWSTR lpPathW )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return NULL;
-}
-
-EXTERN_C LPITEMIDLIST WINAPI SHSimpleIDListFromPathW_WINDOWS( LPCWSTR lpPathW )
-{
-    AUTO_WSTR2STR( lpPath );
-
-    return SHSimpleIDListFromPathA( lpPathA );
-}
-
-
-EXTERN_C void WINAPI ResolveThunk_SHSimpleIDListFromPathW( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName )
-{
-    if ( (LONG)GetVersion < 0 )
-        *lppfn = (FARPROC)SHSimpleIDListFromPathW_WINDOWS;
-    else
-    {
-        FARPROC	lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), MAKEINTRESOURCE(162) );
-        if ( !lpfnResult )
-            lpfnResult = (FARPROC)SHSimpleIDListFromPathW_Failure;
-
-        *lppfn = lpfnResult;
-    }
-}
-
-
-DEFINE_CUSTOM_THUNK( kernel32, GetLongPathNameW, DWORD, WINAPI, GetLongPathNameW, ( LPCWSTR lpShortPathW, LPWSTR lpLongPathW, DWORD cchBuffer ) );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp
deleted file mode 100644
index efe640874..000000000
--- a/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, SetVolumeMountPointA, (LPCSTR lpszVolumeMountPoint, LPCSTR lpszVolumeName) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp
deleted file mode 100644
index 5d2ff95e8..000000000
--- a/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, SetVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint, LPCWSTR lpszVolumeName) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/Uwinapi.def b/sal/systools/win32/uwinapi/Uwinapi.def
deleted file mode 100644
index 58893d5a5..000000000
--- a/sal/systools/win32/uwinapi/Uwinapi.def
+++ /dev/null
@@ -1,22 +0,0 @@
-EXPORTS

-	CommandLineToArgvW

-	CopyFileW

-	CopyFileExW

-	CopyFileExA

-	DeleteFileW

-	DrawStateW

-	GetLogicalDriveStringsW

-	GetLongPathNameA

-	GetLongPathNameW

-	LoadLibraryExW

-	LoadLibraryW

-	MoveFileExA

-	MoveFileExW

-	MoveFileW

-	GetVersion

-	DllGetVersion

-	lstrrchrA

-	lstrrchrW

-	lstrchrA

-	lstrchrW

-

diff --git a/sal/systools/win32/uwinapi/Uwinapi.h b/sal/systools/win32/uwinapi/Uwinapi.h
deleted file mode 100644
index 5a1db0e87..000000000
--- a/sal/systools/win32/uwinapi/Uwinapi.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#pragma once
-
-#ifdef _UWINAPI_
-#define _KERNEL32_
-#define _USER32_
-#define _SHELL32_
-#endif
-
-#include <windows.h>
-#include <malloc.h>
-
-#ifndef _UWINAPI_
-EXTERN_C WINBASEAPI DWORD UWINAPI_dwFakedVersion;
-#endif
-
-EXTERN_C WINBASEAPI DWORD SetVersion( DWORD dwVersion );
-
-/* Version macros */
-
-#define MAKE_VER_WIN32( major, minor, build, isWindows ) \
-((DWORD)MAKELONG( MAKEWORD( major, minor ), (build) | ( isWindows ? 0x8000 : 0 ) ))
-
-#define MAKE_VER_WIN32_NT( major, minor, build ) \
-    MAKE_VER_WIN32( major, minor, build, FALSE )
-
-#define MAKE_VER_WIN32_WINDOWS( major, minor, build ) \
-    MAKE_VER_WIN32( major, minor, build, TRUE )
-
-#define VER_WIN32_WINDOWS_95	MAKE_VER_WIN32_WINDOWS( 4, 0, 0 )
-#define VER_WIN32_WINDOWS_98	MAKE_VER_WIN32_WINDOWS( 4, 10, 0 )
-#define VER_WIN32_WINDOWS_ME	MAKE_VER_WIN32_WINDOWS( 4, 90, 0 )
-#define VER_WIN32_NT_NT4		MAKE_VER_WIN32_NT( 4, 0, 0 )
-#define VER_WIN32_NT_2000		MAKE_VER_WIN32_NT( 5, 0, 0 )
-#define VER_WIN32_NT_XP			MAKE_VER_WIN32_NT( 5, 1, 0 )
-
-
-EXTERN_C WINBASEAPI LPSTR WINAPI lstrchrA( LPCSTR lpString, CHAR c );
-EXTERN_C WINBASEAPI LPWSTR WINAPI lstrchrW( LPCWSTR lpString, WCHAR c );
-EXTERN_C WINBASEAPI LPSTR WINAPI lstrrchrA( LPCSTR lpString, CHAR c );
-EXTERN_C WINBASEAPI LPWSTR WINAPI lstrrchrW( LPCWSTR lpString, WCHAR c );
-
-#ifdef UNICODE
-#define lstrrchr	lstrrchrW
-#define lstrchr		lstrchrW
-#else
-#define lstrrchr	lstrrchrA
-#define lstrchr		lstrchrA
-#endif
-
-#define IsValidHandle(Handle)	((DWORD)(Handle) + 1 > 1)
-
-#ifdef __cplusplus
-
-#define _AUTO_WSTR2STR( lpStrA, lpStrW ) \
-LPSTR	lpStrA; \
-if ( lpStrW ) \
-{ \
-    int	cNeeded = WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, NULL, 0, NULL, NULL ); \
-    lpStrA = (LPSTR)_alloca( cNeeded * sizeof(CHAR) ); \
-    WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, lpStrA, cNeeded, NULL, NULL ); \
-} \
-else \
-    lpStrA = NULL;
-
-
-#define AUTO_WSTR2STR( lpStr ) \
-    _AUTO_WSTR2STR( lpStr##A, lpStr##W )
-
-#define AUTO_STR( lpStr, cchBuffer ) \
-LPSTR	lpStr##A = lpStr##W ? (LPSTR)_alloca( (cchBuffer) * sizeof(CHAR) ) : NULL;
-
-#endif	// __cplusplus
-
-#define STRBUF2WSTR( lpStr, cchSrcBuffer, cchDestBuffer ) \
-    MultiByteToWideChar( CP_ACP, 0, lpStr##A, cchSrcBuffer, lpStr##W, cchDestBuffer )
-
-#define STR2WSTR( lpStr, cchBuffer ) \
-    STRBUF2WSTR( lpStr, -1, cchBuffer )
-
-#define WSTR2STR( lpStr, cchBuffer ) \
-    WideCharToMultiByte( CP_ACP, 0, lpStr##W, -1, lpStr##A, cchBuffer, NULL, NULL )
-
-EXTERN_C void WINAPI ResolveThunk_WINDOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure );
-EXTERN_C void WINAPI ResolveThunk_TRYLOAD( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure );
-EXTERN_C void WINAPI ResolveThunk_ALLWAYS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure );
-
-
-
-
-#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
-EXTERN_C rettype calltype func##_##resolve params; \
-static rettype calltype func##_##Failure params; \
-static _declspec ( naked ) func##_Thunk() \
-{ \
-    ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \
-    _asm	jmp	[module##_##func##_Ptr] \
-} \
-EXTERN_C _declspec( naked ) rettype calltype func params \
-{ \
-    _asm	jmp	[module##_##func##_Ptr] \
-} \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
-static rettype calltype func##_##Failure params \
-{ \
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
-    return (rettype)0; \
-} \
-EXTERN_C rettype calltype func##_##resolve params
-
-
-
-
-
-
-
-
-
-
-
-#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
-static _declspec ( naked ) func##_Thunk() \
-{ \
-    ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \
-    _asm	jmp	[module##_##func##_Ptr] \
-} \
-EXTERN_C _declspec( naked ) rettype calltype func params \
-{ \
-    _asm	jmp	[module##_##func##_Ptr] \
-} \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/macros.h b/sal/systools/win32/uwinapi/macros.h
deleted file mode 100644
index 2d253c413..000000000
--- a/sal/systools/win32/uwinapi/macros.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define _UWINAPI_
-#include <systools/win32/uwinapi.h>
-
-#ifndef _INC_MALLOC
-#	include <malloc.h>
-#endif
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
-#endif
-
-#ifndef _INC_TCHAR
-#	ifdef UNICODE
-#		define _UNICODE
-#	endif
-#	include <TCHAR.H>
-#endif
-
-// Globally disable "warning C4100: unreferenced formal parameter" caused by
-// IMPLEMENT_THUNK:
-#ifdef _MSC_VER
-#pragma warning(disable:4100)
-#endif
-
-/* Version macros */
-
-#define MAKE_VER_WIN32( major, minor, build, isWindows ) \
-((DWORD)MAKELONG( MAKEWORD( major, minor ), (build) | ( isWindows ? 0x8000 : 0 ) ))
-
-#define MAKE_VER_WIN32_NT( major, minor, build ) \
-    MAKE_VER_WIN32( major, minor, build, FALSE )
-
-#define MAKE_VER_WIN32_WINDOWS( major, minor, build ) \
-    MAKE_VER_WIN32( major, minor, build, TRUE )
-
-#define VER_WIN32_WINDOWS_95	MAKE_VER_WIN32_WINDOWS( 4, 0, 0 )
-#define VER_WIN32_WINDOWS_98	MAKE_VER_WIN32_WINDOWS( 4, 10, 0 )
-#define VER_WIN32_WINDOWS_ME	MAKE_VER_WIN32_WINDOWS( 4, 90, 0 )
-#define VER_WIN32_NT_NT4		MAKE_VER_WIN32_NT( 4, 0, 0 )
-#define VER_WIN32_NT_2000		MAKE_VER_WIN32_NT( 5, 0, 0 )
-#define VER_WIN32_NT_XP			MAKE_VER_WIN32_NT( 5, 1, 0 )
-
-
-#ifdef __cplusplus
-
-#define _AUTO_WSTR2STR( lpStrA, lpStrW ) \
-LPSTR	lpStrA; \
-if ( lpStrW ) \
-{ \
-    int	cNeeded = WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, NULL, 0, NULL, NULL ); \
-    lpStrA = (LPSTR)_alloca( cNeeded * sizeof(CHAR) ); \
-    WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, lpStrA, cNeeded, NULL, NULL ); \
-} \
-else \
-    lpStrA = NULL;
-
-
-#define AUTO_WSTR2STR( lpStr ) \
-    _AUTO_WSTR2STR( lpStr##A, lpStr##W )
-
-#define AUTO_STR( lpStr, cchBuffer ) \
-LPSTR	lpStr##A = lpStr##W ? (LPSTR)_alloca( (cchBuffer) * sizeof(CHAR) ) : NULL;
-
-#endif	/* __cplusplus */
-
-
-#define STRBUF2WSTR( lpStr, cchSrcBuffer, cchDestBuffer ) \
-    MultiByteToWideChar( CP_ACP, 0, lpStr##A, cchSrcBuffer, lpStr##W, (int) cchDestBuffer )
-
-#define STR2WSTR( lpStr, cchBuffer ) \
-    STRBUF2WSTR( lpStr, -1, cchBuffer )
-
-#define WSTR2STR( lpStr, cchBuffer ) \
-    WideCharToMultiByte( CP_ACP, 0, lpStr##W, -1, lpStr##A, cchBuffer, NULL, NULL )
-
-EXTERN_C void WINAPI ResolveThunk_WINDOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure );
-EXTERN_C void WINAPI ResolveThunk_TRYLOAD( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure );
-EXTERN_C void WINAPI ResolveThunk_ALLWAYS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure );
-
-
-
-
-#ifdef __MINGW32__
-#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
-static void func##_Thunk(); \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
-EXTERN_C rettype calltype func params \
-{ \
-    asm("	popl	%ebp"); \
-    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
-} \
-EXTERN_C rettype calltype func##_##resolve params; \
-static rettype calltype func##_##Failure params; \
-static void func##_Thunk() \
-{ \
-    ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \
-    asm("	movl	%ebp, %esp"); \
-    asm("	popl	%ebp"); \
-    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
-} \
-static rettype calltype func##_##Failure params \
-{ \
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
-    return (rettype)0; \
-} \
-EXTERN_C rettype calltype func##_##resolve params
-#else
-#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
-EXTERN_C rettype calltype func##_##resolve params; \
-static rettype calltype func##_##Failure params; \
-static _declspec ( naked ) void func##_Thunk() \
-{ \
-    ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \
-    _asm	jmp	[module##_##func##_Ptr] \
-} \
-EXTERN_C _declspec( naked ) rettype calltype func params \
-{ \
-    _asm	jmp	[module##_##func##_Ptr] \
-} \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
-static rettype calltype func##_##Failure params \
-{ \
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
-    return (rettype)0; \
-} \
-EXTERN_C rettype calltype func##_##resolve params
-#endif
-
-
-
-#ifdef __MINGW32__
-#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
-static void func##_Thunk(); \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
-static void func##_Thunk() \
-{ \
-    ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \
-    asm("	movl	%ebp, %esp"); \
-    asm("	popl	%ebp"); \
-    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
-} \
-EXTERN_C rettype calltype func params \
-{ \
-    asm("	popl	%ebp"); \
-    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
-}
-#else
-#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
-static _declspec ( naked ) void func##_Thunk() \
-{ \
-    ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \
-    _asm	jmp	[module##_##func##_Ptr] \
-} \
-EXTERN_C _declspec( naked ) rettype calltype func params \
-{ \
-    _asm	jmp	[module##_##func##_Ptr] \
-} \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;
-#endif
-
-
-#ifdef __MINGW32__
-#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \
-static void func##_Thunk(); \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
-static rettype calltype func##_##Failure params; \
-static _declspec ( naked ) void func##_Thunk() \
-{ \
-    ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \
-    asm("	movl	%ebp, %esp"); \
-    asm("	popl	%ebp"); \
-    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
-} \
-EXTERN_C _declspec( naked ) rettype calltype func params \
-{ \
-    asm("	popl	%ebp"); \
-    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
-} \
-static rettype calltype func##_##Failure params \
-{ \
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
-    return (rettype)0; \
-}
-#else
-#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
-static rettype calltype func##_##Failure params; \
-static _declspec ( naked ) void func##_Thunk() \
-{ \
-    ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \
-    _asm	jmp	[module##_##func##_Ptr] \
-} \
-EXTERN_C _declspec( naked ) rettype calltype func params \
-{ \
-    _asm	jmp	[module##_##func##_Ptr] \
-} \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
-static rettype calltype func##_##Failure params \
-{ \
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
-    return (rettype)0; \
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk
index 1d7e7580c..0989b6121 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -47,69 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
 CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
 .ENDIF
 
-SLOFILES=
-
-.IF "$(CPU)"=="I"
-
-SLOFILES+=\
-        $(SLO)$/CheckTokenMembership.obj\
-        $(SLO)$/CommandLineToArgvW.obj\
-        $(SLO)$/CopyFileExA.obj\
-        $(SLO)$/CopyFileExW.obj\
-        $(SLO)$/DrawStateW.obj\
-        $(SLO)$/EnumProcesses.obj\
-        $(SLO)$/GetLogicalDriveStringsW.obj\
-        $(SLO)$/GetLongPathNameA.obj\
-        $(SLO)$/GetLongPathNameW.obj\
-        $(SLO)$/GetModuleFileNameExA.obj\
-        $(SLO)$/GetModuleFileNameExW.obj\
-        $(SLO)$/GetProcessId.obj\
-        $(SLO)$/GetUserDefaultUILanguage.obj\
-        $(SLO)$/GetUserDomainA.obj\
-        $(SLO)$/GetUserDomainW.obj\
-        $(SLO)$/GetDiskFreeSpaceExA.obj\
-        $(SLO)$/GetDiskFreeSpaceExW.obj\
-        $(SLO)$/MoveFileExA.obj\
-        $(SLO)$/MoveFileExW.obj\
-        $(SLO)$/toolhelp.obj\
-        $(SLO)$/DllGetVersion.obj\
-        $(SLO)$/DllMain.obj\
-        $(SLO)$/ResolveThunk.obj\
-        $(SLO)$/ResolveUnicows.obj\
-        $(SLO)$/FindFirstVolumeA.obj\
-        $(SLO)$/FindFirstVolumeW.obj\
-        $(SLO)$/FindNextVolumeA.obj\
-        $(SLO)$/FindNextVolumeW.obj\
-        $(SLO)$/FindVolumeClose.obj\
-        $(SLO)$/FindFirstVolumeMountPointA.obj\
-        $(SLO)$/FindFirstVolumeMountPointW.obj\
-        $(SLO)$/FindNextVolumeMountPointA.obj\
-        $(SLO)$/FindNextVolumeMountPointW.obj\
-        $(SLO)$/FindVolumeMountPointClose.obj\
-        $(SLO)$/GetVolumeNameForVolumeMountPointA.obj\
-        $(SLO)$/GetVolumeNameForVolumeMountPointW.obj\
-        $(SLO)$/DeleteVolumeMountPointA.obj\
-        $(SLO)$/DeleteVolumeMountPointW.obj\
-        $(SLO)$/GetVolumePathNameA.obj\
-        $(SLO)$/GetVolumePathNameW.obj\
-        $(SLO)$/SetVolumeMountPointA.obj\
-        $(SLO)$/SetVolumeMountPointW.obj\
-        $(SLO)$/PathAddBackslashW.obj\
-        $(SLO)$/PathCompactPathExW.obj\
-        $(SLO)$/PathFileExistsW.obj\
-        $(SLO)$/PathFindExtensionW.obj\
-        $(SLO)$/PathFindFileNameW.obj\
-        $(SLO)$/PathIsFileSpecW.obj\
-        $(SLO)$/PathIsUNCW.obj\
-        $(SLO)$/PathRemoveExtensionW.obj\
-        $(SLO)$/PathRemoveFileSpecW.obj\
-        $(SLO)$/PathSetDlgItemPathW.obj\
-        $(SLO)$/PathStripToRootW.obj\
-        $(SLO)$/SHCreateItemFromParsingName.obj
-
-.ENDIF
-
-SLOFILES+=\
+SLOFILES=\
         $(SLO)$/snprintf.obj\
         $(SLO)$/snwprintf.obj
 
@@ -145,11 +83,4 @@ SHL1STDLIBS+=\
 
 .ENDIF
 
-.IF "$(COM)"=="GCC"
-ALL: ALLTAR $(LB)$/libuwinapi.a
-
-$(LB)$/libuwinapi.a: $(MISC)$/uwinapi.def
-    dlltool --dllname uwinapi.dll --input-def=$(MISC)$/uwinapi.def --kill-at --output-lib=$(LB)$/libuwinapi.a
-.ENDIF
-
 .INCLUDE : target.mk
diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c
index 534f76336..b5316f022 100644
--- a/sal/systools/win32/uwinapi/sntprintf.c
+++ b/sal/systools/win32/uwinapi/sntprintf.c
@@ -4,6 +4,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#ifdef __MINGW32__
+/* MinGW-w64 doesn't have a _tcsinc() inline or library function */
+#define _MB_MAP_DIRECT
+#endif
 #include <tchar.h>
 #include <systools/win32/snprintf.h>
 
diff --git a/sal/systools/win32/uwinapi/toolhelp.cpp b/sal/systools/win32/uwinapi/toolhelp.cpp
deleted file mode 100644
index 411b6a2b6..000000000
--- a/sal/systools/win32/uwinapi/toolhelp.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "macros.h"
-#include <tlhelp32.h>
-
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Module32First, (HANDLE hSnapshot, LPMODULEENTRY32 lpme ) )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
-}
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Module32FirstW, (HANDLE hSnapshot, LPMODULEENTRY32W lpme ) )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
-}
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Module32Next, (HANDLE hSnapshot, LPMODULEENTRY32 lpme ) )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
-}
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Module32NextW, (HANDLE hSnapshot, LPMODULEENTRY32W lpme ) )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
-}
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Process32First, (HANDLE hSnapshot, LPPROCESSENTRY32 lppe ) )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
-}
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Process32FirstW, (HANDLE hSnapshot, LPPROCESSENTRY32W lppe ) )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
-}
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Process32Next, (HANDLE hSnapshot, LPPROCESSENTRY32 lppe ) )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
-}
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Process32NextW, (HANDLE hSnapshot, LPPROCESSENTRY32W lppe ) )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
-}
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, CreateToolhelp32Snapshot, (DWORD dwFlags, DWORD th32ProcessID ) )
-{
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return NULL;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/unicows.dxp b/sal/systools/win32/uwinapi/unicows.dxp
deleted file mode 100644
index 771782a76..000000000
--- a/sal/systools/win32/uwinapi/unicows.dxp
+++ /dev/null
@@ -1,546 +0,0 @@
-;*************************************************************************
-;
-; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-; 
-; Copyright 2000, 2010 Oracle and/or its affiliates.
-;
-; OpenOffice.org - a multi-platform office productivity suite
-;
-; This file is part of OpenOffice.org.
-;
-; OpenOffice.org is free software: you can redistribute it and/or modify
-; it under the terms of the GNU Lesser General Public License version 3
-; only, as published by the Free Software Foundation.
-;
-; OpenOffice.org is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU Lesser General Public License version 3 for more details
-; (a copy is included in the LICENSE file that accompanied this code).
-;
-; You should have received a copy of the GNU Lesser General Public License
-; version 3 along with OpenOffice.org.  If not, see
-; <http://www.openoffice.org/license.html>
-; for a copy of the LGPLv3 License.
-;
-;*************************************************************************
-;
-; Functions that are exported but not implemented by unicows.dll
-; are only inserted as comment.
-;
-; In addition to MSDN Platform SDK documentation the following functions
-; are not implemented too:
-; AddMonitorW, FreeContextBufferW, GetPrinterDriverDirectoryW,
-; MCIWndCreateW
-;
-; The following functions of unicows.dll are buggy:
-; DrawStateW, GetLogicalDriveStringsW (both implemented in uwinapi.dll)
-;
-; The following functions of unicows.dll are wrapped but the ANSI versions
-; do not exist on Win9x so the wrapper is useless:
-; MoveFileExW, CopyFileExW (both implemented in uwinapi.dll along with the
-; ANSI versions )
-;
-; These functions do not exist on Win 95 and NT neither as Unicode
-; nor as ANSI version, so the wrapper will fail on NT4 and Win 95
-; GetLongPathNameW ( implemented in uwinapi.dll along with the
-; ANSI version )
-;
-; These essential functions aren't implemented by unicows.dll because
-; there's no ANSI version:
-; CommandLineToArgvW (implemented by uwinapi.dll)
-;
-;*************************************************************************
-
-;AcquireCredentialsHandleW
-AddAtomW
-AddFontResourceW
-AddJobW
-;AddMonitorW
-AddPortW
-AddPrintProcessorW
-AddPrintProvidorW
-AddPrinterDriverW
-AddPrinterW
-AdvancedDocumentPropertiesW
-AppendMenuW
-BeginUpdateResourceW
-BroadcastSystemMessageW
-BuildCommDCBAndTimeoutsW
-BuildCommDCBW
-CallMsgFilterW
-CallNamedPipeW
-CallWindowProcA
-CallWindowProcW
-ChangeDisplaySettingsExW
-ChangeDisplaySettingsW
-ChangeMenuW
-CharLowerBuffW
-CharLowerW
-CharNextW
-CharPrevW
-CharToOemBuffW
-CharToOemW
-CharUpperBuffW
-CharUpperW
-ChooseColorW
-ChooseFontW
-CommConfigDialogW
-CompareStringW
-ConfigurePortW
-CopyAcceleratorTableW
-CopyEnhMetaFileW
-CopyFileExW
-CopyFileW
-CopyMetaFileW
-CreateAcceleratorTableW
-CreateColorSpaceW
-CreateDCW
-CreateDialogIndirectParamW
-CreateDialogParamW
-CreateDirectoryExW
-CreateDirectoryW
-CreateEnhMetaFileW
-CreateEventW
-CreateFileMappingW
-CreateFileW
-CreateFontIndirectW
-CreateFontW
-CreateICW
-CreateMDIWindowW
-CreateMailslotW
-CreateMetaFileW
-CreateMutexW
-;CreateNamedPipeW
-CreateProcessW
-CreateScalableFontResourceW
-CreateSemaphoreW
-CreateStdAccessibleProxyW
-CreateWaitableTimerW
-CreateWindowExW
-DdeConnect
-DdeConnectList
-DdeCreateStringHandleW
-DdeInitializeW
-DdeQueryConvInfo
-DdeQueryStringW
-DefDlgProcW
-DefFrameProcW
-DefMDIChildProcW
-DefWindowProcW
-DeleteFileW
-DeleteMonitorW
-DeletePortW
-DeletePrintProcessorW
-DeletePrintProvidorW
-DeletePrinterDriverW
-;DeviceCapabilitiesW
-DialogBoxIndirectParamW
-DialogBoxParamW
-DispatchMessageW
-DlgDirListComboBoxW
-DlgDirListW
-DlgDirSelectComboBoxExW
-DlgDirSelectExW
-;DocumentPropertiesW
-DragQueryFileW
-DrawStateW
-DrawTextExW
-DrawTextW
-EnableWindow
-EndUpdateResourceW
-EnumCalendarInfoExW
-EnumCalendarInfoW
-EnumClipboardFormats
-EnumDateFormatsExW
-EnumDateFormatsW
-EnumDisplayDevicesW
-EnumDisplaySettingsExW
-EnumDisplaySettingsW
-EnumFontFamiliesExW
-EnumFontFamiliesW
-EnumFontsW
-EnumICMProfilesW
-;EnumMonitorsW
-;EnumPortsW
-;EnumPrintProcessorDatatypesW
-;EnumPrintProcessorsW
-;EnumPrinterDriversW
-;EnumPrintersW
-EnumPropsA
-EnumPropsExA
-EnumPropsExW
-EnumPropsW
-EnumSystemCodePagesW
-EnumSystemLocalesW
-EnumTimeFormatsW
-;EnumerateSecurityPackagesW
-ExpandEnvironmentStringsW
-ExtTextOutW
-ExtractIconExW
-ExtractIconW
-FatalAppExitW
-FillConsoleOutputCharacterW
-FindAtomW
-;FindExecutableW
-FindFirstChangeNotificationW
-FindFirstFileW
-FindNextFileW
-FindResourceExW
-FindResourceW
-FindTextW
-FindWindowExW
-FindWindowW
-FormatMessageW
-;FreeContextBufferW
-FreeEnvironmentStringsW
-GetAltTabInfoW
-GetAtomNameW
-GetCPInfo
-GetCPInfoExW
-GetCalendarInfoW
-;GetCharABCWidthsFloatW
-GetCharABCWidthsW
-GetCharWidthFloatW
-GetCharWidthW
-GetCharacterPlacementW
-GetClassInfoExW
-GetClassInfoW
-GetClassLongW
-GetClassNameW
-GetClipboardData
-GetClipboardFormatNameW
-GetComputerNameW
-GetConsoleTitleW
-GetCurrencyFormatW
-GetCurrentDirectoryW
-GetCurrentHwProfileW
-GetDateFormatW
-GetDefaultCommConfigW
-GetDiskFreeSpaceExW
-GetDiskFreeSpaceW
-GetDlgItemTextW
-GetDriveTypeW
-GetEnhMetaFileDescriptionW
-GetEnhMetaFileW
-GetEnvironmentStringsW
-GetEnvironmentVariableW
-GetFileAttributesExW
-GetFileAttributesW
-GetFileTitleW
-GetFileVersionInfoSizeW
-GetFileVersionInfoW
-GetFullPathNameW
-GetGlyphOutlineW
-GetICMProfileW
-;GetJobW
-GetKerningPairsW
-GetKeyNameTextW
-GetKeyboardLayoutNameW
-GetLocaleInfoW
-GetLogColorSpaceW
-GetLogicalDriveStringsW
-GetLongPathNameW
-GetMenuItemInfoW
-GetMenuStringW
-GetMessageW
-GetMetaFileW
-GetModuleFileNameW
-GetModuleHandleW
-GetMonitorInfoW
-GetNamedPipeHandleStateW
-GetNumberFormatW
-GetObjectW
-GetOpenFileNamePreviewW
-GetOpenFileNameW
-GetOutlineTextMetricsW
-GetPrintProcessorDirectoryW
-;GetPrinterDataW
-;GetPrinterDriverDirectoryW
-;GetPrinterDriverW
-;GetPrinterW
-GetPrivateProfileIntW
-GetPrivateProfileSectionNamesW
-GetPrivateProfileSectionW
-GetPrivateProfileStringW
-GetPrivateProfileStructW
-;GetProcAddress
-GetProfileIntW
-GetProfileSectionW
-GetProfileStringW
-GetPropA
-GetPropW
-GetRoleTextW
-GetSaveFileNamePreviewW
-GetSaveFileNameW
-GetShortPathNameW
-GetStartupInfoW
-GetStateTextW
-GetStringTypeExW
-GetStringTypeW
-GetSystemDirectoryW
-GetSystemWindowsDirectoryW
-GetTabbedTextExtentW
-GetTempFileNameW
-GetTempPathW
-GetTextExtentExPointW
-GetTextExtentPoint32W
-GetTextExtentPointW
-GetTextFaceW
-GetTextMetricsW
-GetTimeFormatW
-GetUserNameW
-GetVersionExW
-GetVolumeInformationW
-GetWindowLongA
-GetWindowLongW
-GetWindowModuleFileNameW
-GetWindowTextLengthW
-GetWindowTextW
-GetWindowsDirectoryW
-GlobalAddAtomW
-GlobalFindAtomW
-GlobalGetAtomNameW
-GrayStringW
-;InitSecurityInterfaceW
-;InitializeSecurityContextW
-InsertMenuItemW
-InsertMenuW
-IsBadStringPtrW
-IsCharAlphaNumericW
-IsCharAlphaW
-IsCharLowerW
-IsCharUpperW
-IsClipboardFormatAvailable
-IsDestinationReachableW
-IsDialogMessageW
-IsTextUnicode
-IsValidCodePage
-IsWindowUnicode
-LCMapStringW
-LoadAcceleratorsW
-LoadBitmapW
-LoadCursorFromFileW
-LoadCursorW
-LoadIconW
-LoadImageW
-LoadKeyboardLayoutW
-LoadLibraryExW
-LoadLibraryW
-LoadMenuIndirectW
-LoadMenuW
-LoadStringW
-;MCIWndCreateW
-MapVirtualKeyExW
-MapVirtualKeyW
-MessageBoxExW
-MessageBoxIndirectW
-MessageBoxW
-ModifyMenuW
-MoveFileW
-MultiByteToWideChar
-MultinetGetConnectionPerformanceW
-OemToCharBuffW
-OemToCharW
-;OleUIAddVerbMenuW
-;OleUIBusyW
-;OleUIChangeIconW
-;OleUIChangeSourceW
-;OleUIConvertW
-;OleUIEditLinksW
-;OleUIInsertObjectW
-;OleUIObjectPropertiesW
-;OleUIPasteSpecialW
-;OleUIPromptUserW
-;OleUIUpdateLinksW
-OpenEventW
-OpenFileMappingW
-OpenMutexW
-OpenPrinterW
-OpenSemaphoreW
-OpenWaitableTimerW
-OutputDebugStringW
-PageSetupDlgW
-PeekConsoleInputW
-PeekMessageW
-PlaySoundW
-;PolyTextOutW
-PostMessageW
-PostThreadMessageW
-PrintDlgW
-;QueryContextAttributesW
-;QueryCredentialsAttributesW
-QueryDosDeviceW
-;QuerySecurityPackageInfoW
-RasConnectionNotificationW
-RasCreatePhonebookEntryW
-RasDeleteEntryW
-RasDeleteSubEntryW
-;RasDialW
-RasEditPhonebookEntryW
-RasEnumConnectionsW
-RasEnumDevicesW
-RasEnumEntriesW
-RasGetConnectStatusW
-RasGetEntryDialParamsW
-RasGetEntryPropertiesW
-RasGetErrorStringW
-RasHangUpW
-RasRenameEntryW
-RasSetEntryDialParamsW
-RasSetEntryPropertiesW
-RasSetSubEntryPropertiesW
-RasValidateEntryNameW
-ReadConsoleInputW
-ReadConsoleOutputCharacterW
-ReadConsoleOutputW
-ReadConsoleW
-RegConnectRegistryW
-RegCreateKeyExW
-RegCreateKeyW
-RegDeleteKeyW
-RegDeleteValueW
-RegEnumKeyExW
-RegEnumKeyW
-RegEnumValueW
-RegLoadKeyW
-RegOpenKeyExW
-RegOpenKeyW
-RegQueryInfoKeyW
-RegQueryMultipleValuesW
-RegQueryValueExW
-RegQueryValueW
-RegReplaceKeyW
-RegSaveKeyW
-RegSetValueExW
-RegSetValueW
-RegUnLoadKeyW
-RegisterClassExW
-RegisterClassW
-RegisterClipboardFormatW
-RegisterDeviceNotificationW
-RegisterWindowMessageW
-RemoveDirectoryW
-RemoveFontResourceW
-RemovePropA
-RemovePropW
-ReplaceTextW
-ResetDCW
-;ResetPrinterW
-SHBrowseForFolderW
-SHChangeNotify
-SHFileOperationW
-SHGetFileInfoW
-SHGetNewLinkInfoW
-SHGetPathFromIDListW
-ScrollConsoleScreenBufferW
-SearchPathW
-SendDlgItemMessageW
-SendMessageCallbackW
-SendMessageTimeoutW
-SendMessageW
-SendNotifyMessageW
-SetCalendarInfoW
-SetClassLongW
-SetComputerNameW
-SetConsoleTitleW
-SetCurrentDirectoryW
-SetDefaultCommConfigW
-SetDlgItemTextW
-SetEnvironmentVariableW
-SetFileAttributesW
-SetICMProfileW
-SetJobW
-SetLocaleInfoW
-SetMenuItemInfoW
-SetPrinterDataW
-SetPrinterW
-SetPropA
-SetPropW
-SetVolumeLabelW
-SetWindowLongA
-SetWindowLongW
-SetWindowTextW
-SetWindowsHookExW
-SetWindowsHookW
-ShellAboutW
-ShellExecuteExW
-ShellExecuteW
-Shell_NotifyIconW
-StartDocPrinterW
-StartDocW
-SystemParametersInfoW
-TabbedTextOutW
-TextOutW
-TranslateAcceleratorW
-UnregisterClassW
-UpdateResourceW
-VerFindFileW
-VerInstallFileW
-VerLanguageNameW
-VerQueryValueW
-VkKeyScanExW
-VkKeyScanW
-WNetAddConnection2W
-WNetAddConnection3W
-WNetAddConnectionW
-WNetCancelConnection2W
-WNetCancelConnectionW
-WNetConnectionDialog1W
-WNetDisconnectDialog1W
-WNetEnumResourceW
-WNetGetConnectionW
-WNetGetLastErrorW
-WNetGetNetworkInformationW
-WNetGetProviderNameW
-WNetGetResourceInformationW
-WNetGetResourceParentW
-WNetGetUniversalNameW
-WNetGetUserW
-WNetOpenEnumW
-WNetUseConnectionW
-WaitNamedPipeW
-WideCharToMultiByte
-WinHelpW
-WriteConsoleInputW
-WriteConsoleOutputCharacterW
-WriteConsoleOutputW
-WriteConsoleW
-WritePrivateProfileSectionW
-WritePrivateProfileStringW
-WritePrivateProfileStructW
-WriteProfileSectionW
-WriteProfileStringW
-;auxGetDevCapsW
-capCreateCaptureWindowW
-capGetDriverDescriptionW
-;joyGetDevCapsW
-lstrcatW
-lstrcmpW
-lstrcmpiW
-lstrcpyW
-lstrcpynW
-lstrlenW
-;mciGetDeviceIDW
-;mciGetErrorStringW
-;mciSendCommandW
-;mciSendStringW
-;midiInGetDevCapsW
-;midiInGetErrorTextW
-;midiOutGetDevCapsW
-;midiOutGetErrorTextW
-;mixerGetControlDetailsW
-;mixerGetDevCapsW
-;mixerGetLineControlsW
-;mixerGetLineInfoW
-;mmioInstallIOProcW
-;mmioOpenW
-;mmioRenameW
-;mmioStringToFOURCCW
-sndPlaySoundW
-;waveInGetDevCapsW
-;waveInGetErrorTextW
-;waveOutGetDevCapsW
-;waveOutGetErrorTextW
-wsprintfW
-wvsprintfW
\ No newline at end of file
diff --git a/sal/systools/win32/uwinapi/unicows_mingw.dxp b/sal/systools/win32/uwinapi/unicows_mingw.dxp
deleted file mode 100644
index f898d4b2a..000000000
--- a/sal/systools/win32/uwinapi/unicows_mingw.dxp
+++ /dev/null
@@ -1,544 +0,0 @@
-;*************************************************************************
-;
-; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-; 
-; Copyright 2000, 2010 Oracle and/or its affiliates.
-;
-; OpenOffice.org - a multi-platform office productivity suite
-;
-; This file is part of OpenOffice.org.
-;
-; OpenOffice.org is free software: you can redistribute it and/or modify
-; it under the terms of the GNU Lesser General Public License version 3
-; only, as published by the Free Software Foundation.
-;
-; OpenOffice.org is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU Lesser General Public License version 3 for more details
-; (a copy is included in the LICENSE file that accompanied this code).
-;
-; You should have received a copy of the GNU Lesser General Public License
-; version 3 along with OpenOffice.org.  If not, see
-; <http://www.openoffice.org/license.html>
-; for a copy of the LGPLv3 License.
-;
-;*************************************************************************
-;
-; Functions that are exported but not implemented by unicows.dll
-; are only inserted as comment.
-;
-; In addition to MSDN Platform SDK documentation the following functions 
-; are not implemented too:
-; AddMonitorW, FreeContextBufferW, GetPrinterDriverDirectoryW,
-; MCIWndCreateW
-;
-; The following functions of unicows.dll are buggy:
-; DrawStateW, GetLogicalDriveStringsW (both implemented in uwinapi.dll)
-;
-; The following functions of unicows.dll are wrapped but the ANSI versions
-; do not exist on Win9x so the wrapper is useless:
-; MoveFileExW, CopyFileExW (both implemented in uwinapi.dll along with the 
-; ANSI versions )
-;
-; These functions do not exist on Win 95 and NT neither as Unicode
-; nor as ANSI version, so the wrapper will fail on NT4 and Win 95
-; GetLongPathNameW ( implemented in uwinapi.dll along with the 
-; ANSI version )
-;
-; These essential functions aren't implemented by unicows.dll because 
-; there's no ANSI version:
-; CommandLineToArgvW (implemented by uwinapi.dll)
-;
-;*************************************************************************
-
-;AcquireCredentialsHandleW@36
-AddAtomW@4
-AddFontResourceW@4
-AddJobW@20
-AddPortW@12
-AddPrintProcessorW@16
-AddPrintProvidorW@12
-AddPrinterDriverW@12
-AddPrinterW@12
-AdvancedDocumentPropertiesW@20
-AppendMenuW@16
-BeginUpdateResourceW@8
-BroadcastSystemMessageW@20
-BuildCommDCBAndTimeoutsW@12
-BuildCommDCBW@8
-CallMsgFilterW@8
-CallNamedPipeW@28
-CallWindowProcA@20
-CallWindowProcW@20
-ChangeDisplaySettingsExW@20
-ChangeDisplaySettingsW@8
-ChangeMenuW@20
-CharLowerBuffW@8
-CharLowerW@4
-CharNextW@4
-CharPrevW@8
-CharToOemBuffW@12
-CharToOemW@8
-CharUpperBuffW@8
-CharUpperW@4
-ChooseColorW@4
-ChooseFontW@4
-CommConfigDialogW@12
-CompareStringW@24
-ConfigurePortW@12
-CopyAcceleratorTableW@12
-CopyEnhMetaFileW@8
-CopyFileExW@24
-CopyFileW@12
-CopyMetaFileW@8
-CreateAcceleratorTableW@8
-CreateColorSpaceW@4
-CreateDCW@16
-CreateDialogIndirectParamW@20
-CreateDialogParamW@20
-CreateDirectoryExW@12
-CreateDirectoryW@8
-CreateEnhMetaFileW@16
-CreateEventW@16
-CreateFileMappingW@24
-CreateFileW@28
-CreateFontIndirectW@4
-CreateFontW@56
-CreateICW@16
-CreateMDIWindowW@40
-CreateMailslotW@16
-CreateMetaFileW@4
-CreateMutexW@12
-;CreateNamedPipeW@32
-CreateProcessW@40
-CreateScalableFontResourceW@16
-CreateSemaphoreW@16
-CreateStdAccessibleProxyW@20
-CreateWaitableTimerW@12
-CreateWindowExW@48
-DdeConnect@16
-DdeConnectList@20
-DdeCreateStringHandleW@12
-DdeInitializeW@16
-DdeQueryConvInfo@12
-DdeQueryStringW@20
-DefDlgProcW@16
-DefFrameProcW@20
-DefMDIChildProcW@16
-DefWindowProcW@16
-DeleteFileW@4
-DeleteMonitorW@12
-DeletePortW@12
-DeletePrintProcessorW@12
-DeletePrintProvidorW@12
-DeletePrinterDriverW@12
-;DeviceCapabilitiesW@20
-DialogBoxIndirectParamW@20
-DialogBoxParamW@20
-DispatchMessageW@4
-DlgDirListComboBoxW@20
-DlgDirListW@20
-DlgDirSelectComboBoxExW@16
-DlgDirSelectExW@16
-;DocumentPropertiesW@24
-DragQueryFileW@16
-DrawStateW@40
-DrawTextExW@24
-DrawTextW@20
-EnableWindow@8
-EndUpdateResourceW@8
-EnumCalendarInfoExW@16
-EnumCalendarInfoW@16
-EnumClipboardFormats@4
-EnumDateFormatsExW@12
-EnumDateFormatsW@12
-EnumDisplayDevicesW@16
-EnumDisplaySettingsExW@16
-EnumDisplaySettingsW@12
-EnumFontFamiliesExW@20
-EnumFontFamiliesW@16
-EnumFontsW@16
-EnumICMProfilesW@12
-;EnumMonitorsW@24
-;EnumPortsW@24
-;EnumPrintProcessorDatatypesW@28
-;EnumPrintProcessorsW@28
-;EnumPrinterDriversW@28
-;EnumPrintersW@28
-EnumPropsA@8
-EnumPropsExA@12
-EnumPropsExW@12
-EnumPropsW@8
-EnumSystemCodePagesW@8
-EnumSystemLocalesW@8
-EnumTimeFormatsW@12
-;EnumerateSecurityPackagesW@8
-ExpandEnvironmentStringsW@12
-ExtTextOutW@32
-ExtractIconExW@20
-ExtractIconW@12
-FatalAppExitW@8
-FillConsoleOutputCharacterW@20
-FindAtomW@4
-;FindExecutableW@12
-FindFirstChangeNotificationW@12
-FindFirstFileW@8
-FindNextFileW@8
-FindResourceExW@16
-FindResourceW@12
-FindTextW@4
-FindWindowExW@16
-FindWindowW@8
-FormatMessageW@28
-;FreeContextBuffer@4
-FreeEnvironmentStringsW@4
-GetAltTabInfoW@20
-GetAtomNameW@12
-GetCPInfo@8
-GetCPInfoExW@12
-GetCalendarInfoW@24
-;GetCharABCWidthsFloatW@16
-GetCharABCWidthsW@16
-GetCharWidthFloatW@16
-GetCharWidthW@16
-GetCharacterPlacementW@24
-GetClassInfoExW@12
-GetClassInfoW@12
-GetClassLongW@8
-GetClassNameW@12
-GetClipboardData@4
-GetClipboardFormatNameW@12
-GetComputerNameW@8
-GetConsoleTitleW@8
-GetCurrencyFormatW@24
-GetCurrentDirectoryW@8
-GetCurrentHwProfileW@4
-GetDateFormatW@24
-GetDefaultCommConfigW@12
-GetDiskFreeSpaceExW@16
-GetDiskFreeSpaceW@20
-GetDlgItemTextW@16
-GetDriveTypeW@4
-GetEnhMetaFileDescriptionW@12
-GetEnhMetaFileW@4
-GetEnvironmentStringsW@0
-GetEnvironmentVariableW@12
-GetFileAttributesExW@12
-GetFileAttributesW@4
-GetFileTitleW@12
-GetFileVersionInfoSizeW@8
-GetFileVersionInfoW@16
-GetFullPathNameW@16
-GetGlyphOutlineW@28
-GetICMProfileW@12
-;GetJobW@24
-GetKerningPairsW@12
-GetKeyNameTextW@12
-GetKeyboardLayoutNameW@4
-GetLocaleInfoW@16
-GetLogColorSpaceW@12
-GetLogicalDriveStringsW@8
-GetLongPathNameW@12
-GetMenuItemInfoW@16
-GetMenuStringW@20
-GetMessageW@16
-GetMetaFileW@4
-GetModuleFileNameW@12
-GetModuleHandleW@4
-GetMonitorInfoW@8
-GetNamedPipeHandleStateW@28
-GetNumberFormatW@24
-GetObjectW@12
-GetOpenFileNamePreviewW@4
-GetOpenFileNameW@4
-GetOutlineTextMetricsW@12
-GetPrintProcessorDirectoryW@24
-;GetPrinterDataW@24
-;GetPrinterDriverDirectoryW24
-;GetPrinterDriverW@24
-;GetPrinterW@20
-GetPrivateProfileIntW@16
-GetPrivateProfileSectionNamesW@12
-GetPrivateProfileSectionW@16
-GetPrivateProfileStringW@24
-GetPrivateProfileStructW@20
-GetProcAddress@8=Internal_GetProcAddress@8
-GetProfileIntW@12
-GetProfileSectionW@12
-GetProfileStringW@20
-GetPropA@8
-GetPropW@8
-GetRoleTextW@12
-GetSaveFileNamePreviewW@4
-GetSaveFileNameW@4
-GetShortPathNameW@12
-GetStartupInfoW@4
-GetStateTextW@12
-GetStringTypeExW@20
-GetStringTypeW@16
-GetSystemDirectoryW@8
-GetSystemWindowsDirectoryW@8
-GetTabbedTextExtentW@20
-GetTempFileNameW@16
-GetTempPathW@8
-GetTextExtentExPointW@28
-GetTextExtentPoint32W@16
-GetTextExtentPointW@16
-GetTextFaceW@12
-GetTextMetricsW@8
-GetTimeFormatW@24
-GetUserNameW@8
-GetVersionExW@4
-GetVolumeInformationW@32
-GetWindowLongA@8
-GetWindowLongW@8
-GetWindowModuleFileNameW@12
-GetWindowTextLengthW@4
-GetWindowTextW@12
-GetWindowsDirectoryW@8
-GlobalAddAtomW@4
-GlobalFindAtomW@4
-GlobalGetAtomNameW@12
-GrayStringW@36
-;InitSecurityInterfaceW@0
-;InitializeSecurityContextW@48
-InsertMenuItemW@16
-InsertMenuW@20
-IsBadStringPtrW@8
-IsCharAlphaNumericW@4
-IsCharAlphaW@4
-IsCharLowerW@4
-IsCharUpperW@4
-IsClipboardFormatAvailable@4
-IsDestinationReachableW@8
-IsDialogMessageW@8
-IsTextUnicode@12
-IsValidCodePage@4
-IsWindowUnicode@4
-LCMapStringW@24
-LoadAcceleratorsW@8
-LoadBitmapW@8
-LoadCursorFromFileW@4
-LoadCursorW@8
-LoadIconW@8
-LoadImageW@24
-LoadKeyboardLayoutW@8
-LoadLibraryExW@12
-LoadLibraryW@4
-LoadMenuIndirectW@4
-LoadMenuW@8
-LoadStringW@16
-;MCIWndCreateW@4
-MapVirtualKeyExW@12
-MapVirtualKeyW@8
-MessageBoxExW@20
-MessageBoxIndirectW@4
-MessageBoxW@16
-ModifyMenuW@20
-MoveFileW@8
-MultiByteToWideChar@24
-MultinetGetConnectionPerformanceW@8
-OemToCharBuffW@12
-OemToCharW@8
-;OleUIAddVerbMenuW@36
-;OleUIBusyW@4
-;OleUIChangeIconW@4
-;OleUIChangeSourceW@4
-;OleUIConvertW@4
-;OleUIEditLinksW@4
-;OleUIInsertObjectW@4
-;OleUIObjectPropertiesW@4
-;OleUIPasteSpecialW@4
-;OleUIPromptUserW@8
-;OleUIUpdateLinksW@16
-OpenEventW@12
-OpenFileMappingW@12
-OpenMutexW@12
-OpenPrinterW@12
-OpenSemaphoreW@12
-OpenWaitableTimerW@12
-OutputDebugStringW@4
-PageSetupDlgW@4
-PeekConsoleInputW@16
-PeekMessageW@20
-PlaySoundW@12
-;PolyTextOutW@12
-PostMessageW@16
-PostThreadMessageW@16
-PrintDlgW@4
-;QueryContextAttributesW@12
-;QueryCredentialsAttributesW@12
-QueryDosDeviceW@12
-;QuerySecurityPackageInfoW@8
-RasConnectionNotificationW@12
-RasCreatePhonebookEntryW@8
-RasDeleteEntryW@8
-RasDeleteSubEntryW@12
-;RasDialW@24
-RasEditPhonebookEntryW@12
-RasEnumConnectionsW@12
-RasEnumDevicesW@12
-RasEnumEntriesW@20
-RasGetConnectStatusW@8
-RasGetEntryDialParamsW@12
-RasGetEntryPropertiesW@24
-RasGetErrorStringW@12
-RasHangUpW@4
-RasRenameEntryW@12
-RasSetEntryDialParamsW@12
-RasSetEntryPropertiesW@24
-RasSetSubEntryPropertiesW@28
-RasValidateEntryNameW@8
-ReadConsoleInputW@16
-ReadConsoleOutputCharacterW@20
-ReadConsoleOutputW@20
-ReadConsoleW@20
-RegConnectRegistryW@12
-RegCreateKeyExW@36
-RegCreateKeyW@12
-RegDeleteKeyW@8
-RegDeleteValueW@8
-RegEnumKeyExW@32
-RegEnumKeyW@16
-RegEnumValueW@32
-RegLoadKeyW@12
-RegOpenKeyExW@20
-RegOpenKeyW@12
-RegQueryInfoKeyW@48
-RegQueryMultipleValuesW@20
-RegQueryValueExW@24
-RegQueryValueW@16
-RegReplaceKeyW@16
-RegSaveKeyW@12
-RegSetValueExW@24
-RegSetValueW@20
-RegUnLoadKeyW@8
-RegisterClassExW@4
-RegisterClassW@4
-RegisterClipboardFormatW@4
-RegisterDeviceNotificationW@12
-RegisterWindowMessageW@4
-RemoveDirectoryW@4
-RemoveFontResourceW@4
-RemovePropA@8
-RemovePropW@8
-ReplaceTextW@4
-ResetDCW@8
-;ResetPrinterW@8
-SHBrowseForFolderW@4
-SHChangeNotify@16
-SHFileOperationW@4
-SHGetFileInfoW@20
-SHGetNewLinkInfoW@20
-SHGetPathFromIDListW@8
-ScrollConsoleScreenBufferW@20
-SearchPathW@24
-SendDlgItemMessageW@20
-SendMessageCallbackW@24
-SendMessageTimeoutW@28
-SendMessageW@16
-SendNotifyMessageW@16
-SetCalendarInfoW@16
-SetClassLongW@12
-SetComputerNameW@4
-SetConsoleTitleW@4
-SetCurrentDirectoryW@4
-SetDefaultCommConfigW@12
-SetDlgItemTextW@12
-SetEnvironmentVariableW@8
-SetFileAttributesW@8
-SetICMProfileW@8
-SetJobW@20
-SetLocaleInfoW@12
-SetMenuItemInfoW@16
-SetPrinterDataW@20
-SetPrinterW@16
-SetPropA@12
-SetPropW@12
-SetVolumeLabelW@8
-SetWindowLongA@12
-SetWindowLongW@12
-SetWindowTextW@8
-SetWindowsHookExW@16
-SetWindowsHookW@8
-ShellAboutW@16
-ShellExecuteExW@4
-ShellExecuteW@24
-Shell_NotifyIconW@8
-StartDocPrinterW@12
-StartDocW@8
-SystemParametersInfoW@16
-TabbedTextOutW@32
-TextOutW@20
-TranslateAcceleratorW@12
-UnregisterClassW@8
-UpdateICMRegKeyW@16
-UpdateResourceW@24
-VerFindFileW@32
-VerInstallFileW@32
-VerLanguageNameW@12
-VerQueryValueW@16
-VkKeyScanExW@8
-VkKeyScanW@4
-WNetAddConnection2W@16
-WNetAddConnection3W@20
-WNetAddConnectionW@12
-WNetCancelConnection2W@12
-WNetCancelConnectionW@8
-WNetConnectionDialog1W@4
-WNetDisconnectDialog1W@4
-WNetEnumResourceW@16
-WNetGetConnectionW@12
-WNetGetLastErrorW@20
-WNetGetNetworkInformationW@8
-WNetGetProviderNameW@12
-WNetGetResourceInformationW@16
-WNetGetResourceParentW@12
-WNetGetUniversalNameW@16
-WNetGetUserW@12
-WNetOpenEnumW@20
-WNetUseConnectionW@32
-WaitNamedPipeW@8
-WideCharToMultiByte@32
-WinHelpW@16
-WriteConsoleInputW@16
-WriteConsoleOutputCharacterW@20
-WriteConsoleOutputW@20
-WriteConsoleW@20
-WritePrivateProfileSectionW@12
-WritePrivateProfileStringW@16
-WritePrivateProfileStructW@20
-WriteProfileSectionW@8
-WriteProfileStringW@12
-;auxGetDevCapsW@12
-capCreateCaptureWindowW@32
-capGetDriverDescriptionW@20
-;joyGetDevCapsW@12
-lstrcatW@8
-lstrcmpW@8
-lstrcmpiW@8
-lstrcpyW@8
-lstrcpynW@12
-lstrlenW@4
-;mciGetDeviceIDW@4
-;mciGetErrorStringW@12
-;mciSendCommandW@16
-;mciSendStringW@16
-;midiInGetDevCapsW@12
-;midiInGetErrorTextW@12
-;midiOutGetDevCapsW@12
-;mixerGetControlDetailsW@12
-;mixerGetDevCapsW@12
-;mixerGetLineControlsW@12
-;mixerGetLineInfoW@12
-;mmioInstallIOProcW@12
-;mmioOpenW@@12
-;mmioRenameW@16
-;sndPlaySoundW@8
-;waveInGetDevCapsW@12
-;waveInGetErrorTextW@12
-;waveOutGetDevCapsW@12
-;waveOutGetErrorTextW@12
-wsprintfW
-wvsprintfW@12
diff --git a/sal/systools/win32/uwinapi/uwinapi.dxp b/sal/systools/win32/uwinapi/uwinapi.dxp
deleted file mode 100644
index 551671853..000000000
--- a/sal/systools/win32/uwinapi/uwinapi.dxp
+++ /dev/null
@@ -1,86 +0,0 @@
-;*************************************************************************
-;
-; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-; 
-; Copyright 2000, 2010 Oracle and/or its affiliates.
-;
-; OpenOffice.org - a multi-platform office productivity suite
-;
-; This file is part of OpenOffice.org.
-;
-; OpenOffice.org is free software: you can redistribute it and/or modify
-; it under the terms of the GNU Lesser General Public License version 3
-; only, as published by the Free Software Foundation.
-;
-; OpenOffice.org is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU Lesser General Public License version 3 for more details
-; (a copy is included in the LICENSE file that accompanied this code).
-;
-; You should have received a copy of the GNU Lesser General Public License
-; version 3 along with OpenOffice.org.  If not, see
-; <http://www.openoffice.org/license.html>
-; for a copy of the LGPLv3 License.
-;
-;*************************************************************************
-
-DllGetVersion
-;CheckTokenMembership
-CommandLineToArgvW
-CopyFileExA
-CopyFileExW
-CreateToolhelp32Snapshot
-DrawStateW
-EnumProcesses
-GetDiskFreeSpaceExA
-GetDiskFreeSpaceExW
-GetLogicalDriveStringsW
-GetLongPathNameA
-GetLongPathNameW
-GetModuleFileNameExA
-GetModuleFileNameExW
-GetProcessId
-GetUserDefaultUILanguage
-GetUserDomainA
-GetUserDomainW
-Module32First
-Module32FirstW
-Module32Next
-Module32NextW
-MoveFileExA
-MoveFileExW
-Process32First
-Process32FirstW
-Process32Next
-Process32NextW
-FindFirstVolumeA
-FindFirstVolumeW
-FindNextVolumeA
-FindNextVolumeW
-FindVolumeClose
-FindFirstVolumeMountPointA
-FindFirstVolumeMountPointW
-FindNextVolumeMountPointA
-FindNextVolumeMountPointW
-FindVolumeMountPointClose
-GetVolumeNameForVolumeMountPointA
-GetVolumeNameForVolumeMountPointW
-DeleteVolumeMountPointA
-DeleteVolumeMountPointW
-GetVolumePathNameA
-GetVolumePathNameW
-SetVolumeMountPointA
-SetVolumeMountPointW
-PathAddBackslashW
-PathCompactPathExW
-PathFileExistsW
-PathFindExtensionW
-PathFindFileNameW
-PathIsFileSpecW
-PathIsUNCW
-PathRemoveExtensionW
-PathRemoveFileSpecW
-PathSetDlgItemPathW
-PathStripToRootW
-SHCreateItemFromParsingName
diff --git a/sal/systools/win32/uwinapi/uwinapi_mingw.dxp b/sal/systools/win32/uwinapi/uwinapi_mingw.dxp
deleted file mode 100644
index 81cc6faa0..000000000
--- a/sal/systools/win32/uwinapi/uwinapi_mingw.dxp
+++ /dev/null
@@ -1,90 +0,0 @@
-;*************************************************************************
-;
-; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-; 
-; Copyright 2000, 2010 Oracle and/or its affiliates.
-;
-; OpenOffice.org - a multi-platform office productivity suite
-;
-; This file is part of OpenOffice.org.
-;
-; OpenOffice.org is free software: you can redistribute it and/or modify
-; it under the terms of the GNU Lesser General Public License version 3
-; only, as published by the Free Software Foundation.
-;
-; OpenOffice.org is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU Lesser General Public License version 3 for more details
-; (a copy is included in the LICENSE file that accompanied this code).
-;
-; You should have received a copy of the GNU Lesser General Public License
-; version 3 along with OpenOffice.org.  If not, see
-; <http://www.openoffice.org/license.html>
-; for a copy of the LGPLv3 License.
-;
-;*************************************************************************
-
-DllGetVersion@4
-CommandLineToArgvW@8
-CopyFileExA@24
-CopyFileExW@24
-CreateToolhelp32Snapshot@8
-DrawStateW@40
-EnumProcesses@12
-GetDiskFreeSpaceExA@16
-GetDiskFreeSpaceExW@16
-GetLogicalDriveStringsW@8
-GetLongPathNameA@12
-GetLongPathNameW@12
-GetModuleFileNameExA@16
-GetModuleFileNameExW@16
-GetProcessId@4
-GetUserDefaultUILanguage@0
-GetUserDomainA@8
-GetUserDomainW@8
-Module32First@8
-Module32FirstW@8
-Module32Next@8
-Module32NextW@8
-MoveFileExA@12
-MoveFileExW@12
-Process32First@8
-Process32FirstW@8
-Process32Next@8
-Process32NextW@8
-FindFirstVolumeA@8
-FindFirstVolumeW@8
-FindNextVolumeA@12
-FindNextVolumeW@12
-FindVolumeClose@4
-FindFirstVolumeMountPointA@12
-FindFirstVolumeMountPointW@12
-FindNextVolumeMountPointA@12
-FindNextVolumeMountPointW@12
-FindVolumeMountPointClose@4
-GetVolumeNameForVolumeMountPointA@12
-GetVolumeNameForVolumeMountPointW@12
-DeleteVolumeMountPointA@4
-DeleteVolumeMountPointW@4
-GetVolumePathNameA@12
-GetVolumePathNameW@12
-SetVolumeMountPointA@8
-SetVolumeMountPointW@8
-PathAddBackslashW@4
-PathCompactPathExW@16
-PathFileExistsW@4
-PathFindExtensionW@4
-PathFindFileNameW@4
-PathIsFileSpecW@4
-PathIsUNCW@4
-PathRemoveExtensionW@4
-PathRemoveFileSpecW@4
-PathSetDlgItemPathW@12
-PathStripToRootW@4
-SHCreateItemFromParsingName@16
-snprintf
-snwprintf
-vsnprintf
-vsnwprintf
-
diff --git a/sal/systools/win32/uwinapi/win95sys.h b/sal/systools/win32/uwinapi/win95sys.h
deleted file mode 100644
index a02789ece..000000000
--- a/sal/systools/win32/uwinapi/win95sys.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#pragma once
-
-//Kernel32 objects
-
-#define K32OBJ_SEMAPHORE			0x1
-#define K32OBJ_EVENT				0x2
-#define K32OBJ_MUTEX				0x3
-#define K32OBJ_CRITICAL_SECTION     0x4
-#define K32OBJ_PROCESS				0x5
-#define K32OBJ_THREAD				0x6
-#define K32OBJ_FILE					0x7
-#define K32OBJ_CHANGE				0x8
-#define K32OBJ_CONSOLE				0x9
-#define K32OBJ_SCREEN_BUFFER	    0xA
-#define K32OBJ_MEM_MAPPED_FILE	    0xB
-#define K32OBJ_SERIAL				0xC
-#define K32OBJ_DEVICE_IOCTL			0xD
-#define K32OBJ_PIPE					0xE
-#define K32OBJ_MAILSLOT 			0xF
-#define K32OBJ_TOOLHELP_SNAPSHOT    0x10
-#define K32OBJ_SOCKET				0x11
-
-
-//Process Database flags
-
-#define fDebugSingle		0x00000001
-#define fCreateProcessEvent	0x00000002
-#define fExitProcessEvent	0x00000004
-#define fWin16Process		0x00000008
-#define fDosProcess			0x00000010
-#define fConsoleProcess 	0x00000020
-#define fFileApisAreOem 	0x00000040
-#define fNukeProcess		0x00000080
-#define fServiceProcess 	0x00000100
-#define fLoginScriptHack	0x00000800
-
-
-//Thread Database flags
-
-#define fCreateThreadEvent		0x00000001
-#define fCancelExceptionAbort	0x00000002
-#define fOnTempStack			0x00000004
-#define fGrowableStack			0x00000008
-#define fDelaySingleStep		0x00000010
-#define fOpenExeAsImmovableFile 0x00000020
-#define fCreateSuspended		0x00000040
-#define fStackOverflow			0x00000080
-#define fNestedCleanAPCs		0x00000100
-#define fWasOemNowAnsi			0x00000200
-#define fOKToSetThreadOem		0x00000400
-
-#ifdef _MSC_VER
-#pragma warning(disable:4103)
-#endif
-#pragma pack(1)
-
-
-//MODREF and IMTE structures
-
-typedef struct _MODREF {
-    struct _MODREF *pNextModRef;    // 00h
-    DWORD	    un1;	    // 04h
-    DWORD	    un2;	    // 08h
-    DWORD	    un3;	    // 0Ch
-    WORD	    mteIndex;	// 10h
-    WORD	    un4;	    // 12h
-    DWORD	    un5;	    // 14h
-    PVOID	    ppdb;	    // 18h Pointer to process database
-    DWORD	    un6;	    // 1Ch
-    DWORD	    un7;	    // 20h
-    DWORD	    un8;	    // 24h
-} MODREF, *PMODREF;
-
-typedef struct _IMTE {
-    DWORD	    un1;			// 00h
-    PIMAGE_NT_HEADERS	pNTHdr; // 04h
-    DWORD	    un2;			// 08h
-    PSTR	    pszFileName;    // 0Ch
-    PSTR	    pszModName;     // 10h
-    WORD	    cbFileName;     // 14h
-    WORD	    cbModName;	    // 16h
-    DWORD	    un3;			// 18h
-    DWORD	    cSections;	    // 1Ch
-    DWORD	    un5;			// 20h
-    DWORD	    baseAddress;    // 24h
-    WORD	    hModule16;	    // 28h
-    WORD	    cUsage;			// 2Ah
-    DWORD	    un7;			// 2Ch
-    PSTR	    pszFileName2;   // 30h
-    WORD	    cbFileName2;    // 34h
-    DWORD	    pszModName2;    // 36h
-    WORD	    cbModName2;     // 3Ah
-} IMTE, *PIMTE;
-
-
-//Process Database structure
-
-typedef struct _ENVIRONMENT_DATABASE {
-PSTR	pszEnvironment;     // 00h Pointer to Environment
-DWORD	un1;				// 04h
-PSTR	pszCmdLine;			// 08h Pointer to command line
-PSTR	pszCurrDirectory;   // 0Ch Pointer to current directory
-LPSTARTUPINFOA pStartupInfo;// 10h Pointer to STARTUPINFOA struct
-HANDLE	hStdIn; 			// 14h Standard Input
-HANDLE	hStdOut;			// 18h Standard Output
-HANDLE	hStdErr;			// 1Ch Standard Error
-DWORD	un2;				// 20h
-DWORD	InheritConsole;     // 24h
-DWORD	BreakType;			// 28h
-DWORD	BreakSem;			// 2Ch
-DWORD	BreakEvent;			// 30h
-DWORD	BreakThreadID;	    // 34h
-DWORD	BreakHandlers;	    // 38h
-} ENVIRONMENT_DATABASE, *PENVIRONMENT_DATABASE;
-
-typedef struct _KERNEL_OBJECT {
-DWORD	Type;		    // 00h KERNEL32 object type (5)
-DWORD	cReference;	    // 04h Number of references to process
-} KERNEL_OBJECT, *PKERNEL_OBJECT;
-
-typedef struct _HANDLE_TABLE_ENTRY {
-    DWORD   flags;		// Valid flags depend on what type of object this is
-    PKERNEL_OBJECT   pObject;	// Pointer to the object that the handle refers to
-} HANDLE_TABLE_ENTRY, *PHANDLE_TABLE_ENTRY;
-
-typedef struct _HANDLE_TABLE {
-    DWORD   cEntries;				// Max number of handles in table
-    HANDLE_TABLE_ENTRY array[1];    // An array (number is given by cEntries)
-} HANDLE_TABLE, *PHANDLE_TABLE;
-
-
-typedef struct _PROCESS_DATABASE {
-DWORD	Type;		    // 00h KERNEL32 object type (5)
-DWORD	cReference;	    // 04h Number of references to process
-DWORD	un1;		    // 08h
-DWORD	someEvent;	    // 0Ch An event object (What's it used for???)
-DWORD	TerminationStatus;  // 10h Returned by GetExitCodeProcess
-DWORD	un2;		    // 14h
-DWORD	DefaultHeap;	    // 18h Address of the process heap
-DWORD	MemoryContext;	    // 1Ch pointer to the process's context
-DWORD	flags;		    // 20h
-                // 0x00000001 - fDebugSingle
-                // 0x00000002 - fCreateProcessEvent
-                // 0x00000004 - fExitProcessEvent
-                // 0x00000008 - fWin16Process
-                // 0x00000010 - fDosProcess
-                // 0x00000020 - fConsoleProcess
-                // 0x00000040 - fFileApisAreOem
-                // 0x00000080 - fNukeProcess
-                // 0x00000100 - fServiceProcess
-                // 0x00000800 - fLoginScriptHack
-DWORD	pPSP;		    // 24h Linear address of PSP?
-WORD	PSPSelector;	    // 28h
-WORD	MTEIndex;	    // 2Ah
-WORD	cThreads;	    // 2Ch
-WORD	cNotTermThreads;    // 2Eh
-WORD	un3;		    // 30h
-WORD	cRing0Threads;	    // 32h number of ring 0 threads
-HANDLE	HeapHandle;	    // 34h Heap to allocate handle tables out of
-                //	   This seems to always be the KERNEL32 heap
-HTASK	W16TDB; 	    // 38h Win16 Task Database selector
-DWORD	MemMapFiles;	    // 3Ch memory mapped file list (?)
-PENVIRONMENT_DATABASE pEDB; // 40h Pointer to Environment Database
-PHANDLE_TABLE pHandleTable; // 44h Pointer to process handle table
-struct _PROCESS_DATABASE *ParentPDB;   // 48h Parent process database
-PMODREF MODREFlist;	    // 4Ch Module reference list
-DWORD	ThreadList;	    // 50h Threads in this process
-DWORD	DebuggeeCB;	    // 54h Debuggee Context block?
-DWORD	LocalHeapFreeHead;  // 58h Head of free list in process heap
-DWORD	InitialRing0ID;     // 5Ch
-CRITICAL_SECTION    crst;   // 60h
-DWORD	un4[3]; 	    // 78h
-DWORD	pConsole;	    // 84h Pointer to console for process
-DWORD	tlsInUseBits1;	    // 88h  // Represents TLS indices 0 - 31
-DWORD	tlsInUseBits2;	    // 8Ch  // Represents TLS indices 32 - 63
-DWORD	ProcessDWORD;	    // 90h
-struct _PROCESS_DATABASE *ProcessGroup;    // 94h
-DWORD	pExeMODREF;	    // 98h pointer to EXE's MODREF
-DWORD	TopExcFilter;	    // 9Ch Top Exception Filter?
-DWORD	BasePriority;	    // A0h Base scheduling priority for process
-DWORD	HeapOwnList;	    // A4h Head of the list of process heaps
-DWORD	HeapHandleBlockList;// A8h Pointer to head of heap handle block list
-DWORD	pSomeHeapPtr;	    // ACh normally zero, but can a pointer to a
-                // moveable handle block in the heap
-DWORD	pConsoleProvider;   // B0h Process that owns the console we're using?
-WORD	EnvironSelector;    // B4h Selector containing process environment
-WORD	ErrorMode;	    // B6H SetErrorMode value (also thunks to Win16)
-DWORD	pevtLoadFinished;   // B8h Pointer to event LoadFinished?
-WORD	UTState;	    // BCh
-} PROCESS_DATABASE, *PPROCESS_DATABASE;
-
-
-//TIB (Thread Information Block) structure
-
-typedef struct _SEH_record {
-    struct _SEH_record *pNext;
-    FARPROC		pfnHandler;
-} SEH_record, *PSEH_record;
-
-// This is semi-documented in the NTDDK.H file from the NT DDK
-typedef struct _TIB {
-PSEH_record pvExcept;	    // 00h Head of exception record list
-PVOID	pvStackUserTop;     // 04h Top of user stack
-PVOID	pvStackUserBase;    // 08h Base of user stack
-WORD	pvTDB;		    // 0Ch TDB
-WORD	pvThunksSS;	    // 0Eh SS selector used for thunking to 16 bits
-DWORD	SelmanList;	    // 10h
-PVOID	pvArbitrary;	    // 14h Available for application use
-struct _tib *ptibSelf;	    // 18h Linear address of TIB structure
-WORD	TIBFlags;	    // 1Ch
-WORD	Win16MutexCount;    // 1Eh
-DWORD	DebugContext;	    // 20h
-DWORD	pCurrentPriority;   // 24h
-DWORD	pvQueue;	    // 28h Message Queue selector
-PVOID  *pvTLSArray;	    // 2Ch Thread Local Storage array
-} TIB, *PTIB;
-
-
-//TDBX structure
-
-typedef struct _TDBX {
-    DWORD   ptdb;		// 00h	// PTHREAD_DATABASE
-    DWORD   ppdb;		// 04h	// PPROCESDS_DATABASE
-    DWORD   ContextHandle;	// 08h
-    DWORD   un1;		// 0Ch
-    DWORD   TimeOutHandle;	// 10h
-    DWORD   WakeParam;		// 14h
-    DWORD   BlockHandle;	// 18h
-    DWORD   BlockState; 	// 1Ch
-    DWORD   SuspendCount;	// 20h
-    DWORD   SuspendHandle;	// 24h
-    DWORD   MustCompleteCount;	// 28h
-    DWORD   WaitExFlags;	// 2Ch
-                // 0x00000001 - WAITEXBIT
-                // 0x00000002 - WAITACKBIT
-                // 0x00000004 - SUSPEND_APC_PENDING
-                // 0x00000008 - SUSPEND_TERMINATED
-                // 0x00000010 - BLOCKED_FOR_TERMINATION
-                // 0x00000020 - EMULATE_NPX
-                // 0x00000040 - WIN32_NPX
-                // 0x00000080 - EXTENDED_HANDLES
-                // 0x00000100 - FROZEN
-                // 0x00000200 - DONT_FREEZE
-                // 0x00000400 - DONT_UNFREEZE
-                // 0x00000800 - DONT_TRACE
-                // 0x00001000 - STOP_TRACING
-                // 0x00002000 - WAITING_FOR_CRST_SAFE
-                // 0x00004000 - CRST_SAFE
-                // 0x00040000 - BLOCK_TERMINATE_APC
-    DWORD   SyncWaitCount;	// 30h
-    DWORD   QueuedSyncFuncs;	// 34h
-    DWORD   UserAPCList;	// 38h
-    DWORD   KernAPCList;	// 3Ch
-    DWORD   pPMPSPSelector;	// 40h
-    DWORD   BlockedOnID;	// 44h
-    DWORD   un2[7];		// 48h
-    DWORD   TraceRefData;	// 64h
-    DWORD   TraceCallBack;	// 68h
-    DWORD   TraceEventHandle;	// 6Ch
-    WORD    TraceOutLastCS;	// 70h
-    WORD    K16TDB;		// 72h
-    WORD    K16PDB;		// 74h
-    WORD    DosPDBSeg;		// 76h
-    WORD    ExceptionCount;	// 78h
-} TDBX, *PTDBX;
-
-
-//Thread Database structure
-
-typedef struct _THREAD_DATABASE {
-DWORD	Type;		    // 00h
-DWORD	cReference;	    // 04h
-PPROCESS_DATABASE pProcess; // 08h
-DWORD	someEvent;	    // 0Ch An event object (What's it used for???)
-DWORD	pvExcept;	    // 10h This field through field 3CH is a TIB
-                //	    structure (see TIB.H)
-DWORD	TopOfStack;	    // 14h
-DWORD	StackLow;	    // 18h
-WORD	W16TDB; 	    // 1Ch
-WORD	StackSelector16;    // 1Eh Used when thunking down to 16 bits
-DWORD	SelmanList;	    // 20h
-DWORD	UserPointer;	    // 24h
-PTIB	pTIB;		    // 28h
-WORD	TIBFlags;	    // 2Ch  TIBF_WIN32 = 1, TIBF_TRAP = 2
-WORD	Win16MutexCount;    // 2Eh
-DWORD	DebugContext;	    // 30h
-PDWORD	pCurrentPriority;   // 34h
-DWORD	MessageQueue;	    // 38h
-DWORD	pTLSArray;	    // 3Ch
-PPROCESS_DATABASE pProcess2;// 40h Another copy of the thread's process???
-DWORD	Flags;		    // 44h
-                // 0x00000001 - fCreateThreadEvent
-                // 0x00000002 - fCancelExceptionAbort
-                // 0x00000004 - fOnTempStack
-                // 0x00000008 - fGrowableStack
-                // 0x00000010 - fDelaySingleStep
-                // 0x00000020 - fOpenExeAsImmovableFile
-                // 0x00000040 - fCreateSuspended
-                // 0x00000080 - fStackOverflow
-                // 0x00000100 - fNestedCleanAPCs
-                // 0x00000200 - fWasOemNowAnsi
-                // 0x00000400 - fOKToSetThreadOem
-DWORD	TerminationStatus;  // 48h Returned by GetExitCodeThread
-WORD	TIBSelector;	    // 4Ch
-WORD	EmulatorSelector;   // 4Eh
-DWORD	cHandles;	    // 50h
-DWORD	WaitNodeList;	    // 54h
-DWORD	un4;		    // 58h
-DWORD	Ring0Thread;	    // 5Ch
-PTDBX	pTDBX;		    // 60
-DWORD	StackBase;	    // 64h
-DWORD	TerminationStack;   // 68h
-DWORD	EmulatorData;	    // 6Ch
-DWORD	GetLastErrorCode;   // 70h
-DWORD	DebuggerCB;	    // 74h
-DWORD	DebuggerThread;     // 78h
-PCONTEXT    ThreadContext;  // 7Ch  // register context defined in WINNT.H
-DWORD	Except16List;	    // 80h
-DWORD	ThunkConnect;	    // 84h
-DWORD	NegStackBase;	    // 88h
-DWORD	CurrentSS;	    // 8Ch
-DWORD	SSTable;	    // 90h
-DWORD	ThunkSS16;	    // 94h
-DWORD	TLSArray[64];	    // 98h
-DWORD	DeltaPriority;	    // 198h
-
-// The retail version breaks off somewhere around here.
-// All the remaining fields are most likely only in the debug version
-
-DWORD	un5[7]; 	    // 19Ch
-DWORD	pCreateData16;	    // 1B8h
-DWORD	APISuspendCount;    // 1BCh # of times SuspendThread has been called
-DWORD	un6;		    // 1C0h
-DWORD	WOWChain;	    // 1C4h
-WORD	wSSBig; 	    // 1C8h
-WORD	un7;		    // 1CAh
-DWORD	lp16SwitchRec;	    // 1CCh
-DWORD	un8[6]; 	    // 1D0h
-DWORD	pSomeCritSect1;     // 1E8h
-DWORD	pWin16Mutex;	    // 1ECh
-DWORD	pWin32Mutex;	    // 1F0h
-DWORD	pSomeCritSect2;     // 1F4h
-DWORD	un9;		    // 1F8h
-DWORD	ripString;	    // 1FCh
-DWORD	LastTlsSetValueEIP[64]; // 200h (parallel to TlsArray, contains EIP
-                //	where TLS value was last set from)
-} THREAD_DATABASE, *PTHREAD_DATABASE;
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/test/unloading/exports.dxp b/sal/test/unloading/exports.dxp
index 82adf8e8b..9990690a9 100644
--- a/sal/test/unloading/exports.dxp
+++ b/sal/test/unloading/exports.dxp
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_writeInfo
 component_getFactory
 component_canUnload
diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx
index 5761e0ba9..a7b81a538 100644
--- a/sal/test/unloading/samplelib1.cxx
+++ b/sal/test/unloading/samplelib1.cxx
@@ -136,10 +136,6 @@ static Reference<XInterface> SAL_CALL test4_createInstance(const Reference<XMult
 
 // Standard UNO library interface -------------------------------------------------
 extern "C" {
-    void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv){
-        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-    }
-
     sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKey) throw()
     {
         if (pRegistryKey)
@@ -170,7 +166,7 @@ extern "C" {
                 xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4)));
                 return sal_True;
             }
-            catch (InvalidRegistryException &)
+            catch (const InvalidRegistryException &)
             {
                 OSL_FAIL( "### InvalidRegistryException!" );
             }
@@ -178,7 +174,7 @@ extern "C" {
         return sal_False;
     }
 
-    void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw() 
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw()
     {
         void * pRet = 0;
     
diff --git a/sal/test/unloading/samplelib2.cxx b/sal/test/unloading/samplelib2.cxx
index 169990b94..c7a20f7d2 100644
--- a/sal/test/unloading/samplelib2.cxx
+++ b/sal/test/unloading/samplelib2.cxx
@@ -126,10 +126,6 @@ static Reference<XInterface> SAL_CALL test23_createInstance(const Reference<XMul
 
 // Standard UNO library interface -------------------------------------------------
 extern "C" {
-    void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv){
-        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-    }
-
     sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKey) throw()
     {
         if (pRegistryKey)
@@ -163,7 +159,7 @@ extern "C" {
         return sal_False;
     }
 
-    void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw() 
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw() 
     {
         void * pRet = 0;
     
diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx
index 9404439ac..00d781101 100644
--- a/sal/textenc/tables.cxx
+++ b/sal/textenc/tables.cxx
@@ -127,6 +127,12 @@ static sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 };
 
 ImplTextEncodingData const *
 Impl_getTextEncodingData(rtl_TextEncoding nEncoding)
+#ifdef IOS
+    // Dunno if the g++ for iOS is just pickier, or why other g++
+    // versions don't complain about the lack of throw to match the
+    // one in the declaration in gettextencodingdata.h.o
+    SAL_THROW_EXTERN_C()
+#endif
 {
     static ImplTextEncodingData const * const aData[]
         = { NULL, /* DONTKNOW */
@@ -225,7 +231,6 @@ Impl_getTextEncodingData(rtl_TextEncoding nEncoding)
             &aImplPT154TextEncodingData }; /* PT154 */
     return
         nEncoding < SAL_N_ELEMENTS(aData) ? aData[nEncoding] : NULL;
-    return NULL;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/typesconfig/makefile.mk b/sal/typesconfig/makefile.mk
index d5f7db30d..662bd7d7e 100644
--- a/sal/typesconfig/makefile.mk
+++ b/sal/typesconfig/makefile.mk
@@ -42,20 +42,50 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 # --- Files --------------------------------------------------------
 
+.IF "$(CROSS_COMPILING)"!="YES" && "$(COM)"!="MSC"
+
 APP1TARGET=	$(TARGET)
 APP1OBJS=		$(OBJ)$/typesconfig.obj
 APP1STDLIBS=
 APP1DEF=
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 
 .IF "$(L10N-framework)"==""
+.IF "$(COM)"!="MSC"
 ALLTAR : $(INCCOM)$/sal$/typesizes.h
+.ENDIF
 .ENDIF			# "$(L10N-framework)"==""
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 $(INCCOM)$/sal$/typesizes.h : $(BIN)$/$(TARGET)
     -$(MKDIR) $(INCCOM)$/sal
     $(AUGMENT_LIBRARY_PATH) $(BIN)$/$(TARGET) $@
 
+.ELSE
+
+$(INCCOM)$/sal$/typesizes.h : 
+    -$(MKDIRHIER) $(INCCOM)$/sal
+    echo '/* This file is autogenerated from configure script data */' >$@
+    echo >>$@
+    echo "#define SAL_TYPES_ALIGNMENT2	$(ALIGNOF_SHORT)" >>$@
+    echo "#define SAL_TYPES_ALIGNMENT4	$(ALIGNOF_INT)" >>$@
+.IF "$(SIZEOF_LONG)"=="8"
+    echo "#define SAL_TYPES_ALIGNMENT8	$(ALIGNOF_LONG)" >>$@
+.ELIF "$(SIZEOF_DOUBLE)"=="8"
+    echo "#define SAL_TYPES_ALIGNMENT8	$(ALIGNOF_DOUBLE)" >>$@
+.ELSE
+    echo "#error alignment of some 8-byte type unknown" >>$@
+.ENDIF
+    echo "#define SAL_TYPES_SIZEOFSHORT	$(SIZEOF_SHORT)" >>$@
+    echo "#define SAL_TYPES_SIZEOFINT	$(SIZEOF_INT)" >>$@
+    echo "#define SAL_TYPES_SIZEOFLONG	$(SIZEOF_LONG)" >>$@
+    echo "#define SAL_TYPES_SIZEOFLONGLONG	$(SIZEOF_LONGLONG)" >>$@
+    echo "#define SAL_TYPES_SIZEOFPOINTER	$(SIZEOF_POINTER)" >>$@
+
+.ENDIF
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index 10414c8fc..3a3a16448 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -66,21 +66,13 @@ LIB1FILES=	\
     $(SLB)$/cpprtl.lib	\
     $(SLB)$/textenc.lib 
 
-LIB3TARGET=$(LB)$/a$(TARGET).lib
-LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-LIB3FILES=	\
-    $(LB)$/oslall.lib	\
-    $(LB)$/cpposl.lib	\
-    $(LB)$/cpprtl.lib	\
-    $(LB)$/textenc.lib
-
-
-.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2"
+.IF "$(COM)" == "MSC"
 SHL1TARGET= $(TARGET)
+SHL1IMPLIB= i$(TARGET)
 .ELSE
 SHL1TARGET= uno_$(TARGET)
+SHL1IMPLIB= uno_$(TARGET)
 .ENDIF
-SHL1IMPLIB= i$(TARGET)
 SHL1VERSIONMAP=	$(TARGET).map
 SHL1RPATH=URELIB
 
@@ -95,7 +87,7 @@ UWINAPILIB=     $(LB)$/uwinapi.lib
 SHL1STDLIBS=	\
                 $(UWINAPILIB)\
                 $(ADVAPI32LIB)\
-                $(WSOCK32LIB)\
+                $(WS2_32LIB)\
                 $(MPRLIB)\
                 $(SHELL32LIB)\
                 $(COMDLG32LIB)\
@@ -117,10 +109,6 @@ SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract
 .ENDIF # SOLARIS
 .ENDIF # UNX
 
-.IF "$(GUI)"=="OS2"
-SHL1STDLIBS=pthread.lib
-.ENDIF # OS2
-
 .IF "$(OS)"=="MACOSX"
 SHL1STDLIBS+=-framework CoreFoundation -framework Carbon
 .ENDIF
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 020e11fbc..152b02349 100755
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -598,14 +598,19 @@ UDK_3.10 { # OOo 3.2
         rtl_math_acosh;
 } UDK_3.9;
 
-
-UDK_3.11 { # OOo 3.4
+UDK_3.11 { # symbols available in >= OOo/LibO 3.4
     global:
         osl_setEnvironment;
         osl_clearEnvironment;
         osl_setThreadName;
 } UDK_3.10;
 
+LIBO_UDK_3.5 { # symbols available in >= LibO 3.5
+    global:
+        rtl_stringbuffer_remove;
+        rtl_uStringbuffer_remove;
+} UDK_3.10;
+
 PRIVATE_1.0 {
     global:
         osl_detail_ObjectRegistry_storeAddresses;
diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index 5a036dc13..8c0e7c4ed 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -100,20 +100,6 @@ APP4STDLIBS=$(SALLIB)
 APP4DEPN=$(SLB)$/sal.lib
 
 #
-# tgetpwnam
-#
-.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD" || \
-    "$(OS)"=="DRAGONFLY"
-OBJFILES+=\
-    $(OBJ)$/tgetpwnam.obj
-
-APP5TARGET=tgetpwnam
-APP5OBJS=$(OBJ)$/tgetpwnam.obj
-APP5STDLIBS=$(SALLIB)
-APP5DEPN=$(SLB)$/sal.lib
-.ENDIF # (netbsd | freebsd)
-
-#
 # measure_oustrings
 #
 OBJFILES+=\
@@ -233,44 +219,6 @@ DEF10NAME=$(SHL1TARGET)
 DEF10EXPORTFILE=export.exp
 .ENDIF
 
-.IF "$(TESTAPP)" == "salstattest"
-
-    CFLAGS+= -DUSE_SAL_STATIC
-
-    OBJFILES+=$(OBJ)$/salstattest.obj
-
-    APP10TARGET=salstattest
-    APP10OBJS=$(OBJ)$/salstattest.obj
-    APP10STDLIBS=\
-                $(LB)$/asal.lib\
-                $(SHELL32LIB)\
-                $(USER32LIB)\
-                $(COMDLG32LIB)\
-                $(ADVAPI32LIB)
-
-    APP10DEPN=$(LB)$/asal.lib
-
-.ENDIF # salstattest
-
-.IF "$(TESTAPP)" == "saldyntest"
-
-    OBJFILES+=$(OBJ)$/saldyntest.obj
-
-    APP10TARGET=saldyntest
-    APP10OBJS=$(OBJ)$/saldyntest.obj
-    APP10STDLIBS=\
-                $(LB)$/isal.lib\
-                $(SHELL32LIB)\
-                $(USER32LIB)\
-                $(COMDLG32LIB)\
-                $(ADVAPI32LIB)
-
-    APP10DEPN=$(LB)$/isal.lib
-
-.ENDIF # salstattest
-
-
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sal/workben/saldyntest.c b/sal/workben/saldyntest.c
deleted file mode 100644
index 2f82c834b..000000000
--- a/sal/workben/saldyntest.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <systools/win32/shell9x.h>
-#include <systools/win32/kernel9x.h>
-
-int _cdecl main( int argc, char * argv[] )
-{
-    BROWSEINFOW bi;
-    wchar_t     buff[260];
-    DWORD       dwRet;
-
-    bi.hwndOwner = NULL;
-    bi.pidlRoot = NULL;
-    bi.pszDisplayName = buff;
-    bi.lpszTitle = L"Test";
-    bi.ulFlags = 0;
-    bi.lpfn = NULL;
-    bi.lParam = 0;
-
-    SHBrowseForFolderW( &bi );
-
-    dwRet = GetCanonicalPathW( L"c:\\", buff, 260 );
-
-    return(0);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/salstattest.c b/sal/workben/salstattest.c
deleted file mode 100644
index 8c1557118..000000000
--- a/sal/workben/salstattest.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <stdio.h>
-#include <systools/win32/shell9x.h>
-#include <systools/win32/kernel9x.h>
-
-int _cdecl main( int argc, char * argv[] )
-{
-    BROWSEINFOW bi;
-    wchar_t     buff[260];
-    DWORD       dwRet;
-
-    bi.hwndOwner = NULL;
-    bi.pidlRoot = NULL;
-    bi.pszDisplayName = buff;
-    bi.lpszTitle = L"Test";
-    bi.ulFlags = 0;
-    bi.lpfn = NULL;
-    bi.lParam = 0;
-
-    SHBrowseForFolderW( &bi );
-    
-    dwRet = GetLongPathNameW( L"c:\\", buff, 260 );
-
-    return(0);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/t_random.c b/sal/workben/t_random.c
index ea24cc464..56f2da557 100644
--- a/sal/workben/t_random.c
+++ b/sal/workben/t_random.c
@@ -45,11 +45,7 @@ static char *pt (unsigned char *md, int length)
 /*
  * main.
  */
-#ifdef WIN32
-int __cdecl main (void)
-#else
-int main (void)
-#endif
+int SAL_CALL main (void)
 {
     rtlRandomPool pool;
     pool = rtl_random_createPool();
diff --git a/sal/workben/test.cxx b/sal/workben/test.cxx
index 37c30538d..df0f32962 100644
--- a/sal/workben/test.cxx
+++ b/sal/workben/test.cxx
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx
index 2103da6aa..3d3a27a29 100644
--- a/sal/workben/testfile.cxx
+++ b/sal/workben/testfile.cxx
@@ -129,7 +129,7 @@ sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBr
 sal_Bool Initialize( void )
 {
     DirectoryItem	aItem;
-    FileStatus		aStatus( FileStatusMask_All );
+    FileStatus		aStatus( osl_FileStatus_Mask_All );
     rtl_uString		*strExeFileURL=NULL;
     oslProcessError	ProcessError;
 
@@ -193,7 +193,7 @@ sal_Bool Initialize( void )
     uBytesRequested=aStatus.getFileSize();
 
     // read ini-File
-    rc=pFile->setPos( Pos_Absolut, 0 );
+    rc=pFile->setPos( osl_Pos_Absolut, 0 );
     pBuffer=(sal_Char*) rtl_allocateMemory( (sal_uInt32) (uBytesRequested+1)*sizeof(sal_Char) );
     rtl_zeroMemory( pBuffer, (sal_uInt32)(uBytesRequested+1)*sizeof(sal_Char) );
     
@@ -354,29 +354,29 @@ void showAttributes( sal_uInt64 uAttributes )
 {
     if ( uAttributes==0 )
         printf( "No Attributes \n" );
-    if ( uAttributes & Attribute_ReadOnly ) 
+    if ( uAttributes & osl_File_Attribute_ReadOnly )
         printf( "Attribute: ReadOnly \n" );
-    if ( uAttributes & Attribute_Hidden )
+    if ( uAttributes & osl_File_Attribute_Hidden )
         printf( "Attribute: Hidden \n" );
-    if ( uAttributes & Attribute_Executable ) 
+    if ( uAttributes & osl_File_Attribute_Executable )
         printf( "Attribute: Executable \n");
-    if ( uAttributes & Attribute_GrpWrite )
+    if ( uAttributes & osl_File_Attribute_GrpWrite )
         printf( "Attribute: GrpWrite \n");
-    if ( uAttributes & Attribute_GrpRead ) 
+    if ( uAttributes & osl_File_Attribute_GrpRead )
         printf( "Attribute: GrpRead \n" );
-    if ( uAttributes & Attribute_GrpExe )
+    if ( uAttributes & osl_File_Attribute_GrpExe )
         printf( "Attribute: GrpExe \n" );
-    if ( uAttributes & Attribute_OwnWrite ) 
+    if ( uAttributes & osl_File_Attribute_OwnWrite )
         printf( "Attribute: OwnWrite \n");
-    if ( uAttributes & Attribute_OwnRead )
+    if ( uAttributes & osl_File_Attribute_OwnRead )
         printf( "Attribute: OwnRead \n" );
-    if ( uAttributes & Attribute_OwnExe )
+    if ( uAttributes & osl_File_Attribute_OwnExe )
         printf( "Attribute: OwnExe \n" );
-    if ( uAttributes & Attribute_OthWrite )
+    if ( uAttributes & osl_File_Attribute_OthWrite )
         printf( "Attribute: OthWrite \n" );
-    if ( uAttributes & Attribute_OthRead )
+    if ( uAttributes & osl_File_Attribute_OthRead )
         printf( "Attribute: OthRead \n");
-    if ( uAttributes & Attribute_OthExe )
+    if ( uAttributes & osl_File_Attribute_OthExe )
         printf( "Attribute: OthExe \n" );
 
     return;
@@ -846,7 +846,7 @@ void FileWriteAndReadTest( void )
     // move the filepointer to the beginning
     //----------------------------------------------------
 
-    rc=pFile->setPos( Pos_Absolut , 0 );
+    rc=pFile->setPos( osl_Pos_Absolut , 0 );
     print_error( rtl::OString( "Set FilePointer to the beginning of the file" ), rc );
 
     printf( "\n" );
@@ -1110,7 +1110,7 @@ void FileSizeTest( void )
 
         if ( rc == FileBase::E_None )
         {
-            FileStatus rStatus( FileStatusMask_FileSize  );
+            FileStatus rStatus( osl_FileStatus_Mask_FileSize  );
             rc=aItem.getFileStatus( rStatus );
             print_error( rtl::OString( "Get FileStatus" ), rc );
 
@@ -1197,7 +1197,7 @@ void FilePointerTest( void )
         rFile.setSize( 5000 );
 
         printf( "Set the FilePointer at the end of the file (5000)\n" );
-        rc=rFile.setPos( Pos_End,0 );
+        rc=rFile.setPos( osl_Pos_End,0 );
         print_error( rtl::OString( "SetPos" ), rc );
 
         rc=rFile.getPos( filepointer );
@@ -1239,7 +1239,7 @@ void verifyFileAttributes( void )
 {
     FileBase::RC	rc;
     DirectoryItem	aItem;
-    FileStatus rStatus( FileStatusMask_Attributes  );
+    FileStatus rStatus( osl_FileStatus_Mask_Attributes  );
 
     printf( "\nVerify:\n" );
 
@@ -1278,7 +1278,7 @@ void FileAttributesTest( void )
     printf( "\n\n" );
     
 
-    rc=File::setAttributes( file1, Attribute_GrpWrite );
+    rc=File::setAttributes( file1, osl_File_Attribute_GrpWrite );
     print_error( rtl::OString( "Set Attribute: GrpWrite" ), rc );
     
     verifyFileAttributes();
@@ -1287,7 +1287,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_GrpRead );
+    rc=File::setAttributes( file1, osl_File_Attribute_GrpRead );
     print_error( rtl::OString( "Set Attribute: GrpRead" ), rc );
     
     verifyFileAttributes();
@@ -1296,7 +1296,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_GrpExe );
+    rc=File::setAttributes( file1, osl_File_Attribute_GrpExe );
     print_error( rtl::OString( "Set Attribute: GrpExe" ), rc );
     
     verifyFileAttributes();
@@ -1305,7 +1305,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OwnWrite );
+    rc=File::setAttributes( file1, osl_File_Attribute_OwnWrite );
     print_error( rtl::OString( "Set Attribute: OwnWrite" ), rc );
     
     verifyFileAttributes();
@@ -1314,7 +1314,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OwnRead );
+    rc=File::setAttributes( file1, osl_File_Attribute_OwnRead );
     print_error( rtl::OString( "Set Attribute: OwnRead" ), rc );
     
     verifyFileAttributes();
@@ -1323,7 +1323,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OwnExe );
+    rc=File::setAttributes( file1, osl_File_Attribute_OwnExe );
     print_error( rtl::OString( "Set Attribute: OwnExe" ), rc );
     
     verifyFileAttributes();
@@ -1332,7 +1332,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OthWrite );
+    rc=File::setAttributes( file1, osl_File_Attribute_OthWrite );
     print_error( rtl::OString( "Set Attribute: OthWrite" ), rc );
     
     verifyFileAttributes();
@@ -1341,7 +1341,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OthRead );
+    rc=File::setAttributes( file1, osl_File_Attribute_OthRead );
     print_error( rtl::OString( "Set Attribute: OthRead" ), rc );
     
     verifyFileAttributes();
@@ -1350,7 +1350,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OthExe );
+    rc=File::setAttributes( file1, osl_File_Attribute_OthExe );
     print_error( rtl::OString( "Set Attribute: OthExe" ), rc );
     
     verifyFileAttributes();
@@ -1360,7 +1360,7 @@ void FileAttributesTest( void )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
 
-    rc=File::setAttributes( file1, Attribute_GrpWrite | Attribute_GrpRead | Attribute_GrpExe | Attribute_OwnWrite | Attribute_OwnRead | Attribute_OwnExe | Attribute_OthWrite | Attribute_OthRead | Attribute_OthExe );
+    rc=File::setAttributes( file1, osl_File_Attribute_GrpWrite | osl_File_Attribute_GrpRead | osl_File_Attribute_GrpExe | osl_File_Attribute_OwnWrite | osl_File_Attribute_OwnRead | osl_File_Attribute_OwnExe | osl_File_Attribute_OthWrite | osl_File_Attribute_OthRead | osl_File_Attribute_OthExe );
     print_error( rtl::OString( "Set all Attributes" ), rc );
 
     verifyFileAttributes();
@@ -1385,7 +1385,7 @@ void FileAttributesTest( void )
     printf( "\n\n" );
     
 
-    rc=File::setAttributes( file1, Attribute_ReadOnly );
+    rc=File::setAttributes( file1, osl_File_Attribute_ReadOnly );
     print_error( rtl::OString( "Set Attribute: ReadOnly" ), rc );
     
     verifyFileAttributes();
@@ -1395,7 +1395,7 @@ void FileAttributesTest( void )
 
     verifyFileAttributes();
 
-    rc=File::setAttributes( file1, Attribute_Hidden );
+    rc=File::setAttributes( file1, osl_File_Attribute_Hidden );
     print_error( rtl::OString( "Set Attribute: Hidden" ), rc );
 
     verifyFileAttributes();
@@ -1405,7 +1405,7 @@ void FileAttributesTest( void )
 
     verifyFileAttributes();
 
-    rc=File::setAttributes( file1, Attribute_Hidden | Attribute_ReadOnly );
+    rc=File::setAttributes( file1, osl_File_Attribute_Hidden | osl_File_Attribute_ReadOnly );
     print_error( rtl::OString( "Set Attribute: Hidden & ReadOnly" ), rc );
 
     verifyFileAttributes();
@@ -1497,7 +1497,7 @@ void FileTimeTest( void )
     // Verify
     //--------------------------------------------------
     
-    FileStatus rStatus( FileStatusMask_CreationTime | FileStatusMask_AccessTime | FileStatusMask_ModifyTime);
+    FileStatus rStatus( osl_FileStatus_Mask_CreationTime | osl_FileStatus_Mask_AccessTime | osl_FileStatus_Mask_ModifyTime);
 
     printf( "\nVerify:\n" );
 
@@ -1588,7 +1588,7 @@ void DirectoryItemTest( void )
     rc=DirectoryItem::get( dir1 , aItem );
     print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-    pStatus=new FileStatus( FileStatusMask_All );
+    pStatus=new FileStatus( osl_FileStatus_Mask_All );
     rc=aItem.getFileStatus( *pStatus );
     
     if ( rc==FileBase::E_None )
@@ -1626,7 +1626,7 @@ void DirectoryItemTest( void )
     rc=DirectoryItem::get( file1 , aItem );
     print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-    pStatus=new FileStatus( FileStatusMask_All );
+    pStatus=new FileStatus( osl_FileStatus_Mask_All );
     rc=aItem.getFileStatus( *pStatus );
     
     if ( rc==FileBase::E_None )
@@ -1682,7 +1682,7 @@ void DirectoryItemTest( void )
         rc=DirectoryItem::get( file1 , aItem );
         print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-        pStatus=new FileStatus( FileStatusMask_All );
+        pStatus=new FileStatus( osl_FileStatus_Mask_All );
         rc=aItem.getFileStatus( *pStatus );
     
         if ( rc==FileBase::E_None )
@@ -1741,7 +1741,7 @@ void DirectoryItemTest( void )
         while( rc==FileBase::E_None )
         {
             
-            FileStatus rStatus( FileStatusMask_All );
+            FileStatus rStatus( osl_FileStatus_Mask_All );
             aItem.getFileStatus( rStatus );
 
             str=rStatus.getFileName();
@@ -1766,7 +1766,7 @@ void DirectoryItemTest( void )
             rc=pDir->reset();
             rc=pDir->getNextItem( aItem );
         
-            FileStatus rStatus( FileStatusMask_All );
+            FileStatus rStatus( osl_FileStatus_Mask_All );
             aItem.getFileStatus( rStatus );
 
             str1[i]=rStatus.getFileName();
@@ -1945,7 +1945,7 @@ void DirectoryFileStatusTest( void )
 
     if ( rc==FileBase::E_None )
     {	
-        pStatus=new FileStatus( FileStatusMask_All );
+        pStatus=new FileStatus( osl_FileStatus_Mask_All );
         rc=aItem.getFileStatus( *pStatus );
 
         FileStatusTest( pStatus );
@@ -1984,7 +1984,7 @@ void FileFileStatusTest( void )
 
     if ( rc==FileBase::E_None )
     {
-        pStatus=new FileStatus( FileStatusMask_All );
+        pStatus=new FileStatus( osl_FileStatus_Mask_All );
         rc=aItem.getFileStatus( *pStatus );
 
         FileStatusTest( pStatus );
@@ -2023,7 +2023,7 @@ void VolumeFileStatusTest( void )
 
     if ( rc==FileBase::E_None )
     {
-        pStatus=new FileStatus( FileStatusMask_All) ;
+        pStatus=new FileStatus( osl_FileStatus_Mask_All) ;
         rc=aItem.getFileStatus( *pStatus );
 
         FileStatusTest( pStatus );
@@ -2055,7 +2055,7 @@ void VolumeInfoTest( void )
     
     printf( "\n" );
 
-    VolumeInfo rInfo( VolumeInfoMask_FreeSpace );
+    VolumeInfo rInfo( osl_VolumeInfo_Mask_FreeSpace );
     rc=Directory::getVolumeInfo( root , rInfo );
     print_error( rtl::OString( "GetVolumeInfo" ),rc );	
 
diff --git a/sal/workben/tgetpwnam.cxx b/sal/workben/tgetpwnam.cxx
deleted file mode 100644
index 844aedee3..000000000
--- a/sal/workben/tgetpwnam.cxx
+++ /dev/null
@@ -1,250 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <pthread.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifndef NETBSD
-#include <shadow.h>
-#endif
-
-/* exercises some reentrant libc-fucntions */
-
-extern "C"
-{
-    struct tm *localtime_r(const time_t *timep, struct tm *buffer);
-    struct passwd* getpwnam_r(char*, struct passwd*, char *, int); 
-    struct spwd* getspnam_r(char*, struct spwd*, char *, int);
-    struct hostent *gethostbyname_r(const char *name, struct hostent *result,
-                                    char *buffer, int buflen, int *h_errnop);
-}
-
-static int go;
-
-
-
-extern "C" void *workfunc1(void*)
-{
-    char buffer[256];
-    struct tm		sttm;
-    time_t			nepoch;
-    struct passwd 	stpwd;
-    struct hostent	sthostent;
-    int 			nerr;
-
-    printf("starting thread 1 ...\n");
-    while (go) {
-        getpwnam_r("hr", &stpwd, buffer, sizeof(buffer));
-        gethostbyname_r("blauwal", &sthostent, buffer, sizeof(buffer), &nerr);
-        time(&nepoch);
-        localtime_r(&nepoch, &sttm);
-    }
-    return 0;
-}
-    
-extern "C" void *workfunc2(void*)
-{
-    char buffer[256];
-    struct tm		sttm;
-    time_t			nepoch;
-    struct passwd 	stpwd;
-    struct hostent	sthostent;
-    int 			nerr;
-
-    printf("starting thread 2 ...\n");
-    while(go) {
-        getpwnam_r("mh", &stpwd, buffer, sizeof(buffer));
-        gethostbyname_r("hr-1242", &sthostent, buffer, sizeof(buffer), &nerr);
-        time(&nepoch);
-        localtime_r(&nepoch, &sttm);
-    }
-    return 0;
-}
-
-
-extern int h_errno;
-
-int main(int argc, char *argv[])
-{
-    char buffer[256];
-    struct tm		*ptm;
-    time_t			nepoch;
-    struct passwd 	*pwd, *pres1;
-#ifndef NETBSD	
-    struct spwd 	*spwd, *pres2;
-#endif
-    struct hostent	*phostent, *pres3;
-    char **p;
-
-    pthread_t 		tid1,tid2;
-    int 			res1,res2;
-    
-    go = 1;
-
-    pthread_create(&tid1, NULL, workfunc1, &res1);
-    pthread_create(&tid2, NULL, workfunc2, &res2);
-
-    pwd = (struct passwd*)malloc(sizeof(struct passwd));
-
-    pres1 = getpwnam_r("hr", pwd, buffer, sizeof(buffer));
-
-    sleep(3);
-
-    if (pres1) {
-        printf("Name: %s\n", pwd->pw_name);
-        printf("Passwd: %s\n", pwd->pw_passwd);
-        printf("Uid: %d\n", pwd->pw_uid);
-        printf("Gid: %d\n", pwd->pw_gid);
-#ifdef NETBSD
-        printf("Change: %s", ctime(&pwd->pw_change));
-        printf("Class: %s\n", pwd->pw_class);
-#else
-        printf("Age: %s\n", pwd->pw_age);
-        printf("Comment: %s\n", pwd->pw_comment);
-#endif
-        printf("Gecos: %s\n", pwd->pw_gecos);
-        printf("Dir: %s\n", pwd->pw_dir);
-        printf("Shell: %s\n", pwd->pw_shell);
-    }
-    else
-        printf("getpwnam_r() failed!\n");
-
-    free(pwd);
-
-#ifndef NETBSD
-    spwd = (struct spwd*)malloc(sizeof(struct spwd));
-    
-    pres2 = getspnam_r("hr", spwd, buffer, sizeof(buffer));
-
-    if (pres2) {
-        printf("Name: %s\n", spwd->sp_namp);
-        printf("Passwd: %s\n", spwd->sp_pwdp);
-        printf("Last Change: %ld\n", spwd->sp_lstchg);
-        printf("Min: %ld\n", spwd->sp_min);
-        printf("Max: %ld\n", spwd->sp_max);
-    }
-    else
-        printf("getspnam_r() failed!\n");
-
-    free(spwd);
-#endif
-
-    ptm = (struct tm*)malloc(sizeof(struct tm));
-
-    time(&nepoch);
-    localtime_r(&nepoch, ptm);
-
-    printf("Seconds: %d\n", ptm->tm_sec); 
-    printf("Minutes: %d\n", ptm->tm_min); 
-    printf("Hour: %d\n", ptm->tm_hour); 
-    printf("Day of Month: %d\n", ptm->tm_mday); 
-    printf("Month: %d\n", ptm->tm_mon); 
-    printf("Year: %d\n", ptm->tm_year); 
-    printf("Day of week: %d\n", ptm->tm_wday); 
-    printf("Day in the year: %d\n", ptm->tm_yday); 
-    printf("Daylight saving time: %d\n", ptm->tm_isdst);
-#ifdef NETBSD	
-    printf("Timezone: %s\n", ptm->tm_zone);
-#else
-    printf("Timezone: %s\n", ptm->tm_name);
-#endif
-
-    free(ptm);
-
-    phostent = (struct hostent*)malloc(sizeof(struct hostent));
-
-    pres3 = gethostbyname_r("blauwal", phostent, buffer, sizeof(buffer), h_errno);
-
-    if (pres3) {
-        printf("Official Hostname: %s\n", phostent->h_name);
-        for ( p = phostent->h_aliases; *p != NULL; p++ )
-            printf("Alias: %s\n", *p);
-        printf("Addresstype: %d\n", phostent->h_addrtype);
-        printf("Address length: %d\n", phostent->h_length);
-        if ( phostent->h_addrtype == AF_INET ) {
-            for ( p = phostent->h_addr_list; *p != NULL; *p++ )
-                printf("Address: %s\n", inet_ntoa(**((in_addr**)p)));
-        }
-    }
-    
-
-    /* test boundary conditions */
-    char smallbuf[23]; /* buffer to small */
-    pres3 = gethostbyname_r("blauwal", phostent, smallbuf, sizeof(smallbuf), h_errno);
-    if (!pres3) {
-        perror("Expect ERANGE");
-    }
-    else
-    {
-        printf("ERROR: Check for buffersize went wrong\n");
-    }
-
-#ifdef NETBSD
-    char exactbuf[35];
-#else
-    char exactbuf[24]; /* should be exact the necessary size */
-#endif
-    pres3 = gethostbyname_r("blauwal", phostent, exactbuf, sizeof(exactbuf), &h_errno);
-    if (!pres3) {
-        perror("Check with exact buffersize");
-    }
-    else
-    {
-        printf("Boundary check ok\n");
-    }
-
-    /* test error conditions */
-    pres3 = gethostbyname_r("nohost", phostent, buffer, sizeof(buffer), &h_errno);
-    if (!pres3) {
-        herror("Expect HOST_NOT_FOUND");
-    }
-    else 
-    {
-        printf("failed to detect non existant host\n");
-    } 
-
-    free(phostent);
-    go = 0; /* atomic enough for our purposes */
-
-    pthread_join(tid1, NULL);
-    pthread_join(tid2, NULL);
-
-    exit(0);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/linkhelper.hxx b/salhelper/inc/salhelper/linkhelper.hxx
new file mode 100644
index 000000000..c8744dcca
--- /dev/null
+++ b/salhelper/inc/salhelper/linkhelper.hxx
@@ -0,0 +1,93 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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. 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.
+ *
+ * The Initial Developer of the Original Code is
+ *        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ *
+ * 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.
+ */
+#ifndef _SALHELPER_LINKHELPER_HXX
+#define _SALHELPER_LINKHELPER_HXX
+
+#include <rtl/ustring.hxx>
+#include <osl/file.hxx>
+
+namespace salhelper
+{
+    class LinkResolver
+    {
+    public:
+        osl::FileStatus m_aStatus;
+
+        LinkResolver(sal_uInt32 nMask)
+            : m_aStatus(nMask |
+                        osl_FileStatus_Mask_FileURL |
+                        osl_FileStatus_Mask_Type |
+                        osl_FileStatus_Mask_LinkTargetURL)
+        {
+        }
+
+        /** Resolve a file url if its a symbolic link, to a maximum depth of
+         *  nDepth and fill in m_aStatus with the requested ctor flags
+         *
+         *  @return osl::FileBase::E_None on success
+         *
+         *  @see DirectoryItem::getFileStatus
+         */
+        osl::FileBase::RC fetchFileStatus(const rtl::OUString &rURL,
+            int nDepth = 128)
+        {
+            //In an ideal world this wouldn't be inline, but I want to use this
+            //in jvmfwk hence salhelper, but salhelper is .map controlled and
+            //getting all the mangled names right is a misery, moving it over
+            //to visibility markup would drop per-symbol versioning
+            osl::FileBase::RC eReturn;
+
+            osl::DirectoryItem item;
+            rtl::OUString sURL(rURL);
+            while ((eReturn = osl::DirectoryItem::get(sURL, item))
+                  == osl::File::E_None)
+            {
+                if (--nDepth == 0)
+                {
+                    eReturn = osl::FileBase::E_MULTIHOP;
+                    break;
+                }
+                eReturn = item.getFileStatus(m_aStatus);
+                if (eReturn != osl::File::E_None)
+                    break;
+                if (m_aStatus.getFileType() != osl::FileStatus::Link)
+                {
+                    eReturn = osl::FileBase::E_None;
+                    break;
+                }
+                sURL = m_aStatus.getLinkTargetURL();
+            }
+
+            return eReturn;
+        }
+    };
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/prj/d.lst b/salhelper/prj/d.lst
index 86b44d042..6f5df5069 100644
--- a/salhelper/prj/d.lst
+++ b/salhelper/prj/d.lst
@@ -1,22 +1,23 @@
-mkdir: %_DEST%\inc%_EXT%\salhelper
+mkdir: %_DEST%\inc\salhelper
 
-..\inc\salhelper\condition.hxx %_DEST%\inc%_EXT%\salhelper\condition.hxx
-..\inc\salhelper\dynload.hxx %_DEST%\inc%_EXT%\salhelper\dynload.hxx
-..\inc\salhelper\future.hxx %_DEST%\inc%_EXT%\salhelper\future.hxx
-..\inc\salhelper\futurequeue.hxx %_DEST%\inc%_EXT%\salhelper\futurequeue.hxx
-..\inc\salhelper\monitor.hxx %_DEST%\inc%_EXT%\salhelper\monitor.hxx
-..\inc\salhelper\queue.hxx %_DEST%\inc%_EXT%\salhelper\queue.hxx
-..\inc\salhelper\refobj.hxx %_DEST%\inc%_EXT%\salhelper\refobj.hxx
-..\inc\salhelper\simplereferenceobject.hxx %_DEST%\inc%_EXT%\salhelper\simplereferenceobject.hxx
-..\inc\salhelper\singletonref.hxx %_DEST%\inc%_EXT%\salhelper\singletonref.hxx
-..\inc\salhelper\timer.hxx %_DEST%\inc%_EXT%\salhelper\timer.hxx
+..\inc\salhelper\condition.hxx %_DEST%\inc\salhelper\condition.hxx
+..\inc\salhelper\dynload.hxx %_DEST%\inc\salhelper\dynload.hxx
+..\inc\salhelper\future.hxx %_DEST%\inc\salhelper\future.hxx
+..\inc\salhelper\futurequeue.hxx %_DEST%\inc\salhelper\futurequeue.hxx
+..\inc\salhelper\monitor.hxx %_DEST%\inc\salhelper\monitor.hxx
+..\inc\salhelper\queue.hxx %_DEST%\inc\salhelper\queue.hxx
+..\inc\salhelper\linkhelper.hxx %_DEST%\inc\salhelper\linkhelper.hxx
+..\inc\salhelper\refobj.hxx %_DEST%\inc\salhelper\refobj.hxx
+..\inc\salhelper\simplereferenceobject.hxx %_DEST%\inc\salhelper\simplereferenceobject.hxx
+..\inc\salhelper\singletonref.hxx %_DEST%\inc\salhelper\singletonref.hxx
+..\inc\salhelper\timer.hxx %_DEST%\inc\salhelper\timer.hxx
 
-..\%__SRC%\bin\salhelp*.dll %_DEST%\bin%_EXT%\salhelp*.dll
-..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib%_EXT%\*
+..\%__SRC%\bin\salhelp*.dll %_DEST%\bin\salhelp*.dll
+..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib\*
 
-..\%__SRC%\lib\libuno_salhelper*.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_salhelper*.* %_DEST%\lib\*
 
-..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\salhelper*.lib %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib\*
+..\%__SRC%\lib\salhelper*.lib %_DEST%\lib\*
 
 linklib: libuno_salhelper*.*.*
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index f4e54ea3c..8c7d8a2c0 100644
--- a/salhelper/source/makefile.mk
+++ b/salhelper/source/makefile.mk
@@ -33,7 +33,7 @@ ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
+.IF "$(OS)" != "WNT"
 UNIXVERSIONNAMES=UDK
 .ENDIF # WNT
 
@@ -49,18 +49,17 @@ SLOFILES=	\
     $(SLO)$/simplereferenceobject.obj \
     $(SLO)$/timer.obj
 
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
 SHL1TARGET=	$(TARGET)$(UDK_MAJOR)$(COMID)
-.ELIF "$(GUI)" == "OS2"
-SHL1TARGET=	salhelp$(UDK_MAJOR)
+SHL1IMPLIB=	i$(TARGET)
 .ELSE
 SHL1TARGET=	uno_$(TARGET)$(COMID)
+SHL1IMPLIB=	$(SHL1TARGET)
 .ENDIF
 
 SHL1STDLIBS=$(SALLIB)
 
 SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 SHL1RPATH=  URELIB
@@ -71,8 +70,6 @@ DEF1NAME=	$(SHL1TARGET)
 SHL1VERSIONMAP=msci.map
 .ELIF "$(COMNAME)"=="mscx"
 SHL1VERSIONMAP=mscx.map
-.ELIF "$(GUI)"=="OS2"
-SHL1VERSIONMAP=gcc3os2.map
 .ELIF "$(COMNAME)"=="sunpro5"
 SHL1VERSIONMAP=sols.map
 .ELIF "$(COMNAME)"=="gcc3"
diff --git a/stoc/prj/build.lst b/stoc/prj/build.lst
index 256f09474..c7a1fe693 100644
--- a/stoc/prj/build.lst
+++ b/stoc/prj/build.lst
@@ -1,4 +1,4 @@
-tc	stoc	:	rdbmaker cppuhelper cppu jvmaccess sal salhelper jvmfwk xmlreader LIBXSTL:libxslt NULL
+tc	stoc	:	DESKTOP:rdbmaker cppuhelper cppu jvmaccess sal salhelper jvmfwk xmlreader LIBXSTL:libxslt registry NULL
 tc	stoc									usr1	-	all	tc_mkout NULL
 tc	stoc\inc								nmake	-	all	tc_inc NULL
 tc	stoc\source\defaultregistry				nmake	-	all	tc_defr tc_boot tc_inc NULL
diff --git a/stoc/prj/d.lst b/stoc/prj/d.lst
index 79b2d7734..35863e7e9 100644
--- a/stoc/prj/d.lst
+++ b/stoc/prj/d.lst
@@ -1,28 +1,28 @@
-mkdir: %_DEST%\inc%_EXT%\stoc
+mkdir: %_DEST%\inc\stoc
 
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*
-..\%__SRC%\misc\bootstrap.component %_DEST%\xml%_EXT%\bootstrap.component
-..\%__SRC%\misc\introspection.component %_DEST%\xml%_EXT%\introspection.component
-..\%__SRC%\misc\invocadapt.component %_DEST%\xml%_EXT%\invocadapt.component
-..\%__SRC%\misc\invocation.component %_DEST%\xml%_EXT%\invocation.component
-..\%__SRC%\misc\javaloader.component %_DEST%\xml%_EXT%\javaloader.component
-..\%__SRC%\misc\javavm.component %_DEST%\xml%_EXT%\javavm.component
-..\%__SRC%\misc\namingservice.component %_DEST%\xml%_EXT%\namingservice.component
-..\%__SRC%\misc\proxyfac.component %_DEST%\xml%_EXT%\proxyfac.component
-..\%__SRC%\misc\reflection.component %_DEST%\xml%_EXT%\reflection.component
-..\%__SRC%\misc\stocservices.component %_DEST%\xml%_EXT%\stocservices.component
+..\%__SRC%\bin\*.dll %_DEST%\bin\*
+..\%__SRC%\lib\*.so %_DEST%\lib\*
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\bin\*.rdb %_DEST%\rdb\*
+..\%__SRC%\misc\bootstrap.component %_DEST%\xml\bootstrap.component
+..\%__SRC%\misc\introspection.component %_DEST%\xml\introspection.component
+..\%__SRC%\misc\invocadapt.component %_DEST%\xml\invocadapt.component
+..\%__SRC%\misc\invocation.component %_DEST%\xml\invocation.component
+..\%__SRC%\misc\javaloader.component %_DEST%\xml\javaloader.component
+..\%__SRC%\misc\javavm.component %_DEST%\xml\javavm.component
+..\%__SRC%\misc\namingservice.component %_DEST%\xml\namingservice.component
+..\%__SRC%\misc\proxyfac.component %_DEST%\xml\proxyfac.component
+..\%__SRC%\misc\reflection.component %_DEST%\xml\reflection.component
+..\%__SRC%\misc\stocservices.component %_DEST%\xml\stocservices.component
 
-..\source\module-description.dtd %_DEST%\xml%_EXT%\module-description.dtd
-..\source\corereflection\corefl.xml %_DEST%\xml%_EXT%\reflection.uno.xml
-..\source\inspect\insp.xml %_DEST%\xml%_EXT%\introspection.uno.xml
-..\source\invocation\inv.xml %_DEST%\xml%_EXT%\invocation.uno.xml
-..\source\invocation_adapterfactory\invadp.xml %_DEST%\xml%_EXT%\invocadapt.uno.xml
-..\source\javavm\jen.xml %_DEST%\xml%_EXT%\javavm.uno.xml
-..\source\javaloader\javaloader.xml %_DEST%\xml%_EXT%\javaloader.uno.xml
-..\source\namingservice\namingservice.xml %_DEST%\xml%_EXT%\namingservice.uno.xml
-..\source\proxy_factory\proxyfac.xml %_DEST%\xml%_EXT%\proxyfac.uno.xml
-..\source\bootstrap\bootstrap.xml %_DEST%\xml%_EXT%\bootstrap.uno.xml
-..\source\typeconv\stocserv.xml %_DEST%\xml%_EXT%\stocserv.uno.xml
+..\source\module-description.dtd %_DEST%\xml\module-description.dtd
+..\source\corereflection\corefl.xml %_DEST%\xml\reflection.uno.xml
+..\source\inspect\insp.xml %_DEST%\xml\introspection.uno.xml
+..\source\invocation\inv.xml %_DEST%\xml\invocation.uno.xml
+..\source\invocation_adapterfactory\invadp.xml %_DEST%\xml\invocadapt.uno.xml
+..\source\javavm\jen.xml %_DEST%\xml\javavm.uno.xml
+..\source\javaloader\javaloader.xml %_DEST%\xml\javaloader.uno.xml
+..\source\namingservice\namingservice.xml %_DEST%\xml\namingservice.uno.xml
+..\source\proxy_factory\proxyfac.xml %_DEST%\xml\proxyfac.uno.xml
+..\source\bootstrap\bootstrap.xml %_DEST%\xml\bootstrap.uno.xml
+..\source\typeconv\stocserv.xml %_DEST%\xml\stocserv.uno.xml
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx
index 49a1ad020..32f7a401b 100644
--- a/stoc/source/bootstrap/services.cxx
+++ b/stoc/source/bootstrap/services.cxx
@@ -126,13 +126,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index b45d12fe8..4d242471f 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -62,33 +62,14 @@ static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 static Sequence< OUString > core_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) );
+    return seqNames;
 }
 
 static OUString core_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 //__________________________________________________________________________________________________
 IdlReflectionServiceImpl::IdlReflectionServiceImpl(
@@ -500,13 +481,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index cc96158d1..692e45ae1 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -33,7 +33,7 @@
 #ifdef SAL_UNX
 #include <sal/alloca.h>
 #endif
-#if !(defined(MACOSX) || defined(FREEBSD))
+#if !(defined(MACOSX) || defined(IOS) || defined(FREEBSD))
 #include <malloc.h>
 #endif
 #include <rtl/alloc.h>
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 6bb90285a..5ab668405 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -66,33 +66,14 @@ namespace stoc_bootstrap
 {
 Sequence< OUString > defreg_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString defreg_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 }
 
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index d9ff9ec02..485b9c293 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -59,7 +59,7 @@
 
 #include "mergekeys.hxx"
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #endif 
 
@@ -141,18 +141,9 @@ namespace stoc_bootstrap
 {
 Sequence< OUString > impreg_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = stoc_impreg::spool().sServiceName;
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = stoc_impreg::spool().sServiceName;
+    return seqNames;
 }
 
 OUString impreg_getImplementationName()
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index ba170a1fe..5ada829be 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -32,9 +32,7 @@
 #include <string.h>
 
 // Schalter fuer Introspection-Caching
-#ifndef OS2
 #define USE_INTROSPECTION_CACHE
-#endif
 
 #ifdef USE_INTROSPECTION_CACHE
 #define INTROSPECTION_CACHE_MAX_SIZE 100
@@ -3046,14 +3044,7 @@ Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Referen
 
 extern "C"
 {
-//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
     void * pRet = 0;
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 6528ea8e2..e5b05d09c 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -82,33 +82,14 @@ static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 static Sequence< OUString > inv_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 static OUString inv_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 
 // TODO: Zentral implementieren
@@ -1241,13 +1222,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 3d5c0168d..f011c137a 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -76,34 +76,15 @@ static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 static Sequence< OUString > invadp_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] =
-                OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] =
+        OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 static OUString invadp_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 
 struct hash_ptr
@@ -1010,14 +991,7 @@ sal_Bool SAL_CALL component_canUnload(
 }
 
 //==============================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//==============================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index a097c00c7..b28b766d5 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -86,37 +86,18 @@ static Mutex & getInitMutex();
 
 static Sequence< OUString > loader_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(2);
-            seqNames.getArray()[0] = OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Java") );
-            seqNames.getArray()[1] = OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Java2") );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(2);
+    seqNames.getArray()[0] = OUString(
+        RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Java") );
+    seqNames.getArray()[1] = OUString(
+        RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Java2") );
+    return seqNames;
 }
     
 static OUString loader_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.JavaComponentLoader" ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(
+        RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.JavaComponentLoader" ) );
 }
 
 class JavaComponentLoader : public WeakImplHelper2<XImplementationLoader, XServiceInfo>
@@ -464,16 +445,7 @@ static struct ImplementationEntry g_entries[] =
 
 extern "C"
 {
-// NOTE: component_canUnload is not exported, as the library cannot be unloaded.
-
-//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index c85ae3aef..93c21e174 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -609,14 +609,7 @@ private:
 
 }
 
-extern "C" void SAL_CALL
-component_getImplementationEnvironment(sal_Char const ** pEnvTypeName,
-                                       uno_Environment **)
-{
-    *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName,
                                                 void * pServiceManager,
                                                 void * pRegistryKey)
 {
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 215b0a99a..9c27a1f1b 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -73,33 +73,14 @@ namespace stoc_bootstrap
 {
 Sequence< OUString > loader_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString loader_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 }
 
@@ -221,8 +202,26 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate(
 
     throw(CannotActivateFactoryException, RuntimeException)
 {
+    rtl::OUString aPrefix;
+    if( xKey.is() )
+    {
+        Reference<XRegistryKey > xActivatorKey = xKey->openKey(
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) );
+        if (xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII )
+        {
+            Reference<XRegistryKey > xPrefixKey = xActivatorKey->openKey(
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/PREFIX") ) );
+            if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII )
+            {
+                aPrefix = xPrefixKey->getAsciiValue();
+                if( aPrefix.getLength() != 0 )
+                    aPrefix = aPrefix + OUSTR("_");
+            }
+        }
+    }
+
     return loadSharedLibComponentFactory(
-        expand_url( rLibName ), OUString(), rImplName, m_xSMgr, xKey );
+        expand_url( rLibName ), OUString(), rImplName, m_xSMgr, xKey, aPrefix );
 }
 
 
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 701a1774d..c93269578 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -63,33 +63,14 @@ static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 static Sequence< OUString > ns_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 static OUString ns_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 
 struct equalOWString_Impl
@@ -232,13 +213,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index 227485e50..84833f379 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -521,13 +521,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
     return g_moduleCount.canUnload( &g_moduleCount, pTime );
 }
 
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx
index 0f7908101..6c0ef2cc0 100644
--- a/stoc/source/registry_tdprovider/tdprovider.cxx
+++ b/stoc/source/registry_tdprovider/tdprovider.cxx
@@ -68,33 +68,14 @@ namespace stoc_bootstrap
 {
 uno::Sequence< OUString > rdbtdp_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString rdbtdp_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 }
 
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 405546c84..b42ab0efb 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -1043,9 +1043,9 @@ Reference< XInterface > SAL_CALL ac_create(
 //--------------------------------------------------------------------------------------------------
 Sequence< OUString > ac_getSupportedServiceNames() SAL_THROW( () )
 {
-    static OUString s_serviceName = OUSTR(SERVICE_NAME);
-    static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceName, 1 );
-    return s_serviceNames;
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
+    return aSNS;
 }
 //--------------------------------------------------------------------------------------------------
 OUString ac_getImplementationName() SAL_THROW( () )
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 1288881a9..109fecc0b 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -589,9 +589,9 @@ Reference< XInterface > SAL_CALL filepolicy_create(
 //--------------------------------------------------------------------------------------------------
 Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW( () )
 {
-    static OUString s_serviceName = OUSTR(SERVICE_NAME);
-    static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceName, 1 );
-    return s_serviceNames;
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
+    return aSNS;
 }
 //--------------------------------------------------------------------------------------------------
 OUString filepolicy_getImplementationName() SAL_THROW( () )
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 3dd3148c8..5c20e952c 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -95,102 +95,44 @@ namespace stoc_bootstrap
 {
 Sequence< OUString > smgr_wrapper_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(
-                RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory") );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory") );
+    return seqNames;
 }
 
 OUString smgr_wrapper_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.OServiceManagerWrapper" ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.OServiceManagerWrapper"));
 }
 
 Sequence< OUString > smgr_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(2);
-            seqNames.getArray()[0] = OUString(
-                RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory") );
-            seqNames.getArray()[1] = OUString(
-                RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.ServiceManager") );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(2);
+    seqNames.getArray()[0] = OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory") );
+    seqNames.getArray()[1] = OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.ServiceManager") );
+    return seqNames;
 }
 
 OUString smgr_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.OServiceManager" ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.OServiceManager"));
 }
 
 Sequence< OUString > regsmgr_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(2);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory"));
-            seqNames.getArray()[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.RegistryServiceManager"));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(2);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory"));
+    seqNames.getArray()[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.RegistryServiceManager"));
+    return seqNames;
 }
 
 OUString regsmgr_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.ORegistryServiceManager" ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.ORegistryServiceManager" ) );
 }
 }
 
@@ -506,11 +448,11 @@ void OServiceManager_Listener::disposing(const EventObject & rEvt )
         }
         catch( const IllegalArgumentException & )
         {
-            OSL_FAIL( "IllegalArgumentException catched" );
+            OSL_FAIL( "IllegalArgumentException caught" );
         }
         catch( const NoSuchElementException & )
         {
-            OSL_FAIL( "NoSuchElementException catched" );
+            OSL_FAIL( "NoSuchElementException caught" );
         }
     }
 }
diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx
index 5a50a5aa6..a5dd8f5fa 100644
--- a/stoc/source/simpleregistry/textualservices.cxx
+++ b/stoc/source/simpleregistry/textualservices.cxx
@@ -63,6 +63,7 @@ namespace css = com::sun::star;
 struct Implementation {
     rtl::OUString uri;
     rtl::OUString loader;
+    rtl::OUString prefix;
     std::vector< rtl::OUString > services;
     std::vector< rtl::OUString > singletons;
 };
@@ -103,6 +104,7 @@ private:
     rtl::Reference< Data > data_;
     rtl::OUString attrUri_;
     rtl::OUString attrLoader_;
+    rtl::OUString attrPrefix_;
     rtl::OUString attrImplementation_;
 };
 
@@ -238,6 +240,7 @@ Parser::Parser(rtl::OUString const & uri, rtl::Reference< Data > const & data):
 void Parser::handleComponent() {
     attrUri_ = rtl::OUString();
     attrLoader_ = rtl::OUString();
+    attrPrefix_ = rtl::OUString();
     xmlreader::Span name;
     int nsId;
     while (reader_.nextAttribute(&nsId, &name)) {
@@ -282,14 +285,29 @@ void Parser::handleComponent() {
                              ": <component> has empty \"loader\" attribute"))),
                     css::uno::Reference< css::uno::XInterface >());
             }
+        } else if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
+                   name.equals(RTL_CONSTASCII_STRINGPARAM("prefix")))
+        {
+            if (attrPrefix_.getLength() != 0) {
+                throw css::registry::InvalidRegistryException(
+                    (reader_.getUrl() +
+                     rtl::OUString(
+                         RTL_CONSTASCII_USTRINGPARAM(
+                             ": <component> has multiple \"prefix\""
+                             " attributes"))),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            attrPrefix_ = reader_.getAttributeValue(false).convertFromUtf8();
+            if (attrPrefix_.getLength() == 0) {
+                throw css::registry::InvalidRegistryException(
+                    (reader_.getUrl() +
+                     rtl::OUString(
+                         RTL_CONSTASCII_USTRINGPARAM(
+                             ": <component> has empty \"prefix\" attribute"))),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
         } else {
-            throw css::registry::InvalidRegistryException(
-                (reader_.getUrl() +
-                 rtl::OUString(
-                     RTL_CONSTASCII_USTRINGPARAM(
-                         ": expected <component> attribute \"uri\" or"
-                         " \"loader\""))),
-                css::uno::Reference< css::uno::XInterface >());
+          OSL_FAIL ("unexpected component attribute, expected 'uri' or 'loader' or 'prefix'");
         }
     }
     if (attrUri_.getLength() == 0) {
@@ -336,6 +354,7 @@ void Parser::handleImplementation() {
     }
     data_->implementations[attrImplementation_].uri = attrUri_;
     data_->implementations[attrImplementation_].loader = attrLoader_;
+    data_->implementations[attrImplementation_].prefix = attrPrefix_;
 }
 
 void Parser::handleService() {
@@ -425,6 +444,7 @@ private:
             UNO
               LOCATION utf-8
               ACTIVATOR utf-8
+              PREFIX utf-8
               SERVICES
                 <service>
                 ...
@@ -442,7 +462,7 @@ private:
     */
     enum State {
         STATE_ROOT, STATE_IMPLEMENTATIONS, STATE_IMPLEMENTATION, STATE_UNO,
-        STATE_LOCATION, STATE_ACTIVATOR, STATE_IMPLEMENTATION_SERVICES,
+        STATE_LOCATION, STATE_ACTIVATOR, STATE_PREFIX, STATE_IMPLEMENTATION_SERVICES,
         STATE_IMPLEMENTATION_SERVICE, STATE_IMPLEMENTATION_SINGLETONS,
         STATE_IMPLEMENTATION_SINGLETON, STATE_SERVICES, STATE_SERVICE,
         STATE_SINGLETONS, STATE_SINGLETON, STATE_REGISTEREDBY };
@@ -674,6 +694,8 @@ rtl::OUString Key::getAsciiValue() throw (
         return data_->implementations[path_[1]].uri;
     case STATE_ACTIVATOR:
         return data_->implementations[path_[1]].loader;
+    case STATE_PREFIX:
+        return data_->implementations[path_[1]].prefix;
     default:
         throw css::registry::InvalidValueException(
             rtl::OUString(
@@ -954,7 +976,7 @@ bool Key::find(
     if (path != 0) {
         *path = p;
     }
-    std::size_t const MAX_TRANSITIONS = 4;
+    std::size_t const MAX_TRANSITIONS = 5;
     struct StateInfo {
         css::registry::RegistryValueType type;
         std::size_t count;
@@ -974,15 +996,18 @@ bool Key::find(
         { css::registry::RegistryValueType_NOT_DEFINED, 1,
           { { "UNO", STATE_UNO } } },
         // STATE_UNO:
-        { css::registry::RegistryValueType_NOT_DEFINED, 4,
+        { css::registry::RegistryValueType_NOT_DEFINED, 5,
           { { "LOCATION", STATE_LOCATION },
             { "ACTIVATOR", STATE_ACTIVATOR },
+            { "PREFIX", STATE_PREFIX },
             { "SERVICES", STATE_IMPLEMENTATION_SERVICES },
             { "SINGLETONS", STATE_IMPLEMENTATION_SINGLETONS } } },
         // STATE_LOCATION:
         { css::registry::RegistryValueType_ASCII, 0, {} },
         // STATE_ACTIVATOR:
         { css::registry::RegistryValueType_ASCII, 0, {} },
+        // STATE_PREFIX:
+        { css::registry::RegistryValueType_ASCII, 0, {} },
         // STATE_IMPLEMENTATION_SERVICES:
         { css::registry::RegistryValueType_NOT_DEFINED, 1,
           { { 0, STATE_IMPLEMENTATION_SERVICE } } },
@@ -1090,15 +1115,17 @@ css::uno::Sequence< rtl::OUString > Key::getChildren() {
         }
     case STATE_UNO:
         {
-            css::uno::Sequence< rtl::OUString > seq(4);
+            css::uno::Sequence< rtl::OUString > seq(5);
             seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOCATION"));
             seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ACTIVATOR"));
-            seq[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SERVICES"));
-            seq[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SINGLETONS"));
+            seq[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PREFIX"));
+            seq[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SERVICES"));
+            seq[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SINGLETONS"));
             return seq;
         }
     case STATE_LOCATION:
     case STATE_ACTIVATOR:
+    case STATE_PREFIX:
     case STATE_IMPLEMENTATION_SERVICE:
     case STATE_IMPLEMENTATION_SINGLETON:
     case STATE_SERVICE:
diff --git a/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx
index f4e7e5371..0a9e96c71 100644
--- a/stoc/source/stocservices/stocservices.cxx
+++ b/stoc/source/stocservices/stocservices.cxx
@@ -96,13 +96,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index 235175143..6366818fe 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -86,33 +86,14 @@ namespace stoc_bootstrap
 {
 Sequence< OUString > SAL_CALL tdmgr_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString SAL_CALL tdmgr_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 }
 
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index b57208604..92ef7f1e6 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -68,33 +68,14 @@ namespace stoc_services
 {
 Sequence< OUString > tcv_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-    MutexGuard guard( Mutex::getGlobalMutex() );
-    if( !pNames )
-    {
-        static Sequence< OUString > seqNames(1);
-        seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-        pNames = &seqNames;
-    }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString tcv_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-    MutexGuard guard( Mutex::getGlobalMutex() );
-    if( ! pImplName )
-    {
-        static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-        pImplName = &implName;
-    }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 }
 
@@ -901,7 +882,9 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
         }
         
         case TypeClass_BOOLEAN:
-            aRet <<= OUString::createFromAscii( (*(sal_Bool *)rVal.getValue() ? "true" : "false") );
+            aRet <<= (*(sal_Bool *)rVal.getValue()) ?
+                OUString(RTL_CONSTASCII_USTRINGPARAM("true")) :
+                OUString(RTL_CONSTASCII_USTRINGPARAM("false"));
             break;
         case TypeClass_CHAR:
             aRet <<= OUString( (sal_Unicode *)rVal.getValue(), 1 );
diff --git a/stoc/test/excomp/excomp.cxx b/stoc/test/excomp/excomp.cxx
index 12706dd28..e184b9a94 100644
--- a/stoc/test/excomp/excomp.cxx
+++ b/stoc/test/excomp/excomp.cxx
@@ -67,7 +67,7 @@ OUString getExePath()
 
     OSL_VERIFY(osl_getExecutableFile( &exe.pData) == osl_Process_E_None);
 
-#if defined(WIN32) || defined(__OS2__) || defined(WNT)
+#if defined(WIN32) || defined(WNT)
     exe = exe.copy(0, exe.getLength() - 10);
 #else
     exe = exe.copy(0, exe.getLength() - 6);
diff --git a/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx
index bcc985a6c..84c075d41 100644
--- a/stoc/test/excomp/excomp1.cxx
+++ b/stoc/test/excomp/excomp1.cxx
@@ -155,12 +155,6 @@ Reference<XInterface> SAL_CALL ExampleComponent1_CreateInstance( const Reference
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 sal_Bool SAL_CALL component_writeInfo(
     void * /* pServiceManager */ , void * pRegistryKey )
 {
@@ -189,7 +183,7 @@ sal_Bool SAL_CALL component_writeInfo(
     return sal_False;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     void * pRet = 0;
diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx
index 907fd2afd..f9e84eaa9 100644
--- a/stoc/test/excomp/excomp2.cxx
+++ b/stoc/test/excomp/excomp2.cxx
@@ -226,12 +226,6 @@ Reference<XInterface> SAL_CALL ExampleComponent2_CreateInstance( const Reference
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 sal_Bool SAL_CALL component_writeInfo(
     void * /* pServiceManager */, void * pRegistryKey )
 {
@@ -260,7 +254,7 @@ sal_Bool SAL_CALL component_writeInfo(
     return sal_False;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     void * pRet = 0;
diff --git a/stoc/test/excomp/exports.dxp b/stoc/test/excomp/exports.dxp
index 9630d7e06..51703a046 100644
--- a/stoc/test/excomp/exports.dxp
+++ b/stoc/test/excomp/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
 component_writeInfo
 component_getFactory
diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk
index 2f24634da..d4be0a9ec 100644
--- a/stoc/test/makefile.mk
+++ b/stoc/test/makefile.mk
@@ -98,7 +98,7 @@ APP3STDLIBS= \
 .IF "$(GUI)"=="UNX"
 APP3STDLIBS+= -l$(SHL1TARGET)
 .ENDIF
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 APP3STDLIBS+= i$(SHL1TARGET).lib
 .ENDIF
 
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
index f76be27be..bf395f1e7 100644
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
+++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
@@ -882,15 +882,7 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
     return static_cast< cppu::OWeakObject * >(new Service(context));
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, uno_Environment **)
-{
-    if (envTypeName != 0) {
-        *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-    }
-}
-
-extern "C" void * SAL_CALL component_getFactory(char const * implName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName,
                                                 void * serviceManager, void *) {
     void * p = 0;
     if (serviceManager != 0) {
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index 3ce88df03..81353ae5c 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -313,15 +313,7 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
     return static_cast< cppu::OWeakObject * >(new Service(context));
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, uno_Environment **)
-{
-    if (envTypeName != 0) {
-        *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-    }
-}
-
-extern "C" void * SAL_CALL component_getFactory(char const * implName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName,
                                                 void * serviceManager, void *) {
     void * p = 0;
     if (serviceManager != 0) {
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index aee32df6a..b59030161 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -525,10 +525,8 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x100000000"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
-#ifndef OS2
     aVal <<= (double)( SAL_CONST_INT64(0x100000000) );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
-#endif
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     aVal <<= (double)( 5 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 );
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index bb74c4a21..5db6c0301 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -113,7 +113,7 @@ OUString getExePath()
 {
 OUString 		exe;
 OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
-#if defined(WIN32) || defined(__OS2__) || defined(WNT)
+#if defined(WIN32) || defined(WNT)
 exe = exe.copy(0, exe.getLength() - 16);
 #else
 exe = exe.copy(0, exe.getLength() - 12);
diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx
index f168e56db..d22f59fce 100644
--- a/stoc/test/testsmgr.cxx
+++ b/stoc/test/testsmgr.cxx
@@ -65,7 +65,7 @@ OUString getExePath()
 
     OSL_VERIFY( osl_getExecutableFile( &exe.pData) == osl_Process_E_None);
 
-#if defined(WIN32) || defined(__OS2__) || defined(WNT)
+#if defined(WIN32) || defined(WNT)
     exe = exe.copy(0, exe.getLength() - 16);
 #else
     exe = exe.copy(0, exe.getLength() - 12);
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index ac5436372..a16c5e016 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -292,12 +292,6 @@ extern "C" void SAL_CALL test_ServiceManager()
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 sal_Bool SAL_CALL component_writeInfo(
     void * /*pServiceManager*/, void * pRegistryKey )
 {
@@ -325,7 +319,7 @@ sal_Bool SAL_CALL component_writeInfo(
     return sal_False;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
diff --git a/stoc/test/testsmgr_cpnt.map b/stoc/test/testsmgr_cpnt.map
index ab5ed357b..3cfb43578 100644
--- a/stoc/test/testsmgr_cpnt.map
+++ b/stoc/test/testsmgr_cpnt.map
@@ -1,6 +1,5 @@
 UDK_3_0_0 {
     global:
-        component_getImplementationEnvironment;
         component_writeInfo;
         component_getFactory;
         test_ServiceManager;
diff --git a/store/prj/d.lst b/store/prj/d.lst
index e39be093c..b7809a7e1 100644
--- a/store/prj/d.lst
+++ b/store/prj/d.lst
@@ -1,12 +1,12 @@
-mkdir: %_DEST%\inc%_EXT%\store
-..\inc\store\*.h %_DEST%\inc%_EXT%\store\*.h
-..\inc\store\store.hxx %_DEST%\inc%_EXT%\store\store.hxx
-..\inc\store\store.inl %_DEST%\inc%_EXT%\store\store.inl
-..\util\store.xml %_DEST%\xml%_EXT%\store.xml
-
-..\%__SRC%\lib\istore.lib %_DEST%\lib%_EXT%\istore.lib
-..\%__SRC%\lib\libstore.*.* %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\sto*.dll %_DEST%\bin%_EXT%\sto*.dll
+mkdir: %_DEST%\inc\store
+..\inc\store\*.h %_DEST%\inc\store\*.h
+..\inc\store\store.hxx %_DEST%\inc\store\store.hxx
+..\inc\store\store.inl %_DEST%\inc\store\store.inl
+..\util\store.xml %_DEST%\xml\store.xml
+
+..\%__SRC%\lib\istore.lib %_DEST%\lib\istore.lib
+..\%__SRC%\lib\libstore.*.* %_DEST%\lib\*
+..\%__SRC%\bin\sto*.dll %_DEST%\bin\sto*.dll
 
 
 
diff --git a/store/util/makefile.mk b/store/util/makefile.mk
index 492f54cfa..801197cc8 100644
--- a/store/util/makefile.mk
+++ b/store/util/makefile.mk
@@ -56,7 +56,11 @@ LIB1FILES=	$(LB)$/store.lib
 # --- Shared-Library ---
 
 SHL1TARGET= 	$(TARGET)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= 	istore
+.ELSE
+SHL1IMPLIB= 	store
+.ENDIF
 
 SHL1VERSIONMAP=	$(TARGET).map
 
diff --git a/offapi/com/sun/star/configuration/bootstrap/makefile.mk b/udkapi/Makefile
index 8c234ead5..a79aff831 100644
--- a/offapi/com/sun/star/configuration/bootstrap/makefile.mk
+++ b/udkapi/Makefile
@@ -25,17 +25,14 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..$/..
-PRJNAME=offapi
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-TARGET = csscbootstrap
-PACKAGE = com$/sun$/star$/configuration$/bootstrap
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-IDLFILES = \
-    BootstrapContext.idl				\
-
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
+# vim: set noet sw=4 ts=4:
diff --git a/offapi/com/sun/star/sync2/makefile.mk b/udkapi/Module_udkapi.mk
index f158abd08..7b4d0d878 100644
--- a/offapi/com/sun/star/sync2/makefile.mk
+++ b/udkapi/Module_udkapi.mk
@@ -25,15 +25,14 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..
-PRJNAME=offapi
-TARGET = csssync2
-PACKAGE = com$/sun$/star$/sync2
 
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_Module_Module,udkapi))
 
-IDLFILES = \
-    BadPartnershipException.idl
+$(eval $(call gb_Module_add_targets,udkapi,\
+	UnoApi_udkapi \
+	UnoApi_uretypes \
+	Package_udkapi_inc \
+	Package_udkapi_idl \
+))
 
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
+# vim: set noet sw=4 ts=4:
diff --git a/udkapi/Package_udkapi_idl.mk b/udkapi/Package_udkapi_idl.mk
new file mode 100644
index 000000000..c8b6d60ce
--- /dev/null
+++ b/udkapi/Package_udkapi_idl.mk
@@ -0,0 +1,29 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_UnoApiTarget_autopackage_idl,udkapi))
+
diff --git a/udkapi/Package_udkapi_inc.mk b/udkapi/Package_udkapi_inc.mk
new file mode 100644
index 000000000..27943e7ec
--- /dev/null
+++ b/udkapi/Package_udkapi_inc.mk
@@ -0,0 +1,29 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_UnoApiTarget_autopackage_inc,udkapi))
+
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
new file mode 100644
index 000000000..4c0dca9a5
--- /dev/null
+++ b/udkapi/UnoApi_udkapi.mk
@@ -0,0 +1,468 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi))
+
+$(eval $(call gb_UnoApiTarget_set_include,udkapi,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/udkapi \
+	-I$(OUTDIR)/idl \
+))
+
+$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,\
+	udkapi/com/sun/star/beans/Introspection \
+	udkapi/com/sun/star/beans/PropertyBag \
+	udkapi/com/sun/star/beans/PropertySet \
+	udkapi/com/sun/star/bridge/Bridge \
+	udkapi/com/sun/star/bridge/BridgeFactory \
+	udkapi/com/sun/star/bridge/IiopBridge \
+	udkapi/com/sun/star/bridge/OleApplicationRegistration \
+	udkapi/com/sun/star/bridge/OleBridgeSupplier \
+	udkapi/com/sun/star/bridge/OleBridgeSupplier2 \
+	udkapi/com/sun/star/bridge/OleBridgeSupplierVar1 \
+	udkapi/com/sun/star/bridge/OleObjectFactory \
+	udkapi/com/sun/star/bridge/UrpBridge \
+	udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration \
+	udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier \
+	udkapi/com/sun/star/bridge/oleautomation/Factory \
+	udkapi/com/sun/star/corba/corba \
+	udkapi/com/sun/star/corba/giop/giop \
+	udkapi/com/sun/star/corba/iiop/iiop \
+	udkapi/com/sun/star/corba/iop/iop \
+	udkapi/com/sun/star/io/DataInputStream \
+	udkapi/com/sun/star/io/DataOutputStream \
+	udkapi/com/sun/star/io/MarkableInputStream \
+	udkapi/com/sun/star/io/MarkableOutputStream \
+	udkapi/com/sun/star/io/ObjectInputStream \
+	udkapi/com/sun/star/io/ObjectOutputStream \
+	udkapi/com/sun/star/io/Pipe \
+	udkapi/com/sun/star/io/Pump \
+	udkapi/com/sun/star/io/TextInputStream \
+	udkapi/com/sun/star/io/TextOutputStream \
+	udkapi/com/sun/star/java/JavaVirtualMachine \
+	udkapi/com/sun/star/lang/MultiServiceFactory \
+	udkapi/com/sun/star/lang/RegistryServiceManager \
+	udkapi/com/sun/star/lang/ServiceManager \
+	udkapi/com/sun/star/loader/Dynamic \
+	udkapi/com/sun/star/loader/Java \
+	udkapi/com/sun/star/loader/Java2 \
+	udkapi/com/sun/star/loader/SharedLibrary \
+	udkapi/com/sun/star/reflection/CoreReflection \
+	udkapi/com/sun/star/reflection/ProxyFactory \
+	udkapi/com/sun/star/reflection/TypeDescriptionManager \
+	udkapi/com/sun/star/reflection/TypeDescriptionProvider \
+	udkapi/com/sun/star/registry/DefaultRegistry \
+	udkapi/com/sun/star/registry/ImplementationRegistration \
+	udkapi/com/sun/star/registry/NestedRegistry \
+	udkapi/com/sun/star/registry/SimpleRegistry \
+	udkapi/com/sun/star/script/AllListenerAdapter \
+	udkapi/com/sun/star/script/Converter \
+	udkapi/com/sun/star/script/Engine \
+	udkapi/com/sun/star/script/Invocation \
+	udkapi/com/sun/star/script/InvocationAdapterFactory \
+	udkapi/com/sun/star/script/JavaScript \
+	udkapi/com/sun/star/security/AccessController \
+	udkapi/com/sun/star/security/Policy \
+	udkapi/com/sun/star/test/TestFactory \
+	udkapi/com/sun/star/udk-modules \
+	udkapi/com/sun/star/uno/NamingService \
+	udkapi/com/sun/star/util/BootstrapMacroExpander \
+	udkapi/com/sun/star/util/MacroExpander \
+	udkapi/com/sun/star/util/logging/Logger \
+	udkapi/com/sun/star/util/logging/LoggerRemote \
+	udkapi/com/sun/star/util/theMacroExpander \
+))
+
+$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,\
+	udkapi/com/sun/star/bridge/UnoUrlResolver \
+	udkapi/com/sun/star/connection/Acceptor \
+	udkapi/com/sun/star/connection/Connector \
+	udkapi/com/sun/star/container/EnumerableMap \
+	udkapi/com/sun/star/io/SequenceInputStream \
+	udkapi/com/sun/star/io/SequenceOutputStream \
+	udkapi/com/sun/star/io/TempFile \
+	udkapi/com/sun/star/uri/ExternalUriReferenceTranslator \
+	udkapi/com/sun/star/uri/UriReferenceFactory \
+	udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTexpand \
+	udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTscript \
+	udkapi/com/sun/star/uri/VndSunStarPkgUrlReferenceFactory \
+))
+
+$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,\
+	udkapi/com/sun/star/beans/Ambiguous \
+	udkapi/com/sun/star/beans/Defaulted \
+	udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult \
+	udkapi/com/sun/star/beans/GetPropertyTolerantResult \
+	udkapi/com/sun/star/beans/IllegalTypeException \
+	udkapi/com/sun/star/beans/IntrospectionException \
+	udkapi/com/sun/star/beans/MethodConcept \
+	udkapi/com/sun/star/beans/NamedValue \
+	udkapi/com/sun/star/beans/NotRemoveableException \
+	udkapi/com/sun/star/beans/Optional \
+	udkapi/com/sun/star/beans/Pair \
+	udkapi/com/sun/star/beans/Property \
+	udkapi/com/sun/star/beans/PropertyAttribute \
+	udkapi/com/sun/star/beans/PropertyChangeEvent \
+	udkapi/com/sun/star/beans/PropertyConcept \
+	udkapi/com/sun/star/beans/PropertyExistException \
+	udkapi/com/sun/star/beans/PropertySetInfoChange \
+	udkapi/com/sun/star/beans/PropertySetInfoChangeEvent \
+	udkapi/com/sun/star/beans/PropertyState \
+	udkapi/com/sun/star/beans/PropertyStateChangeEvent \
+	udkapi/com/sun/star/beans/PropertyValue \
+	udkapi/com/sun/star/beans/PropertyValues \
+	udkapi/com/sun/star/beans/PropertyVetoException \
+	udkapi/com/sun/star/beans/SetPropertyTolerantFailed \
+	udkapi/com/sun/star/beans/StringPair \
+	udkapi/com/sun/star/beans/TolerantPropertySetResultType \
+	udkapi/com/sun/star/beans/UnknownPropertyException \
+	udkapi/com/sun/star/beans/XExactName \
+	udkapi/com/sun/star/beans/XFastPropertySet \
+	udkapi/com/sun/star/beans/XHierarchicalPropertySet \
+	udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo \
+	udkapi/com/sun/star/beans/XIntroTest \
+	udkapi/com/sun/star/beans/XIntrospection \
+	udkapi/com/sun/star/beans/XIntrospectionAccess \
+	udkapi/com/sun/star/beans/XMaterialHolder \
+	udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet \
+	udkapi/com/sun/star/beans/XMultiPropertySet \
+	udkapi/com/sun/star/beans/XMultiPropertyStates \
+	udkapi/com/sun/star/beans/XPropertiesChangeListener \
+	udkapi/com/sun/star/beans/XPropertiesChangeNotifier \
+	udkapi/com/sun/star/beans/XProperty \
+	udkapi/com/sun/star/beans/XPropertyAccess \
+	udkapi/com/sun/star/beans/XPropertyChangeListener \
+	udkapi/com/sun/star/beans/XPropertyContainer \
+	udkapi/com/sun/star/beans/XPropertySet \
+	udkapi/com/sun/star/beans/XPropertySetInfo \
+	udkapi/com/sun/star/beans/XPropertySetInfoChangeListener \
+	udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier \
+	udkapi/com/sun/star/beans/XPropertyState \
+	udkapi/com/sun/star/beans/XPropertyStateChangeListener \
+	udkapi/com/sun/star/beans/XPropertyWithState \
+	udkapi/com/sun/star/beans/XTolerantMultiPropertySet \
+	udkapi/com/sun/star/beans/XVetoableChangeListener \
+	udkapi/com/sun/star/bridge/BridgeExistsException \
+	udkapi/com/sun/star/bridge/InvalidProtocolChangeException \
+	udkapi/com/sun/star/bridge/ModelDependent \
+	udkapi/com/sun/star/bridge/ProtocolProperty \
+	udkapi/com/sun/star/bridge/XBridge \
+	udkapi/com/sun/star/bridge/XBridgeFactory \
+	udkapi/com/sun/star/bridge/XBridgeSupplier \
+	udkapi/com/sun/star/bridge/XBridgeSupplier2 \
+	udkapi/com/sun/star/bridge/XInstanceProvider \
+	udkapi/com/sun/star/bridge/XProtocolProperties \
+	udkapi/com/sun/star/bridge/XUnoUrlResolver \
+	udkapi/com/sun/star/bridge/oleautomation/Currency \
+	udkapi/com/sun/star/bridge/oleautomation/Date \
+	udkapi/com/sun/star/bridge/oleautomation/Decimal \
+	udkapi/com/sun/star/bridge/oleautomation/NamedArgument \
+	udkapi/com/sun/star/bridge/oleautomation/PropertyPutArgument \
+	udkapi/com/sun/star/bridge/oleautomation/SCode \
+	udkapi/com/sun/star/bridge/oleautomation/XAutomationObject \
+	udkapi/com/sun/star/connection/AlreadyAcceptingException \
+	udkapi/com/sun/star/connection/ConnectionSetupException \
+	udkapi/com/sun/star/connection/NoConnectException \
+	udkapi/com/sun/star/connection/SocketPermission \
+	udkapi/com/sun/star/connection/XAcceptor \
+	udkapi/com/sun/star/connection/XConnection \
+	udkapi/com/sun/star/connection/XConnection2 \
+	udkapi/com/sun/star/connection/XConnectionBroadcaster \
+	udkapi/com/sun/star/connection/XConnector \
+	udkapi/com/sun/star/container/ContainerEvent \
+	udkapi/com/sun/star/container/ElementExistException \
+	udkapi/com/sun/star/container/NoSuchElementException \
+	udkapi/com/sun/star/container/XChild \
+	udkapi/com/sun/star/container/XComponentEnumeration \
+	udkapi/com/sun/star/container/XComponentEnumerationAccess \
+	udkapi/com/sun/star/container/XContainer \
+	udkapi/com/sun/star/container/XContainerApproveBroadcaster \
+	udkapi/com/sun/star/container/XContainerApproveListener \
+	udkapi/com/sun/star/container/XContainerListener \
+	udkapi/com/sun/star/container/XContainerQuery \
+	udkapi/com/sun/star/container/XContentEnumerationAccess \
+	udkapi/com/sun/star/container/XElementAccess \
+	udkapi/com/sun/star/container/XEnumerableMap \
+	udkapi/com/sun/star/container/XEnumeration \
+	udkapi/com/sun/star/container/XEnumerationAccess \
+	udkapi/com/sun/star/container/XHierarchicalName \
+	udkapi/com/sun/star/container/XHierarchicalNameAccess \
+	udkapi/com/sun/star/container/XHierarchicalNameContainer \
+	udkapi/com/sun/star/container/XHierarchicalNameReplace \
+	udkapi/com/sun/star/container/XIdentifierAccess \
+	udkapi/com/sun/star/container/XIdentifierContainer \
+	udkapi/com/sun/star/container/XIdentifierReplace \
+	udkapi/com/sun/star/container/XImplicitIDAccess \
+	udkapi/com/sun/star/container/XImplicitIDContainer \
+	udkapi/com/sun/star/container/XImplicitIDReplace \
+	udkapi/com/sun/star/container/XIndexAccess \
+	udkapi/com/sun/star/container/XIndexContainer \
+	udkapi/com/sun/star/container/XIndexReplace \
+	udkapi/com/sun/star/container/XMap \
+	udkapi/com/sun/star/container/XNameAccess \
+	udkapi/com/sun/star/container/XNameContainer \
+	udkapi/com/sun/star/container/XNameReplace \
+	udkapi/com/sun/star/container/XNamed \
+	udkapi/com/sun/star/container/XSet \
+	udkapi/com/sun/star/container/XStringKeyMap \
+	udkapi/com/sun/star/container/XUniqueIDAccess \
+	udkapi/com/sun/star/io/AlreadyConnectedException \
+	udkapi/com/sun/star/io/BufferSizeExceededException \
+	udkapi/com/sun/star/io/ConnectException \
+	udkapi/com/sun/star/io/DataTransferEvent \
+	udkapi/com/sun/star/io/FilePermission \
+	udkapi/com/sun/star/io/IOException \
+	udkapi/com/sun/star/io/NoRouteToHostException \
+	udkapi/com/sun/star/io/NotConnectedException \
+	udkapi/com/sun/star/io/SocketException \
+	udkapi/com/sun/star/io/UnexpectedEOFException \
+	udkapi/com/sun/star/io/UnknownHostException \
+	udkapi/com/sun/star/io/WrongFormatException \
+	udkapi/com/sun/star/io/XActiveDataControl \
+	udkapi/com/sun/star/io/XActiveDataSink \
+	udkapi/com/sun/star/io/XActiveDataSource \
+	udkapi/com/sun/star/io/XActiveDataStreamer \
+	udkapi/com/sun/star/io/XAsyncOutputMonitor \
+	udkapi/com/sun/star/io/XConnectable \
+	udkapi/com/sun/star/io/XDataExporter \
+	udkapi/com/sun/star/io/XDataImporter \
+	udkapi/com/sun/star/io/XDataInputStream \
+	udkapi/com/sun/star/io/XDataOutputStream \
+	udkapi/com/sun/star/io/XDataTransferEventListener \
+	udkapi/com/sun/star/io/XInputStream \
+	udkapi/com/sun/star/io/XInputStreamProvider \
+	udkapi/com/sun/star/io/XMarkableStream \
+	udkapi/com/sun/star/io/XObjectInputStream \
+	udkapi/com/sun/star/io/XObjectOutputStream \
+	udkapi/com/sun/star/io/XOutputStream \
+	udkapi/com/sun/star/io/XPersist \
+	udkapi/com/sun/star/io/XPersistObject \
+	udkapi/com/sun/star/io/XSeekable \
+	udkapi/com/sun/star/io/XSeekableInputStream \
+	udkapi/com/sun/star/io/XSequenceOutputStream \
+	udkapi/com/sun/star/io/XStream \
+	udkapi/com/sun/star/io/XStreamListener \
+	udkapi/com/sun/star/io/XTempFile \
+	udkapi/com/sun/star/io/XTextInputStream \
+	udkapi/com/sun/star/io/XTextOutputStream \
+	udkapi/com/sun/star/io/XTruncate \
+	udkapi/com/sun/star/io/XXMLExtractor \
+	udkapi/com/sun/star/java/InvalidJavaSettingsException \
+	udkapi/com/sun/star/java/JavaDisabledException \
+	udkapi/com/sun/star/java/JavaInitializationException \
+	udkapi/com/sun/star/java/JavaNotConfiguredException \
+	udkapi/com/sun/star/java/JavaNotFoundException \
+	udkapi/com/sun/star/java/JavaVMCreationFailureException \
+	udkapi/com/sun/star/java/MissingJavaRuntimeException \
+	udkapi/com/sun/star/java/RestartRequiredException \
+	udkapi/com/sun/star/java/WrongJavaVersionException \
+	udkapi/com/sun/star/java/XJavaThreadRegister_11 \
+	udkapi/com/sun/star/java/XJavaVM \
+	udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException \
+	udkapi/com/sun/star/lang/ClassNotFoundException \
+	udkapi/com/sun/star/lang/DisposedException \
+	udkapi/com/sun/star/lang/EventObject \
+	udkapi/com/sun/star/lang/IllegalAccessException \
+	udkapi/com/sun/star/lang/IllegalArgumentException \
+	udkapi/com/sun/star/lang/IndexOutOfBoundsException \
+	udkapi/com/sun/star/lang/InvalidListenerException \
+	udkapi/com/sun/star/lang/ListenerExistException \
+	udkapi/com/sun/star/lang/Locale \
+	udkapi/com/sun/star/lang/NoSuchFieldException \
+	udkapi/com/sun/star/lang/NoSuchMethodException \
+	udkapi/com/sun/star/lang/NoSupportException \
+	udkapi/com/sun/star/lang/NotInitializedException \
+	udkapi/com/sun/star/lang/NullPointerException \
+	udkapi/com/sun/star/lang/ServiceNotRegisteredException \
+	udkapi/com/sun/star/lang/SystemDependent \
+	udkapi/com/sun/star/lang/WrappedTargetException \
+	udkapi/com/sun/star/lang/WrappedTargetRuntimeException \
+	udkapi/com/sun/star/lang/XComponent \
+	udkapi/com/sun/star/lang/XConnectionPoint \
+	udkapi/com/sun/star/lang/XConnectionPointContainer \
+	udkapi/com/sun/star/lang/XEventListener \
+	udkapi/com/sun/star/lang/XInitialization \
+	udkapi/com/sun/star/lang/XLocalizable \
+	udkapi/com/sun/star/lang/XMain \
+	udkapi/com/sun/star/lang/XMultiComponentFactory \
+	udkapi/com/sun/star/lang/XMultiServiceFactory \
+	udkapi/com/sun/star/lang/XServiceDisplayName \
+	udkapi/com/sun/star/lang/XServiceInfo \
+	udkapi/com/sun/star/lang/XServiceName \
+	udkapi/com/sun/star/lang/XSingleComponentFactory \
+	udkapi/com/sun/star/lang/XSingleServiceFactory \
+	udkapi/com/sun/star/lang/XTypeProvider \
+	udkapi/com/sun/star/lang/XUnoTunnel \
+	udkapi/com/sun/star/loader/CannotActivateFactoryException \
+	udkapi/com/sun/star/loader/XImplementationLoader \
+	udkapi/com/sun/star/reflection/FieldAccessMode \
+	udkapi/com/sun/star/reflection/InvalidTypeNameException \
+	udkapi/com/sun/star/reflection/InvocationTargetException \
+	udkapi/com/sun/star/reflection/MethodMode \
+	udkapi/com/sun/star/reflection/NoSuchTypeNameException \
+	udkapi/com/sun/star/reflection/ParamInfo \
+	udkapi/com/sun/star/reflection/ParamMode \
+	udkapi/com/sun/star/reflection/TypeDescriptionSearchDepth \
+	udkapi/com/sun/star/reflection/XArrayTypeDescription \
+	udkapi/com/sun/star/reflection/XCompoundTypeDescription \
+	udkapi/com/sun/star/reflection/XConstantTypeDescription \
+	udkapi/com/sun/star/reflection/XConstantsTypeDescription \
+	udkapi/com/sun/star/reflection/XEnumTypeDescription \
+	udkapi/com/sun/star/reflection/XIdlArray \
+	udkapi/com/sun/star/reflection/XIdlClass \
+	udkapi/com/sun/star/reflection/XIdlClassProvider \
+	udkapi/com/sun/star/reflection/XIdlField \
+	udkapi/com/sun/star/reflection/XIdlField2 \
+	udkapi/com/sun/star/reflection/XIdlMember \
+	udkapi/com/sun/star/reflection/XIdlMethod \
+	udkapi/com/sun/star/reflection/XIdlReflection \
+	udkapi/com/sun/star/reflection/XIndirectTypeDescription \
+	udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription \
+	udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2 \
+	udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription \
+	udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription \
+	udkapi/com/sun/star/reflection/XInterfaceTypeDescription \
+	udkapi/com/sun/star/reflection/XInterfaceTypeDescription2 \
+	udkapi/com/sun/star/reflection/XMethodParameter \
+	udkapi/com/sun/star/reflection/XModuleTypeDescription \
+	udkapi/com/sun/star/reflection/XParameter \
+	udkapi/com/sun/star/reflection/XPropertyTypeDescription \
+	udkapi/com/sun/star/reflection/XProxyFactory \
+	udkapi/com/sun/star/reflection/XPublished \
+	udkapi/com/sun/star/reflection/XServiceConstructorDescription \
+	udkapi/com/sun/star/reflection/XServiceTypeDescription \
+	udkapi/com/sun/star/reflection/XServiceTypeDescription2 \
+	udkapi/com/sun/star/reflection/XSingletonTypeDescription \
+	udkapi/com/sun/star/reflection/XSingletonTypeDescription2 \
+	udkapi/com/sun/star/reflection/XStructTypeDescription \
+	udkapi/com/sun/star/reflection/XTypeDescription \
+	udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration \
+	udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess \
+	udkapi/com/sun/star/reflection/XUnionTypeDescription \
+	udkapi/com/sun/star/registry/CannotRegisterImplementationException \
+	udkapi/com/sun/star/registry/InvalidRegistryException \
+	udkapi/com/sun/star/registry/InvalidValueException \
+	udkapi/com/sun/star/registry/MergeConflictException \
+	udkapi/com/sun/star/registry/RegistryKeyType \
+	udkapi/com/sun/star/registry/RegistryValueType \
+	udkapi/com/sun/star/registry/XImplementationRegistration \
+	udkapi/com/sun/star/registry/XImplementationRegistration2 \
+	udkapi/com/sun/star/registry/XRegistryKey \
+	udkapi/com/sun/star/registry/XSimpleRegistry \
+	udkapi/com/sun/star/script/AllEventObject \
+	udkapi/com/sun/star/script/ArrayWrapper \
+	udkapi/com/sun/star/script/BasicErrorException \
+	udkapi/com/sun/star/script/CannotConvertException \
+	udkapi/com/sun/star/script/CannotCreateAdapterException \
+	udkapi/com/sun/star/script/ContextInformation \
+	udkapi/com/sun/star/script/FailReason \
+	udkapi/com/sun/star/script/FinishEngineEvent \
+	udkapi/com/sun/star/script/FinishReason \
+	udkapi/com/sun/star/script/InterruptEngineEvent \
+	udkapi/com/sun/star/script/InterruptReason \
+	udkapi/com/sun/star/script/InvocationInfo \
+	udkapi/com/sun/star/script/MemberType \
+	udkapi/com/sun/star/script/ScriptEvent \
+	udkapi/com/sun/star/script/ScriptEventDescriptor \
+	udkapi/com/sun/star/script/XAllListener \
+	udkapi/com/sun/star/script/XAllListenerAdapterService \
+    udkapi/com/sun/star/script/XAutomationInvocation \
+	udkapi/com/sun/star/script/XDebugging \
+	udkapi/com/sun/star/script/XDefaultMethod \
+	udkapi/com/sun/star/script/XDefaultProperty \
+	udkapi/com/sun/star/script/XDirectInvocation \
+	udkapi/com/sun/star/script/XEngine \
+	udkapi/com/sun/star/script/XEngineListener \
+	udkapi/com/sun/star/script/XErrorQuery \
+	udkapi/com/sun/star/script/XEventAttacher \
+	udkapi/com/sun/star/script/XEventAttacherManager \
+	udkapi/com/sun/star/script/XInvocation \
+	udkapi/com/sun/star/script/XInvocation2 \
+	udkapi/com/sun/star/script/XInvocationAdapterFactory \
+	udkapi/com/sun/star/script/XInvocationAdapterFactory2 \
+	udkapi/com/sun/star/script/XLibraryAccess \
+	udkapi/com/sun/star/script/XScriptEventsAttacher \
+	udkapi/com/sun/star/script/XScriptEventsSupplier \
+	udkapi/com/sun/star/script/XScriptListener \
+	udkapi/com/sun/star/script/XStarBasicAccess \
+	udkapi/com/sun/star/script/XStarBasicDialogInfo \
+	udkapi/com/sun/star/script/XStarBasicLibraryInfo \
+	udkapi/com/sun/star/script/XStarBasicModuleInfo \
+	udkapi/com/sun/star/script/XTypeConverter \
+	udkapi/com/sun/star/security/AccessControlException \
+	udkapi/com/sun/star/security/AllPermission \
+	udkapi/com/sun/star/security/RuntimePermission \
+	udkapi/com/sun/star/security/XAccessControlContext \
+	udkapi/com/sun/star/security/XAccessController \
+	udkapi/com/sun/star/security/XAction \
+	udkapi/com/sun/star/security/XPolicy \
+	udkapi/com/sun/star/task/XInteractionAbort \
+	udkapi/com/sun/star/task/XInteractionContinuation \
+	udkapi/com/sun/star/task/XInteractionHandler \
+	udkapi/com/sun/star/task/XInteractionHandler2 \
+	udkapi/com/sun/star/task/XInteractionRequest \
+	udkapi/com/sun/star/task/XInteractionRetry \
+	udkapi/com/sun/star/test/TestEvent \
+	udkapi/com/sun/star/test/XSimpleTest \
+	udkapi/com/sun/star/test/XTest \
+	udkapi/com/sun/star/test/XTestListener \
+	udkapi/com/sun/star/test/bridge/XBridgeTest \
+	udkapi/com/sun/star/test/performance/XPerformanceTest \
+	udkapi/com/sun/star/uno/DeploymentException \
+	udkapi/com/sun/star/uno/Exception \
+	udkapi/com/sun/star/uno/RuntimeException \
+	udkapi/com/sun/star/uno/SecurityException \
+	udkapi/com/sun/star/uno/TypeClass \
+	udkapi/com/sun/star/uno/Uik \
+	udkapi/com/sun/star/uno/XAdapter \
+	udkapi/com/sun/star/uno/XAggregation \
+	udkapi/com/sun/star/uno/XComponentContext \
+	udkapi/com/sun/star/uno/XCurrentContext \
+	udkapi/com/sun/star/uno/XInterface \
+	udkapi/com/sun/star/uno/XNamingService \
+	udkapi/com/sun/star/uno/XReference \
+	udkapi/com/sun/star/uno/XUnloadingPreference \
+	udkapi/com/sun/star/uno/XWeak \
+	udkapi/com/sun/star/uri/RelativeUriExcessParentSegments \
+	udkapi/com/sun/star/uri/XExternalUriReferenceTranslator \
+	udkapi/com/sun/star/uri/XUriReference \
+	udkapi/com/sun/star/uri/XUriReferenceFactory \
+	udkapi/com/sun/star/uri/XUriSchemeParser \
+	udkapi/com/sun/star/uri/XVndSunStarExpandUrl \
+	udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference \
+	udkapi/com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory \
+	udkapi/com/sun/star/uri/XVndSunStarScriptUrl \
+	udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference \
+	udkapi/com/sun/star/util/XMacroExpander \
+	udkapi/com/sun/star/util/XVeto \
+	udkapi/com/sun/star/util/logging/LogLevel \
+	udkapi/com/sun/star/util/logging/XLogger \
+	udkapi/com/sun/star/util/logging/XLoggerRemote \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApi_uretypes.mk
new file mode 100644
index 000000000..8fa615d5a
--- /dev/null
+++ b/udkapi/UnoApi_uretypes.mk
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types))
+
+$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\
+    udkapi \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/udkapi/com/sun/star/beans/Ambiguous.idl b/udkapi/com/sun/star/beans/Ambiguous.idl
index 2a54fc229..ec443e7cb 100644
--- a/udkapi/com/sun/star/beans/Ambiguous.idl
+++ b/udkapi/com/sun/star/beans/Ambiguous.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module beans {
    have the <const
    scope="com::sun::star::beans">PropertyAttribute::MAYBEAMBIGUOUS</const>.</p>
  */
-struct Ambiguous<T> {
+published struct Ambiguous<T> {
     /**
        The underlying value of this structure instance.
 
diff --git a/udkapi/com/sun/star/beans/Defaulted.idl b/udkapi/com/sun/star/beans/Defaulted.idl
index 66f5ccb6c..7b0b09318 100644
--- a/udkapi/com/sun/star/beans/Defaulted.idl
+++ b/udkapi/com/sun/star/beans/Defaulted.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module beans {
    have the <const
    scope="com::sun::star::beans">PropertyAttribute::MAYBEDEFAULT</const>.</p>
  */
-struct Defaulted<T> {
+published struct Defaulted<T> {
     /**
        The underlying value of this structure instance.
 
diff --git a/udkapi/com/sun/star/beans/Optional.idl b/udkapi/com/sun/star/beans/Optional.idl
index 00ce5deba..a2786e519 100644
--- a/udkapi/com/sun/star/beans/Optional.idl
+++ b/udkapi/com/sun/star/beans/Optional.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module beans {
    also be useful in other situations, for example as the return type of an
    interface method.</p>
  */
-struct Optional<T> {
+published struct Optional<T> {
     /**
        Marks this structure instance as having an actual value.
      */
diff --git a/udkapi/com/sun/star/beans/Pair.idl b/udkapi/com/sun/star/beans/Pair.idl
index 39d3653f6..4089300a5 100644
--- a/udkapi/com/sun/star/beans/Pair.idl
+++ b/udkapi/com/sun/star/beans/Pair.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module beans {
 
     @since OOo 3.0
  */
-struct Pair<T, U> {
+published struct Pair<T, U> {
 
     /// first object.
     T First;
diff --git a/udkapi/com/sun/star/beans/makefile.mk b/udkapi/com/sun/star/beans/makefile.mk
deleted file mode 100644
index 8e5aba61f..000000000
--- a/udkapi/com/sun/star/beans/makefile.mk
+++ /dev/null
@@ -1,101 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssbeans
-PACKAGE=com$/sun$/star$/beans
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Ambiguous.idl\
-    Defaulted.idl\
-    GetDirectPropertyTolerantResult.idl\
-    GetPropertyTolerantResult.idl\
-    IllegalTypeException.idl\
-    Introspection.idl\
-    IntrospectionException.idl\
-    MethodConcept.idl\
-    NamedValue.idl\
-    NotRemoveableException.idl\
-    Optional.idl\
-    Pair.idl\
-    Property.idl\
-    PropertyAttribute.idl\
-    PropertyBag.idl\
-    PropertyChangeEvent.idl\
-    PropertyConcept.idl\
-    PropertyExistException.idl\
-    PropertySet.idl\
-    PropertySetInfoChange.idl\
-    PropertySetInfoChangeEvent.idl\
-    PropertyState.idl\
-    PropertyStateChangeEvent.idl\
-    PropertyValue.idl\
-    PropertyValues.idl\
-    PropertyVetoException.idl\
-    SetPropertyTolerantFailed.idl\
-    StringPair.idl\
-    TolerantPropertySetResultType.idl\
-    UnknownPropertyException.idl\
-    XExactName.idl\
-    XFastPropertySet.idl\
-    XHierarchicalPropertySet.idl\
-    XHierarchicalPropertySetInfo.idl\
-    XIntrospection.idl\
-    XIntrospectionAccess.idl\
-    XIntroTest.idl\
-    XMaterialHolder.idl\
-    XMultiPropertySet.idl\
-    XMultiPropertyStates.idl\
-    XMultiHierarchicalPropertySet.idl\
-    XPropertiesChangeListener.idl\
-    XPropertiesChangeNotifier.idl\
-    XProperty.idl\
-    XPropertyAccess.idl\
-    XPropertyChangeListener.idl\
-    XPropertyContainer.idl\
-    XPropertySet.idl\
-    XPropertySetInfo.idl\
-    XPropertySetInfoChangeListener.idl\
-    XPropertySetInfoChangeNotifier.idl\
-    XPropertyState.idl\
-    XPropertyStateChangeListener.idl\
-    XPropertyWithState.idl\
-    XTolerantMultiPropertySet.idl\
-    XVetoableChangeListener.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/bridge/makefile.mk b/udkapi/com/sun/star/bridge/makefile.mk
deleted file mode 100644
index 74c95bfce..000000000
--- a/udkapi/com/sun/star/bridge/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssbridge
-PACKAGE=com$/sun$/star$/bridge
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ModelDependent.idl\
-    OleApplicationRegistration.idl\
-    OleBridgeSupplier.idl\
-    OleBridgeSupplier2.idl\
-    OleBridgeSupplierVar1.idl\
-    OleObjectFactory.idl\
-    XBridgeSupplier.idl\
-    XBridgeSupplier2.idl\
-    XBridge.idl \
-    XBridgeFactory.idl\
-    XInstanceProvider.idl\
-    BridgeExistsException.idl \
-    XUnoUrlResolver.idl \
-    UnoUrlResolver.idl \
-    XProtocolProperties.idl \
-    ProtocolProperty.idl \
-    InvalidProtocolChangeException.idl \
-    Bridge.idl \
-    BridgeFactory.idl \
-    UrpBridge.idl \
-    IiopBridge.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/bridge/oleautomation/makefile.mk b/udkapi/com/sun/star/bridge/oleautomation/makefile.mk
deleted file mode 100644
index acb0365a4..000000000
--- a/udkapi/com/sun/star/bridge/oleautomation/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssboleautomation
-PACKAGE=com$/sun$/star$/bridge$/oleautomation
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ApplicationRegistration.idl\
-    BridgeSupplier.idl\
-    Factory.idl \
-    Decimal.idl \
-    Currency.idl \
-    Date.idl \
-    NamedArgument.idl \
-    SCode.idl \
-    PropertyPutArgument.idl \
-    XAutomationObject.idl
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/connection/makefile.mk b/udkapi/com/sun/star/connection/makefile.mk
deleted file mode 100644
index 616871af4..000000000
--- a/udkapi/com/sun/star/connection/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssconnection
-PACKAGE=com$/sun$/star$/connection
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    SocketPermission.idl\
-    XConnection.idl\
-    XConnection2.idl\
-    XConnectionBroadcaster.idl\
-    XAcceptor.idl\
-    XConnector.idl\
-    NoConnectException.idl\
-    AlreadyAcceptingException.idl\
-    ConnectionSetupException.idl \
-    Connector.idl \
-    Acceptor.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/container/makefile.mk b/udkapi/com/sun/star/container/makefile.mk
deleted file mode 100644
index 5385b7e98..000000000
--- a/udkapi/com/sun/star/container/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=csscontainer
-PACKAGE=com$/sun$/star$/container
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XIdentifierAccess.idl\
-    XIdentifierReplace.idl\
-    XIdentifierContainer.idl\
-    ContainerEvent.idl\
-    ElementExistException.idl\
-    EnumerableMap.idl\
-    NoSuchElementException.idl\
-    XChild.idl\
-    XUniqueIDAccess.idl\
-    XComponentEnumeration.idl\
-    XComponentEnumerationAccess.idl\
-    XContainer.idl\
-    XContainerApproveBroadcaster.idl\
-    XContainerApproveListener.idl\
-    XContainerListener.idl\
-    XContainerQuery.idl\
-    XContentEnumerationAccess.idl\
-    XElementAccess.idl\
-    XEnumerableMap.idl\
-    XEnumeration.idl\
-    XEnumerationAccess.idl\
-    XHierarchicalName.idl\
-    XHierarchicalNameAccess.idl\
-    XHierarchicalNameReplace.idl\
-    XHierarchicalNameContainer.idl\
-    XImplicitIDAccess.idl\
-    XImplicitIDContainer.idl\
-    XImplicitIDReplace.idl\
-    XIndexAccess.idl\
-    XIndexContainer.idl\
-    XIndexReplace.idl\
-    XMap.idl\
-    XNameAccess.idl\
-    XNameContainer.idl\
-    XNamed.idl\
-    XNameReplace.idl\
-    XSet.idl\
-    XStringKeyMap.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/corba/giop/makefile.mk b/udkapi/com/sun/star/corba/giop/makefile.mk
deleted file mode 100644
index 1e05e5619..000000000
--- a/udkapi/com/sun/star/corba/giop/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssgiop
-PACKAGE=com$/sun$/star$/giop
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    giop.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/corba/iiop/makefile.mk b/udkapi/com/sun/star/corba/iiop/makefile.mk
deleted file mode 100644
index c59fd0029..000000000
--- a/udkapi/com/sun/star/corba/iiop/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssiiop
-PACKAGE=com$/sun$/star$/iiop
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    iiop.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/corba/iop/makefile.mk b/udkapi/com/sun/star/corba/iop/makefile.mk
deleted file mode 100644
index 982c68c9a..000000000
--- a/udkapi/com/sun/star/corba/iop/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssiop
-PACKAGE=com$/sun$/star$/iop
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    iop.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/corba/makefile.mk b/udkapi/com/sun/star/corba/makefile.mk
deleted file mode 100644
index a959378cf..000000000
--- a/udkapi/com/sun/star/corba/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=csscorba
-PACKAGE=com$/sun$/star$/corba
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    corba.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/io/TempFile.idl b/udkapi/com/sun/star/io/TempFile.idl
index 8a84eed45..06b77e2b5 100644
--- a/udkapi/com/sun/star/io/TempFile.idl
+++ b/udkapi/com/sun/star/io/TempFile.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module io {
 //========================================================================
 /** This service allows to get access to temp files.
  */
-service TempFile : XTempFile;
+published service TempFile : XTempFile;
 
 //=========================================================================
 
diff --git a/udkapi/com/sun/star/io/XTempFile.idl b/udkapi/com/sun/star/io/XTempFile.idl
index ab0d51a47..bda47cffa 100644
--- a/udkapi/com/sun/star/io/XTempFile.idl
+++ b/udkapi/com/sun/star/io/XTempFile.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,12 +38,12 @@ module com { module sun { module star { module io {
 //========================================================================
 /** This interface offers access to temp files.
  */
-interface XTempFile
+published interface XTempFile
 {
     // INTERFACES
     //
     // -------------------------------------------------------------------
-    /** interface <type>XStream</type> offers read and write access to 
+    /** interface <type>XStream</type> offers read and write access to
         the same stream.
     */
     interface XStream;
diff --git a/udkapi/com/sun/star/io/makefile.mk b/udkapi/com/sun/star/io/makefile.mk
deleted file mode 100644
index 3c8b0d5ac..000000000
--- a/udkapi/com/sun/star/io/makefile.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssio
-PACKAGE=com$/sun$/star$/io
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    FilePermission.idl\
-    BufferSizeExceededException.idl\
-    MarkableInputStream.idl\
-    MarkableOutputStream.idl\
-    DataInputStream.idl\
-    DataOutputStream.idl\
-    DataTransferEvent.idl\
-    IOException.idl\
-    NotConnectedException.idl\
-    AlreadyConnectedException.idl\
-    ObjectInputStream.idl\
-    ObjectOutputStream.idl\
-    Pipe.idl\
-    Pump.idl\
-    SequenceInputStream.idl\
-    SequenceOutputStream.idl\
-    UnexpectedEOFException.idl\
-    WrongFormatException.idl\
-    XActiveDataControl.idl\
-    XActiveDataSink.idl\
-    XActiveDataSource.idl\
-    XActiveDataStreamer.idl\
-    XConnectable.idl\
-    XDataExporter.idl\
-    XDataImporter.idl\
-    XDataInputStream.idl\
-    XDataOutputStream.idl\
-    XDataTransferEventListener.idl\
-    XInputStream.idl\
-    XStream.idl\
-    XMarkableStream.idl\
-    XObjectInputStream.idl\
-    XObjectOutputStream.idl\
-    XOutputStream.idl\
-    XPersist.idl\
-    XPersistObject.idl\
-    XStreamListener.idl\
-    XSeekable.idl\
-    XSeekableInputStream.idl\
-    XSequenceOutputStream.idl\
-    TextInputStream.idl\
-    TextOutputStream.idl\
-    XTextInputStream.idl\
-    XTextOutputStream.idl\
-    XTruncate.idl\
-    XXMLExtractor.idl\
-    XInputStreamProvider.idl\
-    UnknownHostException.idl\
-    SocketException.idl\
-    NoRouteToHostException.idl\
-    ConnectException.idl \
-    XAsyncOutputMonitor.idl\
-    XTempFile.idl\
-    TempFile.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/java/makefile.mk b/udkapi/com/sun/star/java/makefile.mk
deleted file mode 100644
index bf7f467c9..000000000
--- a/udkapi/com/sun/star/java/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssjava
-PACKAGE=com$/sun$/star$/java
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    JavaVirtualMachine.idl\
-    WrongJavaVersionException.idl\
-    XJavaThreadRegister_11.idl\
-    XJavaVM.idl\
-    JavaInitializationException.idl\
-    JavaDisabledException.idl\
-    JavaNotConfiguredException.idl\
-    MissingJavaRuntimeException.idl\
-    JavaVMCreationFailureException.idl\
-    JavaNotFoundException.idl \
-        InvalidJavaSettingsException.idl \
-    RestartRequiredException.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/lang/SystemDependent.idl b/udkapi/com/sun/star/lang/SystemDependent.idl
index 7f6d44bf7..62555a447 100644
--- a/udkapi/com/sun/star/lang/SystemDependent.idl
+++ b/udkapi/com/sun/star/lang/SystemDependent.idl
@@ -61,18 +61,16 @@ published constants SystemDependent
     //------------------------------------------------------------------------- 
      
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN32
-    /** The called interface method returns a value specified for the  
-        32-bit Windows systems. 	 
+    /** The called interface method returns a value specified for Windows.
 
-        <p>These are Windows NT, Windows 95, Windows 98 or higher. </p>
+        <p>These are Windows XP or higher. </p>
      */
     const short SYSTEM_WIN32 = 1; 
  
     //------------------------------------------------------------------------- 
      
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN16
-    /** The called interface method returns a value specified for  
-        the 16-bit Windows system.  
+    /** The called interface method returns a value specified for 16-bit Windows.
                  
         <p>This is Windows 3.11. </p>
      */
@@ -81,12 +79,12 @@ published constants SystemDependent
     //------------------------------------------------------------------------- 
      
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_JAVA
-    /** The called interface method returns a value specified for  the system java.  
+    /** The called interface method returns a value specified for Java.
                  
         <p>These are <em>JRE 1.1</em>, <em>JRE 1.2</em>, <em>JDK 1.1</em>,  
         <em>JDK 1.2</em> or higher.   </p>
          
-        <p>The return should be a handle to a java object locked with 
+        <p>The return should be a handle to a Java object locked with
         the call <code>JavaEnvironment->NewGlobalRef( ... )</code>  
         by the callee. </p>
      */
@@ -95,14 +93,12 @@ published constants SystemDependent
     //------------------------------------------------------------------------- 
      
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_OS2
-    /** The called interface method returns a value specified for  the <em>OS/2</em> system.
+    /** The called interface method returns a value specified for <em>OS/2</em>.
      */
-    const short SYSTEM_OS2 = 4; 
- 
-    //------------------------------------------------------------------------- 
-     
+    const short SYSTEM_OS2 = 4;
+
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_MAC
-    /** The called interface method returns a value specified for the <em>MAC-OS</em> system.
+    /** The called interface method returns a value specified for <em>Mac OS X</em>.
      */
     const short SYSTEM_MAC = 5; 
  
@@ -112,7 +108,21 @@ published constants SystemDependent
     /** The called interface method returns a value specified for the <em>X Window System</em>.
      */
     const short SYSTEM_XWINDOW = 6; 
- 
+
+    //-------------------------------------------------------------------------
+
+    // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_IOS
+    /** The called interface method returns a value specified for <em>iOS</em>.
+     */
+    const short SYSTEM_IOS = 7;
+
+    //-------------------------------------------------------------------------
+
+    // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_ANDROID
+    /** The called interface method returns a value specified for <em>Android</em>.
+     */
+    const short SYSTEM_ANDROID = 8;
+
 }; 
  
 //============================================================================= 
diff --git a/udkapi/com/sun/star/lang/makefile.mk b/udkapi/com/sun/star/lang/makefile.mk
deleted file mode 100644
index b0a2d8172..000000000
--- a/udkapi/com/sun/star/lang/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=csslang
-PACKAGE=com$/sun$/star$/lang
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ArrayIndexOutOfBoundsException.idl\
-    ClassNotFoundException.idl\
-    DisposedException.idl\
-    EventObject.idl\
-    IllegalAccessException.idl\
-    IllegalArgumentException.idl\
-    IndexOutOfBoundsException.idl\
-    InvalidListenerException.idl\
-    ListenerExistException.idl\
-    Locale.idl\
-    MultiServiceFactory.idl\
-    NoSuchFieldException.idl\
-    NoSuchMethodException.idl\
-    NoSupportException.idl\
-    NotInitializedException.idl\
-    NullPointerException.idl\
-    RegistryServiceManager.idl\
-    ServiceManager.idl\
-    ServiceNotRegisteredException.idl\
-    SystemDependent.idl\
-    WrappedTargetException.idl\
-    WrappedTargetRuntimeException.idl\
-    XComponent.idl\
-    XConnectionPoint.idl\
-    XConnectionPointContainer.idl\
-    XEventListener.idl\
-    XInitialization.idl\
-    XLocalizable.idl\
-    XMultiServiceFactory.idl\
-    XMultiComponentFactory.idl\
-    XServiceDisplayName.idl\
-    XServiceInfo.idl\
-    XServiceName.idl\
-    XSingleServiceFactory.idl\
-    XSingleComponentFactory.idl\
-    XTypeProvider.idl\
-    XUnoTunnel.idl\
-    XMain.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/loader/makefile.mk b/udkapi/com/sun/star/loader/makefile.mk
deleted file mode 100644
index 3f3641b0d..000000000
--- a/udkapi/com/sun/star/loader/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssloader
-PACKAGE=com$/sun$/star$/loader
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    CannotActivateFactoryException.idl\
-    Java.idl\
-    Java2.idl\
-    Dynamic.idl\
-    SharedLibrary.idl\
-    XImplementationLoader.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/makefile.mk b/udkapi/com/sun/star/makefile.mk
deleted file mode 100644
index ab74a150f..000000000
--- a/udkapi/com/sun/star/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=api
-
-TARGET=css
-PACKAGE=com$/sun$/star
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    udk-modules.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/reflection/makefile.mk b/udkapi/com/sun/star/reflection/makefile.mk
deleted file mode 100644
index a8b1bc8e6..000000000
--- a/udkapi/com/sun/star/reflection/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssreflection
-PACKAGE=com$/sun$/star$/reflection
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    CoreReflection.idl\
-    FieldAccessMode.idl\
-    InvalidTypeNameException.idl\
-    InvocationTargetException.idl\
-    MethodMode.idl\
-    NoSuchTypeNameException.idl\
-    ParamInfo.idl\
-    ParamMode.idl\
-    ProxyFactory.idl\
-    TypeDescriptionManager.idl\
-    TypeDescriptionProvider.idl\
-    TypeDescriptionSearchDepth.idl\
-    XArrayTypeDescription.idl\
-    XCompoundTypeDescription.idl\
-    XConstantTypeDescription.idl\
-    XConstantsTypeDescription.idl\
-    XUnionTypeDescription.idl\
-    XEnumTypeDescription.idl\
-    XIdlArray.idl\
-    XIdlClass.idl\
-    XIdlClassProvider.idl\
-    XIdlField.idl\
-    XIdlField2.idl\
-    XIdlMember.idl\
-    XIdlMethod.idl\
-    XIdlReflection.idl\
-    XIndirectTypeDescription.idl\
-    XInterfaceAttributeTypeDescription.idl\
-    XInterfaceAttributeTypeDescription2.idl \
-    XInterfaceMemberTypeDescription.idl\
-    XInterfaceMethodTypeDescription.idl\
-    XInterfaceTypeDescription.idl\
-    XInterfaceTypeDescription2.idl \
-    XMethodParameter.idl\
-    XModuleTypeDescription.idl\
-    XParameter.idl \
-    XPropertyTypeDescription.idl\
-    XProxyFactory.idl\
-    XPublished.idl \
-    XServiceConstructorDescription.idl \
-    XServiceTypeDescription.idl\
-    XServiceTypeDescription2.idl \
-    XSingletonTypeDescription.idl\
-    XSingletonTypeDescription2.idl \
-    XStructTypeDescription.idl \
-    XTypeDescription.idl\
-    XTypeDescriptionEnumeration.idl\
-    XTypeDescriptionEnumerationAccess.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/registry/makefile.mk b/udkapi/com/sun/star/registry/makefile.mk
deleted file mode 100644
index 0e420aa84..000000000
--- a/udkapi/com/sun/star/registry/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssregistry
-PACKAGE=com$/sun$/star$/registry
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    CannotRegisterImplementationException.idl\
-    DefaultRegistry.idl\
-    ImplementationRegistration.idl\
-    InvalidRegistryException.idl\
-    InvalidValueException.idl\
-    MergeConflictException.idl\
-    NestedRegistry.idl\
-    RegistryKeyType.idl\
-    RegistryValueType.idl\
-    SimpleRegistry.idl\
-    XImplementationRegistration.idl\
-    XImplementationRegistration2.idl\
-    XRegistryKey.idl\
-    XSimpleRegistry.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/script/ArrayWrapper.idl b/udkapi/com/sun/star/script/ArrayWrapper.idl
index 9f73d6e30..47193e1f5 100644
--- a/udkapi/com/sun/star/script/ArrayWrapper.idl
+++ b/udkapi/com/sun/star/script/ArrayWrapper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,27 +34,27 @@
 module com {  module sun {  module star { module script {
 
 //=============================================================================
-/** Allows an UNO sequence that is passed between different language 
-    boundries to indicate it prefers to be represented as a multidimensional 
-    array with 0 or 1 based indices. UNO does not natively represent 
-    Multi-Dimensional arrays, instead a sequence can have elements that are 
-    themselves sequences (an array of arrays ). <p>Some languages ( example 
-    BASIC ) can natively represent both Multi-Dimentional arrays and array of 
-    arrays. 
-    Those languages could represent a sequence of sequences as either a 
-    Multi-Dimentional array or array of arrays. This structure allows a 
+/** Allows an UNO sequence that is passed between different language
+    boundries to indicate it prefers to be represented as a multidimensional
+    array with 0 or 1 based indices. UNO does not natively represent
+    Multi-Dimensional arrays, instead a sequence can have elements that are
+    themselves sequences (an array of arrays ). <p>Some languages ( example
+    BASIC ) can natively represent both Multi-Dimentional arrays and array of
+    arrays.
+    Those languages could represent a sequence of sequences as either a
+    Multi-Dimentional array or array of arrays. This structure allows a
     preference for a Multi-Dimensional array representation to be specified.</p>
 */
 
-struct ArrayWrapper
+published struct ArrayWrapper
 {
-    /** Indicates whether the Array should be have 1 or 0 based indexing. 
+    /** Indicates whether the Array should be have 1 or 0 based indexing.
     */
-    boolean IsZeroIndex; 
+    boolean IsZeroIndex;
     /** Contains the Array to be passed.
         <p> Multi-dimensional arrays can only be represented as a sequence where the elements of the sequence are themselves sequences. N-Levels of indirection are possible, where N is the number of dimensions. Note: its perfectly legal to use this structure with a single dimensioned array just to indicate the array indexing.</p>
     */
-    any Array; 
+    any Array;
 };
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/security/makefile.mk b/udkapi/com/sun/star/security/makefile.mk
deleted file mode 100644
index f8c66f9df..000000000
--- a/udkapi/com/sun/star/security/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# build dependency: security
-#		    security/auth
-#		    security/auth/callback
-#		    security/auth/login
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=udkapi
-
-TARGET=csssec
-PACKAGE=com$/sun$/star$/security
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES= \
-    AllPermission.idl			\
-    RuntimePermission.idl			\
-    Policy.idl				\
-    XPolicy.idl				\
-    AccessController.idl			\
-    XAccessController.idl			\
-    XAccessControlContext.idl		\
-    XAction.idl				\
-    AccessControlException.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/udkapi/com/sun/star/task/XInteractionHandler2.idl b/udkapi/com/sun/star/task/XInteractionHandler2.idl
index 381edbaf5..80c7bb67b 100644
--- a/udkapi/com/sun/star/task/XInteractionHandler2.idl
+++ b/udkapi/com/sun/star/task/XInteractionHandler2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_XInteractionHandler2_idl__ 
-#define __com_sun_star_task_XInteractionHandler2_idl__ 
- 
-#include <com/sun/star/task/XInteractionHandler.idl> 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module task {  
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_task_XInteractionHandler2_idl__
+#define __com_sun_star_task_XInteractionHandler2_idl__
+
+#include <com/sun/star/task/XInteractionHandler.idl>
+
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module task {
+
+//=============================================================================
+
 /** An interaction request handler.
 
    <p>This interface extends the interface <type>XInteractionHandler</type>
       the way that a caller can determine whether an interaction request was
       actually handled by the interaction handler.</p>
+
+      @since OOo 3.2
  */
-/* published */ interface XInteractionHandler2 : com::sun::star::task::XInteractionHandler
-{ 
+published interface XInteractionHandler2 : com::sun::star::task::XInteractionHandler
+{
     //-------------------------------------------------------------------------
     /** Handle an interaction request.
 
         @param Request the inteaction request to handle.
-       
-        @return <true/>, if the handler handled the request, <false/> otherwise. 
+
+        @return <true/>, if the handler handled the request, <false/> otherwise.
      */
-    boolean handleInteractionRequest( 
-        [in] com::sun::star::task::XInteractionRequest Request ); 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-/*============================================================================= 
- 
-=============================================================================*/ 
-#endif 
+    boolean handleInteractionRequest(
+        [in] com::sun::star::task::XInteractionRequest Request );
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/udkapi/com/sun/star/task/makefile.mk b/udkapi/com/sun/star/task/makefile.mk
deleted file mode 100644
index e95d79ce4..000000000
--- a/udkapi/com/sun/star/task/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=csstask
-PACKAGE=com$/sun$/star$/task
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XInteractionAbort.idl\
-    XInteractionContinuation.idl\
-    XInteractionHandler.idl\
-    XInteractionHandler2.idl\
-    XInteractionRequest.idl\
-    XInteractionRetry.idl
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/test/bridge/makefile.mk b/udkapi/com/sun/star/test/bridge/makefile.mk
deleted file mode 100644
index 14347311a..000000000
--- a/udkapi/com/sun/star/test/bridge/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssbridgetest
-PACKAGE=com$/sun$/star$/test$/bridge
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XBridgeTest.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/test/makefile.mk b/udkapi/com/sun/star/test/makefile.mk
deleted file mode 100644
index a1f2016bf..000000000
--- a/udkapi/com/sun/star/test/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=csstest
-PACKAGE=com$/sun$/star$/test
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    TestFactory.idl\
-    XSimpleTest.idl\
-    TestEvent.idl\
-    XTest.idl\
-    XTestListener.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/test/performance/makefile.mk b/udkapi/com/sun/star/test/performance/makefile.mk
deleted file mode 100644
index 00168c2a0..000000000
--- a/udkapi/com/sun/star/test/performance/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssperftest
-PACKAGE=com$/sun$/star$/test$/performance
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XPerformanceTest.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/uno/makefile.mk b/udkapi/com/sun/star/uno/makefile.mk
deleted file mode 100644
index d615b367f..000000000
--- a/udkapi/com/sun/star/uno/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssuno
-PACKAGE=com$/sun$/star$/uno
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Exception.idl\
-    NamingService.idl\
-    RuntimeException.idl\
-    SecurityException.idl\
-    DeploymentException.idl\
-    TypeClass.idl\
-    Uik.idl\
-    XAdapter.idl\
-    XAggregation.idl\
-    XInterface.idl\
-    XNamingService.idl\
-    XReference.idl\
-    XWeak.idl\
-    XComponentContext.idl\
-    XCurrentContext.idl\
-    XUnloadingPreference.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/uri/makefile.mk b/udkapi/com/sun/star/uri/makefile.mk
deleted file mode 100644
index 8b9a0b7a2..000000000
--- a/udkapi/com/sun/star/uri/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..
-PRJNAME := api
-TARGET := cssuri
-
-PACKAGE := com$/sun$/star$/uri
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    ExternalUriReferenceTranslator.idl \
-    RelativeUriExcessParentSegments.idl \
-    UriReferenceFactory.idl \
-    UriSchemeParser_vndDOTsunDOTstarDOTexpand.idl \
-    UriSchemeParser_vndDOTsunDOTstarDOTscript.idl \
-    VndSunStarPkgUrlReferenceFactory.idl \
-    XExternalUriReferenceTranslator.idl \
-    XUriReference.idl \
-    XUriReferenceFactory.idl \
-    XUriSchemeParser.idl \
-    XVndSunStarExpandUrl.idl \
-    XVndSunStarExpandUrlReference.idl \
-    XVndSunStarPkgUrlReferenceFactory.idl \
-    XVndSunStarScriptUrl.idl \
-    XVndSunStarScriptUrlReference.idl
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/util/logging/makefile.mk b/udkapi/com/sun/star/util/logging/makefile.mk
deleted file mode 100644
index e48b71921..000000000
--- a/udkapi/com/sun/star/util/logging/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ     =..$/..$/..$/..$/..
-PRJNAME =logging
-TARGET  =cssulog
-PACKAGE =com$/sun$/star$/util$/logging
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    LogLevel.idl\
-    XLogger.idl\
-    XLoggerRemote.idl\
-    Logger.idl\
-    LoggerRemote.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/com/sun/star/util/makefile.mk b/udkapi/com/sun/star/util/makefile.mk
deleted file mode 100644
index 9c5e0276d..000000000
--- a/udkapi/com/sun/star/util/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssutil
-PACKAGE=com$/sun$/star$/util
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XVeto.idl                       \
-    XMacroExpander.idl				\
-    MacroExpander.idl				\
-    BootstrapMacroExpander.idl \
-    theMacroExpander.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/udkapi/prj/build.lst b/udkapi/prj/build.lst
index 071723a9e..5b763130c 100644
--- a/udkapi/prj/build.lst
+++ b/udkapi/prj/build.lst
@@ -1,30 +1,2 @@
-ua	udkapi	:	idlc NULL
-ua	udkapi									usr1	-	all	ua_mkout NULL
-ua	udkapi\com\sun\star\beans		nmake	-	all	ua_bean NULL
-ua	udkapi\com\sun\star\bridge		nmake	-	all	ua_brid NULL
-ua	udkapi\com\sun\star\bridge\oleautomation		nmake	-	all	ua_auto ua_brid NULL
-ua	udkapi\com\sun\star\connection		nmake	-	all	ua_connect NULL
-ua	udkapi\com\sun\star\container		nmake	-	all	ua_cont NULL
-ua	udkapi\com\sun\star\io			nmake	-	all	ua_io NULL
-ua	udkapi\com\sun\star\java		nmake	-	all	ua_java NULL
-ua	udkapi\com\sun\star\lang		nmake	-	all	ua_lang NULL
-ua	udkapi\com\sun\star\loader		nmake	-	all	ua_load NULL
-ua	udkapi\com\sun\star\reflection		nmake	-	all	ua_refl NULL
-ua	udkapi\com\sun\star\registry		nmake	-	all	ua_regis NULL
-ua	udkapi\com\sun\star\script		nmake	-	all	ua_scrpt NULL
-ua	udkapi\com\sun\star\test		nmake	-	all	ua_test NULL
-ua	udkapi\com\sun\star\test\performance	nmake	-	all	ua_tstperform NULL
-ua	udkapi\com\sun\star\test\bridge		nmake	-	all	ua_tstbridge NULL
-ua	udkapi\com\sun\star\corba\iop		nmake	-	all	ua_iop NULL
-ua	udkapi\com\sun\star\corba\giop		nmake	-	all	ua_giop NULL
-ua	udkapi\com\sun\star\corba\iiop		nmake	-	all	ua_iiop NULL
-ua	udkapi\com\sun\star\corba		nmake	-	all	ua_corba NULL
-ua	udkapi\com\sun\star\uno			nmake	-	all	ua_uno NULL
-ua	udkapi\com\sun\star\security		nmake	-	all	ua_sec ua_uno NULL
-ua	udkapi\com\sun\star\util		nmake	-	all	ua_uutil ua_lang ua_uno NULL
-ua	udkapi\com\sun\star\util\logging	nmake	-	all	ua_log		NULL
-ua	udkapi\com\sun\star\task		nmake	-	all	ua_task ua_uno		NULL
-ua  udkapi\com\sun\star\uri         nmake   -   all ua_uri ua_uno NULL
-ua	udkapi\com\sun\star			nmake	-	all	ua_star NULL
-ua	udkapi\util				nmake	-	all	ua_util ua_bean ua_brid ua_auto ua_connect ua_cont ua_corba ua_giop ua_iiop ua_io ua_iop ua_java ua_lang ua_load ua_refl ua_regis ua_scrpt ua_test ua_tstbridge ua_tstperform ua_sec ua_uno ua_uutil ua_log ua_task ua_uri ua_star NULL
-
+ua	udkapi	:	DESKTOP:idlc DESKTOP:codemaker NULL
+ua	udkapi\prj	nmake	-	all	ua_prj NULL
diff --git a/udkapi/prj/d.lst b/udkapi/prj/d.lst
index f458df76a..13768ff54 100644
--- a/udkapi/prj/d.lst
+++ b/udkapi/prj/d.lst
@@ -1,55 +1,55 @@
-mkdir: %COMMON_DEST%\idl%_EXT%\com
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge\oleautomation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\container
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\io
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\java
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uri
-mkdir: %_DEST%\bin%_EXT%\ure
+mkdir: %COMMON_DEST%\idl\com
+mkdir: %COMMON_DEST%\idl\com\sun
+mkdir: %COMMON_DEST%\idl\com\sun\star
+mkdir: %COMMON_DEST%\idl\com\sun\star\beans
+mkdir: %COMMON_DEST%\idl\com\sun\star\bridge
+mkdir: %COMMON_DEST%\idl\com\sun\star\bridge\oleautomation
+mkdir: %COMMON_DEST%\idl\com\sun\star\connection
+mkdir: %COMMON_DEST%\idl\com\sun\star\container
+mkdir: %COMMON_DEST%\idl\com\sun\star\io
+mkdir: %COMMON_DEST%\idl\com\sun\star\java
+mkdir: %COMMON_DEST%\idl\com\sun\star\lang
+mkdir: %COMMON_DEST%\idl\com\sun\star\reflection
+mkdir: %COMMON_DEST%\idl\com\sun\star\registry
+mkdir: %COMMON_DEST%\idl\com\sun\star\loader
+mkdir: %COMMON_DEST%\idl\com\sun\star\script
+mkdir: %COMMON_DEST%\idl\com\sun\star\test
+mkdir: %COMMON_DEST%\idl\com\sun\star\test\performance
+mkdir: %COMMON_DEST%\idl\com\sun\star\test\bridge
+mkdir: %COMMON_DEST%\idl\com\sun\star\uno
+mkdir: %COMMON_DEST%\idl\com\sun\star\util
+mkdir: %COMMON_DEST%\idl\com\sun\star\util\logging
+mkdir: %COMMON_DEST%\idl\com\sun\star\security
+mkdir: %COMMON_DEST%\idl\com\sun\star\task
+mkdir: %COMMON_DEST%\idl\com\sun\star\uri
+mkdir: %_DEST%\bin\ure
 
-..\%__SRC%\misc\udkapi.autodoc %_DEST%\idl%_EXT%\udkapi.autodoc
-..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\udkapi.rdb
-..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\ure\types.rdb
-..\%__SRC%\ucrdoc\udkapi_doc.db %_DEST%\bin%_EXT%\udkapi_doc.rdb
+..\%__SRC%\misc\udkapi.autodoc %_DEST%\idl\udkapi.autodoc
+..\%__SRC%\ucr\udkapi.db %_DEST%\bin\udkapi.rdb
+..\%__SRC%\ucr\udkapi.db %_DEST%\bin\ure\types.rdb
+..\%__SRC%\ucrdoc\udkapi_doc.db %_DEST%\bin\udkapi_doc.rdb
 
-..\com\sun\star\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star
-..\com\sun\star\beans\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
-..\com\sun\star\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
-..\com\sun\star\bridge\oleautomation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge\oleautomation
-..\com\sun\star\connection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
-..\com\sun\star\container\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\container
-..\com\sun\star\io\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\io
-..\com\sun\star\java\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\java
-..\com\sun\star\lang\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
-..\com\sun\star\reflection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
-..\com\sun\star\registry\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
-..\com\sun\star\loader\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
-..\com\sun\star\script\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-..\com\sun\star\test\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test
-..\com\sun\star\test\performance\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
-..\com\sun\star\test\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
-..\com\sun\star\uno\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
-..\com\sun\star\util\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-..\com\sun\star\util\logging\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
-..\com\sun\star\security\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-..\com\sun\star\task\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-..\com\sun\star\uri\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uri
+..\com\sun\star\*.idl %COMMON_DEST%\idl\com\sun\star
+..\com\sun\star\beans\*.idl %COMMON_DEST%\idl\com\sun\star\beans
+..\com\sun\star\bridge\*.idl %COMMON_DEST%\idl\com\sun\star\bridge
+..\com\sun\star\bridge\oleautomation\*.idl %COMMON_DEST%\idl\com\sun\star\bridge\oleautomation
+..\com\sun\star\connection\*.idl %COMMON_DEST%\idl\com\sun\star\connection
+..\com\sun\star\container\*.idl %COMMON_DEST%\idl\com\sun\star\container
+..\com\sun\star\io\*.idl %COMMON_DEST%\idl\com\sun\star\io
+..\com\sun\star\java\*.idl %COMMON_DEST%\idl\com\sun\star\java
+..\com\sun\star\lang\*.idl %COMMON_DEST%\idl\com\sun\star\lang
+..\com\sun\star\reflection\*.idl %COMMON_DEST%\idl\com\sun\star\reflection
+..\com\sun\star\registry\*.idl %COMMON_DEST%\idl\com\sun\star\registry
+..\com\sun\star\loader\*.idl %COMMON_DEST%\idl\com\sun\star\loader
+..\com\sun\star\script\*.idl %COMMON_DEST%\idl\com\sun\star\script
+..\com\sun\star\test\*.idl %COMMON_DEST%\idl\com\sun\star\test
+..\com\sun\star\test\performance\*.idl %COMMON_DEST%\idl\com\sun\star\test\performance
+..\com\sun\star\test\bridge\*.idl %COMMON_DEST%\idl\com\sun\star\test\bridge
+..\com\sun\star\uno\*.idl %COMMON_DEST%\idl\com\sun\star\uno
+..\com\sun\star\util\*.idl %COMMON_DEST%\idl\com\sun\star\util
+..\com\sun\star\util\logging\*.idl %COMMON_DEST%\idl\com\sun\star\util\logging
+..\com\sun\star\security\*.idl %COMMON_DEST%\idl\com\sun\star\security
+..\com\sun\star\task\*.idl %COMMON_DEST%\idl\com\sun\star\task
+..\com\sun\star\uri\*.idl %COMMON_DEST%\idl\com\sun\star\uri
 
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
+..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
diff --git a/offapi/util/makefile.pmk b/udkapi/prj/makefile.mk
index f58201109..c677d2b3e 100644
--- a/offapi/util/makefile.pmk
+++ b/udkapi/prj/makefile.mk
@@ -25,10 +25,16 @@
 #
 #*************************************************************************
 
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
+PRJ=..
+TARGET=prj
 
-LOCALIDLFILES=TRUE
+.INCLUDE : settings.mk
 
-URDDOC=TRUE
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/udkapi/util/makefile.mk b/udkapi/util/makefile.mk
deleted file mode 100644
index 23dbd3782..000000000
--- a/udkapi/util/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJPCH=
-
-PRJNAME=udkapi
-TARGET=udkapi
-
-#use_starjar=true
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  makefile.pmk
-
-# ------------------------------------------------------------------
-
-UNOIDLDBFILES= \
-    $(UCR)$/css.db \
-    $(UCR)$/cssutil.db \
-    $(UCR)$/cssbeans.db \
-    $(UCR)$/cssbridge.db \
-    $(UCR)$/cssboleautomation.db \
-    $(UCR)$/cssconnection.db\
-    $(UCR)$/csscontainer.db \
-    $(UCR)$/cssio.db \
-    $(UCR)$/cssjava.db \
-    $(UCR)$/csslang.db \
-    $(UCR)$/csssec.db \
-    $(UCR)$/cssloader.db \
-    $(UCR)$/cssreflection.db \
-    $(UCR)$/cssregistry.db \
-    $(UCR)$/cssscript.db \
-    $(UCR)$/csstest.db \
-    $(UCR)$/cssperftest.db \
-    $(UCR)$/cssbridgetest.db \
-    $(UCR)$/cssuno.db \
-    $(UCR)$/cssulog.db \
-    $(UCR)$/csscorba.db \
-    $(UCR)$/cssiop.db \
-    $(UCR)$/cssiiop.db \
-    $(UCR)$/cssgiop.db \
-    $(UCR)$/csstask.db \
-    $(UCR)$/cssuri.db
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/unoil/prj/build.lst b/unoil/prj/build.lst
index c229639c7..15104e8ff 100644
--- a/unoil/prj/build.lst
+++ b/unoil/prj/build.lst
@@ -1,4 +1,4 @@
-ul unoil :: codemaker offapi ridljar solenv cli_ure NULL
+ul unoil :: DESKTOP:codemaker offapi ridljar solenv cli_ure NULL
 ul unoil\javamaker nmake - all ul_javamaker NULL
 ul unoil\util nmake - all ul_util ul_javamaker NULL
 ul unoil\climaker nmake - all  ul_climaker NULL
\ No newline at end of file
diff --git a/unoil/prj/d.lst b/unoil/prj/d.lst
index 30bd77c22..b4ee5815d 100644
--- a/unoil/prj/d.lst
+++ b/unoil/prj/d.lst
@@ -1,5 +1,5 @@
-..\%__SRC%\class\unoil.jar %_DEST%\bin%_EXT%\unoil.jar
-..\%__SRC%\bin\cli_oootypes.dll %_DEST%\bin%_EXT%\cli_oootypes.dll
-..\%__SRC%\bin\cli_oootypes.config %_DEST%\bin%_EXT%\cli_oootypes.config
-..\%__SRC%\bin\policy*.dll %_DEST%\bin%_EXT%\policy*.dll
-..\%__SRC%\bin\clioootypesversion.mk %_DEST%\bin%_EXT%\clioootypesversion.mk 
+..\%__SRC%\class\unoil.jar %_DEST%\bin\unoil.jar
+..\%__SRC%\bin\cli_oootypes.dll %_DEST%\bin\cli_oootypes.dll
+..\%__SRC%\bin\cli_oootypes.config %_DEST%\bin\cli_oootypes.config
+..\%__SRC%\bin\policy*.dll %_DEST%\bin\policy*.dll
+..\%__SRC%\bin\clioootypesversion.mk %_DEST%\bin\clioootypesversion.mk 
diff --git a/ure/prj/d.lst b/ure/prj/d.lst
index 22cfb161c..f9e28443b 100644
--- a/ure/prj/d.lst
+++ b/ure/prj/d.lst
@@ -1,11 +1,11 @@
-mkdir: %_DEST%\bin%_EXT%\ure
-mkdir: %_DEST%\xml%_EXT%\ure
-..\%__SRC%\bin\uretest.zip %COMMON_DEST%\bin%_EXT%\uretest.zip
-..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\ure\services.rdb
-..\source\README %_DEST%\bin%_EXT%\ure\README
-..\source\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\ure\THIRDPARTYLICENSEREADME.html
-..\source\jvmfwk3.ini %_DEST%\bin%_EXT%\ure\jvmfwk3.ini
-..\source\jvmfwk3rc %_DEST%\bin%_EXT%\ure\jvmfwk3rc
-..\source\startup.sh %_DEST%\bin%_EXT%\ure\startup.sh
-..\source\uno.ini %_DEST%\bin%_EXT%\ure\uno.ini
-..\source\unorc %_DEST%\bin%_EXT%\ure\unorc
+mkdir: %_DEST%\bin\ure
+mkdir: %_DEST%\xml\ure
+..\%__SRC%\bin\uretest.zip %COMMON_DEST%\bin\uretest.zip
+..\%__SRC%\misc\services.rdb %_DEST%\xml\ure\services.rdb
+..\source\README %_DEST%\bin\ure\README
+..\source\THIRDPARTYLICENSEREADME.html %_DEST%\bin\ure\THIRDPARTYLICENSEREADME.html
+..\source\jvmfwk3.ini %_DEST%\bin\ure\jvmfwk3.ini
+..\source\jvmfwk3rc %_DEST%\bin\ure\jvmfwk3rc
+..\source\startup.sh %_DEST%\bin\ure\startup.sh
+..\source\uno.ini %_DEST%\bin\ure\uno.ini
+..\source\unorc %_DEST%\bin\ure\unorc
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index 307ffaef2..816c58ef9 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -259,15 +259,9 @@ extern "C" ::sal_Bool SAL_CALL component_writeInfo(
         serviceManager, registryKey, entries);
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return ::cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
-
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, ::uno_Environment **)
-{
-    *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index e4e72e393..960760c3f 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -111,15 +111,9 @@ extern "C" ::sal_Bool SAL_CALL component_writeInfo(
         serviceManager, registryKey, entries);
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return ::cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
-
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, ::uno_Environment **)
-{
-    *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index c93050bd8..e138b8d07 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -111,15 +111,9 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
         serviceManager, registryKey, entries);
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
-
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, uno_Environment **)
-{
-    *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
diff --git a/ure/source/uretest/version.map b/ure/source/uretest/version.map
index 7d305778d..4f37658f3 100644
--- a/ure/source/uretest/version.map
+++ b/ure/source/uretest/version.map
@@ -28,7 +28,6 @@
 UDK_3_0_0 {
     global:
         component_getFactory;
-        component_getImplementationEnvironment;
         component_writeInfo;
 
         _ZTI*;
diff --git a/xml2cmp/prj/d.lst b/xml2cmp/prj/d.lst
index 51c51b4fc..bb5adfa21 100644
--- a/xml2cmp/prj/d.lst
+++ b/xml2cmp/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\xml2cmp.exe %_DEST%\bin%_EXT%\xml2cmp.exe
-..\%__SRC%\bin\xml2cmp %_DEST%\bin%_EXT%\xml2cmp
-..\%__SRC%\bin\srvdepy.exe %_DEST%\bin%_EXT%\srvdepy.exe
-..\%__SRC%\bin\srvdepy %_DEST%\bin%_EXT%\srvdepy
+..\%__SRC%\bin\xml2cmp.exe %_DEST%\bin\xml2cmp.exe
+..\%__SRC%\bin\xml2cmp %_DEST%\bin\xml2cmp
+..\%__SRC%\bin\srvdepy.exe %_DEST%\bin\srvdepy.exe
+..\%__SRC%\bin\srvdepy %_DEST%\bin\srvdepy
diff --git a/xml2cmp/source/finder/makefile.mk b/xml2cmp/source/finder/makefile.mk
index 22ae524f3..fee7e41c6 100644
--- a/xml2cmp/source/finder/makefile.mk
+++ b/xml2cmp/source/finder/makefile.mk
@@ -37,7 +37,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
@@ -45,13 +48,10 @@ OBJFILES= \
     $(OBJ)$/dependy.obj	\
     $(OBJ)$/dep_main.obj
 
-
 # --- Targets ------------------------------------------------------
 
 APP1TARGET=	$(TARGET)
-.IF "$(GUI)"!="OS2"
 APP1STACK=	1000000
-.ENDIF
 
 LIBSALCPPRT=$(0)
 
@@ -59,11 +59,7 @@ LIBSALCPPRT=$(0)
 UWINAPILIB=$(0)
 .ENDIF
 
-
 APP1LIBS=	$(LB)$/$(TARGET).lib $(LB)$/x2c_xcdl.lib $(LB)$/x2c_support.lib
 APP1DEPN=	$(LB)$/$(TARGET).lib $(LB)$/x2c_xcdl.lib $(LB)$/x2c_support.lib
 
-
 .INCLUDE :  target.mk
-
-
diff --git a/xml2cmp/source/support/cmdline.cxx b/xml2cmp/source/support/cmdline.cxx
index c6a2cbb5d..d75718cc0 100644
--- a/xml2cmp/source/support/cmdline.cxx
+++ b/xml2cmp/source/support/cmdline.cxx
@@ -163,7 +163,7 @@ CommandLine::ParseIndexCommand( int					argc,
                     argv  );
 
     sIndexFile = sOutputDirectory;
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     sIndexFile+= "\\xmlindex.html";
 #elif defined(UNX)
     sIndexFile+= "/xmlindex.html";
diff --git a/xml2cmp/source/support/makefile.mk b/xml2cmp/source/support/makefile.mk
index 8f0abcd5a..4c243174c 100644
--- a/xml2cmp/source/support/makefile.mk
+++ b/xml2cmp/source/support/makefile.mk
@@ -31,15 +31,16 @@ PRJNAME=xml2cmp
 TARGET=x2c_support
 TARGETTYPE=CUI
 
-
-
 # --- Settings -----------------------------------------------------
 
 ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
@@ -50,12 +51,7 @@ OBJFILES= \
     $(OBJ)$/syshelp.obj		\
     $(OBJ)$/badcast.obj
 
-
-
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 
-
-
diff --git a/xml2cmp/source/support/syshelp.cxx b/xml2cmp/source/support/syshelp.cxx
index 6838819f1..60ec2f08a 100644
--- a/xml2cmp/source/support/syshelp.cxx
+++ b/xml2cmp/source/support/syshelp.cxx
@@ -37,7 +37,7 @@
 
 #ifdef WNT
 #include <io.h>
-#elif defined(UNX) || defined(OS2)
+#elif defined(UNX)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
@@ -205,7 +205,7 @@ GatherFileNames( List<Simstr> &   	o_sFiles,
 
     _findclose(hFile);
     delete [] sFilter;
-#elif defined(UNX) || defined(OS2)
+#elif defined(UNX)
     DIR * pDir = opendir( i_sSrcDirectory );
     dirent * pEntry = 0;
     char * sEnding;
@@ -287,7 +287,7 @@ GatherSubDirectories( List<Simstr> &   	o_sSubDirectories,
     _findclose(hFile);
     delete [] sFilter;
 
-#elif defined(UNX) || defined(OS2)
+#elif defined(UNX)
     DIR * pDir = opendir( i_sParentdDirectory );
     dirent * pEntry = 0;
     struct stat 	aEntryStatus;
diff --git a/xml2cmp/source/support/syshelp.hxx b/xml2cmp/source/support/syshelp.hxx
index 9d4c358a8..72751d8d5 100644
--- a/xml2cmp/source/support/syshelp.hxx
+++ b/xml2cmp/source/support/syshelp.hxx
@@ -41,7 +41,7 @@ class Simstr;
 template <class XY> class List;
 
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 const char   C_sSLASH[] = "\\";
 const char   C_cSLASH = '\\';
 #elif defined(UNX)
diff --git a/xml2cmp/source/xcd/cr_html.cxx b/xml2cmp/source/xcd/cr_html.cxx
index 24063f46f..334c322e9 100644
--- a/xml2cmp/source/xcd/cr_html.cxx
+++ b/xml2cmp/source/xcd/cr_html.cxx
@@ -54,7 +54,7 @@ HtmlCreator::HtmlCreator( const char *		  		i_pOutputFileName,
                           const XmlElement &	    i_rDocument,
                           const Simstr &		    i_sIDL_BaseDirectory )
     :	aFile(i_pOutputFileName, std::ios::out
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                                | std::ios::binary
 #endif
                                                              ),
diff --git a/xml2cmp/source/xcd/cr_index.cxx b/xml2cmp/source/xcd/cr_index.cxx
index aef14324a..3d1055432 100644
--- a/xml2cmp/source/xcd/cr_index.cxx
+++ b/xml2cmp/source/xcd/cr_index.cxx
@@ -159,7 +159,7 @@ Index::CreateHtmlFileName(	char *						o_sOutputHtml,
     }
 
     strcpy( o_sOutputHtml, sOutputDirectory.str() );        // STRCPY SAFE HERE
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     strcat(o_sOutputHtml, "\\");                            // STRCAT SAFE HERE
 #elif defined(UNX)
     strcat(o_sOutputHtml, "/");                             // STRCAT SAFE HERE
diff --git a/xml2cmp/source/xcd/cr_metho.cxx b/xml2cmp/source/xcd/cr_metho.cxx
index bbb98a519..3e1540771 100644
--- a/xml2cmp/source/xcd/cr_metho.cxx
+++ b/xml2cmp/source/xcd/cr_metho.cxx
@@ -64,7 +64,7 @@ Create_AccessMethod( const char *			i_pOutputFileName,
     int    sDescrLen = (int) strlen(sDescrLineChange);
 
     std::ofstream aFile(i_pOutputFileName, std::ios::out
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                                | std::ios::binary
 #endif
     );
diff --git a/xml2cmp/source/xcd/filebuff.cxx b/xml2cmp/source/xcd/filebuff.cxx
index b2291491d..de9168bab 100644
--- a/xml2cmp/source/xcd/filebuff.cxx
+++ b/xml2cmp/source/xcd/filebuff.cxx
@@ -44,7 +44,7 @@ LoadXmlFile( Buffer & 			o_rBuffer,
     std::ifstream aXmlFile;
 
     aXmlFile.open(i_sXmlFilePath, std::ios::in
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                           | std::ios::binary
 #endif // WNT
     );
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index 98cd2dceb..aeb701acb 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -185,7 +185,7 @@ Put2File_TypeInfo( const char *            i_sOutputFile,
                    ModuleDescription &	   i_rData )
 {
     std::ofstream aOut(i_sOutputFile, std::ios::out
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                                | std::ios::binary
 #endif
     );
diff --git a/xml2cmp/source/xcd/makefile.mk b/xml2cmp/source/xcd/makefile.mk
index cc9d2bca6..096d5c786 100644
--- a/xml2cmp/source/xcd/makefile.mk
+++ b/xml2cmp/source/xcd/makefile.mk
@@ -33,19 +33,19 @@ TARGETTYPE=CUI
 
 LIBTARGET=NO
 
-
-
 # --- Settings -----------------------------------------------------
 
 ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
-
 LIBONLYFILES=\
     $(OBJ)$/cr_html.obj		\
     $(OBJ)$/cr_index.obj	\
@@ -55,25 +55,18 @@ LIBONLYFILES=\
     $(OBJ)$/xmlelem.obj		\
     $(OBJ)$/xmltree.obj
 
-
 OBJFILES=\
     $(OBJ)$/main.obj		\
     $(LIBONLYFILES)
 
-
 LIB1TARGET=$(LB)$/$(TARGET).lib
 LIB1OBJFILES=\
     $(OBJFILES)
 
-
 LIB2TARGET=$(LB)$/$(TARGET)l.lib
 LIB2OBJFILES=\
     $(LIBONLYFILES)
 
-
-
-
 # --- Targets ------------------------------------------------------
 
-
 .INCLUDE :  target.mk
diff --git a/xml2cmp/util/makefile.mk b/xml2cmp/util/makefile.mk
index e0f279990..b50d318a1 100644
--- a/xml2cmp/util/makefile.mk
+++ b/xml2cmp/util/makefile.mk
@@ -36,15 +36,17 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-# --- Files --------------------------------------------------------
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
+# --- Files --------------------------------------------------------
 
 # --- Targets ------------------------------------------------------
 
 APP1TARGET=	$(TARGET)
-.IF "$(GUI)"!="OS2"
 APP1STACK=	1000000
-.ENDIF
 
 UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
@@ -54,5 +56,3 @@ APP1DEPN=   $(LB)$/x2c_xcd.lib $(LB)$/x2c_support.lib
 APP1RPATH=  NONE
 
 .INCLUDE :  target.mk
-
-
diff --git a/offapi/com/sun/star/form/submission/makefile.mk b/xmlreader/Library_xmlreader.mk
index 27a60084c..807af424e 100644
--- a/offapi/com/sun/star/form/submission/makefile.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,24 +25,28 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..$/..$/..
+$(eval $(call gb_Library_Library,xmlreader))
 
-PRJNAME=offapi
+$(eval $(call gb_Library_add_package_headers,xmlreader,xmlreader_inc))
 
-TARGET=cssfsubmission
-PACKAGE=com$/sun$/star$/form$/submission
+$(eval $(call gb_Library_add_defs,xmlreader,\
+	-DOOO_DLLIMPLEMENTATION_XMLREADER \
+))
 
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_Library_add_linked_libs,xmlreader,\
+	sal \
+    $(gb_STDLIBS) \
+))
 
-# ------------------------------------------------------------------------
+$(eval $(call gb_Library_add_exception_objects,xmlreader,\
+	xmlreader/source/pad \
+	xmlreader/source/span \
+	xmlreader/source/xmlreader \
+))
 
-IDLFILES=\
-    XSubmission.idl  \
-    XSubmissionSupplier.idl  \
-    XSubmissionVetoListener.idl  \
+$(eval $(call gb_Library_add_api,xmlreader,\
+    offapi \
+    udkapi \
+))
 
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
+# vim: set noet sw=4 ts=4:
diff --git a/xmlreader/Makefile b/xmlreader/Makefile
new file mode 100644
index 000000000..90947b2e5
--- /dev/null
+++ b/xmlreader/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlreader/Module_xmlreader.mk b/xmlreader/Module_xmlreader.mk
new file mode 100644
index 000000000..096001e8f
--- /dev/null
+++ b/xmlreader/Module_xmlreader.mk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,xmlreader))
+
+$(eval $(call gb_Module_add_targets,xmlreader,\
+	Library_xmlreader \
+	Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/offapi/com/sun/star/deployment/ui/makefile.mk b/xmlreader/Package_inc.mk
index 5436f6617..54a4a6947 100644
--- a/offapi/com/sun/star/deployment/ui/makefile.mk
+++ b/xmlreader/Package_inc.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,19 +25,10 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..$/..
+$(eval $(call gb_Package_Package,xmlreader_inc,$(SRCDIR)/xmlreader/inc))
+$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/pad.hxx,xmlreader/pad.hxx))
+$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/span.hxx,xmlreader/span.hxx))
+$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/xmlreader.hxx,xmlreader/xmlreader.hxx))
+$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/detail/xmlreaderdllapi.hxx,xmlreader/detail/xmlreaderdllapi.hxx))
 
-PRJNAME=offapi
-
-TARGET = cssdeploymentui
-PACKAGE = com$/sun$/star$/deployment$/ui
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    PackageManagerDialog.idl \
-    LicenseDialog.idl \
-    UpdateRequiredDialog.idl
-
-.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
+# vim: set noet sw=4 ts=4:
diff --git a/xmlreader/inc/pch/precompiled_xmlreader.cxx b/xmlreader/inc/pch/precompiled_xmlreader.cxx
deleted file mode 100644
index e5d584855..000000000
--- a/xmlreader/inc/pch/precompiled_xmlreader.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-************************************************************************/
-
-#include "precompiled_xmlreader.hxx"
diff --git a/xmlreader/inc/pch/precompiled_xmlreader.hxx b/xmlreader/inc/pch/precompiled_xmlreader.hxx
deleted file mode 100644
index 7561fe89f..000000000
--- a/xmlreader/inc/pch/precompiled_xmlreader.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-************************************************************************/
-
-#if defined PRECOMPILED_HEADERS
-
-#include "sal/config.h"
-
-#endif
diff --git a/xmlreader/prj/build.lst b/xmlreader/prj/build.lst
index 5408a5255..59b71b87d 100644
--- a/xmlreader/prj/build.lst
+++ b/xmlreader/prj/build.lst
@@ -1,3 +1,2 @@
-xr xmlreader : BOOST:boost cppu offuh sal stlport NULL
-xr xmlreader\inc nmake - all xr_inc NULL
-xr xmlreader\source nmake - all xr_source xr_inc NULL
+xr xmlreader : BOOST:boost cppu offapi sal stlport NULL
+xr xmlreader\prj nmake - all xr_prj NULL
diff --git a/xmlreader/prj/d.lst b/xmlreader/prj/d.lst
index fcb99bd30..a4c06081d 100644
--- a/xmlreader/prj/d.lst
+++ b/xmlreader/prj/d.lst
@@ -1,10 +1 @@
-mkdir: %_DEST%\inc%_EXT%\xmlreader
-mkdir: %_DEST%\inc%_EXT%\xmlreader\detail
-..\%__SRC%\bin\xmlreader.dll %_DEST%\bin%_EXT%\xmlreader.dll
-..\%__SRC%\lib\ixmlreader.lib %_DEST%\lib%_EXT%\ixmlreader.lib
-..\%__SRC%\lib\libxmlreader.dylib %_DEST%\lib%_EXT%\libxmlreader.dylib
-..\%__SRC%\lib\libxmlreader.so %_DEST%\lib%_EXT%\libxmlreader.so
-..\inc\xmlreader\detail\xmlreaderdllapi.hxx %_DEST%\inc%_EXT%\xmlreader\detail\xmlreaderdllapi.hxx
-..\inc\xmlreader\pad.hxx %_DEST%\inc%_EXT%\xmlreader\pad.hxx
-..\inc\xmlreader\span.hxx %_DEST%\inc%_EXT%\xmlreader\span.hxx
-..\inc\xmlreader\xmlreader.hxx %_DEST%\inc%_EXT%\xmlreader\xmlreader.hxx
+..\%__SRC%\lib\libxmlreader.dll.a %_DEST%\lib\libxmlreader.dll.a
diff --git a/xmlreader/prj/makefile.mk b/xmlreader/prj/makefile.mk
new file mode 100644
index 000000000..88cd9dfe0
--- /dev/null
+++ b/xmlreader/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/xmlreader/source/pad.cxx b/xmlreader/source/pad.cxx
index b1673c4a4..8932ee382 100644
--- a/xmlreader/source/pad.cxx
+++ b/xmlreader/source/pad.cxx
@@ -25,9 +25,7 @@
 *
 ************************************************************************/
 
-#include "precompiled_xmlreader.hxx"
 #include "sal/config.h"
-
 #include "osl/diagnose.h"
 #include "rtl/string.h"
 #include "sal/types.h"
diff --git a/xmlreader/source/span.cxx b/xmlreader/source/span.cxx
index 3b936553b..5adfa0597 100644
--- a/xmlreader/source/span.cxx
+++ b/xmlreader/source/span.cxx
@@ -25,9 +25,7 @@
 *
 ************************************************************************/
 
-#include "precompiled_xmlreader.hxx"
 #include "sal/config.h"
-
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "osl/diagnose.h"
diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx
index 27350a8f0..234eb71cb 100644
--- a/xmlreader/source/xmlreader.cxx
+++ b/xmlreader/source/xmlreader.cxx
@@ -25,7 +25,6 @@
 *
 ************************************************************************/
 
-#include "precompiled_xmlreader.hxx"
 #include "sal/config.h"
 
 #include <climits>