diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
index 1a003558f871126c6ff55e9161248d92d311eb51..5f93f43d33324158493626cc01013d9cc6f7e995 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
@@ -33,6 +33,7 @@
 **************************************************************************/
 
 #include "autotoolsbuildconfiguration.h"
+#include "autotoolsbuildsettingswidget.h"
 #include "makestep.h"
 #include "autotoolsproject.h"
 #include "autotoolsprojectconstants.h"
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
index d6f712b044b42a08494af71b79f4768c5791de7e..5177e24621acbe3bf4551f76a63d11c67f2b67e7 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
@@ -35,8 +35,6 @@
 #ifndef AUTOTOOLSBUILDCONFIGURATION_H
 #define AUTOTOOLSBUILDCONFIGURATION_H
 
-#include "autotoolsbuildsettingswidget.h"
-
 #include <projectexplorer/buildconfiguration.h>
 
 namespace AutotoolsProjectManager {
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp
index 9f8315c4cde303fd2a1afc11f98a7b760caf4a45..d8620049ab921ec874dcfabc07fecd68122d2a38 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp
@@ -39,6 +39,8 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/target.h>
 
+#include <utils/pathchooser.h>
+
 #include <QGridLayout>
 #include <QLabel>
 #include <QLineEdit>
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h
index 4550c4906caf5ad3da10885257ba8f18d5fa55ce..eb9fc4acbff95c3d8aa167b7635010663831f029 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h
@@ -35,17 +35,16 @@
 #ifndef AUTOTOOLSBUILDSETTINGSWIDGET_H
 #define AUTOTOOLSBUILDSETTINGSWIDGET_H
 
-#include "autotoolsbuildconfiguration.h"
-
-#include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/project.h>
 #include <projectexplorer/buildstep.h>
-#include <utils/pathchooser.h>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
 QT_END_NAMESPACE
 
+namespace Utils {
+class PathChooser;
+}
+
 namespace AutotoolsProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp
index 9fd234d753795c6a8b1bb1ecd9a8cd306e5cb2a4..474b29ed3281743acb7666480fc970507e11e15f 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp
@@ -34,6 +34,8 @@
 
 #include "autotoolsopenprojectwizard.h"
 
+#include <utils/pathchooser.h>
+
 #include <QVBoxLayout>
 #include <QFormLayout>
 #include <QLabel>
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h
index 043136399cd7ab38e6ab6547c7abff05c6d64cdd..ba3d2ce6be6021d60821f46f3c10a87034f2b123 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h
@@ -36,7 +36,10 @@
 #define AUTOTOOLSOPENPROJECTWIZARD_H
 
 #include <utils/wizard.h>
-#include <utils/pathchooser.h>
+
+namespace Utils {
+class PathChooser;
+}
 
 namespace AutotoolsProjectManager {
 namespace Internal {
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index 7f293b6141a4e61552c6bbf0cc119a54e8fc3775..84c39c591409de6471f3d655276fd45037b5ff5c 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -54,6 +54,7 @@
 #include <cpptools/ModelManagerInterface.h>
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
+#include <utils/filesystemwatcher.h>
 
 #include <QFileInfo>
 #include <QTimer>
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h
index 55612306bb334227d4fbd7ad01bb82148dea6184..97a8ce8a72889b386bb3bf852ad21d5cd9ced51b 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h
@@ -35,14 +35,18 @@
 #ifndef AUTOTOOLSPROJECT_H
 #define AUTOTOOLSPROJECT_H
 
-#include <coreplugin/editormanager/ieditor.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectnodes.h>
-#include <utils/filesystemwatcher.h>
 
-#include <QPointer>
-#include <QDir>
+QT_FORWARD_DECLARE_CLASS(QDir)
+
+namespace Utils {
+class FileSystemWatcher;
+}
+
+namespace ProjectExplorer {
+class Node;
+class FolderNode;
+}
 
 namespace AutotoolsProjectManager {
 namespace Internal {
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp
index 3234afbad46826a9011e33e725dd65c4174ddb8a..a13c14657dec5c4c97d7c407b371f6656c8704c6 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp
@@ -35,6 +35,8 @@
 #include "autotoolsprojectnode.h"
 #include "autotoolsproject.h"
 
+#include <coreplugin/idocument.h>
+
 using namespace AutotoolsProjectManager;
 using namespace AutotoolsProjectManager::Internal;
 using namespace ProjectExplorer;
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
index 433e662eac9ab268b7bfaf390499860342ca2549..ea6b6195584bf8b0c7eead2db0134ecf28210a25 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
@@ -36,7 +36,10 @@
 #define AUTOTOOLSPROJECTNODE_H
 
 #include <projectexplorer/projectnodes.h>
-#include <coreplugin/idocument.h>
+
+namespace Core {
+class IDocument;
+}
 
 namespace AutotoolsProjectManager {
 namespace Internal {
diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp
index 972f6bce0ace28d4a6f56c3647d2dfcf5d09815c..a1fea7247f90f1cbad0d8d6278574b3e24291a31 100644
--- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp
+++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp
@@ -37,6 +37,7 @@
 #include <utils/qtcassert.h>
 
 #include <QFile>
+#include <QDir>
 #include <QFileInfoList>
 #include <QMutexLocker>
 
diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.h b/src/plugins/autotoolsprojectmanager/makefileparser.h
index 8038f8c39fe94067af753382d4958b332f447a81..ce3e67a06e8cd560c3dc28a23e204ce74d247074 100644
--- a/src/plugins/autotoolsprojectmanager/makefileparser.h
+++ b/src/plugins/autotoolsprojectmanager/makefileparser.h
@@ -36,12 +36,11 @@
 #define MAKEFILEPARSER_H
 
 #include <QMutex>
-#include <QString>
 #include <QStringList>
 #include <QTextStream>
 #include <QObject>
-#include <QDir>
-#include <QFileInfo>
+
+QT_FORWARD_DECLARE_CLASS(QDir)
 
 namespace AutotoolsProjectManager {
 namespace Internal {
diff --git a/src/plugins/autotoolsprojectmanager/makefileparserthread.h b/src/plugins/autotoolsprojectmanager/makefileparserthread.h
index e998c726cc97b54fd94e0d364f76d4da9f31cb57..5e3da0f57176086f5c259dce4da588edb05ae1d3 100644
--- a/src/plugins/autotoolsprojectmanager/makefileparserthread.h
+++ b/src/plugins/autotoolsprojectmanager/makefileparserthread.h
@@ -38,7 +38,7 @@
 #include "makefileparser.h"
 
 #include <QMutex>
-#include <QString>
+#include <QStringList>
 #include <QThread>
 
 namespace AutotoolsProjectManager {