diff --git a/DDrawCompat/Config/Config.cpp b/DDrawCompat/Config/Config.cpp
index beaf024..a65ae6b 100644
--- a/DDrawCompat/Config/Config.cpp
+++ b/DDrawCompat/Config/Config.cpp
@@ -1,4 +1,37 @@
-#include <Config/Config.h>
+#include <Config/Settings/AlignSysMemSurfaces.h>
+#include <Config/Settings/AlternatePixelCenter.h>
+#include <Config/Settings/AltTabFix.h>
+#include <Config/Settings/Antialiasing.h>
+#include <Config/Settings/BltFilter.h>
+#include <Config/Settings/ConfigHotKey.h>
+#include <Config/Settings/CpuAffinity.h>
+#include <Config/Settings/CpuAffinityRotation.h>
+#include <Config/Settings/DesktopColorDepth.h>
+#include <Config/Settings/DisplayFilter.h>
+#include <Config/Settings/DisplayRefreshRate.h>
+#include <Config/Settings/DisplayResolution.h>
+#include <Config/Settings/DpiAwareness.h>
+#include <Config/Settings/FontAntialiasing.h>
+#include <Config/Settings/ForceD3D9On12.h>
+#include <Config/Settings/FpsLimiter.h>
+#include <Config/Settings/FullscreenMode.h>
+#include <Config/Settings/LogLevel.h>
+#include <Config/Settings/PalettizedTextures.h>
+#include <Config/Settings/RemoveBorders.h>
+#include <Config/Settings/RenderColorDepth.h>
+#include <Config/Settings/ResolutionScale.h>
+#include <Config/Settings/ResolutionScaleFilter.h>
+#include <Config/Settings/SoftwareDevice.h>
+#include <Config/Settings/SpriteDetection.h>
+#include <Config/Settings/SpriteFilter.h>
+#include <Config/Settings/SpriteTexCoord.h>
+#include <Config/Settings/StatsHotKey.h>
+#include <Config/Settings/SupportedResolutions.h>
+#include <Config/Settings/TerminateHotKey.h>
+#include <Config/Settings/TextureFilter.h>
+#include <Config/Settings/ThreadPriorityBoost.h>
+#include <Config/Settings/VSync.h>
+#include <Config/Settings/WinVersionLie.h>
 
 namespace Config
 {
diff --git a/DDrawCompat/Config/Config.h b/DDrawCompat/Config/Config.h
deleted file mode 100644
index d42cba6..0000000
--- a/DDrawCompat/Config/Config.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma once
-
-#include <Config/Settings/AlignSysMemSurfaces.h>
-#include <Config/Settings/AlternatePixelCenter.h>
-#include <Config/Settings/AltTabFix.h>
-#include <Config/Settings/Antialiasing.h>
-#include <Config/Settings/BltFilter.h>
-#include <Config/Settings/ConfigHotKey.h>
-#include <Config/Settings/CpuAffinity.h>
-#include <Config/Settings/CpuAffinityRotation.h>
-#include <Config/Settings/DesktopColorDepth.h>
-#include <Config/Settings/DisplayFilter.h>
-#include <Config/Settings/DisplayRefreshRate.h>
-#include <Config/Settings/DisplayResolution.h>
-#include <Config/Settings/DpiAwareness.h>
-#include <Config/Settings/FontAntialiasing.h>
-#include <Config/Settings/ForceD3D9On12.h>
-#include <Config/Settings/FpsLimiter.h>
-#include <Config/Settings/FullscreenMode.h>
-#include <Config/Settings/LogLevel.h>
-#include <Config/Settings/PalettizedTextures.h>
-#include <Config/Settings/RemoveBorders.h>
-#include <Config/Settings/RenderColorDepth.h>
-#include <Config/Settings/ResolutionScale.h>
-#include <Config/Settings/ResolutionScaleFilter.h>
-#include <Config/Settings/SoftwareDevice.h>
-#include <Config/Settings/SpriteDetection.h>
-#include <Config/Settings/SpriteFilter.h>
-#include <Config/Settings/SpriteTexCoord.h>
-#include <Config/Settings/StatsHotKey.h>
-#include <Config/Settings/SupportedResolutions.h>
-#include <Config/Settings/TerminateHotKey.h>
-#include <Config/Settings/TextureFilter.h>
-#include <Config/Settings/ThreadPriorityBoost.h>
-#include <Config/Settings/VSync.h>
-#include <Config/Settings/WinVersionLie.h>
-
-namespace Config
-{
-	extern Settings::AlignSysMemSurfaces alignSysMemSurfaces;
-	extern Settings::AlternatePixelCenter alternatePixelCenter;
-	extern Settings::AltTabFix altTabFix;
-	extern Settings::Antialiasing antialiasing;
-	extern Settings::BltFilter bltFilter;
-	extern Settings::ConfigHotKey configHotKey;
-	extern Settings::CpuAffinity cpuAffinity;
-	extern Settings::CpuAffinityRotation cpuAffinityRotation;
-	extern Settings::DesktopColorDepth desktopColorDepth;
-	extern Settings::DisplayFilter displayFilter;
-	extern Settings::DisplayRefreshRate displayRefreshRate;
-	extern Settings::DisplayResolution displayResolution;
-	extern Settings::DpiAwareness dpiAwareness;
-	extern Settings::FontAntialiasing fontAntialiasing;
-	extern Settings::ForceD3D9On12 forceD3D9On12;
-	extern Settings::FpsLimiter fpsLimiter;
-	extern Settings::FullscreenMode fullscreenMode;
-	extern Settings::LogLevel logLevel;
-	extern Settings::PalettizedTextures palettizedTextures;
-	extern Settings::RemoveBorders removeBorders;
-	extern Settings::RenderColorDepth renderColorDepth;
-	extern Settings::ResolutionScale resolutionScale;
-	extern Settings::ResolutionScaleFilter resolutionScaleFilter;
-	extern Settings::SoftwareDevice softwareDevice;
-	extern Settings::SpriteDetection spriteDetection;
-	extern Settings::SpriteFilter spriteFilter;
-	extern Settings::SpriteTexCoord spriteTexCoord;
-	extern Settings::StatsHotKey statsHotKey;
-	extern Settings::SupportedResolutions supportedResolutions;
-	extern Settings::TerminateHotKey terminateHotKey;
-	extern Settings::TextureFilter textureFilter;
-	extern Settings::ThreadPriorityBoost threadPriorityBoost;
-	extern Settings::VSync vSync;
-	extern Settings::WinVersionLie winVersionLie;
-}
diff --git a/DDrawCompat/Config/Settings/AlignSysMemSurfaces.h b/DDrawCompat/Config/Settings/AlignSysMemSurfaces.h
index 7c06461..62dde0b 100644
--- a/DDrawCompat/Config/Settings/AlignSysMemSurfaces.h
+++ b/DDrawCompat/Config/Settings/AlignSysMemSurfaces.h
@@ -15,4 +15,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::AlignSysMemSurfaces alignSysMemSurfaces;
 }
