diff --git a/rundemos.bat b/rundemos.bat
index 81b046586..0d784d417 100644
--- a/rundemos.bat
+++ b/rundemos.bat
@@ -22,7 +22,7 @@ sgv spaceship.osg
 echo sgv cube_mapped_torus.osg
 sgv cube_mapped_torus.osg
 
-echo sgv osgvertexprogram
+echo osgvertexprogram
 osgvertexprogram
 
 echo sgv Town.osg
diff --git a/src/osgGLUT/Window.cpp b/src/osgGLUT/Window.cpp
index 328b3a830..ff586b8fd 100644
--- a/src/osgGLUT/Window.cpp
+++ b/src/osgGLUT/Window.cpp
@@ -72,7 +72,9 @@ bool Window::open()
     glutVisibilityFunc( visibilityCB );
     glutDisplayFunc(    displayCB );
     glutKeyboardFunc(   keyboardCB );
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
     glutKeyboardUpFunc(   keyboardUpCB );
+#endif
 
     glutMouseFunc( mouseCB );
     glutMotionFunc( mouseMotionCB );
diff --git a/src/osgPlugins/lib3ds/ReaderWriter3DS.cpp b/src/osgPlugins/lib3ds/ReaderWriter3DS.cpp
index 6180dd34d..45982da9c 100644
--- a/src/osgPlugins/lib3ds/ReaderWriter3DS.cpp
+++ b/src/osgPlugins/lib3ds/ReaderWriter3DS.cpp
@@ -17,13 +17,13 @@
 #include <osg/NodeVisitor>
 
 
