diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp
index 41f03be964..a8171fefab 100644
--- a/Source/Core/Common/Src/CPUDetect.cpp
+++ b/Source/Core/Common/Src/CPUDetect.cpp
@@ -17,14 +17,12 @@
 
 #ifdef _WIN32
 #include <intrin.h>
-#endif
+#else
 
-#ifdef __linux__
 //#include <config/i386/cpuid.h>
 #include <xmmintrin.h>
 void __cpuid(int info[4], int x) {}
 
-
 #endif
 
 #include <memory.h>
diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h
index 63e9aa10d4..af084c6b4b 100644
--- a/Source/Core/Common/Src/Thread.h
+++ b/Source/Core/Common/Src/Thread.h
@@ -20,6 +20,8 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#else
+#include <pthread.h>
 #endif
 
 #ifdef _WIN32
diff --git a/Source/Core/DiscIO/Src/VolumeCreator.cpp b/Source/Core/DiscIO/Src/VolumeCreator.cpp
index 8a22a215fe..8320182467 100644
--- a/Source/Core/DiscIO/Src/VolumeCreator.cpp
+++ b/Source/Core/DiscIO/Src/VolumeCreator.cpp
@@ -37,7 +37,7 @@ enum EDiscType
 	DISC_TYPE_WII_CONTAINER,
 	DISC_TYPE_GC
 };
-#ifndef WIN32
+#ifndef _WIN32
 	struct SPartition
 	{
 		u64 Offset;
@@ -156,7 +156,7 @@ IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, int _VolumeType)
 
 	u32 numPartitions = Reader.Read32(0x40000);
 	u64 PartitionsOffset = (u64)Reader.Read32(0x40004) << 2;
-	#ifdef WIN32
+	#ifdef _WIN32
 	struct SPartition
 	{
 		u64 Offset;
@@ -164,7 +164,7 @@ IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, int _VolumeType)
 	};
 	#endif
 	std::vector<SPartition>PartitionsVec;
-
+	
 	// read all partitions
 	for (u32 i = 0; i < numPartitions; i++)
 	{
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
index d8b216cb84..6a959777c3 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
@@ -160,8 +160,8 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
     GetWindowRect(GetDesktopWindow(), &rcdesktop);
         
     if (g_Config.bFullscreen) {
-        nBackbufferWidth = rcdesktop.right - rcdesktop.left;
-        nBackbufferHeight = rcdesktop.bottom - rcdesktop.top;
+        //nBackbufferWidth = rcdesktop.right - rcdesktop.left;
+        //nBackbufferHeight = rcdesktop.bottom - rcdesktop.top;
 
         DEVMODE dmScreenSettings;
         memset(&dmScreenSettings,0,sizeof(dmScreenSettings));