diff --git a/Source/Core/DolphinQt/InfinityBase/InfinityBaseWindow.cpp b/Source/Core/DolphinQt/InfinityBase/InfinityBaseWindow.cpp
index 3d6a3a7d3c..e0642b14a4 100644
--- a/Source/Core/DolphinQt/InfinityBase/InfinityBaseWindow.cpp
+++ b/Source/Core/DolphinQt/InfinityBase/InfinityBaseWindow.cpp
@@ -3,6 +3,8 @@
 
 #include "DolphinQt/InfinityBase/InfinityBaseWindow.h"
 
+#include <string>
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QCompleter>
@@ -19,6 +21,8 @@
 #include "Common/IOFile.h"
 
 #include "Core/Config/MainSettings.h"
+#include "Core/Core.h"
+#include "Core/IOS/USB/Emulated/Infinity.h"
 #include "Core/System.h"
 
 #include "DolphinQt/QtUtils/DolphinFileDialog.h"
diff --git a/Source/Core/DolphinQt/InfinityBase/InfinityBaseWindow.h b/Source/Core/DolphinQt/InfinityBase/InfinityBaseWindow.h
index 62b2b1c7fa..b66e17d0f6 100644
--- a/Source/Core/DolphinQt/InfinityBase/InfinityBaseWindow.h
+++ b/Source/Core/DolphinQt/InfinityBase/InfinityBaseWindow.h
@@ -4,18 +4,21 @@
 #pragma once
 
 #include <array>
-#include <string>
 
 #include <QDialog>
-#include <QVBoxLayout>
 #include <QWidget>
 
-#include "Core/Core.h"
-#include "Core/IOS/USB/Emulated/Infinity.h"
+#include "Common/CommonTypes.h"
 
 class QCheckBox;
 class QGroupBox;
 class QLineEdit;
+class QVBoxLayout;
+
+namespace Core
+{
+enum class State;
+}
 
 class InfinityBaseWindow : public QWidget
 {