diff --git a/demos/chartthemes/themewidget.h b/demos/chartthemes/themewidget.h
index 9f83911..41af4bf 100644
--- a/demos/chartthemes/themewidget.h
+++ b/demos/chartthemes/themewidget.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef THEMEWINDOW_H_
-#define THEMEWINDOW_H_
+#ifndef THEMEWINDOW_H
+#define THEMEWINDOW_H
 #include <QWidget>
 #include <QChartGlobal>
 
@@ -73,4 +73,4 @@ private:
     QComboBox *m_legendComboBox;
 };
 
-#endif /* THEMEWINDOW_H_ */
+#endif /* THEMEWINDOW_H */
diff --git a/demos/chartviewer/model.h b/demos/chartviewer/model.h
index fcbe0eb..3fb7700 100644
--- a/demos/chartviewer/model.h
+++ b/demos/chartviewer/model.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef MODEL_H_
-#define MODEL_H_
+#ifndef MODEL_H
+#define MODEL_H
 
 #include <QList>
 #include <QPair>
diff --git a/demos/chartviewer/view.h b/demos/chartviewer/view.h
index 668523a..7bc11ea 100644
--- a/demos/chartviewer/view.h
+++ b/demos/chartviewer/view.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef VIEW_H_
-#define VIEW_H_
+#ifndef VIEW_H
+#define VIEW_H
 #include <QGraphicsView>
 
 class QGraphicsScene;
diff --git a/demos/chartviewer/window.h b/demos/chartviewer/window.h
index 5e94df5..74f96c2 100644
--- a/demos/chartviewer/window.h
+++ b/demos/chartviewer/window.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef WINDOW_H_
-#define WINDOW_H_
+#ifndef WINDOW_H
+#define WINDOW_H
 #include "model.h"
 #include <QMainWindow>
 #include <QChartGlobal>
diff --git a/demos/dynamicspline/chart.h b/demos/dynamicspline/chart.h
index e3c8993..92729ed 100644
--- a/demos/dynamicspline/chart.h
+++ b/demos/dynamicspline/chart.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef CHART_H_
-#define CHART_H_
+#ifndef CHART_H
+#define CHART_H
 
 #include <QChart>
 #include <QTimer>
@@ -53,4 +53,4 @@ private:
 };
 //![1]
 
-#endif /* CHART_H_ */
+#endif /* CHART_H */
diff --git a/examples/presenterchart/chartview.h b/examples/presenterchart/chartview.h
index 67b53b5..557532b 100644
--- a/examples/presenterchart/chartview.h
+++ b/examples/presenterchart/chartview.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef CHARTVIEW_H_
-#define CHARTVIEW_H_
+#ifndef CHARTVIEW_H
+#define CHARTVIEW_H
 
 #include <QChartView>
 #include <QTimer>
@@ -46,4 +46,4 @@ private:
 };
 //![1]
 
-#endif /* CHARTVIEW_H_ */
+#endif /* CHARTVIEW_H */
diff --git a/plugins/designer/qchartsplugin.h b/plugins/designer/qchartsplugin.h
index ef0ada7..c537c18 100644
--- a/plugins/designer/qchartsplugin.h
+++ b/plugins/designer/qchartsplugin.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef QCHARTSPLUGIN_H_
-#define QCHARTSPLUGIN_H_
+#ifndef QCHARTSPLUGIN_H
+#define QCHARTSPLUGIN_H
 
 #include <QDesignerCustomWidgetInterface>
 
@@ -41,4 +41,4 @@ public:
     QWidget *createWidget(QWidget *parent);
 };
 
-#endif /* QCHARTSPLUGIN_H_ */
+#endif /* QCHARTSPLUGIN_H */
diff --git a/src/animations/axisanimation_p.h b/src/animations/axisanimation_p.h
index 04fb25e..3826ca1 100644
--- a/src/animations/axisanimation_p.h
+++ b/src/animations/axisanimation_p.h
@@ -59,4 +59,4 @@ QTCOMMERCIALCHART_END_NAMESPACE
 
 
 
