diff --git a/src/plugins/android/addnewavddialog.ui b/src/plugins/android/addnewavddialog.ui
index 6e55f89ee4c..598a754c103 100644
--- a/src/plugins/android/addnewavddialog.ui
+++ b/src/plugins/android/addnewavddialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AddNewAVDDialog</class>
- <widget class="QDialog" name="AddNewAVDDialog">
+ <class>Android::Internal::AddNewAVDDialog</class>
+ <widget class="QDialog" name="Android::Internal::AddNewAVDDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -113,7 +113,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>AddNewAVDDialog</receiver>
+   <receiver>Android::Internal::AddNewAVDDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -129,7 +129,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>AddNewAVDDialog</receiver>
+   <receiver>Android::Internal::AddNewAVDDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/plugins/android/androiddevicedialog.h b/src/plugins/android/androiddevicedialog.h
index f42a71d2ac6..2b8a15ba0ac 100644
--- a/src/plugins/android/androiddevicedialog.h
+++ b/src/plugins/android/androiddevicedialog.h
@@ -39,14 +39,11 @@ QT_BEGIN_NAMESPACE
 class QModelIndex;
 QT_END_NAMESPACE
 
-namespace Ui {
-class AndroidDeviceDialog;
-}
-
 namespace Android {
 namespace Internal {
 
 class AndroidDeviceModel;
+namespace Ui { class AndroidDeviceDialog; }
 
 class AndroidDeviceDialog : public QDialog
 {
diff --git a/src/plugins/android/androiddevicedialog.ui b/src/plugins/android/androiddevicedialog.ui
index 15e2ce29cf4..c64465e143f 100644
--- a/src/plugins/android/androiddevicedialog.ui
+++ b/src/plugins/android/androiddevicedialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AndroidDeviceDialog</class>
- <widget class="QDialog" name="AndroidDeviceDialog">
+ <class>Android::Internal::AndroidDeviceDialog</class>
+ <widget class="QDialog" name="Android::Internal::AndroidDeviceDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -62,7 +62,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>AndroidDeviceDialog</receiver>
+   <receiver>Android::Internal::AndroidDeviceDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -78,7 +78,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>AndroidDeviceDialog</receiver>
+   <receiver>Android::Internal::AndroidDeviceDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">