diff --git a/DDrawCompat/Config/Settings/AltTabFix.h b/DDrawCompat/Config/Settings/AltTabFix.h
index af444ef..6d3f460 100644
--- a/DDrawCompat/Config/Settings/AltTabFix.h
+++ b/DDrawCompat/Config/Settings/AltTabFix.h
@@ -21,4 +21,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::AltTabFix altTabFix;
 }
diff --git a/DDrawCompat/Config/Settings/AlternatePixelCenter.h b/DDrawCompat/Config/Settings/AlternatePixelCenter.h
index 4e909e3..34fca7f 100644
--- a/DDrawCompat/Config/Settings/AlternatePixelCenter.h
+++ b/DDrawCompat/Config/Settings/AlternatePixelCenter.h
@@ -15,4 +15,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::AlternatePixelCenter alternatePixelCenter;
 }
diff --git a/DDrawCompat/Config/Settings/Antialiasing.h b/DDrawCompat/Config/Settings/Antialiasing.h
index 60a8e28..0884fa8 100644
--- a/DDrawCompat/Config/Settings/Antialiasing.h
+++ b/DDrawCompat/Config/Settings/Antialiasing.h
@@ -14,4 +14,6 @@ namespace Config
 			virtual ParamInfo getParamInfo() const override;
 		};
 	}
+
+	extern Settings::Antialiasing antialiasing;
 }
diff --git a/DDrawCompat/Config/Settings/BltFilter.h b/DDrawCompat/Config/Settings/BltFilter.h
index f1a09ec..09231aa 100644
--- a/DDrawCompat/Config/Settings/BltFilter.h
+++ b/DDrawCompat/Config/Settings/BltFilter.h
@@ -18,4 +18,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::BltFilter bltFilter;
 }
diff --git a/DDrawCompat/Config/Settings/ConfigHotKey.h b/DDrawCompat/Config/Settings/ConfigHotKey.h
index 08f1beb..0ebba41 100644
--- a/DDrawCompat/Config/Settings/ConfigHotKey.h
+++ b/DDrawCompat/Config/Settings/ConfigHotKey.h
@@ -12,4 +12,6 @@ namespace Config
 			ConfigHotKey() : HotKeySetting("ConfigHotKey", "shift+f11") {}
 		};
 	}
+
+	extern Settings::ConfigHotKey configHotKey;
 }
diff --git a/DDrawCompat/Config/Settings/CpuAffinity.h b/DDrawCompat/Config/Settings/CpuAffinity.h
index 9b1e6cc..2bf5f4f 100644
--- a/DDrawCompat/Config/Settings/CpuAffinity.h
+++ b/DDrawCompat/Config/Settings/CpuAffinity.h
@@ -21,4 +21,6 @@ namespace Config
 			unsigned m_value;
 		};
 	}
+
+	extern Settings::CpuAffinity cpuAffinity;
 }
diff --git a/DDrawCompat/Config/Settings/CpuAffinityRotation.h b/DDrawCompat/Config/Settings/CpuAffinityRotation.h
index 8553b20..469d723 100644
--- a/DDrawCompat/Config/Settings/CpuAffinityRotation.h
+++ b/DDrawCompat/Config/Settings/CpuAffinityRotation.h
@@ -15,4 +15,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::CpuAffinityRotation cpuAffinityRotation;
 }
diff --git a/DDrawCompat/Config/Settings/DesktopColorDepth.h b/DDrawCompat/Config/Settings/DesktopColorDepth.h
index 6182fbd..9e683a6 100644
--- a/DDrawCompat/Config/Settings/DesktopColorDepth.h
+++ b/DDrawCompat/Config/Settings/DesktopColorDepth.h
@@ -17,4 +17,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::DesktopColorDepth desktopColorDepth;
 }
