diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 1a5f5cb42b..efc035fce6 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -19,7 +19,6 @@ target_sources(common PRIVATE
FastFormatString.cpp
FastJmp.cpp
FileSystem.cpp
- IniInterface.cpp
Mutex.cpp
Misc.cpp
MD5Digest.cpp
diff --git a/common/common.vcxproj b/common/common.vcxproj
index 3bb8544384..05c2bebc94 100644
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -58,7 +58,6 @@
-
diff --git a/common/common.vcxproj.filters b/common/common.vcxproj.filters
index 205252f179..4dee7bf1f2 100644
--- a/common/common.vcxproj.filters
+++ b/common/common.vcxproj.filters
@@ -25,9 +25,6 @@
Source Files
-
- Source Files
-
Source Files
diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 7c644bb7f7..4d472acec5 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -1109,6 +1109,7 @@ set(pcsx2GuiSources
gui/ExecutorThread.cpp
gui/FrameForGS.cpp
gui/GlobalCommands.cpp
+ gui/IniInterface.cpp
gui/i18n.cpp
gui/IsoDropTarget.cpp
gui/MainFrame.cpp
@@ -1172,6 +1173,7 @@ set(pcsx2GuiHeaders
gui/DriveList.h
gui/GSFrame.h
gui/i18n.h
+ gui/IniInterface.h
gui/IsoDropTarget.h
gui/MainFrame.h
gui/MSWstuff.h
diff --git a/pcsx2/DEV9/DEV9Config.cpp b/pcsx2/DEV9/DEV9Config.cpp
index 872c167ce9..4c30f27c76 100644
--- a/pcsx2/DEV9/DEV9Config.cpp
+++ b/pcsx2/DEV9/DEV9Config.cpp
@@ -19,10 +19,10 @@
#include
#include "DEV9.h"
-#include "common/IniInterface.h"
#ifndef PCSX2_CORE
#include "gui/AppConfig.h"
+#include "gui/IniInterface.h"
#endif
#ifdef _WIN32
diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp
index 98eb9817e0..666eea3abf 100644
--- a/pcsx2/gui/AppConfig.cpp
+++ b/pcsx2/gui/AppConfig.cpp
@@ -16,8 +16,7 @@
#include "PrecompiledHeader.h"
#include "App.h"
#include "MainFrame.h"
-
-#include "common/IniInterface.h"
+#include "IniInterface.h"
#include "common/SettingsWrapper.h"
#include "wxSettingsInterface.h"
diff --git a/pcsx2/gui/AppEventListeners.h b/pcsx2/gui/AppEventListeners.h
index 27446e6ffe..79bc53f326 100644
--- a/pcsx2/gui/AppEventListeners.h
+++ b/pcsx2/gui/AppEventListeners.h
@@ -16,8 +16,8 @@
#pragma once
#include "common/EventSource.h"
+#include "gui/IniInterface.h"
#include "gui/pxEvents.h"
-#include "common/IniInterface.h"
enum CoreThreadStatus
{
diff --git a/pcsx2/gui/AppEventSources.cpp b/pcsx2/gui/AppEventSources.cpp
index ae59314381..ab0cc0b5fd 100644
--- a/pcsx2/gui/AppEventSources.cpp
+++ b/pcsx2/gui/AppEventSources.cpp
@@ -15,7 +15,7 @@
#include "PrecompiledHeader.h"
#include "App.h"
-#include "common/IniInterface.h"
+#include "IniInterface.h"
#include "common/EventSource.inl"
template class EventSource< IEventListener_CoreThread >;
diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp
index a7348493f7..cebe5558cf 100644
--- a/pcsx2/gui/AppInit.cpp
+++ b/pcsx2/gui/AppInit.cpp
@@ -19,8 +19,8 @@
#include "ConsoleLogger.h"
#include "MSWstuff.h"
#include "MTVU.h" // for thread cancellation on shutdown
+#include "IniInterface.h"
-#include "common/IniInterface.h"
#include "common/StringUtil.h"
#include "DebugTools/Debug.h"
#include "Dialogs/ModalPopups.h"
diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp
index e3e167d1c0..ca1278e745 100644
--- a/pcsx2/gui/AppMain.cpp
+++ b/pcsx2/gui/AppMain.cpp
@@ -21,6 +21,7 @@
#include "Host.h"
#include "AppSaveStates.h"
#include "AppAccelerators.h"
+#include "IniInterface.h"
#include "PAD/Gamepad.h"
#include "ps2/BiosTools.h"
@@ -36,7 +37,6 @@
# include "Recording/InputRecording.h"
#endif
-#include "common/IniInterface.h"
#include "common/FileSystem.h"
#include "common/StringUtil.h"
#include "common/AppTrait.h"
diff --git a/pcsx2/gui/AppUserMode.cpp b/pcsx2/gui/AppUserMode.cpp
index 8e5b9c38fb..eeb4265f51 100644
--- a/pcsx2/gui/AppUserMode.cpp
+++ b/pcsx2/gui/AppUserMode.cpp
@@ -15,7 +15,7 @@
#include "PrecompiledHeader.h"
#include "MainFrame.h"
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
#include "Dialogs/ModalPopups.h"
#include
diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp
index 0e96b6d14f..8ff9c48f44 100644
--- a/pcsx2/gui/ConsoleLogger.cpp
+++ b/pcsx2/gui/ConsoleLogger.cpp
@@ -19,9 +19,9 @@
#include "ConsoleLogger.h"
#include "MSWstuff.h"
#include "Host.h"
+#include "IniInterface.h"
#include "common/Console.h"
-#include "common/IniInterface.h"
#include "common/SafeArray.inl"
#include "Dialogs/LogOptionsDialog.h"
#include "DebugTools/Debug.h"
diff --git a/common/IniInterface.cpp b/pcsx2/gui/IniInterface.cpp
similarity index 99%
rename from common/IniInterface.cpp
rename to pcsx2/gui/IniInterface.cpp
index 02cacee4df..529bf3ea3a 100644
--- a/common/IniInterface.cpp
+++ b/pcsx2/gui/IniInterface.cpp
@@ -15,7 +15,7 @@
#include
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
#include "common/Console.h"
const wxRect wxDefaultRect(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord);
diff --git a/common/IniInterface.h b/pcsx2/gui/IniInterface.h
similarity index 99%
rename from common/IniInterface.h
rename to pcsx2/gui/IniInterface.h
index 2ed3d18e0c..9b9c6bfe39 100644
--- a/common/IniInterface.h
+++ b/pcsx2/gui/IniInterface.h
@@ -15,7 +15,7 @@
#pragma once
-#include "Path.h"
+#include "common/Path.h"
#include
#include
#include
diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp
index 5883fcb056..c29a7e9e49 100644
--- a/pcsx2/gui/MainMenuClicks.cpp
+++ b/pcsx2/gui/MainMenuClicks.cpp
@@ -19,6 +19,7 @@
#include "CDVD/CDVD.h"
#include "GS.h"
#include "GSFrame.h"
+#include "IniInterface.h"
#include "SPU2/spu2.h"
#include "System/SysThreads.h"
#include "DEV9/DEV9.h"
@@ -33,7 +34,6 @@
#include "Dialogs/ConfigurationDialog.h"
#include "Debugger/DisassemblyDialog.h"
-#include "common/IniInterface.h"
#include "fmt/core.h"
#include "wx/numdlg.h"
diff --git a/pcsx2/gui/Panels/LogOptionsPanels.cpp b/pcsx2/gui/Panels/LogOptionsPanels.cpp
index 293afcf51c..16d32df9ec 100644
--- a/pcsx2/gui/Panels/LogOptionsPanels.cpp
+++ b/pcsx2/gui/Panels/LogOptionsPanels.cpp
@@ -16,7 +16,7 @@
#include "PrecompiledHeader.h"
#include "LogOptionsPanels.h"
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
#include "DebugTools/Debug.h"
#include
diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp
index 2f4d81ecb2..4afa9478da 100644
--- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp
+++ b/pcsx2/gui/Panels/MemoryCardListPanel.cpp
@@ -22,7 +22,7 @@
#include "MemoryCardPanels.h"
#include "gui/Dialogs/ConfigurationDialog.h"
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
#include "common/StringUtil.h"
#include "Sio.h"
diff --git a/pcsx2/gui/Panels/MemoryCardListView.cpp b/pcsx2/gui/Panels/MemoryCardListView.cpp
index 796bc05a2c..fbca417416 100644
--- a/pcsx2/gui/Panels/MemoryCardListView.cpp
+++ b/pcsx2/gui/Panels/MemoryCardListView.cpp
@@ -19,7 +19,7 @@
#include "gui/Dialogs/ConfigurationDialog.h"
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
using namespace pxSizerFlags;
using namespace Panels;
diff --git a/pcsx2/gui/RecentIsoList.cpp b/pcsx2/gui/RecentIsoList.cpp
index a17bdde600..4e36c125bd 100644
--- a/pcsx2/gui/RecentIsoList.cpp
+++ b/pcsx2/gui/RecentIsoList.cpp
@@ -18,7 +18,7 @@
#include "AppCoreThread.h"
#include "RecentIsoList.h"
#include "IsoDropTarget.h"
-#include "common/IniInterface.h"
+#include "IniInterface.h"
extern wxString GetMsg_IsoImageChanged();
diff --git a/pcsx2/gui/wxHelpers.cpp b/pcsx2/gui/wxHelpers.cpp
index 4cdbddb818..706902d478 100644
--- a/pcsx2/gui/wxHelpers.cpp
+++ b/pcsx2/gui/wxHelpers.cpp
@@ -20,7 +20,7 @@
#include
#include "common/General.h"
#include "common/Threading.h"
-#include "common/IniInterface.h"
+#include "gui/IniInterface.h"
#include "gui/wxGuiTools.h"
#include "gui/pxStaticText.h"
diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj
index 1f7987b3dc..b059eb39ab 100644
--- a/pcsx2/pcsx2.vcxproj
+++ b/pcsx2/pcsx2.vcxproj
@@ -349,6 +349,7 @@
+
@@ -797,6 +798,7 @@
+
diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters
index f9a5d6c7b2..125be43acb 100644
--- a/pcsx2/pcsx2.vcxproj.filters
+++ b/pcsx2/pcsx2.vcxproj.filters
@@ -1766,6 +1766,9 @@
System\Ps2\EmotionEngine\EE\Dynarec
+
+ AppHost
+
@@ -2933,6 +2936,9 @@
System\Ps2\EmotionEngine\EE\Dynarec
+
+ AppHost
+