From bce3ef60a8f6c6859e41985219f02638269fd73e Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <gabor.kelemen@collabora.com>
Date: Sun, 25 Jan 2026 22:01:16 +0100
Subject: [PATCH] tdf#146619 Use more forward declarations in include/sot/

Change-Id: I6706c7009432d0d8d7bc6f9193d8f020e9aedf25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198239
Reviewed-by: Gabor Kelemen <gabor.kelemen@collabora.com>
Tested-by: Jenkins
---
 filter/source/msfilter/msdffimp.cxx              | 1 +
 filter/source/msfilter/msoleexp.cxx              | 1 +
 filter/source/msfilter/rtfutil.cxx               | 3 +++
 include/filter/msfilter/svxmsbas.hxx             | 1 +
 include/sot/storage.hxx                          | 4 ++--
 include/sot/storinfo.hxx                         | 2 +-
 oox/source/ole/olehelper.cxx                     | 1 +
 oox/source/ole/vbaexport.cxx                     | 1 +
 sc/source/filter/excel/xiescher.cxx              | 1 +
 sc/source/filter/xcl97/xcl97esc.cxx              | 1 +
 sd/source/core/sdpage.cxx                        | 1 +
 sd/source/ui/unoidl/sddetect.cxx                 | 1 +
 sfx2/source/doc/SfxDocumentMetaData.cxx          | 1 +
 sfx2/source/doc/objstor.cxx                      | 1 +
 sfx2/source/doc/oleprops.cxx                     | 2 ++
 sfx2/source/doc/oleprops.hxx                     | 1 +
 sot/qa/cppunit/test_sot.cxx                      | 1 +
 sot/source/sdstor/stgole.hxx                     | 1 +
 sot/source/sdstor/storage.cxx                    | 1 +
 starmath/source/document.cxx                     | 1 +
 starmath/source/eqnolefilehdr.cxx                | 1 +
 starmath/source/mathtype.cxx                     | 2 ++
 starmath/source/smdetect.cxx                     | 1 +
 svtools/source/misc/imagemgr.cxx                 | 1 +
 svx/source/xml/xmleohlp.cxx                      | 1 +
 sw/qa/extras/htmlexport/htmlexport.cxx           | 1 +
 sw/source/filter/basflt/iodetect.cxx             | 1 +
 sw/source/filter/html/htmlplug.cxx               | 1 +
 sw/source/filter/html/htmlreqifreader.cxx        | 1 +
 sw/source/filter/ww8/docxattributeoutput.cxx     | 1 +
 sw/source/filter/ww8/rtfattributeoutput.cxx      | 1 +
 sw/source/filter/ww8/wrtww8.cxx                  | 1 +
 sw/source/filter/ww8/ww8par4.cxx                 | 1 +
 sw/source/ui/uno/swdetect.cxx                    | 1 +
 writerperfect/source/common/WPXSvInputStream.cxx | 1 +
 35 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 85881010d323..954cbccab006 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -29,6 +29,7 @@
 #include <o3tl/any.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/file.hxx>
+#include <tools/globname.hxx>
 #include <tools/solar.h>
 #include <sal/log.hxx>
 #include <rtl/math.hxx>
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 90f04e6ad575..8ca4cf80a2c2 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
+#include <tools/globname.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/propertyvalue.hxx>
diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
index 1e27047525d3..ccc65b077d4a 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -13,7 +13,10 @@
 #include <osl/diagnose.h>
 #include <svtools/rtfkeywd.hxx>
 #include <rtl/character.hxx>
+#include <rtl/ref.hxx>
+#include <tools/globname.hxx>
 #include <tools/stream.hxx>
+#include <sot/formats.hxx>
 #include <sot/storage.hxx>
 #include <o3tl/numeric.hxx>
 
diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx
index 436487e1b6c0..a5a62e0bd401 100644
--- a/include/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <filter/msfilter/msfilterdllapi.h>
+#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <sot/storage.hxx>
 #include <comphelper/errcode.hxx>
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 0983a06608cc..468bca592533 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_SOT_STORAGE_HXX
 
 #include <sot/object.hxx>
-#include <rtl/ref.hxx>
 #include <tools/stream.hxx>
-#include <tools/globname.hxx>
 #include <comphelper/errcode.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/sotdllapi.h>