diff --git a/DDrawCompat/Config/Settings/DisplayFilter.h b/DDrawCompat/Config/Settings/DisplayFilter.h
index 727459a..342d059 100644
--- a/DDrawCompat/Config/Settings/DisplayFilter.h
+++ b/DDrawCompat/Config/Settings/DisplayFilter.h
@@ -17,4 +17,6 @@ namespace Config
 			virtual ParamInfo getParamInfo() const override;
 		};
 	}
+
+	extern Settings::DisplayFilter displayFilter;
 }
diff --git a/DDrawCompat/Config/Settings/DisplayRefreshRate.h b/DDrawCompat/Config/Settings/DisplayRefreshRate.h
index 0a49c15..521d4ed 100644
--- a/DDrawCompat/Config/Settings/DisplayRefreshRate.h
+++ b/DDrawCompat/Config/Settings/DisplayRefreshRate.h
@@ -19,4 +19,6 @@ namespace Config
 			void setValue(const std::string& value) override;
 		};
 	}
+
+	extern Settings::DisplayRefreshRate displayRefreshRate;
 }
diff --git a/DDrawCompat/Config/Settings/DisplayResolution.h b/DDrawCompat/Config/Settings/DisplayResolution.h
index 32761d2..b1f36cf 100644
--- a/DDrawCompat/Config/Settings/DisplayResolution.h
+++ b/DDrawCompat/Config/Settings/DisplayResolution.h
@@ -22,4 +22,6 @@ namespace Config
 			void setValue(const std::string& value) override;
 		};
 	}
+
+	extern Settings::DisplayResolution displayResolution;
 }
diff --git a/DDrawCompat/Config/Settings/DpiAwareness.h b/DDrawCompat/Config/Settings/DpiAwareness.h
index ddb448d..3e2a6aa 100644
--- a/DDrawCompat/Config/Settings/DpiAwareness.h
+++ b/DDrawCompat/Config/Settings/DpiAwareness.h
@@ -22,4 +22,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::DpiAwareness dpiAwareness;
 }
diff --git a/DDrawCompat/Config/Settings/FontAntialiasing.h b/DDrawCompat/Config/Settings/FontAntialiasing.h
index a0f3153..d05487d 100644
--- a/DDrawCompat/Config/Settings/FontAntialiasing.h
+++ b/DDrawCompat/Config/Settings/FontAntialiasing.h
@@ -19,4 +19,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::FontAntialiasing fontAntialiasing;
 }
diff --git a/DDrawCompat/Config/Settings/ForceD3D9On12.h b/DDrawCompat/Config/Settings/ForceD3D9On12.h
index bc85415..28a1ad0 100644
--- a/DDrawCompat/Config/Settings/ForceD3D9On12.h
+++ b/DDrawCompat/Config/Settings/ForceD3D9On12.h
@@ -15,4 +15,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::ForceD3D9On12 forceD3D9On12;
 }
diff --git a/DDrawCompat/Config/Settings/FpsLimiter.h b/DDrawCompat/Config/Settings/FpsLimiter.h
index c4ab5bf..38a5d6a 100644
--- a/DDrawCompat/Config/Settings/FpsLimiter.h
+++ b/DDrawCompat/Config/Settings/FpsLimiter.h
@@ -19,4 +19,6 @@ namespace Config
 			virtual ParamInfo getParamInfo() const override;
 		};
 	}
+
+	extern Settings::FpsLimiter fpsLimiter;
 }
diff --git a/DDrawCompat/Config/Settings/FullscreenMode.h b/DDrawCompat/Config/Settings/FullscreenMode.h
index 5935dde..7522f5c 100644
--- a/DDrawCompat/Config/Settings/FullscreenMode.h
+++ b/DDrawCompat/Config/Settings/FullscreenMode.h
@@ -18,4 +18,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::FullscreenMode fullscreenMode;
 }
diff --git a/DDrawCompat/Config/Settings/LogLevel.h b/DDrawCompat/Config/Settings/LogLevel.h
index 5f32b93..a41181a 100644
--- a/DDrawCompat/Config/Settings/LogLevel.h
+++ b/DDrawCompat/Config/Settings/LogLevel.h
@@ -26,4 +26,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::LogLevel logLevel;
 }
diff --git a/DDrawCompat/Config/Settings/PalettizedTextures.h b/DDrawCompat/Config/Settings/PalettizedTextures.h
index bf3e9e9..7b37d41 100644
--- a/DDrawCompat/Config/Settings/PalettizedTextures.h
+++ b/DDrawCompat/Config/Settings/PalettizedTextures.h
@@ -15,4 +15,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::PalettizedTextures palettizedTextures;
 }
diff --git a/DDrawCompat/Config/Settings/RemoveBorders.h b/DDrawCompat/Config/Settings/RemoveBorders.h
index e43d52b..c5536e9 100644
--- a/DDrawCompat/Config/Settings/RemoveBorders.h
+++ b/DDrawCompat/Config/Settings/RemoveBorders.h
@@ -15,4 +15,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::RemoveBorders removeBorders;
 }
diff --git a/DDrawCompat/Config/Settings/RenderColorDepth.h b/DDrawCompat/Config/Settings/RenderColorDepth.h
index ebb0b13..2269d98 100644
--- a/DDrawCompat/Config/Settings/RenderColorDepth.h
+++ b/DDrawCompat/Config/Settings/RenderColorDepth.h
@@ -15,4 +15,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::RenderColorDepth renderColorDepth;
 }
