diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp
index 6120e90e917..c9c33dc5959 100644
--- a/src/plugins/clangcodemodel/clangtextmark.cpp
+++ b/src/plugins/clangcodemodel/clangtextmark.cpp
@@ -29,7 +29,6 @@
 #include "clangdclient.h"
 #include "clangdiagnostictooltipwidget.h"
 #include "clangeditordocumentprocessor.h"
-#include "clangmodelmanagersupport.h"
 #include "clangutils.h"
 
 #include <coreplugin/icore.h>
@@ -42,12 +41,11 @@
 
 #include <utils/fadingindicator.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/theme/theme.h>
 #include <utils/utilsicons.h>
 
 #include <QAction>
-#include <QApplication>
-#include <QClipboard>
 #include <QLayout>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
@@ -319,7 +317,7 @@ ClangdTextMark::ClangdTextMark(const FilePath &filePath,
     QObject::connect(action, &QAction::triggered, [diag = m_diagnostic]() {
         const QString text = ClangDiagnosticWidget::createText({diag},
                                                                ClangDiagnosticWidget::InfoBar);
-        QApplication::clipboard()->setText(text, QClipboard::Clipboard);
+        setClipboardAndSelection(text);
     });
     actions << action;
 
diff --git a/src/plugins/clangtools/diagnosticmark.cpp b/src/plugins/clangtools/diagnosticmark.cpp
index 632781c7127..37dd7693921 100644
--- a/src/plugins/clangtools/diagnosticmark.cpp
+++ b/src/plugins/clangtools/diagnosticmark.cpp
@@ -30,10 +30,9 @@
 #include "diagnosticconfigswidget.h"
 
 #include <utils/utilsicons.h>
+#include <utils/stringutils.h>
 
 #include <QAction>
-#include <QApplication>
-#include <QClipboard>
 
 namespace ClangTools {
 namespace Internal {
@@ -65,7 +64,7 @@ DiagnosticMark::DiagnosticMark(const Diagnostic &diagnostic)
         const QString text = createFullLocationString(diagnostic.location)
                              + ": "
                              + diagnostic.description;
-        QApplication::clipboard()->setText(text);
+        Utils::setClipboardAndSelection(text);
     });
     actions << action;