diff --git a/source/cd_win.c b/source/cd_win.c
index 719074e..fbd63c5 100644
--- a/source/cd_win.c
+++ b/source/cd_win.c
@@ -31,6 +31,8 @@
 #endif
 #include <windows.h>
 #include "quakedef.h"
+#include "qargs.h"
+#include "console.h"
 #include "cdaudio.h"
 #include "cmd.h"
 
diff --git a/source/cl_sys_win.c b/source/cl_sys_win.c
index 94f2a86..7a0690d 100644
--- a/source/cl_sys_win.c
+++ b/source/cl_sys_win.c
@@ -50,18 +50,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
-#include "winquake.h"
-#include "resource.h"
-#include "sys.h"
+#include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <io.h>
 #include <conio.h>
+
+#include "quakedef.h"
+#include "winquake.h"
+#include "resource.h"
+#include "sys.h"
 #include "screen.h"
 #include "qargs.h"
 #include "client.h"
+#include "console.h"
 
 qboolean is_server = false;
 
diff --git a/source/fnmatch.c b/source/fnmatch.c
index 8752401..ce319c3 100644
--- a/source/fnmatch.c
+++ b/source/fnmatch.c
@@ -24,35 +24,17 @@
 	$Id$
 */
 
-#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
-#include <config.h>
-#else
 #include "config.h"
-#endif
-#endif
-
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 
-/* This code to undef const added in libiberty.  */
-#ifndef __STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
 #include <errno.h>
-#include <fnmatch.h>
 #include <ctype.h>
 
+#include "win32/fnmatch.h"
+
 
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
diff --git a/source/in_win.c b/source/in_win.c
index 4cdb654..03c7177 100644
--- a/source/in_win.c
+++ b/source/in_win.c
@@ -39,6 +39,9 @@
 #include <dinput.h>
 #include "client.h"
 #include "keys.h"
+#include "console.h"
+#include "qargs.h"
+#include "cmd.h"
 //#include "dosisms.h"
 
 #define DINPUT_BUFFERSIZE           16
diff --git a/source/keys.c b/source/keys.c
index a1b2497..d9f67d7 100644
--- a/source/keys.c
+++ b/source/keys.c
@@ -26,13 +26,16 @@
 	$Id$
 */
 
-#ifdef _WIN32
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "qtypes.h"
 #include "sys.h"
 #include "keys.h"
@@ -44,8 +47,6 @@
 #include "screen.h"
 #include "client.h"
 
-#include <string.h>
-
 /*
 
 key up events are sent even if in console mode
diff --git a/source/snd_mix.c b/source/snd_mix.c
index f50d309..21b2446 100644
--- a/source/snd_mix.c
+++ b/source/snd_mix.c
@@ -31,6 +31,7 @@
 # include <config.h>
 #endif
 #include "sound.h"
+#include "console.h"
 
 #ifdef _WIN32
 #include "winquake.h"
diff --git a/source/snd_win.c b/source/snd_win.c
index 32f78b4..22d5163 100644
--- a/source/snd_win.c
+++ b/source/snd_win.c
@@ -31,6 +31,8 @@
 #endif
 #include "quakedef.h"
 #include "winquake.h"
+#include "qargs.h"
+#include "console.h"
 #include "sound.h"
 
 #define iDirectSoundCreate(a,b,c)	pDirectSoundCreate(a,b,c)
diff --git a/source/sv_sys_win.c b/source/sv_sys_win.c
index 28fcefc..3dd4d6c 100644
--- a/source/sv_sys_win.c
+++ b/source/sv_sys_win.c
@@ -29,14 +29,17 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <winsock.h>
+#include <conio.h>
+
 #include "qargs.h"
 #include "cvar.h"
 #include "server.h"
 #include "sys.h"
 
-#include <winsock.h>
-#include <conio.h>
-
 
 qboolean is_server = true;
 qboolean WinNT;
diff --git a/source/va.c b/source/va.c
index 364494b..51750c3 100644
--- a/source/va.c
+++ b/source/va.c
@@ -20,8 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <stdarg.h>
 #include <stdio.h>
+#include <stdarg.h>
+
+#include "qtypes.h"
 
 /*
 	va
diff --git a/source/vid_mgl.c b/source/vid_mgl.c
index c1f386e..662cc70 100644
--- a/source/vid_mgl.c
+++ b/source/vid_mgl.c
@@ -31,6 +31,7 @@
 # include "config.h"
 #endif
 #include <stdlib.h>
+
 #include "quakedef.h"
 #include "winquake.h"
 #include "sys.h"
@@ -42,6 +43,11 @@
 #include "wad.h"
 #include "cmd.h"
 #include "qendian.h"
+#include "draw.h"
+#include "console.h"
+#include "sound.h"
+#include "cdaudio.h"
+#include "qargs.h"
 
 #define	MINIMUM_MEMORY	0x550000