-#endif /* AXISITEM_H_ */
+#endif /* AXISANIMATION_H */
diff --git a/src/animations/chartanimation_p.h b/src/animations/chartanimation_p.h
index 6962f01..4e52fae 100644
--- a/src/animations/chartanimation_p.h
+++ b/src/animations/chartanimation_p.h
@@ -46,6 +46,4 @@ public:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-
-
-#endif /* AXISITEM_H_ */
+#endif /* CHARTANIMATION_H */
diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h b/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
index 8bca232..377d4d5 100644
--- a/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
+++ b/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef CHARTCATEGORIESAXISX_H
-#define CHARTCATEGORIESAXISX_H
+#ifndef CHARTBARCATEGORYAXISX_H
+#define CHARTBARCATEGORYAXISX_H
 
 #include "chartaxis_p.h"
 
@@ -61,4 +61,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* CHARTCATEGORIESAXISX_H */
+#endif /* CHARTBARCATEGORYAXISX_H */
diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h b/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
index 4ac4dba..1db8aef 100644
--- a/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
+++ b/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef CHARTCATEGORIESAXISY_H
-#define CHARTCATEGORIESAXISY_H
+#ifndef CHARTBARCATEGORYAXISY_H
+#define CHARTBARCATEGORYAXISY_H
 
 #include "chartaxis_p.h"
 
@@ -60,4 +60,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* CHARTCATEGORIESAXISY_H */
+#endif /* CHARTBARCATEGORYAXISY_H */
diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
index b61d069..e70fe3a 100644
--- a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
+++ b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
@@ -199,7 +199,7 @@ void QBarCategoryAxis::remove(const QString &category)
         if(!d->m_categories.isEmpty())
             setRange(d->m_categories.first(),d->m_categories.last());
         else
-            setRange(QString::null,QString::null);
+            setRange(QString(),QString());
         emit categoriesChanged();
     }
 }
@@ -242,7 +242,7 @@ void QBarCategoryAxis::clear()
 {
     Q_D(QBarCategoryAxis);
     d->m_categories.clear();
-    setRange(QString::null,QString::null);
+    setRange(QString(),QString());
     emit categoriesChanged();
 }
 
diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.h b/src/axis/barcategoryaxis/qbarcategoryaxis.h
index 2a4e507..e1c8e0f 100644
--- a/src/axis/barcategoryaxis/qbarcategoryaxis.h
+++ b/src/axis/barcategoryaxis/qbarcategoryaxis.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef QBARCATEGORIESAXIS_H
-#define QBARCATEGORIESAXIS_H
+#ifndef QBARCATEGORYAXIS_H
+#define QBARCATEGORYAXIS_H
 
 #include "qabstractaxis.h"
 
@@ -76,4 +76,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // QCATEGORIESAXIS_H
+#endif // QBARCATEGORYAXIS_H
diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis_p.h b/src/axis/barcategoryaxis/qbarcategoryaxis_p.h
index a6c87d7..a8bbc38 100644
--- a/src/axis/barcategoryaxis/qbarcategoryaxis_p.h
+++ b/src/axis/barcategoryaxis/qbarcategoryaxis_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef QBARCATEGORIESAXIS_P_H
-#define QBARCATEGORIESAXIS_P_H
+#ifndef QBARCATEGORYAXIS_P_H
+#define QBARCATEGORYAXIS_P_H
 
 #include "qbarcategoryaxis.h"
 #include "qabstractaxis_p.h"
@@ -73,4 +73,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // QBARCATEGORIESAXIS_P_H
+#endif // QBARCATEGORYAXIS_P_H
diff --git a/src/axis/categoryaxis/chartcategoryaxisx_p.h b/src/axis/categoryaxis/chartcategoryaxisx_p.h
index a3ff02b..60191f4 100644
--- a/src/axis/categoryaxis/chartcategoryaxisx_p.h
+++ b/src/axis/categoryaxis/chartcategoryaxisx_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef CHARTINTERVALAXISX_H
-#define CHARTINTERVALAXISX_H
+#ifndef CHARTCATEGORYAXISX_H
+#define CHARTCATEGORYAXISX_H
 
 #include "chartaxis_p.h"
 
