diff --git a/src/libs/qmljs/qmljscodeformatter.h b/src/libs/qmljs/qmljscodeformatter.h
index 878b458f302..c91b36ba27f 100644
--- a/src/libs/qmljs/qmljscodeformatter.h
+++ b/src/libs/qmljs/qmljscodeformatter.h
@@ -176,7 +176,7 @@ public: // must be public to make Q_GADGET introspection work
         case_start, // after a 'case' or 'default' token
         case_cont // after the colon in a case/default
     };
-    Q_ENUMS(StateType)
+    Q_ENUM(StateType)
 
 protected:
     // extends Token::Kind from qmljsscanner.h
diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h
index a7b7f4d7917..000953107cd 100644
--- a/src/libs/utils/detailswidget.h
+++ b/src/libs/utils/detailswidget.h
@@ -44,7 +44,6 @@ class QTCREATOR_UTILS_EXPORT DetailsWidget : public QWidget
     Q_PROPERTY(bool useCheckBox READ useCheckBox WRITE setUseCheckBox DESIGNABLE true)
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked DESIGNABLE true)
     Q_PROPERTY(State state READ state WRITE setState)
-    Q_ENUMS(State)
 
 public:
     enum State {
@@ -53,6 +52,7 @@ public:
         NoSummary,
         OnlySummary
     };
+    Q_ENUM(State)
 
     explicit DetailsWidget(QWidget *parent = nullptr);
     ~DetailsWidget() override;
diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h
index f8f626af60a..13127f08823 100644
--- a/src/libs/utils/fancylineedit.h
+++ b/src/libs/utils/fancylineedit.h
@@ -71,10 +71,9 @@ private:
 class QTCREATOR_UTILS_EXPORT FancyLineEdit : public CompletingLineEdit
 {
     Q_OBJECT
-    Q_ENUMS(Side)
-
 public:
     enum Side {Left = 0, Right = 1};
+    Q_ENUM(Side)
 
     explicit FancyLineEdit(QWidget *parent = nullptr);
     ~FancyLineEdit() override;
diff --git a/src/libs/utils/icon.cpp b/src/libs/utils/icon.cpp
index ff5b5d12b47..63a5e6ac3f7 100644
--- a/src/libs/utils/icon.cpp
+++ b/src/libs/utils/icon.cpp
@@ -32,7 +32,6 @@
 #include <QApplication>
 #include <QIcon>
 #include <QImage>
-#include <QMetaEnum>
 #include <QPainter>
 #include <QPaintEngine>
 #include <QWidget>
diff --git a/src/libs/utils/parameteraction.h b/src/libs/utils/parameteraction.h
index 627d40fb5fc..196fa7b61c0 100644
--- a/src/libs/utils/parameteraction.h
+++ b/src/libs/utils/parameteraction.h
@@ -33,13 +33,13 @@ namespace Utils {
 
 class QTCREATOR_UTILS_EXPORT ParameterAction : public QAction
 {
-    Q_ENUMS(EnablingMode)
     Q_PROPERTY(QString emptyText READ emptyText WRITE setEmptyText)
     Q_PROPERTY(QString parameterText READ parameterText WRITE setParameterText)
     Q_PROPERTY(EnablingMode enablingMode READ enablingMode WRITE setEnablingMode)
     Q_OBJECT
 public:
     enum EnablingMode { AlwaysEnabled, EnabledWithParameter };
+    Q_ENUM(EnablingMode)
 
     explicit ParameterAction(const QString &emptyText,
                              const QString &parameterText,
diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index 75625691808..2b00bb3ba4e 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -46,7 +46,6 @@ class PathChooserPrivate;
 class QTCREATOR_UTILS_EXPORT PathChooser : public QWidget
 {
     Q_OBJECT
-    Q_ENUMS(Kind)
     Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged DESIGNABLE true)
     Q_PROPERTY(QString promptDialogTitle READ promptDialogTitle WRITE setPromptDialogTitle DESIGNABLE true)
     Q_PROPERTY(QString promptDialogFilter READ promptDialogFilter WRITE setPromptDialogFilter DESIGNABLE true)
@@ -72,6 +71,7 @@ public:
         Command, // A command that may or may not exist at the time of selection (e.g. result of a build)
         Any
     };
+    Q_ENUM(Kind)
 
     // Default is <Directory>
     void setExpectedKind(Kind expected);
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
index d0c1f869db5..fa66980126b 100644
--- a/src/libs/utils/theme/theme.h
+++ b/src/libs/utils/theme/theme.h
@@ -40,13 +40,6 @@ class ThemePrivate;
 class QTCREATOR_UTILS_EXPORT Theme : public QObject
 {
     Q_OBJECT
-
-    Q_ENUMS(Color)
-    Q_ENUMS(ImageFile)
-    Q_ENUMS(Gradient)
-    Q_ENUMS(Flag)
-    Q_ENUMS(WidgetStyle)
-
 public:
     Theme(const QString &id, QObject *parent = nullptr);
     ~Theme() override;
@@ -381,6 +374,11 @@ public:
         DarkUserInterface
     };
 
+    Q_ENUM(Color)
+    Q_ENUM(ImageFile)
+    Q_ENUM(Gradient)
+    Q_ENUM(Flag)
+
     Q_INVOKABLE bool flag(Flag f) const;
     Q_INVOKABLE QColor color(Color role) const;
     QString imageFile(ImageFile imageFile, const QString &fallBack) const;
diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h
index 3b52923f2fa..b120d8b493b 100644
--- a/src/plugins/coreplugin/iversioncontrol.h
+++ b/src/plugins/coreplugin/iversioncontrol.h
@@ -45,7 +45,6 @@ class ShellCommand;
 class CORE_EXPORT IVersionControl : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(SettingsFlag Operation)
 public:
     enum SettingsFlag {
         AutoOpen = 0x1
@@ -59,6 +58,8 @@ public:
         AnnotateOperation,
         InitialCheckoutOperation
     };
+    Q_ENUM(SettingsFlag)
+    Q_ENUM(Operation)
 
     enum OpenSupportMode {
         NoOpen,        /*!< Files can be edited without noticing the VCS */
diff --git a/src/plugins/coreplugin/iwelcomepage.cpp b/src/plugins/coreplugin/iwelcomepage.cpp
index e305bbe7d5f..20f1c2194d6 100644
--- a/src/plugins/coreplugin/iwelcomepage.cpp
+++ b/src/plugins/coreplugin/iwelcomepage.cpp
@@ -32,7 +32,6 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QMetaEnum>
 #include <QPainter>
 #include <QPixmap>
 #include <QUrl>
diff --git a/src/plugins/designer/cpp/newclasswidget.h b/src/plugins/designer/cpp/newclasswidget.h
index 112c2cefb29..69ff987063e 100644
--- a/src/plugins/designer/cpp/newclasswidget.h
+++ b/src/plugins/designer/cpp/newclasswidget.h
@@ -35,8 +35,6 @@ struct NewClassWidgetPrivate;
 class NewClassWidget : public QWidget
 {
     Q_OBJECT
-    Q_ENUMS(ClassType)
-
 public:
     enum ClassType { NoClassType,
                      ClassInheritsQObject,
@@ -45,6 +43,7 @@ public:
                      ClassInheritsQQuickItem,
                      SharedDataClass
                    };
+    Q_ENUM(ClassType)
     explicit NewClassWidget(QWidget *parent = nullptr);
     ~NewClassWidget() override;
 
diff --git a/src/plugins/perfprofiler/perfprofilerflamegraphmodel.h b/src/plugins/perfprofiler/perfprofilerflamegraphmodel.h
index c5a42b53544..e794f79be79 100644
--- a/src/plugins/perfprofiler/perfprofilerflamegraphmodel.h
+++ b/src/plugins/perfprofiler/perfprofilerflamegraphmodel.h
@@ -39,7 +39,6 @@ class PerfProfilerFlameGraphModel : public QAbstractItemModel
 {
     Q_OBJECT
     Q_DISABLE_COPY(PerfProfilerFlameGraphModel);
-    Q_ENUMS(Role)
 public:
     PerfProfilerFlameGraphModel(PerfProfilerFlameGraphModel &&) = delete;
     PerfProfilerFlameGraphModel &operator=(PerfProfilerFlameGraphModel &&) = delete;
@@ -61,6 +60,7 @@ public:
         ResourcePeakRole,
         MaxRole
     };
+    Q_ENUM(Role)
 
     struct Data {
         Data *parent = nullptr;
diff --git a/src/plugins/qmldesigner/components/componentcore/theme.h b/src/plugins/qmldesigner/components/componentcore/theme.h
index 4db7db24835..e2d26720add 100644
--- a/src/plugins/qmldesigner/components/componentcore/theme.h
+++ b/src/plugins/qmldesigner/components/componentcore/theme.h
@@ -41,9 +41,6 @@ namespace QmlDesigner {
 class QMLDESIGNERCORE_EXPORT Theme : public Utils::Theme
 {
     Q_OBJECT
-
-    Q_ENUMS(Icon)
-
 public:
     enum Icon {
         actionIcon,
@@ -146,6 +143,7 @@ public:
         zoomOut,
         zoomSelection
     };
+    Q_ENUM(Icon)
 
     static Theme *instance();
     static QString replaceCssColors(const QString &input);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
index 0bd562add20..8cdcc73bcd0 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
@@ -74,14 +74,13 @@ class QmlAnchorBindingProxy : public QObject
 
     Q_PROPERTY(QStringList possibleTargetItems READ possibleTargetItems NOTIFY itemNodeChanged)
 
-    Q_ENUMS(RelativeAnchorTarget)
-
 public:
     enum RelativeAnchorTarget {
         SameEdge = 0,
         Center = 1,
         OppositeEdge = 2
     };
+    Q_ENUM(RelativeAnchorTarget)
 
     //only enable if node has parent
 
diff --git a/src/plugins/qmlprofiler/flamegraphmodel.h b/src/plugins/qmlprofiler/flamegraphmodel.h
index a5549c934d6..456502b9322 100644
--- a/src/plugins/qmlprofiler/flamegraphmodel.h
+++ b/src/plugins/qmlprofiler/flamegraphmodel.h
@@ -55,7 +55,6 @@ struct FlameGraphData {
 class FlameGraphModel : public QAbstractItemModel
 {
     Q_OBJECT
-    Q_ENUMS(Role)
 public:
     enum Role {
         TypeIdRole = Qt::UserRole + 1, // Sort by data, not by displayed string
@@ -74,6 +73,7 @@ public:
         MemoryRole,
         MaxRole
     };
+    Q_ENUM(Role)
 
     FlameGraphModel(QmlProfilerModelManager *modelManager, QObject *parent = nullptr);
 
diff --git a/src/plugins/texteditor/colorscheme.cpp b/src/plugins/texteditor/colorscheme.cpp
index 80733e7ee1e..d032f3e37b0 100644
--- a/src/plugins/texteditor/colorscheme.cpp
+++ b/src/plugins/texteditor/colorscheme.cpp
@@ -31,7 +31,6 @@
 
 #include <QFile>
 #include <QCoreApplication>
-#include <QMetaEnum>
 #include <QXmlStreamWriter>
 
 using namespace TextEditor;
diff --git a/src/plugins/updateinfo/updateinfoplugin.h b/src/plugins/updateinfo/updateinfoplugin.h
index 4140107f3ea..98c2b9904d6 100644
--- a/src/plugins/updateinfo/updateinfoplugin.h
+++ b/src/plugins/updateinfo/updateinfoplugin.h
@@ -41,13 +41,13 @@ class UpdateInfoPlugin final : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "UpdateInfo.json")
-    Q_ENUMS(CheckUpdateInterval)
 public:
     enum CheckUpdateInterval {
         DailyCheck,
         WeeklyCheck,
         MonthlyCheck
     };
+    Q_ENUM(CheckUpdateInterval)
 
     UpdateInfoPlugin();
     ~UpdateInfoPlugin() override;
diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.h b/src/plugins/valgrind/callgrind/callgrindcontroller.h
index 2a5fd8d7624..090d34290a3 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.h
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.h
@@ -38,8 +38,6 @@ namespace Callgrind {
 class CallgrindController : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(Option)
-
 public:
     enum Option {
         Unknown,
@@ -48,6 +46,7 @@ public:
         Pause,
         UnPause
     };
+    Q_ENUM(Option)
 
     CallgrindController();
     ~CallgrindController() override;