diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index c95c606e536..b49c8fc3c7b 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -223,8 +223,7 @@ void ClangModelManagerSupport::globalRename(const CppEditor::CursorInEditor &cur
     CppModelManager::globalRename(cursor, replacement, CppModelManager::Backend::Builtin);
 }
 
-void ClangModelManagerSupport::findUsages(const CppEditor::CursorInEditor &cursor,
-                                   CppEditor::UsagesCallback &&callback) const
+void ClangModelManagerSupport::findUsages(const CppEditor::CursorInEditor &cursor) const
 {
     if (ClangdClient * const client = clientForFile(cursor.filePath());
             client && client->isFullyIndexed()) {
@@ -234,7 +233,7 @@ void ClangModelManagerSupport::findUsages(const CppEditor::CursorInEditor &curso
 
         return;
     }
-    CppModelManager::findUsages(cursor, std::move(callback), CppModelManager::Backend::Builtin);
+    CppModelManager::findUsages(cursor, CppModelManager::Backend::Builtin);
 }
 
 void ClangModelManagerSupport::switchHeaderSource(const Utils::FilePath &filePath, bool inNextSplit)
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
index 32acad56168..7604dd5cc59 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
@@ -91,8 +91,7 @@ private:
                             const CppEditor::ProjectPart *projectPart,
                             CppEditor::RenameCallback &&renameSymbolsCallback) override;
     void globalRename(const CppEditor::CursorInEditor &cursor, const QString &replacement) override;
-    void findUsages(const CppEditor::CursorInEditor &cursor,
-                    CppEditor::UsagesCallback &&callback) const override;
+    void findUsages(const CppEditor::CursorInEditor &cursor) const override;
     void switchHeaderSource(const Utils::FilePath &filePath, bool inNextSplit) override;
 
     void onEditorOpened(Core::IEditor *editor);
diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
index bb121d0f56e..534861e0ea8 100644
--- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
+++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
@@ -193,8 +193,7 @@ void BuiltinModelManagerSupport::globalRename(const CursorInEditor &data,
     }
 }
 
-void BuiltinModelManagerSupport::findUsages(const CursorInEditor &data,
-                                      UsagesCallback &&) const
+void BuiltinModelManagerSupport::findUsages(const CursorInEditor &data) const
 {
     CppModelManager *modelManager = CppModelManager::instance();
     if (!modelManager)
diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h
index fbf6f7bc5f2..91fd7abe70e 100644
--- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h
+++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h
@@ -59,7 +59,7 @@ private:
                             const ProjectPart *projectPart,
                             RenameCallback &&renameSymbolsCallback) override;
     void globalRename(const CursorInEditor &data, const QString &replacement) override;
-    void findUsages(const CursorInEditor &data, UsagesCallback &&) const override;
+    void findUsages(const CursorInEditor &data) const override;
     void switchHeaderSource(const Utils::FilePath &filePath, bool inNextSplit) override;
 
     QScopedPointer<CppCompletionAssistProvider> m_completionAssistProvider;
diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp
index b5ff4d61d26..1bb5ec7b96d 100644
--- a/src/plugins/cppeditor/cppeditorwidget.cpp
+++ b/src/plugins/cppeditor/cppeditorwidget.cpp
@@ -792,23 +792,16 @@ void CppEditorWidget::findUsages()
 void CppEditorWidget::findUsages(QTextCursor cursor)
 {
     // 'this' in cursorInEditor is never used (and must never be used) asynchronously.
-    const CursorInEditor cursorInEditor{cursor, textDocument()->filePath(), this,
-                textDocument()};
+    const CursorInEditor cursorInEditor{cursor, textDocument()->filePath(), this, textDocument()};
     QPointer<CppEditorWidget> cppEditorWidget = this;
-    d->m_modelManager->findUsages(cursorInEditor,
-                                  [=](const Usages &usages) {
-                                      if (!cppEditorWidget)
-                                          return;
-                                      findRenameCallback(cppEditorWidget.data(), cursor, usages);
-                                  });
+    d->m_modelManager->findUsages(cursorInEditor);
 }
 
 void CppEditorWidget::renameUsages(const QString &replacement, QTextCursor cursor)
 {
     if (cursor.isNull())
         cursor = textCursor();
-    CursorInEditor cursorInEditor{cursor, textDocument()->filePath(), this,
-                textDocument()};
+    CursorInEditor cursorInEditor{cursor, textDocument()->filePath(), this, textDocument()};
     QPointer<CppEditorWidget> cppEditorWidget = this;
     d->m_modelManager->globalRename(cursorInEditor, replacement);
 }
diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp
index 55eb9328ce3..f6ab5f7453d 100644
--- a/src/plugins/cppeditor/cppmodelmanager.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager.cpp
@@ -322,10 +322,9 @@ void CppModelManager::globalRename(const CursorInEditor &data, const QString &re
     instance()->modelManagerSupport(backend)->globalRename(data, replacement);
 }
 
-void CppModelManager::findUsages(const CursorInEditor &data,
-                                 UsagesCallback &&showUsagesCallback, Backend backend)
+void CppModelManager::findUsages(const CursorInEditor &data, Backend backend)
 {
-    instance()->modelManagerSupport(backend)->findUsages(data, std::move(showUsagesCallback));
+    instance()->modelManagerSupport(backend)->findUsages(data);
 }
 
 void CppModelManager::switchHeaderSource(bool inNextSplit, Backend backend)
diff --git a/src/plugins/cppeditor/cppmodelmanager.h b/src/plugins/cppeditor/cppmodelmanager.h
index af4b616d90c..591fda2a17b 100644
--- a/src/plugins/cppeditor/cppmodelmanager.h
+++ b/src/plugins/cppeditor/cppmodelmanager.h
@@ -181,8 +181,7 @@ public:
                                    Backend backend = Backend::Best);
     static void globalRename(const CursorInEditor &data, const QString &replacement,
                              Backend backend = Backend::Best);
-    static void findUsages(const CursorInEditor &data, UsagesCallback &&showUsagesCallback,
-                           Backend backend = Backend::Best);
+    static void findUsages(const CursorInEditor &data, Backend backend = Backend::Best);
     static void switchHeaderSource(bool inNextSplit, Backend backend = Backend::Best);
 
     static Core::ILocatorFilter *createAuxiliaryCurrentDocumentFilter();
diff --git a/src/plugins/cppeditor/cppmodelmanagersupport.h b/src/plugins/cppeditor/cppmodelmanagersupport.h
index 40ea575232a..522010c1ad2 100644
--- a/src/plugins/cppeditor/cppmodelmanagersupport.h
+++ b/src/plugins/cppeditor/cppmodelmanagersupport.h
@@ -74,8 +74,7 @@ public:
                                     const ProjectPart *projectPart,
                                     RenameCallback &&renameSymbolsCallback) = 0;
     virtual void globalRename(const CursorInEditor &data, const QString &replacement) = 0;
-    virtual void findUsages(const CursorInEditor &data,
-                            UsagesCallback &&showUsagesCallback) const = 0;
+    virtual void findUsages(const CursorInEditor &data) const = 0;
     virtual void switchHeaderSource(const Utils::FilePath &filePath, bool inNextSplit) = 0;
 };