Clean exported headers of the Remote Linux, Android plugins.

Change-Id: Ie7825b9c7f3e131a8afaebbd4c245f1227c8dcd4
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>

10 files changed, 17 insertions, 18 deletions

diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h
index c8aff85c01..a32d78a6e8 100644
--- a/src/plugins/android/androidbuildapkstep.h
+++ b/src/plugins/android/androidbuildapkstep.h
@@ -34,7 +34,6 @@
 
 #include "android_global.h"
 #include <projectexplorer/abstractprocessstep.h>
-#include <qtsupport/baseqtversion.h>
 
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 7c1d7649f9..f35cce897a 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -41,16 +41,18 @@
 #include <QMap>
 #include <QFutureInterface>
 
-#include <projectexplorer/abi.h>
-
 #include <utils/fileutils.h>
-#include <utils/environment.h>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
 QT_END_NAMESPACE
 
-namespace ProjectExplorer { class Project; }
+namespace ProjectExplorer {
+class Abi;
+class Project;
+}
+
+namespace Utils { class Environment; }
 
 namespace Android {
 class AndroidPlugin;
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 80b61e0bfa..3c2625c860 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "androidmanager.h"
+#include "androidconstants.h"
 #include "androiddeployconfiguration.h"
 #include "androidconfigurations.h"
 #include "androidrunconfiguration.h"
diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h
index acb81dfafd..771963a1fc 100644
--- a/src/plugins/android/androidmanager.h
+++ b/src/plugins/android/androidmanager.h
@@ -32,7 +32,6 @@
 #define ANDROIDMANAGER_H
 
 #include "android_global.h"
-#include <utils/fileutils.h>
 
 #include <QPair>
 #include <QObject>
@@ -43,6 +42,8 @@ class Kit;
 class Target;
 }
 
+namespace Utils { class FileName; }
+
 namespace Android {
 
 class AndroidQtSupport;
diff --git a/src/plugins/android/androidqtsupport.h b/src/plugins/android/androidqtsupport.h
index 013e28a3b2..b6e2867f5a 100644
--- a/src/plugins/android/androidqtsupport.h
+++ b/src/plugins/android/androidqtsupport.h
@@ -31,21 +31,20 @@
 #ifndef ANDROIDSUPPORT_H
 #define ANDROIDSUPPORT_H
 
+#include "android_global.h"
+
 #include <QObject>
 #include <QList>
 
-#include <projectexplorer/project.h>
-
-#include <utils/fileutils.h>
-
-#include "android_global.h"
-
 namespace ProjectExplorer {
-    class Target;
     class DeployConfiguration;
     class ProcessParameters;
+    class Project;
+    class Target;
 }
 
+namespace Utils { class FileName; }
+
 namespace Android {
 
 class ANDROID_EXPORT AndroidQtSupport : public QObject
diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h
index 67b0d41db0..d62936e8cd 100644
--- a/src/plugins/android/androidrunconfiguration.h
+++ b/src/plugins/android/androidrunconfiguration.h
@@ -32,8 +32,6 @@
 #define ANDROIDRUNCONFIGURATION_H
 
 #include "android_global.h"
-#include "androidconstants.h"
-#include "androidconfigurations.h"
 
 #include <projectexplorer/runconfiguration.h>
 
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
index a6a63f27d7..66cd812653 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
@@ -30,6 +30,7 @@
 
 #include "remotelinuxenvironmentaspect.h"
 
+#include "abstractremotelinuxrunconfiguration.h"
 #include "remotelinuxenvironmentaspectwidget.h"
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.h b/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
index f818cd7c6d..a920dce1a9 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
@@ -31,8 +31,6 @@
 #ifndef REMOTELINUXENVIRONMENTASPECT_H
 #define REMOTELINUXENVIRONMENTASPECT_H
 
-#include "abstractremotelinuxrunconfiguration.h"
-
 #include "remotelinux_export.h"
 
 #include <projectexplorer/environmentaspect.h>
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp
index bb1b21cad4..2da43252ba 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.cpp
@@ -30,6 +30,7 @@
 
 #include "remotelinuxenvironmentaspectwidget.h"
 
+#include "remotelinuxrunconfiguration.h"
 #include "remotelinuxenvironmentreader.h"
 
 #include <QCoreApplication>
diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.h b/src/plugins/remotelinux/remotelinuxsignaloperation.h
index c387ba6ab9..342ebe8ba6 100644
--- a/src/plugins/remotelinux/remotelinuxsignaloperation.h
+++ b/src/plugins/remotelinux/remotelinuxsignaloperation.h
@@ -37,7 +37,6 @@
 #include <ssh/sshconnection.h>
 
 namespace QSsh {
-class SshConnectionParameters;
 class SshRemoteProcessRunner;
 }