@@ -55,4 +55,4 @@ protected:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* CHARTINTERVALAXISX_H */
+#endif /* CHARTCATEGORYAXISX_H */
diff --git a/src/axis/categoryaxis/chartcategoryaxisy_p.h b/src/axis/categoryaxis/chartcategoryaxisy_p.h
index 66c466b..9c3186c 100644
--- a/src/axis/categoryaxis/chartcategoryaxisy_p.h
+++ b/src/axis/categoryaxis/chartcategoryaxisy_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef CHARTINTERVALAXISY_H
-#define CHARTINTERVALAXISY_H
+#ifndef CHARTCATEGORYAXISY_H
+#define CHARTCATEGORYAXISY_H
 
 #include "chartaxis_p.h"
 
@@ -55,4 +55,4 @@ Q_SLOTS
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* CHARTINTERVALAXISY_H */
+#endif /* CHARTCATEGORYAXISY_H */
diff --git a/src/axis/categoryaxis/qcategoryaxis.cpp b/src/axis/categoryaxis/qcategoryaxis.cpp
index e544ff8..5fc5a3b 100644
--- a/src/axis/categoryaxis/qcategoryaxis.cpp
+++ b/src/axis/categoryaxis/qcategoryaxis.cpp
@@ -156,7 +156,7 @@ void QCategoryAxis::setStartValue(qreal min)
 qreal QCategoryAxis::startValue(const QString& categoryLabel) const
 {
     Q_D(const QCategoryAxis);
-    if (categoryLabel == QString())
+    if (categoryLabel.isEmpty())
         return d->m_categoryMinimum;
     else
         return d->m_categoriesMap.value(categoryLabel).first;
diff --git a/src/axis/categoryaxis/qcategoryaxis.h b/src/axis/categoryaxis/qcategoryaxis.h
index d676666..28ea4ba 100644
--- a/src/axis/categoryaxis/qcategoryaxis.h
+++ b/src/axis/categoryaxis/qcategoryaxis.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef QCATEGORIESAXIS_H
-#define QCATEGORIESAXIS_H
+#ifndef QCATEGORYAXIS_H
+#define QCATEGORYAXIS_H
 
 #include "qabstractaxis.h"
 #include "qvalueaxis.h"
@@ -62,4 +62,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // QCATEGORIESAXIS_H
+#endif // QCATEGORYAXIS_H
diff --git a/src/axis/chartaxis_p.h b/src/axis/chartaxis_p.h
index 4229e24..389e654 100644
--- a/src/axis/chartaxis_p.h
+++ b/src/axis/chartaxis_p.h
@@ -166,4 +166,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* AXISITEM_H_ */
+#endif /* CHARTAXI_H */
diff --git a/src/axis/datetimeaxis/qdatetimeaxis_p.h b/src/axis/datetimeaxis/qdatetimeaxis_p.h
index c748772..491c580 100644
--- a/src/axis/datetimeaxis/qdatetimeaxis_p.h
+++ b/src/axis/datetimeaxis/qdatetimeaxis_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef QVALUESAXIS_P_H
-#define QVALUESAXIS_P_H
+#ifndef QDATETIMEAXIS_P_H
+#define QDATETIMEAXIS_P_H
 
 #include "qdatetimeaxis.h"
 #include "qabstractaxis_p.h"
@@ -67,4 +67,4 @@ class QDateTimeAxisPrivate : public QAbstractAxisPrivate
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // QVALUESAXIS_P_H
+#endif // QDATETIMEAXIS_P_H
diff --git a/src/axis/qabstractaxis.cpp b/src/axis/qabstractaxis.cpp
index c0c61b5..b110789 100644
--- a/src/axis/qabstractaxis.cpp
+++ b/src/axis/qabstractaxis.cpp
@@ -572,7 +572,7 @@ void QAbstractAxis::hide()
 
 /*!
   Sets the minimum value shown on the axis.
-  Depending on the actual axis type the \a min paramter is converted to appropriate type.
+  Depending on the actual axis type the \a min parameter is converted to appropriate type.
   If the conversion is impossible then the function call does nothing
 */
 void QAbstractAxis::setMin(const QVariant &min)
@@ -582,7 +582,7 @@ void QAbstractAxis::setMin(const QVariant &min)
 
 /*!
   Sets the maximum value shown on the axis.
-  Depending on the actual axis type the \a max paramter is converted to appropriate type.
+  Depending on the actual axis type the \a max parameter is converted to appropriate type.
   If the conversion is impossible then the function call does nothing
 */
 void QAbstractAxis::setMax(const QVariant &max)
@@ -592,7 +592,7 @@ void QAbstractAxis::setMax(const QVariant &max)
 
 /*!
   Sets the range shown on the axis.
-  Depending on the actual axis type the \a min and \a max paramters are converted to appropriate types.
+  Depending on the actual axis type the \a min and \a max parameters are converted to appropriate types.
   If the conversion is impossible then the function call does nothing.
 */
 void QAbstractAxis::setRange(const QVariant &min, const QVariant &max)
diff --git a/src/axis/valueaxis/chartvalueaxisx_p.h b/src/axis/valueaxis/chartvalueaxisx_p.h
index 3a3d5c8..bf7a9cc 100644
--- a/src/axis/valueaxis/chartvalueaxisx_p.h
+++ b/src/axis/valueaxis/chartvalueaxisx_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef CHARTVALUESAXISX_H
-#define CHARTVALUESAXISX_H
+#ifndef CHARTVALUEAXISX_H
+#define CHARTVALUEAXISX_H
 
 #include "chartaxis_p.h"
 
@@ -57,4 +57,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* CHARTVALUESAXISX_H */
+#endif /* CHARTVALUEAXISX_H */
diff --git a/src/axis/valueaxis/chartvalueaxisy_p.h b/src/axis/valueaxis/chartvalueaxisy_p.h
index 37defc5..4687954 100644
--- a/src/axis/valueaxis/chartvalueaxisy_p.h
+++ b/src/axis/valueaxis/chartvalueaxisy_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef CHARTVALUESAXISY_H
-#define CHARTVALUESAXISY_H
+#ifndef CHARTVALUEAXISY_H
+#define CHARTVALUEAXISY_H
 
 #include "chartaxis_p.h"
 
@@ -55,4 +55,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* CHARTVALUESAXISY_H */
+#endif /* CHARTVALUEAXISY_H */
diff --git a/src/axis/valueaxis/qvalueaxis.cpp b/src/axis/valueaxis/qvalueaxis.cpp
index 9d04784..266ddf6 100644
--- a/src/axis/valueaxis/qvalueaxis.cpp
+++ b/src/axis/valueaxis/qvalueaxis.cpp
@@ -301,8 +301,7 @@ QValueAxisPrivate::QValueAxisPrivate(QValueAxis* q):
     m_min(0),
     m_max(0),
     m_tickCount(5),
-    m_niceNumbers(false),
-    m_format(QString::null)
+    m_niceNumbers(false)
 {
 
 }
diff --git a/src/axis/valueaxis/qvalueaxis.h b/src/axis/valueaxis/qvalueaxis.h
index 159d88b..be3d054 100644
--- a/src/axis/valueaxis/qvalueaxis.h
+++ b/src/axis/valueaxis/qvalueaxis.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef QVALUESAXIS_H
-#define QVALUESAXIS_H
+#ifndef QVALUEAXIS_H
+#define QVALUEAXIS_H
 
 #include "qabstractaxis.h"
 
@@ -75,4 +75,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // QVALUESAXIS_H
+#endif // QVALUEAXIS_H
diff --git a/src/axis/valueaxis/qvalueaxis_p.h b/src/axis/valueaxis/qvalueaxis_p.h
index 3dcd1ab..2321ebc 100644
--- a/src/axis/valueaxis/qvalueaxis_p.h
+++ b/src/axis/valueaxis/qvalueaxis_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef QVALUESAXIS_P_H
-#define QVALUESAXIS_P_H
+#ifndef QVALUEAXIS_P_H
+#define QVALUEAXIS_P_H
 
 #include "qvalueaxis.h"
 #include "qabstractaxis_p.h"
@@ -70,4 +70,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // QVALUESAXIS_P_H
+#endif // QVALUEAXIS_P_H
diff --git a/src/barchart/abstractbarchartitem.cpp b/src/barchart/abstractbarchartitem.cpp
index 135c5f9..55e1ad6 100644
--- a/src/barchart/abstractbarchartitem.cpp
+++ b/src/barchart/abstractbarchartitem.cpp
@@ -149,10 +149,10 @@ void AbstractBarChartItem::handleDataStructureChanged()
             // Bars
             Bar *bar = new Bar(set,c,this);
             m_bars.append(bar);
-            connect(bar, SIGNAL(clicked(int, QBarSet*)), m_series, SIGNAL(clicked(int, QBarSet*)));
-            connect(bar, SIGNAL(hovered(bool, QBarSet*)), m_series, SIGNAL(hovered(bool, QBarSet*)));
-            connect(bar, SIGNAL(clicked(int, QBarSet*)), set, SIGNAL(clicked(int)));
-            connect(bar, SIGNAL(hovered(bool, QBarSet*)), set, SIGNAL(hovered(bool)));
+            connect(bar, SIGNAL(clicked(int,QBarSet*)), m_series, SIGNAL(clicked(int,QBarSet*)));
+            connect(bar, SIGNAL(hovered(bool,QBarSet*)), m_series, SIGNAL(hovered(bool,QBarSet*)));
+            connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int)));
+            connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool)));
             m_layout.append(QRectF(0, 0, 0, 0));
 
             // Labels
diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp
index 9f44d11..3e91203 100644
--- a/src/barchart/qabstractbarseries.cpp
+++ b/src/barchart/qabstractbarseries.cpp
@@ -287,7 +287,7 @@ bool QAbstractBarSeries::take(QBarSet *set)
 
 /*!
     Adds a list of barsets to series. Takes ownership of \a sets.
-    Returns true, if all sets were appended succesfully. If any of the sets is null or is already appended to series,
+    Returns true, if all sets were appended successfully. If any of the sets is null or is already appended to series,
     nothing is appended and function returns false. If any of the sets is in list more than once, nothing is appended
     and function returns false.
 */
diff --git a/src/barchart/qbarmodelmapper.cpp b/src/barchart/qbarmodelmapper.cpp
index e0023af..8524c71 100644
--- a/src/barchart/qbarmodelmapper.cpp
+++ b/src/barchart/qbarmodelmapper.cpp
@@ -550,8 +550,8 @@ void QBarModelMapperPrivate::initializeBarFromModel()
                 posInBar++;
                 barIndex = barModelIndex(i, posInBar);
             }
-            connect(barSet, SIGNAL(valuesAdded(int, int)), this, SLOT(valuesAdded(int, int)));
-            connect(barSet, SIGNAL(valuesRemoved(int, int)), this, SLOT(valuesRemoved(int, int)));
+            connect(barSet, SIGNAL(valuesAdded(int,int)), this, SLOT(valuesAdded(int,int)));
+            connect(barSet, SIGNAL(valuesRemoved(int,int)), this, SLOT(valuesRemoved(int,int)));
             connect(barSet, SIGNAL(valueChanged(int)), this, SLOT(barValueChanged(int)));
             connect(barSet, SIGNAL(labelChanged()), this, SLOT(barLabelChanged()));
             m_series->append(barSet);