diff --git a/DDrawCompat/Config/Settings/ResolutionScale.h b/DDrawCompat/Config/Settings/ResolutionScale.h
index 398f288..406a2ff 100644
--- a/DDrawCompat/Config/Settings/ResolutionScale.h
+++ b/DDrawCompat/Config/Settings/ResolutionScale.h
@@ -24,4 +24,6 @@ namespace Config
 			void setValue(const std::string& value) override;
 		};
 	}
+
+	extern Settings::ResolutionScale resolutionScale;
 }
diff --git a/DDrawCompat/Config/Settings/ResolutionScaleFilter.h b/DDrawCompat/Config/Settings/ResolutionScaleFilter.h
index 78b70fe..b9a4ab1 100644
--- a/DDrawCompat/Config/Settings/ResolutionScaleFilter.h
+++ b/DDrawCompat/Config/Settings/ResolutionScaleFilter.h
@@ -18,4 +18,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::ResolutionScaleFilter resolutionScaleFilter;
 }
diff --git a/DDrawCompat/Config/Settings/SoftwareDevice.h b/DDrawCompat/Config/Settings/SoftwareDevice.h
index 1e7cde4..81a2be8 100644
--- a/DDrawCompat/Config/Settings/SoftwareDevice.h
+++ b/DDrawCompat/Config/Settings/SoftwareDevice.h
@@ -22,4 +22,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::SoftwareDevice softwareDevice;
 }
diff --git a/DDrawCompat/Config/Settings/SpriteDetection.h b/DDrawCompat/Config/Settings/SpriteDetection.h
index 5cb49ee..ccb72c1 100644
--- a/DDrawCompat/Config/Settings/SpriteDetection.h
+++ b/DDrawCompat/Config/Settings/SpriteDetection.h
@@ -19,4 +19,6 @@ namespace Config
 			virtual ParamInfo getParamInfo() const override;
 		};
 	}
+
+	extern Settings::SpriteDetection spriteDetection;
 }
diff --git a/DDrawCompat/Config/Settings/SpriteFilter.h b/DDrawCompat/Config/Settings/SpriteFilter.h
index f22383a..727565c 100644
--- a/DDrawCompat/Config/Settings/SpriteFilter.h
+++ b/DDrawCompat/Config/Settings/SpriteFilter.h
@@ -12,4 +12,6 @@ namespace Config
 			SpriteFilter();
 		};
 	}
+
+	extern Settings::SpriteFilter spriteFilter;
 }
diff --git a/DDrawCompat/Config/Settings/SpriteTexCoord.h b/DDrawCompat/Config/Settings/SpriteTexCoord.h
index 23ba2b4..5142c8a 100644
--- a/DDrawCompat/Config/Settings/SpriteTexCoord.h
+++ b/DDrawCompat/Config/Settings/SpriteTexCoord.h
@@ -19,4 +19,6 @@ namespace Config
 			virtual ParamInfo getParamInfo() const override;
 		};
 	}
+
+	extern Settings::SpriteTexCoord spriteTexCoord;
 }
diff --git a/DDrawCompat/Config/Settings/StatsHotKey.h b/DDrawCompat/Config/Settings/StatsHotKey.h
index f8c959a..f09a5e8 100644
--- a/DDrawCompat/Config/Settings/StatsHotKey.h
+++ b/DDrawCompat/Config/Settings/StatsHotKey.h
@@ -12,4 +12,6 @@ namespace Config
 			StatsHotKey() : HotKeySetting("StatsHotKey", "shift+f12") {}
 		};
 	}
+
+	extern Settings::StatsHotKey statsHotKey;
 }
diff --git a/DDrawCompat/Config/Settings/SupportedResolutions.h b/DDrawCompat/Config/Settings/SupportedResolutions.h
index 12a3997..35e1020 100644
--- a/DDrawCompat/Config/Settings/SupportedResolutions.h
+++ b/DDrawCompat/Config/Settings/SupportedResolutions.h
@@ -27,4 +27,6 @@ namespace Config
 			std::set<SIZE> m_resolutions;
 		};
 	}
+
+	extern Settings::SupportedResolutions supportedResolutions;
 }
diff --git a/DDrawCompat/Config/Settings/TerminateHotKey.h b/DDrawCompat/Config/Settings/TerminateHotKey.h
index 23350fe..8a77c79 100644
--- a/DDrawCompat/Config/Settings/TerminateHotKey.h
+++ b/DDrawCompat/Config/Settings/TerminateHotKey.h
@@ -12,4 +12,6 @@ namespace Config
 			TerminateHotKey() : HotKeySetting("TerminateHotKey", "ctrl+alt+end") {}
 		};
 	}
+
+	extern Settings::TerminateHotKey terminateHotKey;
 }
diff --git a/DDrawCompat/Config/Settings/TextureFilter.h b/DDrawCompat/Config/Settings/TextureFilter.h
index 7556a2d..6e322cb 100644
--- a/DDrawCompat/Config/Settings/TextureFilter.h
+++ b/DDrawCompat/Config/Settings/TextureFilter.h
@@ -18,4 +18,6 @@ namespace Config
 			UINT getMaxAnisotropy() const { return std::get<2>(m_value); }
 		};
 	}
+
+	extern Settings::TextureFilter textureFilter;
 }
diff --git a/DDrawCompat/Config/Settings/ThreadPriorityBoost.h b/DDrawCompat/Config/Settings/ThreadPriorityBoost.h
index 2276ba1..6f55b22 100644
--- a/DDrawCompat/Config/Settings/ThreadPriorityBoost.h
+++ b/DDrawCompat/Config/Settings/ThreadPriorityBoost.h
@@ -17,4 +17,6 @@ namespace Config
 			}
 		};
 	}
