163 files changed, 587 insertions, 524 deletions
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 0857f4603dbf..4224cf1b6c27 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -201,12 +201,10 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
     oox/source/drawingml/themeelementscontext \
     oox/source/drawingml/themefragmenthandler \
     oox/source/drawingml/transform2dcontext \
-    oox/source/dump/biffdumper \
     oox/source/dump/dffdumper \
     oox/source/dump/dumperbase \
     oox/source/dump/oledumper \
     oox/source/dump/pptxdumper \
-    oox/source/dump/xlsbdumper \
     oox/source/export/chartexport \
     oox/source/export/ColorPropertySet \
     oox/source/export/drawingml \
@@ -290,64 +288,6 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
     oox/source/vml/vmlshape \
     oox/source/vml/vmltextboxcontext \
     oox/source/vml/vmltextbox \
-    oox/source/xls/addressconverter \
-    oox/source/xls/autofilterbuffer \
-    oox/source/xls/autofiltercontext \
-    oox/source/xls/biffcodec \
-    oox/source/xls/biffdetector \
-    oox/source/xls/biffhelper \
-    oox/source/xls/biffinputstream \
-    oox/source/xls/biffoutputstream \
-    oox/source/xls/chartsheetfragment \
-    oox/source/xls/commentsbuffer \
-    oox/source/xls/commentsfragment \
-    oox/source/xls/condformatbuffer \
-    oox/source/xls/condformatcontext \
-    oox/source/xls/connectionsbuffer \
-    oox/source/xls/connectionsfragment \
-    oox/source/xls/defnamesbuffer \
-    oox/source/xls/drawingbase \
-    oox/source/xls/drawingfragment \
-    oox/source/xls/drawingmanager \
-    oox/source/xls/excelchartconverter \
-    oox/source/xls/excelfilter \
-    oox/source/xls/excelhandlers \
-    oox/source/xls/excelvbaproject \
-    oox/source/xls/externallinkbuffer \
-    oox/source/xls/externallinkfragment \
-    oox/source/xls/formulabase \
-    oox/source/xls/formulaparser \
-    oox/source/xls/numberformatsbuffer \
-    oox/source/xls/ooxformulaparser \
-    oox/source/xls/pagesettings \
-    oox/source/xls/pivotcachebuffer \
-    oox/source/xls/pivotcachefragment \
-    oox/source/xls/pivottablebuffer \
-    oox/source/xls/pivottablefragment \
-    oox/source/xls/querytablebuffer \
-    oox/source/xls/querytablefragment \
-    oox/source/xls/richstringcontext \
-    oox/source/xls/richstring \
-    oox/source/xls/scenariobuffer \
-    oox/source/xls/scenariocontext \
-    oox/source/xls/sharedstringsbuffer \
-    oox/source/xls/sharedstringsfragment \
-    oox/source/xls/sheetdatabuffer \
-    oox/source/xls/sheetdatacontext \
-    oox/source/xls/stylesbuffer \
-    oox/source/xls/stylesfragment \
-    oox/source/xls/tablebuffer \
-    oox/source/xls/tablefragment \
-    oox/source/xls/themebuffer \
-    oox/source/xls/unitconverter \
-    oox/source/xls/viewsettings \
-    oox/source/xls/workbookfragment \
-    oox/source/xls/workbookhelper \
-    oox/source/xls/workbooksettings \
-    oox/source/xls/worksheetbuffer \
-    oox/source/xls/worksheetfragment \
-    oox/source/xls/worksheethelper \
-    oox/source/xls/worksheetsettings \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,oox,\
diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk
index 9c7f5d33916b..19d818a12584 100644
--- a/oox/Package_inc.mk
+++ b/oox/Package_inc.mk
@@ -32,15 +32,48 @@ $(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/filterdetect.hxx,oox/core
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/fragmenthandler2.hxx,oox/core/fragmenthandler2.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/relations.hxx,oox/core/relations.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/xmlfilterbase.hxx,oox/core/xmlfilterbase.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/binarycodec.hxx,oox/core/binarycodec.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/contexthandler.hxx,oox/core/contexthandler.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/contexthandler2.hxx,oox/core/contexthandler2.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/fragmenthandler.hxx,oox/core/fragmenthandler.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/binaryfilterbase.hxx,oox/core/binaryfilterbase.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/dllapi.h,oox/dllapi.h))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/chartconverter.hxx,oox/drawingml/chart/chartconverter.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/table/tablestylelist.hxx,oox/drawingml/table/tablestylelist.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/color.hxx,oox/drawingml/color.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/theme.hxx,oox/drawingml/theme.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/clrscheme.hxx,oox/drawingml/clrscheme.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shape.hxx,oox/drawingml/shape.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/drawingmltypes.hxx,oox/drawingml/drawingmltypes.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/customshapeproperties.hxx,oox/drawingml/customshapeproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textliststyle.hxx,oox/drawingml/textliststyle.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/colorchoicecontext.hxx,oox/drawingml/colorchoicecontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textparagraphproperties.hxx,oox/drawingml/textparagraphproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/fillproperties.hxx,oox/drawingml/fillproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/fillpropertiesgroupcontext.hxx,oox/drawingml/fillpropertiesgroupcontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapepropertiescontext.hxx,oox/drawingml/shapepropertiescontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapegroupcontext.hxx,oox/drawingml/shapegroupcontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapecontext.hxx,oox/drawingml/shapecontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/embeddedwavaudiofile.hxx,oox/drawingml/embeddedwavaudiofile.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textcharacterproperties.hxx,oox/drawingml/textcharacterproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textspacing.hxx,oox/drawingml/textspacing.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shape3dproperties.hxx,oox/drawingml/shape3dproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/connectorshapecontext.hxx,oox/drawingml/connectorshapecontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/graphicshapecontext.hxx,oox/drawingml/graphicshapecontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textfont.hxx,oox/drawingml/textfont.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/lineproperties.hxx,oox/drawingml/lineproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapepropertymap.hxx,oox/drawingml/shapepropertymap.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/themefragmenthandler.hxx,oox/drawingml/themefragmenthandler.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/datasourcemodel.hxx,oox/drawingml/chart/datasourcemodel.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/modelbase.hxx,oox/drawingml/chart/modelbase.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/chartexport.hxx,oox/export/chartexport.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/drawingml.hxx,oox/export/drawingml.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/shapes.hxx,oox/export/shapes.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/utils.hxx,oox/export/utils.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/vmlexport.hxx,oox/export/vmlexport.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binarystreambase.hxx,oox/helper/binarystreambase.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binaryinputstream.hxx,oox/helper/binaryinputstream.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binaryoutputstream.hxx,oox/helper/binaryoutputstream.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/containerhelper.hxx,oox/helper/containerhelper.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/graphichelper.hxx,oox/helper/graphichelper.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/helper.hxx,oox/helper/helper.hxx))
@@ -48,6 +81,10 @@ $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/refmap.hxx,oox/helper/r
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/refvector.hxx,oox/helper/refvector.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/storagebase.hxx,oox/helper/storagebase.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/zipstorage.hxx,oox/helper/zipstorage.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/propertymap.hxx,oox/helper/propertymap.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/propertyset.hxx,oox/helper/propertyset.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/attributelist.hxx,oox/helper/attributelist.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/progressbar.hxx,oox/helper/progressbar.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/mathml/export.hxx,oox/mathml/export.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/mathml/import.hxx,oox/mathml/import.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/mathml/importutils.hxx,oox/mathml/importutils.hxx))
@@ -55,8 +92,15 @@ $(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/olehelper.hxx,oox/ole/oleh
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/oleobjecthelper.hxx,oox/ole/oleobjecthelper.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/olestorage.hxx,oox/ole/olestorage.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/vbaproject.hxx,oox/ole/vbaproject.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/vbaprojectfilter.hxx,oox/ole/vbaprojectfilter.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/axcontrol.hxx,oox/ole/axcontrol.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/axbinaryreader.hxx,oox/ole/axbinaryreader.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/axfontdata.hxx,oox/ole/axfontdata.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmldrawing.hxx,oox/vml/vmldrawing.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlshape.hxx,oox/vml/vmlshape.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/xls/excelvbaproject.hxx,oox/xls/excelvbaproject.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlformatting.hxx,oox/vml/vmlformatting.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmldrawingfragment.hxx,oox/vml/vmldrawingfragment.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmltextbox.hxx,oox/vml/vmltextbox.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlshapecontainer.hxx,oox/vml/vmlshapecontainer.hxx))
 
 # vim: set noet sw=4 ts=4:
diff --git a/oox/inc/oox/core/binarycodec.hxx b/oox/inc/oox/core/binarycodec.hxx
index c182877e0541..e57868555431 100644
--- a/oox/inc/oox/core/binarycodec.hxx
+++ b/oox/inc/oox/core/binarycodec.hxx
@@ -34,6 +34,7 @@
 
 #include <rtl/cipher.h>
 #include <rtl/digest.h>
+#include "oox/dllapi.h"
 
 namespace oox { class AttributeList; }
 
