4 files changed, 9 insertions, 3 deletions
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index 8ddb138a..60804e8f 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -30,6 +30,7 @@ public:
         DrawSurface = 2,
         DrawSurfaceAndWireframe = DrawWireframe | DrawSurface
     };
+    Q_ENUM(DrawFlag)
     Q_DECLARE_FLAGS(DrawFlags, DrawFlag)
 
     explicit QSurface3DSeries(QObject *parent = nullptr);
@@ -80,6 +81,8 @@ private:
     friend class Surface3DController;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QSurface3DSeries::DrawFlags)
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index 9346c421..f3d8ecaa 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -22,8 +22,6 @@ class QAbstract3DSeries;
 class Q_DATAVISUALIZATION_EXPORT QAbstract3DGraph : public QWindow, protected QOpenGLFunctions
 {
     Q_OBJECT
-    Q_ENUMS(ShadowQuality)
-    Q_ENUMS(ElementType)
     Q_FLAGS(SelectionFlag SelectionFlags)
     Q_FLAGS(OptimizationHint OptimizationHints)
     Q_PROPERTY(QAbstract3DInputHandler* activeInputHandler READ activeInputHandler WRITE setActiveInputHandler NOTIFY activeInputHandlerChanged)
@@ -63,6 +61,7 @@ public:
         SelectionSlice             = 8,
         SelectionMultiSeries       = 16
     };
+    Q_ENUM(SelectionFlag)
     Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag)
 
     enum ShadowQuality {
@@ -74,6 +73,7 @@ public:
         ShadowQualitySoftMedium,
         ShadowQualitySoftHigh
     };
+    Q_ENUM(ShadowQuality)
 
     enum ElementType {
         ElementNone = 0,
@@ -83,11 +83,13 @@ public:
         ElementAxisZLabel,
         ElementCustomItem
     };
+    Q_ENUM(ElementType)
 
     enum OptimizationHint {
         OptimizationDefault = 0,
         OptimizationStatic  = 1
     };
+    Q_ENUM(OptimizationHint)
     Q_DECLARE_FLAGS(OptimizationHints, OptimizationHint)
 
 public:
diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h
index e7c7fb41..7a2b7241 100644
--- a/src/datavisualization/utils/surfaceobject_p.h
+++ b/src/datavisualization/utils/surfaceobject_p.h
@@ -14,7 +14,6 @@
 #ifndef SURFACEOBJECT_P_H
 #define SURFACEOBJECT_P_H
 
-#include "datavisualizationglobal_p.h"
 #include "abstractobjecthelper_p.h"
 #include "qsurfacedataproxy.h"
 
diff --git a/src/datavisualizationqml/abstractdeclarative_p.h b/src/datavisualizationqml/abstractdeclarative_p.h
index f7b7e4cd..090738c5 100644
--- a/src/datavisualizationqml/abstractdeclarative_p.h
+++ b/src/datavisualizationqml/abstractdeclarative_p.h
@@ -110,6 +110,8 @@ public:
     Q_ENUM(ShadowQuality)
     Q_ENUM(RenderingMode)
     Q_ENUM(ElementType)
+    Q_ENUM(SelectionFlag)
+    Q_ENUM(OptimizationHint)
     Q_FLAGS(SelectionFlag SelectionFlags)
     Q_FLAGS(OptimizationHint OptimizationHints)