+
+	extern Settings::ThreadPriorityBoost threadPriorityBoost;
 }
diff --git a/DDrawCompat/Config/Settings/VSync.h b/DDrawCompat/Config/Settings/VSync.h
index 22348e3..787e4be 100644
--- a/DDrawCompat/Config/Settings/VSync.h
+++ b/DDrawCompat/Config/Settings/VSync.h
@@ -18,4 +18,6 @@ namespace Config
 			virtual ParamInfo getParamInfo() const override;
 		};
 	}
+
+	extern Settings::VSync vSync;
 }
diff --git a/DDrawCompat/Config/Settings/WinVersionLie.h b/DDrawCompat/Config/Settings/WinVersionLie.h
index 85fe8b3..25411e4 100644
--- a/DDrawCompat/Config/Settings/WinVersionLie.h
+++ b/DDrawCompat/Config/Settings/WinVersionLie.h
@@ -23,4 +23,6 @@ namespace Config
 			virtual ParamInfo getParamInfo() const override;
 		};
 	}
+
+	extern Settings::WinVersionLie winVersionLie;
 }
diff --git a/DDrawCompat/D3dDdi/Adapter.cpp b/DDrawCompat/D3dDdi/Adapter.cpp
index 194f98f..151a0e3 100644
--- a/DDrawCompat/D3dDdi/Adapter.cpp
+++ b/DDrawCompat/D3dDdi/Adapter.cpp
@@ -3,7 +3,9 @@
 
 #include <Common/Comparison.h>
 #include <Common/CompatVtable.h>
-#include <Config/Config.h>
+#include <Config/Settings/Antialiasing.h>
+#include <Config/Settings/PalettizedTextures.h>
+#include <Config/Settings/ResolutionScale.h>
 #include <D3dDdi/Adapter.h>
 #include <D3dDdi/AdapterFuncs.h>
 #include <D3dDdi/Device.h>
diff --git a/DDrawCompat/D3dDdi/DeviceState.cpp b/DDrawCompat/D3dDdi/DeviceState.cpp
index a999d09..375f000 100644
--- a/DDrawCompat/D3dDdi/DeviceState.cpp
+++ b/DDrawCompat/D3dDdi/DeviceState.cpp
@@ -1,6 +1,9 @@
 #include <algorithm>
 
-#include <Config/Config.h>
+#include <Config/Settings/AlternatePixelCenter.h>
+#include <Config/Settings/SpriteFilter.h>
+#include <Config/Settings/SpriteTexCoord.h>
+#include <Config/Settings/TextureFilter.h>
 #include <Common/Log.h>
 #include <D3dDdi/Device.h>
 #include <D3dDdi/DeviceState.h>
diff --git a/DDrawCompat/D3dDdi/DrawPrimitive.cpp b/DDrawCompat/D3dDdi/DrawPrimitive.cpp
index bad0a12..f595ddd 100644
--- a/DDrawCompat/D3dDdi/DrawPrimitive.cpp
+++ b/DDrawCompat/D3dDdi/DrawPrimitive.cpp
@@ -1,7 +1,8 @@
 #include <algorithm>
 
 #include <Common/Log.h>
-#include <Config/Config.h>
+#include <Config/Settings/SpriteDetection.h>
+#include <Config/Settings/SpriteTexCoord.h>
 #include <D3dDdi/DrawPrimitive.h>
 #include <D3dDdi/Device.h>
 #include <D3dDdi/Resource.h>
diff --git a/DDrawCompat/D3dDdi/KernelModeThunks.cpp b/DDrawCompat/D3dDdi/KernelModeThunks.cpp
index 0a1ba03..5e34b58 100644
--- a/DDrawCompat/D3dDdi/KernelModeThunks.cpp
+++ b/DDrawCompat/D3dDdi/KernelModeThunks.cpp
@@ -7,7 +7,7 @@
 #include <Common/Hook.h>
 #include <Common/ScopedSrwLock.h>
 #include <Common/Time.h>
-#include <Config/Config.h>
+#include <Config/Settings/ForceD3D9On12.h>
 #include <D3dDdi/Device.h>
 #include <D3dDdi/KernelModeThunks.h>
 #include <D3dDdi/Log/KernelModeThunksLog.h>
diff --git a/DDrawCompat/D3dDdi/Resource.cpp b/DDrawCompat/D3dDdi/Resource.cpp
index b8b80a2..e67dbbe 100644
--- a/DDrawCompat/D3dDdi/Resource.cpp
+++ b/DDrawCompat/D3dDdi/Resource.cpp
@@ -5,7 +5,10 @@
 #include <Common/Log.h>
 #include <Common/Rect.h>
 #include <Common/Time.h>
-#include <Config/Config.h>
+#include <Config/Settings/BltFilter.h>
+#include <Config/Settings/DisplayFilter.h>
+#include <Config/Settings/RenderColorDepth.h>
+#include <Config/Settings/ResolutionScaleFilter.h>
 #include <D3dDdi/Adapter.h>
 #include <D3dDdi/Device.h>
 #include <D3dDdi/KernelModeThunks.h>