@@ -31,10 +29,12 @@
 namespace com::sun::star::embed { class XStorage; }
 namespace com::sun::star::uno { class Any; }
 namespace com::sun::star::uno { template <typename > class Reference; }
+namespace rtl { template <class reference_type> class Reference; }
 
 enum class SotClipboardFormatId : sal_uInt32;
 
 class BaseStorageStream;
+class SvGlobalName;
 
 namespace SotTempStream
 {
diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx
index c1283cffe1a8..7d0c568ca899 100644
--- a/include/sot/storinfo.hxx
+++ b/include/sot/storinfo.hxx
@@ -24,10 +24,10 @@
 #include <utility>
 #include <vector>
 #include <sot/sotdllapi.h>
-#include <sot/formats.hxx>
 
 class StgDirEntry;
 class SvStream;
+enum class SotClipboardFormatId : sal_uInt32;
 
 class SvStorageInfo
 {
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index c5042aa5a6d9..0e6fcb0fc056 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/formats.hxx>
 #include <sot/storage.hxx>
 #include <osl/diagnose.h>
 #include <oox/helper/binaryinputstream.hxx>
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index 7131c8755d13..61f2ce13320a 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/random.hxx>
 #include <comphelper/xmltools.hxx>
 #include <utility>
+#include <rtl/ref.hxx>
 #include <rtl/tencinfo.h>
 #include <osl/thread.h>
 
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index edcaf3d82bc4..4e74b4f3a4d9 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 
 #include <sfx2/objsh.hxx>
+#include <tools/globname.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <comphelper/configuration.hxx>
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index b2f81453c667..7db78d45bcd4 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -37,6 +37,7 @@
 
 #include <sot/exchange.hxx>
 #include <sot/storage.hxx>
+#include <tools/globname.hxx>
 #include <xeescher.hxx>
 
 #include <drwlayer.hxx>
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 370358d74202..11f2298cc454 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -64,6 +64,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
+#include <tools/globname.hxx>
 #include <o3tl/enumarray.hxx>
 #include <o3tl/safeint.hxx>
 #include <o3tl/sorted_vector.hxx>
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index d750709c5a22..52569386e771 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <rtl/ref.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index c80c332c6788..973f441ceb59 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -62,6 +62,7 @@
 #include <com/sun/star/util/DateTimeWithTimezone.hpp>
 #include <com/sun/star/util/Duration.hpp>
 
+#include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <tools/datetime.hxx>
 #include <comphelper/diagnose_ex.hxx>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index f8db2fdc7154..c90414375207 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -73,6 +73,7 @@
 #include <unotools/useroptions.hxx>
 #include <unotools/securityoptions.hxx>
 #include <tools/debug.hxx>
+#include <tools/globname.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <comphelper/memorystream.hxx>
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index b7716aa7c0e1..1ba8b4eaf48d 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -23,6 +23,8 @@
 #include <comphelper/types.hxx>
 #include <o3tl/safeint.hxx>
 #include <tools/datetime.hxx>
+#include <tools/globname.hxx>
+#include <rtl/ref.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
 #include <utility>
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index 5c486c8dad51..c7341b9ba3a4 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -27,6 +27,7 @@
 #include <osl/thread.h>
 #include <rtl/ustring.hxx>
 #include <sot/storage.hxx>
+#include <tools/globname.hxx>
 
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Date.hpp>
diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx
index f696ea576c88..553e30658119 100644
--- a/sot/qa/cppunit/test_sot.cxx
+++ b/sot/qa/cppunit/test_sot.cxx
@@ -10,6 +10,7 @@
 #include <unotest/filters-test.hxx>
 #include <unotest/bootstrapfixturebase.hxx>
 
+#include <rtl/ref.hxx>
 #include <sot/storage.hxx>
 #include <sot/storinfo.hxx>
 #include <sysformats.hxx>
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index 899b07fcd97e..7f3bbd691f75 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -23,6 +23,7 @@
 #include <memory>
 
 #include <sot/stg.hxx>
+#include <sot/formats.hxx>
 
 class StgInternalStream : public SvStream
 {
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index cb9569db498e..fe8553e3c5b2 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <osl/file.hxx>
+#include <rtl/ref.hxx>
 #include <sot/stg.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/storage.hxx>
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 2e1ab7843882..29a5fd5f6ea7 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -53,6 +53,7 @@
 #include <vcl/mapmod.hxx>
 #include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/virdev.hxx>
+#include <tools/globname.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx
index 074fde684f0c..f2724108f7da 100644
--- a/starmath/source/eqnolefilehdr.cxx
+++ b/starmath/source/eqnolefilehdr.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "eqnolefilehdr.hxx"
+#include <rtl/ref.hxx>
 #include <sot/storage.hxx>
 
 
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index af6f39e71019..651993639376 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -23,7 +23,9 @@
 #include <filter/msfilter/classids.hxx>
 #include <osl/diagnose.h>
 #include <sfx2/docfile.hxx>
+#include <sot/formats.hxx>
 #include <sot/storage.hxx>
+#include <tools/globname.hxx>
 #include <array>
 
 //These are the default MathType sizes
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 899dbcccf8b1..fdfd23f2abd9 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <rtl/ref.hxx>
 #include <sfx2/docfile.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <sot/storage.hxx>
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 06fb0eb98039..a76924ea2005 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -20,6 +20,7 @@
 #include <svtools/imagemgr.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/globname.hxx>
 #include <tools/debug.hxx>
 #include <vcl/image.hxx>
 #include <sot/storage.hxx>
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 5802daaecb19..25838c5a3bcb 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -32,6 +32,7 @@
 #include <osl/diagnose.h>
 #include <sot/storage.hxx>
 #include <tools/debug.hxx>
+#include <tools/globname.hxx>
 #include <sal/log.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx
index 49775639e11c..315884006cd6 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <sot/storage.hxx>
+#include <tools/globname.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 104067ac2eb8..3977d6740599 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -20,6 +20,7 @@
 #include <iodetect.hxx>
 #include <memory>
 #include <osl/endian.h>
+#include <rtl/ref.hxx>
 #include <sot/storage.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 78e6f0cd8d5a..b1ccc56d7c36 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -34,6 +34,7 @@
 #include <svtools/htmlout.hxx>
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmltokn.h>
+#include <tools/globname.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <IDocumentContentOperations.hxx>
 #include <SwAppletImpl.hxx>
diff --git a/sw/source/filter/html/htmlreqifreader.cxx b/sw/source/filter/html/htmlreqifreader.cxx
index 5177808111c0..3c32ef02cef2 100644
--- a/sw/source/filter/html/htmlreqifreader.cxx
+++ b/sw/source/filter/html/htmlreqifreader.cxx
@@ -16,6 +16,7 @@
 #include <svtools/parrtf.hxx>
 #include <svtools/rtfkeywd.hxx>
 #include <svtools/rtftoken.h>
+#include <tools/globname.hxx>
 #include <tools/stream.hxx>
 #include <filter/msfilter/msdffimp.hxx>
 #include <vcl/cvtgrf.hxx>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index caa090a17b63..1cc8a988a113 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -103,6 +103,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/datetimeutils.hxx>
+#include <tools/globname.hxx>
 #include <svl/whiter.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 8cb059784ff9..02f3c201060d 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -28,6 +28,7 @@
 #include <sal/log.hxx>
 #include <sot/exchange.hxx>
 #include <svtools/rtfkeywd.hxx>
+#include <tools/globname.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/adjustitem.hxx>
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index bb7589f1812f..39e9d32f5533 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -103,6 +103,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/frame.hxx>
 #include <svl/stritem.hxx>
+#include <tools/globname.hxx>
 #include <unotools/tempfile.hxx>
 #include <filter/msfilter/mscodec.hxx>
 #include <filter/msfilter/svxmsbas.hxx>
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 666186fca6a7..aa36f4063556 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -32,6 +32,7 @@
 #include <filter/msfilter/msdffimp.hxx>
 #include "sprmids.hxx"
 #include <sal/log.hxx>
+#include <tools/globname.hxx>
 #include <osl/diagnose.h>
 
 #include <sot/exchange.hxx>
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 8dff2ae698f5..5578299c7e5b 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -23,6 +23,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <rtl/ref.hxx>
 #include <sfx2/docfile.hxx>
 #include <sot/storage.hxx>
 #include <tools/urlobj.hxx>
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 03c5ae2961ac..155c97e0972a 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -15,6 +15,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/seekableinput.hxx>
 #include <o3tl/safeint.hxx>
+#include <rtl/ref.hxx>
 #include <rtl/string.hxx>
 #include <sal/log.hxx>