qw_client.dsp and makefile.mgw:

remove vid_win.c from the projects. no longer needed after taniwha's
    cl_main changes.

cl_main.c:
    remove #include "winquake.h", which is not needed

vc/config.h:
    add #define HAVE_WINSOCK_H

include/win32/vc/config.h

@@ -269,6 +269,9 @@
 /* Define if you have a sane fnmatch.h   */
 #define HAVE_FNMATCH_PROTO
 
+/* Define if you have winsock.h in your includes path */
+#define HAVE_WINSOCK_H
+
 /* Define this to something appropriate for declaring 0 length arrays */
 #define ZERO_LENGTH_ARRAY 0
 

source/cl_main.c

@@ -86,7 +86,6 @@
 #include "vid.h"
 #include "view.h"
 #include "va.h"
-#include "winquake.h"
 
 #ifdef __sun
 /* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */

source/makefile.mgw

@@ -82,7 +82,7 @@ WIN32_OTHER = cd_win.c joy_win.c in_win.c
 client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
 	cl_main.c cl_misc.c cl_parse.c cl_pred.c cl_slist.c cl_tent.c \
 	console.c keys.c menu.c model_alias.c model_sprite.c nonintel.c \
-	pcx.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c vid.c vid_win.c $(client_ASM)
+	pcx.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c vid.c $(client_ASM)
 
 #
 # OPENGL rendering

source/qw_client.dsp

@@ -1481,10 +1481,6 @@ SOURCE=.\vid_wgl.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\vid_win.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\wad.c
 # End Source File
 # Begin Source File