engine: don't include windows headers, as they globally included by port.h already

common/port.h

@@ -20,11 +20,8 @@ GNU General Public License for more details.
 #include "build.h"
 
 #if !defined(_WIN32)
-	#include <limits.h>
 	#include <dlfcn.h>
-	#include <stdlib.h>
 	#include <unistd.h>
-	#include <string.h>
 
 	#define PATH_SPLITTER "/"
 
@@ -124,19 +121,15 @@ GNU General Public License for more details.
 	#define OS_LIB_PREFIX ""
 	#define OS_LIB_EXT "dll"
 	#define VGUI_SUPPORT_DLL "../vgui_support." OS_LIB_EXT
-#ifdef XASH_64BIT
+	#ifdef XASH_64BIT
-// windows NameForFunction not implemented yet
+		// windows NameForFunction not implemented yet
-#define XASH_ALLOW_SAVERESTORE_OFFSETS
+		#define XASH_ALLOW_SAVERESTORE_OFFSETS
-#endif
+	#endif
 #endif //WIN32
 
-#ifndef INT_MAX
+#include <stdlib.h>
-#define INT_MAX 2147483647
+#include <string.h>
-#endif
+#include <limits.h>
-
-#ifndef USHRT_MAX
-#define USHRT_MAX 65535
-#endif
 
 #if defined XASH_SDL && !defined REF_DLL
 #include <SDL.h>

engine/client/input.c

@@ -22,10 +22,6 @@ GNU General Public License for more details.
 #include <SDL.h>
 #endif
 
-#ifdef _WIN32
-#include "windows.h"
-#endif
-
 #include "platform/platform.h"
 
 void*		in_mousecursor;

engine/common/imagelib/img_png.c

@@ -17,9 +17,7 @@ GNU General Public License for more details.
 #include "miniz.h"
 #include "imagelib.h"
 #include "mathlib.h"
-#ifdef _WIN32
+#ifndef _WIN32
-#include <winsock2.h>
-#else
 #include <netinet/in.h>
 #endif
 

engine/common/net_ws.c

@@ -19,7 +19,6 @@ GNU General Public License for more details.
 #include "mathlib.h"
 #ifdef _WIN32
 // Winsock
-#include <winsock2.h>
 #include <WS2tcpip.h>
 #else
 // BSD sockets

engine/platform/win32/sys_win.c

@@ -13,7 +13,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
 
-#include <windows.h>
 #include "platform/platform.h"
 #include "menu_int.h"