summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-03-13 07:18:14 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-03-19 09:16:02 +0100
commit63a25b79f18fda29cd744add813ce9508c69b996 (patch)
tree59c8d210c7fc7f618534b92d7c3c5c64d8265eb7 /sw
parent00ac19068de5e120d1620a719aa64f1203c639ae (diff)
tdf#42949 Fix IWYU warnings in sw/source/core/inc/[a-f]*
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I6c3ae806cbb4a00381e39414ff8c8fede5bf1733 Reviewed-on: https://gerrit.libreoffice.org/69150 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/IwyuFilter_sw.yaml12
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport10.cxx1
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx1
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx1
-rw-r--r--sw/qa/extras/ww8export/ww8export2.cxx1
-rw-r--r--sw/source/core/access/accmap.cxx1
-rw-r--r--sw/source/core/doc/DocumentRedlineManager.cxx1
-rw-r--r--sw/source/core/doc/docfmt.cxx1
-rw-r--r--sw/source/core/doc/notxtfrm.cxx2
-rw-r--r--sw/source/core/doc/tblrwcl.cxx1
-rw-r--r--sw/source/core/docnode/section.cxx3
-rw-r--r--sw/source/core/draw/dflyobj.cxx1
-rw-r--r--sw/source/core/edit/edfcol.cxx1
-rw-r--r--sw/source/core/fields/docufld.cxx2
-rw-r--r--sw/source/core/frmedt/fefly1.cxx1
-rw-r--r--sw/source/core/frmedt/feshview.cxx2
-rw-r--r--sw/source/core/inc/DocumentChartDataProviderManager.hxx4
-rw-r--r--sw/source/core/inc/DocumentDeviceManager.hxx1
-rw-r--r--sw/source/core/inc/DocumentDrawModelManager.hxx3
-rw-r--r--sw/source/core/inc/DocumentExternalDataManager.hxx1
-rw-r--r--sw/source/core/inc/DocumentTimerManager.hxx1
-rw-r--r--sw/source/core/inc/acorrect.hxx2
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx1
-rw-r--r--sw/source/core/inc/ascharanchoredobjectposition.hxx1
-rw-r--r--sw/source/core/inc/bookmrk.hxx5
-rw-r--r--sw/source/core/inc/cntfrm.hxx1
-rw-r--r--sw/source/core/inc/crossrefbookmark.hxx1
-rw-r--r--sw/source/core/inc/dbg_lay.hxx4
-rw-r--r--sw/source/core/inc/dflyobj.hxx5
-rw-r--r--sw/source/core/inc/docfld.hxx1
-rw-r--r--sw/source/core/inc/docsort.hxx1
-rw-r--r--sw/source/core/inc/drawfont.hxx4
-rw-r--r--sw/source/core/inc/flowfrm.hxx6
-rw-r--r--sw/source/core/inc/flyfrm.hxx2
-rw-r--r--sw/source/core/inc/flyfrms.hxx2
-rw-r--r--sw/source/core/inc/fntcache.hxx4
-rw-r--r--sw/source/core/inc/fntcap.hxx1
-rw-r--r--sw/source/core/inc/frame.hxx7
-rw-r--r--sw/source/core/inc/frminf.hxx1
-rw-r--r--sw/source/core/inc/frmtool.hxx15
-rw-r--r--sw/source/core/inc/notxtfrm.hxx1
-rw-r--r--sw/source/core/layout/anchoredobject.cxx1
-rw-r--r--sw/source/core/layout/atrfrm.cxx1
-rw-r--r--sw/source/core/layout/calcmove.cxx1
-rw-r--r--sw/source/core/layout/colfrm.cxx1
-rw-r--r--sw/source/core/layout/dbg_lay.cxx1
-rw-r--r--sw/source/core/layout/findfrm.cxx1
-rw-r--r--sw/source/core/layout/flowfrm.cxx1
-rw-r--r--sw/source/core/layout/fly.cxx2
-rw-r--r--sw/source/core/layout/flylay.cxx1
-rw-r--r--sw/source/core/layout/frmtool.cxx2
-rw-r--r--sw/source/core/layout/layact.cxx2
-rw-r--r--sw/source/core/layout/newfrm.cxx1
-rw-r--r--sw/source/core/layout/pagechg.cxx2
-rw-r--r--sw/source/core/layout/pagedesc.cxx1
-rw-r--r--sw/source/core/layout/paintfrm.cxx5
-rw-r--r--sw/source/core/layout/sectfrm.cxx2
-rw-r--r--sw/source/core/layout/ssfrm.cxx1
-rw-r--r--sw/source/core/layout/tabfrm.cxx2
-rw-r--r--sw/source/core/layout/trvlfrm.cxx2
-rw-r--r--sw/source/core/layout/wsfrm.cxx2
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx1
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx1
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx2
-rw-r--r--sw/source/core/text/frmcrsr.cxx1
-rw-r--r--sw/source/core/text/frmpaint.cxx1
-rw-r--r--sw/source/core/text/porfld.cxx1
-rw-r--r--sw/source/core/text/porfld.hxx2
-rw-r--r--sw/source/core/text/txtfly.cxx1
-rw-r--r--sw/source/core/text/txtfrm.cxx1
-rw-r--r--sw/source/core/tox/ToxTabStopTokenHandler.cxx2
-rw-r--r--sw/source/core/view/vnew.cxx1
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx2
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx1
74 files changed, 105 insertions, 51 deletions
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index f15fbc15ee67..ce7961e08ca0 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -250,3 +250,15 @@ blacklist:
- com/sun/star/text/XRedline.hpp
# sw::UnoImplPtr typedef
- unobaseclass.hxx
+ sw/source/core/inc/acorrect.hxx:
+ # Needed for implicit dtor
+ - svl/itemset.hxx
+ sw/source/core/inc/dumpfilter.hxx:
+ # Base class needs complete type
+ - com/sun/star/document/XExporter.hpp
+ - com/sun/star/document/XFilter.hpp
+ - com/sun/star/lang/XInitialization.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ sw/source/core/inc/frame.hxx:
+ # Needed for direct member access
+ - com/sun/star/style/TabStop.hpp
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 009b77069055..254ae993d1bd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -57,6 +57,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <swtypes.hxx>
#include <drawdoc.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
#include <unotools/streamwrap.hxx>
#include <comphelper/propertysequence.hxx>
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 6defeb5da96a..ceed820f4a66 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -38,6 +38,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/lokhelper.hxx>
#include <redline.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentRedlineAccess.hxx>
#include <vcl/scheduler.hxx>
#include <vcl/vclevent.hxx>
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 92cc2394bd83..c6c3dc1123c8 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -64,6 +64,7 @@
#include <txatbase.hxx>
#include <ftnidx.hxx>
#include <txtftn.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentFieldsAccess.hxx>
#include <IDocumentState.hxx>
#include <unofldmid.h>
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx
index 5e189944b8ed..5419aa42b959 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -29,6 +29,7 @@
#include <pagedesc.hxx>
#include <svx/svdpage.hxx>
#include <drawdoc.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <editeng/unoprnms.hxx>
class Test : public SwModelTestBase
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 876d9fc59d2e..e13ed035cbc1 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -74,6 +74,7 @@
#include <prevwpage.hxx>
#include <calbck.hxx>
#include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index de113562139a..a94e9a514089 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -23,6 +23,7 @@
#include <doc.hxx>
#include <docsh.hxx>
#include <fmtfld.hxx>
+#include <frmtool.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentFieldsAccess.hxx>
#include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 9367874f24c5..c870a63068c9 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -45,6 +45,7 @@
#include <docfunc.hxx>
#include <drawdoc.hxx>
#include <MarkManager.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentUndoRedo.hxx>
#include <DocumentContentOperationsManager.hxx>
#include <IDocumentFieldsAccess.hxx>
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index b2fb0f388bac..004e11dc9160 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -31,6 +31,7 @@
#include <sfx2/printer.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/colritem.hxx>
+#include <editeng/boxitem.hxx>
#include <svx/xoutbmp.hxx>
#include <fmturl.hxx>
#include <fmtsrnd.hxx>
@@ -74,6 +75,7 @@
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/utils/b2dclipstate.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
#include <txtfly.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index cb367c67a04b..f6c0bb60e715 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -39,6 +39,7 @@
#include <docsh.hxx>
#include <fesh.hxx>
#include <tabfrm.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <pam.hxx>
#include <swtable.hxx>
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 92cc3839dd87..e0ca1175f1c7 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <libxml/xmlstring.h>
+#include <libxml/xmlwriter.h>
#include <stdlib.h>
#include <hintids.hxx>
#include <svl/intitem.hxx>
@@ -42,6 +44,7 @@
#include <IDocumentLayoutAccess.hxx>
#include <node.hxx>
#include <pam.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <editsh.hxx>
#include <hints.hxx>
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index b7f5a30de5af..36b7396f5f74 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -61,6 +61,7 @@
// AW: For VCOfDrawVirtObj and stuff
#include <svx/sdr/contact/viewcontactofvirtobj.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <sw_primitivetypes2d.hxx>
#include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index f3d4fe945c27..25d691f88296 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 0cd8e57e9f5a..a11d3b59a696 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -44,6 +44,8 @@
#include <unotools/useroptions.hxx>
#include <unotools/syslocale.hxx>
#include <svl/zforlist.hxx>
+#include <libxml/xmlstring.h>
+#include <libxml/xmlwriter.h>
#include <tools/time.hxx>
#include <tools/datetime.hxx>
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index ec7f590123aa..7d63fdfdca95 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -48,6 +48,7 @@
#include <viewimp.hxx>
#include <viscrs.hxx>
#include <doc.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 368aab4f67f5..83b2a5c5ede8 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -45,6 +45,7 @@
#include <svx/svdpagv.hxx>
#include <svx/dialmgr.hxx>
#include <tools/globname.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentSettingAccess.hxx>
#include <DocumentSettingManager.hxx>
#include <IDocumentState.hxx>
@@ -54,6 +55,7 @@
#include <textboxhelper.hxx>
#include <frmfmt.hxx>
#include <frmatr.hxx>
+#include <frmtool.hxx>
#include <fmtfsize.hxx>
#include <fmtanchr.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/core/inc/DocumentChartDataProviderManager.hxx b/sw/source/core/inc/DocumentChartDataProviderManager.hxx
index 1e747e97636b..1759f5b94982 100644
--- a/sw/source/core/inc/DocumentChartDataProviderManager.hxx
+++ b/sw/source/core/inc/DocumentChartDataProviderManager.hxx
@@ -25,10 +25,6 @@
#include <rtl/ref.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace frame {
- class XModel;
-}}}}
-
class SwTable;
class SwChartDataProvider;
class SwChartLockController_Helper;
diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx
index 23bb4e1f436f..46c682817247 100644
--- a/sw/source/core/inc/DocumentDeviceManager.hxx
+++ b/sw/source/core/inc/DocumentDeviceManager.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTDEVICEMANAGER_HXX
#include <IDocumentDeviceAccess.hxx>
-#include <sal/types.h>
#include <vcl/vclptr.hxx>
#include <memory>
diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx
index ec78263112e6..2f86e2d732ee 100644
--- a/sw/source/core/inc/DocumentDrawModelManager.hxx
+++ b/sw/source/core/inc/DocumentDrawModelManager.hxx
@@ -20,12 +20,11 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTDRAWMODELMANAGER_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTDRAWMODELMANAGER_HXX
-#include <sal/types.h>
#include <IDocumentDrawModelAccess.hxx>
#include <svx/svdtypes.hxx>
#include <memory>
+#include <drawdoc.hxx>
-class SwDrawModel;
class SdrPageView;
class SwDoc;
diff --git a/sw/source/core/inc/DocumentExternalDataManager.hxx b/sw/source/core/inc/DocumentExternalDataManager.hxx
index 96e4c3c801f5..068d87eed006 100644
--- a/sw/source/core/inc/DocumentExternalDataManager.hxx
+++ b/sw/source/core/inc/DocumentExternalDataManager.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTEXTERNALDATAMANAGER_HXX
#include <IDocumentExternalData.hxx>
-#include <sal/types.h>
namespace sw {
diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx
index df0a5d2b1ce6..65346efdb494 100644
--- a/sw/source/core/inc/DocumentTimerManager.hxx
+++ b/sw/source/core/inc/DocumentTimerManager.hxx
@@ -23,7 +23,6 @@
#include <IDocumentTimerAccess.hxx>
#include <SwDocIdle.hxx>
-#include <vcl/idle.hxx>
#include <sal/types.h>
#include <tools/link.hxx>
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index 39bd19e91584..8808b47702d3 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -22,9 +22,9 @@
#include <memory>
+#include <svl/itemset.hxx>
#include <tools/solar.h>
#include <editeng/svxacorr.hxx>
-#include <swundo.hxx>
class SwEditShell;
class SwPaM;
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index 1e6c63af00bc..924e6b63bc5b 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -24,7 +24,6 @@
#include "frame.hxx"
class SdrObject;
-class SwFrame;
class SwFlyFrame;
class SwContact;
class SwFrameFormat;
diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx
index bc0c2197975c..6bafb73d1e6a 100644
--- a/sw/source/core/inc/ascharanchoredobjectposition.hxx
+++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SW_SOURCE_CORE_INC_ASCHARANCHOREDOBJECTPOSITION_HXX
#include "anchoredobjectposition.hxx"
-#include <sal/types.h>
#include <swtypes.hxx>
#include <swrect.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 9f6c8af89f34..2aec024a4272 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -24,11 +24,10 @@
#include <sfx2/Metadatable.hxx>
#include <vcl/keycod.hxx>
#include <memory>
-#include <map>
#include <rtl/ustring.hxx>
#include <osl/diagnose.h>
+#include <tools/ref.hxx>
#include <IMark.hxx>
-#include <swserv.hxx>
#include <swrect.hxx>
#include "DropDownFormFieldButton.hxx"
@@ -42,9 +41,9 @@ namespace com {
}
}
-struct SwPosition; // fwd Decl. wg. UI
class SwDoc;
class SwEditWin;
+class SwServerObject;
namespace sw {
namespace mark {
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index aa28f580f3ad..4e57c4142ee3 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -23,7 +23,6 @@
#include "frame.hxx"
#include "flowfrm.hxx"
#include <cshtyp.hxx>
-#include <node.hxx>
class SwLayoutFrame;
class SwContentNode;
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index 2d7765749626..06116bdda776 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_CROSSREFBOOKMARK_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_CROSSREFBOOKMARK_HXX
-#include <IMark.hxx>
#include "bookmrk.hxx"
#include <rtl/ustring.hxx>
#include <vcl/keycod.hxx>
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index e9c04d81eaa9..4f7348b3b046 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -58,10 +58,6 @@ enum class DbgAction {
#ifdef DBG_UTIL
-#include <tools/solar.h>
-
-#include <swtypes.hxx>
-
class SwImplProtocol;
class SwFrame;
class SwImplEnterLeave;
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 30e27cf5f97c..53c5ae907055 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -20,12 +20,13 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_DFLYOBJ_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_DFLYOBJ_HXX
-#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <svx/svdovirt.hxx>
+#include <svx/svdobj.hxx>
+
+namespace drawinglayer::geometry { class ViewInformation2D; }
class SwFlyFrame;
class SwFrameFormat;
-class SdrObjMacroHitRec;
const sal_uInt16 SwFlyDrawObjIdentifier = 0x0001;
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 6f2a8ee02323..36cf3d86eba0 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -36,7 +36,6 @@ class SwTextTOXMark;
class SwTableBox;
class SwTextINetFormat;
class SwFlyFrameFormat;
-class SwDoc;
class SwNode;
struct SwPosition;
enum class SwFieldIds : sal_uInt16;
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 893dc28ae732..392cb8785e60 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -30,7 +30,6 @@ class SwTableBox;
class SwUndoSort;
class FlatFndBox;
struct SwSortOptions;
-struct SwSortElement;
class FndBox_;
class FndLine_;
class CollatorWrapper;
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 8cfa4b720082..7c35b4a9a67b 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -20,18 +20,16 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_DRAWFONT_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_DRAWFONT_HXX
-#include <tools/solar.h>
#include <osl/diagnose.h>
#include <vcl/vclptr.hxx>
#include <vcl/outdev.hxx>
#include "TextFrameIndex.hxx"
+#include <swdllapi.h>
class SwTextFrame;
class SwViewShell;
class SwScriptInfo;
-class Point;
namespace sw { class WrongListIterator; }
-class Size;
class SwFont;
namespace vcl {
class Font;
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index ba5930b4c145..d7dc6cfe0ebf 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -20,7 +20,9 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_FLOWFRM_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_FLOWFRM_HXX
-#include "frmtool.hxx"
+#include "frame.hxx"
+#include "layfrm.hxx"
+#include <swtypes.hxx>
class SvxFormatKeepItem;
class SvxFormatBreakItem;
@@ -29,8 +31,6 @@ class SwRect;
class SwBorderAttrs;
class SwDoc;
class SwNodeIndex;
-// #i44049#
-class SwObjectFormatterTextFrame;
/** Base class that provides the general functionalities for frames that are
allowed at page breaks (flow) and shall continue on the next page (can be
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 218fbe4a98ec..c44725f73a6b 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -32,10 +32,8 @@ class SwFormatFrameSize;
struct SwCursorMoveState;
class SwBorderAttrs;
class SwVirtFlyDrawObj;
-class SwFrameFormats;
class SwAttrSetChg;
namespace tools { class PolyPolygon; }
-class SwFlyDrawContact;
class SwFormat;
class SwViewShell;
class SwFEShell;
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index e59a7fe332b1..4c6940c28edc 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -23,8 +23,6 @@
#include "flyfrm.hxx"
-// #i28701#
-class SwFlyAtContentFrame;
class SwNoTextFrame;
double getLocalFrameRotation_from_SwNoTextFrame(const SwNoTextFrame& rNoTextFrame);
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index c025c6c283ac..d5759ed9def3 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -25,18 +25,16 @@
#include <vcl/font.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/vcllayout.hxx>
-#include <swtypes.hxx>
+#include <vcl/outdev.hxx>
#include "swcache.hxx"
#include "TextFrameIndex.hxx"
-class OutputDevice;
class FontMetric;
class SwFntObj;
class SwDrawTextInfo;
class SwViewShell;
class SwSubFont;
class MapMode;
-class Point;
class SwFntCache : public SwCache
{
diff --git a/sw/source/core/inc/fntcap.hxx b/sw/source/core/inc/fntcap.hxx
index 03591c51791d..0b1cee67cddc 100644
--- a/sw/source/core/inc/fntcap.hxx
+++ b/sw/source/core/inc/fntcap.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_FNTCAP_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_FNTCAP_HXX
-#include <sal/types.h>
#include <rtl/ustring.hxx>
#include "TextFrameIndex.hxx"
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 55688215275e..add2f4b4ba01 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -21,20 +21,20 @@
#define INCLUDED_SW_SOURCE_CORE_INC_FRAME_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <editeng/borderline.hxx>
#include <swtypes.hxx>
#include <swrect.hxx>
#include <calbck.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <o3tl/typed_flags_set.hxx>
-#include <IDocumentDrawModelAccess.hxx>
#include <com/sun/star/style/TabStop.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <vcl/outdev.hxx>
#include <memory>
+namespace drawinglayer::processor2d { class BaseProcessor2D; }
+
class SwLayoutFrame;
class SwRootFrame;
class SwPageFrame;
@@ -45,9 +45,7 @@ class SwFootnoteFrame;
class SwFootnoteBossFrame;
class SwTabFrame;
class SwRowFrame;
-class SwFlowFrame;
class SwContentFrame;
-class SfxPoolItem;
class SwAttrSet;
class Color;
class SwBorderAttrs;
@@ -63,6 +61,7 @@ class SwPrintData;
class SwSortedObjs;
class SwAnchoredObject;
enum class SvxFrameDirection;
+class IDocumentDrawModelAccess;
// Each FrameType is represented here as a bit.
// The bits must be set in a way that it can be determined with masking of
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index e582745f154d..ab7ce6a5c00c 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -27,7 +27,6 @@
#include <vector>
class SwTextFrame;
-class SwPaM;
class SwTextCursor;
class SwTextFrameInfo
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 7c76779cd658..18048e34112b 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -21,25 +21,25 @@
#define INCLUDED_SW_SOURCE_CORE_INC_FRMTOOL_HXX
#include <swtypes.hxx>
-#include "layfrm.hxx"
-#include <frmatr.hxx>
+#include "frame.hxx"
#include "swcache.hxx"
#include <editeng/lrspitem.hxx>
-#include "swfont.hxx"
-#include "flyfrm.hxx"
-#include <basegfx/utils/b2dclipstate.hxx>
+#include <swatrset.hxx>
+class SwLayoutFrame;
+class SwFont;
+class SwTextFrame;
+class SwFormatAnchor;
+class SwViewShell;
class SwPageFrame;
class SwFlyFrame;
class SwContentFrame;
class SwRootFrame;
class SwDoc;
-class SwAttrSet;
class SdrObject;
class SvxBrushItem;
class SdrMarkList;
class SwNodeIndex;
-class OutputDevice;
class GraphicObject;
class GraphicAttr;
class SwPageDesc;
@@ -47,6 +47,7 @@ class SwFrameFormats;
class SwRegionRects;
class SwTextNode;
namespace sw { struct Extent; }
+namespace basegfx { namespace utils { class B2DClipState; } }
#define FAR_AWAY (SAL_MAX_INT32 - 20000) // initial position of a Fly
#define BROWSE_HEIGHT (56700L * 10L) // 10 Meters
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index fad416c27d8f..225c0906066c 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_CORE_INC_NOTXTFRM_HXX
#include "cntfrm.hxx"
+#include <node.hxx>
class SwNoTextNode;
class OutputDevice;
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index cdebc37ee10b..57dd72bfb904 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -18,6 +18,7 @@
*/
#include <txtfrm.hxx>
+#include <frmatr.hxx>
#include <fmtornt.hxx>
#include <doc.hxx>
#include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index deec3f657033..9a3020681f9f 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -51,6 +51,7 @@
#include <fmtline.hxx>
#include <tgrditem.hxx>
#include <hfspacingitem.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentContentOperations.hxx>
#include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 05260abf2dad..c09efcbbea5d 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -21,6 +21,7 @@
#include <rootfrm.hxx>
#include <pagefrm.hxx>
#include <viewopt.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <txtftn.hxx>
#include <fmtftn.hxx>
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 6339d026fafb..b241257b4bda 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -21,6 +21,7 @@
#include <fmtclds.hxx>
#include <fmtfordr.hxx>
#include <frmfmt.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <colfrm.hxx>
#include <pagefrm.hxx>
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 00df02d2f5f5..0ad2d950570e 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -108,6 +108,7 @@
#include <frame.hxx>
#include <swtable.hxx>
#include <sal/log.hxx>
+#include <tools/stream.hxx>
PROT SwProtocol::nRecord = PROT::FileInit;
SwImplProtocol* SwProtocol::pImpl = nullptr;
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index a0af09b2ad37..7a411d549ba6 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -25,6 +25,7 @@
#include <notxtfrm.hxx>
#include <tabfrm.hxx>
#include <sectfrm.hxx>
+#include <frmatr.hxx>
#include <flyfrms.hxx>
#include <ftnfrm.hxx>
#include <txtftn.hxx>
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 39d369d1b38b..76ace9527fb9 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -27,6 +27,7 @@
#include <pagefrm.hxx>
#include <viewimp.hxx>
#include <viewopt.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <IDocumentFieldsAccess.hxx>
#include <dcontact.hxx>
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 970d454567e7..06410cedf750 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -50,6 +50,7 @@
#include <dcontact.hxx>
#include <dflyobj.hxx>
#include <dview.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <hints.hxx>
#include <tabfrm.hxx>
@@ -59,6 +60,7 @@
#include <sectfrm.hxx>
#include <vcl/svapp.hxx>
#include <calbck.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentLayoutAccess.hxx>
#include <textboxhelper.hxx>
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index c0b0219f0167..16a610847978 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -23,6 +23,7 @@
#include <dflyobj.hxx>
#include <dcontact.hxx>
#include <ftnfrm.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <hints.hxx>
#include <sectfrm.hxx>
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 5728fc345363..5c33911727bf 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -41,6 +41,7 @@
#include <viewopt.hxx>
#include <dflyobj.hxx>
#include <dcontact.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <tabfrm.hxx>
#include <rowfrm.hxx>
@@ -64,6 +65,7 @@
#include <objectformatter.hxx>
#include <calbck.hxx>
#include <DocumentSettingManager.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentTimerAccess.hxx>
#include <IDocumentRedlineAccess.hxx>
#include <IDocumentFieldsAccess.hxx>
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 62028b741499..8e02e75e9362 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -25,6 +25,7 @@
#include <viewimp.hxx>
#include <crsrsh.hxx>
#include <dflyobj.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <dcontact.hxx>
#include <viewopt.hxx>
@@ -32,6 +33,7 @@
#include <layouter.hxx>
#include <docstat.hxx>
#include <swevent.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentStatistics.hxx>
#include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index bfaf62657091..e4ae9a45c53e 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -38,6 +38,7 @@
#include <hints.hxx>
#include <viewopt.hxx>
#include <set>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentFieldsAccess.hxx>
#include <DocumentLayoutManager.hxx>
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index f179080e1985..f77954545a50 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -28,6 +28,7 @@
#include <fmtornt.hxx>
#include <fmtsrnd.hxx>
#include <ftninfo.hxx>
+#include <frmtool.hxx>
#include <tgrditem.hxx>
#include <viewopt.hxx>
#include <docsh.hxx>
@@ -39,6 +40,7 @@
#include <viewimp.hxx>
#include <pagefrm.hxx>
#include <rootfrm.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentFieldsAccess.hxx>
#include <dcontact.hxx>
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index 8dc2ad33a1d9..c1559e115600 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -29,6 +29,7 @@
#include <pagefrm.hxx>
#include <pagedesc.hxx>
#include <swtable.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <doc.hxx>
#include <node.hxx>
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 6c5233a85c95..e8f0613cf942 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -39,6 +39,8 @@
#include <viewimp.hxx>
#include <dflyobj.hxx>
#include <flyfrm.hxx>
+#include <frmatr.hxx>
+#include <frmtool.hxx>
#include <viewopt.hxx>
#include <dview.hxx>
#include <dcontact.hxx>
@@ -63,6 +65,7 @@
#include <hffrm.hxx>
#include <colfrm.hxx>
#include <sw_primitivetypes2d.hxx>
+#include <swfont.hxx>
#include <svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx>
#include <svx/sdr/contact/viewobjectcontactredirector.hxx>
@@ -70,6 +73,7 @@
#include <svx/sdr/contact/viewcontact.hxx>
#include <DocumentSettingManager.hxx>
#include <IDocumentDeviceAccess.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <ndole.hxx>
#include <PostItMgr.hxx>
@@ -94,6 +98,7 @@
#include <svx/framelinkarray.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <basegfx/color/bcolortools.hxx>
+#include <basegfx/utils/b2dclipstate.hxx>
#include <sal/log.hxx>
#include <memory>
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 39bf62082c18..58d0c7d4d5ad 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -45,6 +45,8 @@
#include <flyfrms.hxx>
#include <sortedobjs.hxx>
#include <hints.hxx>
+#include <frmatr.hxx>
+#include <frmtool.hxx>
namespace
{
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index e1c8ec770646..902ee811b657 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -32,6 +32,7 @@
#include <viewimp.hxx>
#include <sortedobjs.hxx>
#include <hints.hxx>
+#include <frmtool.hxx>
// No inline cause we need the function pointers
long SwFrame::GetTopMargin() const
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index e90020ce0a35..5c2158d415cb 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -58,6 +58,8 @@
#include <DocumentSettingManager.hxx>
#include <docary.hxx>
#include <sal/log.hxx>
+#include <frmatr.hxx>
+#include <frmtool.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 45d22ab72a29..3abc0276ccac 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -45,6 +45,8 @@
#include <txatbase.hxx>
#include <fmtfld.hxx>
#include <fldbas.hxx>
+#include <frmatr.hxx>
+#include <frmtool.hxx>
#include <cfloat>
#include <swselectionlist.hxx>
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index c76f70110990..0f486b4f3f4b 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -54,6 +54,8 @@
#include <dbg_lay.hxx>
#include <editeng/frmdiritem.hxx>
#include <sortedobjs.hxx>
+#include <frmatr.hxx>
+#include <frmtool.hxx>
// RotateFlyFrame3
#include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index c6724a34e0b4..09f6b33c5458 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -24,6 +24,7 @@
#include <flyfrms.hxx>
#include <txtfrm.hxx>
#include <pagefrm.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <svx/svdobj.hxx>
#include <dflyobj.hxx>
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 4347c125ee90..25424dfaa3f3 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -38,6 +38,7 @@
#include <svx/svdobj.hxx>
#include <pam.hxx>
#include <environmentofanchoredobject.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <ndtxt.hxx>
#include <dflyobj.hxx>
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 94cdbf02368c..cbfbac447f06 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
#include <EnhancedPDFExportHelper.hxx>
#include <hintids.hxx>
@@ -74,6 +75,7 @@
#include <SwNodeNum.hxx>
#include <calbck.hxx>
#include <stack>
+#include <frmtool.hxx>
#include <tools/globname.hxx>
#include <svx/svdobj.hxx>
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 1c269af60167..e3bb28798d84 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -19,6 +19,7 @@
#include <ndtxt.hxx>
#include <pam.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <viewopt.hxx>
#include <paratr.hxx>
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index ccfe63c147ca..5debf4061f54 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -34,6 +34,7 @@
#include <viewsh.hxx>
#include <viewimp.hxx>
#include <viewopt.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <txtfrm.hxx>
#include "itrpaint.hxx"
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 2a52f9b539c7..bfb547d31487 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -31,6 +31,7 @@
#include "porfld.hxx"
#include "inftxt.hxx"
#include <blink.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <viewsh.hxx>
#include <docsh.hxx>
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 069ab3798060..998f33e16a60 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -20,8 +20,10 @@
#define INCLUDED_SW_SOURCE_CORE_TEXT_PORFLD_HXX
#include <swtypes.hxx>
+#include <swfont.hxx>
#include "porexp.hxx"
#include <fmtornt.hxx>
+#include <o3tl/enumarray.hxx>
class SwFont;
class SvxBrushItem;
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index a6535c853e59..124648a386d1 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -27,6 +27,7 @@
#include <swregion.hxx>
#include <dflyobj.hxx>
#include <flyfrm.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include "porfly.hxx"
#include "porfld.hxx"
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 81e71b8176f9..345f198533f3 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -47,6 +47,7 @@
#include <dflyobj.hxx>
#include <flyfrm.hxx>
#include <tabfrm.hxx>
+#include <frmatr.hxx>
#include <frmtool.hxx>
#include <pagedesc.hxx>
#include <tgrditem.hxx>
diff --git a/sw/source/core/tox/ToxTabStopTokenHandler.cxx b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
index 0efd0125a1e1..d45acc676c7f 100644
--- a/sw/source/core/tox/ToxTabStopTokenHandler.cxx
+++ b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
@@ -11,11 +11,13 @@
#include <editeng/tstpitem.hxx>
#include <editeng/lrspitem.hxx>
+#include <editeng/boxitem.hxx>
#include <cntfrm.hxx>
#include <fmtfsize.hxx>
#include <fmtpdsc.hxx>
#include <frmfmt.hxx>
+#include <frmatr.hxx>
#include <ndtxt.hxx>
#include <pagedesc.hxx>
#include <pagefrm.hxx>
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 5f967ea514fd..aecaffe4df00 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -20,6 +20,7 @@
#include <sfx2/printer.hxx>
#include <sal/log.hxx>
#include <doc.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentUndoRedo.hxx>
#include <DocumentSettingManager.hxx>
#include <IDocumentDeviceAccess.hxx>
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 2b80b4480a13..4060ab996218 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -25,6 +25,7 @@
#include <view.hxx>
#include <viewopt.hxx>
#include <wrtsh.hxx>
+#include <IDocumentDrawModelAccess.hxx>
#include <basegfx/color/bcolortools.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
@@ -43,6 +44,7 @@
#include <editeng/brushitem.hxx>
#include <svx/hdft.hxx>
#include <sfx2/dispatch.hxx>
+#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <vcl/decoview.hxx>
#include <vcl/gradient.hxx>
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index f0b7048f19cf..38d15842018e 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -38,6 +38,7 @@
#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
+#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <editeng/formatbreakitem.hxx>
#include <sfx2/dispatch.hxx>