diff --git a/src/declarativeimports/calendar/calendar.h b/src/declarativeimports/calendar/calendar.h
index 891ff3f16..b6d488baa 100644
--- a/src/declarativeimports/calendar/calendar.h
+++ b/src/declarativeimports/calendar/calendar.h
@@ -118,7 +118,7 @@ public:
         Holiday = 1,
         Event = 2,
         Todo = 4,
-        Journal = 8
+        Journal = 8,
     };
     Q_ENUM(Type)
     Q_DECLARE_FLAGS(Types, Type)
@@ -126,7 +126,7 @@ public:
     enum DateMatchingPrecision {
         MatchYear,
         MatchYearAndMonth,
-        MatchYearMonthAndDay
+        MatchYearMonthAndDay,
     };
     Q_ENUM(DateMatchingPrecision)
 
diff --git a/src/declarativeimports/calendar/calendardata.h b/src/declarativeimports/calendar/calendardata.h
index b606a9a15..5f7ec75f4 100644
--- a/src/declarativeimports/calendar/calendardata.h
+++ b/src/declarativeimports/calendar/calendardata.h
@@ -29,7 +29,7 @@ public:
         Holiday = 1,
         Event = 2,
         Todo = 4,
-        Journal = 8
+        Journal = 8,
     };
     Q_ENUM(Type)
     Q_DECLARE_FLAGS(Types, Type)
diff --git a/src/declarativeimports/calendar/daysmodel.h b/src/declarativeimports/calendar/daysmodel.h
index 568a5445b..8b9646688 100644
--- a/src/declarativeimports/calendar/daysmodel.h
+++ b/src/declarativeimports/calendar/daysmodel.h
@@ -30,7 +30,7 @@ public:
         //containsJournalItems,
         dayNumber,
         monthNumber,
-        yearNumber
+        yearNumber,
     };
 
     explicit DaysModel(QObject *parent = nullptr);
diff --git a/src/declarativeimports/core/datasource.h b/src/declarativeimports/core/datasource.h
index 12ebc0902..e40f4ccbd 100644
--- a/src/declarativeimports/core/datasource.h
+++ b/src/declarativeimports/core/datasource.h
@@ -38,7 +38,7 @@ public:
     enum Change {
         NoChange = 0,
         DataEngineChanged = 1,
-        SourcesChanged = 2
+        SourcesChanged = 2,
     };
     Q_DECLARE_FLAGS(Changes, Change)
 
diff --git a/src/declarativeimports/core/framesvgitem.cpp b/src/declarativeimports/core/framesvgitem.cpp
index 9f9e71fb6..e68658d35 100644
--- a/src/declarativeimports/core/framesvgitem.cpp
+++ b/src/declarativeimports/core/framesvgitem.cpp
@@ -69,7 +69,7 @@ public:
         FastStretch,
         //on resize re-render the part of the frame from the SVG
         Stretch,
-        Tile
+        Tile,
     };
 
     FrameItemNode(FrameSvgItem* frameSvg, FrameSvg::EnabledBorders borders, FitMode fitMode, QSGNode* parent)
diff --git a/src/declarativeimports/plasmacomponents/enums.h b/src/declarativeimports/plasmacomponents/enums.h
index fbdfd18c5..a882aeede 100644
--- a/src/declarativeimports/plasmacomponents/enums.h
+++ b/src/declarativeimports/plasmacomponents/enums.h
@@ -18,7 +18,7 @@ public:
         Opening,
         Open,
         Closing,
-        Closed
+        Closed,
     };
     Q_ENUM(Status)
 };
@@ -33,7 +33,7 @@ public:
         LockPortrait,
         LockLandscape,
         LockPrevious,
-        Manual
+        Manual,
     };
     Q_ENUM(Orientation)
 };
@@ -47,7 +47,7 @@ public:
         Inactive,
         Activating,
         Active,
-        Deactivating
+        Deactivating,
     };
     Q_ENUM(Status)
 };
diff --git a/src/declarativeimports/plasmaextracomponents/qml/PlasmoidHeading.qml b/src/declarativeimports/plasmaextracomponents/qml/PlasmoidHeading.qml
index 9da5acadc..1f5e34b0d 100644
--- a/src/declarativeimports/plasmaextracomponents/qml/PlasmoidHeading.qml
+++ b/src/declarativeimports/plasmaextracomponents/qml/PlasmoidHeading.qml
@@ -29,7 +29,7 @@ import "private" as Private
         /**
          * Indicates that it's used as a footer of the plasmoid, touching the bottom border
          */
