--- a/configure.in	Thu Jan 20 17:33:06 2011 -0800
+++ b/configure.in	Thu Jan 20 18:04:05 2011 -0800
@@ -1645,8 +1645,8 @@
 }
 
 
-dnl Check for Win32 OpenGL
-CheckWIN32GL()
+dnl Check for Windows OpenGL
+CheckWINDOWSGL()
 {
     if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
         AC_DEFINE(SDL_VIDEO_OPENGL)
@@ -1906,10 +1906,10 @@
     fi
 }
 
-dnl Determine whether the compiler can produce Win32 executables
-CheckWIN32()
+dnl Determine whether the compiler can produce Windows executables
+CheckWINDOWS()
 {
-    AC_MSG_CHECKING(Win32 compiler)
+    AC_MSG_CHECKING(Windows compiler)
     have_win32_gcc=no
     AC_TRY_COMPILE([
      #include <windows.h>
@@ -1920,7 +1920,7 @@
     AC_MSG_RESULT($have_win32_gcc)
     if test x$have_win32_gcc != xyes; then
        AC_MSG_ERROR([
-*** Your compiler ($CC) does not produce Win32 executables!
+*** Your compiler ($CC) does not produce Windows executables!
        ])
     fi
 
@@ -1938,7 +1938,7 @@
 
     dnl See if the user wants to redirect standard output to files
     AC_ARG_ENABLE(stdio-redirect,
-AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Win32 [[default=yes]]]),
+AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Windows [[default=yes]]]),
                   , enable_stdio_redirect=yes)
     if test x$enable_stdio_redirect != xyes; then
         EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT"
@@ -1949,7 +1949,7 @@
 CheckDIRECTX()
 {
     AC_ARG_ENABLE(directx,
-AC_HELP_STRING([--enable-directx], [use DirectX for Win32 audio/video [[default=yes]]]),
+AC_HELP_STRING([--enable-directx], [use DirectX for Windows audio/video [[default=yes]]]),
                   , enable_directx=yes)
     if test x$enable_directx = xyes; then
         AC_CHECK_HEADER(d3d9.h, have_d3d=yes)
@@ -2332,10 +2332,10 @@
         CheckDummyVideo
         CheckDiskAudio
         CheckDummyAudio
-        CheckWIN32
+        CheckWINDOWS
         if test x$enable_video = xyes; then
-            AC_DEFINE(SDL_VIDEO_DRIVER_WIN32)
-            SOURCES="$SOURCES $srcdir/src/video/win32/*.c"
+            AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
+            SOURCES="$SOURCES $srcdir/src/video/windows/*.c"
             have_video=yes
             AC_ARG_ENABLE(render-gdi,
 AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
@@ -2381,10 +2381,10 @@
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
-            AC_DEFINE(SDL_THREAD_WIN32)
-            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c"
-            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c"
-            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c"
+            AC_DEFINE(SDL_THREAD_WINDOWS)
+            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c"
+            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c"
+            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c"
             SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
             have_threads=yes
         fi
@@ -2396,8 +2396,8 @@
         fi
         # Set up files for the shared object loading library
         if test x$enable_loadso = xyes; then
-            AC_DEFINE(SDL_LOADSO_WIN32)
-            SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
+            AC_DEFINE(SDL_LOADSO_WINDOWS)
+            SOURCES="$SOURCES $srcdir/src/loadso/windows/*.c"
             have_loadso=yes
         fi
         # Set up the system libraries we need
@@ -2412,8 +2412,8 @@
         	;;
 	esac
 
-        # The Win32 platform requires special setup
-        SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"
+        # The Windows platform requires special setup
+        SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
         EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
         EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS"
         ;;
@@ -2431,13 +2431,13 @@
         CheckDummyVideo
         CheckDiskAudio
         CheckDummyAudio
-        CheckWIN32
-        CheckWIN32GL
+        CheckWINDOWS
+        CheckWINDOWSGL
         CheckDIRECTX
         # Set up files for the video library
         if test x$enable_video = xyes; then
-            AC_DEFINE(SDL_VIDEO_DRIVER_WIN32)
-            SOURCES="$SOURCES $srcdir/src/video/win32/*.c"
+            AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
+            SOURCES="$SOURCES $srcdir/src/video/windows/*.c"
             have_video=yes
             AC_ARG_ENABLE(render-gdi,
 AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
@@ -2466,18 +2466,18 @@
         if test x$enable_joystick = xyes; then
             if test x$have_dinput = xyes; then
                 AC_DEFINE(SDL_JOYSTICK_DINPUT)
-                SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c"
+                SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_dxjoystick.c"
                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
             else
                 AC_DEFINE(SDL_JOYSTICK_WINMM)
-                SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c"
+                SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_mmjoystick.c"
             fi
             have_joystick=yes
         fi
         if test x$enable_haptic = xyes; then
             if test x$have_dinput = xyes; then
                 AC_DEFINE(SDL_HAPTIC_DINPUT)
-                SOURCES="$SOURCES $srcdir/src/haptic/win32/SDL_syshaptic.c"
+                SOURCES="$SOURCES $srcdir/src/haptic/windows/SDL_syshaptic.c"
                 have_haptic=yes
             fi
         fi
@@ -2488,23 +2488,23 @@
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
-            AC_DEFINE(SDL_THREAD_WIN32)
-            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c"
-            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c"
-            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c"
+            AC_DEFINE(SDL_THREAD_WINDOWS)
+            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c"
+            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c"
+            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c"
             SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
             have_threads=yes
         fi
         # Set up files for the timer library
         if test x$enable_timers = xyes; then
-            AC_DEFINE(SDL_TIMER_WIN32)
-            SOURCES="$SOURCES $srcdir/src/timer/win32/*.c"
+            AC_DEFINE(SDL_TIMER_WINDOWS)
+            SOURCES="$SOURCES $srcdir/src/timer/windows/*.c"
             have_timers=yes
         fi
         # Set up files for the shared object loading library
         if test x$enable_loadso = xyes; then
-            AC_DEFINE(SDL_LOADSO_WIN32)
-            SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
+            AC_DEFINE(SDL_LOADSO_WINDOWS)
+            SOURCES="$SOURCES $srcdir/src/loadso/windows/*.c"
             have_loadso=yes
         fi
         # Set up the system libraries we need
@@ -2512,9 +2512,9 @@
         # You can get this here: http://libunicows.sourceforge.net/
         #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lmsimg32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
-        # The Win32 platform requires special setup
-        VERSION_SOURCES="$srcdir/src/main/win32/*.rc"
-        SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"
+        # The Windows platform requires special setup
+        VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
+        SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
         SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
         SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
         ;;