diff --git a/DDrawCompat/DDraw/DirectDraw.cpp b/DDrawCompat/DDraw/DirectDraw.cpp
index f88d9f7..e20748b 100644
--- a/DDrawCompat/DDraw/DirectDraw.cpp
+++ b/DDrawCompat/DDraw/DirectDraw.cpp
@@ -5,7 +5,9 @@
 #include <Common/Comparison.h>
 #include <Common/CompatPtr.h>
 #include <Common/CompatVtable.h>
-#include <Config/Config.h>
+#include <Config/Settings/AltTabFix.h>
+#include <Config/Settings/PalettizedTextures.h>
+#include <Config/Settings/SoftwareDevice.h>
 #include <D3dDdi/Adapter.h>
 #include <D3dDdi/Device.h>
 #include <D3dDdi/KernelModeThunks.h>
diff --git a/DDrawCompat/DDraw/DirectDrawPalette.cpp b/DDrawCompat/DDraw/DirectDrawPalette.cpp
index 4bf69d7..e7a3bd2 100644
--- a/DDrawCompat/DDraw/DirectDrawPalette.cpp
+++ b/DDrawCompat/DDraw/DirectDrawPalette.cpp
@@ -3,7 +3,6 @@
 
 #include <Common/CompatVtable.h>
 #include <Common/Time.h>
-#include <Config/Config.h>
 #include <DDraw/DirectDrawPalette.h>
 #include <DDraw/ScopedThreadLock.h>
 #include <DDraw/Surfaces/PrimarySurface.h>
diff --git a/DDrawCompat/DDraw/RealPrimarySurface.cpp b/DDrawCompat/DDraw/RealPrimarySurface.cpp
index 5b3a1fe..57154b4 100644
--- a/DDrawCompat/DDraw/RealPrimarySurface.cpp
+++ b/DDrawCompat/DDraw/RealPrimarySurface.cpp
@@ -7,7 +7,8 @@
 #include <Common/ScopedCriticalSection.h>
 #include <Common/ScopedThreadPriority.h>
 #include <Common/Time.h>
-#include <Config/Config.h>
+#include <Config/Settings/FpsLimiter.h>
+#include <Config/Settings/VSync.h>
 #include <D3dDdi/Device.h>
 #include <D3dDdi/KernelModeThunks.h>
 #include <D3dDdi/Resource.h>
diff --git a/DDrawCompat/DDraw/Surfaces/PrimarySurface.cpp b/DDrawCompat/DDraw/Surfaces/PrimarySurface.cpp
index 7404a29..5729a68 100644
--- a/DDrawCompat/DDraw/Surfaces/PrimarySurface.cpp
+++ b/DDrawCompat/DDraw/Surfaces/PrimarySurface.cpp
@@ -1,6 +1,5 @@
 #include <Common/CompatPtr.h>
 #include <Common/CompatRef.h>
-#include <Config/Config.h>
 #include <D3dDdi/Device.h>
 #include <D3dDdi/KernelModeThunks.h>
 #include <D3dDdi/Resource.h>
diff --git a/DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.cpp b/DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.cpp
index 1ce9b89..2d1a9f0 100644
--- a/DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.cpp
+++ b/DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.cpp
@@ -1,5 +1,5 @@
 #include <Common/CompatPtr.h>
-#include <Config/Config.h>
+#include <Config/Settings/FpsLimiter.h>
 #include <D3dDdi/KernelModeThunks.h>
 #include <D3dDdi/ScopedCriticalSection.h>
 #include <DDraw/DirectDrawClipper.h>
diff --git a/DDrawCompat/DDraw/Surfaces/Surface.cpp b/DDrawCompat/DDraw/Surfaces/Surface.cpp
index fb13fd3..2a439c0 100644
--- a/DDrawCompat/DDraw/Surfaces/Surface.cpp
+++ b/DDrawCompat/DDraw/Surfaces/Surface.cpp
@@ -3,7 +3,7 @@
 #include <initguid.h>
 
 #include <Common/CompatPtr.h>
-#include <Config/Config.h>
+#include <Config/Settings/AlignSysMemSurfaces.h>
 #include <DDraw/DirectDrawClipper.h>
 #include <DDraw/DirectDrawSurface.h>
 #include <DDraw/Surfaces/Surface.h>
diff --git a/DDrawCompat/DDraw/Surfaces/TagSurface.cpp b/DDrawCompat/DDraw/Surfaces/TagSurface.cpp
index b2ff9df..955d360 100644
--- a/DDrawCompat/DDraw/Surfaces/TagSurface.cpp
+++ b/DDrawCompat/DDraw/Surfaces/TagSurface.cpp
@@ -1,6 +1,6 @@
 #include <map>
 
-#include <Config/Config.h>
+#include <Config/Settings/RemoveBorders.h>
 #include <DDraw/DirectDraw.h>
 #include <DDraw/Surfaces/TagSurface.h>
 
diff --git a/DDrawCompat/DDrawCompat.vcxproj b/DDrawCompat/DDrawCompat.vcxproj
index 9cf3467..4fc701c 100644
--- a/DDrawCompat/DDrawCompat.vcxproj
+++ b/DDrawCompat/DDrawCompat.vcxproj
@@ -152,7 +152,6 @@
     <ClInclude Include="Common\Hook.h" />
     <ClInclude Include="Common\ScopedCriticalSection.h" />
     <ClInclude Include="Common\Time.h" />
-    <ClInclude Include="Config\Config.h" />
     <ClInclude Include="Config\EnumSetting.h" />
     <ClInclude Include="Config\HotKeySetting.h" />
     <ClInclude Include="Config\ListSetting.h" />