-        Footer
+        Footer,
     }
 
     /**
diff --git a/src/plasma/framesvg.h b/src/plasma/framesvg.h
index 94fa4b72d..b5e24c5cd 100644
--- a/src/plasma/framesvg.h
+++ b/src/plasma/framesvg.h
@@ -76,7 +76,7 @@ public:
         BottomBorder = 2,
         LeftBorder = 4,
         RightBorder = 8,
-        AllBorders = TopBorder | BottomBorder | LeftBorder | RightBorder
+        AllBorders = TopBorder | BottomBorder | LeftBorder | RightBorder,
     };
     Q_DECLARE_FLAGS(EnabledBorders, EnabledBorder)
     Q_FLAG(EnabledBorders)
diff --git a/src/plasma/plasma.h b/src/plasma/plasma.h
index daf430e2d..662e492de 100644
--- a/src/plasma/plasma.h
+++ b/src/plasma/plasma.h
@@ -46,7 +46,7 @@ public:
         ContextConstraint = 32, /**< the context (e.g. activity) has changed */
         UiReadyConstraint = 64, /**< The ui has been completely loaded */ // (FIXME: merged with StartupCompletedConstraint?)
         AllConstraints = FormFactorConstraint | LocationConstraint | ScreenConstraint |
-                         ImmutableConstraint
+                         ImmutableConstraint,
     };
     Q_ENUM(Constraint)
     Q_DECLARE_FLAGS(Constraints, Constraint)
@@ -83,7 +83,7 @@ public:
                     can expand horizontally. */
         Vertical,     /**< The applet is constrained horizontally, but
                     can expand vertically. */
-        Application /**< The Applet lives in a plane and should be optimized to look as a full application,
+        Application, /**< The Applet lives in a plane and should be optimized to look as a full application,
                      for the desktop or the particular device. */
     };
     Q_ENUM(FormFactor)
@@ -96,7 +96,7 @@ public:
         NoContainmentDisplayHint = 0,
         ContainmentDrawsPlasmoidHeading = 1, /**< The containment will draw an titlebar-looking header for the applets, so the applets shouldn't attempt to paint a similar thing **/
         ContainmentForcesSquarePlasmoids = 2, /**< The containment will force every plasmoid to be constrained in a square icon (An example is the System Tray)**/
-        DesktopFullyCovered = 4 /**< The desktop area for the contaiment's screen is not visible at all, for instance a window has been maximized on top of it */
+        DesktopFullyCovered = 4, /**< The desktop area for the contaiment's screen is not visible at all, for instance a window has been maximized on top of it */
     };
     Q_ENUM(ContainmentDisplayHint)
     Q_DECLARE_FLAGS(ContainmentDisplayHints, ContainmentDisplayHint)
@@ -115,7 +115,7 @@ public:
         CustomContainment = 127, /**< A containment that is neither a desktop nor a panel
                                 but something application specific */
         CustomPanelContainment = 128, /**< A customized desktop panel */
-        CustomEmbeddedContainment = 129 /**< A customized containment embedded in another applet */
+        CustomEmbeddedContainment = 129, /**< A customized containment embedded in another applet */
     };
     Q_ENUM(ContainmentType)
 
@@ -128,7 +128,7 @@ public:
         ControlAction = 200,  /**< Generic control, similar to ConfigureAction TODO: better doc */
         MiscAction = 300,  /**< A type of action that doesn't fit in the other categories */
         DestructiveAction = 400,  /**< A dangerous action, such as deletion of objects, plasmoids and files. They are intended to be shown separated from other actions */
-        UserAction = DestructiveAction + 1000 /**< If new types are needed in a C++ implementation, define them as ids more than  UserAction*/
+        UserAction = DestructiveAction + 1000, /**< If new types are needed in a C++ implementation, define them as ids more than  UserAction*/
     };
     Q_ENUM(ActionType)
 
@@ -142,7 +142,7 @@ public:
         Down = 0, /**< Display downards */
         Up,       /**< Display upwards */
         Left,     /**< Display to the left */
-        Right     /**< Display to the right */
+        Right,     /**< Display to the right */
     };
     Q_ENUM(Direction)
 
@@ -159,7 +159,7 @@ public:
         TopEdge,      /**< Along the top of the screen*/
         BottomEdge,   /**< Along the bottom of the screen*/
         LeftEdge,     /**< Along the left side of the screen */
-        RightEdge     /**< Along the right side of the screen */
+        RightEdge,     /**< Along the right side of the screen */
     };
     Q_ENUM(Location)
 
