diff --git a/src/areachart/qareaseries.h b/src/areachart/qareaseries.h
index 79bbc8a..082fa25 100644
--- a/src/areachart/qareaseries.h
+++ b/src/areachart/qareaseries.h
@@ -81,4 +81,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif
+#endif // QAREASERIES_H
diff --git a/src/axis/qabstractaxis.h b/src/axis/qabstractaxis.h
index f03376c..ea729c4 100644
--- a/src/axis/qabstractaxis.h
+++ b/src/axis/qabstractaxis.h
@@ -65,7 +65,7 @@ public:
 
     virtual AxisType type() const = 0;
 
-    //visibilty hadnling
+    //visibilty handling
     bool isVisible() const;
     void setVisible(bool visible = true);
 
@@ -153,4 +153,5 @@ protected:
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
-#endif
+
+#endif // QABSTRACTAXIS_H
diff --git a/src/barchart/qabstractbarseries.h b/src/barchart/qabstractbarseries.h
index 10e7025..a0161c8 100644
--- a/src/barchart/qabstractbarseries.h
+++ b/src/barchart/qabstractbarseries.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef ABSTRACTBARSERIES_H
-#define ABSTRACTBARSERIES_H
+#ifndef QABSTRACTBARSERIES_H
+#define QABSTRACTBARSERIES_H
 
 #include <qabstractseries.h>
 #include <QStringList>
@@ -80,4 +80,4 @@ protected:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // ABSTRACTBARSERIES_H
+#endif // QABSTRACTBARSERIES_H
diff --git a/src/barchart/vertical/percent/qpercentbarseries.h b/src/barchart/vertical/percent/qpercentbarseries.h
index 904ce8e..f416fb8 100644
--- a/src/barchart/vertical/percent/qpercentbarseries.h
+++ b/src/barchart/vertical/percent/qpercentbarseries.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef PERCENTBARSERIES_H
-#define PERCENTBARSERIES_H
+#ifndef QPERCENTBARSERIES_H
+#define QPERCENTBARSERIES_H
 
 #include <QStringList>
 #include <qabstractbarseries.h>
@@ -43,4 +43,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // PERCENTBARSERIES_H
+#endif // QPERCENTBARSERIES_H
diff --git a/src/barchart/vertical/stacked/qstackedbarseries.h b/src/barchart/vertical/stacked/qstackedbarseries.h
index b700a74..1a903f3 100644
--- a/src/barchart/vertical/stacked/qstackedbarseries.h
+++ b/src/barchart/vertical/stacked/qstackedbarseries.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef STACKEDBARSERIES_H
-#define STACKEDBARSERIES_H
+#ifndef QSTACKEDBARSERIES_H
+#define QSTACKEDBARSERIES_H
 
 #include <QStringList>
 #include <qabstractbarseries.h>
@@ -43,4 +43,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // STACKEDBARSERIES_H
+#endif // QSTACKEDBARSERIES_H
diff --git a/src/linechart/qlineseries.h b/src/linechart/qlineseries.h
index f817cf2..2553606 100644
--- a/src/linechart/qlineseries.h
+++ b/src/linechart/qlineseries.h
@@ -49,4 +49,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif
+#endif // QLINESERIES_H
diff --git a/src/piechart/qpieseries.h b/src/piechart/qpieseries.h
index 85607f0..79b2534 100644
--- a/src/piechart/qpieseries.h
+++ b/src/piechart/qpieseries.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef PIESERIES_H
-#define PIESERIES_H
+#ifndef QPIESERIES_H
+#define QPIESERIES_H
 
 #include <qabstractseries.h>
 #include <QPieSlice>
@@ -99,4 +99,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // PIESERIES_H
+#endif // QPIESERIES_H
diff --git a/src/qabstractseries.h b/src/qabstractseries.h
index 734fe30..d2fca74 100644
--- a/src/qabstractseries.h
+++ b/src/qabstractseries.h
@@ -84,4 +84,4 @@ protected:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif
+#endif // QABSTRACTSERIES_H
diff --git a/src/qchart.h b/src/qchart.h
index e9a0fd5..9eb8416 100644
--- a/src/qchart.h
+++ b/src/qchart.h
@@ -130,4 +130,4 @@ QTCOMMERCIALCHART_END_NAMESPACE
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTCOMMERCIALCHART_NAMESPACE::QChart::AnimationOptions)
 
-#endif
+#endif // QCHART_H
diff --git a/src/qchartglobal.h b/src/qchartglobal.h
index 3bf998c..3216bcc 100644
--- a/src/qchartglobal.h
+++ b/src/qchartglobal.h
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#ifndef CHARTGLOBAL_H
-#define CHARTGLOBAL_H
+#ifndef QCHARTGLOBAL_H
+#define QCHARTGLOBAL_H
 
 #define QTCOMMERCIALCHART_VERSION_STR   "1.0"
 #define QTCOMMERCIALCHART_VERSION 0x01
@@ -76,4 +76,4 @@ static inline QDebug chartDebug(int numargs,...)
 }
 #endif
 
-#endif // CHARTGLOBAL_H
+#endif // QCHARTGLOBAL_H
diff --git a/src/qchartview.h b/src/qchartview.h
index bfe28d8..1754f1a 100644
--- a/src/qchartview.h
+++ b/src/qchartview.h
@@ -69,4 +69,4 @@ protected:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif // QCHARTWIDGET_H
+#endif // QCHARTVIEW_H
diff --git a/src/xychart/qxyseries.h b/src/xychart/qxyseries.h
index 277bc58..f8a2887 100644
--- a/src/xychart/qxyseries.h
+++ b/src/xychart/qxyseries.h
@@ -91,4 +91,4 @@ private:
 
 QTCOMMERCIALCHART_END_NAMESPACE
 
-#endif
+#endif // QXYSERIES_H