diff --git a/plugins/GSdx/GSThread.h b/plugins/GSdx/GSThread.h
index b97d34027e..2d10c68a77 100644
--- a/plugins/GSdx/GSThread.h
+++ b/plugins/GSdx/GSThread.h
@@ -152,9 +152,6 @@ public:
 #include <pthread.h>
 #endif
 
-#include <mutex>
-#include <condition_variable>
-
 class GSThread : public IGSThread
 {
     #ifdef _STD_THREAD_
diff --git a/plugins/GSdx/stdafx.h b/plugins/GSdx/stdafx.h
index cda44482f1..d21c72716e 100644
--- a/plugins/GSdx/stdafx.h
+++ b/plugins/GSdx/stdafx.h
@@ -96,6 +96,14 @@ typedef uint32 uptr;
 #include <set>
 #include <queue>
 #include <algorithm>
+#ifdef _CX11_
+#include <thread>
+#include <atomic>
+#endif
+#if defined(__linux__) || defined(_CX11_)
+#include <mutex>
+#include <condition_variable>
+#endif
 
 using namespace std;