@@ -172,7 +172,7 @@ public:
         RightPositioned,   /**< Positioned right */
         TopPositioned,     /**< Positioned top */
         BottomPositioned,  /**< Positioned bottom */
-        CenterPositioned   /**< Positioned in the center */
+        CenterPositioned,   /**< Positioned in the center */
     };
     Q_ENUM(Position)
 
@@ -196,7 +196,7 @@ public:
                                      to the right of the widget */
         RightPosedTopAlignedPopup,    /**< Popup positioned on the right, aligned
                                      to the top of the widget */
-        RightPosedBottomAlignedPopup  /**< Popup positioned on the right, aligned
+        RightPosedBottomAlignedPopup,  /**< Popup positioned on the right, aligned
                                      to the bottom of the widget */
     };
     Q_ENUM(PopupPlacement)
@@ -207,7 +207,7 @@ public:
     enum FlipDirection {
         NoFlip = 0,          /**< Do not flip */
         HorizontalFlip = 1,  /**< Flip horizontally */
-        VerticalFlip = 2     /**< Flip vertically */
+        VerticalFlip = 2,     /**< Flip vertically */
     };
     Q_ENUM(FlipDirection)
     Q_DECLARE_FLAGS(Flip, FlipDirection)
@@ -218,7 +218,7 @@ public:
     enum IntervalAlignment {
         NoAlignment = 0, /**< No alignment **/
         AlignToMinute, /**< Align to the minute **/
-        AlignToHour /**< Align to the hour **/
+        AlignToHour, /**< Align to the hour **/
     };
     Q_ENUM(IntervalAlignment)
 
@@ -231,7 +231,7 @@ public:
         Mutable = 1,        /**< The item can be modified in any way **/
         UserImmutable = 2,  /**< The user has requested a lock down, and can undo
                            the lock down at any time **/
-        SystemImmutable = 4 /**<  the item is locked down by the system, the user
+        SystemImmutable = 4, /**<  the item is locked down by the system, the user
                            can't unlock it **/
     };
     Q_ENUM(ImmutabilityType)
@@ -245,7 +245,7 @@ public:
         DataEngineComponent = 2,  /**< Plasma::DataEngine based plugins **/
         ContainmentComponent = 4,/**< Plasma::Containment based plugins **/
         WallpaperComponent = 8,   /**< Plasma::Wallpaper based plugins **/
-        GenericComponent = 16      /** Generic repositories of files, usually they keep QML files and their assets **/
+        GenericComponent = 16,      /** Generic repositories of files, usually they keep QML files and their assets **/
     };
     Q_ENUM(ComponentType)
     Q_DECLARE_FLAGS(ComponentTypes, ComponentType)
@@ -254,7 +254,7 @@ public:
         TopMargin = 0, /**< The top margin **/
         BottomMargin, /**< The bottom margin **/
         LeftMargin, /**< The left margin **/
-        RightMargin /**< The right margin **/
+        RightMargin, /**< The right margin **/
     };
     Q_ENUM(MarginEdge)
 
@@ -270,7 +270,7 @@ public:
         RequiresAttentionStatus = 4, /**< The Item needs persistent attention **/
         AcceptingInputStatus = 5, /**< The Item is accepting input **/
         //FIXME KF6: this should be the smallest status
-        HiddenStatus = 6    /**< The Item will be hidden totally  **/
+        HiddenStatus = 6,    /**< The Item will be hidden totally  **/
     };
     Q_ENUM(ItemStatus)
 
@@ -283,7 +283,7 @@ public:
                                      user's own keys*/
         SelfTrusted,                /**< The signature is valid and made with one of the user's own keys*/
         FullyTrusted,               /**< The signature is valid and made with a key signed by the vendor's key*/
-        UltimatelyTrusted           /**< The signature is valid and made with the vendor's key*/
+        UltimatelyTrusted,           /**< The signature is valid and made with the vendor's key*/
     };
     Q_ENUM(TrustLevel)
 
@@ -296,7 +296,7 @@ public:
         TranslucentBackground = 2, /**< An alternate version of the background is drawn, usually more translucent */
         ShadowBackground = 4, /**< The applet won't have a svg background but a drop shadow of its content done via a shader */
         ConfigurableBackground = 8, /** If the hint has this flag, the user is able to configure this background */
-        DefaultBackground = StandardBackground /**< Default settings: both standard background */
+        DefaultBackground = StandardBackground, /**< Default settings: both standard background */
     };
     Q_ENUM(BackgroundHints)
     //TODO KF6: BackgroundHint and BackgroundHints
