diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index cac39e4e0..691039586 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -55,7 +55,6 @@
 
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/sessionstatus.h"
-#include "base/bittorrent/torrent.h"
 #include "base/global.h"
 #include "base/logger.h"
 #include "base/net/downloadmanager.h"
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 8fa089adb..12d56ed83 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -35,6 +35,8 @@
 #include <QSystemTrayIcon>
 #endif
 
+#include "base/bittorrent/torrent.h"
+
 class QCloseEvent;
 class QFileSystemWatcher;
 class QSplitter;
@@ -57,11 +59,6 @@ class TorrentCreatorDialog;
 class TransferListFiltersWidget;
 class TransferListWidget;
 
-namespace BitTorrent
-{
-    class Torrent;
-}
-
 namespace Net
 {
     struct DownloadResult;
diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp
index 7210fcef5..042e955b2 100644
--- a/src/gui/transferlistfilterswidget.cpp
+++ b/src/gui/transferlistfilterswidget.cpp
@@ -38,10 +38,8 @@
 #include <QUrl>
 #include <QVBoxLayout>
 
-#include "base/bittorrent/infohash.h"
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrent.h"
-#include "base/bittorrent/trackerentry.h"
 #include "base/global.h"
 #include "base/logger.h"
 #include "base/net/downloadmanager.h"
diff --git a/src/gui/transferlistfilterswidget.h b/src/gui/transferlistfilterswidget.h
index b47077ead..0a0f39491 100644
--- a/src/gui/transferlistfilterswidget.h
+++ b/src/gui/transferlistfilterswidget.h
@@ -32,6 +32,9 @@
 #include <QListWidget>
 #include <QtContainerFwd>
 
+#include "base/bittorrent/infohash.h"
+#include "base/bittorrent/trackerentry.h"
+
 class QCheckBox;
 class QResizeEvent;
 
@@ -40,8 +43,6 @@ class TransferListWidget;
 namespace BitTorrent
 {
     class Torrent;
-    class TorrentID;
-    struct TrackerEntry;
 }
 
 namespace Net
diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp
index fba5468ae..e42a144c9 100644
--- a/src/gui/transferlistwidget.cpp
+++ b/src/gui/transferlistwidget.cpp
@@ -44,7 +44,6 @@
 #include <QWheelEvent>
 
 #include "base/bittorrent/common.h"
-#include "base/bittorrent/infohash.h"
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrent.h"
 #include "base/bittorrent/trackerentry.h"
diff --git a/src/gui/transferlistwidget.h b/src/gui/transferlistwidget.h
index ef1400e3b..9257ea15b 100644
--- a/src/gui/transferlistwidget.h
+++ b/src/gui/transferlistwidget.h
@@ -29,9 +29,12 @@
 #pragma once
 
 #include <functional>
+
 #include <QtContainerFwd>
 #include <QTreeView>
 
+#include "base/bittorrent/infohash.h"
+
 class MainWindow;
 class TransferListModel;
 class TransferListSortModel;
@@ -39,7 +42,6 @@ class TransferListSortModel;
 namespace BitTorrent
 {
     class Torrent;
-    class TorrentID;
 }
 
 enum class CopyInfohashPolicy