diff --git a/DDrawCompat/DDrawCompat.vcxproj.filters b/DDrawCompat/DDrawCompat.vcxproj.filters
index 6cc8a85..4479a78 100644
--- a/DDrawCompat/DDrawCompat.vcxproj.filters
+++ b/DDrawCompat/DDrawCompat.vcxproj.filters
@@ -237,9 +237,6 @@
     <ClInclude Include="Win32\Registry.h">
       <Filter>Header Files\Win32</Filter>
     </ClInclude>
-    <ClInclude Include="Config\Config.h">
-      <Filter>Header Files\Config</Filter>
-    </ClInclude>
     <ClInclude Include="DDraw\Surfaces\Surface.h">
       <Filter>Header Files\DDraw\Surfaces</Filter>
     </ClInclude>
diff --git a/DDrawCompat/Direct3d/Direct3d.cpp b/DDrawCompat/Direct3d/Direct3d.cpp
index 001578d..0e7e64a 100644
--- a/DDrawCompat/Direct3d/Direct3d.cpp
+++ b/DDrawCompat/Direct3d/Direct3d.cpp
@@ -1,8 +1,9 @@
 #include <set>
 
+#include <Common/Comparison.h>
 #include <Common/CompatPtr.h>
 #include <Common/CompatVtable.h>
-#include <Config/Config.h>
+#include <Config/Settings/SoftwareDevice.h>
 #include <D3dDdi/Device.h>
 #include <DDraw/DirectDrawSurface.h>
 #include <DDraw/ScopedThreadLock.h>
diff --git a/DDrawCompat/Dll/DllMain.cpp b/DDrawCompat/Dll/DllMain.cpp
index 39617bb..c24ba51 100644
--- a/DDrawCompat/Dll/DllMain.cpp
+++ b/DDrawCompat/Dll/DllMain.cpp
@@ -9,8 +9,9 @@
 #include <Common/Log.h>
 #include <Common/Path.h>
 #include <Common/Time.h>
-#include <Config/Config.h>
 #include <Config/Parser.h>
+#include <Config/Settings/DpiAwareness.h>
+#include <Config/Settings/FullscreenMode.h>
 #include <D3dDdi/Hooks.h>
 #include <DDraw/DirectDraw.h>
 #include <DDraw/Hooks.h>
diff --git a/DDrawCompat/Gdi/Font.cpp b/DDrawCompat/Gdi/Font.cpp
index 9cf986c..deb4cb3 100644
--- a/DDrawCompat/Gdi/Font.cpp
+++ b/DDrawCompat/Gdi/Font.cpp
@@ -1,6 +1,6 @@
 #include <Common/Hook.h>
 #include <Common/Log.h>
-#include <Config/Config.h>
+#include <Config/Settings/FontAntialiasing.h>
 #include <Gdi/Font.h>
 
 namespace
diff --git a/DDrawCompat/Gdi/VirtualScreen.cpp b/DDrawCompat/Gdi/VirtualScreen.cpp
index e924870..688b267 100644
--- a/DDrawCompat/Gdi/VirtualScreen.cpp
+++ b/DDrawCompat/Gdi/VirtualScreen.cpp
@@ -1,6 +1,6 @@
 #include <map>
 
-#include <Config/Config.h>
+#include <Config/Settings/AlignSysMemSurfaces.h>
 #include <Common/ScopedCriticalSection.h>
 #include <D3dDdi/Device.h>
 #include <D3dDdi/Resource.h>
diff --git a/DDrawCompat/Gdi/WinProc.cpp b/DDrawCompat/Gdi/WinProc.cpp
index 7e32d18..96ba62e 100644
--- a/DDrawCompat/Gdi/WinProc.cpp
+++ b/DDrawCompat/Gdi/WinProc.cpp
@@ -8,7 +8,8 @@
 #include <Common/ScopedSrwLock.h>
 #include <Common/ScopedThreadPriority.h>
 #include <Common/Time.h>
-#include <Config/Config.h>
+#include <Config/Settings/FpsLimiter.h>
+#include <Config/Settings/RemoveBorders.h>
 #include <Dll/Dll.h>
 #include <DDraw/DirectDraw.h>
 #include <DDraw/RealPrimarySurface.h>
diff --git a/DDrawCompat/Input/Input.cpp b/DDrawCompat/Input/Input.cpp
index d73685e..afefc0f 100644
--- a/DDrawCompat/Input/Input.cpp
+++ b/DDrawCompat/Input/Input.cpp
@@ -7,7 +7,7 @@
 
 #include <Common/Hook.h>
 #include <Common/Log.h>
-#include <Config/Config.h>
+#include <Config/Settings/TerminateHotKey.h>
 #include <Dll/Dll.h>
 #include <DDraw/RealPrimarySurface.h>
 #include <Gdi/GuiThread.h>
diff --git a/DDrawCompat/Overlay/ConfigWindow.cpp b/DDrawCompat/Overlay/ConfigWindow.cpp
index 71f7a04..9ce0eeb 100644
--- a/DDrawCompat/Overlay/ConfigWindow.cpp
+++ b/DDrawCompat/Overlay/ConfigWindow.cpp
@@ -2,7 +2,21 @@
 #include <sstream>
 
 #include <Common/Log.h>
