diff --git a/src/plugins/clangrefactoring/clangrefactoring-source.pri b/src/plugins/clangrefactoring/clangrefactoring-source.pri
index 78eb707ecca..24c3c4f597e 100644
--- a/src/plugins/clangrefactoring/clangrefactoring-source.pri
+++ b/src/plugins/clangrefactoring/clangrefactoring-source.pri
@@ -5,7 +5,7 @@ HEADERS += \
     $$PWD/refactoringconnectionclient.h \
     $$PWD/refactoringclient.h \
     $$PWD/searchinterface.h \
-    $$PWD/searchhandleinterface.h \
+    $$PWD/searchhandle.h \
     $$PWD/projectpartutilities.h \
     $$PWD/clangqueryprojectsfindfilter.h
 
@@ -14,6 +14,6 @@ SOURCES += \
     $$PWD/refactoringconnectionclient.cpp \
     $$PWD/refactoringclient.cpp \
     $$PWD/searchinterface.cpp \
-    $$PWD/searchhandleinterface.cpp \
+    $$PWD/searchhandle.cpp \
     $$PWD/projectpartutilities.cpp \
     $$PWD/clangqueryprojectsfindfilter.cpp
diff --git a/src/plugins/clangrefactoring/searchhandleinterface.cpp b/src/plugins/clangrefactoring/searchhandleinterface.cpp
deleted file mode 100644
index 8eed7e59bec..00000000000
--- a/src/plugins/clangrefactoring/searchhandleinterface.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "searchhandleinterface.h"
-
-namespace ClangRefactoring {
-
-SearchHandle::~SearchHandle()
-{
-}
-
-void SearchHandle::cancel()
-{
-    server->cancel();
-}
-
-void SearchHandle::setRefactoringServer(ClangBackEnd::RefactoringServerInterface *server)
-{
-    this->server = server;
-}
-
-} // namespace ClangRefactoring
diff --git a/src/plugins/clangrefactoring/searchhandleinterface.h b/src/plugins/clangrefactoring/searchhandleinterface.h
deleted file mode 100644
index 185be306a2e..00000000000
--- a/src/plugins/clangrefactoring/searchhandleinterface.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <coreplugin/find/searchresultitem.h>
-
-#include <refactoringserverinterface.h>
-
-namespace ClangRefactoring {
-
-class SearchHandle
-{
-public:
-    virtual ~SearchHandle();
-
-    virtual void addResult(const QString &fileName,
-                           const QString &lineText,
-                           Core::Search::TextRange textRange) = 0;
-
-    virtual void setExpectedResultCount(uint count) = 0;
-    virtual void setResultCounter(uint counter) = 0;
-
-    virtual void finishSearch() = 0;
-
-    void cancel();
-
-    void setRefactoringServer(ClangBackEnd::RefactoringServerInterface *server);
-
-private:
-    ClangBackEnd::RefactoringServerInterface *server = nullptr;
-};
-
-} // namespace ClangRefactoring