diff --git a/python/core/qgsdiagramrenderer.sip b/python/core/qgsdiagramrenderer.sip
index 24e13120d00..47a0be4d661 100644
--- a/python/core/qgsdiagramrenderer.sip
+++ b/python/core/qgsdiagramrenderer.sip
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsDiagramLayerSettings
 {
 %Docstring
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
index dd81aa99c80..e2a7c982d2e 100755
--- a/scripts/sipify.pl
+++ b/scripts/sipify.pl
@@ -757,8 +757,8 @@ while ($LINE_IDX < $LINE_COUNT){
     if ( $LINE =~ m/^(\s*)Q_DECLARE_FLAGS\(\s*(.*?)\s*,\s*(.*?)\s*\)\s*$/ ){
         my $ACTUAL_CLASS = $CLASSNAME[$#CLASSNAME];
         dbg_info("Declare flags: $ACTUAL_CLASS");
-        $LINE = "$1typedef QFlags<$ACTUAL_CLASS::$3> $2;\n";
-        $QFLAG_HASH{"$ACTUAL_CLASS::$2"} = "$ACTUAL_CLASS::$3";
+        $LINE = "$1typedef QFlags<${ACTUAL_CLASS}::$3> $2;\n";
+        $QFLAG_HASH{"${ACTUAL_CLASS}::$2"} = "${ACTUAL_CLASS}::$3";
     }
     # catch Q_DECLARE_OPERATORS_FOR_FLAGS
     if ( $LINE =~ m/^(\s*)Q_DECLARE_OPERATORS_FOR_FLAGS\(\s*(.*?)\s*\)\s*$/ ){
diff --git a/src/core/qgsdiagramrenderer.h b/src/core/qgsdiagramrenderer.h
index 151492ecafa..a8115820e0b 100644
--- a/src/core/qgsdiagramrenderer.h
+++ b/src/core/qgsdiagramrenderer.h
@@ -32,7 +32,8 @@
 #include "qgspropertycollection.h"
 #include "qgsdatadefinedsizelegend.h"
 
-class QgsDiagram;
+#include "diagram/qgsdiagram.h"
+
 class QgsDiagramRenderer;
 class QgsFeature;
 class QgsRenderContext;