--- a/include/SDL_syswm.h	Sat Feb 25 20:48:26 2006 +0000
+++ b/include/SDL_syswm.h	Sat Feb 25 22:18:25 2006 +0000
@@ -116,7 +116,8 @@
 } SDL_SysWMinfo;
 
 #elif SDL_VIDEO_DRIVER_WINDIB || SDL_VIDEO_DRIVER_DDRAW
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 /* The windows custom event structure */
 struct SDL_SysWMmsg {

--- a/include/SDL_windows.h	Sat Feb 25 20:48:26 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_windows_h
-#define _SDL_windows_h
-
-#include "SDL_stdinc.h"
-
-/* This includes only the windows headers needed by SDL, with no C runtime */
-#define WIN32_LEAN_AND_MEAN
-#ifndef HAVE_LIBC
-#ifdef _MSC_VER
-#ifndef __FLTUSED__
-#define __FLTUSED__
-#ifdef __cplusplus
-   extern "C"
-#endif
-	   __declspec(selectany) int _fltused=1;
-#endif
-#endif /* _MSC_VER */
-#endif/* !HAVE_LIBC */
-#include <windows.h>
-
-#endif /* _SDL_windows_h */

--- a/src/SDL.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/SDL.c	Sat Feb 25 22:18:25 2006 +0000
@@ -327,7 +327,8 @@
 
 #if !defined(HAVE_LIBC) || defined(_WIN32_WCE) || (defined(__WATCOMC__) && defined(BUILD_DLL))
 /* Need to include DllMain() on Windows CE and Watcom C for some reason.. */
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 BOOL APIENTRY _DllMainCRTStartup( HANDLE hModule, 
                        DWORD  ul_reason_for_call, 

--- a/src/audio/windib/SDL_dibaudio.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/audio/windib/SDL_dibaudio.c	Sat Feb 25 22:18:25 2006 +0000
@@ -23,7 +23,8 @@
 
 /* Allow access to a raw mixing buffer */
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <mmsystem.h>
 
 #include "SDL_timer.h"

--- a/src/audio/windx5/directx.h	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/audio/windx5/directx.h	Sat Feb 25 22:18:25 2006 +0000
@@ -4,7 +4,8 @@
 
 /* Include all of the DirectX 5.0 headers and adds any necessary tweaks */
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <mmsystem.h>
 #ifndef WIN32
 #define WIN32

--- a/src/cdrom/win32/SDL_syscdrom.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/cdrom/win32/SDL_syscdrom.c	Sat Feb 25 22:18:25 2006 +0000
@@ -23,7 +23,8 @@
 
 /* Functions for system-level CD-ROM audio control */
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <mmsystem.h>
 
 #include "SDL_cdrom.h"

--- a/src/joystick/win32/SDL_mmjoystick.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/joystick/win32/SDL_mmjoystick.c	Sat Feb 25 22:18:25 2006 +0000
@@ -23,7 +23,8 @@
 
 /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <mmsystem.h>
 #include <regstr.h>
 

--- a/src/loadso/win32/SDL_sysloadso.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/loadso/win32/SDL_sysloadso.c	Sat Feb 25 22:18:25 2006 +0000
@@ -24,7 +24,8 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /* System dependent library loading routines                           */
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #include "SDL_loadso.h"
 

--- a/src/main/win32/SDL_win32_main.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/main/win32/SDL_win32_main.c	Sat Feb 25 22:18:25 2006 +0000
@@ -7,7 +7,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #ifdef _WIN32_WCE
 # define DIR_SEPERATOR TEXT("\\")

--- a/src/stdlib/SDL_getenv.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/stdlib/SDL_getenv.c	Sat Feb 25 22:18:25 2006 +0000
@@ -27,7 +27,8 @@
 
 #if defined(__WIN32__) && !defined(_WIN32_WCE)
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 /* Note this isn't thread-safe! */
 

--- a/src/stdlib/SDL_malloc.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/stdlib/SDL_malloc.c	Sat Feb 25 22:18:25 2006 +0000
@@ -485,7 +485,8 @@
 #endif  /* _WIN32 */
 #endif  /* WIN32 */
 #ifdef WIN32
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #define HAVE_MMAP 1
 #define HAVE_MORECORE 0
 #define LACKS_UNISTD_H

--- a/src/stdlib/SDL_stdlib.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/stdlib/SDL_stdlib.c	Sat Feb 25 22:18:25 2006 +0000
@@ -30,6 +30,14 @@
 
 #if defined(_MSC_VER)
 
+#ifndef __FLTUSED__
+#define __FLTUSED__
+#ifdef __cplusplus
+   extern "C"
+#endif
+	   __declspec(selectany) int _fltused=1;
+#endif
+
 /* Float to long */
 void __declspec(naked) _ftol()
 {

--- a/src/thread/win32/SDL_sysmutex.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/thread/win32/SDL_sysmutex.c	Sat Feb 25 22:18:25 2006 +0000
@@ -23,7 +23,8 @@
 
 /* Mutex functions using the Win32 API */
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #include "SDL_mutex.h"
 

--- a/src/thread/win32/SDL_syssem.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/thread/win32/SDL_syssem.c	Sat Feb 25 22:18:25 2006 +0000
@@ -23,7 +23,8 @@
 
 /* Semaphore functions using the Win32 API */
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #include "SDL_thread.h"
 #if defined(_WIN32_WCE) && (_WIN32_WCE < 300)

--- a/src/thread/win32/SDL_systhread.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/thread/win32/SDL_systhread.c	Sat Feb 25 22:18:25 2006 +0000
@@ -23,7 +23,8 @@
 
 /* Win32 thread management routines for SDL */
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #include "SDL_thread.h"
 #include "../SDL_thread_c.h"

--- a/src/thread/win32/SDL_systhread_c.h	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/thread/win32/SDL_systhread_c.h	Sat Feb 25 22:18:25 2006 +0000
@@ -21,7 +21,8 @@
 */
 #include "SDL_config.h"
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 typedef HANDLE SYS_ThreadHandle;
 

--- a/src/thread/win32/win_ce_semaphore.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/thread/win32/win_ce_semaphore.c	Sat Feb 25 22:18:25 2006 +0000
@@ -28,7 +28,9 @@
       and it is not clear how to handle a mixture of WCE semaphores and normal
       events and mutexes. */
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
 #include "win_ce_semaphore.h"
 
 static SYNCHHANDLE CleanUp (SYNCHHANDLE hSynch, DWORD Flags);

--- a/src/timer/win32/SDL_systimer.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/timer/win32/SDL_systimer.c	Sat Feb 25 22:18:25 2006 +0000
@@ -21,7 +21,8 @@
 */
 #include "SDL_config.h"
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <mmsystem.h>
 
 #include "SDL_timer.h"

--- a/src/timer/wince/SDL_systimer.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/timer/wince/SDL_systimer.c	Sat Feb 25 22:18:25 2006 +0000
@@ -21,7 +21,8 @@
 */
 #include "SDL_config.h"
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <mmsystem.h>
 
 #include "SDL_timer.h"

--- a/src/video/wincommon/SDL_lowvideo.h	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/video/wincommon/SDL_lowvideo.h	Sat Feb 25 22:18:25 2006 +0000
@@ -24,7 +24,8 @@
 #ifndef _SDL_lowvideo_h
 #define _SDL_lowvideo_h
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #include "../SDL_sysvideo.h"
 

--- a/src/video/wincommon/SDL_sysevents.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/video/wincommon/SDL_sysevents.c	Sat Feb 25 22:18:25 2006 +0000
@@ -21,7 +21,8 @@
 */
 #include "SDL_config.h"
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #include "SDL_events.h"
 #include "SDL_video.h"

--- a/src/video/wincommon/SDL_sysmouse.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/video/wincommon/SDL_sysmouse.c	Sat Feb 25 22:18:25 2006 +0000
@@ -21,7 +21,8 @@
 */
 #include "SDL_config.h"
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #include "SDL_mouse.h"
 #include "../../events/SDL_events_c.h"

--- a/src/video/wincommon/SDL_syswm.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/video/wincommon/SDL_syswm.c	Sat Feb 25 22:18:25 2006 +0000
@@ -21,7 +21,8 @@
 */
 #include "SDL_config.h"
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #include "SDL_version.h"
 #include "SDL_video.h"

--- a/src/video/windib/SDL_dibevents.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/video/windib/SDL_dibevents.c	Sat Feb 25 22:18:25 2006 +0000
@@ -21,7 +21,8 @@
 */
 #include "SDL_config.h"
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #include "SDL_main.h"
 #include "SDL_events.h"

--- a/src/video/windib/SDL_dibvideo.c	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/video/windib/SDL_dibvideo.c	Sat Feb 25 22:18:25 2006 +0000
@@ -21,7 +21,8 @@
 */
 #include "SDL_config.h"
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #if defined(_WIN32_WCE)
 

--- a/src/video/windib/SDL_dibvideo.h	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/video/windib/SDL_dibvideo.h	Sat Feb 25 22:18:25 2006 +0000
@@ -24,7 +24,8 @@
 #ifndef _SDL_dibvideo_h
 #define _SDL_dibvideo_h
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 /* for PDA */
 typedef enum

--- a/src/video/windx5/directx.h	Sat Feb 25 20:48:26 2006 +0000
+++ b/src/video/windx5/directx.h	Sat Feb 25 22:18:25 2006 +0000
@@ -4,7 +4,8 @@
 
 /* Include all of the DirectX 5.0 headers and adds any necessary tweaks */
 
-#include "SDL_windows.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <mmsystem.h>
 #ifndef WIN32
 #define WIN32