diff --git a/declarativeimports/core/corebindingsplugin.cpp b/declarativeimports/core/corebindingsplugin.cpp
index fe0c95d36..f08d8b36d 100644
--- a/declarativeimports/core/corebindingsplugin.cpp
+++ b/declarativeimports/core/corebindingsplugin.cpp
@@ -30,11 +30,11 @@
 #include <Plasma/FrameSvg>
 #include <Plasma/Svg>
 
-#include "datasource_p.h"
+#include "datasource.h"
 #include "datamodel.h"
-#include "framesvgitem_p.h"
-#include "svgitem_p.h"
-#include "theme_p.h"
+#include "framesvgitem.h"
+#include "svgitem.h"
+#include "theme.h"
 #include "dialog.h"
 #include "tooltip.h"
 #include "dataenginebindings_p.h"
diff --git a/declarativeimports/core/datamodel.cpp b/declarativeimports/core/datamodel.cpp
index 29da9e13c..0b260af4f 100644
--- a/declarativeimports/core/datamodel.cpp
+++ b/declarativeimports/core/datamodel.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "datamodel.h"
-#include "datasource_p.h"
+#include "datasource.h"
 
 #include <QTimer>
 
diff --git a/declarativeimports/core/datasource.cpp b/declarativeimports/core/datasource.cpp
index b33a38728..b29158809 100644
--- a/declarativeimports/core/datasource.cpp
+++ b/declarativeimports/core/datasource.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "datasource_p.h"
+#include "datasource.h"
 
 #include "qdeclarativeengine.h"
 #include "qdeclarativecontext.h"
@@ -196,4 +196,4 @@ void DataSource::disconnectSource(const QString &source)
 }
 
 }
-#include "datasource_p.moc"
+#include "datasource.moc"
diff --git a/declarativeimports/core/datasource_p.h b/declarativeimports/core/datasource.h
similarity index 100%
rename from declarativeimports/core/datasource_p.h
rename to declarativeimports/core/datasource.h
diff --git a/declarativeimports/core/framesvgitem.cpp b/declarativeimports/core/framesvgitem.cpp
index 4c030f356..edfcbc934 100644
--- a/declarativeimports/core/framesvgitem.cpp
+++ b/declarativeimports/core/framesvgitem.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "framesvgitem_p.h"
+#include "framesvgitem.h"
 
 #include <QtGui/QPainter>
 
@@ -130,4 +130,4 @@ void FrameSvgItem::doUpdate()
 
 } // Plasma namespace
 
-#include "framesvgitem_p.moc"
+#include "framesvgitem.moc"
diff --git a/declarativeimports/core/framesvgitem_p.h b/declarativeimports/core/framesvgitem.h
similarity index 100%
rename from declarativeimports/core/framesvgitem_p.h
rename to declarativeimports/core/framesvgitem.h
diff --git a/declarativeimports/core/svgitem.cpp b/declarativeimports/core/svgitem.cpp
index ae246e717..00e6d2a84 100644
--- a/declarativeimports/core/svgitem.cpp
+++ b/declarativeimports/core/svgitem.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "svgitem_p.h"
+#include "svgitem.h"
 
 #include <QtGui/QPainter>
 
@@ -124,4 +124,4 @@ void SvgItem::updateNeeded()
 
 } // Plasma namespace
 
-#include "svgitem_p.moc"
+#include "svgitem.moc"
diff --git a/declarativeimports/core/svgitem_p.h b/declarativeimports/core/svgitem.h
similarity index 100%
rename from declarativeimports/core/svgitem_p.h
rename to declarativeimports/core/svgitem.h
diff --git a/declarativeimports/core/theme.cpp b/declarativeimports/core/theme.cpp
index 262afff59..0976fd5f3 100644
--- a/declarativeimports/core/theme.cpp
+++ b/declarativeimports/core/theme.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
-#include "theme_p.h"
+#include "theme.h"
 
 #include <KIconLoader>
 
@@ -299,5 +299,5 @@ int ThemeProxy::enormousIconSize() const
     return KIconLoader::SizeEnormous;
 }
 
-#include "theme_p.moc"
+#include "theme.moc"
 
diff --git a/declarativeimports/core/theme_p.h b/declarativeimports/core/theme.h
similarity index 100%
rename from declarativeimports/core/theme_p.h
rename to declarativeimports/core/theme.h