diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp
index a1c54f7700d..bfeb27f2579 100644
--- a/src/plugins/git/gitgrep.cpp
+++ b/src/plugins/git/gitgrep.cpp
@@ -45,12 +45,11 @@
 #include <QSettings>
 #include <QTextStream>
 
-using namespace Utils;
-
 namespace Git {
 namespace Internal {
 
 using namespace Core;
+using namespace Utils;
 using VcsBase::VcsCommand;
 
 namespace {
@@ -187,8 +186,8 @@ GitGrep::GitGrep()
                             "that are managed by source control."));
     TextEditor::FindInFiles *findInFiles = TextEditor::FindInFiles::instance();
     QTC_ASSERT(findInFiles, return);
-    QObject::connect(findInFiles, &TextEditor::FindInFiles::pathChanged,
-                     m_widget.data(), [this](const QString &path) {
+    connect(findInFiles, &TextEditor::FindInFiles::pathChanged,
+            m_widget, [this](const QString &path) {
         m_widget->setEnabled(validateDirectory(path));
     });
     findInFiles->setFindExtension(this);
@@ -196,7 +195,7 @@ GitGrep::GitGrep()
 
 GitGrep::~GitGrep()
 {
-    delete m_widget.data();
+    delete m_widget;
 }
 
 QString GitGrep::title() const
@@ -206,7 +205,7 @@ QString GitGrep::title() const
 
 QWidget *GitGrep::widget() const
 {
-    return m_widget.data();
+    return m_widget;
 }
 
 bool GitGrep::isEnabled() const
diff --git a/src/plugins/git/gitgrep.h b/src/plugins/git/gitgrep.h
index 67a239bf582..e0a5ea60f1c 100644
--- a/src/plugins/git/gitgrep.h
+++ b/src/plugins/git/gitgrep.h
@@ -30,9 +30,6 @@
 
 #include <utils/fileutils.h>
 
-#include <QPointer>
-#include <QStringListModel>
-
 QT_FORWARD_DECLARE_CLASS(QCheckBox)
 
 namespace Git {
@@ -56,7 +53,7 @@ public:
             const TextEditor::FileFindParameters &parameters) override;
 
 private:
-    QPointer<QCheckBox> m_widget;
+    QCheckBox *m_widget;
 };
 
 } // namespace Internal