diff --git a/src/context/contextalbum.h b/src/context/contextalbum.h
index 1b4e67ac3..89d4a9b31 100644
--- a/src/context/contextalbum.h
+++ b/src/context/contextalbum.h
@@ -86,8 +86,8 @@ class ContextAlbum : public QWidget {
   void AutomaticCoverSearchDone();
   void FadeCurrentCover(const qreal value);
   void FadeCurrentCoverFinished();
-  void FadePreviousCover(SharedPtr<PreviousCover> previous_cover);
-  void FadePreviousCoverFinished(SharedPtr<PreviousCover> previous_cover);
+  void FadePreviousCover(SharedPtr<ContextAlbum::PreviousCover> previous_cover);
+  void FadePreviousCoverFinished(SharedPtr<ContextAlbum::PreviousCover> previous_cover);
 
  public Q_SLOTS:
   void SearchCoverInProgress();
diff --git a/src/covermanager/opentidalcoverprovider.h b/src/covermanager/opentidalcoverprovider.h
index b4b377144..396d16c78 100644
--- a/src/covermanager/opentidalcoverprovider.h
+++ b/src/covermanager/opentidalcoverprovider.h
@@ -74,7 +74,7 @@ class OpenTidalCoverProvider : public JsonCoverProvider {
   void FlushRequests();
   void LoginFinished(QNetworkReply *reply);
   void HandleLoginSSLErrors(const QList<QSslError> &ssl_errors);
-  void HandleSearchReply(QNetworkReply *reply, SearchRequestPtr search_request);
+  void HandleSearchReply(QNetworkReply *reply, OpenTidalCoverProvider::SearchRequestPtr search_request);
 
  private:
   QTimer *login_timer_;
diff --git a/src/lyrics/musixmatchlyricsprovider.h b/src/lyrics/musixmatchlyricsprovider.h
index a7f1b1e03..4f26520b3 100644
--- a/src/lyrics/musixmatchlyricsprovider.h
+++ b/src/lyrics/musixmatchlyricsprovider.h
@@ -67,8 +67,8 @@ class MusixmatchLyricsProvider : public JsonLyricsProvider, public MusixmatchPro
   void Error(const QString &error, const QVariant &debug = QVariant()) override;
 
  private Q_SLOTS:
-  void HandleSearchReply(QNetworkReply *reply, LyricsSearchContextPtr search);
-  void HandleLyricsReply(QNetworkReply *reply, LyricsSearchContextPtr search, const QUrl &url);
+  void HandleSearchReply(QNetworkReply *reply, MusixmatchLyricsProvider::LyricsSearchContextPtr search);
+  void HandleLyricsReply(QNetworkReply *reply, MusixmatchLyricsProvider::LyricsSearchContextPtr search, const QUrl &url);
 
  private:
   QList<LyricsSearchContextPtr> requests_search_;
diff --git a/src/qobuz/qobuzrequest.h b/src/qobuz/qobuzrequest.h
index 142958515..6f99fa104 100644
--- a/src/qobuz/qobuzrequest.h
+++ b/src/qobuz/qobuzrequest.h
@@ -110,13 +110,13 @@ class QobuzRequest : public QobuzBaseRequest {
   void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
 
   void AlbumsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
-  void AlbumsReceived(QNetworkReply *reply, const Artist &artist_requested, const int limit_requested, const int offset_requested);
+  void AlbumsReceived(QNetworkReply *reply, const QobuzRequest::Artist &artist_requested, const int limit_requested, const int offset_requested);
 
   void SongsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
-  void SongsReceived(QNetworkReply *reply, const Artist &artist_requested, const Album &album_requested, const int limit_requested, const int offset_requested);
+  void SongsReceived(QNetworkReply *reply, const QobuzRequest::Artist &artist_requested, const QobuzRequest::Album &album_requested, const int limit_requested, const int offset_requested);
 
-  void ArtistAlbumsReplyReceived(QNetworkReply *reply, const Artist &artist, const int offset_requested);
-  void AlbumSongsReplyReceived(QNetworkReply *reply, const Artist &artist, const Album &album, const int offset_requested);
+  void ArtistAlbumsReplyReceived(QNetworkReply *reply, const QobuzRequest::Artist &artist, const int offset_requested);
+  void AlbumSongsReplyReceived(QNetworkReply *reply, const QobuzRequest::Artist &artist, const QobuzRequest::Album &album, const int offset_requested);
   void AlbumCoverReceived(QNetworkReply *reply, const QUrl &cover_url, const QString &filename);
 
  private:
diff --git a/src/spotify/spotifyrequest.h b/src/spotify/spotifyrequest.h
index dc9d2c3b7..010959b27 100644
--- a/src/spotify/spotifyrequest.h
+++ b/src/spotify/spotifyrequest.h
@@ -105,13 +105,13 @@ class SpotifyRequest : public SpotifyBaseRequest {
   void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
 
   void AlbumsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
-  void AlbumsReceived(QNetworkReply *reply, const Artist &artist_artist, const int limit_requested, const int offset_requested);
+  void AlbumsReceived(QNetworkReply *reply, const SpotifyRequest::Artist &artist_artist, const int limit_requested, const int offset_requested);
 
   void SongsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
-  void SongsReceived(QNetworkReply *reply, const Artist &artist, const Album &album, const int limit_requested, const int offset_requested);
+  void SongsReceived(QNetworkReply *reply, const SpotifyRequest::Artist &artist, const SpotifyRequest::Album &album, const int limit_requested, const int offset_requested);
 
-  void ArtistAlbumsReplyReceived(QNetworkReply *reply, const Artist &artist, const int offset_requested);
-  void AlbumSongsReplyReceived(QNetworkReply *reply, const Artist &artist, const Album &album, const int offset_requested);
+  void ArtistAlbumsReplyReceived(QNetworkReply *reply, const SpotifyRequest::Artist &artist, const int offset_requested);
+  void AlbumSongsReplyReceived(QNetworkReply *reply, const SpotifyRequest::Artist &artist, const SpotifyRequest::Album &album, const int offset_requested);
   void AlbumCoverReceived(QNetworkReply *reply, const QString &album_id, const QUrl &url, const QString &filename);
 
  private:
diff --git a/src/subsonic/subsonicrequest.h b/src/subsonic/subsonicrequest.h
index 72e588727..5eb067008 100644
--- a/src/subsonic/subsonicrequest.h
+++ b/src/subsonic/subsonicrequest.h
@@ -86,7 +86,7 @@ class SubsonicRequest : public SubsonicBaseRequest {
  private Q_SLOTS:
   void AlbumsReplyReceived(QNetworkReply *reply, const int offset_requested, const int size_requested);
   void AlbumSongsReplyReceived(QNetworkReply *reply, const QString &artist_id, const QString &album_id, const QString &album_artist);
-  void AlbumCoverReceived(QNetworkReply *reply, const AlbumCoverRequest &request);
+  void AlbumCoverReceived(QNetworkReply *reply, const SubsonicRequest::AlbumCoverRequest &request);
 
  private:
 
diff --git a/src/tidal/tidalrequest.h b/src/tidal/tidalrequest.h
index 8ae3622b2..af7cdfefb 100644
--- a/src/tidal/tidalrequest.h
+++ b/src/tidal/tidalrequest.h
@@ -111,13 +111,13 @@ class TidalRequest : public TidalBaseRequest {
   void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
 
   void AlbumsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
-  void AlbumsReceived(QNetworkReply *reply, const Artist &artist_requested, const int limit_requested, const int offset_requested, const bool auto_login);
+  void AlbumsReceived(QNetworkReply *reply, const TidalRequest::Artist &artist_requested, const int limit_requested, const int offset_requested, const bool auto_login);
 
   void SongsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
-  void SongsReceived(QNetworkReply *reply, const Artist &artist, const Album &album, const int limit_requested, const int offset_requested, const bool auto_login = false);
+  void SongsReceived(QNetworkReply *reply, const TidalRequest::Artist &artist, const TidalRequest::Album &album, const int limit_requested, const int offset_requested, const bool auto_login = false);
 
-  void ArtistAlbumsReplyReceived(QNetworkReply *reply, const Artist &artist, const int offset_requested);
-  void AlbumSongsReplyReceived(QNetworkReply *reply, const Artist &artist, const Album &album, const int offset_requested);
+  void ArtistAlbumsReplyReceived(QNetworkReply *reply, const TidalRequest::Artist &artist, const int offset_requested);
+  void AlbumSongsReplyReceived(QNetworkReply *reply, const TidalRequest::Artist &artist, const TidalRequest::Album &album, const int offset_requested);
   void AlbumCoverReceived(QNetworkReply *reply, const QString &album_id, const QUrl &url, const QString &filename);
 
  public Q_SLOTS: