diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo
index be10c56cb..e7c9a3f19 100755
Binary files a/mk/windoze/Glest.suo and b/mk/windoze/Glest.suo differ
diff --git a/mk/windoze/shared_lib.vcproj b/mk/windoze/shared_lib.vcproj
index 502e89d28..bde31e3ea 100755
--- a/mk/windoze/shared_lib.vcproj
+++ b/mk/windoze/shared_lib.vcproj
@@ -707,6 +707,14 @@
 			<Filter
 				Name="platform"
 				>
+				<File
+					RelativePath="..\..\source\shared_lib\sources\platform\common\base_thread.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\shared_lib\sources\platform\common\cache_manager.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\source\shared_lib\include\platform\sdl\gl_wrap.h"
 					>
@@ -727,6 +735,10 @@
 					RelativePath="..\..\source\shared_lib\include\platform\sdl\sdl_private.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\source\shared_lib\sources\platform\common\simple_threads.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\source\shared_lib\include\platform\posix\socket.h"
 					>
diff --git a/source/shared_lib/include/platform/sdl/window.h b/source/shared_lib/include/platform/sdl/window.h
index b725c571d..0e51c6054 100644
--- a/source/shared_lib/include/platform/sdl/window.h
+++ b/source/shared_lib/include/platform/sdl/window.h
@@ -116,7 +116,7 @@ private:
 	static SDL_keysym keystate;
 	
     static void setLastMouseEvent(int64 lastMouseEvent)	{Window::lastMouseEvent = lastMouseEvent;}
-    static unsigned int getLastMouseEvent() 				    {return Window::lastMouseEvent;}
+    static int64 getLastMouseEvent() 				    {return Window::lastMouseEvent;}
 
     static const MouseState &getMouseState() 				    {return Window::mouseState;}
     static void setMouseState(MouseButton b, bool state)		{Window::mouseState.set(b, state);}
diff --git a/source/shared_lib/sources/platform/common/base_thread.cpp b/source/shared_lib/sources/platform/common/base_thread.cpp
index 1680367d0..15d93dc8a 100644
--- a/source/shared_lib/sources/platform/common/base_thread.cpp
+++ b/source/shared_lib/sources/platform/common/base_thread.cpp
@@ -11,7 +11,9 @@
 // ==============================================================
 
 #include "base_thread.h"
+#include "platform_common.h"
 #include "util.h"
+#include <time.h>
 
 using namespace Shared::Util;
 
diff --git a/source/shared_lib/sources/platform/common/simple_threads.cpp b/source/shared_lib/sources/platform/common/simple_threads.cpp
index 9de1ce6ff..b8ca1c07b 100644
--- a/source/shared_lib/sources/platform/common/simple_threads.cpp
+++ b/source/shared_lib/sources/platform/common/simple_threads.cpp
@@ -33,9 +33,9 @@ void FileCRCPreCacheThread::execute() {
 		vector<string> techPaths;
 	    findDirs(techDataPaths, techPaths);
 		if(techPaths.empty() == false) {
-			for(int idx = 0; idx < techPaths.size(); idx++) {
+			for(unsigned int idx = 0; idx < techPaths.size(); idx++) {
 				string &techPath = techPaths[idx];
-				for(int idx2 = 0; idx2 < techPaths.size(); idx2++) {
+				for(unsigned int idx2 = 0; idx2 < techPaths.size(); idx2++) {
 					string techName = techPaths[idx2];
 
 					printf("In [%s::%s Line: %d] caching CRC value for Tech [%s]\n",__FILE__,__FUNCTION__,__LINE__,techName.c_str());
diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp
index bd67aa8da..55e45bfe1 100644
--- a/source/shared_lib/sources/util/util.cpp
+++ b/source/shared_lib/sources/util/util.cpp
@@ -60,7 +60,7 @@ inline bool acquire_file_lock(int hnd)
    return -1 != ::fcntl(hnd, F_SETLK, &lock);
 #else
    HANDLE hFile = (HANDLE)_get_osfhandle(hnd);
-   return true == ::LockFile(hFile, 0, 0, 0, -0x10000);
+   return TRUE == ::LockFile(hFile, 0, 0, 0, -0x10000);
 #endif
 }