- load of changes to get things compiling under VC++ 2010 (with updated deps seperate for vc2010)

source/shared_lib/include/platform/posix/socket.h

@@ -12,23 +12,11 @@
 #ifndef _SHARED_PLATFORM_SOCKET_H_
 #define _SHARED_PLATFORM_SOCKET_H_
 
-#include <string>
-
-#include <errno.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <map>
-#include <vector>
-#include "base_thread.h"
-#include "simple_threads.h"
-#include "types.h"
-
-using std::string;
-
 #ifdef WIN32
     #ifdef __MINGW32__
 	   #include <winsock2.h>
     #else
+       #include <winsock2.h>
        #include <winsock.h>
     #endif
 
@@ -44,6 +32,18 @@ using std::string;
 
 #endif
 
+#include <string>
+#include <errno.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <map>
+#include <vector>
+#include "base_thread.h"
+#include "simple_threads.h"
+#include "data_types.h"
+
+using std::string;
+
 #include "leak_dumper.h"
 
 using namespace Shared::PlatformCommon;