diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib G:\FGCVS\freeglut\include\GL\freeglut_std.h freeglut\include\GL\freeglut_std.h
--- G:\FGCVS\freeglut\include\GL\freeglut_std.h	Sun Apr 19 13:21:43 2009
+++ freeglut\include\GL\freeglut_std.h	Sun Apr 19 17:05:01 2009
@@ -57,7 +57,9 @@
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN 1
 #  endif
+#ifndef NOMINMAX
 #   define NOMINMAX
+#endif
 #   include <Windows.h>
 
 /* Windows static library */
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib G:\FGCVS\PLIB\src\js\jsWindows.cxx PLIB\src\js\jsWindows.cxx
--- G:\FGCVS\PLIB\src\js\jsWindows.cxx	Sun Apr 19 13:21:58 2009
+++ PLIB\src\js\jsWindows.cxx	Fri Mar 13 15:58:18 2009
@@ -25,6 +25,8 @@
 
 #if defined (UL_WIN32)
 
+extern int getJSName( char * name, int len );
+
 #define _JS_MAX_AXES_WIN 8  /* X,Y,Z,R,U,V,POV_X,POV_Y */
 
 struct os_specific_s {
@@ -122,10 +124,13 @@
     // at least for USB.  Try to get the real name from the registry.
     if ( ! os->getOEMProductName ( this, name, sizeof(name) ) )
     {
-      ulSetError ( UL_WARNING,
-                   "JS: Failed to read joystick name from registry" ) ;
-
-      strncpy ( name, os->jsCaps.szPname, sizeof(name) ) ;
+        if ( ! getJSName( name, sizeof(name) ) )
+        {
+            ulSetError ( UL_WARNING,
+                    "JS: Failed to read joystick name from registry" ) ;
+ 
+            strncpy ( name, os->jsCaps.szPname, sizeof(name) ) ;
+        }
     }
 
     // Windows joystick drivers may provide any combination of
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib G:\FGCVS\SimGear\source\simgear\sound\sample_openal.cxx Simgear\simgear\sound\sample_openal.cxx
--- G:\FGCVS\SimGear\source\simgear\sound\sample_openal.cxx	Fri Dec 26 17:40:45 2008
+++ Simgear\simgear\sound\sample_openal.cxx	Fri Mar 13 16:06:08 2009
@@ -24,16 +24,6 @@
 #  include <simgear_config.h>
 #endif
 
-#if defined( __APPLE__ )
-# define AL_ILLEGAL_ENUM AL_INVALID_ENUM
-# define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION
-# include <OpenAL/al.h>
-# include <OpenAL/alut.h>
-#else
-# include <AL/al.h>
-# include <AL/alut.h>
-#endif
-
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/structure/exception.hxx>
@@ -136,6 +126,7 @@
   }
 
 #else
+    .error Pre alut 1.0 version NOT supported
         //
 	// pre 1.0 alut version
         //
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib G:\FGCVS\SimGear\source\simgear\sound\sample_openal.hxx Simgear\simgear\sound\sample_openal.hxx
--- G:\FGCVS\SimGear\source\simgear\sound\sample_openal.hxx	Sun Oct 26 13:33:02 2008
+++ Simgear\simgear\sound\sample_openal.hxx	Fri Mar 13 16:07:18 2009
@@ -48,7 +48,11 @@
 # include <OpenAL/al.h>
 # include <OpenAL/alut.h>
 #else
+#ifdef USE_OPENAL_SDK
+# include <al.h>
+#else
 # include <AL/al.h>
+#endif
 # include <AL/alut.h>
 #endif
 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib G:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.cxx Simgear\simgear\sound\soundmgr_openal.cxx
--- G:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.cxx	Mon Sep 29 17:42:06 2008
+++ Simgear\simgear\sound\soundmgr_openal.cxx	Fri Mar 13 16:07:38 2009
@@ -29,14 +29,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined(__APPLE__)
-# include <OpenAL/al.h>
-# include <OpenAL/alc.h>
-#else
-# include <AL/al.h>
-# include <AL/alc.h>
-#endif
-
 #if defined (__APPLE__)
 #  ifdef __GNUC__
 #    if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 )
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib G:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.hxx Simgear\simgear\sound\soundmgr_openal.hxx
--- G:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.hxx	Sun Oct 26 13:33:02 2008
+++ Simgear\simgear\sound\soundmgr_openal.hxx	Fri Mar 13 16:09:00 2009
@@ -42,14 +42,6 @@
 #include <string>
 #include <map>
 
-#if defined( __APPLE__ )
-# include <OpenAL/al.h>
-# include <OpenAL/alc.h>
-#else
-# include <AL/al.h>
-# include <AL/alc.h>
-#endif
-
 #include "sample_openal.hxx"
 
 using std::map;
