diff --git a/src/declarativeimports/core/corebindingsplugin.cpp b/src/declarativeimports/core/corebindingsplugin.cpp
index b1aeefa26..efd523cfc 100644
--- a/src/declarativeimports/core/corebindingsplugin.cpp
+++ b/src/declarativeimports/core/corebindingsplugin.cpp
@@ -89,7 +89,7 @@ void CoreBindingsPlugin::registerTypes(const char *uri)
     qmlRegisterType<Plasma::DataModel>(uri, 2, 0, "DataModel");
     qmlRegisterType<Plasma::SortFilterModel>(uri, 2, 0, "SortFilterModel");
 
-    qmlRegisterType<Dialog>(uri, 2, 0, "Dialog");
+    qmlRegisterType<PlasmaQuick::Dialog>(uri, 2, 0, "Dialog");
     qmlRegisterType<ToolTip>(uri, 2, 0, "ToolTipArea");
 
     qmlRegisterInterface<Plasma::Service>("Service");
diff --git a/src/declarativeimports/core/dialog.cpp b/src/declarativeimports/core/dialog.cpp
index 40113ad0e..00245d503 100644
--- a/src/declarativeimports/core/dialog.cpp
+++ b/src/declarativeimports/core/dialog.cpp
@@ -48,6 +48,9 @@
 //Unfortunately QWINDOWSIZE_MAX is not exported
 #define DIALOGSIZE_MAX ((1<<24)-1)
 
+namespace PlasmaQuick
+{
+
 class DialogPrivate {
 public:
     DialogPrivate(Dialog *dialog)
@@ -795,6 +798,7 @@ void Dialog::setOutputOnly(bool outputOnly)
     emit outputOnlyChanged();
 }
 
+}
 
 #include "moc_dialog.cpp"
 
diff --git a/src/declarativeimports/core/dialog.h b/src/declarativeimports/core/dialog.h
index a6012941c..eaec27b90 100644
--- a/src/declarativeimports/core/dialog.h
+++ b/src/declarativeimports/core/dialog.h
@@ -35,6 +35,8 @@ class QQuickItem;
 class QScreen;
 
 
+namespace PlasmaQuick {
+
 class DialogPrivate;
 
 /**
@@ -189,4 +191,6 @@ private:
     Q_PRIVATE_SLOT(d, void requestSyncToMainItemSize(bool delayed))
 };
 
+}
+
 #endif
diff --git a/src/declarativeimports/core/tooltipdialog.h b/src/declarativeimports/core/tooltipdialog.h
index dab119f35..c4043cbcf 100644
--- a/src/declarativeimports/core/tooltipdialog.h
+++ b/src/declarativeimports/core/tooltipdialog.h
@@ -41,7 +41,7 @@ namespace KDeclarative
  *
  * Exposed as `ToolTipDialog` in QML.
  */
-class ToolTipDialog : public Dialog
+class ToolTipDialog : public PlasmaQuick::Dialog
 {
     Q_OBJECT