diff --git a/src/barchart/vertical/bar/barchartitem.cpp b/src/barchart/vertical/bar/barchartitem.cpp
index 453d076..a11c9f1 100644
--- a/src/barchart/vertical/bar/barchartitem.cpp
+++ b/src/barchart/vertical/bar/barchartitem.cpp
@@ -20,7 +20,6 @@
 
 #include "barchartitem_p.h"
 #include "bar_p.h"
-#include "qbarset_p.h"
 #include "qabstractbarseries_p.h"
 #include "qbarset.h"
 #include "qbarset_p.h"
diff --git a/src/chartbackground_p.h b/src/chartbackground_p.h
index 15d9c63..7e97e36 100644
--- a/src/chartbackground_p.h
+++ b/src/chartbackground_p.h
@@ -61,6 +61,6 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* CHARTBACKGROUND_H_ */
+#endif /* CHARTBACKGROUND_H */
 
 
diff --git a/src/chartdataset_p.h b/src/chartdataset_p.h
index 8ab5702..9b72e64 100644
--- a/src/chartdataset_p.h
+++ b/src/chartdataset_p.h
@@ -95,4 +95,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* CHARTENGINE_P_H_ */
+#endif /* CHARTENGINE_P_H */
diff --git a/src/chartitem_p.h b/src/chartitem_p.h
index 4637bb9..f6b85d9 100644
--- a/src/chartitem_p.h
+++ b/src/chartitem_p.h
@@ -45,4 +45,4 @@ public:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* CHARTITEM_H_ */
+#endif /* CHARTITEM_H */
diff --git a/src/chartlayout_p.h b/src/chartlayout_p.h
index 1c4a22c..0785d22 100644
--- a/src/chartlayout_p.h
+++ b/src/chartlayout_p.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef CHARTLAYOUT_H_
-#define CHARTLAYOUT_H_
+#ifndef CHARTLAYOUT_H
+#define CHARTLAYOUT_H
 #include <QGraphicsLayout>
 #include <QMargins>
 #include "qchartglobal.h"