diff --git a/src/plasma/private/framesvg_p.h b/src/plasma/private/framesvg_p.h
index 083918290..dc0e509d3 100644
--- a/src/plasma/private/framesvg_p.h
+++ b/src/plasma/private/framesvg_p.h
@@ -142,7 +142,7 @@ public:
 
     enum UpdateType {
         UpdateFrame,
-        UpdateFrameAndMargins
+        UpdateFrameAndMargins,
     };
 
     void generateBackground(const QSharedPointer<FrameData> &frame);
diff --git a/src/plasma/private/theme_p.h b/src/plasma/private/theme_p.h
index a419ee658..3cf46fde6 100644
--- a/src/plasma/private/theme_p.h
+++ b/src/plasma/private/theme_p.h
@@ -41,7 +41,7 @@ static const int DEFAULT_WALLPAPER_HEIGHT = 1200;
 enum CacheType {
     NoCache = 0,
     PixmapCache = 1,
-    SvgElementsCache = 2
+    SvgElementsCache = 2,
 };
 Q_DECLARE_FLAGS(CacheTypes, CacheType)
 Q_DECLARE_OPERATORS_FOR_FLAGS(CacheTypes)
diff --git a/src/plasma/svg.h b/src/plasma/svg.h
index c5dbbea39..5e63febb2 100644
--- a/src/plasma/svg.h
+++ b/src/plasma/svg.h
@@ -54,7 +54,7 @@ class PLASMA_EXPORT Svg : public QObject
 public:
     enum Status {
         Normal = 0,
-        Selected
+        Selected,
     };
     Q_ENUM(Status)
 
diff --git a/src/plasma/theme.h b/src/plasma/theme.h
index c8a40a071..0dc5d51fa 100644
--- a/src/plasma/theme.h
+++ b/src/plasma/theme.h
@@ -70,7 +70,7 @@ public:
         PositiveTextColor = 8, /**< color of foreground objects with a "positive message" connotation (usually green) */
         NeutralTextColor = 9, /**< color of foreground objects with a "neutral message" connotation (usually yellow) */
         NegativeTextColor = 10, /**< color of foreground objects with a "negative message" connotation (usually red) */
-        DisabledTextColor = 11 /**< color of disabled text @since 5.64 */
+        DisabledTextColor = 11, /**< color of disabled text @since 5.64 */
     };
 
     enum ColorGroup {
@@ -79,7 +79,7 @@ public:
         ViewColorGroup = 2,
         ComplementaryColorGroup = 3,
         HeaderColorGroup,
-        ToolTipColorGroup
+        ToolTipColorGroup,
     };
     Q_ENUM(ColorGroup)
 
diff --git a/src/plasmaquick/configmodel.h b/src/plasmaquick/configmodel.h
index c2e7fd6f0..29602d116 100644
--- a/src/plasmaquick/configmodel.h
+++ b/src/plasmaquick/configmodel.h
@@ -58,7 +58,7 @@ public:
         SourceRole,
         PluginNameRole,
         VisibleRole,
-        KCMRole
+        KCMRole,
     };
     explicit ConfigModel(QObject *parent = nullptr);
     ~ConfigModel() override;
diff --git a/src/plasmaquick/dialog.h b/src/plasmaquick/dialog.h
index 5f03cd7a6..573cbd32b 100644
--- a/src/plasmaquick/dialog.h
+++ b/src/plasmaquick/dialog.h
@@ -153,7 +153,7 @@ public:
         Tooltip = NET::Tooltip,
         Notification = NET::Notification,
         OnScreenDisplay = NET::OnScreenDisplay,
-        CriticalNotification = NET::CriticalNotification
+        CriticalNotification = NET::CriticalNotification,
     };
     Q_ENUM(WindowType)
 
diff --git a/src/plasmaquick/private/appletquickitem_p.h b/src/plasmaquick/private/appletquickitem_p.h
index 7acda9d9c..8b8ecadcc 100644
--- a/src/plasmaquick/private/appletquickitem_p.h
+++ b/src/plasmaquick/private/appletquickitem_p.h
@@ -48,14 +48,14 @@ public:
         DefaultLauncherPreloadWeight = 100,
         DelayedPreloadWeight = 25,
         PreloadWeightIncrement = 5,
-        PreloadWeightDecrement = 8
+        PreloadWeightDecrement = 8,
     };
 
     enum PreloadPolicy {
         Uninitialized = -1,
         None = 0,
         Adaptive = 1,
-        Aggressive = 2
+        Aggressive = 2,
     };
 
     AppletQuickItemPrivate(Plasma::Applet *a, AppletQuickItem *item);