Reduce scope of #include <tools/stream.hxx>

Change-Id: I0752cbb0cb2e0f89607d81d9eda7ce7091449fd6

11 files changed, 22 insertions, 6 deletions

diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx
index 1ae4248d4495..14a066383c02 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -53,9 +53,12 @@
  *
  *
  ************************************************************************/
-#include <assert.h>
+
 #include "explode.hxx"
+#include <tools/stream.hxx>
+#include <assert.h>
 #include <math.h>
+
     const static char Tree1String[][32] = {
         "101",
         "11",
diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx
index 5cb560182f67..d5b0f51c899b 100644
--- a/lotuswordpro/source/filter/explode.hxx
+++ b/lotuswordpro/source/filter/explode.hxx
@@ -56,7 +56,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_EXPLODE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_EXPLODE_HXX
 
-#include <tools/stream.hxx>
+#include <sal/types.h>
+
+class SvStream;
 
 class HuffmanTreeNode
 {
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index f84f700b79fd..79aa69b81b9b 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -67,6 +67,7 @@
 
 #include <osl/file.h>
 #include <osl/file.hxx>
+#include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <xmloff/attrlist.hxx>
 #include <com/sun/star/io/IOException.hpp>
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx
index 8bba057a3291..d976f3d6f9eb 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -57,7 +57,8 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFILTER_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <tools/stream.hxx>
+
+class SvStream;
 
 //test code
 int ReadWordproFile(SvStream &rStream, css::uno::Reference<css::xml::sax::XDocumentHandler>& XDoc);
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx
index 7344124c8f81..1c4c6c631ba9 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -56,6 +56,9 @@
 
 #include "lwpobjstrm.hxx"
 #include "lwptools.hxx"
+
+#include <sal/types.h>
+#include <tools/solar.h>
 #include <memory>
 
 /**
diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
index 26518682588f..b30097a96d97 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
@@ -54,6 +54,8 @@
  *
  ************************************************************************/
 
+#include <tools/stream.hxx>
+
 #include "lwpsdwfileloader.hxx"
 #include "lwpsdwgrouploaderv0102.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.hxx b/lotuswordpro/source/filter/lwpsdwfileloader.hxx
index df6ea55df8e6..a8edc629ddbf 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.hxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.hxx
@@ -62,11 +62,11 @@
 #include <vector>
 
 #include <rtl/ref.hxx>
-#include <tools/stream.hxx>
 
 #include "lwpheader.hxx"
 #include "xfilter/ixfstream.hxx"
 
+class SvStream;
 class XFFrame;
 class LwpGraphicObject;
 class LwpSdwFileLoader
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
index 58725c92326b..d660cc5587e1 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
@@ -54,6 +54,8 @@
  *
  ************************************************************************/
 
+#include <tools/stream.hxx>
+
 #include "lwpsdwgrouploaderv0102.hxx"
 #include "lwpdrawobj.hxx"
 #include "lwptools.hxx"
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
index c3a42e4b55c0..718e0f29e511 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
@@ -60,11 +60,11 @@
 #include <sal/config.h>
 
 #include <rtl/ref.hxx>
-#include <tools/stream.hxx>
 
 #include "lwpheader.hxx"
 #include "lwpsdwdrawheader.hxx"
 
+class SvStream;
 class XFFrame;
 class XFDrawGroup;
 class LwpGraphicObject;
diff --git a/lotuswordpro/source/filter/lwpsvstream.cxx b/lotuswordpro/source/filter/lwpsvstream.cxx
index e49b8b1cc425..6c3b2856c726 100644
--- a/lotuswordpro/source/filter/lwpsvstream.cxx
+++ b/lotuswordpro/source/filter/lwpsvstream.cxx
@@ -54,6 +54,7 @@
  *
  ************************************************************************/
 #include "lwpsvstream.hxx"
+#include <tools/stream.hxx>
 
 const sal_uInt32 LwpSvStream::LWP_STREAM_BASE = 0x0010;
 
diff --git a/lotuswordpro/source/filter/lwpsvstream.hxx b/lotuswordpro/source/filter/lwpsvstream.hxx
index 40cb435029f7..d7ccb525291f 100644
--- a/lotuswordpro/source/filter/lwpsvstream.hxx
+++ b/lotuswordpro/source/filter/lwpsvstream.hxx
@@ -58,7 +58,8 @@
 
 #include "lwpheader.hxx"
 #include "xfilter/xfglobal.hxx"
-#include <tools/stream.hxx>
+
+class SvStream;
 
 /**
  * @brief   encapsulate XInputStream to provide SvStream like interfaces