From 50823d893807d590d20ca8ee97a9a345d5df4ac3 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Fri, 26 Oct 2018 20:14:08 +0200
Subject: tdf#42949 Fix IWYU warnings in include/sot/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ic5d0dd8c712e74825ed0d0de6bf366568ca48f25
Reviewed-on: https://gerrit.libreoffice.org/62460
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
 include/sot/exchange.hxx |  6 +-----
 include/sot/filelist.hxx |  3 ++-
 include/sot/formats.hxx  |  2 +-
 include/sot/stg.hxx      | 18 ++++--------------
 include/sot/storage.hxx  |  9 +++++----
 include/sot/storinfo.hxx |  6 ++++--
 6 files changed, 17 insertions(+), 27 deletions(-)

(limited to 'include/sot')

diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx
index 3ea611799506..15279ebab582 100644
--- a/include/sot/exchange.hxx
+++ b/include/sot/exchange.hxx
@@ -20,22 +20,18 @@
 #ifndef INCLUDED_SOT_EXCHANGE_HXX
 #define INCLUDED_SOT_EXCHANGE_HXX
 
-#include <list>
 #include <vector>
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 #include <sot/sotdllapi.h>
 #include <sot/formats.hxx>
-#include <tools/solar.h>
 #include <o3tl/typed_flags_set.hxx>
 
-class SotDataObject;
-
 namespace com { namespace sun { namespace star { namespace datatransfer {
     class XTransferable;
 } } } }
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
 
 struct DataFlavorEx : public css::datatransfer::DataFlavor
 {
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index d8895644e4ae..f853fa4757d7 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -21,9 +21,10 @@
 #define INCLUDED_SOT_FILELIST_HXX
 
 #include <sot/sotdllapi.h>
-#include <tools/stream.hxx>
+#include <rtl/ustring.hxx>
 
 #include <vector>
+class SvStream;
 
 class SOT_DLLPUBLIC FileList
 {
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx
index a1f5f8858335..968af5232c79 100644
--- a/include/sot/formats.hxx
+++ b/include/sot/formats.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SOT_FORMATS_HXX
 #define INCLUDED_SOT_FORMATS_HXX
 
-#include <tools/solar.h>
+#include <sal/types.h>
 
 // - predefined formats -
 // Do NOT change the order of these values as the implementation depends on them!
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index b932f9139b09..d692403b9a72 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -20,28 +20,18 @@
 #ifndef INCLUDED_SOT_STG_HXX
 #define INCLUDED_SOT_STG_HXX
 
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/uno/Reference.h>
-
-#include <com/sun/star/io/XInputStream.hpp>
-
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-
-#include <com/sun/star/embed/XStorage.hpp>
-
-
 #include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/globname.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/sotdllapi.h>
 
-class Storage;
-class StorageStream;
+namespace com { namespace sun { namespace star { namespace ucb { class XProgressHandler; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
 class StgIo;
 class StgDirEntry;
-class StgStrm;
-class SvGlobalName;
 typedef struct SvGUID ClsId;
 
 class SOT_DLLPUBLIC StorageBase : public SvRefBase
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 83437604d164..6a7e25af9dfb 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -20,18 +20,19 @@
 #ifndef INCLUDED_SOT_STORAGE_HXX
 #define INCLUDED_SOT_STORAGE_HXX
 
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/embed/XStorage.hpp>
 #include <sot/object.hxx>
 #include <tools/stream.hxx>
+#include <tools/globname.hxx>
 #include <vcl/errcode.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/sotdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
 enum class SotClipboardFormatId : sal_uInt32;
 
-class SotStorage;
 class BaseStorageStream;
 class SOT_DLLPUBLIC SotStorageStream : virtual public SotObject, public SvStream
 {
diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx
index 004101d8c22c..b9a3c4fe13d2 100644
--- a/include/sot/storinfo.hxx
+++ b/include/sot/storinfo.hxx
@@ -20,13 +20,15 @@
 #ifndef INCLUDED_SOT_STORINFO_HXX
 #define INCLUDED_SOT_STORINFO_HXX
 
-#include <tools/globname.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
 #include <vector>
 #include <sot/sotdllapi.h>
-#include <sot/exchange.hxx>
+#include <sot/formats.hxx>
 
 class StgDirEntry;
+class SvStream;
+
 class SvStorageInfo
 {
 friend class SotStorage;
-- 
cgit