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

Change-Id: I0752cbb0cb2e0f89607d81d9eda7ce7091449fd6

8 files changed, 15 insertions, 7 deletions

diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
index de7e1c7a11ad..822820859acc 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
@@ -20,10 +20,11 @@
 #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFGRPRD_HXX
 #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFGRPRD_HXX
 
+#include <rtl/string.hxx>
 #include <sal/types.h>
+#include <tools/solar.h>
 
-#include <tools/stream.hxx>
-
+class SvStream;
 
 class DXFGroupReader
 {
diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx
index 44522ad68e64..b7f455eeb674 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -19,6 +19,7 @@
 
 
 #include "ccidecom.hxx"
+#include <tools/stream.hxx>
 
 //=============================== Huffman tables ========================
 
diff --git a/filter/source/graphicfilter/itiff/ccidecom.hxx b/filter/source/graphicfilter/itiff/ccidecom.hxx
index 34636868df74..c92769df6576 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.hxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_CCIDECOM_HXX
 #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_CCIDECOM_HXX
 
-#include <tools/stream.hxx>
-
+#include <sal/types.h>
+#include <tools/solar.h>
 
 #define CCI_OPTION_2D               1       // 2D compression (instead of 1D)
 #define CCI_OPTION_EOL              2       // There are EOL-Codes at the end of each line.
@@ -43,6 +43,7 @@ struct CCILookUpTableEntry {
     sal_uInt16 nCodeBits;
 };
 
+class SvStream;
 
 class CCIDecompressor {
 
diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx
index dc437e27e678..f07fb22aec47 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.cxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx
@@ -19,6 +19,7 @@
 
 
 #include "lzwdecom.hxx"
+#include <tools/stream.hxx>
 #include <algorithm>
 #include <set>
 
diff --git a/filter/source/graphicfilter/itiff/lzwdecom.hxx b/filter/source/graphicfilter/itiff/lzwdecom.hxx
index bce76b59cc13..85d6f06f677f 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.hxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.hxx
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_LZWDECOM_HXX
 #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_LZWDECOM_HXX
 
-#include <tools/stream.hxx>
+#include <sal/types.h>
+#include <tools/solar.h>
 
 struct LZWTableEntry {
     sal_uInt16 nPrevCode;
@@ -28,6 +29,8 @@ struct LZWTableEntry {
     sal_uInt8 nData;
 };
 
+class SvStream;
+
 class LZWDecompressor {
 
 public:
diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx
index 14cf0180c87f..a3517330829a 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <filter/msfilter/dffpropset.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <tools/stream.hxx>
 
 static const DffPropSetEntry mso_PropSetDefaults[] = {
 
diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx
index 0e44b23d0fa1..40dc36b7089e 100644
--- a/filter/source/msfilter/viscache.hxx
+++ b/filter/source/msfilter/viscache.hxx
@@ -20,10 +20,11 @@
 #define INCLUDED_FILTER_SOURCE_MSFILTER_VISCACHE_HXX
 
 #include <sfx2/objsh.hxx>
-#include <tools/stream.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/bitmap.hxx>
 
+class SvStream;
+
 class Impl_OlePres
 {
     SotClipboardFormatId nFormat;
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index a9938f2b494f..3509871e7833 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -22,7 +22,6 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/stream.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/metric.hxx>