15 files changed, 7 insertions, 41 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index f8715d71408a..5b52b4b3683a 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -19,7 +19,6 @@
 
 
 #include <sot/storinfo.hxx>
-#include <sot/exchange.hxx>
 #include <osl/file.hxx>
 #include <unotools/tempfile.hxx>
 #include <tools/stream.hxx>
@@ -27,14 +26,10 @@
 
 #include <sot/stg.hxx>
 #include "stgelem.hxx"
-#include "stgcache.hxx"
-#include "stgstrms.hxx"
 #include "stgdir.hxx"
 #include "stgio.hxx"
 #include "stgole.hxx"
 
-#include <memory>
-
 static long nTmpCount = 0;
 
 // The internal open mode is StreamMode::READ | StreamMode::TRUNC, which is silly
diff --git a/sot/source/sdstor/stgavl.hxx b/sot/source/sdstor/stgavl.hxx
index 5dd29a988f30..c78df17229cd 100644
--- a/sot/source/sdstor/stgavl.hxx
+++ b/sot/source/sdstor/stgavl.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SOT_SOURCE_SDSTOR_STGAVL_HXX
 #define INCLUDED_SOT_SOURCE_SDSTOR_STGAVL_HXX
 
+#include <sal/types.h>
+
 // This is an abstract base class for nodes.
 // Especially, the compare function must be implemented.
 
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 5c03f89cc4fd..ba5610f706b5 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -23,11 +23,7 @@
 #include <tools/solar.h>
 
 #include <sot/stg.hxx>
-#include "stgelem.hxx"
 #include "stgcache.hxx"
-#include "stgstrms.hxx"
-#include "stgdir.hxx"
-#include "stgio.hxx"
 
 #include <algorithm>
 
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index b7cd8e4d25f0..17ae1a9d4b88 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -22,18 +22,15 @@
 
 #include <osl/endian.h>
 #include <rtl/ref.hxx>
-#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include "stgelem.hxx"
 #include <salhelper/simplereferenceobject.hxx>
 
 #include <memory>
 #include <unordered_map>
-#include <functional>
 
 class UCBStorageStream;
 class StgPage;
-class StgDirEntry;
 class StorageBase;
 
 class StgCache
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 71a1268cb84d..f31488fd07c2 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -18,11 +18,8 @@
  */
 
 
-#include <string.h>
-
 #include <sot/stg.hxx>
 #include "stgelem.hxx"
-#include "stgcache.hxx"
 #include "stgstrms.hxx"
 #include "stgdir.hxx"
 #include "stgio.hxx"
diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx
index b0d2c43cf511..3605c27ac03d 100644
--- a/sot/source/sdstor/stgdir.hxx
+++ b/sot/source/sdstor/stgdir.hxx
@@ -25,8 +25,6 @@
 #include "stgstrms.hxx"
 
 class StgIo;
-class StgEntry;
-class StgDirEntry;
 class StgDirStrm;
 
 class BaseStorageStream;
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index be22b5e44b6e..6ad0d9a6f438 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -24,9 +24,6 @@
 #include <unotools/charclass.hxx>
 #include <sot/stg.hxx>
 #include "stgelem.hxx"
-#include "stgcache.hxx"
-#include "stgstrms.hxx"
-#include "stgdir.hxx"
 #include "stgio.hxx"
 
 static const sal_uInt16 nMaxLegalStr = 31;
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 8ec356d20699..026881b9a7d7 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -18,14 +18,12 @@
  */
 
 
-#include <sot/stg.hxx>
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
 #include "stgdir.hxx"
 #include "stgio.hxx"
 #include <o3tl/safeint.hxx>
-#include <rtl/instance.hxx>
 #include <sal/log.hxx>
 
 #include <memory>
diff --git a/sot/source/sdstor/stgio.hxx b/sot/source/sdstor/stgio.hxx
index 8e09c6ae1c09..7ed5917ac63e 100644
--- a/sot/source/sdstor/stgio.hxx
+++ b/sot/source/sdstor/stgio.hxx
@@ -22,8 +22,6 @@
 
 #include "stgcache.hxx"
 #include "stgelem.hxx"
-#include <tools/link.hxx>
-#include <tools/solar.h>
 
 class StgFATStrm;
 class StgDataStrm;
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 0b1aa0d6a80d..87a42b92f61b 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -20,10 +20,9 @@
 #include <memory>
 #include <algorithm>
 
-#include <rtl/string.h>
+#include "stgelem.hxx"
 #include "stgole.hxx"
 #include <sot/storinfo.hxx>
-#include <sot/exchange.hxx>
 
 ///////////////////////// class StgInternalStream
 
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index d75bc6c00321..b6888823e4af 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -21,10 +21,8 @@
 #define INCLUDED_SOT_SOURCE_SDSTOR_STGOLE_HXX
 
 #include <memory>
-#include <string.h>
 
 #include <sot/stg.hxx>
-#include "stgelem.hxx"
 
 class StgInternalStream : public SvStream
 {
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index a03b75ccbe42..3c805283cb4b 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -24,9 +24,7 @@
 #include <o3tl/safeint.hxx>
 #include <osl/file.hxx>
 #include <unotools/tempfile.hxx>
-#include <set>
 
-#include <sot/stg.hxx>
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 2325d261108d..62fed8cfa692 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <rtl/digest.h>
 #include <osl/file.hxx>
 #include <sot/stg.hxx>
 #include <sot/storinfo.hxx>
@@ -37,8 +36,6 @@
 #include <unotools/ucbhelper.hxx>
 #include <comphelper/fileformat.h>
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <ucbhelper/content.hxx>
 
 #include <memory>
 
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index 080e41d3e83e..c4c21145f815 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -18,9 +18,10 @@
  */
 
 
-#include <sot/stg.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
+#include <tools/stream.hxx>
+#include <vcl/errcode.hxx>
 #include <memory>
 
 /************** class SvStorageInfo **************************************
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 59b9f97f1e85..f5dea724f153 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -20,11 +20,9 @@
 #include <com/sun/star/io/NotConnectedException.hpp>
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/ucb/NameClash.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -32,7 +30,6 @@
 #include <com/sun/star/ucb/ResultSetException.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
@@ -45,16 +42,13 @@
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 
 #include <memory>
-#include <rtl/digest.h>
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
 #include <sal/log.hxx>
 #include <tools/ref.hxx>
 #include <tools/debug.hxx>
-#include <unotools/streamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbhelper.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -62,13 +56,14 @@
 
 #include <sot/stg.hxx>
 #include <sot/storinfo.hxx>
-#include <sot/storage.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include <comphelper/classids.hxx>
 
 #include <vector>
 
+namespace com::sun::star::ucb { class XCommandEnvironment; }
+
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;