diff --git a/CMakeLists.txt b/CMakeLists.txt
index d39083252a..fba3771033 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1740,6 +1740,8 @@ add_library(${CoreLibName} ${CoreLinkType}
 	${CommonJIT}
 	Core/Config.cpp
 	Core/Config.h
+	Core/ConfigSettings.cpp
+	Core/ConfigSettings.h
 	Core/ConfigValues.h
 	Core/ControlMapper.cpp
 	Core/ControlMapper.h
diff --git a/Core/ConfigSettings.cpp b/Core/ConfigSettings.cpp
new file mode 100644
index 0000000000..9410dbfd9d
--- /dev/null
+++ b/Core/ConfigSettings.cpp
@@ -0,0 +1,3 @@
+#include "Core/ConfigSettings.h"
+#include "Core/ConfigValues.h"
+
diff --git a/Core/ConfigSettings.h b/Core/ConfigSettings.h
new file mode 100644
index 0000000000..3f59c932d3
--- /dev/null
+++ b/Core/ConfigSettings.h
@@ -0,0 +1,2 @@
+#pragma once
+
diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj
index 7f8c5d0a64..1eaeaef5b1 100644
--- a/UWP/CoreUWP/CoreUWP.vcxproj
+++ b/UWP/CoreUWP/CoreUWP.vcxproj
@@ -281,6 +281,7 @@
     <ClInclude Include="..\..\Core\AVIDump.h" />
     <ClInclude Include="..\..\Core\Compatibility.h" />
     <ClInclude Include="..\..\Core\Config.h" />
+    <ClInclude Include="..\..\Core\ConfigSettings.h" />
     <ClInclude Include="..\..\Core\ControlMapper.h" />
     <ClInclude Include="..\..\Core\Core.h" />
     <ClInclude Include="..\..\Core\CoreParameter.h" />
@@ -521,6 +522,7 @@
     <ClCompile Include="..\..\Core\AVIDump.cpp" />
     <ClCompile Include="..\..\Core\Compatibility.cpp" />
     <ClCompile Include="..\..\Core\Config.cpp" />
+    <ClCompile Include="..\..\Core\ConfigSettings.cpp" />
     <ClCompile Include="..\..\Core\ControlMapper.cpp" />
     <ClCompile Include="..\..\Core\Core.cpp" />
     <ClCompile Include="..\..\Core\CoreTiming.cpp" />
diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters
index e6d4485bb1..85f5201e01 100644
--- a/UWP/CoreUWP/CoreUWP.vcxproj.filters
+++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters
@@ -1126,6 +1126,7 @@
     <ClCompile Include="..\..\Core\MIPS\MIPSVFPUFallbacks.cpp">
       <Filter>MIPS</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Core\ConfigSettings.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -1780,6 +1781,7 @@
     <ClInclude Include="..\..\Core\MIPS\MIPSVFPUFallbacks.h">
       <Filter>MIPS</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Core\ConfigSettings.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\ext\gason\LICENSE">
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 08c80409e4..38301fb436 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -440,6 +440,7 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Core/Core.cpp \
   $(SRC)/Core/Compatibility.cpp \
   $(SRC)/Core/Config.cpp \
+  $(SRC)/Core/ConfigSettings.cpp \
   $(SRC)/Core/CoreTiming.cpp \
   $(SRC)/Core/CwCheat.cpp \
   $(SRC)/Core/HDRemaster.cpp \
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index d0b58dd588..e5d39bc963 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -501,6 +501,7 @@ SOURCES_CXX += \
 	       $(EXTDIR)/jpge/jpge.cpp \
 	       $(COREDIR)/AVIDump.cpp \
 	       $(COREDIR)/Config.cpp \
+	       $(COREDIR)/ConfigSettings.cpp \
 	       $(COREDIR)/ControlMapper.cpp \
 	       $(COREDIR)/Core.cpp \
 	       $(COREDIR)/WaveFile.cpp \