diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 5f910a1670..9b8d3ba3b2 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -1,6 +1,9 @@
set(SRCS Analytics.cpp
CDUtils.cpp
ColorUtil.cpp
+ Config/Config.cpp
+ Config/Layer.cpp
+ Config/Section.cpp
ENetUtil.cpp
FileSearch.cpp
FileUtil.cpp
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
index 831dcad4a7..756c30d473 100644
--- a/Source/Core/Common/Common.vcxproj
+++ b/Source/Core/Common/Common.vcxproj
@@ -53,6 +53,10 @@
+
+
+
+
@@ -149,6 +153,9 @@
+
+
+
diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters
index 3c9b952742..4ffd6c0575 100644
--- a/Source/Core/Common/Common.vcxproj.filters
+++ b/Source/Core/Common/Common.vcxproj.filters
@@ -34,6 +34,10 @@
+
+
+
+
@@ -232,6 +236,9 @@
+
+
+
diff --git a/Source/Core/Common/Config/Config.cpp b/Source/Core/Common/Config/Config.cpp
new file mode 100644
index 0000000000..bcfb9a2619
--- /dev/null
+++ b/Source/Core/Common/Config/Config.cpp
@@ -0,0 +1,140 @@
+// Copyright 2016 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include
+#include
+#include