diff --git a/src/chartsnamespace.h b/src/chartsnamespace.h
index fcd3488..5434f06 100644
--- a/src/chartsnamespace.h
+++ b/src/chartsnamespace.h
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 #ifndef CHARTSNAMESPACE_H
-#define MACROINCLUDE_H
+#define CHARTSNAMESPACE_H
 
 // this is needed by the designer plugin.
 
diff --git a/src/legend/qlegend.h b/src/legend/qlegend.h
index cace27e..20de5c0 100644
--- a/src/legend/qlegend.h
+++ b/src/legend/qlegend.h
@@ -28,15 +28,12 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-class Domain;
-class LegendMarker;
 class QPieSlice;
 class QXYSeries;
 class QBarSet;
 class QAbstractBarSeries;
 class QPieSeries;
 class QAreaSeries;
-class LegendScrollButton;
 class QChart;
 class QLegendPrivate;
 
diff --git a/src/legend/qlegend_p.h b/src/legend/qlegend_p.h
index 7964b3f..24eb9fe 100644
--- a/src/legend/qlegend_p.h
+++ b/src/legend/qlegend_p.h
@@ -38,6 +38,8 @@ class QChart;
 class ChartPresenter;
 class QAbstractSeries;
 class LegendLayout;
+class LegendMarker;
+class Domain;
 
 class QLegendPrivate : public QObject
 {
diff --git a/src/piechart/qpieseries.h b/src/piechart/qpieseries.h
index f053fa3..8b62be0 100644
--- a/src/piechart/qpieseries.h
+++ b/src/piechart/qpieseries.h
@@ -26,7 +26,6 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class QPieSeriesPrivate;
-//class QPieSlice;
 
 class QTCOMMERCIALCHART_EXPORT QPieSeries : public QAbstractSeries
 {