diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index 9c6a616abe3..434af007891 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -41,6 +41,7 @@
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QFormLayout>
+#include <QGroupBox>
 #include <QHBoxLayout>
 #include <QImage>
 #include <QLabel>
@@ -84,6 +85,32 @@ static Target *androidTarget(const FilePath &fileName)
     return nullptr;
 }
 
+class PermissionsModel: public QAbstractListModel
+{
+public:
+    PermissionsModel(QObject *parent = nullptr);
+    void setPermissions(const QStringList &permissions);
+    const QStringList &permissions();
+    QModelIndex addPermission(const QString &permission);
+    void removePermission(int index);
+    QVariant data(const QModelIndex &index, int role) const override;
+
+protected:
+    int rowCount(const QModelIndex &parent) const override;
+
+private:
+    QStringList m_permissions;
+};
+
+class AndroidManifestTextEditorWidget : public TextEditor::TextEditorWidget
+{
+public:
+    explicit AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent);
+
+private:
+    Core::IContext *m_context;
+};
+
 AndroidManifestEditorWidget::AndroidManifestEditorWidget()
 {
     m_textEditorWidget = new AndroidManifestTextEditorWidget(this);
diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h
index 23b8cdce05d..cfb59f38401 100644
--- a/src/plugins/android/androidmanifesteditorwidget.h
+++ b/src/plugins/android/androidmanifesteditorwidget.h
@@ -5,23 +5,19 @@
 
 #include <texteditor/texteditor.h>
 
-#include <QAbstractListModel>
-#include <QGroupBox>
-#include <QTabWidget>
 #include <QStackedWidget>
 #include <QTimer>
 
 QT_BEGIN_NAMESPACE
 class QCheckBox;
 class QDomDocument;
-class QDomElement;
 class QComboBox;
+class QGroupBox;
 class QPushButton;
 class QLabel;
 class QLineEdit;
 class QListView;
-class QSpinBox;
-class QToolButton;
+class QTabWidget;
 class QXmlStreamReader;
 class QXmlStreamWriter;
 QT_END_NAMESPACE
@@ -32,38 +28,13 @@ namespace Android::Internal {
 
 class AndroidManifestEditor;
 class AndroidManifestEditorIconContainerWidget;
-class AndroidManifestEditorWidget;
+class PermissionsModel;
 class SplashScreenContainerWidget;
 
-class PermissionsModel: public QAbstractListModel
-{
-public:
-    PermissionsModel(QObject *parent = nullptr);
-    void setPermissions(const QStringList &permissions);
-    const QStringList &permissions();
-    QModelIndex addPermission(const QString &permission);
-    void removePermission(int index);
-    QVariant data(const QModelIndex &index, int role) const override;
-
-protected:
-    int rowCount(const QModelIndex &parent) const override;
-
-private:
-    QStringList m_permissions;
-};
-
-class AndroidManifestTextEditorWidget : public TextEditor::TextEditorWidget
-{
-public:
-    explicit AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent);
-
-private:
-    Core::IContext *m_context;
-};
-
 class AndroidManifestEditorWidget : public QStackedWidget
 {
     Q_OBJECT
+
 public:
     enum EditorPage {
         General = 0,