Fix some IWYU warnings

Change-Id: I4b6e799c1afc2a762a3729ee89f3226c59a6eef8
Reviewed-on: https://gerrit.libreoffice.org/48462
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

13 files changed, 7 insertions, 32 deletions

diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 5d485d598b01..2e4fffdb3d30 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -20,15 +20,11 @@
 #ifndef INCLUDED_SW_INC_ANNOTATIONWIN_HXX
 #define INCLUDED_SW_INC_ANNOTATIONWIN_HXX
 
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <editeng/editstat.hxx>
 #include <tools/date.hxx>
 #include <vcl/builder.hxx>
-#include <vcl/lineinfo.hxx>
 #include <vcl/window.hxx>
 
-#include "docufld.hxx"
 #include "postithelper.hxx"
 #include "swrect.hxx"
 #include "SidebarWindowsTypes.hxx"
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 2ebec2f20758..88d5f8c0a393 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SW_INC_ENHANCEDPDFEXPORTHELPER_HXX
 #define INCLUDED_SW_INC_ENHANCEDPDFEXPORTHELPER_HXX
 
-#include <vcl/pdfextoutdevdata.hxx>
 #include <i18nlangtag/lang.h>
+#include <vcl/pdfwriter.hxx>
 #include "swrect.hxx"
 #include "swtypes.hxx"
 
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index bc1c4aa65e4f..67c1b908abd2 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -20,14 +20,13 @@
 #ifndef INCLUDED_SW_INC_IDOCUMENTLAYOUTACCESS_HXX
 #define INCLUDED_SW_INC_IDOCUMENTLAYOUTACCESS_HXX
 
-#include "swtypes.hxx"
-
 class SwViewShell;
 class SwRootFrame;
 class SwFrameFormat;
 class SfxItemSet;
 class SwLayouter;
 class SwFormatAnchor;
+enum class RndStdIds;
 
 /** Provides access to the layout of a document.
 */
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index 5f511bce3532..fc894ead0200 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
 #define INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
 
-#include <tools/solar.h>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
 namespace sfx2 { class SvLinkSource;  class LinkManager; }
diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx
index 6b69da672d30..32db18cb914d 100644
--- a/sw/inc/IDocumentOutlineNodes.hxx
+++ b/sw/inc/IDocumentOutlineNodes.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_INC_IDOCUMENTOUTLINENODES_HXX
 
 #include <rtl/ustring.hxx>
-#include <sal/types.h>
 #include <vector>
 
 class SwTextNode;
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 7ff58d456ca4..2050ee2ec3cc 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -25,11 +25,8 @@
 #include <cstddef>
 
 #include <sal/types.h>
-#include <tools/solar.h>
 
-#include <limits.h>
-
-#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Sequence.h>
 #include <o3tl/typed_flags_set.hxx>
 
 #include "docary.hxx"
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 41b2c4ff79c3..e3ac10797b89 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
 #define INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
 
-#include <tools/solar.h>
+#include <sal/types.h>
 #include "fldupde.hxx"
 #include <i18nlangtag/lang.h>
 #include <memory>
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index eeab2efa9e1d..d108a91ccb3a 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
 #define INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
 
-#include <tools/solar.h>
-
 /** Get information about the current document state
  */
 class IDocumentState
diff --git a/sw/inc/PageColumnPopup.hxx b/sw/inc/PageColumnPopup.hxx
index a0b217a5329e..3753596a4e6f 100644
--- a/sw/inc/PageColumnPopup.hxx
+++ b/sw/inc/PageColumnPopup.hxx
@@ -21,8 +21,6 @@
 
 #include <sfx2/tbxctrl.hxx>
 #include "swdllapi.h"
-#include <vcl/vclenum.hxx>
-#include <functional>
 
 class SW_DLLPUBLIC PageColumnPopup : public SfxToolBoxControl
 {
diff --git a/sw/inc/PageMarginPopup.hxx b/sw/inc/PageMarginPopup.hxx
index d3f4424d7515..7a66ca8e3db9 100644
--- a/sw/inc/PageMarginPopup.hxx
+++ b/sw/inc/PageMarginPopup.hxx
@@ -21,8 +21,6 @@
 
 #include <sfx2/tbxctrl.hxx>
 #include "swdllapi.h"
-#include <vcl/vclenum.hxx>
-#include <functional>
 
 class SW_DLLPUBLIC PageMarginPopup : public SfxToolBoxControl
 {
diff --git a/sw/inc/PageOrientationPopup.hxx b/sw/inc/PageOrientationPopup.hxx
index 1d403a9332b9..b8cdacb79dfb 100644
--- a/sw/inc/PageOrientationPopup.hxx
+++ b/sw/inc/PageOrientationPopup.hxx
@@ -21,8 +21,6 @@
 
 #include <sfx2/tbxctrl.hxx>
 #include "swdllapi.h"
-#include <vcl/vclenum.hxx>
-#include <functional>
 
 class SW_DLLPUBLIC PageOrientationPopup : public SfxToolBoxControl
 {
diff --git a/sw/inc/PageSizePopup.hxx b/sw/inc/PageSizePopup.hxx
index 4355ec23cb70..a604accde35e 100644
--- a/sw/inc/PageSizePopup.hxx
+++ b/sw/inc/PageSizePopup.hxx
@@ -21,8 +21,6 @@
 
 #include <sfx2/tbxctrl.hxx>
 #include "swdllapi.h"
-#include <vcl/vclenum.hxx>
-#include <functional>
 
 class SW_DLLPUBLIC PageSizePopup : public SfxToolBoxControl
 {
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index a243aa11125c..726471e1dea6 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -20,19 +20,13 @@
 #define INCLUDED_SW_INC_DOC_HXX
 
 // SwDoc interfaces
-#include "IDocumentMarkAccess.hxx"
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
-#include <sal/macros.h>
 #include "swdllapi.h"
 #include "swtypes.hxx"
-#include "swatrset.hxx"
 #include "toxe.hxx"
 #include "flyenum.hxx"
 #include "flypos.hxx"
-#include "itabenum.hxx"
 #include "swdbdata.hxx"
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
@@ -48,8 +42,6 @@
 #include "pagedesc.hxx"
 #include "tblenum.hxx"
 
-#include <svtools/embedhlp.hxx>
-
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ -175,7 +167,9 @@ class IDocumentState;
 class IDocumentLayoutAccess;
 class IDocumentStylePoolAccess;
 class IDocumentExternalData;
+class IDocumentMarkAccess;
 class SetGetExpFields;
+struct SwInsertTableOptions;
 
 namespace sw { namespace mark {
     class MarkManager;