diff --git a/src/chartpresenter_p.h b/src/chartpresenter_p.h
index 910e959..7a78cfd 100644
--- a/src/chartpresenter_p.h
+++ b/src/chartpresenter_p.h
@@ -174,4 +174,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* CHARTPRESENTER_H_ */
+#endif /* CHARTPRESENTER_H */
diff --git a/src/chartsnamespace.h b/src/chartsnamespace.h
index 1eadf62..fcd3488 100644
--- a/src/chartsnamespace.h
+++ b/src/chartsnamespace.h
@@ -18,11 +18,11 @@
 **
 ****************************************************************************/
 
-#ifndef MACROINCLUDE_H_
-#define MACROINCLUDE_H_
+#ifndef CHARTSNAMESPACE_H
+#define MACROINCLUDE_H
 
 // this is needed by the designer plugin.
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
-#endif /* MACROINCLUDE_H_ */
+#endif /* CHARTSNAMESPACE_H */
diff --git a/src/legend/legendlayout_p.h b/src/legend/legendlayout_p.h
index 66a0866..5801cf0 100644
--- a/src/legend/legendlayout_p.h
+++ b/src/legend/legendlayout_p.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef LEGENDLAYOUT_H_
-#define LEGENDLAYOUT_H_
+#ifndef LEGENDLAYOUT_H
+#define LEGENDLAYOUT_H
 #include <QGraphicsLayout>
 #include "qchartglobal.h"
 
diff --git a/src/piechart/qpiemodelmapper.cpp b/src/piechart/qpiemodelmapper.cpp
index e3224bb..5cbac21 100644
--- a/src/piechart/qpiemodelmapper.cpp
+++ b/src/piechart/qpiemodelmapper.cpp
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#include "qpiemodelmapper_p.h"
 #include "qpiemodelmapper.h"
+#include "qpiemodelmapper_p.h"
 #include "qpieseries.h"
 #include "qpieslice.h"
 #include <QAbstractItemModel>
diff --git a/src/qchartview_p.h b/src/qchartview_p.h
index af7e05d..b23f2f5 100644
--- a/src/qchartview_p.h
+++ b/src/qchartview_p.h
@@ -43,7 +43,7 @@ class QChartView;
 class QChartViewPrivate {
 
 public:
-    QChartViewPrivate(QChartView *q,QChart *chart = 0);
+    explicit QChartViewPrivate(QChartView *q, QChart *chart = 0);
     ~QChartViewPrivate();
 
 protected:
diff --git a/src/scroller_p.h b/src/scroller_p.h
index 6515875..5459650 100644
--- a/src/scroller_p.h
+++ b/src/scroller_p.h
@@ -104,4 +104,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif /* SCROLLER_P_H_ */
+#endif /* SCROLLER_P_H */
diff --git a/src/xychart/xychart_p.h b/src/xychart/xychart_p.h
index a072fe3..eed7006 100644
--- a/src/xychart/xychart_p.h
+++ b/src/xychart/xychart_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef XYCHARTITEM_H
-#define XYCHARTITEM_H
+#ifndef XYCHART_H
+#define XYCHART_H
 
 #include "qchartglobal.h"
 #include "chartitem_p.h"