@@ -42,7 +43,7 @@ namespace core {
 
 // ============================================================================
 
-class CodecHelper
+class OOX_DLLPUBLIC CodecHelper
 {
 public:
     /** Returns the password hash if it is in the required 16-bit limit. */
@@ -60,7 +61,7 @@ private:
     Implements a simple XOR encoding/decoding algorithm used in MS Office
     versions up to MSO 95.
  */
-class BinaryCodec_XOR
+class OOX_DLLPUBLIC BinaryCodec_XOR
 {
 public:
     /** Enumerates codec types supported by this XOR codec implementation. */
@@ -186,7 +187,7 @@ private:
     Implementation is based on the wvDecrypt package by Caolan McNamara:
     http://www.csn.ul.ie/~caolan/docs/wvDecrypt.html
  */
-class BinaryCodec_RCF
+class OOX_DLLPUBLIC BinaryCodec_RCF
 {
 public:
     /** Default constructor.
diff --git a/oox/inc/oox/core/binaryfilterbase.hxx b/oox/inc/oox/core/binaryfilterbase.hxx
index 77d747bbdd77..566452582a46 100644
--- a/oox/inc/oox/core/binaryfilterbase.hxx
+++ b/oox/inc/oox/core/binaryfilterbase.hxx
@@ -37,7 +37,7 @@ namespace core {
 
 // ============================================================================
 
-class BinaryFilterBase : public FilterBase
+class OOX_DLLPUBLIC BinaryFilterBase : public FilterBase
 {
 public:
     explicit            BinaryFilterBase(
diff --git a/oox/inc/oox/core/contexthandler.hxx b/oox/inc/oox/core/contexthandler.hxx
index 94a095b22c0c..f0562ec2b50d 100644
--- a/oox/inc/oox/core/contexthandler.hxx
+++ b/oox/inc/oox/core/contexthandler.hxx
@@ -35,6 +35,7 @@
 #include <rtl/ref.hxx>
 #include "oox/token/namespaces.hxx"
 #include "oox/token/tokens.hxx"
+#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XLocator; } }
@@ -60,7 +61,7 @@ typedef ::boost::shared_ptr< FragmentBaseData > FragmentBaseDataRef;
 
 typedef ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastContextHandler > ContextHandler_BASE;
 
-class ContextHandler : public ContextHandler_BASE
+class OOX_DLLPUBLIC ContextHandler : public ContextHandler_BASE
 {
 public:
     explicit            ContextHandler( const ContextHandler& rParent );
diff --git a/oox/inc/oox/core/contexthandler2.hxx b/oox/inc/oox/core/contexthandler2.hxx
index 96121ebe6bc7..af412c236aea 100644
--- a/oox/inc/oox/core/contexthandler2.hxx
+++ b/oox/inc/oox/core/contexthandler2.hxx
@@ -34,6 +34,7 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/core/contexthandler.hxx"
+#include "oox/dllapi.h"
 
 namespace oox {
 namespace core {
@@ -69,7 +70,7 @@ struct ElementInfo;
     and implEndRecord() functions of this helper. Again, this is implemented
     already in the classes ContextHandler2 and FragmentHandler2.
  */
-class ContextHandler2Helper
+class OOX_DLLPUBLIC ContextHandler2Helper
 {
 public:
     explicit            ContextHandler2Helper( bool bEnableTrimSpace );
@@ -219,7 +220,7 @@ private:
 
 // ============================================================================
 
-class ContextHandler2 : public ContextHandler, public ContextHandler2Helper
+class OOX_DLLPUBLIC ContextHandler2 : public ContextHandler, public ContextHandler2Helper
 {
 public:
     explicit            ContextHandler2( ContextHandler2Helper& rParent );
diff --git a/oox/inc/oox/core/fragmenthandler.hxx b/oox/inc/oox/core/fragmenthandler.hxx
index 05c645396c84..ca71a308feb2 100644
--- a/oox/inc/oox/core/fragmenthandler.hxx
+++ b/oox/inc/oox/core/fragmenthandler.hxx
@@ -33,6 +33,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include "oox/core/contexthandler.hxx"
 #include "oox/core/relations.hxx"
+#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
@@ -84,7 +85,7 @@ struct RecordInfo
 
 typedef ::cppu::ImplInheritanceHelper1< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandler_BASE;
 
-class FragmentHandler : public FragmentHandler_BASE
+class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE
 {
 public:
     explicit            FragmentHandler( XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath );
diff --git a/oox/inc/oox/core/fragmenthandler2.hxx b/oox/inc/oox/core/fragmenthandler2.hxx
index f129444453f0..781ed855a282 100644
--- a/oox/inc/oox/core/fragmenthandler2.hxx
+++ b/oox/inc/oox/core/fragmenthandler2.hxx
@@ -32,13 +32,14 @@
 #include "oox/core/contexthandler2.hxx"
 #include "oox/core/fragmenthandler.hxx"
 #include <vector>
+#include "oox/dllapi.h"
 
 namespace oox {
 namespace core {
 
 // ============================================================================
 
-class FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper
+class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper
 {
 private:
     enum MCE_STATE
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index 1b504f04c949..e7d558b044ed 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -32,6 +32,7 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 #include "oox/helper/helper.hxx"
+#include "oox/dllapi.h"
 
 namespace oox {
 namespace core {
@@ -70,7 +71,7 @@ struct Relation
 class Relations;
 typedef ::boost::shared_ptr< Relations > RelationsRef;
 
-class Relations : public ::std::map< ::rtl::OUString, Relation >
+class OOX_DLLPUBLIC Relations : public ::std::map< ::rtl::OUString, Relation >
 {
 public:
     explicit            Relations( const ::rtl::OUString& rFragmentPath );
diff --git a/oox/inc/oox/drawingml/clrscheme.hxx b/oox/inc/oox/drawingml/clrscheme.hxx
index 73af9c1ac351..0c74436adb7b 100644
--- a/oox/inc/oox/drawingml/clrscheme.hxx
+++ b/oox/inc/oox/drawingml/clrscheme.hxx
@@ -33,6 +33,7 @@
 #include <map>
 #include <vector>
 #include "oox/drawingml/color.hxx"
+#include "oox/dllapi.h"
 
 namespace oox { namespace drawingml {
 
@@ -48,7 +49,7 @@ public:
 
 typedef boost::shared_ptr< ClrMap > ClrMapPtr;
 
-class ClrScheme
+class OOX_DLLPUBLIC ClrScheme
 {
     std::map < sal_Int32, sal_Int32 > maClrScheme;
 
diff --git a/oox/inc/oox/drawingml/color.hxx b/oox/inc/oox/drawingml/color.hxx
index 62767ad7f803..7021d7a368fd 100644
--- a/oox/inc/oox/drawingml/color.hxx
+++ b/oox/inc/oox/drawingml/color.hxx
@@ -35,6 +35,7 @@
 #include <rtl/instance.hxx>
 #include <rtl/ustring.hxx>
 #include "oox/helper/helper.hxx"
+#include "oox/dllapi.h"
 
 namespace oox { class GraphicHelper; }
 
@@ -43,7 +44,7 @@ namespace drawingml {
 
 // ============================================================================
 
-class Color
+class OOX_DLLPUBLIC Color
 {
 public:
                         Color();
diff --git a/oox/inc/oox/drawingml/connectorshapecontext.hxx b/oox/inc/oox/drawingml/connectorshapecontext.hxx
index e98f1a4d9a38..6cd9c2c58312 100644
--- a/oox/inc/oox/drawingml/connectorshapecontext.hxx
+++ b/oox/inc/oox/drawingml/connectorshapecontext.hxx
@@ -31,10 +31,11 @@
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/shapecontext.hxx"
+#include "oox/dllapi.h"
 
 namespace oox { namespace drawingml {
 
-class ConnectorShapeContext : public ShapeContext
+class OOX_DLLPUBLIC ConnectorShapeContext : public ShapeContext
 {
 public:
     ConnectorShapeContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pGroupShapePtr );
diff --git a/oox/inc/oox/drawingml/fillproperties.hxx b/oox/inc/oox/drawingml/fillproperties.hxx
index b528eaeb4cb5..dd30edf61e64 100644
--- a/oox/inc/oox/drawingml/fillproperties.hxx
+++ b/oox/inc/oox/drawingml/fillproperties.hxx
@@ -109,7 +109,7 @@ struct BlipFillProperties
 
 // ============================================================================
 
-struct FillProperties
+struct OOX_DLLPUBLIC FillProperties
 {
     OptValue< sal_Int32 > moFillType;           /// Fill type (OOXML token).
     Color               maFillColor;            /// Solid fill color and transparence.
diff --git a/oox/inc/oox/drawingml/graphicshapecontext.hxx b/oox/inc/oox/drawingml/graphicshapecontext.hxx
index 0abfbaa12af6..719dba522857 100644
--- a/oox/inc/oox/drawingml/graphicshapecontext.hxx
+++ b/oox/inc/oox/drawingml/graphicshapecontext.hxx
@@ -31,12 +31,13 @@
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/shapecontext.hxx"
+#include "oox/dllapi.h"
 
 namespace oox { namespace vml { struct OleObjectInfo; } }
 
 namespace oox { namespace drawingml {
 
-class GraphicShapeContext : public ShapeContext
+class OOX_DLLPUBLIC GraphicShapeContext : public ShapeContext
 {
 public:
     GraphicShapeContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr );
@@ -47,7 +48,7 @@ public:
 
 // ====================================================================
 
-class GraphicalObjectFrameContext : public ShapeContext
+class OOX_DLLPUBLIC GraphicalObjectFrameContext : public ShapeContext
 {
 public:
     GraphicalObjectFrameContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr, bool bEmbedShapesInChart );
diff --git a/oox/inc/oox/drawingml/lineproperties.hxx b/oox/inc/oox/drawingml/lineproperties.hxx
index 8de222d27b40..0aaee3de1b87 100644
--- a/oox/inc/oox/drawingml/lineproperties.hxx
+++ b/oox/inc/oox/drawingml/lineproperties.hxx
@@ -48,7 +48,7 @@ struct LineArrowProperties
 
 // ============================================================================
 
-struct LineProperties
+struct OOX_DLLPUBLIC LineProperties
 {
     typedef ::std::pair< sal_Int32, sal_Int32 > DashStop;
     typedef ::std::vector< DashStop >           DashStopVector;
diff --git a/oox/inc/oox/drawingml/linepropertiescontext.hxx b/oox/inc/oox/drawingml/linepropertiescontext.hxx
index 445c47d7d7a8..b30d63111518 100644
--- a/oox/inc/oox/drawingml/linepropertiescontext.hxx
+++ b/oox/inc/oox/drawingml/linepropertiescontext.hxx
@@ -30,6 +30,7 @@
 #define OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler.hxx"
+#include "oox/dllapi.h"
 
 namespace oox { namespace drawingml {
 
@@ -37,7 +38,7 @@ namespace oox { namespace drawingml {
 
 struct LineProperties;
 
-class LinePropertiesContext : public ::oox::core::ContextHandler
+class OOX_DLLPUBLIC LinePropertiesContext : public ::oox::core::ContextHandler
 {
 public:
     LinePropertiesContext( ::oox::core::ContextHandler& rParent,
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index 772f6993289d..b360098c6d6f 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -42,6 +42,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vector>
 #include <map>
+#include "oox/dllapi.h"
 
 namespace oox { namespace vml {
     struct OleObjectInfo;
@@ -75,7 +76,7 @@ struct ChartShapeInfo
 
 // ============================================================================
 
-class Shape
+class OOX_DLLPUBLIC Shape
     : public boost::enable_shared_from_this< Shape >
 {
 public:
diff --git a/oox/inc/oox/drawingml/shapecontext.hxx b/oox/inc/oox/drawingml/shapecontext.hxx
index 89298f51055a..ccd5ab4653bc 100644
--- a/oox/inc/oox/drawingml/shapecontext.hxx
+++ b/oox/inc/oox/drawingml/shapecontext.hxx
@@ -34,10 +34,11 @@
 #include "oox/core/contexthandler.hxx"
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/shapepropertiescontext.hxx"
+#include "oox/dllapi.h"
 
 namespace oox { namespace drawingml {
 
-class ShapeContext : public ::oox::core::ContextHandler
+class OOX_DLLPUBLIC ShapeContext : public ::oox::core::ContextHandler
 {
 public:
     ShapeContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr );
diff --git a/oox/inc/oox/drawingml/shapegroupcontext.hxx b/oox/inc/oox/drawingml/shapegroupcontext.hxx
index 784058f091cf..38d0374a5ef3 100644
--- a/oox/inc/oox/drawingml/shapegroupcontext.hxx
+++ b/oox/inc/oox/drawingml/shapegroupcontext.hxx
@@ -31,10 +31,11 @@
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/shapecontext.hxx"
+#include "oox/dllapi.h"
 
 namespace oox { namespace drawingml {
 
-class ShapeGroupContext : public ::oox::core::ContextHandler
+class OOX_DLLPUBLIC ShapeGroupContext : public ::oox::core::ContextHandler
 {
 public:
     ShapeGroupContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pGroupShapePtr );
diff --git a/oox/inc/oox/drawingml/shapepropertymap.hxx b/oox/inc/oox/drawingml/shapepropertymap.hxx
index b467288370eb..69b9cfa555ae 100644
--- a/oox/inc/oox/drawingml/shapepropertymap.hxx
+++ b/oox/inc/oox/drawingml/shapepropertymap.hxx
@@ -30,6 +30,7 @@
 #define OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
 
 #include "oox/helper/propertymap.hxx"
+#include "oox/dllapi.h"
 
 namespace oox { class ModelObjectHelper; }
 
@@ -74,7 +75,7 @@ enum ShapePropertyId
 
 // ============================================================================
 
-struct ShapePropertyInfo
+struct OOX_DLLPUBLIC ShapePropertyInfo
 {
     const sal_Int32*    mpnPropertyIds;         /// Pointer to array of property identifiers for all SHAPEPROP properties.
     bool                mbNamedLineMarker;      /// True = use named line marker instead of explicit line marker.
@@ -97,7 +98,7 @@ struct ShapePropertyInfo
 
 // ============================================================================
 
-class ShapePropertyMap : public PropertyMap
+class OOX_DLLPUBLIC ShapePropertyMap : public PropertyMap
 {
 public:
     explicit            ShapePropertyMap(
diff --git a/oox/inc/oox/drawingml/theme.hxx b/oox/inc/oox/drawingml/theme.hxx
index b2a039d68527..c83c7ed02a22 100644
--- a/oox/inc/oox/drawingml/theme.hxx
+++ b/oox/inc/oox/drawingml/theme.hxx
@@ -33,6 +33,7 @@
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/textfont.hxx"
 #include <com/sun/star/xml/dom/XDocument.hpp>
+#include "oox/dllapi.h"
 
 namespace oox {
 namespace drawingml {
@@ -50,7 +51,7 @@ typedef RefMap< sal_Int32, TextCharacterProperties >    FontScheme;
 
 // ============================================================================
 
-class Theme
+class OOX_DLLPUBLIC Theme
 {
 public:
     explicit            Theme();
diff --git a/oox/inc/oox/drawingml/themefragmenthandler.hxx b/oox/inc/oox/drawingml/themefragmenthandler.hxx
index 177cbd2a1911..c3d32e3de9ee 100644
--- a/oox/inc/oox/drawingml/themefragmenthandler.hxx
+++ b/oox/inc/oox/drawingml/themefragmenthandler.hxx
@@ -30,6 +30,7 @@
 #define OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
+#include "oox/dllapi.h"
 
 namespace oox {
 namespace drawingml {
@@ -38,7 +39,7 @@ class Theme;
 
 // ============================================================================
 
-class ThemeFragmentHandler : public ::oox::core::FragmentHandler2
+class OOX_DLLPUBLIC ThemeFragmentHandler : public ::oox::core::FragmentHandler2
 {
 public:
     explicit            ThemeFragmentHandler(
diff --git a/oox/inc/oox/helper/attributelist.hxx b/oox/inc/oox/helper/attributelist.hxx
index c60c6f8d58cc..db031073d21c 100644
--- a/oox/inc/oox/helper/attributelist.hxx
+++ b/oox/inc/oox/helper/attributelist.hxx
@@ -34,6 +34,7 @@
 #include "oox/helper/helper.hxx"
 #include "oox/token/namespaces.hxx"
 #include "oox/token/tokens.hxx"
+#include "oox/dllapi.h"
 
 namespace oox {
 
@@ -42,7 +43,7 @@ namespace oox {
 /** Static helpers for conversion of strings to attribute values of various
     different data types.
  */
-class AttributeConversion
+class OOX_DLLPUBLIC AttributeConversion
 {
 public:
     /** Returns the XML token identifier from the passed string. */
@@ -76,7 +77,7 @@ public:
     convenience functions that convert the string value of an attribute to
     various other data types.
  */
-class AttributeList
+class OOX_DLLPUBLIC AttributeList
 {
 public:
     explicit            AttributeList(
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx
index 6e952a2b6436..deed56723da9 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/oox/inc/oox/helper/binaryinputstream.hxx
@@ -47,7 +47,7 @@ class BinaryOutputStream;
 
     The binary data in the stream is assumed to be in little-endian format.
  */
-class BinaryInputStream : public virtual BinaryStreamBase
+class OOX_DLLPUBLIC BinaryInputStream : public virtual BinaryStreamBase
 {
 public:
     /** Derived classes implement reading nBytes bytes to the passed sequence.
@@ -281,7 +281,7 @@ void BinaryInputStream::skipArray( sal_Int32 nElemCount )
 
     The binary data in the stream is assumed to be in little-endian format.
  */
-class BinaryXInputStream : public BinaryXSeekableStream, public BinaryInputStream
+class OOX_DLLPUBLIC BinaryXInputStream : public BinaryXSeekableStream, public BinaryInputStream
 {
 public:
     /** Constructs the wrapper object for the passed input stream.
@@ -333,7 +333,7 @@ private:
 
     The binary data in the stream is assumed to be in little-endian format.
  */
-class SequenceInputStream : public SequenceSeekableStream, public BinaryInputStream
+class OOX_DLLPUBLIC SequenceInputStream : public SequenceSeekableStream, public BinaryInputStream
 {
 public:
     /** Constructs the wrapper object for the passed data sequence.
diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx b/oox/inc/oox/helper/binaryoutputstream.hxx
index b0cc8b259935..773f0d03d51c 100644
--- a/oox/inc/oox/helper/binaryoutputstream.hxx
+++ b/oox/inc/oox/helper/binaryoutputstream.hxx
@@ -166,7 +166,7 @@ private:
     construction, the stream points to the beginning of the passed data
     sequence. The data sequence is expanded automatically while writing to it.
  */
-class SequenceOutputStream : public SequenceSeekableStream, public BinaryOutputStream
+class OOX_DLLPUBLIC SequenceOutputStream : public SequenceSeekableStream, public BinaryOutputStream
 {
 public:
     /** Constructs the wrapper object for the passed data sequence.
diff --git a/oox/inc/oox/helper/binarystreambase.hxx b/oox/inc/oox/helper/binarystreambase.hxx
index 5d2d3caad6b4..5f7926b601aa 100644
--- a/oox/inc/oox/helper/binarystreambase.hxx
+++ b/oox/inc/oox/helper/binarystreambase.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <boost/shared_ptr.hpp>
 #include "oox/helper/helper.hxx"
+#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace io { class XSeekable; }
@@ -45,7 +46,7 @@ typedef ::com::sun::star::uno::Sequence< sal_Int8 > StreamDataSequence;
 
 /** Base class for binary stream classes.
  */
-class BinaryStreamBase
+class OOX_DLLPUBLIC BinaryStreamBase
 {
 public:
     virtual             ~BinaryStreamBase();
@@ -134,7 +135,7 @@ private:
 /** Base class for binary input and output streams wrapping a UNO stream,
     seekable via the com.sun.star.io.XSeekable interface.
  */
-class BinaryXSeekableStream : public virtual BinaryStreamBase
+class OOX_DLLPUBLIC BinaryXSeekableStream : public virtual BinaryStreamBase
 {
 public:
     virtual             ~BinaryXSeekableStream();
@@ -166,7 +167,7 @@ private:
     wrapper. The data sequence MUST NOT be changed from outside as long as this
     stream wrapper is used to modify it.
  */
-class SequenceSeekableStream : public virtual BinaryStreamBase
+class OOX_DLLPUBLIC SequenceSeekableStream : public virtual BinaryStreamBase
 {
 public:
     /** Returns the size of the wrapped data sequence. */
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx
index eef942986c80..ce71d5216b94 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/oox/inc/oox/helper/containerhelper.hxx
@@ -33,6 +33,7 @@
 #include <vector>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
+#include "oox/dllapi.h"
 
 namespace rtl { class OUString; }
 
@@ -73,7 +74,7 @@ typedef ::std::vector< ValueRange > ValueRangeVector;
 /** An ordered list of value ranges. The insertion operation will merge
     consecutive value ranges.
  */
-class ValueRangeSet
+class OOX_DLLPUBLIC ValueRangeSet
 {
 public:
     inline explicit     ValueRangeSet() {}
@@ -164,7 +165,7 @@ private:
 // ============================================================================
 
 /** Static helper functions for improved API container handling. */
-class ContainerHelper
+class OOX_DLLPUBLIC ContainerHelper
 {
 public:
     // com.sun.star.container.XIndexContainer ---------------------------------
diff --git a/oox/inc/oox/helper/progressbar.hxx b/oox/inc/oox/helper/progressbar.hxx
index 898ede10f20b..f0f350a493e0 100644
--- a/oox/inc/oox/helper/progressbar.hxx
+++ b/oox/inc/oox/helper/progressbar.hxx
@@ -31,6 +31,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/uno/Reference.hxx>
+#include "oox/dllapi.h"
 
 namespace rtl { class OUString; }
 
@@ -92,7 +93,7 @@ public:
 
 /** A simple progress bar.
  */
-class ProgressBar : public IProgressBar
+class OOX_DLLPUBLIC ProgressBar : public IProgressBar
 {
 public:
     explicit            ProgressBar(
@@ -116,7 +117,7 @@ private:
 
 /** A progress bar containing several independent segments.
  */
-class SegmentProgressBar : public ISegmentProgressBar
+class OOX_DLLPUBLIC SegmentProgressBar : public ISegmentProgressBar
 {
 public:
     explicit            SegmentProgressBar(
diff --git a/oox/inc/oox/helper/propertymap.hxx b/oox/inc/oox/helper/propertymap.hxx
index dabd2e470cbf..3cc8e1e16eef 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
 #include "oox/token/properties.hxx"
+#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star { namespace beans {
     struct PropertyValue;
@@ -56,7 +57,7 @@ typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > PropertyMapBase;
     name mapping is done internally while the properties are written to
     property sets.
  */
-class PropertyMap : public PropertyMapBase
+class OOX_DLLPUBLIC PropertyMap : public PropertyMapBase
 {
 public:
     explicit            PropertyMap();
diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx
index 14ca79bfc63d..fcdf66cda8fb 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/oox/inc/oox/helper/propertyset.hxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include "oox/token/properties.hxx"
+#include "oox/dllapi.h"
 
 namespace oox {
 
@@ -55,7 +56,7 @@ class PropertyMap;
     implementation does not support the XMultiPropertySet interface, all
     properties are handled separately in a loop.
  */
-class PropertySet
+class OOX_DLLPUBLIC PropertySet
 {
 public:
     inline explicit     PropertySet() {}
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index ee3a9acc5c53..b204b92ec7ad 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -34,6 +34,7 @@
 #include "oox/helper/propertyset.hxx"
 #include "oox/ole/axbinaryreader.hxx"
 #include "oox/ole/olehelper.hxx"
+#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace awt { class XControlModel; }
@@ -197,7 +198,7 @@ enum ApiDefaultStateMode
 /** A base class with useful helper functions for something that is able to
     convert ActiveX and ComCtl form controls.
  */
-class ControlConverter
+class OOX_DLLPUBLIC ControlConverter
 {
 public:
     explicit            ControlConverter(
@@ -349,7 +350,7 @@ private:
 // ============================================================================
 
 /** Base class for all models of form controls. */
-class ControlModelBase
+class OOX_DLLPUBLIC ControlModelBase
 {
 public:
     explicit            ControlModelBase();
@@ -484,7 +485,7 @@ private:
 // ============================================================================
 
 /** Base class for all models of Form 2.0 form controls. */
-class AxControlModelBase : public ControlModelBase
+class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase
 {
 public:
     explicit            AxControlModelBase();
@@ -495,7 +496,7 @@ public:
 // ============================================================================
 
 /** Base class for Forms 2.0 controls supporting text formatting. */
-class AxFontDataModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase
 {
 public:
     explicit            AxFontDataModel( bool bSupportsAlign = true );
@@ -519,7 +520,7 @@ private:
 // ============================================================================
 
 /** Model for a Forms 2.0 command button. */
-class AxCommandButtonModel : public AxFontDataModel
+class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel
 {
 public:
     explicit            AxCommandButtonModel();
@@ -548,7 +549,7 @@ public: // direct access needed for legacy VML drawing controls
 // ============================================================================
 
 /** Model for a Forms 2.0 label. */
-class AxLabelModel : public AxFontDataModel
+class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel
 {
 public:
     explicit            AxLabelModel();
@@ -576,7 +577,7 @@ public: // direct access needed for legacy VML drawing controls
 // ============================================================================
 
 /** Model for a Forms 2.0 image. */
-class AxImageModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase
 {
 public:
     explicit            AxImageModel();
@@ -605,7 +606,7 @@ private:
 // ============================================================================
 
 /** Base class for a Forms 2.0 morph data control. */
-class AxMorphDataModelBase : public AxFontDataModel
+class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel
 {
 public:
     explicit            AxMorphDataModelBase();
@@ -642,7 +643,7 @@ public: // direct access needed for legacy VML drawing controls
 // ============================================================================
 
 /** Model for a Forms 2.0 toggle button. */
-class AxToggleButtonModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase
 {
 public:
     explicit            AxToggleButtonModel();
@@ -656,7 +657,7 @@ public:
 // ============================================================================
 
 /** Model for a Forms 2.0 check box. */
-class AxCheckBoxModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase
 {
 public:
     explicit            AxCheckBoxModel();
@@ -670,7 +671,7 @@ public:
 // ============================================================================
 
 /** Model for a Forms 2.0 option button. */
-class AxOptionButtonModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase
 {
 public:
     explicit            AxOptionButtonModel();
@@ -687,7 +688,7 @@ public:
 // ============================================================================
 
 /** Model for a Forms 2.0 text box. */
-class AxTextBoxModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase
 {
 public:
     explicit            AxTextBoxModel();
@@ -701,7 +702,7 @@ public:
 // ============================================================================
 
 /** Model for a numeric field (legacy drawing controls only). */
-class AxNumericFieldModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase
 {
 public:
     explicit            AxNumericFieldModel();
@@ -715,7 +716,7 @@ public:
 // ============================================================================
 
 /** Model for a Forms 2.0 list box. */
-class AxListBoxModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase
 {
 public:
     explicit            AxListBoxModel();
@@ -729,7 +730,7 @@ public:
 // ============================================================================
 
 /** Model for a Forms 2.0 combo box. */
-class AxComboBoxModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase
 {
 public:
     explicit            AxComboBoxModel();
@@ -743,7 +744,7 @@ public:
 // ============================================================================
 
 /** Model for a Forms 2.0 spin button. */
-class AxSpinButtonModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase
 {
 public:
     explicit            AxSpinButtonModel();
@@ -772,7 +773,7 @@ public: // direct access needed for legacy VML drawing controls
 // ============================================================================
 
 /** Model for a Forms 2.0 scroll bar. */
-class AxScrollBarModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase
 {
 public:
     explicit            AxScrollBarModel();
@@ -803,7 +804,7 @@ public: // direct access needed for legacy VML drawing controls
 // ============================================================================
 
 /** Model for a Forms 2.0 tabstrip control. */
-class AxTabStripModel : public AxFontDataModel
+class OOX_DLLPUBLIC AxTabStripModel : public AxFontDataModel
 {
 public:
     explicit            AxTabStripModel();
@@ -833,7 +834,7 @@ typedef ::boost::shared_ptr< AxTabStripModel > AxTabStripModelRef;
 typedef ::std::vector< ::rtl::OUString > AxClassTable;
 
 /** Base class for ActiveX container controls. */
-class AxContainerModelBase : public AxFontDataModel
+class OOX_DLLPUBLIC AxContainerModelBase : public AxFontDataModel
 {
 public:
     explicit            AxContainerModelBase( bool bFontSupport = false );
@@ -874,7 +875,7 @@ typedef ::boost::shared_ptr< AxContainerModelBase > AxContainerModelRef;
 // ============================================================================
 
 /** Model for a Forms 2.0 frame control. */
-class AxFrameModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase
 {
 public:
     explicit            AxFrameModel();
@@ -886,7 +887,7 @@ public:
 // ============================================================================
 
 /** Model for a Forms 2.0 formpage control (a single page in a multipage control). */
-class AxFormPageModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxFormPageModel : public AxContainerModelBase
 {
 public:
     explicit            AxFormPageModel();
@@ -899,7 +900,7 @@ public:
 
 /** Model for a Forms 2.0 multipage control. Contains the tabstrip control
     (class AxTabStripModel) and the single pages (class AxFormPageModel). */
-class AxMultiPageModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxMultiPageModel : public AxContainerModelBase
 {
 public:
     explicit            AxMultiPageModel();
@@ -918,7 +919,7 @@ private:
 // ============================================================================
 
 /** Model for a Forms 2.0 user form. */
-class AxUserFormModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase
 {
 public:
     explicit            AxUserFormModel();
@@ -947,7 +948,7 @@ public:
 
 /** A form control embedded in a document draw page. Contains a specific model
     structure according to the type of the control. */
-class EmbeddedControl
+class OOX_DLLPUBLIC EmbeddedControl
 {
 public:
     explicit            EmbeddedControl( const ::rtl::OUString& rName );
diff --git a/oox/inc/oox/ole/axfontdata.hxx b/oox/inc/oox/ole/axfontdata.hxx
index 2fba2ed78c00..47a2db1c4277 100644
--- a/oox/inc/oox/ole/axfontdata.hxx
+++ b/oox/inc/oox/ole/axfontdata.hxx
@@ -32,6 +32,7 @@
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
 #include "oox/helper/refvector.hxx"
+#include "oox/dllapi.h"
 
 namespace oox {
 namespace ole {
@@ -52,7 +53,7 @@ const sal_Int32 AX_FONTDATA_RIGHT           = 2;
 const sal_Int32 AX_FONTDATA_CENTER          = 3;
 
 /** All entries of a font property. */
-struct AxFontData
+struct OOX_DLLPUBLIC AxFontData
 {
     ::rtl::OUString     maFontName;         /// Name of the used font.
     sal_uInt32          mnFontEffects;      /// Font effect flags.
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index f4af24a2eb21..cb1ee4f8f1d4 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/uno/XInterface.hpp>
 #include "oox/helper/refvector.hxx"
 #include "oox/helper/storagebase.hxx"
+#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
@@ -50,7 +51,7 @@ namespace ole {
 
 // ============================================================================
 
-class VbaFilterConfig
+class OOX_DLLPUBLIC VbaFilterConfig
 {
 public:
     explicit            VbaFilterConfig(
@@ -89,7 +90,7 @@ private:
     store all information needed to finally attach the macro to the action,
     once the VBA project has been imported.
  */
-class VbaMacroAttacherBase
+class OOX_DLLPUBLIC VbaMacroAttacherBase
 {
 public:
     explicit            VbaMacroAttacherBase( const ::rtl::OUString& rMacroName );
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx
index 2b6ef0e17fdc..5415deedaf97 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/oox/inc/oox/vml/vmldrawing.hxx
@@ -33,6 +33,7 @@
 #include <memory>
 #include <vector>
 #include <oox/ole/oleobjecthelper.hxx>
+#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Rectangle; }
@@ -68,7 +69,7 @@ enum DrawingType
 // ============================================================================
 
 /** Contains information about an OLE object embedded in a draw page. */
-struct OleObjectInfo : public ::oox::ole::OleObjectInfo
+struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo
 {
     ::rtl::OUString     maShapeId;          /// Shape identifier for shape lookup.
     ::rtl::OUString     maName;             /// Programmatical name of the OLE object.
@@ -81,10 +82,10 @@ struct OleObjectInfo : public ::oox::ole::OleObjectInfo
     void                setShapeId( sal_Int32 nShapeId );
 };
 
-// ============================================================================
+// =========================================/===================================
 
 /** Contains information about a form control embedded in a draw page. */
-struct ControlInfo
+struct OOX_DLLPUBLIC ControlInfo
 {
     ::rtl::OUString     maShapeId;          /// Shape identifier for shape lookup.
     ::rtl::OUString     maFragmentPath;     /// Path to the fragment describing the form control properties.
@@ -99,7 +100,7 @@ struct ControlInfo
 // ============================================================================
 
 /** Represents the collection of VML shapes for a complete draw page. */
-class Drawing
+class OOX_DLLPUBLIC Drawing
 {
 public:
     explicit            Drawing(
diff --git a/oox/inc/oox/vml/vmldrawingfragment.hxx b/oox/inc/oox/vml/vmldrawingfragment.hxx
index 2b6be0eac7ff..8d630c7aec03 100644
--- a/oox/inc/oox/vml/vmldrawingfragment.hxx
+++ b/oox/inc/oox/vml/vmldrawingfragment.hxx
@@ -30,6 +30,7 @@
 #define OOX_VML_VMLDRAWINGFRAGMENT_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
+#include "oox/dllapi.h"
 
 namespace oox {
 namespace vml {
@@ -38,7 +39,7 @@ class Drawing;
 
 // ============================================================================
 
-class DrawingFragment : public ::oox::core::FragmentHandler2
+class OOX_DLLPUBLIC DrawingFragment : public ::oox::core::FragmentHandler2
 {
 public:
     explicit            DrawingFragment(
diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/oox/inc/oox/vml/vmlformatting.hxx
index 627da96e987a..25f7a555d94b 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/oox/inc/oox/vml/vmlformatting.hxx
@@ -30,6 +30,7 @@
 #define OOX_VML_VMLFORMATTING_HXX
 
 #include "oox/helper/helper.hxx"
+#include "oox/dllapi.h"
 
 namespace oox {
     class GraphicHelper;
@@ -47,7 +48,7 @@ typedef ::std::pair< double, double >       DoublePair;
 
 // ============================================================================
 
-class ConversionHelper
+class OOX_DLLPUBLIC ConversionHelper
 {
 public:
     /** Returns two values contained in rValue separated by cSep.
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 65683f722716..1998a0271c29 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -33,6 +33,7 @@
 #include <vector>
 #include <com/sun/star/awt/Point.hpp>
 #include "oox/vml/vmlformatting.hxx"
+#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Rectangle; }
@@ -196,7 +197,7 @@ struct ShapeModel
 
 /** A shape object that is part of a drawing. May inherit properties from a
     shape template. */
-class ShapeBase : public ShapeType
+class OOX_DLLPUBLIC ShapeBase : public ShapeType
 {
 public:
     /** Returns read/write access to the shape model structure. */
diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index 6ba9e124e1b4..cc2e41bdd8ef 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -32,6 +32,7 @@
 #include <vector>
 #include <rtl/ustring.hxx>
 #include "oox/helper/helper.hxx"
+#include "oox/dllapi.h"
 
 namespace oox {
 namespace vml {
@@ -39,7 +40,7 @@ namespace vml {
 // ============================================================================
 
 /** Font settings for a text portion in a textbox. */
-struct TextFontModel
+struct OOX_DLLPUBLIC TextFontModel
 {
     OptValue< ::rtl::OUString > moName;     /// Font name.
     OptValue< ::rtl::OUString > moColor;    /// Font color, HTML encoded, sort of.
@@ -67,7 +68,7 @@ struct TextPortionModel
 // ============================================================================
 
 /** The textbox contains all text contents and properties. */
-class TextBox
+class OOX_DLLPUBLIC TextBox
 {
 public:
     explicit            TextBox();
diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx
index cc95050f883e..84b0468943ef 100644
--- a/oox/source/core/services.cxx
+++ b/oox/source/core/services.cxx
@@ -43,16 +43,10 @@ namespace oox {
     namespace core {    DECLARE_FUNCTIONS( FastTokenHandler );          }
     namespace core {    DECLARE_FUNCTIONS( FilterDetect );              }
     namespace docprop { DECLARE_FUNCTIONS( DocumentPropertiesImport );  }
-    namespace ole {     DECLARE_FUNCTIONS( WordVbaProjectFilter );      }
     namespace ppt {     DECLARE_FUNCTIONS( PowerPointImport );          }
     namespace ppt {     DECLARE_FUNCTIONS( QuickDiagrammingImport );    }
     namespace ppt {     DECLARE_FUNCTIONS( QuickDiagrammingLayout );    }
     namespace shape {   DECLARE_FUNCTIONS( ShapeContextHandler );       }
-    namespace xls {     DECLARE_FUNCTIONS( BiffDetector );              }
-    namespace xls {     DECLARE_FUNCTIONS( ExcelFilter );               }
-    namespace xls {     DECLARE_FUNCTIONS( ExcelBiffFilter );           }
-    namespace xls {     DECLARE_FUNCTIONS( ExcelVbaProjectFilter );     }
-    namespace xls {     DECLARE_FUNCTIONS( OOXMLFormulaParser );        }
 }
 
 #undef DECLARE_FUNCTIONS
@@ -69,16 +63,10 @@ static ::cppu::ImplementationEntry const spServices[] =
     IMPLEMENTATION_ENTRY( ::oox::core::FastTokenHandler ),
     IMPLEMENTATION_ENTRY( ::oox::core::FilterDetect ),
     IMPLEMENTATION_ENTRY( ::oox::docprop::DocumentPropertiesImport ),
-    IMPLEMENTATION_ENTRY( ::oox::ole::WordVbaProjectFilter ),
     IMPLEMENTATION_ENTRY( ::oox::ppt::PowerPointImport ),
     IMPLEMENTATION_ENTRY( ::oox::ppt::QuickDiagrammingImport ),
     IMPLEMENTATION_ENTRY( ::oox::ppt::QuickDiagrammingLayout ),
     IMPLEMENTATION_ENTRY( ::oox::shape::ShapeContextHandler ),
-    IMPLEMENTATION_ENTRY( ::oox::xls::BiffDetector ),
-    IMPLEMENTATION_ENTRY( ::oox::xls::ExcelFilter ),
-    IMPLEMENTATION_ENTRY( ::oox::xls::ExcelBiffFilter ),
-    IMPLEMENTATION_ENTRY( ::oox::xls::ExcelVbaProjectFilter ),
-    IMPLEMENTATION_ENTRY( ::oox::xls::OOXMLFormulaParser ),
     { 0, 0, 0, 0, 0, 0 }
 };
 
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index d8061cf07f5f..54159b440a93 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -40,7 +40,7 @@
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
 #include "oox/helper/textinputstream.hxx"
-#include "oox/xls/biffhelper.hxx"
+//#include "oox/xls/biffhelper.hxx"
 
 #if OOX_INCLUDE_DUMPER
 
@@ -2388,7 +2388,11 @@ double OutputObjectBase::writeRkItem( const String& rName, sal_Int32 nRk )
 {
     MultiItemsGuard aMultiGuard( mxOut );
     writeHexItem( rName, static_cast< sal_uInt32 >( nRk ), "RK-FLAGS" );
+#if FIXME
     double fValue = ::oox::xls::BiffHelper::calcDoubleFromRk( nRk );
+#else
+    double fValue = 0.0;
+#endif
     writeDecItem( "decoded", fValue );
     return fValue;
 }
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index a569f04edb55..394d24729ed5 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -28,7 +28,7 @@
 
 #include "oox/dump/pptxdumper.hxx"
 
-#include "oox/dump/biffdumper.hxx"
+//#include "oox/dump/biffdumper.hxx"
 #include "oox/dump/oledumper.hxx"
 #include "oox/dump/xlsbdumper.hxx"
 #include "oox/helper/zipstorage.hxx"
@@ -43,7 +43,7 @@ namespace pptx {
 // ============================================================================
 
 using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
+//using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
 using ::comphelper::MediaDescriptor;
@@ -65,6 +65,7 @@ void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm,
     {
         Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
+#if FIXME
     else if(
         aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlsb")) ||
         aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlsm")) ||
@@ -84,6 +85,7 @@ void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm,
     {
         ::oox::dump::biff::Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
+#endif
     else if(
         aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xml")) ||
         aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vml")) ||
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index cc50ef9d2a62..bdf5219765fe 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -88,9 +88,6 @@
 #include <comphelper/processfactory.hxx>
 #include "SchXMLSeriesHelper.hxx"
 #include "ColorPropertySet.hxx"
-#include "oox/xls/formulaparser.hxx"
-#include "oox/xls/workbookhelper.hxx"
-#include "oox/xls/addressconverter.hxx"
 #include <set>
 #include <time.h>
 
diff --git a/oox/util/oox.component b/oox/util/oox.component
index f6519d5a8664..2858498c26f6 100644
--- a/oox/util/oox.component
+++ b/oox/util/oox.component
@@ -37,9 +37,6 @@
   <implementation name="com.sun.star.comp.oox.docprop.DocumentPropertiesImporter">
     <service name="com.sun.star.document.OOXMLDocumentPropertiesImporter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.oox.WordVbaProjectFilter">
-    <service name="com.sun.star.document.ImportFilter"/>
-  </implementation>
   <implementation name="com.sun.star.comp.oox.ppt.PowerPointImport">
     <service name="com.sun.star.document.ImportFilter"/>
     <service name="com.sun.star.document.ExportFilter"/>
@@ -47,21 +44,4 @@
   <implementation name="com.sun.star.comp.oox.ShapeContextHandler">
     <service name="com.sun.star.xml.sax.FastShapeContextHandler"/>
   </implementation>
-  <implementation name="com.sun.star.comp.oox.xls.BiffDetector">
-    <service name="com.sun.star.frame.ExtendedTypeDetection"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.oox.xls.ExcelFilter">
-    <service name="com.sun.star.document.ImportFilter"/>
-    <service name="com.sun.star.document.ExportFilter"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.oox.xls.ExcelBiffFilter">
-    <service name="com.sun.star.document.ImportFilter"/>
-    <service name="com.sun.star.document.ExportFilter"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.oox.xls.ExcelVbaProjectFilter">
-    <service name="com.sun.star.document.ImportFilter"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.oox.xls.FormulaParser">
-    <service name="com.sun.star.sheet.FilterFormulaParser"/>
-  </implementation>
 </component>
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index fb168e303095..2a997efdba44 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_set_include,scfilt,\
 	-I$(SRCDIR)/sc/source/filter/inc \
 	-I$(SRCDIR)/sc/source/ui/inc \
 	-I$(SRCDIR)/sc/inc \
+	-I$(WORKDIR)/oox/inc \
 	$$(INCLUDE) \
 ))
 
@@ -158,6 +159,64 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
 	sc/source/filter/xcl97/XclImpChangeTrack \
 	sc/source/filter/xcl97/xcl97esc \
 	sc/source/filter/xcl97/xcl97rec \
+        sc/source/filter/oox/excelfilter \
+        sc/source/filter/oox/addressconverter \
+        sc/source/filter/oox/autofilterbuffer \
+        sc/source/filter/oox/autofiltercontext \
+        sc/source/filter/oox/biffcodec \
+        sc/source/filter/oox/biffdetector \
+        sc/source/filter/oox/biffhelper \
+        sc/source/filter/oox/biffinputstream \
+        sc/source/filter/oox/biffoutputstream \
+        sc/source/filter/oox/chartsheetfragment \
+        sc/source/filter/oox/commentsbuffer \
+        sc/source/filter/oox/commentsfragment \
+        sc/source/filter/oox/condformatbuffer \
+        sc/source/filter/oox/condformatcontext \
+        sc/source/filter/oox/connectionsbuffer \
+        sc/source/filter/oox/connectionsfragment \
+        sc/source/filter/oox/defnamesbuffer \
+        sc/source/filter/oox/drawingbase \
+        sc/source/filter/oox/drawingfragment \
+        sc/source/filter/oox/drawingmanager \
+        sc/source/filter/oox/excelchartconverter \
+        sc/source/filter/oox/excelhandlers \
+        sc/source/filter/oox/excelvbaproject \
+        sc/source/filter/oox/externallinkbuffer \
+        sc/source/filter/oox/externallinkfragment \
+        sc/source/filter/oox/formulabase \
+        sc/source/filter/oox/formulaparser \
+        sc/source/filter/oox/numberformatsbuffer \
+        sc/source/filter/oox/ooxformulaparser \
+        sc/source/filter/oox/pagesettings \
+        sc/source/filter/oox/pivotcachebuffer \
+        sc/source/filter/oox/pivotcachefragment \
+        sc/source/filter/oox/pivottablebuffer \
+        sc/source/filter/oox/pivottablefragment \
+        sc/source/filter/oox/querytablebuffer \
+        sc/source/filter/oox/querytablefragment \
+        sc/source/filter/oox/richstringcontext \
+        sc/source/filter/oox/richstring \
+        sc/source/filter/oox/scenariobuffer \
+        sc/source/filter/oox/scenariocontext \
+        sc/source/filter/oox/sharedstringsbuffer \
+        sc/source/filter/oox/sharedstringsfragment \
+        sc/source/filter/oox/sheetdatabuffer \
+        sc/source/filter/oox/sheetdatacontext \
+        sc/source/filter/oox/stylesbuffer \
+        sc/source/filter/oox/stylesfragment \
+        sc/source/filter/oox/tablebuffer \
+        sc/source/filter/oox/tablefragment \
+        sc/source/filter/oox/themebuffer \
+        sc/source/filter/oox/unitconverter \
+        sc/source/filter/oox/viewsettings \
+        sc/source/filter/oox/workbookfragment \
+        sc/source/filter/oox/workbookhelper \
+        sc/source/filter/oox/workbooksettings \
+        sc/source/filter/oox/worksheetbuffer \
+        sc/source/filter/oox/worksheetfragment \
+        sc/source/filter/oox/worksheethelper \
+        sc/source/filter/oox/worksheetsettings \
 ))
 
 $(eval $(call gb_Library_add_noexception_objects,scfilt,\
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 5230ab895c98..67df56f12c91 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -54,7 +54,7 @@
 #include <oox/token/tokens.hxx>
 #include <formula/grammar.hxx>
 #include <oox/export/drawingml.hxx>
-#include <oox/xls/excelvbaproject.hxx>
+#include <excelvbaproject.hxx>
 
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
@@ -1182,6 +1182,13 @@ Reference< XInterface > SAL_CALL XlsxExport_createInstance(const Reference< XCom
     return (cppu::OWeakObject*) new XclExpXmlStream( rCC );
 }
 
+namespace oox { namespace xls {
+    OUString SAL_CALL ExcelFilter_getImplementationName() throw();
+    Sequence< OUString > SAL_CALL ExcelFilter_getSupportedServiceNames() throw();
+    Reference< XInterface > SAL_CALL ExcelFilter_createInstance(
+        const Reference< XComponentContext >& rxContext ) throw( Exception );
+} }
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -1197,6 +1204,11 @@ extern "C"
         XlsxExport_getSupportedServiceNames, ::cppu::createSingleComponentFactory,
         0, 0
     },
+    {
+        oox::xls::ExcelFilter_createInstance, oox::xls::ExcelFilter_getImplementationName,
+        oox::xls::ExcelFilter_getSupportedServiceNames, ::cppu::createSingleComponentFactory,
+        0, 0
+    },
     { 0, 0, 0, 0, 0, 0 }
 };
 
diff --git a/oox/inc/oox/xls/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index 47de4bab1a32..e8108c76b375 100644
--- a/oox/inc/oox/xls/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -32,7 +32,7 @@
 #include <vector>
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx
index 493c512b7b42..711986186d01 100644
--- a/oox/inc/oox/xls/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -31,7 +31,7 @@
 
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include "oox/helper/refvector.hxx"
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace sheet { struct TableFilterField3; }
diff --git a/oox/inc/oox/xls/autofiltercontext.hxx b/sc/source/filter/inc/autofiltercontext.hxx
index 7860f6047824..6583fd36d509 100644
--- a/oox/inc/oox/xls/autofiltercontext.hxx
+++ b/sc/source/filter/inc/autofiltercontext.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_AUTOFILTERCONTEXT_HXX
 #define OOX_XLS_AUTOFILTERCONTEXT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx
index d8bf69b7f9c9..2c3aeabb4a53 100644
--- a/oox/inc/oox/xls/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -32,7 +32,7 @@
 #include <vector>
 #include <comphelper/docpasswordhelper.hxx>
 #include "oox/core/binarycodec.hxx"
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/biffdetector.hxx b/sc/source/filter/inc/biffdetector.hxx
index 96d195ea2ef5..5a7c330b5733 100644
--- a/oox/inc/oox/xls/biffdetector.hxx
+++ b/sc/source/filter/inc/biffdetector.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include "oox/helper/storagebase.hxx"
-#include "oox/xls/biffhelper.hxx"
+#include "biffhelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace beans { struct PropertyValue; }
diff --git a/oox/inc/oox/xls/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx
index be8303feac54..be8303feac54 100644
--- a/oox/inc/oox/xls/biffhelper.hxx
+++ b/sc/source/filter/inc/biffhelper.hxx
diff --git a/oox/inc/oox/xls/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx
index c05186c0dd6a..9f01b023a074 100644
--- a/oox/inc/oox/xls/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -31,8 +31,8 @@
 
 #include <vector>
 #include "oox/helper/binaryinputstream.hxx"
-#include "oox/xls/biffhelper.hxx"
-#include "oox/xls/biffcodec.hxx"
+#include "biffhelper.hxx"
+#include "biffcodec.hxx"
 
 namespace rtl { class OUStringBuffer; }
 
diff --git a/oox/inc/oox/xls/biffoutputstream.hxx b/sc/source/filter/inc/biffoutputstream.hxx
index 2a4ea9d2c20b..75440e146436 100644
--- a/oox/inc/oox/xls/biffoutputstream.hxx
+++ b/sc/source/filter/inc/biffoutputstream.hxx
@@ -31,7 +31,7 @@
 
 #include <vector>
 #include "oox/helper/binaryoutputstream.hxx"
-#include "oox/xls/biffhelper.hxx"
+#include "biffhelper.hxx"
 
 namespace oox { class BinaryOutputStream; }
 
diff --git a/oox/inc/oox/xls/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx
index 2f2d44c23ffb..504a17040625 100644
--- a/oox/inc/oox/xls/chartsheetfragment.hxx
+++ b/sc/source/filter/inc/chartsheetfragment.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_CHARTSHEETFRAGMENT_HXX
 #define OOX_XLS_CHARTSHEETFRAGMENT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx
index b8731932c0c0..81143a982235 100644
--- a/oox/inc/oox/xls/commentsbuffer.hxx
+++ b/sc/source/filter/inc/commentsbuffer.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_COMMENTSBUFFER_HXX
 #define OOX_XLS_COMMENTSBUFFER_HXX
 
-#include "oox/xls/richstring.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "richstring.hxx"
+#include "worksheethelper.hxx"
 #include <com/sun/star/awt/Rectangle.hpp>
 
 namespace oox {
diff --git a/oox/inc/oox/xls/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx
index e0a43e8b0904..f03a557637e7 100644
--- a/oox/inc/oox/xls/commentsfragment.hxx
+++ b/sc/source/filter/inc/commentsfragment.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_COMMENTSFRAGMENT_HXX
 #define OOX_XLS_COMMENTSFRAGMENT_HXX
 
-#include "oox/xls/commentsbuffer.hxx"
-#include "oox/xls/excelhandlers.hxx"
+#include "commentsbuffer.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index 43541781d6b1..393a9d0875a9 100644
--- a/oox/inc/oox/xls/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -30,8 +30,8 @@
 #define OOX_XLS_CONDFORMATBUFFER_HXX
 
 #include <com/sun/star/sheet/ConditionOperator2.hpp>
-#include "oox/xls/formulaparser.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "formulaparser.hxx"
+#include "worksheethelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace sheet { class XSheetConditionalEntries; }
diff --git a/oox/inc/oox/xls/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx
index 4289c32abe51..1cfd42cadec0 100644
--- a/oox/inc/oox/xls/condformatcontext.hxx
+++ b/sc/source/filter/inc/condformatcontext.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_CONDFORMATCONTEXT_HXX
 #define OOX_XLS_CONDFORMATCONTEXT_HXX
 
-#include "oox/xls/condformatbuffer.hxx"
-#include "oox/xls/excelhandlers.hxx"
+#include "condformatbuffer.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx
index 0674638f64f2..50dba76b3c67 100644
--- a/oox/inc/oox/xls/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -30,7 +30,7 @@
 #define OOX_XLS_CONNECTIONSBUFFER_HXX
 
 #include "oox/helper/refvector.hxx"
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx
index 0b3e171a10c2..b791454dede3 100644
--- a/oox/inc/oox/xls/connectionsfragment.hxx
+++ b/sc/source/filter/inc/connectionsfragment.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_CONNECTIONSFRAGMENT_HXX
 #define OOX_XLS_CONNECTIONSFRAGMENT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index a4b9257189fd..0d28b6ab747e 100644
--- a/oox/inc/oox/xls/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_DEFINEDNAMESBUFFER_HXX
 #define OOX_XLS_DEFINEDNAMESBUFFER_HXX
 
-#include "oox/xls/formulabase.hxx"
+#include "formulabase.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace sheet { class XNamedRange; }
diff --git a/oox/inc/oox/xls/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx
index d7188b565647..4c4769390ed3 100644
--- a/oox/inc/oox/xls/drawingbase.hxx
+++ b/sc/source/filter/inc/drawingbase.hxx
@@ -30,7 +30,7 @@
 #define OOX_XLS_DRAWINGBASE_HXX
 
 #include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "worksheethelper.hxx"
 
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/table/XCell.hpp>
diff --git a/oox/inc/oox/xls/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx
index 1000845dcac7..e8b1ed7abeae 100644
--- a/oox/inc/oox/xls/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -38,8 +38,8 @@
 #include "oox/vml/vmldrawing.hxx"
 #include "oox/vml/vmldrawingfragment.hxx"
 #include "oox/vml/vmltextbox.hxx"
-#include "oox/xls/drawingbase.hxx"
-#include "oox/xls/excelhandlers.hxx"
+#include "drawingbase.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox { namespace ole {
     struct AxFontData;
diff --git a/oox/inc/oox/xls/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index 758c60ef301b..a7580a3e12e6 100644
--- a/oox/inc/oox/xls/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_DRAWINGMANAGER_HXX
 #define OOX_XLS_DRAWINGMANAGER_HXX
 
-#include "oox/xls/drawingbase.hxx"
+#include "drawingbase.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace drawing { class XDrawPage; }
diff --git a/oox/inc/oox/xls/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx
index 9d0562dab7b8..0bc0539ed40c 100644
--- a/oox/inc/oox/xls/excelchartconverter.hxx
+++ b/sc/source/filter/inc/excelchartconverter.hxx
@@ -30,7 +30,7 @@
 #define OOX_XLS_EXCELCHARTCONVERTER_HXX
 
 #include "oox/drawingml/chart/chartconverter.hxx"
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx
index c15b6cc542cf..c15b6cc542cf 100644
--- a/oox/inc/oox/xls/excelfilter.hxx
+++ b/sc/source/filter/inc/excelfilter.hxx
diff --git a/oox/inc/oox/xls/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index 41bf788a1ef1..46cc1c217f60 100644
--- a/oox/inc/oox/xls/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -30,7 +30,7 @@
 #define OOX_XLS_EXCELHANDLERS_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "worksheethelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx
index 39dc37b2ea2b..fbc5badd7cdc 100644
--- a/oox/inc/oox/xls/excelvbaproject.hxx
+++ b/sc/source/filter/inc/excelvbaproject.hxx
@@ -30,7 +30,6 @@
 #define OOX_XLS_EXCELVBAPROJECT_HXX
 
 #include "oox/ole/vbaproject.hxx"
-#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
         namespace sheet { class XSpreadsheetDocument; }
@@ -42,7 +41,7 @@ namespace xls {
 // ============================================================================
 
 /** Special implementation of the VBA project for the Excel filters. */
-class OOX_DLLPUBLIC ExcelVbaProject : public ::oox::ole::VbaProject
+class ExcelVbaProject : public ::oox::ole::VbaProject
 {
 public:
     explicit            ExcelVbaProject(
diff --git a/oox/inc/oox/xls/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index 071b251a8ba5..f7f37fe8f2ec 100644
--- a/oox/inc/oox/xls/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -31,7 +31,7 @@
 
 #include <com/sun/star/sheet/ExternalLinkInfo.hpp>
 #include "oox/helper/containerhelper.hxx"
-#include "oox/xls/defnamesbuffer.hxx"
+#include "defnamesbuffer.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace sheet { struct DDEItemInfo; }
diff --git a/oox/inc/oox/xls/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx
index a9dc623eb2c7..36b1d77296fb 100644
--- a/oox/inc/oox/xls/externallinkfragment.hxx
+++ b/sc/source/filter/inc/externallinkfragment.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_EXTERNALLINKFRAGMENT_HXX
 #define OOX_XLS_EXTERNALLINKFRAGMENT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/externallinkbuffer.hxx"
+#include "excelhandlers.hxx"
+#include "externallinkbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 1d34343ec6ef..0199d178a62c 100644
--- a/oox/inc/oox/xls/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include "oox/helper/propertyset.hxx"
 #include "oox/helper/refvector.hxx"
-#include "oox/xls/addressconverter.hxx"
+#include "addressconverter.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace sheet { class XFormulaOpCodeMapper; }
diff --git a/oox/inc/oox/xls/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx
index 3c5595639aa3..6bbe5fc2651b 100644
--- a/oox/inc/oox/xls/formulaparser.hxx
+++ b/sc/source/filter/inc/formulaparser.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_FORMULAPARSER_HXX
 #define OOX_XLS_FORMULAPARSER_HXX
 
-#include "oox/xls/formulabase.hxx"
+#include "formulabase.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx
index 17fef04055fc..5914ab90c6b8 100644
--- a/oox/inc/oox/xls/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -30,7 +30,7 @@
 #define OOX_XLS_NUMBERFORMATSBUFFER_HXX
 
 #include <com/sun/star/lang/Locale.hpp>
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace util { class XNumberFormats; }
diff --git a/oox/inc/oox/xls/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx
index 757aec615860..757aec615860 100644
--- a/oox/inc/oox/xls/ooxformulaparser.hxx
+++ b/sc/source/filter/inc/ooxformulaparser.hxx
diff --git a/oox/inc/oox/xls/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx
index b73fa350ad47..0ce662c5fb66 100644
--- a/oox/inc/oox/xls/pagesettings.hxx
+++ b/sc/source/filter/inc/pagesettings.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_PAGESETTINGS_HXX
 #define OOX_XLS_PAGESETTINGS_HXX
 
-#include "oox/xls/worksheethelper.hxx"
+#include "worksheethelper.hxx"
 
 namespace oox { class PropertySet; }
 namespace oox { namespace core { class Relations; } }
diff --git a/oox/inc/oox/xls/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx
index b56de3017516..3c339160054d 100644
--- a/oox/inc/oox/xls/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/refvector.hxx"
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace sheet { class XDataPilotField; }
diff --git a/oox/inc/oox/xls/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx
index 66a583482cdf..a52c5b2c9377 100644
--- a/oox/inc/oox/xls/pivotcachefragment.hxx
+++ b/sc/source/filter/inc/pivotcachefragment.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_PIVOTCACHEFRAGMENT_HXX
 #define OOX_XLS_PIVOTCACHEFRAGMENT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx
index 1d7c10cafa5e..3be869169fea 100644
--- a/oox/inc/oox/xls/pivottablebuffer.hxx
+++ b/sc/source/filter/inc/pivottablebuffer.hxx
@@ -30,8 +30,8 @@
 #define OOX_XLS_PIVOTTABLEBUFFER_HXX
 
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/xls/pivotcachebuffer.hxx"
-#include "oox/xls/stylesbuffer.hxx"
+#include "pivotcachebuffer.hxx"
+#include "stylesbuffer.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace sheet { class XDataPilotDescriptor; }
diff --git a/oox/inc/oox/xls/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx
index 08cf854804cc..5053c726ccb1 100644
--- a/oox/inc/oox/xls/pivottablefragment.hxx
+++ b/sc/source/filter/inc/pivottablefragment.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_PIVOTTABLEFRAGMENT_HXX
 #define OOX_XLS_PIVOTTABLEFRAGMENT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "excelhandlers.hxx"
+#include "worksheethelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/querytablebuffer.hxx b/sc/source/filter/inc/querytablebuffer.hxx
index ae50bf6211dc..8496e40e3529 100644
--- a/oox/inc/oox/xls/querytablebuffer.hxx
+++ b/sc/source/filter/inc/querytablebuffer.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_QUERYTABLEBUFFER_HXX
 #define OOX_XLS_QUERYTABLEBUFFER_HXX
 
-#include "oox/xls/stylesbuffer.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "stylesbuffer.hxx"
+#include "worksheethelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx
index 7c1eaee05778..5609eb0d065c 100644
--- a/oox/inc/oox/xls/querytablefragment.hxx
+++ b/sc/source/filter/inc/querytablefragment.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_QUERYTABLEFRAGMENT_HXX
 #define OOX_XLS_QUERYTABLEFRAGMENT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 8efffdf34286..588deae288d3 100644
--- a/oox/inc/oox/xls/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -30,7 +30,7 @@
 #define OOX_XLS_RICHSTRING_HXX
 
 #include "oox/helper/refvector.hxx"
-#include "oox/xls/stylesbuffer.hxx"
+#include "stylesbuffer.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace text { class XText; }
diff --git a/oox/inc/oox/xls/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx
index 5f50ccdda243..36e49d4686df 100644
--- a/oox/inc/oox/xls/richstringcontext.hxx
+++ b/sc/source/filter/inc/richstringcontext.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_RICHSTRINGCONTEXT_HXX
 #define OOX_XLS_RICHSTRINGCONTEXT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/richstring.hxx"
+#include "excelhandlers.hxx"
+#include "richstring.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx
index e484e418473d..dc996c71e30f 100644
--- a/oox/inc/oox/xls/scenariobuffer.hxx
+++ b/sc/source/filter/inc/scenariobuffer.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/table/CellAddress.hpp>
 #include "oox/helper/refmap.hxx"
 #include "oox/helper/refvector.hxx"
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/scenariocontext.hxx b/sc/source/filter/inc/scenariocontext.hxx
index 5a7334ad44eb..87a9baa087a8 100644
--- a/oox/inc/oox/xls/scenariocontext.hxx
+++ b/sc/source/filter/inc/scenariocontext.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_SCENARIOCONTEXT_HXX
 #define OOX_XLS_SCENARIOCONTEXT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/sharedstringsbuffer.hxx b/sc/source/filter/inc/sharedstringsbuffer.hxx
index cf659aa3ed85..124213d1504c 100644
--- a/oox/inc/oox/xls/sharedstringsbuffer.hxx
+++ b/sc/source/filter/inc/sharedstringsbuffer.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_SHAREDSTRINGSBUFFER_HXX
 #define OOX_XLS_SHAREDSTRINGSBUFFER_HXX
 
-#include "oox/xls/richstring.hxx"
+#include "richstring.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx
index f84b5efb5040..2ed204b45f93 100644
--- a/oox/inc/oox/xls/sharedstringsfragment.hxx
+++ b/sc/source/filter/inc/sharedstringsfragment.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_SHAREDSTRINGSFRAGMENT_HXX
 #define OOX_XLS_SHAREDSTRINGSFRAGMENT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx
index d715f07705e3..ac7fc81a9f4b 100644
--- a/oox/inc/oox/xls/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -31,8 +31,8 @@
 
 #include <list>
 #include <map>
-#include "oox/xls/richstring.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "richstring.hxx"
+#include "worksheethelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace sheet { class XNamedRange; }
diff --git a/oox/inc/oox/xls/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx
index 12f542f49273..324b12a1837c 100644
--- a/oox/inc/oox/xls/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -29,9 +29,9 @@
 #ifndef OOX_XLS_SHEETDATACONTEXT_HXX
 #define OOX_XLS_SHEETDATACONTEXT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/richstring.hxx"
-#include "oox/xls/sheetdatabuffer.hxx"
+#include "excelhandlers.hxx"
+#include "richstring.hxx"
+#include "sheetdatabuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index f2099743f60e..4b98cb9baa14 100644
--- a/oox/inc/oox/xls/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -39,7 +39,7 @@
 #include "oox/helper/graphichelper.hxx"
 #include "oox/helper/refmap.hxx"
 #include "oox/helper/refvector.hxx"
-#include "oox/xls/numberformatsbuffer.hxx"
+#include "numberformatsbuffer.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct FontDescrtiptor; }
diff --git a/oox/inc/oox/xls/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx
index 23b4f04b1feb..e5815695a57f 100644
--- a/oox/inc/oox/xls/stylesfragment.hxx
+++ b/sc/source/filter/inc/stylesfragment.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_STYLESFRAGMENT_HXX
 #define OOX_XLS_STYLESFRAGMENT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/stylesbuffer.hxx"
+#include "excelhandlers.hxx"
+#include "stylesbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx
index e5ea4857b615..08ce3e80f5ad 100644
--- a/oox/inc/oox/xls/tablebuffer.hxx
+++ b/sc/source/filter/inc/tablebuffer.hxx
@@ -30,8 +30,8 @@
 #define OOX_XLS_TABLEBUFFER_HXX
 
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/xls/autofilterbuffer.hxx"
-#include "oox/xls/workbookhelper.hxx"
+#include "autofilterbuffer.hxx"
+#include "workbookhelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx
index de1a28253f20..956b8a5b5f10 100644
--- a/oox/inc/oox/xls/tablefragment.hxx
+++ b/sc/source/filter/inc/tablefragment.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_TABLEFRAGMENT_HXX
 #define OOX_XLS_TABLEFRAGMENT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx
index e1641e740a71..be8f15508df8 100644
--- a/oox/inc/oox/xls/themebuffer.hxx
+++ b/sc/source/filter/inc/themebuffer.hxx
@@ -30,7 +30,7 @@
 #define OOX_XLS_THEMEBUFFER_HXX
 
 #include "oox/drawingml/theme.hxx"
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx
index e3cd263fa2bc..e3a0dc519ec5 100644
--- a/oox/inc/oox/xls/unitconverter.hxx
+++ b/sc/source/filter/inc/unitconverter.hxx
@@ -31,7 +31,7 @@
 
 #include <map>
 #include <vector>
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace util { struct Date; struct DateTime; }
diff --git a/oox/inc/oox/xls/viewsettings.hxx b/sc/source/filter/inc/viewsettings.hxx
index d020616082ff..10da445c358e 100644
--- a/oox/inc/oox/xls/viewsettings.hxx
+++ b/sc/source/filter/inc/viewsettings.hxx
@@ -31,9 +31,9 @@
 
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/stylesbuffer.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "addressconverter.hxx"
+#include "stylesbuffer.hxx"
+#include "worksheethelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx
index a67f8d216110..ab1aab6ee4a2 100644
--- a/oox/inc/oox/xls/workbookfragment.hxx
+++ b/sc/source/filter/inc/workbookfragment.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_WORKBOOKFRAGMENT_HXX
 #define OOX_XLS_WORKBOOKFRAGMENT_HXX
 
-#include "oox/xls/defnamesbuffer.hxx"
-#include "oox/xls/excelhandlers.hxx"
+#include "defnamesbuffer.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index b7ac389a18e6..368abf739c90 100644
--- a/oox/inc/oox/xls/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -32,7 +32,7 @@
 #include <boost/shared_ptr.hpp>
 #include <rtl/ref.hxx>
 #include "oox/helper/storagebase.hxx"
-#include "oox/xls/biffhelper.hxx"
+#include "biffhelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameAccess; }
diff --git a/oox/inc/oox/xls/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx
index 3a1e1f2f5063..a52ee61b7da8 100644
--- a/oox/inc/oox/xls/workbooksettings.hxx
+++ b/sc/source/filter/inc/workbooksettings.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_WORKBOOKSETTINGS_HXX
 #define OOX_XLS_WORKBOOKSETTINGS_HXX
 
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star { namespace util { struct Date; } } } }
 
diff --git a/oox/inc/oox/xls/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx
index d524a5e1d909..f653c4410d2e 100644
--- a/oox/inc/oox/xls/worksheetbuffer.hxx
+++ b/sc/source/filter/inc/worksheetbuffer.hxx
@@ -32,7 +32,7 @@
 #include <utility>
 #include "oox/helper/refmap.hxx"
 #include "oox/helper/refvector.hxx"
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace i18n { class XCharacterClassification; }
diff --git a/oox/inc/oox/xls/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx
index 73d8fd8df987..093b482f7da3 100644
--- a/oox/inc/oox/xls/worksheetfragment.hxx
+++ b/sc/source/filter/inc/worksheetfragment.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_WORKSHEETFRAGMENT_HXX
 #define OOX_XLS_WORKSHEETFRAGMENT_HXX
 
-#include "oox/xls/excelhandlers.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/inc/oox/xls/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index 798e5ccac08b..facb12e21520 100644
--- a/oox/inc/oox/xls/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -32,8 +32,8 @@
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/progressbar.hxx"
 #include "oox/ole/olehelper.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/formulabase.hxx"
+#include "addressconverter.hxx"
+#include "formulabase.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Point; }
diff --git a/oox/inc/oox/xls/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx
index b733d1432d82..175c61dd191b 100644
--- a/oox/inc/oox/xls/worksheetsettings.hxx
+++ b/sc/source/filter/inc/worksheetsettings.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_WORKSHEETSETTINGS_HXX
 #define OOX_XLS_WORKSHEETSETTINGS_HXX
 
-#include "oox/xls/richstring.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "richstring.hxx"
+#include "worksheethelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx
index 3f4567803870..9f0c09c89f20 100644
--- a/oox/source/xls/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/addressconverter.hxx"
+#include "addressconverter.hxx"
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
@@ -35,8 +35,8 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "oox/core/filterbase.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/biffoutputstream.hxx"
+#include "biffinputstream.hxx"
+#include "biffoutputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index ec92a90fcbf4..ed5f1c316204 100644
--- a/oox/source/xls/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/autofilterbuffer.hxx"
+#include "autofilterbuffer.hxx"
 
 #include <com/sun/star/sheet/FilterConnection.hpp>
 #include <com/sun/star/sheet/FilterOperator2.hpp>
@@ -38,9 +38,9 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/defnamesbuffer.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "defnamesbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx
index 88de30b6de65..c58cb4d80f18 100644
--- a/oox/source/xls/autofiltercontext.cxx
+++ b/sc/source/filter/oox/autofiltercontext.cxx
@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
-#include "oox/xls/autofiltercontext.hxx"
+#include "autofiltercontext.hxx"
 
-#include "oox/xls/autofilterbuffer.hxx"
-#include "oox/xls/biffinputstream.hxx"
+#include "autofilterbuffer.hxx"
+#include "biffinputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx
index 19d4b7e47ce3..5d791cdc911f 100644
--- a/oox/source/xls/biffcodec.cxx
+++ b/sc/source/filter/oox/biffcodec.cxx
@@ -26,12 +26,12 @@
  *
  ************************************************************************/
 
-#include "oox/xls/biffcodec.hxx"
+#include "biffcodec.hxx"
 
 #include <osl/thread.h>
 #include <string.h>
 #include "oox/core/filterbase.hxx"
-#include "oox/xls/biffinputstream.hxx"
+#include "biffinputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/biffdetector.cxx b/sc/source/filter/oox/biffdetector.cxx
index d55a2b3d0715..5c5a2c26ef41 100644
--- a/oox/source/xls/biffdetector.cxx
+++ b/sc/source/filter/oox/biffdetector.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/biffdetector.hxx"
+#include "biffdetector.hxx"
 
 #include <algorithm>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/oox/source/xls/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx
index f1a54e0fe589..d71249d76629 100644
--- a/oox/source/xls/biffhelper.cxx
+++ b/sc/source/filter/oox/biffhelper.cxx
@@ -26,13 +26,13 @@
  *
  ************************************************************************/
 
-#include "oox/xls/biffhelper.hxx"
+#include "biffhelper.hxx"
 
 #include <rtl/math.hxx>
 #include <rtl/tencinfo.h>
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/biffoutputstream.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "biffinputstream.hxx"
+#include "biffoutputstream.hxx"
+#include "worksheethelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx
index d238bb30256c..71641f51ba2d 100644
--- a/oox/source/xls/biffinputstream.cxx
+++ b/sc/source/filter/oox/biffinputstream.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/biffinputstream.hxx"
+#include "biffinputstream.hxx"
 
 #include <algorithm>
 #include <rtl/ustrbuf.hxx>
diff --git a/oox/source/xls/biffoutputstream.cxx b/sc/source/filter/oox/biffoutputstream.cxx
index df28b6e27379..88bded6e3be4 100644
--- a/oox/source/xls/biffoutputstream.cxx
+++ b/sc/source/filter/oox/biffoutputstream.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/biffoutputstream.hxx"
+#include "biffoutputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx
index 3cf8114e08b3..e6e0f0b427ac 100644
--- a/oox/source/xls/chartsheetfragment.cxx
+++ b/sc/source/filter/oox/chartsheetfragment.cxx
@@ -26,14 +26,14 @@
  *
  ************************************************************************/
 
-#include "oox/xls/chartsheetfragment.hxx"
+#include "chartsheetfragment.hxx"
 
 #include "oox/helper/attributelist.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/pagesettings.hxx"
-#include "oox/xls/viewsettings.hxx"
-#include "oox/xls/workbooksettings.hxx"
-#include "oox/xls/worksheetsettings.hxx"
+#include "biffinputstream.hxx"
+#include "pagesettings.hxx"
+#include "viewsettings.hxx"
+#include "workbooksettings.hxx"
+#include "worksheetsettings.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index f1c803380ba4..a1bef7dfa5c5 100644
--- a/oox/source/xls/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -29,7 +29,7 @@
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 
-#include "oox/xls/commentsbuffer.hxx"
+#include "commentsbuffer.hxx"
 
 #include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
 #include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp>
@@ -37,12 +37,12 @@
 #include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
 #include "oox/helper/attributelist.hxx"
 #include "oox/vml/vmlshape.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/drawingfragment.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "drawingfragment.hxx"
 #include "svx/sdtaitm.hxx"
-#include "oox/xls/unitconverter.hxx"
-#include "oox/xls/drawingmanager.hxx"
+#include "unitconverter.hxx"
+#include "drawingmanager.hxx"
 
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
diff --git a/oox/source/xls/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx
index c26485f2b171..54736fcd403a 100644
--- a/oox/source/xls/commentsfragment.cxx
+++ b/sc/source/filter/oox/commentsfragment.cxx
@@ -26,9 +26,9 @@
  *
  ************************************************************************/
 
-#include "oox/xls/commentsfragment.hxx"
+#include "commentsfragment.hxx"
 
-#include "oox/xls/richstringcontext.hxx"
+#include "richstringcontext.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index c2341dc7b79c..b10210fbecfc 100644
--- a/oox/source/xls/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/condformatbuffer.hxx"
+#include "condformatbuffer.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -46,9 +46,9 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/stylesbuffer.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "stylesbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx
index 20b3f9db88c7..0ca3b7fe431a 100644
--- a/oox/source/xls/condformatcontext.cxx
+++ b/sc/source/filter/oox/condformatcontext.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/condformatcontext.hxx"
+#include "condformatcontext.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx
index 51b79703cf3a..e9946a809ecf 100644
--- a/oox/source/xls/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
-#include "oox/xls/connectionsbuffer.hxx"
+#include "connectionsbuffer.hxx"
 
 #include "oox/helper/attributelist.hxx"
-#include "oox/xls/biffinputstream.hxx"
+#include "biffinputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx
index 82c998d585b9..23433c7c1ba2 100644
--- a/oox/source/xls/connectionsfragment.cxx
+++ b/sc/source/filter/oox/connectionsfragment.cxx
@@ -26,11 +26,11 @@
  *
  ************************************************************************/
 
-#include "oox/xls/connectionsfragment.hxx"
+#include "connectionsfragment.hxx"
 
 #include "oox/helper/attributelist.hxx"
-#include "oox/xls/biffhelper.hxx"
-#include "oox/xls/connectionsbuffer.hxx"
+#include "biffhelper.hxx"
+#include "connectionsbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 17418d658a89..ab0ed199a8f8 100644
--- a/oox/source/xls/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/defnamesbuffer.hxx"
+#include "defnamesbuffer.hxx"
 
 #include <com/sun/star/sheet/ComplexReference.hpp>
 #include <com/sun/star/sheet/ExternalReference.hpp>
@@ -39,11 +39,11 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/externallinkbuffer.hxx"
-#include "oox/xls/formulaparser.hxx"
-#include "oox/xls/worksheetbuffer.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "externallinkbuffer.hxx"
+#include "formulaparser.hxx"
+#include "worksheetbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index cf2a931f5c23..376476cc7ffe 100644
--- a/oox/source/xls/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -26,12 +26,12 @@
  *
  ************************************************************************/
 
-#include "oox/xls/drawingbase.hxx"
+#include "drawingbase.hxx"
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/binaryinputstream.hxx"
-#include "oox/xls/unitconverter.hxx"
+#include "unitconverter.hxx"
 #include "oox/helper/propertyset.hxx"
 
 namespace oox {
diff --git a/oox/source/xls/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 1fa504c9c5f0..f04128762507 100644
--- a/oox/source/xls/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/drawingfragment.hxx"
+#include "drawingfragment.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
@@ -41,10 +41,10 @@
 #include "oox/helper/propertyset.hxx"
 #include "oox/vml/vmlshape.hxx"
 #include "oox/vml/vmlshapecontainer.hxx"
-#include "oox/xls/formulaparser.hxx"
-#include "oox/xls/stylesbuffer.hxx"
-#include "oox/xls/themebuffer.hxx"
-#include "oox/xls/unitconverter.hxx"
+#include "formulaparser.hxx"
+#include "stylesbuffer.hxx"
+#include "themebuffer.hxx"
+#include "unitconverter.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index afadd1f7464f..5ba29e244488 100644
--- a/oox/source/xls/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/drawingmanager.hxx"
+#include "drawingmanager.hxx"
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/CircleKind.hpp>
@@ -39,8 +39,8 @@
 #include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/token/tokens.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/unitconverter.hxx"
+#include "biffinputstream.hxx"
+#include "unitconverter.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx
index 2fb699dd46d3..a6303b0362ea 100644
--- a/oox/source/xls/excelchartconverter.cxx
+++ b/sc/source/filter/oox/excelchartconverter.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/excelchartconverter.hxx"
+#include "excelchartconverter.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
@@ -36,7 +36,7 @@
 #include "oox/core/filterbase.hxx"
 #include "oox/drawingml/chart/datasourcemodel.hxx"
 #include "oox/helper/containerhelper.hxx"
-#include "oox/xls/formulaparser.hxx"
+#include "formulaparser.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index 9ac3cf30b389..57c9749e7f96 100644
--- a/oox/source/xls/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -26,19 +26,19 @@
  *
  ************************************************************************/
 
-#include "oox/xls/excelfilter.hxx"
+#include "excelfilter.hxx"
 
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include "oox/dump/biffdumper.hxx"
-#include "oox/dump/xlsbdumper.hxx"
+//#include "oox/dump/biffdumper.hxx"
+//#include "oox/dump/xlsbdumper.hxx"
 #include "oox/helper/binaryinputstream.hxx"
-#include "oox/xls/biffdetector.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/excelchartconverter.hxx"
-#include "oox/xls/excelvbaproject.hxx"
-#include "oox/xls/stylesbuffer.hxx"
-#include "oox/xls/themebuffer.hxx"
-#include "oox/xls/workbookfragment.hxx"
+#include "biffdetector.hxx"
+#include "biffinputstream.hxx"
+#include "excelchartconverter.hxx"
+#include "excelvbaproject.hxx"
+#include "stylesbuffer.hxx"
+#include "themebuffer.hxx"
+#include "workbookfragment.hxx"
 
 namespace oox {
 namespace xls {
@@ -120,7 +120,7 @@ bool ExcelFilter::importDocument() throw()
         file:///<path-to-oox-module>/source/dump/xlsbdumper.ini
         into the environment variable OOO_XLSBDUMPER and start the office with
         this variable (nonpro only). */
-    OOX_DUMP_FILE( ::oox::dump::xlsb::Dumper );
+    //OOX_DUMP_FILE( ::oox::dump::xlsb::Dumper );
 
     OUString aWorkbookPath = getFragmentPathFromFirstType( CREATE_OFFICEDOC_RELATION_TYPE( "officeDocument" ) );
     if( aWorkbookPath.isEmpty() )
@@ -243,7 +243,7 @@ bool ExcelBiffFilter::importDocument() throw()
         file:///<path-to-oox-module>/source/dump/biffdumper.ini
         into the environment variable OOO_BIFFDUMPER and start the office with
         this variable (nonpro only). */
-    OOX_DUMP_FILE( ::oox::dump::biff::Dumper );
+    //OOX_DUMP_FILE( ::oox::dump::biff::Dumper );
 
     /*  The boolean argument "UseBiffFilter" passed through XInitialisation
         decides whether to import/export the document with this filter (true),
diff --git a/oox/source/xls/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx
index 271e9be629b9..a3d0b518d6e8 100644
--- a/oox/source/xls/excelhandlers.cxx
+++ b/sc/source/filter/oox/excelhandlers.cxx
@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
-#include "oox/xls/excelhandlers.hxx"
+#include "excelhandlers.hxx"
 
 #include "oox/core/filterbase.hxx"
-#include "oox/xls/biffinputstream.hxx"
+#include "biffinputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx
index 12ba7cb86044..148f27a58b47 100644
--- a/oox/source/xls/excelvbaproject.cxx
+++ b/sc/source/filter/oox/excelvbaproject.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/excelvbaproject.hxx"
+#include "excelvbaproject.hxx"
 
 #include <list>
 #include <set>
diff --git a/oox/source/xls/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index 8f79b8007973..2a6faca1455e 100644
--- a/oox/source/xls/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/externallinkbuffer.hxx"
+#include "externallinkbuffer.hxx"
 
 #include <com/sun/star/sheet/ComplexReference.hpp>
 #include <com/sun/star/sheet/DDELinkInfo.hpp>
@@ -42,11 +42,11 @@
 #include <rtl/strbuf.hxx>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/attributelist.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/formulaparser.hxx"
-#include "oox/xls/worksheetbuffer.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "excelhandlers.hxx"
+#include "formulaparser.hxx"
+#include "worksheetbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx
index 04909ceb4166..0b7c3794e57a 100644
--- a/oox/source/xls/externallinkfragment.cxx
+++ b/sc/source/filter/oox/externallinkfragment.cxx
@@ -26,14 +26,14 @@
  *
  ************************************************************************/
 
-#include "oox/xls/externallinkfragment.hxx"
+#include "externallinkfragment.hxx"
 
 #include <com/sun/star/sheet/XExternalSheetCache.hpp>
 #include "oox/helper/attributelist.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/defnamesbuffer.hxx"
-#include "oox/xls/sheetdatacontext.hxx"
-#include "oox/xls/unitconverter.hxx"
+#include "biffinputstream.hxx"
+#include "defnamesbuffer.hxx"
+#include "sheetdatacontext.hxx"
+#include "unitconverter.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 7cb36293d024..276564eeaa11 100644
--- a/oox/source/xls/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/formulabase.hxx"
+#include "formulabase.hxx"
 
 #include <map>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -44,7 +44,7 @@
 #include <rtl/ustrbuf.hxx>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/containerhelper.hxx"
-#include "oox/xls/biffinputstream.hxx"
+#include "biffinputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 4643c6c798b5..eeb683f85ab0 100644
--- a/oox/source/xls/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/formulaparser.hxx"
+#include "formulaparser.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sheet/ComplexReference.hpp>
@@ -36,12 +36,12 @@
 #include <com/sun/star/sheet/ReferenceFlags.hpp>
 #include <com/sun/star/sheet/SingleReference.hpp>
 #include "oox/core/filterbase.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/defnamesbuffer.hxx"
-#include "oox/xls/externallinkbuffer.hxx"
-#include "oox/xls/tablebuffer.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "defnamesbuffer.hxx"
+#include "externallinkbuffer.hxx"
+#include "tablebuffer.hxx"
+#include "worksheethelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 785fc4600c96..e8a9ca55796d 100644
--- a/oox/source/xls/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/numberformatsbuffer.hxx"
+#include "numberformatsbuffer.hxx"
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/i18n/NumberFormatIndex.hpp>
@@ -41,7 +41,7 @@
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/propertymap.hxx"
-#include "oox/xls/biffinputstream.hxx"
+#include "biffinputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index 77197de38930..ebb5175f4eee 100644
--- a/oox/source/xls/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
-#include "oox/xls/ooxformulaparser.hxx"
+#include "ooxformulaparser.hxx"
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include "oox/xls/formulaparser.hxx"
+#include "formulaparser.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 0625bb3e152f..6f140b16518e 100644
--- a/oox/source/xls/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/pagesettings.hxx"
+#include "pagesettings.hxx"
 
 #include <algorithm>
 #include <set>
@@ -45,10 +45,10 @@
 #include "oox/helper/graphichelper.hxx"
 #include "oox/helper/propertymap.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/stylesbuffer.hxx"
-#include "oox/xls/unitconverter.hxx"
+#include "biffinputstream.hxx"
+#include "excelhandlers.hxx"
+#include "stylesbuffer.hxx"
+#include "unitconverter.hxx"
 #include <sax/tools/converter.hxx>
 
 namespace oox {
diff --git a/oox/source/xls/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index 77b5a0fc1fc2..4a5c32170a3c 100644
--- a/oox/source/xls/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/pivotcachebuffer.hxx"
+#include "pivotcachebuffer.hxx"
 
 #include <set>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -40,14 +40,14 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/defnamesbuffer.hxx"
-#include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/pivotcachefragment.hxx"
-#include "oox/xls/sheetdatabuffer.hxx"
-#include "oox/xls/tablebuffer.hxx"
-#include "oox/xls/unitconverter.hxx"
-#include "oox/xls/worksheetbuffer.hxx"
+#include "biffinputstream.hxx"
+#include "defnamesbuffer.hxx"
+#include "excelhandlers.hxx"
+#include "pivotcachefragment.hxx"
+#include "sheetdatabuffer.hxx"
+#include "tablebuffer.hxx"
+#include "unitconverter.hxx"
+#include "worksheetbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx
index 4884976a790b..3671f52066bb 100644
--- a/oox/source/xls/pivotcachefragment.cxx
+++ b/sc/source/filter/oox/pivotcachefragment.cxx
@@ -26,12 +26,12 @@
  *
  ************************************************************************/
 
-#include "oox/xls/pivotcachefragment.hxx"
+#include "pivotcachefragment.hxx"
 
 #include "oox/helper/attributelist.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/pivotcachebuffer.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "pivotcachebuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index ef390cafd006..0a5dc7388f81 100644
--- a/oox/source/xls/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/pivottablebuffer.hxx"
+#include "pivottablebuffer.hxx"
 
 #include <set>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -50,8 +50,8 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx
index 9d8fc1ffef5f..76310bfb2a3d 100644
--- a/oox/source/xls/pivottablefragment.cxx
+++ b/sc/source/filter/oox/pivottablefragment.cxx
@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
-#include "oox/xls/pivottablefragment.hxx"
+#include "pivottablefragment.hxx"
 
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/pivottablebuffer.hxx"
+#include "biffinputstream.hxx"
+#include "pivottablebuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index d9043684ee78..63d2ea8f6119 100644
--- a/oox/source/xls/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -26,17 +26,17 @@
  *
  ************************************************************************/
 
-#include "oox/xls/querytablebuffer.hxx"
+#include "querytablebuffer.hxx"
 
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/sheet/XAreaLink.hpp>
 #include <com/sun/star/sheet/XAreaLinks.hpp>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/attributelist.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/connectionsbuffer.hxx"
-#include "oox/xls/defnamesbuffer.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "connectionsbuffer.hxx"
+#include "defnamesbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx
index 94a6d57c0608..ad4ca130f062 100644
--- a/oox/source/xls/querytablefragment.cxx
+++ b/sc/source/filter/oox/querytablefragment.cxx
@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
-#include "oox/xls/querytablefragment.hxx"
+#include "querytablefragment.hxx"
 
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/querytablebuffer.hxx"
+#include "biffinputstream.hxx"
+#include "querytablebuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index 48d5db87b9bc..28c0d0cb1827 100644
--- a/oox/source/xls/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -26,13 +26,13 @@
  *
  ************************************************************************/
 
-#include "oox/xls/richstring.hxx"
+#include "richstring.hxx"
 
 #include <com/sun/star/text/XText.hpp>
 #include <rtl/ustrbuf.hxx>
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/biffinputstream.hxx"
+#include "biffinputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx
index 6ea5720bb3ec..0443ff1fc5c3 100644
--- a/oox/source/xls/richstringcontext.cxx
+++ b/sc/source/filter/oox/richstringcontext.cxx
@@ -26,9 +26,9 @@
  *
  ************************************************************************/
 
-#include "oox/xls/richstringcontext.hxx"
+#include "richstringcontext.hxx"
 
-#include "oox/xls/stylesfragment.hxx"
+#include "stylesfragment.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx
index b0d24c994c64..0309bb6460e9 100644
--- a/oox/source/xls/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/scenariobuffer.hxx"
+#include "scenariobuffer.hxx"
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sheet/XScenario.hpp>
@@ -37,8 +37,8 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/scenariocontext.cxx b/sc/source/filter/oox/scenariocontext.cxx
index 8584e914fa1e..5c1c76d967eb 100644
--- a/oox/source/xls/scenariocontext.cxx
+++ b/sc/source/filter/oox/scenariocontext.cxx
@@ -26,9 +26,9 @@
  *
  ************************************************************************/
 
-#include "oox/xls/scenariocontext.hxx"
+#include "scenariocontext.hxx"
 
-#include "oox/xls/scenariobuffer.hxx"
+#include "scenariobuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/sharedformulabuffer.cxx b/sc/source/filter/oox/sharedformulabuffer.cxx
index b2861800f2dc..9646534ac207 100644
--- a/oox/source/xls/sharedformulabuffer.cxx
+++ b/sc/source/filter/oox/sharedformulabuffer.cxx
@@ -29,9 +29,9 @@
 #include <com/sun/star/sheet/XFormulaTokens.hpp>
 #include <rtl/ustrbuf.hxx>
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/formulaparser.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "formulaparser.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/sharedstringsbuffer.cxx b/sc/source/filter/oox/sharedstringsbuffer.cxx
index eee6a2bf8471..c71172f4a9a9 100644
--- a/oox/source/xls/sharedstringsbuffer.cxx
+++ b/sc/source/filter/oox/sharedstringsbuffer.cxx
@@ -26,9 +26,9 @@
  *
  ************************************************************************/
 
-#include "oox/xls/sharedstringsbuffer.hxx"
+#include "sharedstringsbuffer.hxx"
 
-#include "oox/xls/biffinputstream.hxx"
+#include "biffinputstream.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx
index b9eed5478044..0be8837935bc 100644
--- a/oox/source/xls/sharedstringsfragment.cxx
+++ b/sc/source/filter/oox/sharedstringsfragment.cxx
@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
-#include "oox/xls/sharedstringsfragment.hxx"
+#include "sharedstringsfragment.hxx"
 
-#include "oox/xls/richstringcontext.hxx"
-#include "oox/xls/sharedstringsbuffer.hxx"
+#include "richstringcontext.hxx"
+#include "sharedstringsbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index d382809cf381..fbae5b15aa97 100644
--- a/oox/source/xls/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/sheetdatabuffer.hxx"
+#include "sheetdatabuffer.hxx"
 
 #include <algorithm>
 #include <com/sun/star/sheet/XArrayFormulaTokens.hpp>
@@ -45,11 +45,11 @@
 #include "oox/helper/propertymap.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/token/tokens.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/formulaparser.hxx"
-#include "oox/xls/sharedstringsbuffer.hxx"
-#include "oox/xls/unitconverter.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "formulaparser.hxx"
+#include "sharedstringsbuffer.hxx"
+#include "unitconverter.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index 7196e4761405..c087418c7371 100644
--- a/oox/source/xls/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/sheetdatacontext.hxx"
+#include "sheetdatacontext.hxx"
 
 #include <com/sun/star/table/CellContentType.hpp>
 #include <com/sun/star/table/XCell.hpp>
@@ -34,11 +34,11 @@
 #include <com/sun/star/text/XText.hpp>
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/formulaparser.hxx"
-#include "oox/xls/richstringcontext.hxx"
-#include "oox/xls/unitconverter.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "formulaparser.hxx"
+#include "richstringcontext.hxx"
+#include "unitconverter.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 6c9c76f49259..ffcd6f05cbe7 100644
--- a/oox/source/xls/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/stylesbuffer.hxx"
+#include "stylesbuffer.hxx"
 
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/awt/FontFamily.hpp>
@@ -53,11 +53,11 @@
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertymap.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/condformatbuffer.hxx"
-#include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/themebuffer.hxx"
-#include "oox/xls/unitconverter.hxx"
+#include "biffinputstream.hxx"
+#include "condformatbuffer.hxx"
+#include "excelhandlers.hxx"
+#include "themebuffer.hxx"
+#include "unitconverter.hxx"
 
 using ::com::sun::star::table::BorderLine2;
 namespace oox {
diff --git a/oox/source/xls/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx
index 21e0db7287eb..d301135d905b 100644
--- a/oox/source/xls/stylesfragment.cxx
+++ b/sc/source/filter/oox/stylesfragment.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/stylesfragment.hxx"
+#include "stylesfragment.hxx"
 
 #include "oox/helper/attributelist.hxx"
 
diff --git a/oox/source/xls/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx
index baefc3d41631..a2c98220afcd 100644
--- a/oox/source/xls/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -26,13 +26,13 @@
  *
  ************************************************************************/
 
-#include "oox/xls/tablebuffer.hxx"
+#include "tablebuffer.hxx"
 
 #include <com/sun/star/sheet/XDatabaseRange.hpp>
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/addressconverter.hxx"
+#include "addressconverter.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx
index 874b370c1ded..28953f366f7e 100644
--- a/oox/source/xls/tablefragment.cxx
+++ b/sc/source/filter/oox/tablefragment.cxx
@@ -26,11 +26,11 @@
  *
  ************************************************************************/
 
-#include "oox/xls/tablefragment.hxx"
+#include "tablefragment.hxx"
 
-#include "oox/xls/autofilterbuffer.hxx"
-#include "oox/xls/autofiltercontext.hxx"
-#include "oox/xls/tablebuffer.hxx"
+#include "autofilterbuffer.hxx"
+#include "autofiltercontext.hxx"
+#include "tablebuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/themebuffer.cxx b/sc/source/filter/oox/themebuffer.cxx
index ac37d9eb4bcd..2d3682e4c1a5 100644
--- a/oox/source/xls/themebuffer.cxx
+++ b/sc/source/filter/oox/themebuffer.cxx
@@ -26,9 +26,9 @@
  *
  ************************************************************************/
 
-#include "oox/xls/themebuffer.hxx"
+#include "themebuffer.hxx"
 
-#include "oox/xls/stylesbuffer.hxx"
+#include "stylesbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx
index 636fb72980fb..86112043370f 100644
--- a/oox/source/xls/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/unitconverter.hxx"
+#include "unitconverter.hxx"
 
 #include <com/sun/star/awt/DeviceInfo.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
@@ -37,7 +37,7 @@
 #include <rtl/math.hxx>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/stylesbuffer.hxx"
+#include "stylesbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx
index 297b3dc9e2a4..ec954fce0f78 100644
--- a/oox/source/xls/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/viewsettings.hxx"
+#include "viewsettings.hxx"
 
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
@@ -40,11 +40,11 @@
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertymap.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/unitconverter.hxx"
-#include "oox/xls/workbooksettings.hxx"
-#include "oox/xls/worksheetbuffer.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "unitconverter.hxx"
+#include "workbooksettings.hxx"
+#include "worksheetbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index d4e61fb9834e..4d079e0cfce3 100644
--- a/oox/source/xls/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/workbookfragment.hxx"
+#include "workbookfragment.hxx"
 
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/sheet/XCalculatable.hpp>
@@ -36,21 +36,21 @@
 #include "oox/helper/progressbar.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/ole/olestorage.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/chartsheetfragment.hxx"
-#include "oox/xls/connectionsfragment.hxx"
-#include "oox/xls/externallinkbuffer.hxx"
-#include "oox/xls/externallinkfragment.hxx"
-#include "oox/xls/pivotcachebuffer.hxx"
-#include "oox/xls/sharedstringsbuffer.hxx"
-#include "oox/xls/sharedstringsfragment.hxx"
-#include "oox/xls/stylesfragment.hxx"
-#include "oox/xls/tablebuffer.hxx"
-#include "oox/xls/themebuffer.hxx"
-#include "oox/xls/viewsettings.hxx"
-#include "oox/xls/workbooksettings.hxx"
-#include "oox/xls/worksheetbuffer.hxx"
-#include "oox/xls/worksheetfragment.hxx"
+#include "biffinputstream.hxx"
+#include "chartsheetfragment.hxx"
+#include "connectionsfragment.hxx"
+#include "externallinkbuffer.hxx"
+#include "externallinkfragment.hxx"
+#include "pivotcachebuffer.hxx"
+#include "sharedstringsbuffer.hxx"
+#include "sharedstringsfragment.hxx"
+#include "stylesfragment.hxx"
+#include "tablebuffer.hxx"
+#include "themebuffer.hxx"
+#include "viewsettings.hxx"
+#include "workbooksettings.hxx"
+#include "worksheetbuffer.hxx"
+#include "worksheetfragment.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 1c018a880de1..f6ea218a7c87 100644
--- a/oox/source/xls/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/workbookhelper.hxx"
+#include "workbookhelper.hxx"
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -47,27 +47,27 @@
 #include "oox/helper/progressbar.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/ole/vbaproject.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/biffcodec.hxx"
-#include "oox/xls/connectionsbuffer.hxx"
-#include "oox/xls/defnamesbuffer.hxx"
-#include "oox/xls/excelchartconverter.hxx"
-#include "oox/xls/excelfilter.hxx"
-#include "oox/xls/externallinkbuffer.hxx"
-#include "oox/xls/formulaparser.hxx"
-#include "oox/xls/pagesettings.hxx"
-#include "oox/xls/pivotcachebuffer.hxx"
-#include "oox/xls/pivottablebuffer.hxx"
-#include "oox/xls/scenariobuffer.hxx"
-#include "oox/xls/sharedstringsbuffer.hxx"
-#include "oox/xls/stylesbuffer.hxx"
-#include "oox/xls/tablebuffer.hxx"
-#include "oox/xls/themebuffer.hxx"
-#include "oox/xls/unitconverter.hxx"
-#include "oox/xls/viewsettings.hxx"
-#include "oox/xls/workbooksettings.hxx"
-#include "oox/xls/worksheetbuffer.hxx"
+#include "addressconverter.hxx"
+#include "biffinputstream.hxx"
+#include "biffcodec.hxx"
+#include "connectionsbuffer.hxx"
+#include "defnamesbuffer.hxx"
+#include "excelchartconverter.hxx"
+#include "excelfilter.hxx"
+#include "externallinkbuffer.hxx"
+#include "formulaparser.hxx"
+#include "pagesettings.hxx"
+#include "pivotcachebuffer.hxx"
+#include "pivottablebuffer.hxx"
+#include "scenariobuffer.hxx"
+#include "sharedstringsbuffer.hxx"
+#include "stylesbuffer.hxx"
+#include "tablebuffer.hxx"
+#include "themebuffer.hxx"
+#include "unitconverter.hxx"
+#include "viewsettings.hxx"
+#include "workbooksettings.hxx"
+#include "worksheetbuffer.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx
index f9eb011e01df..b07fa83baf6b 100644
--- a/oox/source/xls/workbooksettings.cxx
+++ b/sc/source/filter/oox/workbooksettings.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/workbooksettings.hxx"
+#include "workbooksettings.hxx"
 
 #include <com/sun/star/sheet/XCalculatable.hpp>
 #include <com/sun/star/util/Date.hpp>
@@ -36,8 +36,8 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/core/xmlfilterbase.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/unitconverter.hxx"
+#include "biffinputstream.hxx"
+#include "unitconverter.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index be741ab6aec9..5178143cb9b3 100644
--- a/oox/source/xls/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/worksheetbuffer.hxx"
+#include "worksheetbuffer.hxx"
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -39,8 +39,8 @@
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/excelhandlers.hxx"
+#include "biffinputstream.hxx"
+#include "excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index a045c46feb46..b4484bdd1621 100644
--- a/oox/source/xls/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -26,31 +26,31 @@
  *
  ************************************************************************/
 
-#include "oox/xls/worksheetfragment.hxx"
+#include "worksheetfragment.hxx"
 
 #include "oox/core/filterbase.hxx"
 #include "oox/core/relations.hxx"
 #include "oox/helper/attributelist.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/autofilterbuffer.hxx"
-#include "oox/xls/autofiltercontext.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/commentsfragment.hxx"
-#include "oox/xls/condformatcontext.hxx"
-#include "oox/xls/drawingfragment.hxx"
-#include "oox/xls/drawingmanager.hxx"
-#include "oox/xls/externallinkbuffer.hxx"
-#include "oox/xls/pagesettings.hxx"
-#include "oox/xls/pivottablefragment.hxx"
-#include "oox/xls/querytablefragment.hxx"
-#include "oox/xls/scenariobuffer.hxx"
-#include "oox/xls/scenariocontext.hxx"
-#include "oox/xls/sheetdatabuffer.hxx"
-#include "oox/xls/sheetdatacontext.hxx"
-#include "oox/xls/tablefragment.hxx"
-#include "oox/xls/viewsettings.hxx"
-#include "oox/xls/workbooksettings.hxx"
-#include "oox/xls/worksheetsettings.hxx"
+#include "addressconverter.hxx"
+#include "autofilterbuffer.hxx"
+#include "autofiltercontext.hxx"
+#include "biffinputstream.hxx"
+#include "commentsfragment.hxx"
+#include "condformatcontext.hxx"
+#include "drawingfragment.hxx"
+#include "drawingmanager.hxx"
+#include "externallinkbuffer.hxx"
+#include "pagesettings.hxx"
+#include "pivottablefragment.hxx"
+#include "querytablefragment.hxx"
+#include "scenariobuffer.hxx"
+#include "scenariocontext.hxx"
+#include "sheetdatabuffer.hxx"
+#include "sheetdatacontext.hxx"
+#include "tablefragment.hxx"
+#include "viewsettings.hxx"
+#include "workbooksettings.hxx"
+#include "worksheetsettings.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 97ce24dab006..27e8eab76878 100644
--- a/oox/source/xls/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "oox/xls/worksheethelper.hxx"
+#include "worksheethelper.hxx"
 
 #include <algorithm>
 #include <list>
@@ -54,23 +54,23 @@
 #include <rtl/ustrbuf.hxx>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/xls/addressconverter.hxx"
-#include "oox/xls/autofilterbuffer.hxx"
-#include "oox/xls/commentsbuffer.hxx"
-#include "oox/xls/condformatbuffer.hxx"
-#include "oox/xls/drawingfragment.hxx"
-#include "oox/xls/drawingmanager.hxx"
-#include "oox/xls/formulaparser.hxx"
-#include "oox/xls/pagesettings.hxx"
-#include "oox/xls/querytablebuffer.hxx"
-#include "oox/xls/sharedstringsbuffer.hxx"
-#include "oox/xls/sheetdatabuffer.hxx"
-#include "oox/xls/stylesbuffer.hxx"
-#include "oox/xls/unitconverter.hxx"
-#include "oox/xls/viewsettings.hxx"
-#include "oox/xls/workbooksettings.hxx"
-#include "oox/xls/worksheetbuffer.hxx"
-#include "oox/xls/worksheetsettings.hxx"
+#include "addressconverter.hxx"
+#include "autofilterbuffer.hxx"
+#include "commentsbuffer.hxx"
+#include "condformatbuffer.hxx"
+#include "drawingfragment.hxx"
+#include "drawingmanager.hxx"
+#include "formulaparser.hxx"
+#include "pagesettings.hxx"
+#include "querytablebuffer.hxx"
+#include "sharedstringsbuffer.hxx"
+#include "sheetdatabuffer.hxx"
+#include "stylesbuffer.hxx"
+#include "unitconverter.hxx"
+#include "viewsettings.hxx"
+#include "workbooksettings.hxx"
+#include "worksheetbuffer.hxx"
+#include "worksheetsettings.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/oox/source/xls/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx
index e415c2f35cd6..768041b23834 100644
--- a/oox/source/xls/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -26,14 +26,14 @@
  *
  ************************************************************************/
 
-#include "oox/xls/worksheetsettings.hxx"
+#include "worksheetsettings.hxx"
 
 #include <com/sun/star/util/XProtectable.hpp>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/attributelist.hxx"
-#include "oox/xls/biffinputstream.hxx"
-#include "oox/xls/pagesettings.hxx"
-#include "oox/xls/workbooksettings.hxx"
+#include "biffinputstream.hxx"
+#include "pagesettings.hxx"
+#include "workbooksettings.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/sc/util/scfilt.component b/sc/util/scfilt.component
index 91ae96d910ce..1b72dcd017ec 100644
--- a/sc/util/scfilt.component
+++ b/sc/util/scfilt.component
@@ -31,4 +31,11 @@
   <implementation name="com.sun.star.comp.oox.ExcelFilterExport">
     <service name="com.sun.star.comp.oox.ExcelFilterExport"/>
   </implementation>
+  <implementation name="com.sun.star.comp.oox.xls.ExcelFilter">
+    <service name="com.sun.star.document.ImportFilter"/>
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.oox.xls.FormulaParser">
+    <service name="com.sun.star.sheet.FilterFormulaParser"/>
+  </implementation>
 </component>