diff --git a/cmake/FindPortAudio.cmake b/cmake/FindPortAudio.cmake
index a0d0d5b163..7a3ef677e4 100644
--- a/cmake/FindPortAudio.cmake
+++ b/cmake/FindPortAudio.cmake
@@ -9,14 +9,13 @@ if(PORTAUDIO_INCLUDE_DIR AND PORTAUDIO_LIBRARIES)
     set(PORTAUDIO_FIND_QUIETLY TRUE)
 endif(PORTAUDIO_INCLUDE_DIR AND PORTAUDIO_LIBRARIES)
 
-# include dir
-find_path(PORTAUDIO_INCLUDE_DIR portaudio.h)
+# Search both portaudio.h and pa_linux_alsa.h to ensure the user gets
+# the include of the V2 API (V1 have only portaudio.h)
+find_path(PORTAUDIO_INCLUDE_DIR NAMES portaudio.h pa_linux_alsa.h)
 
 # finally the library itself
 find_library(libPortAudio NAMES portaudio)
-# Seems to run OK without libportaudiocpp so do not pull additional dependency
-# find_library(libPortAudioCpp NAMES portaudiocpp)
-# set(PORTAUDIO_LIBRARIES ${libPortAudio} ${libPortAudioCpp})
+# Run OK without libportaudiocpp so do not pull additional dependency
 set(PORTAUDIO_LIBRARIES ${libPortAudio})
 
 # handle the QUIETLY and REQUIRED arguments and set PORTAUDIO_FOUND to TRUE if 
diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index b54dfbbead..9151047af3 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -68,6 +68,10 @@ set(GSdxSources
     GSDirtyRect.cpp
     GSDrawScanline.cpp
     GSDrawScanlineCodeGenerator.cpp
+    GSDrawScanlineCodeGenerator.x86.avx.cpp
+    GSDrawScanlineCodeGenerator.x64.cpp
+    GSDrawScanlineCodeGenerator.x86.cpp
+    GSDrawScanlineCodeGenerator.x64.avx.cpp
     GSDump.cpp
     GSFunctionMap.cpp
     GSLinuxDialog.cpp
@@ -79,6 +83,10 @@ set(GSdxSources
     GSRendererSW.cpp
     GSSetting.cpp
     GSSetupPrimCodeGenerator.cpp
+    GSSetupPrimCodeGenerator.x86.avx.cpp
+    GSSetupPrimCodeGenerator.x64.avx.cpp
+    GSSetupPrimCodeGenerator.x86.cpp
+    GSSetupPrimCodeGenerator.x64.cpp
     GSState.cpp
     GSTables.cpp
     GSTexture.cpp
@@ -90,6 +98,10 @@ set(GSdxSources
     GSUtil.cpp
     GSVector.cpp
     GSVertexTrace.cpp
+    GSVertexTrace.x64.avx.cpp
+    GSVertexTrace.x86.cpp
+    GSVertexTrace.x86.avx.cpp
+    GSVertexTrace.x64.cpp
     GSWnd.cpp
     GSdx.cpp
     stdafx.cpp