Recheck modules s[f-t]* with IWYU

See tdf#42949 for motivation

Change-Id: I1f520aad1b1c942ad5616d96851016fc366ac58f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130203
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

16 files changed, 16 insertions, 19 deletions

diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 9f8849da4b82..3b8e9fa9788d 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -24,7 +24,8 @@
 #include <vcl/weld.hxx>
 #include <unotools/resmgr.hxx>
 
-#include "parse.hxx"
+#include "node.hxx"
+#include "parsebase.hxx"
 #include "AccessibleSmElementsControl.hxx"
 
 class SmDocShell;
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 4b670e61cb8c..5886ffaf2eac 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -11,6 +11,8 @@
 
 #include "caret.hxx"
 
+#include <list>
+
 /** Factor to multiple the squared horizontal distance with
  * Used for Up and Down movement.
  */
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 7403d35cf5a8..214d9a9ce558 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -30,7 +30,8 @@
 #include <oox/export/utils.hxx>
 
 #include "format.hxx"
-#include "parse.hxx"
+#include "node.hxx"
+#include "parsebase.hxx"
 #include "smdllapi.hxx"
 #include "mathml/iterator.hxx"
 
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 3c5d498a364b..503cdd8452a9 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -21,7 +21,6 @@
 
 #include <svx/weldeditview.hxx>
 #include <vcl/idle.hxx>
-#include <vcl/transfer.hxx>
 
 class SmDocShell;
 class SmViewShell;
diff --git a/starmath/inc/mathml/element.hxx b/starmath/inc/mathml/element.hxx
index 901e0021daa3..ce5d7073b606 100644
--- a/starmath/inc/mathml/element.hxx
+++ b/starmath/inc/mathml/element.hxx
@@ -10,7 +10,6 @@
 #pragma once
 
 #include "attribute.hxx"
-#include "starmathdatabase.hxx"
 #include <rect.hxx>
 
 #include <editeng/editdata.hxx>
diff --git a/starmath/inc/mathml/export.hxx b/starmath/inc/mathml/export.hxx
index 125f2602c491..0bd83e6ef238 100644
--- a/starmath/inc/mathml/export.hxx
+++ b/starmath/inc/mathml/export.hxx
@@ -28,8 +28,7 @@
 #include <xmloff/xmltoken.hxx>
 
 // Extras
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/xml/sax/Writer.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
 
 class SfxMedium;
 class SmDocShell;
diff --git a/starmath/inc/mathml/import.hxx b/starmath/inc/mathml/import.hxx
index f14682bdfb8b..d98cc8cf4b66 100644
--- a/starmath/inc/mathml/import.hxx
+++ b/starmath/inc/mathml/import.hxx
@@ -17,7 +17,6 @@
 #include <xmloff/xmlimp.hxx>
 
 // Extras
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 
 class SfxMedium;
 class SmDocShell;
diff --git a/starmath/inc/mathml/mathmlattr.hxx b/starmath/inc/mathml/mathmlattr.hxx
index 16161fb4b8fb..b7d1160bb8ca 100644
--- a/starmath/inc/mathml/mathmlattr.hxx
+++ b/starmath/inc/mathml/mathmlattr.hxx
@@ -14,7 +14,6 @@
 #include <string_view>
 
 #include <rtl/ustring.hxx>
-#include <sal/types.h>
 #include <tools/fract.hxx>
 
 // MathML 3: 2.1.5.1 Syntax notation used in the MathML specification
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 427966279dd6..0a8a6c369065 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -68,6 +68,7 @@
 #include "nodetype.hxx"
 
 #include <editeng/editdata.hxx>
+#include <rtl/ustrbuf.hxx>
 
 enum class FontAttribute {
     None   = 0x0000,
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index c69a6e2654be..a62d515b5f7a 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "parse5.hxx"
+#include "parsebase.hxx"
 
 namespace starmathdatabase
 {
diff --git a/starmath/inc/parse5.hxx b/starmath/inc/parse5.hxx
index 69528c403c0a..5b72378676ee 100644
--- a/starmath/inc/parse5.hxx
+++ b/starmath/inc/parse5.hxx
@@ -24,6 +24,7 @@
 #pragma once
 
 #include "parsebase.hxx"
+#include <unotools/charclass.hxx>
 
 class SmParser5 final : public AbstractSmParser
 {
diff --git a/starmath/inc/parsebase.hxx b/starmath/inc/parsebase.hxx
index d655e7615096..c5618525626f 100644
--- a/starmath/inc/parsebase.hxx
+++ b/starmath/inc/parsebase.hxx
@@ -23,11 +23,12 @@
 
 #pragma once
 
-#include <unotools/charclass.hxx>
 #include <unotools/resmgr.hxx>
 
 #include "node.hxx"
 
+#include <set>
+
 #define DEPTH_LIMIT 1024
 
 // Those are the errors that the parser may encounter.
diff --git a/starmath/inc/smediteng.hxx b/starmath/inc/smediteng.hxx
index 4e0b3162a811..6c95b5804490 100644
--- a/starmath/inc/smediteng.hxx
+++ b/starmath/inc/smediteng.hxx
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <editeng/editeng.hxx>
-#include <editeng/fontitem.hxx>
 #include <unotools/lingucfg.hxx>
 
 class SmEditEngine final : public EditEngine
diff --git a/starmath/inc/smmod.hrc b/starmath/inc/smmod.hrc
index 69c7affb7acd..885af214742e 100644
--- a/starmath/inc/smmod.hrc
+++ b/starmath/inc/smmod.hrc
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 const TranslateId RID_UI_SYMBOLSET_NAMES[] =
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index f0796a6622cb..e22625155ff2 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -15,6 +15,8 @@
 
 #pragma once
 
+#include <rtl/ustring.hxx>
+
 inline constexpr OUStringLiteral RID_UNDOFORMATNAME = u"Format";
 
 // clang-format off
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index 808195dca9d3..86ee287d51c8 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -28,19 +28,11 @@
 
 #pragma once
 
-#include "types.hxx"
-#include <rtl/ustrbuf.hxx>
 #include <tools/color.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 // std imports
-#include <cassert>
 #include <memory>
-#include <vector>
-#include <stack>
-#include <tuple>
-#include <list>
-#include <set>
 
 // TokenGroups
 enum class TG