starmath: cleanup includes with iwyu

Change-Id: I6de145f8b59d3ebcbc0cb32df3f955c9ee738eeb
Reviewed-on: https://gerrit.libreoffice.org/40666
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

34 files changed, 34 insertions, 154 deletions

diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx
index e21c0b40e1f6..90ba2f899bec 100644
--- a/starmath/inc/caret.hxx
+++ b/starmath/inc/caret.hxx
@@ -11,8 +11,6 @@
 
 #include <sal/config.h>
 
-#include <sal/log.hxx>
-
 #include "node.hxx"
 
 #include <cassert>
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 4f199ad332a9..b7a7efe371f4 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -22,14 +22,12 @@
 
 #include "types.hxx"
 #include "token.hxx"
-#include "error.hxx"
 #include "rect.hxx"
 #include "format.hxx"
 
 #include <o3tl/typed_flags_set.hxx>
 
 #include <cassert>
-#include <memory>
 #include <vector>
 
 enum class FontAttribute {
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index a43638123405..5d7c08f60a00 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -20,15 +20,12 @@
 #include <sal/config.h>
 
 #include <memory>
-#include <utility>
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
-#include <com/sun/star/awt/FocusEvent.hpp>
-#include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <unotools/accessiblerelationsethelper.hxx>
 
@@ -39,6 +36,7 @@
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
+#include <svx/AccessibleTextHelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/unohelp2.hxx>
@@ -56,7 +54,6 @@
 
 
 #include "accessibility.hxx"
-#include <unomodel.hxx>
 #include <document.hxx>
 #include <view.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 624b7a391f96..9f3755a7f377 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -25,16 +25,13 @@
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/implbase.hxx>
 #include <svl/SfxBroadcaster.hxx>
 
 #include <editeng/editeng.hxx>
 #include <editeng/unoedsrc.hxx>
-#include <svx/AccessibleTextHelper.hxx>
 #include <edit.hxx>
 #include <memory>
 
@@ -42,6 +39,8 @@ class SmGraphicWindow;
 class SmEditWindow;
 class SmDocShell;
 
+namespace accessibility { class AccessibleTextHelper; }
+
 // classes and helper-classes used for accessibility in the graphic-window
 
 
diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx
index 05467dcfad3d..dc5adf2b994c 100644
--- a/starmath/source/action.cxx
+++ b/starmath/source/action.cxx
@@ -18,9 +18,7 @@
  */
 
 #include "action.hxx"
-#include "smdll.hxx"
 #include "document.hxx"
-#include "strings.hrc"
 #include "strings.hxx"
 
 SmFormatAction::SmFormatAction(SmDocShell *pDocSh,
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 70a649dedfa0..4d8dcdc6fd7e 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -21,21 +21,18 @@
 #include <vector>
 
 #include <svl/itemset.hxx>
-#include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include <sal/macros.h>
 #include <officecfg/Office/Math.hxx>
 #include "cfgitem.hxx"
 
 #include "starmath.hrc"
-#include "strings.hrc"
-#include "smdll.hxx"
 #include "smmod.hxx"
+#include "symbol.hxx"
 #include "format.hxx"
 
 using namespace com::sun::star::uno;
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 3a90fd6df1d2..ccc9aafd008e 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -20,21 +20,22 @@
 #ifndef INCLUDED_STARMATH_SOURCE_CFGITEM_HXX
 #define INCLUDED_STARMATH_SOURCE_CFGITEM_HXX
 
+#include "utility.hxx"
+
 #include <deque>
 #include <vector>
 
-#include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <rtl/ustring.hxx>
+#include <svl/SfxBroadcaster.hxx>
 #include <unotools/configitem.hxx>
-#include <vcl/timer.hxx>
 
-#include <symbol.hxx>
 #include <types.hxx>
 #include <memory>
 
 class SmSym;
+class SmSymbolManager;
 class SmFormat;
 namespace vcl { class Font; }
 struct SmCfgOther;
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 7c1c6df689f6..56f43eccaddf 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -11,9 +11,8 @@
 #include "visitors.hxx"
 #include "document.hxx"
 #include "view.hxx"
-#include "accessibility.hxx"
-#include "strings.hxx"
 #include <comphelper/string.hxx>
+#include <editeng/editeng.hxx>
 #include <cassert>
 
 void SmCursor::Move(OutputDevice* pDev, SmMovementDirection direction, bool bMoveAnchor){
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx
index 9810406fed89..b5d3b8f2acb7 100644
--- a/starmath/source/detreg.cxx
+++ b/starmath/source/detreg.cxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <cppuhelper/factory.hxx>
 #include <rtl/ustring.hxx>
 
 #include "smdetect.hxx"
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 031f57c31f2c..c6e85c62db0e 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -25,19 +25,14 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
 #include <svtools/ctrltool.hxx>
-#include <sfx2/printer.hxx>
-#include <vcl/help.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <sfx2/dispatch.hxx>
-#include <osl/diagnose.h>
 #include <svx/ucsubset.hxx>
 
 #include "dialog.hxx"
@@ -48,8 +43,6 @@
 #include "smmod.hxx"
 #include "symbol.hxx"
 #include "view.hxx"
-#include "document.hxx"
-#include "unomodel.hxx"
 
 #include <algorithm>
 
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index e010383f0bad..e6a04cde82bb 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -18,63 +18,46 @@
  */
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Any.h>
 
 #include <comphelper/accessibletexthelper.hxx>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/storagehelper.hxx>
 #include <o3tl/make_unique.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <unotools/eventcfg.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
-#include <sfx2/fcontnr.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <comphelper/classids.hxx>
-#include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
 #include <svl/eitem.hxx>
-#include <svl/fstathelper.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
-#include <unotools/linguprops.hxx>
-#include <unotools/pathoptions.hxx>
-#include <svl/ptitem.hxx>
-#include <svtools/sfxecode.hxx>
 #include <svl/slstitm.hxx>
 #include <svl/hint.hxx>
 #include <svl/stritem.hxx>
-#include <svtools/transfer.hxx>
 #include <svl/undo.hxx>
-#include <svl/urihelper.hxx>
 #include <svl/whiter.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/unolingu.hxx>
-#include <ucbhelper/content.hxx>
 #include <vcl/mapmod.hxx>
 #include <tools/mapunit.hxx>
-#include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 
 #include <document.hxx>
 #include <action.hxx>
 #include <dialog.hxx>
 #include <format.hxx>
-#include <smdll.hxx>
 #include <starmath.hrc>
 #include <strings.hrc>
 #include <symbol.hxx>
@@ -87,7 +70,6 @@
 #include "rtfexport.hxx"
 #include "mathmlimport.hxx"
 #include "mathmlexport.hxx"
-#include <sfx2/sfxsids.hrc>
 #include <svx/svxids.hrc>
 #include "cursor.hxx"
 #include <tools/diagnose_ex.h>
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index a499763b10ba..92abbe35f997 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -18,13 +18,8 @@
  */
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
 
 #include "starmath.hrc"
-#include "strings.hrc"
 #include "helpids.h"
 
 #include <vcl/menu.hxx>
@@ -33,17 +28,10 @@
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editstat.hxx>
-#include <editeng/eeitem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svl/intitem.hxx>
-#include <svl/itempool.hxx>
 #include <svl/stritem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/lrspitem.hxx>
-#include <svl/itemset.hxx>
-#include <editeng/fontitem.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <svx/AccessibleTextHelper.hxx>
 
 #include "edit.hxx"
 #include "view.hxx"
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index bd6409688eef..463a24b4e398 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <svl/languageoptions.hxx>
-#include <vcl/svapp.hxx>
-#include <editeng/scripttypeitem.hxx>
 #include "format.hxx"
 #include <cassert>
 
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index d63d09c3b5e2..f26b6d7d9725 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -24,20 +24,8 @@
  may be significant
 */
 
-#include <com/sun/star/xml/sax/XErrorHandler.hpp>
-#include <com/sun/star/xml/sax/XEntityResolver.hpp>
-#include <com/sun/star/xml/sax/InputSource.hpp>
-#include <com/sun/star/xml/sax/XDTDHandler.hpp>
-#include <com/sun/star/xml/sax/XParser.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XActiveDataControl.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
-#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/packages/zip/ZipIOException.hpp>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <com/sun/star/uno/Any.h>
@@ -45,11 +33,11 @@
 #include <rtl/math.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/docfile.hxx>
+#include "sfx2/sfxsids.hrc"
 #include <osl/diagnose.h>
-#include <svtools/sfxecode.hxx>
 #include <unotools/saveopt.hxx>
+#include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
-#include <svl/itemprop.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <sax/tools/converter.hxx>
@@ -57,7 +45,6 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/attrlist.hxx>
-#include <xmloff/xmlmetai.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/servicehelper.hxx>
 
@@ -65,8 +52,6 @@
 #include <stack>
 
 #include "mathmlexport.hxx"
-#include "register.hxx"
-#include <starmath.hrc>
 #include <strings.hrc>
 #include <unomodel.hxx>
 #include <document.hxx>
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index 449f6c49763f..bb0a5e097fa0 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -20,14 +20,12 @@
 #ifndef INCLUDED_STARMATH_SOURCE_MATHMLEXPORT_HXX
 #define INCLUDED_STARMATH_SOURCE_MATHMLEXPORT_HXX
 
-#include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlexp.hxx>
-#include <xmloff/DocumentSettingsContext.hxx>
 #include <xmloff/xmltoken.hxx>
 
-#include <node.hxx>
-
 class SfxMedium;
+class SmNode;
+class SmVerticalBraceNode;
 namespace com { namespace sun { namespace star {
     namespace io {
         class XOutputStream; }
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index eac8b6e758e6..f2126c74e3f0 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -22,18 +22,12 @@
 into one string, xml parser hands them to us line by line rather than all in
 one go*/
 
-#include <com/sun/star/xml/sax/XErrorHandler.hpp>
-#include <com/sun/star/xml/sax/XEntityResolver.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
-#include <com/sun/star/xml/sax/XDTDHandler.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XActiveDataControl.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
@@ -45,20 +39,19 @@ one go*/
 #include <comphelper/string.hxx>
 #include <o3tl/make_unique.hxx>
 #include <rtl/character.hxx>
-#include <rtl/math.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <osl/diagnose.h>
 #include <svtools/sfxecode.hxx>
-#include <unotools/saveopt.hxx>
+#include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
-#include <svl/itemprop.hxx>
 #include <unotools/streamwrap.hxx>
 #include <sax/tools/converter.hxx>
+#include <xmloff/DocumentSettingsContext.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmloff/attrlist.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlmetai.hxx>
 
@@ -67,7 +60,6 @@ one go*/
 #include "mathmlattr.hxx"
 #include "mathmlimport.hxx"
 #include "register.hxx"
-#include <starmath.hrc>
 #include <strings.hrc>
 #include <unomodel.hxx>
 #include <document.hxx>
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index c1fc11fb9863..31556b77073d 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -21,9 +21,6 @@
 #define INCLUDED_STARMATH_SOURCE_MATHMLIMPORT_HXX
 
 #include <xmloff/xmlimp.hxx>
-#include <xmloff/xmlexp.hxx>
-#include <xmloff/DocumentSettingsContext.hxx>
-#include <xmloff/xmltoken.hxx>
 
 #include <node.hxx>
 #include <deque>
@@ -31,8 +28,6 @@
 
 class SfxMedium;
 namespace com { namespace sun { namespace star {
-    namespace io {
-        class XIutputStream; }
     namespace beans {
         class XPropertySet; }
 } } }
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 2ed0271899da..1173eb30bb05 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -17,11 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <mathtype.hxx>
+#include "mathtype.hxx"
 
 #include <filter/msfilter/classids.hxx>
 #include <osl/diagnose.h>
 #include <sfx2/docfile.hxx>
+#include <sot/storage.hxx>
+
+#include "eqnolefilehdr.hxx"
+#include "node.hxx"
 
 void MathType::Init()
 {
diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx
index 07951c935ddd..caa651acbd75 100644
--- a/starmath/source/mathtype.hxx
+++ b/starmath/source/mathtype.hxx
@@ -20,14 +20,16 @@
 #ifndef INCLUDED_STARMATH_SOURCE_MATHTYPE_HXX
 #define INCLUDED_STARMATH_SOURCE_MATHTYPE_HXX
 
-#include "node.hxx"
-#include "eqnolefilehdr.hxx"
-
-#include <sot/storage.hxx>
+#include <rtl/ustring.hxx>
 
 #include <set>
+#include <vector>
 
 class SfxMedium;
+class SmMatrixNode;
+class SmNode;
+class SotStorage;
+class SotStorageStream;
 
 class MathTypeFont
 {
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index efc13f4483ee..086e69d34d07 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -19,11 +19,10 @@
 
 
 #include "node.hxx"
+#include "parse.hxx"
 #include "rect.hxx"
 #include "symbol.hxx"
 #include "smmod.hxx"
-#include "document.hxx"
-#include "view.hxx"
 #include "mathtype.hxx"
 #include "tmpdevice.hxx"
 #include "visitors.hxx"
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 1b80468320b2..62373396cdd6 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -11,6 +11,7 @@
 #include "ooxmlimport.hxx"
 #include "types.hxx"
 
+#include <oox/mathml/importutils.hxx>
 #include <oox/token/tokens.hxx>
 #include <oox/token/namespaces.hxx>
 #include <rtl/ustring.hxx>
diff --git a/starmath/source/ooxmlimport.hxx b/starmath/source/ooxmlimport.hxx
index f9bf11854a94..026870bfa5cf 100644
--- a/starmath/source/ooxmlimport.hxx
+++ b/starmath/source/ooxmlimport.hxx
@@ -10,8 +10,9 @@
 #ifndef INCLUDED_STARMATH_SOURCE_OOXMLIMPORT_HXX
 #define INCLUDED_STARMATH_SOURCE_OOXMLIMPORT_HXX
 
-#include <oox/mathml/importutils.hxx>
+#include <rtl/ustring.hxx>
 
+namespace oox { namespace formulaimport { class XmlStream; } }
 /**
  Class implementing reading of formulas from OOXML. The toplevel element is expected
  to be oMath (handle oMathPara outside of this code).
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index d5e891f155d8..934a91412329 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -20,14 +20,10 @@
 #include <memory>
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <i18nlangtag/lang.h>
-#include <editeng/unolingu.hxx>
 #include <unotools/syslocale.hxx>
-#include <sal/macros.h>
 #include <o3tl/make_unique.hxx>
-#include <vcl/settings.hxx>
 #include "parse.hxx"
 #include "strings.hrc"
-#include "smdll.hxx"
 #include "smmod.hxx"
 #include "cfgitem.hxx"
 #include <cassert>
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 0199290ee215..6f5faf57ec20 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -19,13 +19,10 @@
 
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <vcl/virdev.hxx>
 
-
 #include "rect.hxx"
 #include "types.hxx"
-#include "utility.hxx"
 #include "smmod.hxx"
 
 #include <cassert>
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index 79ccd14aff6a..946e8543afbe 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -17,16 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <cppuhelper/factory.hxx>
 #include <rtl/ustring.hxx>
 
 #include <sfx2/sfxmodelfactory.hxx>
 
 #include "register.hxx"
-#include "smdll.hxx"
-#include "document.hxx"
-#include "unomodel.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 059d3b325050..6b316f19e169 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "smdetect.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <sfx2/docfile.hxx>
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index e3896d784924..a228e5666e0d 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -21,16 +21,11 @@
 #define INCLUDED_STARMATH_SOURCE_SMDETECT_HXX
 
 #include <rtl/ustring.hxx>
-#include <osl/diagnose.h>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <cppuhelper/factory.hxx>
-#include <sfx2/sfxuno.hxx>
 
 
 namespace com
diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx
index 2373e1e5d4ec..ecd80501d80d 100644
--- a/starmath/source/smdll.cxx
+++ b/starmath/source/smdll.cxx
@@ -25,8 +25,6 @@
 #include <svx/zoomsliderctrl.hxx>
 #include <sfx2/docfac.hxx>
 #include <svx/lboxctrl.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
 #include <sfx2/app.hxx>
 
 #include <smdll.hxx>
@@ -36,7 +34,6 @@
 #include <ElementsDockingWindow.hxx>
 
 #include <starmath.hrc>
-#include <strings.hrc>
 
 #include <svx/xmlsecctrl.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 37548597e82b..cc1980b1775f 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -28,12 +28,10 @@
 #include <vcl/virdev.hxx>
 #include <unotools/syslocale.hxx>
 #include "smmod.hxx"
-#include "symbol.hxx"
 #include "cfgitem.hxx"
 #include "dialog.hxx"
 #include "edit.hxx"
 #include "view.hxx"
-#include "strings.hrc"
 #include "smmod.hrc"
 #include "starmath.hrc"
 #include "svx/modctrl.hxx"
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 1b127bef4454..e37929cc6673 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -18,15 +18,11 @@
  */
 
 #include <vector>
-#include <iterator>
 
 #include "symbol.hxx"
-#include "view.hxx"
 #include "utility.hxx"
-#include "dialog.hxx"
 #include "cfgitem.hxx"
 #include "smmod.hxx"
-#include "strings.hrc"
 
 
 SmSym::SmSym() :
diff --git a/starmath/source/tmpdevice.hxx b/starmath/source/tmpdevice.hxx
index 6c10666d1980..4cadfa69176c 100644
--- a/starmath/source/tmpdevice.hxx
+++ b/starmath/source/tmpdevice.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_STARMATH_SOURCE_TMPDEVICE_HXX
 
 #include <tools/color.hxx>
-#include <vcl/lineinfo.hxx>
 #include <vcl/outdev.hxx>
 
 class SmTmpDevice
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index bb26c724d4b9..efcbc09d6f33 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/docfac.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 7f9dd45fdc4b..ef5276b6512d 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -25,10 +25,7 @@
 #include <o3tl/make_unique.hxx>
 #include <sfx2/printer.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/ctrltool.hxx>
-#include <svl/itemprop.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <editeng/paperinf.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/print.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
@@ -36,8 +33,6 @@
 #include <com/sun/star/formula/SymbolDescriptor.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
-#include <xmloff/xmluconv.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -50,7 +45,6 @@
 #include <symbol.hxx>
 #include <starmath.hrc>
 #include <strings.hrc>
-#include <smdll.hxx>
 #include "cfgitem.hxx"
 
 using namespace ::cppu;
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 13d162e9eccb..81ad79e51f70 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -18,10 +18,8 @@
  */
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/container/XChild.hpp>
@@ -30,7 +28,6 @@
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/string.hxx>
 #include <i18nutil/unicode.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
@@ -42,16 +39,12 @@
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
 #include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
 #include <svl/itemset.hxx>
 #include <svl/poolitem.hxx>
-#include <svl/ptitem.hxx>
 #include <svl/stritem.hxx>
 #include <svtools/transfer.hxx>
 #include <svtools/miscopt.hxx>
-#include <svl/undo.hxx>
 #include <svl/whiter.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/zoomslideritem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
@@ -59,8 +52,6 @@
 #include <sfx2/zoomitem.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/wrkwin.hxx>
 #include <vcl/settings.hxx>
 
 #include <unotools/streamwrap.hxx>