diff --git a/src/plugins/projectexplorer/ioutputparser.h b/src/plugins/projectexplorer/ioutputparser.h
index 298193a8580..da761334604 100644
--- a/src/plugins/projectexplorer/ioutputparser.h
+++ b/src/plugins/projectexplorer/ioutputparser.h
@@ -85,4 +85,6 @@ private:
 
 } // namespace ProjectExplorer
 
+Q_DECLARE_METATYPE(ProjectExplorer::IOutputParser*)
+
 #endif // IOUTPUTPARSER_H
diff --git a/src/plugins/projectexplorer/metatypedeclarations.h b/src/plugins/projectexplorer/metatypedeclarations.h
index bff872fafc7..598ddece4ba 100644
--- a/src/plugins/projectexplorer/metatypedeclarations.h
+++ b/src/plugins/projectexplorer/metatypedeclarations.h
@@ -31,33 +31,15 @@
 #define PROJECTEXPLORERMETATYPEDECLARATIONS_H
 
 #include <QtCore/QMetaType>
-#include <QtCore/QList>
 
 namespace ProjectExplorer {
-class ProjectInterface;
 class IProjectManager;
 class SessionManager;
-class IApplicationOutput;
-class IOutputParser;
-class GlobalConfigManagerInterface;
 class Project;
-struct Task;
-
-namespace Internal {
-class CommandQObject;
-}
 }
 
 Q_DECLARE_METATYPE(QList<ProjectExplorer::Project*>)
 Q_DECLARE_METATYPE(ProjectExplorer::SessionManager*)
 Q_DECLARE_METATYPE(ProjectExplorer::IProjectManager*)
-Q_DECLARE_METATYPE(ProjectExplorer::IApplicationOutput*)
-Q_DECLARE_METATYPE(ProjectExplorer::Internal::CommandQObject*)
-Q_DECLARE_METATYPE(QList<ProjectExplorer::Internal::CommandQObject*>)
-Q_DECLARE_METATYPE(ProjectExplorer::IOutputParser*)
-
-Q_DECLARE_METATYPE(ProjectExplorer::GlobalConfigManagerInterface*)
-Q_DECLARE_METATYPE(ProjectExplorer::Task)
-Q_DECLARE_METATYPE(QList<ProjectExplorer::Task>)
 
 #endif // PROJECTEXPLORERMETATYPEDECLARATIONS_H
diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h
index 596a8089d8b..6ad39204b02 100644
--- a/src/plugins/projectexplorer/taskwindow.h
+++ b/src/plugins/projectexplorer/taskwindow.h
@@ -144,4 +144,7 @@ uint qHash(const Task &task);
 
 } //namespace ProjectExplorer
 
+Q_DECLARE_METATYPE(ProjectExplorer::Task)
+Q_DECLARE_METATYPE(QList<ProjectExplorer::Task>)
+
 #endif // TASKWINDOW_H