diff --git a/src/plugins/projectexplorer/outputwindow.h b/src/plugins/projectexplorer/outputwindow.h
index b29664fe53a8d15f522ce6ca4c4fccf785aa8f71..0646c16f7e9186e00a0255a38f4529af33c71c5b 100644
--- a/src/plugins/projectexplorer/outputwindow.h
+++ b/src/plugins/projectexplorer/outputwindow.h
@@ -93,11 +93,11 @@ public slots:
     void projectRemoved();
     void coreAboutToClose();
 
-    void appendApplicationOutput(RunControl *rc, const QString &out,
+    void appendApplicationOutput(ProjectExplorer::RunControl *rc, const QString &out,
                                  bool onStdErr);
-    void appendApplicationOutputInline(RunControl *rc, const QString &out,
+    void appendApplicationOutputInline(ProjectExplorer::RunControl *rc, const QString &out,
                                        bool onStdErr);
-    void appendMessage(RunControl *rc, const QString &out, bool isError);
+    void appendMessage(ProjectExplorer::RunControl *rc, const QString &out, bool isError);
 
 private slots:
     void reRunRunControl();
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 57fdc99ae8b7ecf7baa09d64eddfb5f31d9c62f2..6d21f7cf448bd2e6c4c1ffe3bb584bac08a5fa2b 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1264,12 +1264,12 @@ void ProjectExplorerPlugin::startRunControl(RunControl *runControl, const QStrin
     if (projectExplorerSettings().cleanOldAppOutput)
         d->m_outputPane->clearContents();
 
-    connect(runControl, SIGNAL(addToOutputWindow(RunControl *, const QString &, bool)),
-            d->m_outputPane, SLOT(appendApplicationOutput(RunControl*,const QString &, bool)));
-    connect(runControl, SIGNAL(addToOutputWindowInline(RunControl *, const QString &, bool)),
-            d->m_outputPane, SLOT(appendApplicationOutputInline(RunControl*,const QString &, bool)));
-    connect(runControl, SIGNAL(appendMessage(RunControl*,QString,bool)),
-            d->m_outputPane, SLOT(appendMessage(RunControl *, const QString &, bool)));
+    connect(runControl, SIGNAL(addToOutputWindow(ProjectExplorer::RunControl*,QString,bool)),
+            d->m_outputPane, SLOT(appendApplicationOutput(ProjectExplorer::RunControl*,QString, bool)));
+    connect(runControl, SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl*,QString,bool)),
+            d->m_outputPane, SLOT(appendApplicationOutputInline(ProjectExplorer::RunControl*,QString,bool)));
+    connect(runControl, SIGNAL(appendMessage(ProjectExplorer::RunControl*,QString,bool)),
+            d->m_outputPane, SLOT(appendMessage(ProjectExplorer::RunControl*,QString,bool)));
 
     connect(runControl, SIGNAL(finished()),
             this, SLOT(runControlFinished()));
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 486bc18f96d12caf3c21435d0837396e2be6e25c..f9e897e509fbda10e016b174bd832d31ab59bc93 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -173,9 +173,9 @@ public:
     QString runMode() const;
 
 signals:
-    void addToOutputWindow(RunControl *, const QString &line, bool onStdErr);
-    void addToOutputWindowInline(RunControl *, const QString &line, bool onStdErr);
-    void appendMessage(RunControl *, const QString &error, bool isError);
+    void addToOutputWindow(ProjectExplorer::RunControl *, const QString &line, bool onStdErr);
+    void addToOutputWindowInline(ProjectExplorer::RunControl *, const QString &line, bool onStdErr);
+    void appendMessage(ProjectExplorer::RunControl *, const QString &error, bool isError);
     void started();
     void finished();
 
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
index bb5c4362727312a6aad5acf66f0736e128943991..5541eccd7c7e3fbfefa5b633bbc60ef3b00554e5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
@@ -457,8 +457,8 @@ MaemoDebugRunControl::MaemoDebugRunControl(RunConfiguration *runConfiguration)
 
 MaemoDebugRunControl::~MaemoDebugRunControl()
 {
-    disconnect(SIGNAL(addToOutputWindow(RunControl*,QString, bool)));
-    disconnect(SIGNAL(addToOutputWindowInline(RunControl*,QString, bool)));
+    disconnect(SIGNAL(addToOutputWindow(ProjectExplorer::RunControl*,QString, bool)));
+    disconnect(SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl*,QString, bool)));
     stop();
 }
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 2bd0d8d2d8b48184aae5b01cde82d842ad6dc313..0ceefdc10c0d7a20711d53f7bfde56208e8a6669 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -947,8 +947,8 @@ void S60DeviceDebugRunControl::handleLauncherFinished()
             SLOT(debuggingFinished()),
             Qt::QueuedConnection);
     connect(m_debuggerRunControl,
-            SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl,QString,bool)),
-            SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl,QString,bool)),
+            SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl*,QString,bool)),
+            SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl*,QString,bool)),
             Qt::QueuedConnection);
 
     DebuggerPlugin::startDebugger(m_debuggerRunControl);