-#include <Config/Config.h>
+#include <Config/Settings/AlternatePixelCenter.h>
+#include <Config/Settings/Antialiasing.h>
+#include <Config/Settings/BltFilter.h>
+#include <Config/Settings/ConfigHotKey.h>
+#include <Config/Settings/DisplayFilter.h>
+#include <Config/Settings/FontAntialiasing.h>
+#include <Config/Settings/FpsLimiter.h>
+#include <Config/Settings/RenderColorDepth.h>
+#include <Config/Settings/ResolutionScale.h>
+#include <Config/Settings/ResolutionScaleFilter.h>
+#include <Config/Settings/SpriteDetection.h>
+#include <Config/Settings/SpriteFilter.h>
+#include <Config/Settings/SpriteTexCoord.h>
+#include <Config/Settings/TextureFilter.h>
+#include <Config/Settings/VSync.h>
 #include <Gdi/GuiThread.h>
 #include <Input/Input.h>
 #include <Overlay/ConfigWindow.h>
@@ -27,8 +41,8 @@ namespace Overlay
 		m_captionCloseButton.reset(new ButtonControl(*this, r, "X", onClose));
 
 		addControl(Config::alternatePixelCenter);
-		addControl(Config::bltFilter);
 		addControl(Config::antialiasing);
+		addControl(Config::bltFilter);
 		addControl(Config::displayFilter);
 		addControl(Config::fontAntialiasing);
 		addControl(Config::fpsLimiter);
diff --git a/DDrawCompat/Overlay/SettingControl.cpp b/DDrawCompat/Overlay/SettingControl.cpp
index b35946f..3cbd32a 100644
--- a/DDrawCompat/Overlay/SettingControl.cpp
+++ b/DDrawCompat/Overlay/SettingControl.cpp
@@ -1,4 +1,9 @@
-#include <Config/Config.h>
+#include <Config/Settings/Antialiasing.h>
+#include <Config/Settings/RenderColorDepth.h>
+#include <Config/Settings/ResolutionScale.h>
+#include <Config/Settings/SpriteFilter.h>
+#include <Config/Settings/SpriteTexCoord.h>
+#include <Config/Settings/TextureFilter.h>
 #include <Config/Setting.h>
 #include <D3dDdi/Device.h>
 #include <Overlay/ComboBoxControl.h>
diff --git a/DDrawCompat/Overlay/StatsWindow.cpp b/DDrawCompat/Overlay/StatsWindow.cpp
index db2d19b..b3442d3 100644
--- a/DDrawCompat/Overlay/StatsWindow.cpp
+++ b/DDrawCompat/Overlay/StatsWindow.cpp
@@ -2,7 +2,7 @@
 #include <functional>
 
 #include <Common/Time.h>
-#include <Config/Config.h>
+#include <Config/Settings/StatsHotKey.h>
 #include <Gdi/GuiThread.h>
 #include <Input/Input.h>
 #include <Overlay/ConfigWindow.h>
diff --git a/DDrawCompat/Overlay/Window.cpp b/DDrawCompat/Overlay/Window.cpp
index f9c17ee..b222849 100644
--- a/DDrawCompat/Overlay/Window.cpp
+++ b/DDrawCompat/Overlay/Window.cpp
@@ -5,7 +5,6 @@
 
 #include <Common/Hook.h>
 #include <Common/Log.h>
-#include <Config/Config.h>
 #include <Dll/Dll.h>
 #include <DDraw/RealPrimarySurface.h>
 #include <DDraw/Surfaces/PrimarySurface.h>
diff --git a/DDrawCompat/Win32/DisplayMode.cpp b/DDrawCompat/Win32/DisplayMode.cpp
index 90e383d..32f2bf5 100644
--- a/DDrawCompat/Win32/DisplayMode.cpp
+++ b/DDrawCompat/Win32/DisplayMode.cpp
@@ -10,7 +10,10 @@
 #include <Common/CompatPtr.h>
 #include <Common/Hook.h>
 #include <Common/ScopedSrwLock.h>
-#include <Config/Config.h>
+#include <Config/Settings/DesktopColorDepth.h>
+#include <Config/Settings/DisplayRefreshRate.h>
+#include <Config/Settings/DisplayResolution.h>
+#include <Config/Settings/SupportedResolutions.h>
 #include <DDraw/DirectDraw.h>
 #include <DDraw/ScopedThreadLock.h>
 #include <Gdi/Gdi.h>
diff --git a/DDrawCompat/Win32/Thread.cpp b/DDrawCompat/Win32/Thread.cpp
index 150c005..662ee66 100644
--- a/DDrawCompat/Win32/Thread.cpp
+++ b/DDrawCompat/Win32/Thread.cpp
@@ -8,7 +8,9 @@
 #include <Common/Hook.h>
 #include <Common/Log.h>
 #include <Common/Time.h>
-#include <Config/Config.h>
+#include <Config/Settings/CpuAffinity.h>
+#include <Config/Settings/CpuAffinityRotation.h>
+#include <Config/Settings/ThreadPriorityBoost.h>
 #include <Dll/Dll.h>
 #include <Win32/Thread.h>
 
diff --git a/DDrawCompat/Win32/Version.cpp b/DDrawCompat/Win32/Version.cpp
index 13c918d..8a01c39 100644
--- a/DDrawCompat/Win32/Version.cpp
+++ b/DDrawCompat/Win32/Version.cpp
@@ -2,7 +2,7 @@
 
 #include <Common/Hook.h>
 #include <Common/Log.h>
-#include <Config/Config.h>
+#include <Config/Settings/WinVersionLie.h>
 
 #include <Win32/Version.h>