change libwriterperfect to shared library

There are already 3 libs linking with it and there will be another one
in near future. It is time to stop the duplication :-)

Change-Id: Ia7d24882c37a8bf49fa031b73fa1bd5296f78820

25 files changed, 112 insertions, 214 deletions

diff --git a/writerperfect/CppunitTest_writerperfect_stream.mk b/writerperfect/CppunitTest_writerperfect_stream.mk
index b469658d037a..141b41570f00 100644
--- a/writerperfect/CppunitTest_writerperfect_stream.mk
+++ b/writerperfect/CppunitTest_writerperfect_stream.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_stream,\
 	tl \
 	unotest \
 	utl \
+	writerperfect \
 ))
 
 $(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_stream,\
diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk
index 8b1a61119638..faf805deb1e3 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -21,11 +21,6 @@ $(eval $(call gb_Library_Library,wpftdraw))
 
 $(eval $(call gb_Library_set_componentfile,wpftdraw,writerperfect/source/draw/wpftdraw))
 
-$(eval $(call gb_Library_set_include,wpftdraw,\
-	$$(INCLUDE) \
-    -I$(SRCDIR)/writerperfect/source \
-))
-
 $(eval $(call gb_Library_use_sdk_api,wpftdraw))
 
 $(eval $(call gb_Library_use_libraries,wpftdraw,\
@@ -36,14 +31,11 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\
 	sot \
 	tl \
 	utl \
+	writerperfect \
 	xo \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_static_libraries,wpftdraw,\
-	writerperfect \
-))
-
 $(eval $(call gb_Library_use_externals,wpftdraw,\
 	cdr \
 	etonyek \
diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk
index f8a8a15a5bea..db7218c2740c 100644
--- a/writerperfect/Library_wpftimpress.mk
+++ b/writerperfect/Library_wpftimpress.mk
@@ -21,11 +21,6 @@ $(eval $(call gb_Library_Library,wpftimpress))
 
 $(eval $(call gb_Library_set_componentfile,wpftimpress,writerperfect/source/impress/wpftimpress))
 
-$(eval $(call gb_Library_set_include,wpftimpress,\
-	$$(INCLUDE) \
-    -I$(SRCDIR)/writerperfect/source \
-))
-
 $(eval $(call gb_Library_use_sdk_api,wpftimpress))
 
 $(eval $(call gb_Library_use_libraries,wpftimpress,\
@@ -37,14 +32,11 @@ $(eval $(call gb_Library_use_libraries,wpftimpress,\
 	tl \
 	ucbhelper \
 	utl \
+	writerperfect \
 	xo \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_static_libraries,wpftimpress,\
-	writerperfect \
-))
-
 $(eval $(call gb_Library_use_externals,wpftimpress,\
 	boost_headers \
 	etonyek \
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index fab462bca4c1..f6f8d3fe2209 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -21,11 +21,6 @@ $(eval $(call gb_Library_Library,wpftwriter))
 
 $(eval $(call gb_Library_set_componentfile,wpftwriter,writerperfect/source/writer/wpftwriter))
 
-$(eval $(call gb_Library_set_include,wpftwriter,\
-	$$(INCLUDE) \
-    -I$(SRCDIR)/writerperfect/source \
-))
-
 $(eval $(call gb_Library_use_sdk_api,wpftwriter))
 
 $(eval $(call gb_Library_use_libraries,wpftwriter,\
@@ -39,14 +34,11 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
 	tl \
 	ucbhelper \
 	utl \
+	writerperfect \
 	xo \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_static_libraries,wpftwriter,\
-	writerperfect \
-))
-
 $(eval $(call gb_Library_use_externals,wpftwriter,\
 	abw \
 	boost_headers \
diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/Library_writerperfect.mk
index 6b21c02ebf99..072b483954d1 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/Library_writerperfect.mk
@@ -17,14 +17,13 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-$(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect))
+$(eval $(call gb_Library_Library,writerperfect))
 
-$(eval $(call gb_StaticLibrary_set_include,writerperfect,\
-	$$(INCLUDE) \
-    -I$(SRCDIR)/writerperfect/source \
+$(eval $(call gb_Library_add_defs,writerperfect,\
+	-DWRITERPERFECT_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_StaticLibrary_use_externals,writerperfect,\
+$(eval $(call gb_Library_use_externals,writerperfect,\
 	boost_headers \
 	etonyek \
 	odfgen \
@@ -32,15 +31,24 @@ $(eval $(call gb_StaticLibrary_use_externals,writerperfect,\
 	wpg \
 ))
 
-$(eval $(call gb_StaticLibrary_use_api,writerperfect,\
-    offapi \
-    udkapi \
+$(eval $(call gb_Library_use_sdk_api,writerperfect))
+
+$(eval $(call gb_Library_use_libraries,writerperfect,\
+	comphelper \
+	cppu \
+	sal \
+	sot \
+	tl \
+	ucbhelper \
+	utl \
+	xo \
+	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_StaticLibrary_add_exception_objects,writerperfect,\
+$(eval $(call gb_Library_add_exception_objects,writerperfect,\
 	writerperfect/source/common/DirectoryStream \
 	writerperfect/source/common/DocumentHandler \
-	writerperfect/source/common/WPXSvStream \
+	writerperfect/source/common/WPXSvInputStream \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index 423329d098b7..24decb49a38a 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Module_add_targets,writerperfect,\
 	Library_wpftdraw \
 	Library_wpftimpress \
 	Library_wpftwriter \
-	StaticLibrary_writerperfect \
+	Library_writerperfect \
 ))
 
 $(eval $(call gb_Module_add_check_targets,writerperfect,\
diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx
index 3452bf6e5297..1d28ec814d30 100644
--- a/writerperfect/qa/unit/WPXSvStreamTest.cxx
+++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx
@@ -26,7 +26,7 @@
 
 #include "test/bootstrapfixture.hxx"
 
-#include "WPXSvStream.hxx"
+#include <writerperfect/WPXSvInputStream.hxx>
 
 namespace io = com::sun::star::io;
 namespace ucb = com::sun::star::ucb;
@@ -36,6 +36,8 @@ using boost::shared_ptr;
 
 using std::equal;
 
+using writerperfect::WPXSvInputStream;
+
 namespace
 {
 
diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx
index 90aeb597c991..c12569491940 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -35,8 +35,8 @@
 
 #include <ucbhelper/content.hxx>
 
-#include "DirectoryStream.hxx"
-#include "WPXSvStream.hxx"
+#include <writerperfect/DirectoryStream.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
 
 namespace io = com::sun::star::io;
 namespace sdbc = com::sun::star::sdbc;
diff --git a/writerperfect/source/common/DirectoryStream.hxx b/writerperfect/source/common/DirectoryStream.hxx
deleted file mode 100644
index ab10bbfea762..000000000000
--- a/writerperfect/source/common/DirectoryStream.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef DIRECTORYSTREAM_H_INCLUDED
-#define DIRECTORYSTREAM_H_INCLUDED
-
-#include <libwpd-stream/libwpd-stream.h>
-
-#include <com/sun/star/uno/Reference.h>
-
-namespace com { namespace sun { namespace star { namespace ucb {
-    class XContent;
-} } } }
-
-namespace writerperfect
-{
-
-class DirectoryStream : public WPXInputStream
-{
-    struct Impl;
-
-public:
-    explicit DirectoryStream(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent);
-    virtual ~DirectoryStream();
-
-    virtual bool isOLEStream() SAL_OVERRIDE;
-    virtual WPXInputStream *getDocumentOLEStream(const char *pName) SAL_OVERRIDE;
-
-    virtual const unsigned char *read(unsigned long nNumBytes, unsigned long &nNumBytesRead) SAL_OVERRIDE;
-    virtual int seek(long nOffset, WPX_SEEK_TYPE eSeekType) SAL_OVERRIDE;
-    virtual long tell() SAL_OVERRIDE;
-    virtual bool atEOS() SAL_OVERRIDE;
-
-private:
-    Impl *m_pImpl;
-};
-
-}
-
-#endif //  DIRECTORYSTREAM_H_INCLUDED
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/common/DocumentHandler.cxx b/writerperfect/source/common/DocumentHandler.cxx
index 073b9429571b..239f20ec7055 100644
--- a/writerperfect/source/common/DocumentHandler.cxx
+++ b/writerperfect/source/common/DocumentHandler.cxx
@@ -6,15 +6,23 @@
  *
  * For further information visit http://libwpd.sourceforge.net
  */
-#include "DocumentHandler.hxx"
+
+#include <writerperfect/DocumentHandler.hxx>
 
 #include <string.h>
+
+#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 
 #include <xmloff/attrlist.hxx>
 
+namespace writerperfect
+{
+
+using com::sun::star::uno::Reference;
 using com::sun::star::xml::sax::XAttributeList;
+using com::sun::star::xml::sax::XDocumentHandler;
 
 DocumentHandler::DocumentHandler(Reference < XDocumentHandler > &xHandler) :
     mxHandler(xHandler)
@@ -63,4 +71,6 @@ void DocumentHandler::characters(const WPXString &sCharacters)
     mxHandler->characters(sCharU16);
 }
 
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/common/DocumentHandler.hxx b/writerperfect/source/common/DocumentHandler.hxx
deleted file mode 100644
index dad1e0f61d0e..000000000000
--- a/writerperfect/source/common/DocumentHandler.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _DOCUMENTHANDLER_HXX_
-#define _DOCUMENTHANDLER_HXX_
-
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-
-#include <libwpd/libwpd.h>
-
-#include <libodfgen/libodfgen.hxx>
-
-using com::sun::star::uno::Reference;
-using com::sun::star::xml::sax::XDocumentHandler;
-
-class DocumentHandler: public OdfDocumentHandler
-{
-public:
-    DocumentHandler(Reference < XDocumentHandler > &xHandler);
-    void startDocument() SAL_OVERRIDE;
-    void endDocument() SAL_OVERRIDE;
-    void startElement(const char *psName, const WPXPropertyList &xPropList) SAL_OVERRIDE;
-    void endElement(const char *psName) SAL_OVERRIDE;
-    void characters(const WPXString &sCharacters) SAL_OVERRIDE;
-
-private:
-    Reference < XDocumentHandler > mxHandler;
-};
-
-#endif // _DOCUMENTHANDLER_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/common/WPXSvStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 818830df9050..b2ad2a8a5d64 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "WPXSvStream.hxx"
+#include <writerperfect/WPXSvInputStream.hxx>
 
 #include <com/sun/star/packages/zip/XZipFileAccess2.hpp>
 #include <com/sun/star/uno/Any.hxx>
@@ -16,6 +16,9 @@
 #include <comphelper/seekableinput.hxx>
 
 #include <rtl/string.hxx>
+
+#include <sot/storage.hxx>
+
 #include <tools/stream.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
@@ -27,6 +30,9 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/unordered_map.hpp>
 
+namespace writerperfect
+{
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 
@@ -950,4 +956,6 @@ WPXInputStream *WPXSvInputStream::getDocumentOLEStream(const char *name)
     return getSubStreamByName(name);
 }
 
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/common/WPXSvStream.hxx b/writerperfect/source/common/WPXSvStream.hxx
deleted file mode 100644
index 337bf16b51fb..000000000000
--- a/writerperfect/source/common/WPXSvStream.hxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef WPXSVSTREAM_H
-#define WPXSVSTREAM_H
-
-#include <sot/storage.hxx>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-
-#include <libwpd-stream/libwpd-stream.h>
-
-class WPXSvInputStreamImpl;
-
-class WPXSvInputStream : public WPXInputStream
-{
-public:
-    WPXSvInputStream( ::com::sun::star::uno::Reference<
-                      ::com::sun::star::io::XInputStream > xStream );
-    virtual ~WPXSvInputStream();
-
-    virtual bool isStructured();
-    virtual unsigned subStreamCount();
-    virtual const char * subStreamName(unsigned id);
-    virtual bool existsSubStream(const char *name);
-    virtual WPXInputStream * getSubStreamByName(const char *name);
-    virtual WPXInputStream * getSubStreamById(unsigned id);
-
-    virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead) SAL_OVERRIDE;
-    virtual int seek(long offset, WPX_SEEK_TYPE seekType) SAL_OVERRIDE;
-    virtual long tell() SAL_OVERRIDE;
-    virtual bool isEnd();
-
-    virtual bool isOLEStream() SAL_OVERRIDE;
-    virtual WPXInputStream * getDocumentOLEStream(const char *name) SAL_OVERRIDE;
-    virtual bool atEOS() SAL_OVERRIDE;
-
-private:
-    WPXSvInputStreamImpl *mpImpl;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index 0b57b70e9982..246486006405 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -23,13 +23,14 @@
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 
 #include <libcdr/libcdr.h>
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "CDRImportFilter.hxx"
 
 #include <iostream>
@@ -53,6 +54,8 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
 
 sal_Bool SAL_CALL CDRImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException, std::exception)
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index 2949ce1b4aff..fe944322e30a 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -23,13 +23,14 @@
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 
 #include <libcdr/libcdr.h>
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "CMXImportFilter.hxx"
 
 #include <iostream>
@@ -53,6 +54,8 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
 
 sal_Bool SAL_CALL CMXImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException, std::exception)
diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx
index 00520723eedf..b73aa4a7d870 100644
--- a/writerperfect/source/draw/FreehandImportFilter.cxx
+++ b/writerperfect/source/draw/FreehandImportFilter.cxx
@@ -19,13 +19,14 @@
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 
 #include <libfreehand/libfreehand.h>
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "FreehandImportFilter.hxx"
 
 #include <iostream>
@@ -49,6 +50,8 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
 
 sal_Bool SAL_CALL FreehandImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException, std::exception)
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 85b33c3511c6..b7537b03da78 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -19,13 +19,14 @@
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 
 #include <libmspub/libmspub.h>
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "MSPUBImportFilter.hxx"
 
 #include <iostream>
@@ -49,6 +50,8 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
 
 sal_Bool SAL_CALL MSPUBImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException, std::exception)
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index fb7d2e0a4443..7d388211e762 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -19,13 +19,14 @@
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 
 #include <libvisio/libvisio.h>
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "VisioImportFilter.hxx"
 
 #include <iostream>
@@ -49,6 +50,8 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
 
 sal_Bool SAL_CALL VisioImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException, std::exception)
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index fa1461e81f58..b5b3d7fce612 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -25,12 +25,13 @@
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "WPGImportFilter.hxx"
 
 #include <iostream>
@@ -55,6 +56,8 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
 
 sal_Bool SAL_CALL WPGImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException, std::exception)
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx
index 6eab1fd8c633..b1019b2c9664 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -28,11 +28,13 @@
 #include <osl/diagnose.h>
 #include <rtl/tencinfo.h>
 #include <ucbhelper/content.hxx>
+
+#include <writerperfect/DirectoryStream.hxx>
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 
-#include "common/DirectoryStream.hxx"
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "KeynoteImportFilter.hxx"
 
 using boost::shared_ptr;
@@ -56,6 +58,9 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
+
 namespace beans = com::sun::star::beans;
 namespace container = com::sun::star::container;
 namespace ucb = com::sun::star::ucb;
diff --git a/writerperfect/source/writer/AbiWordImportFilter.cxx b/writerperfect/source/writer/AbiWordImportFilter.cxx
index 6c10871c8e89..04048e2bb321 100644
--- a/writerperfect/source/writer/AbiWordImportFilter.cxx
+++ b/writerperfect/source/writer/AbiWordImportFilter.cxx
@@ -21,6 +21,9 @@
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 #include <ucbhelper/content.hxx>
 
@@ -28,8 +31,6 @@
 
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "AbiWordImportFilter.hxx"
 
 #include <iostream>
@@ -54,6 +55,8 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
 
 sal_Bool SAL_CALL AbiWordImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException)
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index 9110c67c2faf..f566be5a10d1 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -21,6 +21,9 @@
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 #include <ucbhelper/content.hxx>
 
@@ -28,8 +31,6 @@
 
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "EBookImportFilter.hxx"
 
 #include <iostream>
@@ -54,6 +55,8 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
 
 sal_Bool SAL_CALL EBookImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException)
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index e22fc1d8bf64..0a43e64926a1 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -21,6 +21,9 @@
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 #include <ucbhelper/content.hxx>
 
@@ -28,8 +31,6 @@
 
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "MSWorksImportFilter.hxx"
 
 #include <iostream>
@@ -54,6 +55,8 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
 
 sal_Bool SAL_CALL MSWorksImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException)
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
index 82d2e260187b..b5a4a7168a6e 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -18,14 +18,15 @@
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 #include <ucbhelper/content.hxx>
 
 #include <libmwaw/libmwaw.hxx>
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "MWAWImportFilter.hxx"
 
 using namespace ::com::sun::star::uno;
@@ -48,6 +49,9 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
+
 static bool handleEmbeddedMWAWObject(const WPXBinaryData &data, OdfDocumentHandler *pHandler,  const OdfStreamType streamType)
 {
     OdgGenerator exporter(pHandler, streamType);
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index 0d5f65005713..605a1eb37040 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -21,6 +21,9 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <writerperfect/DocumentHandler.hxx>
+#include <writerperfect/WPXSvInputStream.hxx>
+
 #include <xmloff/attrlist.hxx>
 #include <sfx2/passwd.hxx>
 #include <ucbhelper/content.hxx>
@@ -28,8 +31,6 @@
 #include <libwpd/libwpd.h>
 #include <libodfgen/libodfgen.hxx>
 
-#include "common/DocumentHandler.hxx"
-#include "common/WPXSvStream.hxx"
 #include "WordPerfectImportFilter.hxx"
 
 using ::ucbhelper::Content;
@@ -53,6 +54,8 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
+using writerperfect::DocumentHandler;
+using writerperfect::WPXSvInputStream;
 
 static bool handleEmbeddedWPGObject(const WPXBinaryData &data, OdfDocumentHandler *pHandler,  const OdfStreamType streamType)
 {