CWS-TOOLING: integrate CWS gnumake2

1089 files changed, 8180 insertions, 11193 deletions

diff --git a/basic/inc/modsizeexceeded.hxx b/basic/inc/basic/modsizeexceeded.hxx
index e2d716259f09..e2d716259f09 100644
--- a/basic/inc/modsizeexceeded.hxx
+++ b/basic/inc/basic/modsizeexceeded.hxx
diff --git a/basic/inc/svtmsg.hrc b/basic/inc/basic/svtmsg.hrc
index ff215d3fc9cb..ff215d3fc9cb 100644
--- a/basic/inc/svtmsg.hrc
+++ b/basic/inc/basic/svtmsg.hrc
diff --git a/basic/inc/testtool.hrc b/basic/inc/basic/testtool.hrc
index 075b462944c9..075b462944c9 100644
--- a/basic/inc/testtool.hrc
+++ b/basic/inc/basic/testtool.hrc
diff --git a/basic/inc/ttmsg.hrc b/basic/inc/basic/ttmsg.hrc
index 26f250bc6a6a..26f250bc6a6a 100644
--- a/basic/inc/ttmsg.hrc
+++ b/basic/inc/basic/ttmsg.hrc
diff --git a/basic/prj/d.lst b/basic/prj/d.lst
index d8d0fce41994..41d1a59550f0 100644
--- a/basic/prj/d.lst
+++ b/basic/prj/d.lst
@@ -20,41 +20,10 @@ mkdir: %COMMON_DEST%\res%_EXT%
 ..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a
 
 mkdir: %_DEST%\inc%_EXT%\basic
-..\inc\testtool.hrc %_DEST%\inc%_EXT%\basic\testtool.hrc
-..\inc\ttmsg.hrc %_DEST%\inc%_EXT%\basic\ttmsg.hrc
-..\inc\basic\ttglobal.hrc %_DEST%\inc%_EXT%\basic\ttglobal.hrc
-..\inc\svtmsg.hrc %_DEST%\inc%_EXT%\basic\svtmsg.hrc
+..\inc\basic\*.hxx %_DEST%\inc%_EXT%\basic\*.hxx
+..\inc\basic\*.hrc %_DEST%\inc%_EXT%\basic\*.hrc
+..\inc\basic\*.h %_DEST%\inc%_EXT%\basic\*.h
 
-..\inc\basic\sbdef.hxx %_DEST%\inc%_EXT%\basic\sbdef.hxx
-..\inc\basic\sbmod.hxx %_DEST%\inc%_EXT%\basic\sbmod.hxx
-..\inc\basic\sbjsmod.hxx %_DEST%\inc%_EXT%\basic\sbjsmod.hxx
-..\inc\basic\sbmeth.hxx %_DEST%\inc%_EXT%\basic\sbmeth.hxx
-..\inc\basic\sbprop.hxx %_DEST%\inc%_EXT%\basic\sbprop.hxx
-..\inc\basic\sbstar.hxx %_DEST%\inc%_EXT%\basic\sbstar.hxx
-..\inc\basic\sbuno.hxx %_DEST%\inc%_EXT%\basic\sbuno.hxx
-..\inc\basic\basmgr.hxx %_DEST%\inc%_EXT%\basic\basmgr.hxx
-..\inc\basic\sberrors.hxx %_DEST%\inc%_EXT%\basic\sberrors.hxx
-..\inc\basic\basrdll.hxx %_DEST%\inc%_EXT%\basic\basrdll.hxx
-..\inc\basic\sbstdobj.hxx %_DEST%\inc%_EXT%\basic\sbstdobj.hxx
-..\inc\basic\process.hxx %_DEST%\inc%_EXT%\basic\process.hxx
-..\inc\basic\mybasic.hxx %_DEST%\inc%_EXT%\basic\mybasic.hxx
-..\inc\basic\testtool.hxx %_DEST%\inc%_EXT%\basic\testtool.hxx
-..\inc\basic\basicrt.hxx %_DEST%\inc%_EXT%\basic\basicrt.hxx
-..\inc\basic\dispdefs.hxx %_DEST%\inc%_EXT%\basic\dispdefs.hxx
-..\inc\basic\ttstrhlp.hxx %_DEST%\inc%_EXT%\basic\ttstrhlp.hxx
-
-..\inc\basic\sbx.hxx %_DEST%\inc%_EXT%\basic\sbx.hxx
-..\inc\basic\sbxcore.hxx %_DEST%\inc%_EXT%\basic\sbxcore.hxx
-..\inc\basic\sbxdef.hxx %_DEST%\inc%_EXT%\basic\sbxdef.hxx
-..\inc\basic\sbxform.hxx %_DEST%\inc%_EXT%\basic\sbxform.hxx
-..\inc\basic\sbxmeth.hxx %_DEST%\inc%_EXT%\basic\sbxmeth.hxx
-..\inc\basic\sbxobj.hxx %_DEST%\inc%_EXT%\basic\sbxobj.hxx
-..\inc\basic\sbxprop.hxx %_DEST%\inc%_EXT%\basic\sbxprop.hxx
-..\inc\basic\sbxvar.hxx %_DEST%\inc%_EXT%\basic\sbxvar.hxx
-..\inc\basic\sbxbase.hxx %_DEST%\inc%_EXT%\basic\sbxbase.hxx
-..\inc\basic\sbxfac.hxx %_DEST%\inc%_EXT%\basic\sbxfac.hxx
-..\inc\basic\sbxmstrm.hxx %_DEST%\inc%_EXT%\basic\sbxmstrm.hxx
-
-..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx
 ..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx
 ..\%__SRC%\misc\sb.component %_DEST%\xml%_EXT%\sb.component
+
diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src
index 89686ebfc0ee..748256bb5564 100644
--- a/basic/source/app/svtmsg.src
+++ b/basic/source/app/svtmsg.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "svtmsg.hrc"
+#include "basic/svtmsg.hrc"
 
 
 // Hier sind die Messages aus dem Verzeichnis /basic/source/app enhalten
diff --git a/basic/source/app/testtool.src b/basic/source/app/testtool.src
index 245cff6c7917..090cb735c139 100644
--- a/basic/source/app/testtool.src
+++ b/basic/source/app/testtool.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "testtool.hrc"
+#include "basic/testtool.hrc"
 
 
 ///////////////////////////////
diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src
index 63a6643f3cf1..076ee83fd879 100644
--- a/basic/source/app/ttmsg.src
+++ b/basic/source/app/ttmsg.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "ttmsg.hrc"
+#include "basic/ttmsg.hrc"
 
 
 // Hier sind die Messages aus dem Verzeichnis /basic/source/testtool enhalten
diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx
index 408b0f3f8dd4..3efc7f2d230b 100644
--- a/basic/source/uno/modsizeexceeded.cxx
+++ b/basic/source/uno/modsizeexceeded.cxx
@@ -27,9 +27,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basic.hxx"
-#include "modsizeexceeded.hxx"
+#include "basic/modsizeexceeded.hxx"
 
-#include <framework/interaction.hxx>
+#include <comphelper/interaction.hxx>
 #include <com/sun/star/script/ModuleSizeExceededRequest.hpp>
 
 using namespace com::sun::star;
@@ -44,8 +44,8 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >&
 
     m_aRequest <<= aReq;
 
-    m_xAbort.set( uno::Reference< task::XInteractionAbort >(new framework::ContinuationAbort), uno::UNO_QUERY );
-    m_xApprove.set( uno::Reference< task::XInteractionApprove >(new framework::ContinuationApprove ), uno::UNO_QUERY );
+    m_xAbort.set( uno::Reference< task::XInteractionAbort >(new comphelper::OInteractionAbort), uno::UNO_QUERY );
+    m_xApprove.set( uno::Reference< task::XInteractionApprove >(new comphelper::OInteractionApprove ), uno::UNO_QUERY );
     m_lContinuations.realloc( 2 );
     m_lContinuations[0] =  m_xApprove;
     m_lContinuations[1] = m_xAbort;
@@ -54,15 +54,15 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >&
 sal_Bool
 ModuleSizeExceeded::isAbort() const
 {
-    framework::ContinuationAbort* pBase = static_cast< framework::ContinuationAbort* >( m_xAbort.get() );
-    return pBase->isSelected();
+    comphelper::OInteractionAbort* pBase = static_cast< comphelper::OInteractionAbort* >( m_xAbort.get() );
+    return pBase->wasSelected();
 }
 
 sal_Bool
 ModuleSizeExceeded::isApprove() const
 {
-    framework::ContinuationApprove* pBase = static_cast< framework::ContinuationApprove* >( m_xApprove.get() );
-    return pBase->isSelected();
+    comphelper::OInteractionApprove* pBase = static_cast< comphelper::OInteractionApprove* >( m_xApprove.get() );
+    return pBase->wasSelected();
 }
 
 
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index f7091d1c1a0b..d95fa0191919 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -62,7 +62,7 @@
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/basicmanagerrepository.hxx>
-#include "modsizeexceeded.hxx"
+#include "basic/modsizeexceeded.hxx"
 #include <xmlscript/xmlmod_imexp.hxx>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/util/VetoException.hpp>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 9d432f73a731..d53bfcf1aaf2 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -694,7 +694,6 @@
 #include "svtools/apearcfg.hxx"
 #include "svl/brdcst.hxx"
 #include "unotools/cacheoptions.hxx"
-#include "svl/cancel.hxx"
 #include "svl/cjkoptions.hxx"
 #include "unotools/cmdoptions.hxx"
 #include "svl/cntwall.hxx"
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
new file mode 100644
index 000000000000..031cb24117d7
--- /dev/null
+++ b/framework/AllLangResTarget_fwe.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_AllLangResTarget_AllLangResTarget,fwe))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,fwe,framework))
+
+$(eval $(call gb_AllLangResTarget_add_srs,fwe,\
+    fwe/fwk_classes \
+    fwe/fwk_services \
+))
+
+
+$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes))
+
+$(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/framework/inc \
+    -I$(SRCDIR)/framework/inc/classes \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\
+    framework/source/classes/resource.src \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services))
+
+$(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/framework/inc \
+    -I$(SRCDIR)/framework/inc/services \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,fwe/fwk_services,\
+    framework/source/services/fwk_services.src \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
new file mode 100644
index 000000000000..33d8959a474e
--- /dev/null
+++ b/framework/Library_fwe.mk
@@ -0,0 +1,115 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,fwe))
+
+$(eval $(call gb_Library_set_include,fwe,\
+    -I$(SRCDIR)/framework/inc/pch \
+    -I$(SRCDIR)/framework/source/inc \
+    -I$(SRCDIR)/framework/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/framework \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,fwe,\
+    $$(DEFS) \
+    -DFWE_DLLIMPLEMENTATION\
+))
+
+$(eval $(call gb_Library_add_linked_libs,fwe,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwi \
+    sal \
+    stl \
+    svl \
+    svt \
+    tl \
+    utl \
+    vcl \
+    vos3 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fwe,\
+    framework/source/fwe/classes/actiontriggercontainer \
+    framework/source/fwe/classes/actiontriggerpropertyset \
+    framework/source/fwe/classes/actiontriggerseparatorpropertyset \
+    framework/source/fwe/classes/addonmenu \
+    framework/source/fwe/classes/addonsoptions \
+    framework/source/fwe/classes/bmkmenu \
+    framework/source/fwe/classes/framelistanalyzer \
+    framework/source/fwe/classes/fwkresid \
+    framework/source/fwe/classes/imagewrapper \
+    framework/source/fwe/classes/menuextensionsupplier \
+    framework/source/fwe/classes/rootactiontriggercontainer \
+    framework/source/fwe/classes/sfxhelperfunctions \
+    framework/source/fwe/dispatch/interaction \
+    framework/source/fwe/helper/acceleratorinfo \
+    framework/source/fwe/helper/actiontriggerhelper \
+    framework/source/fwe/helper/configimporter \
+    framework/source/fwe/helper/imageproducer \
+    framework/source/fwe/helper/propertysetcontainer \
+    framework/source/fwe/helper/titlehelper \
+    framework/source/fwe/helper/uiconfigelementwrapperbase \
+    framework/source/fwe/helper/uielementwrapperbase \
+    framework/source/fwe/interaction/preventduplicateinteraction \
+    framework/source/fwe/xml/eventsconfiguration \
+    framework/source/fwe/xml/eventsdocumenthandler \
+    framework/source/fwe/xml/imagesconfiguration \
+    framework/source/fwe/xml/imagesdocumenthandler \
+    framework/source/fwe/xml/menuconfiguration \
+    framework/source/fwe/xml/menudocumenthandler \
+    framework/source/fwe/xml/saxnamespacefilter \
+    framework/source/fwe/xml/statusbarconfiguration \
+    framework/source/fwe/xml/statusbardocumenthandler \
+    framework/source/fwe/xml/toolboxconfiguration \
+    framework/source/fwe/xml/toolboxdocumenthandler \
+    framework/source/fwe/xml/xmlnamespaces \
+))
+
+ifeq ($(OS),LINUX)
+
+$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
+
+$(eval $(call gb_Library_add_linked_libs,fwe,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwe,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# TODO: visibility
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
new file mode 100644
index 000000000000..568f0a1eb22a
--- /dev/null
+++ b/framework/Library_fwi.mk
@@ -0,0 +1,97 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,fwi))
+
+$(eval $(call gb_Library_add_package_headers,fwi,framework_inc))
+
+$(eval $(call gb_Library_set_defs,fwi,\
+    $$(DEFS) \
+    -DFWI_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_set_include,fwi,\
+    -I$(SRCDIR)/framework/inc/pch \
+    -I$(SRCDIR)/framework/source/inc \
+    -I$(SRCDIR)/framework/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/framework \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fwi,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nisolang1 \
+    sal \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    utl \
+    vcl \
+    vos3 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fwi,\
+    framework/source/fwi/classes/converter \
+    framework/source/fwi/classes/propertysethelper \
+    framework/source/fwi/classes/protocolhandlercache \
+    framework/source/fwi/helper/mischelper \
+    framework/source/fwi/helper/networkdomain \
+    framework/source/fwi/helper/shareablemutex \
+    framework/source/fwi/jobs/configaccess \
+    framework/source/fwi/jobs/jobconst \
+    framework/source/fwi/threadhelp/lockhelper \
+    framework/source/fwi/threadhelp/transactionmanager \
+    framework/source/fwi/uielement/constitemcontainer \
+    framework/source/fwi/uielement/itemcontainer \
+    framework/source/fwi/uielement/rootitemcontainer \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,fwi,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwi,\
+    advapi32 \
+    kernel32 \
+    msvcrt \
+    stl \
+    unicows \
+    uwinapi \
+))
+endif
+# TODO: visibility
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
new file mode 100644
index 000000000000..50c16b83b42a
--- /dev/null
+++ b/framework/Library_fwk.mk
@@ -0,0 +1,199 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,fwk))
+
+$(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_framework))
+
+$(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk))
+
+$(eval $(call gb_Library_set_include,fwk,\
+    -I$(SRCDIR)/framework/inc/pch \
+    -I$(SRCDIR)/framework/source/inc \
+    -I$(SRCDIR)/framework/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/framework \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fwk,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    fwi \
+    i18nisolang1 \
+    sal \
+    sot \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fwk,\
+    framework/source/accelerators/acceleratorcache \
+    framework/source/accelerators/acceleratorconfiguration \
+    framework/source/accelerators/documentacceleratorconfiguration \
+    framework/source/accelerators/globalacceleratorconfiguration \
+    framework/source/accelerators/keymapping \
+    framework/source/accelerators/moduleacceleratorconfiguration \
+    framework/source/accelerators/presethandler \
+    framework/source/accelerators/storageholder \
+    framework/source/classes/droptargetlistener \
+    framework/source/classes/framecontainer \
+    framework/source/classes/fwktabwindow \
+    framework/source/classes/menumanager \
+    framework/source/classes/taskcreator \
+    framework/source/constant/containerquery \
+    framework/source/constant/contenthandler \
+    framework/source/constant/frameloader \
+    framework/source/dispatch/closedispatcher \
+    framework/source/dispatch/dispatchinformationprovider \
+    framework/source/dispatch/dispatchprovider \
+    framework/source/dispatch/helpagentdispatcher \
+    framework/source/dispatch/interceptionhelper \
+    framework/source/dispatch/loaddispatcher \
+    framework/source/dispatch/menudispatcher \
+    framework/source/dispatch/startmoduledispatcher \
+    framework/source/dispatch/windowcommanddispatch \
+    framework/source/helper/dockingareadefaultacceptor \
+    framework/source/helper/ocomponentaccess \
+    framework/source/helper/ocomponentenumeration \
+    framework/source/helper/oframes \
+    framework/source/helper/persistentwindowstate \
+    framework/source/helper/statusindicator \
+    framework/source/helper/statusindicatorfactory \
+    framework/source/helper/tagwindowasmodified \
+    framework/source/helper/titlebarupdate \
+    framework/source/helper/vclstatusindicator \
+    framework/source/helper/wakeupthread \
+    framework/source/interaction/quietinteraction \
+    framework/source/jobs/job \
+    framework/source/jobs/jobdata \
+    framework/source/jobs/jobdispatch \
+    framework/source/jobs/jobexecutor \
+    framework/source/jobs/jobresult \
+    framework/source/jobs/joburl \
+    framework/source/layoutmanager/helpers \
+    framework/source/layoutmanager/layoutmanager \
+    framework/source/layoutmanager/panel \
+    framework/source/layoutmanager/panelmanager \
+    framework/source/layoutmanager/toolbarlayoutmanager \
+    framework/source/layoutmanager/uielement \
+    framework/source/loadenv/loadenv \
+    framework/source/loadenv/targethelper \
+    framework/source/register/registerservices \
+    framework/source/services/autorecovery \
+    framework/source/services/backingcomp \
+    framework/source/services/backingwindow \
+    framework/source/services/desktop \
+    framework/source/services/frame \
+    framework/source/services/modelwinservice \
+    framework/source/services/modulemanager \
+    framework/source/services/pathsettings \
+    framework/source/services/sessionlistener \
+    framework/source/services/substitutepathvars \
+    framework/source/services/tabwindowservice \
+    framework/source/services/taskcreatorsrv \
+    framework/source/services/uriabbreviation \
+    framework/source/services/urltransformer \
+    framework/source/uiconfiguration/globalsettings \
+    framework/source/uiconfiguration/graphicnameaccess \
+    framework/source/uiconfiguration/imagemanager \
+    framework/source/uiconfiguration/imagemanagerimpl \
+    framework/source/uiconfiguration/moduleimagemanager \
+    framework/source/uiconfiguration/moduleuicfgsupplier \
+    framework/source/uiconfiguration/moduleuiconfigurationmanager \
+    framework/source/uiconfiguration/uicategorydescription \
+    framework/source/uiconfiguration/uiconfigurationmanager \
+    framework/source/uiconfiguration/uiconfigurationmanagerimpl \
+    framework/source/uiconfiguration/windowstateconfiguration \
+    framework/source/uielement/addonstoolbarmanager \
+    framework/source/uielement/addonstoolbarwrapper \
+    framework/source/uielement/buttontoolbarcontroller \
+    framework/source/uielement/comboboxtoolbarcontroller \
+    framework/source/uielement/complextoolbarcontroller \
+    framework/source/uielement/controlmenucontroller \
+    framework/source/uielement/dropdownboxtoolbarcontroller \
+    framework/source/uielement/edittoolbarcontroller \
+    framework/source/uielement/generictoolbarcontroller \
+    framework/source/uielement/imagebuttontoolbarcontroller \
+    framework/source/uielement/langselectionstatusbarcontroller \
+    framework/source/uielement/menubarmanager \
+    framework/source/uielement/menubarmerger \
+    framework/source/uielement/menubarwrapper \
+    framework/source/uielement/objectmenucontroller \
+    framework/source/uielement/panelwindow \
+    framework/source/uielement/panelwrapper \
+    framework/source/uielement/progressbarwrapper \
+    framework/source/uielement/recentfilesmenucontroller \
+    framework/source/uielement/spinfieldtoolbarcontroller \
+    framework/source/uielement/statusbar \
+    framework/source/uielement/statusbarmanager \
+    framework/source/uielement/statusbarwrapper \
+    framework/source/uielement/statusindicatorinterfacewrapper \
+    framework/source/uielement/togglebuttontoolbarcontroller \
+    framework/source/uielement/toolbar \
+    framework/source/uielement/toolbarmanager \
+    framework/source/uielement/toolbarmerger \
+    framework/source/uielement/toolbarwrapper \
+    framework/source/uielement/uicommanddescription \
+    framework/source/uifactory/addonstoolboxfactory \
+    framework/source/uifactory/factoryconfiguration \
+    framework/source/uifactory/menubarfactory \
+    framework/source/uifactory/popupmenucontrollerfactory \
+    framework/source/uifactory/statusbarcontrollerfactory \
+    framework/source/uifactory/statusbarfactory \
+    framework/source/uifactory/toolbarcontrollerfactory \
+    framework/source/uifactory/toolboxfactory \
+    framework/source/uifactory/uielementfactorymanager \
+    framework/source/uifactory/windowcontentfactorymanager \
+    framework/source/xml/acceleratorconfigurationreader \
+    framework/source/xml/acceleratorconfigurationwriter \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,fwk,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwk,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
new file mode 100644
index 000000000000..d2002115eaf0
--- /dev/null
+++ b/framework/Library_fwl.mk
@@ -0,0 +1,99 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,fwl))
+
+$(eval $(call gb_Library_set_componentfile,fwl,framework/util/fwl))
+
+$(eval $(call gb_Library_set_include,fwl,\
+    -I$(SRCDIR)/framework/inc \
+    -I$(SRCDIR)/framework/inc/pch \
+    -I$(SRCDIR)/framework/source/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/framework \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fwl,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    fwi \
+    i18nisolang1 \
+    sal \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fwl,\
+    framework/source/classes/fwlresid \
+    framework/source/dispatch/mailtodispatcher \
+    framework/source/dispatch/oxt_handler \
+    framework/source/dispatch/popupmenudispatcher \
+    framework/source/dispatch/servicehandler \
+    framework/source/recording/dispatchrecorder \
+    framework/source/recording/dispatchrecordersupplier \
+    framework/source/register/registertemp \
+    framework/source/services/dispatchhelper \
+    framework/source/services/license \
+    framework/source/services/mediatypedetectionhelper \
+    framework/source/services/uriabbreviation \
+    framework/source/uielement/fontmenucontroller \
+    framework/source/uielement/fontsizemenucontroller \
+    framework/source/uielement/footermenucontroller \
+    framework/source/uielement/headermenucontroller \
+    framework/source/uielement/langselectionmenucontroller \
+    framework/source/uielement/logoimagestatusbarcontroller \
+    framework/source/uielement/logotextstatusbarcontroller \
+    framework/source/uielement/macrosmenucontroller \
+    framework/source/uielement/newmenucontroller \
+    framework/source/uielement/popupmenucontroller \
+    framework/source/uielement/simpletextstatusbarcontroller \
+    framework/source/uielement/toolbarsmenucontroller \
+))
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,fwl,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwl,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
new file mode 100644
index 000000000000..9ff49719148a
--- /dev/null
+++ b/framework/Library_fwm.mk
@@ -0,0 +1,81 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,fwm))
+
+$(eval $(call gb_Library_set_componentfile,fwm,framework/util/fwm))
+
+$(eval $(call gb_Library_set_include,fwm,\
+    -I$(SRCDIR)/framework/inc/pch \
+    -I$(SRCDIR)/framework/inc \
+    -I$(SRCDIR)/framework/source/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/framework \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fwm,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwi \
+    sal \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    utl \
+    vcl \
+    vos3 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fwm,\
+    framework/source/dispatch/systemexec \
+    framework/source/jobs/helponstartup \
+    framework/source/jobs/shelljob \
+    framework/source/register/register3rdcomponents \
+    framework/source/tabwin/tabwindow \
+    framework/source/tabwin/tabwinfactory \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,fwm,\
+    dl \
+    m \
+    pthread \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwm,\
+    kernel32 \
+    msvcrt \
+    uwinapi \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/source/explorer/makefile.mk b/framework/Makefile
index 75a15ebdb862..a79aff831024 100644
--- a/sfx2/source/explorer/makefile.mk
+++ b/framework/Makefile
@@ -25,23 +25,14 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-PRJNAME=sfx2
-TARGET=explorer
-ENABLE_EXCEPTIONS=TRUE
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-                $(SLO)$/nochaos.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.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/framework/Module_framework.mk b/framework/Module_framework.mk
new file mode 100644
index 000000000000..28b2e087b60f
--- /dev/null
+++ b/framework/Module_framework.mk
@@ -0,0 +1,43 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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,framework))
+
+$(eval $(call gb_Module_add_targets,framework,\
+    AllLangResTarget_fwe \
+    Library_fwe \
+    Library_fwi \
+    Library_fwk \
+    Library_fwl \
+    Library_fwm \
+    Package_dtd \
+    Package_inc \
+    Package_uiconfig \
+    Package_unotypes \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/framework/inc/makefile.mk b/framework/Package_dtd.mk
index e2f1bedf4e98..db23783c4ef9 100644
--- a/framework/inc/makefile.mk
+++ b/framework/Package_dtd.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 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,34 +14,22 @@
 #
 # OpenOffice.org is distributed in the hope 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=framework
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
 
+$(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/accelerator.dtd,accelerator.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/event.dtd,event.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/groupuinames.dtd,groupuinames.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/image.dtd,image.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/menubar.dtd,menubar.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/statusbar.dtd,statusbar.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/toolbar.dtd,toolbar.dtd))
diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk
new file mode 100644
index 000000000000..adefc3ccbd56
--- /dev/null
+++ b/framework/Package_inc.mk
@@ -0,0 +1,48 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Package_Package,framework_inc,$(SRCDIR)/framework/inc))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/acceleratorinfo.hxx,framework/acceleratorinfo.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,framework/actiontriggerhelper.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,framework/addonmenu.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,framework/addonsoptions.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,framework/bmkmenu.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,framework/configimporter.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,framework/eventsconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/framelistanalyzer.hxx,framework/framelistanalyzer.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,framework/imageproducer.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,framework/imagesconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,framework/interaction.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,framework/menuconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,framework/menuextensionsupplier.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/preventduplicateinteraction.hxx,framework/preventduplicateinteraction.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/sfxhelperfunctions.hxx,framework/sfxhelperfunctions.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/titlehelper.hxx,framework/titlehelper.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/toolboxconfiguration.hxx,framework/toolboxconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/fwedllapi.h,framework/fwedllapi.h))
+$(eval $(call gb_Package_add_file,framework_inc,inc/fwkdllapi.h,fwkdllapi.h))
+$(eval $(call gb_Package_add_file,framework_inc,inc/fwidllapi.h,fwidllapi.h))
diff --git a/framework/qa/complex/dispatches/helper/makefile.mk b/framework/Package_uiconfig.mk
index 2b2ccab5ebef..295be6c87252 100644
--- a/framework/qa/complex/dispatches/helper/makefile.mk
+++ b/framework/Package_uiconfig.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 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,34 +14,18 @@
 #
 # OpenOffice.org is distributed in the hope 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 = ../../../..
-TARGET  = checkdispatchapi
-PRJNAME = framework
-PACKAGE = complex/dispatches/helper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar Generator.jar
-JAVAFILES       = Interceptor.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-
-MAXLINELENGTH = 100000
-
-.INCLUDE :  target.mk
-
-
 
+$(eval $(call gb_Package_Package,framework_uiconfig,$(SRCDIR)/framework/uiconfig))
+$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/menubar/menubar.xml,startmodule/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/statusbar/statusbar.xml,startmodule/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/toolbar/standardbar.xml,startmodule/toolbar/standardbar.xml))
diff --git a/framework/Package_unotypes.mk b/framework/Package_unotypes.mk
new file mode 100644
index 000000000000..01069ae93dc4
--- /dev/null
+++ b/framework/Package_unotypes.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Package_Package,framework_unotypes,$(SRCDIR)/framework/source/unotypes))
+$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwk.xml,fwk.xml))
+$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwl.xml,fwl.xml))
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 034252c2ae63..936f6cf0cdbb 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -32,14 +32,16 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
+#include <framework/fwedllapi.h>
 
 #define SERVICENAME_ACTIONTRIGGERCONTAINER          "com.sun.star.ui.ActionTriggerContainer"
 #define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER   "com.sun.star.comp.ui.ActionTriggerContainer"
 
+
 namespace framework
 {
 
-class ActionTriggerContainer :  public PropertySetContainer,
+class FWE_DLLPUBLIC ActionTriggerContainer :    public PropertySetContainer,
                                 public com::sun::star::lang::XMultiServiceFactory,
                                 public com::sun::star::lang::XServiceInfo,
                                 public com::sun::star::lang::XTypeProvider
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 203fa6eb67eb..3f373f272afd 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <framework/fwedllapi.h>
 
 #define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger"
 #define IMPLEMENTATIONNAME_ACTIONTRIGGER "com.sun.star.comp.ui.ActionTrigger"
@@ -48,7 +49,7 @@
 namespace framework
 {
 
-class ActionTriggerPropertySet :    public ThreadHelpBase                       ,   // Struct for right initalization of mutex member! Must be first of baseclasses.
+class ActionTriggerPropertySet :  public ThreadHelpBase                       ,   // Struct for right initalization of mutex member! Must be first of baseclasses.
                                     public ::com::sun::star::lang::XServiceInfo ,
                                     public ::com::sun::star::lang::XTypeProvider,
                                     public ::cppu::OBroadcastHelper             ,
@@ -56,23 +57,23 @@ class ActionTriggerPropertySet :    public ThreadHelpBase
                                     public ::cppu::OWeakObject
 {
     public:
-        ActionTriggerPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-        virtual ~ActionTriggerPropertySet();
+        FWE_DLLPUBLIC ActionTriggerPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        FWE_DLLPUBLIC virtual ~ActionTriggerPropertySet();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
             throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL acquire() throw ();
-        virtual void SAL_CALL release() throw ();
+        virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw ();
+        virtual FWE_DLLPUBLIC void SAL_CALL release() throw ();
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XTypeProvider
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
         //---------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 7cb1488c1112..f3579e98fcc1 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -37,10 +37,12 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <framework/fwedllapi.h>
 
 #define SERVICENAME_ACTIONTRIGGERSEPARATOR          "com.sun.star.ui.ActionTriggerSeparator"
 #define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR   "com.sun.star.comp.ui.ActionTriggerSeparator"
 
+
 namespace framework
 {
 
diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index bd53b127f800..43972eeefa1b 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <tools/datetime.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -62,7 +63,7 @@ namespace framework{
 //  exported definitions
 //_________________________________________________________________________________________________________________
 
-class Converter
+class FWI_DLLPUBLIC Converter
 {
     public:
         // Seq<Any> <=> Seq<beans.PropertyValue>
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index c18eef0d77c3..6cfe3fc7a0dd 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -29,11 +29,12 @@
 #define __FRAMEWORK_CLASSES_FWKRESID_HXX_
 
 #include <tools/resid.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
 
-class FwkResId : public ResId
+class FWE_DLLPUBLIC FwkResId : public ResId
 {
     public:
         FwkResId( USHORT nId );
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index fe4c9f5c9641..2001314e9edb 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -34,11 +34,12 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <vcl/image.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
 
-class ImageWrapper : public ThreadHelpBase                          ,   // Struct for right initalization of mutex member! Must be first of baseclasses.
+class FWE_DLLPUBLIC ImageWrapper : public ThreadHelpBase                            ,   // Struct for right initalization of mutex member! Must be first of baseclasses.
                      public ::cppu::WeakImplHelper2< ::com::sun::star::awt::XBitmap,
                                                     ::com::sun::star::lang::XUnoTunnel >
 {
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index f1c5648470b9..d62debc5b2a2 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -49,6 +49,7 @@
 //  other includes
 
 #include <cppuhelper/weakref.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -66,7 +67,7 @@ namespace framework{
  *  Further the derived and this base class share the same lock.
  *  So it's possible to be threadsafe if it's needed.
 */
-class PropertySetHelper : public css::beans::XPropertySet
+class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
                         , public css::beans::XPropertySetInfo
 {
     //-------------------------------------------------------------------------
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 77c4ca6a7f93..ffdcaa1f253b 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -47,6 +47,7 @@
 
 #include <unotools/configitem.hxx>
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -76,7 +77,7 @@ namespace framework{
     This struct holds the information about one such registered protocol handler.
     A list of handler objects is defined as ProtocolHandlerHash. see below
 */
-struct ProtocolHandler
+struct FWI_DLLPUBLIC ProtocolHandler
 {
     /* member */
     public:
@@ -94,7 +95,7 @@ struct ProtocolHandler
     uno implementation names as value. Overloading of the index operator makes it possible
     to search for a key by using a full qualified URL on list of all possible pattern keys.
 */
-class PatternHash : public BaseHash< ::rtl::OUString >
+class FWI_DLLPUBLIC PatternHash : public BaseHash< ::rtl::OUString >
 {
     /* interface */
     public:
@@ -133,7 +134,7 @@ typedef BaseHash< ProtocolHandler > HandlerHash;
 */
 
 class HandlerCFGAccess;
-class HandlerCache
+class FWI_DLLPUBLIC HandlerCache
 {
     /* member */
     private:
@@ -178,7 +179,7 @@ class HandlerCache
 
     @modified       30.04.2002 09:58, as96863
 */
-class HandlerCFGAccess : public ::utl::ConfigItem
+class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem
 {
     private:
         HandlerCache* m_pCache;
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 5d7a820983f7..e3c26d190ce9 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
+#include <framework/fwedllapi.h>
 
 #define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER   "com.sun.star.comp.ui.RootActionTriggerContainer"
 
@@ -42,7 +43,7 @@
 namespace framework
 {
 
-class RootActionTriggerContainer :  public PropertySetContainer,
+class FWE_DLLPUBLIC RootActionTriggerContainer :  public PropertySetContainer,
                                     public com::sun::star::lang::XMultiServiceFactory,
                                     public com::sun::star::lang::XServiceInfo,
                                     public com::sun::star::lang::XUnoTunnel,
diff --git a/framework/inc/dispatch/interaction.hxx b/framework/inc/dispatch/interaction.hxx
deleted file mode 100644
index 28b5d817251b..000000000000
--- a/framework/inc/dispatch/interaction.hxx
+++ /dev/null
@@ -1,325 +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.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_DISPATCH_INTERACTION_HXX_
-#define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
-
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/task/XInteractionContinuation.hpp>
-#include <com/sun/star/task/XInteractionAbort.hpp>
-#include <com/sun/star/task/XInteractionApprove.hpp>
-#include <com/sun/star/task/XInteractionDisapprove.hpp>
-#include <com/sun/star/task/XInteractionRetry.hpp>
-#include <com/sun/star/document/XInteractionFilterSelect.hpp>
-#include <com/sun/star/document/NoSuchFilterRequest.hpp>
-#include <com/sun/star/document/AmbigousFilterRequest.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-
-//_________________________________________________________________________________________________________________
-//  includes of other projects
-//_________________________________________________________________________________________________________________
-#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//_________________________________________________________________________________________________________________
-//  non exported const
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  non exported definitions
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  declarations
-//_________________________________________________________________________________________________________________
-
-/*-************************************************************************************************************//**
-    @short          base for continuation classes
-    @descr          An interaction continuation could be used on XInteractionHandler/XInteractionRequest
-                    to abort or react for it.
-                    Base functionality is everytime the same - handler mark right continuation by calling
-                    interface method "select()". User of interaction can detect it by testing c++ method "isSelected()"!
-                    Superclasses can add additional interfaces or methods to support additional features ...
-                    but selection of it is supported here!
-
-    @implements     XInterface
-                    XTypeProvider (supported by WeakImplHelper!)
-                    XInteractionContinuation
-
-    @base           WeakImplHelper1
-
-    @devstatus      ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-template< class TContinuationType >
-class ContinuationBase : public ::cppu::WeakImplHelper1< TContinuationType >
-{
-    // c++ interface
-    public:
-
-        //---------------------------------------------------------------------------------------------------------
-        // initialize continuation with right start values
-        //---------------------------------------------------------------------------------------------------------
-        ContinuationBase()
-            :   m_bSelected( sal_False )
-        {
-        }
-
-        //---------------------------------------------------------------------------------------------------------
-        // was continuation selected by handler?
-        //---------------------------------------------------------------------------------------------------------
-        sal_Bool isSelected() const
-        {
-            return m_bSelected;
-        }
-
-        //---------------------------------------------------------------------------------------------------------
-        // make using more then once possible
-        //---------------------------------------------------------------------------------------------------------
-        void reset()
-        {
-            m_bSelected = sal_False;
-        }
-
-    // uno interface
-    public:
-
-        //---------------------------------------------------------------------------------------------------------
-        // called by handler to mark continuation as the only possible solution for started interaction
-        //---------------------------------------------------------------------------------------------------------
-        virtual void SAL_CALL select() throw( ::com::sun::star::uno::RuntimeException )
-        {
-            m_bSelected = sal_True;
-        }
-
-    // member
-    private:
-
-        sal_Bool m_bSelected;
-
-};  // class ContinuationBase
-
-/*-************************************************************************************************************//**
-    @short          declaration of some simple continuations
-    @descr          These derived classes implements some simple continuations, which doesnt need and additional
-                    interfaces or methods. Her selected state is the only neccessary feature. User of it can
-                    distinguish by type between different functionality!
-
-    @implements     -
-
-    @base           ContinuationBase
-
-    @devstatus      ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-typedef ContinuationBase< ::com::sun::star::task::XInteractionAbort > ContinuationAbort;
-typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > ContinuationApprove;
-typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > ContinuationDisapprove;
-typedef ContinuationBase< ::com::sun::star::task::XInteractionRetry > ContinuationRetry;
-
-/*-************************************************************************************************************//**
-    @short          declaration of special continuation for filter selection
-    @descr          Sometimes filter detection during loading document failed. Then we need a possibility
-                    to ask user for his decision. These continuation transport selected filter by user to
-                    code user of interaction.
-
-    @attention      This implementation could be used one times only. We don't support a resetable continuation yet!
-                    Why? Normaly interaction should show a filter selection dialog and ask user for his decision.
-                    He can select any filter - then instances of these class will be called by handler ... or user
-                    close dialog without any selection. Then another continuation should be slected by handler to
-                    abort continuations ... Retrying isn't very usefull here ... I think.
-
-    @implements     XInteractionFilterSelect
-
-    @base           ImplInheritanceHelper1
-                    ContinuationBase
-
-    @devstatus      ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-class ContinuationFilterSelect : public ContinuationBase< ::com::sun::star::document::XInteractionFilterSelect >
-{
-    // c++ interface
-    public:
-        ContinuationFilterSelect();
-
-    // uno interface
-    public:
-        virtual void            SAL_CALL setFilter( const ::rtl::OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::rtl::OUString SAL_CALL getFilter(                                ) throw( ::com::sun::star::uno::RuntimeException );
-
-    // member
-    private:
-        ::rtl::OUString m_sFilter;
-
-};  // class ContinuationFilterSelect
-
-/*-************************************************************************************************************//**
-    @short          special request for interaction to ask user for right filter
-    @descr          These helper can be used to ask user for right filter, if filter detection failed.
-                    It capsulate communication with any interaction handler and supports an easy
-                    access on interaction results for user of these class.
-                    Use it and forget complex mechanism of interaction ...
-
-    @example        RequestFilterSelect*             pRequest = new RequestFilterSelect;
-                    Reference< XInteractionRequest > xRequest ( pRequest );
-                    xInteractionHandler->handle( xRequest );
-                    if( ! pRequest.isAbort() )
-                    {
-                        OUString sFilter = pRequest->getFilter();
-                    }
-
-    @implements     XInteractionRequest
-
-    @base           WeakImplHelper1
-
-    @devstatus      ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-class RequestFilterSelect : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
-{
-    // c++ interface
-    public:
-        RequestFilterSelect( const ::rtl::OUString& sURL );
-        sal_Bool        isAbort  () const;
-        ::rtl::OUString getFilter() const;
-
-    // uno interface
-    public:
-        virtual ::com::sun::star::uno::Any                                                                                              SAL_CALL getRequest      () throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException );
-
-    // member
-    private:
-        ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
-        ContinuationAbort*                                                                                                         m_pAbort        ;
-        ContinuationFilterSelect*                                                                                                  m_pFilter       ;
-
-};  // class RequestFilterSelect
-
-/*-************************************************************************************************************//**
-    @short          special request for interaction
-    @descr          User must decide between a preselected and another detected filter.
-                    It capsulate communication with any interaction handler and supports an easy
-                    access on interaction results for user of these class.
-
-    @implements     XInteractionRequest
-
-    @base           WeakImplHelper1
-
-    @devstatus      ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-class RequestAmbigousFilter : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
-{
-    // c++ interface
-    public:
-        RequestAmbigousFilter( const ::rtl::OUString& sURL            ,
-                               const ::rtl::OUString& sSelectedFilter ,
-                               const ::rtl::OUString& sDetectedFilter );
-        sal_Bool        isAbort  () const;
-        ::rtl::OUString getFilter() const;
-
-    // uno interface
-    public:
-        virtual ::com::sun::star::uno::Any                                                                                              SAL_CALL getRequest      () throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException );
-
-    // member
-    private:
-        ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
-        ContinuationAbort*                                                                                                         m_pAbort        ;
-        ContinuationFilterSelect*                                                                                                  m_pFilter       ;
-
-};  // class RequestFilterSelect
-
-/*-************************************************************************************************************//**
-    @short          special request for interaction
-    @descr          User must decide between a preselected and another detected filter.
-                    It capsulate communication with any interaction handler and supports an easy
-                    access on interaction results for user of these class.
-
-    @implements     XInteractionRequest
-
-    @base           WeakImplHelper1
-
-    @devstatus      ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-class InteractionRequest : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
-{
-    // c++ interface
-    public:
-        InteractionRequest( const ::com::sun::star::uno::Any&                                                                                             aRequest       ,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations )
-        {
-            m_aRequest       = aRequest      ;
-            m_lContinuations = lContinuations;
-        }
-
-    // uno interface
-    public:
-        virtual ::com::sun::star::uno::Any SAL_CALL getRequest()
-            throw( ::com::sun::star::uno::RuntimeException )
-            {
-                return m_aRequest;
-            }
-
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations()
-            throw( ::com::sun::star::uno::RuntimeException )
-            {
-                return m_lContinuations;
-            }
-
-    // member
-    private:
-        ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
-
-};  // class RequestFilterSelect
-
-}       //  namespace framework
-
-#endif  // #define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
diff --git a/framework/inc/helper/acceleratorinfo.hxx b/framework/inc/framework/acceleratorinfo.hxx
index bb529303df89..6b0519ceed98 100644
--- a/framework/inc/helper/acceleratorinfo.hxx
+++ b/framework/inc/framework/acceleratorinfo.hxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <vcl/keycod.hxx>
 #include <rtl/ustring.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
diff --git a/framework/inc/helper/actiontriggerhelper.hxx b/framework/inc/framework/actiontriggerhelper.hxx
index 4e387a42509a..67c4115a3621 100644
--- a/framework/inc/helper/actiontriggerhelper.hxx
+++ b/framework/inc/framework/actiontriggerhelper.hxx
@@ -33,11 +33,12 @@
 // #110897#
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/menu.hxx>
+#include <framework/fwedllapi.h>
 
 
 namespace framework
 {
-    class ActionTriggerHelper
+    class FWE_DLLPUBLIC ActionTriggerHelper
     {
         public:
             // Fills the submitted menu with the structure contained in the second
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx
index 4bc5bb8f5990..183c6937b39e 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/framework/addonmenu.hxx
@@ -40,6 +40,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <vcl/menu.hxx>
+#include <framework/fwedllapi.h>
 
 #define ADDONMENU_ITEMID_START       2000
 #define ADDONMENU_ITEMID_END         3000
@@ -47,7 +48,7 @@
 namespace framework
 {
 
-class AddonMenu : public PopupMenu
+class FWE_DLLPUBLIC AddonMenu : public PopupMenu
 {
     public:
                         AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
@@ -58,7 +59,7 @@ class AddonMenu : public PopupMenu
 };
 
 class AddonMenuManager;
-class AddonPopupMenu : public AddonMenu
+class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
 {
     public:
                                 ~AddonPopupMenu();
@@ -80,7 +81,7 @@ class AddonPopupMenu : public AddonMenu
     friend class AddonMenuManager;
 };
 
-class AddonMenuManager
+class FWE_DLLPUBLIC AddonMenuManager
 {
     public:
         enum MenuType
diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx
index 1824dd7b3f45..6e41fcbafdd1 100644
--- a/framework/inc/classes/addonsoptions.hxx
+++ b/framework/inc/framework/addonsoptions.hxx
@@ -38,7 +38,7 @@
 #include <vcl/svapp.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
-
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
 //  types, enums, ...
 //_________________________________________________________________________________________________________________
@@ -81,7 +81,7 @@ namespace framework
 
 typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > MergeMenuDefinition;
 
-struct MergeMenuInstruction
+struct FWE_DLLPUBLIC MergeMenuInstruction
 {
     ::rtl::OUString     aMergePoint;
     ::rtl::OUString     aMergeCommand;
@@ -92,7 +92,7 @@ struct MergeMenuInstruction
 };
 typedef ::std::vector< MergeMenuInstruction > MergeMenuInstructionContainer;
 
-struct MergeToolbarInstruction
+struct FWE_DLLPUBLIC MergeToolbarInstruction
 {
     ::rtl::OUString     aMergeToolbar;
     ::rtl::OUString     aMergePoint;
@@ -132,7 +132,7 @@ class AddonsOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class AddonsOptions
+class FWE_DLLPUBLIC AddonsOptions
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/framework/bmkmenu.hxx
index 11668d285d69..db6e2977f8b5 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/framework/bmkmenu.hxx
@@ -27,13 +27,13 @@
 #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX
 #define __FRAMEWORK_CLASSES_BMKMENU_HXX
 
-#include "classes/addonmenu.hxx"
+#include "framework/addonmenu.hxx"
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
 
 #include <com/sun/star/frame/XFrame.hpp>
-
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
@@ -50,7 +50,7 @@ namespace framework
 {
 
 class BmkMenu_Impl;
-class BmkMenu : public AddonMenu
+class FWE_DLLPUBLIC BmkMenu : public AddonMenu
 {
     public:
                         enum BmkMenuType
diff --git a/framework/inc/helper/configimporter.hxx b/framework/inc/framework/configimporter.hxx
index bbe465d85692..6038f7bdd325 100644
--- a/framework/inc/helper/configimporter.hxx
+++ b/framework/inc/framework/configimporter.hxx
@@ -34,10 +34,11 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <rtl/ustring.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
-    class UIConfigurationImporterOOo1x
+    class FWE_DLLPUBLIC UIConfigurationImporterOOo1x
     {
         public:
             static sal_Bool ImportCustomToolbars(
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx
index e5e1ab474a2a..4c07be58d1c7 100644
--- a/framework/inc/xml/eventsconfiguration.hxx
+++ b/framework/inc/framework/eventsconfiguration.hxx
@@ -28,6 +28,7 @@
 #ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
 
+#include <framework/fwedllapi.h>
 #include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
@@ -40,13 +41,13 @@
 namespace framework
 {
 
-struct EventsConfig
+struct FWE_DLLPUBLIC EventsConfig
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString >              aEventNames;
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >   aEventsProperties;
 };
 
-class EventsConfiguration
+class FWE_DLLPUBLIC EventsConfiguration
 {
     public:
         // #110897#
diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/framework/framelistanalyzer.hxx
index 4ab3c4532cdc..d6f2cd734237 100644
--- a/framework/inc/classes/framelistanalyzer.hxx
+++ b/framework/inc/framework/framelistanalyzer.hxx
@@ -34,6 +34,7 @@
 
 //_______________________________________________
 //  other includes
+#include <framework/fwedllapi.h>
 
 //_______________________________________________
 //  namespace
@@ -53,7 +54,7 @@ namespace framework{
     to switch into the backing mode, close the current active frame only or
     exit the whole application explicitly or implicitly.
  */
-class FrameListAnalyzer
+class FWE_DLLPUBLIC FrameListAnalyzer
 {
     //_______________________________________
     // types
diff --git a/framework/inc/framework/fwedllapi.h b/framework/inc/framework/fwedllapi.h
new file mode 100644
index 000000000000..c3aa1bb81d1d
--- /dev/null
+++ b/framework/inc/framework/fwedllapi.h
@@ -0,0 +1,13 @@
+#ifndef INCLUDED_FWEDLLAPI_H
+#define INCLUDED_FWEDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(FWE_DLLIMPLEMENTATION)
+#define FWE_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define FWE_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+#define FWE_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_FWEDLLAPI_H */
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/framework/imageproducer.hxx
index dff0ccfd1049..595b4c913744 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/framework/imageproducer.hxx
@@ -35,15 +35,16 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <vcl/image.hxx>
 #include <rtl/ustring.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
 
 typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
 
-pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
+pfunc_getImage FWE_DLLPUBLIC SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
 
-Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
 
 }
 
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/framework/imagesconfiguration.hxx
index 733822db8beb..0771e2d8f7f1 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/framework/imagesconfiguration.hxx
@@ -28,6 +28,7 @@
 #ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 
+#include <framework/fwedllapi.h>
 #include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
@@ -49,7 +50,7 @@ enum ImageMaskMode
     ImageMaskMode_Bitmap
 };
 
-struct ImageItemDescriptor
+struct FWE_DLLPUBLIC ImageItemDescriptor
 {
     ImageItemDescriptor() : nIndex( -1 ) {}
 
@@ -57,7 +58,7 @@ struct ImageItemDescriptor
     long    nIndex;                     // index of the bitmap inside the bitmaplist
 };
 
-struct ExternalImageItemDescriptor
+struct FWE_DLLPUBLIC ExternalImageItemDescriptor
 {
     String  aCommandURL;                // URL command to dispatch
     String  aURL;                       // a URL to an external bitmap
@@ -69,7 +70,7 @@ SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10, 2)
 typedef ExternalImageItemDescriptor* ExternalImageItemDescriptorPtr;
 SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2)
 
-struct ImageListItemDescriptor
+struct FWE_DLLPUBLIC ImageListItemDescriptor
 {
     ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ),
                                 pImageItemList( 0 ) {}
@@ -88,7 +89,7 @@ struct ImageListItemDescriptor
 typedef ImageListItemDescriptor* ImageListItemDescriptorPtr;
 SV_DECL_PTRARR_DEL( ImageListDescriptor, ImageListItemDescriptorPtr, 10, 2)
 
-struct ImageListsDescriptor
+struct FWE_DLLPUBLIC ImageListsDescriptor
 {
     ImageListsDescriptor() : pImageList( 0 ),
                      pExternalImageList( 0 ) {}
@@ -98,7 +99,7 @@ struct ImageListsDescriptor
     ExternalImageItemListDescriptor*    pExternalImageList;
 };
 
-class ImagesConfiguration
+class FWE_DLLPUBLIC ImagesConfiguration
 {
     public:
         // #110897#
diff --git a/framework/inc/framework/interaction.hxx b/framework/inc/framework/interaction.hxx
new file mode 100644
index 000000000000..03c8fde19736
--- /dev/null
+++ b/framework/inc/framework/interaction.hxx
@@ -0,0 +1,142 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 __FRAMEWORK_DISPATCH_INTERACTION_HXX_
+#define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
+
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/task/XInteractionContinuation.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionDisapprove.hpp>
+#include <com/sun/star/task/XInteractionRetry.hpp>
+#include <com/sun/star/document/XInteractionFilterSelect.hpp>
+#include <com/sun/star/document/NoSuchFilterRequest.hpp>
+#include <com/sun/star/document/AmbigousFilterRequest.hpp>
+#include <com/sun/star/uno/RuntimeException.hpp>
+
+//_________________________________________________________________________________________________________________
+//  includes of other projects
+//_________________________________________________________________________________________________________________
+#include <rtl/ustring.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <framework/fwedllapi.h>
+
+namespace framework{
+
+/*-************************************************************************************************************//**
+    @short          special request for interaction to ask user for right filter
+    @descr          These helper can be used to ask user for right filter, if filter detection failed.
+                    It capsulate communication with any interaction handler and supports an easy
+                    access on interaction results for user of these class.
+                    Use it and forget complex mechanism of interaction ...
+
+    @example        RequestFilterSelect*             pRequest = new RequestFilterSelect;
+                    Reference< XInteractionRequest > xRequest ( pRequest );
+                    xInteractionHandler->handle( xRequest );
+                    if( ! pRequest.isAbort() )
+                    {
+                        OUString sFilter = pRequest->getFilter();
+                    }
+
+    @implements     XInteractionRequest
+
+    @base           WeakImplHelper1
+
+    @devstatus      ready to use
+    @threadsafe     no (used on once position only!)
+*//*-*************************************************************************************************************/
+class RequestFilterSelect_Impl;
+class FWE_DLLPUBLIC RequestFilterSelect
+{
+    RequestFilterSelect_Impl* pImp;
+
+    public:
+        RequestFilterSelect( const ::rtl::OUString& sURL );
+        ~RequestFilterSelect();
+        sal_Bool        isAbort  () const;
+        ::rtl::OUString getFilter() const;
+    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+};
+
+/*-************************************************************************************************************//**
+    @short          special request for interaction
+    @descr          User must decide between a preselected and another detected filter.
+                    It capsulate communication with any interaction handler and supports an easy
+                    access on interaction results for user of these class.
+
+    @implements     XInteractionRequest
+
+    @base           WeakImplHelper1
+
+    @devstatus      ready to use
+    @threadsafe     no (used on once position only!)
+*//*-*************************************************************************************************************/
+class FWE_DLLPUBLIC InteractionRequest
+{
+public:
+    static com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >
+        CreateRequest( const ::com::sun::star::uno::Any& aRequest,
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations );
+};
+
+/*-************************************************************************************************************//**
+    @short          special request for interaction
+    @descr          User must decide between a preselected and another detected filter.
+                    It capsulate communication with any interaction handler and supports an easy
+                    access on interaction results for user of these class.
+
+    @implements     XInteractionRequest
+
+    @base           WeakImplHelper1
+
+    @devstatus      ready to use
+    @threadsafe     no (used on once position only!)
+*//*-*************************************************************************************************************/
+/*
+class RequestAmbigousFilter_Impl;
+class RequestAmbigousFilter             // seems to be unused currently
+{
+    RequestAmbigousFilter_Impl* pImp;
+
+    // c++ interface
+public:
+    RequestAmbigousFilter( const ::rtl::OUString& sURL,
+                            const ::rtl::OUString& sSelectedFilter ,
+                            const ::rtl::OUString& sDetectedFilter );
+    ~RequestAmbigousFilter();
+    sal_Bool        isAbort  () const;
+    ::rtl::OUString getFilter() const;
+    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+};
+ */
+
+}       //  namespace framework
+
+#endif  // #define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx
index ad43ee07997d..dee6c23a8f8e 100644
--- a/framework/inc/xml/menuconfiguration.hxx
+++ b/framework/inc/framework/menuconfiguration.hxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -70,7 +71,7 @@ const USHORT ITEMID_ADDONHELP           = FWK_SID_ADDONHELP;
 namespace framework
 {
 
-class MenuConfiguration
+class FWE_DLLPUBLIC MenuConfiguration
 {
     public:
         struct Attributes
diff --git a/framework/inc/classes/menuextensionsupplier.hxx b/framework/inc/framework/menuextensionsupplier.hxx
index 04fe3352fa31..f6ca60d4fecc 100644
--- a/framework/inc/classes/menuextensionsupplier.hxx
+++ b/framework/inc/framework/menuextensionsupplier.hxx
@@ -29,8 +29,9 @@
 #define __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_
 
 #include <rtl/ustring.hxx>
+#include <framework/fwedllapi.h>
 
-struct MenuExtensionItem
+struct FWE_DLLPUBLIC MenuExtensionItem
 {
     rtl::OUString aLabel;
     rtl::OUString aURL;
@@ -41,9 +42,9 @@ typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)();
 namespace framework
 {
 
-pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier );
+FWE_DLLPUBLIC pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier );
 
-MenuExtensionItem SAL_CALL GetMenuExtension();
+FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension();
 
 }
 
diff --git a/framework/inc/interaction/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx
index 4ba9554b21f9..e7f26b354f28 100644
--- a/framework/inc/interaction/preventduplicateinteraction.hxx
+++ b/framework/inc/framework/preventduplicateinteraction.hxx
@@ -28,6 +28,7 @@
 #ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
 #define __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
 
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
@@ -82,7 +83,7 @@ struct ThreadHelpBase2
         mutable ::osl::Mutex m_aLock;
 };
 
-class PreventDuplicateInteraction : private ThreadHelpBase2
+class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
                                     ,public ::cppu::WeakImplHelper1< css::task::XInteractionHandler2 >
 {
     //_____________________________________
diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/framework/sfxhelperfunctions.hxx
index ac3fa472f249..fd4292fc340f 100644
--- a/framework/inc/classes/sfxhelperfunctions.hxx
+++ b/framework/inc/framework/sfxhelperfunctions.hxx
@@ -28,6 +28,7 @@
 #ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
 #define __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
 
+#include <framework/fwedllapi.h>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <rtl/ustring.hxx>
 #include <vcl/toolbox.hxx>
@@ -45,29 +46,29 @@ typedef void ( *pfunc_activateToolPanel)( const ::com::sun::star::uno::Reference
 namespace framework
 {
 
-pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
+FWE_DLLPUBLIC pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
 
-svt::ToolboxController* SAL_CALL CreateToolBoxController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
+FWE_DLLPUBLIC svt::ToolboxController* SAL_CALL CreateToolBoxController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
 
-pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator );
+FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator );
 
-svt::StatusbarController* SAL_CALL CreateStatusBarController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL );
+FWE_DLLPUBLIC svt::StatusbarController* SAL_CALL CreateStatusBarController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL );
 
-pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc );
+FWE_DLLPUBLIC pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc );
 
-void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+FWE_DLLPUBLIC void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
 
-pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow );
+FWE_DLLPUBLIC pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow );
 
-void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+FWE_DLLPUBLIC void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
 
-pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
+FWE_DLLPUBLIC pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
 
-bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+FWE_DLLPUBLIC bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
 
-pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
+FWE_DLLPUBLIC pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
 
-void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
+FWE_DLLPUBLIC void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
 }
 
 #endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx
index 8619ae423622..bd93831cba7a 100644
--- a/framework/inc/xml/statusbarconfiguration.hxx
+++ b/framework/inc/framework/statusbarconfiguration.hxx
@@ -1,6 +1,33 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
 #define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
 
+#include <framework/fwedllapi.h>
 #include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
@@ -14,7 +41,7 @@
 namespace framework
 {
 
-struct StatusBarItemDescriptor
+struct FWE_DLLPUBLIC StatusBarItemDescriptor
 {
     String  aURL;                       // URL command to dispatch
     long    nItemBits;                  // properties for this statusbar item (WinBits)
@@ -31,7 +58,7 @@ struct StatusBarItemDescriptor
 typedef StatusBarItemDescriptor* StatusBarItemDescriptorPtr;
 SV_DECL_PTRARR_DEL( StatusBarDescriptor, StatusBarItemDescriptorPtr, 10, 2)
 
-class StatusBarConfiguration
+class FWE_DLLPUBLIC StatusBarConfiguration
 {
     public:
         static sal_Bool LoadStatusBar(
diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index a816b4299539..592a419e0b75 100644
--- a/framework/inc/helper/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -51,6 +51,7 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <hash_map>
+#include <framework/fwedllapi.h>
 
 //_______________________________________________
 // namespace
@@ -70,7 +71,7 @@ namespace framework{
 
     @threadsafe
  */
-class TitleHelper : private ::cppu::BaseMutex
+class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
                   , public  ::cppu::WeakImplHelper5< css::frame::XTitle                 ,
                                                      css::frame::XTitleChangeBroadcaster,
                                                      css::frame::XTitleChangeListener   ,
diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx
index 924c601ac689..453d94810fbc 100644
--- a/framework/inc/xml/toolboxconfiguration.hxx
+++ b/framework/inc/framework/toolboxconfiguration.hxx
@@ -1,6 +1,33 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 
+#include <framework/fwedllapi.h>
 #include <svl/svarray.hxx>
 #include <vcl/bitmap.hxx>
 #include <tools/string.hxx>
@@ -17,7 +44,7 @@
 namespace framework
 {
 
-class ToolBoxConfiguration
+class FWE_DLLPUBLIC ToolBoxConfiguration
 {
     public:
         // #110897#
diff --git a/framework/inc/fwidllapi.h b/framework/inc/fwidllapi.h
new file mode 100644
index 000000000000..8f4b50cf77e0
--- /dev/null
+++ b/framework/inc/fwidllapi.h
@@ -0,0 +1,13 @@
+#ifndef INCLUDED_FWIDLLAPI_H
+#define INCLUDED_FWIDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(FWI_DLLIMPLEMENTATION)
+#define FWI_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define FWI_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+#define FWI_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_FWIDLLAPI_H */
diff --git a/framework/inc/fwkdllapi.h b/framework/inc/fwkdllapi.h
new file mode 100644
index 000000000000..a22303386b68
--- /dev/null
+++ b/framework/inc/fwkdllapi.h
@@ -0,0 +1,8 @@
+#ifndef INCLUDED_FWKDLLAPI_H
+#define INCLUDED_FWKDLLAPI_H
+
+#include "sal/types.h"
+
+#include <fwidllapi.h>
+
+#endif /* INCLUDED_FWKDLLAPI_H */
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 6a1886244b54..5698974930ca 100644..100755
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -35,6 +35,7 @@
 #include <i18npool/lang.h>
 #include <svl/languageoptions.hxx>
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 #include <set>
 
@@ -90,7 +91,7 @@ inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType
 }
 
 
-class LanguageGuessingHelper
+class FWI_DLLPUBLIC LanguageGuessingHelper
 {
     mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >    m_xLanguageGuesser;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
@@ -101,7 +102,7 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >  GetGuesser() const;
 };
 
-::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
+FWI_DLLPUBLIC ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
             ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&    _xServiceFactory
             ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&        _xUICommandLabels
             ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame
@@ -109,7 +110,7 @@ public:
             ,sal_Bool& _rIni
             ,const sal_Char* _pName);
 
-void FillLangItems( std::set< ::rtl::OUString > &rLangItems,
+FWI_DLLPUBLIC void FillLangItems( std::set< ::rtl::OUString > &rLangItems,
         const SvtLanguageTable &rLanguageTable,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame,
         const LanguageGuessingHelper & rLangGuessHelper,
diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx
index 577b8a2672ad..55db4bf708dc 100644
--- a/framework/inc/helper/networkdomain.hxx
+++ b/framework/inc/helper/networkdomain.hxx
@@ -29,11 +29,12 @@
 #define __FRAMEWORK_HELPER_NETWORKDOMAIN_HXX_
 
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 namespace framework
 {
 
-class NetworkDomain
+class FWI_DLLPUBLIC NetworkDomain
 {
     public:
         static rtl::OUString GetNTDomainName();
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index 3420aa58b9c3..d1c50d3d9a14 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -37,11 +37,12 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <threadhelp/threadhelpbase.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
 
-class PropertySetContainer : public com::sun::star::container::XIndexContainer  ,
+class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIndexContainer    ,
                              public ThreadHelpBase                              ,   // Struct for right initalization of mutex member! Must be first of baseclasses.
                              public ::cppu::OWeakObject
 {
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index c591bb54d5c9..1d323551b841 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -30,11 +30,12 @@
 
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
+#include <fwidllapi.h>
 
 namespace framework
 {
 
-class ShareableMutex
+class FWI_DLLPUBLIC ShareableMutex
 {
     public:
         ShareableMutex();
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 05ab216d6f06..a815e7ac544d 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -58,6 +58,7 @@
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
@@ -78,45 +79,48 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
     //  public methods
     //-------------------------------------------------------------------------------------------------------------
     public:
-        UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory );
-        virtual ~UIConfigElementWrapperBase();
+        FWE_DLLPUBLIC UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory );
+        virtual FWE_DLLPUBLIC ~UIConfigElementWrapperBase();
 
-        //---------------------------------------------------------------------------------------------------------
-        //  XInterface, XTypeProvider
-        //---------------------------------------------------------------------------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
+        //  XInterface
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw();
+        virtual FWE_DLLPUBLIC void SAL_CALL release() throw();
+
+        // XTypeProvider
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException );
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException );
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
 
         // XInitialization
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
         // XUIElementSettings
-        virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
 
         // XUIElement
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
 
         //  XUIConfigurationListener
-        virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
 
         // XEventListener
         using cppu::OPropertySetHelper::disposing;
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException);
 
     //-------------------------------------------------------------------------------------------------------------
     //  protected methods
@@ -124,21 +128,21 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
     protected:
 
         //  OPropertySetHelper
-        virtual sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
+        virtual FWE_DLLPUBLIC sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
                                                                                                                com::sun::star::uno::Any&        aOldValue       ,
                                                                                                                sal_Int32                        nHandle         ,
                                                                                                                const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::lang::IllegalArgumentException );
-        virtual void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
+        virtual FWE_DLLPUBLIC void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
                                                                                                                const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::uno::Exception                 );
         using cppu::OPropertySetHelper::getFastPropertyValue;
-        virtual void                                                SAL_CALL getFastPropertyValue( com::sun::star::uno::Any&    aValue          ,
+        virtual FWE_DLLPUBLIC void                                                SAL_CALL getFastPropertyValue( com::sun::star::uno::Any&    aValue          ,
                                                                                                    sal_Int32                    nHandle         ) const;
-        virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
-        virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
 
-        virtual void impl_fillNewData();
+        virtual FWE_DLLPUBLIC void impl_fillNewData();
 
-        static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+        static FWE_DLLPUBLIC const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
 
         sal_Int16                                                                               m_nType;
         bool                                                                                    m_bPersistent : 1,
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index bc83765b09fe..daa574c9411e 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -53,6 +53,7 @@
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
@@ -71,31 +72,34 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
     //  public methods
     //-------------------------------------------------------------------------------------------------------------
     public:
-        UIElementWrapperBase( sal_Int16 nType );
-        virtual ~UIElementWrapperBase();
+        FWE_DLLPUBLIC UIElementWrapperBase( sal_Int16 nType );
+        virtual FWE_DLLPUBLIC ~UIElementWrapperBase();
 
-        //---------------------------------------------------------------------------------------------------------
-        //  XInterface, XTypeProvider
-        //---------------------------------------------------------------------------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
+        //  XInterface
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw();
+        virtual FWE_DLLPUBLIC void SAL_CALL release() throw();
+
+        // XTypeProvider
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException );
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException );
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
 
         // XInitialization
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
 
         // XUIElement
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
 
     //-------------------------------------------------------------------------------------------------------------
     //  protected methods
@@ -103,19 +107,19 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
     protected:
 
         //  OPropertySetHelper
-        virtual sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
+        virtual FWE_DLLPUBLIC sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
                                                                                                                com::sun::star::uno::Any&        aOldValue       ,
                                                                                                                sal_Int32                        nHandle         ,
                                                                                                                const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::lang::IllegalArgumentException );
-        virtual void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
+        virtual FWE_DLLPUBLIC void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
                                                                                                                const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::uno::Exception                 );
         using cppu::OPropertySetHelper::getFastPropertyValue;
-        virtual void                                                SAL_CALL getFastPropertyValue( com::sun::star::uno::Any&    aValue          ,
+        virtual FWE_DLLPUBLIC void                                                SAL_CALL getFastPropertyValue( com::sun::star::uno::Any&    aValue          ,
                                                                                                    sal_Int32                    nHandle         ) const;
-        virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
-        virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
 
-        static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+        static FWE_DLLPUBLIC const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
 
         ::cppu::OMultiTypeInterfaceContainerHelper                          m_aListenerContainer;   /// container for ALL Listener
         rtl::OUString                                                       m_aResourceURL;
diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index 4a634f0192e4..31fb5d757656 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -42,6 +42,7 @@
 //_______________________________________
 // other includes
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 //_______________________________________
 // namespace
@@ -58,7 +59,7 @@ namespace framework{
             instead of using soecialize config items of the svtools
             project. This class can wrapp such configuration access.
  */
-class ConfigAccess : public ThreadHelpBase
+class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase
 {
     //___________________________________
     // const
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index 56acbb6f182f..3222479af82f 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -41,6 +41,7 @@
 // other includes
 
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 //_______________________________________
 // namespace
@@ -59,10 +60,9 @@ namespace framework{
             it's code. Typos can occure or code will be changed by new developers ...
             Shared set of constant values can help to improve the mentainance of this code.
  */
-class JobConst
+class FWI_DLLPUBLIC JobConst
 {
     public:
-
         static const ::rtl::OUString ANSWER_DEACTIVATE_JOB();
         static const ::rtl::OUString ANSWER_SAVE_ARGUMENTS();
         static const ::rtl::OUString ANSWER_SEND_DISPATCHRESULT();
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 6b0135a39e10..0110a0b40b9e 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -52,7 +52,7 @@
 #include <stdtypes.h>
 #include <uielement/menubarmanager.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uielement/panelwindow.hxx>
 #include <uielement/uielement.hxx>
 #include <helper/ilayoutnotifications.hxx>
diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx
index 5677350b5349..d6ebae6d4b9c 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -46,6 +46,7 @@
 //_________________________________________________________________________________________________________________
 #include <osl/mutex.hxx>
 #include <vos/mutex.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -104,7 +105,7 @@ enum ELockType
 
     @devstatus      draft
 *//*-*************************************************************************************************************/
-class LockHelper : public  IMutex
+class FWI_DLLPUBLIC LockHelper : public  IMutex
                  , public  IRWLock
                  , private INonCopyable
 {
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index eca13d63103c..a9608de0164d 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -49,6 +49,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <osl/mutex.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -78,7 +79,7 @@ namespace framework{
 
     @devstatus      draft
 *//*-*************************************************************************************************************/
-class TransactionManager : public  ITransactionManager
+class FWI_DLLPUBLIC TransactionManager : public  ITransactionManager
                          , private INonCopyable
 {
     //-------------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index c2eeea0e3c28..04db0513fd86 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -56,13 +56,14 @@
 #include <cppuhelper/propshlp.hxx>
 
 #include <vector>
+#include <fwidllapi.h>
 
 namespace framework
 {
 
 class RootItemContainer;
 class ItemContainer;
-class ConstItemContainer :  public ::com::sun::star::lang::XTypeProvider    ,
+class FWI_DLLPUBLIC ConstItemContainer :    public ::com::sun::star::lang::XTypeProvider    ,
                             public com::sun::star::container::XIndexAccess  ,
                             public ::com::sun::star::lang::XUnoTunnel       ,
                             public ::com::sun::star::beans::XFastPropertySet,
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index ab45d039e636..91e5429f4e82 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -52,12 +52,12 @@
 #include <cppuhelper/implbase1.hxx>
 
 #include <vector>
+#include <fwidllapi.h>
 
 namespace framework
 {
-
 class ConstItemContainer;
-class ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexContainer>
+class FWI_DLLPUBLIC ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexContainer>
 {
     friend class ConstItemContainer;
 
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 773efafa52fe..f201c70d7bb0 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -72,7 +72,7 @@
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 
 namespace framework
 {
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 9ec0955c3ffe..df2920983c3d 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -57,13 +57,12 @@
 #include <cppuhelper/interfacecontainer.hxx>
 
 #include <vector>
+#include <fwidllapi.h>
 
 namespace framework
 {
-
 class ConstItemContainer;
-class ItemContainer;
-class RootItemContainer :   public ::com::sun::star::lang::XTypeProvider            ,
+class RootItemContainer : public ::com::sun::star::lang::XTypeProvider            ,
                             public ::com::sun::star::container::XIndexContainer     ,
                             public ::com::sun::star::lang::XSingleComponentFactory  ,
                             public ::com::sun::star::lang::XUnoTunnel               ,
@@ -75,10 +74,10 @@ class RootItemContainer :   public ::com::sun::star::lang::XTypeProvider
     friend class ConstItemContainer;
 
     public:
-        RootItemContainer();
-        RootItemContainer( const ConstItemContainer& rConstItemContainer );
-        RootItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer );
-        virtual ~RootItemContainer();
+        FWI_DLLPUBLIC RootItemContainer();
+        FWI_DLLPUBLIC RootItemContainer( const ConstItemContainer& rConstItemContainer );
+        FWI_DLLPUBLIC RootItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer );
+        virtual FWI_DLLPUBLIC ~RootItemContainer();
 
         //---------------------------------------------------------------------------------------------------------
         //  XInterface, XTypeProvider
@@ -87,8 +86,8 @@ class RootItemContainer :   public ::com::sun::star::lang::XTypeProvider
         FWK_DECLARE_XTYPEPROVIDER
 
         // XUnoTunnel
-        static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-        static RootItemContainer*                                   GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+        static FWI_DLLPUBLIC const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
+        static FWI_DLLPUBLIC RootItemContainer*                                   GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
         sal_Int64                                                   SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
         // XIndexContainer
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
index aa5d5ec52e1f..ffce5c1a348b 100644
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ b/framework/inc/xml/eventsdocumenthandler.hxx
@@ -29,7 +29,7 @@
 #define __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_
 
 #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
-#include <xml/eventsconfiguration.hxx>
+#include <framework/eventsconfiguration.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
@@ -50,6 +50,7 @@
 #include <hash_map>
 #include <stdtypes.h>
 
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
 //  namespace
 //_________________________________________________________________________________________________________________
@@ -59,7 +60,7 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadEventsDocumentHandler :  private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadEventsDocumentHandler :    private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
                                     public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -149,7 +150,7 @@ class OReadEventsDocumentHandler :  private ThreadHelpBase, // Struct for right
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >    m_xLocator;
 };
 
-class OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
 {
     public:
         OWriteEventsDocumentHandler(
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 2ecb63ed1609..59d1e4abdb3a 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -28,6 +28,8 @@
 #ifndef __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
 #define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
 
+#include <framework/fwedllapi.h>
+
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
@@ -39,7 +41,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -47,6 +49,7 @@
 #include <hash_map>
 #include <stdtypes.h>
 
+
 //_________________________________________________________________________________________________________________
 //  namespace
 //_________________________________________________________________________________________________________________
@@ -56,7 +59,7 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadImagesDocumentHandler : private ThreadHelpBase,  // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadImagesDocumentHandler : private ThreadHelpBase,    // Struct for right initalization of lock member! Must be first of baseclasses.
                                    public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -157,7 +160,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase,  // Struct for right
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >    m_xLocator;
 };
 
-class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
 {
     public:
         OWriteImagesDocumentHandler(
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index fbf1dce837e3..5c6064cdd4f1 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -48,6 +48,7 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -55,7 +56,7 @@
 
 namespace framework{
 
-class ReadMenuDocumentHandlerBase : public ThreadHelpBase,  // Struct for right initalization of mutex member! Must be first of baseclasses.
+class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase,    // Struct for right initalization of mutex member! Must be first of baseclasses.
                                     public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -118,7 +119,7 @@ class ReadMenuDocumentHandlerBase : public ThreadHelpBase,  // Struct for right
 };
 
 
-class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
 {
     public:
         // #110897#
@@ -162,7 +163,7 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
 };  // OReadMenuDocumentHandler
 
 
-class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
 {
     public:
         // #110897#
@@ -209,7 +210,7 @@ class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
 };  // OReadMenuBarHandler
 
 
-class OReadMenuHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase
 {
     public:
         OReadMenuHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuContainer,
@@ -247,7 +248,7 @@ class OReadMenuHandler : public ReadMenuDocumentHandlerBase
 }; // OReadMenuHandler
 
 
-class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
 {
     public:
         OReadMenuPopupHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuContainer,
@@ -290,7 +291,7 @@ class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
 }; // OReadMenuPopupHandler
 
 
-class OWriteMenuDocumentHandler
+class FWE_DLLPUBLIC OWriteMenuDocumentHandler
 {
     public:
         OWriteMenuDocumentHandler(
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index 7d04dd434441..f4bdfcf677e9 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -36,6 +36,7 @@
 #include <cppuhelper/implbase1.hxx>
 
 #include <stack>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -44,7 +45,7 @@
 namespace framework
 {
 
-class SaxNamespaceFilter : public ThreadHelpBase,   // Struct for right initalization of mutex member! Must be first of baseclasses.
+class FWE_DLLPUBLIC SaxNamespaceFilter : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses.
                            public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 3ce94a872344..82c2d0c55111 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -29,7 +29,7 @@
 #define __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_
 
 #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
@@ -49,6 +49,7 @@
 
 #include <hash_map>
 #include <stdtypes.h>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -59,7 +60,7 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadStatusBarDocumentHandler :   private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
                                         public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -148,7 +149,7 @@ class OReadStatusBarDocumentHandler :   private ThreadHelpBase, // Struct for ri
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >            m_xLocator;
 };
 
-class OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
 {
     public:
         OWriteStatusBarDocumentHandler(
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index c3cd030f6213..0b514b927bc1 100644
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.hxx
@@ -1,3 +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.
+ *
+ ************************************************************************/
 #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_
 #define __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_
 
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 5cb634b2bdc9..d90d91cee036 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -28,7 +28,7 @@
 #ifndef __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_
 #define __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_
 
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -43,6 +43,7 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <stdtypes.h>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -53,7 +54,7 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase,   // Struct for right initalization of lock member! Must be first of baseclasses.
                                     public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -169,7 +170,7 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right
 };
 
 
-class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler : private ThreadHelpBase   // Struct for right initalization of lock member! Must be first of baseclasses.
 {
     public:
             OWriteToolBoxDocumentHandler(
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index 81b6bb305ee0..bcb9ec4cb5e3 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -31,11 +31,12 @@
 #include <com/sun/star/xml/sax/SAXException.hpp>
 
 #include <map>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
 
-class XMLNamespaces
+class FWE_DLLPUBLIC XMLNamespaces
 {
     public:
         XMLNamespaces();
diff --git a/framework/prj/build.lst b/framework/prj/build.lst
index cf994604699a..afdad4072f93 100644
--- a/framework/prj/build.lst
+++ b/framework/prj/build.lst
@@ -1,57 +1,2 @@
-fr	framework	:    l10n svtools NULL
-fr	framework								usr1	-	all	fr_mkout NULL
-fr  framework\inc			        	    nmake   -   all fr_inc NULL
-fr  framework\source\constant               nmake   -   all fr_constant fr_inc NULL
-fr  framework\source\threadhelp             nmake   -   all fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\loadenv                nmake   -   all fr_loadenv fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\classes                nmake   -   all fr_classes fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\jobs                   nmake   -   all fr_jobs fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\interaction            nmake   -   all fr_interaction fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\helper                 nmake   -   all fr_helper fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\dispatch               nmake   -   all fr_dispatch fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\services               nmake   -   all fr_services fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\register               nmake   -   all fr_register fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\recording              nmake   -   all fr_recording fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\xml					nmake   -  	all fr_xml fr_threadhelp fr_inc NULL
-fr  framework\source\layoutmanager			nmake   -   all fr_layoutmanager fr_threadhelp fr_inc NULL
-fr  framework\source\uielement              nmake   -   all fr_uielement fr_threadhelp fr_inc NULL
-fr  framework\source\uifactory              nmake   -   all fr_uifactory fr_threadhelp fr_inc NULL
-fr  framework\source\uiconfiguration        nmake   -   all fr_uiconfiguration fr_threadhelp fr_inc NULL
-fr  framework\source\accelerators           nmake   -   all fr_accelerators fr_threadhelp fr_inc NULL
-fr  framework\source\tabwin					nmake   -   all fr_tabwin fr_threadhelp fr_inc NULL
-fr  framework\util                          nmake   -   all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin NULL
-fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL
-
-# complex tests
-# fails on unxsoli4
-# fr framework\qa\complex\ModuleManager          nmake - all fr_qa_complex_modulemanager NULL
-# fr framework\qa\complex\XUserInputInterception nmake - all fr_qa_complex_xuserinputinterception NULL
-
-# fr framework\qa\complex\accelerators           nmake - all fr_qa_complex_accel fr_qa_complex_accel_helper NULL
-
-# unclear should be remove
-# fr framework\qa\complex\api_internal           nmake - all fr_qa_complex_api_internal NULL
-
-# BUG! opens an error box
-# fr framework\qa\complex\broken_document          nmake - all fr_qa_complex_broken_doc NULL
-
-# failed:
-# fr framework\qa\complex\desktop                  nmake - all fr_qa_complex_desktop NULL
-
-# fr framework\qa\complex\dispatches               nmake - all fr_qa_complex_dispatches fr_qa_complex_dispatches_helper NULL
-# fr framework\qa\complex\disposing                nmake - all fr_qa_complex_disposing NULL
-
-# GPF
-# fr framework\qa\complex\framework\autosave       nmake - all fr_qa_complex_framework_autosave NULL
-
-# much too complex, will not change to new junit
-# fr framework\qa\complex\framework\recovery     nmake - all fr_qa_complex_framework_recovery NULL
-
-# fr framework\qa\complex\imageManager             nmake - all fr_qa_complex_imageManager fr_qa_complex_imageManager_interfaces NULL
-
-# fr framework\qa\complex\loadAllDocuments         nmake - all fr_qa_complex_loadAllDocuments fr_qa_complex_loadAllDocuments_helper NULL
-
-# need cleanups
-# fr framework\qa\complex\path_settings            nmake - all fr_qa_complex_path_settings NULL
-# fr framework\qa\complex\path_substitution        nmake - all fr_qa_complex_path_substitution NULL
-
+fr framework : l10n svtools NULL
+fr framework\prj nmake - all fr_all NULL
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index d3a3d6dd153c..e69de29bb2d1 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -1,55 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\framework
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
-
-..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd
-..\dtd\toolbar.dtd %_DEST%\bin%_EXT%\toolbar.dtd
-..\dtd\statusbar.dtd %_DEST%\bin%_EXT%\statusbar.dtd
-..\dtd\event.dtd %_DEST%\bin%_EXT%\event.dtd
-..\dtd\accelerator.dtd %_DEST%\bin%_EXT%\accelerator.dtd
-..\dtd\image.dtd %_DEST%\bin%_EXT%\image.dtd
-..\dtd\groupuinames.dtd %_DEST%\bin%_EXT%\groupuinames.dtd
-
-..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib
-..\%__SRC%\lib\ifwi.lib %_DEST%\lib%_EXT%\ifwi.lib
-..\inc\helper\imageproducer.hxx %_DEST%\inc%_EXT%\framework\imageproducer.hxx
-..\inc\helper\acceleratorinfo.hxx %_DEST%\inc%_EXT%\framework\acceleratorinfo.hxx
-..\inc\helper\actiontriggerhelper.hxx %_DEST%\inc%_EXT%\framework\actiontriggerhelper.hxx
-..\inc\xml\menuconfiguration.hxx %_DEST%\inc%_EXT%\framework\menuconfiguration.hxx
-..\inc\classes\bmkmenu.hxx %_DEST%\inc%_EXT%\framework\bmkmenu.hxx
-..\inc\xml\toolboxconfiguration.hxx %_DEST%\inc%_EXT%\framework\toolboxconfiguration.hxx
-..\inc\xml\statusbarconfiguration.hxx %_DEST%\inc%_EXT%\framework\statusbarconfiguration.hxx
-..\inc\xml\eventsconfiguration.hxx %_DEST%\inc%_EXT%\framework\eventsconfiguration.hxx
-..\inc\xml\imagesconfiguration.hxx %_DEST%\inc%_EXT%\framework\imagesconfiguration.hxx
-..\inc\classes\addonsoptions.hxx %_DEST%\inc%_EXT%\framework\addonsoptions.hxx
-..\inc\dispatch\interaction.hxx %_DEST%\inc%_EXT%\framework\interaction.hxx
-..\inc\classes\addonmenu.hxx %_DEST%\inc%_EXT%\framework\addonmenu.hxx
-..\inc\classes\sfxhelperfunctions.hxx %_DEST%\inc%_EXT%\framework\sfxhelperfunctions.hxx
-..\inc\helper\configimporter.hxx %_DEST%\inc%_EXT%\framework\configimporter.hxx
-..\inc\classes\menuextensionsupplier.hxx %_DEST%\inc%_EXT%\framework\menuextensionsupplier.hxx
-..\inc\interaction\preventduplicateinteraction.hxx %_DEST%\inc%_EXT%\framework\preventduplicateinteraction.hxx
-..\inc\helper\titlehelper.hxx %_DEST%\inc%_EXT%\framework\titlehelper.hxx
-..\inc\classes\framelistanalyzer.hxx %_DEST%\inc%_EXT%\framework\framelistanalyzer.hxx
-
-..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml
-..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml
-..\uiconfig\startmodule\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar\*.xml
-
-..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml
-
-..\%__SRC%\misc\fwk.component %_DEST%\xml%_EXT%\fwk.component
-..\%__SRC%\misc\fwl.component %_DEST%\xml%_EXT%\fwl.component
-..\%__SRC%\misc\fwm.component %_DEST%\xml%_EXT%\fwm.component
diff --git a/framework/source/application/makefile.mk b/framework/prj/makefile.mk
index 96bd84de2373..c73a3d944bbf 100644
--- a/framework/source/application/makefile.mk
+++ b/framework/prj/makefile.mk
@@ -24,22 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=			framework
-TARGET=				framework
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
+PRJ=..
+TARGET=prj
 
-# --- Settings -----------------------------------------------------
+.INCLUDE : settings.mk
 
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/login.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk
deleted file mode 100644
index 4ad6d8929030..000000000000
--- a/framework/qa/complex/ModuleManager/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.
-#
-#*************************************************************************
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_ModuleManager
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/ModuleManager
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckXModuleManager.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk
deleted file mode 100644
index 8b08bec171ee..000000000000
--- a/framework/qa/complex/XUserInputInterception/makefile.mk
+++ /dev/null
@@ -1,133 +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 "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-# we don't want something like this.
-# .IF "$(OS)"=="LINUX"
-# nothing .PHONY:
-# 	@echo "Test marked as failed on this platform"
-# .END
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_xuserinputinterception
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/XUserInputInterception
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    EventTest.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-# 
-# 
-# 
-# PRJ = ..$/..$/..
-# TARGET  = EventTest
-# PRJNAME = framework
-# PACKAGE = complex$/XUserInputInterception
-# 
-# # --- Settings -----------------------------------------------------
-# .INCLUDE: settings.mk
-# 
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-#                   OOoRunner.jar mysql.jar
-# JAVAFILES       = EventTest.java
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# 
-# #----- make a jar from compiled files ------------------------------
-# 
-# MAXLINELENGTH = 100000
-# 
-# JARCLASSDIRS    = $(PACKAGE)
-# JARTARGET       = $(TARGET).jar
-# JARCOMPRESS 	= TRUE
-# 
-# # --- Parameters for the test --------------------------------------
-# 
-# # start an office if the parameter is set for the makefile
-# .IF "$(OFFICE)" == ""
-# CT_APPEXECCOMMAND =
-# .ELSE
-# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-# .ENDIF
-# 
-# # test base is java complex
-# CT_TESTBASE = -TestBase java_complex
-# 
-# # test looks something like the.full.package.TestName
-# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# .IF "$(depend)" == ""
-# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-# .ELSE
-# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-# .ENDIF
-# 
-# .INCLUDE :  target.mk
-# 
-# #$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
-# #   cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-# #   jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
-# 
-# RUN: run
-# 
-# run:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
-# 
-# 
-# 
diff --git a/framework/qa/complex/accelerators/helper/makefile.mk b/framework/qa/complex/accelerators/helper/makefile.mk
deleted file mode 100644
index 189a5fddba77..000000000000
--- a/framework/qa/complex/accelerators/helper/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 = ../../../..
-TARGET  = AcceleratorsConfigurationTest
-PRJNAME = framework
-PACKAGE = complex/accelerators/helper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-                  Generator.jar OOoRunner.jar
-JAVAFILES       = KeyMapping.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-MAXLINELENGTH = 100000
-
-.INCLUDE :  target.mk
diff --git a/framework/qa/complex/accelerators/makefile.mk b/framework/qa/complex/accelerators/makefile.mk
deleted file mode 100644
index 7d5460324849..000000000000
--- a/framework/qa/complex/accelerators/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.
-#
-#*************************************************************************
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_accelerators
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/accelerators
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    AcceleratorsConfigurationTest.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-    KeyMapping.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-#                  OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-
-
-                  
diff --git a/framework/qa/complex/api_internal/makefile.mk b/framework/qa/complex/api_internal/makefile.mk
deleted file mode 100755
index f1a22011a8e7..000000000000
--- a/framework/qa/complex/api_internal/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_api_internal
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/api_internal
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckAPI.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-#                  OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
diff --git a/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk
deleted file mode 100755
index 8b1cf2ac3bfd..000000000000
--- a/framework/qa/complex/broken_document/makefile.mk
+++ /dev/null
@@ -1,65 +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 "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_broken_document
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/broken_document
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    LoadDocument.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-    TestDocument.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-#                  OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
diff --git a/framework/qa/complex/contextMenuInterceptor/makefile.mk b/framework/qa/complex/contextMenuInterceptor/makefile.mk
deleted file mode 100644
index 574d98641468..000000000000
--- a/framework/qa/complex/contextMenuInterceptor/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_contextMenuInterceptor
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/contextMenuInterceptor
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckContextMenuInterceptor.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-    ContextMenuInterceptor.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-#                  OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/framework/qa/complex/desktop/makefile.mk b/framework/qa/complex/desktop/makefile.mk
deleted file mode 100755
index 74db8d34e160..000000000000
--- a/framework/qa/complex/desktop/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_desktop
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/desktop
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    DesktopTerminate.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-#                  OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/framework/qa/complex/dispatches/makefile.mk b/framework/qa/complex/dispatches/makefile.mk
deleted file mode 100644
index 6a5ff79dd793..000000000000
--- a/framework/qa/complex/dispatches/makefile.mk
+++ /dev/null
@@ -1,131 +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 "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_dispatches
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/dispatches
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    checkdispatchapi.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
- Interceptor.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar ConnectivityTools.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-
-
-# PRJ = ..$/..$/..
-# TARGET  = checkdispatchapi
-# PRJNAME = framework
-# PACKAGE = complex$/dispatches
-# 
-# # --- Settings -----------------------------------------------------
-# .INCLUDE: settings.mk
-# 
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-#                   OOoRunner.jar mysql.jar ConnectivityTools.jar
-# JAVAFILES       = checkdispatchapi.java
-# 
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# 
-# SUBDIRS=helper
-# 
-# #----- make a jar from compiled files ------------------------------
-# 
-# MAXLINELENGTH = 100000
-# 
-# JARCLASSDIRS    = $(PACKAGE)
-# JARTARGET       = $(TARGET).jar
-# JARCOMPRESS 	= TRUE
-# 
-# # --- Parameters for the test --------------------------------------
-# 
-# # start an office if the parameter is set for the makefile
-# .IF "$(OFFICE)" == ""
-# CT_APPEXECCOMMAND =
-# .ELSE
-# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-# .ENDIF
-# 
-# # test base is java complex
-# CT_TESTBASE = -TestBase java_complex
-# 
-# # test looks something like the.full.package.TestName
-# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# .IF "$(depend)" == ""
-# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-# .ELSE
-# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-# .ENDIF
-# 
-# .INCLUDE :  target.mk
-# 
-# #$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
-# #   cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-# #   jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
-# 
-# RUN: run
-# 
-# run:
-#    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
-# 
-# 
-# 
diff --git a/framework/qa/complex/disposing/makefile.mk b/framework/qa/complex/disposing/makefile.mk
deleted file mode 100755
index f24960421f21..000000000000
--- a/framework/qa/complex/disposing/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_disposing
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/disposing
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    GetServiceWhileDisposingOffice.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
diff --git a/framework/qa/complex/framework/autosave/makefile.mk b/framework/qa/complex/framework/autosave/makefile.mk
deleted file mode 100644
index 2e8e3dca1f76..000000000000
--- a/framework/qa/complex/framework/autosave/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../../..
-PRJNAME = framework
-TARGET = qa_complex_framework_autosave
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/framework/autosave
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    AutoSave.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
- ConfigHelper.java \
- Protocol.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-# 
-# PRJ = ..$/..$/..$/..
-# TARGET  = AutoSave
-# PRJNAME = framework
-# PACKAGE = complex$/framework$/autosave
-# 
-# # --- Settings -----------------------------------------------------
-# .INCLUDE: settings.mk
-# 
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-#                   OOoRunner.jar mysql.jar
-# JAVAFILES       = AutoSave.java ConfigHelper.java Protocol.java
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# 
-# #----- make a jar from compiled files ------------------------------
-# 
-# MAXLINELENGTH = 100000
-# 
-# JARCLASSDIRS    = $(PACKAGE)
-# JARTARGET       = $(TARGET).jar
-# JARCOMPRESS 	= TRUE
-# 
-# # --- Parameters for the test --------------------------------------
-# 
-# # start an office if the parameter is set for the makefile
-# .IF "$(OFFICE)" == ""
-# CT_APPEXECCOMMAND =
-# .ELSE
-# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-# .ENDIF
-# 
-# # test base is java complex
-# CT_TESTBASE = -TestBase java_complex
-# 
-# # test looks something like the.full.package.TestName
-# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# .IF "$(depend)" == ""
-# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-# .ELSE
-# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-# .ENDIF
-# 
-# .INCLUDE :  target.mk
-# 
-# #$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
-# #   cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-# #   jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
-# 
-# RUN: run
-# 
-# run:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
-# 
-# 
-# 
diff --git a/framework/qa/complex/framework/recovery/makefile.mk b/framework/qa/complex/framework/recovery/makefile.mk
deleted file mode 100755
index 4a9f80b4b2a5..000000000000
--- a/framework/qa/complex/framework/recovery/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 = ..$/..$/..$/..
-TARGET  = RecoveryTest
-PRJNAME = framework
-PACKAGE = complex$/framework$/recovery
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES      = RecoveryTest.java RecoveryTools.java CrashThread.java TimeoutThread.java KlickButtonThread.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS  = $(PACKAGE)
-JARTARGET     = $(TARGET).jar
-JARCOMPRESS   = TRUE
-
-#------ some information how to run the test -----------------------
-
-MYTAR: ALLTAR
-    @echo 
-    @echo ###########################   N O T E  ######################################
-    @echo 
-    @echo To run the test successfully you have to extend your LD_LIBRARY_PATH
-    @echo to your office program directory!
-    @echo Example:
-    @echo setenv LD_LIBRARY_PATH /myOffice/program:\$$LD_LIBRARY_PATH
-    @echo
-    @echo To run the you have to use the parameter cmd:
-    @echo cmd="PATH_TO_OFFICE_BINARY -accept=socket,host=localhost,port=8100;urp;"
-    @echo 
-    @echo Example:
-    @echo dmake run cmd="/myOffice/program/soffice -accept=socket,host=localhost,port=8100;urp;"
-    @echo
-    
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(cmd)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -cmd "$(cmd)"
-#CT_APPEXECCOMMAND = -AppExecutionCommand \
-#            "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# replace $/ with . in package name
-CT_PACKAGE  = -o $(PACKAGE:s\$/\.\)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-CT_NOOFFICE = -NoOffice true
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-RUN: run
-# muss noch angepasst werden: es soll auf -AppExecutionCommand und -NoOffice gepr??ft werden
-#.IF "$(OFFICE)" == ""
-#run:
-#    @echo Exit
-#.ELSE
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_NOOFFICE) $(CT_PACKAGE).RecoveryTest
-
diff --git a/framework/qa/complex/imageManager/interfaces/makefile.mk b/framework/qa/complex/imageManager/interfaces/makefile.mk
deleted file mode 100755
index f7b6f5ebf035..000000000000
--- a/framework/qa/complex/imageManager/interfaces/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 = ../../../..
-TARGET  = ImageManager
-PRJNAME = framework
-PACKAGE = complex/imageManager/interfaces
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-
-JAVAFILES       = \
-_XComponent.java \
-_XUIConfiguration.java \
-_XImageManager.java \
-_XUIConfigurationPersistence.java \
-_XInitialization.java \
-_XTypeProvider.java
-
-JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS  = $(PACKAGE)
-JARTARGET     = $(TARGET).jar
-JARCOMPRESS   = TRUE
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk
deleted file mode 100755
index 133e522b13b4..000000000000
--- a/framework/qa/complex/imageManager/makefile.mk
+++ /dev/null
@@ -1,123 +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 "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_imageManager
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/imageManager
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
- CheckImageManager.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
- _XComponent.java \
- _XImageManager.java \
- _XInitialization.java \
- _XTypeProvider.java \
- _XUIConfiguration.java \
- _XUIConfigurationPersistence.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-
-# 
-# 
-# PRJ = ..$/..$/..
-# TARGET  = ImageManager
-# PRJNAME = framework
-# PACKAGE = imageManager
-# 
-# # --- Settings -----------------------------------------------------
-# .INCLUDE: settings.mk
-# 
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-# JAVAFILES       = CheckImageManager.java
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# 
-# #----- make a jar from compiled files ------------------------------
-# 
-# MAXLINELENGTH = 100000
-# 
-# JARCLASSDIRS  = $(PACKAGE)
-# JARTARGET     = $(TARGET).jar
-# JARCOMPRESS   = TRUE
-# 
-# # --- Parameters for the test --------------------------------------
-# 
-# # start an office if the parameter is set for the makefile
-# .IF "$(OFFICE)" == ""
-# CT_APPEXECCOMMAND =
-# .ELSE
-# CT_APPEXECCOMMAND = -AppExecutionCommand \
-#             "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-# .ENDIF
-# 
-# # test base is java complex
-# CT_TESTBASE = -TestBase java_complex
-# 
-# # replace $/ with . in package name
-# CT_PACKAGE  = -o $(PACKAGE:s\$/\.\)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# .INCLUDE :  target.mk
-# 
-# RUN: run
-# 
-# run:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_PACKAGE).CheckImageManager
-# 
-# 
diff --git a/framework/qa/complex/loadAllDocuments/makefile.mk b/framework/qa/complex/loadAllDocuments/makefile.mk
deleted file mode 100644
index ebf0265620bf..000000000000
--- a/framework/qa/complex/loadAllDocuments/makefile.mk
+++ /dev/null
@@ -1,134 +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 "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_loadAllDocuments
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/loadAllDocuments
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckXComponentLoader.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
- InteractionHandler.java \
- StatusIndicator.java \
- StreamSimulator.java \
- TestDocument.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-
-# 
-# 
-# PRJ = ..$/..$/..
-# TARGET  = CheckXComponentLoader
-# PRJNAME = framework
-# PACKAGE = complex$/loadAllDocuments
-# 
-# # --- Settings -----------------------------------------------------
-# .INCLUDE: settings.mk
-# 
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-#                   OOoRunner.jar mysql.jar
-# JAVAFILES       = 
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# 
-# SUBDIRS = helper
-# 
-# #----- make a jar from compiled files ------------------------------
-# 
-# MAXLINELENGTH = 100000
-# 
-# JARCLASSDIRS    = $(PACKAGE)
-# JARTARGET       = $(TARGET).jar
-# JARCOMPRESS 	= TRUE
-# 
-# # --- Parameters for the test --------------------------------------
-# 
-# # start an office if the parameter is set for the makefile
-# .IF "$(OFFICE)" == ""
-# CT_APPEXECCOMMAND =
-# .ELSE
-# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-# .ENDIF
-# 
-# # test base is java complex
-# CT_TESTBASE = -TestBase java_complex
-# 
-# # test looks something like the.full.package.TestName
-# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# .IF "$(depend)" == ""
-# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-# .ELSE
-# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-# .ENDIF
-# 
-# .INCLUDE :  target.mk
-# 
-# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
-#     cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-#     jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
-# 
-# RUN: run
-# 
-# run:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) -tdoc $(PWD)$/testdocuments
-# 
-# 
-# 
diff --git a/framework/qa/complex/path_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk
deleted file mode 100755
index 05900d46e190..000000000000
--- a/framework/qa/complex/path_settings/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-#	@echo "OOO_SUBSEQUENT_TESTS not set, do nothing."
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_path_settings
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/path_settings
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    PathSettingsTest.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
diff --git a/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk
deleted file mode 100755
index 338affbf70d7..000000000000
--- a/framework/qa/complex/path_substitution/makefile.mk
+++ /dev/null
@@ -1,122 +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 "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = framework
-TARGET = qa_complex_path_substitution
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/path_substitution
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    PathSubstitutionTest.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-# 
-# 
-# 
-# 
-# PRJ = ..$/..$/..
-# TARGET  = PathSubstitution
-# PRJNAME = $(TARGET)
-# PACKAGE = complex$/path_substitution
-# 
-# # --- Settings -----------------------------------------------------
-# .INCLUDE: settings.mk
-# 
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
-# JAVAFILES       = PathSubstitutionTest.java
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# 
-# #----- make a jar from compiled files ------------------------------
-# 
-# MAXLINELENGTH = 100000
-# 
-# JARCLASSDIRS    = $(PACKAGE)
-# JARTARGET       = $(TARGET).jar
-# JARCOMPRESS 	= TRUE
-# 
-# # --- Parameters for the test --------------------------------------
-# 
-# # start an office if the parameter is set for the makefile
-# .IF "$(OFFICE)" == ""
-# CT_APPEXECCOMMAND =
-# .ELSE
-# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-# .ENDIF
-# 
-# # test base is java complex
-# CT_TESTBASE = -TestBase java_complex
-# 
-# # test looks something like the.full.package.TestName
-# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# .IF "$(depend)" == ""
-# ALL :   ALLTAR
-# .ELSE
-# ALL: 	ALLDEP
-# .ENDIF
-# 
-# .INCLUDE :  target.mk
-# 
-# RUN: run
-# 
-# run:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST)
-# 
diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk
deleted file mode 100755
index 38a6cf7cced8..000000000000
--- a/framework/qa/unoapi/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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = framework
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/framework/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/framework/source/accelerators/makefile.mk b/framework/source/accelerators/makefile.mk
deleted file mode 100644
index 23a60dd1870e..000000000000
--- a/framework/source/accelerators/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=			framework
-TARGET=             fwk_accelerators
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           \
-                    $(SLO)$/keymapping.obj                      \
-                    $(SLO)$/storageholder.obj                   \
-                    $(SLO)$/presethandler.obj                   \
-                    $(SLO)$/acceleratorcache.obj                \
-                    $(SLO)$/acceleratorconfiguration.obj        \
-                    $(SLO)$/globalacceleratorconfiguration.obj  \
-                    $(SLO)$/moduleacceleratorconfiguration.obj  \
-                    $(SLO)$/documentacceleratorconfiguration.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index aa550807460c..a441f251a592 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -30,7 +30,7 @@
 
 #include <classes/fwktabwindow.hxx>
 #include "framework.hrc"
-#include <classes/fwlresid.hxx>
+#include <classes/fwkresid.hxx>
 
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/XContainerWindowEventHandler.hpp>
@@ -205,9 +205,9 @@ void FwkTabPage::Resize()
 
 FwkTabWindow::FwkTabWindow( Window* pParent ) :
 
-    Window( pParent, FwlResId( WIN_TABWINDOW ) ),
+    Window( pParent, FwkResId( WIN_TABWINDOW ) ),
 
-    m_aTabCtrl  ( this, FwlResId( TC_TABCONTROL ) )
+    m_aTabCtrl  ( this, FwkResId( TC_TABCONTROL ) )
 {
     uno::Reference < lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
     m_xWinProvider = uno::Reference < awt::XContainerWindowProvider >(
diff --git a/framework/source/classes/makefile.mk b/framework/source/classes/makefile.mk
deleted file mode 100644
index 22e8a6d540f0..000000000000
--- a/framework/source/classes/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=			framework
-TARGET=				fwk_classes
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           \
-                    $(SLO)$/propertysethelper.obj					\
-                    $(SLO)$/framecontainer.obj						\
-                    $(SLO)$/taskcreator.obj							\
-                    $(SLO)$/menumanager.obj							\
-                    $(SLO)$/bmkmenu.obj								\
-                    $(SLO)$/droptargetlistener.obj					\
-                    $(SLO)$/converter.obj							\
-                    $(SLO)$/actiontriggerpropertyset.obj			\
-                    $(SLO)$/actiontriggerseparatorpropertyset.obj	\
-                    $(SLO)$/actiontriggercontainer.obj				\
-                    $(SLO)$/imagewrapper.obj						\
-                    $(SLO)$/rootactiontriggercontainer.obj          \
-                    $(SLO)$/protocolhandlercache.obj				\
-                    $(SLO)$/addonmenu.obj							\
-                    $(SLO)$/addonsoptions.obj						\
-                    $(SLO)$/fwkresid.obj                            \
-                    $(SLO)$/fwlresid.obj                            \
-                    $(SLO)$/framelistanalyzer.obj                   \
-                    $(SLO)$/sfxhelperfunctions.obj                  \
-                    $(SLO)$/menuextensionsupplier.obj               \
-                    $(SLO)$/fwktabwindow.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-    resource.src
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 61cb8eb4a253..493ac9dfb4a1 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -33,12 +33,12 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 #include <classes/menumanager.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <classes/bmkmenu.hxx>
-#include <classes/addonmenu.hxx>
-#include <helper/imageproducer.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/bmkmenu.hxx>
+#include <framework/addonmenu.hxx>
+#include <framework/imageproducer.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include "classes/addonsoptions.hxx"
+#include "framework/addonsoptions.hxx"
 #include <classes/fwkresid.hxx>
 #include <services.h>
 #include "classes/resource.hrc"
diff --git a/framework/source/constant/makefile.mk b/framework/source/constant/makefile.mk
deleted file mode 100644
index 05fc28870d0a..000000000000
--- a/framework/source/constant/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=			framework
-TARGET=             fwk_constant
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           $(SLO)$/frameloader.obj         \
-                    $(SLO)$/contenthandler.obj      \
-                    $(SLO)$/containerquery.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index ee84de9d7dd4..57355eaa6398 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -34,7 +34,7 @@
 #include <pattern/frame.hxx>
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
-#include <classes/framelistanalyzer.hxx>
+#include <framework/framelistanalyzer.hxx>
 #include <services.h>
 #include <general.h>
 
diff --git a/framework/source/dispatch/makefile.mk b/framework/source/dispatch/makefile.mk
deleted file mode 100644
index b969d71ea9fc..000000000000
--- a/framework/source/dispatch/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=            framework
-TARGET=             fwk_dispatch
-USE_DEFFILE=        TRUE
-ENABLE_EXCEPTIONS=  TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :          settings.mk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=framework
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/closedispatcher.obj                 \
-    $(SLO)$/dispatchinformationprovider.obj     \
-    $(SLO)$/dispatchprovider.obj                \
-    $(SLO)$/helpagentdispatcher.obj             \
-    $(SLO)$/interaction.obj                     \
-    $(SLO)$/interceptionhelper.obj              \
-    $(SLO)$/loaddispatcher.obj                  \
-    $(SLO)$/mailtodispatcher.obj                \
-    $(SLO)$/menudispatcher.obj                  \
-    $(SLO)$/oxt_handler.obj                     \
-    $(SLO)$/popupmenudispatcher.obj             \
-    $(SLO)$/servicehandler.obj                  \
-    $(SLO)$/systemexec.obj		                \
-    $(SLO)$/windowcommanddispatch.obj           \
-    $(SLO)$/startmoduledispatcher.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :          target.mk
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 718830545db2..d55556b23f65 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -33,8 +33,8 @@
 //_________________________________________________________________________________________________________________
 #include <dispatch/menudispatcher.hxx>
 #include <general.h>
-#include <xml/menuconfiguration.hxx>
-#include <classes/addonmenu.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/addonmenu.hxx>
 #include <services.h>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 834d11017ec8..8437b82961ea 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -34,8 +34,8 @@
 
 #include <dispatch/popupmenudispatcher.hxx>
 #include <general.h>
-#include <xml/menuconfiguration.hxx>
-#include <classes/addonmenu.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/addonmenu.hxx>
 #include <services.h>
 #include <properties.h>
 
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 40def3f98488..0e49b2818e56 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -36,7 +36,7 @@
 #include <pattern/frame.hxx>
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
-#include <classes/framelistanalyzer.hxx>
+#include <framework/framelistanalyzer.hxx>
 #include <dispatchcommands.h>
 #include <targets.h>
 #include <services.h>
diff --git a/framework/source/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index ea549fd3fda8..ea549fd3fda8 100644
--- a/framework/source/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
diff --git a/framework/source/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index e72efe6e7cba..c3400f10eef4 100644
--- a/framework/source/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -41,6 +41,8 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::awt;
 
+//struct SAL_DLLPUBLIC_IMPORT ::cppu::OBroadcastHelperVar< OMultiTypeInterfaceContainerHelper, OMultiTypeInterfaceContainerHelper::keyType >;
+
 // Handles for properties
 // (PLEASE SORT THIS FIELD, IF YOU ADD NEW PROPERTIES!)
 // We use an enum to define these handles, to use all numbers from 0 to nn and
diff --git a/framework/source/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index f68c293fcef4..f68c293fcef4 100644
--- a/framework/source/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
diff --git a/framework/source/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 4961a8f7c1f2..c3c328c3626e 100644
--- a/framework/source/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -31,12 +31,12 @@
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
-#include "classes/addonmenu.hxx"
-#include "classes/addonsoptions.hxx"
+#include "framework/addonmenu.hxx"
+#include "framework/addonsoptions.hxx"
 #include <general.h>
 #include <macros/debug/assertion.hxx>
-#include <helper/imageproducer.hxx>
-#include <xml/menuconfiguration.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/menuconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 9bdaeb7dfda3..1d947c651a67 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -31,7 +31,7 @@
 //_________________________________________________________________________________________________________________
 //  includes
 //_________________________________________________________________________________________________________________
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx
index aa2aef3b9d2b..78ddb606585b 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -34,11 +34,11 @@
 
 #include <limits.h>
 
-#include "classes/bmkmenu.hxx"
+#include "framework/bmkmenu.hxx"
 #include <general.h>
 #include <macros/debug/assertion.hxx>
-#include <helper/imageproducer.hxx>
-#include <xml/menuconfiguration.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/menuconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
diff --git a/framework/source/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index 22f019e78df5..1a33ebf91d7e 100644
--- a/framework/source/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include "classes/framelistanalyzer.hxx"
+#include "framework/framelistanalyzer.hxx"
 
 //_______________________________________________
 //  my own includes
diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index 54b37da6dbf7..54b37da6dbf7 100644
--- a/framework/source/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
diff --git a/framework/source/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index 82a7f684413c..82a7f684413c 100644
--- a/framework/source/classes/imagewrapper.cxx
+++ b/framework/source/fwe/classes/imagewrapper.cxx
diff --git a/framework/source/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx
index 07991c61f90f..3849a34d5425 100644
--- a/framework/source/classes/menuextensionsupplier.cxx
+++ b/framework/source/fwe/classes/menuextensionsupplier.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <classes/menuextensionsupplier.hxx>
+#include <framework/menuextensionsupplier.hxx>
 #include <osl/mutex.hxx>
 
 static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = NULL;
diff --git a/framework/source/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index c78d398b39a7..cdcc9aea5e1f 100644
--- a/framework/source/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -32,7 +32,7 @@
 #include <classes/actiontriggercontainer.hxx>
 #include <classes/actiontriggerpropertyset.hxx>
 #include <classes/actiontriggerseparatorpropertyset.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/framework/source/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index c6953b1ea2b9..ba3db729817d 100644
--- a/framework/source/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -28,9 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_CXX_
-#include <classes/sfxhelperfunctions.hxx>
-#endif
+#include <framework/sfxhelperfunctions.hxx>
 
 #include <tools/diagnose_ex.h>
 
diff --git a/framework/source/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index d1d14740956b..9b3d4f4c69d8 100644
--- a/framework/source/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -31,34 +31,51 @@
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
-#include <dispatch/interaction.hxx>
+#include <comphelper/interaction.hxx>
+#include <framework/interaction.hxx>
 #include <general.h>
 
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
+using namespace ::com::sun::star;
 
-//_________________________________________________________________________________________________________________
-//  includes of other projects
-//_________________________________________________________________________________________________________________
+namespace framework{
 
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
+/*-************************************************************************************************************//**
+    @short          declaration of special continuation for filter selection
+    @descr          Sometimes filter detection during loading document failed. Then we need a possibility
+                    to ask user for his decision. These continuation transport selected filter by user to
+                    code user of interaction.
 
-namespace framework{
+    @attention      This implementation could be used one times only. We don't support a resetable continuation yet!
+                    Why? Normaly interaction should show a filter selection dialog and ask user for his decision.
+                    He can select any filter - then instances of these class will be called by handler ... or user
+                    close dialog without any selection. Then another continuation should be slected by handler to
+                    abort continuations ... Retrying isn't very usefull here ... I think.
 
-//_________________________________________________________________________________________________________________
-//  non exported const
-//_________________________________________________________________________________________________________________
+    @implements     XInteractionFilterSelect
 
-//_________________________________________________________________________________________________________________
-//  non exported definitions
-//_________________________________________________________________________________________________________________
+    @base           ImplInheritanceHelper1
+                    ContinuationBase
+
+    @devstatus      ready to use
+    @threadsafe     no (used on once position only!)
+*//*-*************************************************************************************************************/
+class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterSelect >
+{
+    // c++ interface
+    public:
+        ContinuationFilterSelect();
+
+    // uno interface
+    public:
+        virtual void            SAL_CALL setFilter( const ::rtl::OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::rtl::OUString SAL_CALL getFilter(                                ) throw( ::com::sun::star::uno::RuntimeException );
+
+    // member
+    private:
+        ::rtl::OUString m_sFilter;
+
+};  // class ContinuationFilterSelect
 
-//_________________________________________________________________________________________________________________
-//  declarations
-//_________________________________________________________________________________________________________________
 
 //---------------------------------------------------------------------------------------------------------
 // initialize continuation with right start values
@@ -84,11 +101,29 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilte
     return m_sFilter;
 }
 
+class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+public:
+    RequestFilterSelect_Impl( const ::rtl::OUString& sURL );
+    sal_Bool        isAbort  () const;
+    ::rtl::OUString getFilter() const;
+
+public:
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException );
+
+private:
+    ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
+    comphelper::OInteractionAbort* m_pAbort;
+    ContinuationFilterSelect* m_pFilter;
+};
+
 //---------------------------------------------------------------------------------------------------------
 // initialize instance with all neccessary informations
 // We use it without any further checks on our member then ...!
 //---------------------------------------------------------------------------------------------------------
-RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
+RequestFilterSelect_Impl::RequestFilterSelect_Impl( const ::rtl::OUString& sURL )
 {
     ::rtl::OUString temp;
     css::uno::Reference< css::uno::XInterface > temp2;
@@ -97,7 +132,7 @@ RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
                                                        sURL                                          );
     m_aRequest <<= aFilterRequest;
 
-    m_pAbort  = new ContinuationAbort       ;
+    m_pAbort  = new comphelper::OInteractionAbort;
     m_pFilter = new ContinuationFilterSelect;
 
     m_lContinuations.realloc( 2 );
@@ -109,16 +144,16 @@ RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified then!
 //---------------------------------------------------------------------------------------------------------
-sal_Bool RequestFilterSelect::isAbort() const
+sal_Bool RequestFilterSelect_Impl::isAbort() const
 {
-    return m_pAbort->isSelected();
+    return m_pAbort->wasSelected();
 }
 
 //---------------------------------------------------------------------------------------------------------
 // return user selected filter
 // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
 //---------------------------------------------------------------------------------------------------------
-::rtl::OUString RequestFilterSelect::getFilter() const
+::rtl::OUString RequestFilterSelect_Impl::getFilter() const
 {
     return m_pFilter->getFilter();
 }
@@ -127,7 +162,7 @@ sal_Bool RequestFilterSelect::isAbort() const
 // handler call it to get type of request
 // Is hard coded to "please select filter" here. see ctor for further informations.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Any SAL_CALL RequestFilterSelect::getRequest() throw( css::uno::RuntimeException )
+css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException )
 {
     return m_aRequest;
 }
@@ -138,16 +173,102 @@ css::uno::Any SAL_CALL RequestFilterSelect::getRequest() throw( css::uno::Runtim
 // After interaction we support read access on these continuations on our c++ interface to
 // return user decision.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect::getContinuations() throw( css::uno::RuntimeException )
+css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException )
 {
     return m_lContinuations;
 }
 
+
+RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
+{
+    pImp = new RequestFilterSelect_Impl( sURL );
+    pImp->acquire();
+}
+
+RequestFilterSelect::~RequestFilterSelect()
+{
+    pImp->release();
+}
+
+
+//---------------------------------------------------------------------------------------------------------
+// return abort state of interaction
+// If it is true, return value of method "getFilter()" will be unspecified then!
+//---------------------------------------------------------------------------------------------------------
+sal_Bool RequestFilterSelect::isAbort() const
+{
+    return pImp->isAbort();
+}
+
+//---------------------------------------------------------------------------------------------------------
+// return user selected filter
+// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
+//---------------------------------------------------------------------------------------------------------
+::rtl::OUString RequestFilterSelect::getFilter() const
+{
+    return pImp->getFilter();
+}
+
+uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest()
+{
+    return uno::Reference < task::XInteractionRequest > (pImp);
+}
+
+/*
+class RequestAmbigousFilter_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+public:
+    RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL            ,
+                            const ::rtl::OUString& sSelectedFilter ,
+                            const ::rtl::OUString& sDetectedFilter );
+    sal_Bool        isAbort  () const;
+    ::rtl::OUString getFilter() const;
+
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest () throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException );
+
+    ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
+    ContinuationAbort*                                                                                                         m_pAbort        ;
+    ContinuationFilterSelect*                                                                                                  m_pFilter       ;
+};
+
+RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL, const ::rtl::OUString& sSelectedFilter,
+    const ::rtl::OUString& sDetectedFilter )
+{
+    pImp = new RequestAmbigousFilter_Impl( sURL, sSelectedFilter, sDetectedFilter );
+    pImp->acquire();
+}
+
+RequestAmbigousFilter::~RequestAmbigousFilter()
+{
+    pImp->release();
+}
+
+sal_Bool RequestAmbigousFilter::isAbort() const
+{
+    return pImp->isAbort();
+}
+
+//---------------------------------------------------------------------------------------------------------
+// return user selected filter
+// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
+//---------------------------------------------------------------------------------------------------------
+::rtl::OUString RequestAmbigousFilter::getFilter() const
+{
+    return pImp->getFilter();
+}
+
+uno::Reference < task::XInteractionRequest > RequestAmbigousFilter::GetRequest()
+{
+    return uno::Reference < task::XInteractionRequest > (pImp);
+}
+
 //---------------------------------------------------------------------------------------------------------
 // initialize instance with all neccessary informations
 // We use it without any further checks on our member then ...!
 //---------------------------------------------------------------------------------------------------------
-RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL            ,
+RequestAmbigousFilter_Impl::RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL            ,
                                               const ::rtl::OUString& sSelectedFilter ,
                                               const ::rtl::OUString& sDetectedFilter )
 {
@@ -172,7 +293,7 @@ RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified then!
 //---------------------------------------------------------------------------------------------------------
-sal_Bool RequestAmbigousFilter::isAbort() const
+sal_Bool RequestAmbigousFilter_Impl::isAbort() const
 {
     return m_pAbort->isSelected();
 }
@@ -181,7 +302,7 @@ sal_Bool RequestAmbigousFilter::isAbort() const
 // return user selected filter
 // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
 //---------------------------------------------------------------------------------------------------------
-::rtl::OUString RequestAmbigousFilter::getFilter() const
+::rtl::OUString RequestAmbigousFilter_Impl::getFilter() const
 {
     return m_pFilter->getFilter();
 }
@@ -190,7 +311,7 @@ sal_Bool RequestAmbigousFilter::isAbort() const
 // handler call it to get type of request
 // Is hard coded to "please select filter" here. see ctor for further informations.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Any SAL_CALL RequestAmbigousFilter::getRequest() throw( css::uno::RuntimeException )
+css::uno::Any SAL_CALL RequestAmbigousFilter_Impl::getRequest() throw( css::uno::RuntimeException )
 {
     return m_aRequest;
 }
@@ -201,9 +322,45 @@ css::uno::Any SAL_CALL RequestAmbigousFilter::getRequest() throw( css::uno::Runt
 // After interaction we support read access on these continuations on our c++ interface to
 // return user decision.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestAmbigousFilter::getContinuations() throw( css::uno::RuntimeException )
+css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestAmbigousFilter_Impl::getContinuations() throw( css::uno::RuntimeException )
+{
+    return m_lContinuations;
+}
+*/
+
+class InteractionRequest_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+    uno::Any m_aRequest;
+    uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations;
+
+public:
+    InteractionRequest_Impl( const ::com::sun::star::uno::Any& aRequest,
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations )
+    {
+        m_aRequest = aRequest;
+        m_lContinuations = lContinuations;
+    }
+
+    virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException );
+    virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations()
+            throw( uno::RuntimeException );
+};
+
+uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException )
+{
+    return m_aRequest;
+}
+
+uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL InteractionRequest_Impl::getContinuations()
+    throw( uno::RuntimeException )
 {
     return m_lContinuations;
 }
 
+uno::Reference < task::XInteractionRequest > InteractionRequest::CreateRequest(
+    const uno::Any& aRequest, const uno::Sequence< uno::Reference< task::XInteractionContinuation > > lContinuations )
+{
+    return new InteractionRequest_Impl( aRequest, lContinuations );
+}
+
 }       //  namespace framework
diff --git a/framework/source/helper/acceleratorinfo.cxx b/framework/source/fwe/helper/acceleratorinfo.cxx
index 3db17cf1db89..5774bc35a253 100644
--- a/framework/source/helper/acceleratorinfo.cxx
+++ b/framework/source/fwe/helper/acceleratorinfo.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include <helper/acceleratorinfo.hxx>
+#include <framework/acceleratorinfo.hxx>
 
 namespace framework
 {
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index b1c4e50dfe00..7de57599dd4b 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -27,11 +27,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <classes/actiontriggerseparatorpropertyset.hxx>
 #include <classes/rootactiontriggercontainer.hxx>
 #include <classes/imagewrapper.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
diff --git a/framework/source/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx
index 6f2c402da1e8..0b7571416c9d 100644
--- a/framework/source/helper/configimporter.cxx
+++ b/framework/source/fwe/helper/configimporter.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include <helper/configimporter.hxx>
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/configimporter.hxx>
+#include <framework/toolboxconfiguration.hxx>
 #include <com/sun/star/embed/ElementModes.hpp>
 
 #include <rtl/ustrbuf.hxx>
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx
index c4cf5921ee11..eae77637187c 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/fwe/helper/imageproducer.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include <helper/imageproducer.hxx>
+#include <framework/imageproducer.hxx>
 
 namespace framework
 {
diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 0fe750f92fd9..0fe750f92fd9 100644
--- a/framework/source/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 1ca884c27ca7..d9191da2be2e 100644
--- a/framework/source/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -31,7 +31,7 @@
 //_______________________________________________
 // includes
 
-#include <helper/titlehelper.hxx>
+#include <framework/titlehelper.hxx>
 #include <services.h>
 #include <properties.h>
 
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx
index 030ec5bf8cf6..030ec5bf8cf6 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/fwe/helper/uielementwrapperbase.cxx
index 6329f94b3063..6329f94b3063 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/fwe/helper/uielementwrapperbase.cxx
diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 6d0185a48080..7bc2201a3a27 100644
--- a/framework/source/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include "interaction/preventduplicateinteraction.hxx"
+#include "framework/preventduplicateinteraction.hxx"
 
 //_________________________________________________________________________________________________________________
 //  my own includes
diff --git a/framework/source/xml/eventsconfiguration.cxx b/framework/source/fwe/xml/eventsconfiguration.cxx
index 75a024eb8405..873682f60345 100644
--- a/framework/source/xml/eventsconfiguration.cxx
+++ b/framework/source/fwe/xml/eventsconfiguration.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <xml/eventsconfiguration.hxx>
+#include <framework/eventsconfiguration.hxx>
 #include <xml/eventsdocumenthandler.hxx>
 #include <services.h>
 
diff --git a/framework/source/xml/eventsdocumenthandler.cxx b/framework/source/fwe/xml/eventsdocumenthandler.cxx
index a1cc33b02dad..ad21937fcc5d 100644
--- a/framework/source/xml/eventsdocumenthandler.cxx
+++ b/framework/source/fwe/xml/eventsdocumenthandler.cxx
@@ -28,6 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
+#include <framework/fwedllapi.h>
 #include <stdio.h>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/fwe/xml/imagesconfiguration.cxx
index 75517d2766dd..d561a76d5995 100644
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/fwe/xml/imagesconfiguration.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <services.h>
 
 #ifndef __FRAMEWORK_CLASSES_IMAGESDOCUMENTHANDLER_HXX_
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/fwe/xml/imagesdocumenthandler.cxx
index 83d42b82c539..83d42b82c539 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/fwe/xml/imagesdocumenthandler.cxx
diff --git a/framework/source/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 010c96349d8c..4493d5f80ec9 100644
--- a/framework/source/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -31,12 +31,12 @@
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
-#include <xml/menuconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
 
 #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX_
-#include <classes/bmkmenu.hxx>
+#include <framework/bmkmenu.hxx>
 #endif
-#include <classes/addonmenu.hxx>
+#include <framework/addonmenu.hxx>
 #include <xml/menudocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
 #include <services.h>
diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 3fc5d1775be4..c5d5e84cf609 100644
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -34,8 +34,8 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 #include <xml/menudocumenthandler.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <classes/addonmenu.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/addonmenu.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
diff --git a/framework/source/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index a92c58547e06..a92c58547e06 100644
--- a/framework/source/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
diff --git a/framework/source/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx
index 2b9d3e5baa58..0d79ef8fd461 100644
--- a/framework/source/xml/statusbarconfiguration.cxx
+++ b/framework/source/fwe/xml/statusbarconfiguration.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 #include <xml/statusbardocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
 #include <services.h>
diff --git a/framework/source/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 370ca6e3f18a..370ca6e3f18a 100644
--- a/framework/source/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx
index 9d1c91aa6849..994354a7e1a8 100644
--- a/framework/source/xml/toolboxconfiguration.cxx
+++ b/framework/source/fwe/xml/toolboxconfiguration.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 #include <xml/toolboxdocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
 #include <services.h>
diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index acb88ef16e75..acb88ef16e75 100644
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
diff --git a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
new file mode 100644
index 000000000000..645750dc3f51
--- /dev/null
+++ b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_framework.hxx"
+
+#include <stdio.h>
+
+//_________________________________________________________________________________________________________________
+//  my own includes
+//_________________________________________________________________________________________________________________
+
+#include <threadhelp/resetableguard.hxx>
+#include <xml/toolboxlayoutdocumenthandler.hxx>
+#include <macros/debug.hxx>
+#include <xml/toolboxconfigurationdefines.hxx>
+
+//_________________________________________________________________________________________________________________
+//  interface includes
+//_________________________________________________________________________________________________________________
+
+#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_
+#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
+#endif
+
+//_________________________________________________________________________________________________________________
+//  other includes
+//_________________________________________________________________________________________________________________
+#include <vcl/svapp.hxx>
+#include <vcl/toolbox.hxx>
+
+//_________________________________________________________________________________________________________________
+//  namespace
+//_________________________________________________________________________________________________________________
diff --git a/framework/source/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx
index fbaf51613d15..fbaf51613d15 100644
--- a/framework/source/xml/xmlnamespaces.cxx
+++ b/framework/source/fwe/xml/xmlnamespaces.cxx
diff --git a/framework/source/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx
index d70b099c9e03..d70b099c9e03 100644
--- a/framework/source/classes/converter.cxx
+++ b/framework/source/fwi/classes/converter.cxx
diff --git a/framework/source/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index 2e41106a9ceb..2e41106a9ceb 100644
--- a/framework/source/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index 266100ce4f43..89412e9c6c65 100644
--- a/framework/source/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -332,7 +332,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
             (**ppPattern)[*pItem] = lNames[nSource];
         }
 
-        // �nsert the handler info into the normal handler cache
+        // ï¿œnsert the handler info into the normal handler cache
         (**ppHandler)[lNames[nSource]] = aHandler;
         ++nSource;
     }
diff --git a/framework/source/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index deb5aa023c1b..deb5aa023c1b 100644
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
diff --git a/framework/source/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx
index fcc966402944..fcc966402944 100644
--- a/framework/source/helper/networkdomain.cxx
+++ b/framework/source/fwi/helper/networkdomain.cxx
diff --git a/framework/source/helper/shareablemutex.cxx b/framework/source/fwi/helper/shareablemutex.cxx
index b173c6c34a4f..b173c6c34a4f 100644
--- a/framework/source/helper/shareablemutex.cxx
+++ b/framework/source/fwi/helper/shareablemutex.cxx
diff --git a/framework/source/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index 95226268ce2b..95226268ce2b 100644
--- a/framework/source/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
diff --git a/framework/source/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx
index b71a68342a69..b71a68342a69 100644
--- a/framework/source/jobs/jobconst.cxx
+++ b/framework/source/fwi/jobs/jobconst.cxx
diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx
index 4c5ebb7a5d91..4c5ebb7a5d91 100644
--- a/framework/source/threadhelp/lockhelper.cxx
+++ b/framework/source/fwi/threadhelp/lockhelper.cxx
diff --git a/framework/source/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index a42c871c176e..3523ddbbd128 100644
--- a/framework/source/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -36,6 +36,7 @@
 #include <macros/debug.hxx>
 
 #include <macros/generic.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -180,7 +181,7 @@ void  TransactionManager::setWorkingMode( EWorkingMode eMode )
                                     // Make member access threadsafe!
                                     ResetableGuard aGuard( m_aMutex );
 
-                                    // Check working mode again .. because anoz�ther instance could be faster.
+                                    // Check working mode again .. because anozï¿œther instance could be faster.
                                     // (It's possible to set this guard at first of this method too!)
                                     if( m_aTransactionManager.getWorkingMode() == E_INIT )
                                     {
diff --git a/framework/source/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 9ef9a72e5093..9ef9a72e5093 100644
--- a/framework/source/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
diff --git a/framework/source/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 943a5abe2f03..943a5abe2f03 100644
--- a/framework/source/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 8c81f31f2394..8c81f31f2394 100644
--- a/framework/source/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index 91cfc451fadd..2b199c03ba83 100644..100755
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -76,7 +76,7 @@ using namespace ::rtl                           ;
 //*****************************************************************************************************************
 //  constructor
 //*****************************************************************************************************************
-DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const   Reference< XFrame >&        xOwner  )
+DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const   css::uno::Reference< XFrame >&      xOwner  )
         //  Init baseclasses first
         :   ThreadHelpBase  ( &Application::GetSolarMutex() )
         // Init member
@@ -100,8 +100,8 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::ge
     ResetableGuard aGuard( m_aLock );
 
     // Try to "lock" the frame for access to taskscontainer.
-    Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
-    Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
+    css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
 
     return xContainerWindow;
 }
@@ -112,13 +112,13 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css
     ResetableGuard aGuard( m_aLock );
 
     // Try to "lock" the frame for access to taskscontainer.
-    Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
     aGuard.unlock();
 
     if ( xFrame.is() == sal_True )
     {
-        Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
-        Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() );
+        css::uno::Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
+        css::uno::Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() );
 
         if (( xContainerWindow.is() == sal_True ) &&
             ( xComponentWindow.is() == sal_True )       )
@@ -152,11 +152,11 @@ void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::R
     ResetableGuard aGuard( m_aLock );
 
     // Try to "lock" the frame for access to taskscontainer.
-    Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
     if ( xFrame.is() == sal_True )
     {
-        Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
-        Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() );
+        css::uno::Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
+        css::uno::Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() );
 
         if (( xContainerWindow.is() == sal_True ) &&
             ( xComponentWindow.is() == sal_True )       )
diff --git a/framework/source/helper/makefile.mk b/framework/source/helper/makefile.mk
deleted file mode 100644
index ed54c381160c..000000000000
--- a/framework/source/helper/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=			framework
-TARGET=				fwk_helper
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=framework
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES= 			$(SLO)$/ocomponentaccess.obj					\
-                    $(SLO)$/ocomponentenumeration.obj				\
-                    $(SLO)$/oframes.obj								\
-                    $(SLO)$/statusindicatorfactory.obj				\
-                    $(SLO)$/statusindicator.obj						\
-                    $(SLO)$/imageproducer.obj						\
-                    $(SLO)$/propertysetcontainer.obj				\
-                    $(SLO)$/actiontriggerhelper.obj					\
-                    $(SLO)$/persistentwindowstate.obj				\
-                    $(SLO)$/networkdomain.obj						\
-                    $(SLO)$/acceleratorinfo.obj                     \
-                    $(SLO)$/uielementwrapperbase.obj                \
-                    $(SLO)$/dockingareadefaultacceptor.obj          \
-                    $(SLO)$/uiconfigelementwrapperbase.obj          \
-                    $(SLO)$/shareablemutex.obj                      \
-                    $(SLO)$/vclstatusindicator.obj                  \
-                    $(SLO)$/wakeupthread.obj                        \
-                    $(SLO)$/configimporter.obj                      \
-                    $(SLO)$/tagwindowasmodified.obj                 \
-                    $(SLO)$/titlebarupdate.obj                      \
-                    $(SLO)$/titlehelper.obj                         \
-                    $(SLO)$/mischelper.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index ce25ac0796fc..4e64a38d6ca3 100644..100755
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -77,7 +77,7 @@ using namespace ::rtl                           ;
 //*****************************************************************************************************************
 //  constructor
 //*****************************************************************************************************************
-OComponentAccess::OComponentAccess( const Reference< XDesktop >& xOwner )
+OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwner )
         //  Init baseclasses first
         :   ThreadHelpBase  ( &Application::GetSolarMutex() )
         // Init member
@@ -97,27 +97,27 @@ OComponentAccess::~OComponentAccess()
 //*****************************************************************************************************************
 //  XEnumerationAccess
 //*****************************************************************************************************************
-Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException )
+css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException )
 {
     // Ready for multithreading
     ResetableGuard aGuard( m_aLock );
 
     // Set default return value, if method failed.
     // If no desktop exist and there is no task container - return an empty enumeration!
-    Reference< XEnumeration > xReturn = Reference< XEnumeration >();
+    css::uno::Reference< XEnumeration > xReturn = css::uno::Reference< XEnumeration >();
 
     // Try to "lock" the desktop for access to task container.
-    Reference< XInterface > xLock = m_xOwner.get();
+    css::uno::Reference< XInterface > xLock = m_xOwner.get();
     if ( xLock.is() == sal_True )
     {
         // Desktop exist => pointer to task container must be valid.
         // Initialize a new enumeration ... if some tasks and his components exist!
         // (OTasksEnumeration will make an assert, if we initialize the new instance without valid values!)
 
-        Sequence< Reference< XComponent > > seqComponents;
-        impl_collectAllChildComponents( Reference< XFramesSupplier >( xLock, UNO_QUERY ), seqComponents );
+        Sequence< css::uno::Reference< XComponent > > seqComponents;
+        impl_collectAllChildComponents( css::uno::Reference< XFramesSupplier >( xLock, UNO_QUERY ), seqComponents );
         OComponentEnumeration* pEnumeration = new OComponentEnumeration( seqComponents );
-        xReturn = Reference< XEnumeration >( (OWeakObject*)pEnumeration, UNO_QUERY );
+        xReturn = css::uno::Reference< XEnumeration >( (OWeakObject*)pEnumeration, UNO_QUERY );
     }
 
     // Return result of this operation.
@@ -131,7 +131,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException )
 {
     // Elements in list an enumeration are components!
     // Return the uno-type of XComponent.
-    return ::getCppuType((const Reference< XComponent >*)NULL);
+    return ::getCppuType((const css::uno::Reference< XComponent >*)NULL);
 }
 
 //*****************************************************************************************************************
@@ -146,7 +146,7 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException )
     sal_Bool bReturn = sal_False;
 
     // Try to "lock" the desktop for access to task container.
-    Reference< XFramesSupplier > xLock( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFramesSupplier > xLock( m_xOwner.get(), UNO_QUERY );
     if ( xLock.is() == sal_True )
     {
         // Ask container of owner for existing elements.
@@ -160,8 +160,8 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException )
 //*****************************************************************************************************************
 //  private method
 //*****************************************************************************************************************
-void OComponentAccess::impl_collectAllChildComponents(  const   Reference< XFramesSupplier >&           xNode           ,
-                                                                 Sequence< Reference< XComponent > >&   seqComponents   )
+void OComponentAccess::impl_collectAllChildComponents(  const   css::uno::Reference< XFramesSupplier >&         xNode           ,
+                                                                 Sequence< css::uno::Reference< XComponent > >& seqComponents   )
 {
     // If valid node was given ...
     if( xNode.is() == sal_True )
@@ -173,13 +173,13 @@ void OComponentAccess::impl_collectAllChildComponents(  const   Reference< XFram
 
         sal_Int32 nComponentCount = seqComponents.getLength();
 
-        const Reference< XFrames >              xContainer  = xNode->getFrames();
-        const Sequence< Reference< XFrame > >   seqFrames   = xContainer->queryFrames( FrameSearchFlag::CHILDREN );
+        const css::uno::Reference< XFrames >                xContainer  = xNode->getFrames();
+        const Sequence< css::uno::Reference< XFrame > > seqFrames   = xContainer->queryFrames( FrameSearchFlag::CHILDREN );
 
         const sal_Int32 nFrameCount = seqFrames.getLength();
         for( sal_Int32 nFrame=0; nFrame<nFrameCount; ++nFrame )
         {
-            Reference< XComponent > xComponent = impl_getFrameComponent( seqFrames[nFrame] );
+            css::uno::Reference< XComponent > xComponent = impl_getFrameComponent( seqFrames[nFrame] );
             if( xComponent.is() == sal_True )
             {
                 nComponentCount++;
@@ -194,30 +194,30 @@ void OComponentAccess::impl_collectAllChildComponents(  const   Reference< XFram
 //*****************************************************************************************************************
 //  private method
 //*****************************************************************************************************************
-Reference< XComponent > OComponentAccess::impl_getFrameComponent( const Reference< XFrame >& xFrame ) const
+css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) const
 {
     // Set default return value, if method failed.
-    Reference< XComponent > xComponent = Reference< XComponent >();
+    css::uno::Reference< XComponent > xComponent = css::uno::Reference< XComponent >();
     // Does no controller exists?
-    Reference< XController > xController = xFrame->getController();
+    css::uno::Reference< XController > xController = xFrame->getController();
     if ( xController.is() == sal_False )
     {
         // Controller not exist - use the VCL-component.
-        xComponent = Reference< XComponent >( xFrame->getComponentWindow(), UNO_QUERY );
+        xComponent = css::uno::Reference< XComponent >( xFrame->getComponentWindow(), UNO_QUERY );
     }
     else
     {
         // Does no model exists?
-        Reference< XModel > xModel( xController->getModel(), UNO_QUERY );
+        css::uno::Reference< XModel > xModel( xController->getModel(), UNO_QUERY );
         if ( xModel.is() == sal_True )
         {
             // Model exist - use the model as component.
-            xComponent = Reference< XComponent >( xModel, UNO_QUERY );
+            xComponent = css::uno::Reference< XComponent >( xModel, UNO_QUERY );
         }
         else
         {
             // Model not exist - use the controller as component.
-            xComponent = Reference< XComponent >( xController, UNO_QUERY );
+            xComponent = css::uno::Reference< XComponent >( xController, UNO_QUERY );
         }
     }
 
@@ -241,7 +241,7 @@ Reference< XComponent > OComponentAccess::impl_getFrameComponent( const Referenc
 #ifdef ENABLE_ASSERTIONS
 
 //*****************************************************************************************************************
-sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const   Reference< XDesktop >&      xOwner  )
+sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const   css::uno::Reference< XDesktop >&      xOwner  )
 {
     // Set default return value.
     sal_Bool bOK = sal_True;
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 68237179d70d..9df43625a5a8 100644..100755
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -74,7 +74,7 @@ using namespace ::rtl                           ;
 //*****************************************************************************************************************
 //  constructor
 //*****************************************************************************************************************
-OComponentEnumeration::OComponentEnumeration( const Sequence< Reference< XComponent > >& seqComponents )
+OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Reference< XComponent > >& seqComponents )
         //  Init baseclasses first
         //  Attention:
         //      Don't change order of initialization!
@@ -200,7 +200,7 @@ void OComponentEnumeration::impl_resetObject()
 
 //*****************************************************************************************************************
 // An empty list is allowed ... hasMoreElements() will return false then!
-sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< Reference< XComponent > >& seqComponents )
+sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< css::uno::Reference< XComponent > >& seqComponents )
 {
     // Set default return value.
     sal_Bool bOK = sal_True;
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 62f4b30de749..3034f7438cf6 100644..100755
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -79,8 +79,8 @@ using namespace ::vos                           ;
 //*****************************************************************************************************************
 //  constructor
 //*****************************************************************************************************************
-OFrames::OFrames(   const   Reference< XMultiServiceFactory >&  xFactory        ,
-                    const   Reference< XFrame >&                xOwner          ,
+OFrames::OFrames(   const   css::uno::Reference< XMultiServiceFactory >&    xFactory        ,
+                    const   css::uno::Reference< XFrame >&              xOwner          ,
                             FrameContainer*                     pFrameContainer )
         //  Init baseclasses first
         :   ThreadHelpBase              ( &Application::GetSolarMutex() )
@@ -107,7 +107,7 @@ OFrames::~OFrames()
 //*****************************************************************************************************************
 //  XFrames
 //*****************************************************************************************************************
-void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( RuntimeException )
+void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException )
 {
     // Ready for multithreading
     ResetableGuard aGuard( m_aLock );
@@ -118,7 +118,7 @@ void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( Runtim
 
     // Do the follow only, if owner instance valid!
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // Append frame to the end of the container ...
@@ -133,7 +133,7 @@ void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( Runtim
 //*****************************************************************************************************************
 //  XFrames
 //*****************************************************************************************************************
-void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( RuntimeException )
+void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException )
 {
     // Ready for multithreading
     ResetableGuard aGuard( m_aLock );
@@ -144,7 +144,7 @@ void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( Runtim
 
     // Do the follow only, if owner instance valid!
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // Search frame and remove it from container ...
@@ -160,7 +160,7 @@ void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( Runtim
 //*****************************************************************************************************************
 //  XFrames
 //*****************************************************************************************************************
-Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException )
+Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException )
 {
     // Ready for multithreading
     ResetableGuard aGuard( m_aLock );
@@ -170,11 +170,11 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch
     LOG_ASSERT( impldbg_checkParameter_queryFrames( nSearchFlags ), "OFrames::queryFrames()\nInvalid parameter detected!\n" )
 
     // Set default return value. (empty sequence)
-    Sequence< Reference< XFrame > > seqFrames;
+    Sequence< css::uno::Reference< XFrame > > seqFrames;
 
     // Do the follow only, if owner instance valid.
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // Work only, if search was not started here ...!
@@ -203,10 +203,10 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch
             // Add parent to list ... if any exist!
             if( nSearchFlags & FrameSearchFlag::PARENT )
             {
-                Reference< XFrame > xParent( xOwner->getCreator(), UNO_QUERY );
+                css::uno::Reference< XFrame > xParent( xOwner->getCreator(), UNO_QUERY );
                 if( xParent.is() == sal_True )
                 {
-                    Sequence< Reference< XFrame > > seqParent( 1 );
+                    Sequence< css::uno::Reference< XFrame > > seqParent( 1 );
                     seqParent[0] = xParent;
                     impl_appendSequence( seqFrames, seqParent );
                 }
@@ -216,7 +216,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch
             // Add owner to list if SELF is searched.
             if( nSearchFlags & FrameSearchFlag::SELF )
             {
-                Sequence< Reference< XFrame > > seqSelf( 1 );
+                Sequence< css::uno::Reference< XFrame > > seqSelf( 1 );
                 seqSelf[0] = xOwner;
                 impl_appendSequence( seqFrames, seqSelf );
             }
@@ -229,7 +229,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch
                 // Protect this instance against recursive calls from parents.
                 m_bRecursiveSearchProtection = sal_True;
                 // Ask parent of my owner for frames and append results to return list.
-                Reference< XFramesSupplier > xParent( xOwner->getCreator(), UNO_QUERY );
+                css::uno::Reference< XFramesSupplier > xParent( xOwner->getCreator(), UNO_QUERY );
                 // If a parent exist ...
                 if ( xParent.is() == sal_True )
                 {
@@ -254,7 +254,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch
                 {
                     // We don't must control this conversion.
                     // We have done this at append()!
-                    Reference< XFramesSupplier > xItem( (*m_pFrameContainer)[nIndex], UNO_QUERY );
+                    css::uno::Reference< XFramesSupplier > xItem( (*m_pFrameContainer)[nIndex], UNO_QUERY );
                     impl_appendSequence( seqFrames, xItem->getFrames()->queryFrames( nChildSearchFlags ) );
                 }
             }
@@ -280,7 +280,7 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException )
 
     // Do the follow only, if owner instance valid.
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // Set CURRENT size of container for return.
@@ -311,7 +311,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
 
     // Do the follow only, if owner instance valid.
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // Get element form container.
@@ -329,7 +329,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
 Type SAL_CALL OFrames::getElementType() throw( RuntimeException )
 {
     // This "container" support XFrame-interfaces only!
-    return ::getCppuType( (const Reference< XFrame >*)NULL );
+    return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL );
 }
 
 //*****************************************************************************************************************
@@ -344,7 +344,7 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException )
     sal_Bool bHasElements = sal_False;
     // Do the follow only, if owner instance valid.
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // If some elements exist ...
@@ -378,18 +378,18 @@ void OFrames::impl_resetObject()
 //*****************************************************************************************************************
 //  private method
 //*****************************************************************************************************************
-void OFrames::impl_appendSequence(          Sequence< Reference< XFrame > >&    seqDestination  ,
-                                     const  Sequence< Reference< XFrame > >&    seqSource       )
+void OFrames::impl_appendSequence(          Sequence< css::uno::Reference< XFrame > >&  seqDestination  ,
+                                     const  Sequence< css::uno::Reference< XFrame > >&  seqSource       )
 {
     // Get some informations about the sequences.
     sal_Int32                       nSourceCount        = seqSource.getLength();
     sal_Int32                       nDestinationCount   = seqDestination.getLength();
-    const Reference< XFrame >*      pSourceAccess       = seqSource.getConstArray();
-    Reference< XFrame >*            pDestinationAccess  = seqDestination.getArray();
+    const css::uno::Reference< XFrame >*        pSourceAccess       = seqSource.getConstArray();
+    css::uno::Reference< XFrame >*          pDestinationAccess  = seqDestination.getArray();
 
     // Get memory for result list.
-    Sequence< Reference< XFrame > > seqResult           ( nSourceCount + nDestinationCount );
-    Reference< XFrame >*            pResultAccess       = seqResult.getArray();
+    Sequence< css::uno::Reference< XFrame > >   seqResult           ( nSourceCount + nDestinationCount );
+    css::uno::Reference< XFrame >*          pResultAccess       = seqResult.getArray();
     sal_Int32                       nResultPosition     = 0;
 
     // Copy all items from first sequence.
@@ -434,8 +434,8 @@ void OFrames::impl_appendSequence(          Sequence< Reference< XFrame > >&
 // An instance of this class can only work with valid initialization.
 // We share the mutex with ouer owner class, need a valid factory to instanciate new services and
 // use the access to ouer owner for some operations.
-sal_Bool OFrames::impldbg_checkParameter_OFramesCtor(   const   Reference< XMultiServiceFactory >&  xFactory        ,
-                                                        const   Reference< XFrame >&                xOwner          ,
+sal_Bool OFrames::impldbg_checkParameter_OFramesCtor(   const   css::uno::Reference< XMultiServiceFactory >&    xFactory        ,
+                                                        const   css::uno::Reference< XFrame >&              xOwner          ,
                                                                 FrameContainer*                     pFrameContainer )
 {
     // Set default return value.
@@ -458,7 +458,7 @@ sal_Bool OFrames::impldbg_checkParameter_OFramesCtor(   const   Reference< XMult
 //*****************************************************************************************************************
 // Its only allowed to add valid references to container.
 // AND - alle frames must support XFrames-interface!
-sal_Bool OFrames::impldbg_checkParameter_append( const Reference< XFrame >& xFrame )
+sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFrame >& xFrame )
 {
     // Set default return value.
     sal_Bool bOK = sal_True;
@@ -477,7 +477,7 @@ sal_Bool OFrames::impldbg_checkParameter_append( const Reference< XFrame >& xFra
 //*****************************************************************************************************************
 // Its only allowed to add valid references to container...
 // ... => You can only delete valid references!
-sal_Bool OFrames::impldbg_checkParameter_remove( const Reference< XFrame >& xFrame )
+sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFrame >& xFrame )
 {
     // Set default return value.
     sal_Bool bOK = sal_True;
diff --git a/framework/source/interaction/makefile.mk b/framework/source/interaction/makefile.mk
deleted file mode 100644
index 0767cb6b3389..000000000000
--- a/framework/source/interaction/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=		framework
-TARGET=			fwk_interaction
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=framework
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=		$(SLO)$/quietinteraction.obj		    \
-                $(SLO)$/preventduplicateinteraction.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/jobs/makefile.mk b/framework/source/jobs/makefile.mk
deleted file mode 100644
index ee5cc637664a..000000000000
--- a/framework/source/jobs/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=			framework
-TARGET=             fwk_jobs
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           $(SLO)$/jobexecutor.obj     \
-                    $(SLO)$/jobdispatch.obj     \
-                    $(SLO)$/job.obj             \
-                    $(SLO)$/jobdata.obj         \
-                    $(SLO)$/jobresult.obj       \
-                    $(SLO)$/joburl.obj          \
-                    $(SLO)$/jobconst.obj        \
-                    $(SLO)$/helponstartup.obj   \
-                    $(SLO)$/shelljob.obj        \
-                    $(SLO)$/configaccess.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e5bf08cf0300..4106e9d67353 100755
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -37,8 +37,11 @@
 #include <panelmanager.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include <services.h>
-#include <classes/sfxhelperfunctions.hxx>
+
+#include <framework/sfxhelperfunctions.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 #include <uielement/menubarwrapper.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
 #include <classes/fwkresid.hxx>
 #include <classes/resource.hrc>
diff --git a/framework/source/layoutmanager/makefile.mk b/framework/source/layoutmanager/makefile.mk
deleted file mode 100644
index 7ce19a71f2f9..000000000000
--- a/framework/source/layoutmanager/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General 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=			framework
-TARGET=				fwk_layout
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/panelmanager.obj	\
-                    $(SLO)$/layoutmanager.obj	\
-                    $(SLO)$/panel.obj			\
-                    $(SLO)$/helpers.obj			\
-                    $(SLO)$/uielement.obj		\
-                    $(SLO)$/toolbarlayoutmanager.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index baf6f088cc2e..df6b36020f93 100755
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -52,7 +52,7 @@
 #include <stdtypes.h>
 #include <uiconfiguration/globalsettings.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uielement/uielement.hxx>
 #include <helper/ilayoutnotifications.hxx>
 
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 75bcc4c4587f..cf37e1d8129f 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -34,9 +34,7 @@
 #ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_
 #include <loadenv/targethelper.hxx>
 #endif
-#include <classes/framelistanalyzer.hxx>
-
-#include <dispatch/interaction.hxx>
+#include <framework/framelistanalyzer.hxx>
 
 #ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_
 #include <constant/frameloader.hxx>
@@ -56,7 +54,8 @@
 #include <properties.h>
 #include <protocols.h>
 #include <services.h>
-#include <dispatch/interaction.hxx>
+#include <comphelper/interaction.hxx>
+#include <framework/interaction.hxx>
 
 //_______________________________________________
 // includes of uno interface
@@ -1058,8 +1057,8 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
             css::uno::Any                                                                    aInteraction;
             css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > lContinuations(2);
 
-            ContinuationAbort*   pAbort   = new ContinuationAbort();
-            ContinuationApprove* pApprove = new ContinuationApprove();
+            comphelper::OInteractionAbort*   pAbort   = new comphelper::OInteractionAbort();
+            comphelper::OInteractionApprove* pApprove = new comphelper::OInteractionApprove();
 
             lContinuations[0] = css::uno::Reference< css::task::XInteractionContinuation >(
                                     static_cast< css::task::XInteractionContinuation* >(pAbort),
@@ -1071,13 +1070,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
             css::task::ErrorCodeRequest aErrorCode;
             aErrorCode.ErrCode = ERRCODE_SFX_NOMOREDOCUMENTSALLOWED;
             aInteraction <<= aErrorCode;
-
-            InteractionRequest* pRequest = new InteractionRequest(aInteraction, lContinuations);
-            css::uno::Reference< css::task::XInteractionRequest > xRequest(
-                static_cast< css::task::XInteractionRequest* >(pRequest),
-                css::uno::UNO_QUERY_THROW);
-
-            xInteraction->handle(xRequest);
+            xInteraction->handle( InteractionRequest::CreateRequest(aInteraction, lContinuations) );
         }
     }
 
diff --git a/framework/source/loadenv/makefile.mk b/framework/source/loadenv/makefile.mk
deleted file mode 100644
index c68ad8d304cb..000000000000
--- a/framework/source/loadenv/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=			framework
-TARGET=             fwk_loadenv
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           \
-                    $(SLO)$/loadenv.obj              \
-                    $(SLO)$/targethelper.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/recording/makefile.mk b/framework/source/recording/makefile.mk
deleted file mode 100644
index a13eb7b91202..000000000000
--- a/framework/source/recording/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=framework
-TARGET=recording
-ENABLE_EXCEPTIONS=TRUE
-NO_BSYMBOLIC=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
-    $(SLO)$/dispatchrecordersupplier.obj\
-    $(SLO)$/dispatchrecorder.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/framework/source/register/makefile.mk b/framework/source/register/makefile.mk
deleted file mode 100644
index 2920cb283018..000000000000
--- a/framework/source/register/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=			framework
-TARGET=				fwk_register
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-LIBTARGET=			NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-VISIBILITY_HIDDEN = TRUE
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/registerservices.obj		\
-                    $(SLO)$/registertemp.obj            \
-                    $(SLO)$/register3rdcomponents.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index 4f078d9ab50d..fe9dfe2ee573 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -54,7 +54,7 @@
 =================================================================================================================*/
 #include <services/urltransformer.hxx>
 #include <services/desktop.hxx>
-//#include <services/tabwindowservice.hxx>
+#include <services/tabwindowservice.hxx>
 #include <services/frame.hxx>
 #include <services/modulemanager.hxx>
 //#include <dispatch/oxt_handler.hxx>
@@ -169,7 +169,7 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer
                         IFFACTORY( ::framework::LangSelectionStatusbarController        )   else
                         //IFFACTORY( ::framework::LanguageSelectionMenuController         )   else
                         IFFACTORY( ::framework::WindowContentFactoryManager             )   else
-                        //IFFACTORY( ::framework::TabWindowService                        )   else
+                        IFFACTORY( ::framework::TabWindowService                        )   else
                         IFFACTORY( ::framework::SubstitutePathVariables                 )   else
                         IFFACTORY( ::framework::PathSettings                            )
             )
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 111b3550559d..59444093d53e 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -65,7 +65,6 @@
 #include <uielement/simpletextstatusbarcontroller.hxx>
 #include <uielement/logoimagestatusbarcontroller.hxx>
 #include <uielement/logotextstatusbarcontroller.hxx>
-#include <services/tabwindowservice.hxx>
 #include <uielement/fontmenucontroller.hxx>
 #include <uielement/fontsizemenucontroller.hxx>
 #include <uielement/footermenucontroller.hxx>
@@ -86,7 +85,6 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::MediaTypeDetectionHelper
                         IFFACTORY( ::framework::License                                 )   else
                         IFFACTORY( ::framework::PopupMenuDispatcher                     )   else
                         IFFACTORY( ::framework::DispatchHelper                          )   else
-                        IFFACTORY( ::framework::TabWindowService                        )   else
                         IFFACTORY( ::framework::DispatchRecorder                        )   else
                         IFFACTORY( ::framework::DispatchRecorderSupplier                )   else
                         IFFACTORY( ::framework::SimpleTextStatusbarController           )   else
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index c4cc7149ab6d..4e3213081980 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -27,6 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+
 #include "services/autorecovery.hxx"
 #include <loadenv/loadenv.hxx>
 
@@ -97,6 +98,8 @@
 
 #include <tools/urlobj.hxx>
 
+#include <fwkdllapi.h>
+
 //_______________________________________________
 // namespaces
 
@@ -123,6 +126,7 @@ using ::com::sun::star::lang::XComponent;
 
 namespace fpf = ::framework::pattern::frame;
 
+
 namespace framework
 {
 
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 13c5647341e6..627f26e0549c 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -37,7 +37,7 @@
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
 #include <classes/droptargetlistener.hxx>
-#include <helper/acceleratorinfo.hxx>
+#include <framework/acceleratorinfo.hxx>
 #include <targets.h>
 #include <properties.h>
 #include <services.h>
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 293e03ee655b..289757ec7874 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -101,6 +101,8 @@
 #endif
 #include <comphelper/extract.hxx>
 
+#include <fwkdllapi.h>
+
 //_________________________________________________________________________________________________________________
 //  namespace
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 08a7c522831b..a6567b218369 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -42,11 +42,11 @@
 #include <loadenv/loadenv.hxx>
 #include <helper/oframes.hxx>
 #include <helper/statusindicatorfactory.hxx>
-#include <helper/titlehelper.hxx>
+#include <framework/titlehelper.hxx>
 #include <classes/droptargetlistener.hxx>
 #include <classes/taskcreator.hxx>
 #include <loadenv/targethelper.hxx>
-#include <classes/framelistanalyzer.hxx>
+#include <framework/framelistanalyzer.hxx>
 #include <helper/dockingareadefaultacceptor.hxx>
 #include <dispatch/dispatchinformationprovider.hxx>
 #include <threadhelp/transactionguard.hxx>
diff --git a/framework/source/services/makefile.mk b/framework/source/services/makefile.mk
deleted file mode 100644
index eaeaae1f8a82..000000000000
--- a/framework/source/services/makefile.mk
+++ /dev/null
@@ -1,65 +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=			framework
-TARGET=				fwk_services
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/desktop.obj \
-        $(SLO)$/frame.obj \
-        $(SLO)$/urltransformer.obj \
-        $(SLO)$/mediatypedetectionhelper.obj \
-        $(SLO)$/substitutepathvars.obj \
-        $(SLO)$/pathsettings.obj \
-        $(SLO)$/backingcomp.obj \
-        $(SLO)$/backingwindow.obj \
-        $(SLO)$/dispatchhelper.obj \
-        $(SLO)$/license.obj \
-        $(SLO)$/modulemanager.obj \
-        $(SLO)$/autorecovery.obj \
-        $(SLO)$/sessionlistener.obj \
-        $(SLO)$/taskcreatorsrv.obj \
-        $(SLO)$/uriabbreviation.obj \
-        $(SLO)$/tabwindowservice.obj \
-        $(SLO)$/modelwinservice.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES= fwk_services.src
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index fe8af40f0850..42a5ea10f9d1 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -57,6 +57,8 @@
 #include <comphelper/configurationhelper.hxx>
 #include <unotools/configpathes.hxx>
 
+#include <fwkdllapi.h>
+
 // ______________________________________________
 //  non exported const
 
diff --git a/framework/source/tabwin/makefile.mk b/framework/source/tabwin/makefile.mk
deleted file mode 100644
index 6147672bdc73..000000000000
--- a/framework/source/tabwin/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=			framework
-TARGET=				fwk_tabwin
-USE_DEFFILE=		TRUE
-NO_BSYMBOLIC=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-BOOTSTRAP_SERVICE=	FALSE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/tabwinfactory.obj	\
-                    $(SLO)$/tabwindow.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/threadhelp/makefile.mk b/framework/source/threadhelp/makefile.mk
deleted file mode 100644
index be4d71137925..000000000000
--- a/framework/source/threadhelp/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=			framework
-TARGET=				fwk_threadhelp
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :			settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			$(SLO)$/lockhelper.obj				\
-                    $(SLO)$/transactionmanager.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index fc18c2ac95ce..2a57e72e1ce4 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_framework.hxx"
 #include <uiconfiguration/imagemanager.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <uiconfiguration/graphicnameaccess.hxx>
 #include <services.h>
 #include "imagemanagerimpl.hxx"
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 24e19977c680..a5304a9d64df 100755
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_framework.hxx"
 #include <imagemanagerimpl.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <uiconfiguration/graphicnameaccess.hxx>
 #include <services.h>
 
diff --git a/framework/source/uiconfiguration/makefile.mk b/framework/source/uiconfiguration/makefile.mk
deleted file mode 100644
index ef82e2da76c6..000000000000
--- a/framework/source/uiconfiguration/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=			framework
-TARGET=				fwk_uiconfiguration
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/uiconfigurationmanager.obj          \
-                    $(SLO)$/moduleuiconfigurationmanager.obj    \
-                    $(SLO)$/moduleuicfgsupplier.obj             \
-                    $(SLO)$/windowstateconfiguration.obj        \
-                    $(SLO)$/moduleimagemanager.obj              \
-                    $(SLO)$/imagemanager.obj                    \
-                    $(SLO)$/imagemanagerimpl.obj                \
-                    $(SLO)$/graphicnameaccess.obj               \
-                    $(SLO)$/uicategorydescription.obj           \
-                    $(SLO)$/globalsettings.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index d76fdcf4c67f..fc90dd102912 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -30,7 +30,7 @@
 #include <rtl/logfile.hxx>
 #include <uiconfiguration/moduleimagemanager.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <uiconfiguration/graphicnameaccess.hxx>
 #include <services.h>
 #include "imagemanagerimpl.hxx"
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 607efce4d4d6..704e3774e52b 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -33,11 +33,11 @@
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/uielementtypenames.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 
 #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index e704fe680ae9..366e58c0adb2 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -33,11 +33,11 @@
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/uielementtypenames.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 
 #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index 5b875d82f25a..eee01dad72c7 100755
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -33,12 +33,12 @@
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/uielementtypenames.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 #include <uiconfiguration/imagemanager.hxx>
 
 #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 #endif
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 0c4c610bd4b0..c4ba41372cd5 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -43,13 +43,13 @@
 #endif
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
-#include <helper/imageproducer.hxx>
-#include <classes/sfxhelperfunctions.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 #include <classes/fwkresid.hxx>
 #ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_
 #include <classes/resource.hrc>
 #endif
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX
 #include <uielement/comboboxtoolbarcontroller.hxx>
 #endif
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 315d1b6e0bf8..52478f278544 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -35,7 +35,7 @@
 
 #include <uielement/addonstoolbarwrapper.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/addonstoolbarmanager.hxx>
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 3f37050e6780..6b3b06071e90 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -65,7 +65,7 @@
 #include <classes/fwkresid.hxx>
 #include <dispatch/uieventloghelper.hxx>
 
-#include <xml/menuconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
 #include <uielement/menubarmanager.hxx>
 
 using namespace ::com::sun::star::awt;
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 5126ffdd253a..e883b236584a 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -35,7 +35,7 @@
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
 #endif
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index afe2e7173086..e94d8f770fa8 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -34,7 +34,7 @@
 #include "services.h"
 #include <classes/resource.hrc>
 #include <classes/fwkresid.hxx>
-#include <helper/imageproducer.hxx>
+#include <framework/imageproducer.hxx>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/framework/source/uielement/makefile.mk b/framework/source/uielement/makefile.mk
deleted file mode 100644
index 0acfa6b662a5..000000000000
--- a/framework/source/uielement/makefile.mk
+++ /dev/null
@@ -1,89 +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=            framework
-TARGET=             fwk_uielement
-USE_DEFFILE=        TRUE
-ENABLE_EXCEPTIONS=  TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :          settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           \
-                    $(SLO)$/addonstoolbarmanager.obj            \
-                    $(SLO)$/addonstoolbarwrapper.obj            \
-                    $(SLO)$/buttontoolbarcontroller.obj         \
-                    $(SLO)$/comboboxtoolbarcontroller.obj       \
-                    $(SLO)$/complextoolbarcontroller.obj        \
-                    $(SLO)$/constitemcontainer.obj              \
-                    $(SLO)$/controlmenucontroller.obj           \
-                    $(SLO)$/dropdownboxtoolbarcontroller.obj    \
-                    $(SLO)$/edittoolbarcontroller.obj           \
-                    $(SLO)$/fontmenucontroller.obj              \
-                    $(SLO)$/fontsizemenucontroller.obj          \
-                    $(SLO)$/footermenucontroller.obj            \
-                    $(SLO)$/generictoolbarcontroller.obj        \
-                    $(SLO)$/headermenucontroller.obj            \
-                    $(SLO)$/imagebuttontoolbarcontroller.obj    \
-                    $(SLO)$/itemcontainer.obj                   \
-                    $(SLO)$/langselectionmenucontroller.obj     \
-                    $(SLO)$/langselectionstatusbarcontroller.obj \
-                    $(SLO)$/logoimagestatusbarcontroller.obj    \
-                    $(SLO)$/logotextstatusbarcontroller.obj     \
-                    $(SLO)$/macrosmenucontroller.obj            \
-                    $(SLO)$/menubarmanager.obj                  \
-                    $(SLO)$/menubarmerger.obj                   \
-                    $(SLO)$/menubarwrapper.obj                  \
-                    $(SLO)$/newmenucontroller.obj               \
-                    $(SLO)$/objectmenucontroller.obj            \
-                    $(SLO)$/progressbarwrapper.obj              \
-                    $(SLO)$/recentfilesmenucontroller.obj       \
-                    $(SLO)$/rootitemcontainer.obj               \
-                    $(SLO)$/simpletextstatusbarcontroller.obj   \
-                    $(SLO)$/spinfieldtoolbarcontroller.obj      \
-                    $(SLO)$/statusbar.obj                       \
-                    $(SLO)$/statusbarmanager.obj                \
-                    $(SLO)$/statusbarwrapper.obj                \
-                    $(SLO)$/statusindicatorinterfacewrapper.obj \
-                    $(SLO)$/togglebuttontoolbarcontroller.obj   \
-                    $(SLO)$/toolbar.obj                         \
-                    $(SLO)$/toolbarmanager.obj                  \
-                    $(SLO)$/toolbarmerger.obj                   \
-                    $(SLO)$/toolbarsmenucontroller.obj          \
-                    $(SLO)$/toolbarwrapper.obj                  \
-                    $(SLO)$/popupmenucontroller.obj				\
-                    $(SLO)$/uicommanddescription.obj            \
-                    $(SLO)$/panelwrapper.obj					\
-                    $(SLO)$/panelwindow.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :          target.mk
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index b5be6da817fb..cec7be63c87d 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -33,17 +33,17 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 #include <uielement/menubarmanager.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <classes/bmkmenu.hxx>
-#include <classes/addonmenu.hxx>
-#include <helper/imageproducer.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/bmkmenu.hxx>
+#include <framework/addonmenu.hxx>
+#include <framework/imageproducer.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include "classes/addonsoptions.hxx"
+#include "framework/addonsoptions.hxx"
 #include <classes/fwkresid.hxx>
 #include <classes/menumanager.hxx>
-#include <helper/acceleratorinfo.hxx>
+#include <framework/acceleratorinfo.hxx>
 #include <helper/mischelper.hxx>
-#include <classes/menuextensionsupplier.hxx>
+#include <framework/menuextensionsupplier.hxx>
 #include <classes/resource.hrc>
 #include <services.h>
 
@@ -97,7 +97,7 @@
 #include <svtools/acceleratorexecute.hxx>
 #include <rtl/logfile.hxx>
 #include "svtools/miscopt.hxx"
-#include <classes/addonmenu.hxx>
+#include <framework/addonmenu.hxx>
 #include <uielement/menubarmerger.hxx>
 #include <dispatch/uieventloghelper.hxx>
 
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index f82253345778..d1d3b9b427e0 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_framework.hxx"
 
 #include <uielement/menubarmerger.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index da3092c2c725..887a1c388752 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -33,7 +33,7 @@
 //_________________________________________________________________________________________________________________
 #include <uielement/menubarwrapper.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <services.h>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 786795ff1d14..8ae7842d07fd 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -38,9 +38,9 @@
 #include <classes/resource.hrc>
 #endif
 #include <classes/fwkresid.hxx>
-#include <classes/bmkmenu.hxx>
-#include <helper/imageproducer.hxx>
-#include <xml/menuconfiguration.hxx>
+#include <framework/bmkmenu.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/menuconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
diff --git a/framework/source/uielement/panelwrapper.cxx b/framework/source/uielement/panelwrapper.cxx
index 91bc6fa9dac8..405ee412df83 100755
--- a/framework/source/uielement/panelwrapper.cxx
+++ b/framework/source/uielement/panelwrapper.cxx
@@ -8,7 +8,6 @@
 #include <services.h>
 #include <uielement/panelwrapper.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/panelwindow.hxx>
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 6521a83d5a2d..ab0ff9777ea4 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -35,7 +35,7 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/threadhelpbase.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <classes/sfxhelperfunctions.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 030a790b35e3..3002a340dfef 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -34,7 +34,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/statusbar.hxx>
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index cf39edec2a7c..43262fcc64a2 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -35,7 +35,7 @@
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
 #endif
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ebaf097bb79f..8d5169101c8d 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -44,15 +44,15 @@
 #include "services.h"
 #include "general.h"
 #include "properties.h"
-#include <helper/imageproducer.hxx>
-#include <classes/sfxhelperfunctions.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 #include <classes/fwkresid.hxx>
 #ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_
 #include <classes/resource.hrc>
 #endif
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uielement/toolbarmerger.hxx>
-#include <helper/acceleratorinfo.hxx>
+#include <framework/acceleratorinfo.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index aca62a8b44ef..42207b5611b2 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -30,7 +30,7 @@
 
 #include <uielement/toolbarmerger.hxx>
 #include <uielement/generictoolbarcontroller.hxx>
-#include <helper/imageproducer.hxx>
+#include <framework/imageproducer.hxx>
 
 #include <svtools/miscopt.hxx>
 
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index fffaac0b42df..e46468cd821c 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -41,8 +41,8 @@
 #endif
 #include <classes/fwkresid.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
-#include <helper/imageproducer.hxx>
-#include <classes/sfxhelperfunctions.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 5a4fb7cddde4..7b6e81ff91d9 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -34,7 +34,7 @@
 
 #include <uielement/toolbarwrapper.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/toolbarmanager.hxx>
diff --git a/framework/source/uifactory/makefile.mk b/framework/source/uifactory/makefile.mk
deleted file mode 100644
index cf820e98738f..000000000000
--- a/framework/source/uifactory/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=framework
-TARGET=	fwk_uifactory
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/popupmenucontrollerfactory.obj  \
-                    $(SLO)$/uielementfactorymanager.obj     \
-                    $(SLO)$/menubarfactory.obj              \
-                    $(SLO)$/toolboxfactory.obj              \
-                    $(SLO)$/addonstoolboxfactory.obj        \
-                    $(SLO)$/toolbarcontrollerfactory.obj    \
-                    $(SLO)$/statusbarfactory.obj            \
-                    $(SLO)$/statusbarcontrollerfactory.obj	\
-                    $(SLO)$/factoryconfiguration.obj        \
-                    $(SLO)$/windowcontentfactorymanager.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/xml/makefile.mk b/framework/source/xml/makefile.mk
deleted file mode 100644
index a4f18a555ab3..000000000000
--- a/framework/source/xml/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=			framework
-TARGET=				fwk_xml
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=		\
-                $(SLO)$/eventsconfiguration.obj				\
-                $(SLO)$/eventsdocumenthandler.obj			\
-                $(SLO)$/imagesconfiguration.obj				\
-                $(SLO)$/imagesdocumenthandler.obj			\
-                $(SLO)$/menuconfiguration.obj				\
-                $(SLO)$/menudocumenthandler.obj				\
-                $(SLO)$/statusbarconfiguration.obj			\
-                $(SLO)$/statusbardocumenthandler.obj		\
-                $(SLO)$/toolboxconfiguration.obj			\
-                $(SLO)$/toolboxdocumenthandler.obj			\
-                $(SLO)$/saxnamespacefilter.obj				\
-                $(SLO)$/xmlnamespaces.obj                   \
-                $(SLO)$/acceleratorconfigurationreader.obj  \
-                $(SLO)$/acceleratorconfigurationwriter.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/test/makefile.mk b/framework/test/makefile.mk
deleted file mode 100644
index 6764af8dd091..000000000000
--- a/framework/test/makefile.mk
+++ /dev/null
@@ -1,94 +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=			framework
-TARGET=				test
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
-USE_DEFFILE=		TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- applikation: "test" --------------------------------------------------
-
-#APP1TARGET= 	test
-
-#APP1OBJS=		$(SLO)$/test.obj
-#DEPOBJFILES+= $(APP1OBJS)
-
-#APP1LIBS=		$(SLB)$/fwk_classes.lib				\
-#				$(SLB)$/fwk_helper.lib
-
-#APP1STDLIBS=	$(CPPULIB)							\
-#				$(CPPUHELPERLIB)					\
-#				$(SALLIB)							\
-#				$(VOSLIB)							\
-#				$(TOOLSLIB) 						\
-#				$(SVTOOLLIB)						\
-#				$(TKLIB)							\
-#				$(COMPHELPERLIB)					\
-#				$(VCLLIB)
-
-#APP1DEPN=		$(SLB)$/fwk_helper.lib				\
-#				$(SLB)$/fwk_classes.lib
-
-# --- application: "threadtest" --------------------------------------------------
-
-APP2TARGET= 	threadtest
-
-APP2OBJS=		$(SLO)$/threadtest.obj				\
-                $(SLO)$/transactionmanager.obj		\
-                $(SLO)$/transactionguard.obj		\
-                $(SLO)$/fairrwlock.obj				\
-                $(SLO)$/resetableguard.obj			\
-                $(SLO)$/gate.obj					\
-                $(SLO)$/readguard.obj				\
-                $(SLO)$/writeguard.obj
-
-DEPOBJFILES+= $(APP2OBJS)
-
-APP2STDLIBS=	$(CPPULIB)							\
-                $(CPPUHELPERLIB)					\
-                $(SALLIB)							\
-                $(VOSLIB)							\
-                $(VCLLIB)
-
-APP2DEPN=		$(SLO)$/fairrwlock.obj				\
-                $(SLO)$/transactionmanager.obj		\
-                $(SLO)$/transactionguard.obj		\
-                $(SLO)$/resetableguard.obj			\
-                $(SLO)$/gate.obj					\
-                $(SLO)$/readguard.obj				\
-                $(SLO)$/writeguard.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/framework/test/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk
deleted file mode 100644
index 833c328dc8a8..000000000000
--- a/framework/test/threadtest/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=			framework
-TARGET=				threadtest
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
-USE_DEFFILE=		TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- application: "threadtest" --------------------------------------------------
-
-APP1TARGET= 	threadtest
-
-APP1OBJS=		$(SLO)$/threadtest.obj							\
-                $(SLO)$/lockhelper.obj
-
-DEPOBJFILES=$(APP1OBJS)
-
-# [ed] 6/16/02 Add the transaction manager library on OS X
-
-APP1STDLIBS=	$(CPPULIB)										\
-                $(CPPUHELPERLIB)								\
-                $(SALLIB)										\
-                $(VOSLIB)										\
-                $(VCLLIB)
-
-APP1DEPN=		$(INC)$/threadhelp$/threadhelpbase.hxx			\
-                $(INC)$/threadhelp$/transactionbase.hxx			\
-                $(INC)$/threadhelp$/transactionmanager.hxx		\
-                $(INC)$/threadhelp$/transactionguard.hxx		\
-                $(INC)$/threadhelp$/resetableguard.hxx			\
-                $(INC)$/threadhelp$/readguard.hxx				\
-                $(INC)$/threadhelp$/writeguard.hxx
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk
deleted file mode 100644
index 83782fdc4d74..000000000000
--- a/framework/test/typecfg/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=			framework
-TARGET=             typecfg
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- applikation: "xml2xcd" --------------------------------------------------
-
-# --- applikation: "cfgview" --------------------------------------------------
-
-APP2TARGET=     cfgview
-
-APP2OBJS=		$(SLO)$/cfgview.obj					\
-                $(SLO)$/servicemanager.obj			\
-                $(SLO)$/filtercachedata.obj			\
-                $(SLO)$/filtercache.obj				\
-                $(SLO)$/wildcard.obj				\
-                $(SLO)$/lockhelper.obj
-
-DEPOBJFILES=$(APP2OBJS)
-
-APP2STDLIBS=	$(CPPULIB)							\
-                $(CPPUHELPERLIB)					\
-                $(SALLIB)							\
-                $(VOSLIB)							\
-                $(TOOLSLIB) 						\
-                $(SVTOOLLIB)						\
-                $(TKLIB)							\
-                $(COMPHELPERLIB)					\
-                $(UNOTOOLSLIB)						\
-                $(VCLLIB)
-
-APP2DEPN=		$(SLO)$/servicemanager.obj			\
-                $(SLO)$/filtercachedata.obj			\
-                $(SLO)$/filtercache.obj				\
-                $(SLO)$/wildcard.obj				\
-                $(SLO)$/lockhelper.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/framework/util/guiapps/makefile.mk b/framework/util/guiapps/makefile.mk
deleted file mode 100644
index efa5fc3fd88e..000000000000
--- a/framework/util/guiapps/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=			framework
-TARGET=				framework_guiapp
-TARGETTYPE=GUI
-
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-GEN_HID=                TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- login applikation -------------------------------------------------------
-
-APP1TARGET= 	login
-
-APP1OBJS=		$(SLO)$/login.obj					\
-                $(SLO)$/servicemanager.obj			\
-                $(SLO)$/lockhelper.obj				\
-                $(SLO)$/transactionmanager.obj
-
-DEPOBJFILES=$(APP1OBJS)
-
-APP1STDLIBS=	$(CPPULIB)							\
-                $(CPPUHELPERLIB)					\
-                $(SALLIB)							\
-                $(VOSLIB)							\
-                $(TOOLSLIB) 						\
-                $(SVTOOLLIB)						\
-                $(TKLIB)							\
-                $(COMPHELPERLIB)					\
-                $(VCLLIB)
-
-APP1DEPN=		$(SLO)$/servicemanager.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
deleted file mode 100644
index 698ba37d5d3d..000000000000
--- a/framework/util/makefile.mk
+++ /dev/null
@@ -1,451 +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=            framework
-TARGET=             framework
-
-USE_DEFFILE=        TRUE
-ENABLE_EXCEPTIONS=  TRUE
-NO_BSYMBOLIC=       TRUE
-GEN_HID=            TRUE
-GEN_HID_OTHER=      TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- internal import -------------------------------------------------
-
-LIB1TARGET=     $(SLB)$/fwiobj.lib
-
-LIB1OBJFILES=   \
-                $(SLO)$/converter.obj                           \
-                $(SLO)$/lockhelper.obj                          \
-                $(SLO)$/transactionmanager.obj                  \
-                $(SLO)$/protocolhandlercache.obj                \
-                $(SLO)$/networkdomain.obj                       \
-                $(SLO)$/configaccess.obj                        \
-                $(SLO)$/shareablemutex.obj                      \
-                $(SLO)$/itemcontainer.obj                       \
-                $(SLO)$/rootitemcontainer.obj                   \
-                $(SLO)$/constitemcontainer.obj                  \
-                $(SLO)$/jobconst.obj                            \
-                $(SLO)$/mischelper.obj                          \
-                $(SLO)$/propertysethelper.obj
-
-
-
-# --- export library for sfx2 -------------------------------------------------
-
-LIB2TARGET=     $(SLB)$/fweobj.lib
-
-LIB2OBJFILES=   \
-                $(SLO)$/bmkmenu.obj                             \
-                $(SLO)$/eventsconfiguration.obj                 \
-                $(SLO)$/eventsdocumenthandler.obj               \
-                $(SLO)$/imageproducer.obj                       \
-                $(SLO)$/lockhelper.obj                          \
-                $(SLO)$/menuconfiguration.obj                   \
-                $(SLO)$/menudocumenthandler.obj                 \
-                $(SLO)$/saxnamespacefilter.obj                  \
-                $(SLO)$/statusbarconfiguration.obj              \
-                $(SLO)$/statusbardocumenthandler.obj            \
-                $(SLO)$/toolboxconfiguration.obj                \
-                $(SLO)$/toolboxdocumenthandler.obj              \
-                $(SLO)$/imagesconfiguration.obj                 \
-                $(SLO)$/imagesdocumenthandler.obj               \
-                $(SLO)$/xmlnamespaces.obj                       \
-                $(SLO)$/actiontriggerpropertyset.obj            \
-                $(SLO)$/actiontriggerseparatorpropertyset.obj   \
-                $(SLO)$/actiontriggercontainer.obj              \
-                $(SLO)$/propertysetcontainer.obj                \
-                $(SLO)$/rootactiontriggercontainer.obj          \
-                $(SLO)$/actiontriggerhelper.obj                 \
-                $(SLO)$/imagewrapper.obj                        \
-                $(SLO)$/interaction.obj                         \
-                $(SLO)$/addonmenu.obj                           \
-                $(SLO)$/addonsoptions.obj                       \
-                $(SLO)$/fwkresid.obj                            \
-                $(SLO)$/acceleratorinfo.obj                     \
-                $(SLO)$/sfxhelperfunctions.obj                  \
-                $(SLO)$/uielementwrapperbase.obj                \
-                $(SLO)$/uiconfigelementwrapperbase.obj          \
-                $(SLO)$/configimporter.obj                      \
-                $(SLO)$/menuextensionsupplier.obj               \
-                $(SLO)$/preventduplicateinteraction.obj         \
-                $(SLO)$/framelistanalyzer.obj                   \
-                $(SLO)$/titlehelper.obj
-
-# --- import classes library ---------------------------------------------------
-
-SHL1TARGET=     fwi$(DLLPOSTFIX)
-
-SHL1IMPLIB=     ifwi
-
-SHL1LIBS=       $(LIB1TARGET)
-
-SHL1STDLIBS=    \
-                $(UNOTOOLSLIB)      \
-                $(CPPUHELPERLIB)    \
-                $(TOOLSLIB)         \
-                $(SVTOOLLIB)        \
-                $(SVLLIB)        	\
-                $(I18NISOLANGLIB)   \
-                $(VOSLIB)           \
-                $(VCLLIB)           \
-                $(TKLIB)            \
-                $(CPPULIB)          \
-                $(SALLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=\
-        $(UWINAPILIB) \
-        $(UNICOWSLIB) \
-        $(ADVAPI32LIB) \
-        $(KERNEL32LIB)
-.ENDIF
-
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=       $(SHL1TARGET)
-
-DEFLIB1NAME=    fwiobj
-DEF1DEPN=       $(MISC)$/$(SHL1TARGET).flt
-
-
-# --- export classes library ---------------------------------------------------
-
-SHL2TARGET=     fwe$(DLLPOSTFIX)
-
-SHL2IMPLIB=     ifwe
-
-SHL2LIBS=       $(LIB2TARGET)
-
-SHL2STDLIBS=    \
-                $(FWILIB)                           \
-                $(VCLLIB)                           \
-                $(SVLLIB)                           \
-                $(SVTOOLLIB)                        \
-                $(UNOTOOLSLIB)                      \
-                $(TOOLSLIB)                         \
-                $(COMPHELPERLIB)                    \
-                $(CPPUHELPERLIB)                    \
-                $(CPPULIB)                          \
-                $(VOSLIB)                           \
-                $(SALLIB)
-
-SHL2DEF=        $(MISC)$/$(SHL2TARGET).def
-SHL2DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN)
-
-DEF2NAME=       $(SHL2TARGET)
-
-DEFLIB2NAME=    fweobj
-DEF2DEPN=       $(MISC)$/$(SHL2TARGET).flt
-
-# --- light services library ----------------------------------------------------
-
-SHL3TARGET=     fwl$(DLLPOSTFIX)
-
-SHL3IMPLIB=     ifwl
-
-SHL3OBJS=       $(SLO)$/mediatypedetectionhelper.obj\
-                $(SLO)$/registertemp.obj            \
-                $(SLO)$/mailtodispatcher.obj        \
-                $(SLO)$/oxt_handler.obj    			\
-                $(SLO)$/toolbarsmenucontroller.obj  \
-                $(SLO)$/newmenucontroller.obj          \
-                $(SLO)$/macrosmenucontroller.obj   \
-                $(SLO)$/langselectionmenucontroller.obj   \
-                $(SLO)$/headermenucontroller.obj    \
-                $(SLO)$/footermenucontroller.obj    \
-                $(SLO)$/fontsizemenucontroller.obj  \
-                $(SLO)$/fontmenucontroller.obj      \
-                $(SLO)$/tabwindowservice.obj        \
-                $(SLO)$/fwktabwindow.obj            \
-                $(SLO)$/logotextstatusbarcontroller.obj   \
-                $(SLO)$/fwlresid.obj    			\
-                $(SLO)$/logoimagestatusbarcontroller.obj  \
-                $(SLO)$/simpletextstatusbarcontroller.obj \
-                $(SLO)$/uriabbreviation.obj         \
-                $(SLO)$/servicehandler.obj          \
-                $(SLO)$/license.obj                 \
-                $(SLO)$/dispatchrecorder.obj        \
-                $(SLO)$/dispatchrecordersupplier.obj\
-                $(SLO)$/dispatchhelper.obj          \
-                $(SLO)$/popupmenudispatcher.obj     \
-                $(SLO)$/popupmenucontroller.obj
-
-SHL3STDLIBS=    \
-                $(FWILIB)                           \
-                $(FWELIB)                           \
-                $(SVLLIB)                           \
-                $(TKLIB)                            \
-                $(SVTOOLLIB)                        \
-                $(UNOTOOLSLIB)                      \
-                $(TOOLSLIB)                         \
-                $(COMPHELPERLIB)                    \
-                $(CPPUHELPERLIB)                    \
-                $(COMPHELPERLIB)                    \
-                $(CPPULIB)                          \
-                $(VCLLIB)                           \
-                $(SALLIB)
-
-SHL3DEF=        $(MISC)$/$(SHL3TARGET).def
-SHL3DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2TARGETN)
-
-DEF3NAME=       $(SHL3TARGET)
-
-SHL3VERSIONMAP= $(SOLARENV)/src/component.map
-
-# --- services library ----------------------------------------------------
-
-SHL4TARGET=     fwk$(DLLPOSTFIX)
-
-SHL4IMPLIB=     ifwk
-
-SHL4OBJS=       \
-                $(SLO)$/acceleratorcache.obj                \
-                $(SLO)$/acceleratorconfiguration.obj        \
-                $(SLO)$/acceleratorconfigurationreader.obj  \
-                $(SLO)$/acceleratorconfigurationwriter.obj  \
-                $(SLO)$/addonstoolbarmanager.obj    \
-                $(SLO)$/addonstoolbarwrapper.obj    \
-                $(SLO)$/addonstoolboxfactory.obj    \
-                $(SLO)$/autorecovery.obj            \
-                $(SLO)$/backingcomp.obj             \
-                $(SLO)$/backingwindow.obj           \
-                $(SLO)$/buttontoolbarcontroller.obj       \
-                $(SLO)$/closedispatcher.obj         \
-                $(SLO)$/comboboxtoolbarcontroller.obj     \
-                $(SLO)$/complextoolbarcontroller.obj      \
-                $(SLO)$/configaccess.obj            \
-                $(SLO)$/containerquery.obj          \
-                $(SLO)$/contenthandler.obj          \
-                $(SLO)$/controlmenucontroller.obj   \
-                $(SLO)$/desktop.obj                 \
-                $(SLO)$/dispatchinformationprovider.obj     \
-                $(SLO)$/dispatchprovider.obj        \
-                $(SLO)$/dockingareadefaultacceptor.obj  \
-                $(SLO)$/documentacceleratorconfiguration.obj \
-                $(SLO)$/dropdownboxtoolbarcontroller.obj  \
-                $(SLO)$/droptargetlistener.obj      \
-                $(SLO)$/edittoolbarcontroller.obj   \
-                $(SLO)$/factoryconfiguration.obj    \
-                $(SLO)$/framecontainer.obj          \
-                $(SLO)$/frameloader.obj             \
-                $(SLO)$/frame.obj                   \
-                $(SLO)$/generictoolbarcontroller.obj    \
-                $(SLO)$/globalacceleratorconfiguration.obj  \
-                $(SLO)$/globalsettings.obj                \
-                $(SLO)$/graphicnameaccess.obj       \
-                $(SLO)$/helpagentdispatcher.obj     \
-                $(SLO)$/imagebuttontoolbarcontroller.obj  \
-                $(SLO)$/imagemanager.obj            \
-                $(SLO)$/imagemanagerimpl.obj        \
-                $(SLO)$/interceptionhelper.obj      \
-                $(SLO)$/jobdata.obj                 \
-                $(SLO)$/jobdispatch.obj             \
-                $(SLO)$/jobexecutor.obj             \
-                $(SLO)$/job.obj                     \
-                $(SLO)$/jobresult.obj               \
-                $(SLO)$/joburl.obj                  \
-                $(SLO)$/keymapping.obj              \
-                $(SLO)$/langselectionstatusbarcontroller.obj \
-                $(SLO)$/layoutmanager.obj           \
-                $(SLO)$/loaddispatcher.obj          \
-                $(SLO)$/loadenv.obj                 \
-                $(SLO)$/menubarfactory.obj          \
-                $(SLO)$/menubarmanager.obj          \
-                $(SLO)$/menubarmerger.obj                 \
-                $(SLO)$/menubarwrapper.obj          \
-                $(SLO)$/menudispatcher.obj          \
-                $(SLO)$/menumanager.obj             \
-                $(SLO)$/moduleacceleratorconfiguration.obj  \
-                $(SLO)$/moduleimagemanager.obj      \
-                $(SLO)$/modulemanager.obj           \
-                $(SLO)$/moduleuicfgsupplier.obj     \
-                $(SLO)$/moduleuiconfigurationmanager.obj \
-                $(SLO)$/objectmenucontroller.obj    \
-                $(SLO)$/ocomponentaccess.obj        \
-                $(SLO)$/ocomponentenumeration.obj   \
-                $(SLO)$/oframes.obj                 \
-                $(SLO)$/pathsettings.obj			\
-                $(SLO)$/persistentwindowstate.obj   \
-                $(SLO)$/popupmenucontrollerfactory.obj\
-                $(SLO)$/presethandler.obj                   \
-                $(SLO)$/progressbarwrapper.obj          \
-                $(SLO)$/recentfilesmenucontroller.obj   \
-                $(SLO)$/registerservices.obj        \
-                $(SLO)$/sessionlistener.obj         \
-                $(SLO)$/spinfieldtoolbarcontroller.obj    \
-                $(SLO)$/statusbarcontrollerfactory.obj\
-                $(SLO)$/statusbarfactory.obj        \
-                $(SLO)$/statusbarmanager.obj        \
-                $(SLO)$/statusbar.obj               \
-                $(SLO)$/statusbarwrapper.obj        \
-                $(SLO)$/statusindicatorfactory.obj  \
-                $(SLO)$/statusindicatorinterfacewrapper.obj \
-                $(SLO)$/statusindicator.obj         \
-                $(SLO)$/quietinteraction.obj        \
-                $(SLO)$/storageholder.obj           \
-                $(SLO)$/substitutepathvars.obj      \
-                $(SLO)$/tagwindowasmodified.obj     \
-                $(SLO)$/targethelper.obj            \
-                $(SLO)$/taskcreator.obj             \
-                $(SLO)$/taskcreatorsrv.obj          \
-                $(SLO)$/titlebarupdate.obj          \
-                $(SLO)$/togglebuttontoolbarcontroller.obj \
-                $(SLO)$/toolbarcontrollerfactory.obj\
-                $(SLO)$/toolbarmanager.obj          \
-                $(SLO)$/toolbarmerger.obj           \
-                $(SLO)$/toolbar.obj                 \
-                $(SLO)$/toolbarwrapper.obj          \
-                $(SLO)$/toolboxfactory.obj          \
-                $(SLO)$/uicategorydescription.obj   \
-                $(SLO)$/uicommanddescription.obj    \
-                $(SLO)$/uiconfigurationmanager.obj  \
-                $(SLO)$/uielementfactorymanager.obj \
-                $(SLO)$/urltransformer.obj          \
-                $(SLO)$/vclstatusindicator.obj      \
-                $(SLO)$/wakeupthread.obj            \
-                $(SLO)$/windowcommanddispatch.obj   \
-                $(SLO)$/windowstateconfiguration.obj \
-                $(SLO)$/windowcontentfactorymanager.obj \
-                $(SLO)$/startmoduledispatcher.obj	\
-                $(SLO)$/modelwinservice.obj			\
-                $(SLO)$/panelmanager.obj			\
-                $(SLO)$/panel.obj					\
-                $(SLO)$/helpers.obj					\
-                $(SLO)$/uielement.obj				\
-                $(SLO)$/toolbarlayoutmanager.obj
- 
-SHL4STDLIBS=    \
-                $(FWILIB)                           \
-                $(FWELIB)                           \
-                $(SVTOOLLIB)                        \
-                $(TKLIB)                            \
-                $(VCLLIB)                           \
-                $(SVLLIB)                           \
-                $(SOTLIB)                           \
-                $(UNOTOOLSLIB)                      \
-                $(TOOLSLIB)                         \
-                $(COMPHELPERLIB)                    \
-                $(CPPUHELPERLIB)                    \
-                $(CPPULIB)                          \
-                $(SALLIB)                           \
-                $(UCBHELPERLIB)                     \
-                $(I18NISOLANGLIB)
-
-SHL4DEF=        $(MISC)$/$(SHL4TARGET).def
-SHL4DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN)
-
-DEF4NAME=       $(SHL4TARGET)
-
-SHL4VERSIONMAP= $(SOLARENV)/src/component.map
-
-# --- services library ----------------------------------------------------
-
-SHL5TARGET=     fwm$(DLLPOSTFIX)
-
-SHL5IMPLIB=     ifwm
-
-SHL5OBJS=       \
-                $(SLO)$/helponstartup.obj   \
-                $(SLO)$/tabwinfactory.obj   \
-                $(SLO)$/tabwindow.obj       \
-                $(SLO)$/systemexec.obj      \
-                $(SLO)$/shelljob.obj        \
-                $(SLO)$/register3rdcomponents.obj
-
-SHL5STDLIBS=    \
-                $(FWILIB)           \
-                $(TKLIB)            \
-                $(VCLLIB)           \
-                $(TOOLSLIB)         \
-                $(COMPHELPERLIB)    \
-                $(CPPUHELPERLIB)    \
-                $(CPPULIB)          \
-                $(SALLIB)
-
-SHL5DEF=        $(MISC)$/$(SHL5TARGET).def
-SHL5DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN)
-
-DEF5NAME=       $(SHL5TARGET)
-
-SHL5VERSIONMAP= $(SOLARENV)/src/component.map
-
-RESLIB1NAME=        fwe
-RESLIB1IMAGES=      $(PRJ)$/res
-RESLIB1SRSFILES=    $(SRS)$/fwk_classes.srs \
-                    $(SRS)$/fwk_services.srs \
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo _Impl>$@
-    @echo WEP>>$@
-    @echo m_pLoader>$@
-    @echo _TI2>>$@
-    @echo _TI3>>$@
-    @echo LIBMAIN>>$@
-    @echo LibMain>>$@
-    @echo _STL::pair>>$@
-
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo _Impl>$@
-    @echo WEP>>$@
-    @echo m_pLoader>$@
-    @echo _TI2>>$@
-    @echo LIBMAIN>>$@
-    @echo LibMain>>$@
-
-ALLTAR : $(MISC)/fwk.component $(MISC)/fwl.component $(MISC)/fwm.component
-
-$(MISC)/fwk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        fwk.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt fwk.component
-
-$(MISC)/fwl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        fwl.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt fwl.component
-
-$(MISC)/fwm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        fwm.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt fwm.component
diff --git a/framework/util/makefile.pmk b/framework/util/makefile.pmk
index e567ba01c141..6dc45f466d26 100644
--- a/framework/util/makefile.pmk
+++ b/framework/util/makefile.pmk
@@ -36,3 +36,4 @@ PATH_SEPERATOR=";"
 .ENDIF
 
 JARFILES = uno.jar
+VISIBILITY_HIDDEN=TRUE
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 4b2535a7e61b..ce2025856676 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -202,7 +202,11 @@ BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
             }
         }
         else
+        {
+            const ByteString aStr( aFileName, RTL_TEXTENCODING_UTF8 );
+            fprintf( stderr, "unable to read input file: %s\n", aStr.GetBuffer() );
             return FALSE;
+        }
     }
     return TRUE;
 }
diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx
index 167c11dcc65d..167c11dcc65d 100644
--- a/linguistic/inc/hyphdta.hxx
+++ b/linguistic/inc/linguistic/hyphdta.hxx
diff --git a/linguistic/inc/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx
index 18d125af560e..18d125af560e 100644
--- a/linguistic/inc/lngprophelp.hxx
+++ b/linguistic/inc/linguistic/lngprophelp.hxx
diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/linguistic/lngprops.hxx
index 68f599d50a8c..68f599d50a8c 100644
--- a/linguistic/inc/lngprops.hxx
+++ b/linguistic/inc/linguistic/lngprops.hxx
diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/linguistic/misc.hxx
index f40a0ae55803..f40a0ae55803 100644
--- a/linguistic/inc/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
diff --git a/linguistic/inc/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx
index f4d0f5c660ce..f4d0f5c660ce 100644
--- a/linguistic/inc/spelldta.hxx
+++ b/linguistic/inc/linguistic/spelldta.hxx
diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst
index 0e0534feafd8..03237f925764 100644
--- a/linguistic/prj/d.lst
+++ b/linguistic/prj/d.lst
@@ -7,5 +7,7 @@
 ..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
 
 mkdir: %_DEST%\inc%_EXT%\linguistic
-..\inc\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
+..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
+
 ..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component
+
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 0b7245eb3019..e7c52b500817 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -66,7 +66,7 @@
 
 #include "convdic.hxx"
 #include "convdicxml.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace std;
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index c0a22da8a1f1..983b06704653 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -38,7 +38,7 @@
 #include <hash_map>
 #include <set>
 #include <memory>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 // text conversion dictionary extension
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index c842893d66f1..7f4dc8a913a0 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -53,7 +53,7 @@
 #include "convdiclist.hxx"
 #include "convdic.hxx"
 #include "hhconvdic.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 //using namespace utl;
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index d1c0740d991f..dec9103d1d51 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -36,7 +36,7 @@
 #include <svl/svarray.hxx>
 #include <tools/debug.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "lngopt.hxx"
 
 
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index f3d56f7024a9..30ced3ca02cb 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -58,7 +58,7 @@
 
 #include "convdic.hxx"
 #include "convdicxml.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace std;
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index eca7e9e48ce6..d005d51a4b28 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -38,7 +38,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <tools/string.hxx>
 #include <rtl/ustring.hxx>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index eca18c2166d3..5952c6ca0247 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -40,7 +40,7 @@
 #include <tools/stream.hxx>
 
 #include "defs.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index c93cd6b907c6..0674210d8494 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -41,7 +41,7 @@
 #include <vector>
 #include <memory>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "lngopt.hxx"
 
 class DicEvtListenerHelper;
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index afcf1503bbe9..e311e54cde88 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -67,7 +67,7 @@
 #include <map>
 #include <vector>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include "lngopt.hxx"
 
diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index 57041b7c1e4a..4647cd7feefe 100644
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -34,7 +34,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 207284230b4c..8f0e1f8736b8 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
 #include "hhconvdic.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace utl;
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index 9bdecf0903fc..8d30ea2fd812 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -35,7 +35,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <tools/string.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include "convdic.hxx"
 
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 441d3ff449e9..2d234fdc15fa 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -42,8 +42,8 @@
 #include <osl/mutex.hxx>
 
 #include "hyphdsp.hxx"
-#include "hyphdta.hxx"
-#include "lngprops.hxx"
+#include "linguistic/hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
 #include "lngsvcmgr.hxx"
 
 
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index a722e9046c3c..416715943c9e 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -45,7 +45,7 @@
 #include <map>
 
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 class LngSvcMgr;
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index 66c3ca3f7775..503d646de117 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
 
-#include "hyphdta.hxx"
-#include "lngprops.hxx"
-#include "misc.hxx"
+#include "linguistic/hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/misc.hxx"
 #include <osl/mutex.hxx>
 
 
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index e4c50686afcf..6556fc71d052 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include "iprcache.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp>
 #include <tools/debug.hxx>
@@ -57,7 +57,7 @@
 #endif
 #include <unotools/processfactory.hxx>
 
-#include <lngprops.hxx>
+#include <linguistic/lngprops.hxx>
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 9cefa6179316..f00f4f439451 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -29,8 +29,8 @@
 #include "precompiled_linguistic.hxx"
 
 #include "lngopt.hxx"
-#include "lngprops.hxx"
-#include "misc.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/misc.hxx"
 #include <tools/debug.hxx>
 #include <unotools/lingucfg.hxx>
 
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 7e86f31fc437..7f14142a4519 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -45,7 +45,7 @@
 #include <tools/solar.h>
 
 #include <svl/itemprop.hxx>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include <vos/refernce.hxx>
 
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 91b1a7ff8ebc..0efcf94a0b13 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -36,10 +36,10 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/mutex.hxx>
 
-#include <misc.hxx>
-#include <lngprops.hxx>
+#include <linguistic/misc.hxx>
+#include <linguistic/lngprops.hxx>
 
-#include <lngprophelp.hxx>
+#include <linguistic/lngprophelp.hxx>
 
 
 //using namespace utl;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 9a9f680b4ea2..c6da72bca6c1 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -49,7 +49,7 @@
 
 #include "lngsvcmgr.hxx"
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "spelldsp.hxx"
 #include "hyphdsp.hxx"
 #include "thesdsp.hxx"
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index bb6f6cf93732..1fd74d08acd1 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -42,7 +42,7 @@
 
 //#include <vcl/timer.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 class SpellCheckerDispatcher;
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 7fb35b26a908..25c2a7f6b374 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -53,10 +53,10 @@
 
 #include <rtl/instance.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
-#include "lngprops.hxx"
-#include "hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/hyphdta.hxx"
 #include <i18npool/mslangid.hxx>
 
 using namespace utl;
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index df7bc2f9f636..16874c4ff830 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 using namespace com::sun::star;
 
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 2c9c99296ad7..9f1f969f7237 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -43,9 +43,9 @@
 #include <vector>
 
 #include "spelldsp.hxx"
-#include "spelldta.hxx"
+#include "linguistic/spelldta.hxx"
 #include "lngsvcmgr.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 
 
 using namespace utl;
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 28807ac7a800..7ae83d3dbc6f 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -29,7 +29,7 @@
 #define _LINGUISTIC_SPELLDSP_HXX_
 
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "iprcache.hxx"
 
 #include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index cb7578f54852..fb4c11c892c6 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -37,7 +37,7 @@
 
 #include <vector>
 
-#include "spelldta.hxx"
+#include "linguistic/spelldta.hxx"
 #include "lngsvcmgr.hxx"
 
 
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 6bd61ef408dd..91aab5c0997e 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -38,7 +38,7 @@
 #include <osl/mutex.hxx>
 
 #include "thesdsp.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx
index 85a57e000f3e..e7aa3bf310f8 100644
--- a/linguistic/source/thesdta.cxx
+++ b/linguistic/source/thesdta.cxx
@@ -30,7 +30,7 @@
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 
-#include <misc.hxx>
+#include <linguistic/misc.hxx>
 
 #include "thesdta.hxx"
 
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index 0a02bc22bb58..dcfa1d240cde 100644
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 #include "sprophelp.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 #include <tools/debug.hxx>
 
 #include <com/sun/star/linguistic2/LinguServiceEvent.hpp>
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index 81981093e2f8..38123a144655 100644
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.cxx
@@ -41,8 +41,8 @@
 #include <sspellimp.hxx>
 #endif
 
-#include "lngprops.hxx"
-#include "spelldta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/spelldta.hxx"
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index df37c403572f..e6796afc6356 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
 #include <tools/table.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "sprophelp.hxx"
 
 using namespace ::rtl;
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
new file mode 100644
index 000000000000..aa3270e08a07
--- /dev/null
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -0,0 +1,79 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_AllLangResTarget_AllLangResTarget,sfx))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,sfx,sfx2))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sfx,\
+    sfx/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,sfx/res))
+
+$(eval $(call gb_SrsTarget_set_include,sfx/res,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(WORKDIR)/inc \
+    -I$(SRCDIR)/sfx2/source/dialog \
+    -I$(SRCDIR)/sfx2/source/inc \
+    -I$(SRCDIR)/sfx2/inc/ \
+    -I$(SRCDIR)/sfx2/inc/sfx \
+))
+
+$(eval $(call gb_SrsTarget_add_files,sfx/res,\
+    sfx2/source/appl/app.src \
+    sfx2/source/appl/dde.src \
+    sfx2/source/appl/newhelp.src \
+    sfx2/source/appl/sfx.src \
+    sfx2/source/bastyp/bastyp.src \
+    sfx2/source/bastyp/fltfnc.src \
+    sfx2/source/dialog/alienwarn.src \
+    sfx2/source/dialog/dialog.src \
+    sfx2/source/dialog/dinfdlg.src \
+    sfx2/source/dialog/dinfedt.src \
+    sfx2/source/dialog/filedlghelper.src \
+    sfx2/source/dialog/mailwindow.src \
+    sfx2/source/dialog/mgetempl.src \
+    sfx2/source/dialog/newstyle.src \
+    sfx2/source/dialog/passwd.src \
+    sfx2/source/dialog/printopt.src \
+    sfx2/source/dialog/recfloat.src \
+    sfx2/source/dialog/srchdlg.src \
+    sfx2/source/dialog/templdlg.src \
+    sfx2/source/dialog/versdlg.src \
+    sfx2/source/doc/doc.src \
+    sfx2/source/doc/doctdlg.src \
+    sfx2/source/doc/doctempl.src \
+    sfx2/source/doc/docvor.src \
+    sfx2/source/doc/graphhelp.src \
+    sfx2/source/doc/new.src \
+    sfx2/source/menu/menu.src \
+    sfx2/source/view/view.src \
+))
+
+
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
new file mode 100755
index 000000000000..6ed99271d353
--- /dev/null
+++ b/sfx2/Library_qstart.mk
@@ -0,0 +1,92 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,qstart_gtk))
+
+$(eval $(call gb_Library_set_include,qstart_gtk,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sfx2/inc \
+    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/sfx2/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+    $(filter -I%,$(GTK_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_set_defs,qstart_gtk,\
+    $$(DEFS) \
+    -DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \
+    -DENABLE_QUICKSTART_APPLET \
+))
+
+$(eval $(call gb_Library_set_cflags,qstart_gtk,\
+    $$(CFLAGS) \
+    $(filter-out -I%,$(GTK_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
+    $$(LDFLAGS) \
+    $(GTK_LIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    i18nisolang1 \
+    sal \
+    sax \
+    sb \
+    sot \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xml2 \
+    eggtray \
+    sfx \
+))
+
+$(eval $(call gb_Library_add_linked_system_libs,qstart_gtk,\
+    dl \
+    icuuc \
+    m \
+    pthread \
+))
+
+$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
+    sfx2/source/appl/shutdowniconunx \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
new file mode 100755
index 000000000000..ed941d5b9a9f
--- /dev/null
+++ b/sfx2/Library_sfx.mk
@@ -0,0 +1,309 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,sfx))
+
+$(eval $(call gb_Library_add_package_headers,sfx,\
+    sfx2_inc \
+    sfx2_sdi \
+))
+
+$(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx2))
+
+$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
+
+$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
+
+$(eval $(call gb_Library_set_include,sfx,\
+    -I$(SRCDIR)/sfx2/inc \
+    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/sfx2/source/inc \
+    -I$(SRCDIR)/sfx2/inc/pch \
+    -I$(WORKDIR)/SdiTarget/sfx2/sdi \
+    -I$(WORKDIR)/inc/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+    $(LIBXML_CFLAGS) \
+))
+
+$(eval $(call gb_Library_set_defs,sfx,\
+    $$(DEFS) \
+    -DSFX2_DLLIMPLEMENTATION \
+    -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sfx,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    i18nisolang1 \
+    sal \
+    sax \
+    sb \
+    sot \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xml2 \
+))
+
+$(eval $(call gb_Library_add_linked_system_libs,sfx,\
+    icuuc \
+    dl \
+    m \
+    pthread \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sfx,\
+    sfx2/source/appl/app \
+    sfx2/source/appl/appbas \
+    sfx2/source/appl/appbaslib \
+    sfx2/source/appl/appcfg \
+    sfx2/source/appl/appchild \
+    sfx2/source/appl/appdata \
+    sfx2/source/appl/appdde \
+    sfx2/source/appl/appinit \
+    sfx2/source/appl/appmain \
+    sfx2/source/appl/appmisc \
+    sfx2/source/appl/appopen \
+    sfx2/source/appl/appquit \
+    sfx2/source/appl/appreg \
+    sfx2/source/appl/appserv \
+    sfx2/source/appl/appuno \
+    sfx2/source/appl/childwin \
+    sfx2/source/appl/fileobj \
+    sfx2/source/appl/fwkhelper \
+    sfx2/source/appl/helpdispatch \
+    sfx2/source/appl/helpinterceptor \
+    sfx2/source/appl/imagemgr \
+    sfx2/source/appl/imestatuswindow \
+    sfx2/source/appl/impldde \
+    sfx2/source/appl/linkmgr2 \
+    sfx2/source/appl/linksrc \
+    sfx2/source/appl/lnkbase2 \
+    sfx2/source/appl/module \
+    sfx2/source/appl/newhelp \
+    sfx2/source/appl/opengrf \
+    sfx2/source/appl/sfxhelp \
+    sfx2/source/appl/sfxpicklist \
+    sfx2/source/appl/shutdownicon \
+    sfx2/source/appl/workwin \
+    sfx2/source/appl/xpackcreator \
+    sfx2/source/bastyp/bitset \
+    sfx2/source/bastyp/fltfnc \
+    sfx2/source/bastyp/fltlst \
+    sfx2/source/bastyp/frmhtml \
+    sfx2/source/bastyp/frmhtmlw \
+    sfx2/source/bastyp/helper \
+    sfx2/source/bastyp/mieclip \
+    sfx2/source/bastyp/minarray \
+    sfx2/source/bastyp/misc \
+    sfx2/source/bastyp/progress \
+    sfx2/source/bastyp/sfxhtml \
+    sfx2/source/bastyp/sfxresid \
+    sfx2/source/config/evntconf \
+    sfx2/source/control/bindings \
+    sfx2/source/control/ctrlitem \
+    sfx2/source/control/dispatch \
+    sfx2/source/control/macrconf \
+    sfx2/source/control/macro \
+    sfx2/source/control/minfitem \
+    sfx2/source/control/msg \
+    sfx2/source/control/msgpool \
+    sfx2/source/control/objface \
+    sfx2/source/control/querystatus \
+    sfx2/source/control/request \
+    sfx2/source/control/sfxstatuslistener \
+    sfx2/source/control/shell \
+    sfx2/source/control/sorgitm \
+    sfx2/source/control/statcach \
+    sfx2/source/control/unoctitm \
+    sfx2/source/dialog/about \
+    sfx2/source/dialog/alienwarn \
+    sfx2/source/dialog/basedlgs \
+    sfx2/source/dialog/dinfdlg \
+    sfx2/source/dialog/dinfedt \
+    sfx2/source/dialog/dockwin \
+    sfx2/source/dialog/filedlghelper \
+    sfx2/source/dialog/filtergrouping \
+    sfx2/source/dialog/intro \
+    sfx2/source/dialog/itemconnect \
+    sfx2/source/dialog/mailmodel \
+    sfx2/source/dialog/mgetempl \
+    sfx2/source/dialog/navigat \
+    sfx2/source/dialog/newstyle \
+    sfx2/source/dialog/partwnd \
+    sfx2/source/dialog/passwd \
+    sfx2/source/dialog/printopt \
+    sfx2/source/dialog/recfloat \
+    sfx2/source/dialog/securitypage \
+    sfx2/source/dialog/sfxdlg \
+    sfx2/source/dialog/splitwin \
+    sfx2/source/dialog/srchdlg \
+    sfx2/source/dialog/styfitem \
+    sfx2/source/dialog/styledlg \
+    sfx2/source/dialog/tabdlg \
+    sfx2/source/dialog/taskpane \
+    sfx2/source/dialog/templdlg \
+    sfx2/source/dialog/titledockwin \
+    sfx2/source/dialog/tplcitem \
+    sfx2/source/dialog/tplpitem \
+    sfx2/source/dialog/versdlg \
+    sfx2/source/doc/DocumentMetadataAccess \
+    sfx2/source/doc/Metadatable \
+    sfx2/source/doc/QuerySaveDocument \
+    sfx2/source/doc/SfxDocumentMetaData \
+    sfx2/source/doc/docfac \
+    sfx2/source/doc/docfile \
+    sfx2/source/doc/docfilt \
+    sfx2/source/doc/docinf \
+    sfx2/source/doc/docinsert \
+    sfx2/source/doc/docmacromode \
+    sfx2/source/doc/docstoragemodifylistener \
+    sfx2/source/doc/doctdlg \
+    sfx2/source/doc/doctempl \
+    sfx2/source/doc/doctemplates \
+    sfx2/source/doc/doctemplateslocal \
+    sfx2/source/doc/docvor \
+    sfx2/source/doc/frmdescr \
+    sfx2/source/doc/graphhelp \
+    sfx2/source/doc/guisaveas \
+    sfx2/source/doc/iframe \
+    sfx2/source/doc/new \
+    sfx2/source/doc/objcont \
+    sfx2/source/doc/objembed \
+    sfx2/source/doc/objitem \
+    sfx2/source/doc/objmisc \
+    sfx2/source/doc/objserv \
+    sfx2/source/doc/objstor \
+    sfx2/source/doc/objuno \
+    sfx2/source/doc/objxtor \
+    sfx2/source/doc/oleprops \
+    sfx2/source/doc/ownsubfilterservice \
+    sfx2/source/doc/plugin \
+    sfx2/source/doc/printhelper \
+    sfx2/source/doc/querytemplate \
+    sfx2/source/doc/sfxbasemodel \
+    sfx2/source/doc/sfxmodelfactory \
+    sfx2/source/doc/syspath \
+    sfx2/source/explorer/nochaos \
+    sfx2/source/inet/inettbc \
+    sfx2/source/menu/mnuitem \
+    sfx2/source/menu/mnumgr \
+    sfx2/source/menu/objmnctl \
+    sfx2/source/menu/thessubmenu \
+    sfx2/source/menu/virtmenu \
+    sfx2/source/notify/eventsupplier \
+    sfx2/source/notify/hintpost \
+    sfx2/source/statbar/stbitem \
+    sfx2/source/toolbox/imgmgr \
+    sfx2/source/toolbox/tbxitem \
+    sfx2/source/view/frame \
+    sfx2/source/view/frame2 \
+    sfx2/source/view/frmload \
+    sfx2/source/view/ipclient \
+    sfx2/source/view/orgmgr \
+    sfx2/source/view/printer \
+    sfx2/source/view/sfxbasecontroller \
+    sfx2/source/view/userinputinterception \
+    sfx2/source/view/viewfac \
+    sfx2/source/view/viewfrm \
+    sfx2/source/view/viewfrm2 \
+    sfx2/source/view/viewprn \
+    sfx2/source/view/viewsh \
+))
+
+$(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx))
+
+$(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/sfx2/inc \
+    -I$(SRCDIR)/sfx2/sdi \
+))
+
+ifeq ($(OS),$(filter WNT MACOSX,$(OS)))
+$(eval $(call gb_Library_set_defs,sfx,\
+    $$(DEFS) \
+    -DENABLE_QUICKSTART_APPLET \
+))
+endif
+
+ifeq ($(OS),OS2)
+$(eval $(call gb_Library_add_exception_objects,sfx,\
+    sfx2/source/appl/shutdowniconOs2.ob \
+))
+endif
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_objcxxobjects,sfx,\
+    sfx2/source/appl/shutdowniconaqua \
+))
+$(eval $(call gb_Library_add_linked_libs,sfx,\
+    objc \
+    Cocoa \
+))
+endif
+ifeq ($(OS),WNT)
+# workaround: disable PCH for these objects to avoid redeclaration
+# errors - needs to be fixed in module tools
+$(eval $(call gb_Library_add_cxxobjects,sfx,\
+    sfx2/source/appl/shutdowniconw32 \
+    sfx2/source/doc/sfxacldetect \
+    sfx2/source/doc/syspathw32 \
+    , $(gb_LinkTarget_EXCEPTIONFLAGS) -nologo -UPRECOMPILED_HEADERS \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sfx,\
+    advapi32 \
+    gdi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    ole32 \
+    shell32 \
+    user32 \
+    uuid \
+    uwinapi \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,sfx,\
+    sfx2/source/appl/shutdowniconw32 \
+    sfx2/source/doc/sfxacldetect \
+    , $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+endif
+# vim: set noet sw=4 ts=4:
+
diff --git a/sfx2/Makefile b/sfx2/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/sfx2/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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/framework/qa/complex/loadAllDocuments/helper/makefile.mk b/sfx2/Module_sfx2.mk
index 05a3c7a997ea..f6ac7c4c053e 100644..100755
--- a/framework/qa/complex/loadAllDocuments/helper/makefile.mk
+++ b/sfx2/Module_sfx2.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 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,34 +14,42 @@
 #
 # OpenOffice.org is distributed in the hope 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 = ../../../..
-TARGET  = CheckXComponentLoader
-PRJNAME = framework
-PACKAGE = complex/loadAllDocuments/helper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
-JAVAFILES       = InteractionHandler.java StatusIndicator.java StreamSimulator.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-
-MAXLINELENGTH = 100000
-
-.INCLUDE :  target.mk
-
-
 
+$(eval $(call gb_Module_Module,sfx2))
+
+$(eval $(call gb_Module_add_targets,sfx2,\
+    AllLangResTarget_sfx2 \
+    Library_sfx \
+    Package_inc \
+    Package_sdi \
+))
+
+ifeq ($(OS),LINUX)
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+$(eval $(call gb_Module_add_targets,sfx2,\
+    Library_qstart \
+))
+endif
+endif
+
+#todo: map file?
+#todo: source/appl ohne Optimierung?
+#todo: source/control ohne Optimierung?
+#todo: source/dialog BUILD_VER_STRING
+#todo: source/doc SYSTEM_LIBXML2
+#todo: noopt for acldetect.cxx?
+#todo: ENABLE_LAYOUT
+#todo: quickstarter
+#todo: link against cocoa on Mac
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
new file mode 100644
index 000000000000..6ad8b0209c4e
--- /dev/null
+++ b/sfx2/Package_inc.mk
@@ -0,0 +1,138 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/htmlmode.hxx,sfx2/htmlmode.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxcommands.h,sfx2/sfxcommands.h))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/taskpane.hxx,sfx2/taskpane.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/titledockwin.hxx,sfx2/titledockwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
diff --git a/sfx2/Package_sdi.mk b/sfx2/Package_sdi.mk
new file mode 100644
index 000000000000..63f2138adf4f
--- /dev/null
+++ b/sfx2/Package_sdi.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Package_Package,sfx2_sdi,$(SRCDIR)/sfx2/sdi))
+$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfx.sdi,sfx.sdi))
+$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfxitems.sdi,sfxitems.sdi))
diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx
deleted file mode 100755
index 16f332480cf6..000000000000
--- a/sfx2/inc/brokenpackageint.hxx
+++ /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.
- *
- ************************************************************************/
-
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <com/sun/star/document/BrokenPackageRequest.hpp>
-#include <com/sun/star/task/XInteractionApprove.hpp>
-#include <com/sun/star/task/XInteractionDisapprove.hpp>
-#include <framework/interaction.hxx>
-
-using namespace ::framework;
-typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > SfxContinuationApprove;
-typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > SfxContinuationDisapprove;
-
-class SFX2_DLLPUBLIC RequestPackageReparation :
-        public ::com::sun::star::task::XInteractionRequest,
-        public ::cppu::OWeakObject
-{
-    ::com::sun::star::uno::Any m_aRequest;
-
-    ::com::sun::star::uno::Sequence<
-                    ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
-                > m_lContinuations;
-
-    SfxContinuationApprove* m_pApprove;
-    SfxContinuationDisapprove*  m_pDisapprove;
-
-public:
-    RequestPackageReparation( ::rtl::OUString aName );
-
-    // XInterface / OWeakObject
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire(  ) throw ();
-    virtual void SAL_CALL release(  ) throw ();
-
-    sal_Bool    isApproved() { return m_pApprove->isSelected(); }
-
-    virtual ::com::sun::star::uno::Any SAL_CALL getRequest()
-        throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual ::com::sun::star::uno::Sequence<
-                ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
-            > SAL_CALL getContinuations()
-        throw( ::com::sun::star::uno::RuntimeException );
-};
-
-class SFX2_DLLPUBLIC NotifyBrokenPackage :
-    public ::com::sun::star::task::XInteractionRequest,
-    public ::cppu::OWeakObject
-{
-    ::com::sun::star::uno::Any m_aRequest;
-
-    ::com::sun::star::uno::Sequence<
-                    ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
-                > m_lContinuations;
-
-    ContinuationAbort*  m_pAbort;
-
-public:
-    NotifyBrokenPackage( ::rtl::OUString aName );
-
-    // XInterface / OWeakObject
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire(  ) throw ();
-    virtual void SAL_CALL release(  ) throw ();
-
-    sal_Bool    isAborted() { return m_pAbort->isSelected(); }
-
-    virtual ::com::sun::star::uno::Any SAL_CALL getRequest()
-        throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual ::com::sun::star::uno::Sequence<
-                ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
-            > SAL_CALL getContinuations()
-        throw( ::com::sun::star::uno::RuntimeException );
-};
-
diff --git a/sfx2/inc/makefile.mk b/sfx2/inc/makefile.mk
deleted file mode 100644
index b7aa547e2c79..000000000000
--- a/sfx2/inc/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=sfx2
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/sfx2/inc/QuerySaveDocument.hxx b/sfx2/inc/sfx2/QuerySaveDocument.hxx
index e25d1a23082c..e25d1a23082c 100644
--- a/sfx2/inc/QuerySaveDocument.hxx
+++ b/sfx2/inc/sfx2/QuerySaveDocument.hxx
diff --git a/sfx2/inc/basmgr.hxx b/sfx2/inc/sfx2/basmgr.hxx
index 7156be8f8327..0227ad6515ec 100644
--- a/sfx2/inc/basmgr.hxx
+++ b/sfx2/inc/sfx2/basmgr.hxx
@@ -28,8 +28,7 @@
 #ifndef _SFX_BASMGR_HXX
 #define _SFX_BASMGR_HXX
 
-#ifndef _BASMGR_HXX_
 #include <basic/basmgr.hxx>
-#endif
+#include <svtools/svtools.hrc>
 
 #endif  //_SFX_BASMGR_HXX
diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx
new file mode 100755
index 000000000000..5186e875a6ea
--- /dev/null
+++ b/sfx2/inc/sfx2/brokenpackageint.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include "sal/config.h"
+#include "sfx2/dllapi.h"
+#include <com/sun/star/document/BrokenPackageRequest.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionDisapprove.hpp>
+
+class RequestPackageReparation_Impl;
+class SFX2_DLLPUBLIC RequestPackageReparation
+{
+    RequestPackageReparation_Impl* pImp;
+public:
+    RequestPackageReparation( ::rtl::OUString aName );
+    ~RequestPackageReparation();
+    sal_Bool    isApproved();
+    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+};
+
+class NotifyBrokenPackage_Impl;
+class SFX2_DLLPUBLIC NotifyBrokenPackage
+{
+    NotifyBrokenPackage_Impl* pImp;
+public:
+    NotifyBrokenPackage( ::rtl::OUString aName );
+    ~NotifyBrokenPackage();
+    sal_Bool    isAborted();
+    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+};
+
diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/sfx2/dinfedt.hxx
index 64ad32cb1337..64ad32cb1337 100644
--- a/sfx2/inc/dinfedt.hxx
+++ b/sfx2/inc/sfx2/dinfedt.hxx
diff --git a/sfx2/inc/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx
index c4e4be12185e..c4e4be12185e 100644
--- a/sfx2/inc/docinsert.hxx
+++ b/sfx2/inc/sfx2/docinsert.hxx
diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx
index 79dc724210c4..79dc724210c4 100644
--- a/sfx2/inc/imagemgr.hxx
+++ b/sfx2/inc/sfx2/imagemgr.hxx
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx
index ae1f8a23ddc9..ae1f8a23ddc9 100644
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/sfx2/imgmgr.hxx
diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx
index fa9086f2623b..fa9086f2623b 100644
--- a/sfx2/inc/mailmodelapi.hxx
+++ b/sfx2/inc/sfx2/mailmodelapi.hxx
diff --git a/sfx2/inc/mieclip.hxx b/sfx2/inc/sfx2/mieclip.hxx
index 562bca7940e2..562bca7940e2 100644
--- a/sfx2/inc/mieclip.hxx
+++ b/sfx2/inc/sfx2/mieclip.hxx
diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/sfx2/minfitem.hxx
index 29edf6b3e8cb..29edf6b3e8cb 100644
--- a/sfx2/inc/minfitem.hxx
+++ b/sfx2/inc/sfx2/minfitem.hxx
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 5a3a48445c0f..6ca9d5212a57 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -28,14 +28,12 @@
 #define _SFX_PASSWD_HXX
 
 #include "sal/config.h"
-#include "sfx2/dllapi.h"
-
-#ifndef _SV_BUTTON_HXX
+#include <sfx2/dllapi.h>
 #include <vcl/button.hxx>
-#endif
 #include <vcl/dialog.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
+#include <sfx2/app.hxx>
 
 // defines ---------------------------------------------------------------
 
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index a49b003b5b49..44c00cc93018 100755..100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -362,9 +362,6 @@
 #define RID_ITEMLIST_LINGU          (RID_OPTIONS_START + 11)
 #define RID_SFXPAGE_PRINTOPTIONS    (RID_OPTIONS_START + 12)
 
-#define STR_UNDO                            (RID_SFX_VIEW_START+11)
-#define STR_REDO                            (RID_SFX_VIEW_START+12)
-#define STR_REPEAT                          (RID_SFX_VIEW_START+13)
 #define RID_STR_NEW_TASK                    (RID_SFX_DOC_START+ 76)
 
 // Member-Ids ------------------------------------------------------------
diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx
index 17589c7cd399..17589c7cd399 100644
--- a/sfx2/inc/sfxhelp.hxx
+++ b/sfx2/inc/sfx2/sfxhelp.hxx
diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx
index ceea5452a0d5..2dfdb48afef4 100644
--- a/sfx2/inc/sfxresid.hxx
+++ b/sfx2/inc/sfx2/sfxresid.hxx
@@ -28,12 +28,10 @@
 #define _SFX_SFXRESID_HXX
 
 #include <tools/string.hxx>
-
-#ifndef _RESID_HXX //autogen
+#include "sfx2/dllapi.h"
 #include <tools/resid.hxx>
-#endif
 
-class SfxResId: public ResId
+class SFX2_DLLPUBLIC SfxResId: public ResId
 {
 public:
     SfxResId( USHORT nId );
diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/sfx2/stbitem.hxx
index 977ba869750d..977ba869750d 100644
--- a/sfx2/inc/stbitem.hxx
+++ b/sfx2/inc/sfx2/stbitem.hxx
diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/sfx2/tplpitem.hxx
index 38198e0ff7ee..38198e0ff7ee 100644
--- a/sfx2/inc/tplpitem.hxx
+++ b/sfx2/inc/sfx2/tplpitem.hxx
diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx
index b0f0abdba3b3..420a44440aae 100644
--- a/sfx2/inc/viewfac.hxx
+++ b/sfx2/inc/sfx2/viewfac.hxx
@@ -30,9 +30,7 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include <tools/string.hxx>
-#ifndef _RESID_HXX //autogen
 #include <tools/resid.hxx>
-#endif
 
 class SfxViewFrame;
 class SfxViewShell;
@@ -51,7 +49,6 @@ public:
 
     SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh);
     void          InitFactory();
-
     USHORT        GetOrdinal() const { return nOrd; }
 
     /// returns a legacy view name. This is "view" with an appended ordinal/ID.
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index ee8dfb1ca57c..bbd627a39ad6 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -380,4 +380,3 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const
 
 #endif // #ifndef _SFXVIEWSH_HXX
 
-
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index 1e471312c6cf..85763aab9258 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,31 +1,11 @@
 sf      sfx2    :    l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL
 sf	sfx2									usr1	-	all	sf_mkout NULL
-sf	sfx2\inc								nmake	-	all	sf_inc NULL
-sf	sfx2\prj								get		-	all	sf_prj NULL
-sf	sfx2\mac\res							get		-	all	sf_mres NULL
-sf	sfx2\source\inc							get		-	all	sf_sinc NULL
-sf	sfx2\sdi								nmake	-	all	sf_sdi NULL
-sf	sfx2\source\appl						nmake	-	all	sf_appl sf_sdi sf_inc NULL
-sf	sfx2\source\view						nmake	-	all	sf_view sf_sdi sf_inc NULL
-sf	sfx2\source\bastyp						nmake	-	all	sf_bast sf_sdi sf_inc NULL
-sf	sfx2\source\config						nmake	-	all	sf_cnfg sf_sdi sf_inc NULL
-sf	sfx2\source\control						nmake	-	all	sf_ctrl sf_sdi sf_inc NULL
-sf	sfx2\source\dialog						nmake	-	all	sf_dlg sf_sdi sf_inc NULL
-sf	sfx2\source\doc							nmake	-	all	sf_doc sf_sdi sf_inc NULL
-sf	sfx2\source\layout						nmake	-	all	sf_layout sf_sdi sf_inc NULL
-sf	sfx2\source\menu						nmake	-	all	sf_menu sf_sdi sf_inc NULL
-sf	sfx2\source\notify						nmake	-	all	sf_noti sf_sdi sf_inc NULL
-sf	sfx2\source\statbar						nmake	-	all	sf_sbar sf_sdi sf_inc NULL
-sf	sfx2\source\toolbox						nmake	-	all	sf_tbox sf_sdi sf_inc NULL
-sf	sfx2\source\inet						nmake	-	all	sf_inet sf_sdi sf_inc NULL
-sf	sfx2\source\explorer					nmake	-	all	sf_expl sf_sdi sf_inc NULL
-sf	sfx2\workben\custompanel                nmake   -   all sf_wb_custompanel NULL
-sf      sfx2\util                                                               nmake   -       all     sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL
-sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL
-sf  sfx2\qa\cppunit							nmake	-	all sf_qa_cppunit sf_util NULL
+sf	sfx2\prj								nmake	-	all	sf_prj NULL
+
 
 # fails on unxsoli4
 # sf      sfx2\qa\complex\standalonedocumentinfo  nmake   -       all     sf_qa_complex_standalonedocumentinfo sf_util NULL
 
 # sf      sfx2\qa\complex\framework               nmake   -       all     sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL
 # sf      sfx2\qa\complex\docinfo                 nmake   -       all     sf_qa_complex_docinfo sf_util NULL
+
diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst
index 0768000425eb..e69de29bb2d1 100644
--- a/sfx2/prj/d.lst
+++ b/sfx2/prj/d.lst
@@ -1,47 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\inc%_EXT%\sfx2
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\sfx.lib %_DEST%\lib%_EXT%\sfx.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\slb\sfx.lib %_DEST%\lib%_EXT%\xsfx.lib
-..\%__SRC%\lib\isfx.lib %_DEST%\lib%_EXT%\isfx.lib
-..\%__SRC%\lib\debug.lib %_DEST%\lib%_EXT%\sfxdebug.lib
-..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym
-..\%__SRC%\bin\sfx?????.dll %_DEST%\bin%_EXT%\sfx?????.dll
-..\%__SRC%\bin\sfx*.res %_DEST%\bin%_EXT%\sfx*.res
-..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym
-..\%__SRC%\misc\sfx?????.map %_DEST%\bin%_EXT%\sfx?????.map
-..\%__SRC%\bin\elc?????.dll %_DEST%\bin%_EXT%\elc?????.dll
-..\%__SRC%\srs\sfx.srs %_DEST%\res%_EXT%\sfx.srs
-..\%COMMON_OUTDIR%\srs\sfx_srs.hid %COMMON_DEST%\res%_EXT%\sfx_srs.hid
-..\%__SRC%\srs\sfxslots.srs %_DEST%\res%_EXT%\sfxslots.srs
-..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid
-..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml
-..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv
-
-..\inc\sfx2\*.h %_DEST%\inc%_EXT%\sfx2\*.h
-..\inc\sfx2\*.hxx %_DEST%\inc%_EXT%\sfx2\*.hxx
-..\inc\sfx2\*.hrc %_DEST%\inc%_EXT%\sfx2\*.hrc
-
-..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi
-..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi
-..\inc\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx
-..\inc\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx
-..\inc\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx
-..\inc\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx
-..\inc\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx
-..\inc\sfxhelp.hxx %_DEST%\inc%_EXT%\sfx2\sfxhelp.hxx
-..\inc\stbitem.hxx %_DEST%\inc%_EXT%\sfx2\stbitem.hxx
-..\inc\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx
-..\inc\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx
-..\inc\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx
-..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx
-..\inc\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx
-..\inc\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx
-..\inc\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx
-
-..\%__SRC%\misc\sfx.component %_DEST%\xml%_EXT%\sfx.component
diff --git a/sfx2/source/config/makefile.mk b/sfx2/prj/makefile.mk
index d090babd1505..c73a3d944bbf 100644
--- a/sfx2/source/config/makefile.mk
+++ b/sfx2/prj/makefile.mk
@@ -25,23 +25,16 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+PRJ=..
+TARGET=prj
 
-PRJNAME=sfx2
-TARGET=config
-ENABLE_EXCEPTIONS=TRUE
+.INCLUDE : settings.mk
 
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/evntconf.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk
deleted file mode 100644
index 626b648a6d06..000000000000
--- a/sfx2/qa/complex/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sfx2
-TARGET = qa_complex_docinfo
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/docinfo
-JAVATESTFILES = \
-    DocumentProperties.java
-
-JAVAFILES = $(JAVATESTFILES)
-
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-
-
-
diff --git a/sfx2/qa/complex/framework/DocHelper/makefile.mk b/sfx2/qa/complex/framework/DocHelper/makefile.mk
deleted file mode 100644
index ad614cfca3f8..000000000000
--- a/sfx2/qa/complex/framework/DocHelper/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 = ../../../..
-TARGET  = DocHelper
-PRJNAME = $(TARGET)
-PACKAGE = complex/framework/dochelper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = \
-    DialogThread.java \
-    WriterHelper.java
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/qa/complex/framework/makefile.mk b/sfx2/qa/complex/framework/makefile.mk
deleted file mode 100644
index 325135b9133c..000000000000
--- a/sfx2/qa/complex/framework/makefile.mk
+++ /dev/null
@@ -1,65 +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 "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sfx2
-TARGET = qa_complex_framework
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/framework
-JAVATESTFILES = \
-    DocumentPropertiesTest.java \
-    DocumentMetadataAccessTest.java \
-    CheckGlobalEventBroadcaster_writer1.java
-
-JAVAFILES = $(JAVATESTFILES) \
-    TestDocument.java \
-    WriterHelper.java \
-    DialogThread.java
-
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
diff --git a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
deleted file mode 100644
index aade48dbd789..000000000000
--- a/sfx2/qa/complex/standalonedocumentinfo/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sfx2
-TARGET = qa_complex_standalonedocumentinfo
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/standalonedocumentinfo
-JAVATESTFILES = \
-    StandaloneDocumentInfoUnitTest.java
-
-JAVAFILES = $(JAVATESTFILES) \
-    StandaloneDocumentInfoTest.java \
-    Test01.java \
-    TestHelper.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk
deleted file mode 100644
index b53a04ec43f9..000000000000
--- a/sfx2/qa/cppunit/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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ=../..
-PRJNAME=sfx2
-TARGET=qa_cppunit
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.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)
-DLLPRE = # no leading "lib" on .so files
-
-# --- Libs ---------------------------------------------------------
-
-SHL1OBJS=  \
-    $(SLO)/test_metadatable.obj \
-
-
-SHL1STDLIBS= \
-     $(CPPUNITLIB) \
-     $(SALLIB) \
-     $(CPPULIB) \
-     $(CPPUHELPERLIB) \
-     $(VCLLIB) \
-     $(SFXLIB) \
-
-
-SHL1TARGET= test_metadatable
-SHL1RPATH = NONE
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= version.map
-
-# --- All object files ---------------------------------------------
-
-SLOFILES= \
-    $(SHL1OBJS) \
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-.END
diff --git a/sfx2/qa/unoapi/makefile.mk b/sfx2/qa/unoapi/makefile.mk
deleted file mode 100644
index ea91ba4d1c44..000000000000
--- a/sfx2/qa/unoapi/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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = sfx2
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/sfx2/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sfx2/sdi/makefile.mk b/sfx2/sdi/makefile.mk
deleted file mode 100644
index c02e51eb6998..000000000000
--- a/sfx2/sdi/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=sfx2
-TARGET=sfxslots
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-.IF "$(L10N_framework)"==""
-
-SDI1NAME=$(TARGET)
-SDI1EXPORT=sfx
-#SIDHRCNAME=sfx.hrc unused???
-
-.ENDIF
-# --- Files --------------------------------------------------------
-
-SVSDI1DEPEND= \
-        $(PRJ)$/inc$/sfx2$/sfxsids.hrc \
-        sfx.sdi	\
-        appslots.sdi \
-        sfxslots.sdi \
-        docslots.sdi \
-        viwslots.sdi \
-                frmslots.sdi
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 7e4e9921573a..4a1586175e15 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -43,14 +43,10 @@
 #include <basic/basrdll.hxx>
 #include <svtools/asynclink.hxx>
 #include <svl/stritem.hxx>
-#ifndef _SOUND_HXX //autogen
 #include <vcl/sound.hxx>
-#endif
 #include <svl/eitem.hxx>
 #include <svl/urlbmk.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 
@@ -58,8 +54,6 @@
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
 #include <osl/file.hxx>
-#ifndef GCC
-#endif
 
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
@@ -78,23 +72,18 @@
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
-
 #include <basic/basmgr.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
-
 #include <rtl/logfile.hxx>
-
 #include <sfx2/appuno.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/request.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/progress.hxx>
 #include <sfx2/objsh.hxx>
@@ -120,9 +109,10 @@
 #include <sfx2/module.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/sfxdlg.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include "eventsupplier.hxx"
 #include <sfx2/dockwin.hxx>
+#include <tools/svlibrary.hxx>

 
 #ifdef DBG_UTIL
 #include <sfx2/tbxctrl.hxx>
@@ -291,7 +281,7 @@ void SfxPropertyHandler::Property( ApplicationProperty& rProp )
 #include <framework/imageproducer.hxx>
 #include <framework/acceleratorinfo.hxx>
 #include <framework/sfxhelperfunctions.hxx>
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 #include "fwkhelper.hxx"
 
 ::osl::Mutex SfxApplication::gMutex;
@@ -736,9 +726,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );

 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
@@ -827,9 +815,7 @@ SfxApplication::ChooseScript()
 void SfxApplication::MacroOrganizer( INT16 nTabId )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );

 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 47750cd73f78..f8a387bba79b 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -31,6 +31,45 @@
 #include "app.hrc"
 #include "helpid.hrc"
 
+String STR_NONAME
+{
+    Text [ en-US ] = "Untitled" ;
+};
+String STR_CLOSE
+{
+    Text [ en-US ] = "Close" ;
+};
+String STR_STYLE_FILTER_AUTO
+{
+    Text [ en-US ] = "Automatic" ;
+};
+String STR_STANDARD_SHORTCUT
+{
+    Text [ en-US ] = "Standard" ;
+};
+String STR_BYTES
+{
+    Text [ en-US ] = "Bytes" ;
+};
+String STR_KB
+{
+    Text [ en-US ] = "KB" ;
+};
+String STR_MB
+{
+    Text [ en-US ] = "MB" ;
+};
+String STR_GB
+{
+    Text [ en-US ] = "GB" ;
+};
+QueryBox MSG_QUERY_LASTVERSION
+{
+    Buttons = WB_YES_NO ;
+    DefButton = WB_DEF_NO ;
+    Message [ en-US ] = "Cancel all changes?" ;
+};
+
 InfoBox RID_DOCALREADYLOADED_DLG
 {
     Message [ en-US ] = "Document already open." ;
@@ -891,19 +930,37 @@ Image IMG_MISSING_4
     ImageBitmap = Bitmap { File = "sn064.bmp" ; };
 };
 
+String STR_STANDARD
+{
+    Text [ en-US ] = "Standard" ;
+};
+
 String RID_SVXSTR_FILELINK
 {
     Text [ en-US ] = "Document" ;
 };
+
+String STR_NONE
+{
+    Text [ en-US ] = "- None -" ;
+};
 String RID_SVXSTR_GRAFIKLINK
 {
     Text [ en-US ] = "Graphic" ;
 };
+String STR_SFX_FILTERNAME_ALL
+{
+    Text [ en-US ] = "All files (*.*)" ;
+};
 String RID_SVXSTR_EDITGRFLINK
 {
     Text [ en-US ] = "Link graphics" ;
 };
-
+// i66948 used in project scripting
+String STR_ERRUNOEVENTBINDUNG
+{
+    Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name.";
+};
 String RID_SVXSTR_GRFILTER_OPENERROR
 {
     Text [ en-US ] = "Graphics file cannot be opened" ;
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 10c4a6bc6797..7e775cbbb502 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -60,7 +60,7 @@
 #include "arrdecl.hxx"
 #include <sfx2/app.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/msg.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/progress.hxx>
@@ -69,8 +69,8 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/dispatch.hxx>
-#include "tplpitem.hxx"
-#include "minfitem.hxx"
+#include "sfx2/tplpitem.hxx"
+#include "sfx2/minfitem.hxx"
 #include "app.hrc"
 #include <sfx2/evntconf.hxx>
 #include <sfx2/macrconf.hxx>
@@ -78,8 +78,8 @@
 #include <sfx2/dinfdlg.hxx>
 #include "appdata.hxx"
 #include "appbas.hxx"
-#include "sfxhelp.hxx"
-#include "basmgr.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include "sfx2/basmgr.hxx"
 #include "sorgitm.hxx"
 #include "appbaslib.hxx"
 #include <basic/basicmanagerrepository.hxx>
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index 96c998b2674d..7f4e8cedb637 100644..100755
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -25,6 +25,9 @@
  *
  ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
 #include "appbaslib.hxx"
 
 #include <sfx2/sfxuno.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 0b5e94ea24f0..c876db373d35 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -78,7 +78,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
@@ -91,7 +91,7 @@
 #include <sfx2/macrconf.hxx>
 #include "helper.hxx"   // SfxContentHelper::...
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "shutdownicon.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 38ea69280c49..32b56717293c 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -57,7 +57,7 @@
 #include <sfx2/request.hxx>
 #include "referers.hxx"
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "objshimp.hxx"
 #include <sfx2/appuno.hxx>
 #include "imestatuswindow.hxx"
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 08023c5414a6..2aa19901d87c 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -65,9 +65,6 @@
 #include <rtl/logfile.hxx>
 #include <vcl/edit.hxx>
 
-#ifndef GCC
-#endif
-
 #include <sfx2/unoctitm.hxx>
 #include "app.hrc"
 #include "sfxlocal.hrc"
@@ -81,14 +78,15 @@
 #include <sfx2/mnumgr.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/progress.hxx>
-#include "sfxhelp.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/viewsh.hxx>
 #include "nochaos.hxx"
 #include <sfx2/fcontnr.hxx>
 #include "helper.hxx"   // SfxContentHelper::Kill()
 #include "sfxpicklist.hxx"
+#include <tools/svlibrary.hxx>

 
 #ifdef UNX
 #define stricmp(a,b) strcmp(a,b)
@@ -215,10 +213,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
     {
         bDetermineFunction = true;
 
-        String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-        sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "cui" ) ) );
-
-        rtl::OUString aLibName( sLibName );
+        static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "cui" ) ) );

         oslModule handleMod = osl_loadModuleRelative(
             &thisModule, aLibName.pData, 0 );
 
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index cf097b900b52..546b6b1c6558 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -53,7 +53,7 @@
 #include <sfx2/app.hxx>
 #include "arrdecl.hxx"
 #include <sfx2/dispatch.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/viewsh.hxx>
 #include "intro.hxx"
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 70147e8d9146..94b921f8122e 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -64,12 +64,12 @@
 #include <unotools/moduleoptions.hxx>
 #include <osl/file.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 #include "appdata.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/tbxctrl.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include <sfx2/mnuitem.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 807834ca41a5..0f4c1f651082 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -98,7 +98,7 @@
 #include <sfx2/passwd.hxx>
 #include "referers.hxx"
 #include <sfx2/request.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/viewsh.hxx>
 #include "app.hrc"
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 7399742d1e94..e7d0fd70bf58 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -50,7 +50,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/printer.hxx>
 #include "arrdecl.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/macrconf.hxx>
 #include <sfx2/mnumgr.hxx>
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index addace134362..9fd2dfc696d3 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -36,11 +36,11 @@
 #include <sfx2/app.hxx>
 #include "appdata.hxx"
 #include "arrdecl.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/templdlg.hxx>
 #include "objmnctl.hxx"
 #include "inettbc.hxx"
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include <sfx2/navigat.hxx>
 #include <sfx2/taskpane.hxx>
 #include <sfx2/module.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 439396d2ffa7..c1858c5b33fb 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -28,9 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 #include <com/sun/star/uno/Reference.hxx>
-#ifndef _COM_SUN_STAR_LANG_XMultiServiceFactory_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/frame/DispatchResultEvent.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
@@ -40,9 +38,7 @@
 #include <com/sun/star/frame/XDispatchHelper.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
-#ifndef _COM_SUN_STAR_UTIL_CloseVetoException_HPP_
 #include <com/sun/star/util/CloseVetoException.hpp>
-#endif
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
@@ -118,12 +114,12 @@
 #include <sfx2/sfx.hrc>
 #include "app.hrc"
 #include <sfx2/passwd.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/childwin.hxx>
 #include "appdata.hxx"
 #include <sfx2/macrconf.hxx>
-#include "minfitem.hxx"
+#include "sfx2/minfitem.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -132,7 +128,8 @@
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/dialogs.hrc>
 #include "sorgitm.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include <tools/svlibrary.hxx>

 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -749,9 +746,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 ::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, BOOL bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );

 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
@@ -771,9 +766,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 void MacroOrganizer( INT16 nTabId )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );

 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 8d1ac08844bf..60b684d7385f 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -52,9 +52,7 @@
 #include <basic/sbxobj.hxx>
 #include <basic/sberrors.hxx>
 #include <basic/basmgr.hxx>
-#ifndef _BASIC_SBUNO_HXX
 #include <basic/sbuno.hxx>
-#endif
 
 #include <basic/sbxcore.hxx>
 #include <svl/ownlist.hxx>
@@ -97,6 +95,7 @@
 #include <osl/mutex.hxx>
 #include <comphelper/sequence.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <comphelper/interaction.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ucb;
@@ -106,9 +105,6 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::io;
 
-#ifndef GCC
-#endif
-
 #include "sfxtypes.hxx"
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/app.hxx>
@@ -131,7 +127,7 @@ using namespace ::com::sun::star::io;
 #include "fltoptint.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxbasecontroller.hxx>
-#include "brokenpackageint.hxx"
+#include <sfx2/brokenpackageint.hxx>
 #include "eventsupplier.hxx"
 #include "xpackcreator.hxx"
 #include "plugin.hxx"
@@ -139,7 +135,6 @@ using namespace ::com::sun::star::io;
 #include <ownsubfilterservice.hxx>
 #include "SfxDocumentMetaData.hxx"
 
-
 #define FRAMELOADER_SERVICENAME         "com.sun.star.frame.FrameLoader"
 #define PROTOCOLHANDLER_SERVICENAME     "com.sun.star.frame.ProtocolHandler"
 
@@ -2268,18 +2263,18 @@ RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< ::
     ::rtl::OUString temp;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
     ::com::sun::star::document::FilterOptionsRequest aOptionsRequest( temp,
-                                                                          temp2,
+                                                                      temp2,
                                                                       rModel,
                                                                       rProperties );
 
-        m_aRequest <<= aOptionsRequest;
+    m_aRequest <<= aOptionsRequest;
 
-        m_pAbort  = new ContinuationAbort;
-        m_pOptions = new FilterOptionsContinuation;
+    m_pAbort  = new comphelper::OInteractionAbort;
+    m_pOptions = new FilterOptionsContinuation;
 
-        m_lContinuations.realloc( 2 );
-        m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
-        m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pOptions );
+    m_lContinuations.realloc( 2 );
+    m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
+    m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pOptions );
 }
 
 ::com::sun::star::uno::Any SAL_CALL RequestFilterOptions::getRequest()
@@ -2296,107 +2291,139 @@ RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< ::
 }
 
 //=========================================================================
+class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+    ::com::sun::star::uno::Any m_aRequest;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations;
+    comphelper::OInteractionApprove* m_pApprove;
+    comphelper::OInteractionDisapprove*  m_pDisapprove;
 
-RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName )
+public:
+    RequestPackageReparation_Impl( ::rtl::OUString aName );
+    sal_Bool    isApproved();
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations()
+        throw( ::com::sun::star::uno::RuntimeException );
+};
+
+RequestPackageReparation_Impl::RequestPackageReparation_Impl( ::rtl::OUString aName )
 {
     ::rtl::OUString temp;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
     ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp,
-                                                                                temp2,
-                                                                            aName );
-
-        m_aRequest <<= aBrokenPackageRequest;
+                                                                                 temp2,
+                                                                              aName );
+       m_aRequest <<= aBrokenPackageRequest;
+    m_pApprove = new comphelper::OInteractionApprove;
+    m_pDisapprove = new comphelper::OInteractionDisapprove;
+       m_lContinuations.realloc( 2 );
+       m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pApprove );
+       m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pDisapprove );
+}
 
-        m_pApprove = new ContinuationApprove;
-        m_pDisapprove = new ContinuationDisapprove;
+sal_Bool RequestPackageReparation_Impl::isApproved()
+{
+    return m_pApprove->wasSelected();
+}
 
-        m_lContinuations.realloc( 2 );
-        m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pApprove );
-        m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pDisapprove );
+::com::sun::star::uno::Any SAL_CALL RequestPackageReparation_Impl::getRequest()
+        throw( ::com::sun::star::uno::RuntimeException )
+{
+    return m_aRequest;
 }
 
-/*uno::*/Any SAL_CALL RequestPackageReparation::queryInterface( const /*uno::*/Type& rType ) throw (RuntimeException)
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
+    SAL_CALL RequestPackageReparation_Impl::getContinuations()
+        throw( ::com::sun::star::uno::RuntimeException )
 {
-    return ::cppu::queryInterface ( rType,
-            // OWeakObject interfaces
-            dynamic_cast< XInterface* > ( (XInteractionRequest *) this ),
-            static_cast< XWeak* > ( this ),
-            // my own interfaces
-            static_cast< XInteractionRequest*  > ( this ) );
+    return m_lContinuations;
 }
 
-void SAL_CALL RequestPackageReparation::acquire(  ) throw ()
+RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName )
 {
-    OWeakObject::acquire();
+    pImp = new RequestPackageReparation_Impl( aName );
+    pImp->acquire();
 }
 
-void SAL_CALL RequestPackageReparation::release(  ) throw ()
+RequestPackageReparation::~RequestPackageReparation()
 {
-    OWeakObject::release();
+    pImp->release();
 }
 
-::com::sun::star::uno::Any SAL_CALL RequestPackageReparation::getRequest()
-        throw( ::com::sun::star::uno::RuntimeException )
+sal_Bool RequestPackageReparation::isApproved()
 {
-    return m_aRequest;
+    return pImp->isApproved();
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
-    SAL_CALL RequestPackageReparation::getContinuations()
-        throw( ::com::sun::star::uno::RuntimeException )
+com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > RequestPackageReparation::GetRequest()
 {
-    return m_lContinuations;
+    return com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >(pImp);
 }
 
 //=========================================================================
+class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+    ::com::sun::star::uno::Any m_aRequest;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations;
+    comphelper::OInteractionAbort*  m_pAbort;
 
-NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName )
+public:
+    NotifyBrokenPackage_Impl( ::rtl::OUString aName );
+    sal_Bool    isAborted();
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations()
+        throw( ::com::sun::star::uno::RuntimeException );
+};
+
+NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( ::rtl::OUString aName )
 {
     ::rtl::OUString temp;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
     ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp,
-                                                                                temp2,
-                                                                            aName );
-
-        m_aRequest <<= aBrokenPackageRequest;
-
-        m_pAbort  = new ContinuationAbort;
+                                                                                 temp2,
+                                                                              aName );
+       m_aRequest <<= aBrokenPackageRequest;
+    m_pAbort  = new comphelper::OInteractionAbort;
+       m_lContinuations.realloc( 1 );
+       m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
+}
 
-        m_lContinuations.realloc( 1 );
-        m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
+sal_Bool NotifyBrokenPackage_Impl::isAborted()
+{
+    return m_pAbort->wasSelected();
 }
 
-/*uno::*/Any SAL_CALL NotifyBrokenPackage::queryInterface( const /*uno::*/Type& rType ) throw (RuntimeException)
+::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage_Impl::getRequest()
+        throw( ::com::sun::star::uno::RuntimeException )
 {
-    return ::cppu::queryInterface ( rType,
-            // OWeakObject interfaces
-            dynamic_cast< XInterface* > ( (XInteractionRequest *) this ),
-            static_cast< XWeak* > ( this ),
-            // my own interfaces
-            static_cast< XInteractionRequest*  > ( this ) );
+    return m_aRequest;
 }
 
-void SAL_CALL NotifyBrokenPackage::acquire(  ) throw ()
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
+    SAL_CALL NotifyBrokenPackage_Impl::getContinuations()
+        throw( ::com::sun::star::uno::RuntimeException )
 {
-    OWeakObject::acquire();
+    return m_lContinuations;
 }
 
-void SAL_CALL NotifyBrokenPackage::release(  ) throw ()
+NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName )
 {
-    OWeakObject::release();
+    pImp = new NotifyBrokenPackage_Impl( aName );
+    pImp->acquire();
 }
 
-::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage::getRequest()
-        throw( ::com::sun::star::uno::RuntimeException )
+NotifyBrokenPackage::~NotifyBrokenPackage()
 {
-    return m_aRequest;
+    pImp->release();
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
-    SAL_CALL NotifyBrokenPackage::getContinuations()
-        throw( ::com::sun::star::uno::RuntimeException )
+sal_Bool NotifyBrokenPackage::isAborted()
 {
-    return m_lContinuations;
+    return pImp->isAborted();
 }
 
+com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > NotifyBrokenPackage::GetRequest()
+{
+    return com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >(pImp);
+}
 
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 294d6ef17da5..cb53305e4b01 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -48,7 +48,7 @@
 #include <comphelper/processfactory.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/opengrf.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "fileobj.hxx"
 #include "app.hrc"
 
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 3b26eae1858d..b9f4404d5555 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
@@ -41,7 +41,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/logfile.hxx>
 
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 20b7abb5d087..479e8ddea745 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -45,7 +45,7 @@
 #include "dde.hrc"
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/linkmgr.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index ce69ba225157..934b4051a638 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -50,7 +50,7 @@
 #include "fileobj.hxx"
 #include "impldde.hxx"
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 314832e2249d..6a51783a8a04 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <vcl/svapp.hxx>
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/filedlghelper.hxx>
 #include <tools/debug.hxx>
 #include <svl/svdde.hxx>
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk
deleted file mode 100644
index 30f74355077a..000000000000
--- a/sfx2/source/appl/makefile.mk
+++ /dev/null
@@ -1,158 +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=sfx2
-TARGET=appl
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# w.g. compilerbugs
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-CFLAGS+=-Od
-CFLAGS+=-DENABLE_QUICKSTART_APPLET
-.ENDIF
-.ENDIF
-
-.IF "$(GUIBASE)"=="aqua"
-CFLAGS+=-DENABLE_QUICKSTART_APPLET
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-        CDEFS+=-DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST)
-.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-        PKGCONFIG_MODULES=gtk+-2.0
-        .INCLUDE: pkg_config.mk
-        CFLAGS+=$(PKGCONFIG_CFLAGS)
-        CFLAGS+=-DENABLE_QUICKSTART_APPLET
-        CDEFS+=-DPLUGIN_NAME=libqstart_gtk$(DLLPOSTFIX)$(DLLPOST)
-.ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-.ELSE
-        CDEFS+=-DDLL_NAME=sfx$(DLLPOSTFIX)$(DLLPOST)
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=appl
-SRC1FILES =  \
-        app.src newhelp.src dde.src
-
-SRS2NAME=sfx
-SRC2FILES =  \
-        sfx.src
-
-SFX_OBJECTS = \
-    $(SLO)$/app.obj \
-    $(SLO)$/appbas.obj \
-    $(SLO)$/appcfg.obj \
-    $(SLO)$/appchild.obj \
-    $(SLO)$/appdata.obj \
-    $(SLO)$/appdde.obj \
-    $(SLO)$/appinit.obj \
-        $(SLO)$/appmain.obj \
-    $(SLO)$/appmisc.obj \
-    $(SLO)$/appopen.obj \
-    $(SLO)$/appquit.obj \
-    $(SLO)$/appreg.obj \
-    $(SLO)$/appserv.obj \
-    $(SLO)$/appuno.obj \
-    $(SLO)$/appbaslib.obj \
-    $(SLO)$/childwin.obj \
-    $(SLO)$/fileobj.obj			\
-    $(SLO)$/helpdispatch.obj \
-    $(SLO)$/helpinterceptor.obj \
-    $(SLO)$/imagemgr.obj\
-        $(SLO)$/imestatuswindow.obj \
-        $(SLO)$/impldde.obj \
-        $(SLO)$/linkmgr2.obj \
-        $(SLO)$/linksrc.obj \
-        $(SLO)$/lnkbase2.obj \
-    $(SLO)$/module.obj \
-    $(SLO)$/newhelp.obj \
-    $(SLO)$/opengrf.obj			\
-    $(SLO)$/sfxhelp.obj \
-    $(SLO)$/sfxpicklist.obj \
-    $(SLO)$/shutdownicon.obj \
-    $(SLO)$/shutdowniconw32.obj \
-    $(SLO)$/workwin.obj \
-        $(SLO)$/xpackcreator.obj \
-    $(SLO)$/fwkhelper.obj
-
-.IF "$(GUI)"=="OS2"
-SFX_OBJECTS +=  $(SLO)$/shutdowniconOs2.obj
-.ENDIF
-
-.IF "$(GUIBASE)"=="aqua"
-SFX_OBJECTS += $(SLO)$/shutdowniconaqua.obj
-.ENDIF
-
-SLOFILES = $(SFX_OBJECTS)
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1OBJFILES= $(SFX_OBJECTS)
-
-.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-QUICKSTART_OBJECTS = $(SLO)$/shutdowniconunx.obj
-SLOFILES += $(QUICKSTART_OBJECTS)
-
-LIB2TARGET= $(SLB)$/quickstart.lib
-LIB2OBJFILES= $(QUICKSTART_OBJECTS)
-.ENDIF
-
-.IF "$(GUI)"=="OS2"
-SLOFILES +=  $(SLO)$/shutdowniconOs2.obj
-.ENDIF
-
-EXCEPTIONSFILES=\
-    $(SLO)$/imagemgr.obj		\
-    $(SLO)$/appopen.obj \
-    $(SLO)$/appmain.obj			\
-    $(SLO)$/appmisc.obj			\
-    $(SLO)$/appinit.obj			\
-    $(SLO)$/appcfg.obj			\
-    $(SLO)$/fileobj.obj			\
-    $(SLO)$/helpinterceptor.obj	\
-    $(SLO)$/newhelp.obj			\
-    $(SLO)$/opengrf.obj			\
-    $(SLO)$/sfxhelp.obj			\
-    $(SLO)$/shutdownicon.obj	\
-    $(SLO)$/shutdowniconw32.obj \
-    $(SLO)$/sfxpicklist.obj		\
-    $(SLO)$/helpdispatch.obj	\
-    $(SLO)$/xpackcreator.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 895263ef4783..ba91d9c1117b 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -38,10 +38,10 @@
 #include <sfx2/module.hxx>
 #include <sfx2/app.hxx>
 #include "arrdecl.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/tbxctrl.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include <sfx2/mnuitem.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/mnumgr.hxx>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 1d79b89a776d..96f4c6b91f5b 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -30,16 +30,16 @@
 
 #include "newhelp.hxx"
 #include <sfx2/sfxuno.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "helpinterceptor.hxx"
 #include "helper.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/app.hxx>
 #include "sfxtypes.hxx"
 #include "panelist.hxx"
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include "srchdlg.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 
 #include "app.hrc"
 #include "newhelp.hrc"
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index fd2043a9a431..328bca2522b5 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -54,7 +54,7 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/opengrf.hxx>
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 //-----------------------------------------------------------------------------
 
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 7d4bb0db1726..c3b734e327de 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -27,107 +27,16 @@
 
 #include <sfx2/sfx.hrc>
 
-String STR_NONAME
-{
-    Text [ en-US ] = "Untitled" ;
-};
-
-String STR_NONE
-{
-    Text [ en-US ] = "- None -" ;
-};
-
-String STR_CLOSE
-{
-    Text [ en-US ] = "Close" ;
-};
-
-String STR_STYLE_FILTER_AUTO
-{
-    Text [ en-US ] = "Automatic" ;
-};
-
 String STR_STYLE_FILTER_USED
 {
     Text [ en-US ] = "Applied Styles" ;
 };
-
-
-
 String STR_STYLE_FILTER_USERDEF
 {
     Text [ en-US ] = "Custom Styles" ;
 };
-
 String STR_STYLE_FILTER_ALL
 {
     Text [ en-US ] = "All Styles" ;
 };
 
-String STR_STANDARD
-{
-    Text [ en-US ] = "Standard" ;
-};
-String STR_STANDARD_SHORTCUT
-{
-    Text [ en-US ] = "Standard" ;
-};
-
-String STR_SFX_FILTERNAME_ALL
-{
-    Text [ en-US ] = "All files (*.*)" ;
-};
-
-String STR_BYTES
-{
-    Text [ en-US ] = "Bytes" ;
-};
-
-String STR_KB
-{
-    Text [ en-US ] = "KB" ;
-};
-
-String STR_MB
-{
-    Text [ en-US ] = "MB" ;
-};
-
-
-String STR_GB
-{
-    Text [ en-US ] = "GB" ;
-};
-
-String STR_UNDO
-{
-    Text [ en-US ] = "Undo: " ;
-};
-
-String STR_REDO
-{
-    Text [ en-US ] = "Re~do: " ;
-};
-
-String STR_REPEAT
-{
-    Text [ en-US ] = "~Repeat: " ;
-};
-
-String RID_STR_NEW_TASK
-{
-    Text [ en-US ] = "New task";
-};
-QueryBox MSG_QUERY_LASTVERSION
-{
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_NO ;
-    Message [ en-US ] = "Cancel all changes?" ;
-};
-
-// i66948 used in project scripting
-String STR_ERRUNOEVENTBINDUNG
-{
-    Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name.";
-};
-
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index a12ced237f55..bab37281cb05 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -28,7 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
+
 #include <set>
 #include <algorithm>
 #include <com/sun/star/uno/Reference.h>
@@ -70,7 +71,9 @@
 #include <svl/svstdarr.hxx>
 
 #include "newhelp.hxx"
-#include "sfxresid.hxx"
+#include <sfx2/objsh.hxx>
+#include <sfx2/docfac.hxx>
+#include "sfx2/sfxresid.hxx"
 #include "helper.hxx"
 #include "app.hrc"
 #include <sfx2/sfxuno.hxx>
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 3fce25e7e0d6..3c323b05fd72 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -69,7 +69,7 @@
 #endif
 #include <vcl/timer.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
@@ -80,7 +80,11 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::vos;
+#ifdef WNT
+using ::rtl::OUString;
+#else
 using namespace ::rtl;
+#endif
 using namespace ::sfx2;
 
 #ifdef ENABLE_QUICKSTART_APPLET
@@ -89,6 +93,10 @@ extern "C" { static void SAL_CALL thisModule() {} }
 # endif
 #endif
 
+#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK)
+#define PLUGIN_NAME "libqstart_gtkli.so"
+#endif
+
 class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener >
 {
 public:
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index f9a388deee5c..2224643bc88f 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -47,7 +47,7 @@
 #include <sfx2/viewsh.hxx>
 #include "splitwin.hxx"
 #include <sfx2/msgpool.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>      // SFX_ITEMSET_SET
 #include <vcl/taskpanelist.hxx>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index d11b8b5130ed..12f824ea4255 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -110,7 +110,7 @@ using namespace ::vos;
 #include <svtools/sfxecode.hxx>
 #include <unotools/syslocale.hxx>
 
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "sfxbasic.hxx"
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
@@ -120,7 +120,7 @@ using namespace ::vos;
 #include <sfx2/progress.hxx>
 #include "openflag.hxx"
 #include "bastyp.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/doctempl.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index df81eb3f4039..e17151c6e322 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -46,7 +46,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfx.hrc>
 #include "bastyp.hrc"
diff --git a/sfx2/source/bastyp/makefile.mk b/sfx2/source/bastyp/makefile.mk
deleted file mode 100644
index 75c0cace40d6..000000000000
--- a/sfx2/source/bastyp/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=sfx2
-TARGET=bastyp
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
-        $(SLO)$/sfxhtml.obj				\
-        $(SLO)$/frmhtml.obj				\
-        $(SLO)$/frmhtmlw.obj				\
-        $(SLO)$/misc.obj				\
-        $(SLO)$/progress.obj			\
-        $(SLO)$/sfxresid.obj			\
-        $(SLO)$/bitset.obj				\
-        $(SLO)$/minarray.obj			\
-        $(SLO)$/fltfnc.obj				\
-        $(SLO)$/mieclip.obj				\
-        $(SLO)$/fltlst.obj				\
-        $(SLO)$/helper.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        fltfnc.src	\
-                bastyp.src
-
-EXCEPTIONSFILES =\
-    $(SLO)$/helper.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index ee2b15d34ab9..4154ddc6301b 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -33,7 +33,7 @@
 #include <sot/storage.hxx>
 #include <sot/formats.hxx>
 
-#include <mieclip.hxx>
+#include <sfx2/mieclip.hxx>
 #include <sfx2/sfxuno.hxx>
 
 MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj()
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 3af0ba2b0a6f..9650c8155d84 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -51,7 +51,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/docfile.hxx>
 #include "workwin.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "bastyp.hrc"
 #include <sfx2/msg.hxx>
 
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 11ab5a724099..cf1cd983f76e 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -32,7 +32,7 @@
 #endif
 #include <tools/simplerm.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 
 // -----------------------------------------------------------------------
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 9935c3a18c8b..8da7e4f10ce1 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -28,35 +28,27 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 #include <vcl/msgbox.hxx>
-#ifndef _SV_RESARY_HXX
 #include <tools/resary.hxx>
-#endif
 #include <svl/lstner.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <tools/urlobj.hxx>
 #include <basic/sbx.hxx>
-
-#include <sot/storage.hxx>
+    #include <sot/storage.hxx>
 #include <unotools/securityoptions.hxx>
 
-#ifndef _RTL_USTRING_
 #include <rtl/ustring.h>
-#endif
-
 #include <com/sun/star/uno/Any.hxx>
 #include <framework/eventsconfiguration.hxx>
 #include <comphelper/processfactory.hxx>
-
 #include <sfx2/evntconf.hxx>
-
 #include <sfx2/macrconf.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/dispatch.hxx>
 #include "config.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "eventsupplier.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 444be02127b3..c08d713547a0 100644..100755
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -57,7 +57,7 @@
 
 // wg. nAutoPageID
 #include "appdata.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/minstack.hxx>
 #include <sfx2/msg.hxx>
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index 9e8657ae0c82..079c7180ac1a 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -59,8 +59,8 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/dispatch.hxx>
-#include "minfitem.hxx"
-#include "imgmgr.hxx"
+#include "sfx2/minfitem.hxx"
+#include "sfx2/imgmgr.hxx"
 #include <sfx2/evntconf.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/genlink.hxx>
diff --git a/sfx2/source/control/makefile.mk b/sfx2/source/control/makefile.mk
deleted file mode 100644
index 86797589e3aa..000000000000
--- a/sfx2/source/control/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=sfx2
-TARGET=control
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# w.g. compilerbugs
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-CFLAGS+=-Od
-.ENDIF
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-CFLAGS+=-O0
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/bindings.obj \
-    $(SLO)$/ctrlitem.obj \
-    $(SLO)$/dispatch.obj \
-    $(SLO)$/macrconf.obj \
-        $(SLO)$/macro.obj \
-    $(SLO)$/minfitem.obj \
-    $(SLO)$/msg.obj \
-       $(SLO)$/msgpool.obj \
-       $(SLO)$/objface.obj \
-    $(SLO)$/querystatus.obj \
-    $(SLO)$/request.obj \
-        $(SLO)$/sfxstatuslistener.obj \
-    $(SLO)$/shell.obj \
-    $(SLO)$/sorgitm.obj \
-    $(SLO)$/statcach.obj \
-        $(SLO)$/unoctitm.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx
index 0c0c0124b612..b0cdd58d2645 100644
--- a/sfx2/source/control/minfitem.cxx
+++ b/sfx2/source/control/minfitem.cxx
@@ -30,10 +30,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#ifndef GCC
-#endif
-
-#include "minfitem.hxx"
+#include "sfx2/minfitem.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index f1abd25a5413..10359ba20f73 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -41,7 +41,7 @@
 #include <sfx2/objface.hxx>
 #include "sfxtypes.hxx"
 #include <sfx2/macrconf.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/module.hxx>
 
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 0692b99b8adb..d0ce2abae773 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/msgpool.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/minarray.hxx>
 #include <sfx2/objsh.hxx>
 
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 8688740ce0fb..bee4a5c87675 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index f6bb2b2c3004..c2cf5f164e7c 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -50,7 +50,7 @@
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/msgpool.hxx>
 
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e53f1766b7b9..f85d0d8e9e49 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -463,7 +463,7 @@ void SfxOfficeDispatch::SetMasterUnoCommand( sal_Bool bSet )
 sal_Bool SfxOfficeDispatch::IsMasterUnoCommand() const
 {
     if ( pControllerItem )
-        pControllerItem->isMasterSlaveCommand();
+        return pControllerItem->isMasterSlaveCommand();
     return sal_False;
 }
 
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 7d868eb97362..ea7b0a2bb0bd 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -29,7 +29,6 @@
 #include "precompiled_sfx2.hxx"
 
 // include ---------------------------------------------------------------
-#include <aboutbmpnames.hxx>
 
 #ifndef _SV_APP_HXX
 #include <vcl/svapp.hxx>
@@ -114,7 +113,7 @@ Image SfxApplication::GetApplicationLogo()
 {
     Image aAppLogo;
 
-    rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( ABOUT_BITMAP_STRINGLIST ) );
+    rtl::OUString aAbouts;
     bool bLoaded = false;
     sal_Int32 nIndex = 0;
     do
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 6fd765dcb616..13a0433b7be5 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include "alienwarn.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 
 #include "alienwarn.hrc"
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index df1f13155513..5a7f8a1fd900 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -47,9 +47,9 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewsh.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "workwin.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "dialog.hrc"
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx
index 85f9f955e355..5c250f7cc912 100644
--- a/sfx2/source/dialog/dinfedt.cxx
+++ b/sfx2/source/dialog/dinfedt.cxx
@@ -31,8 +31,8 @@
 #ifndef GCC
 #endif
 
-#include "dinfedt.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/dinfedt.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include <sfx2/sfx.hrc>
 #include "dinfedt.hrc"
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 0864b0e18c2b..4f55dfde21a7 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -44,7 +44,7 @@
 #include "workwin.hxx"
 #include "splitwin.hxx"
 #include <sfx2/viewsh.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/msgpool.hxx>
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 5045f1e9d75c..c3624f50191a 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -91,7 +91,7 @@
 #include <sfx2/docfac.hxx>
 #include "openflag.hxx"
 #include <sfx2/passwd.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxsids.hrc>
 #include "filedlghelper.hrc"
 #include "filtergrouping.hxx"
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index ea2429be8157..ab75d777c5ff 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -32,7 +32,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/docfac.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <osl/thread.h>
 #include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index dfd099f6cf45..8c05fa424263 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -47,9 +47,7 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/security/CertificateValidity.hpp>
-#ifndef _COM_SUN_STAR_SECURITY_DOCUMENTSIGNATURESINFORMATION_HPP_
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
-#endif
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -57,15 +55,15 @@
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/document/XExporter.hpp>
-
+#include <rtl/textenc.h>
 #include <rtl/uri.h>
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <mailmodelapi.hxx>
+#include <sfx2/mailmodelapi.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxsids.hrc>
 #include "dialog.hrc"
 
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
deleted file mode 100644
index 223807d37b11..000000000000
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ /dev/null
@@ -1,693 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-// includes --------------------------------------------------------------
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/mozilla/XPluginInstance.hpp>
-#include <com/sun/star/ucb/XDataContainer.hpp>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
-#include <com/sun/star/system/SimpleMailClientFlags.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
-#ifndef _RTL_TEXTENC_H
-#include <rtl/textench.h>
-#endif
-#include <vos/mutex.hxx>
-#include <rtl/uri.h>
-#include <rtl/uri.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <unotools/streamhelper.hxx>
-#include <unotools/configitem.hxx>
-#include <comphelper/mediadescriptor.hxx>
-#include <vos/thread.hxx>
-#include <vcl/msgbox.hxx>
-
-#include "mailmodelapi.hxx"
-#include <sfx2/docfilt.hxx>
-#include <sfx2/docfac.hxx>
-#include "sfxtypes.hxx"
-
-#include "dialog.hrc"
-#include "sfxresid.hxx"
-#include <sfx2/sfxuno.hxx>
-#include <sfx2/fcontnr.hxx>
-#include "guisaveas.hxx"
-
-#include <unotools/tempfile.hxx>
-#include <vcl/svapp.hxx>
-#include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <unotools/useroptions.hxx>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/extract.hxx>
-#include <ucbhelper/content.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/urlobj.hxx>
-
-// --------------------------------------------------------------
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::mozilla;
-using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::system;
-using namespace ::rtl;
-
-namespace
-{
-    // functions -------------------------------------------------------------
-
-    BOOL CreateFromAddress_Impl( String& rFrom )
-
-    /*  [Beschreibung]
-
-        Diese Funktion versucht mit Hilfe des IniManagers eine From-Adresse
-        zu erzeugen. daf"ur werden die Felder 'Vorname', 'Name' und 'EMail'
-        aus der Applikations-Ini-Datei ausgelesen. Sollten diese Felder
-        nicht gesetzt sein, wird FALSE zur"uckgegeben.
-
-        [R"uckgabewert]
-
-        TRUE:   Adresse konnte erzeugt werden.
-        FALSE:  Adresse konnte nicht erzeugt werden.
-    */
-
-    {
-        SvtUserOptions aUserCFG;
-        String aName        = aUserCFG.GetLastName  ();
-        String aFirstName   = aUserCFG.GetFirstName ();
-        if ( aFirstName.Len() || aName.Len() )
-        {
-            if ( aFirstName.Len() )
-            {
-                rFrom = TRIM( aFirstName );
-
-                if ( aName.Len() )
-                    rFrom += ' ';
-            }
-            rFrom += TRIM( aName );
-            // unerlaubte Zeichen entfernen
-            rFrom.EraseAllChars( '<' );
-            rFrom.EraseAllChars( '>' );
-            rFrom.EraseAllChars( '@' );
-        }
-        String aEmailName = aUserCFG.GetEmail();
-        // unerlaubte Zeichen entfernen
-        aEmailName.EraseAllChars( '<' );
-        aEmailName.EraseAllChars( '>' );
-
-        if ( aEmailName.Len() )
-        {
-            if ( rFrom.Len() )
-                rFrom += ' ';
-            ( ( rFrom += '<' ) += TRIM( aEmailName ) ) += '>';
-        }
-        else
-            rFrom.Erase();
-        return ( rFrom.Len() > 0 );
-    }
-
-}
-
-// class OThread
-class OMailSendThreadImpl : public ::vos::OThread
-{
-    public:
-        OMailSendThreadImpl(
-                Reference< XSimpleMailClient > xSimpleMailClient,
-                Reference< XSimpleMailMessage > xSimpleMailMessage,
-                const Reference< XFrame >&  _xCurrentFrame,
-                long nSendFlags ) :
-            m_nSendFlags( nSendFlags ),
-            m_bSend( sal_False ),
-            m_xSimpleMailClient( xSimpleMailClient ),
-            m_xSimpleMailMessage( xSimpleMailMessage ),
-            m_xCurrentFrame(_xCurrentFrame) {}
-
-        virtual ~OMailSendThreadImpl();
-
-        virtual void SAL_CALL run();
-        virtual void SAL_CALL onTerminated();
-
-    private:
-        long        m_nSendFlags;
-        sal_Bool    m_bSend;
-        Reference< XSimpleMailClient > m_xSimpleMailClient;
-        Reference< XSimpleMailMessage > m_xSimpleMailMessage;
-        Reference< XFrame > m_xCurrentFrame;
-};
-
-OMailSendThreadImpl::~OMailSendThreadImpl()
-{
-}
-
-void SAL_CALL OMailSendThreadImpl::run()
-{
-    try
-    {
-        m_xSimpleMailClient->sendSimpleMailMessage( m_xSimpleMailMessage, m_nSendFlags );
-        m_bSend = sal_True;
-    }
-    catch ( IllegalArgumentException& )
-    {
-        m_bSend = sal_False;
-    }
-    catch ( Exception& )
-    {
-        m_bSend = sal_False;
-    }
-
-    if ( m_bSend == sal_False )
-    {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
-        Reference< ::com::sun::star::awt::XWindow > xParentWindow = m_xCurrentFrame->getContainerWindow();
-        Window*                                     pParentWindow = VCLUnoHelper::GetWindow( xParentWindow );
-
-        ErrorBox aBox( pParentWindow, SfxResId( RID_ERRBOX_MAIL_CONFIG ));
-        aBox.Execute();
-    }
-}
-
-void SAL_CALL OMailSendThreadImpl::onTerminated()
-{
-    delete this;
-}
-
-// class AddressList_Impl ------------------------------------------------
-
-typedef String* AddressItemPtr_Impl;
-DECLARE_LIST( AddressList_Impl, AddressItemPtr_Impl )
-
-// class SfxMailModel -----------------------------------------------
-
-void SfxMailModel::ClearList( AddressList_Impl* pList )
-{
-    if ( pList )
-    {
-        ULONG i, nCount = pList->Count();
-        for ( i = 0; i < nCount; ++i )
-            delete pList->GetObject(i);
-        pList->Clear();
-    }
-}
-
-void SfxMailModel::MakeValueList( AddressList_Impl* pList, String& rValueList )
-{
-    rValueList.Erase();
-    if ( pList )
-    {
-        ULONG i, nCount = pList->Count();
-        for ( i = 0; i < nCount; ++i )
-        {
-            if ( rValueList.Len() > 0 )
-                rValueList += ',';
-            rValueList += *pList->GetObject(i);
-        }
-    }
-}
-namespace
-{
-    String lcl_getFactoryName(const Reference<XInterface>& _xModel)
-    {
-        rtl::OUString sModuleIdentifier;
-        rtl::OUString sFactoryShortName;
-        Reference < XModuleManager > xModuleManager( ::comphelper::getProcessServiceFactory()->createInstance(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager")) ), UNO_QUERY );
-
-        if ( _xModel.is() )
-        {
-            try
-            {
-                sModuleIdentifier = xModuleManager->identify( _xModel );
-            }
-            catch ( ::com::sun::star::frame::UnknownModuleException& )
-            {
-                DBG_WARNING( "SfxHelp::GetHelpModuleName_Impl(): unknown module (help in help?)" );
-            }
-            catch ( Exception& )
-            {
-                DBG_ERRORFILE( "SfxHelp::GetHelpModuleName_Impl(): exception of XModuleManager::identif        y()" );
-            }
-        }
-
-        return sModuleIdentifier;
-    }
-
-    String lcl_createTempFileName(const Reference < XModel >& _xModel,const ::rtl::OUString& _sAttachmentTitle)
-    {
-    // create temp file name with leading chars and extension
-        Reference < XStorable > xStor( _xModel, UNO_QUERY );
-        String      aLeadingStr;
-        if ( xStor.is() )
-        {
-            sal_Bool    bHasName = xStor->hasLocation();
-
-            if ( !bHasName )
-            {
-                if ( _sAttachmentTitle.getLength() )
-                    aLeadingStr = _sAttachmentTitle;
-                else
-                    aLeadingStr = String( DEFINE_CONST_UNICODE("noname") );
-            }
-            else
-            {
-                INetURLObject aFileObj(_xModel->getURL());
-                if ( aFileObj.hasExtension() )
-                {
-                    aFileObj.removeExtension();
-                    if ( _sAttachmentTitle.getLength() )
-                        aLeadingStr = _sAttachmentTitle;
-                    else
-                        aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
-                    aLeadingStr += String::CreateFromAscii( "_" );
-                }
-                else
-                {
-                    if ( _sAttachmentTitle.getLength() )
-                        aLeadingStr = _sAttachmentTitle;
-                    else
-                        aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
-                    aLeadingStr += String::CreateFromAscii( "_" );
-                }
-            }
-        }
-        return aLeadingStr;
-    }
-
-}
-SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAttachmentTitle
-                                    , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _xModel
-                                    , String& rFileName)
-{
-    SaveResult          eRet = SAVE_CANCELLED;
-    try
-    {
-        Reference<XModifiable> xMod(_xModel,UNO_QUERY);
-
-        // save the document
-        if ( xMod.is() )
-        {
-            // detect filter
-            const SfxFilter* pFilter = SfxFilter::GetDefaultFilter(lcl_getFactoryName(_xModel));
-//          sal_Bool bHasFilter = pFilter != NULL;
-
-            sal_Bool bRet = sal_False;
-            // create temp file name with leading chars and extension
-            Reference < XStorable > xStor( _xModel, UNO_QUERY );
-            if ( xStor.is() )
-            {
-                String*     pExt = NULL;
-                INetURLObject aFileObj(_xModel->getURL());
-                if ( aFileObj.hasExtension() )
-                    pExt = new String( String::CreateFromAscii( "." ) + (OUString) aFileObj.getExtension() );
-
-                String aLeadingStr = lcl_createTempFileName(_xModel,_sAttachmentTitle);
-
-                if ( pFilter && !pExt )
-                {
-                    pExt = new String( pFilter->GetWildcard()().GetToken(0) );
-                    // erase the '*' from the extension (e.g. "*.sdw")
-                    pExt->Erase( 0, 1 );
-                }
-
-                {
-                    ::utl::TempFile aTempFile( aLeadingStr, pExt );
-                    rFileName = aTempFile.GetURL();
-                }
-                delete pExt;
-                // save document to temp file
-
-                // save document to temp file
-                Sequence < PropertyValue > aArgs( _xModel->getArgs() );
-                ::comphelper::MediaDescriptor aMedia(aArgs);
-
-                if ( pFilter )
-                {
-                    ::rtl::OUString sFilter(pFilter->GetFilterName());
-                    ::rtl::OUString sFilterName(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
-                    if ( !aMedia.createItemIfMissing(sFilterName,sFilter) )
-                        aMedia[sFilterName] <<= sFilter;
-                }
-
-                ::rtl::OUString sURL(RTL_CONSTASCII_USTRINGPARAM("URL"));
-                if ( !aMedia.createItemIfMissing(sURL,::rtl::OUString(rFileName)) )
-                    aMedia[sURL] <<= ::rtl::OUString(rFileName);
-
-                ::rtl::OUString sSaveTo(RTL_CONSTASCII_USTRINGPARAM("SaveTo"));
-                if ( !aMedia.createItemIfMissing(sSaveTo,sal_True) )
-                    aMedia[sSaveTo] <<= sal_True;
-
-                ::rtl::OUString sReadOnly(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
-                if ( !aMedia.createItemIfMissing(sReadOnly,sal_False) )
-                    aMedia[sReadOnly] <<= sal_False;
-
-                aMedia >> aArgs;
-
-                try
-                {
-                    Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
-                    SfxStoringHelper aHelper(xMgr);
-                    aHelper.GUIStoreModel(_xModel,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveAs")),aArgs, sal_False, ::rtl::OUString() );
-                    //  xStor->storeToURL(rFileName,aArgs);
-                    bRet = sal_True;
-                }
-                catch(Exception&)
-                {
-                }
-            }
-
-            // restore old settings
-/* TODO
-            if ( !bModified && xDocShell->IsEnableSetModified() )
-                xDocShell->SetModified( FALSE );
-*/
-            eRet = bRet ? SAVE_SUCCESSFULL : SAVE_ERROR;
-        }
-    }
-    catch(Exception&)
-    {
-        OSL_ENSURE(0,"Exception catched!");
-    }
-
-    return eRet;
-}
-SfxMailModel::SaveResult SfxMailModel::SaveDocAsPDF( const ::rtl::OUString& _sAttachmentTitle
-                                    , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _xModel
-                                    , String& rFileName)
-{
-    SaveResult eRet = SAVE_CANCELLED;
-    try
-    {
-        Reference<XModifiable> xMod(_xModel,UNO_QUERY);
-
-        // save the document
-        if ( xMod.is() )
-        {
-            // Get PDF Filter from document
-            ::rtl::OUString sPDFMediaType(RTL_CONSTASCII_USTRINGPARAM("application/pdf"));
-
-            sal_Bool bRet = sal_False;
-            // create temp file name with leading chars and extension
-            Reference < XStorable > xStor( _xModel, UNO_QUERY );
-            if ( xStor.is() )
-            {
-                String aLeadingStr = lcl_createTempFileName(_xModel,_sAttachmentTitle);
-                String aPDFExtension = String::CreateFromAscii( ".pdf" );
-                ::utl::TempFile aTempFile( aLeadingStr, &aPDFExtension );
-
-                rFileName = aTempFile.GetURL();
-
-                // save document to temp file
-                Sequence < PropertyValue > aArgs( _xModel->getArgs() );
-                ::comphelper::MediaDescriptor aMedia(aArgs);
-
-                ::rtl::OUString sMediaType(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
-                if ( !aMedia.createItemIfMissing(sMediaType,sPDFMediaType) )
-                    aMedia[sMediaType] <<= sPDFMediaType;
-
-                ::rtl::OUString sURL(RTL_CONSTASCII_USTRINGPARAM("URL"));
-                if ( !aMedia.createItemIfMissing(sURL,::rtl::OUString(rFileName)) )
-                    aMedia[sURL] <<= ::rtl::OUString(rFileName);
-                aMedia >> aArgs;
-
-                try
-                {
-                    Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
-                    SfxStoringHelper aHelper(xMgr);
-                    aHelper.GUIStoreModel(_xModel,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExportToPDF")),aArgs, sal_False, ::rtl::OUString);
-                    //  xStor->storeToURL(rFileName,aArgs);
-                    bRet = sal_True;
-                }
-                catch(Exception&)
-                {
-                }
-
-                eRet = bRet ? SAVE_SUCCESSFULL : SAVE_CANCELLED;
-
-                // restore old settings
-                /* TODO
-                if ( !bModified && xDocShell->IsEnableSetModified() )
-                    xDocShell->SetModified( FALSE );
-                */
-            }
-        }
-    }
-    catch(Exception&)
-    {
-        OSL_ENSURE(0,"Exception catched!");
-    }
-
-    return eRet;
-}
-// -----------------------------------------------------------------------------
-SfxMailModel::SendMailResult SfxMailModel::AttachDocument(   MailDocType _eMailDocType
-                                    , const Reference< XModel >& _xModel
-                                    , const ::rtl::OUString& _sAttachmentTitle)
-{
-    SaveResult eSaveResult;
-    String aFileName;
-
-//  sal_Bool bSuccessfull = sal_False;
-    if ( _eMailDocType == TYPE_SELF )
-        eSaveResult = SaveDocument( _sAttachmentTitle,_xModel,aFileName);
-    else
-        eSaveResult = SaveDocAsPDF( _sAttachmentTitle,_xModel,aFileName);
-
-    if ( eSaveResult == SAVE_SUCCESSFULL && aFileName.Len() )
-        maAttachedDocuments.push_back(aFileName);
-    return eSaveResult == SAVE_SUCCESSFULL ? SEND_MAIL_OK : SEND_MAIL_ERROR;
-}
-// -----------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxMailModel, DoneHdl, void*, EMPTYARG )
-{
-    mbLoadDone = sal_True;
-    return 0;
-}
-// -----------------------------------------------------------------------------
-IMPL_LINK_INLINE_END( SfxMailModel, DoneHdl, void*, EMPTYARG )
-
-SfxMailModel::SfxMailModel( const Reference< XFrame >& _xFrame) :
-
-    mpToList    ( NULL ),
-    mpCcList    ( NULL ),
-    mpBccList   ( NULL ),
-    m_xCurrentFrame ( _xFrame ),
-    mePriority  ( PRIO_NORMAL ),
-    mbLoadDone  ( sal_True )
-
-{
-}
-
-SfxMailModel::~SfxMailModel()
-{
-    ClearList( mpToList );
-    delete mpToList;
-    ClearList( mpCcList );
-    delete mpCcList;
-    ClearList( mpBccList );
-    delete mpBccList;
-}
-
-void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole )
-{
-    // don't add a empty address
-    if ( rAddress.Len() > 0 )
-    {
-        AddressList_Impl* pList = NULL;
-        if ( ROLE_TO == eRole )
-        {
-            if ( !mpToList )
-                // create the list
-                mpToList = new AddressList_Impl;
-            pList = mpToList;
-        }
-        else if ( ROLE_CC == eRole )
-        {
-            if ( !mpCcList )
-                // create the list
-                mpCcList = new AddressList_Impl;
-            pList = mpCcList;
-        }
-        else if ( ROLE_BCC == eRole )
-        {
-            if ( !mpBccList )
-                // create the list
-                mpBccList = new AddressList_Impl;
-            pList = mpBccList;
-        }
-        else
-        {
-            DBG_ERRORFILE( "invalid address role" );
-        }
-
-        if ( pList )
-        {
-            // add address to list
-            AddressItemPtr_Impl pAddress = new String( rAddress );
-            pList->Insert( pAddress, LIST_APPEND );
-        }
-    }
-}
-
-SfxMailModel::SendMailResult SfxMailModel::Send( )
-{
-    OSL_ENSURE(!maAttachedDocuments.empty(),"No document added!");
-    SendMailResult  eResult = SEND_MAIL_ERROR;
-    if ( !maAttachedDocuments.empty() )
-    {
-
-        Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
-        if ( xMgr.is() )
-        {
-            Reference< XSimpleMailClientSupplier >  xSimpleMailClientSupplier;
-
-            // Prefer the SimpleSystemMail service if available
-            xSimpleMailClientSupplier = Reference< XSimpleMailClientSupplier >(
-                xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SimpleSystemMail" ))),
-                UNO_QUERY );
-
-            if ( ! xSimpleMailClientSupplier.is() )
-            {
-                xSimpleMailClientSupplier = Reference< XSimpleMailClientSupplier >(
-                    xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SimpleCommandMail" ))),
-                    UNO_QUERY );
-            }
-
-            if ( xSimpleMailClientSupplier.is() )
-            {
-                Reference< XSimpleMailClient > xSimpleMailClient = xSimpleMailClientSupplier->querySimpleMailClient();
-
-                if ( !xSimpleMailClient.is() )
-                {
-                    // no mail client support => message box!
-                    return SEND_MAIL_ERROR;
-                }
-
-                // we have a simple mail client
-                Reference< XSimpleMailMessage > xSimpleMailMessage = xSimpleMailClient->createSimpleMailMessage();
-                if ( xSimpleMailMessage.is() )
-                {
-                    sal_Int32 nSendFlags = SimpleMailClientFlags::DEFAULTS;
-                    if ( maFromAddress.Len() == 0 )
-                    {
-                        // from address not set, try figure out users e-mail address
-                        CreateFromAddress_Impl( maFromAddress );
-                    }
-                    xSimpleMailMessage->setOriginator( maFromAddress );
-
-                    sal_Int32 nToCount      = mpToList ? mpToList->Count() : 0;
-                    sal_Int32 nCcCount      = mpCcList ? mpCcList->Count() : 0;
-                    sal_Int32 nCcSeqCount   = nCcCount;
-
-                    // set recipient (only one) for this simple mail server!!
-                    if ( nToCount > 1 )
-                    {
-                        nCcSeqCount = nToCount - 1 + nCcCount;
-                        xSimpleMailMessage->setRecipient( *mpToList->GetObject( 0 ));
-                        nSendFlags = SimpleMailClientFlags::NO_USER_INTERFACE;
-                    }
-                    else if ( nToCount == 1 )
-                    {
-                        xSimpleMailMessage->setRecipient( *mpToList->GetObject( 0 ));
-                        nSendFlags = SimpleMailClientFlags::NO_USER_INTERFACE;
-                    }
-
-                    // all other recipient must be handled with CC recipients!
-                    if ( nCcSeqCount > 0 )
-                    {
-                        sal_Int32               nIndex = 0;
-                        Sequence< OUString >    aCcRecipientSeq;
-
-                        aCcRecipientSeq.realloc( nCcSeqCount );
-                        if ( nCcSeqCount > nCcCount )
-                        {
-                            for ( sal_Int32 i = 1; i < nToCount; ++i )
-                            {
-                                aCcRecipientSeq[nIndex++] = *mpToList->GetObject(i);
-                            }
-                        }
-
-                        for ( sal_Int32 i = 0; i < nCcCount; i++ )
-                        {
-                            aCcRecipientSeq[nIndex++] = *mpCcList->GetObject(i);
-                        }
-                        xSimpleMailMessage->setCcRecipient( aCcRecipientSeq );
-                    }
-
-                    sal_Int32 nBccCount = mpBccList ? mpBccList->Count() : 0;
-                    if ( nBccCount > 0 )
-                    {
-                        Sequence< OUString > aBccRecipientSeq( nBccCount );
-                        for ( sal_Int32 i = 0; i < nBccCount; ++i )
-                        {
-                            aBccRecipientSeq[i] = *mpBccList->GetObject(i);
-                        }
-                        xSimpleMailMessage->setBccRecipient( aBccRecipientSeq );
-                    }
-
-                    Sequence< OUString > aAttachmentSeq(&(maAttachedDocuments[0]),maAttachedDocuments.size());
-
-                    xSimpleMailMessage->setSubject( maSubject );
-                    xSimpleMailMessage->setAttachement( aAttachmentSeq );
-
-                    // Bugfix: #95743#
-                    // Due to the current clipboard implementation we cannot stop the main thread
-                    // because the clipboard implementation calls the main thread from another thread
-                    // and this would result in a deadlock!
-                    // Currently we create a thread to send a message and process all remaining error
-                    // handling in this thread!!
-
-                    OMailSendThreadImpl* pMailSendThread = new OMailSendThreadImpl( xSimpleMailClient, xSimpleMailMessage, m_xCurrentFrame,nSendFlags );
-                    pMailSendThread->create();
-
-                    // Return always true as the real error handling occurss in the OMailSendThreadImpl-implementation!
-                    eResult = SEND_MAIL_OK;
-                }
-            }
-        }
-    }
-    else
-        eResult = SEND_MAIL_CANCELLED;
-
-    return eResult;
-}
diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk
deleted file mode 100644
index 572053557e00..000000000000
--- a/sfx2/source/dialog/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=sfx2
-TARGET=dialog
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------------
-
-EXCEPTIONSFILES=\
-        $(SLO)$/filedlghelper.obj	\
-        $(SLO)$/filtergrouping.obj	\
-        $(SLO)$/itemconnect.obj     \
-        $(SLO)$/mailmodel.obj		\
-        $(SLO)$/partwnd.obj         \
-        $(SLO)$/recfloat.obj        \
-        $(SLO)$/templdlg.obj        \
-        $(SLO)$/dinfdlg.obj         \
-        $(SLO)$/dockwin.obj         \
-        $(SLO)$/passwd.obj			\
-        $(SLO)$/taskpane.obj
-
-SLOFILES =\
-        $(EXCEPTIONSFILES)			\
-        $(SLO)$/about.obj           \
-        $(SLO)$/alienwarn.obj       \
-        $(SLO)$/basedlgs.obj		\
-        $(SLO)$/dinfedt.obj			\
-        $(SLO)$/intro.obj			\
-        $(SLO)$/mgetempl.obj		\
-        $(SLO)$/navigat.obj			\
-        $(SLO)$/newstyle.obj		\
-        $(SLO)$/printopt.obj		\
-        $(SLO)$/sfxdlg.obj          \
-        $(SLO)$/splitwin.obj		\
-        $(SLO)$/srchdlg.obj         \
-        $(SLO)$/styfitem.obj		\
-        $(SLO)$/styledlg.obj		\
-        $(SLO)$/tabdlg.obj			\
-        $(SLO)$/tplcitem.obj		\
-        $(SLO)$/tplpitem.obj		\
-        $(SLO)$/versdlg.obj         \
-        $(SLO)$/securitypage.obj    \
-        $(SLO)$/titledockwin.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        recfloat.src		\
-        alienwarn.src       \
-        dialog.src			\
-        dinfdlg.src			\
-        dinfedt.src			\
-        filedlghelper.src	\
-        mailwindow.src		\
-        mgetempl.src		\
-        newstyle.src		\
-        passwd.src			\
-        templdlg.src		\
-        versdlg.src			\
-        printopt.src        \
-        srchdlg.src         \
-        securitypage.src    \
-        titledockwin.src    \
-        taskpane.src
-
-.IF "$(BUILD_VER_STRING)"!=""
-.IF "$(GUI)"=="UNX"
-CFLAGS+=-DBUILD_VER_STRING='"$(BUILD_VER_STRING)"'
-.ELSE # "$(GUI)"=="UNX"
-CFLAGS+=-DBUILD_VER_STRING="$(subst,",\" "$(BUILD_VER_STRING)")"
-.ENDIF # "$(GUI)"=="UNX"
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(INCCOM)$/cuilib.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
-    $(RM) $@
-    @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
-    @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
-.ENDIF
-
-$(SLO)$/sfxdlg.obj : $(INCCOM)$/cuilib.hxx
-
-$(SLO)$/about.obj : $(INCCOM)$/aboutbmpnames.hxx
-
-.INCLUDE .IGNORE : $(MISC)$/about_bmp_names.mk
-
-.IF "$(ABOUT_BITMAPS:f)"!="$(LASTTIME_ABOUT_BITMAPS)"
-DO_PHONY=.PHONY
-.ENDIF			# "$(ABOUT_BITMAPS:f)"!="$(LASTTIME_ABOUT_BITMAPS)"
-
-$(INCCOM)$/aboutbmpnames.hxx $(DO_PHONY):
-    echo const char ABOUT_BITMAP_STRINGLIST[]=$(EMQ)"$(ABOUT_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@
-    echo LASTTIME_ABOUT_BITMAPS=$(ABOUT_BITMAPS:f) > $(MISC)$/about_bmp_names.mk
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 1666916b0c0b..d97847f5b6e0 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -46,7 +46,7 @@
 #include <sfx2/mgetempl.hxx>
 #include <sfx2/objsh.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/module.hxx>
 
 #include <sfx2/sfx.hrc>
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index d7f258e7ccb3..290886528e24 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/navigat.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "helpid.hrc"
 
 SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR );
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 7193129838b2..8235333857d5 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/newstyle.hxx>
 #include "dialog.hrc"
 #include "newstyle.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 // PRIVATE METHODES ------------------------------------------------------
 
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 52c6acedd4ea..455479b9d125 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -35,7 +35,7 @@
 
 #include <sfx2/passwd.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include "dialog.hrc"
 #include "passwd.hrc"
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 80902204fa88..6b26cf9fb504 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -38,7 +38,7 @@
 
 #include "printopt.hrc"
 #include "dialog.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/viewsh.hxx>
 #include <sfx2/printopt.hxx>
 
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index c678cfdffb6e..aaabdd3e5d74 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -42,13 +42,13 @@
 
 #include "recfloat.hxx"
 #include "dialog.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx
index d62ed70b8490..becab5097ec3 100755
--- a/sfx2/source/dialog/sfxdlg.cxx
+++ b/sfx2/source/dialog/sfxdlg.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include <sfx2/sfxdlg.hxx>
-#include "cuilib.hxx"
+//#include "cuilib.hxx"
 
 #include <osl/module.hxx>
 #include <tools/string.hxx>
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index f6e5f96cf0bd..d4cc7950612f 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -49,7 +49,7 @@
 #include <sfx2/dockwin.hxx>
 #include <sfx2/app.hxx>
 #include "dialog.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/mnumgr.hxx>
 #include "virtmenu.hxx"
 #include <sfx2/msgpool.hxx>
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 0134b8d58bfa..f4d2392c9017 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include "srchdlg.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 
 #include "srchdlg.hrc"
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index ff6406f0d5d3..e1d01de94955 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -39,7 +39,7 @@
 
 #include <sfx2/styledlg.hxx>
 #include <sfx2/mgetempl.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 
 #include "dialog.hrc"
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 3c7a58cd09f9..d149bea792dc 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -42,8 +42,8 @@
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxdlg.hxx>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 88801d95f0d5..b10e634be231 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
@@ -60,8 +60,8 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/newstyle.hxx>
-#include "tplpitem.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/tplpitem.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include "templdlg.hrc"
 #include <sfx2/sfx.hrc>
@@ -73,7 +73,7 @@
 #include "docvor.hxx"
 #include <sfx2/doctempl.hxx>
 #include <sfx2/module.hxx>
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include "helpid.hrc"
 #include "appdata.hxx"
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 5d7569300cf8..0e03106b0d5e 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -33,12 +33,9 @@
 #include <svl/intitem.hxx>
 #include <vcl/svapp.hxx>
 
-#ifndef GCC
-#endif
-
 #include <sfx2/templdlg.hxx>
 #include <sfx2/bindings.hxx>
-#include "tplpitem.hxx"
+#include "sfx2/tplpitem.hxx"
 #include "tplcitem.hxx"
 #include "templdgi.hxx"
 
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index 7b81fb54cdbd..566c379df508 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -30,10 +30,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#ifndef GCC
-#endif
-
-#include "tplpitem.hxx"
+#include "sfx2/tplpitem.hxx"
 #include <com/sun/star/frame/status/Template.hpp>
 
 
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index a050e07da5ae..f2a0cf2790f3 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -46,7 +46,7 @@
 #include "versdlg.hrc"
 #include "versdlg.hxx"
 #include <sfx2/viewfrm.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx
index 642fe3c21af8..1907e54246ab 100644
--- a/sfx2/source/doc/QuerySaveDocument.cxx
+++ b/sfx2/source/doc/QuerySaveDocument.cxx
@@ -27,15 +27,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include "QuerySaveDocument.hxx"
+#include "sfx2/QuerySaveDocument.hxx"
 
 #include <sfx2/sfx.hrc>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 #include "doc.hrc"
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
+
 // -----------------------------------------------------------------------------
 short ExecuteQuerySaveDocument(Window* _pParent,const String& _rTitle)
 {
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 4311559f94af..ff0a15e20088 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -47,13 +47,13 @@
 #include <sfx2/sfx.hrc>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include "fltfnc.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/mnumgr.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 #include "syspath.hxx"
 #include <osl/file.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 6b9afa136e46..434553bdb226 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -81,6 +81,7 @@
 #include <unotools/tempfile.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/componentcontext.hxx>
+#include <comphelper/interaction.hxx>
 #include <framework/interaction.hxx>
 #include <unotools/streamhelper.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -144,7 +145,7 @@ using namespace ::com::sun::star::io;
 #include <sfx2/docfac.hxx>       // GetFilterContainer
 #include "doc.hrc"
 #include "openflag.hxx"     // SFX_STREAM_READONLY etc.
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/appuno.hxx>
 
 //#include "xmlversion.hxx"
@@ -3783,19 +3784,17 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction
         {
             uno::Sequence< uno::Reference< task::XInteractionContinuation > > aContinuations( bAllowAbort ? 2 : 1 );
 
-            ::rtl::Reference< ::framework::ContinuationApprove > pApprove( new ::framework::ContinuationApprove() );
+            ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove );
             aContinuations[ 0 ] = pApprove.get();
 
             if ( bAllowAbort )
             {
-                ::rtl::Reference< ::framework::ContinuationAbort > pAbort( new ::framework::ContinuationAbort() );
+                ::rtl::Reference< ::comphelper::OInteractionAbort > pAbort( new ::comphelper::OInteractionAbort );
                 aContinuations[ 1 ] = pAbort.get();
             }
 
-            uno::Reference< task::XInteractionRequest > xRequest( new ::framework::InteractionRequest( aRequest, aContinuations ) );
-            xHandler->handle( xRequest );
-
-            bResult = pApprove->isSelected();
+            xHandler->handle(::framework::InteractionRequest::CreateRequest (aRequest,aContinuations));
+            bResult = pApprove->wasSelected();
         }
         catch( const Exception& )
         {
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 2dcca2eadf56..360854dc3dbf 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include <sfx2/app.hxx>
-#include "docinsert.hxx"
+#include "sfx2/docinsert.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index 7a5fea18004f..e6726e97e96d 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -37,7 +37,7 @@
 
 #include <sfx2/doctdlg.hxx>
 #include "docvor.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/app.hxx>
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index db6f2a2d133f..f5ea04e5e08d 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -94,7 +94,7 @@ using namespace ::ucbhelper;
 #include <sfx2/objsh.hxx>
 #include "sfxtypes.hxx"
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 #include <sfx2/fcontnr.hxx>
 #include <svtools/templatefoldercache.hxx>
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 71f3683c0006..8644e79f611d 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -65,7 +65,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/ucbhelper.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxurlrelocator.hxx"
 #include "doctemplateslocal.hxx"
 #include <sfx2/docfac.hxx>
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 719dc5b8d223..6367f2a65d76 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -64,7 +64,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 #include <sfx2/sfx.hrc>
 #include "docvor.hrc"
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 388d85cefc25..eff1554526ea 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -78,7 +78,7 @@
 #include <comphelper/processfactory.hxx>
 
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "graphhelp.hxx"
 #include "doc.hrc"
 
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 6b2b5dcb8c0b..9eb82e7cfd44 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -77,7 +77,7 @@
 
 #include <sfx2/sfxsids.hrc>
 #include <doc.hrc>
-#include <sfxresid.hxx>
+#include <sfx2/sfxresid.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/app.hxx>
diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk
deleted file mode 100644
index d663d34cf5ba..000000000000
--- a/sfx2/source/doc/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=sfx2
-TARGET=doc
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
-        doc.src new.src doctdlg.src docvor.src doctempl.src graphhelp.src
-
-SLOFILES =	\
-        $(SLO)$/printhelper.obj \
-        $(SLO)$/docinf.obj \
-        $(SLO)$/oleprops.obj \
-        $(SLO)$/iframe.obj \
-        $(SLO)$/plugin.obj \
-        $(SLO)$/docfile.obj \
-        $(SLO)$/objuno.obj \
-        $(SLO)$/frmdescr.obj \
-        $(SLO)$/objxtor.obj \
-        $(SLO)$/objmisc.obj \
-        $(SLO)$/objstor.obj \
-        $(SLO)$/objcont.obj \
-        $(SLO)$/objserv.obj \
-        $(SLO)$/objitem.obj \
-        $(SLO)$/ownsubfilterservice.obj \
-        $(SLO)$/docfac.obj \
-        $(SLO)$/docfilt.obj \
-        $(SLO)$/doctempl.obj \
-        $(SLO)$/doctemplates.obj \
-        $(SLO)$/doctemplateslocal.obj \
-        $(SLO)$/docvor.obj \
-        $(SLO)$/new.obj \
-        $(SLO)$/doctdlg.obj \
-        $(SLO)$/sfxbasemodel.obj \
-        $(SLO)$/guisaveas.obj\
-        $(SLO)$/objembed.obj\
-        $(SLO)$/graphhelp.obj \
-        $(SLO)$/QuerySaveDocument.obj \
-        $(SLO)$/docinsert.obj \
-        $(SLO)$/docmacromode.obj \
-        $(SLO)$/SfxDocumentMetaData.obj \
-        $(SLO)$/DocumentMetadataAccess.obj \
-        $(SLO)$/Metadatable.obj \
-        $(SLO)$/sfxmodelfactory.obj \
-        $(SLO)$/sfxacldetect.obj \
-        $(SLO)$/docstoragemodifylistener.obj \
-        $(SLO)$/querytemplate.obj \
-        $(SLO)$/syspath.obj \
-        $(SLO)$/syspathw32.obj
-
-.IF "$(GUI)" == "WNT"
-
-#HACK TO DISABLE PCH
-NOOPTFILES= \
-        $(SLO)$/sfxacldetect.obj \
-        $(SLO)$/syspathw32.obj
-.ENDIF        
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index d3235b1c7a7f..932f6f10ecb0 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -31,9 +31,7 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/morebtn.hxx>
-#ifndef _SVMEDIT_HXX
 #include <svtools/svmedit.hxx>
-#endif
 #include <svl/itemset.hxx>
 #include <svl/eitem.hxx>
 #include <svtools/sfxecode.hxx>
@@ -42,9 +40,7 @@
 #include <unotools/localfilehelper.hxx>
 
 #include "new.hrc"
-#ifndef _SFX_DOC_HRC
 #include "doc.hrc"
-#endif
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
 #include "sfxtypes.hxx"
@@ -54,8 +50,8 @@
 #include <sfx2/objsh.hxx>
 #include "fltfnc.hxx"
 #include <sfx2/viewsh.hxx>
-#include "viewfac.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/viewfac.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include "preview.hxx"
 #include <sfx2/printer.hxx>
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index e0e63da04bb8..91f5842c1fb7 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -62,7 +62,7 @@
 #include <vcl/oldprintadaptor.hxx>
 
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "appdata.hxx"
 #include <sfx2/dinfdlg.hxx>
 #include "fltfnc.hxx"
@@ -71,11 +71,11 @@
 #include <sfx2/objsh.hxx>
 #include "objshimp.hxx"
 #include <sfx2/evntconf.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/printer.hxx>
+#include "sfx2/basmgr.hxx"
 #include <sfx2/viewfrm.hxx>
-#include "basmgr.hxx"
 #include <sfx2/doctempl.hxx>
 #include "doc.hrc"
 #include <sfx2/sfxbasemodel.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index e386b2382acf..75bdcc44d34e 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -118,6 +118,7 @@ using namespace ::com::sun::star::container;
 #include <rtl/bootstrap.hxx>
 #include <vcl/svapp.hxx>
 #include <framework/interaction.hxx>
+#include <comphelper/interaction.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/documentconstants.hxx>
 
@@ -126,7 +127,7 @@ using namespace ::com::sun::star::container;
 #include "appdata.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/objsh.hxx>
@@ -2286,8 +2287,8 @@ sal_Bool SfxObjectShell::UseInteractionToHandleError(
         {
             uno::Any aInteraction;
             uno::Sequence< uno::Reference< task::XInteractionContinuation > > lContinuations(2);
-            ::framework::ContinuationAbort* pAbort = new ::framework::ContinuationAbort();
-            ::framework::ContinuationApprove* pApprove = new ::framework::ContinuationApprove();
+            ::comphelper::OInteractionAbort* pAbort = new ::comphelper::OInteractionAbort();
+            ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove();
             lContinuations[0] = uno::Reference< task::XInteractionContinuation >(
                                  static_cast< task::XInteractionContinuation* >( pAbort ), uno::UNO_QUERY );
             lContinuations[1] = uno::Reference< task::XInteractionContinuation >(
@@ -2296,14 +2297,8 @@ sal_Bool SfxObjectShell::UseInteractionToHandleError(
             task::ErrorCodeRequest aErrorCode;
             aErrorCode.ErrCode = nError;
             aInteraction <<= aErrorCode;
-
-            ::framework::InteractionRequest* pRequest = new ::framework::InteractionRequest(aInteraction,lContinuations);
-            uno::Reference< task::XInteractionRequest > xRequest(
-                             static_cast< task::XInteractionRequest* >( pRequest ),
-                             uno::UNO_QUERY);
-
-            xHandler->handle(xRequest);
-            bResult = pAbort->isSelected();
+            xHandler->handle(::framework::InteractionRequest::CreateRequest (aInteraction,lContinuations));
+            bResult = pAbort->wasSelected();
         }
         catch( uno::Exception& )
         {}
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index b0be3638f2a4..c9b5e6f37293 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -69,7 +69,7 @@
 
 #include <sfx2/app.hxx>
 #include <sfx2/signaturestate.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/printer.hxx>
@@ -91,7 +91,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/objface.hxx>
 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index c3f532ad1ba6..0575660877a3 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -111,7 +111,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/request.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include "fltfnc.hxx"
 #include <sfx2/docfilt.hxx>
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 466f8dd43104..32d50de40d51 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -68,7 +68,7 @@
 #include <vector>
 #include <algorithm>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index b7567b89f02f..13fb08445431 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -54,7 +54,7 @@
 #include <svl/eitem.hxx>
 #include <tools/rtti.hxx>
 #include <svl/lstner.hxx>
-#include <sfxhelp.hxx>
+#include <sfx2/sfxhelp.hxx>
 #include <basic/sbstar.hxx>
 #include <svl/stritem.hxx>
 #include <basic/sbx.hxx>
@@ -96,7 +96,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "objshimp.hxx"
 #include "appbas.hxx"
 #include "sfxtypes.hxx"
@@ -107,8 +107,8 @@
 #include "appdata.hxx"
 #include <sfx2/appuno.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "basmgr.hxx"
-#include "QuerySaveDocument.hxx"
+#include "sfx2/basmgr.hxx"
+#include "sfx2/QuerySaveDocument.hxx"
 #include "helpid.hrc"
 #include <sfx2/msg.hxx>
 #include "appbaslib.hxx"
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index 3e6a529bc67e..a2adce45d239 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include "querytemplate.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 #include "helpid.hrc"
 #include <vcl/svapp.hxx>
diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx
index de6528794e20..ded9d3000fc8 100644
--- a/sfx2/source/doc/sfxacldetect.cxx
+++ b/sfx2/source/doc/sfxacldetect.cxx
@@ -25,6 +25,10 @@
  *
  ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+
 #ifdef WNT
 
 // necessary to include system headers without warnings
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index bf2654a1297e..21c06cb29615 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -102,7 +102,7 @@
 //________________________________________________________________________________________________________
 
 #include <sfx2/sfxbasecontroller.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include "workwin.hxx"
 #include <sfx2/signaturestate.hxx>
 #include <sfx2/sfxuno.hxx>
@@ -114,7 +114,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/objuno.hxx>
 #include <sfx2/printer.hxx>
-#include <basmgr.hxx>
+#include <sfx2/basmgr.hxx>
 #include <sfx2/event.hxx>
 #include <eventsupplier.hxx>
 #include <sfx2/evntconf.hxx>
@@ -125,12 +125,12 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include "sfx2/docstoragemodifylistener.hxx"
-#include "brokenpackageint.hxx"
+#include "sfx2/brokenpackageint.hxx"
 #include "graphhelp.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/DocumentMetadataAccess.hxx>
 
-#include <sfxresid.hxx>
+#include <sfx2/sfxresid.hxx>
 
 //________________________________________________________________________________________________________
 // const
@@ -1805,10 +1805,9 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
                 SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, FALSE );
                 if ( !pRepairItem || !pRepairItem->GetValue() )
                 {
-                    RequestPackageReparation* pRequest = new RequestPackageReparation( aDocName );
-                    com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > xRequest ( pRequest );
-                    xHandler->handle( xRequest );
-                    if( pRequest->isApproved() )
+                    RequestPackageReparation aRequest( aDocName );
+                    xHandler->handle( aRequest.GetRequest() );
+                    if( aRequest.isApproved() )
                     {
                         // broken package: try second loading and allow repair
                         pMedium->GetItemSet()->Put( SfxBoolItem( SID_REPAIRPACKAGE, sal_True ) );
@@ -1828,9 +1827,8 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
                 if ( nError == ERRCODE_IO_BROKENPACKAGE )
                 {
                     // repair either not allowed or not successful
-                    NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocName );
-                    com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > xRequest ( pNotifyRequest );
-                       xHandler->handle( xRequest );
+                    NotifyBrokenPackage aRequest( aDocName );
+                    xHandler->handle( aRequest.GetRequest() );
                 }
             }
         }
@@ -3288,7 +3286,7 @@ uno::Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfig
                     uno::Reference< lang::XMultiServiceFactory > xServiceMgr( ::comphelper::getProcessServiceFactory() );
                     uno::Sequence< uno::Reference< container::XIndexContainer > > rToolbars;
 
-                    sal_Bool bImported = UIConfigurationImporterOOo1x::ImportCustomToolbars(
+                    sal_Bool bImported = framework::UIConfigurationImporterOOo1x::ImportCustomToolbars(
                                             xNewUIConfMan, rToolbars, xServiceMgr, xOOo1ConfigStorage );
                     if ( bImported )
                     {
diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx
index c0a163bed39c..167dadea2e38 100644..100755
--- a/sfx2/source/doc/syspathw32.cxx
+++ b/sfx2/source/doc/syspathw32.cxx
@@ -28,6 +28,10 @@
 *
 ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+
 #ifdef WNT
 #ifdef _MSC_VER
 #pragma warning(disable:4917)
diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx
index b4aed7ccdd99..d674c7620d54 100644
--- a/sfx2/source/inc/fltoptint.hxx
+++ b/sfx2/source/inc/fltoptint.hxx
@@ -24,15 +24,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef SFX2_FLTOPTINT_HXX
+#define SFX2_FLTOPTINT_HXX
 
 #include <com/sun/star/document/FilterOptionsRequest.hpp>
 #include <com/sun/star/document/XInteractionFilterOptions.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <framework/interaction.hxx>
+#include <comphelper/interaction.hxx>
 
-using namespace ::framework;
+//using namespace ::framework;
 
-class FilterOptionsContinuation : public ContinuationBase< ::com::sun::star::document::XInteractionFilterOptions >
+class FilterOptionsContinuation : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterOptions >
 {
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties;
 
@@ -49,7 +51,7 @@ class RequestFilterOptions : public ::cppu::WeakImplHelper1< ::com::sun::star::t
                     ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
                 > m_lContinuations;
 
-    ContinuationAbort*  m_pAbort;
+    comphelper::OInteractionAbort*  m_pAbort;
 
     FilterOptionsContinuation*  m_pOptions;
 
@@ -57,7 +59,7 @@ public:
     RequestFilterOptions( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > rModel,
                               ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties );
 
-    sal_Bool    isAbort() { return m_pAbort->isSelected(); }
+    sal_Bool    isAbort() { return m_pAbort->wasSelected(); }
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getFilterOptions()
     {
@@ -73,3 +75,4 @@ public:
         throw( ::com::sun::star::uno::RuntimeException );
 };
 
+#endif
diff --git a/sfx2/source/layout/makefile.mk b/sfx2/source/layout/makefile.mk
deleted file mode 100644
index a11ba76a15bd..000000000000
--- a/sfx2/source/layout/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=sfx2
-TARGET=layout
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-
-SLOFILES = \
-        $(SLO)$/sfxdialog.obj
-#
-
-SLOFILES += $(SLO)$/sfxtabdialog.obj \
-    $(SLO)$/factory.obj \
-        $(SLO)$/sfxtabpage.obj
-
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx
index 782e890d81be..7909d404b524 100644
--- a/sfx2/source/layout/sfxtabdialog.cxx
+++ b/sfx2/source/layout/sfxtabdialog.cxx
@@ -42,8 +42,8 @@
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxdlg.hxx>
diff --git a/sfx2/source/menu/makefile.mk b/sfx2/source/menu/makefile.mk
deleted file mode 100644
index 8b55bd0840ea..000000000000
--- a/sfx2/source/menu/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=sfx2
-TARGET=menu
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = menu.src
-
-SLOFILES =	\
-        $(SLO)$/mnuitem.obj \
-        $(SLO)$/mnumgr.obj \
-        $(SLO)$/objmnctl.obj \
-        $(SLO)$/thessubmenu.obj \
-        $(SLO)$/virtmenu.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 281b451d8098..f101b0d426b9 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -72,9 +72,9 @@
 #include <sfx2/module.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "imgmgr.hxx"
-#include "imagemgr.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/imgmgr.hxx"
+#include "sfx2/imagemgr.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "../doc/doc.hrc"
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index b3e5717dd7b6..77dbd0dcb885 100755
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -76,7 +76,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/bindings.hxx>
 #include "mnucfga.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/macrconf.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/sfx.hrc>
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 48ff6a3948c5..f0408a66a408 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -36,14 +36,9 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <comphelper/processfactory.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <tools/urlobj.hxx>
 
-#ifndef GCC
-#endif
-
 #include "virtmenu.hxx"
 #include <sfx2/msgpool.hxx>
 #include "statcach.hxx"
@@ -60,9 +55,9 @@
 #include <sfx2/viewsh.hxx>
 #include "sfxpicklist.hxx"
 #include <sfx2/macrconf.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "menu.hrc"
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 #include <framework/addonsoptions.hxx>
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 32e6887f802c..1ca10c6d9390 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -51,7 +51,7 @@
 #include "eventsupplier.hxx"
 
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include <sfx2/sfxsids.hrc>
 #include "sfxlocal.hrc"
diff --git a/sfx2/source/notify/makefile.mk b/sfx2/source/notify/makefile.mk
deleted file mode 100644
index e2ddde40f936..000000000000
--- a/sfx2/source/notify/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=sfx2
-TARGET=notify
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/eventsupplier.obj \
-                $(SLO)$/hintpost.obj
-
-EXCEPTIONSFILES =	\
-        $(SLO)$/eventsupplier.obj
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/statbar/makefile.mk b/sfx2/source/statbar/makefile.mk
deleted file mode 100644
index f99c8fcdaa1e..000000000000
--- a/sfx2/source/statbar/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=sfx2
-TARGET=statbar
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =						\
-                $(SLO)$/stbitem.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index e5de57d835c3..68d855cbf6c6 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -41,7 +41,7 @@
 #include <vcl/status.hxx>
 
 #include <sfx2/app.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/msg.hxx>
 #include "arrdecl.hxx"
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 7694932d44c4..231baa76fc76 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -31,10 +31,10 @@
 #include <stdio.h>
 #include <hash_map>
 
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/bindings.hxx>
 #include "statcach.hxx"
 #include <sfx2/module.hxx>
diff --git a/sfx2/source/toolbox/makefile.mk b/sfx2/source/toolbox/makefile.mk
deleted file mode 100644
index ce4f011e6044..000000000000
--- a/sfx2/source/toolbox/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=sfx2
-TARGET=toolbox
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-                $(SLO)$/tbxitem.obj \
-                $(SLO)$/imgmgr.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index f5b38d5a8a18..7cc25c872eb1 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -92,7 +92,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/macrconf.hxx>
 #include <sfx2/genlink.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfx.hrc>
 #include <sfx2/module.hxx>
 #include <sfx2/docfile.hxx>
@@ -103,11 +103,11 @@
 #include <sfx2/unoctitm.hxx>
 #include "helpid.hrc"
 #include "workwin.hxx"
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include "virtmenu.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/module.hxx>
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 
 #include <comphelper/uieventslogger.hxx>
 #include <com/sun/star/frame/XModuleManager.hpp>
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 36edd34c973d..ef963b36d7bb 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -30,7 +30,7 @@
 
 #include "impframe.hxx"
 #include "objshimp.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "workwin.hxx"
 
 #include "sfx2/app.hxx"
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index df252b831803..a4707f03d364 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -30,7 +30,6 @@
 
 #include "frmload.hxx"
 #include "objshimp.hxx"
-#include "viewfac.hxx"
 #include "sfx2/app.hxx"
 #include "sfx2/dispatch.hxx"
 #include "sfx2/docfac.hxx"
@@ -45,6 +44,7 @@
 #include "sfx2/sfxuno.hxx"
 #include "sfx2/viewfrm.hxx"
 #include "sfx2/viewsh.hxx"
+#include "sfx2/viewfac.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/container/XContainerQuery.hpp>
@@ -216,11 +216,10 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con
     ::rtl::OUString sFilterName;
     try
     {
-        ::framework::RequestFilterSelect* pRequest = new ::framework::RequestFilterSelect( i_rDocumentURL );
-        Reference< XInteractionRequest > xRequest ( pRequest );
-        i_rxHandler->handle( xRequest );
-        if( !pRequest->isAbort() )
-            sFilterName = pRequest->getFilter();
+        ::framework::RequestFilterSelect aRequest( i_rDocumentURL );
+        i_rxHandler->handle( aRequest.GetRequest() );
+        if( !aRequest.isAbort() )
+            sFilterName = aRequest.getFilter();
     }
     catch( const Exception& )
     {
diff --git a/sfx2/source/view/makefile.mk b/sfx2/source/view/makefile.mk
deleted file mode 100644
index 9c257f4c9f75..000000000000
--- a/sfx2/source/view/makefile.mk
+++ /dev/null
@@ -1,65 +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=			sfx2
-TARGET=				view
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
-                view.src
-
-SLOFILES =	\
-        $(SLO)$/ipclient.obj \
-        $(SLO)$/viewsh.obj \
-        $(SLO)$/frmload.obj \
-        $(SLO)$/frame.obj \
-        $(SLO)$/frame2.obj \
-        $(SLO)$/printer.obj \
-        $(SLO)$/viewprn.obj \
-        $(SLO)$/viewfac.obj \
-        $(SLO)$/orgmgr.obj \
-        $(SLO)$/viewfrm.obj \
-        $(SLO)$/viewfrm2.obj \
-        $(SLO)$/sfxbasecontroller.obj \
-        $(SLO)$/userinputinterception.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index b15392372b19..6c92cd448adf 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -53,7 +53,7 @@
 #include "docvor.hxx"
 #include "orgmgr.hxx"
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "view.hrc"
 #include <sfx2/docfilt.hxx>
 #include "fltfnc.hxx"
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 46a96bafab9a..310c1a58a578 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/prnmon.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/tabdlg.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "view.hrc"
 
 #ifdef MSC
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
deleted file mode 100644
index a4e96ab1065e..000000000000
--- a/sfx2/source/view/prnmon.cxx
+++ /dev/null
@@ -1,495 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-#include <com/sun/star/view/PrintableState.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/util/XCloseBroadcaster.hpp>
-#include <com/sun/star/util/XCloseListener.hpp>
-#include <com/sun/star/util/CloseVetoException.hpp>
-#include <vcl/fixed.hxx>
-#include <vcl/msgbox.hxx>
-#include <svtools/asynclink.hxx>
-
-#include <unotools/printwarningoptions.hxx>
-#include <svl/eitem.hxx>
-
-#ifndef GCC
-#endif
-
-#include <sfx2/prnmon.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/docfile.hxx>
-#include "sfxtypes.hxx"
-#include <sfx2/progress.hxx>
-#include <sfx2/bindings.hxx>
-#include "sfxresid.hxx"
-#include <sfx2/event.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/app.hxx>
-
-#include "view.hrc"
-
-//------------------------------------------------------------------------
-
-#define SFX_TITLE_MAXLEN_PRINTMONITOR   22
-
-//------------------------------------------------------------------------
-
-struct SfxPrintMonitor_Impl: public ModelessDialog
-{
-
-    SfxPrintMonitor_Impl( Window *pParent, SfxViewShell *rpViewShell );
-    virtual BOOL Close();
-
-    SfxViewShell*           pViewShell;
-    FixedText               aDocName;
-    FixedText               aPrinting;
-    FixedText               aPrinter;
-    FixedText               aPrintInfo;
-    CancelButton            aCancel;
-};
-
-//-------------------------------------------------------------------------
-
-struct SfxPrintProgress_Impl : public SfxListener
-{
-    SfxPrintMonitor_Impl*   pMonitor;
-    SfxViewShell*           pViewShell;
-    SfxPrinter*             pPrinter;
-    SfxPrinter*             pOldPrinter;
-    USHORT                  nLastPage;
-    BOOL                    bRunning;
-    BOOL                    bCancel;
-    BOOL                    bDeleteOnEndPrint;
-    BOOL                    bShow;
-    BOOL                    bCallbacks;
-    BOOL                    bOldEnablePrintFile;
-    BOOL                    bOldFlag;
-    BOOL                    bRestoreFlag;
-    BOOL                    bAborted;
-    svtools::AsynchronLink  aDeleteLink;
-    Link                    aCancelHdl;
-
-private:
-    DECL_LINK( CancelHdl, Button * );
-    DECL_STATIC_LINK( SfxPrintProgress_Impl, DeleteHdl, SfxPrintProgress * );
-
-public:
-    SfxPrintProgress_Impl( SfxViewShell* pTheViewShell, SfxPrinter* pThePrinter );
-    ~SfxPrintProgress_Impl();
-
-    void                    Delete( SfxPrintProgress* pAntiImpl ) { aDeleteLink.Call( pAntiImpl ); }
-    SfxViewShell*           GetViewShell() const { return pViewShell; }
-    BOOL                    SetPage( USHORT nPage, const String &rPage );
-    void                    CreateMonitor();
-    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-};
-
-void SfxPrintProgress_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
-{
-    SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint );
-    if ( pPrintHint )
-    {
-        if ( pPrintHint->GetWhich() == -2 )
-            CancelHdl(0);
-    }
-}
-
-//------------------------------------------------------------------------
-
-SfxPrintMonitor_Impl::SfxPrintMonitor_Impl( Window* pParent, SfxViewShell* rpViewShell ) :
-    ModelessDialog( pParent, SfxResId( DLG_PRINTMONITOR ) ),
-    pViewShell  ( rpViewShell ),
-    aDocName    ( this, SfxResId( FT_DOCNAME ) ),
-    aPrinting   ( this, SfxResId( FT_PRINTING ) ),
-    aPrinter    ( this, SfxResId( FT_PRINTER ) ),
-    aPrintInfo  ( this, SfxResId( FT_PRINTINFO ) ),
-    aCancel     ( this, SfxResId( PB_CANCELPRNMON ) )
-{
-    if( rpViewShell->GetPrinter()->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) != 0 )
-    {
-        String aPrep( SfxResId( STR_FT_PREPARATION ) );
-        aPrinting.SetText( aPrep );
-        aPrinter.Show( FALSE );
-    }
-    FreeResource();
-}
-
-//------------------------------------------------------------------------
-
-IMPL_STATIC_LINK_NOINSTANCE( SfxPrintProgress_Impl, DeleteHdl, SfxPrintProgress*, pAntiImpl )
-{
-    delete pAntiImpl;
-    return 0;
-}
-
-void actualizePrintCancelState(CancelButton& rButton, const SfxObjectShell* pShell)
-{
-    sal_Bool bEnableCancelButton = sal_True;
-    if (pShell)
-        bEnableCancelButton = pShell->Stamp_GetPrintCancelState();
-
-    if (!bEnableCancelButton)
-        rButton.Disable();
-    else
-        rButton.Enable();
-}
-
-//------------------------------------------------------------------------
-
-SfxPrintProgress_Impl::SfxPrintProgress_Impl( SfxViewShell* pTheViewShell,
-                                              SfxPrinter* pThePrinter ) :
-
-    pMonitor            ( 0 ),
-    pViewShell          ( pTheViewShell ),
-    pPrinter            ( pThePrinter ),
-    pOldPrinter         ( NULL ),
-    nLastPage           ( 0 ),
-    bRunning            ( TRUE ),
-    bCancel             ( FALSE ),
-    bDeleteOnEndPrint   ( FALSE ),
-    bShow               ( FALSE ),
-    bCallbacks          ( FALSE ),
-    bOldEnablePrintFile ( FALSE ),
-    bOldFlag            ( TRUE ),
-    bRestoreFlag        ( FALSE ),
-    bAborted            ( FALSE ),
-    aDeleteLink         ( STATIC_LINK( this, SfxPrintProgress_Impl, DeleteHdl ) )
-{
-    StartListening( *pViewShell->GetObjectShell() );
-}
-
-void SfxPrintProgress_Impl::CreateMonitor()
-{
-    // mark monitor to been shown in first status indication
-    bShow = TRUE;
-
-    if ( !pMonitor )
-    {
-        Window* pParent = pViewShell->GetWindow();
-        pMonitor = new SfxPrintMonitor_Impl( pParent, pViewShell );
-        pMonitor->aDocName.SetText( pViewShell->GetObjectShell()->GetTitle( SFX_TITLE_MAXLEN_PRINTMONITOR ) );
-        pMonitor->aPrinter.SetText( pViewShell->GetPrinter()->GetName() );
-
-        // Stampit enable/dsiable cancel button
-        actualizePrintCancelState( pMonitor->aCancel, pViewShell->GetObjectShell() );
-        pMonitor->aCancel.SetClickHdl( LINK( this, SfxPrintProgress_Impl, CancelHdl ) );
-    }
-}
-
-//------------------------------------------------------------------------
-
-SfxPrintProgress_Impl::~SfxPrintProgress_Impl()
-{
-}
-
-//------------------------------------------------------------------------
-
-BOOL SfxPrintProgress_Impl::SetPage( USHORT nPage, const String &rPage )
-{
-    // wurde der Druckauftrag abgebrochen?
-    if ( bCancel || !pMonitor )
-        return FALSE;
-
-    // Stampit enable/dsiable cancel button
-    actualizePrintCancelState(pMonitor->aCancel, pViewShell->GetObjectShell());
-
-    nLastPage = nPage;
-    String aStrPrintInfo = String( SfxResId( STR_PAGE ) );
-    if ( !rPage.Len() )
-        aStrPrintInfo += String::CreateFromInt32( nLastPage );
-    else
-        aStrPrintInfo += rPage;
-    pMonitor->aPrintInfo.SetText( aStrPrintInfo );
-    pMonitor->Update();
-    return TRUE;
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( SfxPrintProgress_Impl, CancelHdl, Button *, EMPTYARG )
-{
-    if ( !pViewShell->GetPrinter()->IsJobActive() && pViewShell->GetPrinter()->IsPrinting() )
-        // we are still in StartJob, cancelling now might lead to a crash
-        return 0;
-
-    if ( pMonitor )
-        pMonitor->Hide();
-
-    pViewShell->GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_ABORTED, NULL, NULL ) );
-    pViewShell->GetPrinter()->AbortJob();
-    bCancel = TRUE;
-
-    if ( aCancelHdl.IsSet() )
-        aCancelHdl.Call( this );
-
-    bAborted = TRUE;
-    return 0;
-}
-
-BOOL SfxPrintMonitor_Impl::Close()
-{
-    BOOL bAgree = pViewShell ? pViewShell->GetObjectShell()->Stamp_GetPrintCancelState() : TRUE;
-    if (!bAgree)
-        return FALSE;
-    else
-        return ModelessDialog::Close();
-}
-
-//--------------------------------------------------------------------
-
-SfxPrintProgress::SfxPrintProgress( SfxViewShell* pViewSh, FASTBOOL bShow )
-:   SfxProgress( pViewSh->GetViewFrame()->GetObjectShell(),
-                 String(SfxResId(STR_PRINTING)), 1, FALSE ),
-    pImp( new SfxPrintProgress_Impl( pViewSh, pViewSh->GetPrinter() ) )
-{
-    #if 0
-    pImp->pPrinter->SetEndPrintHdl( LINK( this, SfxPrintProgress, EndPrintNotify ) );
-    pImp->pPrinter->SetErrorHdl( LINK( this, SfxPrintProgress, PrintErrorNotify ) );
-    pImp->pPrinter->SetStartPrintHdl( LINK( this, SfxPrintProgress, StartPrintNotify ) );
-    pImp->bCallbacks = TRUE;
-    #endif
-
-    SfxObjectShell* pDoc = pViewSh->GetObjectShell();
-    SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_HIDDEN, FALSE );
-    if ( pItem && pItem->GetValue() )
-        bShow = FALSE;
-
-    if ( bShow )
-        pImp->CreateMonitor();
-
-    Lock();
-    if ( !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
-    {
-        pImp->bRestoreFlag = TRUE;
-        pImp->bOldFlag = pDoc->IsEnableSetModified();
-        if ( pImp->bOldFlag )
-            pDoc->EnableSetModified( FALSE );
-    }
-}
-
-//--------------------------------------------------------------------
-
-SfxPrintProgress::~SfxPrintProgress()
-{
-    // k"onnte auch schon weg sein (in EndPrintNotify)
-    DELETEZ(pImp->pMonitor);
-
-    // ggf. Callbacks entfermen
-    if ( pImp->bCallbacks )
-    {
-        // pImp->pPrinter->SetEndPrintHdl( Link() );
-        pImp->pPrinter->SetErrorHdl( Link() );
-        pImp->bCallbacks = FALSE;
-    }
-
-    // ggf. vorherigen Drucker wieder einsetzen
-    if ( pImp->pOldPrinter )
-        pImp->pViewShell->SetPrinter( pImp->pOldPrinter, SFX_PRINTER_PRINTER );
-    else
-        // ggf. vorherigen Print-To-File-Status zuruecksetzen
-        pImp->pViewShell->GetPrinter()->EnablePrintFile( pImp->bOldEnablePrintFile );
-
-    // EndPrint-Notification an Frame
-    //pImp->pViewShell->GetViewFrame()->GetFrame().Lock_Impl(FALSE);
-    pImp->EndListening( *(pImp->pViewShell->GetObjectShell()) );
-
-    // the following call might destroy the view or even the document
-    pImp->pViewShell->CheckOwnerShip_Impl();
-    delete pImp;
-}
-
-//--------------------------------------------------------------------
-
-BOOL SfxPrintProgress::SetState( ULONG nValue, ULONG nNewRange )
-{
-    if ( pImp->bShow )
-    {
-        pImp->bShow = FALSE;
-        if ( pImp->pMonitor )
-        {
-            pImp->pMonitor->Show();
-            pImp->pMonitor->Update();
-        }
-    }
-
-    return pImp->SetPage( (USHORT)nValue, GetStateText_Impl() ) &&
-           SfxProgress::SetState( nValue, nNewRange );
-}
-
-//--------------------------------------------------------------------
-
-void SfxPrintProgress::SetText( const String& rText )
-{
-    if ( pImp->pMonitor )
-    {
-        pImp->pMonitor->SetText( rText );
-        pImp->pMonitor->Update();
-    }
-    SfxProgress::SetText( rText );
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxPrintProgress, PrintErrorNotify, void *, EMPTYARG )
-{
-    if ( pImp->pMonitor )
-        pImp->pMonitor->Hide();
-    // AbortJob calls EndPrint hdl, so do not delete pImp just now
-    BOOL bWasDeleteOnEndPrint = pImp->bDeleteOnEndPrint;
-    pImp->bDeleteOnEndPrint = FALSE;
-    pImp->pPrinter->AbortJob();
-    InfoBox( pImp->GetViewShell()->GetWindow(),
-             String( SfxResId(STR_ERROR_PRINT) ) ).Execute();
-    if ( pImp->bRestoreFlag && pImp->pViewShell->GetObjectShell()->IsEnableSetModified() != pImp->bOldFlag )
-        pImp->pViewShell->GetObjectShell()->EnableSetModified( pImp->bOldFlag );
-    pImp->GetViewShell()->GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_FAILED, NULL, NULL ) );
-    // now we can clean up like normally EndPrint hdl does
-    if( bWasDeleteOnEndPrint )
-    {
-        DELETEZ(pImp->pMonitor);
-        delete this;
-    }
-    return 0;
-}
-IMPL_LINK_INLINE_END( SfxPrintProgress, PrintErrorNotify, void *, EMPTYARG )
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( SfxPrintProgress, StartPrintNotify, void *, EMPTYARG )
-{
-    SfxObjectShell *pObjShell = pImp->pViewShell->GetObjectShell();
-    SFX_APP()->NotifyEvent(SfxEventHint(SFX_EVENT_PRINTDOC, GlobalEventConfig::GetEventName( STR_EVENT_PRINTDOC ), pObjShell));
-    pObjShell->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_STARTED, NULL, NULL ) );
-    return 0;
-}
-
-IMPL_LINK( SfxPrintProgress, EndPrintNotify, void *, EMPTYARG )
-{
-    if ( pImp->pMonitor )
-        pImp->pMonitor->Hide();
-
-    SfxViewShell* pViewShell = pImp->pViewShell;
-
-    // Slots enablen
-    pViewShell->Invalidate( SID_PRINTDOC );
-    pViewShell->Invalidate( SID_PRINTDOCDIRECT );
-    pViewShell->Invalidate( SID_SETUPPRINTER );
-
-    // . . . falls der Printer im System umgestellt wurde, hier Aenderung
-    // nachziehen.
-    //! if( pMDI->IsPrinterChanged() ) pMDI->Changed( 0L );
-
-    // Callbacks rausnehmen
-    // pImp->pPrinter->SetEndPrintHdl( Link() );
-    pImp->pPrinter->SetErrorHdl( Link() );
-    pImp->bCallbacks = FALSE;
-
-    // ggf. alten Printer wieder einsetzen
-    if ( pImp->pOldPrinter )
-    {
-        // Fix #59613#: niemals den aktuellen Printer synchron abschiessen !
-        // Da sowieso immer bDeleteOnEndPrint gesetzt wird, wird der der Drucker im
-        // dtor vom Printprogress ( dann aber asynchron !! ) zur"uckgesetzt.
-/*
-        pImp->pViewShell->SetPrinter( pImp->pOldPrinter, SFX_PRINTER_PRINTER );
-        pImp->pOldPrinter = 0;
-        pImp->pPrinter = 0;
- */
-    }
-    else
-        // ggf. vorherigen Print-To-File-Status zuruecksetzen
-        pViewShell->GetPrinter()->EnablePrintFile( pImp->bOldEnablePrintFile );
-
-    // it is possible that after printing the document or view is deleted (because the VieShell got the ownership)
-    // so first clean up
-    if ( pImp->bRestoreFlag && pViewShell->GetObjectShell()->IsEnableSetModified() != pImp->bOldFlag )
-        pViewShell->GetObjectShell()->EnableSetModified( TRUE );
-
-    pViewShell->GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_COMPLETED, NULL, NULL ) );
-    if ( pImp->bDeleteOnEndPrint )
-    {
-        DELETEZ(pImp->pMonitor);
-        delete this;
-    }
-    else
-    {
-        DBG_ASSERT( !pImp->pOldPrinter, "Unable to restore printer!" );
-        pImp->bRunning = FALSE;
-    }
-
-    return 0;
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::DeleteOnEndPrint()
-{
-    UnLock(); // jetzt schon, wg. Drucken im Thread
-#ifndef WNT
-    // da das Drucken im 'Thread' unter Windows zu undefiniert ist bleibt der
-    // Print-Monitor dort stehen, auf den anderen Plattformen kann man dann
-    // weiterarbeiten, also kommt das Teil weg
-    DELETEZ( pImp->pMonitor );
-#endif
-
-    pImp->bDeleteOnEndPrint = TRUE;
-    if ( !pImp->bRunning )
-        delete this;
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::RestoreOnEndPrint( SfxPrinter *pOldPrinter,
-                                          BOOL bOldEnablePrintFile )
-{
-    pImp->pOldPrinter = pOldPrinter;
-    pImp->bOldEnablePrintFile = bOldEnablePrintFile;
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::RestoreOnEndPrint( SfxPrinter *pOldPrinter )
-{
-    RestoreOnEndPrint( pOldPrinter, FALSE );
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::SetCancelHdl( const Link& aCancelHdl )
-{
-    pImp->aCancelHdl = aCancelHdl;
-}
-
-BOOL SfxPrintProgress::IsAborted() const
-{
-    return pImp->bAborted;
-}
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 19aa4b75ee0f..3a7185565408 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -93,7 +93,7 @@
 #include <hash_map>
 
 #include <sfx2/event.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 
 #define OMULTITYPEINTERFACECONTAINERHELPER      ::cppu::OMultiTypeInterfaceContainerHelper
 #define OINTERFACECONTAINERHELPER               ::cppu::OInterfaceContainerHelper
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 243dcd56e4c8..3dce1ec795bb 100644
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.hrc
@@ -41,12 +41,6 @@
 #define STR_NOSTARTPRINTER                  (RID_SFX_VIEW_START+ 9)
 #define STR_PRINTING                        (RID_SFX_VIEW_START+10)
 
-#ifndef STR_UNDO
-#define STR_UNDO                            (RID_SFX_VIEW_START+11)
-#define STR_REDO                            (RID_SFX_VIEW_START+12)
-#define STR_REPEAT                          (RID_SFX_VIEW_START+13)
-#endif
-
 #define DLG_PRINTMONITOR                    (RID_SFX_VIEW_START)
 #define FT_DOCNAME                      1
 #define FT_PRINTING                     2
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index f9469e8a9f88..3eed678420dd 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -30,8 +30,8 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include <sfx2/app.hxx>
+#include "sfx2/viewfac.hxx"
 #include <rtl/ustrbuf.hxx>
-#include "viewfac.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 6222721d9b83..dbadbc54ebd4 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -36,12 +36,8 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
-#ifndef _SPLITWIN_HXX //autogen
 #include <vcl/splitwin.hxx>
-#endif
 #include <unotools/moduleoptions.hxx>
 #include <svl/intitem.hxx>
 #include <svl/visitem.hxx>
@@ -50,9 +46,7 @@
 #include <svl/slstitm.hxx>
 #include <svl/whiter.hxx>
 #include <svl/undo.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <tools/diagnose_ex.h>
@@ -98,6 +92,8 @@
 #include <comphelper/storagehelper.hxx>
 #include <svtools/asynclink.hxx>
 #include <svl/sharecontrolfile.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtdata.hxx>
 #include <framework/framelistanalyzer.hxx>
 
 #include <boost/optional.hpp>
@@ -113,9 +109,6 @@ using ::com::sun::star::document::XViewDataSupplier;
 using ::com::sun::star::container::XIndexContainer;
 namespace css = ::com::sun::star;
 
-#ifndef GCC
-#endif
-
 // wg. ViewFrame::Current
 #include "appdata.hxx"
 #include <sfx2/taskpane.hxx>
@@ -132,10 +125,10 @@ namespace css = ::com::sun::star;
 #include <sfx2/request.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/ipclient.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "appbas.hxx"
 #include <sfx2/objitem.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include <sfx2/event.hxx>
 #include "fltfnc.hxx"
 #include <sfx2/docfile.hxx>
@@ -152,7 +145,7 @@ namespace css = ::com::sun::star;
 #include "workwin.hxx"
 #include "helper.hxx"
 #include "macro.hxx"
-#include "minfitem.hxx"
+#include "sfx2/minfitem.hxx"
 #include "../appl/app.hrc"
 #include "impviewframe.hxx"
 
@@ -1030,8 +1023,8 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
 
     if ( pShUndoMgr && pShUndoMgr->GetUndoActionCount() )
     {
-        String aTmp( SfxResId( STR_UNDO ) );
-        aTmp += pShUndoMgr->GetUndoActionComment(0);
+        String aTmp( SvtResId( STR_UNDO ) );
+        aTmp+= pShUndoMgr->GetUndoActionComment(0);
         rSet.Put( SfxStringItem( SID_UNDO, aTmp ) );
     }
     else
@@ -1039,7 +1032,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
 
     if ( pShUndoMgr && pShUndoMgr->GetRedoActionCount() )
     {
-        String aTmp( SfxResId(STR_REDO) );
+        String aTmp( SvtResId(STR_REDO) );
         aTmp += pShUndoMgr->GetRedoActionComment(0);
         rSet.Put( SfxStringItem( SID_REDO, aTmp ) );
     }
@@ -1049,7 +1042,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
     if ( pShUndoMgr && pTarget && pShUndoMgr->GetRepeatActionCount() &&
          pShUndoMgr->CanRepeat(*pTarget, 0) )
     {
-        String aTmp( SfxResId(STR_REPEAT) );
+        String aTmp( SvtResId(STR_REPEAT) );
         aTmp += pShUndoMgr->GetRepeatActionComment(*pTarget, 0);
         rSet.Put( SfxStringItem( SID_REPEAT, aTmp ) );
     }
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 480b5307df2e..05ce981a51b6 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -30,7 +30,7 @@
 
 #include "impviewframe.hxx"
 #include "statcach.hxx"
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include "workwin.hxx"
 
 #include "sfx2/app.hxx"
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index d1cfd8c2d181..4ef4244f28e6 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -50,7 +50,7 @@
 #include "viewimp.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/prnmon.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/objsh.hxx>
 #include "sfxtypes.hxx"
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 968d0cbe8676..2edd0f382aa9 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -70,7 +70,7 @@
 #include "view.hrc"
 #include <sfx2/viewsh.hxx>
 #include "viewimp.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/printer.hxx>
@@ -81,8 +81,8 @@
 #include "view.hrc"
 #include "sfxlocal.hrc"
 #include <sfx2/sfxbasecontroller.hxx>
+#include "sfx2/mailmodelapi.hxx"
 #include <sfx2/viewfrm.hxx>
-#include "mailmodelapi.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/ipclient.hxx>
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
deleted file mode 100644
index f520e2097e7e..000000000000
--- a/sfx2/util/makefile.mk
+++ /dev/null
@@ -1,172 +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=..
-
-ENABLE_EXCEPTIONS=TRUE
-PRJNAME=sfx2
-TARGET=sfx
-#sfx.hid generieren
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=  $(SLB)$/appl.lib		\
-            $(SLB)$/explorer.lib	\
-            $(SLB)$/doc.lib			\
-            $(SLB)$/view.lib		\
-            $(SLB)$/control.lib		\
-            $(SLB)$/notify.lib		\
-            $(SLB)$/menu.lib		\
-            $(SLB)$/inet.lib		\
-            $(SLB)$/toolbox.lib		\
-            $(SLB)$/statbar.lib		\
-            $(SLB)$/dialog.lib		\
-            $(SLB)$/bastyp.lib		\
-            $(SLB)$/config.lib
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-LIB1FILES += $(SLB)$/layout.lib
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-HELPIDFILES=\
-            ..\inc\sfx2\sfxsids.hrc	\
-            ..\source\inc\helpid.hrc
-
-.IF "$(GUI)"!="UNX"
-LIB2TARGET= $(LB)$/$(TARGET).lib
-LIB2FILES=  $(LB)$/isfx.lib
-LIB2DEPN=$(SHL1TARGETN)
-.ENDIF
-
-SHL1TARGET= sfx$(DLLPOSTFIX)
-SHL1IMPLIB= isfx
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS+=\
-        $(FWELIB) \
-        $(BASICLIB) \
-        $(SVTOOLLIB) \
-        $(TKLIB) \
-        $(VCLLIB) \
-        $(SVLLIB)	\
-        $(SOTLIB) \
-        $(UNOTOOLSLIB) \
-        $(TOOLSLIB) \
-        $(I18NISOLANGLIB) \
-        $(SAXLIB) \
-        $(COMPHELPERLIB) \
-        $(UCBHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(VOSLIB) \
-        $(SALLIB) \
-        $(LIBXML2LIB) \
-
-
-.IF "$(GUI)"=="WNT"
-
-SHL1STDLIBS+=\
-        $(UWINAPILIB) \
-        $(ADVAPI32LIB) \
-        $(SHELL32LIB) \
-        $(GDI32LIB) \
-        $(OLE32LIB) \
-        $(UUIDLIB)
-.ELSE # WNT
-.IF "$(OS)" == "MACOSX"
-SHL1STDLIBS+= -framework Cocoa
-.ENDIF # MACOSX
-.ENDIF # WNT
-
-
-SHL1DEPN += $(shell @$(FIND) $(SLO) -type f -name "*.OBJ" -print)
-
-SHL1LIBS=   $(LIB1TARGET)
-
-#SHL1OBJS=   $(SLO)$/sfxdll.obj
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME	=$(SHL1TARGET)
-DEFLIB1NAME	=sfx
-DEF1DES		=Sfx
-
-SFXSRSLIST=\
-        $(SRS)$/appl.srs \
-        $(SRS)$/sfx.srs \
-        $(SRS)$/doc.srs \
-        $(SRS)$/view.srs \
-        $(SRS)$/menu.srs \
-        $(SRS)$/dialog.srs \
-                $(SRS)$/bastyp.srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=$(SFXSRSLIST)
-
-# gtk quick-starter
-.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE: pkg_config.mk
-CFLAGS+=$(PKGCONFIG_CFLAGS)
-
-SHL3TARGET=qstart_gtk$(DLLPOSTFIX)
-SHL3LIBS=$(SLB)$/quickstart.lib
-SHL3DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN)
-# libs for gtk plugin
-SHL3STDLIBS=$(SHL1STDLIBS) $(SFX2LIB) $(EGGTRAYLIB)
-SHL3STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//)
-# hack for faked SO environment
-.IF "$(PKGCONFIG_ROOT)"!=""
-SHL3SONAME+=-z nodefs
-SHL3NOCHECK=TRUE
-.ENDIF          # "$(PKGCONFIG_ROOT)"!=""
-.ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-.ENDIF # "$(GUI)"=="UNX"
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/sfx.component
-
-$(MISC)/sfx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        sfx.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt sfx.component
diff --git a/sfx2/workben/custompanel/makefile.mk b/sfx2/workben/custompanel/makefile.mk
deleted file mode 100644
index 2a4704af499a..000000000000
--- a/sfx2/workben/custompanel/makefile.mk
+++ /dev/null
@@ -1,120 +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=sfx2
-
-TARGET=custompanel
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-EXTENSIONNAME:=custom-tool-panel
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-#-------------------------------------------------------------------
-
-#---- extension version
-EXTENSION_VERSION_BASE=0.1
-.IF ( "$(CWS_WORK_STAMP)" == "" ) || ( "$(UPDATER)" == "YES" )
-    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-.ELSE
-    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP)
-.ENDIF
-
-#---- extension title package name
-EXTENSION_TITLE=Custom Tool Panel Example
-EXTENSION_ZIPNAME=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(RTL_OS:l)-$(RTL_ARCH:l)
-
-#--------------------------------------------------
-
-SHL1DLLPRE=
-SHL1TARGET=$(TARGET).uno
-LIB1TARGET=$(SLB)/$(SHL1TARGET).lib
-LIB1OBJFILES= \
-        $(SLO)/ctp_factory.obj \
-        $(SLO)/ctp_services.obj \
-        $(SLO)/ctp_panel.obj
-
-SHL1STDLIBS= \
-        $(CPPULIB)          \
-        $(SALLIB)           \
-        $(SALHELPERLIB)     \
-        $(CPPUHELPERLIB)
-
-SHL1VERSIONMAP=$(SOLARSRC)/solenv/src/reg-component.map
-SHL1LIBS=	$(LIB1TARGET)
-SHL1DEF=	$(MISC)/$(SHL1TARGET).def
-SHL1RPATH=  OXT
-DEF1NAME=	$(SHL1TARGET)
-
-# create Extension -----------------------------
-
-COMPONENT_CONFIGDEST=.
-
-COMPONENT_XCU = \
-    $(EXTENSIONDIR)/WriterWindowState.xcu \
-    $(EXTENSIONDIR)/CalcWindowState.xcu \
-    $(EXTENSIONDIR)/DrawWindowState.xcu \
-    $(EXTENSIONDIR)/ImpressWindowState.xcu \
-    $(EXTENSIONDIR)/Factories.xcu
-
-COMPONENT_LIBRARIES = \
-        $(EXTENSIONDIR)/$(SHL1TARGET)$(DLLPOST)
-
-COMPONENT_IMAGES= \
-    $(EXTENSIONDIR)/panel.png
-
-# ........ dependencies for packaging the extension ........
-EXTENSION_PACKDEPS=makefile.mk $(COMPONENT_IMAGES)
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-$(EXTENSIONDIR)/%.png : ./%.png
-    @@-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@ > $(NULLDEV)
-
-$(EXTENSIONDIR)/WriterWindowState.xcu: ./WriterWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./WriterWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/WriterWindowState.xcu
-
-$(EXTENSIONDIR)/CalcWindowState.xcu: ./CalcWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./CalcWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/CalcWindowState.xcu
-
-$(EXTENSIONDIR)/DrawWindowState.xcu: ./DrawWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./DrawWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/DrawWindowState.xcu
-
-$(EXTENSIONDIR)/ImpressWindowState.xcu: ./ImpressWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./ImpressWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/ImpressWindowState.xcu
-
diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk
index da28e5ff68f4..3ee6298e744f 100644
--- a/shell/source/tools/lngconvex/makefile.mk
+++ b/shell/source/tools/lngconvex/makefile.mk
@@ -58,8 +58,8 @@ APP1STDLIBS= $(SALLIB)\
             $(I18NISOLANGLIB)
 
 .IF "$(COM)"!="GCC"
-APP1STDLIBS+= $(TOOLSLIBST) \
-            msvcprt.lib
+APP1STDLIBS+= msvcprt.lib
+#$(TOOLSLIBST) 
 .ENDIF
 
 # --- Targets ------------------------------------------------------
diff --git a/svx/Makefile b/svx/Makefile
new file mode 100644
index 000000000000..963c7870d955
--- /dev/null
+++ b/svx/Makefile
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+
+gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))
+
+$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE)))
+
+
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 38f6daffee19..d1038641c841 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -36,7 +36,7 @@
 #include <svtools/transfer.hxx>
 #include <svl/lstner.hxx>
 #include <svtools/miscopt.hxx>
-#include "galbrws.hxx"
+#include "svx/galbrws.hxx"
 
 // ----------------------
 // - GalleryBrowserMode -
diff --git a/svx/inc/globlac.hrc b/svx/inc/globlac.hrc
deleted file mode 100644
index f72d4c1d31a8..000000000000
--- a/svx/inc/globlac.hrc
+++ /dev/null
@@ -1,223 +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.
- *
- ************************************************************************/
-
-#ifndef _GLOBALACC_SRC
-#define _GLOBALACC_SRC
-
-#define ACC_CODE( Id, c, bSh, bM1, bM2 ) \
-                    AcceleratorItem { Identifier = Id; \
-                            Key = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; };
-
-#define ACC_FUNC( Id, f ) \
-                AcceleratorItem { Identifier = Id; \
-                    Key = KeyCode { Function = f ; }; };
-
-#define ACC_KEY( language, c, bSh, bM1, bM2 ) \
-                    Key[ language ] = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; };
-
-#define ACC_DEF_KEY( c, bSh, bM1, bM2 ) \
-                    Key = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; };
-
-
-#define AI_HELPINDEX                ACC_CODE( SID_HELPINDEX, KEY_F1, FALSE, TRUE, FALSE )
-
-#define AI_ATTR_CHAR                ACC_CODE( SID_ATTR_CHAR, KEY_F2, FALSE, FALSE, FALSE )
-// new shortcut F9 for starting slide-show (see #73417#)
-#define AI_PRESENTATION             ACC_CODE( SID_PRESENTATION, KEY_F9, FALSE, FALSE, FALSE )
-// formerly used shortcut Ctrl-F2.  Still used (in sd) for compatibility
-#define AI_PRESENTATION_COMPAT      ACC_CODE( SID_PRESENTATION, KEY_F2, FALSE, TRUE, FALSE )
-#define AI_ENTER_GROUP              ACC_CODE( SID_ENTER_GROUP, KEY_F3, FALSE, FALSE, FALSE )
-#define AI_COPYOBJECTS              ACC_CODE( SID_COPYOBJECTS, KEY_F3, TRUE, FALSE, FALSE )
-#define AI_LEAVE_GROUP              ACC_CODE( SID_LEAVE_GROUP, KEY_F3, FALSE, TRUE, FALSE )
-#define AI_ATTR_TRANSFORM           ACC_CODE( SID_ATTR_TRANSFORM, KEY_F4, FALSE, FALSE, FALSE )
-#define AI_NAVIGATOR                ACC_CODE( SID_NAVIGATOR, KEY_F5, FALSE, FALSE, FALSE )
-#define AI_SPELLING                 ACC_CODE( SID_SPELL_DIALOG, KEY_F7, FALSE, FALSE, FALSE )
-#define AI_THESAURUS                ACC_CODE( SID_THESAURUS, KEY_F7, FALSE, TRUE, FALSE )
-#define AI_BEZIER_EDIT              ACC_CODE( SID_BEZIER_EDIT, KEY_F8, FALSE, FALSE, FALSE )
-#define AI_ATTR_TEXT_FITTOSIZE      ACC_CODE( SID_ATTR_TEXT_FITTOSIZE, KEY_F8, TRUE, TRUE, FALSE )
-#define AI_STYLE_DESIGNER           ACC_CODE( SID_STYLE_DESIGNER, KEY_F11, FALSE, FALSE, FALSE )
-#define AI_OUTLINEMODE              ACC_CODE( SID_OUTLINEMODE, KEY_F12, FALSE, FALSE, FALSE )
-#define AI_DRAWINGMODE              ACC_CODE( SID_DRAWINGMODE, KEY_F12, FALSE, TRUE, FALSE )
-
-#define AI_ATTR_PARA_LINESPACE_10   ACC_CODE( SID_ATTR_PARA_LINESPACE_10, KEY_1, FALSE, TRUE, FALSE )
-#define AI_ATTR_PARA_LINESPACE_20   ACC_CODE( SID_ATTR_PARA_LINESPACE_20, KEY_2, FALSE, TRUE, FALSE )
-#define AI_ATTR_PARA_LINESPACE_15   ACC_CODE( SID_ATTR_PARA_LINESPACE_15, KEY_5, FALSE, TRUE, FALSE )
-#define AI_SHOW_ITEMBROWSER         ACC_CODE( SID_SHOW_ITEMBROWSER, KEY_9, TRUE, TRUE, TRUE )
-
-#define AI_ATTR_PARA_ADJUST_BLOCK   AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_BLOCK;\
-                                        ACC_DEF_KEY(        KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,       KEY_J, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_PARA_ADJUST_CENTER  AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_CENTER;\
-                                        ACC_DEF_KEY(        KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_C, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_J, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_WEIGHT         AcceleratorItem { Identifier = SID_ATTR_CHAR_WEIGHT;\
-                                        ACC_DEF_KEY(        KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_N, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da ,       KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,       KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru,        KEY_B, FALSE, TRUE, FALSE ) };
-
-#define AI_SEARCH_DLG               AcceleratorItem { Identifier = SID_SEARCH_DLG;\
-                                        ACC_DEF_KEY(        KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_F, FALSE, TRUE, FALSE ) };
-
-#define AI_GROUP                    ACC_CODE( SID_GROUP, KEY_G, TRUE, TRUE, FALSE )
-#define AI_UNGROUP                  ACC_CODE( SID_UNGROUP, KEY_G, TRUE, TRUE, TRUE )
-
-// Weitersuchen ...
-#define AI_SET_SUPER_SCRIPT         AcceleratorItem { Identifier = SID_SET_SUPER_SCRIPT;\
-                                        ACC_DEF_KEY(        KEY_P, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( de ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_P, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_H, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_POSTURE        AcceleratorItem { Identifier = SID_ATTR_CHAR_POSTURE;\
-                                        ACC_DEF_KEY(        KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da ,       KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,       KEY_I, FALSE, TRUE, FALSE ) };
-
-#define AI_COMBINE                  ACC_CODE( SID_COMBINE, KEY_K, TRUE, TRUE, FALSE )
-#define AI_DISMANTLE                ACC_CODE( SID_DISMANTLE, KEY_K, TRUE, TRUE, TRUE )
-#define AI_ATTR_PARA_ADJUST_LEFT    AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_LEFT;\
-                                        ACC_DEF_KEY(        KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_G, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_L, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_PARA_ADJUST_RIGHT   AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_RIGHT;\
-                                        ACC_DEF_KEY(        KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_D, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_D, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_R, FALSE, TRUE, FALSE ) };
-
-#define AI_SET_SUB_SCRIPT           AcceleratorItem { Identifier = SID_SET_SUB_SCRIPT;\
-                                        ACC_DEF_KEY(        KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY(    de ,        KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_P, TRUE,  TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_UNDERLINE      AcceleratorItem { Identifier = SID_ATTR_CHAR_UNDERLINE;\
-                                        ACC_DEF_KEY(        KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da,        KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl,        KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,       KEY_U, FALSE, TRUE, FALSE ) };
-
-#define AI_STYLE_CATALOG            ACC_CODE( SID_STYLE_CATALOG, KEY_F11, FALSE, TRUE, FALSE )
-#define AI_WIN_FULLSCREEN           ACC_CODE( SID_WIN_FULLSCREEN, KEY_J, TRUE, TRUE, FALSE )
-
-#define AI_FOCUSURLBOX              ACC_CODE( SID_FOCUSURLBOX, KEY_O, TRUE, TRUE, FALSE )
-#define AI_SELECTALL                ACC_CODE( SID_SELECTALL, KEY_A, FALSE, TRUE, FALSE )
-
-// Anordnung
-#define AI_FRAME_TO_TOP             ACC_CODE( SID_FRAME_TO_TOP, KEY_ADD, TRUE, TRUE, FALSE )
-#define AI_MOREFRONT                ACC_CODE( SID_MOREFRONT, KEY_ADD, FALSE, TRUE, FALSE )
-#define AI_FRAME_TO_BOTTOM          ACC_CODE( SID_FRAME_TO_BOTTOM, KEY_SUBTRACT, TRUE, TRUE, FALSE )
-#define AI_MOREBACK                 ACC_CODE( SID_MOREBACK, KEY_SUBTRACT, FALSE, TRUE, FALSE )
-
-// sonstige Acceleratoren
-#define AI_NEWDOC                   ACC_CODE( SID_NEWDOC, KEY_N, TRUE, TRUE, FALSE )
-#define AI_NEWDOCDIRECT             ACC_CODE( SID_NEWDOCDIRECT, KEY_N, FALSE, TRUE, FALSE )
-#define AI_OPENDOC                  ACC_CODE( SID_OPENDOC, KEY_O, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_OPENDOC, KEY_OPEN, FALSE, FALSE, FALSE )
-#define AI_CLOSEWIN                 ACC_CODE( SID_CLOSEWIN, KEY_W, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_CLOSEWIN, KEY_F4, FALSE, TRUE, FALSE )
-#define AI_SAVEDOC                  ACC_CODE( SID_SAVEDOC, KEY_S, FALSE, TRUE, FALSE )
-#define AI_PRINTDOC                 ACC_CODE( SID_PRINTDOC, KEY_P, FALSE, TRUE, FALSE )
-#define AI_QUITAPP                  ACC_CODE( SID_QUITAPP, KEY_Q, FALSE, TRUE, FALSE )
-#define AI_CUT                      ACC_CODE( SID_CUT, KEY_X, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_CUT, KEY_DELETE, TRUE, FALSE, FALSE ) \
-                                    ACC_CODE( SID_CUT, KEY_CUT, FALSE, FALSE, FALSE )
-#define AI_COPY                     ACC_CODE( SID_COPY, KEY_C, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_COPY, KEY_INSERT, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_COPY, KEY_COPY, FALSE, FALSE, FALSE )
-#define AI_PASTE                    ACC_CODE( SID_PASTE, KEY_V, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_PASTE, KEY_INSERT, TRUE, FALSE, FALSE ) \
-                                    ACC_CODE( SID_PASTE, KEY_PASTE, FALSE, FALSE, FALSE )
-#define AI_UNDO                     ACC_CODE( SID_UNDO, KEY_Z, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_UNDO, KEY_BACKSPACE, FALSE, FALSE, TRUE ) \
-                                    ACC_CODE( SID_UNDO, KEY_UNDO, FALSE, FALSE, FALSE )
-#define AI_REDO                     ACC_CODE( SID_REDO, KEY_Y, FALSE, TRUE, FALSE )
-#define AI_REPEAT                   ACC_CODE( SID_REPEAT, KEY_REPEAT, FALSE, FALSE, FALSE )
-#define AI_DELETE                   ACC_CODE( SID_DELETE, KEY_DELETE, FALSE, FALSE, FALSE )
-
-#endif // _GLOBLACC_SRC
-
-
-
-
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index b53064312a38..59d156f82018 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -55,7 +55,6 @@
 #include "boost/scoped_ptr.hpp"
 #include "boost/shared_ptr.hpp"
 #include "boost/spirit/include/classic_core.hpp"
-#include "bootstrp/sstring.hxx"
 #include "com/sun/star/accessibility/AccessibleEventId.hpp"
 #include "com/sun/star/accessibility/AccessibleEventObject.hpp"
 #include "com/sun/star/accessibility/AccessibleRelationType.hpp"
diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx
index 5b6e0ab9ab35..5b6e0ab9ab35 100644
--- a/svx/inc/ActionDescriptionProvider.hxx
+++ b/svx/inc/svx/ActionDescriptionProvider.hxx
diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx
index 501b350eef05..501b350eef05 100644
--- a/svx/inc/DescriptionGenerator.hxx
+++ b/svx/inc/svx/DescriptionGenerator.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx
index b3b944513e60..b3b944513e60 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/inc/svx/EnhancedCustomShape2d.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
index 2ee9824ce547..2ee9824ce547 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
index 054af2e3af41..054af2e3af41 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
diff --git a/svx/inc/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx
index 6b0ec247a39e..6b0ec247a39e 100644
--- a/svx/inc/ParseContext.hxx
+++ b/svx/inc/svx/ParseContext.hxx
diff --git a/svx/inc/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx
index 7e3a1be005b8..7e3a1be005b8 100644
--- a/svx/inc/UnoNamespaceMap.hxx
+++ b/svx/inc/svx/UnoNamespaceMap.hxx
diff --git a/svx/inc/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx
index 59ca1e1e086a..59ca1e1e086a 100644
--- a/svx/inc/XPropertyTable.hxx
+++ b/svx/inc/svx/XPropertyTable.hxx
diff --git a/svx/inc/anchorid.hxx b/svx/inc/svx/anchorid.hxx
index 976d0dc504c6..976d0dc504c6 100644
--- a/svx/inc/anchorid.hxx
+++ b/svx/inc/svx/anchorid.hxx
diff --git a/svx/inc/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx
index 1cb9c2068f01..1cb9c2068f01 100644
--- a/svx/inc/chrtitem.hxx
+++ b/svx/inc/svx/chrtitem.hxx
diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx
index 22480ab1e728..22480ab1e728 100644
--- a/svx/inc/clipboardctl.hxx
+++ b/svx/inc/svx/clipboardctl.hxx
diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx
index 74687d56d38b..74687d56d38b 100644
--- a/svx/inc/clipfmtitem.hxx
+++ b/svx/inc/svx/clipfmtitem.hxx
diff --git a/svx/inc/connctrl.hxx b/svx/inc/svx/connctrl.hxx
index 468fffcc43b7..468fffcc43b7 100644
--- a/svx/inc/connctrl.hxx
+++ b/svx/inc/svx/connctrl.hxx
diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx
index 123e5af7d5a8..123e5af7d5a8 100644
--- a/svx/inc/databaseregistrationui.hxx
+++ b/svx/inc/svx/databaseregistrationui.hxx
diff --git a/svx/inc/dbexch.hrc b/svx/inc/svx/dbexch.hrc
index faa2274987cd..faa2274987cd 100644
--- a/svx/inc/dbexch.hrc
+++ b/svx/inc/svx/dbexch.hrc
diff --git a/svx/inc/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx
index 3b63ac1f4b4d..3b63ac1f4b4d 100644
--- a/svx/inc/dialcontrol.hxx
+++ b/svx/inc/svx/dialcontrol.hxx
diff --git a/svx/inc/dlgutil.hxx b/svx/inc/svx/dlgutil.hxx
index 9f0d5190daed..9f0d5190daed 100644
--- a/svx/inc/dlgutil.hxx
+++ b/svx/inc/svx/dlgutil.hxx
diff --git a/svx/inc/drawitem.hxx b/svx/inc/svx/drawitem.hxx
index 9bfdb5cfd87a..9bfdb5cfd87a 100644
--- a/svx/inc/drawitem.hxx
+++ b/svx/inc/svx/drawitem.hxx
diff --git a/svx/inc/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx
index 43fd292ddb36..43fd292ddb36 100644
--- a/svx/inc/flagsdef.hxx
+++ b/svx/inc/svx/flagsdef.hxx
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 432d78b211ad..4b6fd22b2587 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -37,7 +37,7 @@
 #endif
 #include <sfx2/dockwin.hxx>
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #include <svtools/valueset.hxx>
 #include <svtools/stdctrl.hxx>
diff --git a/svx/inc/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx
index 886db3280d60..886db3280d60 100644
--- a/svx/inc/fmgridif.hxx
+++ b/svx/inc/svx/fmgridif.hxx
diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx
index 7d10ea2ab7b4..7d10ea2ab7b4 100644
--- a/svx/inc/fmobjfac.hxx
+++ b/svx/inc/svx/fmobjfac.hxx
diff --git a/svx/source/inc/fmresids.hrc b/svx/inc/svx/fmresids.hrc
index f6843801e522..f6843801e522 100644
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/inc/svx/fmresids.hrc
diff --git a/svx/source/inc/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx
index 3705f32b7494..3705f32b7494 100644
--- a/svx/source/inc/fmsrccfg.hxx
+++ b/svx/inc/svx/fmsrccfg.hxx
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx
index 3a3af0ac7d8f..3a3af0ac7d8f 100644
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/inc/svx/fmsrcimp.hxx
diff --git a/svx/inc/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index 813b01ba390f..813b01ba390f 100644
--- a/svx/inc/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx
index 40ac3cef966a..40ac3cef966a 100644
--- a/svx/inc/fontworkgallery.hxx
+++ b/svx/inc/svx/fontworkgallery.hxx
diff --git a/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx
index b380e051daf8..b380e051daf8 100644
--- a/svx/inc/formatpaintbrushctrl.hxx
+++ b/svx/inc/svx/formatpaintbrushctrl.hxx
diff --git a/svx/inc/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index f54901db543d..f54901db543d 100644
--- a/svx/inc/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
diff --git a/svx/inc/galctrl.hxx b/svx/inc/svx/galctrl.hxx
index 3acf53dbeddb..3acf53dbeddb 100644
--- a/svx/inc/galctrl.hxx
+++ b/svx/inc/svx/galctrl.hxx
diff --git a/svx/inc/gallery.hxx b/svx/inc/svx/gallery.hxx
index 68a5c68539f1..68a5c68539f1 100644
--- a/svx/inc/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
diff --git a/svx/inc/galtheme.hxx b/svx/inc/svx/galtheme.hxx
index aa77bba25d26..aa77bba25d26 100644
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/svx/galtheme.hxx
diff --git a/svx/inc/globl3d.hxx b/svx/inc/svx/globl3d.hxx
index 1560f96dc1f5..1560f96dc1f5 100644
--- a/svx/inc/globl3d.hxx
+++ b/svx/inc/svx/globl3d.hxx
diff --git a/svx/inc/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx
index 0c68f73f48f6..0c68f73f48f6 100644
--- a/svx/inc/grafctrl.hxx
+++ b/svx/inc/svx/grafctrl.hxx
diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx
index b9540e8845ca..b9540e8845ca 100644
--- a/svx/inc/hlnkitem.hxx
+++ b/svx/inc/svx/hlnkitem.hxx
diff --git a/svx/inc/htmlmode.hxx b/svx/inc/svx/htmlmode.hxx
index dab1b5b1db70..dab1b5b1db70 100644
--- a/svx/inc/htmlmode.hxx
+++ b/svx/inc/svx/htmlmode.hxx
diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx
index fc129763e63f..fc129763e63f 100644
--- a/svx/inc/hyperdlg.hxx
+++ b/svx/inc/svx/hyperdlg.hxx
diff --git a/svx/source/dialog/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx
index 0a5af0afae82..0a5af0afae82 100644
--- a/svx/source/dialog/hyprlink.hxx
+++ b/svx/inc/svx/hyprlink.hxx
diff --git a/svx/inc/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx
index d1a6961453a5..d1a6961453a5 100644
--- a/svx/inc/imapdlg.hxx
+++ b/svx/inc/svx/imapdlg.hxx
diff --git a/svx/inc/insctrl.hxx b/svx/inc/svx/insctrl.hxx
index e7fa02c70d91..e7fa02c70d91 100644
--- a/svx/inc/insctrl.hxx
+++ b/svx/inc/svx/insctrl.hxx
diff --git a/svx/inc/layctrl.hxx b/svx/inc/svx/layctrl.hxx
index 1bbdc714b7c9..1bbdc714b7c9 100644
--- a/svx/inc/layctrl.hxx
+++ b/svx/inc/svx/layctrl.hxx
diff --git a/svx/inc/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx
index 36c82c64f44b..36c82c64f44b 100644
--- a/svx/inc/lboxctrl.hxx
+++ b/svx/inc/svx/lboxctrl.hxx
diff --git a/svx/inc/linectrl.hxx b/svx/inc/svx/linectrl.hxx
index 43c96f128671..43c96f128671 100644
--- a/svx/inc/linectrl.hxx
+++ b/svx/inc/svx/linectrl.hxx
diff --git a/svx/inc/measctrl.hxx b/svx/inc/svx/measctrl.hxx
index d45dc134cf19..d45dc134cf19 100644
--- a/svx/inc/measctrl.hxx
+++ b/svx/inc/svx/measctrl.hxx
diff --git a/svx/inc/modctrl.hxx b/svx/inc/svx/modctrl.hxx
index fd9e085c826e..fd9e085c826e 100644
--- a/svx/inc/modctrl.hxx
+++ b/svx/inc/svx/modctrl.hxx
diff --git a/svx/inc/numvset.hxx b/svx/inc/svx/numvset.hxx
index d174e1d6fba5..d174e1d6fba5 100644
--- a/svx/inc/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
diff --git a/svx/inc/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx
index 6ce30853f441..6ce30853f441 100644
--- a/svx/inc/objfac3d.hxx
+++ b/svx/inc/svx/objfac3d.hxx
diff --git a/svx/inc/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx
index 50f18ccb9ed9..50f18ccb9ed9 100644
--- a/svx/inc/ofaitem.hxx
+++ b/svx/inc/svx/ofaitem.hxx
diff --git a/svx/inc/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx
index 50520aac0204..50520aac0204 100644
--- a/svx/inc/optgenrl.hxx
+++ b/svx/inc/svx/optgenrl.hxx
diff --git a/svx/inc/optgrid.hxx b/svx/inc/svx/optgrid.hxx
index 6dd2a5f9371d..6dd2a5f9371d 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/svx/optgrid.hxx
diff --git a/svx/inc/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx
index 7508740b62d6..7508740b62d6 100644
--- a/svx/inc/orienthelper.hxx
+++ b/svx/inc/svx/orienthelper.hxx
diff --git a/svx/inc/passwd.hxx b/svx/inc/svx/passwd.hxx
index 9a6b14f0144a..9a6b14f0144a 100644
--- a/svx/inc/passwd.hxx
+++ b/svx/inc/svx/passwd.hxx
diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx
index 93d99c4774a2..93d99c4774a2 100644
--- a/svx/inc/pfiledlg.hxx
+++ b/svx/inc/svx/pfiledlg.hxx
diff --git a/svx/inc/postattr.hxx b/svx/inc/svx/postattr.hxx
index 840312cf0c46..840312cf0c46 100644
--- a/svx/inc/postattr.hxx
+++ b/svx/inc/svx/postattr.hxx
diff --git a/svx/inc/prtqry.hxx b/svx/inc/svx/prtqry.hxx
index ce7ae239215f..ce7ae239215f 100644
--- a/svx/inc/prtqry.hxx
+++ b/svx/inc/svx/prtqry.hxx
diff --git a/svx/inc/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx
index 54ec2788521f..54ec2788521f 100644
--- a/svx/inc/pszctrl.hxx
+++ b/svx/inc/svx/pszctrl.hxx
diff --git a/svx/inc/relfld.hxx b/svx/inc/svx/relfld.hxx
index 02d9ca20a5d3..02d9ca20a5d3 100644
--- a/svx/inc/relfld.hxx
+++ b/svx/inc/svx/relfld.hxx
diff --git a/svx/inc/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx
index 8177713e6013..8177713e6013 100644
--- a/svx/inc/rotmodit.hxx
+++ b/svx/inc/svx/rotmodit.hxx
diff --git a/svx/inc/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx
index e8deecfed145..e8deecfed145 100644
--- a/svx/inc/rubydialog.hxx
+++ b/svx/inc/svx/rubydialog.hxx
diff --git a/svx/inc/rulritem.hxx b/svx/inc/svx/rulritem.hxx
index f6b81e1eedb8..f6b81e1eedb8 100644
--- a/svx/inc/rulritem.hxx
+++ b/svx/inc/svx/rulritem.hxx
diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx
index fef8c2e604d0..fef8c2e604d0 100644
--- a/svx/inc/sdrpaintwindow.hxx
+++ b/svx/inc/svx/sdrpaintwindow.hxx
diff --git a/svx/inc/selctrl.hxx b/svx/inc/svx/selctrl.hxx
index 5d7fac4f4a5e..5d7fac4f4a5e 100644
--- a/svx/inc/selctrl.hxx
+++ b/svx/inc/svx/selctrl.hxx
diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx
index bd1d3e8f60d0..85ba02eb0e41 100644
--- a/svx/inc/svx/splitcelldlg.hxx
+++ b/svx/inc/svx/splitcelldlg.hxx
@@ -29,7 +29,7 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/button.hxx>
 
 #include <svx/stddlg.hxx>
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 29aec84fae24..0253f61a7785 100644
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -118,7 +118,7 @@ public:
 // class SvxSearchDialog -------------------------------------------------
 
 /*
-    {k:\svx\prototyp\dialog\srchdlg.hxx}
+    {k:\svx\prototyp\dialog\svx/srchdlg.hxx}
 
     [Beschreibung]
     In diesem Modeless-Dialog werden die Attribute einer Suche eingestellt
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svx/svdglob.hxx
index 588869ff9890..588869ff9890 100644
--- a/svx/inc/svdglob.hxx
+++ b/svx/inc/svx/svdglob.hxx
diff --git a/svx/inc/svditer.hxx b/svx/inc/svx/svditer.hxx
index 8ab6c32ea061..8ab6c32ea061 100644
--- a/svx/inc/svditer.hxx
+++ b/svx/inc/svx/svditer.hxx
diff --git a/svx/source/svdraw/svditext.hxx b/svx/inc/svx/svditext.hxx
index b181b4046f9e..b181b4046f9e 100644
--- a/svx/source/svdraw/svditext.hxx
+++ b/svx/inc/svx/svditext.hxx
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svx/svdstr.hrc
index d778bf40326b..d778bf40326b 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svx/svdstr.hrc
diff --git a/svx/inc/svdviter.hxx b/svx/inc/svx/svdviter.hxx
index 884733bc2d84..884733bc2d84 100644
--- a/svx/inc/svdviter.hxx
+++ b/svx/inc/svx/svdviter.hxx
diff --git a/svx/inc/svimbase.hxx b/svx/inc/svx/svimbase.hxx
index ba10f76b01f9..ba10f76b01f9 100644
--- a/svx/inc/svimbase.hxx
+++ b/svx/inc/svx/svimbase.hxx
diff --git a/svx/inc/svxerr.hxx b/svx/inc/svx/svxerr.hxx
index 0fd197f1a5f5..0fd197f1a5f5 100644
--- a/svx/inc/svxerr.hxx
+++ b/svx/inc/svx/svxerr.hxx
diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx
index fdd757b1a91b..fdd757b1a91b 100644
--- a/svx/inc/svxgrahicitem.hxx
+++ b/svx/inc/svx/svxgrahicitem.hxx
diff --git a/svx/inc/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx
index 843ff2a487af..843ff2a487af 100644
--- a/svx/inc/swframeexample.hxx
+++ b/svx/inc/svx/swframeexample.hxx
diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/svx/swframeposstrings.hxx
index 7ba005dc1e76..7ba005dc1e76 100644
--- a/svx/inc/swframeposstrings.hxx
+++ b/svx/inc/svx/swframeposstrings.hxx
diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/svx/swframevalidation.hxx
index 600479718050..600479718050 100644
--- a/svx/inc/swframevalidation.hxx
+++ b/svx/inc/svx/swframevalidation.hxx
diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx
index 873dbc576f7c..a197e110f8ab 100644
--- a/svx/inc/svx/tabarea.hxx
+++ b/svx/inc/svx/tabarea.hxx
@@ -31,7 +31,7 @@
 
 #include <svtools/valueset.hxx>
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx
index 7ccc189b0083..dd4d6033960c 100644
--- a/svx/inc/svx/tabline.hxx
+++ b/svx/inc/svx/tabline.hxx
@@ -30,7 +30,7 @@
 // include ---------------------------------------------------------------
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
diff --git a/svx/inc/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx
index 669b03e87c73..669b03e87c73 100644
--- a/svx/inc/tbxalign.hxx
+++ b/svx/inc/svx/tbxalign.hxx
diff --git a/svx/inc/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx
index 848c015c2995..848c015c2995 100644
--- a/svx/inc/tbxcolor.hxx
+++ b/svx/inc/svx/tbxcolor.hxx
diff --git a/svx/inc/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx
index 39bfc09cf8b1..39bfc09cf8b1 100644
--- a/svx/inc/tbxctl.hxx
+++ b/svx/inc/svx/tbxctl.hxx
diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx
index 21aa3ea871ed..21aa3ea871ed 100644
--- a/svx/inc/tbxcustomshapes.hxx
+++ b/svx/inc/svx/tbxcustomshapes.hxx
diff --git a/svx/inc/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx
index 8f071f38792b..8f071f38792b 100644
--- a/svx/inc/tbxdraw.hxx
+++ b/svx/inc/svx/tbxdraw.hxx
diff --git a/svx/inc/txencbox.hxx b/svx/inc/svx/txencbox.hxx
index e24716f8c953..e24716f8c953 100644
--- a/svx/inc/txencbox.hxx
+++ b/svx/inc/svx/txencbox.hxx
diff --git a/svx/inc/txenctab.hxx b/svx/inc/svx/txenctab.hxx
index e04428717c53..e04428717c53 100644
--- a/svx/inc/txenctab.hxx
+++ b/svx/inc/svx/txenctab.hxx
diff --git a/svx/inc/unoapi.hxx b/svx/inc/svx/unoapi.hxx
index 6a990a8d1c70..6a990a8d1c70 100644
--- a/svx/inc/unoapi.hxx
+++ b/svx/inc/svx/unoapi.hxx
diff --git a/svx/inc/unofill.hxx b/svx/inc/svx/unofill.hxx
index 8c1a196b00d7..8c1a196b00d7 100644
--- a/svx/inc/unofill.hxx
+++ b/svx/inc/svx/unofill.hxx
diff --git a/svx/inc/unomaster.hxx b/svx/inc/svx/unomaster.hxx
index 06f716705233..06f716705233 100644
--- a/svx/inc/unomaster.hxx
+++ b/svx/inc/svx/unomaster.hxx
diff --git a/svx/inc/unopool.hxx b/svx/inc/svx/unopool.hxx
index c34105efb448..c34105efb448 100644
--- a/svx/inc/unopool.hxx
+++ b/svx/inc/svx/unopool.hxx
diff --git a/svx/inc/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx
index 422f6fc24029..422f6fc24029 100644
--- a/svx/inc/unoshcol.hxx
+++ b/svx/inc/svx/unoshcol.hxx
diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx
index 8c350e31918b..8c350e31918b 100644
--- a/svx/inc/verttexttbxctrl.hxx
+++ b/svx/inc/svx/verttexttbxctrl.hxx
diff --git a/svx/inc/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx
index 1b4d745c55f8..1b4d745c55f8 100644
--- a/svx/inc/wrapfield.hxx
+++ b/svx/inc/svx/wrapfield.hxx
diff --git a/svx/inc/xattr.hxx b/svx/inc/svx/xattr.hxx
index 20035f7743e7..20035f7743e7 100644
--- a/svx/inc/xattr.hxx
+++ b/svx/inc/svx/xattr.hxx
diff --git a/svx/inc/xexch.hxx b/svx/inc/svx/xexch.hxx
index ff317f0a7541..ff317f0a7541 100644
--- a/svx/inc/xexch.hxx
+++ b/svx/inc/svx/xexch.hxx
diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx
index 211e17ca1801..211e17ca1801 100644
--- a/svx/inc/xmleohlp.hxx
+++ b/svx/inc/svx/xmleohlp.hxx
diff --git a/svx/inc/xmlexchg.hxx b/svx/inc/svx/xmlexchg.hxx
index f4820e0eb6fe..f4820e0eb6fe 100644
--- a/svx/inc/xmlexchg.hxx
+++ b/svx/inc/svx/xmlexchg.hxx
diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx
index e17c78cd5ccb..e17c78cd5ccb 100644
--- a/svx/inc/xmlgrhlp.hxx
+++ b/svx/inc/svx/xmlgrhlp.hxx
diff --git a/svx/inc/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx
index aa1a38f183bd..aa1a38f183bd 100644
--- a/svx/inc/xmlsecctrl.hxx
+++ b/svx/inc/svx/xmlsecctrl.hxx
diff --git a/svx/inc/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx
index 726eb2f83d9c..726eb2f83d9c 100644
--- a/svx/inc/xoutbmp.hxx
+++ b/svx/inc/svx/xoutbmp.hxx
diff --git a/svx/inc/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx
index 7788bb1023f1..7788bb1023f1 100644
--- a/svx/inc/zoom_def.hxx
+++ b/svx/inc/svx/zoom_def.hxx
diff --git a/svx/inc/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx
index ea3ecdb33025..ea3ecdb33025 100644
--- a/svx/inc/zoomctrl.hxx
+++ b/svx/inc/svx/zoomctrl.hxx
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index fe15afbdf469..a07db5dbe093 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -2,6 +2,9 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 mkdir: %COMMON_DEST%\res%_EXT%
 mkdir: %_DEST%\xml%_EXT%\uiconfig
 mkdir: %_DEST%\xml%_EXT%\uiconfig\global
+mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator
+mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US
+mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es
 
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
 ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
@@ -20,442 +23,12 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi
 ..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi
 
-..\source\inc\fmsrccfg.hxx %_DEST%\inc%_EXT%\svx\fmsrccfg.hxx
-..\source\inc\fmsrcimp.hxx %_DEST%\inc%_EXT%\svx\fmsrcimp.hxx
-..\inc\galtheme.hxx %_DEST%\inc%_EXT%\svx\galtheme.hxx
-..\inc\galctrl.hxx %_DEST%\inc%_EXT%\svx\galctrl.hxx
-..\inc\svx\galmisc.hxx %_DEST%\inc%_EXT%\svx\galmisc.hxx
-..\inc\svx\gallery1.hxx %_DEST%\inc%_EXT%\svx\gallery1.hxx
-..\inc\svx\fmtools.hxx %_DEST%\inc%_EXT%\svx\fmtools.hxx
-..\inc\svx\exthelpid.hrc %_DEST%\inc%_EXT%\svx\exthelpid.hrc
+..\inc\svx\*.hxx %_DEST%\inc%_EXT%\svx\*.hxx
+..\inc\svx\*.h %_DEST%\inc%_EXT%\svx\*.h
+..\inc\svx\*.hrc %_DEST%\inc%_EXT%\svx\*.hrc
 
-..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx
 ..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx
 ..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc
-..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc
-..\source\dialog\hyprlink.hxx %_DEST%\inc%_EXT%\svx\hyprlink.hxx
-
-../source/customshapes/EnhancedCustomShapeTypeNames.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeTypeNames.hxx
-../source/customshapes/EnhancedCustomShapeGeometry.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeGeometry.hxx
-../inc/svx/EnhancedCustomShapeFunctionParser.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeFunctionParser.hxx
-../source/customshapes/EnhancedCustomShape2d.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShape2d.hxx
-../inc/xattr.hxx %_DEST%\inc%_EXT%\svx\xattr.hxx
-../inc/svdglob.hxx %_DEST%\inc%_EXT%\svx\svdglob.hxx
-../source/svdraw/svditext.hxx %_DEST%\inc%_EXT%\svx\svditext.hxx
-
-..\inc\ActionDescriptionProvider.hxx %_DEST%\inc%_EXT%\svx\ActionDescriptionProvider.hxx
-..\inc\anchorid.hxx %_DEST%\inc%_EXT%\svx\anchorid.hxx
-..\inc\chrtitem.hxx %_DEST%\inc%_EXT%\svx\chrtitem.hxx
-..\inc\clipboardctl.hxx %_DEST%\inc%_EXT%\svx\clipboardctl.hxx
-..\inc\clipfmtitem.hxx %_DEST%\inc%_EXT%\svx\clipfmtitem.hxx
-..\inc\connctrl.hxx %_DEST%\inc%_EXT%\svx\connctrl.hxx
-..\inc\databaseregistrationui.hxx %_DEST%\inc%_EXT%\svx\databaseregistrationui.hxx
-..\inc\dbexch.hrc %_DEST%\inc%_EXT%\svx\dbexch.hrc
-..\inc\DescriptionGenerator.hxx %_DEST%\inc%_EXT%\svx\DescriptionGenerator.hxx
-..\inc\dialcontrol.hxx %_DEST%\inc%_EXT%\svx\dialcontrol.hxx
-..\inc\dlgutil.hxx %_DEST%\inc%_EXT%\svx\dlgutil.hxx
-..\inc\drawitem.hxx %_DEST%\inc%_EXT%\svx\drawitem.hxx
-..\inc\editstat.hxx %_DEST%\inc%_EXT%\svx\editstat.hxx
-..\inc\editund2.hxx %_DEST%\inc%_EXT%\svx\editund2.hxx
-..\inc\eerdll.hxx %_DEST%\inc%_EXT%\svx\editdll.hxx
-..\inc\flstitem.hxx %_DEST%\inc%_EXT%\svx\flstitem.hxx
-..\inc\extrusioncontrols.hxx %_DEST%\inc%_EXT%\svx\extrusioncontrols.hxx
-..\inc\fmgridif.hxx %_DEST%\inc%_EXT%\svx\fmgridif.hxx
-..\inc\fmobjfac.hxx %_DEST%\inc%_EXT%\svx\fmobjfac.hxx
-..\inc\fontlb.hxx %_DEST%\inc%_EXT%\svx\fontlb.hxx
-..\inc\fontworkgallery.hxx %_DEST%\inc%_EXT%\svx\fontworkgallery.hxx
-..\inc\formatpaintbrushctrl.hxx %_DEST%\inc%_EXT%\svx\formatpaintbrushctrl.hxx
-..\inc\gallery.hxx %_DEST%\inc%_EXT%\svx\gallery.hxx
-..\inc\galbrws.hxx %_DEST%\inc%_EXT%\svx\galbrws.hxx
-..\inc\globlac.hrc %_DEST%\inc%_EXT%\svx\globlac.hrc
-..\inc\globl3d.hxx %_DEST%\inc%_EXT%\svx\globl3d.hxx
-..\inc\grafctrl.hxx %_DEST%\inc%_EXT%\svx\grafctrl.hxx
-..\inc\hlnkitem.hxx %_DEST%\inc%_EXT%\svx\hlnkitem.hxx
-..\inc\htmlmode.hxx %_DEST%\inc%_EXT%\svx\htmlmode.hxx
-..\inc\hyperdlg.hxx %_DEST%\inc%_EXT%\svx\hyperdlg.hxx
-..\inc\imapdlg.hxx %_DEST%\inc%_EXT%\svx\imapdlg.hxx
-..\inc\insctrl.hxx %_DEST%\inc%_EXT%\svx\insctrl.hxx
-..\inc\layctrl.hxx %_DEST%\inc%_EXT%\svx\layctrl.hxx
-..\inc\lboxctrl.hxx %_DEST%\inc%_EXT%\svx\lboxctrl.hxx
-..\inc\linectrl.hxx %_DEST%\inc%_EXT%\svx\linectrl.hxx
-..\inc\measctrl.hxx %_DEST%\inc%_EXT%\svx\measctrl.hxx
-..\inc\modctrl.hxx %_DEST%\inc%_EXT%\svx\modctrl.hxx
-..\inc\numvset.hxx %_DEST%\inc%_EXT%\svx\numvset.hxx
-..\inc\objfac3d.hxx %_DEST%\inc%_EXT%\svx\objfac3d.hxx
-..\inc\ofaitem.hxx %_DEST%\inc%_EXT%\svx\ofaitem.hxx
-..\inc\optgenrl.hxx %_DEST%\inc%_EXT%\svx\optgenrl.hxx
-..\inc\optgrid.hxx %_DEST%\inc%_EXT%\svx\optgrid.hxx
-..\inc\orienthelper.hxx %_DEST%\inc%_EXT%\svx\orienthelper.hxx
-..\inc\ParseContext.hxx %_DEST%\inc%_EXT%\svx\ParseContext.hxx
-..\inc\passwd.hxx %_DEST%\inc%_EXT%\svx\passwd.hxx
-..\inc\pfiledlg.hxx %_DEST%\inc%_EXT%\svx\pfiledlg.hxx
-..\inc\postattr.hxx %_DEST%\inc%_EXT%\svx\postattr.hxx
-..\inc\prtqry.hxx %_DEST%\inc%_EXT%\svx\prtqry.hxx
-..\inc\pszctrl.hxx %_DEST%\inc%_EXT%\svx\pszctrl.hxx
-..\inc\relfld.hxx %_DEST%\inc%_EXT%\svx\relfld.hxx
-..\inc\rotmodit.hxx %_DEST%\inc%_EXT%\svx\rotmodit.hxx
-..\inc\rubydialog.hxx %_DEST%\inc%_EXT%\svx\rubydialog.hxx
-..\inc\rulritem.hxx %_DEST%\inc%_EXT%\svx\rulritem.hxx
-..\inc\sdrpaintwindow.hxx %_DEST%\inc%_EXT%\svx\sdrpaintwindow.hxx
-..\inc\selctrl.hxx %_DEST%\inc%_EXT%\svx\selctrl.hxx
-..\inc\srchdlg.hxx %_DEST%\inc%_EXT%\svx\srchdlg.hxx
-..\inc\srchitem.hxx %_DEST%\inc%_EXT%\svx\srchitem.hxx
-..\inc\svditer.hxx %_DEST%\inc%_EXT%\svx\svditer.hxx
-..\inc\svdstr.hrc %_DEST%\inc%_EXT%\svx\svdstr.hrc
-..\inc\svdviter.hxx %_DEST%\inc%_EXT%\svx\svdviter.hxx
-..\inc\svimbase.hxx %_DEST%\inc%_EXT%\svx\svimbase.hxx
-..\inc\svxerr.hxx %_DEST%\inc%_EXT%\svx\svxerr.hxx
-..\inc\svxgrahicitem.hxx %_DEST%\inc%_EXT%\svx\svxgrahicitem.hxx
-..\inc\swframeposstrings.hxx %_DEST%\inc%_EXT%\svx\swframeposstrings.hxx
-..\inc\swframevalidation.hxx %_DEST%\inc%_EXT%\svx\swframevalidation.hxx
-..\inc\swframeexample.hxx %_DEST%\inc%_EXT%\svx\swframeexample.hxx
-..\inc\tbxalign.hxx %_DEST%\inc%_EXT%\svx\tbxalign.hxx
-..\inc\tbxcolor.hxx %_DEST%\inc%_EXT%\svx\tbxcolor.hxx
-..\inc\tbxctl.hxx %_DEST%\inc%_EXT%\svx\tbxctl.hxx
-..\inc\tbxcustomshapes.hxx %_DEST%\inc%_EXT%\svx\tbxcustomshapes.hxx
-..\inc\tbxdraw.hxx %_DEST%\inc%_EXT%\svx\tbxdraw.hxx
-..\inc\txencbox.hxx %_DEST%\inc%_EXT%\svx\txencbox.hxx
-..\inc\txenctab.hxx %_DEST%\inc%_EXT%\svx\txenctab.hxx
-..\inc\unoapi.hxx %_DEST%\inc%_EXT%\svx\unoapi.hxx
-..\inc\unofill.hxx %_DEST%\inc%_EXT%\svx\unofill.hxx
-..\inc\unomaster.hxx %_DEST%\inc%_EXT%\svx\unomaster.hxx
-..\inc\UnoNamespaceMap.hxx %_DEST%\inc%_EXT%\svx\UnoNamespaceMap.hxx
-..\inc\unopool.hxx %_DEST%\inc%_EXT%\svx\unopool.hxx
-..\inc\unoshcol.hxx %_DEST%\inc%_EXT%\svx\unoshcol.hxx
-..\inc\verttexttbxctrl.hxx %_DEST%\inc%_EXT%\svx\verttexttbxctrl.hxx
-..\inc\wrapfield.hxx %_DEST%\inc%_EXT%\svx\wrapfield.hxx
-..\inc\xexch.hxx %_DEST%\inc%_EXT%\svx\xexch.hxx
-..\inc\xmleohlp.hxx %_DEST%\inc%_EXT%\svx\xmleohlp.hxx
-..\inc\xmlexchg.hxx %_DEST%\inc%_EXT%\svx\xmlexchg.hxx
-..\inc\xmlgrhlp.hxx %_DEST%\inc%_EXT%\svx\xmlgrhlp.hxx
-..\inc\xmlsecctrl.hxx %_DEST%\inc%_EXT%\svx\xmlsecctrl.hxx
-..\inc\xoutbmp.hxx %_DEST%\inc%_EXT%\svx\xoutbmp.hxx
-..\inc\XPropertyTable.hxx %_DEST%\inc%_EXT%\svx\XPropertyTable.hxx
-..\inc\zoom_def.hxx %_DEST%\inc%_EXT%\svx\zoom_def.hxx
-..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx
-
-..\inc\svx\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx
-..\inc\svx\dstribut_enum.hxx %_DEST%\inc%_EXT%\svx\dstribut_enum.hxx
-..\inc\svx\svdfield.hxx %_DEST%\inc%_EXT%\svx\svdfield.hxx
-..\inc\svx\svxitems.hrc %_DEST%\inc%_EXT%\svx\svxitems.hrc
-..\inc\svx\svddef.hxx %_DEST%\inc%_EXT%\svx\svddef.hxx
-..\inc\svx\ipolypolygoneditorcontroller.hxx %_DEST%\inc%_EXT%\svx\ipolypolygoneditorcontroller.hxx
-..\inc\svx\polypolygoneditor.hxx %_DEST%\inc%_EXT%\svx\polypolygoneditor.hxx
-..\inc\svx\svdsob.hxx %_DEST%\inc%_EXT%\svx\svdsob.hxx
-..\inc\svx\svdlayer.hxx %_DEST%\inc%_EXT%\svx\svdlayer.hxx
-..\inc\svx\algitem.hxx %_DEST%\inc%_EXT%\svx\algitem.hxx
-..\inc\svx\simptabl.hxx %_DEST%\inc%_EXT%\svx\simptabl.hxx
-..\inc\svx\ctredlin.hxx %_DEST%\inc%_EXT%\svx\ctredlin.hxx
-..\inc\svx\bmpmask.hxx %_DEST%\inc%_EXT%\svx\bmpmask.hxx
-..\inc\svx\camera3d.hxx %_DEST%\inc%_EXT%\svx\camera3d.hxx
-..\inc\svx\charmap.hxx %_DEST%\inc%_EXT%\svx\charmap.hxx
-..\inc\svx\checklbx.hxx %_DEST%\inc%_EXT%\svx\checklbx.hxx
-..\inc\svx\contdlg.hxx %_DEST%\inc%_EXT%\svx\contdlg.hxx
-..\inc\svx\tabarea.hxx %_DEST%\inc%_EXT%\svx\tabarea.hxx
-..\inc\svx\tabline.hxx %_DEST%\inc%_EXT%\svx\tabline.hxx
-..\inc\svx\colrctrl.hxx %_DEST%\inc%_EXT%\svx\colrctrl.hxx
-..\inc\svx\cube3d.hxx %_DEST%\inc%_EXT%\svx\cube3d.hxx
-..\inc\svx\polygn3d.hxx %_DEST%\inc%_EXT%\svx\polygn3d.hxx
-..\inc\svx\lathe3d.hxx %_DEST%\inc%_EXT%\svx\lathe3d.hxx
-..\inc\svx\e3ditem.hxx %_DEST%\inc%_EXT%\svx\e3ditem.hxx
-..\inc\svx\def3d.hxx %_DEST%\inc%_EXT%\svx\def3d.hxx
-..\inc\svx\svdtypes.hxx %_DEST%\inc%_EXT%\svx\svdtypes.hxx
-..\inc\svx\volume3d.hxx %_DEST%\inc%_EXT%\svx\volume3d.hxx
-..\inc\svx\xenum.hxx %_DEST%\inc%_EXT%\svx\xenum.hxx
-..\inc\svx\dialmgr.hxx %_DEST%\inc%_EXT%\svx\dialmgr.hxx
-..\inc\svx\dlgctl3d.hxx %_DEST%\inc%_EXT%\svx\dlgctl3d.hxx
-..\inc\svx\dlgctrl.hxx %_DEST%\inc%_EXT%\svx\dlgctrl.hxx
-..\inc\svx\dialogs.hrc %_DEST%\inc%_EXT%\svx\dialogs.hrc
-..\inc\svx\extrud3d.hxx %_DEST%\inc%_EXT%\svx\extrud3d.hxx
-..\inc\svx\f3dchild.hxx %_DEST%\inc%_EXT%\svx\f3dchild.hxx
-..\inc\svx\fillctrl.hxx %_DEST%\inc%_EXT%\svx\fillctrl.hxx
-..\inc\svx\float3d.hxx %_DEST%\inc%_EXT%\svx\float3d.hxx
-..\inc\svx\fntctl.hxx %_DEST%\inc%_EXT%\svx\fntctl.hxx
-..\inc\svx\fntctrl.hxx %_DEST%\inc%_EXT%\svx\fntctrl.hxx
-..\inc\svx\fntszctl.hxx %_DEST%\inc%_EXT%\svx\fntszctl.hxx
-..\inc\svx\fontwork.hxx %_DEST%\inc%_EXT%\svx\fontwork.hxx
-..\inc\svx\framebordertype.hxx %_DEST%\inc%_EXT%\svx\framebordertype.hxx
-..\inc\svx\framelink.hxx %_DEST%\inc%_EXT%\svx\framelink.hxx
-..\inc\svx\framelinkarray.hxx %_DEST%\inc%_EXT%\svx\framelinkarray.hxx
-..\inc\svx\frmsel.hxx %_DEST%\inc%_EXT%\svx\frmsel.hxx
-..\inc\svx\graphctl.hxx %_DEST%\inc%_EXT%\svx\graphctl.hxx
-..\inc\svx\hdft.hxx %_DEST%\inc%_EXT%\svx\hdft2.hxx
-..\inc\svx\ifaceids.hxx %_DEST%\inc%_EXT%\svx\ifaceids.hxx
-..\inc\svx\itemwin.hxx %_DEST%\inc%_EXT%\svx\itemwin.hxx
-..\inc\svx\langbox.hxx %_DEST%\inc%_EXT%\svx\langbox.hxx
-..\inc\svx\numinf.hxx %_DEST%\inc%_EXT%\svx\numinf.hxx
-..\inc\svx\numfmtsh.hxx %_DEST%\inc%_EXT%\svx\numfmtsh.hxx
-..\inc\svx\obj3d.hxx %_DEST%\inc%_EXT%\svx\obj3d.hxx
-..\inc\svx\pagectrl.hxx %_DEST%\inc%_EXT%\svx\pagectrl.hxx
-..\inc\svx\pageitem.hxx %_DEST%\inc%_EXT%\svx\pageitem.hxx
-..\inc\svx\paraprev.hxx %_DEST%\inc%_EXT%\svx\paraprev.hxx
-..\inc\svx\polysc3d.hxx %_DEST%\inc%_EXT%\svx\polysc3d.hxx
-..\inc\svx\rectenum.hxx %_DEST%\inc%_EXT%\svx\rectenum.hxx
-..\inc\svx\ruler.hxx %_DEST%\inc%_EXT%\svx\ruler.hxx
-..\inc\svx\scene3d.hxx %_DEST%\inc%_EXT%\svx\scene3d.hxx
-..\inc\svx\e3dsceneupdater.hxx %_DEST%\inc%_EXT%\svx\e3dsceneupdater.hxx
-..\inc\svx\sdangitm.hxx %_DEST%\inc%_EXT%\svx\sdangitm.hxx
-..\inc\svx\sderitm.hxx %_DEST%\inc%_EXT%\svx\sderitm.hxx
-..\inc\svx\sdgcoitm.hxx %_DEST%\inc%_EXT%\svx\sdgcoitm.hxx
-..\inc\svx\sdgcpitm.hxx %_DEST%\inc%_EXT%\svx\sdgcpitm.hxx
-..\inc\svx\sdgluitm.hxx %_DEST%\inc%_EXT%\svx\sdgluitm.hxx
-..\inc\svx\sdginitm.hxx %_DEST%\inc%_EXT%\svx\sdginitm.hxx
-..\inc\svx\sdggaitm.hxx %_DEST%\inc%_EXT%\svx\sdggaitm.hxx
-..\inc\svx\sdgmoitm.hxx %_DEST%\inc%_EXT%\svx\sdgmoitm.hxx
-..\inc\svx\sdgtritm.hxx %_DEST%\inc%_EXT%\svx\sdgtritm.hxx
-..\inc\svx\sdmetitm.hxx %_DEST%\inc%_EXT%\svx\sdmetitm.hxx
-..\inc\svx\sdooitm.hxx %_DEST%\inc%_EXT%\svx\sdooitm.hxx
-..\inc\svx\sdprcitm.hxx %_DEST%\inc%_EXT%\svx\sdprcitm.hxx
-..\inc\svx\sdshcitm.hxx %_DEST%\inc%_EXT%\svx\sdshcitm.hxx
-..\inc\svx\sdshitm.hxx %_DEST%\inc%_EXT%\svx\sdshitm.hxx
-..\inc\svx\sdshtitm.hxx %_DEST%\inc%_EXT%\svx\sdshtitm.hxx
-..\inc\svx\sdsxyitm.hxx %_DEST%\inc%_EXT%\svx\sdsxyitm.hxx
-..\inc\svx\sdtaaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaaitm.hxx
-..\inc\svx\sdtacitm.hxx %_DEST%\inc%_EXT%\svx\sdtacitm.hxx
-..\inc\svx\sdtaditm.hxx %_DEST%\inc%_EXT%\svx\sdtaditm.hxx
-..\inc\svx\sdtagitm.hxx %_DEST%\inc%_EXT%\svx\sdtagitm.hxx
-..\inc\svx\sdtaiitm.hxx %_DEST%\inc%_EXT%\svx\sdtaiitm.hxx
-..\inc\svx\sdtfchim.hxx %_DEST%\inc%_EXT%\svx\sdtfchim.hxx
-..\inc\svx\sdtaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaitm.hxx
-..\inc\svx\sdtakitm.hxx %_DEST%\inc%_EXT%\svx\sdtakitm.hxx
-..\inc\svx\sdtayitm.hxx %_DEST%\inc%_EXT%\svx\sdtayitm.hxx
-..\inc\svx\sdtcfitm.hxx %_DEST%\inc%_EXT%\svx\sdtcfitm.hxx
-..\inc\svx\sdtditm.hxx %_DEST%\inc%_EXT%\svx\sdtditm.hxx
-..\inc\svx\sdtfsitm.hxx %_DEST%\inc%_EXT%\svx\sdtfsitm.hxx
-..\inc\svx\sdtmfitm.hxx %_DEST%\inc%_EXT%\svx\sdtmfitm.hxx
-..\inc\svx\sdynitm.hxx %_DEST%\inc%_EXT%\svx\sdynitm.hxx
-..\inc\svx\sphere3d.hxx %_DEST%\inc%_EXT%\svx\sphere3d.hxx
-..\inc\svx\SpellDialogChildWindow.hxx %_DEST%\inc%_EXT%\svx\SpellDialogChildWindow.hxx
-..\inc\svx\stddlg.hxx %_DEST%\inc%_EXT%\svx\stddlg.hxx
-..\inc\svx\strarray.hxx %_DEST%\inc%_EXT%\svx\strarray.hxx
-..\inc\svx\svdattr.hxx %_DEST%\inc%_EXT%\svx\svdattr.hxx
-..\inc\svx\svdattrx.hxx %_DEST%\inc%_EXT%\svx\svdattrx.hxx
-..\inc\svx\svdcrtv.hxx %_DEST%\inc%_EXT%\svx\svdcrtv.hxx
-..\inc\svx\svddrag.hxx %_DEST%\inc%_EXT%\svx\svddrag.hxx
-..\inc\svx\svddrgmt.hxx %_DEST%\inc%_EXT%\svx\svddrgmt.hxx
-..\inc\svx\svddrgv.hxx %_DEST%\inc%_EXT%\svx\svddrgv.hxx
-..\inc\svx\svdedtv.hxx %_DEST%\inc%_EXT%\svx\svdedtv.hxx
-..\inc\svx\svdedxv.hxx %_DEST%\inc%_EXT%\svx\svdedxv.hxx
-..\inc\svx\svdetc.hxx %_DEST%\inc%_EXT%\svx\svdetc.hxx
-..\inc\svx\sdrhittesthelper.hxx %_DEST%\inc%_EXT%\svx\sdrhittesthelper.hxx
-..\inc\svx\svdglev.hxx %_DEST%\inc%_EXT%\svx\svdglev.hxx
-..\inc\svx\svdglue.hxx %_DEST%\inc%_EXT%\svx\svdglue.hxx
-..\inc\svx\svdhdl.hxx %_DEST%\inc%_EXT%\svx\svdhdl.hxx
-..\inc\svx\svdhlpln.hxx %_DEST%\inc%_EXT%\svx\svdhlpln.hxx
-..\inc\svx\svdmark.hxx %_DEST%\inc%_EXT%\svx\svdmark.hxx
-..\inc\svx\svdmodel.hxx %_DEST%\inc%_EXT%\svx\svdmodel.hxx
-..\inc\svx\svdmrkv.hxx %_DEST%\inc%_EXT%\svx\svdmrkv.hxx
-..\inc\svx\svdoattr.hxx %_DEST%\inc%_EXT%\svx\svdoattr.hxx
-..\inc\svx\svdobj.hxx %_DEST%\inc%_EXT%\svx\svdobj.hxx
-..\inc\svx\sdrobjectuser.hxx %_DEST%\inc%_EXT%\svx\sdrobjectuser.hxx
-..\inc\svx\svdocapt.hxx %_DEST%\inc%_EXT%\svx\svdocapt.hxx
-..\inc\svx\svdocirc.hxx %_DEST%\inc%_EXT%\svx\svdocirc.hxx
-..\inc\svx\svdoedge.hxx %_DEST%\inc%_EXT%\svx\svdoedge.hxx
-..\inc\svx\svdograf.hxx %_DEST%\inc%_EXT%\svx\svdograf.hxx
-..\inc\svx\svdogrp.hxx %_DEST%\inc%_EXT%\svx\svdogrp.hxx
-..\inc\svx\svdomeas.hxx %_DEST%\inc%_EXT%\svx\svdomeas.hxx
-..\inc\svx\svdomedia.hxx %_DEST%\inc%_EXT%\svx\svdomedia.hxx
-..\inc\svx\svdoole2.hxx %_DEST%\inc%_EXT%\svx\svdoole2.hxx
-..\inc\svx\svdopage.hxx %_DEST%\inc%_EXT%\svx\svdopage.hxx
-..\inc\svx\svdopath.hxx %_DEST%\inc%_EXT%\svx\svdopath.hxx
-..\inc\svx\svdorect.hxx %_DEST%\inc%_EXT%\svx\svdorect.hxx
-..\inc\svx\svdotext.hxx %_DEST%\inc%_EXT%\svx\svdotext.hxx
-..\inc\svx\svdovirt.hxx %_DEST%\inc%_EXT%\svx\svdovirt.hxx
-..\inc\svx\svdpage.hxx %_DEST%\inc%_EXT%\svx\svdpage.hxx
-..\inc\svx\sdrmasterpagedescriptor.hxx %_DEST%\inc%_EXT%\svx\sdrmasterpagedescriptor.hxx
-..\inc\svx\sdrcomment.hxx %_DEST%\inc%_EXT%\svx\sdrcomment.hxx
-..\inc\svx\sdrpageuser.hxx %_DEST%\inc%_EXT%\svx\sdrpageuser.hxx
-..\inc\svx\svdpagv.hxx %_DEST%\inc%_EXT%\svx\svdpagv.hxx
-..\inc\svx\sdrpagewindow.hxx %_DEST%\inc%_EXT%\svx\sdrpagewindow.hxx
-..\inc\svx\svdpntv.hxx %_DEST%\inc%_EXT%\svx\svdpntv.hxx
-..\inc\svx\svdpoev.hxx %_DEST%\inc%_EXT%\svx\svdpoev.hxx
-..\inc\svx\svdpool.hxx %_DEST%\inc%_EXT%\svx\svdpool.hxx
-..\inc\svx\svdsnpv.hxx %_DEST%\inc%_EXT%\svx\svdsnpv.hxx
-..\inc\svx\svdtrans.hxx %_DEST%\inc%_EXT%\svx\svdtrans.hxx
-..\inc\svx\svdundo.hxx %_DEST%\inc%_EXT%\svx\svdundo.hxx
-..\inc\svx\svdoutl.hxx %_DEST%\inc%_EXT%\svx\svdoutl.hxx
-..\inc\svx\svdview.hxx %_DEST%\inc%_EXT%\svx\svdview.hxx
-..\inc\svx\svdxcgv.hxx %_DEST%\inc%_EXT%\svx\svdxcgv.hxx
-..\inc\svx\svxids.hrc %_DEST%\inc%_EXT%\svx\svxids.hrc
-..\inc\svx\sxallitm.hxx %_DEST%\inc%_EXT%\svx\sxallitm.hxx
-..\inc\svx\sxcaitm.hxx %_DEST%\inc%_EXT%\svx\sxcaitm.hxx
-..\inc\svx\sxcecitm.hxx %_DEST%\inc%_EXT%\svx\sxcecitm.hxx
-..\inc\svx\sxcgitm.hxx %_DEST%\inc%_EXT%\svx\sxcgitm.hxx
-..\inc\svx\sxciaitm.hxx %_DEST%\inc%_EXT%\svx\sxciaitm.hxx
-..\inc\svx\sxcikitm.hxx %_DEST%\inc%_EXT%\svx\sxcikitm.hxx
-..\inc\svx\sxcllitm.hxx %_DEST%\inc%_EXT%\svx\sxcllitm.hxx
-..\inc\svx\sxctitm.hxx %_DEST%\inc%_EXT%\svx\sxctitm.hxx
-..\inc\svx\sxekitm.hxx %_DEST%\inc%_EXT%\svx\sxekitm.hxx
-..\inc\svx\sxelditm.hxx %_DEST%\inc%_EXT%\svx\sxelditm.hxx
-..\inc\svx\sxenditm.hxx %_DEST%\inc%_EXT%\svx\sxenditm.hxx
-..\inc\svx\sxfiitm.hxx %_DEST%\inc%_EXT%\svx\sxfiitm.hxx
-..\inc\svx\sxlayitm.hxx %_DEST%\inc%_EXT%\svx\sxlayitm.hxx
-..\inc\svx\sxlogitm.hxx %_DEST%\inc%_EXT%\svx\sxlogitm.hxx
-..\inc\svx\sxmbritm.hxx %_DEST%\inc%_EXT%\svx\sxmbritm.hxx
-..\inc\svx\sxmfsitm.hxx %_DEST%\inc%_EXT%\svx\sxmfsitm.hxx
-..\inc\svx\sxmkitm.hxx %_DEST%\inc%_EXT%\svx\sxmkitm.hxx
-..\inc\svx\sxmlhitm.hxx %_DEST%\inc%_EXT%\svx\sxmlhitm.hxx
-..\inc\svx\sxmoitm.hxx %_DEST%\inc%_EXT%\svx\sxmoitm.hxx
-..\inc\svx\sxmovitm.hxx %_DEST%\inc%_EXT%\svx\sxmovitm.hxx
-..\inc\svx\sxmsitm.hxx %_DEST%\inc%_EXT%\svx\sxmsitm.hxx
-..\inc\svx\sxmspitm.hxx %_DEST%\inc%_EXT%\svx\sxmspitm.hxx
-..\inc\svx\sxmsuitm.hxx %_DEST%\inc%_EXT%\svx\sxmsuitm.hxx
-..\inc\svx\sxmtaitm.hxx %_DEST%\inc%_EXT%\svx\sxmtaitm.hxx
-..\inc\svx\sxmtfitm.hxx %_DEST%\inc%_EXT%\svx\sxmtfitm.hxx
-..\inc\svx\sxmtpitm.hxx %_DEST%\inc%_EXT%\svx\sxmtpitm.hxx
-..\inc\svx\sxmtritm.hxx %_DEST%\inc%_EXT%\svx\sxmtritm.hxx
-..\inc\svx\sxmuitm.hxx %_DEST%\inc%_EXT%\svx\sxmuitm.hxx
-..\inc\svx\sxoneitm.hxx %_DEST%\inc%_EXT%\svx\sxoneitm.hxx
-..\inc\svx\sxonitm.hxx %_DEST%\inc%_EXT%\svx\sxonitm.hxx
-..\inc\svx\sxopitm.hxx %_DEST%\inc%_EXT%\svx\sxopitm.hxx
-..\inc\svx\sxraitm.hxx %_DEST%\inc%_EXT%\svx\sxraitm.hxx
-..\inc\svx\sxreaitm.hxx %_DEST%\inc%_EXT%\svx\sxreaitm.hxx
-..\inc\svx\sxreoitm.hxx %_DEST%\inc%_EXT%\svx\sxreoitm.hxx
-..\inc\svx\sxroaitm.hxx %_DEST%\inc%_EXT%\svx\sxroaitm.hxx
-..\inc\svx\sxrooitm.hxx %_DEST%\inc%_EXT%\svx\sxrooitm.hxx
-..\inc\svx\sxsaitm.hxx %_DEST%\inc%_EXT%\svx\sxsaitm.hxx
-..\inc\svx\sxsalitm.hxx %_DEST%\inc%_EXT%\svx\sxsalitm.hxx
-..\inc\svx\sxsiitm.hxx %_DEST%\inc%_EXT%\svx\sxsiitm.hxx
-..\inc\svx\sxsoitm.hxx %_DEST%\inc%_EXT%\svx\sxsoitm.hxx
-..\inc\svx\sxtraitm.hxx %_DEST%\inc%_EXT%\svx\sxtraitm.hxx
-..\inc\svx\tbcontrl.hxx %_DEST%\inc%_EXT%\svx\tbcontrl.hxx
-..\inc\svx\unomid.hxx %_DEST%\inc%_EXT%\svx\unomid.hxx
-..\inc\svx\unopage.hxx %_DEST%\inc%_EXT%\svx\unopage.hxx
-..\inc\svx\unoshape.hxx %_DEST%\inc%_EXT%\svx\unoshape.hxx
-..\inc\svx\shapepropertynotifier.hxx %_DEST%\inc%_EXT%\svx\shapepropertynotifier.hxx
-..\inc\svx\shapeproperty.hxx %_DEST%\inc%_EXT%\svx\shapeproperty.hxx
-..\inc\svx\unoprov.hxx %_DEST%\inc%_EXT%\svx\unoprov.hxx
-..\inc\svx\unomod.hxx %_DEST%\inc%_EXT%\svx\unomod.hxx
-..\inc\svx\unomodel.hxx %_DEST%\inc%_EXT%\svx\unomodel.hxx
-..\inc\svx\fmdpage.hxx %_DEST%\inc%_EXT%\svx\fmdpage.hxx
-..\inc\svx\fmsearch.hxx %_DEST%\inc%_EXT%\svx\fmsearch.hxx
-..\inc\svx\view3d.hxx %_DEST%\inc%_EXT%\svx\view3d.hxx
-..\inc\svx\viewpt3d.hxx %_DEST%\inc%_EXT%\svx\viewpt3d.hxx
-..\inc\svx\xbitmap.hxx %_DEST%\inc%_EXT%\svx\xbitmap.hxx
-..\inc\svx\xbtmpit.hxx %_DEST%\inc%_EXT%\svx\xbtmpit.hxx
-..\inc\svx\xcolit.hxx %_DEST%\inc%_EXT%\svx\xcolit.hxx
-..\inc\svx\xdef.hxx %_DEST%\inc%_EXT%\svx\xdef.hxx
-..\inc\svx\xdash.hxx %_DEST%\inc%_EXT%\svx\xdash.hxx
-..\inc\svx\xfillit.hxx %_DEST%\inc%_EXT%\svx\xfillit.hxx
-..\inc\svx\xfillit0.hxx %_DEST%\inc%_EXT%\svx\xfillit0.hxx
-..\inc\svx\xflasit.hxx %_DEST%\inc%_EXT%\svx\xflasit.hxx
-..\inc\svx\xflbckit.hxx %_DEST%\inc%_EXT%\svx\xflbckit.hxx
-..\inc\svx\xflbmpit.hxx %_DEST%\inc%_EXT%\svx\xflbmpit.hxx
-..\inc\svx\xflbmsli.hxx %_DEST%\inc%_EXT%\svx\xflbmsli.hxx
-..\inc\svx\xflbmsxy.hxx %_DEST%\inc%_EXT%\svx\xflbmsxy.hxx
-..\inc\svx\xflbmtit.hxx %_DEST%\inc%_EXT%\svx\xflbmtit.hxx
-..\inc\svx\xflboxy.hxx %_DEST%\inc%_EXT%\svx\xflboxy.hxx
-..\inc\svx\xflbstit.hxx %_DEST%\inc%_EXT%\svx\xflbstit.hxx
-..\inc\svx\xflbtoxy.hxx %_DEST%\inc%_EXT%\svx\xflbtoxy.hxx
-..\inc\svx\xflclit.hxx %_DEST%\inc%_EXT%\svx\xflclit.hxx
-..\inc\svx\xsflclit.hxx %_DEST%\inc%_EXT%\svx\xsflclit.hxx
-..\inc\svx\xflgrit.hxx %_DEST%\inc%_EXT%\svx\xflgrit.hxx
-..\inc\svx\xflftrit.hxx %_DEST%\inc%_EXT%\svx\xflftrit.hxx
-..\inc\svx\xflhtit.hxx %_DEST%\inc%_EXT%\svx\xflhtit.hxx
-..\inc\svx\xfltrit.hxx %_DEST%\inc%_EXT%\svx\xfltrit.hxx
-..\inc\svx\xftadit.hxx %_DEST%\inc%_EXT%\svx\xftadit.hxx
-..\inc\svx\xftdiit.hxx %_DEST%\inc%_EXT%\svx\xftdiit.hxx
-..\inc\svx\xftmrit.hxx %_DEST%\inc%_EXT%\svx\xftmrit.hxx
-..\inc\svx\xftouit.hxx %_DEST%\inc%_EXT%\svx\xftouit.hxx
-..\inc\svx\xftsfit.hxx %_DEST%\inc%_EXT%\svx\xftsfit.hxx
-..\inc\svx\xftshcit.hxx %_DEST%\inc%_EXT%\svx\xftshcit.hxx
-..\inc\svx\xftshit.hxx %_DEST%\inc%_EXT%\svx\xftshit.hxx
-..\inc\svx\xftshtit.hxx %_DEST%\inc%_EXT%\svx\xftshtit.hxx
-..\inc\svx\xftshxy.hxx %_DEST%\inc%_EXT%\svx\xftshxy.hxx
-..\inc\svx\xftstit.hxx %_DEST%\inc%_EXT%\svx\xftstit.hxx
-..\inc\svx\xgrad.hxx %_DEST%\inc%_EXT%\svx\xgrad.hxx
-..\inc\svx\xgrscit.hxx %_DEST%\inc%_EXT%\svx\xgrscit.hxx
-..\inc\svx\xhatch.hxx %_DEST%\inc%_EXT%\svx\xhatch.hxx
-..\inc\svx\xit.hxx %_DEST%\inc%_EXT%\svx\xit.hxx
-..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx
-..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx
-..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx
-..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx
-..\inc\svx\xlnasit.hxx %_DEST%\inc%_EXT%\svx\xlnasit.hxx
-..\inc\svx\xlnclit.hxx %_DEST%\inc%_EXT%\svx\xlnclit.hxx
-..\inc\svx\xlndsit.hxx %_DEST%\inc%_EXT%\svx\xlndsit.hxx
-..\inc\svx\xlnedcit.hxx %_DEST%\inc%_EXT%\svx\xlnedcit.hxx
-..\inc\svx\xlnedit.hxx %_DEST%\inc%_EXT%\svx\xlnedit.hxx
-..\inc\svx\xlnedwit.hxx %_DEST%\inc%_EXT%\svx\xlnedwit.hxx
-..\inc\svx\xlnstcit.hxx %_DEST%\inc%_EXT%\svx\xlnstcit.hxx
-..\inc\svx\xlnstit.hxx %_DEST%\inc%_EXT%\svx\xlnstit.hxx
-..\inc\svx\xlnstwit.hxx %_DEST%\inc%_EXT%\svx\xlnstwit.hxx
-..\inc\svx\xlntrit.hxx %_DEST%\inc%_EXT%\svx\xlntrit.hxx
-..\inc\svx\xlnwtit.hxx %_DEST%\inc%_EXT%\svx\xlnwtit.hxx
-..\inc\svx\xpoly.hxx %_DEST%\inc%_EXT%\svx\xpoly.hxx
-..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\svx\xpool.hxx
-..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\xpool.hxx
-..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\svx\xsetit.hxx
-..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\xsetit.hxx
-..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\svx\xtable.hxx
-..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\xtable.hxx
-..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\svx\xtextit.hxx
-..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\xtextit.hxx
-..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\svx\xtextit0.hxx
-..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\xtextit0.hxx
-..\inc\svx\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx
-..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx
-..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx
-..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx
-..\inc\svx\extrusioncolorcontrol.hxx %_DEST%\inc%_EXT%\svx\extrusioncolorcontrol.hxx
-
-..\inc\svx\fmmodel.hxx %_DEST%\inc%_EXT%\svx\fmmodel.hxx
-..\inc\svx\fmpage.hxx %_DEST%\inc%_EXT%\svx\fmpage.hxx
-..\inc\svx\fmview.hxx %_DEST%\inc%_EXT%\svx\fmview.hxx
-..\inc\svx\fmglob.hxx %_DEST%\inc%_EXT%\svx\fmglob.hxx
-..\inc\svx\fmshell.hxx %_DEST%\inc%_EXT%\svx\fmshell.hxx
-..\inc\svx\svdouno.hxx %_DEST%\inc%_EXT%\svx\svdouno.hxx
-..\inc\svx\deflt3d.hxx %_DEST%\inc%_EXT%\svx\deflt3d.hxx
-..\inc\svx\AccessibleTextHelper.hxx %_DEST%\inc%_EXT%\svx\AccessibleTextHelper.hxx
-..\inc\svx\e3dundo.hxx %_DEST%\inc%_EXT%\svx\e3dundo.hxx
-..\inc\svx\msdffdef.hxx %_DEST%\inc%_EXT%\svx\msdffdef.hxx
-..\inc\svx\unoshtxt.hxx %_DEST%\inc%_EXT%\svx\unoshtxt.hxx
-..\inc\svx\fmdmod.hxx %_DEST%\inc%_EXT%\svx\fmdmod.hxx
-..\inc\svx\fmgridcl.hxx %_DEST%\inc%_EXT%\svx\fmgridcl.hxx
-..\inc\svx\gridctrl.hxx %_DEST%\inc%_EXT%\svx\gridctrl.hxx
-..\inc\svx\unoshprp.hxx %_DEST%\inc%_EXT%\svx\unoshprp.hxx
-..\inc\svx\sdasaitm.hxx %_DEST%\inc%_EXT%\svx\sdasaitm.hxx
-..\inc\svx\sdasitm.hxx %_DEST%\inc%_EXT%\svx\sdasitm.hxx
-..\inc\svx\grfcrop.hxx %_DEST%\inc%_EXT%\svx\grfcrop.hxx
-..\inc\svx\grfflt.hxx %_DEST%\inc%_EXT%\svx\grfflt.hxx
-..\inc\svx\svx3ditems.hxx %_DEST%\inc%_EXT%\svx\svx3ditems.hxx
-..\inc\svx\dbaexchange.hxx %_DEST%\inc%_EXT%\svx\dbaexchange.hxx
-..\inc\svx\dbaobjectex.hxx %_DEST%\inc%_EXT%\svx\dbaobjectex.hxx
-..\inc\svx\ucsubset.hxx %_DEST%\inc%_EXT%\svx\ucsubset.hxx
-..\inc\svx\ucsubset.hrc %_DEST%\inc%_EXT%\svx\ucsubset.hrc
-..\inc\svx\dataaccessdescriptor.hxx %_DEST%\inc%_EXT%\svx\dataaccessdescriptor.hxx
-..\inc\svx\frmdirlbox.hxx %_DEST%\inc%_EXT%\svx\frmdirlbox.hxx
-..\inc\svx\AccessibleShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleShape.hxx
-..\inc\svx\AccessibleGraphicShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleGraphicShape.hxx
-..\inc\svx\AccessibleOLEShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleOLEShape.hxx
-..\inc\svx\AccessibleShapeTreeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeTreeInfo.hxx
-..\inc\svx\AccessibleShapeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeInfo.hxx
-..\inc\svx\AccessibleControlShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleControlShape.hxx
-..\inc\svx\IAccessibleViewForwarder.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarder.hxx
-..\inc\svx\IAccessibleViewForwarderListener.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarderListener.hxx
-..\inc\svx\IAccessibleParent.hxx %_DEST%\inc%_EXT%\svx\IAccessibleParent.hxx
-..\inc\svx\ChildrenManager.hxx %_DEST%\inc%_EXT%\svx\ChildrenManager.hxx
-..\inc\svx\ShapeTypeHandler.hxx %_DEST%\inc%_EXT%\svx\ShapeTypeHandler.hxx
-..\inc\svx\SvxShapeTypes.hxx %_DEST%\inc%_EXT%\svx\SvxShapeTypes.hxx
-..\inc\svx\svdoashp.hxx %_DEST%\inc%_EXT%\svx\svdoashp.hxx
-..\inc\svx\extrusionbar.hxx %_DEST%\inc%_EXT%\svx\extrusionbar.hxx
-..\inc\svx\fontworkbar.hxx %_DEST%\inc%_EXT%\svx\fontworkbar.hxx
-..\inc\svx\svxdlg.hxx %_DEST%\inc%_EXT%\svx\svxdlg.hxx
-..\inc\svx\tbxcolorupdate.hxx %_DEST%\inc%_EXT%\svx\tbxcolorupdate.hxx
-..\inc\svx\svxdllapi.h %_DEST%\inc%_EXT%\svx\svxdllapi.h
-..\inc\svx\SmartTagMgr.hxx %_DEST%\inc%_EXT%\svx\SmartTagMgr.hxx
-..\inc\svx\SmartTagItem.hxx %_DEST%\inc%_EXT%\svx\SmartTagItem.hxx
-..\inc\svx\SmartTagCtl.hxx %_DEST%\inc%_EXT%\svx\SmartTagCtl.hxx
-..\inc\svx\databaselocationinput.hxx %_DEST%\inc%_EXT%\svx\databaselocationinput.hxx
-..\inc\svx\dbcharsethelper.hxx %_DEST%\inc%_EXT%\svx\dbcharsethelper.hxx
-..\inc\svx\dbtoolsclient.hxx %_DEST%\inc%_EXT%\svx\dbtoolsclient.hxx
-..\inc\svx\sdrobjectfilter.hxx %_DEST%\inc%_EXT%\svx\sdrobjectfilter.hxx
-
-..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx
-..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx
-..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx
-..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
-..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx
 
 mkdir: %_DEST%\inc%_EXT%\svx\sdr
 mkdir: %_DEST%\inc%_EXT%\svx\sdr\properties
@@ -491,6 +64,7 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\contact
 ..\inc\svx\sdr\contact\viewobjectcontactredirector.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactredirector.hxx
 ..\inc\svx\sdr\contact\viewobjectcontactofpageobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofpageobj.hxx
 ..\inc\svx\sdr\contact\viewobjectcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofsdrobj.hxx
+..\inc\svx\sdr\contact\vocbitmapbuffer.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\vocbitmapbuffer.hxx
 
 mkdir: %_DEST%\inc%_EXT%\svx\sdr\overlay
 ..\inc\svx\sdr\overlay\overlayanimatedbitmapex.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayanimatedbitmapex.hxx
@@ -512,6 +86,10 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\primitive2d
 ..\inc\svx\sdr\primitive2d\sdrprimitivetools.hxx %_DEST%\inc%_EXT%\svx\sdr\primitive2d\sdrprimitivetools.hxx
 
 mkdir: %_DEST%\inc%_EXT%\svx\sdr\animation
+..\inc\svx\sdr\animation\ainfographic.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfographic.hxx
+..\inc\svx\sdr\animation\ainfoscrolltext.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfoscrolltext.hxx
+..\inc\svx\sdr\animation\ainfotext.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfotext.hxx
+..\inc\svx\sdr\animation\animationinfo.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\animationinfo.hxx
 ..\inc\svx\sdr\animation\animationstate.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\animationstate.hxx
 ..\inc\svx\sdr\animation\objectanimator.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\objectanimator.hxx
 ..\inc\svx\sdr\animation\scheduler.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\scheduler.hxx
@@ -546,11 +124,9 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
 ..\xml\AccessibleControlShape.xml %_DEST%\xml%_EXT%\AccessibleControlShape.xml
 ..\xml\AccessibleEditableTextPara.xml %_DEST%\xml%_EXT%\AccessibleEditableTextPara.xml
 
-..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx
-..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx
-..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx
-..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
-..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx
+..\uiconfig\accelerator\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\*.xml
+..\uiconfig\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US\*.xml
+..\uiconfig\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es\*.xml
 
 ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
 ..\%__SRC%\misc\svx.component %_DEST%\xml%_EXT%\svx.component
diff --git a/svx/prj/makefile.mk b/svx/prj/makefile.mk
new file mode 100644
index 000000000000..2a0b99e72fd5
--- /dev/null
+++ b/svx/prj/makefile.mk
@@ -0,0 +1,2 @@
+all:
+    cd .. && make -srj9
diff --git a/svx/prj/target_lib_svx.mk b/svx/prj/target_lib_svx.mk
new file mode 100644
index 000000000000..6810f7f30fed
--- /dev/null
+++ b/svx/prj/target_lib_svx.mk
@@ -0,0 +1,261 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,svx))
+
+$(eval $(call gb_Library_set_include,svx,\
+    $$(SOLARINC) \
+    -I$(WORKDIR)/inc/svx/ \
+    -I$(SRCDIR)/svx/inc \
+    -I$(SRCDIR)/svx/source/inc \
+    -I$(SRCDIR)/svx/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,svx,\
+    $$(DEFS) \
+    -DACCESSIBLE_LAYOUT \
+    -DSVX_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,svx,\
+    basegfx \
+    sb \
+    comphelper \
+    cppuhelper \
+    cppu \
+    drawinglayer \
+    editeng \
+    i18nisolang1 \
+    icuuc \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xo \
+    xcr \
+    stl \
+))
+
+#    svx/source/unodialogs/textconversiondlgs/services \
+#    svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \
+#    svx/source/unodialogs/textconversiondlgs/chinese_translationdialog \
+#    svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog \
+#    svx/source/unodialogs/textconversiondlgs/resid \
+
+
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/unodraw/recoveryui \
+    svx/source/unodraw/unoshcol \
+    svx/source/unodraw/unoctabl \
+    svx/source/unodraw/unopool \
+    svx/source/unodraw/UnoNamespaceMap \
+    svx/source/tbxctrls/layctrl \
+    svx/source/tbxctrls/tbxcolor \
+    svx/source/tbxctrls/formatpaintbrushctrl \
+    svx/source/tbxctrls/colrctrl \
+    svx/source/tbxctrls/itemwin \
+    svx/source/tbxctrls/tbxalign \
+    svx/source/tbxctrls/fillctrl \
+    svx/source/tbxctrls/tbunocontroller \
+    svx/source/tbxctrls/subtoolboxcontrol \
+    svx/source/tbxctrls/grafctrl \
+    svx/source/tbxctrls/linectrl \
+    svx/source/tbxctrls/tbxdrctl \
+    svx/source/tbxctrls/verttexttbxctrl \
+    svx/source/tbxctrls/lboxctrl \
+    svx/source/table/tablertfexporter \
+    svx/source/table/tablertfimporter \
+    svx/source/table/accessiblecell \
+    svx/source/table/accessibletableshape \
+    svx/source/table/tabledesign \
+    svx/source/table/celleditsource \
+    svx/source/svdraw/svdoimp \
+    svx/source/svdraw/svdscrol \
+    svx/source/svdraw/ActionDescriptionProvider \
+    svx/source/svdraw/impgrfll \
+    svx/source/items/SmartTagItem \
+    svx/source/items/svxempty \
+    svx/source/items/viewlayoutitem \
+    svx/source/items/zoomslideritem \
+    svx/source/items/hlnkitem \
+    svx/source/items/numfmtsh \
+    svx/source/items/algitem \
+    svx/source/items/zoomitem \
+    svx/source/items/ofaitem \
+    svx/source/items/pageitem \
+    svx/source/items/numinf \
+    svx/source/items/postattr \
+    svx/source/items/rotmodit \
+    svx/source/items/svxerr \
+    svx/source/form/databaselocationinput \
+    svx/source/form/fmsrcimp \
+    svx/source/form/filtnav \
+    svx/source/form/tabwin \
+    svx/source/form/fmsrccfg \
+    svx/source/form/fmobjfac \
+    svx/source/form/tbxform \
+    svx/source/form/fmPropBrw \
+    svx/source/form/dbcharsethelper \
+    svx/source/stbctrls/pszctrl \
+    svx/source/stbctrls/insctrl \
+    svx/source/stbctrls/selctrl \
+    svx/source/stbctrls/xmlsecctrl \
+    svx/source/stbctrls/modctrl \
+    svx/source/stbctrls/zoomsliderctrl \
+    svx/source/stbctrls/zoomctrl \
+    svx/source/gengal/gengal \
+    svx/source/unogallery/unogaltheme \
+    svx/source/unogallery/unogalitem \
+    svx/source/unogallery/unogalthemeprovider \
+    svx/source/mnuctrls/SmartTagCtl \
+    svx/source/mnuctrls/fntctl \
+    svx/source/mnuctrls/clipboardctl \
+    svx/source/mnuctrls/fntszctl \
+    svx/source/fmcomp/dbaobjectex \
+    svx/source/smarttags/SmartTagMgr \
+    svx/source/accessibility/AccessibleOLEShape \
+    svx/source/accessibility/AccessibleShapeTreeInfo \
+    svx/source/accessibility/DGColorNameLookUp \
+    svx/source/accessibility/charmapacc \
+    svx/source/accessibility/AccessibleShape \
+    svx/source/accessibility/AccessibleTextHelper \
+    svx/source/accessibility/svxrectctaccessiblecontext \
+    svx/source/accessibility/AccessibleGraphicShape \
+    svx/source/accessibility/AccessibleEmptyEditSource \
+    svx/source/accessibility/ChildrenManagerImpl \
+    svx/source/accessibility/AccessibleShapeInfo \
+    svx/source/accessibility/DescriptionGenerator \
+    svx/source/accessibility/ShapeTypeHandler \
+    svx/source/accessibility/ChildrenManager \
+    svx/source/accessibility/AccessibleControlShape \
+    svx/source/accessibility/AccessibleTextEventQueue \
+    svx/source/accessibility/AccessibleFrameSelector \
+    svx/source/accessibility/SvxShapeTypes \
+    svx/source/accessibility/GraphCtlAccessibleContext \
+    svx/source/customshapes/tbxcustomshapes \
+    svx/source/engine3d/float3d \
+    svx/source/engine3d/volume3d \
+    svx/source/engine3d/viewpt3d \
+    svx/source/dialog/srchdlg \
+    svx/source/dialog/rubydialog \
+    svx/source/dialog/srchctrl \
+    svx/source/dialog/paraprev \
+    svx/source/dialog/fontwork \
+    svx/source/dialog/framelinkarray \
+    svx/source/dialog/svxbmpnumvalueset \
+    svx/source/dialog/hyperdlg \
+    svx/source/dialog/wrapfield \
+    svx/source/dialog/svxruler \
+    svx/source/dialog/ctredlin \
+    svx/source/dialog/rulritem \
+    svx/source/dialog/dialcontrol \
+    svx/source/dialog/databaseregistrationui \
+    svx/source/dialog/txencbox \
+    svx/source/dialog/charmap \
+    svx/source/dialog/passwd \
+    svx/source/dialog/dlgctrl \
+    svx/source/dialog/hdft \
+    svx/source/dialog/frmdirlbox \
+    svx/source/dialog/fntctrl \
+    svx/source/dialog/docrecovery \
+    svx/source/dialog/checklbx \
+    svx/source/dialog/swframeposstrings \
+    svx/source/dialog/svxgrahicitem \
+    svx/source/dialog/relfld \
+    svx/source/dialog/SpellDialogChildWindow \
+    svx/source/dialog/strarray \
+    svx/source/dialog/prtqry \
+    svx/source/dialog/connctrl \
+    svx/source/dialog/contwnd \
+    svx/source/dialog/pfiledlg \
+    svx/source/dialog/dlgctl3d \
+    svx/source/dialog/hyprlink \
+    svx/source/dialog/grfflt \
+    svx/source/dialog/measctrl \
+    svx/source/dialog/orienthelper \
+    svx/source/dialog/frmsel \
+    svx/source/dialog/swframeexample \
+    svx/source/dialog/_bmpmask \
+    svx/source/dialog/graphctl \
+    svx/source/dialog/rlrcitem \
+    svx/source/dialog/fontlb \
+    svx/source/dialog/optgrid \
+    svx/source/dialog/imapwnd \
+    svx/source/dialog/pagectrl \
+    svx/source/dialog/_contdlg \
+    svx/source/dialog/txenctab \
+    svx/source/dialog/imapdlg \
+    svx/source/customshapes/EnhancedCustomShape3d \
+    svx/source/customshapes/EnhancedCustomShapeHandle \
+    svx/source/customshapes/EnhancedCustomShapeEngine \
+    svx/source/customshapes/EnhancedCustomShapeFontWork \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/dialog/sendreportunx \
+))
+$(eval $(call gb_Library_add_linked_libs,svx,\
+    dl \
+    m \
+    pthread \
+))
+else
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,svx,\
+    advapi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/dialog/sendreportw32 \
+))
+))
+else
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/dialog/sendreportgen \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,svx,\
+    shell \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/prj/target_lib_svxcore.mk b/svx/prj/target_lib_svxcore.mk
new file mode 100644
index 000000000000..f337588232fb
--- /dev/null
+++ b/svx/prj/target_lib_svxcore.mk
@@ -0,0 +1,449 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,svxcore))
+
+$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots))
+
+$(eval $(call gb_Library_set_include,svxcore,\
+    -I$(SRCDIR)/svx/inc \
+    -I$(SRCDIR)/svx/source/inc \
+    -I$(SRCDIR)/svx/inc/pch \
+    -I$(WORKDIR)/SdiTarget/svx/sdi \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,svxcore,\
+    $$(DEFS) \
+    -DACCESSIBLE_LAYOUT \
+    -DSVX_DLLIMPLEMENTATION \
+    -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+))
+
+$(eval $(call gb_Library_add_linked_libs,svxcore,\
+    avmedia \
+    basegfx \
+    sb \
+    comphelper \
+    cppuhelper \
+    cppu \
+    drawinglayer \
+    editeng \
+    fwe \
+    i18nisolang1 \
+    icuuc \
+    lng \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xo \
+))
+
+$(eval $(call gb_Library_add_exception_objects,svxcore,\
+    svx/source/sdr/animation/scheduler \
+    svx/source/sdr/animation/objectanimator \
+    svx/source/sdr/animation/animationstate \
+    svx/source/sdr/attribute/sdrlinefillshadowtextattribute \
+    svx/source/sdr/attribute/sdrfilltextattribute \
+    svx/source/sdr/attribute/sdrshadowtextattribute \
+    svx/source/sdr/attribute/sdrtextattribute \
+    svx/source/sdr/attribute/sdrlineshadowtextattribute \
+    svx/source/sdr/attribute/sdrformtextattribute \
+    svx/source/sdr/attribute/sdrformtextoutlineattribute \
+    svx/source/sdr/contact/viewobjectcontactofgroup \
+    svx/source/sdr/contact/viewobjectcontactofsdrpage \
+    svx/source/sdr/contact/viewcontactofpageobj \
+    svx/source/sdr/contact/viewcontactofe3d \
+    svx/source/sdr/contact/viewcontactofe3dcube \
+    svx/source/sdr/contact/viewcontactofsdrmediaobj \
+    svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor \
+    svx/source/sdr/contact/viewobjectcontactofpageobj \
+    svx/source/sdr/contact/viewobjectcontactofe3dscene \
+    svx/source/sdr/contact/viewcontactofgraphic \
+    svx/source/sdr/contact/viewobjectcontactredirector \
+    svx/source/sdr/contact/viewcontactofsdrcircobj \
+    svx/source/sdr/contact/viewcontactofgroup \
+    svx/source/sdr/contact/viewcontactofunocontrol \
+    svx/source/sdr/contact/viewcontactofsdrobjcustomshape \
+    svx/source/sdr/contact/viewcontactofsdrobj \
+    svx/source/sdr/contact/objectcontact \
+    svx/source/sdr/contact/viewcontactoftextobj \
+    svx/source/sdr/contact/viewcontactofe3dlathe \
+    svx/source/sdr/contact/viewcontactofsdrpage \
+    svx/source/sdr/contact/viewcontactofe3dextrude \
+    svx/source/sdr/contact/viewcontactofmasterpagedescriptor \
+    svx/source/sdr/contact/viewcontact \
+    svx/source/sdr/contact/viewcontactofsdrole2obj \
+    svx/source/sdr/contact/displayinfo \
+    svx/source/sdr/contact/objectcontacttools \
+    svx/source/sdr/contact/viewcontactofe3dscene \
+    svx/source/sdr/contact/viewcontactofsdrrectobj \
+    svx/source/sdr/contact/viewobjectcontactofsdrole2obj \
+    svx/source/sdr/contact/viewobjectcontactofunocontrol \
+    svx/source/sdr/contact/viewobjectcontactofgraphic \
+    svx/source/sdr/contact/sdrmediawindow \
+    svx/source/sdr/contact/viewobjectcontactofsdrmediaobj \
+    svx/source/sdr/contact/viewcontactofsdrcaptionobj \
+    svx/source/sdr/contact/viewcontactofvirtobj \
+    svx/source/sdr/contact/viewcontactofe3dsphere \
+    svx/source/sdr/contact/viewcontactofe3dpolygon \
+    svx/source/sdr/contact/viewcontactofsdredgeobj \
+    svx/source/sdr/contact/viewobjectcontact \
+    svx/source/sdr/contact/viewobjectcontactofsdrobj \
+    svx/source/sdr/contact/objectcontactofpageview \
+    svx/source/sdr/contact/viewcontactofsdrpathobj \
+    svx/source/sdr/contact/viewcontactofsdrmeasureobj \
+    svx/source/sdr/contact/objectcontactofobjlistpainter \
+    svx/source/sdr/contact/viewobjectcontactofe3d \
+    svx/source/customshapes/EnhancedCustomShapeGeometry \
+    svx/source/customshapes/EnhancedCustomShapeTypeNames \
+    svx/source/customshapes/EnhancedCustomShape2d \
+    svx/source/customshapes/EnhancedCustomShapeFunctionParser \
+    svx/source/dialog/dialmgr \
+    svx/source/dialog/dlgutil \
+    svx/source/dialog/framelink \
+    svx/source/dialog/langbox \
+    svx/source/dialog/simptabl \
+    svx/source/dialog/svxdlg \
+    svx/source/dialog/stddlg \
+    svx/source/engine3d/deflt3d \
+    svx/source/engine3d/polysc3d \
+    svx/source/engine3d/sphere3d \
+    svx/source/engine3d/helperminimaldepth3d \
+    svx/source/engine3d/obj3d \
+    svx/source/engine3d/dragmt3d \
+    svx/source/engine3d/scene3d \
+    svx/source/engine3d/view3d \
+    svx/source/engine3d/e3dsceneupdater \
+    svx/source/engine3d/viewpt3d2 \
+    svx/source/engine3d/svx3ditems \
+    svx/source/engine3d/camera3d \
+    svx/source/engine3d/e3dundo \
+    svx/source/engine3d/objfac3d \
+    svx/source/engine3d/lathe3d \
+    svx/source/engine3d/polygn3d \
+    svx/source/engine3d/view3d1 \
+    svx/source/engine3d/cube3d \
+    svx/source/engine3d/helperhittest3d \
+    svx/source/engine3d/extrud3d \
+    svx/source/sdr/event/eventhandler \
+    svx/source/fmcomp/gridctrl \
+    svx/source/fmcomp/xmlexchg \
+    svx/source/fmcomp/trace \
+    svx/source/fmcomp/fmgridcl \
+    svx/source/fmcomp/gridcell \
+    svx/source/fmcomp/dbaexchange \
+    svx/source/fmcomp/gridcols \
+    svx/source/fmcomp/fmgridif \
+    svx/source/form/formfeaturedispatcher \
+    svx/source/form/typeconversionclient \
+    svx/source/form/fmpgeimp \
+    svx/source/form/fmcontrolbordermanager \
+    svx/source/form/fmshell \
+    svx/source/form/fmundo \
+    svx/source/form/ParseContext \
+    svx/source/form/fmexpl \
+    svx/source/form/fmtools \
+    svx/source/form/fmexch \
+    svx/source/form/formcontroller \
+    svx/source/form/dataaccessdescriptor \
+    svx/source/form/fmtextcontrolshell \
+    svx/source/form/datalistener \
+    svx/source/form/formcontrolfactory \
+    svx/source/form/sdbdatacolumn \
+    svx/source/form/fmview \
+    svx/source/form/delayedevent \
+    svx/source/form/fmservs \
+    svx/source/form/fmobj \
+    svx/source/form/fmdocumentclassification \
+    svx/source/form/sqlparserclient \
+    svx/source/form/fmshimp \
+    svx/source/form/typemap \
+    svx/source/form/fmscriptingenv \
+    svx/source/form/dbtoolsclient \
+    svx/source/form/fmpage \
+    svx/source/form/stringlistresource \
+    svx/source/form/fmmodel \
+    svx/source/form/formtoolbars \
+    svx/source/form/fmdpage \
+    svx/source/form/fmitems \
+    svx/source/form/navigatortreemodel \
+    svx/source/form/fmvwimp \
+    svx/source/form/fmtextcontrolfeature \
+    svx/source/form/fmdmod \
+    svx/source/form/fmcontrollayout \
+    svx/source/form/fmtextcontroldialogs \
+    svx/source/form/formdispatchinterceptor \
+    svx/source/form/formcontrolling \
+    svx/source/form/navigatortree \
+    svx/source/form/datanavi \
+    svx/source/form/legacyformcontroller \
+    svx/source/form/xfm_addcondition \
+    svx/source/gallery2/galexpl \
+    svx/source/gallery2/galtheme \
+    svx/source/gallery2/galctrl \
+    svx/source/gallery2/gallery1 \
+    svx/source/gallery2/galmisc \
+    svx/source/gallery2/galobj \
+    svx/source/gallery2/galbrws2 \
+    svx/source/gallery2/galbrws \
+    svx/source/gallery2/galbrws1 \
+    svx/source/gallery2/codec \
+    svx/source/items/drawitem \
+    svx/source/items/chrtitem \
+    svx/source/items/e3ditem \
+    svx/source/items/grfitem \
+    svx/source/items/clipfmtitem \
+    svx/source/items/customshapeitem \
+    svx/source/sdr/overlay/overlayline \
+    svx/source/sdr/overlay/overlaycrosshair \
+    svx/source/sdr/overlay/overlayrollingrectangle \
+    svx/source/sdr/overlay/overlaytriangle \
+    svx/source/sdr/overlay/overlayselection \
+    svx/source/sdr/overlay/overlayhatchrect \
+    svx/source/sdr/overlay/overlaybitmapex \
+    svx/source/sdr/overlay/overlaymanagerbuffered \
+    svx/source/sdr/overlay/overlayhelpline \
+    svx/source/sdr/overlay/overlayanimatedbitmapex \
+    svx/source/sdr/overlay/overlaypolypolygon \
+    svx/source/sdr/overlay/overlayobjectcell \
+    svx/source/sdr/overlay/overlaytools \
+    svx/source/sdr/overlay/overlayprimitive2dsequenceobject \
+    svx/source/sdr/overlay/overlayobject \
+    svx/source/sdr/overlay/overlaymanager \
+    svx/source/sdr/overlay/overlayobjectlist \
+    svx/source/sdr/primitive2d/sdrellipseprimitive2d \
+    svx/source/sdr/primitive2d/sdrprimitivetools \
+    svx/source/sdr/primitive2d/sdrtextprimitive2d \
+    svx/source/sdr/primitive2d/primitivefactory2d \
+    svx/source/sdr/primitive2d/sdrolecontentprimitive2d \
+    svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d \
+    svx/source/sdr/primitive2d/sdrgrafprimitive2d \
+    svx/source/sdr/primitive2d/sdrole2primitive2d \
+    svx/source/sdr/primitive2d/sdrpathprimitive2d \
+    svx/source/sdr/primitive2d/sdrrectangleprimitive2d \
+    svx/source/sdr/primitive2d/sdrcaptionprimitive2d \
+    svx/source/sdr/primitive2d/sdrconnectorprimitive2d \
+    svx/source/sdr/primitive2d/sdrmeasureprimitive2d \
+    svx/source/sdr/primitive2d/sdrattributecreator \
+    svx/source/sdr/primitive2d/sdrdecompositiontools \
+    svx/source/sdr/primitive3d/sdrattributecreator3d \
+    svx/source/sdr/properties/pageproperties \
+    svx/source/sdr/properties/e3dsceneproperties \
+    svx/source/sdr/properties/itemsettools \
+    svx/source/sdr/properties/captionproperties \
+    svx/source/sdr/properties/e3dextrudeproperties \
+    svx/source/sdr/properties/e3dproperties \
+    svx/source/sdr/properties/measureproperties \
+    svx/source/sdr/properties/customshapeproperties \
+    svx/source/sdr/properties/rectangleproperties \
+    svx/source/sdr/properties/groupproperties \
+    svx/source/sdr/properties/properties \
+    svx/source/sdr/properties/e3dlatheproperties \
+    svx/source/sdr/properties/graphicproperties \
+    svx/source/sdr/properties/circleproperties \
+    svx/source/sdr/properties/emptyproperties \
+    svx/source/sdr/properties/e3dsphereproperties \
+    svx/source/sdr/properties/defaultproperties \
+    svx/source/sdr/properties/textproperties \
+    svx/source/sdr/properties/attributeproperties \
+    svx/source/sdr/properties/connectorproperties \
+    svx/source/sdr/properties/e3dcompoundproperties \
+    svx/source/sdr/properties/oleproperties \
+    svx/source/svdraw/svdglev \
+    svx/source/svdraw/svdhdl \
+    svx/source/svdraw/svdomedia \
+    svx/source/svdraw/svdedxv \
+    svx/source/svdraw/svdoedge \
+    svx/source/svdraw/svdundo \
+    svx/source/svdraw/svdmrkv1 \
+    svx/source/svdraw/svdotxfl \
+    svx/source/svdraw/sdrcomment \
+    svx/source/svdraw/svdcrtv \
+    svx/source/svdraw/svdouno \
+    svx/source/svdraw/svditer \
+    svx/source/svdraw/svdotxln \
+    svx/source/svdraw/svdxcgv \
+    svx/source/svdraw/svdomeas \
+    svx/source/svdraw/svdpntv \
+    svx/source/svdraw/svdattr \
+    svx/source/svdraw/svdotxdr \
+    svx/source/svdraw/svdtext \
+    svx/source/svdraw/svdedtv2 \
+    svx/source/svdraw/svddrag \
+    svx/source/svdraw/svdopage \
+    svx/source/svdraw/svddrgmt \
+    svx/source/svdraw/svdogrp \
+    svx/source/svdraw/svdovirt \
+    svx/source/svdraw/svddrgv \
+    svx/source/svdraw/sdrpaintwindow \
+    svx/source/svdraw/polypolygoneditor \
+    svx/source/svdraw/svdpoev \
+    svx/source/svdraw/svdotextpathdecomposition \
+    svx/source/svdraw/svdmrkv \
+    svx/source/svdraw/svdview \
+    svx/source/svdraw/svdoashp \
+    svx/source/svdraw/svdoutlinercache \
+    svx/source/svdraw/svdetc \
+    svx/source/svdraw/svdlayer \
+    svx/source/svdraw/svdfmtf \
+    svx/source/svdraw/gradtrns \
+    svx/source/svdraw/svdotxed \
+    svx/source/svdraw/svdhlpln \
+    svx/source/svdraw/svdedtv \
+    svx/source/svdraw/svdmodel \
+    svx/source/svdraw/svdopath \
+    svx/source/svdraw/svdtrans \
+    svx/source/svdraw/svdpagv \
+    svx/source/svdraw/svdorect \
+    svx/source/svdraw/svdedtv1 \
+    svx/source/svdraw/svdograf \
+    svx/source/svdraw/sdrhittesthelper \
+    svx/source/svdraw/svdglue \
+    svx/source/svdraw/svdobj \
+    svx/source/svdraw/svdsnpv \
+    svx/source/svdraw/svdotext \
+    svx/source/svdraw/svdoattr \
+    svx/source/svdraw/svdviter \
+    svx/source/svdraw/svdpage \
+    svx/source/svdraw/svdoole2 \
+    svx/source/svdraw/svdibrow \
+    svx/source/svdraw/sdrmasterpagedescriptor \
+    svx/source/svdraw/svdocapt \
+    svx/source/svdraw/svdmark \
+    svx/source/svdraw/svdocirc \
+    svx/source/svdraw/selectioncontroller \
+    svx/source/svdraw/clonelist \
+    svx/source/svdraw/svdotxtr \
+    svx/source/svdraw/svdoutl \
+    svx/source/svdraw/sdrpagewindow \
+    svx/source/svdraw/svdotxat \
+    svx/source/svdraw/svdotextdecomposition \
+    svx/source/table/tablecontroller \
+    svx/source/table/tablerow \
+    svx/source/table/tablelayouter \
+    svx/source/table/tablecolumn \
+    svx/source/table/tablemodel \
+    svx/source/table/svdotable \
+    svx/source/table/cellcursor \
+    svx/source/table/propertyset \
+    svx/source/table/tablecolumns \
+    svx/source/table/viewcontactoftableobj \
+    svx/source/table/cellrange \
+    svx/source/table/tableundo \
+    svx/source/table/tablerows \
+    svx/source/table/tablehandles \
+    svx/source/table/cell \
+    svx/source/tbxctrls/fontworkgallery \
+    svx/source/tbxctrls/extrusioncontrols \
+    svx/source/tbxctrls/tbcontrl \
+    svx/source/tbxctrls/toolbarmenu \
+    svx/source/tbxctrls/tbxcolorupdate \
+    svx/source/toolbars/fontworkbar \
+    svx/source/toolbars/extrusionbar \
+    svx/source/unodraw/unoshap4 \
+    svx/source/unodraw/unomlstr \
+    svx/source/unodraw/unoshtxt \
+    svx/source/unodraw/gluepts \
+    svx/source/unodraw/shapepropertynotifier \
+    svx/source/unodraw/tableshape \
+    svx/source/unodraw/unohtabl \
+    svx/source/unodraw/unoshape \
+    svx/source/unodraw/UnoGraphicExporter \
+    svx/source/unodraw/unobtabl \
+    svx/source/unodraw/XPropertyTable \
+    svx/source/unodraw/unoshap3 \
+    svx/source/unodraw/unottabl \
+    svx/source/unodraw/UnoNameItemTable \
+    svx/source/unodraw/unogtabl \
+    svx/source/unodraw/unomod \
+    svx/source/unodraw/unopage \
+    svx/source/unodraw/unoprov \
+    svx/source/unodraw/unomtabl \
+    svx/source/unodraw/unoshap2 \
+    svx/source/unodraw/unodtabl \
+    svx/source/xml/xmlexport \
+    svx/source/xml/xmlgrhlp \
+    svx/source/xml/xmlxtimp \
+    svx/source/xml/xmlxtexp \
+    svx/source/xml/xmleohlp \
+    svx/source/xoutdev/xtablend \
+    svx/source/xoutdev/xattr \
+    svx/source/xoutdev/xtabgrdt \
+    svx/source/xoutdev/xtabhtch \
+    svx/source/xoutdev/_xoutbmp \
+    svx/source/xoutdev/xtabdash \
+    svx/source/xoutdev/xtabbtmp \
+    svx/source/xoutdev/xexch \
+    svx/source/xoutdev/xtabcolr \
+    svx/source/xoutdev/xattr2 \
+    svx/source/xoutdev/xtable \
+    svx/source/xoutdev/xattrbmp \
+    svx/source/xoutdev/_xpoly \
+    svx/source/xoutdev/xpool \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,svxcore,\
+    dl \
+    m \
+    pthread \
+    stl \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,svxcore,\
+    advapi32 \
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+
+$(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
+
+
+$(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/svx/inc \
+    -I$(SRCDIR)/svx/sdi \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/prj/target_module_svx.mk b/svx/prj/target_module_svx.mk
new file mode 100644
index 000000000000..5978c97e5500
--- /dev/null
+++ b/svx/prj/target_module_svx.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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,svx,\
+    $(call gb_AllLangResTarget_get_target,svx) \
+    $(call gb_Library_get_target,svxcore) \
+    $(call gb_Library_get_target,svx) \
+))
+
+$(eval $(call gb_Module_read_includes,svx,\
+    lib_svx \
+    lib_svxcore \
+    res_svx \
+))
+
+#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
+#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes
+#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
+#todo: noopt for viewpt3d.cxx with MSVC and ICC
+#todo: set -DENABLE_VBA in case $(ENABLE_VBA)="YES"; can we do it in gbuild.mk?
+#todo: gengal
+#todo: set -D... for ENABLE_GTK/KDE/KDE4 -> in gbuild.mk?
+#todo: ibrwimp.lib in util/makefile.mk on Windows ?!
+#todo: GENHID
+#todo: uiconfig
+#todo: exports from gallery (util/gal.dxp) and svx (svx.dxp)
+#todo: resources, textconversion, packages
+
diff --git a/svx/prj/target_package_inc.mk b/svx/prj/target_package_inc.mk
new file mode 100644
index 000000000000..dd836b286f8b
--- /dev/null
+++ b/svx/prj/target_package_inc.mk
@@ -0,0 +1,154 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/prj/target_res_svx.mk b/svx/prj/target_res_svx.mk
new file mode 100644
index 000000000000..67d3cfab1cc1
--- /dev/null
+++ b/svx/prj/target_res_svx.mk
@@ -0,0 +1,112 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_AllLangResTarget_AllLangResTarget,svx))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx))
+#$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx/source/svdraw))
+
+$(eval $(call gb_AllLangResTarget_add_srs,svx,\
+    svx/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,svx/res))
+
+$(eval $(call gb_SrsTarget_set_include,svx/res,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(WORKDIR)/inc \
+    -I$(SRCDIR)/svx/source/inc \
+    -I$(SRCDIR)/svx/source/dialog \
+    -I$(SRCDIR)/svx/inc/ \
+    -I$(SRCDIR)/svx/unxlngi6.pro/inc/ \
+))
+
+#svx/source/src/errtxt.src
+#svx/source/src/app.src
+
+#svx/source/intro/iso.src
+#svx/source/intro/ooo.src
+
+#svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
+#svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
+
+$(eval $(call gb_SrsTarget_add_files,svx/res,\
+    svx/source/stbctrls/stbctrls.src \
+    svx/source/dialog/passwd.src \
+    svx/source/dialog/language.src \
+    svx/source/dialog/bmpmask.src \
+    svx/source/dialog/ucsubset.src \
+    svx/source/dialog/hdft.src \
+    svx/source/dialog/imapdlg.src \
+    svx/source/dialog/swframeposstrings.src \
+    svx/source/dialog/prtqry.src \
+    svx/source/dialog/txenctab.src \
+    svx/source/dialog/dlgctrl.src \
+    svx/source/dialog/frmsel.src \
+    svx/source/dialog/ctredlin.src \
+    svx/source/dialog/sdstring.src \
+    svx/source/dialog/ruler.src \
+    svx/source/dialog/srchdlg.src \
+    svx/source/dialog/optgrid.src \
+    svx/source/dialog/langbox.src \
+    svx/source/dialog/contdlg.src \
+    svx/source/dialog/rubydialog.src \
+    svx/source/dialog/fontwork.src \
+    svx/source/dialog/docrecovery.src \
+    svx/source/dialog/hyprlink.src \
+    svx/source/dialog/svxbmpnumvalueset.src \
+    svx/source/engine3d/string3d.src \
+    svx/source/engine3d/float3d.src \
+    svx/source/mnuctrls/mnuctrls.src \
+    svx/source/tbxctrls/linectrl.src \
+    svx/source/tbxctrls/colrctrl.src \
+    svx/source/tbxctrls/extrusioncontrols.src \
+    svx/source/tbxctrls/tbxdraw.src \
+    svx/source/tbxctrls/grafctrl.src \
+    svx/source/tbxctrls/lboxctrl.src \
+    svx/source/tbxctrls/tbcontrl.src \
+    svx/source/tbxctrls/fontworkgallery.src \
+    svx/source/fmcomp/gridctrl.src \
+    svx/source/form/fmexpl.src \
+    svx/source/form/formshell.src \
+    svx/source/form/fmstring.src \
+    svx/source/form/datanavi.src \
+    svx/source/form/filtnav.src \
+    svx/source/unodraw/unodraw.src \
+    svx/source/table/table.src \
+    svx/source/toolbars/extrusionbar.src \
+    svx/source/toolbars/fontworkbar.src \
+    svx/source/gallery2/galtheme.src \
+    svx/source/gallery2/gallery.src \
+    svx/source/svdraw/svdstr.src \
+    svx/source/accessibility/accessibility.src \
+    svx/source/items/svxitems.src \
+    svx/source/items/svxerr.src \
+))
+
+
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 610f219c21cf..2bca7593f423 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -39,14 +39,14 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <svx/svdouno.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/accessiblewrapper.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <algorithm>
 
 using namespace ::comphelper;
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 28cdb8b0882b..4c1869f6997a 100755
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/AccessibleShape.hxx>
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 #include <svx/AccessibleShapeInfo.hxx>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <rtl/uuid.h>
@@ -51,7 +51,7 @@
 #include <svx/unoshtxt.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdmodel.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <com/sun/star/uno/Exception.hpp>
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
@@ -59,7 +59,7 @@
 #ifndef _SVX_ACCESSIBILITY_HRC
 #include "accessibility.hrc"
 #endif
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <svx/dialmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 010bc5decfeb..8587639fa1fa 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -52,12 +52,12 @@
 #ifndef _SVX_ACCESSIBILITY_HRC
 #include "accessibility.hrc"
 #endif
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <svx/dialmgr.hxx>
 #include <tools/string.hxx>
 
 #include <svx/xdef.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "accessibility.hrc"
 #include "DGColorNameLookUp.hxx"
 
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index b0523bda67e1..0119e7c71cbf 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -45,7 +45,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <svtools/colorcfg.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 //===== local includes ========================================================
 #include <svx/ShapeTypeHandler.hxx>
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 228f2ed50492..4a4cad786b58 100755
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -35,7 +35,7 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/dialmgr.hxx>
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 
 
 using namespace ::rtl;
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 36490775cea1..6224373f9a15 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -27,9 +27,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShape2d.hxx"
-#include "EnhancedCustomShapeGeometry.hxx"
-#include "EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
 #include <svx/svdoashp.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdocirc.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 059bb8f43b5c..3545805f4966 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -31,7 +31,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
 #include <tools/poly.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoashp.hxx>
 #include <svl/poolitem.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 237a0537d472..ae7a1398c9e7 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -28,16 +28,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "EnhancedCustomShapeEngine.hxx"
-#include "EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
 #include "EnhancedCustomShape3d.hxx"
 #include "EnhancedCustomShapeFontWork.hxx"
 #include "EnhancedCustomShapeHandle.hxx"
-#include "EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
 #include <svx/unoshape.hxx>
 #ifndef _SVX_UNOPAGE_HXX
 #include "svx/unopage.hxx"
 #endif
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdogrp.hxx>
@@ -49,7 +49,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "unopolyhelper.hxx"
 #include <uno/mapping.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 06c7098400a3..5a24cb1fd75d 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -38,7 +38,7 @@
 #include <svx/sdasaitm.hxx>
 #include <svx/sdtfsitm.hxx>
 #include <vcl/virdev.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <vcl/metric.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/frmdiritem.hxx>
@@ -46,7 +46,7 @@
 #include <editeng/postitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/charscaleitem.hxx>
-#include "EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
 #include <svx/svdorect.hxx>
 #include <svx/svdoashp.hxx>
 #include <editeng/outliner.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index a00a625693c4..dafd0d868963 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
 #include <rtl/ustring.hxx>
 #include <tools/fract.hxx>
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index aa8d7c253e6e..2bf28c81ca18 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
 #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp>
 /*
 static const SvxMSDffVertPair Vert[] =
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
index 0a87ad57d660..92104f0ae82e 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "EnhancedCustomShapeHandle.hxx"
-#include "EnhancedCustomShape2d.hxx"
-#include "unoapi.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
+#include "svx/unoapi.hxx"
 
 // -----------------------------------------------------------------------------
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index c3651f3b54cf..093bae0d2a2d 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
 #include <osl/mutex.hxx>
 #include <hash_map>
 
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index b3c4645a58f9..4cec80db354d 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -43,7 +43,7 @@
 
 #include <sfx2/imagemgr.hxx>
 #include <vcl/svapp.hxx>
-#include "tbxcustomshapes.hxx"
+#include "svx/tbxcustomshapes.hxx"
 
 SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem);
 
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 2eee0268816a..26dc3137aa52 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -52,7 +52,7 @@
 #define _XOUTBMP_STATICS_ONLY
 
 #include <svx/dialmgr.hxx>
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svx/contdlg.hxx>
@@ -61,7 +61,7 @@
 #include "contwnd.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <vcl/svapp.hxx>
 
 /******************************************************************************/
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 79e563510dbc..84670ee32418 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -37,9 +37,9 @@
 
 #include <svx/svdpage.hxx> // SdrObjList
 
-#include "connctrl.hxx"
+#include "svx/connctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 // #110094#
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 590408bf6707..5019be9f9472 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <xoutbmp.hxx>
+#include <svx/xoutbmp.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <contdlg.hrc>
@@ -40,7 +40,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 // #i75482#
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 #define TRANSCOL Color( COL_WHITE )
 
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index fb7b4a6903ef..68c7d970fecb 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 // === includes (declaration) ============================================
-#include "databaseregistrationui.hxx"
+#include "svx/databaseregistrationui.hxx"
 
 // === includes (UNO) ====================================================
 // === /includes (UNO) ===================================================
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 0d5e6ed4bd6f..562b194ab56a 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "dialcontrol.hxx"
+#include "svx/dialcontrol.hxx"
 
 #include <math.h>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index 6c7a42f90970..dede78faef1d 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -30,7 +30,7 @@
 
 // include ---------------------------------------------------------------
 
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svl/itemset.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/module.hxx>
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 6443c12b427b..a6b03a17d890 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "fontlb.hxx"
+#include "svx/fontlb.hxx"
 #include <vcl/svapp.hxx>
 
 // ============================================================================
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 054a76fec493..c62cea74c69a 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -41,7 +41,7 @@
 #include <svx/xtextit.hxx>
 
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 #include <svx/dialogs.hrc>
 #include "fontwork.hrc"
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index a50bc6247a5f..7c0794d8bb6e 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -41,12 +41,12 @@
 
 #include <svx/graphctl.hxx>
 #include "GraphCtlAccessibleContext.hxx"
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include <svx/svxids.hrc>
 #include <svx/svdpage.hxx>
 
 // #i72889#
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 /*************************************************************************
 |*
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 551f682abda0..2da5df325dfa 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -48,9 +48,9 @@
 #include <svx/hdft.hxx>
 #include <svx/pageitem.hxx>
 //CHINA001 #include "bbdlg.hxx"
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
+#include "svx/htmlmode.hxx"
 
 #include <editeng/brshitem.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 6828f222facc..dcca52044531 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -31,7 +31,7 @@
 // include ---------------------------------------------------------------
 #include <vcl/settings.hxx>
 #include <unotools/viewoptions.hxx>
-#include "hyperdlg.hxx"
+#include "svx/hyperdlg.hxx"
 #include <svx/svxdlg.hxx> //CHINA001
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index c7c9f7a22939..b8f150736ea1 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -43,11 +43,11 @@
 #include <sfx2/objsh.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include "hlnkitem.hxx"
+#include "svx/hlnkitem.hxx"
 #include <svx/dialogs.hrc>
 #include "hyprlink.hrc"
 #include <svx/dialmgr.hxx>
-#include "hyprlink.hxx"
+#include "svx/hyprlink.hxx"
 #include "hyprdlg.hxx"
 
 using namespace ::rtl;
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index e876431b13ec..df396bf99f41 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -68,7 +68,7 @@
 #endif
 
 #define _IMAPDLG_PRIVATE
-#include "imapdlg.hxx"
+#include "svx/imapdlg.hxx"
 
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
@@ -76,7 +76,7 @@
 #include "imapdlg.hrc"
 #include "imapwnd.hxx"
 #include "imapimp.hxx"
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index b4da78cabe59..4442cb76bad4 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -37,7 +37,7 @@
 #include <svtools/imappoly.hxx>
 #include <svl/urlbmk.hxx>
 
-#include <xoutbmp.hxx>
+#include <svx/xoutbmp.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 3b56b443e2fe..13f29089b784 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -33,9 +33,9 @@
 #include <svx/svdomeas.hxx>
 #include <svx/svdmodel.hxx>
 
-#include "measctrl.hxx"
+#include "svx/measctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 /*************************************************************************
 |*
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 7565539578df..f281580b93db 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -38,10 +38,10 @@
 
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
-#include "optgrid.hxx"
+#include "svx/optgrid.hxx"
 #include <svx/dialogs.hrc>
 #include "optgrid.hrc"
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 /* -----------------18.08.98 17:41-------------------
  * local functions
diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx
index f546bb95dc21..95b6e5b4ca08 100644
--- a/svx/source/dialog/orienthelper.cxx
+++ b/svx/source/dialog/orienthelper.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "orienthelper.hxx"
+#include "svx/orienthelper.hxx"
 
 #include <vector>
 #include <utility>
@@ -35,7 +35,7 @@
 #ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
 #endif
-#include "dialcontrol.hxx"
+#include "svx/dialcontrol.hxx"
 
 namespace svx {
 
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 19d97d368496..bb689c3fb8fa 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -36,7 +36,7 @@
 
 #define _SVX_PASSWD_CXX
 
-#include "passwd.hxx"
+#include "svx/passwd.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include "passwd.hrc"
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index af8d283185a6..2938988fac7e 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -35,7 +35,7 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include "pfiledlg.hxx"
+#include "svx/pfiledlg.hxx"
 #include <svx/dialogs.hrc>
 
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index 07f4d2fe9928..0a19d52958e3 100644
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
 #endif
-#include <prtqry.hxx>
+#include <svx/prtqry.hxx>
 #include <svx/dialmgr.hxx>
 #include <tools/shl.hxx>
 
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 8cdb6ee5ba3f..1224de5ba6ea 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -31,7 +31,7 @@
 // include ---------------------------------------------------------------
 
 #include <tools/ref.hxx>
-#include "relfld.hxx"
+#include "svx/relfld.hxx"
 
 // -----------------------------------------------------------------------
 
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 38223bcb8893..23d62d4de85e 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -44,7 +44,7 @@
 #include <editeng/tstpitem.hxx>
 #include "editeng/protitem.hxx"
 #include "rlrcitem.hxx"
-#include "rulritem.hxx"
+#include "svx/rulritem.hxx"
 #include <svl/eitem.hxx>
 
 // class SvxRulerItem ----------------------------------------------------
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 5a5839443170..d281802ac40e 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <rubydialog.hxx>
+#include <svx/rubydialog.hxx>
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index fd0007cce8e5..331c38d6bdd6 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -30,7 +30,7 @@
 #include <tools/string.hxx>
 
 #include <svx/dialogs.hrc>
-#include "rulritem.hxx"
+#include "svx/rulritem.hxx"
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/frame/status/LeftRightMargin.hpp>
 #include <com/sun/star/frame/status/UpperLowerMargin.hpp>
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index 993288bcd622..479888463a5c 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -40,7 +40,7 @@
 
 
 #include "srchctrl.hxx"
-#include "srchdlg.hxx"
+#include "svx/srchdlg.hxx"
 #include <svl/srchitem.hxx>
 
 // class SvxSearchFamilyControllerItem -----------------------------------
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 3ccba1f910ae..9f6d606dc759 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -56,7 +56,7 @@
 #include <toolkit/unohlp.hxx>
 
 #define _SVX_SRCHDLG_CXX
-#include "srchdlg.hxx"
+#include "svx/srchdlg.hxx"
 
 #include <svx/dialogs.hrc>
 #include <svx/svxitems.hrc>
@@ -69,7 +69,7 @@
 #include <svx/pageitem.hxx>
 #include "srchctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <editeng/brshitem.hxx>
 #include <tools/resary.hxx>
 #include <svx/svxdlg.hxx> //CHINA001
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index cbf5a39997bd..482dc467d66c 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -41,7 +41,7 @@
 #include <editeng/numitem.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
-#include <gallery.hxx>
+#include <svx/gallery.hxx>
 #include <svl/urihelper.hxx>
 #include <editeng/brshitem.hxx>
 #include <svl/intitem.hxx>
@@ -49,14 +49,14 @@
 #include <vcl/graph.hxx>
 #include <vcl/msgbox.hxx>
 #include <editeng/flstitem.hxx>
-#include <dlgutil.hxx>
+#include <svx/dlgutil.hxx>
 #ifndef _XTABLE_HXX //autogen
 
 #include <svx/xtable.hxx>
 #endif
-#include <drawitem.hxx>
-#include <numvset.hxx>
-#include <htmlmode.hxx>
+#include <svx/drawitem.hxx>
+#include <svx/numvset.hxx>
+#include <svx/htmlmode.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
 #include <editeng/unolingu.hxx>
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx
index 07daea2064ab..6d6d2cb126db 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "svxgrahicitem.hxx"
+#include "svx/svxgrahicitem.hxx"
 TYPEINIT1(SvxGraphicItem,SfxPoolItem);
 SvxGraphicItem::SvxGraphicItem( USHORT _nWhich, const Graphic& rGraphic )
     : SfxPoolItem( _nWhich ), aGraphic( rGraphic )
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 8000de0d2103..0e79ff530e7c 100755..100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -48,7 +48,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/ruler.hxx>
 #include "rlrcitem.hxx"
-#include "rulritem.hxx"
+#include "svx/rulritem.hxx"
 #include <editeng/tstpitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include "editeng/protitem.hxx"
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index f79e009bb332..8ba911fb90c0 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -33,7 +33,7 @@
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/colorcfg.hxx>
-#include <swframeexample.hxx>
+#include <svx/swframeexample.hxx>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index 7faa97230c92..03b2746ae3fd 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <swframeposstrings.hxx>
+#include <svx/swframeposstrings.hxx>
 #include <tools/rc.hxx>
 #include <tools/debug.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src
index 3c9788fa8c9e..c6a164630c5e 100644
--- a/svx/source/dialog/swframeposstrings.src
+++ b/svx/source/dialog/swframeposstrings.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 #include <svx/dialogs.hrc>
 
-//the following defines have to match the (enum values + 1) in swframeposstrings.hxx!
+//the following defines have to match the (enum values + 1) in svx/swframeposstrings.hxx!
 #define STR_LEFT                                1
 #define STR_RIGHT                               2
 #define STR_FROMLEFT                            3
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 718989b84450..751184e929c7 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "txencbox.hxx"
-#include "txenctab.hxx"
+#include "svx/txencbox.hxx"
+#include "svx/txenctab.hxx"
 #include <svx/dialogs.hrc>
 #include "svx/dbcharsethelper.hxx"
 #include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index 3fc82705141c..74b60a08d2bd 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -30,7 +30,7 @@
 
 #include <svx/dialogs.hrc> // -> RID_SVXSTR_TEXTENCODING_TABLE
 #include <svx/dialmgr.hxx>
-#include "txenctab.hxx"
+#include "svx/txenctab.hxx"
 #include <tools/shl.hxx>
 
 //------------------------------------------------------------------------
diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx
index 8c6da9f1ff81..ee152439254c 100644
--- a/svx/source/dialog/wrapfield.cxx
+++ b/svx/source/dialog/wrapfield.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "wrapfield.hxx"
+#include "svx/wrapfield.hxx"
 
 namespace svx {
 
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 626ee80d46e3..b78d464d4897 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/cube3d.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <basegfx/point/b3dpoint.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <svx/sdr/contact/viewcontactofe3dcube.hxx>
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 7261586947c4..423a846d86a1 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/extrud3d.hxx>
 #include <svx/scene3d.hxx>
 
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 8ff6af906eaa..e1e90d88c22f 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -37,7 +37,7 @@
 #include <tools/shl.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/svdmodel.hxx>
-#include <globl3d.hxx>
+#include <svx/globl3d.hxx>
 #include <svx/view3d.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/sphere3d.hxx>
@@ -48,9 +48,9 @@
 #include <svx/polysc3d.hxx>
 #include <editeng/eeitem.hxx>
 #include <svl/style.hxx>
-#include <dlgutil.hxx>
+#include <svx/dlgutil.hxx>
 
-#include <dlgutil.hxx>
+#include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/viewpt3d.hxx> // ProjectionType
 
@@ -60,7 +60,7 @@
 #include <editeng/colritem.hxx>
 #include <svx/e3ditem.hxx>
 
-#include <gallery.hxx>
+#include <svx/gallery.hxx>
 #define GALLERY_THEME "3D"
 #include <svl/whiter.hxx>
 
diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx
index 78324c22ed27..c5e77870a073 100644
--- a/svx/source/engine3d/helperhittest3d.cxx
+++ b/svx/source/engine3d/helperhittest3d.cxx
@@ -32,7 +32,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/scene3d.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <drawinglayer/processor3d/cutfindprocessor3d.hxx>
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index e6953f96f766..4d88dce0fb4d 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -28,11 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <tools/poly.hxx>
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/lathe3d.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/svxids.hrc>
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 9f284d826d9f..c9ceb1ef78a6 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -28,14 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
-#include "svditer.hxx"
-#include "globl3d.hxx"
+#include "svx/svditer.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/camera3d.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/polysc3d.hxx>
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 3b06b249558e..493e5260cd7e 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -28,14 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/polysc3d.hxx>
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/polygn3d.hxx>
-#include "objfac3d.hxx"
+#include "svx/objfac3d.hxx"
 #include <svx/svdobj.hxx>
 
 /*************************************************************************
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index e91689424e18..0ec26903d2c0 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 #include <svx/polygn3d.hxx>
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <basegfx/point/b3dpoint.hxx>
 #include <svx/sdr/contact/viewcontactofe3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx
index 3c002e2533b8..212f5ccae44a 100644
--- a/svx/source/engine3d/polysc3d.cxx
+++ b/svx/source/engine3d/polysc3d.cxx
@@ -30,14 +30,14 @@
 #include <svx/xfillit.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdogrp.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdetc.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
 #include <svl/style.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/polysc3d.hxx>
 #include <svx/xlnclit.hxx>
 #include <svl/metitem.hxx>
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 0b06a74c280d..f209ee93487a 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -28,14 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
-#include "svditer.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svditer.hxx"
 
 #if defined( UNX ) || defined( ICC )
 #include <stdlib.h>
 #endif
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/svdpage.hxx>
 #include <svl/style.hxx>
 #include <svx/scene3d.hxx>
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index ab9e3bc87f79..316c353ad7bb 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -28,11 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/sphere3d.hxx>
 
 #include <svx/svxids.hrc>
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 047faef2cb41..c69abb362754 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -32,7 +32,7 @@
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
 #include <tools/shl.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpool.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdmodel.hxx>
@@ -43,7 +43,7 @@
 #include <svx/svdview.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/obj3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/sphere3d.hxx>
@@ -64,7 +64,7 @@
 #include <svx/xlnwtit.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
 #include <svx/sdrpagewindow.hxx>
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index dce003fe90ae..121696d8ed6b 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <tools/shl.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svxids.hrc>
@@ -37,7 +37,7 @@
 #include <svx/fmview.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/obj3d.hxx>
 #include <svx/polysc3d.hxx>
 #include <svx/e3ditem.hxx>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index d64b0c9ab958..618c2135652a 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -28,12 +28,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "dbexch.hrc"
-#include "fmgridif.hxx"
+#include "svx/dbexch.hrc"
+#include "svx/fmgridif.hxx"
 #include "fmitems.hxx"
 #include "fmprop.hrc"
 #include "svx/fmtools.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmurl.hxx"
 #include "formcontrolfactory.hxx"
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 5a033cd77d44..d6a530db85e3 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "fmgridif.hxx"
+#include "svx/fmgridif.hxx"
 #include "fmprop.hrc"
 #include "fmservs.hxx"
 #include "svx/fmtools.hxx"
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 76c700ae4221..7fb9d8330cf6 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -30,7 +30,7 @@
 
 
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "svx/fmtools.hxx"
 #include "gridcell.hxx"
 #include "gridcols.hxx"
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 1944bd47dad5..d54b091c6bd2 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -61,7 +61,7 @@
 #include <vcl/menu.hxx>
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 
 #ifndef _SVX_SVXIDS_HRC
diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src
index 88651ebbe04f..874f3ae4f0d9 100644
--- a/svx/source/fmcomp/gridctrl.src
+++ b/svx/source/fmcomp/gridctrl.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include <svx/svxids.hrc>
 #include "globlmn.hrc"
 #include "fmhelp.hrc"
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index 5356e7c2b7dd..1026356e08c2 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "xmlexchg.hxx"
+#include "svx/xmlexchg.hxx"
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
 #include <tools/debug.hxx>
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 7b00319cb164..e1f069be96a6 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "ParseContext.hxx"
+#include "svx/ParseContext.hxx"
 #include "stringlistresource.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 7c23c0a2020d..c6df77774c77 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -31,7 +31,7 @@
 #include "svx/databaselocationinput.hxx"
 #include "svx/dialmgr.hxx"
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 9412c715b2b5..aecb4f295efa 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -32,12 +32,12 @@
 #include "fmservs.hxx"
 
 #include "datanavi.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 #include <svx/svxids.hrc>
 #include <tools/rcid.h>
 #include <tools/diagnose_ex.h>
-#include "xmlexchg.hxx"
+#include "svx/xmlexchg.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/fmshell.hxx>
 #include <svtools/miscopt.hxx>
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 5d81bf13ac26..3dac7faf3a90 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -27,7 +27,7 @@
 
 #include "datanavi.hrc"
 #include "globlmn.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 
 #define MASKCOLOR   MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 9d1b65208fdf..3b910652a96b 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -34,7 +34,7 @@
 #include "fmhelp.hrc"
 #include "fmitems.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "gridcell.hxx"
 
 /** === begin UNO includes === **/
diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src
index feaba66729db..3d9eff3de4e8 100644
--- a/svx/source/form/filtnav.src
+++ b/svx/source/form/filtnav.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #include <svx/svxids.hrc>
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 
 Menu RID_FM_FILTER_MENU
@@ -60,30 +60,3 @@ Menu RID_FM_FILTER_MENU
     };
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index bcc275896410..6768acfbe1f2 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -31,7 +31,7 @@
 #include "fmhelp.hrc"
 #include "fmprop.hrc"
 #include "fmPropBrw.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "fmpgeimp.hxx"
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index c50dcb398928..1481a1846a36 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -33,7 +33,7 @@
 #include <svl/itempool.hxx>
 
 #ifndef _SVX_DBEXCH_HRC
-#include <dbexch.hrc>
+#include <svx/dbexch.hrc>
 #endif
 #include <sot/formats.hxx>
 #include <svtools/svtreebx.hxx>
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index c27b5b69d075..039c3361491d 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #ifndef _SVX_FMEXPL_HRC
 #include "fmexpl.hrc"
@@ -54,7 +54,7 @@
 #include "fmprop.hrc"
 #endif
 #include <svx/dialmgr.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdouno.hxx>
 #include <fmundo.hxx>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index b5bdd50239e7..8d6866f0ecdb 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #include <svx/svxids.hrc>
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmexpl.hrc"
 #include "globlmn.hrc"
 #include <svx/svxcommands.h>
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index e679779887a2..2b7ad83f7f5f 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -31,7 +31,7 @@
 #include "fmprop.hrc"
 #include "fmvwimp.hxx"
 #include "fmpgeimp.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "svx/fmview.hxx"
 #include "svx/fmglob.hxx"
 #include "svx/fmpage.hxx"
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index ca96a9957ba7..1c7da93dfd95 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -33,7 +33,7 @@
 #include "fmservs.hxx"
 
 #ifndef _FM_FMOBJFAC_HXX
-#include "fmobjfac.hxx"
+#include "svx/fmobjfac.hxx"
 #endif
 
 #ifndef _FM_FMGLOB_HXX
@@ -56,7 +56,7 @@
 #include <tools/resid.hxx>
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 0a5c7da9ea3c..2c2999ee34ea 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -44,7 +44,7 @@
 
 #ifndef SVX_LIGHT
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #endif
 #include <tools/shl.hxx>
@@ -61,7 +61,7 @@
 #include <sfx2/objsh.hxx>
 #endif
 #endif
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdview.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/help.hxx>
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 3ade4bdd3091..e239e982dd66 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svxerr.hxx"
+#include "svx/svxerr.hxx"
 #include "fmpgeimp.hxx"
 #include "fmundo.hxx"
 #include "svx/fmtools.hxx"
@@ -36,8 +36,8 @@
 #include "fmservs.hxx"
 #include "fmobj.hxx"
 #include "formcontrolfactory.hxx"
-#include "svditer.hxx"
-#include "fmresids.hrc"
+#include "svx/svditer.hxx"
+#include "svx/fmresids.hrc"
 #include "svx/dbtoolsclient.hxx"
 #include "treevisitor.hxx"
 
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 96bdd27d62e1..e767f7c0b112 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -64,7 +64,7 @@
 #include <sfx2/objsh.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/fmpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "fmobj.hxx"
 
 #ifndef _SVX_SVXIDS_HRC
@@ -72,7 +72,7 @@
 #endif
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include "fmexch.hxx"
 #include <svx/fmglob.hxx>
@@ -288,7 +288,7 @@ void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView)
 }
 
 //------------------------------------------------------------------------
-sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing)
+sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool /*bForBrowsing*/)
 {
     if ( GetImpl()->didPrepareClose() )
         // we already did a PrepareClose for the current modifications of the current form
@@ -320,10 +320,6 @@ sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing)
                     if ( bModified && bUI )
                     {
                         QueryBox aQry(NULL, SVX_RES(RID_QRY_SAVEMODIFIED));
-                        if (bForBrowsing)
-                            aQry.AddButton(SVX_RES(RID_STR_NEW_TASK), RET_NEWTASK,
-                                BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON);
-
                         switch (aQry.Execute())
                         {
                             case RET_NO:
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e627624d8102..7a705dfa4aa5 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -33,7 +33,7 @@
 #include "fmpgeimp.hxx"
 #include "svx/fmtools.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "fmtextcontrolshell.hxx"
@@ -42,7 +42,7 @@
 #include "fmvwimp.hxx"
 #include "formtoolbars.hxx"
 #include "gridcols.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/dialogs.hrc"
 #include "svx/fmglob.hxx"
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 243b45e099fb..dc396feec29f 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "fmsrccfg.hxx"
+#include "svx/fmsrccfg.hxx"
 #include <svl/filerec.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index ee870f0c29b0..56957490150d 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -29,10 +29,10 @@
 #include "precompiled_svx.hxx"
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include "svx/fmtools.hxx"
-#include "fmsrccfg.hxx"
+#include "svx/fmsrccfg.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/wldcrd.hxx>
@@ -63,7 +63,7 @@
 #include "fmprop.hrc"
 #endif
 #include "fmservs.hxx"
-#include "fmsrcimp.hxx"
+#include "svx/fmsrcimp.hxx"
 #include <svx/fmsearch.hxx>
 
 #include <comphelper/numbers.hxx>
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
index 8e3df1a8cdf5..91b5d28203a0 100644
--- a/svx/source/form/fmstring.src
+++ b/svx/source/form/fmstring.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 /* Strings fuer Uebersetzung */
 String RID_ERR_CONTEXT_ADDFORM
 {
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index c10bdfe14ec5..d758b5622e0b 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -44,7 +44,7 @@
 //#include "tabstpge.hxx"
 #endif
 
-#include "flagsdef.hxx"
+#include "svx/flagsdef.hxx"
 #include <svl/intitem.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 320baea302b7..19ca20dd7983 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmtextcontroldialogs.hxx"
 #include "fmtextcontrolfeature.hxx"
 #include "fmtextcontrolshell.hxx"
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index e6559850ea5d..e63325f710e9 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -31,10 +31,10 @@
 #include "fmundo.hxx"
 #include "fmpgeimp.hxx"
 #include "svx/dbtoolsclient.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "fmobj.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "svx/fmglob.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/fmmodel.hxx"
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 22681d511b82..6804e838e602 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -50,7 +50,7 @@
 #include <basic/sbx.hxx>
 #include "fmitems.hxx"
 #include "fmobj.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/fmview.hxx>
@@ -76,7 +76,7 @@
 #include <vcl/stdtext.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 2bf00300a5a5..8e0f6b2a261a 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -32,15 +32,15 @@
 #include "fmobj.hxx"
 #include "fmpgeimp.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "svx/fmtools.hxx"
 #include "fmundo.hxx"
 #include "fmvwimp.hxx"
 #include "formcontrolfactory.hxx"
-#include "sdrpaintwindow.hxx"
-#include "svditer.hxx"
+#include "svx/sdrpaintwindow.hxx"
+#include "svx/svditer.hxx"
 #include "svx/dataaccessdescriptor.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/fmglob.hxx"
@@ -51,7 +51,7 @@
 #include "svx/sdrpagewindow.hxx"
 #include "svx/svdogrp.hxx"
 #include "svx/svdpagv.hxx"
-#include "xmlexchg.hxx"
+#include "svx/xmlexchg.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index feb160482665..857bdc1b2647 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -31,7 +31,7 @@
 #include "formcontrolfactory.hxx"
 #include "fmcontrollayout.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/svdouno.hxx"
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index f43233ae08ba..7087e3d6793f 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -36,7 +36,7 @@
 #include "formcontrolling.hxx"
 #include "fmprop.hrc"
 #include "svx/dialmgr.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "svx/fmtools.hxx"
 #include "fmurl.hxx"
diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src
index f7e2419aae7d..287f60a277a7 100644
--- a/svx/source/form/formshell.src
+++ b/svx/source/form/formshell.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
 #include <sfx2/sfxsids.hrc>
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index ff60597d70fe..78bbc7a533d9 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -32,12 +32,12 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/svdpagv.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 
 #include "fmhelp.hrc"
 #include "fmexpl.hrc"
 #include "fmexpl.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmshimp.hxx"
 #include "fmservs.hxx"
 #include "fmundo.hxx"
@@ -57,7 +57,7 @@
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 #include <svx/svxdlg.hxx> //CHINA001
 #include <svx/dialogs.hrc> //CHINA001
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 24a7d2c5d3d7..2065295006e9 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -32,7 +32,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/fmglob.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdogrp.hxx>
 #include <svx/svdpagv.hxx>
 
@@ -42,7 +42,7 @@
 #include "fmhelp.hrc"
 #include "fmexpl.hrc"
 #include "fmexpl.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmshimp.hxx"
 #include "fmobj.hxx"
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx
index 4b187bbb2b7d..a63db6e96d62 100644
--- a/svx/source/form/sqlparserclient.cxx
+++ b/svx/source/form/sqlparserclient.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "sqlparserclient.hxx"
-#include "ParseContext.hxx"
+#include "svx/ParseContext.hxx"
 
 //........................................................................
 namespace svxform
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index bce51d8d43f5..37c102cb1954 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -61,7 +61,7 @@
 #endif
 
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include <svx/dialmgr.hxx>
 #include <tools/shl.hxx>
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index f275fd9efd72..fb13eddd15f0 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -45,11 +45,11 @@
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
 #endif
-#include "tbxctl.hxx"
-#include "tbxdraw.hxx"
+#include "svx/tbxctl.hxx"
+#include "svx/tbxdraw.hxx"
 #include "tbxform.hxx"
 #ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include "fmitems.hxx"
 #ifndef _SVX_FMHELP_HRC
diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index f465e9d88dad..c12bb313f862 100644
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -38,7 +38,7 @@
 #include <editeng/shdditem.hxx>
 #include <editeng/postitem.hxx>
 #ifndef _SVX_CLIPBOARDCTL_HXX_
-#include "clipfmtitem.hxx"
+#include "svx/clipfmtitem.hxx"
 #endif
 #include <editeng/fhgtitem.hxx>
 #include "editeng/fontitem.hxx"
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index b048da9bf022..b972dccd9ab7 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -38,7 +38,7 @@
 #include "svx/gallery1.hxx"
 #include "galbrws1.hxx"
 #include "galbrws2.hxx"
-#include "galbrws.hxx"
+#include "svx/galbrws.hxx"
 
 // -------------------
 // - GallerySplitter -
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index ccbcd40862de..04f402804b0c 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -35,7 +35,7 @@
 #include <sfx2/app.hxx>
 #include "helpid.hrc"
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include "galbrws1.hxx"
 #include <com/sun/star/util/DateTime.hpp>
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 91740fafcb14..2903dcabef59 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -30,7 +30,7 @@
 #include <vcl/menu.hxx>
 #include <svl/lstner.hxx>
 #include <vector>
-#include "galbrws.hxx"
+#include "svx/galbrws.hxx"
 
 // -----------------
 // - GalleryButton -
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 0483a1bc1425..045b52aa2e53 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -44,11 +44,11 @@
 #include "svtools/filter.hxx"
 #include <editeng/brshitem.hxx>
 #include "helpid.hrc"
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
 #include "galobj.hxx"
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
-#include "galctrl.hxx"
+#include "svx/galtheme.hxx"
+#include "svx/galctrl.hxx"
 #include "svx/galmisc.hxx"
 #include "galbrws2.hxx"
 #include "gallery.hrc"
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 8022cecc0fbe..d6817134fefb 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -34,9 +34,9 @@
 #include <avmedia/mediaplayer.hxx>
 #include "helpid.hrc"
 #include "galbrws2.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
-#include "galctrl.hxx"
+#include "svx/galctrl.hxx"
 #include "editeng/AccessibleStringWrap.hxx"
 #include <editeng/svxfont.hxx>
 #include "galobj.hxx"
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 7e5b6fe5e3a9..cad6780f11f7 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -31,9 +31,9 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/viewfrm.hxx>
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
-#include "galbrws.hxx"
-#include "gallery.hxx"
+#include "svx/galtheme.hxx"
+#include "svx/galbrws.hxx"
+#include "svx/gallery.hxx"
 #include "galobj.hxx"
 
 // -----------
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 419e160e6765..32ad01aca4a2 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -35,10 +35,10 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/docfile.hxx>
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
 #include "gallery.hrc"
 #include "svx/galmisc.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/gallery1.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 10dd5949dee2..835c7dc3e731 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -51,7 +51,7 @@
 #include "codec.hxx"
 #include "gallery.hrc"
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 8fd38025f4a5..730c1179a07e 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -52,7 +52,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
 #include "svx/galmisc.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 4120027c3e35..e7001d176920 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -67,7 +67,7 @@
 #include <osl/process.h>
 #include <rtl/bootstrap.hxx>
 
-#include <galtheme.hxx>
+#include <svx/galtheme.hxx>
 #include <svx/gallery1.hxx>
 
 using namespace ::vos;
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 88d2346b9d20..e56f9fd64a36 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -65,7 +65,7 @@
 #include <svl/svstdarr.hxx>
 #include <sfx2/mnuitem.hxx>
 #include "svx/fmtools.hxx"
-#include "fmsrccfg.hxx"
+#include "svx/fmsrccfg.hxx"
 #include <osl/mutex.hxx>
 #include <vos/thread.hxx>
 #include <tools/debug.hxx>
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index ced2a0708b9c..01e175d51e4e 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -29,7 +29,7 @@
 #define SVX_SQLPARSERCLIENT_HXX
 
 #include "svx/dbtoolsclient.hxx"
-#include "ParseContext.hxx"
+#include "svx/ParseContext.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 //........................................................................
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 8957bd2e3ba0..474bf19f7bd6 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -44,7 +44,7 @@
 #include <float.h>
 #include <rtl/math.hxx>
 
-#include "chrtitem.hxx"
+#include "svx/chrtitem.hxx"
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 086cd1cff161..bc3ca621635b 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -32,7 +32,7 @@
 #define _SVSTDARR_STRINGSDTOR
 
 #include <svl/svstdarr.hxx>
-#include <clipfmtitem.hxx>
+#include <svx/clipfmtitem.hxx>
 #include <com/sun/star/frame/status/ClipboardFormats.hpp>
 
 struct SvxClipboardFmtItem_Impl
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 27d7dba45c49..f02848835ffd 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -33,7 +33,7 @@
 #include <svx/svxids.hrc>
 
 
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <svx/xtable.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index a67a87021d31..987f5aa6df08 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -44,7 +44,7 @@
 #include <basic/sbxvar.hxx>
 #endif
 
-#include "hlnkitem.hxx"
+#include "svx/hlnkitem.hxx"
 
 // -----------------------------------------------------------------------
 
diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx
index 4a3680cbe58b..e996373eb48e 100644
--- a/svx/source/items/ofaitem.cxx
+++ b/svx/source/items/ofaitem.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "ofaitem.hxx"
+#include "svx/ofaitem.hxx"
 
 OfaPtrItem::OfaPtrItem( USHORT _nWhich, void *_pPtr )
     : SfxPoolItem( _nWhich ), pPtr( _pPtr )
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 5b03bbd6be2d..cab4207d56c5 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -31,7 +31,7 @@
 // include ---------------------------------------------------------------
 
 #define _SVX_POSTATTR_CXX
-#include "postattr.hxx"
+#include "svx/postattr.hxx"
 #include <editeng/itemtype.hxx>
 #include <svx/svxitems.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 10a0adf3f0c9..6e6f46cdc373 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/table/CellOrientation.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 
-#include "rotmodit.hxx"
+#include "svx/rotmodit.hxx"
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index 317514601aa5..89b4266a1339 100644
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -31,7 +31,7 @@
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 
-#include "svxerr.hxx"
+#include "svx/svxerr.hxx"
 #include <svx/dialmgr.hxx>
 
 #include <svx/dialogs.hrc>
diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src
index 382027a12b51..890e5687021d 100644
--- a/svx/source/items/svxerr.src
+++ b/svx/source/items/svxerr.src
@@ -26,7 +26,7 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 #define __RSC
-#include "svxerr.hxx"
+#include "svx/svxerr.hxx"
 #include <svx/dialogs.hrc>
 #include <editeng/editerr.hxx>
 
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index f6b95067c5e2..db92fd66d425 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -36,8 +36,8 @@
 #include <sot/exchange.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/toolbox.hxx>
-#include <clipboardctl.hxx>
-#include <clipfmtitem.hxx>
+#include <svx/clipboardctl.hxx>
+#include <svx/clipfmtitem.hxx>
 
 #include <svtools/insdlg.hxx>
 #include <svx/svxids.hrc>
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 68e7c4d32472..48c1a1158c4c 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -43,7 +43,7 @@
 #include "editeng/fontitem.hxx"
 #include "editeng/flstitem.hxx"
 
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
 
 #define LOGIC   OutputDevice::LogicToLogic
diff --git a/svx/source/mnuctrls/makefile.mk b/svx/source/mnuctrls/makefile.mk
index 9c208d9a787c..31c8e532143f 100644
--- a/svx/source/mnuctrls/makefile.mk
+++ b/svx/source/mnuctrls/makefile.mk
@@ -56,7 +56,7 @@ HXX1TARGET=mnuctrls
 HXX1EXT=   hxx
 HXX1EXCL=  -E:*include*
 HXX1DEPN=\
-        $(INC)$/clipboardctl.hxx \
+        $(INC)$/svx/clipboardctl.hxx \
         $(INC)$/fntctl.hxx	\
         $(INC)$/fntszctl.hxx \
         $(INC)$/SmartTagCtl.hxx
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index c6965fcd40fb..e24aa1c29de7 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -37,7 +37,7 @@
 #include <drawinglayer/processor2d/vclprocessor2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdr/contact/objectcontacttools.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 1652855d84a8..d2264e219c48 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -38,13 +38,13 @@
 #include <svx/sdr/animation/objectanimator.hxx>
 #include <svx/sdr/event/eventhandler.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <drawinglayer/processor2d/vclprocessor2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontacttools.hxx>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 7172b0840476..d4748a14ed98 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -44,8 +44,8 @@
 #include <svx/sdr/event/eventhandler.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdr/primitive2d/sdrgrafprimitive2d.hxx>
-#include "svdstr.hrc"
-#include <svdglob.hxx>
+#include "svx/svdstr.hrc"
+#include <svx/svdglob.hxx>
 #include <vcl/svapp.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 6d609108e580..3b002e406be1 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -40,7 +40,7 @@
 #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontactofpageview.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/primitive2d/sdrprimitivetools.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 6fa63f7c073e..5ddd74004461 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -31,7 +31,7 @@
 #include <svx/svdoashp.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index ad65b647001e..abe30839aa43 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -45,8 +45,8 @@
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <vcl/lazydelete.hxx>
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include <svx/svdstr.hrc>
+#include <svx/svdglob.hxx>
 #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
 
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 2a4d527fdcdd..fb57864903d1 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/awt/XWindow2.hpp>
 /** === end UNO includes === **/
 
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 #include <tools/diagnose_ex.h>
 #include <vcl/pdfextoutdevdata.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 34731f100b5d..945d5ff982b1 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -38,7 +38,7 @@
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/svdpage.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index ce8d0c79a5f9..6785f69f556b 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -39,7 +39,7 @@
 #include <avmedia/mediaitem.hxx>
 #include "sdrmediawindow.hxx"
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 1da80b6c245e..3f849e92b462 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -38,7 +38,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index d6a6867b819e..d148f76576aa 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -30,7 +30,7 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 089f75aa8ade..cf34f3345e0a 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -35,7 +35,7 @@
 #include <editeng/editobj.hxx>
 #include <editeng/flditem.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 41a3294b2a01..3ee3189ac4a8 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -32,7 +32,7 @@
 #include <svl/whiter.hxx>
 #include <svx/svddef.hxx>
 #include <svx/scene3d.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index eab977681490..37678966bc07 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -34,7 +34,7 @@
 
 #include <vector>
 #include <svx/svdogrp.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // class to remember broadcast start positions
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index 576f9745e167..f8c307f26309 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -31,7 +31,7 @@
 #include <svx/sdr/properties/itemsettools.hxx>
 #include <svl/itemset.hxx>
 #include <svx/svdogrp.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src
new file mode 100644
index 000000000000..004885c45150
--- /dev/null
+++ b/svx/source/src/errtxt.src
@@ -0,0 +1,515 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 __RSC
+#include <svtools/svtools.hrc>
+#include <svtools/sfxecode.hxx>
+
+// pragma ----------------------------------------------------------------
+Resource RID_ERRCTX
+{
+    String ERRCTX_ERROR
+    {
+        Text [ en-US ] = "Error" ;
+    };
+    String ERRCTX_WARNING
+    {
+        Text [ en-US ] = "Warning" ;
+    };
+    String ERRCTX_SFX_LOADTEMPLATE
+    {
+        Text [ en-US ] = "$(ERR) loading the template $(ARG1)" ;
+    };
+    String ERRCTX_SFX_SAVEDOC
+    {
+        Text [ en-US ] = "$(ERR) saving the document $(ARG1)";
+    };
+    String ERRCTX_SFX_SAVEASDOC
+    {
+        Text [ en-US ] = "$(ERR) saving the document $(ARG1)";
+    };
+    String ERRCTX_SFX_DOCINFO
+    {
+        Text [ en-US ] = "$(ERR) displaying doc. information for document $(ARG1)" ;
+    };
+    String ERRCTX_SFX_DOCTEMPLATE
+    {
+        Text [ en-US ] = "$(ERR) writing document $(ARG1) as template" ;
+    };
+    String ERRCTX_SFX_MOVEORCOPYCONTENTS
+    {
+        Text [ en-US ] = "$(ERR) copying or moving document contents" ;
+    };
+    String ERRCTX_SFX_DOCMANAGER
+    {
+        Text [ en-US ] = "$(ERR) starting the Document Manager" ;
+    };
+    String ERRCTX_SFX_OPENDOC
+    {
+        Text [ en-US ] = "$(ERR) loading document $(ARG1)" ;
+    };
+    String ERRCTX_SFX_NEWDOCDIRECT
+    {
+        Text [ en-US ] = "$(ERR) creating a new document" ;
+    };
+    String ERRCTX_SFX_NEWDOC
+    {
+        Text [ en-US ] = "$(ERR) creating a new document" ;
+    };
+    String ERRCTX_SFX_CREATEOBJSH
+    {
+        Text [ en-US ] = "$(ERR) expanding entry" ;
+    };
+    String ERRCTX_SFX_LOADBASIC
+    {
+        Text [ en-US ] = "$(ERR) loading BASIC of document $(ARG1)" ;
+    };
+    String ERRCTX_SFX_SEARCHADDRESS
+    {
+        Text [ en-US ] = "$(ERR) searching for an address";
+    };
+};
+Resource RID_ERRHDL
+{
+    String ERRCODE_CLASS_ABORT
+    {
+        Text [ en-US ] = "Abort" ;
+    };
+    String ERRCODE_CLASS_NOTEXISTS
+    {
+        Text [ en-US ] = "Nonexistent object" ;
+    };
+    String ERRCODE_CLASS_ALREADYEXISTS
+    {
+        Text [ en-US ] = "Object already exists" ;
+    };
+    String ERRCODE_CLASS_ACCESS
+    {
+        Text [ en-US ] = "Object not accessible" ;
+    };
+    String ERRCODE_CLASS_PATH
+    {
+        Text [ en-US ] = "Inadmissible path" ;
+    };
+    String ERRCODE_CLASS_LOCKING
+    {
+        Text [ en-US ] = "Locking problem" ;
+    };
+    String ERRCODE_CLASS_PARAMETER
+    {
+        Text [ en-US ] = "Wrong parameter" ;
+    };
+    String ERRCODE_CLASS_SPACE
+    {
+        Text [ en-US ] = "Resource exhausted" ;
+    };
+    String ERRCODE_CLASS_NOTSUPPORTED
+    {
+        Text [ en-US ] = "Action not supported" ;
+    };
+    String ERRCODE_CLASS_READ
+    {
+        Text [ en-US ] = "Read-Error" ;
+    };
+    String ERRCODE_CLASS_WRITE
+    {
+        Text [ en-US ] = "Write Error" ;
+    };
+    String ERRCODE_CLASS_UNKNOWN
+    {
+        Text [ en-US ] = "unknown" ;
+    };
+    String ERRCODE_CLASS_VERSION
+    {
+        Text [ en-US ] = "Version Incompatibility" ;
+    };
+    String ERRCODE_CLASS_GENERAL
+    {
+        Text [ en-US ] = "General Error" ;
+    };
+    String ERRCODE_CLASS_FORMAT
+    {
+        Text [ en-US ] = "Incorrect format" ;
+    };
+    String ERRCODE_CLASS_CREATE
+    {
+        Text [ en-US ] = "Error creating object" ;
+    };
+    String ERRCODE_CLASS_SBX
+    {
+        Text [ en-US ] = "Inadmissible value or data type" ;
+    };
+    String ERRCODE_CLASS_RUNTIME
+    {
+        Text [ en-US ] = "BASIC runtime error" ;
+    };
+    String ERRCODE_CLASS_COMPILER
+    {
+        Text [ en-US ] = "BASIC syntax error" ;
+    };
+    String 1
+    {
+        Text [ en-US ] = "General Error" ;
+    };
+    String ERRCODE_IO_GENERAL
+    {
+        Text [ en-US ] = "General input/output error." ;
+    };
+    String ERRCODE_IO_MISPLACEDCHAR
+    {
+        Text [ en-US ] = "Invalid file name." ;
+    };
+    String ERRCODE_IO_NOTEXISTS
+    {
+        Text [ en-US ] = "Nonexistent file." ;
+    };
+    String ERRCODE_IO_ALREADYEXISTS
+    {
+        Text [ en-US ] = "File already exists." ;
+    };
+    String ERRCODE_IO_NOTADIRECTORY
+    {
+        Text [ en-US ] = "The object is not a directory." ;
+    };
+    String ERRCODE_IO_NOTAFILE
+    {
+        Text [ en-US ] = "The object is not a file." ;
+    };
+    String ERRCODE_IO_INVALIDDEVICE
+    {
+        Text [ en-US ] = "The specified device is invalid." ;
+    };
+    String ERRCODE_IO_ACCESSDENIED
+    {
+        Text [ en-US ] = "The object cannot be accessed\ndue to insufficient user rights." ;
+    };
+    String ERRCODE_IO_LOCKVIOLATION
+    {
+        Text [ en-US ] = "Sharing violation while accessing the object." ;
+    };
+    String ERRCODE_IO_OUTOFSPACE
+    {
+        Text [ en-US ] = "No more space on device." ;
+    };
+    String ERRCODE_IO_ISWILDCARD
+    {
+        Text [ en-US ] = "This operation cannot be run on\nfiles containing wildcards." ;
+    };
+    String ERRCODE_IO_NOTSUPPORTED
+    {
+        Text [ en-US ] = "This operation is not supported on this operating system." ;
+    };
+    String ERRCODE_IO_TOOMANYOPENFILES
+    {
+        Text [ en-US ] = "There are too many files open." ;
+    };
+    String ERRCODE_IO_CANTREAD
+    {
+        Text [ en-US ] = "Data could not be read from the file." ;
+    };
+    String ERRCODE_IO_CANTWRITE
+    {
+        Text [ en-US ] = "The file could not be written." ;
+    };
+    String ERRCODE_IO_OUTOFMEMORY
+    {
+        Text [ en-US ] = "The operation could not be run due to insufficient memory." ;
+    };
+    String ERRCODE_IO_CANTSEEK
+    {
+        Text [ en-US ] = "The seek operation could not be run." ;
+    };
+    String ERRCODE_IO_CANTTELL
+    {
+        Text [ en-US ] = "The tell operation could not be run." ;
+    };
+    String ERRCODE_IO_WRONGVERSION
+    {
+        Text [ en-US ] = "Incorrect file version." ;
+    };
+    String ERRCODE_IO_WRONGFORMAT
+    {
+        Text [ en-US ] = "Incorrect file format." ;
+    };
+    String ERRCODE_IO_INVALIDCHAR
+    {
+        Text [ en-US ] = "The file name contains invalid characters." ;
+    };
+    String ERRCODE_IO_UNKNOWN
+    {
+        Text [ en-US ] = "An unknown I/O error has occurred." ;
+    };
+    String ERRCODE_IO_INVALIDACCESS
+    {
+        Text [ en-US ] = "An invalid attempt was made to access the file." ;
+    };
+    String ERRCODE_IO_CANTCREATE
+    {
+        Text [ en-US ] = "The file could not be created." ;
+    };
+    String ERRCODE_IO_INVALIDPARAMETER
+    {
+        Text [ en-US ] = "The operation was started under an invalid parameter." ;
+    };
+    String ERRCODE_IO_ABORT
+    {
+        Text [ en-US ] = "The operation on the file was aborted." ;
+    };
+    String ERRCODE_IO_NOTEXISTSPATH
+    {
+        Text [ en-US ] = "Path to the file does not exist." ;
+    };
+    String ERRCODE_IO_RECURSIVE
+    {
+        Text [ en-US ] = "An object cannot be copied into itself." ;
+    };
+    String ERRCODE_SFX_NOSTDTEMPLATE
+    {
+        Text [ en-US ] = "The default template could not be opened." ;
+    };
+    String ERRCODE_SFX_TEMPLATENOTFOUND
+    {
+        Text [ en-US ] = "The specified template could not be found." ;
+    };
+    String ERRCODE_SFX_NOTATEMPLATE
+    {
+        Text [ en-US ] = "The file cannot be used as template." ;
+    };
+    String ERRCODE_SFX_CANTREADDOCINFO
+    {
+        Text [ en-US ] = "Document information could not be read from the file because\nthe document information format is unknown or because document information does not\nexist." ;
+    };
+    String ERRCODE_SFX_ALREADYOPEN
+    {
+        Text [ en-US ] = "This document has already been opened for editing." ;
+    };
+    String ERRCODE_SFX_WRONGPASSWORD
+    {
+        Text [ en-US ] = "The wrong password has been entered." ;
+    };
+    String ERRCODE_SFX_DOLOADFAILED
+    {
+        Text [ en-US ] = "Error reading file." ;
+    };
+    String ERRCODE_SFX_DOCUMENTREADONLY
+    {
+        Text [ en-US ] = "The document was opened as read-only." ;
+    };
+    String ERRCODE_SFX_OLEGENERAL
+    {
+        Text [ en-US ] = "General OLE Error." ;
+    };
+    String ERRCODE_INET_NAME_RESOLVE
+    {
+        Text [ en-US ] = "The host name $(ARG1) could not be resolved." ;
+    };
+    String ERRCODE_INET_CONNECT
+    {
+        Text [ en-US ] = "Could not establish Internet connection to $(ARG1)." ;
+    };
+    String ERRCODE_INET_READ
+    {
+        Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ;
+    };
+    String ERRCODE_INET_WRITE
+    {
+        Text [ en-US ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)." ;
+    };
+    String ERRCODE_INET_GENERAL
+    {
+        Text [ en-US ] = "General Internet error has occurred." ;
+    };
+    String ERRCODE_INET_OFFLINE
+    {
+        Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ;
+    };
+    String ERRCODE_SFXMSG_STYLEREPLACE
+    {
+        ExtraData = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL ;
+        Text [ en-US ] = "Should the $(ARG1) Style be replaced?" ;
+    };
+    String ERRCODE_SFX_NOFILTER
+    {
+        Text [ en-US ] = "A filter has not been found." ;
+    };
+    String ERRCODE_SFX_CANTFINDORIGINAL
+    {
+        Text [ en-US ] = "The original could not be determined." ;
+    };
+    String ERRCODE_SFX_CANTCREATECONTENT
+    {
+        Text [ en-US ] = "The contents could not be created." ;
+    };
+    String ERRCODE_SFX_CANTCREATELINK
+    {
+        Text [ en-US ] = "The link could not be created." ;
+    };
+    String ERRCODE_SFX_WRONGBMKFORMAT
+    {
+        Text [ en-US ] = "The link format is invalid." ;
+    };
+    String ERRCODE_SFX_WRONGICONFILE
+    {
+        Text [ en-US ] = "The configuration of the icon display is invalid." ;
+    };
+    String ERRCODE_SFX_CANTWRITEICONFILE
+    {
+        Text [ en-US ] = "The configuration of the icon display can not be saved." ;
+    };
+    String ERRCODE_SFX_CANTDELICONFILE
+    {
+        Text [ en-US ] = "The configuration of the icon display could not be deleted." ;
+    };
+    String ERRCODE_SFX_CANTRENAMECONTENT
+    {
+        Text [ en-US ] = "Contents cannot be renamed." ;
+    };
+    String ERRCODE_SFX_INVALIDBMKPATH
+    {
+        Text [ en-US ] = "The bookmark folder is invalid." ;
+    };
+    String ERRCODE_SFX_CANTWRITEURLCFGFILE
+    {
+        Text [ en-US ] = "The configuration of the URLs to be saved locally could not be saved." ;
+    };
+    String ERRCODE_SFX_WRONGURLCFGFORMAT
+    {
+        Text [ en-US ] = "The configuration format of the URLs to be saved locally is invalid." ;
+    };
+    String ERRCODE_SFX_NODOCUMENT
+    {
+        Text [ en-US ] = "This action cannot be applied to a document that does not exist." ;
+    };
+    String ERRCODE_SFX_INVALIDLINK
+    {
+        Text [ en-US ] = "The link refers to an invalid target." ;
+    };
+    String ERRCODE_SFX_INVALIDTRASHPATH
+    {
+        Text [ en-US ] = "The Recycle Bin path is invalid." ;
+    };
+    String ERRCODE_SFX_NOTRESTORABLE
+    {
+        Text [ en-US ] = "The entry could not be restored." ;
+    };
+    String ERRCODE_IO_NAMETOOLONG
+    {
+        Text [ en-US ] = "The file name is too long for the target file system." ;
+    };
+    String ERRCODE_SFX_CONSULTUSER
+    {
+        Text [ en-US ] = "The details for running the function are incomplete." ;
+    };
+    String ERRCODE_SFX_INVALIDSYNTAX
+    {
+        Text [ en-US ] = "The input syntax is invalid." ;
+    };
+    String ERRCODE_SFX_CANTCREATEFOLDER
+    {
+        Text [ en-US ] = "The input syntax is invalid." ;
+    };
+    String ERRCODE_SFX_CANTRENAMEFOLDER
+    {
+        Text [ en-US ] = "The input syntax is invalid." ;
+    };
+    String ERRCODE_SFX_WRONG_CDF_FORMAT
+    {
+        Text [ en-US ] = "The channel document has an invalid format." ;
+    };
+    String ERRCODE_SFX_EMPTY_SERVER
+    {
+        Text [ en-US ] = "The server must not be empty." ;
+    };
+    String ERRCODE_SFX_NO_ABOBOX
+    {
+        Text [ en-US ] = "A subscription folder is required to install a Channel." ;
+    };
+    String ERRCODE_IO_NOTSTORABLEINBINARYFORMAT
+    {
+        Text [ en-US ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format.";
+    };
+    String ERRCODE_SFX_TARGETFILECORRUPTED
+    {
+        Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check your system settings. You can find an automatically generated backup copy of this file in folder $(PATH) named $(BACKUPNAME).";
+    };
+    String ERRCODE_SFX_NOMOREDOCUMENTSALLOWED
+    {
+        Text [ en-US ] = "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document.";
+    };
+    String ERRCODE_SFX_CANTCREATEBACKUP
+    {
+        Text [ en-US ] = "Could not create backup copy." ;
+    };
+    String ERRCODE_SFX_MACROS_SUPPORT_DISABLED
+    {
+        Text [ en-US ] = "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled.";
+    };
+    String ERRCODE_SFX_DOCUMENT_MACRO_DISABLED
+    {
+        Text [ en-US ] = "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ;
+    };
+    String ERRCODE_SFX_BROKENSIGNATURE
+    {
+        Text [ en-US ] = "The digitally signed document content and/or macros do not match the current document signature.\n\nThis could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ;
+    };
+    String ERRCODE_SFX_INCOMPLETE_ENCRYPTION
+    {
+        Text [ en-US ] = "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ;
+    };
+
+    String ERRCODE_IO_INVALIDLENGTH
+    {
+        Text [ en-US ] = "Invalid data length." ;
+    };
+    String ERRCODE_IO_CURRENTDIR
+    {
+        Text [ en-US ] = "Function not possible: path contains current directory." ;
+    };
+    String ERRCODE_IO_NOTSAMEDEVICE
+    {
+        Text [ en-US ] = "Function not possible: device (drive) not identical." ;
+    };
+    String ERRCODE_IO_DEVICENOTREADY
+    {
+        Text [ en-US ] = "Device (drive) not ready." ;
+    };
+    String ERRCODE_IO_BADCRC
+    {
+        Text [ en-US ] = "Wrong check amount." ;
+    };
+    String ERRCODE_IO_WRITEPROTECTED
+    {
+        Text [ en-US ] = "Function not possible: write protected." ;
+    };
+    String ERRCODE_SFX_SHARED_NOPASSWORDCHANGE
+    {
+        Text [ en-US ] = "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first.";
+    };
+};
+
+// eof ------------------------------------------------------------------------
+
diff --git a/svx/source/src/makefile.mk b/svx/source/src/makefile.mk
index fb96866ca0f7..c41b3e492e00 100644
--- a/svx/source/src/makefile.mk
+++ b/svx/source/src/makefile.mk
@@ -39,8 +39,6 @@ TARGET=ofa
 
 RES1FILELIST=\
     $(SRS)$/app.srs \
-    $(SOLARCOMMONRESDIR)$/svtools.srs \
-    $(SOLARCOMMONRESDIR)$/sfx.srs 	\
     $(SOLARCOMMONRESDIR)$/basic.srs
 
 RESLIB1NAME=$(TARGET)
@@ -51,7 +49,8 @@ RESLIB1SRSFILES=$(RES1FILELIST)
 
 SRS1NAME= app
 SRC1FILES=	\
-    app.src
+    app.src \
+    errtxt.src
 
 .INCLUDE :  target.mk
 
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 2ca1c5b5cfdd..157a9bd06f7e 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -41,7 +41,7 @@
 
 #include <svx/dialogs.hrc>
 
-#include "insctrl.hxx"
+#include "svx/insctrl.hxx"
 #include <svx/dialmgr.hxx>
 
 #define PAINT_OFFSET    5
diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk
index 4e125adcd9d8..71c639cecdd3 100644
--- a/svx/source/stbctrls/makefile.mk
+++ b/svx/source/stbctrls/makefile.mk
@@ -61,12 +61,12 @@ HXX1TARGET=stbctrls
 HXX1EXT=   hxx
 HXX1EXCL=  -E:*include*
 HXX1DEPN=\
-        $(INC)$/insctrl.hxx	\
-        $(INC)$/zoomctrl.hxx	\
-        $(INC)$/pszctrl.hxx	\
-        $(INC)$/selctrl.hxx	\
-        $(INC)$/modctrl.hxx \
-                $(INC)$/xmlsecctrl.hxx \
+        $(INC)$/svx/insctrl.hxx	\
+        $(INC)$/svx/zoomctrl.hxx	\
+        $(INC)$/svx/pszctrl.hxx	\
+        $(INC)$/svx/selctrl.hxx	\
+        $(INC)$/svx/modctrl.hxx \
+                $(INC)$/svx/xmlsecctrl.hxx \
                 $(INC)$/zoomsliderctrl.hxx \
 
 # --- Targets -------------------------------------------------------
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index fbb212e131f0..986b84f7b8dc 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -40,7 +40,7 @@
 
 #include <svx/dialogs.hrc>
 
-#include "modctrl.hxx"
+#include "svx/modctrl.hxx"
 #include <svx/dialmgr.hxx>
 
 SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem);
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index e980ece5c8b6..43b563f78411 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -45,13 +45,13 @@
 #include <svl/intitem.hxx>
 #define _SVX_PSZCTRL_CXX
 
-#include "pszctrl.hxx"
+#include "svx/pszctrl.hxx"
 
 #define PAINT_OFFSET    5
 
 #include <editeng/sizeitem.hxx>
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include "stbctrls.h"
 #include "sfx2/module.hxx"
 
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 980216ce17bf..e56ba9aeaef9 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -39,7 +39,7 @@
 
 #define _SVX_SELCTRL_CXX
 
-#include "selctrl.hxx"
+#include "svx/selctrl.hxx"
 #include <svx/dialmgr.hxx>
 
 #include <svx/dialogs.hrc>
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 92d8f7ad0746..26daed799c6e 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -53,14 +53,14 @@
 
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include "xmlsecctrl.hxx"
+#include "svx/xmlsecctrl.hxx"
 #include <tools/urlobj.hxx>
 
 #define PAINT_OFFSET    5
 
 //#include <editeng/sizeitem.hxx>
 //#include <svx/dialmgr.hxx>
-//#include "dlgutil.hxx"
+//#include "svx/dlgutil.hxx"
 //#include "stbctrls.h"
 
 //#include <svx/dialogs.hrc>
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 63cbbb969d2d..fb9fc65583e3 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -39,7 +39,7 @@
 
 #include <svx/dialogs.hrc>
 
-#include "zoomctrl.hxx"
+#include "svx/zoomctrl.hxx"
 //CHINA001 #include "zoom.hxx"
 #include <svx/zoomitem.hxx>
 #include "stbctrls.h"
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index acd60e27680b..ffc753e61276 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "ActionDescriptionProvider.hxx"
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/ActionDescriptionProvider.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 ::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType
                         , const ::rtl::OUString& rObjectName )
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 6c9c72930603..b564421f6d0e 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -39,7 +39,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/contact/objectcontactofpageview.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <vos/mutex.hxx>
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index d173c1eea4d5..656ab9f2f27a 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/overlay/overlaymanagerbuffered.hxx>
 #include <svx/svdpntv.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 3a3935f819f8..1adddfc29b2b 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -54,11 +54,11 @@
 
 #include <svx/svxids.hrc>
 #include <svx/xtable.hxx>    // fuer RGB_Color()
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>  // fuer DEGREE_CHAR
 #include <svx/svdtrans.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"
 #include <svx/sdgcpitm.hxx>
 #include <editeng/adjitem.hxx>
 #include <svx/sdtfchim.hxx>
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 9fd0edd3aac0..7980668c0b9a 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdcrtv.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/svdundo.hxx>
 #include <svx/svdocapt.hxx> // Spezialbehandlung: Nach dem Create transparente Fuellung
 #include <svx/svdoedge.hxx>
@@ -45,7 +45,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include "fmobj.hxx"
 #include <svx/svdocirc.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index d04bf8851795..d41b5b1a1c34 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -37,7 +37,7 @@
 #include <tools/bigint.hxx>
 #include <vcl/svapp.hxx>
 
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpoly.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdtrans.hxx>
@@ -45,8 +45,8 @@
 #include <svx/svdmark.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svddrgv.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdograf.hxx>
@@ -59,7 +59,7 @@
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdr/overlay/overlayrollingrectangle.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
@@ -68,7 +68,7 @@
 #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdopath.hxx>
 #include <svx/polypolygoneditor.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index f1b84ac5f98e..f47d30fb3bdd 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svddrgv.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpoly.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdtrans.hxx>
@@ -38,12 +38,12 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "svddrgm1.hxx"
 #include <svx/obj3d.hxx>
 #include <svx/svdoashp.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <svx/polypolygoneditor.hxx>
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 26966a543f1c..d2c1e7bc52ef 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -40,8 +40,8 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpoev.hxx>  // fuer die PolyPossiblities
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/e3dsceneupdater.hxx>
 
 // #i13033#
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 1ac6d0b89945..9e149bd8e42d 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -40,8 +40,8 @@
 #include <svx/rectenum.hxx>
 #include <svx/svxids.hrc>   // fuer SID_ATTR_TRANSFORM_...
 #include <svx/svdattr.hxx>  // fuer Get/SetGeoAttr
-#include "svditext.hxx"
-#include "svditer.hxx"
+#include "svx/svditext.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdpage.hxx>
@@ -50,8 +50,8 @@
 #include <svx/svdattrx.hxx> // fuer MergeNotPersistAttr
 #include <svx/svdetc.hxx>   // fuer SearchOutlinerItems
 #include <svx/svdopath.hxx>  // fuer Crook
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <editeng/eeitem.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/whiter.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 8cf83c0429cc..afb81b5bc6c2 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -36,11 +36,11 @@
 #include <svx/svdopath.hxx>  // fuer CombineObjects
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdograf.hxx>  // fuer Possibilities
 #include <svx/svdoole2.hxx>  // und Mtf-Import
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include "svdfmtf.hxx"
 #include <svx/svdetc.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 7235310def0b..961c860567f9 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -50,12 +50,12 @@
 #include <editeng/editobj.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/scripttypeitem.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdoutl.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdundo.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdpage.hxx"
 #include "svx/svdetc.hxx"   // fuer GetDraftFillColor
@@ -67,16 +67,16 @@
 
 #include <svx/svdoutl.hxx>
 #include <svx/svddrgv.hxx>  // fuer SetSolidDragging()
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
-#include "globl3d.hxx"
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
+#include "svx/globl3d.hxx"
 #include <editeng/outliner.hxx>
 #include <editeng/adjitem.hxx>
 
 // #98988#
 #include <svtools/colorcfg.hxx>
 #include <vcl/svapp.hxx> //add CHINA001
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 8a4245919821..74d0cf6046da 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -31,12 +31,12 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <svx/svdetc.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdtrans.hxx>
-#include "svdglob.hxx"
-#include "svdstr.hrc"
-#include "svdviter.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
 #include <vcl/bmpacc.hxx>
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 34a77fcd9e62..f10610317578 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -57,7 +57,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdobj.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdotext.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdocirc.hxx>
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 6eab2ea7ecfa..e90d1972a4cd 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -32,8 +32,8 @@
 #include <math.h>
 
 #include <svx/svdundo.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svdpagv.hxx>
 #include <svx/svdglue.hxx>
 #include <svx/svdtrans.hxx>
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 47a04241e5bb..791d0f5ca8e7 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -41,8 +41,8 @@
 #include <vcl/bmpacc.hxx>
 
 #include <svx/sxekitm.hxx>
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 #include <svx/svdmodel.hxx>
 #include "gradtrns.hxx"
@@ -62,7 +62,7 @@
 #include <svx/sdr/overlay/overlaytriangle.hxx>
 #include <svx/sdr/overlay/overlayhatchrect.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <vcl/lazydelete.hxx>
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index fa3dbe852b3a..3ded3a1f90c3 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -36,7 +36,7 @@
 #define _STDLIB_H
 #endif
 
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <editeng/flditem.hxx>
 #include <editeng/editdata.hxx>
 #include <svx/svdpool.hxx>
@@ -66,7 +66,7 @@
 #include <svl/rectitem.hxx>
 
 #include <svl/rngitem.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index 30c423c7178c..0e7bc872c5a6 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 098c036dcad7..2c12a7b5d06c 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -31,8 +31,8 @@
 
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx> // fuer Broadcasting
-#include "svdglob.hxx"  // StringCache
-#include "svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // SetOfByte
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index c871865ac87b..d61654e674ea 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -34,13 +34,13 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdopath.hxx> // zur Abschaltung
 #include <svx/svdogrp.hxx>  // des Cache bei
 #include <svx/svdorect.hxx> // GetMarkDescription
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #include <svx/obj3d.hxx>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 9abb1969459d..7718451ab945 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -49,12 +49,12 @@
 #include <svx/xflhtit.hxx>
 #include <svx/xlnstit.hxx>
 
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <editeng/editeng.hxx>   // Fuer EditEngine::CreatePool()
 
 #include <svx/xtable.hxx>
 
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdlayer.hxx>
@@ -65,8 +65,8 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdoole2.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include "svdoutlinercache.hxx"
 
 
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index ee9e8f48634b..d51ecbc53dac 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -31,8 +31,8 @@
 #include <svx/svdmrkv.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdglob.hxx"
-#include "svditext.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
@@ -48,14 +48,14 @@
 #include "gradtrns.hxx"
 #include <svx/xflftrit.hxx>
 #include <svx/dialmgr.hxx>
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/svdovirt.hxx>
 #include <svx/sdr/overlay/overlayrollingrectangle.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrhittesthelper.hxx>
 
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index fe271c80534d..f67b35bfdf67 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -31,7 +31,7 @@
 #include <svx/svdmrkv.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdglob.hxx"
+#include "svx/svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
 #include "svddrgm1.hxx"
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 6ab27c85aaf0..6a8221136f7c 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/svdoashp.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/unoshape.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentbroker.hxx>
@@ -52,22 +52,22 @@
 #include <svx/xpoly.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdattrx.hxx>  // NotPersistItems
 #include <svx/svdoedge.hxx>  // #32383# Die Verbinder nach Move nochmal anbroadcasten
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <editeng/eeitem.hxx>
 #include "editeng/editstat.hxx"
 #include <svx/svdoutl.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/sdtfchim.hxx>
-#include "../customshapes/EnhancedCustomShapeGeometry.hxx"
-#include "../customshapes/EnhancedCustomShapeTypeNames.hxx"
-#include "../customshapes/EnhancedCustomShape2d.hxx"
+#include "../svx/EnhancedCustomShapeGeometry.hxx"
+#include "../svx/EnhancedCustomShapeTypeNames.hxx"
+#include "../svx/EnhancedCustomShape2d.hxx"
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 81c1ca029ede..09965a1b98a6 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -30,7 +30,7 @@
 
 #include <svx/svdoattr.hxx>
 #include <svx/xpool.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdattr.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index b9d3e24592ee..0a0c35aec524 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -47,8 +47,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdovirt.hxx>  // Fuer Add/Del Ref
 #include <svx/svdview.hxx>   // fuer Dragging (Ortho abfragen)
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include <svx/svdstr.hrc>    // Objektname
 #include <svx/svdogrp.hxx>   // Factory
 #include <svx/svdopath.hxx>  // Factory
 #include <svx/svdoedge.hxx>  // Factory
@@ -74,7 +74,7 @@
 #include <svx/xlndsit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xflclit.hxx>
-#include "svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xfltrit.hxx>
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index b92157823081..fd9ee15b8f2c 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -41,8 +41,8 @@
 #include <svx/svddrag.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>   // fuer RectSnap
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <svx/svdogrp.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/xflhtit.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 31582d652dc4..d28039cf1989 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -47,8 +47,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx> // fuer die Objektkonvertierung
 #include <svx/svdview.hxx>  // Zum Draggen (Ortho)
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <editeng/eeitem.hxx>
 #include "svdoimp.hxx"
 #include <svx/sdr/properties/circleproperties.hxx>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 3d254aeb39c4..c7bbc5fab761 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -43,8 +43,8 @@
 #include <svx/svdhdl.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <svl/style.hxx>
 #include <svl/smplhint.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 27c96f6c819d..b299d4c7a2ef 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -47,14 +47,14 @@
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/svdetc.hxx>
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdpagv.hxx>
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include "svtools/filter.hxx"
 #include <svx/svdograf.hxx>
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 4060369f8016..56c49ac7ddee 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -45,14 +45,14 @@
 
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdattrx.hxx>  // NotPersistItems
 #include <svx/svdoedge.hxx>  // #32383# Die Verbinder nach Move nochmal anbroadcasten
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 
 #include <svx/svxids.hrc>
 #include <svl/whiter.hxx>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 2bcf016d0e4a..ade79ec70878 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -30,7 +30,7 @@
 
 #include <svx/svdomeas.hxx>
 #include <math.h>
-#include "svditext.hxx" //
+#include "svx/svditext.hxx" //
 #include <svx/xpoly.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdhdl.hxx>
@@ -40,8 +40,8 @@
 #include <svx/svdattrx.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <svl/style.hxx>
 #include <svl/smplhint.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 9dd615490f9e..8d360e67bed0 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -31,8 +31,8 @@
 #include <vcl/svapp.hxx>
 
 #include <svx/svdomedia.hxx>
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <avmedia/mediawindow.hxx>
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 483c247c064f..216783663603 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -77,8 +77,8 @@
 
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include "unomlstr.hxx"
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index a2d21e6e2269..dbe19ac40efe 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -29,8 +29,8 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdopage.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 9d136ef82eae..b3f61c7b0813 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -41,8 +41,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdhdl.hxx>
 #include <svx/svdview.hxx>  // fuer MovCreate bei Freihandlinien
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 
 #ifdef _MSC_VER
 #pragma optimize ("",off)
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index b03dbf5b903a..84dab2cfb165 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -45,8 +45,8 @@
 #include <svx/svdview.hxx> // das
 #include <svx/svdundo.hxx> // Macro-Beispiel
 #include <svx/svdopath.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 6a79359e1a00..7b9185ca7d3b 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -29,15 +29,15 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdpagv.hxx>  // fuer Abfrage im Paint, ob das
 #include <svx/svdview.hxx>  // Objekt gerade editiert wird
 #include <svx/svdpage.hxx>  // und fuer AnimationHandler (Laufschrift)
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdmodel.hxx>  // OutlinerDefaults
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <editeng/writingmodeitem.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 3675c7becac4..9bc3bbb4958c 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -53,7 +53,7 @@
 #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx>
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 031e8e9dd45b..178af85d2cf4 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -64,7 +64,7 @@
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <editeng/editstat.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx>
 
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 13064e890313..8b6dab72d5e9 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -30,7 +30,7 @@
 
 #include <svl/style.hxx>
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx> // fuer GetMaxObjSize und GetStyleSheetPool
 #include <svx/svdoutl.hxx>
 #include <svx/svdorect.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 97da16876ac0..0e4feeedd2f3 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -33,8 +33,8 @@
 #include <svx/svddrag.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx> // fuer SetXPolyDirty in MovCreate bei SolidDragging
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdoashp.hxx>
 #include <tools/bigint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index c7715f37764c..6f749a297aef 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx> // fuer GetMaxObjSize
 #include <svx/svdoutl.hxx>
 #include <editeng/outliner.hxx>
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 7d176fbfe811..57bcc7a22ae8 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -34,7 +34,7 @@
 #include <ucbhelper/contentbroker.hxx>
 #include <unotools/datetime.hxx>
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>
 #include <editeng/editdata.hxx>
 #include <sfx2/lnkbase.hxx>
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index bd1564ab3f4e..4559dacb31d8 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
@@ -41,7 +41,7 @@
 #include <svx/sdr/properties/properties.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svl/itemset.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/xflclit.hxx>
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index b98e5ba5c1c6..894a5c72926f 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -47,17 +47,17 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <rtl/ref.hxx>
 #include <set>
 #include <memory>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <tools/diagnose_ex.h>
 #include <svx/svdograf.hxx>
 
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 592f41543132..26190c18aa60 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -49,7 +49,7 @@
 #include <svx/svdograf.hxx> // fuer SwapInAll()
 #include <svx/svdoedge.hxx> // Zum kopieren der Konnektoren
 #include <svx/svdoole2.hxx> // Sonderbehandlung OLE beim SdrExchangeFormat
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdotext.hxx>
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 0ccfd1e01346..1758cd92745b 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -47,7 +47,7 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdogrp.hxx>
 #include <svx/svdtypes.hxx>
 
@@ -66,7 +66,7 @@
 using namespace ::rtl;
 using namespace ::com::sun::star;
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 TYPEINIT1(SdrPageView, SfxListener);
 DBG_NAME(SdrPageView);
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index feaf859c3b21..1d74ed119c33 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <svx/svdpntv.hxx>
 #include <vcl/msgbox.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svtools/grfmgr.hxx>
 #include <svx/svdmodel.hxx>
 
@@ -54,7 +54,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdattrx.hxx>
 #include "svdibrow.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdouno.hxx>
 #include <svx/sdr/overlay/overlayobjectlist.hxx>
 #include <svx/sdr/overlay/overlayrollingrectangle.hxx>
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 27e2884bb90c..3a3942319661 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -34,8 +34,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdundo.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svdtrans.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 1a8f735887cf..a58081ad0ee0 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -35,13 +35,13 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/sdr/overlay/overlayobjectlist.hxx>
 #include <svx/sdr/overlay/overlaycrosshair.hxx>
 #include <svx/sdr/overlay/overlayhelpline.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // #114409#-1 Migrate PageOrigin
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 000e20cf24d4..6690d4a7618b 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 /* StarView resource file */
 
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
  // Ab hier gecachte Strings
 String STR_ObjNameSingulNONE
 {
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 667dd3a340b5..a20ebd9baf65 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -29,15 +29,15 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdundo.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdotext.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/scene3d.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/svdogrp.hxx>
@@ -47,7 +47,7 @@
 #include <svl/whiter.hxx>
 #include <svx/e3dsceneupdater.hxx>
 
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 7a4305b9581f..1320aef9b17b 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -29,8 +29,8 @@
 #include "precompiled_svx.hxx"
 #include <editeng/eeitem.hxx>
 
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svdpagv.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdedxv.hxx>
@@ -55,7 +55,7 @@
 #include <tools/tenccvt.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrhittesthelper.hxx>
 
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index 9c52ee87cf23..ceb192e85683 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
@@ -36,7 +36,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdsob.hxx>
 #include <svl/brdcst.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index d19b190b3d6a..181b086988db 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -30,11 +30,11 @@
 
 #include <vector>
 #include <editeng/editeng.hxx>
-#include "xexch.hxx"
+#include "svx/xexch.hxx"
 #include <svx/xflclit.hxx>
 #include <svx/svdxcgv.hxx>
 #include <svx/svdoutl.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdetc.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdograf.hxx>
@@ -45,9 +45,9 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdtrans.hxx> // Fuer GetMapFactor zum umskalieren bei PasteModel
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
-#include "xoutbmp.hxx"
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
+#include "svx/xoutbmp.hxx"
 #include <vcl/metaact.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/itempool.hxx>
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 71b94d021650..ce04c9f6307a 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -30,7 +30,7 @@
 
 #include <accessiblecell.hxx>
 
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 70329213d01a..7fb3a7ffcf70 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -33,8 +33,8 @@
 #include "tablelayouter.hxx"
 #include "cell.hxx"
 #include "svx/svdmodel.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 // -----------------------------------------------------------------------------
 
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index 218d8631cb75..4b49088be6e2 100644
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -55,7 +55,7 @@
 #include "svx/svdpage.hxx"
 #include "editeng/editeng.hxx"
 #include "editeng/unotext.hxx"
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 //------------------------------------------------------------------------
 
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index e928f94d88ec..7f9250a90561 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -63,8 +63,8 @@
 #include "svx/framelink.hxx"
 #include "svx/sdr/table/tabledesign.hxx"
 #include "svx/svdundo.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "editeng/writingmodeitem.hxx"
 #include "editeng/frmdiritem.hxx"
 #include "svx/xflhtit.hxx"
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 4a0432c0c15f..a4ba47047efe 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -59,15 +59,15 @@
 #include "svx/sdrpagewindow.hxx"
 #include <svx/selectioncontroller.hxx>
 #include <svx/svdmodel.hxx>
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 #include <svx/svxdlg.hxx>
 #include <editeng/boxitem.hxx>
 #include "cell.hxx"
 #include <editeng/borderline.hxx>
 #include <editeng/colritem.hxx>
 #include "editeng/bolnitem.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "svx/svdpage.hxx"
 #include "tableundo.hxx"
 #include "tablelayouter.hxx"
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 33833f8b81b1..46df8c681db5 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -42,7 +42,7 @@
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdpagv.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 5e13bce7101e..7f855752dcf2 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -44,8 +44,8 @@
 #include "editeng/borderline.hxx"
 #include "editeng/boxitem.hxx"
 #include "svx/svdmodel.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 using ::rtl::OUString;
 using ::com::sun::star::awt::XLayoutConstrains;
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 1c8d0aa60dc8..b62d1187e14c 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -46,8 +46,8 @@
 #include "tableundo.hxx"
 #include "svx/svdotable.hxx"
 #include "svx/svdmodel.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 //#define PLEASE_DEBUG_THE_TABLES 1
 
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index bf3612e55250..260a2e2e646c 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -40,12 +40,12 @@
 #include <svx/colrctrl.hxx>
 
 #include <svx/svdview.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <editeng/colritem.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
-#include "xexch.hxx"
+#include "svx/xexch.hxx"
 #include <vcl/svapp.hxx>
 
 SFX_IMPL_DOCKINGWINDOW( SvxColorChildWindow, SID_COLOR_CONTROL )
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index f98fd57a0480..e5bc5045c7b3 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -39,6 +39,7 @@
 
 #include <vos/mutex.hxx>
 
+#include <svtools/toolbarmenu.hxx>
 #include <vcl/toolbox.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
@@ -65,7 +66,7 @@
 ////////////
 
 using ::rtl::OUString;
-using ::svtools::ToolbarMenu;
+//using ::svtools::ToolbarMenu;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 31c77e221d62..5b740dbef004 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -44,8 +44,8 @@
 #define TMP_STR_BEGIN   '['
 #define TMP_STR_END     ']'
 
-#include "drawitem.hxx"
-#include "xattr.hxx"
+#include "svx/drawitem.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/fillctrl.hxx>
 #include <svx/itemwin.hxx>
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 1216a7863b79..23f2241ab235 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -53,10 +53,10 @@
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
 
-#include "gallery.hxx"
-#include <dlgutil.hxx>
+#include "svx/gallery.hxx"
+#include <svx/dlgutil.hxx>
 
-#include "fontworkgallery.hxx"
+#include <svx/fontworkgallery.hxx>
 #include "fontworkgallery.hrc"
 
 #include <algorithm>
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 0333cc62a374..45e76f8ae6e9 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "formatpaintbrushctrl.hxx"
+#include "svx/formatpaintbrushctrl.hxx"
 
 // header for class SfxBoolItem
 #include <svl/eitem.hxx>
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 849d495e214e..9f8c023c3b3d 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -64,8 +64,8 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdtrans.hxx>
-#include "grafctrl.hxx"
-#include "tbxcolor.hxx"
+#include "svx/grafctrl.hxx"
+#include "svx/tbxcolor.hxx"
 
 // namespaces
 using ::rtl::OUString;
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 9415ddaf1814..26b5a508491e 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -49,11 +49,11 @@
 #include <svx/xlineit0.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/xtable.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/itemwin.hxx>
-#include "linectrl.hxx"
+#include "svx/linectrl.hxx"
 #include <svtools/colorcfg.hxx>
 
 #include "linectrl.hrc"
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 139506028292..04e7e3dc543a 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -40,7 +40,7 @@
 #include <sfx2/app.hxx>
 
 #include <svx/dialogs.hrc>
-#include "layctrl.hxx"
+#include "svx/layctrl.hxx"
 #include <svx/dialmgr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 6d05c8bdb946..4fe822f94955 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -46,7 +46,7 @@
 #include <svl/slstitm.hxx>
 #include <svl/stritem.hxx>
 #include <svx/dialmgr.hxx>
-#include <lboxctrl.hxx>
+#include <svx/lboxctrl.hxx>
 #ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
 #endif
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 6deab3eca30b..0b7e6fe7182b 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -42,10 +42,10 @@
 #include <svx/dialogs.hrc>
 #include "helpid.hrc"
 
-#include "drawitem.hxx"
-#include "xattr.hxx"
+#include "svx/drawitem.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
-#include "linectrl.hxx"
+#include "svx/linectrl.hxx"
 #include <svx/itemwin.hxx>
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5c99e84e6a47..8e100c083814 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -72,7 +72,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/svxitems.hrc>
 #include "helpid.hrc"
-#include "htmlmode.hxx"
+#include "svx/htmlmode.hxx"
 #include <svx/xtable.hxx>
 #include "editeng/fontitem.hxx"
 #include <editeng/fhgtitem.hxx>
@@ -81,9 +81,9 @@
 #include <editeng/colritem.hxx>
 #include "editeng/flstitem.hxx"
 #include "editeng/bolnitem.hxx"
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <svx/tbcontrl.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
 #include "colorwindow.hxx"
 #include <memory>
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 3d9d6881eec7..e0bcd03b62fc 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -32,8 +32,8 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
-#include "tbxalign.hxx"
-#include "tbxdraw.hxx"
+#include "svx/tbxalign.hxx"
+#include "svx/tbxdraw.hxx"
 #include "tbxdraw.hrc"
 #include <tools/shl.hxx>
 #ifndef _SFX_IMAGEMGR_HXX
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 57d791f1babd..83b48b9e57b7 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "tbxcolor.hxx"
+#include "svx/tbxcolor.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 5160c78ead27..34969ca00bc2 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -42,9 +42,9 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
-#include "tbxctl.hxx"
-#include "tbxdraw.hxx"
-#include "tbxcolor.hxx"
+#include "svx/tbxctl.hxx"
+#include "svx/tbxdraw.hxx"
+#include "svx/tbxcolor.hxx"
 #include "tbxdraw.hrc"
 #include <com/sun/star/frame/XLayoutManager.hpp>
 
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 579fe9f511cf..14ffdc778361 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -30,7 +30,7 @@
 
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
-#include <verttexttbxctrl.hxx>
+#include <svx/verttexttbxctrl.hxx>
 #include <svl/languageoptions.hxx>
 #include <sfx2/app.hxx>
 #include <svl/eitem.hxx>
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 3005289268b9..74a00bd431c6 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -50,7 +50,7 @@
 #endif
 #include <svx/svdview.hxx>
 #include <editeng/colritem.hxx>
-#include "chrtitem.hxx"
+#include "svx/chrtitem.hxx"
 
 #include <svx/extrusionbar.hxx>
 #include "extrusiondepthdialog.hxx"
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 777aead3fa1a..49a4f62609a9 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -32,7 +32,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewsh.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <svx/dialmgr.hxx>
@@ -48,11 +48,11 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/kernitem.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 #include <svx/svxids.hrc>
 #include <svx/fontworkbar.hxx>
-#include "fontworkgallery.hxx"
+#include "svx/fontworkgallery.hxx"
 
 using ::rtl::OUString;
 
@@ -349,7 +349,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
     }
 }
 
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svl/itempool.hxx>
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index c58e86f77fc3..440f6c313e20 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -46,6 +46,7 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionContinuation.hpp>
 
+#include <comphelper/interaction.hxx>
 #include <framework/interaction.hxx>
 #include <com/sun/star/drawing/GraphicFilterRequest.hpp>
 #include <com/sun/star/util/URL.hpp>
@@ -65,9 +66,9 @@
 #include <editeng/numitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdograf.hxx>
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include "svtools/filter.hxx"
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/fmview.hxx>
@@ -1066,15 +1067,13 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
     {
         Any aInteraction;
         Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations(1);
-        ::framework::ContinuationApprove* pApprove = new ::framework::ContinuationApprove();
+        ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove();
         lContinuations[0] = Reference< XInteractionContinuation >(static_cast< XInteractionContinuation* >(pApprove), UNO_QUERY);
 
         GraphicFilterRequest aErrorCode;
         aErrorCode.ErrCode = nStatus;
         aInteraction <<= aErrorCode;
-        framework::InteractionRequest* pRequest = new framework::InteractionRequest( aInteraction, lContinuations );
-        Reference< XInteractionRequest >xRequest( static_cast< XInteractionRequest* >(pRequest), UNO_QUERY );
-        aSettings.mxInteractionHandler->handle( xRequest );
+        aSettings.mxInteractionHandler->handle( framework::InteractionRequest::CreateRequest( aInteraction, lContinuations ) );
     }
     return nStatus == GRFILTER_OK;
 }
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index c7eb679e5e63..0ce5b6ca223a 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -39,7 +39,7 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index faf38d64b520..c504a46f29f3 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -30,7 +30,7 @@
 
 #include <set>
 
-#include "UnoNamespaceMap.hxx"
+#include "svx/UnoNamespaceMap.hxx"
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
@@ -41,7 +41,7 @@
 #include <osl/mutex.hxx>
 #include <comphelper/stl_types.hxx>
 #include <svl/itempool.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "editeng/xmlcnitm.hxx"
 
 
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 6f69b1405d0e..617d1737a482 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
@@ -42,7 +42,7 @@
 #include "unopolyhelper.hxx"
 #include <svx/xdef.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <editeng/unoprnms.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 70576f4fab95..793e9a6d858b 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -36,10 +36,10 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/unomid.hxx>
 #include <editeng/unoprnms.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 #include <editeng/memberids.hrc>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index dbe9c735e2bd..48357f873ce3 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -35,9 +35,9 @@
 #include "../customshapes/EnhancedCustomShapeEngine.hxx"
 
 #include <svx/xtable.hxx>
-#include "unoshcol.hxx"
+#include "svx/unoshcol.hxx"
 #include "recoveryui.hxx"
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 #include "tbunocontroller.hxx"
 #include "tbunosearchcontrollers.hxx"
 
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 19663ab08ade..9c7637c4d5a9 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -38,7 +38,7 @@
 
 #include <svx/xdash.hxx>
 #include <svx/svdmodel.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 3cd4b13ac38e..bbb575a06410 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -36,7 +36,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xflgrit.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 #include <svx/unomid.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index b774afe5c7ad..64fbdae052a0 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -37,7 +37,7 @@
 #include <svx/xdef.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/unomid.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index a10d097981f5..195411b1e944 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -41,17 +41,17 @@
 #include <comphelper/serviceinfohelper.hxx>
 
 #include <cppuhelper/implbase2.hxx>
-#include <unofill.hxx>
+#include <svx/unofill.hxx>
 #include <editeng/unonrule.hxx>
 #include <svtools/unoimap.hxx>
 #include <svx/fmdpage.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <sfx2/sfx.hrc>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 
 #include <svx/svdmodel.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/svdtypes.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/unopage.hxx>
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 60d19e8d13a9..01375649553b 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -50,9 +50,9 @@
 #include <vcl/svapp.hxx>
 
 
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 9d5e1695c5cb..a905aa0fd2f4 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -49,11 +49,11 @@
 #include <svx/svdpagv.hxx>
 #include <svx/unopage.hxx>
 #include "shapeimpl.hxx"
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/polysc3d.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/svdopath.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdomeas.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/lathe3d.hxx>
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 8c2d7ecde19a..17c32389e311 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -36,7 +36,7 @@
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include "unopool.hxx"
+#include "svx/unopool.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/unoprov.hxx>
@@ -48,7 +48,7 @@
 #include <svx/svdetc.hxx>
 #include <editeng/editeng.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <memory>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 4be296d51219..ffc6c28f9fec 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -45,11 +45,11 @@
 #include <vcl/svapp.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <svx/dialmgr.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <editeng/unotext.hxx>
 #include <svx/unoshprp.hxx>
 #include <editeng/editeng.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/dialogs.hrc>
 #include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 1613f5d652e0..057e5f8b7e6c 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -65,7 +65,7 @@
 #include "unopolyhelper.hxx"
 
 // #i29181#
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 92d1706d4e6a..fd8f9dd1d2d9 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -45,7 +45,7 @@
 #include <svx/unopage.hxx>
 #include <editeng/unoprnms.hxx>
 #include <svx/polysc3d.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/lathe3d.hxx>
@@ -324,7 +324,7 @@ static void ConvertObjectToHomogenMatric( E3dObject* pObject, Any& rValue )
 }
 
 //----------------------------------------------------------------------
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 struct ImpRememberTransAndRect
 {
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 96804103f610..79d5b7c5dec9 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -60,11 +60,11 @@
 
 #include <svx/unoshprp.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdview.hxx"
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 ///////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index afb8cbb8723a..0f1482adaf5d 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -61,7 +61,7 @@
 #include "svx/svdogrp.hxx"
 #include "svx/scene3d.hxx"
 #include "svx/svdmodel.hxx"
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include "svx/fmglob.hxx"
 #include "svx/unopage.hxx"
 #include "svx/view3d.hxx"
@@ -72,7 +72,7 @@
 #include "svx/unoshprp.hxx"
 #include "svx/sxciaitm.hxx" // todo: remove
 #include "svx/svdograf.hxx"
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "svx/svdomeas.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdpool.hxx"
@@ -90,9 +90,9 @@
 #include "svx/xlnedit.hxx"
 #include "svx/xlnstit.hxx"
 #include "svx/xlndsit.hxx"
-#include "svdglob.hxx"
-#include "svdstr.hrc"
-#include "unomaster.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/unomaster.hxx"
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 3b45753175e6..f42e06cd8619 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 #include <com/sun/star/document/EventObject.hpp>
 
-#include "unoshcol.hxx"
+#include "svx/unoshcol.hxx"
 #include <svx/unoprov.hxx>
 #include <comphelper/serviceinfohelper.hxx>
 
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 05551414507c..04770faf694b 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -55,7 +55,7 @@
 #include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <vos/mutex.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 using namespace ::osl;
 using namespace ::vos;
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 58dcbc39d03c..46a84bf52fad 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -35,7 +35,7 @@
 
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 #include <svx/unomid.hxx>
 #include "UnoNameItemTable.hxx"
 
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 53bd6b99e5fc..ac90eb5ee362 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -30,7 +30,7 @@
 
 #include "unogalitem.hxx"
 #include "unogaltheme.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include <svx/fmmodel.hxx>
 #include <rtl/uuid.h>
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index e2596eba84ec..1145be7e3f5e 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -32,7 +32,7 @@
 
 #include "unogaltheme.hxx"
 #include "unogalitem.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/gallery1.hxx"
 #include "svx/galmisc.hxx"
 #include <svx/fmmodel.hxx>
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index ff161c0a1b2b..fdeda1dd726b 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -56,7 +56,7 @@
 #include <sot/clsids.hxx>
 #endif
 #include <map>
-#include "xmleohlp.hxx"
+#include "svx/xmleohlp.hxx"
 
 // -----------
 // - Defines -
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 55a80ec40d89..c3b5bc5e55d0 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -44,8 +44,8 @@
 #include <unotools/streamwrap.hxx>
 #include <sot/storage.hxx>
 #include <svx/svdmodel.hxx>
-#include <xmleohlp.hxx>
-#include <xmlgrhlp.hxx>
+#include <svx/xmleohlp.hxx>
+#include <svx/xmlgrhlp.hxx>
 
 #include <svx/unomodel.hxx>
 
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 45ecf71b5aff..a1a7565f314d 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -47,7 +47,7 @@
 #include <tools/zcodec.hxx>
 
 #include "svtools/filter.hxx"
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 
 #include <algorithm>
 
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 58860317040c..b04b083f486b 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -54,7 +54,7 @@
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 
 #include "xmlxtexp.hxx"
 
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 58cf00441520..c2071d4bd252 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -60,7 +60,7 @@
 #include "xmloff/ImageStyle.hxx"
 #include "xmloff/MarkerStyle.hxx"
 #include <xmloff/xmlictxt.hxx>
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 #include "xmloff/attrlist.hxx"
 
 #include "xmlxtimp.hxx"
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 1f9bec471c8f..6b3419c7b04e 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -38,7 +38,7 @@
 #include <svl/solar.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include <svtools/FilterConfigItem.hxx>
 #include <svtools/filter.hxx>
 
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 627c3ed6fb45..f7ce452ea6e8 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -44,15 +44,15 @@
 #include <editeng/memberids.hrc>
 #include <tools/stream.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svl/style.hxx>
 #include "unopolyhelper.hxx"
 
 #include <tools/bigint.hxx>
 #include <svl/itemset.hxx>
 #include <svx/dialogs.hrc>
-#include "svdstr.hrc"
-#include "xattr.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
 #include <editeng/itemtype.hxx>
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index ea91bc120201..0c8fc3e9cbec 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/uno/Any.hxx>
 
 #include <svx/dialogs.hrc>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
 #include <editeng/itemtype.hxx>
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 486602e28256..57c894e00475 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -38,13 +38,13 @@
 #include <editeng/memberids.hrc>
 
 #include <svx/dialogs.hrc>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
 #include <editeng/unoprnms.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdmodel.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index eec20c0fe80c..8b658918069a 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -43,7 +43,7 @@
 #endif
 #include <svl/itemset.hxx>
 #include <svx/xdef.hxx>
-#include "xexch.hxx"
+#include "svx/xexch.hxx"
 
 
 TYPEINIT1_AUTOFACTORY( XFillExchangeData, SvDataCopyStream );
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 47dda35245a4..3d377c88fa4d 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/xtable.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svxids.hrc>
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index b4a426b0cf11..d61c339f762d 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -31,7 +31,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 853d397010b7..2b3ac7ab850b 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -31,7 +31,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include <unotools/pathoptions.hxx>
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 88cec422f49a..3455ed4d3588 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -33,7 +33,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 2a64d4b8855a..3a9f24c6d15a 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -33,7 +33,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 703b2db16b1f..ef5beece8dc8 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -33,7 +33,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/svapp.hxx>
 
@@ -50,7 +50,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/xflhtit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 54d359506f77..ac5dcc739e41 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -33,7 +33,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
diff --git a/svx/util/cui.dxp b/svx/util/cui.dxp
deleted file mode 100644
index cfee3729bf0c..000000000000
--- a/svx/util/cui.dxp
+++ /dev/null
@@ -1 +0,0 @@
-CreateDialogFactory
diff --git a/svx/util/cui.flt b/svx/util/cui.flt
deleted file mode 100644
index 8ab7afd3bf61..000000000000
--- a/svx/util/cui.flt
+++ /dev/null
@@ -1,139 +0,0 @@
-lcl
-+getImplementation
-Impl
-IMPL
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxFontTable
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-DialogsResMgr
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-+ImpGetResStr
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridControl
-+FmXGridPeer
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-___CT
-_alloc
-_CT
-exception::exception
-_TI2
-___CT
diff --git a/svx/util/dl.flt b/svx/util/dl.flt
deleted file mode 100644
index 8ab7afd3bf61..000000000000
--- a/svx/util/dl.flt
+++ /dev/null
@@ -1,139 +0,0 @@
-lcl
-+getImplementation
-Impl
-IMPL
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxFontTable
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-DialogsResMgr
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-+ImpGetResStr
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridControl
-+FmXGridPeer
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-___CT
-_alloc
-_CT
-exception::exception
-_TI2
-___CT
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 18f52487e483..277581a4a7a7 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -75,30 +75,33 @@ SHL1LIBS= \
 
 
 SHL1STDLIBS= \
-             $(EDITENGLIB) \
-             $(AVMEDIALIB) \
-             $(SFX2LIB) \
-             $(XMLOFFLIB) \
-             $(BASEGFXLIB) \
-             $(DRAWINGLAYERLIB) \
-             $(LNGLIB) \
-             $(BASICLIB) \
-             $(SVTOOLLIB) \
-             $(TKLIB) \
-             $(VCLLIB) \
-             $(SVLLIB) \
-             $(SOTLIB) \
-             $(UNOTOOLSLIB) \
-             $(TOOLSLIB) \
-             $(I18NISOLANGLIB) \
-             $(I18NPAPERLIB) \
-             $(COMPHELPERLIB) \
-             $(UCBHELPERLIB) \
-             $(CPPUHELPERLIB) \
-             $(CPPULIB) \
-             $(VOSLIB) \
-             $(SALLIB) \
-             $(ICUUCLIB)
+    $(AVMEDIALIB) \
+    $(BASEGFXLIB) \
+    $(BASICLIB) \
+    $(COMPHELPERLIB) \
+    $(CPPUHELPERLIB) \
+    $(CPPULIB) \
+    $(DRAWINGLAYERLIB) \
+    $(EDITENGLIB) \
+    $(FWELIB) \
+    $(GOODIESLIB) \
+    $(I18NISOLANGLIB) \
+    $(I18NPAPERLIB) \
+    $(ICUUCLIB) \
+    $(LNGLIB) \
+    $(SALLIB) \
+    $(SFX2LIB) \
+    $(SOTLIB) \
+    $(SVLLIB) \
+    $(SVTOOLLIB) \
+    $(TKLIB) \
+    $(TOOLSLIB) \
+    $(UCBHELPERLIB) \
+    $(UNOTOOLSLIB) \
+    $(VCLLIB) \
+    $(VOSLIB) \
+    $(XMLOFFLIB) \
+
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
@@ -132,29 +135,31 @@ SHL2LIBS+=$(SLB)$/ibrwimp.lib
 .ENDIF # (WIN)
 
 SHL2STDLIBS= \
-            $(EDITENGLIB) \
-            $(SVXCORELIB) \
-            $(SFX2LIB) \
-            $(XMLOFFLIB) \
-            $(BASEGFXLIB) \
-            $(DRAWINGLAYERLIB) \
-            $(BASICLIB) \
-            $(SVTOOLLIB) \
-            $(TKLIB) \
-            $(VCLLIB) \
-            $(SVLLIB) \
-            $(SOTLIB) \
-            $(UNOTOOLSLIB) \
-            $(TOOLSLIB) \
-            $(I18NISOLANGLIB) \
-            $(XMLSCRIPTLIB) \
-            $(COMPHELPERLIB) \
-            $(UCBHELPERLIB)	\
-            $(CPPUHELPERLIB)	\
-            $(CPPULIB) \
-            $(VOSLIB) \
-            $(SALLIB) \
-            $(ICUUCLIB)
+    $(BASEGFXLIB) \
+    $(BASICLIB) \
+    $(COMPHELPERLIB) \
+    $(CPPUHELPERLIB)	\
+    $(CPPULIB) \
+    $(DRAWINGLAYERLIB) \
+    $(EDITENGLIB) \
+    $(GOODIESLIB) \
+    $(I18NISOLANGLIB) \
+    $(ICUUCLIB) \
+    $(SALLIB) \
+    $(SFX2LIB) \
+    $(SOTLIB) \
+    $(SVLLIB) \
+    $(SVTOOLLIB) \
+    $(SVXCORELIB) \
+    $(TKLIB) \
+    $(TOOLSLIB) \
+    $(UCBHELPERLIB)	\
+    $(UNOTOOLSLIB) \
+    $(VCLLIB) \
+    $(VOSLIB) \
+    $(XMLOFFLIB) \
+    $(XMLSCRIPTLIB) \
+
 
 .IF "$(GUI)"=="WNT"
 SHL2STDLIBS+=$(SHELLLIB)
@@ -185,8 +190,7 @@ SRSFILELIST=\
         $(SRS)$/unodraw.srs \
         $(SRS)$/accessibility.srs \
         $(SRS)$/table.srs \
-        $(SRS)$/toolbars.srs \
-        $(SOLARCOMMONRESDIR)$/sfx.srs
+        $(SRS)$/toolbars.srs
 
 RESLIB1NAME=svx
 RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw
diff --git a/svx/util/svx.flt b/svx/util/svx.flt
deleted file mode 100644
index 26520493b8ca..000000000000
--- a/svx/util/svx.flt
+++ /dev/null
@@ -1,134 +0,0 @@
-lcl
-+getImplementation
-Impl
-IMPL
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxFontTable
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridPeer
-+FmXGridControl
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-__CT
-union_impl
-alternative
diff --git a/vbahelper/prj/build.lst b/vbahelper/prj/build.lst
index 20001db859c8..aafbb73c3b21 100644
--- a/vbahelper/prj/build.lst
+++ b/vbahelper/prj/build.lst
@@ -1,4 +1,4 @@
-vba     vbahelper       :       oovbaapi basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal NULL
+vba	vbahelper	:	oovbaapi offuh basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal NULL
 vba	vbahelper									usr1	-	all	  vba_mkout NULL
 #vba	vbahelper\inc								nmake	-	all	vba_inc NULL
 vba	vbahelper\source\vbahelper                        nmake	-	all	vba_vbahelper NULL
diff --git a/vbahelper/source/msforms/makefile.mk b/vbahelper/source/msforms/makefile.mk
index 5fce64649dcb..40a6b8350fd4 100644
--- a/vbahelper/source/msforms/makefile.mk
+++ b/vbahelper/source/msforms/makefile.mk
@@ -70,12 +70,3 @@ SLOFILES=\
 
 .INCLUDE :  target.mk
 
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
-
diff --git a/vbahelper/source/vbahelper/makefile.mk b/vbahelper/source/vbahelper/makefile.mk
index 22ed40a3adfa..51fa5b449d23 100644
--- a/vbahelper/source/vbahelper/makefile.mk
+++ b/vbahelper/source/vbahelper/makefile.mk
@@ -71,12 +71,4 @@ SLOFILES=\
 
 .INCLUDE :  target.mk
 
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
 
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
new file mode 100644
index 000000000000..2e335b4175c4
--- /dev/null
+++ b/xmloff/Library_xo.mk
@@ -0,0 +1,401 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,xo))
+
+$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
+
+$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff))
+
+$(eval $(call gb_Library_set_include,xo,\
+    $$(SOLARINC) \
+    -I. \
+    -I$(WORKDIR)/inc/ \
+    -I$(SRCDIR)/xmloff/inc \
+    -I$(SRCDIR)/xmloff/source/inc \
+    -I$(SRCDIR)/xmloff/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,xo,\
+    $$(DEFS) \
+    -DXMLOFF_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xo,\
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nisolang1 \
+    sal \
+    stl \
+    svl \
+    tl \
+    utl \
+    vos3 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xo,\
+    xmloff/source/chart/ColorPropertySet \
+    xmloff/source/chart/PropertyMaps \
+    xmloff/source/chart/SchXMLAutoStylePoolP \
+    xmloff/source/chart/SchXMLCalculationSettingsContext \
+    xmloff/source/chart/SchXMLChartContext \
+    xmloff/source/chart/SchXMLExport \
+    xmloff/source/chart/SchXMLImport \
+    xmloff/source/chart/SchXMLParagraphContext \
+    xmloff/source/chart/SchXMLPlotAreaContext \
+    xmloff/source/chart/SchXMLSeries2Context \
+    xmloff/source/chart/SchXMLSeriesHelper \
+    xmloff/source/chart/SchXMLTableContext \
+    xmloff/source/chart/SchXMLTextListContext \
+    xmloff/source/chart/SchXMLTools \
+    xmloff/source/chart/XMLAxisPositionPropertyHdl \
+    xmloff/source/chart/XMLChartPropertyContext \
+    xmloff/source/chart/XMLChartStyleContext \
+    xmloff/source/chart/XMLErrorBarStylePropertyHdl \
+    xmloff/source/chart/XMLErrorIndicatorPropertyHdl \
+    xmloff/source/chart/XMLLabelSeparatorContext \
+    xmloff/source/chart/XMLSymbolImageContext \
+    xmloff/source/chart/XMLSymbolTypePropertyHdl \
+    xmloff/source/chart/XMLTextOrientationHdl \
+    xmloff/source/chart/contexts \
+    xmloff/source/chart/transporttypes \
+    xmloff/source/core/DocumentSettingsContext \
+    xmloff/source/core/DomBuilderContext \
+    xmloff/source/core/DomExport \
+    xmloff/source/core/ProgressBarHelper \
+    xmloff/source/core/PropertySetMerger \
+    xmloff/source/core/RDFaExportHelper \
+    xmloff/source/core/RDFaImportHelper \
+    xmloff/source/core/SettingsExportHelper \
+    xmloff/source/core/XMLBase64Export \
+    xmloff/source/core/XMLBase64ImportContext \
+    xmloff/source/core/XMLBasicExportFilter \
+    xmloff/source/core/XMLEmbeddedObjectExportFilter \
+    xmloff/source/core/XMLEmbeddedObjectImportContext \
+    xmloff/source/core/attrlist \
+    xmloff/source/core/facreg \
+    xmloff/source/core/i18nmap \
+    xmloff/source/core/nmspmap \
+    xmloff/source/core/unoatrcn \
+    xmloff/source/core/unointerfacetouniqueidentifiermapper \
+    xmloff/source/core/xmlcnitm \
+    xmloff/source/core/xmlehelp \
+    xmloff/source/core/xmlerror \
+    xmloff/source/core/xmlexp \
+    xmloff/source/core/xmlictxt \
+    xmloff/source/core/xmlimp \
+    xmloff/source/core/xmltkmap \
+    xmloff/source/core/xmltoken \
+    xmloff/source/core/xmluconv \
+    xmloff/source/draw/EnhancedCustomShapeToken \
+    xmloff/source/draw/XMLGraphicsDefaultStyle \
+    xmloff/source/draw/XMLImageMapContext \
+    xmloff/source/draw/XMLImageMapExport \
+    xmloff/source/draw/XMLNumberStyles \
+    xmloff/source/draw/XMLReplacementImageContext \
+    xmloff/source/draw/XMLShapePropertySetContext \
+    xmloff/source/draw/XMLShapeStyleContext \
+    xmloff/source/draw/animationexport \
+    xmloff/source/draw/animationimport \
+    xmloff/source/draw/animexp \
+    xmloff/source/draw/animimp \
+    xmloff/source/draw/descriptionimp \
+    xmloff/source/draw/eventimp \
+    xmloff/source/draw/layerexp \
+    xmloff/source/draw/layerimp \
+    xmloff/source/draw/numithdl \
+    xmloff/source/draw/propimp0 \
+    xmloff/source/draw/sdpropls \
+    xmloff/source/draw/sdxmlexp \
+    xmloff/source/draw/sdxmlimp \
+    xmloff/source/draw/shapeexport \
+    xmloff/source/draw/shapeexport2 \
+    xmloff/source/draw/shapeexport3 \
+    xmloff/source/draw/shapeexport4 \
+    xmloff/source/draw/shapeimport \
+    xmloff/source/draw/viewcontext \
+    xmloff/source/draw/xexptran \
+    xmloff/source/draw/ximp3dobject \
+    xmloff/source/draw/ximp3dscene \
+    xmloff/source/draw/ximpbody \
+    xmloff/source/draw/ximpcustomshape \
+    xmloff/source/draw/ximpgrp \
+    xmloff/source/draw/ximplink \
+    xmloff/source/draw/ximpnote \
+    xmloff/source/draw/ximppage \
+    xmloff/source/draw/ximpshap \
+    xmloff/source/draw/ximpshow \
+    xmloff/source/draw/ximpstyl \
+    xmloff/source/forms/attriblistmerge \
+    xmloff/source/forms/controlelement \
+    xmloff/source/forms/controlpropertyhdl \
+    xmloff/source/forms/controlpropertymap \
+    xmloff/source/forms/elementexport \
+    xmloff/source/forms/elementimport \
+    xmloff/source/forms/eventexport \
+    xmloff/source/forms/eventimport \
+    xmloff/source/forms/formattributes \
+    xmloff/source/forms/formcellbinding \
+    xmloff/source/forms/formenums \
+    xmloff/source/forms/formevents \
+    xmloff/source/forms/formlayerexport \
+    xmloff/source/forms/formlayerimport \
+    xmloff/source/forms/formsimp \
+    xmloff/source/forms/formstyles \
+    xmloff/source/forms/gridcolumnproptranslator \
+    xmloff/source/forms/layerexport \
+    xmloff/source/forms/layerimport \
+    xmloff/source/forms/logging \
+    xmloff/source/forms/officeforms \
+    xmloff/source/forms/propertyexport \
+    xmloff/source/forms/propertyimport \
+    xmloff/source/forms/property_meta_data \
+    xmloff/source/forms/strings \
+    xmloff/source/forms/valueproperties \
+    xmloff/source/forms/handler/form_handler_factory \
+    xmloff/source/forms/handler/property_handler_base \
+    xmloff/source/forms/handler/vcl_date_handler \
+    xmloff/source/forms/handler/vcl_time_handler \
+    xmloff/source/meta/MetaExportComponent \
+    xmloff/source/meta/MetaImportComponent \
+    xmloff/source/meta/xmlmetae \
+    xmloff/source/meta/xmlmetai \
+    xmloff/source/meta/xmlversion \
+    xmloff/source/script/XMLEventExport \
+    xmloff/source/script/XMLEventImportHelper \
+    xmloff/source/script/XMLEventsImportContext \
+    xmloff/source/script/XMLScriptContextFactory \
+    xmloff/source/script/XMLScriptExportHandler \
+    xmloff/source/script/XMLStarBasicContextFactory \
+    xmloff/source/script/XMLStarBasicExportHandler \
+    xmloff/source/script/xmlbasici \
+    xmloff/source/script/xmlscripti \
+    xmloff/source/style/AttributeContainerHandler \
+    xmloff/source/style/DashStyle \
+    xmloff/source/style/DrawAspectHdl \
+    xmloff/source/style/EnumPropertyHdl \
+    xmloff/source/style/FillStyleContext \
+    xmloff/source/style/GradientStyle \
+    xmloff/source/style/HatchStyle \
+    xmloff/source/style/ImageStyle \
+    xmloff/source/style/MarkerStyle \
+    xmloff/source/style/MultiPropertySetHelper \
+    xmloff/source/style/NamedBoolPropertyHdl \
+    xmloff/source/style/PageHeaderFooterContext \
+    xmloff/source/style/PageMasterExportPropMapper \
+    xmloff/source/style/PageMasterImportContext \
+    xmloff/source/style/PageMasterImportPropMapper \
+    xmloff/source/style/PageMasterPropHdl \
+    xmloff/source/style/PageMasterPropHdlFactory \
+    xmloff/source/style/PageMasterPropMapper \
+    xmloff/source/style/PageMasterStyleMap \
+    xmloff/source/style/PagePropertySetContext \
+    xmloff/source/style/SinglePropertySetInfoCache \
+    xmloff/source/style/StyleMap \
+    xmloff/source/style/TransGradientStyle \
+    xmloff/source/style/VisAreaContext \
+    xmloff/source/style/VisAreaExport \
+    xmloff/source/style/WordWrapPropertyHdl \
+    xmloff/source/style/XMLBackgroundImageContext \
+    xmloff/source/style/XMLBackgroundImageExport \
+    xmloff/source/style/XMLBitmapLogicalSizePropertyHandler \
+    xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler \
+    xmloff/source/style/XMLClipPropertyHandler \
+    xmloff/source/style/XMLConstantsPropertyHandler \
+    xmloff/source/style/XMLElementPropertyContext \
+    xmloff/source/style/XMLFillBitmapSizePropertyHandler \
+    xmloff/source/style/XMLFontAutoStylePool \
+    xmloff/source/style/XMLFontStylesContext \
+    xmloff/source/style/XMLFootnoteSeparatorExport \
+    xmloff/source/style/XMLFootnoteSeparatorImport \
+    xmloff/source/style/XMLIsPercentagePropertyHandler \
+    xmloff/source/style/XMLPageExport \
+    xmloff/source/style/XMLPercentOrMeasurePropertyHandler \
+    xmloff/source/style/XMLRectangleMembersHandler \
+    xmloff/source/style/adjushdl \
+    xmloff/source/style/backhdl \
+    xmloff/source/style/bordrhdl \
+    xmloff/source/style/breakhdl \
+    xmloff/source/style/cdouthdl \
+    xmloff/source/style/chrhghdl \
+    xmloff/source/style/chrlohdl \
+    xmloff/source/style/csmaphdl \
+    xmloff/source/style/durationhdl \
+    xmloff/source/style/escphdl \
+    xmloff/source/style/fonthdl \
+    xmloff/source/style/impastp1 \
+    xmloff/source/style/impastp2 \
+    xmloff/source/style/impastp3 \
+    xmloff/source/style/impastp4 \
+    xmloff/source/style/kernihdl \
+    xmloff/source/style/lspachdl \
+    xmloff/source/style/numehelp \
+    xmloff/source/style/opaquhdl \
+    xmloff/source/style/postuhdl \
+    xmloff/source/style/prhdlfac \
+    xmloff/source/style/prstylei \
+    xmloff/source/style/shadwhdl \
+    xmloff/source/style/shdwdhdl \
+    xmloff/source/style/styleexp \
+    xmloff/source/style/tabsthdl \
+    xmloff/source/style/undlihdl \
+    xmloff/source/style/uniref \
+    xmloff/source/style/weighhdl \
+    xmloff/source/style/xmlaustp \
+    xmloff/source/style/xmlbahdl \
+    xmloff/source/style/xmlexppr \
+    xmloff/source/style/xmlimppr \
+    xmloff/source/style/xmlnume \
+    xmloff/source/style/xmlnumfe \
+    xmloff/source/style/xmlnumfi \
+    xmloff/source/style/xmlnumi \
+    xmloff/source/style/xmlprcon \
+    xmloff/source/style/xmlprhdl \
+    xmloff/source/style/xmlprmap \
+    xmloff/source/style/xmlstyle \
+    xmloff/source/style/xmltabe \
+    xmloff/source/style/xmltabi \
+    xmloff/source/table/XMLTableExport \
+    xmloff/source/table/XMLTableImport \
+    xmloff/source/text/XMLAutoMarkFileContext \
+    xmloff/source/text/XMLAutoTextContainerEventImport \
+    xmloff/source/text/XMLAutoTextEventExport \
+    xmloff/source/text/XMLAutoTextEventImport \
+    xmloff/source/text/XMLCalculationSettingsContext \
+    xmloff/source/text/XMLChangeElementImportContext \
+    xmloff/source/text/XMLChangeImportContext \
+    xmloff/source/text/XMLChangeInfoContext \
+    xmloff/source/text/XMLChangedRegionImportContext \
+    xmloff/source/text/XMLFootnoteBodyImportContext \
+    xmloff/source/text/XMLFootnoteConfigurationImportContext \
+    xmloff/source/text/XMLFootnoteImportContext \
+    xmloff/source/text/XMLIndexAlphabeticalSourceContext \
+    xmloff/source/text/XMLIndexBibliographyConfigurationContext \
+    xmloff/source/text/XMLIndexBibliographyEntryContext \
+    xmloff/source/text/XMLIndexBibliographySourceContext \
+    xmloff/source/text/XMLIndexBodyContext \
+    xmloff/source/text/XMLIndexChapterInfoEntryContext \
+    xmloff/source/text/XMLIndexIllustrationSourceContext \
+    xmloff/source/text/XMLIndexMarkExport \
+    xmloff/source/text/XMLIndexObjectSourceContext \
+    xmloff/source/text/XMLIndexSimpleEntryContext \
+    xmloff/source/text/XMLIndexSourceBaseContext \
+    xmloff/source/text/XMLIndexSpanEntryContext \
+    xmloff/source/text/XMLIndexTOCContext \
+    xmloff/source/text/XMLIndexTOCSourceContext \
+    xmloff/source/text/XMLIndexTOCStylesContext \
+    xmloff/source/text/XMLIndexTabStopEntryContext \
+    xmloff/source/text/XMLIndexTableSourceContext \
+    xmloff/source/text/XMLIndexTemplateContext \
+    xmloff/source/text/XMLIndexTitleTemplateContext \
+    xmloff/source/text/XMLIndexUserSourceContext \
+    xmloff/source/text/XMLLineNumberingExport \
+    xmloff/source/text/XMLLineNumberingImportContext \
+    xmloff/source/text/XMLLineNumberingSeparatorImportContext \
+    xmloff/source/text/XMLPropertyBackpatcher \
+    xmloff/source/text/XMLRedlineExport \
+    xmloff/source/text/XMLSectionExport \
+    xmloff/source/text/XMLSectionFootnoteConfigExport \
+    xmloff/source/text/XMLSectionFootnoteConfigImport \
+    xmloff/source/text/XMLSectionImportContext \
+    xmloff/source/text/XMLSectionSourceDDEImportContext \
+    xmloff/source/text/XMLSectionSourceImportContext \
+    xmloff/source/text/XMLStringBufferImportContext \
+    xmloff/source/text/XMLTextCharStyleNamesElementExport \
+    xmloff/source/text/XMLTextColumnsContext \
+    xmloff/source/text/XMLTextColumnsExport \
+    xmloff/source/text/XMLTextFrameContext \
+    xmloff/source/text/XMLTextFrameHyperlinkContext \
+    xmloff/source/text/XMLTextHeaderFooterContext \
+    xmloff/source/text/XMLTextListAutoStylePool \
+    xmloff/source/text/XMLTextListBlockContext \
+    xmloff/source/text/XMLTextListItemContext \
+    xmloff/source/text/XMLTextMarkImportContext \
+    xmloff/source/text/XMLTextMasterPageContext \
+    xmloff/source/text/XMLTextMasterPageExport \
+    xmloff/source/text/XMLTextMasterStylesContext \
+    xmloff/source/text/XMLTextNumRuleInfo \
+    xmloff/source/text/XMLTextPropertySetContext \
+    xmloff/source/text/XMLTextShapeImportHelper \
+    xmloff/source/text/XMLTextShapeStyleContext \
+    xmloff/source/text/XMLTextTableContext \
+    xmloff/source/text/XMLTrackedChangesImportContext \
+    xmloff/source/text/txtdrope \
+    xmloff/source/text/txtdropi \
+    xmloff/source/text/txtexppr \
+    xmloff/source/text/txtflde \
+    xmloff/source/text/txtfldi \
+    xmloff/source/text/txtftne \
+    xmloff/source/text/txtimp \
+    xmloff/source/text/txtimppr \
+    xmloff/source/text/txtlists \
+    xmloff/source/text/txtparae \
+    xmloff/source/text/txtparai \
+    xmloff/source/text/txtprhdl \
+    xmloff/source/text/txtprmap \
+    xmloff/source/text/txtsecte \
+    xmloff/source/text/txtstyle \
+    xmloff/source/text/txtstyli \
+    xmloff/source/text/txtvfldi \
+    xmloff/source/xforms/SchemaContext \
+    xmloff/source/xforms/SchemaRestrictionContext \
+    xmloff/source/xforms/SchemaSimpleTypeContext \
+    xmloff/source/xforms/TokenContext \
+    xmloff/source/xforms/XFormsBindContext \
+    xmloff/source/xforms/XFormsInstanceContext \
+    xmloff/source/xforms/XFormsModelContext \
+    xmloff/source/xforms/XFormsSubmissionContext \
+    xmloff/source/xforms/xformsapi \
+    xmloff/source/xforms/xformsexport \
+    xmloff/source/xforms/xformsimport \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,xo,\
+    dl \
+    icuuc \
+    m \
+    pthread \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,xo,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet ts=4 sw=4:
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
new file mode 100644
index 000000000000..6880eb1a1fd9
--- /dev/null
+++ b/xmloff/Library_xof.mk
@@ -0,0 +1,112 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,xof))
+
+$(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof))
+
+$(eval $(call gb_Library_set_include,xof,\
+    -I$(SRCDIR)/xmloff/inc/pch \
+    -I$(SRCDIR)/xmloff/inc \
+    -I$(SRCDIR)/xmloff/source/inc \
+    -I$(WORKDIR)/inc/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xof,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    salhelper \
+    stl \
+    xo \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xof,\
+    xmloff/source/transform/ChartOASISTContext \
+    xmloff/source/transform/ChartOOoTContext \
+    xmloff/source/transform/ChartPlotAreaOASISTContext \
+    xmloff/source/transform/ChartPlotAreaOOoTContext \
+    xmloff/source/transform/ControlOASISTContext \
+    xmloff/source/transform/ControlOOoTContext \
+    xmloff/source/transform/CreateElemTContext \
+    xmloff/source/transform/DeepTContext \
+    xmloff/source/transform/DlgOASISTContext \
+    xmloff/source/transform/DocumentTContext \
+    xmloff/source/transform/EventMap \
+    xmloff/source/transform/EventOASISTContext \
+    xmloff/source/transform/EventOOoTContext \
+    xmloff/source/transform/FlatTContext \
+    xmloff/source/transform/FormPropOASISTContext \
+    xmloff/source/transform/FormPropOOoTContext \
+    xmloff/source/transform/FrameOASISTContext \
+    xmloff/source/transform/FrameOOoTContext \
+    xmloff/source/transform/IgnoreTContext \
+    xmloff/source/transform/MergeElemTContext \
+    xmloff/source/transform/MetaTContext \
+    xmloff/source/transform/MutableAttrList \
+    xmloff/source/transform/NotesTContext \
+    xmloff/source/transform/OOo2Oasis \
+    xmloff/source/transform/Oasis2OOo \
+    xmloff/source/transform/PersAttrListTContext \
+    xmloff/source/transform/PersMixedContentTContext \
+    xmloff/source/transform/ProcAddAttrTContext \
+    xmloff/source/transform/ProcAttrTContext \
+    xmloff/source/transform/PropertyActionsOASIS \
+    xmloff/source/transform/PropertyActionsOOo \
+    xmloff/source/transform/RenameElemTContext \
+    xmloff/source/transform/StyleOASISTContext \
+    xmloff/source/transform/StyleOOoTContext \
+    xmloff/source/transform/TransformerActions \
+    xmloff/source/transform/TransformerBase \
+    xmloff/source/transform/TransformerContext \
+    xmloff/source/transform/TransformerTokenMap \
+    xmloff/source/transform/XMLFilterRegistration \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,xof,\
+    icuuc \
+    dl \
+    m \
+    pthread \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,xof,\
+    kernel32 \
+    msvcrt \
+    oldnames \
+    user32 \
+    uwinapi \
+))
+endif
+# vim: set noet ts=4 sw=4:
diff --git a/xmloff/Makefile b/xmloff/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/xmloff/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
new file mode 100644
index 000000000000..eacc83068dad
--- /dev/null
+++ b/xmloff/Module_xmloff.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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,xmloff))
+
+$(eval $(call gb_Module_add_targets,xmloff,\
+    Library_xo \
+    Library_xof \
+    Package_dtd \
+    Package_inc \
+))
+
+#todo: map file
+#todo: xmlkywd.lib - built, but never used?!
+
+# vim: set noet ts=4 sw=4:
diff --git a/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk
new file mode 100644
index 000000000000..fbfbe4a1400d
--- /dev/null
+++ b/xmloff/Package_dtd.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Package_Package,xmloff_dtd,$(SRCDIR)/xmloff/dtd))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/Blocklist.dtd,Blocklist.dtd))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/chart.mod,chart.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/datastyl.mod,datastyl.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/defs.mod,defs.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/drawing.mod,drawing.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/dtypes.mod,dtypes.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/form.mod,form.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/meta.mod,meta.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/nmspace.mod,nmspace.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.dtd,office.dtd))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.mod,office.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/openoffice-2.0-schema.rng,openoffice-2.0-schema.rng))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/script.mod,script.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/settings.mod,settings.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/style.mod,style.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/table.mod,table.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/text.mod,text.mod))
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk
new file mode 100644
index 000000000000..ca2d0abe62e2
--- /dev/null
+++ b/xmloff/Package_inc.mk
@@ -0,0 +1,131 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Package_Package,xmloff_inc,$(SRCDIR)/xmloff/inc))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DashStyle.hxx,xmloff/DashStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DocumentSettingsContext.hxx,xmloff/DocumentSettingsContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/EnumPropertyHdl.hxx,xmloff/EnumPropertyHdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/GradientStyle.hxx,xmloff/GradientStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/HatchStyle.hxx,xmloff/HatchStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ImageStyle.hxx,xmloff/ImageStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/MarkerStyle.hxx,xmloff/MarkerStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/NamedBoolPropertyHdl.hxx,xmloff/NamedBoolPropertyHdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PageMasterStyleMap.hxx,xmloff/PageMasterStyleMap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ProgressBarHelper.hxx,xmloff/ProgressBarHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoHash.hxx,xmloff/PropertySetInfoHash.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoKey.hxx,xmloff/PropertySetInfoKey.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLExportHelper.hxx,xmloff/SchXMLExportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLImportHelper.hxx,xmloff/SchXMLImportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SettingsExportHelper.hxx,xmloff/SettingsExportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SinglePropertySetInfoCache.hxx,xmloff/SinglePropertySetInfoCache.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaContext.hxx,xmloff/VisAreaContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaExport.hxx,xmloff/VisAreaExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/WordWrapPropertyHdl.hxx,xmloff/WordWrapPropertyHdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLBase64ImportContext.hxx,xmloff/XMLBase64ImportContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLCharContext.hxx,xmloff/XMLCharContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLConstantsPropertyHandler.hxx,xmloff/XMLConstantsPropertyHandler.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEmbeddedObjectExportFilter.hxx,xmloff/XMLEmbeddedObjectExportFilter.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventExport.hxx,xmloff/XMLEventExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventsImportContext.hxx,xmloff/XMLEventsImportContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFilterServiceNames.h,xmloff/XMLFilterServiceNames.h))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontAutoStylePool.hxx,xmloff/XMLFontAutoStylePool.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontStylesContext.hxx,xmloff/XMLFontStylesContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLGraphicsDefaultStyle.hxx,xmloff/XMLGraphicsDefaultStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLPageExport.hxx,xmloff/XMLPageExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLSettingsExportContext.hxx,xmloff/XMLSettingsExportContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLShapeStyleContext.hxx,xmloff/XMLShapeStyleContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLStringVector.hxx,xmloff/XMLStringVector.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextListAutoStylePool.hxx,xmloff/XMLTextListAutoStylePool.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageContext.hxx,xmloff/XMLTextMasterPageContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageExport.hxx,xmloff/XMLTextMasterPageExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterStylesContext.hxx,xmloff/XMLTextMasterStylesContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeStyleContext.hxx,xmloff/XMLTextShapeStyleContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextTableContext.hxx,xmloff/XMLTextTableContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/animexp.hxx,xmloff/animexp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/attrlist.hxx,xmloff/attrlist.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/contextid.hxx,xmloff/contextid.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/controlpropertyhdl.hxx,xmloff/controlpropertyhdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/dllapi.h,xmloff/dllapi.h))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/families.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formsimp.hxx,xmloff/formsimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/functional.hxx,xmloff/functional.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/numehelp.hxx,xmloff/numehelp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/odffields.hxx,xmloff/odffields.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prhdlfac.hxx,xmloff/prhdlfac.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prstylei.hxx,xmloff/prstylei.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeexport.hxx,xmloff/shapeexport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeimport.hxx,xmloff/shapeimport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/styleexp.hxx,xmloff/styleexp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableExport.hxx,xmloff/table/XMLTableExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableImport.hxx,xmloff/table/XMLTableImport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimp.hxx,xmloff/txtimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimppr.hxx,xmloff/txtimppr.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtparae.hxx,xmloff/txtparae.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtprmap.hxx,xmloff/txtprmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyle.hxx,xmloff/txtstyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyli.hxx,xmloff/txtstyli.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/uniref.hxx,xmloff/uniref.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unoatrcn.hxx,xmloff/unoatrcn.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsexport.hxx,xmloff/xformsexport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsimport.hxx,xmloff/xformsimport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlaustp.hxx,xmloff/xmlaustp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnimp.hxx,xmloff/xmlcnimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnitm.hxx,xmloff/xmlcnitm.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlement.hxx,xmloff/xmlement.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlerror.hxx,xmloff/xmlerror.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlevent.hxx,xmloff/xmlevent.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexp.hxx,xmloff/xmlexp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexppr.hxx,xmloff/xmlexppr.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlictxt.hxx,xmloff/xmlictxt.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimp.hxx,xmloff/xmlimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimppr.hxx,xmloff/xmlimppr.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlkywd.hxx,xmloff/xmlkywd.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetae.hxx,xmloff/xmlmetae.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetai.hxx,xmloff/xmlmetai.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnmspe.hxx,xmloff/xmlnmspe.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnume.hxx,xmloff/xmlnume.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfe.hxx,xmloff/xmlnumfe.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfi.hxx,xmloff/xmlnumfi.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumi.hxx,xmloff/xmlnumi.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprcon.hxx,xmloff/xmlprcon.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprhdl.hxx,xmloff/xmlprhdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprmap.hxx,xmloff/xmlprmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlreg.hxx,xmloff/xmlreg.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlscripti.hxx,xmloff/xmlscripti.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlstyle.hxx,xmloff/xmlstyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltabe.hxx,xmloff/xmltabe.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltkmap.hxx,xmloff/xmltkmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltoken.hxx,xmloff/xmltoken.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltypes.hxx,xmloff/xmltypes.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmluconv.hxx,xmloff/xmluconv.hxx))
diff --git a/xmloff/source/forms/form_handler_factory.hxx b/xmloff/inc/forms/form_handler_factory.hxx
index 62bf94f74aa8..8752b8384fef 100755
--- a/xmloff/source/forms/form_handler_factory.hxx
+++ b/xmloff/inc/forms/form_handler_factory.hxx
@@ -27,7 +27,7 @@
 #ifndef XMLOFF_FORM_HANDLER_FACTORY_HXX
 #define XMLOFF_FORM_HANDLER_FACTORY_HXX
 
-#include "property_handler.hxx"
+#include "forms/property_handler.hxx"
 
 //......................................................................................................................
 namespace xmloff
diff --git a/xmloff/source/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx
index 247b4f17f798..d2675ba58ad0 100755
--- a/xmloff/source/forms/property_handler.hxx
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -27,7 +27,7 @@
 #ifndef XMLOFF_PROPERTY_HANDLER_HXX
 #define XMLOFF_PROPERTY_HANDLER_HXX
 
-#include "property_ids.hxx"
+#include "forms/property_ids.hxx"
 
 #include <com/sun/star/uno/Any.hxx>
 
diff --git a/xmloff/source/forms/property_ids.hxx b/xmloff/inc/forms/property_ids.hxx
index 31004f2d9ff2..31004f2d9ff2 100755
--- a/xmloff/source/forms/property_ids.hxx
+++ b/xmloff/inc/forms/property_ids.hxx
diff --git a/xmloff/inc/functional.hxx b/xmloff/inc/functional.hxx
deleted file mode 100644
index 7bcbc5c3b210..000000000000
--- a/xmloff/inc/functional.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _XMLOFF_FUNCTIONAL_HXX
-#define _XMLOFF_FUNCTIONAL_HXX
-
-#include <rtl/ustring.hxx>
-
-/* THIS HEADER IS DEPRECATED. USE comphelper/stl_types.hxx INSTEAD!!! */
-
-/** @#file
- *
- * re-implement STL functors as needed
- *
- * The standard comparison operators from the STL cause warnings with
- * several compilers about our sal_Bool (=unsigned char) being
- * converted to bool (C++ bool). We wish to avoid that.
- */
-
-struct less_functor
-{
-    bool operator()(const ::rtl::OUString& x,
-                    const ::rtl::OUString& y) const
-    {
-        return 0 != (x<y);
-    }
-};
-
-
-#endif
diff --git a/xmloff/inc/makefile.mk b/xmloff/inc/makefile.mk
deleted file mode 100644
index db706e293088..000000000000
--- a/xmloff/inc/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=xmloff
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 173ccb1696ed..190568c2ed1e 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -33,7 +33,7 @@
 #define _XMLOFF_TXTFLDE_HXX
 
 #include <com/sun/star/uno/Reference.h>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <rtl/ustring.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/inc/DashStyle.hxx b/xmloff/inc/xmloff/DashStyle.hxx
index f6e39df1d122..f6e39df1d122 100644
--- a/xmloff/inc/DashStyle.hxx
+++ b/xmloff/inc/xmloff/DashStyle.hxx
diff --git a/xmloff/inc/GradientStyle.hxx b/xmloff/inc/xmloff/GradientStyle.hxx
index f4a2fd474225..f4a2fd474225 100644
--- a/xmloff/inc/GradientStyle.hxx
+++ b/xmloff/inc/xmloff/GradientStyle.hxx
diff --git a/xmloff/inc/HatchStyle.hxx b/xmloff/inc/xmloff/HatchStyle.hxx
index 49d7296c3766..49d7296c3766 100644
--- a/xmloff/inc/HatchStyle.hxx
+++ b/xmloff/inc/xmloff/HatchStyle.hxx
diff --git a/xmloff/inc/ImageStyle.hxx b/xmloff/inc/xmloff/ImageStyle.hxx
index 704cc6eec37b..704cc6eec37b 100644
--- a/xmloff/inc/ImageStyle.hxx
+++ b/xmloff/inc/xmloff/ImageStyle.hxx
diff --git a/xmloff/inc/MarkerStyle.hxx b/xmloff/inc/xmloff/MarkerStyle.hxx
index 5d2111ece2e3..5d2111ece2e3 100644
--- a/xmloff/inc/MarkerStyle.hxx
+++ b/xmloff/inc/xmloff/MarkerStyle.hxx
diff --git a/xmloff/inc/VisAreaContext.hxx b/xmloff/inc/xmloff/VisAreaContext.hxx
index 3aa7cabd4a22..3aa7cabd4a22 100644
--- a/xmloff/inc/VisAreaContext.hxx
+++ b/xmloff/inc/xmloff/VisAreaContext.hxx
diff --git a/xmloff/inc/VisAreaExport.hxx b/xmloff/inc/xmloff/VisAreaExport.hxx
index 5b8206387435..5b8206387435 100644
--- a/xmloff/inc/VisAreaExport.hxx
+++ b/xmloff/inc/xmloff/VisAreaExport.hxx
diff --git a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
index 179f74112dfe..179f74112dfe 100644
--- a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
+++ b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
diff --git a/xmloff/inc/XMLFilterServiceNames.h b/xmloff/inc/xmloff/XMLFilterServiceNames.h
index 525143cd2b09..525143cd2b09 100644
--- a/xmloff/inc/XMLFilterServiceNames.h
+++ b/xmloff/inc/xmloff/XMLFilterServiceNames.h
diff --git a/xmloff/inc/XMLTextListAutoStylePool.hxx b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
index 0b3e631ae095..0b3e631ae095 100644
--- a/xmloff/inc/XMLTextListAutoStylePool.hxx
+++ b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.hxx b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx
index 96c17334dfcd..96c17334dfcd 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.hxx
+++ b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx
diff --git a/svx/inc/srchitem.hxx b/xmloff/inc/xmloff/functional.hxx
index fceb5f009953..7928930f07fe 100644
--- a/svx/inc/srchitem.hxx
+++ b/xmloff/inc/xmloff/functional.hxx
@@ -24,11 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVX_SRCHITEM_HXX
-#define _SVX_SRCHITEM_HXX
 
-#include <svl/srchitem.hxx>
+#ifndef _XMLOFF_FUNCTIONAL_HXX
+#define _XMLOFF_FUNCTIONAL_HXX
 
-#endif
+#include <rtl/ustring.hxx>
+
+/* THIS HEADER IS DEPRECATED. USE comphelper/stl_types.hxx INSTEAD!!! */
 
+/** @#file
+ *
+ * re-implement STL functors as needed
+ *
+ * The standard comparison operators from the STL cause warnings with
+ * several compilers about our sal_Bool (=unsigned char) being
+ * converted to bool (C++ bool). We wish to avoid that.
+ */
 
+struct less_functor
+{
+    bool operator()(const ::rtl::OUString& x,
+                    const ::rtl::OUString& y) const
+    {
+        return 0 != (x<y);
+    }
+};
+
+
+#endif
diff --git a/xmloff/inc/i18nmap.hxx b/xmloff/inc/xmloff/i18nmap.hxx
index 643b1d3a88f6..643b1d3a88f6 100644
--- a/xmloff/inc/i18nmap.hxx
+++ b/xmloff/inc/xmloff/i18nmap.hxx
diff --git a/xmloff/inc/numehelp.hxx b/xmloff/inc/xmloff/numehelp.hxx
index bf0b6d6c6113..bf0b6d6c6113 100644
--- a/xmloff/inc/numehelp.hxx
+++ b/xmloff/inc/xmloff/numehelp.hxx
diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index 75310d90f0ae..20be794308a3 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.hxx
@@ -40,7 +40,7 @@
 #include <tools/list.hxx>
 #include <xmloff/xmltkmap.hxx>
 
-// functional.hxx is obsolete and should be replaced by its comphelper
+// xmloff/functional.hxx is obsolete and should be replaced by its comphelper
 // counterpart
 #include <comphelper/stl_types.hxx>
 #include <xmloff/uniref.hxx>
diff --git a/xmloff/inc/txtimppr.hxx b/xmloff/inc/xmloff/txtimppr.hxx
index ca2446a01352..ca2446a01352 100644
--- a/xmloff/inc/txtimppr.hxx
+++ b/xmloff/inc/xmloff/txtimppr.hxx
diff --git a/xmloff/inc/unoatrcn.hxx b/xmloff/inc/xmloff/unoatrcn.hxx
index 250eb2670f88..250eb2670f88 100644
--- a/xmloff/inc/unoatrcn.hxx
+++ b/xmloff/inc/xmloff/unoatrcn.hxx
diff --git a/xmloff/inc/xformsexport.hxx b/xmloff/inc/xmloff/xformsexport.hxx
index 4ee7ac107f88..4ee7ac107f88 100644
--- a/xmloff/inc/xformsexport.hxx
+++ b/xmloff/inc/xmloff/xformsexport.hxx
diff --git a/xmloff/inc/xformsimport.hxx b/xmloff/inc/xmloff/xformsimport.hxx
index 8784ea55b58e..8784ea55b58e 100644
--- a/xmloff/inc/xformsimport.hxx
+++ b/xmloff/inc/xmloff/xformsimport.hxx
diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmloff/xmlcnitm.hxx
index 772ba1dd0fc4..772ba1dd0fc4 100644
--- a/xmloff/inc/xmlcnitm.hxx
+++ b/xmloff/inc/xmloff/xmlcnitm.hxx
diff --git a/xmloff/inc/xmlerror.hxx b/xmloff/inc/xmloff/xmlerror.hxx
index 407ef6b3666d..407ef6b3666d 100644
--- a/xmloff/inc/xmlerror.hxx
+++ b/xmloff/inc/xmloff/xmlerror.hxx
diff --git a/xmloff/inc/xmloff/xmlkywd.hxx b/xmloff/inc/xmloff/xmlkywd.hxx
new file mode 100644
index 000000000000..bce52d875b52
--- /dev/null
+++ b/xmloff/inc/xmloff/xmlkywd.hxx
@@ -0,0 +1,1998 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 _XMLOFF_XMLKYWD_HXX
+#define _XMLOFF_XMLKYWD_HXX
+
+#include <tools/string.hxx>
+
+/*
+ * THIS FILE IS DEPRECATED. IT IS SUPERSEDED BY XMLTOKEN.HXX.
+ *
+ * Please use xmltoken.hxx / xmltoken.cxx from now on.
+ */
+
+
+/* if XML_DEFINE_KEYWORDS is defined the variables are
+   defined rather than declared. So this file MUST be included
+   WITHOUT this define.
+
+   (Except the xmlkywd.cxx file that actually defines the
+    variables which sets this define.)
+ */
+
+#ifndef XML_DEFINE_KEYWORDS
+#define XML_CONSTASCII_ACTION( n, s ) extern sal_Char __FAR_DATA n[sizeof(s)]
+#else
+#define XML_CONSTASCII_ACTION( n, s ) sal_Char __FAR_DATA n[sizeof(s)] = s
+#endif
+
+// common XML
+XML_CONSTASCII_ACTION( sXML_CDATA, "CDATA" );
+XML_CONSTASCII_ACTION( sXML_WS, " " );
+XML_CONSTASCII_ACTION( sXML_xml, "xml" );
+XML_CONSTASCII_ACTION( sXML_xmlns, "xmlns" );
+XML_CONSTASCII_ACTION( sXML_xml_pi, "version=\"1.0\" encoding=\"UTF-8\"" );
+XML_CONSTASCII_ACTION( sXML_xml_doctype_prefix, "<!DOCTYPE " );
+XML_CONSTASCII_ACTION( sXML_xml_doctype_suffix, " PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"office.dtd\">" );
+
+// namespace prefixes and names
+XML_CONSTASCII_ACTION( sXML_np_office, "office" );
+XML_CONSTASCII_ACTION( sXML_n_office, "http://openoffice.org/2000/office" );
+XML_CONSTASCII_ACTION( sXML_n_office_old, "http://sun.com/xmlns/staroffice/office" );
+XML_CONSTASCII_ACTION( sXML_np_meta, "meta" );
+XML_CONSTASCII_ACTION( sXML_n_meta, "http://openoffice.org/2000/meta" );
+XML_CONSTASCII_ACTION( sXML_n_meta_old, "http://sun.com/xmlns/staroffice/meta" );
+XML_CONSTASCII_ACTION( sXML_np_style, "style" );
+XML_CONSTASCII_ACTION( sXML_n_style, "http://openoffice.org/2000/style" );
+XML_CONSTASCII_ACTION( sXML_n_style_old, "http://sun.com/xmlns/staroffice/style" );
+XML_CONSTASCII_ACTION( sXML_np_number, "number" );
+XML_CONSTASCII_ACTION( sXML_n_number, "http://openoffice.org/2000/datastyle" );
+XML_CONSTASCII_ACTION( sXML_n_number_old, "http://sun.com/xmlns/staroffice/number" );
+XML_CONSTASCII_ACTION( sXML_np_text, "text" );
+XML_CONSTASCII_ACTION( sXML_n_text, "http://openoffice.org/2000/text" );
+XML_CONSTASCII_ACTION( sXML_n_text_old, "http://sun.com/xmlns/staroffice/text" );
+XML_CONSTASCII_ACTION( sXML_np_table, "table" );
+XML_CONSTASCII_ACTION( sXML_n_table, "http://openoffice.org/2000/table" );
+XML_CONSTASCII_ACTION( sXML_n_table_old, "http://sun.com/xmlns/staroffice/table" );
+XML_CONSTASCII_ACTION( sXML_np_draw, "draw" );
+XML_CONSTASCII_ACTION( sXML_n_draw, "http://openoffice.org/2000/drawing" );
+XML_CONSTASCII_ACTION( sXML_np_dr3d, "dr3d" );
+XML_CONSTASCII_ACTION( sXML_n_dr3d, "http://openoffice.org/2000/dr3d" );
+XML_CONSTASCII_ACTION( sXML_n_draw_old, "http://sun.com/xmlns/staroffice/draw" );
+XML_CONSTASCII_ACTION( sXML_np_presentation, "presentation" );
+XML_CONSTASCII_ACTION( sXML_n_presentation, "http://openoffice.org/2000/presentation" );
+XML_CONSTASCII_ACTION( sXML_n_presentation_old, "http://sun.com/xmlns/staroffice/presentation" );
+XML_CONSTASCII_ACTION( sXML_np_chart, "chart" );
+XML_CONSTASCII_ACTION( sXML_n_chart, "http://openoffice.org/2000/chart" );
+XML_CONSTASCII_ACTION( sXML_np_config, "config" );
+XML_CONSTASCII_ACTION( sXML_n_config, "http://openoffice.org/2001/config" );
+XML_CONSTASCII_ACTION( sXML_n_chart_old, "http://sun.com/xmlns/staroffice/chart" );
+XML_CONSTASCII_ACTION( sXML_np_fo, "fo" );
+XML_CONSTASCII_ACTION( sXML_n_fo_old, "http://www.w3.org/1999/XSL/Format/" );
+XML_CONSTASCII_ACTION( sXML_n_fo, "http://www.w3.org/1999/XSL/Format" );
+XML_CONSTASCII_ACTION( sXML_np_xlink, "xlink" );
+XML_CONSTASCII_ACTION( sXML_n_xlink, "http://www.w3.org/1999/xlink" );
+XML_CONSTASCII_ACTION( sXML_n_xlink_old, "http://www.w3.org/1999/xlink/namespace" );
+XML_CONSTASCII_ACTION( sXML_np_dc, "dc" );
+XML_CONSTASCII_ACTION( sXML_n_dc, "http://purl.org/dc/elements/1.1/" );
+XML_CONSTASCII_ACTION( sXML_np_svg, "svg" );
+XML_CONSTASCII_ACTION( sXML_n_svg, "http://www.w3.org/2000/svg" );
+XML_CONSTASCII_ACTION( sXML_namespace_form, "form" );
+XML_CONSTASCII_ACTION( sXML_url_form, "http://openoffice.org/2000/form" );
+XML_CONSTASCII_ACTION( sXML_namespace_script, "script" );
+XML_CONSTASCII_ACTION( sXML_url_script, "http://openoffice.org/2000/script" );
+
+XML_CONSTASCII_ACTION( sXML_np_block_list, "block-list");
+XML_CONSTASCII_ACTION( sXML_n_block_list, "http://openoffice.org/2001/block-list" );
+
+XML_CONSTASCII_ACTION( sXML_np_math, "math");
+XML_CONSTASCII_ACTION( sXML_n_math, "http://www.w3.org/1998/Math/MathML" );
+
+XML_CONSTASCII_ACTION( sXML_np_versions_list, "VL");
+XML_CONSTASCII_ACTION( sXML_n_versions_list, "http://openoffice.org/2001/versions-list" );
+
+// units
+XML_CONSTASCII_ACTION( sXML_unit_mm, "mm" );
+XML_CONSTASCII_ACTION( sXML_unit_m, "m" );
+XML_CONSTASCII_ACTION( sXML_unit_km, "km" );
+XML_CONSTASCII_ACTION( sXML_unit_cm, "cm" );
+XML_CONSTASCII_ACTION( sXML_unit_pt, "pt" );
+XML_CONSTASCII_ACTION( sXML_unit_pc, "pc" );
+XML_CONSTASCII_ACTION( sXML_unit_foot, "ft" );
+XML_CONSTASCII_ACTION( sXML_unit_miles, "mi" );
+XML_CONSTASCII_ACTION( sXML_unit_inch, "inch" );
+
+// any other
+XML_CONSTASCII_ACTION( sXML_1, "1" );
+XML_CONSTASCII_ACTION( sXML_10, "10" );
+XML_CONSTASCII_ACTION( sXML_2, "2" );
+XML_CONSTASCII_ACTION( sXML_3, "3" );
+XML_CONSTASCII_ACTION( sXML_4, "4" );
+XML_CONSTASCII_ACTION( sXML_5, "5" );
+XML_CONSTASCII_ACTION( sXML_6, "6" );
+XML_CONSTASCII_ACTION( sXML_7, "7" );
+XML_CONSTASCII_ACTION( sXML_8, "8" );
+XML_CONSTASCII_ACTION( sXML_9, "9" );
+XML_CONSTASCII_ACTION( sXML_A, "A" );
+XML_CONSTASCII_ACTION( sXML_I, "I" );
+XML_CONSTASCII_ACTION( sXML_IBM437, "IBM437" );
+XML_CONSTASCII_ACTION( sXML_IBM850, "IBM850" );
+XML_CONSTASCII_ACTION( sXML_IBM860, "IBM860" );
+XML_CONSTASCII_ACTION( sXML_IBM861, "IBM861" );
+XML_CONSTASCII_ACTION( sXML_IBM863, "IBM863" );
+XML_CONSTASCII_ACTION( sXML_IBM865, "IBM865" );
+XML_CONSTASCII_ACTION( sXML_ISO_8859_1, "ISO-8859-1" );
+XML_CONSTASCII_ACTION( sXML_OLE2, "ole2" );
+XML_CONSTASCII_ACTION( sXML__colon, ":" );
+XML_CONSTASCII_ACTION( sXML__empty, "" );
+XML_CONSTASCII_ACTION( sXML__unknown_, "_unknown_" );
+XML_CONSTASCII_ACTION( sXML_a, "a" );
+XML_CONSTASCII_ACTION( sXML_abbreviated_name, "abbreviated-name" );
+XML_CONSTASCII_ACTION( sXML_above, "above" );
+XML_CONSTASCII_ACTION( sXML_abs, "abs" );
+XML_CONSTASCII_ACTION( sXML_accent, "accent" );
+XML_CONSTASCII_ACTION( sXML_accentunder, "accentunder" );
+XML_CONSTASCII_ACTION( sXML_acceptance_state, "acceptance-state" );
+XML_CONSTASCII_ACTION( sXML_accepted, "accepted" );
+XML_CONSTASCII_ACTION( sXML_action, "action" );
+XML_CONSTASCII_ACTION( sXML_active, "active" );
+XML_CONSTASCII_ACTION( sXML_active_split_range, "active-split-range" );
+XML_CONSTASCII_ACTION( sXML_active_table, "active-table" );
+XML_CONSTASCII_ACTION( sXML_actuate, "actuate" );
+XML_CONSTASCII_ACTION( sXML_add_in, "add-in" );
+XML_CONSTASCII_ACTION( sXML_add_in_name, "add-in-name" );
+XML_CONSTASCII_ACTION( sXML_address, "address" );
+XML_CONSTASCII_ACTION( sXML_adjustment, "adjustment" );
+XML_CONSTASCII_ACTION( sXML_algorithm, "algorithm" );
+XML_CONSTASCII_ACTION( sXML_align, "align" );
+XML_CONSTASCII_ACTION( sXML_all, "all" );
+XML_CONSTASCII_ACTION( sXML_allow_empty_cell, "allow-empty-cell" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index, "alphabetical-index" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_auto_mark_file, "alphabetical-index-auto-mark-file" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_entry_template, "alphabetical-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_mark, "alphabetical-index-mark" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_mark_end, "alphabetical-index-mark-end" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_mark_start, "alphabetical-index-mark-start" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_source, "alphabetical-index-source" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_separators, "alphabetical-separators" );
+XML_CONSTASCII_ACTION( sXML_alternate, "alternate" );
+XML_CONSTASCII_ACTION( sXML_am_pm, "am-pm" );
+XML_CONSTASCII_ACTION( sXML_ambient_color, "ambient-color");
+XML_CONSTASCII_ACTION( sXML_anchor_page_number, "anchor-page-number" );
+XML_CONSTASCII_ACTION( sXML_anchor_type, "anchor-type" );
+XML_CONSTASCII_ACTION( sXML_and, "and" );
+XML_CONSTASCII_ACTION( sXML_animation, "animation" );
+XML_CONSTASCII_ACTION( sXML_animation_direction, "animation-direction" );
+XML_CONSTASCII_ACTION( sXML_animation_start_inside, "animation-start-inside" );
+XML_CONSTASCII_ACTION( sXML_animation_stop_inside, "animation-stop-inside" );
+XML_CONSTASCII_ACTION( sXML_animation_repeat, "animation-repeat" );
+XML_CONSTASCII_ACTION( sXML_animation_delay, "animation-delay" );
+XML_CONSTASCII_ACTION( sXML_animation_steps, "animation-steps" );
+XML_CONSTASCII_ACTION( sXML_annotation, "annotation" );
+XML_CONSTASCII_ACTION( sXML_annotations, "annotations" );
+XML_CONSTASCII_ACTION( sXML_annote, "annote" );
+XML_CONSTASCII_ACTION( sXML_applet, "applet");
+XML_CONSTASCII_ACTION( sXML_applet_name, "applet-name");
+XML_CONSTASCII_ACTION( sXML_application_data, "application-data");
+XML_CONSTASCII_ACTION( sXML_application_xml, "application-xml");
+XML_CONSTASCII_ACTION( sXML_apply, "apply" );
+XML_CONSTASCII_ACTION( sXML_apply_style_name, "apply-style-name" );
+XML_CONSTASCII_ACTION( sXML_aqua, "aqua" );
+XML_CONSTASCII_ACTION( sXML_arccos, "arccos" );
+XML_CONSTASCII_ACTION( sXML_archive, "archive" );
+XML_CONSTASCII_ACTION( sXML_arcsin, "arcsin" );
+XML_CONSTASCII_ACTION( sXML_arctan, "arctan" );
+XML_CONSTASCII_ACTION( sXML_area, "area" );
+XML_CONSTASCII_ACTION( sXML_area_circle, "area-circle" );
+XML_CONSTASCII_ACTION( sXML_area_polygon, "area-polygon" );
+XML_CONSTASCII_ACTION( sXML_area_rectangle, "area-rectangle" );
+XML_CONSTASCII_ACTION( sXML_article, "article" );
+XML_CONSTASCII_ACTION( sXML_as_char, "as-char" );
+XML_CONSTASCII_ACTION( sXML_ascending, "ascending");
+XML_CONSTASCII_ACTION( sXML_attached_axis, "attached-axis" );
+XML_CONSTASCII_ACTION( sXML_attractive, "attractive");
+XML_CONSTASCII_ACTION( sXML_author, "author" );
+XML_CONSTASCII_ACTION( sXML_author_initials, "author-initials" );
+XML_CONSTASCII_ACTION( sXML_author_name, "author-name" );
+XML_CONSTASCII_ACTION( sXML_auto, "auto" );
+XML_CONSTASCII_ACTION( sXML_auto_grow_height, "auto-grow-height" );
+XML_CONSTASCII_ACTION( sXML_auto_grow_width, "auto-grow-width" );
+XML_CONSTASCII_ACTION( sXML_auto_reload, "auto-reload" );
+XML_CONSTASCII_ACTION( sXML_auto_text, "auto-text" );
+XML_CONSTASCII_ACTION( sXML_auto_text_events, "auto-text-events" );
+XML_CONSTASCII_ACTION( sXML_auto_text_group, "auto-text-group" );
+XML_CONSTASCII_ACTION( sXML_auto_text_indent, "auto-text-indent" );
+XML_CONSTASCII_ACTION( sXML_up, "up" );
+XML_CONSTASCII_ACTION( sXML_auto_update, "auto-update" );
+XML_CONSTASCII_ACTION( sXML_automatic, "automatic");
+XML_CONSTASCII_ACTION( sXML_automatic_find_labels, "automatic-find-labels" );
+XML_CONSTASCII_ACTION( sXML_automatic_order, "automatic-order" );
+XML_CONSTASCII_ACTION( sXML_automatic_styles, "automatic-styles" );
+XML_CONSTASCII_ACTION( sXML_automatic_update, "automatic-update" );
+XML_CONSTASCII_ACTION( sXML_average, "average" );
+XML_CONSTASCII_ACTION( sXML_axis, "axis" );
+XML_CONSTASCII_ACTION( sXML_back_scale, "back-scale" );
+XML_CONSTASCII_ACTION( sXML_backface_culling, "backface-culling" );
+XML_CONSTASCII_ACTION( sXML_background, "background" );
+XML_CONSTASCII_ACTION( sXML_background_color, "background-color" );
+XML_CONSTASCII_ACTION( sXML_background_image, "background-image" );
+XML_CONSTASCII_ACTION( sXML_background_no_repeat, "no-repeat" );
+XML_CONSTASCII_ACTION( sXML_background_objects_visible, "background-objects-visible" );
+XML_CONSTASCII_ACTION( sXML_background_repeat, "repeat" );
+XML_CONSTASCII_ACTION( sXML_background_stretch, "stretch" );
+XML_CONSTASCII_ACTION( sXML_background_visible, "background-visible" );
+XML_CONSTASCII_ACTION( sXML_bar, "bar" );
+XML_CONSTASCII_ACTION( sXML_base64Binary, "base64Binary");
+XML_CONSTASCII_ACTION( sXML_base_cell_address, "base-cell-address");
+XML_CONSTASCII_ACTION( sXML_baseline, "baseline" );
+XML_CONSTASCII_ACTION( sXML_before_date_time, "before-date-time" );
+XML_CONSTASCII_ACTION( sXML_below , "below" );
+XML_CONSTASCII_ACTION( sXML_between_date_times, "between-date-times" );
+XML_CONSTASCII_ACTION( sXML_bevel , "bevel" );
+XML_CONSTASCII_ACTION( sXML_bibiliographic_type, "bibiliographic-type" );
+XML_CONSTASCII_ACTION( sXML_bibliography, "bibliography" );
+XML_CONSTASCII_ACTION( sXML_bibliography_configuration, "bibliography-configuration" );
+XML_CONSTASCII_ACTION( sXML_bibliography_data_field, "bibliography-data-field" );
+XML_CONSTASCII_ACTION( sXML_bibliography_entry_template, "bibliography-entry-template" );
+XML_CONSTASCII_ACTION( sXML_bibliography_mark, "bibliography-mark" );
+XML_CONSTASCII_ACTION( sXML_bibliography_source, "bibliography-source" );
+XML_CONSTASCII_ACTION( sXML_bibliography_type, "bibliography-type" );
+XML_CONSTASCII_ACTION( sXML_bind_styles_to_content, "bind-styles-to-content");
+XML_CONSTASCII_ACTION( sXML_bitmap , "bitmap" );
+XML_CONSTASCII_ACTION( sXML_black, "black" );
+XML_CONSTASCII_ACTION( sXML_blend, "blend" );
+XML_CONSTASCII_ACTION( sXML_blinking, "blinking" );
+XML_CONSTASCII_ACTION( sXML_block, "block" );
+XML_CONSTASCII_ACTION( sXML_block_list, "block-list" );
+XML_CONSTASCII_ACTION( sXML_blue , "blue" );
+XML_CONSTASCII_ACTION( sXML_body, "body" );
+XML_CONSTASCII_ACTION( sXML_bold, "bold" );
+XML_CONSTASCII_ACTION( sXML_book, "book" );
+XML_CONSTASCII_ACTION( sXML_booklet, "booklet" );
+XML_CONSTASCII_ACTION( sXML_bookmark, "bookmark" );
+XML_CONSTASCII_ACTION( sXML_bookmark_end, "bookmark-end" );
+XML_CONSTASCII_ACTION( sXML_bookmark_ref, "bookmark-ref" );
+XML_CONSTASCII_ACTION( sXML_bookmark_start, "bookmark-start" );
+XML_CONSTASCII_ACTION( sXML_booktitle, "booktitle" );
+XML_CONSTASCII_ACTION( sXML_boolean, "boolean");
+XML_CONSTASCII_ACTION( sXML_boolean_style, "boolean-style" );
+XML_CONSTASCII_ACTION( sXML_boolean_value, "boolean-value");
+XML_CONSTASCII_ACTION( sXML_border, "border" );
+XML_CONSTASCII_ACTION( sXML_border_bottom, "border-bottom" );
+XML_CONSTASCII_ACTION( sXML_border_color, "border-color" );
+XML_CONSTASCII_ACTION( sXML_border_left, "border-left" );
+XML_CONSTASCII_ACTION( sXML_border_line_width, "border-line-width" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_bottom, "border-line-width-bottom" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_left, "border-line-width-left" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_right, "border-line-width-right" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_top, "border-line-width-top" );
+XML_CONSTASCII_ACTION( sXML_border_right, "border-right" );
+XML_CONSTASCII_ACTION( sXML_border_top, "border-top" );
+XML_CONSTASCII_ACTION( sXML_both, "both");
+XML_CONSTASCII_ACTION( sXML_bottom, "bottom" );
+XML_CONSTASCII_ACTION( sXML_bottom_percent, "bottom percent");
+XML_CONSTASCII_ACTION( sXML_bottom_values, "bottom values");
+XML_CONSTASCII_ACTION( sXML_break_after, "break-after" );
+XML_CONSTASCII_ACTION( sXML_break_before, "break-before" );
+XML_CONSTASCII_ACTION( sXML_break_inside, "break-inside" );
+XML_CONSTASCII_ACTION( sXML_bubble, "bubble" );
+XML_CONSTASCII_ACTION( sXML_bullet_char, "bullet-char" );
+XML_CONSTASCII_ACTION( sXML_bullet_relative_size, "bullet-relative-size" );
+XML_CONSTASCII_ACTION( sXML_buttons, "buttons");
+XML_CONSTASCII_ACTION( sXML_bvar, "bvar");
+XML_CONSTASCII_ACTION( sXML_c, "c" );
+XML_CONSTASCII_ACTION( sXML_cm, "cm" );
+XML_CONSTASCII_ACTION( sXML_calculation_settings, "calculation-settings" );
+XML_CONSTASCII_ACTION( sXML_calendar, "calendar" );
+XML_CONSTASCII_ACTION( sXML_capitalize_entries, "capitalize-entries" );
+XML_CONSTASCII_ACTION( sXML_caption, "caption" );
+XML_CONSTASCII_ACTION( sXML_caption_point_x, "caption-point-x" );
+XML_CONSTASCII_ACTION( sXML_caption_point_y, "caption-point-y" );
+XML_CONSTASCII_ACTION( sXML_caption_sequence_format, "caption-sequence-format" );
+XML_CONSTASCII_ACTION( sXML_caption_sequence_name, "caption-sequence-name" );
+XML_CONSTASCII_ACTION( sXML_case_sensitive, "case-sensitive");
+XML_CONSTASCII_ACTION( sXML_casemap_capitalize, "capitalize" );
+XML_CONSTASCII_ACTION( sXML_casemap_lowercase, "lowercase" );
+XML_CONSTASCII_ACTION( sXML_casemap_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_casemap_small_caps, "small-caps" );
+XML_CONSTASCII_ACTION( sXML_casemap_uppercase, "uppercase" );
+XML_CONSTASCII_ACTION( sXML_categories, "categories" );
+XML_CONSTASCII_ACTION( sXML_category, "category" );
+XML_CONSTASCII_ACTION( sXML_category_and_value, "category-and-value" );
+XML_CONSTASCII_ACTION( sXML_cell_address, "cell-address");
+XML_CONSTASCII_ACTION( sXML_cell_content_change, "cell-content-change");
+XML_CONSTASCII_ACTION( sXML_cell_content_deletion, "cell-content-deletion");
+XML_CONSTASCII_ACTION( sXML_cell_count, "cell-count");
+XML_CONSTASCII_ACTION( sXML_cell_protect, "cell-protect");
+XML_CONSTASCII_ACTION( sXML_cell_range_address, "cell-range-address");
+XML_CONSTASCII_ACTION( sXML_cell_range_address_list, "cell-range-address-list");
+XML_CONSTASCII_ACTION( sXML_cell_range_source, "cell-range-source");
+XML_CONSTASCII_ACTION( sXML_center, "center" );
+XML_CONSTASCII_ACTION( sXML_chain_next_name, "chain-next-name" );
+XML_CONSTASCII_ACTION( sXML_change, "change" );
+XML_CONSTASCII_ACTION( sXML_change_deletion, "change-deletion" );
+XML_CONSTASCII_ACTION( sXML_change_end, "change-end" );
+XML_CONSTASCII_ACTION( sXML_change_id, "change-id" );
+XML_CONSTASCII_ACTION( sXML_change_info, "change-info" );
+XML_CONSTASCII_ACTION( sXML_change_start, "change-start" );
+XML_CONSTASCII_ACTION( sXML_change_track_table_cell, "change-track-table-cell" );
+XML_CONSTASCII_ACTION( sXML_change_view_conditions, "change-view-conditions" );
+XML_CONSTASCII_ACTION( sXML_change_view_settings, "change-view-settings" );
+XML_CONSTASCII_ACTION( sXML_changed_region, "changed-region" );
+XML_CONSTASCII_ACTION( sXML_chapter, "chapter");
+XML_CONSTASCII_ACTION( sXML_char, "char" );
+XML_CONSTASCII_ACTION( sXML_character_count, "character-count" );
+XML_CONSTASCII_ACTION( sXML_chart, "chart" );
+XML_CONSTASCII_ACTION( sXML_charts, "charts" );
+XML_CONSTASCII_ACTION( sXML_chg_author, "chg-author" );
+XML_CONSTASCII_ACTION( sXML_chg_comment, "chg-comment" );
+XML_CONSTASCII_ACTION( sXML_chg_date_time, "chg-date-time" );
+XML_CONSTASCII_ACTION( sXML_ci, "ci" );
+XML_CONSTASCII_ACTION( sXML_circle, "circle" );
+XML_CONSTASCII_ACTION( sXML_citation_body_style_name, "citation-body-style-name" );
+XML_CONSTASCII_ACTION( sXML_citation_style_name, "citation-style-name" );
+XML_CONSTASCII_ACTION( sXML_class, "class" );
+XML_CONSTASCII_ACTION( sXML_class_id, "class-id" );
+XML_CONSTASCII_ACTION( sXML_clip, "clip" );
+XML_CONSTASCII_ACTION( sXML_clockwise, "clockwise" );
+XML_CONSTASCII_ACTION( sXML_close, "close" );
+XML_CONSTASCII_ACTION( sXML_close_horizontal, "close-horizontal" );
+XML_CONSTASCII_ACTION( sXML_close_vertical, "close-vertical" );
+XML_CONSTASCII_ACTION( sXML_cn, "cn" );
+XML_CONSTASCII_ACTION( sXML_code, "code" );
+XML_CONSTASCII_ACTION( sXML_codebase, "codebase" );
+XML_CONSTASCII_ACTION( sXML_collapse, "collapse" );
+XML_CONSTASCII_ACTION( sXML_color, "color" );
+XML_CONSTASCII_ACTION( sXML_color_inversion , "color-inversion" );
+XML_CONSTASCII_ACTION( sXML_color_mode , "color-mode" );
+XML_CONSTASCII_ACTION( sXML_column, "column" );
+XML_CONSTASCII_ACTION( sXML_column_count, "column-count" );
+XML_CONSTASCII_ACTION( sXML_column_gap, "column-gap" );
+XML_CONSTASCII_ACTION( sXML_column_name, "column-name" );
+XML_CONSTASCII_ACTION( sXML_column_sep, "column-sep" );
+XML_CONSTASCII_ACTION( sXML_column_width, "column-width" );
+XML_CONSTASCII_ACTION( sXML_columns, "columns" );
+XML_CONSTASCII_ACTION( sXML_columnsplit_auto, "auto" );
+XML_CONSTASCII_ACTION( sXML_columnsplit_avoid, "avoid" );
+XML_CONSTASCII_ACTION( sXML_combine_entries, "combine-entries" );
+XML_CONSTASCII_ACTION( sXML_combine_entries_with_dash, "combine-entries-with-dash" );
+XML_CONSTASCII_ACTION( sXML_combine_entries_with_pp, "combine-entries-with-pp" );
+XML_CONSTASCII_ACTION( sXML_comma_separated, "comma-separated" );
+XML_CONSTASCII_ACTION( sXML_command, "command" );
+XML_CONSTASCII_ACTION( sXML_comment, "comment" );
+XML_CONSTASCII_ACTION( sXML_compose, "compose" );
+XML_CONSTASCII_ACTION( sXML_cond_style_name, "cond-style-name" );
+XML_CONSTASCII_ACTION( sXML_condition, "condition" );
+XML_CONSTASCII_ACTION( sXML_condition_source, "condition-source");
+XML_CONSTASCII_ACTION( sXML_condition_source_range_address, "condition-source-range-address");
+XML_CONSTASCII_ACTION( sXML_conditional_text, "conditional-text" );
+XML_CONSTASCII_ACTION( sXML_cone, "cone" );
+XML_CONSTASCII_ACTION( sXML_conference, "conference" );
+XML_CONSTASCII_ACTION( sXML_config_item, "config-item" );
+XML_CONSTASCII_ACTION( sXML_config_item_map_indexed, "config-item-map-indexed" );
+XML_CONSTASCII_ACTION( sXML_config_item_map_named, "config-item-map-named" );
+XML_CONSTASCII_ACTION( sXML_config_item_map_entry, "config-item-map-entry" );
+XML_CONSTASCII_ACTION( sXML_config_item_set, "config-item-set" );
+XML_CONSTASCII_ACTION( sXML_configuration_settings, "configuration-settings" );
+XML_CONSTASCII_ACTION( sXML_conjugate, "conjugate" );
+XML_CONSTASCII_ACTION( sXML_connect_bars, "connect-bars" );
+XML_CONSTASCII_ACTION( sXML_connection_name, "connection-name" );
+XML_CONSTASCII_ACTION( sXML_connector, "connector" );
+XML_CONSTASCII_ACTION( sXML_consecutive_numbering, "consecutive-numbering" );
+XML_CONSTASCII_ACTION( sXML_consolidation, "consolidation" );
+XML_CONSTASCII_ACTION( sXML_constant, "constant" );
+XML_CONSTASCII_ACTION( sXML_contains_error, "contains-error");
+XML_CONSTASCII_ACTION( sXML_contains_header, "contains-header");
+XML_CONSTASCII_ACTION( sXML_content, "content" );
+XML_CONSTASCII_ACTION( sXML_content_validation, "content-validation");
+XML_CONSTASCII_ACTION( sXML_content_validation_name, "validation-name");
+XML_CONSTASCII_ACTION( sXML_content_validations, "content-validations");
+XML_CONSTASCII_ACTION( sXML_continue, "continue" );
+XML_CONSTASCII_ACTION( sXML_continue_numbering, "continue-numbering" );
+XML_CONSTASCII_ACTION( sXML_contour_path, "contour-path" );
+XML_CONSTASCII_ACTION( sXML_contour_polygon, "contour-polygon" );
+XML_CONSTASCII_ACTION( sXML_contrast , "contrast" );
+XML_CONSTASCII_ACTION( sXML_control, "control" );
+XML_CONSTASCII_ACTION( sXML_conversion_mode, "conversion-mode" );
+XML_CONSTASCII_ACTION( sXML_copy_back, "copy-back" );
+XML_CONSTASCII_ACTION( sXML_copy_formulas, "copy-formulas" );
+XML_CONSTASCII_ACTION( sXML_copy_outline_levels, "copy-outline-levels" );
+XML_CONSTASCII_ACTION( sXML_copy_results_only, "copy-results-only" );
+XML_CONSTASCII_ACTION( sXML_copy_styles, "copy-styles" );
+XML_CONSTASCII_ACTION( sXML_corner_radius , "corner-radius" );
+XML_CONSTASCII_ACTION( sXML_correct, "correct");
+XML_CONSTASCII_ACTION( sXML_cos, "cos" );
+XML_CONSTASCII_ACTION( sXML_cosh, "cosh" );
+XML_CONSTASCII_ACTION( sXML_cot, "cot" );
+XML_CONSTASCII_ACTION( sXML_coth, "coth" );
+XML_CONSTASCII_ACTION( sXML_count, "count" );
+XML_CONSTASCII_ACTION( sXML_count_empty_lines, "count-empty-lines" );
+XML_CONSTASCII_ACTION( sXML_count_in_floating_frames, "count-in-floating-frames" );
+XML_CONSTASCII_ACTION( sXML_counterclockwise, "counterclockwise" );
+XML_CONSTASCII_ACTION( sXML_countnums, "countnums" );
+XML_CONSTASCII_ACTION( sXML_country, "country" );
+XML_CONSTASCII_ACTION( sXML_country_asian, "country-asian" );
+XML_CONSTASCII_ACTION( sXML_country_complex, "country-complex" );
+XML_CONSTASCII_ACTION( sXML_covered_table_cell, "covered-table-cell" );
+XML_CONSTASCII_ACTION( sXML_create_date, "create-date" );
+XML_CONSTASCII_ACTION( sXML_create_date_string, "create-date-string" );
+XML_CONSTASCII_ACTION( sXML_creation_date, "creation-date" );
+XML_CONSTASCII_ACTION( sXML_creation_time, "creation-time" );
+XML_CONSTASCII_ACTION( sXML_creator, "creator" );
+XML_CONSTASCII_ACTION( sXML_crossedout_cross, "X" );
+XML_CONSTASCII_ACTION( sXML_crossedout_double, "double-line" );
+XML_CONSTASCII_ACTION( sXML_crossedout_none, "none" );
+XML_CONSTASCII_ACTION( sXML_crossedout_single, "single-line" );
+XML_CONSTASCII_ACTION( sXML_crossedout_slash, "slash" );
+XML_CONSTASCII_ACTION( sXML_crossedout_thick, "thick-line" );
+XML_CONSTASCII_ACTION( sXML_csc, "csc" );
+XML_CONSTASCII_ACTION( sXML_csch, "csch" );
+XML_CONSTASCII_ACTION( sXML_cube, "cube" );
+XML_CONSTASCII_ACTION( sXML_cuboid, "cuboid" );
+XML_CONSTASCII_ACTION( sXML_currency, "currency");
+XML_CONSTASCII_ACTION( sXML_currency_style, "currency-style" );
+XML_CONSTASCII_ACTION( sXML_currency_symbol, "currency-symbol" );
+XML_CONSTASCII_ACTION( sXML_current, "current" );
+XML_CONSTASCII_ACTION( sXML_current_value, "current-value" );
+XML_CONSTASCII_ACTION( sXML_cursor_position, "cursor-position" );
+XML_CONSTASCII_ACTION( sXML_cursor_position_x, "cursor-position-x" );
+XML_CONSTASCII_ACTION( sXML_cursor_position_y, "cursor-position-y" );
+XML_CONSTASCII_ACTION( sXML_custom1, "custom1" );
+XML_CONSTASCII_ACTION( sXML_custom2, "custom2" );
+XML_CONSTASCII_ACTION( sXML_custom3, "custom3" );
+XML_CONSTASCII_ACTION( sXML_custom4, "custom4" );
+XML_CONSTASCII_ACTION( sXML_custom5, "custom5" );
+XML_CONSTASCII_ACTION( sXML_cut_offs, "cut_offs" );
+XML_CONSTASCII_ACTION( sXML_cx, "cx" );
+XML_CONSTASCII_ACTION( sXML_cy, "cy" );
+XML_CONSTASCII_ACTION( sXML_cylinder, "cylinder" );
+XML_CONSTASCII_ACTION( sXML_d, "d" );
+XML_CONSTASCII_ACTION( sXML_dash, "dash" );
+XML_CONSTASCII_ACTION( sXML_dashed, "dashed" );
+XML_CONSTASCII_ACTION( sXML_data, "data");
+XML_CONSTASCII_ACTION( sXML_data_cell_range_address, "data-cell-range-address" );
+XML_CONSTASCII_ACTION( sXML_data_label_number, "data-label-number" );
+XML_CONSTASCII_ACTION( sXML_data_label_symbol, "data-label-symbol" );
+XML_CONSTASCII_ACTION( sXML_data_label_text, "data-label-text" );
+XML_CONSTASCII_ACTION( sXML_data_pilot_field, "data-pilot-field");
+XML_CONSTASCII_ACTION( sXML_data_pilot_level, "data-pilot-level");
+XML_CONSTASCII_ACTION( sXML_data_pilot_member, "data-pilot-member");
+XML_CONSTASCII_ACTION( sXML_data_pilot_members, "data-pilot-members");
+XML_CONSTASCII_ACTION( sXML_data_pilot_subtotal, "data-pilot-subtotal");
+XML_CONSTASCII_ACTION( sXML_data_pilot_subtotals, "data-pilot-subtotals");
+XML_CONSTASCII_ACTION( sXML_data_pilot_table, "data-pilot-table");
+XML_CONSTASCII_ACTION( sXML_data_pilot_tables, "data-pilot-tables");
+XML_CONSTASCII_ACTION( sXML_data_point, "data-point" );
+XML_CONSTASCII_ACTION( sXML_data_style, "data-style" );
+XML_CONSTASCII_ACTION( sXML_data_style_name, "data-style-name" );
+XML_CONSTASCII_ACTION( sXML_data_type, "data-type");
+XML_CONSTASCII_ACTION( sXML_database_display, "database-display" );
+XML_CONSTASCII_ACTION( sXML_database_name, "database-name");
+XML_CONSTASCII_ACTION( sXML_database_next, "database-next" );
+XML_CONSTASCII_ACTION( sXML_database_range, "database-range");
+XML_CONSTASCII_ACTION( sXML_database_ranges, "database-ranges");
+XML_CONSTASCII_ACTION( sXML_database_row_number, "database-row-number" );
+XML_CONSTASCII_ACTION( sXML_database_select, "database-select" );
+XML_CONSTASCII_ACTION( sXML_database_source_query, "database-source-query");
+XML_CONSTASCII_ACTION( sXML_database_source_sql, "database-source-sql");
+XML_CONSTASCII_ACTION( sXML_database_source_table, "database-source-table");
+XML_CONSTASCII_ACTION( sXML_date, "date" );
+XML_CONSTASCII_ACTION( sXML_datetime, "datetime" );
+XML_CONSTASCII_ACTION( sXML_date_adjust, "date-adjust" );
+XML_CONSTASCII_ACTION( sXML_date_style, "date-style" );
+XML_CONSTASCII_ACTION( sXML_date_time, "date-time" );
+XML_CONSTASCII_ACTION( sXML_date_value, "date-value");
+XML_CONSTASCII_ACTION( sXML_day, "day" );
+XML_CONSTASCII_ACTION( sXML_day_of_week, "day-of-week" );
+XML_CONSTASCII_ACTION( sXML_dde_application, "dde-application" );
+XML_CONSTASCII_ACTION( sXML_dde_connection, "dde-connection" );
+XML_CONSTASCII_ACTION( sXML_dde_connection_decl, "dde-connection-decl" );
+XML_CONSTASCII_ACTION( sXML_dde_connection_decls, "dde-connection-decls" );
+XML_CONSTASCII_ACTION( sXML_dde_item, "dde-item" );
+XML_CONSTASCII_ACTION( sXML_dde_link, "dde-link" );
+XML_CONSTASCII_ACTION( sXML_dde_links, "dde-links" );
+XML_CONSTASCII_ACTION( sXML_dde_source, "dde-source" );
+XML_CONSTASCII_ACTION( sXML_dde_topic, "dde-topic" );
+XML_CONSTASCII_ACTION( sXML_decimal_places, "decimal-places" );
+XML_CONSTASCII_ACTION( sXML_decimal_replacement, "decimal-replacement" );
+XML_CONSTASCII_ACTION( sXML_declare, "declare" );
+XML_CONSTASCII_ACTION( sXML_decorate_words_only, "decorate-words-only" );
+XML_CONSTASCII_ACTION( sXML_decorative, "decorative" );
+XML_CONSTASCII_ACTION( sXML_deep, "deep" );
+XML_CONSTASCII_ACTION( sXML_default, "default" );
+XML_CONSTASCII_ACTION( sXML_default_cell_style_name, "default-cell-style-name" );
+XML_CONSTASCII_ACTION( sXML_default_style, "default-style" );
+XML_CONSTASCII_ACTION( sXML_default_style_name, "default-style-name" );
+XML_CONSTASCII_ACTION( sXML_degree, "degree" );
+XML_CONSTASCII_ACTION( sXML_delay, "delay" );
+XML_CONSTASCII_ACTION( sXML_deletion, "deletion" );
+XML_CONSTASCII_ACTION( sXML_deletions, "deletions" );
+XML_CONSTASCII_ACTION( sXML_depth, "depth" );
+XML_CONSTASCII_ACTION( sXML_desc, "desc" );
+XML_CONSTASCII_ACTION( sXML_descending, "descending");
+XML_CONSTASCII_ACTION( sXML_description, "description" );
+XML_CONSTASCII_ACTION( sXML_detective, "detective" );
+XML_CONSTASCII_ACTION( sXML_determinant, "determinant" );
+XML_CONSTASCII_ACTION( sXML_diff, "diff");
+XML_CONSTASCII_ACTION( sXML_diffuse_color, "diffuse-color" );
+XML_CONSTASCII_ACTION( sXML_dependences, "dependences");
+XML_CONSTASCII_ACTION( sXML_dependence, "dependence");
+XML_CONSTASCII_ACTION( sXML_direction, "direction");
+XML_CONSTASCII_ACTION( sXML_disabled, "disabled" );
+XML_CONSTASCII_ACTION( sXML_disc, "disc" );
+XML_CONSTASCII_ACTION( sXML_display, "display" );
+XML_CONSTASCII_ACTION( sXML_display_border, "display-border");
+XML_CONSTASCII_ACTION( sXML_display_details, "display-details");
+XML_CONSTASCII_ACTION( sXML_display_duplicates, "display-duplicates");
+XML_CONSTASCII_ACTION( sXML_display_empty, "display-empty");
+XML_CONSTASCII_ACTION( sXML_display_filter_buttons, "display-filter-buttons");
+XML_CONSTASCII_ACTION( sXML_display_formula, "display-formula" );
+XML_CONSTASCII_ACTION( sXML_display_label, "display-label" );
+XML_CONSTASCII_ACTION( sXML_display_levels, "display-levels" );
+XML_CONSTASCII_ACTION( sXML_display_name, "display-name" );
+XML_CONSTASCII_ACTION( sXML_display_outline_level, "display-outline-level" );
+XML_CONSTASCII_ACTION( sXML_dissolve, "dissolve" );
+XML_CONSTASCII_ACTION( sXML_distance, "distance" );
+XML_CONSTASCII_ACTION( sXML_distribute_letter, "distribute-letter" );
+XML_CONSTASCII_ACTION( sXML_distribute_space, "distribute-space" );
+XML_CONSTASCII_ACTION( sXML_divide, "divide" );
+XML_CONSTASCII_ACTION( sXML_document, "document" );
+XML_CONSTASCII_ACTION( sXML_document_content, "document-content" );
+XML_CONSTASCII_ACTION( sXML_document_meta, "document-meta" );
+XML_CONSTASCII_ACTION( sXML_document_settings, "document-settings" );
+XML_CONSTASCII_ACTION( sXML_document_styles, "document-styles" );
+XML_CONSTASCII_ACTION( sXML_document_statistic, "document-statistic" );
+XML_CONSTASCII_ACTION( sXML_domain, "domain" );
+XML_CONSTASCII_ACTION( sXML_dot, "dot" );
+XML_CONSTASCII_ACTION( sXML_dotted, "dotted" );
+XML_CONSTASCII_ACTION( sXML_double, "double" );
+XML_CONSTASCII_ACTION( sXML_double_sided, "double-sided" );
+XML_CONSTASCII_ACTION( sXML_down, "down" );
+XML_CONSTASCII_ACTION( sXML_draft, "draft");
+XML_CONSTASCII_ACTION( sXML_draw, "draw" );
+XML_CONSTASCII_ACTION( sXML_draw_aspect, "ole-draw-aspect" );
+XML_CONSTASCII_ACTION( sXML_drawing, "drawing" );
+XML_CONSTASCII_ACTION( sXML_drawings, "drawings" );
+XML_CONSTASCII_ACTION( sXML_drawpool , "drawpool" );
+XML_CONSTASCII_ACTION( sXML_drop_cap, "drop-cap" );
+XML_CONSTASCII_ACTION( sXML_dynamic, "dynamic" );
+XML_CONSTASCII_ACTION( sXML_edge_rounding, "edge-rounding" );
+XML_CONSTASCII_ACTION( sXML_editable, "editable" );
+XML_CONSTASCII_ACTION( sXML_editing_cycles, "editing-cycles" );
+XML_CONSTASCII_ACTION( sXML_editing_duration, "editing-duration" );
+XML_CONSTASCII_ACTION( sXML_edition, "edition" );
+XML_CONSTASCII_ACTION( sXML_editor, "editor" );
+XML_CONSTASCII_ACTION( sXML_ellipse , "ellipse" );
+XML_CONSTASCII_ACTION( sXML_email, "email" );
+XML_CONSTASCII_ACTION( sXML_embed, "embed" );
+XML_CONSTASCII_ACTION( sXML_embedded_visible_area, "embedded-visible-area" );
+XML_CONSTASCII_ACTION( sXML_embossed, "embossed" );
+XML_CONSTASCII_ACTION( sXML_emissive_color, "emissive-color" );
+XML_CONSTASCII_ACTION( sXML_empty, "empty");
+XML_CONSTASCII_ACTION( sXML_enabled, "enabled" );
+XML_CONSTASCII_ACTION( sXML_encoding, "encoding" );
+XML_CONSTASCII_ACTION( sXML_end, "end" );
+XML_CONSTASCII_ACTION( sXML_end_angle, "end-angle" );
+XML_CONSTASCII_ACTION( sXML_end_cell_address, "end-cell-address" );
+XML_CONSTASCII_ACTION( sXML_end_color, "end-color" );
+XML_CONSTASCII_ACTION( sXML_end_column, "end-column" );
+XML_CONSTASCII_ACTION( sXML_end_intensity, "end-intensity" );
+XML_CONSTASCII_ACTION( sXML_end_position, "end-position" );
+XML_CONSTASCII_ACTION( sXML_end_row, "end-row" );
+XML_CONSTASCII_ACTION( sXML_end_table, "end-table" );
+XML_CONSTASCII_ACTION( sXML_end_x, "end-x" );
+XML_CONSTASCII_ACTION( sXML_end_y, "end-y" );
+XML_CONSTASCII_ACTION( sXML_endless, "endless" );
+XML_CONSTASCII_ACTION( sXML_endnote, "endnote" );
+XML_CONSTASCII_ACTION( sXML_endnote_body, "endnote-body" );
+XML_CONSTASCII_ACTION( sXML_endnote_citation, "endnote-citation" );
+XML_CONSTASCII_ACTION( sXML_endnote_ref, "endnote-ref" );
+XML_CONSTASCII_ACTION( sXML_endnotes_configuration, "endnotes-configuration");
+XML_CONSTASCII_ACTION( sXML_engraved, "engraved" );
+XML_CONSTASCII_ACTION( sXML_eq, "eq");
+XML_CONSTASCII_ACTION( sXML_equal_author, "equal-author");
+XML_CONSTASCII_ACTION( sXML_equal_comment, "equal-comment");
+XML_CONSTASCII_ACTION( sXML_equal_date, "equal-date");
+XML_CONSTASCII_ACTION( sXML_era, "era" );
+XML_CONSTASCII_ACTION( sXML_ergo_sum, "ergo-sum" );
+XML_CONSTASCII_ACTION( sXML_error_category, "error-category" );
+XML_CONSTASCII_ACTION( sXML_error_lower_indicator, "error-lower-indicator" );
+XML_CONSTASCII_ACTION( sXML_error_lower_limit, "error-lower-limit" );
+XML_CONSTASCII_ACTION( sXML_error_macro, "error-macro" );
+XML_CONSTASCII_ACTION( sXML_error_margin, "error-margin" );
+XML_CONSTASCII_ACTION( sXML_error_message, "error-message" );
+XML_CONSTASCII_ACTION( sXML_error_percentage, "error-percentage" );
+XML_CONSTASCII_ACTION( sXML_error_upper_indicator, "error-upper-indicator" );
+XML_CONSTASCII_ACTION( sXML_error_upper_limit, "error-upper-limit" );
+XML_CONSTASCII_ACTION( sXML_escapement_sub, "sub" );
+XML_CONSTASCII_ACTION( sXML_escapement_super, "super" );
+XML_CONSTASCII_ACTION( sXML_even_page, "even-page" );
+XML_CONSTASCII_ACTION( sXML_event, "event" );
+XML_CONSTASCII_ACTION( sXML_event_name, "event-name" );
+XML_CONSTASCII_ACTION( sXML_events, "events" );
+XML_CONSTASCII_ACTION( sXML_execute, "execute" );
+XML_CONSTASCII_ACTION( sXML_execute_macro, "execute-macro" );
+XML_CONSTASCII_ACTION( sXML_exists, "exists" );
+XML_CONSTASCII_ACTION( sXML_exp, "exp" );
+XML_CONSTASCII_ACTION( sXML_exponential, "exponential" );
+XML_CONSTASCII_ACTION( sXML_expression, "expression");
+XML_CONSTASCII_ACTION( sXML_extra, "extra");
+XML_CONSTASCII_ACTION( sXML_extrude, "extrude" );
+XML_CONSTASCII_ACTION( sXML_factorial, "factorial" );
+XML_CONSTASCII_ACTION( sXML_fade_from_bottom, "fade-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_fade_from_center, "fade-from-center" );
+XML_CONSTASCII_ACTION( sXML_fade_from_left, "fade-from-left" );
+XML_CONSTASCII_ACTION( sXML_fade_from_lowerleft, "fade-from-lowerleft" );
+XML_CONSTASCII_ACTION( sXML_fade_from_lowerright, "fade-from-lowerright" );
+XML_CONSTASCII_ACTION( sXML_fade_from_right, "fade-from-right" );
+XML_CONSTASCII_ACTION( sXML_fade_from_top, "fade-from-top" );
+XML_CONSTASCII_ACTION( sXML_fade_from_upperleft, "fade-from-upperleft" );
+XML_CONSTASCII_ACTION( sXML_fade_from_upperright, "fade-from-upperright" );
+XML_CONSTASCII_ACTION( sXML_fade_to_center, "fade-to-center" );
+XML_CONSTASCII_ACTION( sXML_fade_out, "fade-out" );
+XML_CONSTASCII_ACTION( sXML_false, "false" );
+XML_CONSTASCII_ACTION( sXML_family, "family" );
+XML_CONSTASCII_ACTION( sXML_fast, "fast" );
+XML_CONSTASCII_ACTION( sXML_field_number, "field-number");
+XML_CONSTASCII_ACTION( sXML_file_name, "file-name" );
+XML_CONSTASCII_ACTION( sXML_fill, "fill" );
+XML_CONSTASCII_ACTION( sXML_fill_color , "fill-color" );
+XML_CONSTASCII_ACTION( sXML_fill_gradient_name, "fill-gradient-name" );
+XML_CONSTASCII_ACTION( sXML_fill_hatch_name, "fill-hatch-name" );
+XML_CONSTASCII_ACTION( sXML_fill_hatch_solid, "fill-hatch-solid" );
+XML_CONSTASCII_ACTION( sXML_fill_image, "fill-image" );
+XML_CONSTASCII_ACTION( sXML_fill_image_height, "fill-image-height" );
+XML_CONSTASCII_ACTION( sXML_fill_image_name, "fill-image-name" );
+XML_CONSTASCII_ACTION( sXML_fill_image_width, "fill-image-width" );
+XML_CONSTASCII_ACTION( sXML_filter, "filter");
+XML_CONSTASCII_ACTION( sXML_filter_and, "filter-and");
+XML_CONSTASCII_ACTION( sXML_filter_condition, "filter-condition");
+XML_CONSTASCII_ACTION( sXML_filter_name, "filter-name" );
+XML_CONSTASCII_ACTION( sXML_filter_options, "filter-options" );
+XML_CONSTASCII_ACTION( sXML_filter_or, "filter-or");
+XML_CONSTASCII_ACTION( sXML_first_date_time, "first-date-time");
+XML_CONSTASCII_ACTION( sXML_first_page, "first-page");
+XML_CONSTASCII_ACTION( sXML_first_page_number, "first-page-number");
+XML_CONSTASCII_ACTION( sXML_fit_to_contour, "fit-to-contour");
+XML_CONSTASCII_ACTION( sXML_fit_to_size, "fit-to-size" );
+XML_CONSTASCII_ACTION( sXML_fix, "fix" );
+XML_CONSTASCII_ACTION( sXML_fixed, "fixed" );
+XML_CONSTASCII_ACTION( sXML_flat, "flat" );
+XML_CONSTASCII_ACTION( sXML_float, "float");
+XML_CONSTASCII_ACTION( sXML_floating_frame, "floating-frame");
+XML_CONSTASCII_ACTION( sXML_floor, "floor" );
+XML_CONSTASCII_ACTION( sXML_fn, "fn" );
+XML_CONSTASCII_ACTION( sXML_focal_length, "focal-length");
+XML_CONSTASCII_ACTION( sXML_font_char_width, "font-char-width" );
+XML_CONSTASCII_ACTION( sXML_font_charset, "font-charset" );
+XML_CONSTASCII_ACTION( sXML_font_charset_asian, "font-charset-asian" );
+XML_CONSTASCII_ACTION( sXML_font_charset_complex, "font-charset-complex" );
+XML_CONSTASCII_ACTION( sXML_font_color, "font-color" );
+XML_CONSTASCII_ACTION( sXML_font_decl, "font-decl" );
+XML_CONSTASCII_ACTION( sXML_font_decls, "font-decls" );
+XML_CONSTASCII_ACTION( sXML_font_family, "font-family" );
+XML_CONSTASCII_ACTION( sXML_font_family_asian, "font-family-asian" );
+XML_CONSTASCII_ACTION( sXML_font_family_complex, "font-family-complex" );
+XML_CONSTASCII_ACTION( sXML_font_family_generic, "font-family-generic" );
+XML_CONSTASCII_ACTION( sXML_font_family_generic_asian, "font-family-generic-asian" );
+XML_CONSTASCII_ACTION( sXML_font_family_generic_complex, "font-family-generic-complex" );
+XML_CONSTASCII_ACTION( sXML_font_kerning, "font-kerning" );
+XML_CONSTASCII_ACTION( sXML_font_name, "font-name" );
+XML_CONSTASCII_ACTION( sXML_font_name_asian, "font-name-asian" );
+XML_CONSTASCII_ACTION( sXML_font_name_complex, "font-name-complex" );
+XML_CONSTASCII_ACTION( sXML_font_pitch, "font-pitch" );
+XML_CONSTASCII_ACTION( sXML_font_pitch_asian, "font-pitch-asian" );
+XML_CONSTASCII_ACTION( sXML_font_pitch_complex, "font-pitch-complex" );
+XML_CONSTASCII_ACTION( sXML_font_relief, "font-relief" );
+XML_CONSTASCII_ACTION( sXML_font_size, "font-size" );
+XML_CONSTASCII_ACTION( sXML_font_size_asian, "font-size-asian" );
+XML_CONSTASCII_ACTION( sXML_font_size_complex, "font-size-complex" );
+XML_CONSTASCII_ACTION( sXML_font_size_rel, "font-size-rel" );
+XML_CONSTASCII_ACTION( sXML_font_size_rel_asian, "font-size-rel-asian" );
+XML_CONSTASCII_ACTION( sXML_font_size_rel_complex, "font-size-rel-complex" );
+XML_CONSTASCII_ACTION( sXML_font_style, "font-style" );
+XML_CONSTASCII_ACTION( sXML_font_style_asian, "font-style-asian" );
+XML_CONSTASCII_ACTION( sXML_font_style_complex, "font-style-complex" );
+XML_CONSTASCII_ACTION( sXML_font_style_name, "font-style-name" );
+XML_CONSTASCII_ACTION( sXML_font_style_name_asian, "font-style-name-asian" );
+XML_CONSTASCII_ACTION( sXML_font_style_name_complex, "font-style-name-complex" );
+XML_CONSTASCII_ACTION( sXML_font_variant, "font-variant" );
+XML_CONSTASCII_ACTION( sXML_font_weight, "font-weight" );
+XML_CONSTASCII_ACTION( sXML_font_weight_asian, "font-weight-asian" );
+XML_CONSTASCII_ACTION( sXML_font_weight_complex, "font-weight-complex" );
+XML_CONSTASCII_ACTION( sXML_font_width, "font-width" );
+XML_CONSTASCII_ACTION( sXML_font_word_line_mode, "font-word-line-mode" );
+XML_CONSTASCII_ACTION( sXML_fontfamily, "fontfamily" );
+XML_CONSTASCII_ACTION( sXML_fontsize, "fontsize" );
+XML_CONSTASCII_ACTION( sXML_fontstyle, "fontstyle" );
+XML_CONSTASCII_ACTION( sXML_fontweight, "fontweight" );
+XML_CONSTASCII_ACTION( sXML_fontwork_adjust, "fontwork-adjust" );
+XML_CONSTASCII_ACTION( sXML_fontwork_distance, "fontwork-distance" );
+XML_CONSTASCII_ACTION( sXML_fontwork_form, "fontwork-form" );
+XML_CONSTASCII_ACTION( sXML_fontwork_hide_form, "fontwork-hide-form" );
+XML_CONSTASCII_ACTION( sXML_fontwork_mirror, "fontwork-mirror" );
+XML_CONSTASCII_ACTION( sXML_fontwork_outline, "fontwork-outline" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow, "fontwork-shadow" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_color, "fontwork-shadow-color" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_offset_x, "fontwork-shadow-offset-x" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_offset_y, "fontwork-shadow-offset-y" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_transparence, "fontwork-shadow-transparence" );
+XML_CONSTASCII_ACTION( sXML_fontwork_start, "fontwork-start" );
+XML_CONSTASCII_ACTION( sXML_fontwork_style, "fontwork-style" );
+XML_CONSTASCII_ACTION( sXML_footer, "footer" );
+XML_CONSTASCII_ACTION( sXML_footer_left, "footer-left" );
+XML_CONSTASCII_ACTION( sXML_footer_style, "footer-style" );
+XML_CONSTASCII_ACTION( sXML_footnote, "footnote" );
+XML_CONSTASCII_ACTION( sXML_footnote_body, "footnote-body" );
+XML_CONSTASCII_ACTION( sXML_footnote_citation, "footnote-citation" );
+XML_CONSTASCII_ACTION( sXML_footnote_continuation_notice_backward, "footnote-continuation-notice-backward" );
+XML_CONSTASCII_ACTION( sXML_footnote_continuation_notice_forward, "footnote-continuation-notice-forward" );
+XML_CONSTASCII_ACTION( sXML_footnote_max_height, "footnote-max-height" );
+XML_CONSTASCII_ACTION( sXML_distance_after_sep, "distance-after-sep" );
+XML_CONSTASCII_ACTION( sXML_distance_before_sep, "distance-before-sep" );
+XML_CONSTASCII_ACTION( sXML_footnote_ref, "footnote-ref" );
+XML_CONSTASCII_ACTION( sXML_footnote_sep, "footnote-sep" );
+XML_CONSTASCII_ACTION( sXML_footnotes_configuration, "footnotes-configuration");
+XML_CONSTASCII_ACTION( sXML_footnotes_position, "footnotes-position" );
+XML_CONSTASCII_ACTION( sXML_forall, "forall" );
+XML_CONSTASCII_ACTION( sXML_force_manual, "force-manual" );
+XML_CONSTASCII_ACTION( sXML_foreground, "foreground" );
+XML_CONSTASCII_ACTION( sXML_foreign_object, "foreign-object" );
+XML_CONSTASCII_ACTION( sXML_format_change, "format-change" );
+XML_CONSTASCII_ACTION( sXML_format_source, "format-source" );
+XML_CONSTASCII_ACTION( sXML_forms, "forms" );
+XML_CONSTASCII_ACTION( sXML_formula, "formula");
+XML_CONSTASCII_ACTION( sXML_formula_hidden, "formula-hidden");
+XML_CONSTASCII_ACTION( sXML_formulas, "formulas");
+XML_CONSTASCII_ACTION( sXML_fraction, "fraction" );
+XML_CONSTASCII_ACTION( sXML_frame, "frame" );
+XML_CONSTASCII_ACTION( sXML_frame_content, "frame-content" );
+XML_CONSTASCII_ACTION( sXML_frame_display_scrollbar, "frame-display-scrollbar" );
+XML_CONSTASCII_ACTION( sXML_frame_display_border, "frame-display-border" );
+XML_CONSTASCII_ACTION( sXML_frame_margin_horizontal, "frame-margin-horizontal" );
+XML_CONSTASCII_ACTION( sXML_frame_margin_vertical, "frame-margin-vertical" );
+XML_CONSTASCII_ACTION( sXML_frame_end_margin, "frame-end-margin" );
+XML_CONSTASCII_ACTION( sXML_frame_name, "frame-name" );
+XML_CONSTASCII_ACTION( sXML_frame_start_margin, "frame-start-margin" );
+XML_CONSTASCII_ACTION( sXML_freeze, "freeze" );
+XML_CONSTASCII_ACTION( sXML_freeze_position, "freeze-position" );
+XML_CONSTASCII_ACTION( sXML_from_another_table, "from-another-table" );
+XML_CONSTASCII_ACTION( sXML_from_inside, "from-inside" );
+XML_CONSTASCII_ACTION( sXML_from_left, "from-left" );
+XML_CONSTASCII_ACTION( sXML_from_same_table, "from-same-table" );
+XML_CONSTASCII_ACTION( sXML_from_top, "from-top" );
+XML_CONSTASCII_ACTION( sXML_fuchsia, "fuchsia");
+XML_CONSTASCII_ACTION( sXML_full, "full" );
+XML_CONSTASCII_ACTION( sXML_full_screen, "full-screen" );
+XML_CONSTASCII_ACTION( sXML_function, "function");
+XML_CONSTASCII_ACTION( sXML_g , "g" );
+XML_CONSTASCII_ACTION( sXML_gamma , "gamma" );
+XML_CONSTASCII_ACTION( sXML_gap, "gap" );
+XML_CONSTASCII_ACTION( sXML_gap_width, "gap-width" );
+XML_CONSTASCII_ACTION( sXML_gcd, "gcd" );
+XML_CONSTASCII_ACTION( sXML_generator, "generator" );
+XML_CONSTASCII_ACTION( sXML_geq, "geq" );
+XML_CONSTASCII_ACTION( sXML_gouraud, "gouraud");
+XML_CONSTASCII_ACTION( sXML_gradient , "gradient" );
+XML_CONSTASCII_ACTION( sXML_gradient_angle, "angle" );
+XML_CONSTASCII_ACTION( sXML_gradient_border, "border" );
+XML_CONSTASCII_ACTION( sXML_gradient_step_count , "gradient-step-count" );
+XML_CONSTASCII_ACTION( sXML_gradient_style, "gradient-style" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_axial, "axial" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_ellipsoid, "ellipsoid" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_linear, "linear" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_radial, "radial" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_rectangular, "rectangular" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_square, "square" );
+XML_CONSTASCII_ACTION( sXML_grand_total, "grand-total");
+XML_CONSTASCII_ACTION( sXML_graphic , "graphic" );
+XML_CONSTASCII_ACTION( sXML_gray, "gray" );
+XML_CONSTASCII_ACTION( sXML_green , "green" );
+XML_CONSTASCII_ACTION( sXML_greyscale, "greyscale" );
+XML_CONSTASCII_ACTION( sXML_grid, "grid" );
+XML_CONSTASCII_ACTION( sXML_groove, "groove" );
+XML_CONSTASCII_ACTION( sXML_group_by_field_number, "group-by-field-number");
+XML_CONSTASCII_ACTION( sXML_group_name, "group-name" );
+XML_CONSTASCII_ACTION( sXML_grouping, "grouping" );
+XML_CONSTASCII_ACTION( sXML_gt, "gt" );
+XML_CONSTASCII_ACTION( sXML_h, "h" );
+XML_CONSTASCII_ACTION( sXML_hanging, "hanging" );
+XML_CONSTASCII_ACTION( sXML_has_persistent_data, "has-persistent-data");
+XML_CONSTASCII_ACTION( sXML_hatch , "hatch" );
+XML_CONSTASCII_ACTION( sXML_hatch_distance, "distance" );
+XML_CONSTASCII_ACTION( sXML_hatch_style, "style" );
+XML_CONSTASCII_ACTION( sXML_hatchstyle_double, "double" );
+XML_CONSTASCII_ACTION( sXML_hatchstyle_single, "single" );
+XML_CONSTASCII_ACTION( sXML_hatchstyle_triple, "triple" );
+XML_CONSTASCII_ACTION( sXML_header, "header" );
+XML_CONSTASCII_ACTION( sXML_header_left, "header-left" );
+XML_CONSTASCII_ACTION( sXML_header_style, "header-style" );
+XML_CONSTASCII_ACTION( sXML_headers, "headers" );
+XML_CONSTASCII_ACTION( sXML_height, "height" );
+XML_CONSTASCII_ACTION( sXML_help_file_name, "help-file-name" );
+XML_CONSTASCII_ACTION( sXML_help_id, "help-id" );
+XML_CONSTASCII_ACTION( sXML_help_message, "help-message" );
+XML_CONSTASCII_ACTION( sXML_hidden, "hidden" );
+XML_CONSTASCII_ACTION( sXML_hidden_and_protected, "hidden-and-protected");
+XML_CONSTASCII_ACTION( sXML_hidden_paragraph, "hidden-paragraph" );
+XML_CONSTASCII_ACTION( sXML_hidden_text, "hidden-text" );
+XML_CONSTASCII_ACTION( sXML_highlighted_range, "highlighted-range" );
+XML_CONSTASCII_ACTION( sXML_horizontal, "horizontal" );
+XML_CONSTASCII_ACTION( sXML_horizontal_lines, "horizontal-lines" );
+XML_CONSTASCII_ACTION( sXML_horizontal_on_left_pages, "horizontal-on-left-pages" );
+XML_CONSTASCII_ACTION( sXML_horizontal_on_right_pages, "horizontal-on-right-pages" );
+XML_CONSTASCII_ACTION( sXML_horizontal_pos, "horizontal-pos" );
+XML_CONSTASCII_ACTION( sXML_horizontal_rel, "horizontal-rel" );
+XML_CONSTASCII_ACTION( sXML_horizontal_scrollbar_width, "horizontal-scrollbar-width" );
+XML_CONSTASCII_ACTION( sXML_horizontal_segments, "horizontal-segments" );
+XML_CONSTASCII_ACTION( sXML_horizontal_split_mode, "horizontal-split-mode" );
+XML_CONSTASCII_ACTION( sXML_horizontal_split_position, "horizontal-split-position" );
+XML_CONSTASCII_ACTION( sXML_horizontal_stripes, "horizontal-stripes" );
+XML_CONSTASCII_ACTION( sXML_hours, "hours" );
+XML_CONSTASCII_ACTION( sXML_howpublished, "howpublished" );
+XML_CONSTASCII_ACTION( sXML_href, "href" );
+XML_CONSTASCII_ACTION( sXML_html, "html");
+XML_CONSTASCII_ACTION( sXML_hyperlink_behaviour, "hyperlink-behaviour" );
+XML_CONSTASCII_ACTION( sXML_hyphenate, "hyphenate" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_keep, "hyphenation-keep" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_ladder_count, "hyphenation-ladder-count" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_push_char_count, "hyphenation-push-char-count" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_remain_char_count, "hyphenation-remain-char-count" );
+XML_CONSTASCII_ACTION( sXML_i, "i" );
+XML_CONSTASCII_ACTION( sXML_icon, "icon" );
+XML_CONSTASCII_ACTION( sXML_id, "id" );
+XML_CONSTASCII_ACTION( sXML_ident, "ident");
+XML_CONSTASCII_ACTION( sXML_identifier, "identifier" );
+XML_CONSTASCII_ACTION( sXML_identify_categories, "identify-categories");
+XML_CONSTASCII_ACTION( sXML_ideograph_alpha, "ideograph-alpha");
+XML_CONSTASCII_ACTION( sXML_ignore_case, "ignore-case" );
+XML_CONSTASCII_ACTION( sXML_ignore_empty_rows, "ignore-empty-rows");
+XML_CONSTASCII_ACTION( sXML_illustration_index, "illustration-index" );
+XML_CONSTASCII_ACTION( sXML_illustration_index_entry_template, "illustration-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_illustration_index_source, "illustration-index-source" );
+XML_CONSTASCII_ACTION( sXML_image, "image" );
+XML_CONSTASCII_ACTION( sXML_image_count, "image-count" );
+XML_CONSTASCII_ACTION( sXML_image_map, "image-map" );
+XML_CONSTASCII_ACTION( sXML_implies, "implies" );
+XML_CONSTASCII_ACTION( sXML_in, "in");
+XML_CONSTASCII_ACTION( sXML_in_range, "in-range");
+XML_CONSTASCII_ACTION( sXML_inbook, "inbook" );
+XML_CONSTASCII_ACTION( sXML_incollection, "incollection" );
+XML_CONSTASCII_ACTION( sXML_increment, "increment" );
+XML_CONSTASCII_ACTION( sXML_index, "index");
+XML_CONSTASCII_ACTION( sXML_index_body, "index-body");
+XML_CONSTASCII_ACTION( sXML_index_entry_bibliography, "index-entry-bibliography" );
+XML_CONSTASCII_ACTION( sXML_index_entry_chapter, "index-entry-chapter" );
+XML_CONSTASCII_ACTION( sXML_index_entry_chapter_number, "index-entry-chapter-number" );
+XML_CONSTASCII_ACTION( sXML_index_entry_link_end, "index-entry-link-end" );
+XML_CONSTASCII_ACTION( sXML_index_entry_link_start, "index-entry-link-start" );
+XML_CONSTASCII_ACTION( sXML_index_entry_page_number, "index-entry-page-number" );
+XML_CONSTASCII_ACTION( sXML_index_entry_span, "index-entry-span" );
+XML_CONSTASCII_ACTION( sXML_index_entry_tab_stop, "index-entry-tab-stop" );
+XML_CONSTASCII_ACTION( sXML_index_entry_template, "index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_index_entry_text, "index-entry-text" );
+XML_CONSTASCII_ACTION( sXML_index_name, "index-name" );
+XML_CONSTASCII_ACTION( sXML_index_scope, "index-scope" );
+XML_CONSTASCII_ACTION( sXML_index_source_style, "index-source-style" );
+XML_CONSTASCII_ACTION( sXML_index_source_styles, "index-source-styles" );
+XML_CONSTASCII_ACTION( sXML_index_title, "index-title" );
+XML_CONSTASCII_ACTION( sXML_index_title_template, "index-title-template" );
+XML_CONSTASCII_ACTION( sXML_information, "information" );
+XML_CONSTASCII_ACTION( sXML_initial_creator, "initial-creator" );
+XML_CONSTASCII_ACTION( sXML_inproceedings, "inproceedings" );
+XML_CONSTASCII_ACTION( sXML_insertion, "insertion" );
+XML_CONSTASCII_ACTION( sXML_insertion_cut_off, "insertion-cut-off" );
+XML_CONSTASCII_ACTION( sXML_inset, "inset" );
+XML_CONSTASCII_ACTION( sXML_inside, "inside" );
+XML_CONSTASCII_ACTION( sXML_institution, "institution" );
+XML_CONSTASCII_ACTION( sXML_int, "int" );
+XML_CONSTASCII_ACTION( sXML_intensity, "intensity" );
+XML_CONSTASCII_ACTION( sXML_intersect, "intersect" );
+XML_CONSTASCII_ACTION( sXML_interval, "interval" );
+XML_CONSTASCII_ACTION( sXML_interval_major, "interval-major" );
+XML_CONSTASCII_ACTION( sXML_interval_minor, "interval-minor" );
+XML_CONSTASCII_ACTION( sXML_into_english_number, "into-english-number" );
+XML_CONSTASCII_ACTION( sXML_inverse, "inverse" );
+XML_CONSTASCII_ACTION( sXML_is_active, "is-active");
+XML_CONSTASCII_ACTION( sXML_is_data_layout_field, "is-data-layout-field");
+XML_CONSTASCII_ACTION( sXML_is_hidden, "is-hidden" );
+XML_CONSTASCII_ACTION( sXML_is_selection, "is-selection");
+XML_CONSTASCII_ACTION( sXML_isbn, "isbn" );
+XML_CONSTASCII_ACTION( sXML_italic, "italic" );
+XML_CONSTASCII_ACTION( sXML_iteration, "iteration" );
+XML_CONSTASCII_ACTION( sXML_journal, "journal" );
+XML_CONSTASCII_ACTION( sXML_justified, "justified" );
+XML_CONSTASCII_ACTION( sXML_justify, "justify" );
+XML_CONSTASCII_ACTION( sXML_justify_single_word, "justify-single-word" );
+XML_CONSTASCII_ACTION( sXML_keep_with_next, "keep-with-next" );
+XML_CONSTASCII_ACTION( sXML_kerning_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_key, "key" );
+XML_CONSTASCII_ACTION( sXML_key1, "key1" );
+XML_CONSTASCII_ACTION( sXML_key2, "key2" );
+XML_CONSTASCII_ACTION( sXML_keyword, "keyword" );
+XML_CONSTASCII_ACTION( sXML_keywords, "keywords" );
+XML_CONSTASCII_ACTION( sXML_km, "km" );
+XML_CONSTASCII_ACTION( sXML_label, "label" );
+XML_CONSTASCII_ACTION( sXML_label_arrangement, "label-arrangement" );
+XML_CONSTASCII_ACTION( sXML_label_cell_address, "label-cell-address" );
+XML_CONSTASCII_ACTION( sXML_label_cell_range_address, "label-cell-range-address" );
+XML_CONSTASCII_ACTION( sXML_label_range, "label-range" );
+XML_CONSTASCII_ACTION( sXML_label_ranges, "label-ranges" );
+XML_CONSTASCII_ACTION( sXML_layer, "layer" );
+XML_CONSTASCII_ACTION( sXML_layer_set, "layer-set" );
+XML_CONSTASCII_ACTION( sXML_lambda, "lambda" );
+XML_CONSTASCII_ACTION( sXML_landscape, "landscape" );
+XML_CONSTASCII_ACTION( sXML_language, "language" );
+XML_CONSTASCII_ACTION( sXML_language_asian, "language-asian" );
+XML_CONSTASCII_ACTION( sXML_language_complex, "language-complex" );
+XML_CONSTASCII_ACTION( sXML_last_column_spanned, "last-column-spanned" );
+XML_CONSTASCII_ACTION( sXML_last_page, "last-page" );
+XML_CONSTASCII_ACTION( sXML_last_row_spanned, "last-row-spanned" );
+XML_CONSTASCII_ACTION( sXML_leader_char, "leader-char" );
+XML_CONSTASCII_ACTION( sXML_left, "left" );
+XML_CONSTASCII_ACTION( sXML_left_outside, "left-outside" );
+XML_CONSTASCII_ACTION( sXML_left_top_position, "left-top-position" );
+XML_CONSTASCII_ACTION( sXML_legend, "legend" );
+XML_CONSTASCII_ACTION( sXML_legend_position, "legend-position" );
+XML_CONSTASCII_ACTION( sXML_length, "length" );
+XML_CONSTASCII_ACTION( sXML_leq, "leq" );
+XML_CONSTASCII_ACTION( sXML_let_text, "let-text" );
+XML_CONSTASCII_ACTION( sXML_letter_kerning, "letter-kerning" );
+XML_CONSTASCII_ACTION( sXML_letter_spacing, "letter-spacing" );
+XML_CONSTASCII_ACTION( sXML_letters, "letters" );
+XML_CONSTASCII_ACTION( sXML_level, "level" );
+XML_CONSTASCII_ACTION( sXML_library, "library" );
+XML_CONSTASCII_ACTION( sXML_library_embedded, "library-embedded" );
+XML_CONSTASCII_ACTION( sXML_library_linked, "library-linked" );
+XML_CONSTASCII_ACTION( sXML_light, "light");
+XML_CONSTASCII_ACTION( sXML_lighting_mode, "lighting-mode");
+XML_CONSTASCII_ACTION( sXML_lime, "lime" );
+XML_CONSTASCII_ACTION( sXML_limit, "limit" );
+XML_CONSTASCII_ACTION( sXML_line, "line" );
+XML_CONSTASCII_ACTION( sXML_line_break, "line-break" );
+XML_CONSTASCII_ACTION( sXML_line_height, "line-height" );
+XML_CONSTASCII_ACTION( sXML_line_height_at_least, "line-height-at-least" );
+XML_CONSTASCII_ACTION( sXML_line_spacing, "line-spacing" );
+XML_CONSTASCII_ACTION( sXML_linear, "linear" );
+XML_CONSTASCII_ACTION( sXML_linenumbering_configuration, "linenumbering-configuration" );
+XML_CONSTASCII_ACTION( sXML_linenumbering_separator, "linenumbering-separator" );
+XML_CONSTASCII_ACTION( sXML_lines, "lines" );
+XML_CONSTASCII_ACTION( sXML_lines_used, "lines-used" );
+XML_CONSTASCII_ACTION( sXML_link_data_style_to_source, "link-data-style-to-source" );
+XML_CONSTASCII_ACTION( sXML_link_to_source_data, "link-to-source-data" );
+XML_CONSTASCII_ACTION( sXML_list, "list");
+XML_CONSTASCII_ACTION( sXML_list_block, "list-block" );
+XML_CONSTASCII_ACTION( sXML_list_header, "list-header" );
+XML_CONSTASCII_ACTION( sXML_list_info, "list-info" );
+XML_CONSTASCII_ACTION( sXML_list_item, "list-item" );
+XML_CONSTASCII_ACTION( sXML_list_level, "list-level" );
+XML_CONSTASCII_ACTION( sXML_list_level_style_bullet, "list-level-style-bullet" );
+XML_CONSTASCII_ACTION( sXML_list_level_style_image, "list-level-style-image" );
+XML_CONSTASCII_ACTION( sXML_list_level_style_number, "list-level-style-number" );
+XML_CONSTASCII_ACTION( sXML_list_name, "list-name" );
+XML_CONSTASCII_ACTION( sXML_list_style, "list-style" );
+XML_CONSTASCII_ACTION( sXML_list_style_name, "list-style-name" );
+XML_CONSTASCII_ACTION( sXML_ln, "ln" );
+XML_CONSTASCII_ACTION( sXML_locked, "locked" );
+XML_CONSTASCII_ACTION( sXML_log, "log" );
+XML_CONSTASCII_ACTION( sXML_logarithmic, "logarithmic" );
+XML_CONSTASCII_ACTION( sXML_logbase, "logbase" );
+XML_CONSTASCII_ACTION( sXML_long, "long" );
+XML_CONSTASCII_ACTION( sXML_lowlimit, "lowlimit" );
+XML_CONSTASCII_ACTION( sXML_lr_tb, "lr-tb" );
+XML_CONSTASCII_ACTION( sXML_lt, "lt");
+XML_CONSTASCII_ACTION( sXML_ltr, "ltr");
+XML_CONSTASCII_ACTION( sXML_luminance , "luminance" );
+XML_CONSTASCII_ACTION( sXML_macro_name, "macro-name");
+XML_CONSTASCII_ACTION( sXML_maction, "maction");
+XML_CONSTASCII_ACTION( sXML_main_entry_style_name, "main-entry-style-name" );
+XML_CONSTASCII_ACTION( sXML_major, "major" );
+XML_CONSTASCII_ACTION( sXML_maligngroup, "maligngroup");
+XML_CONSTASCII_ACTION( sXML_malignmark, "malignmark");
+XML_CONSTASCII_ACTION( sXML_manual, "manual" );
+XML_CONSTASCII_ACTION( sXML_map, "map" );
+XML_CONSTASCII_ACTION( sXML_margin_bottom, "margin-bottom" );
+XML_CONSTASCII_ACTION( sXML_margin_left, "margin-left" );
+XML_CONSTASCII_ACTION( sXML_margin_right, "margin-right" );
+XML_CONSTASCII_ACTION( sXML_margin_top, "margin-top" );
+XML_CONSTASCII_ACTION( sXML_margins, "margins" );
+XML_CONSTASCII_ACTION( sXML_marker, "marker" );
+XML_CONSTASCII_ACTION( sXML_marker_end , "marker-end" );
+XML_CONSTASCII_ACTION( sXML_marker_end_center , "marker-end-center" );
+XML_CONSTASCII_ACTION( sXML_marker_end_width , "marker-end-width" );
+XML_CONSTASCII_ACTION( sXML_marker_start , "marker-start" );
+XML_CONSTASCII_ACTION( sXML_marker_start_center , "marker-start-center" );
+XML_CONSTASCII_ACTION( sXML_marker_start_width , "marker-start-width" );
+XML_CONSTASCII_ACTION( sXML_maroon, "maroon" );
+XML_CONSTASCII_ACTION( sXML_master_page, "master-page" );
+XML_CONSTASCII_ACTION( sXML_master_page_name , "master-page-name" );
+XML_CONSTASCII_ACTION( sXML_master_styles, "master-styles" );
+XML_CONSTASCII_ACTION( sXML_mastersthesis, "mastersthesis" );
+XML_CONSTASCII_ACTION( sXML_match, "match");
+XML_CONSTASCII_ACTION( sXML_math, "math");
+XML_CONSTASCII_ACTION( sXML_matrix, "matrix");
+XML_CONSTASCII_ACTION( sXML_matrix_covered, "matrix-covered");
+XML_CONSTASCII_ACTION( sXML_matrixrow, "matrixrow");
+XML_CONSTASCII_ACTION( sXML_max, "max" );
+XML_CONSTASCII_ACTION( sXML_max_edge, "max-edge");
+XML_CONSTASCII_ACTION( sXML_max_height, "max-height");
+XML_CONSTASCII_ACTION( sXML_max_width, "max-width");
+XML_CONSTASCII_ACTION( sXML_maximum, "maximum" );
+XML_CONSTASCII_ACTION( sXML_maximum_difference, "maximum-difference" );
+XML_CONSTASCII_ACTION( sXML_may_break_between_rows, "may-break-between-rows" );
+XML_CONSTASCII_ACTION( sXML_may_script, "may-script" );
+XML_CONSTASCII_ACTION( sXML_mean, "mean" );
+XML_CONSTASCII_ACTION( sXML_mean_value, "mean-value" );
+XML_CONSTASCII_ACTION( sXML_measure, "measure" );
+XML_CONSTASCII_ACTION( sXML_measure_align, "measure-align" );
+XML_CONSTASCII_ACTION( sXML_measure_vertical_align, "measure-vertical-align" );
+XML_CONSTASCII_ACTION( sXML_median, "median" );
+XML_CONSTASCII_ACTION( sXML_medium, "medium" );
+XML_CONSTASCII_ACTION( sXML_merror, "merror" );
+XML_CONSTASCII_ACTION( sXML_message_type, "message-type" );
+XML_CONSTASCII_ACTION( sXML_meta, "meta" );
+XML_CONSTASCII_ACTION( sXML_mfenced, "mfenced" );
+XML_CONSTASCII_ACTION( sXML_mfrac, "mfrac" );
+XML_CONSTASCII_ACTION( sXML_mi, "mi" ); //MathML Math Identifier
+XML_CONSTASCII_ACTION( sXML_middle, "middle" );
+XML_CONSTASCII_ACTION( sXML_mime_type, "mime-type" );
+XML_CONSTASCII_ACTION( sXML_min, "min" );
+XML_CONSTASCII_ACTION( sXML_min_denominator_digits, "min-denominator-digits" );
+XML_CONSTASCII_ACTION( sXML_min_edge, "min-edge");
+XML_CONSTASCII_ACTION( sXML_min_exponent_digits, "min-exponent-digits" );
+XML_CONSTASCII_ACTION( sXML_min_height, "min-height" );
+XML_CONSTASCII_ACTION( sXML_min_width, "min-width" );
+XML_CONSTASCII_ACTION( sXML_min_integer_digits, "min-integer-digits" );
+XML_CONSTASCII_ACTION( sXML_min_label_distance, "min-label-distance" );
+XML_CONSTASCII_ACTION( sXML_min_label_width, "min-label-width" );
+XML_CONSTASCII_ACTION( sXML_min_line_height, "min-line-height" );
+XML_CONSTASCII_ACTION( sXML_min_numerator_digits, "min-numerator-digits" );
+XML_CONSTASCII_ACTION( sXML_min_row_height, "min-row-height" );
+XML_CONSTASCII_ACTION( sXML_minimum, "minimum" );
+XML_CONSTASCII_ACTION( sXML_minor, "minor" );
+XML_CONSTASCII_ACTION( sXML_minus, "minus" );
+XML_CONSTASCII_ACTION( sXML_minutes, "minutes" );
+XML_CONSTASCII_ACTION( sXML_mirror, "mirror" );
+XML_CONSTASCII_ACTION( sXML_mirrored, "mirrored" );
+XML_CONSTASCII_ACTION( sXML_misc, "misc" );
+XML_CONSTASCII_ACTION( sXML_miter , "miter" );
+XML_CONSTASCII_ACTION( sXML_mmultiscripts, "mmultiscripts" );
+XML_CONSTASCII_ACTION( sXML_mm, "mm" );
+XML_CONSTASCII_ACTION( sXML_mn, "mn" );
+XML_CONSTASCII_ACTION( sXML_mo, "mo" );
+XML_CONSTASCII_ACTION( sXML_mode, "mode" );
+XML_CONSTASCII_ACTION( sXML_modern, "modern" );
+XML_CONSTASCII_ACTION( sXML_modification_date, "modification-date" );
+XML_CONSTASCII_ACTION( sXML_modification_time, "modification-time" );
+XML_CONSTASCII_ACTION( sXML_modulate, "modulate" );
+XML_CONSTASCII_ACTION( sXML_module, "module" );
+XML_CONSTASCII_ACTION( sXML_moment, "moment" );
+XML_CONSTASCII_ACTION( sXML_mono, "mono" );
+XML_CONSTASCII_ACTION( sXML_month, "month" );
+XML_CONSTASCII_ACTION( sXML_move_from_bottom, "move-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_move_from_left, "move-from-left" );
+XML_CONSTASCII_ACTION( sXML_move_from_right, "move-from-right" );
+XML_CONSTASCII_ACTION( sXML_move_from_top, "move-from-top" );
+XML_CONSTASCII_ACTION( sXML_move_protect, "move-protect" );
+XML_CONSTASCII_ACTION( sXML_mover, "mover" );
+XML_CONSTASCII_ACTION( sXML_movement, "movement" );
+XML_CONSTASCII_ACTION( sXML_movement_cut_off, "movement-cut-off" );
+XML_CONSTASCII_ACTION( sXML_mouse_as_pen, "mouse-as-pen" );
+XML_CONSTASCII_ACTION( sXML_mouse_visible, "mouse-visible" );
+XML_CONSTASCII_ACTION( sXML_mpadded, "mpadded");
+XML_CONSTASCII_ACTION( sXML_mphantom, "mphantom");
+XML_CONSTASCII_ACTION( sXML_mprescripts, "mprescripts");
+XML_CONSTASCII_ACTION( sXML_mroot, "mroot");
+XML_CONSTASCII_ACTION( sXML_mrow, "mrow");
+XML_CONSTASCII_ACTION( sXML_ms, "ms");
+XML_CONSTASCII_ACTION( sXML_mspace, "mspace");
+XML_CONSTASCII_ACTION( sXML_msqrt, "msqrt");
+XML_CONSTASCII_ACTION( sXML_mstyle, "mstyle");
+XML_CONSTASCII_ACTION( sXML_msub, "msub");
+XML_CONSTASCII_ACTION( sXML_msubsup, "msubsup");
+XML_CONSTASCII_ACTION( sXML_msup, "msup");
+XML_CONSTASCII_ACTION( sXML_mtable, "mtable");
+XML_CONSTASCII_ACTION( sXML_mtd, "mtd");
+XML_CONSTASCII_ACTION( sXML_mtext, "mtext");
+XML_CONSTASCII_ACTION( sXML_mtr, "mtr");
+XML_CONSTASCII_ACTION( sXML_multi_deletion_spanned, "multi-deletion-spanned");
+XML_CONSTASCII_ACTION( sXML_munder, "munder");
+XML_CONSTASCII_ACTION( sXML_munderover, "munderover");
+XML_CONSTASCII_ACTION( sXML_name, "name" );
+XML_CONSTASCII_ACTION( sXML_name_and_extension, "name-and-extension" );
+XML_CONSTASCII_ACTION( sXML_named_expression, "named-expression");
+XML_CONSTASCII_ACTION( sXML_named_expressions, "named-expressions");
+XML_CONSTASCII_ACTION( sXML_named_range, "named-range");
+XML_CONSTASCII_ACTION( sXML_navy, "navy");
+XML_CONSTASCII_ACTION( sXML_neq, "neq" );
+XML_CONSTASCII_ACTION( sXML_new, "new" );
+XML_CONSTASCII_ACTION( sXML_next, "next" );
+XML_CONSTASCII_ACTION( sXML_next_page, "next-page" );
+XML_CONSTASCII_ACTION( sXML_next_style_name, "next-style-name" );
+XML_CONSTASCII_ACTION( sXML_nohref, "nohref" );
+XML_CONSTASCII_ACTION( sXML_no_limit, "no-limit" );
+XML_CONSTASCII_ACTION( sXML_no_wrap, "no-wrap" );
+XML_CONSTASCII_ACTION( sXML_noempty, "!empty");
+XML_CONSTASCII_ACTION( sXML_nomatch, "!match");
+XML_CONSTASCII_ACTION( sXML_none, "none" );
+XML_CONSTASCII_ACTION( sXML_noprtsubset, "notprsubset" );
+XML_CONSTASCII_ACTION( sXML_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_normals_direction, "normals-direction" );
+XML_CONSTASCII_ACTION( sXML_normals_kind, "normals-kind" );
+XML_CONSTASCII_ACTION( sXML_not, "not" );
+XML_CONSTASCII_ACTION( sXML_not_equal_date, "not-equal-date" );
+XML_CONSTASCII_ACTION( sXML_note, "note" );
+XML_CONSTASCII_ACTION( sXML_notes, "notes" );
+XML_CONSTASCII_ACTION( sXML_notin, "notin" );
+XML_CONSTASCII_ACTION( sXML_notsubset, "notsubset" );
+XML_CONSTASCII_ACTION( sXML_null_date, "null-date" );
+XML_CONSTASCII_ACTION( sXML_null_year, "null-year" );
+XML_CONSTASCII_ACTION( sXML_num_format, "num-format" );
+XML_CONSTASCII_ACTION( sXML_num_letter_sync, "num-letter-sync" );
+XML_CONSTASCII_ACTION( sXML_num_prefix, "num-prefix" );
+XML_CONSTASCII_ACTION( sXML_num_suffix, "num-suffix" );
+XML_CONSTASCII_ACTION( sXML_number, "number" );
+XML_CONSTASCII_ACTION( sXML_number_and_name, "number-and-name" );
+XML_CONSTASCII_ACTION( sXML_number_columns_repeated, "number-columns-repeated" );
+XML_CONSTASCII_ACTION( sXML_number_columns_spanned, "number-columns-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_lines, "number-lines" );
+XML_CONSTASCII_ACTION( sXML_number_matrix_columns_spanned, "number-matrix-columns-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_matrix_rows_spanned, "number-matrix-rows-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_position, "number-position" );
+XML_CONSTASCII_ACTION( sXML_number_rows_repeated, "number-rows-repeated" );
+XML_CONSTASCII_ACTION( sXML_number_rows_spanned, "number-rows-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_style, "number-style" );
+XML_CONSTASCII_ACTION( sXML_number_wrapped_paragraphs, "number-wrapped-paragraphs" );
+XML_CONSTASCII_ACTION( sXML_numbered_entries, "numbered-entries" );
+XML_CONSTASCII_ACTION( sXML_object, "object" );
+XML_CONSTASCII_ACTION( sXML_object_count, "object-count" );
+XML_CONSTASCII_ACTION( sXML_object_index, "object-index" );
+XML_CONSTASCII_ACTION( sXML_object_index_entry_template, "object-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_object_index_source, "object-index-source" );
+XML_CONSTASCII_ACTION( sXML_object_name, "object-name");
+XML_CONSTASCII_ACTION( sXML_object_ole, "object-ole" );
+XML_CONSTASCII_ACTION( sXML_objects, "objects" );
+XML_CONSTASCII_ACTION( sXML_odd_page, "odd-page" );
+XML_CONSTASCII_ACTION( sXML_offset, "offset" );
+XML_CONSTASCII_ACTION( sXML_olive, "olive" );
+XML_CONSTASCII_ACTION( sXML_online, "online" );
+XML_CONSTASCII_ACTION( sXML_online_text, "online-text" );
+XML_CONSTASCII_ACTION( sXML_onLoad, "onLoad" );
+XML_CONSTASCII_ACTION( sXML_onRequest, "onRequest" );
+XML_CONSTASCII_ACTION( sXML_on_update_keep_size, "on-update-keep-size");
+XML_CONSTASCII_ACTION( sXML_on_update_keep_styles, "on-update-keep-styles");
+XML_CONSTASCII_ACTION( sXML_opaque_background, "background" );
+XML_CONSTASCII_ACTION( sXML_opaque_foreground, "foreground" );
+XML_CONSTASCII_ACTION( sXML_open, "open" );
+XML_CONSTASCII_ACTION( sXML_open_horizontal, "open-horizontal" );
+XML_CONSTASCII_ACTION( sXML_open_vertical, "open-vertical" );
+XML_CONSTASCII_ACTION( sXML_operation, "operation");
+XML_CONSTASCII_ACTION( sXML_operator, "operator");
+XML_CONSTASCII_ACTION( sXML_optimal, "optimal");
+XML_CONSTASCII_ACTION( sXML_or, "or");
+XML_CONSTASCII_ACTION( sXML_order, "order");
+XML_CONSTASCII_ACTION( sXML_ordered_list, "ordered-list" );
+XML_CONSTASCII_ACTION( sXML_organizations, "organizations" );
+XML_CONSTASCII_ACTION( sXML_orientation, "orientation");
+XML_CONSTASCII_ACTION( sXML_orientation_landscape, "orientation-landscape" );
+XML_CONSTASCII_ACTION( sXML_orientation_portrait, "orientation-portrait" );
+XML_CONSTASCII_ACTION( sXML_origin, "origin" );
+XML_CONSTASCII_ACTION( sXML_orphans, "orphans" );
+XML_CONSTASCII_ACTION( sXML_outline_level, "outline-level" );
+XML_CONSTASCII_ACTION( sXML_outline_level_style, "outline-level-style" );
+XML_CONSTASCII_ACTION( sXML_outline_style, "outline-style" );
+XML_CONSTASCII_ACTION( sXML_outset, "outset" );
+XML_CONSTASCII_ACTION( sXML_outside, "outside" );
+XML_CONSTASCII_ACTION( sXML_overlap, "overlap" );
+XML_CONSTASCII_ACTION( sXML_p, "p" );
+XML_CONSTASCII_ACTION( sXML_package_name, "package-name" );
+XML_CONSTASCII_ACTION( sXML_padding, "padding" );
+XML_CONSTASCII_ACTION( sXML_padding_bottom, "padding-bottom" );
+XML_CONSTASCII_ACTION( sXML_padding_left, "padding-left" );
+XML_CONSTASCII_ACTION( sXML_padding_right, "padding-right" );
+XML_CONSTASCII_ACTION( sXML_padding_top, "padding-top" );
+XML_CONSTASCII_ACTION( sXML_page, "page" );
+XML_CONSTASCII_ACTION( sXML_page_adjust, "page-adjust" );
+XML_CONSTASCII_ACTION( sXML_page_breaks_on_group_change, "page-breaks-on-group-change");
+XML_CONSTASCII_ACTION( sXML_page_content, "page-content" );
+XML_CONSTASCII_ACTION( sXML_page_continuation_string, "page-continuation-string" );
+XML_CONSTASCII_ACTION( sXML_page_count, "page-count" );
+XML_CONSTASCII_ACTION( sXML_page_end_margin, "page-end-margin" );
+XML_CONSTASCII_ACTION( sXML_page_height, "page-height" );
+XML_CONSTASCII_ACTION( sXML_page_master, "page-master" );
+XML_CONSTASCII_ACTION( sXML_page_master_name, "page-master-name" );
+XML_CONSTASCII_ACTION( sXML_page_number, "page-number" );
+XML_CONSTASCII_ACTION( sXML_page_start_margin, "page-start-margin" );
+XML_CONSTASCII_ACTION( sXML_page_style_name, "page-style-name" );
+XML_CONSTASCII_ACTION( sXML_page_thumbnail, "page-thumbnail" );
+XML_CONSTASCII_ACTION( sXML_page_usage, "page-usage" );
+XML_CONSTASCII_ACTION( sXML_page_variable_get, "page-variable-get" );
+XML_CONSTASCII_ACTION( sXML_page_variable_set, "page-variable-set" );
+XML_CONSTASCII_ACTION( sXML_page_view_zoom_value, "page-view-zoom-value" );
+XML_CONSTASCII_ACTION( sXML_page_width, "page-width" );
+XML_CONSTASCII_ACTION( sXML_pages, "pages" );
+XML_CONSTASCII_ACTION( sXML_paper_tray_number, "paper-tray-number" );
+XML_CONSTASCII_ACTION( sXML_paragraph, "paragraph" );
+XML_CONSTASCII_ACTION( sXML_paragraph_content, "paragraph-content" );
+XML_CONSTASCII_ACTION( sXML_paragraph_count, "paragraph-count" );
+XML_CONSTASCII_ACTION( sXML_paragraph_end_margin, "paragraph-end-margin" );
+XML_CONSTASCII_ACTION( sXML_paragraph_start_margin, "paragraph-start-margin" );
+XML_CONSTASCII_ACTION( sXML_param, "param" );
+XML_CONSTASCII_ACTION( sXML_parallel, "parallel" );
+XML_CONSTASCII_ACTION( sXML_parent_style_name, "parent-style-name" );
+XML_CONSTASCII_ACTION( sXML_parse_sql_statement, "parse-sql-statement");
+XML_CONSTASCII_ACTION( sXML_parsed, "parsed" );
+XML_CONSTASCII_ACTION( sXML_pause, "pause" );
+XML_CONSTASCII_ACTION( sXML_partialdiff, "partialdiff");
+XML_CONSTASCII_ACTION( sXML_password, "password");
+XML_CONSTASCII_ACTION( sXML_passwort, "passwort");
+XML_CONSTASCII_ACTION( sXML_path , "path" );
+XML_CONSTASCII_ACTION( sXML_pending , "pending" );
+XML_CONSTASCII_ACTION( sXML_percentage, "percentage");
+XML_CONSTASCII_ACTION( sXML_percentage_style, "percentage-style" );
+XML_CONSTASCII_ACTION( sXML_perspective, "perspective");
+XML_CONSTASCII_ACTION( sXML_phdthesis, "phdthesis" );
+XML_CONSTASCII_ACTION( sXML_phong, "phong");
+XML_CONSTASCII_ACTION( sXML_pie_offset, "pie-offset" );
+XML_CONSTASCII_ACTION( sXML_placeholder, "placeholder" );
+XML_CONSTASCII_ACTION( sXML_placeholder_type, "placeholder-type" );
+XML_CONSTASCII_ACTION( sXML_placing, "placing" );
+XML_CONSTASCII_ACTION( sXML_plain_number, "plain-number" );
+XML_CONSTASCII_ACTION( sXML_plain_number_and_name, "plain-number-and-name" );
+XML_CONSTASCII_ACTION( sXML_plot_area, "plot-area" );
+XML_CONSTASCII_ACTION( sXML_plugin, "plugin" );
+XML_CONSTASCII_ACTION( sXML_plus, "plus" );
+XML_CONSTASCII_ACTION( sXML_points, "points" );
+XML_CONSTASCII_ACTION( sXML_polygon , "polygon" );
+XML_CONSTASCII_ACTION( sXML_polyline , "polyline" );
+XML_CONSTASCII_ACTION( sXML_polynomial, "polynomial" );
+XML_CONSTASCII_ACTION( sXML_pool_id, "pool-id" );
+XML_CONSTASCII_ACTION( sXML_portrait, "portrait" );
+XML_CONSTASCII_ACTION( sXML_position, "position" );
+XML_CONSTASCII_ACTION( sXML_position_bottom, "position-bottom" );
+XML_CONSTASCII_ACTION( sXML_position_left, "position-left" );
+XML_CONSTASCII_ACTION( sXML_position_right, "position-right" );
+XML_CONSTASCII_ACTION( sXML_position_top, "position-top" );
+XML_CONSTASCII_ACTION( sXML_posture_italic, "italic" );
+XML_CONSTASCII_ACTION( sXML_posture_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_posture_oblique, "oblique" );
+XML_CONSTASCII_ACTION( sXML_power, "power" );
+XML_CONSTASCII_ACTION( sXML_precision_as_shown, "precision-as-shown" );
+XML_CONSTASCII_ACTION( sXML_prefix, "prefix" );
+XML_CONSTASCII_ACTION( sXML_presentation, "presentation" );
+XML_CONSTASCII_ACTION( sXML_presentation_chart , "chart" );
+XML_CONSTASCII_ACTION( sXML_presentation_graphic , "graphic" );
+XML_CONSTASCII_ACTION( sXML_presentation_notes , "notes" );
+XML_CONSTASCII_ACTION( sXML_presentation_object , "object" );
+XML_CONSTASCII_ACTION( sXML_presentation_orgchart , "orgchart" );
+XML_CONSTASCII_ACTION( sXML_presentation_outline , "outline" );
+XML_CONSTASCII_ACTION( sXML_presentation_page , "page" );
+XML_CONSTASCII_ACTION( sXML_presentation_page_layout, "presentation-page-layout" );
+XML_CONSTASCII_ACTION( sXML_presentation_page_layout_name, "presentation-page-layout-name" );
+XML_CONSTASCII_ACTION( sXML_presentation_subtitle , "subtitle" );
+XML_CONSTASCII_ACTION( sXML_presentation_table , "table" );
+XML_CONSTASCII_ACTION( sXML_presentation_title , "title" );
+XML_CONSTASCII_ACTION( sXML_previous, "previous" );
+XML_CONSTASCII_ACTION( sXML_previous_page, "previous-page" );
+XML_CONSTASCII_ACTION( sXML_print, "print" );
+XML_CONSTASCII_ACTION( sXML_printable, "printable" );
+XML_CONSTASCII_ACTION( sXML_print_content, "print-content");
+XML_CONSTASCII_ACTION( sXML_print_date, "print-date" );
+XML_CONSTASCII_ACTION( sXML_print_orientation, "print-orientation");
+XML_CONSTASCII_ACTION( sXML_print_page_order, "print-page-order");
+XML_CONSTASCII_ACTION( sXML_print_range, "print-range");
+XML_CONSTASCII_ACTION( sXML_print_ranges, "print-ranges");
+XML_CONSTASCII_ACTION( sXML_print_time, "print-time" );
+XML_CONSTASCII_ACTION( sXML_printed_by, "printed-by" );
+XML_CONSTASCII_ACTION( sXML_proceedings, "proceedings" );
+XML_CONSTASCII_ACTION( sXML_product, "product" );
+XML_CONSTASCII_ACTION( sXML_projection, "projection");
+XML_CONSTASCII_ACTION( sXML_properties, "properties" );
+XML_CONSTASCII_ACTION( sXML_protect, "protect" );
+XML_CONSTASCII_ACTION( sXML_protect_content, "content" );
+XML_CONSTASCII_ACTION( sXML_protect_position, "position" );
+XML_CONSTASCII_ACTION( sXML_protect_size, "size" );
+XML_CONSTASCII_ACTION( sXML_protected, "protected" );
+XML_CONSTASCII_ACTION( sXML_protection_key, "protection-key" );
+XML_CONSTASCII_ACTION( sXML_prsubset, "prsubset" );
+XML_CONSTASCII_ACTION( sXML_publisher, "publisher" );
+XML_CONSTASCII_ACTION( sXML_punctuation_wrap, "punctuation-wrap" );
+XML_CONSTASCII_ACTION( sXML_purple, "purple" );
+XML_CONSTASCII_ACTION( sXML_pyramid, "pyramid" );
+XML_CONSTASCII_ACTION( sXML_quarter, "quarter" );
+XML_CONSTASCII_ACTION( sXML_query_name, "query-name");
+XML_CONSTASCII_ACTION( sXML_quo_vadis, "quo-vadis" );
+XML_CONSTASCII_ACTION( sXML_quotient, "quotient" );
+XML_CONSTASCII_ACTION( sXML_r, "r" );
+XML_CONSTASCII_ACTION( sXML_radar, "radar" );
+XML_CONSTASCII_ACTION( sXML_random, "random" );
+XML_CONSTASCII_ACTION( sXML_range_address, "range-address");
+XML_CONSTASCII_ACTION( sXML_range_usable_as, "range-usable-as");
+XML_CONSTASCII_ACTION( sXML_recreate_on_edit , "recreate-on-edit" );
+XML_CONSTASCII_ACTION( sXML_rect , "rect" );
+XML_CONSTASCII_ACTION( sXML_red , "red" );
+XML_CONSTASCII_ACTION( sXML_ref_name, "ref-name" );
+XML_CONSTASCII_ACTION( sXML_reference, "reference" );
+XML_CONSTASCII_ACTION( sXML_reference_end, "reference-end" );
+XML_CONSTASCII_ACTION( sXML_reference_format, "reference-format" );
+XML_CONSTASCII_ACTION( sXML_reference_mark, "reference-mark" );
+XML_CONSTASCII_ACTION( sXML_reference_mark_end, "reference-mark-end" );
+XML_CONSTASCII_ACTION( sXML_reference_mark_start, "reference-mark-start" );
+XML_CONSTASCII_ACTION( sXML_reference_ref, "reference-ref" );
+XML_CONSTASCII_ACTION( sXML_reference_start, "reference-start" );
+XML_CONSTASCII_ACTION( sXML_reference_type, "reference-type" );
+XML_CONSTASCII_ACTION( sXML_refresh_delay, "refresh-delay" );
+XML_CONSTASCII_ACTION( sXML_region_center, "region-center" );
+XML_CONSTASCII_ACTION( sXML_region_left, "region-left" );
+XML_CONSTASCII_ACTION( sXML_region_right, "region-right" );
+XML_CONSTASCII_ACTION( sXML_register_true, "register-true" );
+XML_CONSTASCII_ACTION( sXML_register_truth_ref_style_name, "register-truth-ref-style-name" );
+XML_CONSTASCII_ACTION( sXML_regression_type, "regression-type" );
+XML_CONSTASCII_ACTION( sXML_rejected, "rejected" );
+XML_CONSTASCII_ACTION( sXML_rejecting_change_id, "rejecting-change-id" );
+XML_CONSTASCII_ACTION( sXML_rejection, "rejection" );
+XML_CONSTASCII_ACTION( sXML_rel_column_width, "rel-column-width" );
+XML_CONSTASCII_ACTION( sXML_rel_height, "rel-height" );
+XML_CONSTASCII_ACTION( sXML_rel_width, "rel-width" );
+XML_CONSTASCII_ACTION( sXML_relative, "relative" ) ;
+XML_CONSTASCII_ACTION( sXML_relative_tab_stop_position, "relative-tab-stop-position" );
+XML_CONSTASCII_ACTION( sXML_reln, "reln" ) ;
+XML_CONSTASCII_ACTION( sXML_rem, "rem" ) ;
+XML_CONSTASCII_ACTION( sXML_remove_dependents, "remove-dependents" );
+XML_CONSTASCII_ACTION( sXML_remove_precedents, "remove-precedents" );
+XML_CONSTASCII_ACTION( sXML_repeat, "repeat" );
+XML_CONSTASCII_ACTION( sXML_repeat_column, "repeat-column");
+XML_CONSTASCII_ACTION( sXML_repeat_row, "repeat-row");
+XML_CONSTASCII_ACTION( sXML_repeated, "repeated" );
+XML_CONSTASCII_ACTION( sXML_replace, "replace" );
+XML_CONSTASCII_ACTION( sXML_report_type, "report-type" );
+XML_CONSTASCII_ACTION( sXML_restart_on_page, "restart-on-page" );
+XML_CONSTASCII_ACTION( sXML_revision, "revision" );
+XML_CONSTASCII_ACTION( sXML_ridge, "ridge" );
+XML_CONSTASCII_ACTION( sXML_right, "right" );
+XML_CONSTASCII_ACTION( sXML_right_outside, "right-outside" );
+XML_CONSTASCII_ACTION( sXML_ring, "ring" );
+XML_CONSTASCII_ACTION( sXML_role, "role" );
+XML_CONSTASCII_ACTION( sXML_roll_from_bottom, "roll-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_roll_from_left, "roll-from-left" );
+XML_CONSTASCII_ACTION( sXML_roll_from_right, "roll-from-right" );
+XML_CONSTASCII_ACTION( sXML_roman, "roman" );
+XML_CONSTASCII_ACTION( sXML_root, "root" );
+XML_CONSTASCII_ACTION( sXML_rotate, "rotate" );
+XML_CONSTASCII_ACTION( sXML_rotation, "rotation" );
+XML_CONSTASCII_ACTION( sXML_rotation_align, "rotation-align" );
+XML_CONSTASCII_ACTION( sXML_rotation_angle, "rotation-angle" );
+XML_CONSTASCII_ACTION( sXML_round , "round" );
+XML_CONSTASCII_ACTION( sXML_row, "row");
+XML_CONSTASCII_ACTION( sXML_rows, "rows");
+XML_CONSTASCII_ACTION( sXML_row_height, "row-height" );
+XML_CONSTASCII_ACTION( sXML_row_number, "row-number" );
+XML_CONSTASCII_ACTION( sXML_ruby, "ruby" );
+XML_CONSTASCII_ACTION( sXML_ruby_align, "ruby-align" );
+XML_CONSTASCII_ACTION( sXML_ruby_base, "ruby-base" );
+XML_CONSTASCII_ACTION( sXML_ruby_position, "ruby-position" );
+XML_CONSTASCII_ACTION( sXML_ruby_text, "ruby-text" );
+XML_CONSTASCII_ACTION( sXML_run_through, "run-through" );
+XML_CONSTASCII_ACTION( sXML_rx, "rx" );
+XML_CONSTASCII_ACTION( sXML_ry, "ry" );
+XML_CONSTASCII_ACTION( sXML_s, "s" );
+XML_CONSTASCII_ACTION( sXML_scale, "scale" );
+XML_CONSTASCII_ACTION( sXML_scale_min, "scale-min" );
+XML_CONSTASCII_ACTION( sXML_scale_text, "scale-text" );
+XML_CONSTASCII_ACTION( sXML_scale_to, "scale-to" );
+XML_CONSTASCII_ACTION( sXML_scale_to_pages, "scale-to-pages" );
+XML_CONSTASCII_ACTION( sXML_scatter, "scatter" );
+XML_CONSTASCII_ACTION( sXML_scenario, "scenario" );
+XML_CONSTASCII_ACTION( sXML_scenario_ranges, "scenario-ranges" );
+XML_CONSTASCII_ACTION( sXML_scene, "scene");
+XML_CONSTASCII_ACTION( sXML_school, "school" );
+XML_CONSTASCII_ACTION( sXML_scientific_number, "scientific-number" );
+XML_CONSTASCII_ACTION( sXML_score_spaces, "score-spaces" );
+XML_CONSTASCII_ACTION( sXML_script, "script" );
+XML_CONSTASCII_ACTION( sXML_scroll, "scroll" );
+XML_CONSTASCII_ACTION( sXML_sdev, "sdev" );
+XML_CONSTASCII_ACTION( sXML_search_criteria_must_apply_to_whole_cell, "search-criteria-must-apply-to-whole-cell" );
+XML_CONSTASCII_ACTION( sXML_sec, "sec" );
+XML_CONSTASCII_ACTION( sXML_sech, "sech" );
+XML_CONSTASCII_ACTION( sXML_second_date_time, "second-date-time" );
+XML_CONSTASCII_ACTION( sXML_seconds, "seconds" );
+XML_CONSTASCII_ACTION( sXML_section, "section" );
+XML_CONSTASCII_ACTION( sXML_section_desc, "section-desc" );
+XML_CONSTASCII_ACTION( sXML_section_name, "section-name" );
+XML_CONSTASCII_ACTION( sXML_section_source, "section-source" );
+XML_CONSTASCII_ACTION( sXML_select_page, "select-page" );
+XML_CONSTASCII_ACTION( sXML_selector, "selector" );
+XML_CONSTASCII_ACTION( sXML_semantics, "semantics" );
+XML_CONSTASCII_ACTION( sXML_semi_automatic, "semi-automatic" );
+XML_CONSTASCII_ACTION( sXML_sender_city, "sender-city" );
+XML_CONSTASCII_ACTION( sXML_sender_company, "sender-company" );
+XML_CONSTASCII_ACTION( sXML_sender_country, "sender-country" );
+XML_CONSTASCII_ACTION( sXML_sender_email, "sender-email" );
+XML_CONSTASCII_ACTION( sXML_sender_fax, "sender-fax" );
+XML_CONSTASCII_ACTION( sXML_sender_firstname, "sender-firstname" );
+XML_CONSTASCII_ACTION( sXML_sender_initials, "sender-initials" );
+XML_CONSTASCII_ACTION( sXML_sender_lastname, "sender-lastname" );
+XML_CONSTASCII_ACTION( sXML_sender_phone_private, "sender-phone-private" );
+XML_CONSTASCII_ACTION( sXML_sender_phone_work, "sender-phone-work" );
+XML_CONSTASCII_ACTION( sXML_sender_position, "sender-position" );
+XML_CONSTASCII_ACTION( sXML_sender_postal_code, "sender-postal-code" );
+XML_CONSTASCII_ACTION( sXML_sender_state_or_province, "sender-state-or-province" );
+XML_CONSTASCII_ACTION( sXML_sender_street, "sender-street" );
+XML_CONSTASCII_ACTION( sXML_sender_title, "sender-title" );
+XML_CONSTASCII_ACTION( sXML_sep, "sep" );
+XML_CONSTASCII_ACTION( sXML_separation_character, "separation-character" );
+XML_CONSTASCII_ACTION( sXML_separator, "separator" );
+XML_CONSTASCII_ACTION( sXML_sequence, "sequence" );
+XML_CONSTASCII_ACTION( sXML_sequence_decl, "sequence-decl" );
+XML_CONSTASCII_ACTION( sXML_sequence_decls, "sequence-decls" );
+XML_CONSTASCII_ACTION( sXML_sequence_ref, "sequence-ref" );
+XML_CONSTASCII_ACTION( sXML_series, "series" );
+XML_CONSTASCII_ACTION( sXML_series_source, "series-source" );
+XML_CONSTASCII_ACTION( sXML_server_map, "server-map" );
+XML_CONSTASCII_ACTION( sXML_set, "set" );
+XML_CONSTASCII_ACTION( sXML_setdiff, "setdiff" );
+XML_CONSTASCII_ACTION( sXML_settings, "settings" );
+XML_CONSTASCII_ACTION( sXML_shade_mode, "shade-mode");
+XML_CONSTASCII_ACTION( sXML_shadow, "shadow" );
+XML_CONSTASCII_ACTION( sXML_shadow_color , "shadow-color" );
+XML_CONSTASCII_ACTION( sXML_shadow_offset_x , "shadow-offset-x" );
+XML_CONSTASCII_ACTION( sXML_shadow_offset_y , "shadow-offset-y" );
+XML_CONSTASCII_ACTION( sXML_shadow_slant, "shadow-slant");
+XML_CONSTASCII_ACTION( sXML_shadow_transparency , "shadow-transparency" );
+XML_CONSTASCII_ACTION( sXML_shape, "shape" );
+XML_CONSTASCII_ACTION( sXML_shapes, "shapes" );
+XML_CONSTASCII_ACTION( sXML_sheet_name, "sheet-name" );
+XML_CONSTASCII_ACTION( sXML_shininess, "shininess" );
+XML_CONSTASCII_ACTION( sXML_short, "short" );
+XML_CONSTASCII_ACTION( sXML_show, "show" );
+XML_CONSTASCII_ACTION( sXML_show_accepted_changes, "show-accepted-changes" );
+XML_CONSTASCII_ACTION( sXML_show_rejected_changes, "show-rejected-changes" );
+XML_CONSTASCII_ACTION( sXML_show_changes, "show-changes" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_author, "show-changes-by-author" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_author_name, "show-changes-by-author-name" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_comment, "show-changes-by-comment" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_comment_text, "show-changes-by-comment-text" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime, "show-changes-by-datetime" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime_mode, "show-changes-by-datetime-mode" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime_first_datetime, "show-changes-by-datetime-first-datetime" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime_second_datetime, "show-changes-by-datetime-second-datetime" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_ranges, "show-changes-by-ranges" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_ranges_list, "show-changes-by-ranges-list" );
+XML_CONSTASCII_ACTION( sXML_show_logo, "show-logo" );
+XML_CONSTASCII_ACTION( sXML_show_unit, "show-unit" );
+XML_CONSTASCII_ACTION( sXML_shows, "shows" );
+XML_CONSTASCII_ACTION( sXML_side_by_side, "side-by-side" );
+XML_CONSTASCII_ACTION( sXML_silver, "silver" );
+XML_CONSTASCII_ACTION( sXML_simple, "simple" );
+XML_CONSTASCII_ACTION( sXML_sin, "sin" );
+XML_CONSTASCII_ACTION( sXML_since_date_time, "since-date-time" );
+XML_CONSTASCII_ACTION( sXML_since_save, "since-save" );
+XML_CONSTASCII_ACTION( sXML_sinh, "sinh" );
+XML_CONSTASCII_ACTION( sXML_size, "size" );
+XML_CONSTASCII_ACTION( sXML_size_protect, "size-protect" );
+XML_CONSTASCII_ACTION( sXML_slide, "slide" );
+XML_CONSTASCII_ACTION( sXML_slow, "slow" );
+XML_CONSTASCII_ACTION( sXML_soft_page_break, "soft-page-break" );
+XML_CONSTASCII_ACTION( sXML_solid, "solid" );
+XML_CONSTASCII_ACTION( sXML_solid_type, "solid-type" );
+XML_CONSTASCII_ACTION( sXML_sort, "sort");
+XML_CONSTASCII_ACTION( sXML_sort_ascending, "sort-ascending" );
+XML_CONSTASCII_ACTION( sXML_sort_by, "sort-by");
+XML_CONSTASCII_ACTION( sXML_sort_by_position, "sort-by-position" );
+XML_CONSTASCII_ACTION( sXML_sort_groups, "sort-groups");
+XML_CONSTASCII_ACTION( sXML_sort_key, "sort-key");
+XML_CONSTASCII_ACTION( sXML_sort_by_x_values, "sort-by-x-values" );
+XML_CONSTASCII_ACTION( sXML_source_cell_range, "source-cell-range");
+XML_CONSTASCII_ACTION( sXML_source_cell_range_addresses, "source-cell-range-addresses");
+XML_CONSTASCII_ACTION( sXML_source_field_name, "source-field-name");
+XML_CONSTASCII_ACTION( sXML_source_name, "source-name");
+XML_CONSTASCII_ACTION( sXML_source_range_address, "source-range-address");
+XML_CONSTASCII_ACTION( sXML_source_service, "source-service");
+XML_CONSTASCII_ACTION( sXML_space_before, "space-before" );
+XML_CONSTASCII_ACTION( sXML_span, "span" );
+XML_CONSTASCII_ACTION( sXML_specular, "specular");
+XML_CONSTASCII_ACTION( sXML_specular_color, "specular-color" );
+XML_CONSTASCII_ACTION( sXML_sphere, "sphere" );
+XML_CONSTASCII_ACTION( sXML_spiralin_left, "spiralin-left" );
+XML_CONSTASCII_ACTION( sXML_spiralin_right, "spiralin-right" );
+XML_CONSTASCII_ACTION( sXML_spiralout_left, "spiralout-left" );
+XML_CONSTASCII_ACTION( sXML_spiralout_right, "spiralout-right" );
+XML_CONSTASCII_ACTION( sXML_splines, "splines" );
+XML_CONSTASCII_ACTION( sXML_split, "split" );
+XML_CONSTASCII_ACTION( sXML_split_column, "split-column" );
+XML_CONSTASCII_ACTION( sXML_split_position, "split-position" );
+XML_CONSTASCII_ACTION( sXML_split_row, "split-row" );
+XML_CONSTASCII_ACTION( sXML_spreadsheet , "spreadsheet" );
+XML_CONSTASCII_ACTION( sXML_sql_statement, "sql-statement");
+XML_CONSTASCII_ACTION( sXML_stacked, "stacked" );
+XML_CONSTASCII_ACTION( sXML_stagger_even, "stagger-even" );
+XML_CONSTASCII_ACTION( sXML_stagger_odd, "stagger-odd" );
+XML_CONSTASCII_ACTION( sXML_standard, "standard" );
+XML_CONSTASCII_ACTION( sXML_standard_deviation, "standard-deviation" );
+XML_CONSTASCII_ACTION( sXML_starbasic, "starbasic" );
+XML_CONSTASCII_ACTION( sXML_start, "start" );
+XML_CONSTASCII_ACTION( sXML_start_color, "start-color" );
+XML_CONSTASCII_ACTION( sXML_start_column, "start-column" );
+XML_CONSTASCII_ACTION( sXML_start_intensity, "start-intensity" );
+XML_CONSTASCII_ACTION( sXML_start_numbering_at, "start-numbering-at" );
+XML_CONSTASCII_ACTION( sXML_start_page, "start-page" );
+XML_CONSTASCII_ACTION( sXML_start_position, "start-position" );
+XML_CONSTASCII_ACTION( sXML_start_row, "start-row" );
+XML_CONSTASCII_ACTION( sXML_start_table, "start-table" );
+XML_CONSTASCII_ACTION( sXML_start_value, "start-value" );
+XML_CONSTASCII_ACTION( sXML_start_with_navigator, "start-with-navigator" );
+XML_CONSTASCII_ACTION( sXML_statistics, "statistics" );
+XML_CONSTASCII_ACTION( sXML_status, "status" );
+XML_CONSTASCII_ACTION( sXML_stay_on_top, "stay-on-top" );
+XML_CONSTASCII_ACTION( sXML_stdev, "stdev" );
+XML_CONSTASCII_ACTION( sXML_stdevp, "stdevp" );
+XML_CONSTASCII_ACTION( sXML_steps, "steps" );
+XML_CONSTASCII_ACTION( sXML_stock, "stock" );
+XML_CONSTASCII_ACTION( sXML_stock_updown_bars, "stock-updown-bars" );
+XML_CONSTASCII_ACTION( sXML_stock_with_volume, "stock-with-volume" );
+XML_CONSTASCII_ACTION( sXML_stop, "stop" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_bottom, "stretch-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_left, "stretch-from-left" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_right, "stretch-from-right" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_top, "stretch-from-top" );
+XML_CONSTASCII_ACTION( sXML_stretchy, "stretchy" );
+XML_CONSTASCII_ACTION( sXML_strict , "strict" );
+XML_CONSTASCII_ACTION( sXML_string, "string");
+XML_CONSTASCII_ACTION( sXML_string_value, "string-value");
+XML_CONSTASCII_ACTION( sXML_string_value_if_false, "string-value-if-false" );
+XML_CONSTASCII_ACTION( sXML_string_value_if_true, "string-value-if-true" );
+XML_CONSTASCII_ACTION( sXML_stroke , "stroke" );
+XML_CONSTASCII_ACTION( sXML_stroke_color , "stroke-color" );
+XML_CONSTASCII_ACTION( sXML_stroke_dash , "stroke-dash" );
+XML_CONSTASCII_ACTION( sXML_stroke_linejoin , "stroke-linejoin" );
+XML_CONSTASCII_ACTION( sXML_stroke_opacity, "stroke-opacity" );
+XML_CONSTASCII_ACTION( sXML_stroke_width, "stroke-width" );
+XML_CONSTASCII_ACTION( sXML_structure_protected, "structure-protected" );
+XML_CONSTASCII_ACTION( sXML_style, "style" );
+XML_CONSTASCII_ACTION( sXML_style_name, "style-name" );
+XML_CONSTASCII_ACTION( sXML_styles, "styles" );
+XML_CONSTASCII_ACTION( sXML_stylesheet, "stylesheet" );
+XML_CONSTASCII_ACTION( sXML_sub_table, "sub-table" );
+XML_CONSTASCII_ACTION( sXML_subject, "subject" );
+XML_CONSTASCII_ACTION( sXML_subset, "subset" );
+XML_CONSTASCII_ACTION( sXML_subtitle, "subtitle" );
+XML_CONSTASCII_ACTION( sXML_subtotal_field, "subtotal-field");
+XML_CONSTASCII_ACTION( sXML_subtotal_rule, "subtotal-rule");
+XML_CONSTASCII_ACTION( sXML_subtotal_rules, "subtotal-rules");
+XML_CONSTASCII_ACTION( sXML_suffix, "suffix" );
+XML_CONSTASCII_ACTION( sXML_sum, "sum" );
+XML_CONSTASCII_ACTION( sXML_swiss, "swiss" );
+XML_CONSTASCII_ACTION( sXML_symbol, "symbol" );
+XML_CONSTASCII_ACTION( sXML_symbol_height, "symbol-height" );
+XML_CONSTASCII_ACTION( sXML_symbol_image_name, "symbol-image-name" );
+XML_CONSTASCII_ACTION( sXML_symbol_width, "symbol-width" );
+XML_CONSTASCII_ACTION( sXML_system, "system" );
+XML_CONSTASCII_ACTION( sXML_tab_stop, "tab-stop" );
+XML_CONSTASCII_ACTION( sXML_tab_stops, "tab-stops" );
+XML_CONSTASCII_ACTION( sXML_table, "table" );
+XML_CONSTASCII_ACTION( sXML_tables, "tables" );
+XML_CONSTASCII_ACTION( sXML_table_background, "table-background" );
+XML_CONSTASCII_ACTION( sXML_table_cell, "table-cell" );
+XML_CONSTASCII_ACTION( sXML_table_centering, "table-centering" );
+XML_CONSTASCII_ACTION( sXML_table_column, "table-column" );
+XML_CONSTASCII_ACTION( sXML_table_column_group, "table-column-group" );
+XML_CONSTASCII_ACTION( sXML_table_columns, "table-columns" );
+XML_CONSTASCII_ACTION( sXML_table_count, "table-count" );
+XML_CONSTASCII_ACTION( sXML_table_header, "table-header" );
+XML_CONSTASCII_ACTION( sXML_table_header_columns, "table-header-columns" );
+XML_CONSTASCII_ACTION( sXML_table_header_rows, "table-header-rows" );
+XML_CONSTASCII_ACTION( sXML_table_index, "table-index" );
+XML_CONSTASCII_ACTION( sXML_table_index_entry_template, "table-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_table_index_source, "table-index-source" );
+XML_CONSTASCII_ACTION( sXML_table_name, "table-name");
+XML_CONSTASCII_ACTION( sXML_table_number_list, "table-number-list");
+XML_CONSTASCII_ACTION( sXML_table_of_content, "table-of-content" );
+XML_CONSTASCII_ACTION( sXML_table_of_content_entry_template, "table-of-content-entry-template" );
+XML_CONSTASCII_ACTION( sXML_table_of_content_source, "table-of-content-source" );
+XML_CONSTASCII_ACTION( sXML_table_page, "table-page" );
+XML_CONSTASCII_ACTION( sXML_table_row, "table-row" );
+XML_CONSTASCII_ACTION( sXML_table_row_group, "table-row-group" );
+XML_CONSTASCII_ACTION( sXML_table_rows, "table-rows" );
+XML_CONSTASCII_ACTION( sXML_table_source, "table-source" );
+XML_CONSTASCII_ACTION( sXML_table_view, "table-view" );
+XML_CONSTASCII_ACTION( sXML_tab_stop_distance, "tab-stop-distance" );
+XML_CONSTASCII_ACTION( sXML_tan, "tan" );
+XML_CONSTASCII_ACTION( sXML_tanh, "tanh" );
+XML_CONSTASCII_ACTION( sXML_target_cell_address, "target-cell-address");
+XML_CONSTASCII_ACTION( sXML_target_frame_name, "target-frame-name" );
+XML_CONSTASCII_ACTION( sXML_target_range_address, "target-range-address");
+XML_CONSTASCII_ACTION( sXML_tb_rl, "tb-rl" );
+XML_CONSTASCII_ACTION( sXML_teal, "teal" );
+XML_CONSTASCII_ACTION( sXML_techreport, "techreport" );
+XML_CONSTASCII_ACTION( sXML_template, "template" );
+XML_CONSTASCII_ACTION( sXML_template_name, "template-name" );
+XML_CONSTASCII_ACTION( sXML_tendsto, "tendsto" );
+XML_CONSTASCII_ACTION( sXML_tex_filter, "texture-filter" );
+XML_CONSTASCII_ACTION( sXML_tex_generation_mode_x, "texture-generation-mode-x" );
+XML_CONSTASCII_ACTION( sXML_tex_generation_mode_y, "texture-generation-mode-y" );
+XML_CONSTASCII_ACTION( sXML_tex_kind, "texture-kind" );
+XML_CONSTASCII_ACTION( sXML_tex_mode, "texture-mode" );
+XML_CONSTASCII_ACTION( sXML_text, "text" );
+XML_CONSTASCII_ACTION( sXML_text_align, "text-align" );
+XML_CONSTASCII_ACTION( sXML_text_align_last, "text-align-last" );
+XML_CONSTASCII_ACTION( sXML_text_align_source, "text-align-source" );
+XML_CONSTASCII_ACTION( sXML_text_autospace, "text-autospace" );
+XML_CONSTASCII_ACTION( sXML_text_background_color, "text-background-color" );
+XML_CONSTASCII_ACTION( sXML_text_blinking, "text-blinking" );
+XML_CONSTASCII_ACTION( sXML_text_box, "text-box" );
+XML_CONSTASCII_ACTION( sXML_text_combine, "text-combine" );
+XML_CONSTASCII_ACTION( sXML_text_combine_end_char, "text-combine-end-char" );
+XML_CONSTASCII_ACTION( sXML_text_combine_start_char, "text-combine-start-char" );
+XML_CONSTASCII_ACTION( sXML_text_content, "text-content" );
+XML_CONSTASCII_ACTION( sXML_text_crossing_out, "text-crossing-out" );
+XML_CONSTASCII_ACTION( sXML_text_emphasize, "text-emphasize" );
+XML_CONSTASCII_ACTION( sXML_text_global, "text-global" );
+XML_CONSTASCII_ACTION( sXML_text_indent, "text-indent" );
+XML_CONSTASCII_ACTION( sXML_text_input, "text-input" );
+XML_CONSTASCII_ACTION( sXML_text_outline, "text-outline" );
+XML_CONSTASCII_ACTION( sXML_text_position, "text-position" );
+XML_CONSTASCII_ACTION( sXML_text_rotation_angle, "text-rotation-angle" );
+XML_CONSTASCII_ACTION( sXML_text_rotation_scale, "text-rotation-scale" );
+XML_CONSTASCII_ACTION( sXML_text_scale, "text-scale" );
+XML_CONSTASCII_ACTION( sXML_text_shadow, "text-shadow" );
+XML_CONSTASCII_ACTION( sXML_text_style, "text-style" );
+XML_CONSTASCII_ACTION( sXML_text_transform, "text-transform" );
+XML_CONSTASCII_ACTION( sXML_text_underline, "text-underline" );
+XML_CONSTASCII_ACTION( sXML_text_underline_color, "text-underline-color" );
+XML_CONSTASCII_ACTION( sXML_textarea_horizontal_align, "textarea-horizontal-align" );
+XML_CONSTASCII_ACTION( sXML_textarea_vertical_align, "textarea-vertical-align" );
+XML_CONSTASCII_ACTION( sXML_textual, "textual" );
+XML_CONSTASCII_ACTION( sXML_thick, "thick" );
+XML_CONSTASCII_ACTION( sXML_thin, "thin" );
+XML_CONSTASCII_ACTION( sXML_three_dimensional, "three-dimensional" );
+XML_CONSTASCII_ACTION( sXML_thumbnail, "thumbnail" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_major_inner, "tick-marks-major-inner" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_major_outer, "tick-marks-major-outer" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_minor_inner, "tick-marks-minor-inner" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_minor_outer, "tick-marks-minor-outer" );
+XML_CONSTASCII_ACTION( sXML_tile_repeat_offset, "tile-repeat-offset" );
+XML_CONSTASCII_ACTION( sXML_time, "time");
+XML_CONSTASCII_ACTION( sXML_time_adjust, "time-adjust" );
+XML_CONSTASCII_ACTION( sXML_time_style, "time-style" );
+XML_CONSTASCII_ACTION( sXML_time_value, "time-value");
+XML_CONSTASCII_ACTION( sXML_times, "times");
+XML_CONSTASCII_ACTION( sXML_title, "title" );
+XML_CONSTASCII_ACTION( sXML_to_another_table, "to-another-table" );
+XML_CONSTASCII_ACTION( sXML_toc_mark, "toc-mark" );
+XML_CONSTASCII_ACTION( sXML_toc_mark_end, "toc-mark-end" );
+XML_CONSTASCII_ACTION( sXML_toc_mark_start, "toc-mark-start" );
+XML_CONSTASCII_ACTION( sXML_top, "top" );
+XML_CONSTASCII_ACTION( sXML_top_percent, "top percent");
+XML_CONSTASCII_ACTION( sXML_top_values, "top values");
+XML_CONSTASCII_ACTION( sXML_trace_dependents, "trace-dependents" );
+XML_CONSTASCII_ACTION( sXML_trace_errors, "trace-errors" );
+XML_CONSTASCII_ACTION( sXML_trace_precedents, "trace-precedents" );
+XML_CONSTASCII_ACTION( sXML_track_changes, "track-changes" );
+XML_CONSTASCII_ACTION( sXML_tracked_changes, "tracked-changes" );
+XML_CONSTASCII_ACTION( sXML_tracked_changes_view_settings, "tracked-changes-view-settings" );
+XML_CONSTASCII_ACTION( sXML_transform , "transform" );
+XML_CONSTASCII_ACTION( sXML_transition_on_click, "transition-on-click" );
+XML_CONSTASCII_ACTION( sXML_transparency, "transparency" );
+XML_CONSTASCII_ACTION( sXML_transparency_name, "transparency-name" );
+XML_CONSTASCII_ACTION( sXML_transparent, "transparent" );
+XML_CONSTASCII_ACTION( sXML_transpose, "transpose" );
+XML_CONSTASCII_ACTION( sXML_true, "true" );
+XML_CONSTASCII_ACTION( sXML_truncate_on_overflow, "truncate-on-overflow" );
+XML_CONSTASCII_ACTION( sXML_ttb, "ttb");
+XML_CONSTASCII_ACTION( sXML_type, "type" );
+XML_CONSTASCII_ACTION( sXML_underline_bold, "bold" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dash, "bold-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dot_dash, "bold-dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dot_dot_dash, "bold-dot-dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dotted, "bold-dotted" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_long_dash, "bold-long-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_wave, "bold-wave" );
+XML_CONSTASCII_ACTION( sXML_underline_dash, "dash" );
+XML_CONSTASCII_ACTION( sXML_underline_dot_dash, "dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_dot_dot_dash, "dot-dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_dotted, "dotted" );
+XML_CONSTASCII_ACTION( sXML_underline_double, "double" );
+XML_CONSTASCII_ACTION( sXML_underline_double_wave, "double-wave" );
+XML_CONSTASCII_ACTION( sXML_underline_long_dash, "long-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_none, "none" );
+XML_CONSTASCII_ACTION( sXML_underline_single, "single" );
+XML_CONSTASCII_ACTION( sXML_underline_small_wave, "small-wave" );
+XML_CONSTASCII_ACTION( sXML_underline_wave, "wave" );
+XML_CONSTASCII_ACTION( sXML_unformatted_text, "unformatted-text" );
+XML_CONSTASCII_ACTION( sXML_union, "union" );
+XML_CONSTASCII_ACTION( sXML_unit, "unit" );
+XML_CONSTASCII_ACTION( sXML_unordered_list, "unordered-list" );
+XML_CONSTASCII_ACTION( sXML_unpublished, "unpublished" );
+XML_CONSTASCII_ACTION( sXML_uplimit, "uplimit" );
+XML_CONSTASCII_ACTION( sXML_url, "url" );
+XML_CONSTASCII_ACTION( sXML_use_caption, "use-caption" );
+XML_CONSTASCII_ACTION( sXML_use_cell_protection, "use-cell-protection" );
+XML_CONSTASCII_ACTION( sXML_use_chart_objects, "use-chart-objects" );
+XML_CONSTASCII_ACTION( sXML_use_condition, "use-condition" );
+XML_CONSTASCII_ACTION( sXML_use_draw_objects, "use-draw-objects" );
+XML_CONSTASCII_ACTION( sXML_use_floating_frames, "use-floating-frames" );
+XML_CONSTASCII_ACTION( sXML_use_graphics, "use-graphics" );
+XML_CONSTASCII_ACTION( sXML_use_image_objects, "use-image-objects" );
+XML_CONSTASCII_ACTION( sXML_use_index_marks, "use-index-marks" );
+XML_CONSTASCII_ACTION( sXML_use_index_source_styles, "use-index-source-styles" );
+XML_CONSTASCII_ACTION( sXML_use_keys_as_entries, "use-keys-as-entries" );
+XML_CONSTASCII_ACTION( sXML_use_label, "use-label" );
+XML_CONSTASCII_ACTION( sXML_use_math_objects, "use-math-objects" );
+XML_CONSTASCII_ACTION( sXML_use_objects, "use-objects" );
+XML_CONSTASCII_ACTION( sXML_use_optimal_column_width, "use-optimal-column-width");
+XML_CONSTASCII_ACTION( sXML_use_optimal_row_height, "use-optimal-row-height");
+XML_CONSTASCII_ACTION( sXML_use_other_objects, "use-other-objects" );
+XML_CONSTASCII_ACTION( sXML_use_soft_page_breaks, "use-soft-page-breaks" );
+XML_CONSTASCII_ACTION( sXML_use_spreadsheet_objects, "use-spreadsheet-objects" );
+XML_CONSTASCII_ACTION( sXML_use_styles, "use-styles" );
+XML_CONSTASCII_ACTION( sXML_use_tables, "use-tables" );
+XML_CONSTASCII_ACTION( sXML_use_window_font_color, "use-window-font-color" );
+XML_CONSTASCII_ACTION( sXML_used_hierarchy, "used-hierarchy");
+XML_CONSTASCII_ACTION( sXML_user_defined, "user-defined" );
+XML_CONSTASCII_ACTION( sXML_user_field_decl, "user-field-decl" );
+XML_CONSTASCII_ACTION( sXML_user_field_decls, "user-field-decls" );
+XML_CONSTASCII_ACTION( sXML_user_field_get, "user-field-get" );
+XML_CONSTASCII_ACTION( sXML_user_field_input, "user-field-input" );
+XML_CONSTASCII_ACTION( sXML_user_index, "user-index" );
+XML_CONSTASCII_ACTION( sXML_user_index_entry_template, "user-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_user_index_mark, "user-index-mark" );
+XML_CONSTASCII_ACTION( sXML_user_index_mark_end, "user-index-mark-end" );
+XML_CONSTASCII_ACTION( sXML_user_index_mark_start, "user-index-mark-start" );
+XML_CONSTASCII_ACTION( sXML_user_index_source, "user-index-source" );
+XML_CONSTASCII_ACTION( sXML_user_transformed, "user-transformed" );
+XML_CONSTASCII_ACTION( sXML_username, "username");
+XML_CONSTASCII_ACTION( sXML_value, "value");
+XML_CONSTASCII_ACTION( sXML_value_type, "value-type");
+XML_CONSTASCII_ACTION( sXML_values_cell_range_address, "values-cell-range-address" );
+XML_CONSTASCII_ACTION( sXML_var, "var" );
+XML_CONSTASCII_ACTION( sXML_variable, "variable" );
+XML_CONSTASCII_ACTION( sXML_variable_decl, "variable-decl" );
+XML_CONSTASCII_ACTION( sXML_variable_decls, "variable-decls" );
+XML_CONSTASCII_ACTION( sXML_variable_get, "variable-get" );
+XML_CONSTASCII_ACTION( sXML_variable_input, "variable-input" );
+XML_CONSTASCII_ACTION( sXML_variable_set, "variable-set" );
+XML_CONSTASCII_ACTION( sXML_variance, "variance" );
+XML_CONSTASCII_ACTION( sXML_varp, "varp" );
+XML_CONSTASCII_ACTION( sXML_vector, "vector" );
+XML_CONSTASCII_ACTION( sXML_verb, "verb" );
+XML_CONSTASCII_ACTION( sXML_version, "version" );
+XML_CONSTASCII_ACTION( sXML_version_entry, "version-entry" );
+XML_CONSTASCII_ACTION( sXML_version_list, "version-list" );
+XML_CONSTASCII_ACTION( sXML_vertical, "vertical" );
+XML_CONSTASCII_ACTION( sXML_vertical_align, "vertical-align" );
+XML_CONSTASCII_ACTION( sXML_vertical_lines, "vertical-lines" );
+XML_CONSTASCII_ACTION( sXML_vertical_pos, "vertical-pos" );
+XML_CONSTASCII_ACTION( sXML_vertical_rel, "vertical-rel" );
+XML_CONSTASCII_ACTION( sXML_vertical_segments, "vertical-segments" );
+XML_CONSTASCII_ACTION( sXML_vertical_split_mode, "vertical-split-mode" );
+XML_CONSTASCII_ACTION( sXML_vertical_split_position, "vertical-split-position" );
+XML_CONSTASCII_ACTION( sXML_vertical_stripes, "vertical-stripes" );
+XML_CONSTASCII_ACTION( sXML_view, "view" );
+XML_CONSTASCII_ACTION( sXML_viewBox, "viewBox" );
+XML_CONSTASCII_ACTION( sXML_view_id, "view-id" );
+XML_CONSTASCII_ACTION( sXML_view_settings, "view-settings" );
+XML_CONSTASCII_ACTION( sXML_visibility, "visibility" );
+XML_CONSTASCII_ACTION( sXML_visible, "visible" );
+XML_CONSTASCII_ACTION( sXML_visible_area, "visible-area" );
+XML_CONSTASCII_ACTION( sXML_visible_area_height, "visible-area-height" );
+XML_CONSTASCII_ACTION( sXML_visible_area_left, "visible-area-left" );
+XML_CONSTASCII_ACTION( sXML_visible_area_top, "visible-area-top" );
+XML_CONSTASCII_ACTION( sXML_visible_area_width, "visible-area-width" );
+XML_CONSTASCII_ACTION( sXML_visited_style_name, "visited-style-name" );
+XML_CONSTASCII_ACTION( sXML_volatile, "volatile" );
+XML_CONSTASCII_ACTION( sXML_volume, "volume" );
+XML_CONSTASCII_ACTION( sXML_vpn, "vpn");
+XML_CONSTASCII_ACTION( sXML_vrp, "vrp");
+XML_CONSTASCII_ACTION( sXML_vup, "vup");
+XML_CONSTASCII_ACTION( sXML_wall, "wall" );
+XML_CONSTASCII_ACTION( sXML_warning, "warning" );
+XML_CONSTASCII_ACTION( sXML_watermark, "watermark" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_bottom, "wavyline-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_left, "wavyline-from-left" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_right, "wavyline-from-right" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_top, "wavyline-from-top" );
+XML_CONSTASCII_ACTION( sXML_week_of_year, "week-of-year" );
+XML_CONSTASCII_ACTION( sXML_weight_bold, "bold" );
+XML_CONSTASCII_ACTION( sXML_weight_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_white, "white" );
+XML_CONSTASCII_ACTION( sXML_whole_page, "whole-page" );
+XML_CONSTASCII_ACTION( sXML_widows, "widows" );
+XML_CONSTASCII_ACTION( sXML_width, "width" );
+XML_CONSTASCII_ACTION( sXML_word, "word" );
+XML_CONSTASCII_ACTION( sXML_word_count, "word-count" );
+XML_CONSTASCII_ACTION( sXML_wrap, "wrap" );
+XML_CONSTASCII_ACTION( sXML_wrap_contour, "wrap-contour" );
+XML_CONSTASCII_ACTION( sXML_wrap_contour_mode, "wrap-contour-mode" );
+XML_CONSTASCII_ACTION( sXML_wrap_option, "wrap-option" );
+XML_CONSTASCII_ACTION( sXML_writing_mode, "writing-mode" );
+XML_CONSTASCII_ACTION( sXML_www, "www" );
+XML_CONSTASCII_ACTION( sXML_x, "x" );
+XML_CONSTASCII_ACTION( sXML_x1, "x1" );
+XML_CONSTASCII_ACTION( sXML_x2, "x2" );
+XML_CONSTASCII_ACTION( sXML_x_mac_roman, "x-mac-roman" );
+XML_CONSTASCII_ACTION( sXML_x_symbol, "x-symbol" );
+XML_CONSTASCII_ACTION( sXML_x_system, "x-system" );
+XML_CONSTASCII_ACTION( sXML_xor, "xor" );
+XML_CONSTASCII_ACTION( sXML_y, "y" );
+XML_CONSTASCII_ACTION( sXML_y1, "y1" );
+XML_CONSTASCII_ACTION( sXML_y2, "y2" );
+XML_CONSTASCII_ACTION( sXML_year, "year" );
+XML_CONSTASCII_ACTION( sXML_yellow, "yellow" );
+XML_CONSTASCII_ACTION( sXML_zero_values, "zero-values" );
+XML_CONSTASCII_ACTION( sXML_zindex, "z-index" );
+XML_CONSTASCII_ACTION( sXML_zoom_type, "zoom-type" );
+XML_CONSTASCII_ACTION( sXML_zoom_value, "zoom-value" );
+
+XML_CONSTASCII_ACTION( sXML_start_shape, "start-shape");
+XML_CONSTASCII_ACTION( sXML_start_glue_point, "start-glue-point");
+XML_CONSTASCII_ACTION( sXML_end_shape, "end-shape");
+XML_CONSTASCII_ACTION( sXML_end_glue_point, "end-glue-point");
+XML_CONSTASCII_ACTION( sXML_line_number, "line-number");
+XML_CONSTASCII_ACTION( sXML_line_skew, "line-skew");
+XML_CONSTASCII_ACTION( sXML_curve, "curve" );
+XML_CONSTASCII_ACTION( sXML_start_line_spacing_horizontal, "start-line-spacing-horizontal" );
+XML_CONSTASCII_ACTION( sXML_start_line_spacing_vertical, "start-line-spacing-vertical" );
+XML_CONSTASCII_ACTION( sXML_end_line_spacing_horizontal, "end-line-spacing-horizontal" );
+XML_CONSTASCII_ACTION( sXML_end_line_spacing_vertical, "end-line-spacing-vertical" );
+XML_CONSTASCII_ACTION( sXML_line_distance, "line-distance" );
+XML_CONSTASCII_ACTION( sXML_guide_overhang, "guide-overhang" );
+XML_CONSTASCII_ACTION( sXML_guide_distance, "guide-distance" );
+XML_CONSTASCII_ACTION( sXML_start_guide, "start-guide" );
+XML_CONSTASCII_ACTION( sXML_end_guide, "end-guide" );
+
+XML_CONSTASCII_ACTION( sXML_dots1, "dots1" );
+XML_CONSTASCII_ACTION( sXML_dots1_length, "dots1-length" );
+XML_CONSTASCII_ACTION( sXML_dots2, "dots2" );
+XML_CONSTASCII_ACTION( sXML_dots2_length, "dots2-length" );
+XML_CONSTASCII_ACTION( sXML_enable_numbering, "enable-numbering" );
+
+XML_CONSTASCII_ACTION( sXML_top_left, "top-left" );
+XML_CONSTASCII_ACTION( sXML_top_right, "top-right" );
+XML_CONSTASCII_ACTION( sXML_bottom_left, "bottom-left" );
+XML_CONSTASCII_ACTION( sXML_bottom_right, "bottom-right" );
+
+XML_CONSTASCII_ACTION( sXML_fill_image_ref_point,   "fill-image-ref-point" );
+XML_CONSTASCII_ACTION( sXML_fill_image_ref_point_x, "fill-image-ref-point-x" );
+XML_CONSTASCII_ACTION( sXML_fill_image_ref_point_y, "fill-image-ref-point-y" );
+
+XML_CONSTASCII_ACTION( sXML_from_right, "from-right" );
+XML_CONSTASCII_ACTION( sXML_from_bottom, "from-bottom" );
+XML_CONSTASCII_ACTION( sXML_from_center, "from-center" );
+XML_CONSTASCII_ACTION( sXML_from_upper_left, "from-upper-left" );
+XML_CONSTASCII_ACTION( sXML_from_upper_right, "from-upper-right" );
+XML_CONSTASCII_ACTION( sXML_from_lower_left, "from-lower-left" );
+XML_CONSTASCII_ACTION( sXML_from_lower_right, "from-lower-right" );
+XML_CONSTASCII_ACTION( sXML_to_left, "to-left" );
+XML_CONSTASCII_ACTION( sXML_to_top, "to-top" );
+XML_CONSTASCII_ACTION( sXML_to_right, "to-right" );
+XML_CONSTASCII_ACTION( sXML_to_bottom, "to-bottom" );
+XML_CONSTASCII_ACTION( sXML_to_upper_left, "to-upper-left" );
+XML_CONSTASCII_ACTION( sXML_to_upper_right, "to-upper-right" );
+XML_CONSTASCII_ACTION( sXML_to_lower_right, "to-lower-right" );
+XML_CONSTASCII_ACTION( sXML_to_lower_left, "to-lower-left" );
+XML_CONSTASCII_ACTION( sXML_to_center, "to-center" );
+XML_CONSTASCII_ACTION( sXML_counter_clockwise, "counter-clockwise" );
+
+XML_CONSTASCII_ACTION( sXML_fade, "fade" );
+XML_CONSTASCII_ACTION( sXML_move, "move" );
+XML_CONSTASCII_ACTION( sXML_stripes, "stripes" );
+XML_CONSTASCII_ACTION( sXML_spiral_inward_left, "spiral-inward-left" );
+XML_CONSTASCII_ACTION( sXML_spiral_inward_right, "spiral-inward-right" );
+XML_CONSTASCII_ACTION( sXML_spiral_outward_left, "spiral-outward-left" );
+XML_CONSTASCII_ACTION( sXML_spiral_outward_right, "spiral-outward-right" );
+XML_CONSTASCII_ACTION( sXML_spiral, "spiral" );
+XML_CONSTASCII_ACTION( sXML_spiral_in, "spiral-in" );
+XML_CONSTASCII_ACTION( sXML_spiral_out, "spiral-out" );
+XML_CONSTASCII_ACTION( sXML_wavyline, "wavyline" );
+XML_CONSTASCII_ACTION( sXML_laser, "laser" );
+XML_CONSTASCII_ACTION( sXML_appear, "appear" );
+XML_CONSTASCII_ACTION( sXML_hide, "hide" );
+XML_CONSTASCII_ACTION( sXML_move_short, "move-short" );
+XML_CONSTASCII_ACTION( sXML_checkerboard, "checkerboard" );
+XML_CONSTASCII_ACTION( sXML_stretch, "stretch" );
+
+XML_CONSTASCII_ACTION( sXML_shape_id, "shape-id" );
+XML_CONSTASCII_ACTION( sXML_effect, "effect" );
+XML_CONSTASCII_ACTION( sXML_speed, "speed" );
+XML_CONSTASCII_ACTION( sXML_start_scale, "start-scale" );
+XML_CONSTASCII_ACTION( sXML_show_shape, "show-shape" );
+XML_CONSTASCII_ACTION( sXML_show_text, "show-text" );
+XML_CONSTASCII_ACTION( sXML_hide_shape, "hide-shape" );
+XML_CONSTASCII_ACTION( sXML_hide_text, "hide-text" );
+XML_CONSTASCII_ACTION( sXML_dim, "dim" );
+XML_CONSTASCII_ACTION( sXML_sound, "sound" );
+XML_CONSTASCII_ACTION( sXML_play_full, "play-full" );
+XML_CONSTASCII_ACTION( sXML_path_id, "path-id" );
+
+XML_CONSTASCII_ACTION( sXML_animations, "animations" );
+
+XML_CONSTASCII_ACTION( sXML_kind, "kind" );
+XML_CONSTASCII_ACTION( sXML_start_angle, "start-angle" );
+XML_CONSTASCII_ACTION( sXML_cut, "cut" );
+XML_CONSTASCII_ACTION( sXML_arc, "arc" );
+
+XML_CONSTASCII_ACTION( sXML_upright, "upright" );
+XML_CONSTASCII_ACTION( sXML_slant_x, "slant-x" );
+XML_CONSTASCII_ACTION( sXML_slant_y, "slant-y" );
+XML_CONSTASCII_ACTION( sXML_autosize, "autosize" );
+XML_CONSTASCII_ACTION( sXML_slant, "slant" );
+XML_CONSTASCII_ACTION( sXML_topcircle, "top-circle" );
+XML_CONSTASCII_ACTION( sXML_bottomcircle, "bottom-circle" );
+XML_CONSTASCII_ACTION( sXML_leftcircle, "left-circle" );
+XML_CONSTASCII_ACTION( sXML_rightcircle, "right-circle" );
+XML_CONSTASCII_ACTION( sXML_toparc, "top-arc" );
+XML_CONSTASCII_ACTION( sXML_bottomarc, "bottom-arc" );
+XML_CONSTASCII_ACTION( sXML_leftarc, "left-arc" );
+XML_CONSTASCII_ACTION( sXML_rightarc, "right-arc" );
+XML_CONSTASCII_ACTION( sXML_button1, "button1" );
+XML_CONSTASCII_ACTION( sXML_button2, "button2" );
+XML_CONSTASCII_ACTION( sXML_button3, "button3" );
+XML_CONSTASCII_ACTION( sXML_button4, "button4" );
+
+XML_CONSTASCII_ACTION( sXML_caption_type, "caption-type" );
+XML_CONSTASCII_ACTION( sXML_caption_angle_type, "caption-angle-type" );
+XML_CONSTASCII_ACTION( sXML_caption_angle, "caption-angle" );
+XML_CONSTASCII_ACTION( sXML_caption_gap, "caption-gap" );
+XML_CONSTASCII_ACTION( sXML_caption_escape_direction, "caption-escape-direction" );
+XML_CONSTASCII_ACTION( sXML_caption_escape, "caption-escape" );
+XML_CONSTASCII_ACTION( sXML_caption_line_length, "caption-line-length" );
+XML_CONSTASCII_ACTION( sXML_caption_fit_line_length, "caption-fit-line-length" );
+XML_CONSTASCII_ACTION( sXML_free, "free" );
+
+XML_CONSTASCII_ACTION( sXML_straight_line, "straight-line" );
+XML_CONSTASCII_ACTION( sXML_angled_line, "angled-line" );
+XML_CONSTASCII_ACTION( sXML_angled_connector_line, "angled-connector-line" );
+
+XML_CONSTASCII_ACTION( sXML_data_source_has_labels, "data-source-has-labels" );
+
+XML_CONSTASCII_ACTION( sXML_play, "play" );
+XML_CONSTASCII_ACTION( sXML_handout_master, "handout-master" );
+
+XML_CONSTASCII_ACTION( sXML_escape_direction, "escape-direction" );
+XML_CONSTASCII_ACTION( sXML_glue_point, "glue-point" );
+
+XML_CONSTASCII_ACTION( sXML_text_style_name, "text-style-name" );
+
+XML_CONSTASCII_ACTION( sXML_sort_algorithm, "sort-algorithm" );
+XML_CONSTASCII_ACTION( sXML_roll_from_top, "roll-from-top" );
+
+XML_CONSTASCII_ACTION( sXML_script_data, "script-data" );
+XML_CONSTASCII_ACTION( sXML_libraries, "libraries" );
+XML_CONSTASCII_ACTION( sXML_source_code, "source-code" );
+XML_CONSTASCII_ACTION( sXML_readonly, "readonly" );
+
+XML_CONSTASCII_ACTION( sXML_page_continuation, "page-continuation" );
+
+XML_CONSTASCII_ACTION( sXML_contains, "contains" );
+XML_CONSTASCII_ACTION( sXML_does_not_contain, "does-not-contain" );
+XML_CONSTASCII_ACTION( sXML_begins_with, "begins-with" );
+XML_CONSTASCII_ACTION( sXML_does_not_begin_with, "does-not-begin-with" );
+XML_CONSTASCII_ACTION( sXML_ends_with, "ends-with" );
+XML_CONSTASCII_ACTION( sXML_does_not_end_with, "does-not-end-with" );
+
+#endif
diff --git a/xmloff/inc/xmlnmspe.hxx b/xmloff/inc/xmloff/xmlnmspe.hxx
index 7b7b7e131ec7..7b7b7e131ec7 100644
--- a/xmloff/inc/xmlnmspe.hxx
+++ b/xmloff/inc/xmloff/xmlnmspe.hxx
diff --git a/xmloff/inc/xmlreg.hxx b/xmloff/inc/xmloff/xmlreg.hxx
index 5b835630ab03..5b835630ab03 100644
--- a/xmloff/inc/xmlreg.hxx
+++ b/xmloff/inc/xmloff/xmlreg.hxx
diff --git a/xmloff/inc/xmltabe.hxx b/xmloff/inc/xmloff/xmltabe.hxx
index 988261eb5768..988261eb5768 100644
--- a/xmloff/inc/xmltabe.hxx
+++ b/xmloff/inc/xmloff/xmltabe.hxx
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index e007776ba71f..da30b5e20dd2 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -37,7 +37,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 
 // ------------------------------------------------------------------------
diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst
index 8d60a0f0541b..6f677525dbbb 100644
--- a/xmloff/prj/build.lst
+++ b/xmloff/prj/build.lst
@@ -1,18 +1,5 @@
 xo	xmloff	:	offapi svl vos NULL
-xo	xmloff									usr1	-	all	xo_mkout NULL
-xo	xmloff\prj								get		-	all	xo_prj NULL
-xo	xmloff\inc								nmake	-	all	xo_inc NULL
-xo	xmloff\source\core						nmake	-	all	xo_core xo_inc NULL
-xo	xmloff\source\meta						nmake	-	all	xo_meta xo_inc NULL
-xo	xmloff\source\style						nmake	-	all	xo_style xo_inc NULL
-xo	xmloff\source\text						nmake	-	all	xo_text xo_inc NULL
-xo	xmloff\source\draw						nmake	-	all	xo_draw xo_inc NULL
-xo	xmloff\source\chart						nmake	-	all	xo_chart xo_inc NULL
-xo	xmloff\source\forms						nmake	-	all	xo_forms xo_inc NULL
-xo	xmloff\source\forms\handler             nmake   -   all xo_forms_handler xo_inc NULL
-xo	xmloff\source\script					nmake	-	all	xo_script xo_inc NULL
-xo  xmloff\source\transform                 nmake   -   all xo_transform xo_util xo_inc NULL
-xo  xmloff\source\xforms                    nmake   -   all xo_xforms xo_inc NULL
-xo  xmloff\source\table						nmake   -   all xo_table xo_inc NULL
-xo  xmloff\util                             nmake   -   all xo_util xo_chart xo_core xo_draw xo_forms xo_forms_handler xo_meta xo_script xo_style xo_text xo_xforms xo_table NULL
+zxo	xmloff\prj								nmake	-	all	xo_prj NULL
+
 xo xmloff\qa\unoapi nmake - all xo_qa_unoapi NULL
+
diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst
index 9bbfe05f3ac4..e69de29bb2d1 100644
--- a/xmloff/prj/d.lst
+++ b/xmloff/prj/d.lst
@@ -1,120 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\xmloff
-
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib
-..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib
-..\%__SRC%\lib\libxol.a %_DEST%\lib%_EXT%\libxol.a
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\dtd\* %_DEST%\bin%_EXT%
-
-..\inc\xmloff\odffields.hxx %_DEST%\inc%_EXT%\xmloff\odffields.hxx
-..\inc\xmloff\dllapi.h %_DEST%\inc%_EXT%\xmloff\dllapi.h
-..\inc\xmloff\attrlist.hxx %_DEST%\inc%_EXT%\xmloff\attrlist.hxx
-..\inc\i18nmap.hxx %_DEST%\inc%_EXT%\xmloff\i18nmap.hxx
-..\inc\xmloff\nmspmap.hxx %_DEST%\inc%_EXT%\xmloff\nmspmap.hxx
-..\inc\unoatrcn.hxx %_DEST%\inc%_EXT%\xmloff\unoatrcn.hxx
-..\inc\xmloff\xmlcnimp.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnimp.hxx
-..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnitm.hxx
-..\inc\xmloff\xmlement.hxx %_DEST%\inc%_EXT%\xmloff\xmlement.hxx
-..\inc\xmloff\xmlictxt.hxx %_DEST%\inc%_EXT%\xmloff\xmlictxt.hxx
-..\inc\xmloff\xmlimp.hxx %_DEST%\inc%_EXT%\xmloff\xmlimp.hxx
-..\inc\xmloff\xmlmetae.hxx %_DEST%\inc%_EXT%\xmloff\xmlmetae.hxx
-..\inc\xmloff\xmlmetai.hxx %_DEST%\inc%_EXT%\xmloff\xmlmetai.hxx
-..\inc\xmloff\xmlscripti.hxx %_DEST%\inc%_EXT%\xmloff\xmlscripti.hxx
-..\inc\xmloff\xmlstyle.hxx %_DEST%\inc%_EXT%\xmloff\xmlstyle.hxx
-..\inc\xmloff\xmltkmap.hxx %_DEST%\inc%_EXT%\xmloff\xmltkmap.hxx
-..\inc\xmloff\xmluconv.hxx %_DEST%\inc%_EXT%\xmloff\xmluconv.hxx
-..\inc\xmlnmspe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnmspe.hxx
-..\inc\xmloff\xmlnumfi.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumfi.hxx
-..\inc\xmloff\xmlnumfe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumfe.hxx
-..\inc\xmloff\xmlexp.hxx %_DEST%\inc%_EXT%\xmloff\xmlexp.hxx
-..\inc\xmlreg.hxx %_DEST%\inc%_EXT%\xmloff\xmlreg.hxx
-..\inc\xmloff\xmlnumi.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumi.hxx
-..\inc\xmloff\xmlnume.hxx %_DEST%\inc%_EXT%\xmloff\xmlnume.hxx
-..\inc\xmltabe.hxx %_DEST%\inc%_EXT%\xmloff\xmltabe.hxx
-..\inc\xmloff\maptype.hxx %_DEST%\inc%_EXT%\xmloff\maptype.hxx
-..\inc\xmloff\uniref.hxx %_DEST%\inc%_EXT%\xmloff\uniref.hxx
-..\inc\xmloff\xmlaustp.hxx %_DEST%\inc%_EXT%\xmloff\xmlaustp.hxx
-..\inc\xmloff\xmlexppr.hxx %_DEST%\inc%_EXT%\xmloff\xmlexppr.hxx
-..\inc\xmloff\xmlimppr.hxx %_DEST%\inc%_EXT%\xmloff\xmlimppr.hxx
-..\inc\xmloff\xmlprcon.hxx %_DEST%\inc%_EXT%\xmloff\xmlprcon.hxx
-..\inc\xmloff\xmlprhdl.hxx %_DEST%\inc%_EXT%\xmloff\xmlprhdl.hxx
-..\inc\xmloff\xmlprmap.hxx %_DEST%\inc%_EXT%\xmloff\xmlprmap.hxx
-..\inc\xmloff\xmltypes.hxx %_DEST%\inc%_EXT%\xmloff\xmltypes.hxx
-..\inc\xmloff\families.hxx %_DEST%\inc%_EXT%\xmloff\families.hxx
-..\inc\xmloff\styleexp.hxx %_DEST%\inc%_EXT%\xmloff\styleexp.hxx
-..\inc\xmloff\txtstyle.hxx %_DEST%\inc%_EXT%\xmloff\txtstyle.hxx
-..\inc\xmloff\prstylei.hxx %_DEST%\inc%_EXT%\xmloff\prstylei.hxx
-..\inc\xmloff\txtstyli.hxx %_DEST%\inc%_EXT%\xmloff\txtstyli.hxx
-..\inc\xmloff\txtprmap.hxx %_DEST%\inc%_EXT%\xmloff\txtprmap.hxx
-..\inc\xmloff\txtparae.hxx %_DEST%\inc%_EXT%\xmloff\txtparae.hxx
-..\inc\xmloff\txtimp.hxx %_DEST%\inc%_EXT%\xmloff\txtimp.hxx
-..\inc\xmloff\prhdlfac.hxx %_DEST%\inc%_EXT%\xmloff\prhdlfac.hxx
-..\inc\xmloff\EnumPropertyHdl.hxx %_DEST%\inc%_EXT%\xmloff\EnumPropertyHdl.hxx
-..\inc\xmloff\NamedBoolPropertyHdl.hxx %_DEST%\inc%_EXT%\xmloff\NamedBoolPropertyHdl.hxx
-..\inc\numehelp.hxx %_DEST%\inc%_EXT%\xmloff\numehelp.hxx
-..\inc\XMLTextListAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextListAutoStylePool.hxx
-..\inc\xmloff\shapeexport.hxx %_DEST%\inc%_EXT%\xmloff\shapeexport.hxx
-..\inc\xmloff\shapeimport.hxx %_DEST%\inc%_EXT%\xmloff\shapeimport.hxx
-..\inc\xmloff\SchXMLExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SchXMLExportHelper.hxx
-..\inc\xmloff\SchXMLImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SchXMLImportHelper.hxx
-..\inc\functional.hxx %_DEST%\inc%_EXT%\xmloff\functional.hxx
-..\inc\xmloff\XMLPageExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLPageExport.hxx
-..\inc\xmloff\PageMasterStyleMap.hxx %_DEST%\inc%_EXT%\xmloff\PageMasterStyleMap.hxx
-..\inc\xmloff\XMLTextMasterPageExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterPageExport.hxx
-..\inc\xmloff\XMLTextMasterStylesContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterStylesContext.hxx
-..\inc\xmloff\XMLTextMasterPageContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterPageContext.hxx
-..\inc\xmloff\XMLTextTableContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextTableContext.hxx
-..\source\text\XMLTextShapeImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeImportHelper.hxx
-..\inc\xmloff\XMLShapeStyleContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLShapeStyleContext.hxx
-..\inc\xmloff\XMLTextShapeStyleContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeStyleContext.hxx
-..\inc\xmloff\XMLFontAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLFontAutoStylePool.hxx
-..\inc\xmloff\XMLFontStylesContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLFontStylesContext.hxx
-..\inc\xmloff\ProgressBarHelper.hxx %_DEST%\inc%_EXT%\xmloff\ProgressBarHelper.hxx
-..\inc\xmloff\formlayerexport.hxx %_DEST%\inc%_EXT%\xmloff\formlayerexport.hxx
-..\inc\xmloff\formlayerimport.hxx %_DEST%\inc%_EXT%\xmloff\formlayerimport.hxx
-..\inc\xmloff\animexp.hxx %_DEST%\inc%_EXT%\xmloff\animexp.hxx
-..\inc\xmloff\contextid.hxx %_DEST%\inc%_EXT%\xmloff\contextid.hxx
-..\inc\xmloff\formsimp.hxx %_DEST%\inc%_EXT%\xmloff\formsimp.hxx
-..\inc\VisAreaExport.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaExport.hxx
-..\inc\VisAreaContext.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaContext.hxx
-..\inc\DashStyle.hxx %_DEST%\inc%_EXT%\xmloff\DashStyle.hxx
-..\inc\GradientStyle.hxx %_DEST%\inc%_EXT%\xmloff\GradientStyle.hxx
-..\inc\MarkerStyle.hxx %_DEST%\inc%_EXT%\xmloff\MarkerStyle.hxx
-..\inc\HatchStyle.hxx %_DEST%\inc%_EXT%\xmloff\HatchStyle.hxx
-..\inc\ImageStyle.hxx %_DEST%\inc%_EXT%\xmloff\ImageStyle.hxx
-..\inc\xmloff\SettingsExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SettingsExportHelper.hxx
-..\inc\xmloff\XMLSettingsExportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLSettingsExportContext.hxx
-..\inc\xmloff\DocumentSettingsContext.hxx %_DEST%\inc%_EXT%\xmloff\DocumentSettingsContext.hxx
-..\inc\xmloff\XMLGraphicsDefaultStyle.hxx %_DEST%\inc%_EXT%\xmloff\XMLGraphicsDefaultStyle.hxx
-..\inc\XMLEmbeddedObjectExportFilter.hxx %_DEST%\inc%_EXT%\xmloff\XMLEmbeddedObjectExportFilter.hxx
-..\inc\XMLFilterServiceNames.h %_DEST%\inc%_EXT%\xmloff\XMLFilterServiceNames.h
-..\inc\xmloff\XMLBase64ImportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLBase64ImportContext.hxx
-..\inc\xmloff\xmltoken.hxx %_DEST%\inc%_EXT%\xmloff\xmltoken.hxx
-..\inc\xmloff\XMLEventExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLEventExport.hxx
-..\inc\xmloff\xmlevent.hxx %_DEST%\inc%_EXT%\xmloff\xmlevent.hxx
-..\inc\xmloff\XMLEventsImportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLEventsImportContext.hxx
-..\inc\xmlerror.hxx %_DEST%\inc%_EXT%\xmloff\xmlerror.hxx
-..\inc\xmloff\SinglePropertySetInfoCache.hxx %_DEST%\inc%_EXT%\xmloff\SinglePropertySetInfoCache.hxx
-..\inc\xmloff\PropertySetInfoHash.hxx %_DEST%\inc%_EXT%\xmloff\PropertySetInfoHash.hxx
-..\inc\xmloff\PropertySetInfoKey.hxx %_DEST%\inc%_EXT%\xmloff\PropertySetInfoKey.hxx
-..\inc\xformsimport.hxx %_DEST%\inc%_EXT%\xmloff\xformsimport.hxx
-..\inc\xformsexport.hxx %_DEST%\inc%_EXT%\xmloff\xformsexport.hxx
-..\inc\xmloff\controlpropertyhdl.hxx %_DEST%\inc%_EXT%\xmloff\controlpropertyhdl.hxx
-..\inc\xmloff\ControlBorderHandler.hxx %_DEST%\inc%_EXT%\xmloff\ControlBorderHandler.hxx
-..\inc\xmloff\XMLConstantsPropertyHandler.hxx %_DEST%\inc%_EXT%\xmloff\XMLConstantsPropertyHandler.hxx
-..\inc\xmloff\XMLStringVector.hxx %_DEST%\inc%_EXT%\xmloff\XMLStringVector.hxx
-..\inc\txtimppr.hxx %_DEST%\inc%_EXT%\xmloff\txtimppr.hxx
-..\inc\xmloff\XMLCharContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLCharContext.hxx
-..\xml\components.xml %_DEST%\xml%_EXT%\components.xml
-
-mkdir: %_DEST%\inc%_EXT%\xmloff\table
-..\inc\xmloff\table\XMLTableExport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableExport.hxx
-..\inc\xmloff\table\XMLTableImport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableImport.hxx
-
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\xo.component %_DEST%\xml%_EXT%\xo.component
-..\%__SRC%\misc\xof.component %_DEST%\xml%_EXT%\xof.component
diff --git a/sfx2/source/inet/makefile.mk b/xmloff/prj/makefile.mk
index 9347e68a2cdb..c73a3d944bbf 100644
--- a/sfx2/source/inet/makefile.mk
+++ b/xmloff/prj/makefile.mk
@@ -25,24 +25,16 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+PRJ=..
+TARGET=prj
 
-PRJNAME=sfx2
-TARGET=inet
-ENABLE_EXCEPTIONS=TRUE
+.INCLUDE : settings.mk
 
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-
-SLOFILES =	\
-                $(SLO)$/inettbc.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index 79a59ab6910f..8ba1d5a6a510 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -28,7 +28,7 @@
 #define _PROPERTYMAP_HXX_
 
 #include <xmloff/maptype.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/contextid.hxx>
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
index f66fd3fd8561..ff3a9a08379b 100755
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index e9e3771eb0d7..9df601407199 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -40,7 +40,7 @@
 #include <tools/debug.hxx>
 // header for class ByteString
 #include <tools/string.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index e6f6fc6d9340..358cb023199c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -42,7 +42,7 @@
 #include <sot/clsids.hxx>
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/families.hxx>
 #include <xmloff/xmlaustp.hxx>
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 587070202c9c..338b9c23a004 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -39,7 +39,7 @@
 // header for class ByteString
 #include <tools/string.hxx>
 #include <comphelper/processfactory.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx
index 972bc9016d4f..bcd201153b7f 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -31,7 +31,7 @@
 #include "SchXMLImport.hxx"
 #include "SchXMLParagraphContext.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 9b6731f78da3..ef1544b4a280 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -38,7 +38,7 @@
 #endif
 
 #include <comphelper/processfactory.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 86e9693ee225..b3b322568ea6 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -52,7 +52,7 @@
 // header for define DBG_ERROR1
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #ifndef _XMLOFF_NMSPMAP_HX
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index bc1b50a908a2..cc01a7d1c050 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -37,7 +37,7 @@
 #include "XMLStringBufferImportContext.hxx"
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx
index 884acb473108..5a4dd73f03e6 100755
--- a/xmloff/source/chart/SchXMLTextListContext.cxx
+++ b/xmloff/source/chart/SchXMLTextListContext.cxx
@@ -32,7 +32,7 @@
 #include "SchXMLTextListContext.hxx"
 #include "SchXMLParagraphContext.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index b2a90e534771..674a8ba3accb 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -49,7 +49,7 @@
 // header for class XMLPropertySetMapper
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlmetai.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index 87adea123ab4..f97a9da192f0 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "XMLChartStyleContext.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlnumfi.hxx>
 #include <xmloff/families.hxx>
 
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
index dfebf77050f1..27ac6bd82b23 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
@@ -32,7 +32,7 @@
 #include "SchXMLParagraphContext.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index 99ce619be43f..1d7421ebc22f 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -30,7 +30,7 @@
 #include "XMLSymbolImageContext.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 8d9ba3b7ff26..8ac78f9eb0b5 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlmetai.hxx>
 #include <xmloff/xmlstyle.hxx>
 #include "SchXMLImport.hxx"
diff --git a/xmloff/source/chart/makefile.mk b/xmloff/source/chart/makefile.mk
deleted file mode 100644
index bfdc9aeb5e22..000000000000
--- a/xmloff/source/chart/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				= xmloff
-TARGET				= chart
-AUTOSEG				= true
-ENABLE_EXCEPTIONS	= TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	$(SLO)$/ColorPropertySet.obj \
-            $(SLO)$/SchXMLTools.obj \
-            $(SLO)$/SchXMLExport.obj \
-            $(SLO)$/SchXMLImport.obj \
-            $(SLO)$/contexts.obj \
-            $(SLO)$/SchXMLTableContext.obj \
-            $(SLO)$/SchXMLChartContext.obj \
-            $(SLO)$/SchXMLPlotAreaContext.obj \
-            $(SLO)$/SchXMLParagraphContext.obj \
-            $(SLO)$/SchXMLTextListContext.obj \
-            $(SLO)$/SchXMLSeriesHelper.obj \
-            $(SLO)$/SchXMLSeries2Context.obj \
-            $(SLO)$/PropertyMaps.obj \
-            $(SLO)$/XMLChartStyleContext.obj \
-            $(SLO)$/XMLErrorIndicatorPropertyHdl.obj \
-            $(SLO)$/XMLErrorBarStylePropertyHdl.obj \
-            $(SLO)$/SchXMLAutoStylePoolP.obj \
-            $(SLO)$/XMLChartPropertyContext.obj \
-            $(SLO)$/XMLSymbolImageContext.obj \
-            $(SLO)$/XMLLabelSeparatorContext.obj \
-            $(SLO)$/XMLTextOrientationHdl.obj \
-            $(SLO)$/XMLSymbolTypePropertyHdl.obj \
-            $(SLO)$/XMLAxisPositionPropertyHdl.obj \
-            $(SLO)$/SchXMLCalculationSettingsContext.obj \
-            $(SLO)$/transporttypes.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index b64f3c2a2e1f..0c90a23ae519 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -33,7 +33,7 @@
 #include <xmloff/DocumentSettingsContext.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx
index 158c1a2d8743..317818c6562f 100644
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@@ -32,7 +32,7 @@
 
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index 64131115e3f3..2936951ac091 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -32,7 +32,7 @@
 
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index f603d21258fd..1fbcc506e7ed 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -29,7 +29,7 @@
 
 #include "RDFaExportHelper.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 90e1ba583dd5..7541feb38999 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <xmloff/SettingsExportHelper.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx
index 9e76298f59a4..3833e9924153 100644
--- a/xmloff/source/core/XMLBase64Export.cxx
+++ b/xmloff/source/core/XMLBase64Export.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "XMLBase64Export.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
index 03b52828d5b4..a55b6505981f 100644
--- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "XMLEmbeddedObjectExportFilter.hxx"
+#include "xmloff/XMLEmbeddedObjectExportFilter.hxx"
 
 using ::rtl::OUString;
 
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 9bffe192ad75..e7b3a8b48d19 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -42,11 +42,11 @@
 #include <sot/clsids.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/attrlist.hxx>
-#include "XMLFilterServiceNames.h"
+#include "xmloff/XMLFilterServiceNames.h"
 #include "XMLEmbeddedObjectImportContext.hxx"
 
 using ::rtl::OUString;
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 4556e21e8152..5dd1aac9fe12 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -40,7 +40,7 @@
 
 #include <cppuhelper/factory.hxx>
 #include <uno/lbnames.h>
-#include "xmlreg.hxx"
+#include "xmloff/xmlreg.hxx"
 
 using namespace rtl;
 using namespace com::sun::star;
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index 8bf892820d77..b17a27e03693 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -30,7 +30,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
 #include <svl/svarray.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 
 using namespace rtl;
 
diff --git a/xmloff/source/core/makefile.mk b/xmloff/source/core/makefile.mk
deleted file mode 100644
index 4d663d3218d8..000000000000
--- a/xmloff/source/core/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=xmloff
-TARGET=core
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/unointerfacetouniqueidentifiermapper.obj \
-        $(SLO)$/facreg.obj		\
-        $(SLO)$/xmlcnitm.obj	\
-        $(SLO)$/attrlist.obj	\
-        $(SLO)$/i18nmap.obj		\
-        $(SLO)$/nmspmap.obj		\
-        $(SLO)$/unoatrcn.obj	\
-        $(SLO)$/xmlehelp.obj	\
-        $(SLO)$/xmlerror.obj	\
-        $(SLO)$/xmlexp.obj		\
-        $(SLO)$/xmlictxt.obj	\
-        $(SLO)$/xmlimp.obj		\
-        $(SLO)$/xmltkmap.obj	\
-        $(SLO)$/xmltoken.obj	\
-        $(SLO)$/xmluconv.obj	\
-        $(SLO)$/DomBuilderContext.obj \
-        $(SLO)$/DomExport.obj \
-        $(SLO)$/ProgressBarHelper.obj	\
-        $(SLO)$/PropertySetMerger.obj	\
-        $(SLO)$/SettingsExportHelper.obj	\
-        $(SLO)$/DocumentSettingsContext.obj \
-        $(SLO)$/XMLEmbeddedObjectExportFilter.obj \
-        $(SLO)$/XMLEmbeddedObjectImportContext.obj \
-        $(SLO)$/XMLBase64Export.obj \
-        $(SLO)$/XMLBase64ImportContext.obj \
-        $(SLO)$/XMLBasicExportFilter.obj \
-        $(SLO)$/RDFaImportHelper.obj \
-        $(SLO)$/RDFaExportHelper.obj \
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index b541fd2c3057..22e145bc5180 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -36,7 +36,7 @@
 #endif
 #include <xmloff/nmspmap.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using ::rtl::OUString;
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index a26915b938eb..9b5ca4106c46 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -35,7 +35,7 @@
 
 #include <xmloff/xmlcnimp.hxx>
 
-#include "unoatrcn.hxx"
+#include "xmloff/unoatrcn.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/core/xmlcnitm.cxx b/xmloff/source/core/xmlcnitm.cxx
index f4bd0b55121d..53ed405fa454 100644
--- a/xmloff/source/core/xmlcnitm.cxx
+++ b/xmloff/source/core/xmlcnitm.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <xmloff/xmlcnimp.hxx>
-#include "unoatrcn.hxx"
+#include "xmloff/unoatrcn.hxx"
 
 using namespace rtl;
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 9bfa151adbbd..7581739aae13 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/xml/sax/XLocator.hpp>
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index ac46c740ee97..50e0447d4a9d 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -48,7 +48,7 @@
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlnumfe.hxx>
@@ -63,20 +63,20 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
-#include <GradientStyle.hxx>
-#include <HatchStyle.hxx>
-#include <ImageStyle.hxx>
+#include <xmloff/GradientStyle.hxx>
+#include <xmloff/HatchStyle.hxx>
+#include <xmloff/ImageStyle.hxx>
 #include <TransGradientStyle.hxx>
-#include <MarkerStyle.hxx>
-#include <DashStyle.hxx>
+#include <xmloff/MarkerStyle.hxx>
+#include <xmloff/DashStyle.hxx>
 #include <xmloff/XMLFontAutoStylePool.hxx>
 #include "XMLImageMapExport.hxx"
 #include "XMLBase64Export.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "XMLFilterServiceNames.h"
-#include "XMLEmbeddedObjectExportFilter.hxx"
+#include "xmloff/XMLFilterServiceNames.h"
+#include "xmloff/XMLEmbeddedObjectExportFilter.hxx"
 #include "XMLBasicExportFilter.hxx"
 #include <vos/mutex.hxx>
 #include <rtl/logfile.hxx>
@@ -85,7 +85,7 @@
 #include "PropertySetMerger.hxx"
 
 #include "svl/urihelper.hxx"
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 
 #include <unotools/docinfohelper.hxx>
 #include <unotools/bootstrap.hxx>
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index c791fe4077d4..f75eec83dbd3 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -37,7 +37,7 @@
 #include "unointerfacetouniqueidentifiermapper.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLFontStylesContext.hxx>
 #include <xmloff/xmlictxt.hxx>
@@ -49,7 +49,7 @@
 #include "StyleMap.hxx"
 #include <xmloff/ProgressBarHelper.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index af3a0ce941e5..13ab9f4fd62f 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -31,7 +31,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #ifndef _XMLOFF_FAMILIES_HXX
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 81c962b1be9e..b550477ac30c 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -46,11 +46,11 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "xexptran.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/XMLEventsImportContext.hxx>
 #include "XMLStringBufferImportContext.hxx"
 #include <tools/debug.hxx>
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 01d14ecab54e..6114f51acfdc 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLEventExport.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index dcd26e616e6f..9ad048c758ac 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -30,7 +30,7 @@
 #include <tools/debug.hxx>
 #include <XMLNumberStylesExport.hxx>
 #include <XMLNumberStylesImport.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx
index 4eb607e0403b..d1591a10448e 100644
--- a/xmloff/source/draw/XMLReplacementImageContext.cxx
+++ b/xmloff/source/draw/XMLReplacementImageContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include "XMLReplacementImageContext.hxx"
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 15211495f18d..c9862d1b29ae 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -37,9 +37,9 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/maptype.hxx>
 
 #include "sdpropls.hxx"
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index eaf83444114c..f4dfb71a2de4 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -67,7 +67,7 @@
 #include "sdxmlexp_impl.hxx"
 #include "sdpropls.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlement.hxx>
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 17bba5170c79..0920ef4f0992 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -67,7 +67,7 @@
 #include "sdpropls.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <osl/mutex.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 600ab5c7144f..b2611dbc1e8f 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -37,7 +37,7 @@
 #include <comphelper/extract.hxx>
 #include <tools/color.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlement.hxx>
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index fb7abfa4f94a..c3dbd86fbe41 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -41,7 +41,7 @@
 #include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 /*
 #include <xmloff/xmlement.hxx>
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index 7d17de3a7471..1abc297e6b33 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 #include "descriptionimp.hxx"
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index ad559bc0bf45..3f8fb3bb88be 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -39,7 +39,7 @@
 #include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "eventimp.hxx"
diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index e5393279a0fa..b7d58258e204 100644
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index 960ff3ea1871..26113c1ce156 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "layerimp.hxx"
diff --git a/xmloff/source/draw/makefile.mk b/xmloff/source/draw/makefile.mk
deleted file mode 100644
index 3c9f7ae024f9..000000000000
--- a/xmloff/source/draw/makefile.mk
+++ /dev/null
@@ -1,85 +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=xmloff
-TARGET=draw
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/animationexport.obj\
-        $(SLO)$/animationimport.obj\
-        $(SLO)$/XMLNumberStyles.obj\
-        $(SLO)$/XMLGraphicsDefaultStyle.obj\
-        $(SLO)$/viewcontext.obj\
-        $(SLO)$/eventimp.obj\
-        $(SLO)$/layerexp.obj\
-        $(SLO)$/layerimp.obj\
-        $(SLO)$/ximpshow.obj\
-        $(SLO)$/animimp.obj\
-        $(SLO)$/animexp.obj\
-        $(SLO)$/numithdl.obj\
-        $(SLO)$/sdxmlimp.obj \
-        $(SLO)$/sdxmlexp.obj \
-        $(SLO)$/ximpstyl.obj \
-        $(SLO)$/ximpbody.obj \
-        $(SLO)$/ximpshap.obj \
-        $(SLO)$/ximpgrp.obj \
-        $(SLO)$/ximp3dscene.obj \
-        $(SLO)$/ximp3dobject.obj \
-        $(SLO)$/ximpnote.obj \
-        $(SLO)$/sdpropls.obj \
-        $(SLO)$/propimp0.obj \
-        $(SLO)$/xexptran.obj \
-        $(SLO)$/shapeexport.obj \
-        $(SLO)$/shapeexport2.obj \
-        $(SLO)$/shapeexport3.obj \
-        $(SLO)$/shapeexport4.obj \
-        $(SLO)$/shapeimport.obj \
-        $(SLO)$/XMLImageMapExport.obj \
-        $(SLO)$/XMLImageMapContext.obj \
-        $(SLO)$/XMLShapePropertySetContext.obj \
-        $(SLO)$/XMLShapeStyleContext.obj \
-        $(SLO)$/ximppage.obj \
-        $(SLO)$/ximpcustomshape.obj \
-        $(SLO)$/EnhancedCustomShapeToken.obj \
-        $(SLO)$/XMLReplacementImageContext.obj \
-        $(SLO)$/descriptionimp.obj \
-        $(SLO)$/ximplink.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 9dac5b4cd469..b2dae2f23274 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -62,7 +62,7 @@
 #include "sdpropls.hxx"
 #include "propimp0.hxx"
 #include <xmloff/xmlexp.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <com/sun/star/drawing/NormalsKind.hpp>
 #include <com/sun/star/drawing/TextureProjectionMode.hpp>
 #include <com/sun/star/drawing/TextureKind.hpp>
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index e56379c0781f..6beb7a6fcc14 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlement.hxx>
 #include <xmloff/prhdlfac.hxx>
 #include <xmloff/xmlprmap.hxx>
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlexppr.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 149829f0f440..10692cda1d54 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "unointerfacetouniqueidentifiermapper.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlmetae.hxx>
@@ -77,7 +77,7 @@
 #include "layerexp.hxx"
 
 
-#include "VisAreaExport.hxx"
+#include "xmloff/VisAreaExport.hxx"
 #include "XMLNumberStylesExport.hxx"
 #include <tools/list.hxx>
 #include <tools/string.hxx>
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 1290d545c6b3..4b2e2141c8d0 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -40,7 +40,7 @@
 #include <xmloff/xmlmetai.hxx>
 #endif
 #include "ximpstyl.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/DocumentSettingsContext.hxx>
@@ -51,7 +51,7 @@
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include "sdpropls.hxx"
 #include <xmloff/xmlexppr.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 #include <com/sun/star/style/XStyle.hpp>
 
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index d3dd99967ae9..e76d5bf9b9c9 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -63,7 +63,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/drawing/XCustomShapeEngine.hpp>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index d13b5e24e2db..1295da204db9 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -55,7 +55,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
 
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index f51302b64156..d5c06d7a8ead 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -49,7 +49,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index 238fdebefa55..a57823cd8867 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -72,7 +72,7 @@
 #include <tools/string.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "XMLBase64Export.hxx"
 
 using ::rtl::OUString;
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 903b7d99809a..45411162a183 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -41,7 +41,7 @@
 #include <xmloff/shapeimport.hxx>
 #endif
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "ximpstyl.hxx"
 #include "ximpshap.hxx"
diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx
index 0953cb7536ce..43f12382d420 100644
--- a/xmloff/source/draw/viewcontext.cxx
+++ b/xmloff/source/draw/viewcontext.cxx
@@ -30,9 +30,9 @@
 #include "viewcontext.hxx"
 #include "sdxmlimp_impl.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "VisAreaContext.hxx"
+#include "xmloff/VisAreaContext.hxx"
 
 using namespace com::sun::star;
 using namespace rtl;
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 2f3c90278b6f..dd041daddec8 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/xmluconv.hxx>
 #include "xexptran.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/CameraGeometry.hpp>
 #include "eventimp.hxx"
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 6f9710392e2a..424593d830ac 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -41,11 +41,11 @@
 #include "EnhancedCustomShapeToken.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "xexptran.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index 8d88b77515e1..115c3b8b778c 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include "ximpgrp.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "ximpshap.hxx"
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index 223b320e4f79..ae657d0c32cd 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include "ximplink.hxx"
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 6c715b5ad77a..29aa839c2b9e 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -37,7 +37,7 @@
 #include <xmloff/xmlstyle.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlstyle.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ximppage.hxx"
 #include "ximpshap.hxx"
 #include "animimp.hxx"
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index a26806ce6c24..34590cbd95de 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -71,7 +71,7 @@
 #include "PropertySetMerger.hxx"
 #include <xmloff/families.hxx>
 #include "ximpstyl.hxx"
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "EnhancedCustomShapeToken.hxx"
 #include "XMLReplacementImageContext.hxx"
@@ -82,7 +82,7 @@
 #include "descriptionimp.hxx"
 #include "ximpcustomshape.hxx"
 #include "XMLEmbeddedObjectImportContext.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index f5df8c58d6ba..c81aebf41b6a 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <xmloff/xmltoken.hxx>
 #include <comphelper/extract.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "ximpshow.hxx"
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 01f0fa0faf5c..0102ee24844a 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -31,7 +31,7 @@
 
 #include "ximpstyl.hxx"
 #include <xmloff/XMLShapeStyleContext.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "ximpnote.hxx"
@@ -55,7 +55,7 @@
 #include "layerimp.hxx"
 #include <xmloff/XMLGraphicsDefaultStyle.hxx>
 #include "XMLNumberStylesImport.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index 8e81c2a7e19c..aed0b8c4e190 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmltypes.hxx>
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 149965631b27..1126583f9a45 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -30,12 +30,12 @@
 
 #include "elementexport.hxx"
 #include "strings.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "eventexport.hxx"
 #include "formenums.hxx"
 #include "formcellbinding.hxx"
 #include "formcellbinding.hxx"
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 #include "property_meta_data.hxx"
 
 /** === begin UNO includes === **/
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index eb6dd0965e76..c010b666e552 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -35,7 +35,7 @@
 #include "strings.hxx"
 #include "callbacks.hxx"
 #include "attriblistmerge.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "eventimport.hxx"
 #include "xmloff/txtstyli.hxx"
 #include "formenums.hxx"
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 0e2ef69ab9f8..e27f03f01de9 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "formattributes.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/logfile.hxx>
diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx
index fcccef5065a8..5e46fbaab8d8 100644
--- a/xmloff/source/forms/formevents.cxx
+++ b/xmloff/source/forms/formevents.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "formevents.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlevent.hxx>
 
 //.........................................................................
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index ad5ff7eb4dae..50245fad1d2a 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/formlayerexport.hxx>
 #include "strings.hxx"
 #include "elementexport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include "layerexport.hxx"
 #include "propertyexport.hxx"
diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
index 00a745660710..bc0baaba551e 100644
--- a/xmloff/source/forms/formsimp.cxx
+++ b/xmloff/source/forms/formsimp.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 #ifndef _XMLOFF_ANIMIMP_HXX
diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx
index ccf829d4201f..72a9edf38f42 100755..100644
--- a/xmloff/source/forms/handler/form_handler_factory.cxx
+++ b/xmloff/source/forms/handler/form_handler_factory.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_xmloff.hxx"
 
-#include "form_handler_factory.hxx"
+#include "forms/form_handler_factory.hxx"
 #include "vcl_date_handler.hxx"
 #include "vcl_time_handler.hxx"
 
diff --git a/xmloff/source/forms/handler/makefile.mk b/xmloff/source/forms/handler/makefile.mk
deleted file mode 100755
index 574537ffd474..000000000000
--- a/xmloff/source/forms/handler/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=xmloff
-TARGET=form_handlers
-
-INCEXT=..
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)/util/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-    $(SLO)/form_handler_factory.obj \
-    $(SLO)/property_handler_base.obj \
-    $(SLO)/vcl_date_handler.obj \
-    $(SLO)/vcl_time_handler.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-test:
-    echo $(INCLUDE)
\ No newline at end of file
diff --git a/xmloff/source/forms/handler/property_handler_base.hxx b/xmloff/source/forms/handler/property_handler_base.hxx
index 10adceaa52aa..01f2a9e843f6 100755..100644
--- a/xmloff/source/forms/handler/property_handler_base.hxx
+++ b/xmloff/source/forms/handler/property_handler_base.hxx
@@ -27,7 +27,7 @@
 #ifndef XMLOFF_PROPERTY_HANDLER_BASE_HXX
 #define XMLOFF_PROPERTY_HANDLER_BASE_HXX
 
-#include "property_handler.hxx"
+#include "forms/property_handler.hxx"
 
 #include <osl/interlck.h>
 
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 9d024a3e2c2e..d4f0e86534ab 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -33,7 +33,7 @@
 #include "strings.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/prhdlfac.hxx>
@@ -54,7 +54,7 @@
 #include <xmloff/XMLEventExport.hxx>
 #include "formevents.hxx"
 #include <xmloff/xmlnumfe.hxx>
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/text/XText.hpp>
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 77d60f83ee49..cf5155f6a9a1 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -58,9 +58,9 @@
 #include "controlpropertymap.hxx"
 #include "formevents.hxx"
 #include "formcellbinding.hxx"
-#include "xformsimport.hxx"
+#include "xmloff/xformsimport.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <rtl/logfile.hxx>
 #include <algorithm>
 
diff --git a/xmloff/source/forms/makefile.mk b/xmloff/source/forms/makefile.mk
deleted file mode 100644
index fa2a6ea7d235..000000000000
--- a/xmloff/source/forms/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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmloff
-TARGET=forms
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/officeforms.obj \
-        $(SLO)$/formevents.obj \
-        $(SLO)$/eventimport.obj \
-        $(SLO)$/eventexport.obj \
-        $(SLO)$/controlpropertyhdl.obj \
-        $(SLO)$/controlpropertymap.obj \
-        $(SLO)$/valueproperties.obj \
-        $(SLO)$/attriblistmerge.obj \
-        $(SLO)$/controlelement.obj \
-        $(SLO)$/formlayerexport.obj \
-        $(SLO)$/layerexport.obj \
-        $(SLO)$/elementexport.obj \
-        $(SLO)$/propertyexport.obj \
-        $(SLO)$/elementimport.obj \
-        $(SLO)$/layerimport.obj \
-        $(SLO)$/propertyimport.obj \
-        $(SLO)$/formlayerimport.obj \
-        $(SLO)$/formattributes.obj \
-        $(SLO)$/formenums.obj \
-        $(SLO)$/formsimp.obj \
-        $(SLO)$/strings.obj \
-        $(SLO)$/logging.obj \
-        $(SLO)$/formcellbinding.obj \
-        $(SLO)$/gridcolumnproptranslator.obj \
-        \
-        $(SLO)/property_meta_data.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index d434d7a9addf..0de7b04b70d3 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -30,7 +30,7 @@
 #include "officeforms.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx
index 8e9aa9cb616e..4edab2e649f7 100755..100644
--- a/xmloff/source/forms/property_description.hxx
+++ b/xmloff/source/forms/property_description.hxx
@@ -27,7 +27,7 @@
 #ifndef XMLOFF_PROPERTY_DESCRIPTION_HXX
 #define XMLOFF_PROPERTY_DESCRIPTION_HXX
 
-#include "property_handler.hxx"
+#include "forms/property_handler.hxx"
 #include "property_group.hxx"
 
 #include "xmloff/xmltoken.hxx"
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index 7f058d14b9b7..5930d123578c 100755..100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -27,10 +27,10 @@
 #include "precompiled_xmloff.hxx"
 
 #include "property_description.hxx"
-#include "form_handler_factory.hxx"
+#include "forms/form_handler_factory.hxx"
 #include "strings.hxx"
 #include "xmloff/xmltoken.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 7d84e5a60a1f..bab88b47a82f 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -32,7 +32,7 @@
 #include "propertyexport.hxx"
 #include <xmloff/xmlexp.hxx>
 #include "strings.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/families.hxx>
 #include <osl/diagnose.h>
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index de57eadb69ae..1fdb85067f3d 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -34,7 +34,7 @@
 #include <osl/diagnose.h>
 #include <comphelper/extract.hxx>
 #include "callbacks.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 772d5907bd91..66717ae3aaf8 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -45,7 +45,7 @@
 //#endif
 #include <comphelper/genericpropertyset.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlmetae.hxx>
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index b61e8d113042..d27d2c33b239 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 
 #include "MetaImportComponent.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlmetai.hxx>
diff --git a/xmloff/source/meta/makefile.mk b/xmloff/source/meta/makefile.mk
deleted file mode 100644
index 5efb538c9856..000000000000
--- a/xmloff/source/meta/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=xmloff
-TARGET=meta
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/xmlmetae.obj \
-        $(SLO)$/xmlmetai.obj \
-        $(SLO)$/MetaExportComponent.obj \
-                $(SLO)$/MetaImportComponent.obj \
-                $(SLO)$/xmlversion.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index aab4686339ba..55e7cd97f810 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 35dab510210a..83b9625279b9 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using ::rtl::OUString;
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index f126fd566e94..2675ecb4b98f 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -43,7 +43,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 
diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx
index cdd2906760a0..3dfbab60952f 100644
--- a/xmloff/source/script/XMLEventImportHelper.cxx
+++ b/xmloff/source/script/XMLEventImportHelper.cxx
@@ -34,8 +34,8 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlnmspe.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using ::rtl::OUString;
 using ::com::sun::star::xml::sax::XAttributeList;
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index b22cd6262558..301bef53856d 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -39,9 +39,9 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::xmloff::token;
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx
index 0baf71cb8b96..60e08a208f72 100644
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -32,7 +32,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx
index e04467d1e491..9cfc7211f3b9 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index 94a794675d01..a957b4bd060f 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -32,7 +32,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index ee945f4a74cc..13d6948ba98e 100644
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/script/makefile.mk b/xmloff/source/script/makefile.mk
deleted file mode 100644
index 4109ae6fc554..000000000000
--- a/xmloff/source/script/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=xmloff
-TARGET=script
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/XMLEventExport.obj \
-        $(SLO)$/XMLEventImportHelper.obj \
-        $(SLO)$/XMLEventsImportContext.obj \
-        $(SLO)$/XMLScriptContextFactory.obj \
-        $(SLO)$/XMLScriptExportHandler.obj \
-        $(SLO)$/XMLStarBasicContextFactory.obj \
-        $(SLO)$/XMLStarBasicExportHandler.obj \
-        $(SLO)$/xmlscripti.obj \
-        $(SLO)$/xmlbasici.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index ff88d802b2c6..d64c872d3638 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 
 #include <xmloff/xmlscripti.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 49ff7e5a2cbc..9ac798381e0c 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -29,11 +29,11 @@
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/drawing/DashStyle.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
-#include "DashStyle.hxx"
+#include "xmloff/DashStyle.hxx"
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 311448fe96bb..4ddd5ef64a82 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -30,15 +30,15 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include "FillStyleContext.hxx"
 #include <xmloff/xmlimp.hxx>
-#include "GradientStyle.hxx"
-#include "HatchStyle.hxx"
-#include "ImageStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
 #include "TransGradientStyle.hxx"
-#include "MarkerStyle.hxx"
-#include "DashStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
+#include "xmloff/DashStyle.hxx"
 #include <xmloff/families.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/XMLBase64ImportContext.hxx>
 
 using namespace ::com::sun::star;
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 30da28ac5465..6e3921593644 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -27,12 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "GradientStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
 #include <com/sun/star/awt/Gradient.hpp>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index 5351c345c16e..7785d70f2596 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -27,11 +27,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "HatchStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
 #include <com/sun/star/drawing/Hatch.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 509b925198c4..f6716bfbcfd4 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -27,12 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "ImageStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index 7f134bd65176..f0f32bb18c25 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -27,12 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "MarkerStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
 #include "xexptran.hxx"
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx
index 571c001d00de..9c6aa14c80ff 100644
--- a/xmloff/source/style/PageHeaderFooterContext.cxx
+++ b/xmloff/source/style/PageHeaderFooterContext.cxx
@@ -36,7 +36,7 @@
 #ifndef _XMLOFF_PAGEPHEADERFOOTERCONTEXT_HXX
 #include "PageHeaderFooterContext.hxx"
 #endif
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "PagePropertySetContext.hxx"
 
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index e784e4f5085f..bcbb05012fec 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -30,7 +30,7 @@
 
 
 #include "PageMasterImportContext.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "PageMasterPropHdl.hxx"
 #include "PagePropertySetContext.hxx"
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
index 99065c9d3481..6dbda70f5125 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -31,7 +31,7 @@
 #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX
 #include <xmloff/PageMasterStyleMap.hxx>
 #endif
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 using namespace ::xmloff::token;
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 7e0456e5db25..58c99ef7abbd 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx
index 9d9b34c2159c..cc4722d10216 100644
--- a/xmloff/source/style/VisAreaContext.cxx
+++ b/xmloff/source/style/VisAreaContext.cxx
@@ -32,9 +32,9 @@
 
 
 // INCLUDE ---------------------------------------------------------------
-#include "VisAreaContext.hxx"
+#include "xmloff/VisAreaContext.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/VisAreaExport.cxx b/xmloff/source/style/VisAreaExport.cxx
index a45b63f50242..6bdcb18c7f43 100644
--- a/xmloff/source/style/VisAreaExport.cxx
+++ b/xmloff/source/style/VisAreaExport.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/awt/Rectangle.hpp>
-#include "VisAreaExport.hxx"
+#include "xmloff/VisAreaExport.hxx"
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 9d48f2ce531b..d8f84b1d9840 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx
index dd61d4f3feb5..45039f348603 100644
--- a/xmloff/source/style/XMLBackgroundImageExport.cxx
+++ b/xmloff/source/style/XMLBackgroundImageExport.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/style/GraphicLocation.hpp>
 
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index dcc81ccf9f89..f9e5e298460d 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -27,12 +27,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-
 #include <tools/debug.hxx>
 #include <svl/cntnrsrt.hxx>
 #include <tools/fontenum.hxx>
-
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "fonthdl.hxx"
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 49dd6ddac91e..c36fd4c55fab 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -34,7 +34,7 @@
 #include <rtl/logfile.hxx>
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "fonthdl.hxx"
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 42d4e2cec221..b576c697732c 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -30,7 +30,7 @@
 #include "XMLFootnoteSeparatorExport.hxx"
 #include <tools/debug.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlprmap.hxx>
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index 33fb40fbfc3a..7293c1198cea 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlprmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/maptype.hxx>
 
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index bc5bdaf6d69f..915b2291461f 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <xmloff/XMLPageExport.hxx>
 #include <tools/debug.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/XStyle.hpp>
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index af3f36d8b4d1..63860130e1a5 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/attrlist.hxx>
 #include "impastpl.hxx"
 #include <xmloff/xmlexppr.hxx>
diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk
deleted file mode 100644
index 3436b33b654b..000000000000
--- a/xmloff/source/style/makefile.mk
+++ /dev/null
@@ -1,219 +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=xmloff
-TARGET=style
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        XMLPercentOrMeasurePropertyHandler.cxx \
-        XMLIsPercentagePropertyHandler.cxx \
-        XMLRectangleMembersHandler.cxx \
-        adjushdl.cxx	\
-        backhdl.cxx		\
-        bordrhdl.cxx	\
-        breakhdl.cxx	\
-        cdouthdl.cxx	\
-        chrhghdl.cxx	\
-        chrlohdl.cxx	\
-        csmaphdl.cxx	\
-        escphdl.cxx		\
-        fonthdl.cxx		\
-        impastp1.cxx    \
-        impastp2.cxx    \
-        impastp3.cxx    \
-        impastp4.cxx    \
-        kernihdl.cxx	\
-        lspachdl.cxx	\
-        numehelp.cxx	\
-        opaquhdl.cxx	\
-        postuhdl.cxx	\
-        prhdlfac.cxx	\
-        prstylei.cxx	\
-        shadwhdl.cxx	\
-        shdwdhdl.cxx	\
-        styleexp.cxx	\
-        tabsthdl.cxx	\
-        undlihdl.cxx	\
-        uniref.cxx		\
-        weighhdl.cxx	\
-        xmlaustp.cxx	\
-        xmlbahdl.cxx	\
-        xmlexppr.cxx	\
-        xmlimppr.cxx	\
-        xmlnume.cxx		\
-        xmlnumfe.cxx	\
-        xmlnumfi.cxx	\
-        xmlnumi.cxx		\
-        xmlprcon.cxx	\
-        xmlprhdl.cxx	\
-        xmlprmap.cxx	\
-        xmlstyle.cxx	\
-        xmltabe.cxx		\
-        xmltabi.cxx		\
-        DashStyle.cxx					\
-        EnumPropertyHdl.cxx				\
-        FillStyleContext.cxx			\
-        GradientStyle.cxx				\
-        HatchStyle.cxx					\
-        ImageStyle.cxx					\
-        MarkerStyle.cxx					\
-        MultiPropertySetHelper.cxx		\
-        SinglePropertySetInfoCache.cxx	\
-        DashStyle.cxx					\
-        AttributeContainerHandler.cxx	\
-        NamedBoolPropertyHdl.cxx		\
-        TransGradientStyle.cxx			\
-        XMLBackgroundImageContext.cxx	\
-        XMLBackgroundImageExport.cxx	\
-        XMLClipPropertyHandler.cxx		\
-        XMLConstantsPropertyHandler.cxx	\
-        XMLElementPropertyContext.cxx	\
-        XMLFootnoteSeparatorExport.cxx	\
-        XMLFootnoteSeparatorImport.cxx	\
-        XMLFontAutoStylePool.cxx		\
-        XMLFontStylesContext.cxx		\
-        XMLPageExport.cxx				\
-        PageMasterPropHdl.cxx			\
-        PageMasterPropHdlFactory.cxx	\
-        PageMasterStyleMap.cxx			\
-        PageMasterPropMapper.cxx		\
-        PageMasterExportPropMapper.cxx	\
-        PageMasterImportPropMapper.cxx	\
-        PageMasterImportContext.cxx		\
-        PagePropertySetContext.cxx		\
-        PageHeaderFooterContext.cxx		\
-        StyleMap.cxx		\
-        XMLBitmapRepeatOffsetPropertyHandler.cxx \
-        XMLFillBitmapSizePropertyHandler.cxx \
-        XMLBitmapLogicalSizePropertyHandler.cxx \
-        durationhdl.cxx \
-        VisAreaExport.cxx \
-        VisAreaContext.cxx \
-        DrawAspectHdl.cxx
-
-
-SLOFILES =	\
-        $(SLO)$/XMLPercentOrMeasurePropertyHandler.obj \
-        $(SLO)$/XMLIsPercentagePropertyHandler.obj \
-        $(SLO)$/XMLRectangleMembersHandler.obj \
-        $(SLO)$/adjushdl.obj	\
-        $(SLO)$/backhdl.obj		\
-        $(SLO)$/bordrhdl.obj	\
-        $(SLO)$/breakhdl.obj	\
-        $(SLO)$/cdouthdl.obj	\
-        $(SLO)$/chrhghdl.obj	\
-        $(SLO)$/chrlohdl.obj	\
-        $(SLO)$/csmaphdl.obj	\
-        $(SLO)$/escphdl.obj		\
-        $(SLO)$/fonthdl.obj		\
-        $(SLO)$/impastp1.obj    \
-        $(SLO)$/impastp2.obj    \
-        $(SLO)$/impastp3.obj    \
-        $(SLO)$/impastp4.obj    \
-        $(SLO)$/kernihdl.obj	\
-        $(SLO)$/lspachdl.obj	\
-        $(SLO)$/numehelp.obj	\
-        $(SLO)$/opaquhdl.obj	\
-        $(SLO)$/postuhdl.obj	\
-        $(SLO)$/prhdlfac.obj	\
-        $(SLO)$/prstylei.obj	\
-        $(SLO)$/shadwhdl.obj	\
-        $(SLO)$/shdwdhdl.obj	\
-        $(SLO)$/styleexp.obj	\
-        $(SLO)$/tabsthdl.obj	\
-        $(SLO)$/undlihdl.obj	\
-        $(SLO)$/uniref.obj		\
-        $(SLO)$/weighhdl.obj	\
-        $(SLO)$/xmlaustp.obj	\
-        $(SLO)$/xmlbahdl.obj	\
-        $(SLO)$/xmlexppr.obj	\
-        $(SLO)$/xmlimppr.obj	\
-        $(SLO)$/xmlnume.obj		\
-        $(SLO)$/xmlnumfe.obj	\
-        $(SLO)$/xmlnumfi.obj	\
-        $(SLO)$/xmlnumi.obj		\
-        $(SLO)$/xmlprcon.obj	\
-        $(SLO)$/xmlprhdl.obj	\
-        $(SLO)$/xmlprmap.obj	\
-        $(SLO)$/xmlstyle.obj	\
-        $(SLO)$/xmltabe.obj		\
-        $(SLO)$/xmltabi.obj		\
-        $(SLO)$/DashStyle.obj					\
-        $(SLO)$/EnumPropertyHdl.obj				\
-        $(SLO)$/FillStyleContext.obj			\
-        $(SLO)$/GradientStyle.obj				\
-        $(SLO)$/HatchStyle.obj					\
-        $(SLO)$/ImageStyle.obj					\
-        $(SLO)$/MarkerStyle.obj					\
-        $(SLO)$/MultiPropertySetHelper.obj		\
-        $(SLO)$/SinglePropertySetInfoCache.obj	\
-        $(SLO)$/NamedBoolPropertyHdl.obj		\
-        $(SLO)$/TransGradientStyle.obj			\
-        $(SLO)$/XMLBackgroundImageContext.obj	\
-        $(SLO)$/XMLBackgroundImageExport.obj	\
-        $(SLO)$/XMLClipPropertyHandler.obj		\
-        $(SLO)$/XMLConstantsPropertyHandler.obj	\
-        $(SLO)$/AttributeContainerHandler.obj	\
-        $(SLO)$/XMLElementPropertyContext.obj	\
-        $(SLO)$/XMLFootnoteSeparatorExport.obj	\
-        $(SLO)$/XMLFootnoteSeparatorImport.obj	\
-        $(SLO)$/XMLFontAutoStylePool.obj		\
-        $(SLO)$/XMLFontStylesContext.obj		\
-        $(SLO)$/XMLPageExport.obj				\
-        $(SLO)$/PageMasterPropHdl.obj			\
-        $(SLO)$/PageMasterPropHdlFactory.obj	\
-        $(SLO)$/PageMasterStyleMap.obj			\
-        $(SLO)$/PageMasterPropMapper.obj		\
-        $(SLO)$/PageMasterExportPropMapper.obj	\
-        $(SLO)$/PageMasterImportPropMapper.obj	\
-        $(SLO)$/PageMasterImportContext.obj		\
-        $(SLO)$/PagePropertySetContext.obj		\
-        $(SLO)$/PageHeaderFooterContext.obj		\
-        $(SLO)$/StyleMap.obj					\
-        $(SLO)$/WordWrapPropertyHdl.obj			\
-        $(SLO)$/XMLBitmapRepeatOffsetPropertyHandler.obj \
-        $(SLO)$/XMLFillBitmapSizePropertyHandler.obj	\
-        $(SLO)$/XMLBitmapLogicalSizePropertyHandler.obj	\
-        $(SLO)$/durationhdl.obj	\
-        $(SLO)$/VisAreaExport.obj \
-        $(SLO)$/VisAreaContext.obj \
-        $(SLO)$/DrawAspectHdl.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 8d333f82a156..be98184a41dc 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#include "numehelp.hxx"
+#include "xmloff/numehelp.hxx"
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 3eb2ddb71a8d..9c736bf8f226 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -33,7 +33,7 @@
 #ifndef __SGI_STL_SET
 #include <set>
 #endif
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlprcon.hxx>
 #include <com/sun/star/style/XStyle.hpp>
@@ -49,7 +49,7 @@
 #include <xmloff/prstylei.hxx>
 #endif
 #include <xmloff/attrlist.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index cb666d899fb7..99bf9ce1476e 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -33,7 +33,7 @@
 #include <svl/svstdarr.hxx>
 #endif
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #ifndef _XMLOFF_XMLITMAP_HXX
 //#include "xmlitmap.hxx"
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index c30f7c631a71..c9ff7b92dade 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -34,10 +34,10 @@
 #include "impastpl.hxx"
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/families.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 
 #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX
 #include <xmloff/PageMasterStyleMap.hxx>
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 94898b89ca04..23c55cc4ef04 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -43,7 +43,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/PropertySetInfoHash.hxx>
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 812071ff1b03..1757e48560b9 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -40,10 +40,10 @@
 #include <xmloff/xmlimppr.hxx>
 #include <xmloff/xmlimp.hxx>
 
-#include "unoatrcn.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/unoatrcn.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 
 #include "xmloff/contextid.hxx"
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 5bc581c7af0b..448547f44717 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -50,11 +50,11 @@
 #include <tools/debug.hxx>
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "fonthdl.hxx"
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlnume.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <tools/fontenum.hxx>
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 93355e914759..7562bfa3a9e3 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
 
 #include <xmloff/xmlnumfe.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index a192baa2216b..7ba79b221e79 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -45,7 +45,7 @@
 
 #include <xmloff/xmlnumfi.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 72efeabaaca4..0d45fdc289d0 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -51,12 +51,12 @@
 
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include <xmloff/xmltoken.hxx>
 
-#include "i18nmap.hxx"
+#include <xmloff/i18nmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "fonthdl.hxx"
 #include <xmloff/XMLFontStylesContext.hxx>
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 48779f48f583..c6f89c650e54 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -46,7 +46,7 @@
 #include <svl/cntnrsrt.hxx>
 #include <svl/itemset.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #ifndef _XMLOFF_FAMILIES_HXX
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index 43390b58f006..64c294c3da2f 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -33,11 +33,11 @@
 #include <com/sun/star/style/TabAlign.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmltabe.hxx"
+#include "xmloff/xmltabe.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 72f5e6f1f2e5..24402e61c240 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -31,11 +31,11 @@
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <com/sun/star/style/TabStop.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include <xmloff/xmluconv.hxx>
 
 #include "xmltabi.hxx"
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index ad3a1f96752f..6a31d7a7cc35 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 
 #include "xmloff/table/XMLTableExport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlexppr.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 875c17aa91fc..0695d8643bfa 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -48,7 +48,7 @@
 #include "xmloff/prstylei.hxx"
 #include "xmloff/xmlimp.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "table.hxx"
 
 #include <boost/shared_ptr.hpp>
diff --git a/xmloff/source/table/makefile.mk b/xmloff/source/table/makefile.mk
deleted file mode 100644
index 6f8c8efab7b6..000000000000
--- a/xmloff/source/table/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=xmloff
-TARGET=table
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/XMLTableExport.obj\
-        $(SLO)$/XMLTableImport.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmloff/source/table/tabledesignsimporter.cxx b/xmloff/source/table/tabledesignsimporter.cxx
deleted file mode 100644
index 7c4002df3013..000000000000
--- a/xmloff/source/table/tabledesignsimporter.cxx
+++ /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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_xmloff.hxx"
-
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/table/XTableRows.hpp>
-#include <com/sun/star/table/XMergeableCell.hpp>
-#include <com/sun/star/table/XMergeableCellRange.hpp>
-#include <com/sun/star/table/XTable.hpp>
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#include "xmloff/table/XMLTableImport.hxx"
-#include "xmloff/xmltkmap.hxx"
-#include "xmloff/maptype.hxx"
-#include "xmloff/xmlprmap.hxx"
-#include "xmloff/txtimp.hxx"
-#include "xmloff/xmlimp.hxx"
-#include "xmloff/nmspmap.hxx"
-#include "xmloff/xmlstyle.hxx"
-#include "xmloff/prstylei.hxx"
-#include "xmloff/xmlimp.hxx"
-
-#include "xmlnmspe.hxx"
-#include "table.hxx"
-
-#include <boost/shared_ptr.hpp>
-
-// --------------------------------------------------------------------
-
-using ::rtl::OUString;
-using namespace ::xmloff::token;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::table;
-using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::style;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-
-// --------------------------------------------------------------------
-
-class TabelDesignsImporter : public SvXMLImport
-{
-    TabelDesignsImporter( const Reference< XMultiServiceFactory > & rSMgr );
-    ~TabelDesignsImporter() throw ();
-
-    SvXMLImportContext* CreateContext(USHORT nPrefix, const OUString& rLocalName,   const Reference<XAttributeList>& xAttrList);
-}
-
-// --------------------------------------------------------------------
-
-TabelDesignsImporter::TabelDesignsImporter( const Reference< XMultiServiceFactory > & rSMgr )
-: SvXMLImport( rSMgr, true )
-{
-    // add namespaces
-    GetNamespaceMap().Add(
-        GetXMLToken(XML_NP_PRESENTATION),
-        GetXMLToken(XML_N_PRESENTATION),
-        XML_NAMESPACE_PRESENTATION);
-}
-
-// --------------------------------------------------------------------
-
-TabelDesignsImporter::~TabelDesignsImporter()
-{
-}
-
-// --------------------------------------------------------------------
-
-SvXMLImportContext* TabelDesignsImporter::CreateContext(USHORT nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList)
-{
-}
-
-// --------------------------------------------------------------------
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx
index c0688c4b2259..505a7e6b0281 100644
--- a/xmloff/source/text/XMLAutoMarkFileContext.cxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustring.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
index 1aad5a8a149b..6d14bd5ddc26 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLEventsImportContext.hxx>
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 125d0a63c43c..dcef23ba5734 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -46,7 +46,7 @@
 //#include <comphelper/processfactory.hxx>
 //#endif
 #include <rtl/ustrbuf.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLEventExport.hxx>
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index 9833376eea5c..ffd7f2985070 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include "XMLAutoTextContainerEventImport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <tools/debug.hxx>
 
diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx
index 03ed535d2785..af1b2b0cf7c4 100644
--- a/xmloff/source/text/XMLCalculationSettingsContext.cxx
+++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx
index 49780ad5c91a..061a9a1f9172 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.cxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.cxx
@@ -32,7 +32,7 @@
 #include "XMLChangeInfoContext.hxx"
 #include <com/sun/star/uno/Reference.h>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx
index b30291b736be..9aee1c843369 100644
--- a/xmloff/source/text/XMLChangeImportContext.cxx
+++ b/xmloff/source/text/XMLChangeImportContext.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/text/XTextRange.hpp>
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx
index 21cf7993328d..506ead5789a4 100644
--- a/xmloff/source/text/XMLChangeInfoContext.cxx
+++ b/xmloff/source/text/XMLChangeInfoContext.cxx
@@ -31,7 +31,7 @@
 #include "XMLChangedRegionImportContext.hxx"
 #include "XMLStringBufferImportContext.hxx"
 #include <com/sun/star/uno/Reference.h>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index 52e4ccc8e048..9560a8159a0e 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
index bfd436652253..5f48619c3946 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 9f2877fd9e12..9f0658dc84da 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -35,7 +35,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #ifndef _XMLOFF_FAMILIES_HXX
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx
index 9a015e20a55c..5f7389a7b799 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #include "XMLFootnoteBodyImportContext.hxx"
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index aaebd7a27dca..52147bc8caf2 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index cbd959b65084..23e11530d73f 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
index f17bcd4dedf1..2fafdf44c10f 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <com/sun/star/text/BibliographyDataField.hpp>
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
index dae235996d10..a617c150fd4e 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
index 0c0e815870be..bc5cb36ecb81 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <com/sun/star/text/ChapterFormat.hpp>
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
index 8f9af9f5243b..40c32701d50a 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx
index c7b3d9e3c135..325e7a66f83f 100644
--- a/xmloff/source/text/XMLIndexMarkExport.cxx
+++ b/xmloff/source/text/XMLIndexMarkExport.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index f44154193e33..15301ffb2fe6 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index b043c0b83dea..4284eabe3571 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 3ee80500d21f..f9e04bd0a488 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index ad9f7ce10d7a..2699111ab47a 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -49,10 +49,10 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/prstylei.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index c52a3f1ee2ab..84296ff24241 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
index 0a7e010e59fb..755bd280a539 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index f2702a81ed20..301e7af3f96d 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index 240e702d2b2a..b87514c79eda 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -42,7 +42,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index cb94747c68a5..05bf7f5495da 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
index 029660b0ccd5..333c141f8843 100644
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index 2554229781b0..b87551307d73 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx
index 637cdf0b781e..dd0386d48aab 100644
--- a/xmloff/source/text/XMLLineNumberingExport.cxx
+++ b/xmloff/source/text/XMLLineNumberingExport.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/style/LineNumberPosition.hpp>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnume.hxx>
 
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 55dc9db9b254..cc1e11389750 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/style/NumberingType.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnumi.hxx>
diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
index c07b1e64e14c..4c2b62c5ec35 100644
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
@@ -31,7 +31,7 @@
 #include "XMLLineNumberingImportContext.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index 67970330f3ef..7dee1ba94069 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/text/XTextSection.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index 7cf96abea2e2..aee5f991b48e 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -53,7 +53,7 @@
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
 #include <com/sun/star/text/ChapterFormat.hpp> //i90246
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/families.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
index 9ec1adfb75eb..ce702d714857 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
@@ -37,7 +37,7 @@
 #include <xmloff/txtprmap.hxx>
 #endif
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnume.hxx>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index 838c113a590f..24e87dfde17a 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlprmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlnumi.hxx>
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 4b9b94b1ced7..890c55140ee4 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -34,7 +34,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/prstylei.hxx>
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index de61e78e564b..25f456a5d584 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -34,7 +34,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index 53a56da11be7..7c2023228c2b 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -34,7 +34,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx
index b714ff064ffd..2d9df7ef1ef1 100644
--- a/xmloff/source/text/XMLStringBufferImportContext.cxx
+++ b/xmloff/source/text/XMLStringBufferImportContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "XMLStringBufferImportContext.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
index fd891e447c60..e4ed313d70de 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "XMLTextCharStyleNamesElementExport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlexp.hxx>
 
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 55f3426cf200..48175ae33e4f 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextColumnsContext.hxx"
diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx
index 9e99c98e5df8..695bdf47578f 100644
--- a/xmloff/source/text/XMLTextColumnsExport.cxx
+++ b/xmloff/source/text/XMLTextColumnsExport.cxx
@@ -38,7 +38,7 @@
 
 
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
 #include "XMLTextColumnsExport.hxx"
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index accaa49d5ea4..3216c6f05618 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "XMLAnchorTypePropHdl.hxx"
@@ -50,7 +50,7 @@
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include "XMLReplacementImageContext.hxx"
 #include <xmloff/prstylei.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include "xexptran.hxx"
 #include <xmloff/shapeimport.hxx>
 #include <xmloff/XMLEventsImportContext.hxx>
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index 6ded2b4d5cbd..15cc68c9e675 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "XMLTextFrameContext.hxx"
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 9fcd63290e10..de74248f787b 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XRelativeTextContentRemove.hpp>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "XMLTextHeaderFooterContext.hxx"
 #ifndef _XMLOFF_TEXTTABLECONTEXT_HXX_
 #include <xmloff/XMLTextTableContext.hxx>
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index f7cbe73acd1b..4422241d822f 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlnume.hxx>
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlexp.hxx>
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index fd2cb58b257f..25b0ba3078ea 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextListItemContext.hxx"
 #include "XMLTextListBlockContext.hxx"
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index b9a6dc1915e5..d8effc0180de 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -30,7 +30,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "txtparai.hxx"
 #include "txtlists.hxx"
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 922777808734..4ac42d4abebd 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -38,8 +38,8 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/odffields.hxx>
-#include "xmlnmspe.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index fc18e17fefd3..ba097f542098 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/style/PageStyleLayout.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLTextMasterPageContext.hxx>
 #include "XMLTextHeaderFooterContext.hxx"
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index fba75ca74e1a..dbffabc3d920 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx
index f66f5df75d37..38428dabb8d1 100644
--- a/xmloff/source/text/XMLTextMasterStylesContext.cxx
+++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx
@@ -31,7 +31,7 @@
 
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 482d94d05889..cbb0d976a836 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include "XMLTextNumRuleInfo.hxx"
 // --> OD 2008-04-25 #refactorlists#
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 // <--
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx
index e398effbf44c..3c5df81cb597 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -41,7 +41,7 @@
 #include "XMLAnchorTypePropHdl.hxx"
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include "XMLTextShapeImportHelper.hxx"
+#include "xmloff/XMLTextShapeImportHelper.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 092f8720c6ec..46aac523b55a 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -31,7 +31,7 @@
 #ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #endif
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextPropertySetContext.hxx"
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index ed207fed6c37..9fc143bf4330 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/text/makefile.mk b/xmloff/source/text/makefile.mk
deleted file mode 100644
index 658de220445f..000000000000
--- a/xmloff/source/text/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=xmloff
-TARGET=text
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-
-SLOFILES =	\
-        $(SLO)$/txtdrope.obj \
-        $(SLO)$/txtdropi.obj \
-        $(SLO)$/txtexppr.obj \
-        $(SLO)$/txtflde.obj \
-        $(SLO)$/txtfldi.obj \
-        $(SLO)$/txtftne.obj \
-        $(SLO)$/txtimp.obj \
-        $(SLO)$/txtimppr.obj \
-                $(SLO)$/txtlists.obj \
-        $(SLO)$/txtparae.obj \
-        $(SLO)$/txtparai.obj \
-        $(SLO)$/txtprhdl.obj \
-        $(SLO)$/txtprmap.obj \
-        $(SLO)$/txtsecte.obj \
-        $(SLO)$/txtstyle.obj \
-        $(SLO)$/txtstyli.obj \
-        $(SLO)$/txtvfldi.obj \
-        $(SLO)$/XMLAutoMarkFileContext.obj \
-        $(SLO)$/XMLAutoTextEventExport.obj \
-        $(SLO)$/XMLAutoTextEventImport.obj \
-        $(SLO)$/XMLAutoTextContainerEventImport.obj \
-        $(SLO)$/XMLChangedRegionImportContext.obj \
-        $(SLO)$/XMLChangeElementImportContext.obj \
-        $(SLO)$/XMLChangeInfoContext.obj \
-        $(SLO)$/XMLFootnoteBodyImportContext.obj \
-        $(SLO)$/XMLFootnoteConfigurationImportContext.obj \
-        $(SLO)$/XMLFootnoteImportContext.obj \
-        $(SLO)$/XMLIndexAlphabeticalSourceContext.obj \
-        $(SLO)$/XMLIndexBodyContext.obj \
-        $(SLO)$/XMLIndexBibliographyConfigurationContext.obj \
-        $(SLO)$/XMLIndexBibliographyEntryContext.obj \
-        $(SLO)$/XMLIndexBibliographySourceContext.obj \
-        $(SLO)$/XMLIndexChapterInfoEntryContext.obj \
-        $(SLO)$/XMLIndexIllustrationSourceContext.obj \
-        $(SLO)$/XMLIndexMarkExport.obj \
-        $(SLO)$/XMLIndexObjectSourceContext.obj \
-        $(SLO)$/XMLIndexSimpleEntryContext.obj \
-        $(SLO)$/XMLIndexSpanEntryContext.obj \
-        $(SLO)$/XMLIndexSourceBaseContext.obj \
-        $(SLO)$/XMLIndexTOCContext.obj \
-        $(SLO)$/XMLIndexTOCSourceContext.obj \
-        $(SLO)$/XMLIndexTOCStylesContext.obj \
-        $(SLO)$/XMLIndexTableSourceContext.obj \
-        $(SLO)$/XMLIndexTabStopEntryContext.obj \
-        $(SLO)$/XMLIndexTemplateContext.obj \
-        $(SLO)$/XMLIndexTitleTemplateContext.obj \
-        $(SLO)$/XMLIndexUserSourceContext.obj \
-        $(SLO)$/XMLLineNumberingExport.obj \
-        $(SLO)$/XMLLineNumberingImportContext.obj \
-        $(SLO)$/XMLLineNumberingSeparatorImportContext.obj \
-        $(SLO)$/XMLPropertyBackpatcher.obj \
-        $(SLO)$/XMLRedlineExport.obj \
-        $(SLO)$/XMLSectionExport.obj \
-        $(SLO)$/XMLSectionFootnoteConfigExport.obj \
-        $(SLO)$/XMLSectionFootnoteConfigImport.obj \
-        $(SLO)$/XMLSectionImportContext.obj \
-        $(SLO)$/XMLSectionSourceDDEImportContext.obj \
-        $(SLO)$/XMLSectionSourceImportContext.obj \
-        $(SLO)$/XMLTextCharStyleNamesElementExport.obj \
-        $(SLO)$/XMLTextColumnsContext.obj \
-        $(SLO)$/XMLTextColumnsExport.obj \
-        $(SLO)$/XMLTextFrameContext.obj \
-        $(SLO)$/XMLTextFrameHyperlinkContext.obj \
-        $(SLO)$/XMLTextHeaderFooterContext.obj \
-        $(SLO)$/XMLTextListAutoStylePool.obj \
-        $(SLO)$/XMLTextListBlockContext.obj \
-        $(SLO)$/XMLTextListItemContext.obj \
-        $(SLO)$/XMLTextMarkImportContext.obj \
-        $(SLO)$/XMLTextMasterPageContext.obj \
-        $(SLO)$/XMLTextMasterPageExport.obj \
-        $(SLO)$/XMLTextMasterStylesContext.obj \
-        $(SLO)$/XMLTextNumRuleInfo.obj \
-        $(SLO)$/XMLTextPropertySetContext.obj \
-        $(SLO)$/XMLTextShapeImportHelper.obj \
-        $(SLO)$/XMLTextShapeStyleContext.obj \
-        $(SLO)$/XMLTextTableContext.obj \
-        $(SLO)$/XMLChangeImportContext.obj \
-        $(SLO)$/XMLStringBufferImportContext.obj \
-        $(SLO)$/XMLTrackedChangesImportContext.obj \
-        $(SLO)$/XMLCalculationSettingsContext.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx
index 88d633317afd..1c31ad94dd1d 100644
--- a/xmloff/source/text/txtdrope.cxx
+++ b/xmloff/source/text/txtdrope.cxx
@@ -33,7 +33,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "txtdrope.hxx"
 
 using namespace ::com::sun::star;
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index 759401f637ff..1968a7e7b1a0 100644
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 07f0bcb52576..7b3c7e828683 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -32,18 +32,10 @@
 #include <com/sun/star/table/BorderLine.hpp>
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
-#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTFAMILY_HPP
 #include <com/sun/star/awt/FontFamily.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTPITCH_HPP
 #include <com/sun/star/awt/FontPitch.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTUNDERLINE_HPP
 #include <com/sun/star/awt/FontUnderline.hpp>
-#endif
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
 #include "txtexppr.hxx"
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index a45057db5a5e..583727713fbf 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -30,7 +30,7 @@
 
 #include <xmloff/xmlexppr.hxx>
 #include "txtdrope.hxx"
-#include "xmltabe.hxx"
+#include "xmloff/xmltabe.hxx"
 #include "XMLTextColumnsExport.hxx"
 #ifndef _XMLOFF_XMLBACKGROUNDIMAGEEXPORT_HXX
 #include "XMLBackgroundImageExport.hxx"
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 694d4599f4bb..173c2f780162 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlnume.hxx>
-#include "numehelp.hxx"
+#include "xmloff/numehelp.hxx"
 
 #include <xmloff/families.hxx>
 #include <xmloff/XMLEventExport.hxx>
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 579ad91ddfe9..3a4d6e6b7749 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index 9940046b81c1..df9a03f25fdd 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -51,7 +51,7 @@
 #include <com/sun/star/text/FootnoteNumbering.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlnumfe.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 87710d310d76..d3591ece238c 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -58,7 +58,7 @@
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/txtstyli.hxx>
 #include <xmloff/families.hxx>
 #include <xmloff/xmlnumfi.hxx>
@@ -69,10 +69,10 @@
 #include "txtparai.hxx"
 #include <xmloff/txtimp.hxx>
 #include <xmloff/txtprmap.hxx>
-#include "txtimppr.hxx"
+#include "xmloff/txtimppr.hxx"
 #include <xmloff/xmlimp.hxx>
 #include "txtvfldi.hxx"
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include "XMLTextListItemContext.hxx"
 #include "XMLTextListBlockContext.hxx"
 #include "XMLTextFrameContext.hxx"
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 4a338c6cf832..dceac7a26890 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -37,7 +37,7 @@
 #include <xmloff/XMLFontStylesContext.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "txtimppr.hxx"
+#include "xmloff/txtimppr.hxx"
 
 #define XML_LINE_LEFT 0
 #define XML_LINE_RIGHT 1
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4b6eba9a5f43..89b5c5c1ee48 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -90,7 +90,7 @@
 #include <com/sun/star/text/XEndnotesSupplier.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/util/DateTime.hpp>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/families.hxx>
 #include "txtexppr.hxx"
@@ -106,7 +106,7 @@
 #include <xmloff/txtprmap.hxx>
 #include "XMLImageMapExport.hxx"
 #include "XMLTextNumRuleInfo.hxx"
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/txtparae.hxx>
 #include "XMLSectionExport.hxx"
 #include "XMLIndexMarkExport.hxx"
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 566c94ed166a..697d3e6cd069 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -49,7 +49,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/txtimp.hxx>
 #include "txtparai.hxx"
 #include "txtfldi.hxx"
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index a14b64e05d90..fbc53ef3e16e 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #ifndef _XMLOFF_TXTPRHDL_HXX
 #include "txtprhdl.hxx"
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index 74e6fc706f6b..b18d3fab086d 100644
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.cxx
@@ -50,7 +50,7 @@
 #include <com/sun/star/text/SectionFileLink.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/text/XDocumentIndex.hpp>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/families.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index eb4e59f2dd16..b771a3ea17a2 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -28,47 +28,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#ifndef _TOOLS_DEBUG_HXX
-//#include <tools/debug.hxx>
-#endif
 #include <com/sun/star/style/ParagraphStyleCategory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/style/XStyle.hpp>
-
-
 #include <xmloff/xmltoken.hxx>
-
-#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX
-//#include <xmloff/xmlprmap.hxx>
-#endif
-#ifndef _XMLOFF_XMLSMSPE_HXX
-#include "xmlnmspe.hxx"
-#endif
-#ifndef _XMLOFF_FAMILIES_HXX
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/families.hxx>
-#endif
-#ifndef _XMLOFF_TXTPRMAP_HXX
-//#include <xmloff/txtprmap.hxx>
-#endif
-#ifndef _XMLOFF_TXTPARAE_HXX
 #include <xmloff/txtparae.hxx>
-#endif
 #include <xmloff/xmlnume.hxx>
 #include <xmloff/xmlexp.hxx>
-#ifndef _XMLOFF_XMLSECTIONEXPORT_HXX
 #include "XMLSectionExport.hxx"
-#endif
 #include "XMLLineNumberingExport.hxx"
 #include "txtexppr.hxx"
-#ifndef _XMLOFF_TXTPRMAP_HXX
 #include <xmloff/txtprmap.hxx>
-#endif
-
-#ifndef _XMLOFF_STYLEEXP_HXX
-//#include <xmloff/styleexp.hxx>
-#endif
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 0be1b25a42be..601bef9cdf63 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 
 #include "XMLTextPropertySetContext.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "xmloff/XMLEventsImportContext.hxx"
 #include "xmloff/attrlist.hxx"
 #include "xmloff/families.hxx"
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index fb0a957f6c86..64a8b37a3539 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -36,9 +36,9 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/xmlnumi.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlement.hxx>
diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx
index a294ee6e9388..26a07e1920d4 100644
--- a/xmloff/source/transform/ChartOASISTContext.cxx
+++ b/xmloff/source/transform/ChartOASISTContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "ChartOASISTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx
index 832cd1e216a1..5e5420002d7d 100644
--- a/xmloff/source/transform/ChartOOoTContext.cxx
+++ b/xmloff/source/transform/ChartOOoTContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "ChartOOoTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX
 #include "ActionMapTypesOOo.hxx"
 #endif
diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
index fa33d0c45b54..d1fea38db7f8 100644
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
@@ -30,7 +30,7 @@
 #include "ChartPlotAreaOASISTContext.hxx"
 #include "TransformerBase.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "DeepTContext.hxx"
 #include "ActionMapTypesOASIS.hxx"
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
index b920d3fd7868..19c4fa580e3a 100644
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
@@ -30,7 +30,7 @@
 #include "ChartPlotAreaOOoTContext.hxx"
 #include "TransformerBase.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "DeepTContext.hxx"
 #include "ActionMapTypesOOo.hxx"
diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx
index 8cf8e0df7815..4b87cb4fe80b 100644
--- a/xmloff/source/transform/ControlOASISTContext.cxx
+++ b/xmloff/source/transform/ControlOASISTContext.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx
index 94d6ae1862b6..2317cf52cf50 100644
--- a/xmloff/source/transform/ControlOOoTContext.cxx
+++ b/xmloff/source/transform/ControlOOoTContext.cxx
@@ -30,7 +30,7 @@
 #include "ControlOOoTContext.hxx"
 #include "IgnoreTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOOo.hxx"
 #include "ElemTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx
index 08d6682a7491..bfe62162847a 100644
--- a/xmloff/source/transform/DlgOASISTContext.cxx
+++ b/xmloff/source/transform/DlgOASISTContext.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include "DlgOASISTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx
index 33b5b2c5dd24..5e4d749826ac 100644
--- a/xmloff/source/transform/DocumentTContext.cxx
+++ b/xmloff/source/transform/DocumentTContext.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #ifndef _XMLOFF_TRANSFOERMERBASE_HXX
 #include "TransformerBase.hxx"
diff --git a/xmloff/source/transform/EventMap.cxx b/xmloff/source/transform/EventMap.cxx
index c8bb7694bc6b..6c18e8e559ba 100644
--- a/xmloff/source/transform/EventMap.cxx
+++ b/xmloff/source/transform/EventMap.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "EventMap.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 XMLTransformerEventMapEntry aTransformerEventMap[] =
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index 23e4d699c349..f2122ec3e0da 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -30,7 +30,7 @@
 #include "EventOASISTContext.hxx"
 #include "EventMap.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index 8f90bc66e475..3b63935817c8 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -30,7 +30,7 @@
 #include "EventOOoTContext.hxx"
 #include "EventMap.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX
 #include "ActionMapTypesOOo.hxx"
 #endif
diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx
index 57ec2b33cf20..518618f4059d 100644
--- a/xmloff/source/transform/FormPropOASISTContext.cxx
+++ b/xmloff/source/transform/FormPropOASISTContext.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx
index bbe70d7789de..54682b3e0c03 100644
--- a/xmloff/source/transform/FormPropOOoTContext.cxx
+++ b/xmloff/source/transform/FormPropOOoTContext.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "IgnoreTContext.hxx"
 #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX
diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx
index 084af4ab595c..3c9439111aec 100644
--- a/xmloff/source/transform/FrameOASISTContext.cxx
+++ b/xmloff/source/transform/FrameOASISTContext.cxx
@@ -30,7 +30,7 @@
 #include "FrameOASISTContext.hxx"
 #include "IgnoreTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "ElemTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx
index bda9526e366d..b36d0c29f258 100644
--- a/xmloff/source/transform/FrameOOoTContext.cxx
+++ b/xmloff/source/transform/FrameOOoTContext.cxx
@@ -30,7 +30,7 @@
 #include "FrameOOoTContext.hxx"
 #include "IgnoreTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "ActionMapTypesOOo.hxx"
 #include "AttrTransformerAction.hxx"
diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx
index 337bce70e32a..a88194952499 100644
--- a/xmloff/source/transform/MergeElemTContext.cxx
+++ b/xmloff/source/transform/MergeElemTContext.cxx
@@ -36,7 +36,7 @@
 #include "AttrTransformerAction.hxx"
 #include "ElemTransformerAction.hxx"
 #include "IgnoreTContext.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx
index 3ee3d6f082d6..e05312cb3413 100644
--- a/xmloff/source/transform/MetaTContext.cxx
+++ b/xmloff/source/transform/MetaTContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #ifndef _XMLOFF_TRANSFOERMERBASE_HXX
 #include "TransformerBase.hxx"
diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx
index b2a0317175ed..5af650cb50b7 100644
--- a/xmloff/source/transform/MetaTContext.hxx
+++ b/xmloff/source/transform/MetaTContext.hxx
@@ -29,7 +29,7 @@
 #define _XMLOFF_METATCONTEXT_HXX
 
 #include <rtl/ref.hxx>
-#include "functional.hxx"
+#include "xmloff/functional.hxx"
 
 #include <map>
 
diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx
index 31457e3ce229..31ccbdf48c5b 100644
--- a/xmloff/source/transform/NotesTContext.cxx
+++ b/xmloff/source/transform/NotesTContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #ifndef _XMLOFF_TRANSFOERMERBASE_HXX
 #include "TransformerBase.hxx"
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 4afa5a40c2ca..103202c48866 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -31,7 +31,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/processfactory.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "MutableAttrList.hxx"
 #include "DeepTContext.hxx"
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 5292c931a609..4f0bd1303afb 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -31,7 +31,7 @@
 #include <rtl/uuid.h>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "DeepTContext.hxx"
 #include "MetaTContext.hxx"
diff --git a/xmloff/source/transform/PropertyActionsOASIS.cxx b/xmloff/source/transform/PropertyActionsOASIS.cxx
index e544836a043c..3abafaa5a13e 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.cxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "FamilyType.hxx"
 #include "PropertyActionsOASIS.hxx"
diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx
index bb3e66ff13b6..bc91561de206 100644
--- a/xmloff/source/transform/PropertyActionsOOo.cxx
+++ b/xmloff/source/transform/PropertyActionsOOo.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "PropertyActionsOOo.hxx"
 
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 6c0aba3bb798..ca444e176a0b 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -34,7 +34,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "DeepTContext.hxx"
 #include "ProcAttrTContext.hxx"
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index d3a5af703812..dc0cfb75a100 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "DeepTContext.hxx"
 #include "RenameElemTContext.hxx"
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index d8b6a51ebc00..eef93b17e7fd 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <comphelper/processfactory.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "IgnoreTContext.hxx"
 #include "RenameElemTContext.hxx"
 #include "ProcAttrTContext.hxx"
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 50e14db40e5d..f201474015fc 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -141,12 +141,12 @@ extern "C"
 {
 #endif
 
-void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = NULL;
     if( pServiceManager )
diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk
deleted file mode 100644
index 031549fcb39b..000000000000
--- a/xmloff/source/transform/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 := xmloff
-TARGET := xof
-LIBTARGET=NO
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
-SHL1OBJS = \
-    $(SLO)$/ChartOASISTContext.obj \
-    $(SLO)$/ChartOOoTContext.obj \
-    $(SLO)$/ChartPlotAreaOASISTContext.obj \
-    $(SLO)$/ChartPlotAreaOOoTContext.obj \
-    $(SLO)$/ControlOASISTContext.obj \
-    $(SLO)$/ControlOOoTContext.obj \
-    $(SLO)$/CreateElemTContext.obj \
-    $(SLO)$/DeepTContext.obj \
-    $(SLO)$/DlgOASISTContext.obj \
-    $(SLO)$/DocumentTContext.obj \
-    $(SLO)$/EventMap.obj \
-    $(SLO)$/EventOASISTContext.obj \
-    $(SLO)$/EventOOoTContext.obj \
-    $(SLO)$/FlatTContext.obj \
-    $(SLO)$/FormPropOASISTContext.obj \
-    $(SLO)$/FormPropOOoTContext.obj \
-    $(SLO)$/FrameOASISTContext.obj \
-    $(SLO)$/FrameOOoTContext.obj \
-    $(SLO)$/IgnoreTContext.obj \
-    $(SLO)$/MergeElemTContext.obj \
-    $(SLO)$/MetaTContext.obj \
-    $(SLO)$/MutableAttrList.obj \
-    $(SLO)$/NotesTContext.obj \
-    $(SLO)$/OOo2Oasis.obj \
-    $(SLO)$/Oasis2OOo.obj \
-    $(SLO)$/PersAttrListTContext.obj \
-    $(SLO)$/PersMixedContentTContext.obj \
-    $(SLO)$/ProcAddAttrTContext.obj \
-    $(SLO)$/ProcAttrTContext.obj \
-    $(SLO)$/PropertyActionsOASIS.obj \
-    $(SLO)$/PropertyActionsOOo.obj \
-    $(SLO)$/RenameElemTContext.obj \
-    $(SLO)$/StyleOASISTContext.obj \
-    $(SLO)$/StyleOOoTContext.obj \
-    $(SLO)$/TransformerActions.obj \
-    $(SLO)$/TransformerBase.obj \
-    $(SLO)$/TransformerContext.obj \
-    $(SLO)$/TransformerTokenMap.obj \
-    $(SLO)$/XMLFilterRegistration.obj
-
-SHL1STDLIBS = \
-    $(COMPHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALHELPERLIB) \
-    $(SALLIB)
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
-    SHL1STDLIBS += -lxo$(DLLPOSTFIX)
-.ELSE
-    SHL1STDLIBS += ixo.lib
-.ENDIF
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/xof.component
-
-$(MISC)/xof.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        xof.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt xof.component
diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx
index be41e3a991e6..8e4c6d9de48e 100644
--- a/xmloff/source/xforms/SchemaContext.cxx
+++ b/xmloff/source/xforms/SchemaContext.cxx
@@ -34,7 +34,7 @@
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index 9a9c892a0bce..0c975b347bfc 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -33,7 +33,7 @@
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
index 0bfe22bc40ac..bd327fd61ddd 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
@@ -33,7 +33,7 @@
 #include "SchemaRestrictionContext.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx
index 62c2deea889d..74c1e01d3433 100644
--- a/xmloff/source/xforms/TokenContext.cxx
+++ b/xmloff/source/xforms/TokenContext.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <tools/debug.hxx>
 
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index 6dd7768d3a99..51de4f2007fc 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -33,10 +33,10 @@
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index 7914034a8cc8..ce0573461081 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -41,10 +41,10 @@
 #include <com/sun/star/xforms/XModel.hpp>
 #include <tools/debug.hxx>
 
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include <xmlerror.hxx>
+#include <xmloff/xmlerror.hxx>
 #include <xmloff/nmspmap.hxx>
 
 
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index 7baf83b77fbb..2bc3e13aaf62 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -37,10 +37,10 @@
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 594b3a871fe6..9f0bfa55bca3 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -33,10 +33,10 @@
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/xforms/makefile.mk b/xmloff/source/xforms/makefile.mk
deleted file mode 100644
index f1238a6036bb..000000000000
--- a/xmloff/source/xforms/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=xmloff
-TARGET=xforms
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-    $(SLO)$/xformsapi.obj \
-    $(SLO)$/XFormsBindContext.obj \
-    $(SLO)$/xformsimport.obj \
-    $(SLO)$/XFormsModelContext.obj \
-    $(SLO)$/XFormsInstanceContext.obj \
-    $(SLO)$/XFormsSubmissionContext.obj \
-    $(SLO)$/SchemaContext.obj \
-    $(SLO)$/SchemaRestrictionContext.obj \
-    $(SLO)$/SchemaSimpleTypeContext.obj \
-    $(SLO)$/TokenContext.obj \
-    $(SLO)$/xformsexport.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index 085418608359..794798c5366a 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -45,7 +45,7 @@
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 
 using rtl::OUString;
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index 572b312505b0..3d90170f11f4 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -28,14 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 
 #include "XFormsModelExport.hxx"
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "DomExport.hxx"
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx
index e222e974ba7b..750444c62165 100644
--- a/xmloff/source/xforms/xformsimport.cxx
+++ b/xmloff/source/xforms/xformsimport.cxx
@@ -31,7 +31,7 @@
 #include "XFormsModelContext.hxx"
 #include <vector>
 #include <utility>
-#include "xformsimport.hxx"
+#include "xmloff/xformsimport.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/form/binding/XValueBinding.hpp>
diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
deleted file mode 100644
index 29ed0784d165..000000000000
--- a/xmloff/util/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=xmloff
-TARGET=xo
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------
-.IF "$(L10N_framework)"==""
-LIB1TARGET= $(SLB)$/xo.lib
-LIB1FILES=	\
-    $(SLB)$/core.lib \
-    $(SLB)$/meta.lib \
-    $(SLB)$/script.lib \
-    $(SLB)$/style.lib \
-    $(SLB)$/text.lib \
-    $(SLB)$/draw.lib \
-    $(SLB)$/chart.lib \
-    $(SLB)$/forms.lib \
-    $(SLB)$/form_handlers.lib \
-    $(SLB)$/xforms.lib \
-    $(SLB)$/table.lib
-
-# --- Shared-Library -----------------------------------------------
-
-SHL1TARGET= xo$(DLLPOSTFIX)
-SHL1IMPLIB= i$(TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS= \
-        $(TOOLSLIB)		\
-        $(I18NISOLANGLIB) \
-        $(VOSLIB)		\
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)\
-        $(COMPHELPERLIB)\
-        $(SVLLIB)		\
-        $(SALLIB)		\
-        $(UNOTOOLSLIB)	\
-        $(BASEGFXLIB)
-
-# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "(OS)"=="SCO"
-SHL1STDLIBS+=-licg617mxp
-.ENDIF
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=   $(LIB1TARGET)
-
-# --- Def-File ---------------------------------------------------------
-
-DEF1NAME    =$(SHL1TARGET)
-DEFLIB1NAME =xo
-DEF1DES     =XML Office Lib
-
-# --- Targets ----------------------------------------------------------
-.ENDIF
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/xo.component
-
-$(MISC)/xo.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        xo.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt xo.component