diff --git a/plugins/CDVDiso/src/CMakeLists.txt b/plugins/CDVDiso/src/CMakeLists.txt
index 714b63440e..e9173f937d 100644
--- a/plugins/CDVDiso/src/CMakeLists.txt
+++ b/plugins/CDVDiso/src/CMakeLists.txt
@@ -3,45 +3,27 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output CDVDiso)
 
-set(CommonFlags
-    -fvisibility=hidden
-    -Wall
-    )
-
 set(OptimizationFlags
     -O2
     -DNDEBUG
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    # add defines
-    set(CDVDisoFinalFlags
-        ${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(CDVDisoFinalFlags "")
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-    # add defines
-	set(CDVDisoFinalFlags
-        ${CommonFlags} ${OptimizationFlags}
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(CDVDisoFinalFlags ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-    # add defines
-	set(CDVDisoFinalFlags
-        ${CommonFlags} ${OptimizationFlags}
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(CDVDisoFinalFlags ${OptimizationFlags})
+
+endif()
 
 # CDVDiso sources
 set(CDVDisoSources
diff --git a/plugins/CDVDlinuz/Src/CMakeLists.txt b/plugins/CDVDlinuz/Src/CMakeLists.txt
index 254aeb7191..35f77bf397 100644
--- a/plugins/CDVDlinuz/Src/CMakeLists.txt
+++ b/plugins/CDVDlinuz/Src/CMakeLists.txt
@@ -4,7 +4,6 @@
 set(Output CDVDlinuz)
 
 set(CommonFlags
-    -Wall
     -D_LARGEFILE64_SOURCE
     )
 
@@ -14,29 +13,16 @@ set(OptimizationFlags
     -fomit-frame-pointer
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    # add defines
-    set(CDVDlinuzFinalFlags
-        ${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(CDVDlinuzFinalFlags ${CommonFlags})
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-    # add defines
-	set(CDVDlinuzFinalFlags
-        ${CommonFlags} ${OptimizationFlags}
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(CDVDlinuzFinalFlags ${CommonFlags} ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-    # add defines
-	set(CDVDlinuzFinalFlags
-        ${CommonFlags} ${OptimizationFlags}
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(CDVDlinuzFinalFlags ${CommonFlags} ${OptimizationFlags})
+
+endif()
 
 # CDVDlinuz sources
 set(CDVDlinuzSources
@@ -95,4 +81,4 @@ set(CDVDlinuzFinalLibs
 # add additional include directories
 include_directories(Linux)
 
-add_pcsx2_plugin(${Output} "${CDVDlinuzFinalSources}" "${CDVDlinuzFinalLibs}" "${CDVDlinuzFinalFlags}")
\ No newline at end of file
+add_pcsx2_plugin(${Output} "${CDVDlinuzFinalSources}" "${CDVDlinuzFinalLibs}" "${CDVDlinuzFinalFlags}")
diff --git a/plugins/CDVDnull/CMakeLists.txt b/plugins/CDVDnull/CMakeLists.txt
index 8dbac89a16..088a17b604 100644
--- a/plugins/CDVDnull/CMakeLists.txt
+++ b/plugins/CDVDnull/CMakeLists.txt
@@ -3,45 +3,27 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output CDVDnull)
 
-set(CommonFlags
-    -fvisibility=hidden
-    -Wall
-    )
-
 set(OptimizationFlags
     -O2
     -DNDEBUG
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	# add defines
-    set(CDVDnullFinalFlags
-		${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(CDVDnullFinalFlags "")
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-	# add defines
-	set(CDVDnullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(CDVDnullFinalFlags ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-	# add defines
-	set(CDVDnullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(CDVDnullFinalFlags ${OptimizationFlags})
+
+endif()
 
 # CDVDnull sources
 set(CDVDnullSources
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 7fff99f288..5b21a52245 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -3,7 +3,7 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # make cdvdGigaherz
diff --git a/plugins/FWnull/CMakeLists.txt b/plugins/FWnull/CMakeLists.txt
index d786c271b1..fd5a45e3db 100644
--- a/plugins/FWnull/CMakeLists.txt
+++ b/plugins/FWnull/CMakeLists.txt
@@ -3,44 +3,26 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output FWnull-0.7.0)
 
-set(CommonFlags
-    -fvisibility=hidden
-    -Wall
-    )
-
 set(OptimizationFlags
     -O2
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	# add defines
-    set(FWnullFinalFlags
-		${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(FWnullFinalFlags "")
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-	# add defines
-	set(FWnullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(FWnullFinalFlags ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-	# add defines
-	set(FWnullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(FWnullFinalFlags ${OptimizationFlags})
+
+endif()
 
 # FWnull sources
 set(FWnullSources
@@ -82,4 +64,4 @@ set(FWnullFinalLibs
 	${GTK2_LIBRARIES}
 )
 
-add_pcsx2_plugin(${Output} "${FWnullFinalSources}" "${FWnullFinalLibs}" "${FWnullFinalFlags}")
\ No newline at end of file
+add_pcsx2_plugin(${Output} "${FWnullFinalSources}" "${FWnullFinalLibs}" "${FWnullFinalFlags}")
diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index 0c56aa8bc9..ffafd0ce9e 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -12,8 +12,6 @@ set(Output GSdx-0.1.16)
 set(CommonFlags
     -fno-operator-names # because Xbyak uses and()/xor()/or()/not() function
     -mfpmath=sse
-    #-Wstrict-aliasing # Allow to track strict aliasing issue.
-    -std=c++0x
     -fno-strict-aliasing
     -Wno-unknown-pragmas
     -Wno-parentheses
@@ -26,19 +24,15 @@ set(OptimizationFlags
     )
 
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} -D_DEBUG -g -Wall)
-endif()
+    set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} -D_DEBUG)
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-    set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -D_DEVEL -g)
-endif()
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+    set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -D_DEVEL)
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
     set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -W)
+
 endif()
 
 if(XDG_STD)
diff --git a/plugins/GSnull/CMakeLists.txt b/plugins/GSnull/CMakeLists.txt
index b16914bbbe..667b958f58 100644
--- a/plugins/GSnull/CMakeLists.txt
+++ b/plugins/GSnull/CMakeLists.txt
@@ -3,45 +3,27 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output GSnull)
 
-set(CommonFlags
-    -fvisibility=hidden
-    -Wall
-    )
-
 set(OptimizationFlags
     -O2
     -DNDEBUG
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	# add defines
-    set(GSnullFinalFlags
-		${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(GSnullFinalFlags "")
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-	# add defines
-	set(GSnullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(GSnullFinalFlags ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-	# add defines
-	set(GSnullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(GSnullFinalFlags ${OptimizationFlags})
+
+endif()
 
 # GSnull sources
 set(GSnullSources
diff --git a/plugins/PadNull/CMakeLists.txt b/plugins/PadNull/CMakeLists.txt
index 9e729c8247..937386912e 100644
--- a/plugins/PadNull/CMakeLists.txt
+++ b/plugins/PadNull/CMakeLists.txt
@@ -3,44 +3,26 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 # plugin name
 set(Output PADnull)
 
-set(CommonFlags
-    -fvisibility=hidden
-    -Wall
-    )
-
 set(OptimizationFlags
     -O2
     -DNDEBUG
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	# add defines
-    set(PadNullFinalFlags
-		${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(PadNullFinalFlags "")
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-	# add defines
-	set(PadNullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(PadNullFinalFlags ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-	# add defines
-	set(PadNullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(PadNullFinalFlags ${OptimizationFlags})
+
+endif()
 
 # PadNull sources
 set(PadNullSources
diff --git a/plugins/SPU2null/CMakeLists.txt b/plugins/SPU2null/CMakeLists.txt
index f7eb8d2c47..d88c68e721 100644
--- a/plugins/SPU2null/CMakeLists.txt
+++ b/plugins/SPU2null/CMakeLists.txt
@@ -3,45 +3,27 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output SPU2null)
 
-set(CommonFlags
-    -fvisibility=hidden
-    -Wall
-    )
-
 set(OptimizationFlags
     -O2
     -DNDEBUG
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	# add defines
-    set(SPU2nullFinalFlags
-		${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(SPU2nullFinalFlags "")
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-	# add defines
-	set(SPU2nullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(SPU2nullFinalFlags ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-	# add defines
-	set(SPU2nullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(SPU2nullFinalFlags ${OptimizationFlags})
+
+endif()
 
 # SPU2null sources
 set(SPU2nullSources
diff --git a/plugins/USBnull/CMakeLists.txt b/plugins/USBnull/CMakeLists.txt
index 9ef8b9a53e..a101f8b969 100644
--- a/plugins/USBnull/CMakeLists.txt
+++ b/plugins/USBnull/CMakeLists.txt
@@ -3,45 +3,27 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output USBnull-0.7.0)
 
-set(CommonFlags
-    -fvisibility=hidden
-    -Wall
-    )
-
 set(OptimizationFlags
     -O2
     -DNDEBUG
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	# add defines
-	set(USBnullFinalFlags
-		${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+	set(USBnullFinalFlags "")
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-	# add defines
-	set(USBnullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(USBnullFinalFlags ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-	# add defines
-	set(USBnullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(USBnullFinalFlags ${OptimizationFlags})
+
+endif()
 
 # USBnull sources
 set(USBnullSources
diff --git a/plugins/dev9null/CMakeLists.txt b/plugins/dev9null/CMakeLists.txt
index 4a58bde2af..3c938d1424 100644
--- a/plugins/dev9null/CMakeLists.txt
+++ b/plugins/dev9null/CMakeLists.txt
@@ -3,45 +3,27 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output dev9null-0.5.0)
 
-set(CommonFlags
-    -fvisibility=hidden
-    -Wall
-    )
-
 set(OptimizationFlags
     -O2
     -DNDEBUG
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	# add defines
-    set(dev9nullFinalFlags
-		${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(dev9nullFinalFlags "")
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-	# add defines
-	set(dev9nullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(dev9nullFinalFlags ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-	# add defines
-	set(dev9nullFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(dev9nullFinalFlags ${OptimizationFlags})
+
+endif()
 
 # dev9null sources
 set(dev9nullSources
diff --git a/plugins/onepad/CMakeLists.txt b/plugins/onepad/CMakeLists.txt
index ee387218d0..892d25e3c2 100644
--- a/plugins/onepad/CMakeLists.txt
+++ b/plugins/onepad/CMakeLists.txt
@@ -3,40 +3,27 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output onepad-1.1.0)
 
-set(CommonFlags
-    -fvisibility=hidden
-    -Wall
-    -std=c++0x
-    )
-
 set(OptimizationFlags
     -O2
     -DNDEBUG
     )
 
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    set(onepadFinalFlags
-		${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(onepadFinalFlags "")
 
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-	set(onepadFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(onepadFinalFlags ${OptimizationFlags})
 
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-	set(onepadFinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(onepadFinalFlags ${OptimizationFlags})
+
+endif()
 
 # onepad sources
 set(onepadSources
diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt
index e144a2c87d..018a370bc5 100644
--- a/plugins/spu2-x/src/CMakeLists.txt
+++ b/plugins/spu2-x/src/CMakeLists.txt
@@ -9,45 +9,27 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output spu2x-2.0.0)
 
-set(CommonFlags
-    -fvisibility=hidden
-    -Wall
-    )
-
 set(OptimizationFlags
     -O2
     -DNDEBUG
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	# add defines
-    set(spu2xFinalFlags
-        ${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(spu2xFinalFlags "")
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-	# add defines
-	set(spu2xFinalFlags
-        ${CommonFlags} ${OptimizationFlags}
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(spu2xFinalFlags ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-	# add defines
-	set(spu2xFinalFlags
-        ${CommonFlags} ${OptimizationFlags}
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(spu2xFinalFlags ${OptimizationFlags})
+
+endif()
 
 # spu2x sources
 set(spu2xSources
diff --git a/plugins/zerospu2/CMakeLists.txt b/plugins/zerospu2/CMakeLists.txt
index 6421bbce89..cee15aa3df 100644
--- a/plugins/zerospu2/CMakeLists.txt
+++ b/plugins/zerospu2/CMakeLists.txt
@@ -3,43 +3,26 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output zerospu2)
 
-set(CommonFlags
-    -Wall
-    )
-
 set(OptimizationFlags
     -O2
     -DNDEBUG
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	# add defines
-    set(zerospu2FinalFlags
-		${CommonFlags} -g
-    )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(zerospu2FinalFlags "")
 
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-	# add defines
-	set(zerospu2FinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+	set(zerospu2FinalFlags ${OptimizationFlags})
+
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+	set(zerospu2FinalFlags ${OptimizationFlags})
 
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-	# add defines
-	set(zerospu2FinalFlags
-		${CommonFlags} ${OptimizationFlags}
-	)
 endif(CMAKE_BUILD_TYPE STREQUAL Release)
 
 # zerospu2 sources
diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt
index 490f307108..03424854d5 100644
--- a/plugins/zzogl-pg/opengl/CMakeLists.txt
+++ b/plugins/zzogl-pg/opengl/CMakeLists.txt
@@ -20,7 +20,6 @@ endif(EXISTS "${CMAKE_SOURCE_DIR}/plugins/zzogl-pg/opengl/ZeroGSShaders" AND REB
 set(Output zzogl-0.4.0)
 
 set(CommonFlags
-    -pthread
     -DZEROGS_SSE2
     -fno-strict-aliasing
     -Wstrict-aliasing # Allow to track strict aliasing issue.
@@ -40,32 +39,22 @@ if(NOT USE_CLANG)
     )
 endif(NOT USE_CLANG) 
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    # add defines
     set(zzoglFinalFlags
         ${zzoglFinalFlags}
         ${CommonFlags} -g -Wall -D_DEBUG
     )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
-
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-    # add defines
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
     set(zzoglFinalFlags
         ${zzoglFinalFlags}
         ${CommonFlags} ${OptimizationFlags} -g -W -DZEROGS_DEVBUILD
     )
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
-
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-    # add defines
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
     set(zzoglFinalFlags
         ${zzoglFinalFlags}
         ${CommonFlags} ${OptimizationFlags} -W
     )
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+endif()
 
 # Select the shader API 
 if(GLSL_API)
diff --git a/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt b/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt
index 4b428bd9f8..0d430efb08 100644
--- a/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt
+++ b/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt
@@ -3,14 +3,13 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
     message(FATAL_ERROR "
     You did not 'cmake' the good CMakeLists.txt file. Use the one in the top dir.
     It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
-endif(NOT TOP_CMAKE_WAS_SOURCED)
+endif()
 
 
 # plugin name
 set(Output zzogl-shader)
 
 set(CommonFlags
-    -pthread
     -DZEROGS_SSE2
     -fno-strict-aliasing
     -Wstrict-aliasing # Allow to track strict aliasing issue.
@@ -23,25 +22,15 @@ set(OptimizationFlags
     -DNDEBUG
     )
 
-# Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    # add defines
     set(zerogsshadersFinalFlags
-        ${CommonFlags} -g -Wall -D_DEBUG
+        ${CommonFlags} -D_DEBUG
     )
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
-
-# Devel - Build
-if(CMAKE_BUILD_TYPE STREQUAL Devel)
-    # add defines
+elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
     set(zerogsshadersFinalFlags
         ${CommonFlags} ${OptimizationFlags} -g -W -DZEROGS_DEVBUILD
     )
-endif(CMAKE_BUILD_TYPE STREQUAL Devel)
-
-# Release - Build
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-    # add defines
+elseif(CMAKE_BUILD_TYPE STREQUAL Release)
     set(zerogsshadersFinalFlags
         ${CommonFlags} ${OptimizationFlags} -W
     )