diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index cd35a3ddc09..b0739cdaf43 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -47,8 +47,7 @@ using namespace std;
 using namespace std::chrono_literals;
 using namespace std::placeholders;
 
-namespace Android {
-namespace Internal {
+namespace Android::Internal {
 
 static const QString pidPollingScript = QStringLiteral("while [ -d /proc/%1 ]; do sleep 1; done");
 static const QRegularExpression userIdPattern("u(\\d+)_a");
@@ -861,5 +860,4 @@ void AndroidRunnerWorker::onProcessIdChanged(const PidUserPair &pidUser)
     }
 }
 
-} // namespace Internal
-} // namespace Android
+} // namespace Android::Internal
diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h
index 033cf2d91ed..84f77e34eea 100644
--- a/src/plugins/android/androidrunnerworker.h
+++ b/src/plugins/android/androidrunnerworker.h
@@ -11,19 +11,11 @@
 #include <utils/environment.h>
 #include <utils/port.h>
 
-namespace Utils {
-class FilePath;
-class Process;
-}
+namespace Android { class AndroidDeviceInfo; }
 namespace ProjectExplorer { class RunWorker; }
+namespace Utils { class Process; }
 
-namespace Android {
-
-class AndroidDeviceInfo;
-
-namespace Internal {
-
-const int MIN_SOCKET_HANDSHAKE_PORT = 20001;
+namespace Android::Internal {
 
 using PidUserPair = std::pair<qint64, qint64>;
 
@@ -109,5 +101,4 @@ private:
     bool m_useAppParamsForQmlDebugger = false;
 };
 
-} // namespace Internal
-} // namespace Android
+} // namespace Android::Internal