diff --git a/demos/chartinteractions/chart.cpp b/demos/chartinteractions/chart.cpp
index 3cd8609..051bf73 100644
--- a/demos/chartinteractions/chart.cpp
+++ b/demos/chartinteractions/chart.cpp
@@ -18,12 +18,10 @@
 **
 ****************************************************************************/
 
+#include "chart.h"
 #include <QValueAxis>
 #include <QAbstractAxis>
 #include <cmath>
-#include <QDebug>
-
-#include "chart.h"
 
 Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags, QLineSeries *series)
     : QChart(parent, wFlags), m_series(series)
diff --git a/demos/chartinteractions/chartview.cpp b/demos/chartinteractions/chartview.cpp
index b8ec429..390167a 100644
--- a/demos/chartinteractions/chartview.cpp
+++ b/demos/chartinteractions/chartview.cpp
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#include <QMouseEvent>
 #include "chartview.h"
+#include <QMouseEvent>
 #include "chart.h"
 
 ChartView::ChartView(Chart *chart, QWidget *parent) :
diff --git a/demos/chartthemes/themewidget.h b/demos/chartthemes/themewidget.h
index 41af4bf..d0477fc 100644
--- a/demos/chartthemes/themewidget.h
+++ b/demos/chartthemes/themewidget.h
@@ -18,8 +18,9 @@
 **
 ****************************************************************************/
 
-#ifndef THEMEWINDOW_H
-#define THEMEWINDOW_H
+#ifndef THEMEWIDGET_H
+#define THEMEWIDGET_H
+
 #include <QWidget>
 #include <QChartGlobal>
 
@@ -73,4 +74,4 @@ private:
     QComboBox *m_legendComboBox;
 };
 
-#endif /* THEMEWINDOW_H */
+#endif /* THEMEWIDGET_H */
diff --git a/examples/barmodelmapper/customtablemodel.h b/examples/barmodelmapper/customtablemodel.h
index 64d5f19..3106f9f 100644
--- a/examples/barmodelmapper/customtablemodel.h
+++ b/examples/barmodelmapper/customtablemodel.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef XYPOINTSMODEL_H
-#define XYPOINTSMODEL_H
+#ifndef CUSTOMTABLEMODEL_H
+#define CUSTOMTABLEMODEL_H
 
 #include <QAbstractTableModel>
 #include <QHash>
@@ -48,4 +48,4 @@ private:
     int m_rowCount;
 };
 
-#endif // XYPOINTSMODEL_H
+#endif // CUSTOMTABLEMODEL_H
diff --git a/examples/modeldata/customtablemodel.h b/examples/modeldata/customtablemodel.h
index 64d5f19..3106f9f 100644
--- a/examples/modeldata/customtablemodel.h
+++ b/examples/modeldata/customtablemodel.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef XYPOINTSMODEL_H
-#define XYPOINTSMODEL_H
+#ifndef CUSTOMTABLEMODEL_H
+#define CUSTOMTABLEMODEL_H
 
 #include <QAbstractTableModel>
 #include <QHash>
@@ -48,4 +48,4 @@ private:
     int m_rowCount;
 };
 
-#endif // XYPOINTSMODEL_H
+#endif // CUSTOMTABLEMODEL_H
diff --git a/examples/scatterinteractions/chartview.h b/examples/scatterinteractions/chartview.h
index 56c9224..80f393c 100644
--- a/examples/scatterinteractions/chartview.h
+++ b/examples/scatterinteractions/chartview.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#ifndef CHARTVIEW_H
+#define CHARTVIEW_H
 
 #include <QChartGlobal>
 #include <QChartView>
@@ -43,4 +43,4 @@ private:
     QScatterSeries *m_scatter2;
 };
 
-#endif // MAINWINDOW_H
+#endif // CHARTVIEW_H
diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.h b/tests/auto/qabstractaxis/tst_qabstractaxis.h
index 3f32879..78c3d06 100644
--- a/tests/auto/qabstractaxis/tst_qabstractaxis.h
+++ b/tests/auto/qabstractaxis/tst_qabstractaxis.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef TST_QABSTRACTSERIES_H
-#define TST_QABSTRACTSERIES_H
+#ifndef TST_QABSTRACTAXIS_H
+#define TST_QABSTRACTAXIS_H
 
 #include <QtTest/QtTest>
 #include <tst_definitions.h>
diff --git a/tests/chartdesigner/engine.h b/tests/chartdesigner/engine.h
index d5f8fe6..368f70d 100644
--- a/tests/chartdesigner/engine.h
+++ b/tests/chartdesigner/engine.h
@@ -18,8 +18,8 @@
  **
  ****************************************************************************/
 
-#ifndef ENGINE_H_
-#define ENGINE_H_
+#ifndef ENGINE_H
+#define ENGINE_H
 
 #include <QObject>
 #include <QAbstractSeries>
@@ -73,4 +73,4 @@ private:
     QMap<QAbstractSeries*, QList<QModelIndex> > m_seriesModelIndex;
 };
 
-#endif /* ENGINE_H_ */
+#endif /* ENGINE_H */
diff --git a/tests/wavechart/wavechart.cpp b/tests/wavechart/wavechart.cpp
index f98c174..73c39f0 100644
--- a/tests/wavechart/wavechart.cpp
+++ b/tests/wavechart/wavechart.cpp
@@ -53,9 +53,7 @@ WaveChart::WaveChart(QChart* chart, QWidget* parent) :
     QObject::connect(&m_timer, SIGNAL(timeout()), this, SLOT(update()));
     m_timer.setInterval(5000);
     m_timer.start();
-
 }
-;
 
 void WaveChart::update()
 {
diff --git a/tests/wavechart/wavechart.h b/tests/wavechart/wavechart.h
index 3df98c7..82b2ffb 100644
--- a/tests/wavechart/wavechart.h
+++ b/tests/wavechart/wavechart.h
@@ -18,6 +18,9 @@
 **
 ****************************************************************************/
 
+#ifndef WAVECHART_H
+#define WAVECHART_H
+
 #include <QTimer>
 #include <QTime>
 #include <QObject>
@@ -42,3 +45,5 @@ private:
     qreal m_step;
     QTimer m_timer;
 };
+
+#endif