diff --git a/src/plugins/projectexplorer/outputformat.h b/src/plugins/projectexplorer/outputformat.h
new file mode 100644
index 0000000000000000000000000000000000000000..3d6624a4fc666de22cc8362c73beaf7005b2c179
--- /dev/null
+++ b/src/plugins/projectexplorer/outputformat.h
@@ -0,0 +1,50 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** No Commercial Usage
+**
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**************************************************************************/
+
+#ifndef OUTPUTFORMAT_H
+#define OUTPUTFORMAT_H
+
+namespace ProjectExplorer {
+
+enum OutputFormat
+{
+    NormalMessageFormat,
+    ErrorMessageFormat,
+    StdOutFormat,
+    StdErrFormat,
+    NumberOfFormats // Keep this entry last.
+};
+
+} // namespace ProjectExplorer
+
+#endif // OUTPUTFORMATR_H
diff --git a/src/plugins/projectexplorer/outputformatter.h b/src/plugins/projectexplorer/outputformatter.h
index a24a8cc7b784c7fe735a61a1844b2b5a008acbb1..f21d40a5e17ec30d0c5177c29065af34dd0f8042 100644
--- a/src/plugins/projectexplorer/outputformatter.h
+++ b/src/plugins/projectexplorer/outputformatter.h
@@ -35,26 +35,20 @@
 #define OUTPUTFORMATTER_H
 
 #include "projectexplorer_export.h"
+#include "outputformat.h"
 
 #include <QtCore/QObject>
 
-QT_FORWARD_DECLARE_CLASS(QMouseEvent)
-QT_FORWARD_DECLARE_CLASS(QPlainTextEdit)
-QT_FORWARD_DECLARE_CLASS(QTextCharFormat)
-QT_FORWARD_DECLARE_CLASS(QColor)
+QT_BEGIN_NAMESPACE
+class QMouseEvent;
+class QPlainTextEdit;
+class QTextCharFormat;
+class QColor;
+QT_END_NAMESPACE
 
 namespace ProjectExplorer {
 
-enum OutputFormat
-{
-    NormalMessageFormat,
-    ErrorMessageFormat,
-    StdOutFormat,
-    StdErrFormat,
-    NumberOfFormats // Keep this entry last.
-};
-
-class PROJECTEXPLORER_EXPORT OutputFormatter: public QObject
+class PROJECTEXPLORER_EXPORT OutputFormatter : public QObject
 {
     Q_OBJECT
 
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 333641988219565abed5fbbe083d504eef493959..ceb3417bf699a71026d7ce3dd92bb1136a992a57 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -87,6 +87,7 @@ HEADERS += projectexplorer.h \
     buildenvironmentwidget.h \
     ldparser.h \
     linuxiccparser.h \
+    outputformat.h \
     outputformatter.h \
     runconfigurationmodel.h \
     buildconfigurationmodel.h \