diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffc10b1937..992773b1b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,14 +30,12 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include(Pcsx2Utils)
 include(SearchForStuff)
 
-set(CMAKE_BUILD_TYPE Devel)
-
 #-------------------------------------------------------------------------------
-# if no build type is set, use Debug as default
+# if no build type is set, use Devel as default
 #-------------------------------------------------------------------------------
 if(CMAKE_BUILD_TYPE STREQUAL "")
 	set(CMAKE_BUILD_TYPE Debug)
-	message(STATUS "BuildType set to Debug!!! by default")
+	message(STATUS "BuildType set to Devel by default")
 endif(CMAKE_BUILD_TYPE STREQUAL "")
 #-------------------------------------------------------------------------------
 
diff --git a/common/src/Utilities/CMakeLists.txt b/common/src/Utilities/CMakeLists.txt
index 0a7c77f0b4..792c684049 100644
--- a/common/src/Utilities/CMakeLists.txt
+++ b/common/src/Utilities/CMakeLists.txt
@@ -105,6 +105,7 @@ set(UtilitiesSources
 	Console.cpp
 	EventSource.cpp
 	Exceptions.cpp
+	FastFormatString.cpp
 	HashTools.cpp
 	Linux/LnxHostSys.cpp
 	Linux/LnxMisc.cpp
@@ -115,6 +116,7 @@ set(UtilitiesSources
 	pxCheckBox.cpp
 	pxRadioPanel.cpp
 	pxStaticText.cpp
+	pxWindowTextWriter.cpp
 	Semaphore.cpp
 	StringHelpers.cpp
 	ThreadingDialogs.cpp
diff --git a/detect_missing_file_in_cmake.sh b/detect_missing_file_in_cmake.sh
new file mode 100755
index 0000000000..c4807b3862
--- /dev/null
+++ b/detect_missing_file_in_cmake.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Script default parameter
+MAX_DEPTH=1
+DIR=$PWD
+CMAKE_FILE=CMakeLists.txt
+SKIP_H=FALSE
+
+## Help message
+help()
+{
+    cat <<EOF
+This script detects '.cpp/.h' files that are in directory (and sub) but not in the current cmake.
+options:
+-dir   <dirname>   : give the directory to check. Default '.'
+-help              : print this help message and exit
+-max_depth <depth> : how many depth to check missing file. Default 1
+-skip              : skip the check of '.h' file. Disable by default
+EOF
+
+    exit 0
+}
+
+## Handle option
+while [ -n "$1" ]; do
+case $1 in
+    -help|-h) help;shift 1;; # appel de la fonction help
+    -skip|-s) SKIP_H=TRUE;shift 1;;
+    -dir|-d) DIR=$2;shift 2;;
+    -max_depth|-m) MAX_DEPTH=$2;shift 2;;
+    --) shift;break;;
+    -*) echo "ERROR: $1 option does not exists. Use -h for help";exit 1;;
+    *)  break;;
+esac
+done
+
+
+## Main sript
+for file in `find $DIR -maxdepth $MAX_DEPTH -name "*.cpp"` ; do
+    PATTERN=`basename $file`
+    grep $PATTERN $DIR/$CMAKE_FILE > /dev/null || echo $file is missing in $CMAKE_FILE
+done
+
+if [ "${SKIP_H}" = "FALSE" ] ; then
+    for file in `find $DIR -maxdepth $MAX_DEPTH -name "*.h"` ; do
+        PATTERN=`basename $file`
+        grep $PATTERN $DIR/$CMAKE_FILE > /dev/null || echo $file is missing in $CMAKE_FILE
+    done
+fi
+exit
diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 341ab592fe..63b6597d6e 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -144,6 +144,7 @@ set(pcsx2Sources
 	MMI.cpp
 	MTGS.cpp
 	Patch.cpp
+	Patch_Memory.cpp
 	Pcsx2Config.cpp
 	pcsx2hostfs.cpp
 	PluginManager.cpp
@@ -193,7 +194,9 @@ set(pcsx2Headers
 	Counters.h
 	Dmac.h
 	Dump.h
+	DataBase_Loader.h
 	Elfheader.h
+	File_Reader.h
 	Gif.h
 	GS.h
 	Hardware.h
@@ -211,6 +214,7 @@ set(pcsx2Headers
 	MemoryTypes.h
 	NakedAsm.h
 	Patch.h
+	Patch_Obsolete.h
 	PathDefs.h
 	Plugins.h
 	PrecompiledHeader.h
@@ -297,6 +301,7 @@ set(pcsx2GuiSources
 	gui/Dialogs/AppConfigDialog.cpp
 	gui/Dialogs/AssertionDialog.cpp
 	gui/Panels/BaseApplicableConfigPanel.cpp
+	gui/Panels/MemoryCardListView.cpp
 	gui/Dialogs/BaseConfigurationDialog.cpp
 	gui/Dialogs/BaseConfigurationDialog.inl
 	gui/Dialogs/BiosSelectorDialog.cpp