diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d4861b3d7bd3fb4fddd37eb11ac36a9a9b0a1bfa..6ed413fc7d375de64336023398e534ffda45dc34 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -785,8 +785,6 @@ public slots:
         { if (on) reloadModules(); }
 
     void onAction();
-    void onStatusTimeout();
-
     void setSimpleDockWidgetArrangement(const QString &activeLanguage);
 
     void editorOpened(Core::IEditor *editor);
@@ -837,7 +835,10 @@ public slots:
     void startDebugger(ProjectExplorer::RunControl *runControl);
 
     void setToolTipExpression(const QPoint &mousePos,
-        TextEditor::ITextEditor *editor, int cursorPos);
+        TextEditor::ITextEditor *editor, int cursorPos)
+    {
+        // FIXME
+    }
 
     void dumpLog();
     void cleanupViews();
@@ -850,13 +851,16 @@ public slots:
     void resetLocation();
     void gotoLocation(const QString &file, int line, bool setMarker);
 
-    void registerDockToggled(bool on);
+    void registerDockToggled(bool on) {} // FIXME
     void clearStatusMessage();
-    void operateByInstructionTriggered();
+    void operateByInstructionTriggered() {} // FIXME
 
     void sessionLoaded();
     void aboutToUnloadSession();
     void aboutToSaveSession();
+    void watchPoint() { QTC_ASSERT(false, /**/); } // FIXME
+    void executeDebuggerCommand() { QTC_ASSERT(false, /**/); } // FIXME
+    void executeDebuggerCommand(QString const &) {}
 
 public:
     DebuggerState m_state;
@@ -1137,18 +1141,12 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
     connect(m_actions.resetAction, SIGNAL(triggered()), SLOT(onAction()));
     connect(&m_statusTimer, SIGNAL(timeout()), SLOT(clearStatusMessage()));
 
-/*
+    connect(theDebuggerAction(WatchPoint), SIGNAL(triggered()), SLOT(watchPoint()));
     connect(theDebuggerAction(ExecuteCommand), SIGNAL(triggered()),
-SLOT(onAction()));
-        this, SLOT(executeDebuggerCommand()));
-
-    connect(theDebuggerAction(WatchPoint), SIGNAL(triggered()),
-SLOT(onAction()));
-        this, SLOT(watchPoint()));
+        SLOT(executeDebuggerCommand()));
 
     connect(theDebuggerAction(OperateByInstruction), SIGNAL(triggered()),
-        this, SLOT(operateByInstructionTriggered()));
-*/
+        SLOT(operateByInstructionTriggered()));
 
     m_plugin->readSettings();
 
@@ -1899,9 +1897,6 @@ void DebuggerPluginPrivate::showToolTip(ITextEditor *editor, const QPoint &point
     if (state() == DebuggerNotReady)
         return;
     setToolTipExpression(point, editor, pos);
-
-    QTC_ASSERT(false, /* FIXME ABC */);
-    // d->m_engine->setToolTipExpression(mousePos, editor, cursorPos);
 }
 
 ProjectExplorer::RunControl *
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 723784ad78767c3acf42be2167b98ebd5587dc10..a5877310bae4034d4221202b4f89cbd90dfa5149 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -106,14 +106,7 @@ public:
 public slots:
     void exitDebugger();  // FIXME: remove
     void setBusyCursor(bool on);
-    void interruptDebuggingRequest();
-    void detachDebugger();
-    void addToWatchWindow();
-
-    void executeDebuggerCommand();
-    void executeDebuggerCommand(const QString &command);
-
-    void watchPoint();
+    void addToWatchWindow(); // FIXME: use
 
     void clearCppCodeModelSnapshot();
 
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 73579cad318fe2c353b5a747fec8b31e7ea1fcc9..cd891a1f2d80e52b74bee952b49e9f91832b0466 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -67,11 +67,7 @@ DebuggerEngine *createPdbEngine(const DebuggerStartParameters &);
 DebuggerEngine *createTcfEngine(const DebuggerStartParameters &);
 DebuggerEngine *createQmlEngine(const DebuggerStartParameters &);
 
-#ifdef CDB_ENABLED
-DebuggerEngine *createCdbEngine(const DebuggerStartParameters &);
-#else
-DebuggerEngine *createCdbEngine(const DebuggerStartParameters &) { return 0; }
-#endif
+bool checkGdbConfiguration(int toolChain, QString *errorMsg, QString *settingsPage);
 
 // FIXME: Outdated?
 // The createCdbEngine function takes a list of options pages it can add to.
@@ -79,11 +75,15 @@ DebuggerEngine *createCdbEngine(const DebuggerStartParameters &) { return 0; }
 // of the engine. That's good for not enabling the related ActiveX control
 // unnecessarily.
 
-bool checkGdbConfiguration(int toolChain, QString *errorMsg, QString *settingsPage);
+#ifdef CDB_ENABLED
+DebuggerEngine *createCdbEngine(const DebuggerStartParameters &);
 bool checkCdbConfiguration(int toolChain, QString *errorMsg, QString *settingsPage);
+#else
+DebuggerEngine *createCdbEngine(const DebuggerStartParameters &) { return 0; }
+bool checkCdbConfiguration(int, QString *, QString *) { return false; }
+#endif
 
-}
-
+} // namespace Internal
 
 static QString toolChainName(int toolChainType)
 {