diff --git a/src/barchart/barchart.pri b/src/barchart/barchart.pri
index 60c7ea0..3ae84f5 100644
--- a/src/barchart/barchart.pri
+++ b/src/barchart/barchart.pri
@@ -20,11 +20,11 @@ PRIVATE_HEADERS += \
     $$PWD/bar_p.h \
     $$PWD/barchartmodel_p.h \
     $$PWD/barlabel_p.h \
-    $$PWD/barpresenter.h \
-    $$PWD/barpresenterbase.h \
-    $$PWD/percentbarpresenter.h \
+    $$PWD/barpresenter_p.h \
+    $$PWD/barpresenterbase_p.h \
+    $$PWD/percentbarpresenter_p.h \
     $$PWD/separator_p.h \
-    $$PWD/stackedbarpresenter.h \
+    $$PWD/stackedbarpresenter_p.h \
     $$PWD/barvalue_p.h
 
 PUBLIC_HEADERS += \
diff --git a/src/barchart/barpresenter.cpp b/src/barchart/barpresenter.cpp
index c85c1a0..2bbcf4e 100644
--- a/src/barchart/barpresenter.cpp
+++ b/src/barchart/barpresenter.cpp
@@ -1,4 +1,4 @@
-#include "barpresenter.h"
+#include "barpresenter_p.h"
 #include "bar_p.h"
 #include "barlabel_p.h"
 #include "barvalue_p.h"
@@ -92,6 +92,6 @@ void BarPresenter::layoutChanged()
     mLayoutDirty = true;
 }
 
-#include "moc_barpresenter.cpp"
+#include "moc_barpresenter_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/barpresenter.h b/src/barchart/barpresenter_p.h
similarity index 95%
rename from src/barchart/barpresenter.h
rename to src/barchart/barpresenter_p.h
index bbcd413..383ecbd 100644
--- a/src/barchart/barpresenter.h
+++ b/src/barchart/barpresenter_p.h
@@ -2,7 +2,7 @@
 #define BARPRESENTER_H
 
 #include "qchartglobal.h"
-#include "barpresenterbase.h"
+#include "barpresenterbase_p.h"
 #include <QGraphicsItem>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/barchart/barpresenterbase.cpp b/src/barchart/barpresenterbase.cpp
index 8f2dbeb..48247f9 100644
--- a/src/barchart/barpresenterbase.cpp
+++ b/src/barchart/barpresenterbase.cpp
@@ -1,4 +1,4 @@
-#include "barpresenterbase.h"
+#include "barpresenterbase_p.h"
 #include "bar_p.h"
 #include "barvalue_p.h"
 #include "barlabel_p.h"
@@ -153,6 +153,6 @@ void BarPresenterBase::enableSeparators(bool enabled)
     mSeparatorsEnabled = enabled;
 }
 
-#include "moc_barpresenterbase.cpp"
+#include "moc_barpresenterbase_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/barpresenterbase.h b/src/barchart/barpresenterbase_p.h
similarity index 100%
rename from src/barchart/barpresenterbase.h
rename to src/barchart/barpresenterbase_p.h
diff --git a/src/barchart/percentbarpresenter.cpp b/src/barchart/percentbarpresenter.cpp
index 38e3b07..6fb873b 100644
--- a/src/barchart/percentbarpresenter.cpp
+++ b/src/barchart/percentbarpresenter.cpp
@@ -1,4 +1,4 @@
-#include "percentbarpresenter.h"
+#include "percentbarpresenter_p.h"
 #include "bar_p.h"
 #include "barlabel_p.h"
 #include "barvalue_p.h"
@@ -107,6 +107,6 @@ void PercentBarPresenter::layoutChanged()
     mLayoutDirty = true;
 }
 
-#include "moc_percentbarpresenter.cpp"
+#include "moc_percentbarpresenter_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/percentbarpresenter.h b/src/barchart/percentbarpresenter_p.h
similarity index 95%
rename from src/barchart/percentbarpresenter.h
rename to src/barchart/percentbarpresenter_p.h
index e10fe27..3002365 100644
--- a/src/barchart/percentbarpresenter.h
+++ b/src/barchart/percentbarpresenter_p.h
@@ -4,7 +4,7 @@
 #include "chartitem_p.h"
 #include "bar_p.h"
 #include "qpercentbarseries.h"
-#include "barpresenterbase.h"
+#include "barpresenterbase_p.h"
 #include <QGraphicsItem>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/barchart/stackedbarpresenter.cpp b/src/barchart/stackedbarpresenter.cpp
index 2a0c046..deefd21 100644
--- a/src/barchart/stackedbarpresenter.cpp
+++ b/src/barchart/stackedbarpresenter.cpp
@@ -1,4 +1,4 @@
-#include "stackedbarpresenter.h"
+#include "stackedbarpresenter_p.h"
 #include "bar_p.h"
 #include "barlabel_p.h"
 #include "barvalue_p.h"
@@ -106,6 +106,6 @@ void StackedBarPresenter::layoutChanged()
     mLayoutDirty = true;
 }
 
-#include "moc_stackedbarpresenter.cpp"
+#include "moc_stackedbarpresenter_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/stackedbarpresenter.h b/src/barchart/stackedbarpresenter_p.h
similarity index 94%
rename from src/barchart/stackedbarpresenter.h
rename to src/barchart/stackedbarpresenter_p.h
index 4050bda..744a150 100644
--- a/src/barchart/stackedbarpresenter.h
+++ b/src/barchart/stackedbarpresenter_p.h
@@ -1,7 +1,7 @@
 #ifndef STACKEDBARPRESENTER_H
 #define STACKEDBARPRESENTER_H
 
-#include "barpresenterbase.h"
+#include "barpresenterbase_p.h"
 #include "qstackedbarseries.h"
 #include <QGraphicsItem>
 
diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp
index 12a1649..61c8704 100644
--- a/src/chartpresenter.cpp
+++ b/src/chartpresenter.cpp
@@ -13,10 +13,10 @@
 //items
 #include "axisitem_p.h"
 #include "axisanimationitem_p.h"
-#include "barpresenter.h"
-#include "stackedbarpresenter.h"
+#include "barpresenter_p.h"
+#include "stackedbarpresenter_p.h"
+#include "percentbarpresenter_p.h"
 #include "linechartitem_p.h"
-#include "percentbarpresenter.h"
 #include "linechartanimationitem_p.h"
 #include "piepresenter_p.h"
 #include "scatterpresenter_p.h"
diff --git a/src/charttheme.cpp b/src/charttheme.cpp
index 78c3e37..ece8aba 100644
--- a/src/charttheme.cpp
+++ b/src/charttheme.cpp
@@ -15,10 +15,10 @@
 
 //items
 #include "axisitem_p.h"
-#include "barpresenter.h"
-#include "stackedbarpresenter.h"
+#include "barpresenter_p.h"
+#include "stackedbarpresenter_p.h"
+#include "percentbarpresenter_p.h"
 #include "linechartitem_p.h"
-#include "percentbarpresenter.h"
 #include "scatterpresenter_p.h"
 #include "piepresenter_p.h"