diff --git a/src/globalsearch/digitallyimportedsearchprovider.cpp b/src/globalsearch/digitallyimportedsearchprovider.cpp
index e777ef1c7..d59365f16 100644
--- a/src/globalsearch/digitallyimportedsearchprovider.cpp
+++ b/src/globalsearch/digitallyimportedsearchprovider.cpp
@@ -17,7 +17,6 @@
 
 #include "digitallyimportedsearchprovider.h"
 #include "core/logging.h"
-#include "internet/digitallyimportedservicebase.h"
 
 DigitallyImportedSearchProvider::DigitallyImportedSearchProvider(
     DigitallyImportedServiceBase* service, Application* app, QObject* parent)
diff --git a/src/globalsearch/digitallyimportedsearchprovider.h b/src/globalsearch/digitallyimportedsearchprovider.h
index 4630da96e..f3346a0cb 100644
--- a/src/globalsearch/digitallyimportedsearchprovider.h
+++ b/src/globalsearch/digitallyimportedsearchprovider.h
@@ -19,15 +19,16 @@
 #define DIGITALLYIMPORTEDSEARCHPROVIDER_H
 
 #include "simplesearchprovider.h"
-
-class DigitallyImportedServiceBase;
+#include "internet/digitallyimportedservicebase.h"
 
 class DigitallyImportedSearchProvider : public SimpleSearchProvider {
  public:
   DigitallyImportedSearchProvider(DigitallyImportedServiceBase* service,
                                   Application* app, QObject* parent);
 
-  void ShowConfig();
+  // SearchProvider
+  void ShowConfig() override;
+  InternetService* internet_service() override { return service_; }
 
  protected:
   void RecreateItems();
diff --git a/src/globalsearch/savedradiosearchprovider.cpp b/src/globalsearch/savedradiosearchprovider.cpp
index 8ceffeae8..0c3f5d56d 100644
--- a/src/globalsearch/savedradiosearchprovider.cpp
+++ b/src/globalsearch/savedradiosearchprovider.cpp
@@ -17,7 +17,6 @@
 
 #include "savedradiosearchprovider.h"
 #include "core/mimedata.h"
-#include "internet/savedradio.h"
 #include "ui/iconloader.h"
 
 SavedRadioSearchProvider::SavedRadioSearchProvider(SavedRadio* service,
diff --git a/src/globalsearch/savedradiosearchprovider.h b/src/globalsearch/savedradiosearchprovider.h
index a4e43c87a..9d5ce2498 100644
--- a/src/globalsearch/savedradiosearchprovider.h
+++ b/src/globalsearch/savedradiosearchprovider.h
@@ -19,14 +19,16 @@
 #define SAVEDRADIOSEARCHPROVIDER_H
 
 #include "simplesearchprovider.h"
-
-class SavedRadio;
+#include "internet/savedradio.h"
 
 class SavedRadioSearchProvider : public SimpleSearchProvider {
  public:
   SavedRadioSearchProvider(SavedRadio* service, Application* app,
                            QObject* parent);
 
+  // SearchProvider
+  InternetService* internet_service() override { return service_; }
+
  protected:
   void RecreateItems();
 
diff --git a/src/globalsearch/somafmsearchprovider.cpp b/src/globalsearch/somafmsearchprovider.cpp
index 80833d8dd..dbc9e0c78 100644
--- a/src/globalsearch/somafmsearchprovider.cpp
+++ b/src/globalsearch/somafmsearchprovider.cpp
@@ -16,7 +16,6 @@
 */
 
 #include "somafmsearchprovider.h"
-#include "internet/somafmservice.h"
 
 SomaFMSearchProvider::SomaFMSearchProvider(SomaFMServiceBase* service,
                                            Application* app, QObject* parent)
diff --git a/src/globalsearch/somafmsearchprovider.h b/src/globalsearch/somafmsearchprovider.h
index 40df8bf19..d5b06c9f2 100644
--- a/src/globalsearch/somafmsearchprovider.h
+++ b/src/globalsearch/somafmsearchprovider.h
@@ -19,13 +19,14 @@
 #define SOMAFMSEARCHPROVIDER_H
 
 #include "simplesearchprovider.h"
-
-class SomaFMServiceBase;
+#include "internet/somafmservice.h"
 
 class SomaFMSearchProvider : public SimpleSearchProvider {
  public:
   SomaFMSearchProvider(SomaFMServiceBase* service, Application* app,
                        QObject* parent);
+  // SearchProvider
+  InternetService* internet_service() override { return service_; }
 
   void LoadArtAsync(int id, const Result& result);