diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 23207dc67667..2d8d794727bf 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -41,6 +41,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
+#include <sot/exchange.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/srchitem.hxx>
 #include <svl/visitem.hxx>
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index ff85446bfabd..c6f47028d0f0 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -19,6 +19,8 @@
 
 #include "ChartTransferable.hxx"
 
+#include <sot/exchange.hxx>
+#include <sot/storage.hxx>
 #include <unotools/streamwrap.hxx>
 #include <vcl/graph.hxx>
 #include <svl/itempool.hxx>
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index c85da489eaa5..97b318192e0c 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -54,6 +54,7 @@
 
 #include <editeng/frmdiritem.hxx>
 #include <rtl/uuid.h>
+#include <tools/globname.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 17b459202bc9..c2dab4100388 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -20,6 +20,7 @@
 #include "sbagrid.hrc"
 #include "uiservices.hxx"
 
+#include <sot/exchange.hxx>
 #include <svx/svxids.hrc>
 
 #include <svx/numinf.hxx>
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 7e5f1d0e4dbf..ca975a316f3a 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -59,6 +59,7 @@
 
 #include <comphelper/processfactory.hxx>
 
+#include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 
 #include <unicode/ubidi.h>
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index dc3340eb5e8c..0cb15430a464 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -36,6 +36,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sot/formats.hxx>
+#include <sot/storage.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/storagehelper.hxx>
diff --git a/filter/source/msfilter/svxmsbas2.cxx b/filter/source/msfilter/svxmsbas2.cxx
index 9e7740a61dba..42f343689a96 100644
--- a/filter/source/msfilter/svxmsbas2.cxx
+++ b/filter/source/msfilter/svxmsbas2.cxx
@@ -21,6 +21,7 @@
 
 #include <basic/basmgr.hxx>
 #include <sfx2/objsh.hxx>
+#include <sot/storage.hxx>
 #include <svx/svxerr.hxx>
 #include <filter/msfilter/svxmsbas.hxx>
 
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 91c515762629..d4438d42d835 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 
 #include <o3tl/sorted_vector.hxx>
-#include <sot/storage.hxx>
+#include <tools/ref.hxx>
 #include <tools/rtti.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/time.hxx>
@@ -36,6 +36,7 @@
 
 class CharClass;
 class SfxPoolItem;
+class SotStorage;
 class SvxAutoCorrect;
 class SfxObjectShell;
 namespace vcl { class Window; }
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 34834adcdf5e..fc54adeaba6b 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -38,8 +38,6 @@
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
 
-#include <sot/storage.hxx>
-
 #include <vcl/graph.hxx>
 
 #include <svx/msdffdef.hxx>
@@ -49,6 +47,7 @@
 #include <filter/msfilter/msfilterdllapi.h>
 
 class Graphic;
+class SotStorage;
 class SvStream;
 class SdrObject;
 class SdrOle2Obj;
@@ -68,6 +67,10 @@ class SdrObject;
 class SdrTextObj;
 struct DffObjData;
 
