20 files changed, 44 insertions, 57 deletions
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index da573cd3b627..e9e06216014b 100644
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -19,11 +19,12 @@
 
 #pragma once
 
-class SbiParser;
-class SbModule;
 #include "opcodes.hxx"
 #include "buffer.hxx"
 
+class SbiParser;
+class SbModule;
+
 class SbiCodeGen {
     SbiParser* pParser;         // for error messages, line, column etc.
     SbModule& rMod;
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx
index 9c50517d2fc6..bac8deec2204 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -19,13 +19,12 @@
 #pragma once
 
 #include <ObjectIdentifier.hxx>
+#include <map>
+#include <vector>
 
 namespace com::sun::star::awt { struct KeyEvent; }
 namespace com::sun::star::chart2 { class XChartDocument; }
 
-#include <map>
-#include <vector>
-
 namespace chart
 {
 
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index 1e505ff63ef6..b1607bc0ccd6 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -18,15 +18,12 @@
  */
 #pragma once
 
-#include <vcl/weld.hxx>
-
 #include "TabPageNotifiable.hxx"
+#include <vcl/weld.hxx>
+#include <memory>
 
 namespace com::sun::star::chart2 { class XChartDocument; }
 namespace com::sun::star::uno { class XComponentContext; }
-
-#include <memory>
-
 class BuilderPage;
 
 namespace chart
diff --git a/idlc/inc/astscope.hxx b/idlc/inc/astscope.hxx
index 237b5d0bb82a..be7b03828c14 100644
--- a/idlc/inc/astscope.hxx
+++ b/idlc/inc/astscope.hxx
@@ -22,13 +22,12 @@
 #include <sal/config.h>
 
 #include <string_view>
-
 #include "idlc.hxx"
-
-class AstExpression;
 #include "astdeclaration.hxx"
 #include "astexpression.hxx"
 
+class AstExpression;
+
 class AstScope
 {
 public:
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 8f7d7402bdaf..73fc9f646f43 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -36,7 +36,6 @@
 #include <svl/style.hxx>
 #include <svx/xtable.hxx>
 
-class OutputDevice;
 #include <svx/svdtypes.hxx>
 #include <svx/svxdllapi.h>
 
@@ -48,8 +47,7 @@ class OutputDevice;
 #include <unordered_set>
 #endif
 
-constexpr const sal_Unicode DEGREE_CHAR = u'\x00B0'; /* U+00B0 DEGREE SIGN */
-
+class OutputDevice;
 class SdrOutliner;
 class SdrLayerAdmin;
 class SdrObjList;
@@ -93,6 +91,9 @@ namespace com::sun::star::beans {
 }
 
 
+constexpr const sal_Unicode DEGREE_CHAR = u'\x00B0'; /* U+00B0 DEGREE SIGN */
+
+
 enum class SdrHintKind
 {
     LayerChange,          // changed layer definition
diff --git a/lotuswordpro/inc/lwpfoundry.hxx b/lotuswordpro/inc/lwpfoundry.hxx
index 73d03a6642f9..ebecc4b0d825 100644
--- a/lotuswordpro/inc/lwpfoundry.hxx
+++ b/lotuswordpro/inc/lwpfoundry.hxx
@@ -68,12 +68,12 @@
 #include "lwpdropcapmgr.hxx"
 #include "xfilter/ixfstyle.hxx"
 #include <unordered_map>
+#include <memory>
+
 
 class LwpDocument;
 class LwpBookMark;
 
-#include <memory>
-
 class LwpVersionManager
 {
 public:
diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx
index 055490d7bd59..3e2ce786afe7 100644
--- a/lotuswordpro/source/filter/lwpuidoc.hxx
+++ b/lotuswordpro/source/filter/lwpuidoc.hxx
@@ -62,13 +62,13 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUIDOC_HXX
 
 #include <config_lgpl.h>
+#include <lwpobjstrm.hxx>
+#include <lwpatomholder.hxx>
 
 class LwpNamedProperties;
 class LwpAutoRunMacroOptions;
 class LwpMergeOptions;
 
-#include <lwpobjstrm.hxx>
-#include <lwpatomholder.hxx>
 /**
  * @brief       Properties in UIDocument structure
  *          not parsed yet
diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx
index bae02c725248..9eee30a1a941 100644
--- a/sc/source/ui/inc/chartsh.hxx
+++ b/sc/source/ui/inc/chartsh.hxx
@@ -21,11 +21,10 @@
 
 #include <sfx2/shell.hxx>
 #include <shellids.hxx>
+#include "drawsh.hxx"
 
 class ScViewData;
 
-#include "drawsh.hxx"
-
 class ScChartShell final : public ScDrawShell
 {
 public:
diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx
index 8f2a22cb3dd9..97da8dee1397 100644
--- a/sc/source/ui/inc/drformsh.hxx
+++ b/sc/source/ui/inc/drformsh.hxx
@@ -21,12 +21,11 @@
 
 #include <sfx2/shell.hxx>
 #include <shellids.hxx>
+#include "drawsh.hxx"
 
 class ScViewData;
 class SfxModule;
 
-#include "drawsh.hxx"
-
 class ScDrawFormShell final : public ScDrawShell
 {
 public:
diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx
index 0c2b301c8ea5..cae5ac69bc06 100644
--- a/sc/source/ui/inc/graphsh.hxx
+++ b/sc/source/ui/inc/graphsh.hxx
@@ -23,12 +23,12 @@
 #include <vector>
 #include <sfx2/shell.hxx>
 #include <shellids.hxx>
+#include "drawsh.hxx"
 
 class SdrExternalToolEdit;
 class ScViewData;
 class SfxModule;
 
-#include "drawsh.hxx"
 
 class ScGraphicShell final : public ScDrawShell
 {
diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx
index cc7b6db7dd33..471902b28fc5 100644
--- a/sc/source/ui/inc/mediash.hxx
+++ b/sc/source/ui/inc/mediash.hxx
@@ -20,12 +20,11 @@
 #pragma once
 
 #include <shellids.hxx>
+#include "drawsh.hxx"
 
 class ScViewData;
 class SfxModule;
 
-#include "drawsh.hxx"
-
 class ScMediaShell final : public ScDrawShell
 {
 public:
diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx
index 2fbb656f62e2..88be75adc22c 100644
--- a/sc/source/ui/inc/oleobjsh.hxx
+++ b/sc/source/ui/inc/oleobjsh.hxx
@@ -21,12 +21,11 @@
 
 #include <sfx2/shell.hxx>
 #include <shellids.hxx>
+#include "drawsh.hxx"
 
 class ScViewData;
 class SfxModule;
 
-#include "drawsh.hxx"
-
 class ScOleObjectShell final : public ScDrawShell
 {
 public:
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index 95acc9a184d9..98b0bcb53728 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -19,12 +19,12 @@
 
 #pragma once
 
-class SdrPage;
-
 #include <vcl/bitmapex.hxx>
 #include <osl/mutex.hxx>
 #include <memory>
 
+class SdrPage;
+
 namespace sd::slidesorter::cache
 {
 class CacheCompactor;
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index 2338116549a8..90223a1bc87e 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -19,25 +19,20 @@
 
 #pragma once
 
-class SdDrawDocument;
-
 #include <model/SlsSharedPageDescriptor.hxx>
-
 #include <pres.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/region.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-
 #include <vector>
 
+class SdDrawDocument;
 class SdrPage;
 class SdPage;
-
 namespace sd::slidesorter
 {
 class SlideSorter;
 }
-
 namespace com::sun::star::container
 {
 class XIndexAccess;
diff --git a/sfx2/source/inc/StyleList.hxx b/sfx2/source/inc/StyleList.hxx
index 3b46371c6813..1a4ec422259b 100644
--- a/sfx2/source/inc/StyleList.hxx
+++ b/sfx2/source/inc/StyleList.hxx
@@ -25,6 +25,7 @@ class SfxObjectShell;
 class SfxStyleFamilyItem;
 class SfxTemplateItem;
 class SfxCommonTemplateDialog_Impl;
+class SfxTemplateControllerItem;
 
 enum class StyleFlags
 {
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index a6934cbc9b6f..6d5da6668725 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SFX2_SOURCE_INC_TEMPLDGI_HXX
 #define INCLUDED_SFX2_SOURCE_INC_TEMPLDGI_HXX
 
-class SfxTemplateControllerItem;
-
 #include <sal/config.h>
 
 #include <array>
@@ -43,6 +41,7 @@ class SfxTemplateControllerItem;
 
 #include "StyleList.hxx"
 
+class SfxTemplateControllerItem;
 class SfxStyleFamilyItem;
 class SfxTemplateItem;
 class SfxBindings;
@@ -51,7 +50,6 @@ class SfxStyleSheetBasePool;
 class StyleTreeListBox_Impl;
 class SfxTemplateDialog_Impl;
 class SfxCommonTemplateDialog_Impl;
-
 namespace com::sun::star::frame {
     class XModuleManager2;
 }
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index c24bd5273f52..9d526f9a805d 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -18,11 +18,11 @@
  */
 #pragma once
 
-class SwTextFrame;
-
 #include <swtypes.hxx>
 #include "itrtxt.hxx"
 
+class SwTextFrame;
+
 class SwTextFrameBreak
 {
 private:
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index bfaf2c0745c4..bd0f8ab392c5 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -51,6 +51,10 @@
 #include <swuiidxmrk.hxx>
 #include <tautofmt.hxx>
 #include <wordcountdialog.hxx>
+#include <itabenum.hxx>
+#include <optional>
+#include <o3tl/deleter.hxx>
+
 
 class SwInsertAbstractDlg;
 class SwAsciiFilterDlg;
@@ -71,19 +75,15 @@ class SwRenameXNamedDlg;
 class SwModalRedlineAcceptDlg;
 class SwTOXMark;
 class SwSplitTableDlg;
-
-#include <itabenum.hxx>
-#include <optional>
-#include <o3tl/deleter.hxx>
-
 namespace sw
 {
 class DropDownFieldDialog;
 class DropDownFormFieldDialog;
 class DateFormFieldDialog;
 }
-
 class SwWordCountFloatDlg;
+
+
 class AbstractSwWordCountFloatDlg_Impl : public AbstractSwWordCountFloatDlg
 {
     std::shared_ptr<SwWordCountFloatDlg> m_xDlg;
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 3ec499ff1ee5..ca949068655d 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -20,11 +20,6 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALDISP_HXX
 #define INCLUDED_VCL_INC_UNX_SALDISP_HXX
 
-class   SalDisplay;
-class   SalColormap;
-class   SalVisual;
-class   SalXLib;
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/render.h>
@@ -47,6 +42,12 @@ class   SalXLib;
 
 #include <vclpluginapi.h>
 
+class   SalDisplay;
+class   SalColormap;
+class   SalVisual;
+class   SalXLib;
+
+
 /* From <X11/Intrinsic.h> */
 typedef unsigned long Pixel;
 
diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
index 203ac16a33da..161b9a93619e 100644
--- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
@@ -27,18 +27,17 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <xmlsecuritydllapi.h>
 #include <cppuhelper/implbase.hxx>
+#include <vector>
+#include <memory>
 
 class BufferNode;
 class ElementMark;
 class ElementCollector;
-
-#include <vector>
-#include <memory>
-
 namespace com::sun::star::xml::crypto::sax { class XSAXEventKeeperStatusChangeListener; }
 namespace com::sun::star::xml::csax { class XCompressedDocumentHandler; }
 namespace com::sun::star::xml::wrapper { class XXMLDocumentWrapper; }
 
+
 class SAXEventKeeperImpl final : public cppu::WeakImplHelper
 <
     css::xml::crypto::sax::XSecuritySAXEventKeeper,