Fix more windows.h/winsock.h/winsock2.h issues

We want to use winsock2.h rather than winsock.h. This was mostly enforced
from the global_defines.h file, but I wanted to make it consistent.

Most of these includes can be removed since they're included via
global_defines.h, but someone on windows should clean that up

common/ptimer.cpp

@@ -24,8 +24,8 @@
 #include "string_util.h"
 
 #ifdef _WINDOWS
+	#include <winsock2.h>
 	#include <windows.h>
-	#include <winsock.h>
 	int gettimeofday (timeval *tp, ...);
 #else
 	#include <sys/time.h>