+namespace com { namespace sun { namespace star { namespace embed {
+    class XStorage;
+} } } }
+
 class MSFILTER_DLLPUBLIC DffPropertyReader : public DffPropSet
 {
     const SvxMSDffManager&  rManager;
diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx
index caa91f748893..f0dd8510ae1d 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX
 #define INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX
 
-#include <sot/storage.hxx>
-
 #include <filter/msfilter/msfilterdllapi.h>
 
 namespace com{namespace sun{namespace star{
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 227f97ca6b8d..14ddff3dc627 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -9,7 +9,6 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
 #define INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
 #include <filter/msfilter/msfilterdllapi.h>
-#include <sot/storage.hxx>
 #include <ostream>
 #include <memory>
 #include <vector>
@@ -19,6 +18,7 @@
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
 #include <cppuhelper/implbase1.hxx>
 
diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx
index d379750e3d8e..312e18c87b11 100644
--- a/include/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
@@ -23,11 +23,11 @@
 #include <tools/solar.h>
 #include <filter/msfilter/msfilterdllapi.h>
 
-#include <sot/storage.hxx>
 #include <map>
 #include <unordered_map>
 
 class SfxObjectShell;
+class SotStorage;
 
 /* Construct with the root storage of the MS document, with bImportCode
  * set the visual basic code will be imported into the stardocument when Import
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 17e76e254a86..f82cd2b681e3 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_OLE_OLEHELPER_HXX
 
 #include <rtl/ustring.hxx>
+#include <tools/ref.hxx>
 #include <oox/helper/binarystreambase.hxx>
 #include <oox/helper/storagebase.hxx>
 #include <oox/helper/graphichelper.hxx>
@@ -37,8 +38,9 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <filter/msfilter/msocximex.hxx>
 #include <oox/dllapi.h>
-#include <sot/storage.hxx>
 
+class SotStorage;
+class SotStorageStream;
 class SvGlobalName;
 
 namespace oox {
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index b9d20fe2d6a1..ce8ab3018f6f 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -23,6 +23,7 @@
 #include <sfx2/dllapi.h>
 #include <sfx2/signaturestate.hxx>
 #include <sal/types.h>
+#include <tools/errcode.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -40,7 +41,8 @@
 #include <vcl/vclptr.hxx>
 #include <svl/poolitem.hxx>
 #include <vcl/bitmap.hxx>
-#include <sot/storage.hxx>
+#include <sot/formats.hxx>
+#include <sot/object.hxx>
 #include <rsc/rscsfx.hxx>
 
 #include <sfx2/XmlIdRegistry.hxx>
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index c292b13d07ff..c58e6b3674c6 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -24,8 +24,8 @@
 #include <tools/globname.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
+#include <tools/ref.hxx>
 #include <sot/formats.hxx>
-#include <sot/storage.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/frame/XTerminateListener.hpp>
@@ -49,6 +49,8 @@ class ImageMap;
 class INetBookmark;
 class INetImage;
 class FileList;
+class SotStorageStream;
+struct DataFlavorExVector;
 namespace vcl { class Window; }
 
 // Drag&Drop defines
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index fccf29d097b8..ebe4e78255dc 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_SVX_DBAEXCHANGE_HXX
 #define INCLUDED_SVX_DBAEXCHANGE_HXX
 
+#include <sal/config.h>
+
+#include <o3tl/typed_flags_set.hxx>
 #include <svtools/transfer.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index c0604ea80067..729bdd20fd24 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_GALMISC_HXX
 #define INCLUDED_SVX_GALMISC_HXX
 
-#include <sot/storage.hxx>
+#include <sot/formats.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/imap.hxx>
 #include <svl/hint.hxx>
@@ -33,6 +33,7 @@
 #include <tools/time.hxx>
 
 class GalleryTheme;
+class SotStorageStream;
 
 struct ExchangeData
 {
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 21ec91ffb67e..371d4a065570 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -28,14 +28,12 @@
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/lstner.hxx>
 #include <svtools/transfer.hxx>
-#include <sot/storage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/galmisc.hxx>
 #include <vector>
 
-
-// - GalleryObject -
-
+class SotStorage;
+class SotStorageStream;
 
 // - SgaObjKind -
 
@@ -182,7 +180,7 @@ public:
     SAL_DLLPRIVATE void         AbortActualize() { bAbortActualize = true; }
 
     SAL_DLLPRIVATE Gallery*     GetParent() const { return pParent; }
-    SAL_DLLPRIVATE tools::SvRef<SotStorage> GetSvDrawStorage() const { return aSvDrawStorageRef; }
+    SAL_DLLPRIVATE tools::SvRef<SotStorage> GetSvDrawStorage() const;
 
 public:
 
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 2248d4bebb7a..4d56a4413801 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -24,7 +24,6 @@
 #include <cppuhelper/weakref.hxx>
 #include <editeng/forbiddencharacterstable.hxx>
 #include <rtl/ustring.hxx>
-#include <sot/storage.hxx>
 #include <tools/link.hxx>
 #include <tools/weakbase.hxx>
 #include <vcl/mapmod.hxx>
@@ -74,7 +73,6 @@ class XHatchList;
 class XLineEndList;
 class SvxForbiddenCharactersTable;
 class SvNumberFormatter;
-class SotStorage;
 class SdrOutlinerCache;
 class SdrUndoFactory;
 class ImageMap;
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index 61ed78d6cba3..f5680edb74af 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -22,7 +22,6 @@
 
 #include <cppuhelper/compbase2.hxx>
 #include <osl/mutex.hxx>
-#include <sot/storage.hxx>
 #include <map>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 4344873d846a..fa54529b5334 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -20,6 +20,7 @@
 #include "oox/ole/olehelper.hxx"
 
 #include <rtl/ustrbuf.hxx>
+#include <sot/storage.hxx>
 #include <osl/diagnose.h>
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/graphichelper.hxx"
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 52006da08acd..0623eb202936 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -18,6 +18,7 @@
  */
 #include "GroupsSorting.hxx"
 #include <connectivity/dbtools.hxx>
+#include <sot/exchange.hxx>
 #include <svtools/editbrowsebox.hxx>
 #include <svtools/imgdef.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx
index f85e21fc77cb..5923a5aa78e1 100644
--- a/reportdesign/source/ui/report/dlgedclip.cxx
+++ b/reportdesign/source/ui/report/dlgedclip.cxx
@@ -19,6 +19,7 @@
 #include "dlgedclip.hxx"
 #include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
+#include <sot/exchange.hxx>
 #include <com/sun/star/datatransfer/XMimeContentType.hpp>
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
 
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 23fa1fca1df1..9cb0a7139afa 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -20,6 +20,7 @@
 #include <rsc/rscsfx.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
+#include <sot/storage.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1a895e1403ae..2e4860b79a48 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -21,6 +21,7 @@
 
 #include <memory>
 #include <editeng/adjustitem.hxx>
+#include <sot/storage.hxx>
 #include <svx/algitem.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editstat.hxx>
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index d44bda381190..4091230f9cc0 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -29,6 +29,7 @@
 #include <svl/urlbmk.hxx>
 #include <comphelper/classids.hxx>
 #include <sot/formats.hxx>
+#include <sot/storage.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index e15e201c9d44..30320b904795 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -24,6 +24,7 @@
 #include <editeng/editstat.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/flditem.hxx>
+#include <sot/storage.hxx>
 #include <svx/hlnkitem.hxx>
 #include <editeng/langitem.hxx>
 #include <svx/svxerr.hxx>
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 3172c1d69b1f..046f01ed808a 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -37,6 +37,7 @@
 #include <comphelper/classids.hxx>
 #include <sot/formats.hxx>
 #include <sot/filelist.hxx>
+#include <sot/storage.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/ptitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index c39452f7a9b1..d89235a8a70e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -101,6 +101,7 @@
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/interactionrequest.hxx>
 #include <sot/stg.hxx>
+#include <sot/storage.hxx>
 #include <unotools/saveopt.hxx>
 #include <svl/documentlockfile.hxx>
 #include <com/sun/star/document/DocumentRevisionListPersistence.hpp>
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index ad597513f8b0..7defffe6a757 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <sot/exchange.hxx>
+#include <sot/storage.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 319a91e36079..d431a1e5f400 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -87,6 +87,7 @@
 #include <unotools/tempfile.hxx>
 #include <unotools/docinfohelper.hxx>
 #include <ucbhelper/content.hxx>
+#include <sot/storage.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index b57181663cd8..2bff133bfcbf 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
-
+#include <sot/exchange.hxx>
 #include <svtools/embedtransfer.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx
index da7396101cfa..c412281b4ef4 100644
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sot/exchange.hxx>
 #include <svtools/stringtransfer.hxx>
 
 
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 46dfae05b25c..cf2a75f1d920 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
 
+#include <sot/storage.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 76030e7e1e3d..047b4cc355ec 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1533,6 +1533,12 @@ bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromReso
 bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
 bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
 bool GalleryTheme::IsModified() const { return pThm->IsModified(); }
+
+tools::SvRef<SotStorage> GalleryTheme::GetSvDrawStorage() const
+{
+    return aSvDrawStorageRef;
+}
+
 const OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); }
 
 void GalleryTheme::InsertAllThemes( ListBox& rListBox )
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index a4289d966beb..814c4fbe7f25 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -23,6 +23,7 @@
 
 #include <set>
 
+#include <sot/exchange.hxx>
 #include <svtools/transfer.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 058d81bedf77..9302b7a6f93a 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -17,7 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
 
+#include <sot/exchange.hxx>
+#include <sot/storage.hxx>
 #include <svx/dialogs.hrc>
 
 #include <sfx2/viewsh.hxx>
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 07132555a233..3d699240dc9f 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <sot/storage.hxx>
 #include <tools/debug.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 54e7333cc5c6..c4400547ae0e 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -21,6 +21,7 @@
 
 #include <FrameControlsManager.hxx>
 
+#include <sot/exchange.hxx>
 #include <svx/svdobj.hxx>
 #include <tools/link.hxx>
 #include <vcl/timer.hxx>