diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp
index c98a8b036..20f2cb93e 100644
--- a/src/citra_qt/game_list.cpp
+++ b/src/citra_qt/game_list.cpp
@@ -4,17 +4,27 @@
 
 #include <QApplication>
 #include <QFileInfo>
+#include <QFileSystemWatcher>
+#include <QHBoxLayout>
 #include <QHeaderView>
 #include <QKeyEvent>
+#include <QLabel>
+#include <QLineEdit>
 #include <QMenu>
+#include <QModelIndex>
+#include <QStandardItem>
+#include <QStandardItemModel>
 #include <QThreadPool>
+#include <QToolButton>
+#include <QTreeView>
+#include "citra_qt/game_list.h"
+#include "citra_qt/game_list_p.h"
+#include "citra_qt/main.h"
+#include "citra_qt/ui_settings.h"
 #include "common/common_paths.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/loader/loader.h"
-#include "game_list.h"
-#include "game_list_p.h"
-#include "ui_settings.h"
 
 GameList::SearchField::KeyReleaseEater::KeyReleaseEater(GameList* gamelist) {
     this->gamelist = gamelist;
diff --git a/src/citra_qt/game_list.h b/src/citra_qt/game_list.h
index 4823a1296..86ea869e9 100644
--- a/src/citra_qt/game_list.h
+++ b/src/citra_qt/game_list.h
@@ -4,22 +4,22 @@
 
 #pragma once
 
-#include <QFileSystemWatcher>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QModelIndex>
-#include <QSettings>
-#include <QStandardItem>
-#include <QStandardItemModel>
 #include <QString>
-#include <QToolButton>
-#include <QTreeView>
-#include <QVBoxLayout>
 #include <QWidget>
-#include "main.h"
+#include "common/common_types.h"
 
 class GameListWorker;
+class GMainWindow;
+class QFileSystemWatcher;
+class QHBoxLayout;
+class QLabel;
+class QLineEdit;
+class QModelIndex;
+class QStandardItem;
+class QStandardItemModel;
+class QTreeView;
+class QToolButton;
+class QVBoxLayout;
 
 class GameList : public QWidget {
     Q_OBJECT