summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/inc/authratr.hxx2
-rw-r--r--sw/inc/editsh.hxx1
-rw-r--r--sw/inc/fmtfsize.hxx1
-rw-r--r--sw/inc/hhcwrp.hxx1
-rw-r--r--sw/inc/hintids.hxx5
-rw-r--r--sw/inc/hints.hxx1
-rw-r--r--sw/inc/iodetect.hxx13
-rw-r--r--sw/inc/istyleaccess.hxx1
-rw-r--r--sw/inc/itabenum.hxx2
-rw-r--r--sw/inc/mdiexp.hxx1
-rw-r--r--sw/inc/modcfg.hxx3
-rw-r--r--sw/inc/ndarr.hxx7
-rw-r--r--sw/inc/ndindex.hxx1
-rw-r--r--sw/inc/ndtxt.hxx5
-rw-r--r--sw/inc/ndtyp.hxx2
-rw-r--r--sw/inc/numrule.hxx2
-rw-r--r--sw/inc/viscrs.hxx1
-rw-r--r--sw/qa/core/filters-test.cxx1
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx1
-rw-r--r--sw/source/core/attr/hints.cxx1
-rw-r--r--sw/source/core/doc/DocumentListItemsManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentStylePoolManager.cxx1
-rw-r--r--sw/source/core/doc/poolfmt.cxx1
-rw-r--r--sw/source/core/docnode/ndsect.cxx1
-rw-r--r--sw/source/core/docnode/node.cxx1
-rw-r--r--sw/source/core/fields/docufld.cxx1
-rw-r--r--sw/source/core/inc/bookmrk.hxx1
-rw-r--r--sw/source/core/inc/unoport.hxx1
-rw-r--r--sw/source/core/layout/atrfrm.cxx1
-rw-r--r--sw/source/core/layout/sectfrm.cxx1
-rw-r--r--sw/source/core/para/paratr.cxx1
-rw-r--r--sw/source/core/tox/ToxTextGenerator.cxx1
-rw-r--r--sw/source/core/txtnode/atrftn.cxx1
-rw-r--r--sw/source/core/txtnode/thints.cxx1
-rw-r--r--sw/source/core/unocore/unosett.cxx1
-rw-r--r--sw/source/core/unocore/unostyle.cxx3
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx1
-rw-r--r--sw/source/filter/basflt/iodetect.cxx3
-rw-r--r--sw/source/filter/html/swhtml.cxx1
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx1
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx1
-rw-r--r--sw/source/uibase/app/docstyle.cxx1
-rw-r--r--sw/source/uibase/shells/textsh.cxx1
-rw-r--r--sw/source/uibase/uiview/view.cxx1
45 files changed, 56 insertions, 27 deletions
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 03f670fde347..2c68369215d1 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_INC_AUTHRATR_HXX
#define INCLUDED_SW_INC_AUTHRATR_HXX
-#include <tools/colordata.hxx>
+#include <tools/color.hxx>
#include "swdllapi.h"
class SW_DLLPUBLIC AuthorCharAttr
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 99c970233810..8b9e5662fbe6 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -98,6 +98,7 @@ enum class SvtScriptType;
enum class SfxClassificationPolicyType;
enum class RedlineFlags;
enum class TransliterationFlags;
+enum class GraphicType;
namespace com { namespace sun { namespace star { namespace uno {
template < class > class Sequence;
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index c70706431833..44c891760277 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <editeng/sizeitem.hxx>
-#include <tools/gen.hxx>
#include <svl/poolitem.hxx>
#include "swdllapi.h"
#include "hintids.hxx"
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index d77b291e85b0..f595cf045d10 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_INC_HHCWRP_HXX
#include <editeng/hangulhanja.hxx>
+#include "swdllapi.h"
class SwView;
namespace vcl { class Window; }
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 0230134fc34a..50afd3d98334 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_INC_HINTIDS_HXX
#define INCLUDED_SW_INC_HINTIDS_HXX
-#include <tools/solar.h>
#include <sal/types.h>
#include <svx/xdef.hxx>
#include "swdllapi.h"
@@ -27,6 +26,10 @@
#include <vector>
class SfxStringItem;
+class SwFormatChg;
+class SwUpdateAttr;
+class SwAttrSetChg;
+class SwDocPosUpdate;
// For SwTextHints without end index the following char is added:
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 1c35871b611d..b2dd5aff5eed 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -22,7 +22,6 @@
#include "swatrset.hxx"
#include "swtypes.hxx"
#include <vcl/vclptr.hxx>
-#include <vector>
class SwFormat;
class OutputDevice;
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 3443145af358..388e7d9e7a29 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -20,11 +20,11 @@
#ifndef INCLUDED_SW_INC_IODETECT_HXX
#define INCLUDED_SW_INC_IODETECT_HXX
-#include <osl/endian.h>
+#include <memory>
#include <rtl/ustring.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/fcontnr.hxx>
+#include <tools/lineend.hxx>
+#include <tools/solar.h>
+#include <com/sun/star/embed/XStorage.hpp>
#include "swdllapi.h"
#define FILTER_RTF "RTF" ///< RTF filter
@@ -44,6 +44,11 @@
#define sSWRITER "swriter"
#define sSWRITERWEB "swriter/web"
+class SfxFilter;
+class SfxFilterContainer;
+class SotStorage;
+class SvStream;
+
struct SwIoDetect
{
const OUString sName;
diff --git a/sw/inc/istyleaccess.hxx b/sw/inc/istyleaccess.hxx
index 1f47ee8ecb82..88de8512a7ad 100644
--- a/sw/inc/istyleaccess.hxx
+++ b/sw/inc/istyleaccess.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SW_INC_ISTYLEACCESS_HXX
#include <vector>
-#include <svl/stylepool.hxx>
// Management of (automatic) styles
class IStyleAccess
diff --git a/sw/inc/itabenum.hxx b/sw/inc/itabenum.hxx
index ec338edf0e53..c3c06e5d6abb 100644
--- a/sw/inc/itabenum.hxx
+++ b/sw/inc/itabenum.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_INC_ITABENUM_HXX
#define INCLUDED_SW_INC_ITABENUM_HXX
-#include <tools/solar.h>
+#include <sal/types.h>
namespace tabopts
{
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index c27afef21026..18dfb9d56405 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SW_INC_MDIEXP_HXX
#include <rtl/ustring.hxx>
-#include <tools/solar.h>
#include "tblenum.hxx"
#include "swdllapi.h"
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index bd9fa3b25c70..c20296a9f951 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SW_INC_MODCFG_HXX
#define INCLUDED_SW_INC_MODCFG_HXX
-#include <tools/wintypes.hxx>
-#include <vcl/field.hxx>
#include <unotools/configitem.hxx>
#include "swdllapi.h"
#include "authratr.hxx"
@@ -28,7 +26,6 @@
#include "tblenum.hxx"
#include "itabenum.hxx"
#include <tools/globname.hxx>
-#include <editeng/svxenum.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <vector>
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 689c2c05f13f..fdbebe125cec 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -26,14 +26,10 @@
#include <vector>
#include <memory>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-
-#include <svtools/embedhlp.hxx>
-
#include "bparr.hxx"
#include "ndtyp.hxx"
+#include <rtl/ustring.hxx>
#include <o3tl/sorted_vector.hxx>
-#include "ring.hxx"
class Graphic;
class GraphicObject;
@@ -67,6 +63,7 @@ class SwUndoTextToTable;
struct SwPosition;
namespace sw { class DocumentContentOperationsManager; }
+namespace svt { class EmbeddedObjectRef; }
// class SwNodes
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 67bfc47c5342..fbaf0314f84f 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_INC_NDINDEX_HXX
#define INCLUDED_SW_INC_NDINDEX_HXX
-#include <limits.h>
#include <iostream>
#include <tools/solar.h>
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 98abc094707b..74ca9624ef1c 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -25,7 +25,6 @@
#include "node.hxx"
#include "hintids.hxx"
#include "ndhints.hxx"
-#include "modeltoviewhelper.hxx"
#include "SwNumberTreeTypes.hxx"
#include "IDocumentContentOperations.hxx"
@@ -44,6 +43,10 @@ class SvxLRSpaceItem;
namespace utl {
class TransliterationWrapper;
}
+namespace vcl
+{
+class Font;
+}
class SwTextFormatColl;
class SwContentFrame;
diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx
index 6e1909bdf721..50c1f6999eff 100644
--- a/sw/inc/ndtyp.hxx
+++ b/sw/inc/ndtyp.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_INC_NDTYP_HXX
#define INCLUDED_SW_INC_NDTYP_HXX
-#include <tools/solar.h>
+#include <sal/types.h>
#include <o3tl/typed_flags_set.hxx>
// IDs for different nodes. The member indicating the type of node is
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 88987c15c6d2..b1029c810a82 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -21,12 +21,10 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-#include <editeng/svxenum.hxx>
#include <editeng/numitem.hxx>
#include "swdllapi.h"
#include "swtypes.hxx"
#include "calbck.hxx"
-#include "hints.hxx"
#include "SwNumberTreeTypes.hxx"
#include "ndarr.hxx"
#include <unordered_map>
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 716e44289af2..848739e15eb0 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -63,6 +63,7 @@ public:
namespace sdr { namespace overlay { class OverlayObject; }}
namespace sw { namespace overlay { class OverlayRangesOutline; }}
+class MapMode;
class SwSelPaintRects : public SwRects
{
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 2a0a7db7a3fe..3843a721202e 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -18,6 +18,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include <sfx2/sfxsids.hrc>
+#include <sfx2/fcontnr.hxx>
#include <svl/stritem.hxx>
#include <unotools/tempfile.hxx>
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index 594045173f87..55df15b845e0 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/text/TextMarkupType.hpp>
#include <com/sun/star/accessibility/TextSegment.hpp>
+#include <osl/diagnose.h>
#include <ndtxt.hxx>
#include <wrong.hxx>
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 8a3d8de733d7..678db2590528 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -24,6 +24,7 @@
#include <ndtxt.hxx>
#include <swtypes.hxx>
#include <vcl/outdev.hxx>
+#include <osl/diagnose.h>
SwFormatChg::SwFormatChg( SwFormat* pFormat )
: SwMsgPoolItem( RES_FMT_CHG ), pChangedFormat( pFormat )
diff --git a/sw/source/core/doc/DocumentListItemsManager.cxx b/sw/source/core/doc/DocumentListItemsManager.cxx
index adbdeec36088..edb859a6e57a 100644
--- a/sw/source/core/doc/DocumentListItemsManager.cxx
+++ b/sw/source/core/doc/DocumentListItemsManager.cxx
@@ -20,7 +20,7 @@
#include <DocumentListItemsManager.hxx>
#include <SwNodeNum.hxx>
#include <ndtxt.hxx>
-
+#include <osl/diagnose.h>
namespace sw
{
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index aa8d08f6cf3e..5e9eb561de21 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -35,6 +35,7 @@
#include <frmfmt.hxx>
#include <fmtline.hxx>
#include <numrule.hxx>
+#include <hints.hxx>
#include <editeng/paperinf.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/fontitem.hxx>
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 78f14fc3c912..9effd62c50ee 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -68,6 +68,7 @@
#include <numrule.hxx>
#include <swtable.hxx>
#include <tblafmt.hxx>
+#include <hints.hxx>
#include <svx/xdef.hxx>
#include <svx/xfillit0.hxx>
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 51c57c7d74ce..fcd4e533b179 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -54,6 +54,7 @@
#include <strings.hrc>
#include <viewsh.hxx>
#include <txtfrm.hxx>
+#include <hints.hxx>
#include <memory>
#include "ndsect.hxx"
#include <tools/datetimeutils.hxx>
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 8e0636759083..8e4bc9e66f37 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -67,6 +67,7 @@
#include <ndole.hxx>
#include <memory>
#include <swcrsr.hxx>
+#include <hints.hxx>
#include <svl/itemiter.hxx>
using namespace ::com::sun::star::i18n;
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 52abab26fe30..3ae4dcf8639c 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -89,6 +89,7 @@
#include <editeng/outlobj.hxx>
#include <calbck.hxx>
#include <docary.hxx>
+#include <hints.hxx>
#define URL_DECODE INetURLObject::DecodeMechanism::Unambiguous
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 76363043e505..4fa2ef87c772 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -26,6 +26,7 @@
#include <memory>
#include <map>
#include <rtl/ustring.hxx>
+#include <osl/diagnose.h>
#include <IMark.hxx>
#include <swserv.hxx>
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 8f772760dada..d0cef52f7c70 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -23,6 +23,7 @@
#include <deque>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 3a364a9c84d6..260bf28b4986 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -79,6 +79,7 @@
#include <calbck.hxx>
#include <pagedeschint.hxx>
#include <drawdoc.hxx>
+#include <hints.hxx>
#ifndef NDEBUG
#include <ndtxt.hxx>
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index f939b216e6d9..319974f41713 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -43,6 +43,7 @@
#include <fmtftntx.hxx>
#include <flyfrms.hxx>
#include <sortedobjs.hxx>
+#include <hints.hxx>
SwSectionFrame::SwSectionFrame( SwSection &rSect, SwFrame* pSib )
: SwLayoutFrame( rSect.GetFormat(), pSib )
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index f66b388ffabe..dc030a631b74 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -28,6 +28,7 @@
#include <charfmt.hxx>
#include <cmdid.h>
#include <libxml/xmlwriter.h>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index 2d47ce052191..d60e04bd2ff4 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -38,6 +38,7 @@
#include <ToxLinkProcessor.hxx>
#include <ToxTabStopTokenHandler.hxx>
#include <txatbase.hxx>
+#include <modeltoviewhelper.hxx>
#include <svl/itemiter.hxx>
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index d7b3c122f666..8cad3a892f58 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -35,6 +35,7 @@
#include <fmtftntx.hxx>
#include <section.hxx>
#include <calbck.hxx>
+#include <hints.hxx>
namespace {
/// Get a sorted list of the used footnote reference numbers.
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index bd57ad920f13..d7b70e8a297d 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -78,6 +78,7 @@
#include <memory>
#include <rdfhelper.hxx>
+#include <hints.hxx>
#ifdef DBG_UTIL
#define CHECK Check(true);
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 4be67d59a1fd..4c4c206a5747 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -58,6 +58,7 @@
#include <vcl/font.hxx>
#include <editeng/flstitem.hxx>
#include <vcl/metric.hxx>
+#include <vcl/graph.hxx>
#include <svtools/ctrltool.hxx>
#include <vcl/svapp.hxx>
#include <editeng/unofdesc.hxx>
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 1e99f8b68ba0..1c395b1c9a5c 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -80,7 +80,7 @@
#include <comphelper/sequence.hxx>
#include <o3tl/make_unique.hxx>
-//
+#include <svl/stylepool.hxx>
#include <svx/unobrushitemhelper.hxx>
#include <editeng/unoipset.hxx>
#include <editeng/memberids.h>
@@ -91,6 +91,7 @@
#include <svx/xbtmpit.hxx>
#include <ccoll.hxx>
+#include <hints.hxx>
#include <cassert>
#include <memory>
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index ce39a1f0529d..094e5909613f 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -38,6 +38,7 @@
#include <unotextrange.hxx>
#include <unotextcursor.hxx>
+#include <modeltoviewhelper.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 055a952bbfab..6d532748af4a 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -24,6 +24,9 @@
#include <svtools/parhtml.hxx>
#include <tools/urlobj.hxx>
#include <unotools/moduleoptions.hxx>
+#include <sfx2/docfilt.hxx>
+#include <sfx2/fcontnr.hxx>
+#include <sfx2/docfile.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index c2009feeaf1b..9e4212dbcd67 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -117,6 +117,7 @@
#include <strings.hrc>
#include <swerror.h>
+#include <hints.hxx>
#include "css1atr.hxx"
#define FONTSIZE_MASK 7
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index c6d50ac73a1e..2cffb3becf13 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -48,6 +48,7 @@
#include <charfmt.hxx>
#include <fchrfmt.hxx>
#include <unotools/streamwrap.hxx>
+#include <svtools/embedhlp.hxx>
#include <numrule.hxx>
#include <vcl/svapp.hxx>
#include <IDocumentDrawModelAccess.hxx>
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index ae09250df47b..28a76c3097cc 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -35,6 +35,7 @@
#include <pam.hxx>
#include <tools/poly.hxx>
#include <doc.hxx>
+#include <vcl/graph.hxx>
class SwTextFormatColl;
class SwCharFormat;
@@ -45,7 +46,6 @@ class SwNumFormat;
class SwTextNode;
class SwNoTextNode;
class SwFormatCharFormat;
-class Graphic;
class SwDoc;
class SwNumRule;
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 20a2b854614a..63bfe8f2c3d5 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -70,6 +70,7 @@
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <vcl/graphicfilter.hxx>
#include <vcl/builderfactory.hxx>
+#include <svtools/embedhlp.hxx>
#include <memory>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 51bfb6295460..4e787198cce6 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -65,6 +65,7 @@
#include <svx/svxids.hrc>
#include <svx/xdef.hxx>
#include <SwRewriter.hxx>
+#include <hints.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflftrit.hxx>
#include <svx/svdmodel.hxx>
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 57c63ba22ad2..f043db22aaff 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -107,6 +107,7 @@ using namespace ::com::sun::star;
#include <unomid.h>
#include <IDocumentDrawModelAccess.hxx>
#include <drawdoc.hxx>
+#include <svtools/embedhlp.hxx>
SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell)
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 338c4aa8da83..eb010a49f94d 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -116,6 +116,7 @@
#include <comphelper/propertyvalue.hxx>
#include <sfx2/lokhelper.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <svtools/embedhlp.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;