Move module-local includes to writerperfect/inc

Change-Id: I8e90a95d6ab8d8a696d4666e2ab4ddd9584b60f0

18 files changed, 26 insertions, 20 deletions

diff --git a/writerperfect/CppunitTest_writerperfect_stream.mk b/writerperfect/CppunitTest_writerperfect_stream.mk
index 2d32844e08b2..5bb0c4bb4c28 100644
--- a/writerperfect/CppunitTest_writerperfect_stream.mk
+++ b/writerperfect/CppunitTest_writerperfect_stream.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,writerperfect_stream))
 
 $(eval $(call gb_CppunitTest_set_include,writerperfect_stream,\
 	-I$(SRCDIR)/writerperfect/source/common \
+	-I$(SRCDIR)/writerperfect/inc \
 	$$(INCLUDE) \
 ))
 
diff --git a/writerperfect/Library_writerperfect.mk b/writerperfect/Library_writerperfect.mk
index 1343be6625b6..165a7a02d6de 100644
--- a/writerperfect/Library_writerperfect.mk
+++ b/writerperfect/Library_writerperfect.mk
@@ -23,6 +23,11 @@ $(eval $(call gb_Library_add_defs,writerperfect,\
 	-DWRITERPERFECT_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_set_include,writerperfect, \
+    -I$(SRCDIR)/writerperfect/inc \
+    $$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_use_externals,writerperfect,\
 	boost_headers \
 	odfgen \
diff --git a/include/writerperfect/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx
index 2a7bffda307e..bfa7d57452d6 100644
--- a/include/writerperfect/DirectoryStream.hxx
+++ b/writerperfect/inc/DirectoryStream.hxx
@@ -14,7 +14,7 @@
 
 #include <com/sun/star/uno/Reference.h>
 
-#include <writerperfect/writerperfectdllapi.h>
+#include <writerperfectdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace ucb {
     class XContent;
diff --git a/include/writerperfect/DocumentHandler.hxx b/writerperfect/inc/DocumentHandler.hxx
index 2670096c17ab..608974be1eee 100644
--- a/include/writerperfect/DocumentHandler.hxx
+++ b/writerperfect/inc/DocumentHandler.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/uno/Reference.h>
 
-#include <writerperfect/writerperfectdllapi.h>
+#include <writerperfectdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace xml { namespace sax {
     class XDocumentHandler;
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index d3d1e04acd7a..595936df949b 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -33,8 +33,8 @@
 
 #include <unotools/mediadescriptor.hxx>
 
-#include <writerperfect/DocumentHandler.hxx>
-#include <writerperfect/WPXSvInputStream.hxx>
+#include <DocumentHandler.hxx>
+#include <WPXSvInputStream.hxx>
 
 #include <xmloff/attrlist.hxx>
 
diff --git a/include/writerperfect/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx
index ff35db16893c..e76fb884a154 100644
--- a/include/writerperfect/WPFTEncodingDialog.hxx
+++ b/writerperfect/inc/WPFTEncodingDialog.hxx
@@ -18,7 +18,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/lstbox.hxx>
 
-#include <writerperfect/writerperfectdllapi.h>
+#include <writerperfectdllapi.h>
 
 namespace writerperfect {
 
diff --git a/include/writerperfect/WPXSvInputStream.hxx b/writerperfect/inc/WPXSvInputStream.hxx
index 03b5a7d6b2a1..cd87f1ba008a 100644
--- a/include/writerperfect/WPXSvInputStream.hxx
+++ b/writerperfect/inc/WPXSvInputStream.hxx
@@ -14,7 +14,7 @@
 
 #include <com/sun/star/uno/Reference.h>
 
-#include <writerperfect/writerperfectdllapi.h>
+#include <writerperfectdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace io {
     class XInputStream;
diff --git a/include/writerperfect/writerperfectdllapi.h b/writerperfect/inc/writerperfectdllapi.h
index d5495717e7e1..d5495717e7e1 100644
--- a/include/writerperfect/writerperfectdllapi.h
+++ b/writerperfect/inc/writerperfectdllapi.h
diff --git a/writerperfect/qa/unit/DirectoryStreamTest.cxx b/writerperfect/qa/unit/DirectoryStreamTest.cxx
index 0a279cbc6646..209fe1590f9b 100644
--- a/writerperfect/qa/unit/DirectoryStreamTest.cxx
+++ b/writerperfect/qa/unit/DirectoryStreamTest.cxx
@@ -17,7 +17,7 @@
 
 #include <test/bootstrapfixture.hxx>
 
-#include <writerperfect/DirectoryStream.hxx>
+#include <DirectoryStream.hxx>
 
 namespace ucb = com::sun::star::ucb;
 namespace uno = com::sun::star::uno;
diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx
index a2f6c14a8785..cf2609e0bb76 100644
--- a/writerperfect/qa/unit/WPXSvStreamTest.cxx
+++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx
@@ -26,7 +26,7 @@
 
 #include "test/bootstrapfixture.hxx"
 
-#include <writerperfect/WPXSvInputStream.hxx>
+#include <WPXSvInputStream.hxx>
 
 namespace io = com::sun::star::io;
 namespace ucb = com::sun::star::ucb;
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index f1363a5cb3d2..2431e792827f 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -14,7 +14,7 @@
 
 #include <libwps/libwps.h>
 
-#include "writerperfect/WPFTEncodingDialog.hxx"
+#include "WPFTEncodingDialog.hxx"
 #include "MSWorksCalcImportFilter.hxx"
 
 using com::sun::star::uno::Sequence;
diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx
index b0ff9c43bb6c..1f4638980982 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -36,8 +36,8 @@
 
 #include <ucbhelper/content.hxx>
 
-#include <writerperfect/DirectoryStream.hxx>
-#include <writerperfect/WPXSvInputStream.hxx>
+#include <DirectoryStream.hxx>
+#include <WPXSvInputStream.hxx>
 
 namespace container = com::sun::star::container;
 namespace io = com::sun::star::io;
diff --git a/writerperfect/source/common/DocumentHandler.cxx b/writerperfect/source/common/DocumentHandler.cxx
index 1d93bf575bff..3ea4d053e4a6 100644
--- a/writerperfect/source/common/DocumentHandler.cxx
+++ b/writerperfect/source/common/DocumentHandler.cxx
@@ -7,7 +7,7 @@
  * For further information visit http://libwpd.sourceforge.net
  */
 
-#include <writerperfect/DocumentHandler.hxx>
+#include <DocumentHandler.hxx>
 
 #include <string.h>
 
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx
index 1e359930654e..de521c61e881 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <writerperfect/WPFTEncodingDialog.hxx>
+#include <WPFTEncodingDialog.hxx>
 
 namespace writerperfect
 {
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 535c3e99f4b1..e0fff43199d1 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <writerperfect/WPXSvInputStream.hxx>
+#include <WPXSvInputStream.hxx>
 
 #include <com/sun/star/packages/zip/XZipFileAccess2.hpp>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx
index 6a832c3bdc88..f4e2cba4fd04 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -25,9 +25,9 @@
 #include <rtl/tencinfo.h>
 #include <ucbhelper/content.hxx>
 
-#include <writerperfect/DirectoryStream.hxx>
-#include <writerperfect/DocumentHandler.hxx>
-#include <writerperfect/WPXSvInputStream.hxx>
+#include <DirectoryStream.hxx>
+#include <DocumentHandler.hxx>
+#include <WPXSvInputStream.hxx>
 
 #include <xmloff/attrlist.hxx>
 
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index ddfd785c18dd..96496fe12d27 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -15,7 +15,7 @@
 
 #include <libwps/libwps.h>
 
-#include "writerperfect/WPFTEncodingDialog.hxx"
+#include "WPFTEncodingDialog.hxx"
 #include "MSWorksImportFilter.hxx"
 
 using com::sun::star::uno::Sequence;
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index 8d484dd3ba35..389e5b51c5d0 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -21,8 +21,8 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <writerperfect/DocumentHandler.hxx>
-#include <writerperfect/WPXSvInputStream.hxx>
+#include <DocumentHandler.hxx>
+#include <WPXSvInputStream.hxx>
 
 #include <xmloff/attrlist.hxx>
 #include <sfx2/passwd.hxx>