-#include <file.h>
-#include <mesh.h>
-#include <material.h>
-#include <vector.h>
-#include <matrix.h>
-#include <node.h>
-#include <quat.h>
+#include "file.h"
+#include "mesh.h"
+#include "material.h"
+#include "vector.h"
+#include "matrix.h"
+#include "node.h"
+#include "quat.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/osgPlugins/lib3ds/atmosphere.cpp b/src/osgPlugins/lib3ds/atmosphere.cpp
index a19517d73..c24301a00 100644
--- a/src/osgPlugins/lib3ds/atmosphere.cpp
+++ b/src/osgPlugins/lib3ds/atmosphere.cpp
@@ -20,9 +20,9 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <atmosphere.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "atmosphere.h"
+#include "chunk.h"
+#include "readwrite.h"
 
 
 /*!
diff --git a/src/osgPlugins/lib3ds/atmosphere.h b/src/osgPlugins/lib3ds/atmosphere.h
index ea438340b..0e965eac0 100644
--- a/src/osgPlugins/lib3ds/atmosphere.h
+++ b/src/osgPlugins/lib3ds/atmosphere.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/background.cpp b/src/osgPlugins/lib3ds/background.cpp
index 3931f11b9..410563d80 100644
--- a/src/osgPlugins/lib3ds/background.cpp
+++ b/src/osgPlugins/lib3ds/background.cpp
@@ -20,9 +20,9 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <background.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "background.h"
+#include "chunk.h"
+#include "readwrite.h"
 #include <string.h>
 #include <math.h>
 
diff --git a/src/osgPlugins/lib3ds/background.h b/src/osgPlugins/lib3ds/background.h
index 489613659..e54dc3de8 100644
--- a/src/osgPlugins/lib3ds/background.h
+++ b/src/osgPlugins/lib3ds/background.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/camera.cpp b/src/osgPlugins/lib3ds/camera.cpp
index 1aa6a86ff..af789d070 100644
--- a/src/osgPlugins/lib3ds/camera.cpp
+++ b/src/osgPlugins/lib3ds/camera.cpp
@@ -20,13 +20,13 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <camera.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "camera.h"
+#include "chunk.h"
+#include "readwrite.h"
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif
diff --git a/src/osgPlugins/lib3ds/camera.h b/src/osgPlugins/lib3ds/camera.h
index c600a8ede..733d78d0e 100644
--- a/src/osgPlugins/lib3ds/camera.h
+++ b/src/osgPlugins/lib3ds/camera.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/chunk.cpp b/src/osgPlugins/lib3ds/chunk.cpp
index 057bafd83..bc0a12b4e 100644
--- a/src/osgPlugins/lib3ds/chunk.cpp
+++ b/src/osgPlugins/lib3ds/chunk.cpp
@@ -20,9 +20,9 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <chunk.h>
-#include <readwrite.h>
-#include <chunktable.h>
+#include "chunk.h"
+#include "readwrite.h"
+#include "chunktable.h"
 #include <string.h>
 #include <stdarg.h>
 
diff --git a/src/osgPlugins/lib3ds/chunk.h b/src/osgPlugins/lib3ds/chunk.h
index 37b69094e..3480e9dd1 100644
--- a/src/osgPlugins/lib3ds/chunk.h
+++ b/src/osgPlugins/lib3ds/chunk.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/chunktable.h b/src/osgPlugins/lib3ds/chunktable.h
index ef5261231..f48d4120e 100644
--- a/src/osgPlugins/lib3ds/chunktable.h
+++ b/src/osgPlugins/lib3ds/chunktable.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_CHUNK_H
-#include <chunk.h>
+#include "chunk.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/ease.cpp b/src/osgPlugins/lib3ds/ease.cpp
index 8e23902c4..8fbaf4c78 100644
--- a/src/osgPlugins/lib3ds/ease.cpp
+++ b/src/osgPlugins/lib3ds/ease.cpp
@@ -20,7 +20,7 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <ease.h>
+#include "ease.h"
 
 
 /*!
diff --git a/src/osgPlugins/lib3ds/ease.h b/src/osgPlugins/lib3ds/ease.h
index 18ab8b48f..ce8e4dab3 100644
--- a/src/osgPlugins/lib3ds/ease.h
+++ b/src/osgPlugins/lib3ds/ease.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/file.cpp b/src/osgPlugins/lib3ds/file.cpp
index 95c41cb9d..7884e5e00 100644
--- a/src/osgPlugins/lib3ds/file.cpp
+++ b/src/osgPlugins/lib3ds/file.cpp
@@ -20,19 +20,19 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <file.h>
-#include <chunk.h>
-#include <readwrite.h>
-#include <material.h>
-#include <mesh.h>
-#include <camera.h>
-#include <light.h>
-#include <node.h>
-#include <vector.h>
+#include "file.h"
+#include "chunk.h"
+#include "readwrite.h"
+#include "material.h"
+#include "mesh.h"
+#include "camera.h"
+#include "light.h"
+#include "node.h"
+#include "vector.h"
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif
diff --git a/src/osgPlugins/lib3ds/lib3ds_float.cpp b/src/osgPlugins/lib3ds/lib3ds_float.cpp
index 443ff370c..56181418e 100644
--- a/src/osgPlugins/lib3ds/lib3ds_float.cpp
+++ b/src/osgPlugins/lib3ds/lib3ds_float.cpp
@@ -20,7 +20,7 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <lib3ds_float.h>
+#include "lib3ds_float.h"
 
 
 /*!
diff --git a/src/osgPlugins/lib3ds/lib3ds_float.h b/src/osgPlugins/lib3ds/lib3ds_float.h
index b8dc1a213..9c8861ce2 100644
--- a/src/osgPlugins/lib3ds/lib3ds_float.h
+++ b/src/osgPlugins/lib3ds/lib3ds_float.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/light.cpp b/src/osgPlugins/lib3ds/light.cpp
index fb08717cd..d82bcf556 100644
--- a/src/osgPlugins/lib3ds/light.cpp
+++ b/src/osgPlugins/lib3ds/light.cpp
@@ -20,13 +20,13 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <light.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "light.h"
+#include "chunk.h"
+#include "readwrite.h"
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif
diff --git a/src/osgPlugins/lib3ds/light.h b/src/osgPlugins/lib3ds/light.h
index 3076ecd1e..36ef94962 100644
--- a/src/osgPlugins/lib3ds/light.h
+++ b/src/osgPlugins/lib3ds/light.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/material.cpp b/src/osgPlugins/lib3ds/material.cpp
index 81853d6da..60463cb61 100644
--- a/src/osgPlugins/lib3ds/material.cpp
+++ b/src/osgPlugins/lib3ds/material.cpp
@@ -20,13 +20,13 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <material.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "material.h"
+#include "chunk.h"
+#include "readwrite.h"
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif
diff --git a/src/osgPlugins/lib3ds/material.h b/src/osgPlugins/lib3ds/material.h
index 3562f54f9..70464e387 100644
--- a/src/osgPlugins/lib3ds/material.h
+++ b/src/osgPlugins/lib3ds/material.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/matrix.cpp b/src/osgPlugins/lib3ds/matrix.cpp
index 294a87862..c1b8a5b7e 100644
--- a/src/osgPlugins/lib3ds/matrix.cpp
+++ b/src/osgPlugins/lib3ds/matrix.cpp
@@ -20,9 +20,9 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <matrix.h>
-#include <quat.h>
-#include <vector.h>
+#include "matrix.h"
+#include "quat.h"
+#include "vector.h"
 #include <string.h>
 #include <math.h>
 
diff --git a/src/osgPlugins/lib3ds/matrix.h b/src/osgPlugins/lib3ds/matrix.h
index 9acace96d..0f8b6a908 100644
--- a/src/osgPlugins/lib3ds/matrix.h
+++ b/src/osgPlugins/lib3ds/matrix.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/mesh.cpp b/src/osgPlugins/lib3ds/mesh.cpp
index 7ea30d3e9..a27743828 100644
--- a/src/osgPlugins/lib3ds/mesh.cpp
+++ b/src/osgPlugins/lib3ds/mesh.cpp
@@ -20,15 +20,15 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <mesh.h>
-#include <readwrite.h>
-#include <chunk.h>
-#include <vector.h>
-#include <matrix.h>
+#include "mesh.h"
+#include "readwrite.h"
+#include "chunk.h"
+#include "vector.h"
+#include "matrix.h"
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif
diff --git a/src/osgPlugins/lib3ds/mesh.h b/src/osgPlugins/lib3ds/mesh.h
index d10ad0461..714043148 100644
--- a/src/osgPlugins/lib3ds/mesh.h
+++ b/src/osgPlugins/lib3ds/mesh.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/node.cpp b/src/osgPlugins/lib3ds/node.cpp
index 04ae89a7e..b957a48f8 100644
--- a/src/osgPlugins/lib3ds/node.cpp
+++ b/src/osgPlugins/lib3ds/node.cpp
@@ -20,15 +20,15 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <node.h>
-#include <file.h>
-#include <readwrite.h>
-#include <chunk.h>
-#include <matrix.h>
+#include "node.h"
+#include "file.h"
+#include "readwrite.h"
+#include "chunk.h"
+#include "matrix.h"
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif
diff --git a/src/osgPlugins/lib3ds/node.h b/src/osgPlugins/lib3ds/node.h
index 0492ce3bc..cc64d38e8 100644
--- a/src/osgPlugins/lib3ds/node.h
+++ b/src/osgPlugins/lib3ds/node.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TRACKS_H
-#include <tracks.h>
+#include "tracks.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/quat.cpp b/src/osgPlugins/lib3ds/quat.cpp
index f6e8e3275..ebb6d1c8a 100644
--- a/src/osgPlugins/lib3ds/quat.cpp
+++ b/src/osgPlugins/lib3ds/quat.cpp
@@ -20,7 +20,7 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <quat.h>
+#include "quat.h"
 #include <math.h>
 
 
diff --git a/src/osgPlugins/lib3ds/quat.h b/src/osgPlugins/lib3ds/quat.h
index 68baf2600..10971c5cd 100644
--- a/src/osgPlugins/lib3ds/quat.h
+++ b/src/osgPlugins/lib3ds/quat.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/readwrite.cpp b/src/osgPlugins/lib3ds/readwrite.cpp
index 2b0e6cc61..d555dd14d 100644
--- a/src/osgPlugins/lib3ds/readwrite.cpp
+++ b/src/osgPlugins/lib3ds/readwrite.cpp
@@ -20,7 +20,7 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <readwrite.h>
+#include "readwrite.h"
 
 
 /*!
diff --git a/src/osgPlugins/lib3ds/readwrite.h b/src/osgPlugins/lib3ds/readwrite.h
index bd05cf8e3..64b7bb7a7 100644
--- a/src/osgPlugins/lib3ds/readwrite.h
+++ b/src/osgPlugins/lib3ds/readwrite.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/shadow.cpp b/src/osgPlugins/lib3ds/shadow.cpp
index dfc7b9096..d8951a39d 100644
--- a/src/osgPlugins/lib3ds/shadow.cpp
+++ b/src/osgPlugins/lib3ds/shadow.cpp
@@ -23,7 +23,7 @@
 #include "shadow.h"
 #include "chunk.h"
 #include "readwrite.h"
-#include "math.h"
+#include <math.h>
 
 
 /*!
diff --git a/src/osgPlugins/lib3ds/shadow.h b/src/osgPlugins/lib3ds/shadow.h
index e178492eb..bd476606f 100644
--- a/src/osgPlugins/lib3ds/shadow.h
+++ b/src/osgPlugins/lib3ds/shadow.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/tcb.cpp b/src/osgPlugins/lib3ds/tcb.cpp
index fae26e043..33d6bc609 100644
--- a/src/osgPlugins/lib3ds/tcb.cpp
+++ b/src/osgPlugins/lib3ds/tcb.cpp
@@ -20,8 +20,8 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <tcb.h>
-#include <readwrite.h>
+#include "tcb.h"
+#include "readwrite.h"
 #include <math.h>
 
 
diff --git a/src/osgPlugins/lib3ds/tcb.h b/src/osgPlugins/lib3ds/tcb.h
index f8ec1da41..aea0f4412 100644
--- a/src/osgPlugins/lib3ds/tcb.h
+++ b/src/osgPlugins/lib3ds/tcb.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/tracks.cpp b/src/osgPlugins/lib3ds/tracks.cpp
index e2a1fefb4..ed7ee896f 100644
--- a/src/osgPlugins/lib3ds/tracks.cpp
+++ b/src/osgPlugins/lib3ds/tracks.cpp
@@ -20,16 +20,16 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <tracks.h>
-#include <readwrite.h>
-#include <chunk.h>
-#include <lib3ds_float.h>
-#include <vector.h>
-#include <quat.h>
+#include "tracks.h"
+#include "readwrite.h"
+#include "chunk.h"
+#include "lib3ds_float.h"
+#include "vector.h"
+#include "quat.h"
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <config.h>
+#include "config.h"
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #endif
diff --git a/src/osgPlugins/lib3ds/tracks.h b/src/osgPlugins/lib3ds/tracks.h
index fc0555029..673bd3835 100644
--- a/src/osgPlugins/lib3ds/tracks.h
+++ b/src/osgPlugins/lib3ds/tracks.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TCB_H
-#include <tcb.h>
+#include "tcb.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/vector.cpp b/src/osgPlugins/lib3ds/vector.cpp
index a6fb56082..5b3d023af 100644
--- a/src/osgPlugins/lib3ds/vector.cpp
+++ b/src/osgPlugins/lib3ds/vector.cpp
@@ -20,7 +20,7 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <vector.h>
+#include "vector.h"
 #include <math.h>
 
 
diff --git a/src/osgPlugins/lib3ds/vector.h b/src/osgPlugins/lib3ds/vector.h
index 7588e75d5..f5bcac2a8 100644
--- a/src/osgPlugins/lib3ds/vector.h
+++ b/src/osgPlugins/lib3ds/vector.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/osgPlugins/lib3ds/viewport.cpp b/src/osgPlugins/lib3ds/viewport.cpp
index d68ffc03b..bd0f4f792 100644
--- a/src/osgPlugins/lib3ds/viewport.cpp
+++ b/src/osgPlugins/lib3ds/viewport.cpp
@@ -20,9 +20,9 @@
  * $Id$
  */
 #define LIB3DS_EXPORT
-#include <viewport.h>
-#include <chunk.h>
-#include <readwrite.h>
+#include "viewport.h"
+#include "chunk.h"
+#include "readwrite.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/osgPlugins/lib3ds/viewport.h b/src/osgPlugins/lib3ds/viewport.h
index b9c0f3ae5..7f3db5554 100644
--- a/src/osgPlugins/lib3ds/viewport.h
+++ b/src/osgPlugins/lib3ds/viewport.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef INCLUDED_LIB3DS_TYPES_H
-#include <types.h>
+#include "types.h"
 #endif
 
 #ifdef __cplusplus