diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index fb018b1a9d..b16b52f1cd 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -150,9 +150,11 @@ include_directories(${CMAKE_SOURCE_DIR}/common/include
 					${CMAKE_SOURCE_DIR}/common/include/x86emitter
                     # File generated by Cmake
                     ${CMAKE_BINARY_DIR}/common/include
-                    # WORKAROUND Some issue with multiarch on Debian/Ubuntu
-                    /usr/include/i386-linux-gnu
-                    # WORKAROUND Clang integration issue with multiarch on Debian
-                    #/usr/include/i386-linux-gnu/c++
-                    #/usr/include/i386-linux-gnu/c++/4.8
                     )
+
+# WORKAROUND Some issue with multiarch on Debian/Ubuntu
+if (64BIT_BUILD_DONT_WORK)
+    include_directories(/usr/include/x86_64-linux-gnu)
+else()
+    include_directories(/usr/include/i386-linux-gnu)
+endif()
diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake
index 268313a2e5..70cfc63a0c 100644
--- a/cmake/SelectPcsx2Plugins.cmake
+++ b/cmake/SelectPcsx2Plugins.cmake
@@ -21,8 +21,17 @@ endif()
 # Check for additional dependencies.
 # If all dependencies are available, including OS, build it
 #-------------------------------------------------------------------------------
-set(GTKn_FOUND GTK2_FOUND OR GTK3_FOUND)
-set(SDLn_FOUND SDL_FOUND OR SDL2_FOUND)
+if (GTK2_FOUND OR GTK3_FOUND)
+    set(GTKn_FOUND TRUE)
+else()
+    set(GTKn_FOUND FALSE)
+endif()
+
+if(SDL_FOUND OR SDL2_FOUND)
+    set(SDLn_FOUND TRUE)
+else()
+    set(SDLn_FOUND FALSE)
+endif()
 
 #---------------------------------------
 #			Common libs