Sophie

Sophie

distrib > Fedora > 14 > x86_64 > by-pkgid > 2b3df95349ea21009c5e30ab1dcdf4d2 > files > 4

Inventor-2.1.5-39.fc14.src.rpm

diff -Naur inventor-2.1.5-32/apps/converters/ivdowngrade/downgradeToV1.c++ inventor/apps/converters/ivdowngrade/downgradeToV1.c++
--- inventor-2.1.5-32/apps/converters/ivdowngrade/downgradeToV1.c++	2001-09-25 02:45:25.000000000 +0200
+++ inventor/apps/converters/ivdowngrade/downgradeToV1.c++	2009-02-19 04:41:20.000000000 +0100
@@ -48,7 +48,7 @@
  _______________________________________________________________________
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include <assert.h>
 #include <Inventor/SbDict.h>
diff -Naur inventor-2.1.5-32/apps/converters/ivdowngrade/main.c++ inventor/apps/converters/ivdowngrade/main.c++
--- inventor-2.1.5-32/apps/converters/ivdowngrade/main.c++	2001-09-25 02:45:25.000000000 +0200
+++ inventor/apps/converters/ivdowngrade/main.c++	2009-02-19 04:42:19.000000000 +0100
@@ -49,8 +49,8 @@
  */
 
 #include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <Inventor/SbDict.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInteraction.h>
diff -Naur inventor-2.1.5-32/apps/converters/ivdowngrade/SoLODV2.c++ inventor/apps/converters/ivdowngrade/SoLODV2.c++
--- inventor-2.1.5-32/apps/converters/ivdowngrade/SoLODV2.c++	2001-05-17 22:44:04.000000000 +0200
+++ inventor/apps/converters/ivdowngrade/SoLODV2.c++	2009-02-19 04:42:02.000000000 +0100
@@ -49,7 +49,7 @@
  _______________________________________________________________________
  */
 
-#include <math.h>
+#include <cmath>
 #include <float.h>
 #include <Inventor/nodes/SoLevelOfDetail.h>
 #include <Inventor/actions/SoGetMatrixAction.h>
diff -Naur inventor-2.1.5-32/apps/demos/drop/drop.c++ inventor/apps/demos/drop/drop.c++
--- inventor-2.1.5-32/apps/demos/drop/drop.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/drop/drop.c++	2009-02-19 04:42:19.000000000 +0100
@@ -50,8 +50,8 @@
  _______________________________________________________________________
  */
 
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
 #include <time.h>
 #include <Inventor/Xt/SoXt.h>
 #include "TsField.h"
diff -Naur inventor-2.1.5-32/apps/demos/drop/TsField.c++ inventor/apps/demos/drop/TsField.c++
--- inventor-2.1.5-32/apps/demos/drop/TsField.c++	2000-10-14 12:46:05.000000000 +0200
+++ inventor/apps/demos/drop/TsField.c++	2009-02-19 04:42:19.000000000 +0100
@@ -49,9 +49,9 @@
  */
 
 //--------------------------- Include ----------------------------------
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cmath>
 #include <sys/types.h>
 #include <Xm/Xm.h>
 #include <Xm/Form.h>
diff -Naur inventor-2.1.5-32/apps/demos/drop/TsPiece.c++ inventor/apps/demos/drop/TsPiece.c++
--- inventor-2.1.5-32/apps/demos/drop/TsPiece.c++	2000-08-15 14:55:54.000000000 +0200
+++ inventor/apps/demos/drop/TsPiece.c++	2009-02-19 04:41:20.000000000 +0100
@@ -49,7 +49,7 @@
  */
 
 //--------------------------- Include ----------------------------------
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/nodes/SoTransform.h>
 #include "TsPiece.h"
 
diff -Naur inventor-2.1.5-32/apps/demos/drop/TsPieces.c++ inventor/apps/demos/drop/TsPieces.c++
--- inventor-2.1.5-32/apps/demos/drop/TsPieces.c++	2000-10-14 12:46:05.000000000 +0200
+++ inventor/apps/demos/drop/TsPieces.c++	2009-02-19 04:41:41.000000000 +0100
@@ -48,7 +48,7 @@
  _______________________________________________________________________
  */
 
-#include <string.h>
+#include <cstring>
 #include "TsPieces.h"
 
 static int ellTable[24][4] = {
diff -Naur inventor-2.1.5-32/apps/demos/drop/TsRemoval.c++ inventor/apps/demos/drop/TsRemoval.c++
--- inventor-2.1.5-32/apps/demos/drop/TsRemoval.c++	2000-08-15 14:55:54.000000000 +0200
+++ inventor/apps/demos/drop/TsRemoval.c++	2009-02-19 04:41:20.000000000 +0100
@@ -51,7 +51,7 @@
  */
 
 //--------------------------- Include ----------------------------------
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/nodes/SoMaterial.h>
 #include <Inventor/nodes/SoSeparator.h>
diff -Naur inventor-2.1.5-32/apps/demos/drop/TsTrickle.c++ inventor/apps/demos/drop/TsTrickle.c++
--- inventor-2.1.5-32/apps/demos/drop/TsTrickle.c++	2000-08-15 14:55:54.000000000 +0200
+++ inventor/apps/demos/drop/TsTrickle.c++	2009-02-19 04:41:20.000000000 +0100
@@ -51,7 +51,7 @@
  */
 
 //--------------------------- Include ----------------------------------
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/nodes/SoMaterial.h>
 #include <Inventor/nodes/SoSeparator.h>
diff -Naur inventor-2.1.5-32/apps/demos/drop/TsViewer.c++ inventor/apps/demos/drop/TsViewer.c++
--- inventor-2.1.5-32/apps/demos/drop/TsViewer.c++	2000-08-15 14:55:54.000000000 +0200
+++ inventor/apps/demos/drop/TsViewer.c++	2009-02-19 04:42:02.000000000 +0100
@@ -48,7 +48,7 @@
  _______________________________________________________________________
  */
 
-#include <math.h>
+#include <cmath>
 
 #include <X11/Intrinsic.h>
 #include <X11/Xlib.h>
diff -Naur inventor-2.1.5-32/apps/demos/gview/DisplayGraph.c++ inventor/apps/demos/gview/DisplayGraph.c++
--- inventor-2.1.5-32/apps/demos/gview/DisplayGraph.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/gview/DisplayGraph.c++	2009-02-19 04:42:20.000000000 +0100
@@ -34,7 +34,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SbBox.h>
 #include <Inventor/SbDict.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/demos/gview/FieldEditor.c++ inventor/apps/demos/gview/FieldEditor.c++
--- inventor-2.1.5-32/apps/demos/gview/FieldEditor.c++	2000-10-14 12:46:05.000000000 +0200
+++ inventor/apps/demos/gview/FieldEditor.c++	2009-02-19 04:42:20.000000000 +0100
@@ -34,7 +34,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <ctype.h>
 #include <X11/Intrinsic.h>
 
diff -Naur inventor-2.1.5-32/apps/demos/gview/gview.c++ inventor/apps/demos/gview/gview.c++
--- inventor-2.1.5-32/apps/demos/gview/gview.c++	2002-06-01 04:22:20.000000000 +0200
+++ inventor/apps/demos/gview/gview.c++	2009-02-19 04:42:20.000000000 +0100
@@ -38,7 +38,7 @@
 // gview - displays a graph view of an Inventor scene graph.
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 
 #include <X11/Intrinsic.h>
diff -Naur inventor-2.1.5-32/apps/demos/gview/NodeCreator.c++ inventor/apps/demos/gview/NodeCreator.c++
--- inventor-2.1.5-32/apps/demos/gview/NodeCreator.c++	2000-10-14 12:46:05.000000000 +0200
+++ inventor/apps/demos/gview/NodeCreator.c++	2009-02-19 04:42:20.000000000 +0100
@@ -34,7 +34,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <X11/Intrinsic.h>
 
diff -Naur inventor-2.1.5-32/apps/demos/maze/maze.c++ inventor/apps/demos/maze/maze.c++
--- inventor-2.1.5-32/apps/demos/maze/maze.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/maze/maze.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,10 +41,10 @@
 //  See the README file in this directory for a complete explanation.
 //
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <X11/Intrinsic.h>
-#include <math.h>
+#include <cmath>
 
 #include <Inventor/SoInput.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/demos/maze/PlayClass.c++ inventor/apps/demos/maze/PlayClass.c++
--- inventor-2.1.5-32/apps/demos/maze/PlayClass.c++	2001-09-25 02:45:25.000000000 +0200
+++ inventor/apps/demos/maze/PlayClass.c++	2009-02-19 04:42:19.000000000 +0100
@@ -34,16 +34,16 @@
  *
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
+#include <cstdlib>
+#include <cmath>
+#include <cstring>
 #include <unistd.h>
 #include <CC/osfcn.h>
 #include <signal.h>
diff -Naur inventor-2.1.5-32/apps/demos/noodle/Interface.c++ inventor/apps/demos/noodle/Interface.c++
--- inventor-2.1.5-32/apps/demos/noodle/Interface.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/noodle/Interface.c++	2009-02-19 04:42:19.000000000 +0100
@@ -43,8 +43,8 @@
 
 
 #include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 
diff -Naur inventor-2.1.5-32/apps/demos/noodle/LineManip.c++ inventor/apps/demos/noodle/LineManip.c++
--- inventor-2.1.5-32/apps/demos/noodle/LineManip.c++	2000-08-15 14:55:54.000000000 +0200
+++ inventor/apps/demos/noodle/LineManip.c++	2009-02-19 04:41:20.000000000 +0100
@@ -42,7 +42,7 @@
 // edit).
 //
 
-#include <stdio.h>
+#include <cstdio>
 #include <assert.h>
 
 #include <Inventor/SbColor.h>
diff -Naur inventor-2.1.5-32/apps/demos/noodle/LineManipHilight.c++ inventor/apps/demos/noodle/LineManipHilight.c++
--- inventor-2.1.5-32/apps/demos/noodle/LineManipHilight.c++	2000-08-15 14:55:54.000000000 +0200
+++ inventor/apps/demos/noodle/LineManipHilight.c++	2009-02-19 04:42:02.000000000 +0100
@@ -38,9 +38,9 @@
 // Stuff to hilight parts of the line-set manipulator
 //
 
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
 #include <assert.h>
 
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/demos/noodle/noodle.c++ inventor/apps/demos/noodle/noodle.c++
--- inventor-2.1.5-32/apps/demos/noodle/noodle.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/noodle/noodle.c++	2009-02-19 04:42:20.000000000 +0100
@@ -37,9 +37,9 @@
 // Generalized Cylinder program
 //
 
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cmath>
+#include <cstdlib>
 #include <unistd.h>
 
 #include <Inventor/SoPickedPoint.h>
diff -Naur inventor-2.1.5-32/apps/demos/noodle/profile.c++ inventor/apps/demos/noodle/profile.c++
--- inventor-2.1.5-32/apps/demos/noodle/profile.c++	2001-09-25 02:45:25.000000000 +0200
+++ inventor/apps/demos/noodle/profile.c++	2009-02-19 04:42:19.000000000 +0100
@@ -38,10 +38,10 @@
 // Some code for setting up and dealing with the profile window.
 //
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include <Inventor/Xt/SoXt.h>
 
diff -Naur inventor-2.1.5-32/apps/demos/noodle/WorldInfo.c++ inventor/apps/demos/noodle/WorldInfo.c++
--- inventor-2.1.5-32/apps/demos/noodle/WorldInfo.c++	2000-10-14 12:46:05.000000000 +0200
+++ inventor/apps/demos/noodle/WorldInfo.c++	2009-02-19 04:41:20.000000000 +0100
@@ -43,7 +43,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoLists.h>
diff -Naur inventor-2.1.5-32/apps/demos/qmorf/FlashBackground.c++ inventor/apps/demos/qmorf/FlashBackground.c++
--- inventor-2.1.5-32/apps/demos/qmorf/FlashBackground.c++	2000-10-14 12:46:05.000000000 +0200
+++ inventor/apps/demos/qmorf/FlashBackground.c++	2009-02-19 04:42:20.000000000 +0100
@@ -39,9 +39,9 @@
 // Modified by Gavin Bell
 //
 
-#include <math.h>
+#include <cmath>
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <Inventor/SbLinear.h>
 #include <Inventor/nodes/SoGroup.h>
diff -Naur inventor-2.1.5-32/apps/demos/qmorf/qmorf.c++ inventor/apps/demos/qmorf/qmorf.c++
--- inventor-2.1.5-32/apps/demos/qmorf/qmorf.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/qmorf/qmorf.c++	2009-02-19 04:42:20.000000000 +0100
@@ -42,11 +42,11 @@
 //
 // Written by Gavin Bell for Silicon Graphics
 //
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cmath>
+#include <cstdlib>
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 
 
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/demos/qmorf/quadSheet.c++ inventor/apps/demos/qmorf/quadSheet.c++
--- inventor-2.1.5-32/apps/demos/qmorf/quadSheet.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/qmorf/quadSheet.c++	2009-02-19 04:42:02.000000000 +0100
@@ -38,7 +38,7 @@
 // Code to generate a flat sheet made out of a quad-mesh
 //
 
-#include <math.h>
+#include <cmath>
 #include "QuadThing.h"
 #include <Inventor/SoDB.h>
 #include <Inventor/nodes/SoSeparator.h>
diff -Naur inventor-2.1.5-32/apps/demos/qmorf/quadSphere.c++ inventor/apps/demos/qmorf/quadSphere.c++
--- inventor-2.1.5-32/apps/demos/qmorf/quadSphere.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/qmorf/quadSphere.c++	2009-02-19 04:42:02.000000000 +0100
@@ -41,7 +41,7 @@
 // interpolate them into some other shape.
 //
 
-#include <math.h>
+#include <cmath>
 #include "QuadThing.h"
 #include <Inventor/SoDB.h>
 #include <Inventor/nodes/SoSeparator.h>
diff -Naur inventor-2.1.5-32/apps/demos/qmorf/QuadThing.c++ inventor/apps/demos/qmorf/QuadThing.c++
--- inventor-2.1.5-32/apps/demos/qmorf/QuadThing.c++	2000-10-29 16:04:15.000000000 +0100
+++ inventor/apps/demos/qmorf/QuadThing.c++	2009-02-19 04:42:20.000000000 +0100
@@ -40,7 +40,7 @@
 // quad-mesh objects.
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <assert.h>
 
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/demos/revo/profile.c++ inventor/apps/demos/revo/profile.c++
--- inventor-2.1.5-32/apps/demos/revo/profile.c++	2001-09-25 02:45:25.000000000 +0200
+++ inventor/apps/demos/revo/profile.c++	2009-02-19 04:42:20.000000000 +0100
@@ -38,10 +38,10 @@
 // Some code for setting up and dealing with the profile window.
 //
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/demos/revo/revo.c++ inventor/apps/demos/revo/revo.c++
--- inventor-2.1.5-32/apps/demos/revo/revo.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/revo/revo.c++	2009-02-19 04:42:20.000000000 +0100
@@ -38,9 +38,9 @@
 // Surface of revolution program
 //
 
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cmath>
+#include <cstdlib>
 #include <unistd.h>
 
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/demos/SceneViewer/SceneViewer.c++ inventor/apps/demos/SceneViewer/SceneViewer.c++
--- inventor-2.1.5-32/apps/demos/SceneViewer/SceneViewer.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/SceneViewer/SceneViewer.c++	2009-02-19 04:42:20.000000000 +0100
@@ -40,7 +40,7 @@
 //   to allow interaction with it.
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/Intrinsic.h>
 #include <X11/keysym.h>
 #include <locale.h>
diff -Naur inventor-2.1.5-32/apps/demos/SceneViewer/SoSceneViewer.c++ inventor/apps/demos/SceneViewer/SoSceneViewer.c++
--- inventor-2.1.5-32/apps/demos/SceneViewer/SoSceneViewer.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/SceneViewer/SoSceneViewer.c++	2009-02-19 04:42:20.000000000 +0100
@@ -52,7 +52,7 @@
  _______________________________________________________________________
  */
 
-#include <stdlib.h> // for system() and getenv()
+#include <cstdlib> // for system() and getenv()
 #include <unistd.h> // for access()
 
 #include <X11/StringDefs.h>
diff -Naur inventor-2.1.5-32/apps/demos/textomatic/TextGraph.c++ inventor/apps/demos/textomatic/TextGraph.c++
--- inventor-2.1.5-32/apps/demos/textomatic/TextGraph.c++	2000-08-15 14:55:55.000000000 +0200
+++ inventor/apps/demos/textomatic/TextGraph.c++	2009-02-19 04:42:02.000000000 +0100
@@ -46,9 +46,9 @@
 // The whole thing is underneath a root Separator.
 //
 
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
 
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtClipboard.h>
diff -Naur inventor-2.1.5-32/apps/demos/textomatic/textomatic.c++ inventor/apps/demos/textomatic/textomatic.c++
--- inventor-2.1.5-32/apps/demos/textomatic/textomatic.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/demos/textomatic/textomatic.c++	2009-02-19 04:42:20.000000000 +0100
@@ -37,9 +37,9 @@
 //
 // Main stuff for 3D text creator program
 //
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <iconv.h>
 #ifdef __APPLE__
diff -Naur inventor-2.1.5-32/apps/demos/textomatic/TextWrapper.c++ inventor/apps/demos/textomatic/TextWrapper.c++
--- inventor-2.1.5-32/apps/demos/textomatic/TextWrapper.c++	2000-12-09 04:14:24.000000000 +0100
+++ inventor/apps/demos/textomatic/TextWrapper.c++	2009-02-19 04:41:41.000000000 +0100
@@ -41,8 +41,8 @@
 //
 
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <assert.h>
 #include <iconv.h>
 
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/02.1.HelloCone.c++ inventor/apps/examples/Mentor/CXX/02.1.HelloCone.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/02.1.HelloCone.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/02.1.HelloCone.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
  *  Hello Cone example program; draws a red cone in a window.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtRenderArea.h>
 #include <Inventor/nodes/SoCone.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/02.2.EngineSpin.c++ inventor/apps/examples/Mentor/CXX/02.2.EngineSpin.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/02.2.EngineSpin.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/02.2.EngineSpin.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
  *  Use an engine to make the cone spin.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtRenderArea.h>
 #include <Inventor/engines/SoElapsedTime.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/02.3.Trackball.c++ inventor/apps/examples/Mentor/CXX/02.3.Trackball.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/02.3.Trackball.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/02.3.Trackball.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
  *  Use the trackball manipulator to edit/rotate a red cone
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtRenderArea.h>
 #include <Inventor/manips/SoTrackballManip.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/02.4.Examiner.c++ inventor/apps/examples/Mentor/CXX/02.4.Examiner.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/02.4.Examiner.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/02.4.Examiner.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
  *  Use the Examiner Viewer to look at a red cone
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoCone.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/03.1.Molecule.c++ inventor/apps/examples/Mentor/CXX/03.1.Molecule.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/03.1.Molecule.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/03.1.Molecule.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoGroup.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/03.2.Robot.c++ inventor/apps/examples/Mentor/CXX/03.2.Robot.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/03.2.Robot.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/03.2.Robot.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoCube.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/04.1.Cameras.c++ inventor/apps/examples/Mentor/CXX/04.1.Cameras.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/04.1.Cameras.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/04.1.Cameras.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *  switched once per second.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SbLinear.h>
 
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/04.2.Lights.c++ inventor/apps/examples/Mentor/CXX/04.2.Lights.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/04.2.Lights.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/04.2.Lights.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,7 +45,7 @@
  *  light is moved back and forth using a shuttle node.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/05.1.FaceSet.c++ inventor/apps/examples/Mentor/CXX/05.1.FaceSet.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/05.1.FaceSet.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/05.1.FaceSet.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
  *  This example builds an obelisk using the Face Set node.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoCoordinate3.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/05.2.IndexedFaceSet.c++ inventor/apps/examples/Mentor/CXX/05.2.IndexedFaceSet.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/05.2.IndexedFaceSet.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/05.2.IndexedFaceSet.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  the first stellation of the dodecahedron.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoCoordinate3.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/05.3.TriangleStripSet.c++ inventor/apps/examples/Mentor/CXX/05.3.TriangleStripSet.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/05.3.TriangleStripSet.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/05.3.TriangleStripSet.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  a pennant-shaped flag.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoCoordinate3.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/05.4.QuadMesh.c++ inventor/apps/examples/Mentor/CXX/05.4.QuadMesh.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/05.4.QuadMesh.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/05.4.QuadMesh.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
  *  This example creates the St. Louis Arch using a QuadMesh.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoCoordinate3.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/05.5.Binding.c++ inventor/apps/examples/Mentor/CXX/05.5.Binding.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/05.5.Binding.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/05.5.Binding.c++	2009-02-19 04:42:19.000000000 +0100
@@ -46,7 +46,7 @@
  *  dodecahedron from an earlier example in this chapter.  
  *------------------------------------------------------------*/ 
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoCoordinate3.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/05.6.TransformOrdering.c++ inventor/apps/examples/Mentor/CXX/05.6.TransformOrdering.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/05.6.TransformOrdering.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/05.6.TransformOrdering.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,7 +45,7 @@
  *  translated to the right.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/06.1.Text.c++ inventor/apps/examples/Mentor/CXX/06.1.Text.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/06.1.Text.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/06.1.Text.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  continents Africa and Asia.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/nodes/SoComplexity.h>
 #include <Inventor/nodes/SoFont.h>
 #include <Inventor/nodes/SoGroup.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/06.2.Simple3DText.c++ inventor/apps/examples/Mentor/CXX/06.2.Simple3DText.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/06.2.Simple3DText.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/06.2.Simple3DText.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  continents Africa and Asia.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoComplexity.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/06.3.Complex3DText.c++ inventor/apps/examples/Mentor/CXX/06.3.Complex3DText.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/06.3.Complex3DText.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/06.3.Complex3DText.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  SoXTExaminerViewer.  It is a little fancier than 6.2.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoFont.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/07.1.BasicTexture.c++ inventor/apps/examples/Mentor/CXX/07.1.BasicTexture.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/07.1.BasicTexture.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/07.1.BasicTexture.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  texture coords).
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoCube.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/07.2.TextureCoordinates.c++ inventor/apps/examples/Mentor/CXX/07.2.TextureCoordinates.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/07.2.TextureCoordinates.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/07.2.TextureCoordinates.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  a Face Set.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoCoordinate3.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/07.3.TextureFunction.c++ inventor/apps/examples/Mentor/CXX/07.3.TextureFunction.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/07.3.TextureFunction.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/07.3.TextureFunction.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,7 +45,7 @@
  *  SoTextureCoordinatePlane node.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/nodes/SoMaterial.h>
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoSphere.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/08.1.BSCurve.c++ inventor/apps/examples/Mentor/CXX/08.1.BSCurve.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/08.1.BSCurve.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/08.1.BSCurve.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *  2 to illustrate a curve with a spike in it.
  *--------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/08.2.UniCurve.c++ inventor/apps/examples/Mentor/CXX/08.2.UniCurve.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/08.2.UniCurve.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/08.2.UniCurve.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,7 +45,7 @@
  *  4 to illustrate the curve passing through the endpoints.
  *--------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/08.3.BezSurf.c++ inventor/apps/examples/Mentor/CXX/08.3.BezSurf.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/08.3.BezSurf.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/08.3.BezSurf.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *  each with multipliciy 4 to define the Bezier surface.
  *--------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/08.4.TrimSurf.c++ inventor/apps/examples/Mentor/CXX/08.4.TrimSurf.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/08.4.TrimSurf.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/08.4.TrimSurf.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  *  Bezier curve.
  *----------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/09.1.Print.c++ inventor/apps/examples/Mentor/CXX/09.1.Print.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/09.1.Print.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/09.1.Print.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *  file for printing.
  *----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SbViewportRegion.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoOffscreenRenderer.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/09.2.Texture.c++ inventor/apps/examples/Mentor/CXX/09.2.Texture.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/09.2.Texture.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/09.2.Texture.c++	2009-02-19 04:42:19.000000000 +0100
@@ -43,7 +43,7 @@
  *  a texture map.
  *----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/SoOffscreenRenderer.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/09.4.PickAction.c++ inventor/apps/examples/Mentor/CXX/09.4.PickAction.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/09.4.PickAction.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/09.4.PickAction.c++	2009-02-19 04:42:19.000000000 +0100
@@ -60,7 +60,7 @@
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoTranslation.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 ///////////////////////////////////////////////////////////////
 // CODE FOR The Inventor Mentor STARTS HERE
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/10.1.addEventCB.c++ inventor/apps/examples/Mentor/CXX/10.1.addEventCB.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/10.1.addEventCB.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/10.1.addEventCB.c++	2009-02-19 04:42:19.000000000 +0100
@@ -48,7 +48,7 @@
  *  the size of each selected object.
  *-----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Sb.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtRenderArea.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/10.2.setEventCB.c++ inventor/apps/examples/Mentor/CXX/10.2.setEventCB.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/10.2.setEventCB.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/10.2.setEventCB.c++	2009-02-19 04:42:19.000000000 +0100
@@ -50,7 +50,7 @@
  *       of the point set.
  *-----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/Intrinsic.h>
 
 #include <Inventor/Sb.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/10.3and4.MotifList.c++ inventor/apps/examples/Mentor/CXX/10.3and4.MotifList.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/10.3and4.MotifList.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/10.3and4.MotifList.c++	2009-02-19 04:42:19.000000000 +0100
@@ -54,7 +54,7 @@
  *  item in the motif list.)
  *-----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/Intrinsic.h>
 #include <Xm/Xm.h>
 #include <Xm/List.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/10.5.SelectionCB.c++ inventor/apps/examples/Mentor/CXX/10.5.SelectionCB.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/10.5.SelectionCB.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/10.5.SelectionCB.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *  to change the material color of that object.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/Intrinsic.h>
 #include <Inventor/Sb.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/10.6.PickFilterTopLevel.c++ inventor/apps/examples/Mentor/CXX/10.6.PickFilterTopLevel.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/10.6.PickFilterTopLevel.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/10.6.PickFilterTopLevel.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,7 +45,7 @@
  *  shape that was picked.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/StringDefs.h>
 #include <X11/Intrinsic.h>
 
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/11.2.ReadString.c++ inventor/apps/examples/Mentor/CXX/11.2.ReadString.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/11.2.ReadString.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/11.2.ReadString.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,8 +42,8 @@
  *  Create a dodecahedron, made of an IndexedFaceSet.  
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/12.1.FieldSensor.c++ inventor/apps/examples/Mentor/CXX/12.1.FieldSensor.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/12.1.FieldSensor.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/12.1.FieldSensor.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
  *  Sense changes to a viewer's camera's position.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/12.3.AlarmSensor.c++ inventor/apps/examples/Mentor/CXX/12.3.AlarmSensor.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/12.3.AlarmSensor.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/12.3.AlarmSensor.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
  *  Alarm sensor that raises a flag after 10 minutes
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/nodes/SoCone.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/12.4.TimerSensor.c++ inventor/apps/examples/Mentor/CXX/12.4.TimerSensor.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/12.4.TimerSensor.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/12.4.TimerSensor.c++	2009-02-19 04:42:19.000000000 +0100
@@ -48,7 +48,7 @@
  *  This example could also be done using engines.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/13.1.GlobalFlds.c++ inventor/apps/examples/Mentor/CXX/13.1.GlobalFlds.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/13.1.GlobalFlds.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/13.1.GlobalFlds.c++	2009-02-19 04:42:19.000000000 +0100
@@ -43,7 +43,7 @@
  *  global field to a Text3 string.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtRenderArea.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/13.2.ElapsedTime.c++ inventor/apps/examples/Mentor/CXX/13.2.ElapsedTime.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/13.2.ElapsedTime.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/13.2.ElapsedTime.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *  that the figure slides across the scene.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtRenderArea.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/13.3.TimeCounter.c++ inventor/apps/examples/Mentor/CXX/13.3.TimeCounter.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/13.3.TimeCounter.c++	2003-07-18 00:12:37.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/13.3.TimeCounter.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,7 +45,7 @@
  *  the screen.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtRenderArea.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/13.4.Gate.c++ inventor/apps/examples/Mentor/CXX/13.4.Gate.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/13.4.Gate.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/13.4.Gate.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *  controls the motion of the duck.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtRenderArea.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/13.5.Boolean.c++ inventor/apps/examples/Mentor/CXX/13.5.Boolean.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/13.5.Boolean.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/13.5.Boolean.c++	2009-02-19 04:42:19.000000000 +0100
@@ -43,7 +43,7 @@
  *  and starts moving as soon as the bigger duck stops.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtRenderArea.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/13.6.Calculator.c++ inventor/apps/examples/Mentor/CXX/13.6.Calculator.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/13.6.Calculator.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/13.6.Calculator.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *  along the path of the curve.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtRenderArea.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/13.8.Blinker.c++ inventor/apps/examples/Mentor/CXX/13.8.Blinker.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/13.8.Blinker.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/13.8.Blinker.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  Use a blinker node to flash a neon ad sign on and off
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/14.1.FrolickingWords.c++ inventor/apps/examples/Mentor/CXX/14.1.FrolickingWords.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/14.1.FrolickingWords.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/14.1.FrolickingWords.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,7 +45,7 @@
  *  the words change color and fly about the screen.
  *----------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/engines/SoCalculator.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/14.2.Editors.c++ inventor/apps/examples/Mentor/CXX/14.2.Editors.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/14.2.Editors.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/14.2.Editors.c++	2009-02-19 04:42:19.000000000 +0100
@@ -51,7 +51,7 @@
  *  is attached to the light's 'directionalLight' part.
  *----------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/14.3.Balance.c++ inventor/apps/examples/Mentor/CXX/14.3.Balance.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/14.3.Balance.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/14.3.Balance.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  *      of the scene.
  *----------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/events/SoKeyboardEvent.h>
 #include <Inventor/nodekits/SoCameraKit.h>
 #include <Inventor/nodekits/SoLightKit.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/15.1.ConeRadius.c++ inventor/apps/examples/Mentor/CXX/15.1.ConeRadius.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/15.1.ConeRadius.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/15.1.ConeRadius.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,7 +45,7 @@
  *  connected to the bottomRadius field of the cone.
  *----------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/engines/SoCompose.h>
 #include <Inventor/nodes/SoCone.h>
 #include <Inventor/nodes/SoSeparator.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/15.2.SliderBox.c++ inventor/apps/examples/Mentor/CXX/15.2.SliderBox.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/15.2.SliderBox.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/15.2.SliderBox.c++	2009-02-19 04:42:19.000000000 +0100
@@ -46,7 +46,7 @@
  *  The 3D text and the box are made with SoShapeKits
  *----------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/draggers/SoTranslate1Dragger.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/15.3.AttachManip.c++ inventor/apps/examples/Mentor/CXX/15.3.AttachManip.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/15.3.AttachManip.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/15.3.AttachManip.c++	2009-02-19 04:42:19.000000000 +0100
@@ -61,7 +61,7 @@
  *-----------------------------------------------------------*/
 
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/manips/SoHandleBoxManip.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/15.4.Customize.c++ inventor/apps/examples/Mentor/CXX/15.4.Customize.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/15.4.Customize.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/15.4.Customize.c++	2009-02-19 04:42:19.000000000 +0100
@@ -47,7 +47,7 @@
  *  nodekits, so it's easy to change the parts).
  *----------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 #include <Inventor/draggers/SoTranslate1Dragger.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/16.1.Overlay.c++ inventor/apps/examples/Mentor/CXX/16.1.Overlay.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/16.1.Overlay.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/16.1.Overlay.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,7 +45,7 @@
  *  load the overlay color map with the wanted color.
  *----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/nodes/SoNode.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/16.2.Callback.c++ inventor/apps/examples/Mentor/CXX/16.2.Callback.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/16.2.Callback.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/16.2.Callback.c++	2009-02-19 04:42:19.000000000 +0100
@@ -43,7 +43,7 @@
  *  It uses callbacks for the component to report new values.
  *----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h> 
 #include <Inventor/Xt/SoXt.h> 
 #include <Inventor/Xt/SoXtMaterialEditor.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/16.3.AttachEditor.c++ inventor/apps/examples/Mentor/CXX/16.3.AttachEditor.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/16.3.AttachEditor.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/16.3.AttachEditor.c++	2009-02-19 04:42:19.000000000 +0100
@@ -43,7 +43,7 @@
  *  It attaches the editor to the material of an object.
  *-----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>         
 #include <Inventor/Xt/SoXt.h>         
 #include <Inventor/Xt/SoXtMaterialEditor.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/16.4.OneWindow.c++ inventor/apps/examples/Mentor/CXX/16.4.OneWindow.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/16.4.OneWindow.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/16.4.OneWindow.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *  It attaches the editor to the material of an object.
  *-----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Xm/Form.h>
 #include <Inventor/SoDB.h>          
 #include <Inventor/Xt/SoXt.h>          
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/16.5.Examiner.c++ inventor/apps/examples/Mentor/CXX/16.5.Examiner.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/16.5.Examiner.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/16.5.Examiner.c++	2009-02-19 04:42:19.000000000 +0100
@@ -43,7 +43,7 @@
  *  light in the scene are automatically created by the viewer.
  *-----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>         
 #include <Inventor/Xt/SoXt.h>         
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>  
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/17.1.ColorIndex.c++ inventor/apps/examples/Mentor/CXX/17.1.ColorIndex.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/17.1.ColorIndex.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/17.1.ColorIndex.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,7 +45,7 @@
  *  colors.
  *-----------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/nodes/SoNode.h>
diff -Naur inventor-2.1.5-32/apps/examples/Mentor/CXX/17.3.GLFloor.c++ inventor/apps/examples/Mentor/CXX/17.3.GLFloor.c++
--- inventor-2.1.5-32/apps/examples/Mentor/CXX/17.3.GLFloor.c++	2003-07-18 00:12:38.000000000 +0200
+++ inventor/apps/examples/Mentor/CXX/17.3.GLFloor.c++	2009-02-19 04:41:20.000000000 +0100
@@ -45,7 +45,7 @@
 #include <GL/glx.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/02.Nodes/newNodes.c++ inventor/apps/examples/Toolmaker/02.Nodes/newNodes.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/02.Nodes/newNodes.c++	2000-10-29 16:04:15.000000000 +0100
+++ inventor/apps/examples/Toolmaker/02.Nodes/newNodes.c++	2009-02-19 04:42:19.000000000 +0100
@@ -44,7 +44,7 @@
  *  examiner viewer.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/03.Fields/MFDouble.c++ inventor/apps/examples/Toolmaker/03.Fields/MFDouble.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/03.Fields/MFDouble.c++	2000-10-29 16:04:15.000000000 +0100
+++ inventor/apps/examples/Toolmaker/03.Fields/MFDouble.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
  *  Source file for "MFDouble" field.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "MFDouble.h"
 
 // Defines all required member variables and functions for a
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/07.Nodekits/jumpingJackKitTest.c++ inventor/apps/examples/Toolmaker/07.Nodekits/jumpingJackKitTest.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/07.Nodekits/jumpingJackKitTest.c++	2000-10-29 16:04:16.000000000 +0100
+++ inventor/apps/examples/Toolmaker/07.Nodekits/jumpingJackKitTest.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  puts it in an examinerViewer.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/07.Nodekits/pyramidKitTest.c++ inventor/apps/examples/Toolmaker/07.Nodekits/pyramidKitTest.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/07.Nodekits/pyramidKitTest.c++	2000-10-29 16:04:16.000000000 +0100
+++ inventor/apps/examples/Toolmaker/07.Nodekits/pyramidKitTest.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
  *  This program creates an instance of PyramidKit and
  *  puts it in an examinerViewer.
  *------------------------------------------------------------*/
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
 
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/08.Manips/newManips.c++ inventor/apps/examples/Toolmaker/08.Manips/newManips.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/08.Manips/newManips.c++	2000-10-29 16:04:16.000000000 +0100
+++ inventor/apps/examples/Toolmaker/08.Manips/newManips.c++	2009-02-19 04:42:19.000000000 +0100
@@ -43,7 +43,7 @@
  *  stdout, and renders the graph in an examiner viewer.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/09.Highlights/OverlayHL.c++ inventor/apps/examples/Toolmaker/09.Highlights/OverlayHL.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/09.Highlights/OverlayHL.c++	2000-08-15 14:55:56.000000000 +0200
+++ inventor/apps/examples/Toolmaker/09.Highlights/OverlayHL.c++	2009-02-19 05:05:27.000000000 +0100
@@ -42,8 +42,8 @@
  *------------------------------------------------------------*/
 
 
-#include <limits.h>
-#include <math.h>
+#include <climits>
+#include <cmath>
 #include <Inventor/SbBox.h>
 #include <Inventor/SoPath.h>
 #include <Inventor/SoNodeKitPath.h>
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/09.Highlights/overlayTest.c++ inventor/apps/examples/Toolmaker/09.Highlights/overlayTest.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/09.Highlights/overlayTest.c++	2003-07-18 23:07:41.000000000 +0200
+++ inventor/apps/examples/Toolmaker/09.Highlights/overlayTest.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  in the overlay planes, by subclassing from SoNode.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/StringDefs.h>
 #include <X11/Intrinsic.h>
 
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/09.Highlights/selectionTest.c++ inventor/apps/examples/Toolmaker/09.Highlights/selectionTest.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/09.Highlights/selectionTest.c++	2003-07-18 23:07:41.000000000 +0200
+++ inventor/apps/examples/Toolmaker/09.Highlights/selectionTest.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  by subclassing from SoGLRenderAction.
  *------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/StringDefs.h>
 #include <X11/Intrinsic.h>
 
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/10.Components/simpleViewer.c++ inventor/apps/examples/Toolmaker/10.Components/simpleViewer.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/10.Components/simpleViewer.c++	2000-10-14 12:46:06.000000000 +0200
+++ inventor/apps/examples/Toolmaker/10.Components/simpleViewer.c++	2009-02-19 04:42:02.000000000 +0100
@@ -50,7 +50,7 @@
  _______________________________________________________________________
  */
 
-#include <math.h>
+#include <cmath>
 
 #include <X11/Intrinsic.h>
 #include <X11/Xlib.h>
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/10.Components/tumble.c++ inventor/apps/examples/Toolmaker/10.Components/tumble.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/10.Components/tumble.c++	2003-07-18 23:07:46.000000000 +0200
+++ inventor/apps/examples/Toolmaker/10.Components/tumble.c++	2009-02-19 04:42:19.000000000 +0100
@@ -34,8 +34,8 @@
  *
  */
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/nodes/SoSeparator.h>
diff -Naur inventor-2.1.5-32/apps/examples/Toolmaker/11.Events/eventTest.c++ inventor/apps/examples/Toolmaker/11.Events/eventTest.c++
--- inventor-2.1.5-32/apps/examples/Toolmaker/11.Events/eventTest.c++	2003-07-18 23:07:49.000000000 +0200
+++ inventor/apps/examples/Toolmaker/11.Events/eventTest.c++	2009-02-19 04:42:19.000000000 +0100
@@ -34,7 +34,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/Intrinsic.h>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
diff -Naur inventor-2.1.5-32/apps/nodes/GeneralizedCylinder/GeneralizedCylinder.c++ inventor/apps/nodes/GeneralizedCylinder/GeneralizedCylinder.c++
--- inventor-2.1.5-32/apps/nodes/GeneralizedCylinder/GeneralizedCylinder.c++	2000-10-14 12:46:06.000000000 +0200
+++ inventor/apps/nodes/GeneralizedCylinder/GeneralizedCylinder.c++	2009-02-19 04:41:20.000000000 +0100
@@ -42,7 +42,7 @@
  |
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/nodekits/SoAppearanceKit.h>
diff -Naur inventor-2.1.5-32/apps/nodes/GeneralizedCylinder/Triangulator.c++ inventor/apps/nodes/GeneralizedCylinder/Triangulator.c++
--- inventor-2.1.5-32/apps/nodes/GeneralizedCylinder/Triangulator.c++	2000-08-15 14:55:59.000000000 +0200
+++ inventor/apps/nodes/GeneralizedCylinder/Triangulator.c++	2009-02-19 04:41:20.000000000 +0100
@@ -39,7 +39,7 @@
 // robust or well-designed (or complete or...).
 //
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/fields/SoMFInt32.h>
 #include <Inventor/fields/SoMFVec3f.h>
diff -Naur inventor-2.1.5-32/apps/samples/clock/ivclock.c++ inventor/apps/samples/clock/ivclock.c++
--- inventor-2.1.5-32/apps/samples/clock/ivclock.c++	2000-10-29 16:04:16.000000000 +0100
+++ inventor/apps/samples/clock/ivclock.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,9 +41,9 @@
 //  See the README file in this directory for a complete explanation.
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/Intrinsic.h>
-#include <math.h>
+#include <cmath>
 
 #include <Inventor/SoDB.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/samples/common/LineManip.c++ inventor/apps/samples/common/LineManip.c++
--- inventor-2.1.5-32/apps/samples/common/LineManip.c++	2000-08-15 14:55:59.000000000 +0200
+++ inventor/apps/samples/common/LineManip.c++	2009-02-19 04:41:20.000000000 +0100
@@ -42,7 +42,7 @@
 // edit).
 //
 
-#include <stdio.h>
+#include <cstdio>
 #include <assert.h>
 
 #include <Inventor/SbColor.h>
diff -Naur inventor-2.1.5-32/apps/samples/common/LineManipHilight.c++ inventor/apps/samples/common/LineManipHilight.c++
--- inventor-2.1.5-32/apps/samples/common/LineManipHilight.c++	2000-08-15 14:55:59.000000000 +0200
+++ inventor/apps/samples/common/LineManipHilight.c++	2009-02-19 04:42:02.000000000 +0100
@@ -38,9 +38,9 @@
 // Stuff to hilight parts of the line-set manipulator
 //
 
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
 #include <assert.h>
 
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/samples/ivNodeKitStructure/ivNodeKitStructure.c++ inventor/apps/samples/ivNodeKitStructure/ivNodeKitStructure.c++
--- inventor-2.1.5-32/apps/samples/ivNodeKitStructure/ivNodeKitStructure.c++	2001-09-25 02:45:26.000000000 +0200
+++ inventor/apps/samples/ivNodeKitStructure/ivNodeKitStructure.c++	2009-02-19 04:42:19.000000000 +0100
@@ -38,8 +38,8 @@
 // Print information about the Structure of a Nodekit class.
 //
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <dlfcn.h>
 #include <unistd.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/samples/ivToInclude/ivToIncludeFile.c++ inventor/apps/samples/ivToInclude/ivToIncludeFile.c++
--- inventor-2.1.5-32/apps/samples/ivToInclude/ivToIncludeFile.c++	2001-09-25 02:45:26.000000000 +0200
+++ inventor/apps/samples/ivToInclude/ivToIncludeFile.c++	2009-02-19 04:42:19.000000000 +0100
@@ -45,9 +45,9 @@
 // where the stuff between the quotes is a hex version of the binary file.
 //
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include <assert.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/samples/ivToInclude/testResults.c++ inventor/apps/samples/ivToInclude/testResults.c++
--- inventor-2.1.5-32/apps/samples/ivToInclude/testResults.c++	2000-10-29 16:04:16.000000000 +0100
+++ inventor/apps/samples/ivToInclude/testResults.c++	2009-02-19 04:42:19.000000000 +0100
@@ -56,9 +56,9 @@
 #include "foo.h"
 
 
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
+#include <cstdlib>
+#include <cmath>
+#include <cstring>
 #include <X11/Intrinsic.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/apps/samples/linkages/linkages.c++ inventor/apps/samples/linkages/linkages.c++
--- inventor-2.1.5-32/apps/samples/linkages/linkages.c++	2000-10-29 16:04:16.000000000 +0100
+++ inventor/apps/samples/linkages/linkages.c++	2009-02-19 04:42:19.000000000 +0100
@@ -48,7 +48,7 @@
 //    $Revision: 1.2 $
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>	// for file reading
 #include <Inventor/SoInput.h>	// for file reading
 #include <Inventor/actions/SoWriteAction.h>
diff -Naur inventor-2.1.5-32/apps/samples/lod/details.c++ inventor/apps/samples/lod/details.c++
--- inventor-2.1.5-32/apps/samples/lod/details.c++	2000-10-29 16:04:16.000000000 +0100
+++ inventor/apps/samples/lod/details.c++	2009-02-19 04:42:19.000000000 +0100
@@ -34,7 +34,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>	
 #include <Inventor/SoInput.h>
 #include <Inventor/Xt/SoXt.h>	
diff -Naur inventor-2.1.5-32/apps/samples/manip/constrainManip.c++ inventor/apps/samples/manip/constrainManip.c++
--- inventor-2.1.5-32/apps/samples/manip/constrainManip.c++	2000-10-29 16:04:16.000000000 +0100
+++ inventor/apps/samples/manip/constrainManip.c++	2009-02-19 04:42:19.000000000 +0100
@@ -42,7 +42,7 @@
  *  Display the scene in a viewer.
  *----------------------------------------------------------------*/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 
 #include <Inventor/actions/SoSearchAction.h>
diff -Naur inventor-2.1.5-32/apps/samples/motif/menu.c++ inventor/apps/samples/motif/menu.c++
--- inventor-2.1.5-32/apps/samples/motif/menu.c++	2009-02-18 16:59:29.000000000 +0100
+++ inventor/apps/samples/motif/menu.c++	2009-02-19 04:42:19.000000000 +0100
@@ -48,7 +48,7 @@
 //  at a time, the others are off.
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/Intrinsic.h>
 #include <Xm/Xm.h>
 #include <Xm/CascadeBG.h>
diff -Naur inventor-2.1.5-32/apps/samples/spaceball/spaceball.c++ inventor/apps/samples/spaceball/spaceball.c++
--- inventor-2.1.5-32/apps/samples/spaceball/spaceball.c++	2009-02-18 16:59:29.000000000 +0100
+++ inventor/apps/samples/spaceball/spaceball.c++	2009-02-19 04:42:19.000000000 +0100
@@ -40,7 +40,7 @@
 // are passed via a callback on an SoEventCallback node.
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/Intrinsic.h>
 
 #include <Inventor/So.h>
diff -Naur inventor-2.1.5-32/apps/samples/spaceball/spballViewer.c++ inventor/apps/samples/spaceball/spballViewer.c++
--- inventor-2.1.5-32/apps/samples/spaceball/spballViewer.c++	2009-02-18 16:59:29.000000000 +0100
+++ inventor/apps/samples/spaceball/spballViewer.c++	2009-02-19 04:42:19.000000000 +0100
@@ -41,7 +41,7 @@
 // a callback on the viewer.
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <X11/Intrinsic.h>
 
 #include <Inventor/So.h>
diff -Naur inventor-2.1.5-32/apps/samples/twoDisplays/example.c++ inventor/apps/samples/twoDisplays/example.c++
--- inventor-2.1.5-32/apps/samples/twoDisplays/example.c++	2000-08-15 14:55:59.000000000 +0200
+++ inventor/apps/samples/twoDisplays/example.c++	2009-02-19 04:41:20.000000000 +0100
@@ -42,7 +42,7 @@
 #include <X11/StringDefs.h>
 #include <X11/Intrinsic.h>
 #include <Xm/Label.h>
-#include <stdio.h>
+#include <cstdio>
 
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/viewers/SoXtExaminerViewer.h>
diff -Naur inventor-2.1.5-32/apps/samples/vortex/vortex.c++ inventor/apps/samples/vortex/vortex.c++
--- inventor-2.1.5-32/apps/samples/vortex/vortex.c++	2000-10-29 16:04:16.000000000 +0100
+++ inventor/apps/samples/vortex/vortex.c++	2009-02-19 04:42:19.000000000 +0100
@@ -53,7 +53,7 @@
  */
 
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoPrimitiveVertex.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/apps/samples/widgets/componentTest.c++ inventor/apps/samples/widgets/componentTest.c++
--- inventor-2.1.5-32/apps/samples/widgets/componentTest.c++	2009-02-18 16:59:29.000000000 +0100
+++ inventor/apps/samples/widgets/componentTest.c++	2009-02-19 04:42:19.000000000 +0100
@@ -38,7 +38,7 @@
 // Simple test program which will run a set of custom components.
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/Xt/SoXt.h>
 #include <Inventor/Xt/SoXtMaterialEditor.h>
 #include "MyTextureEditor.h"
diff -Naur inventor-2.1.5-32/apps/samples/widgets/MyFileRead.c++ inventor/apps/samples/widgets/MyFileRead.c++
--- inventor-2.1.5-32/apps/samples/widgets/MyFileRead.c++	2000-10-14 12:46:06.000000000 +0200
+++ inventor/apps/samples/widgets/MyFileRead.c++	2009-02-19 04:42:19.000000000 +0100
@@ -51,7 +51,7 @@
  */
 
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <libgen.h>
 #include <sys/param.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/samples/widgets/MyMtlPal.c++ inventor/apps/samples/widgets/MyMtlPal.c++
--- inventor-2.1.5-32/apps/samples/widgets/MyMtlPal.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/samples/widgets/MyMtlPal.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,13 +52,13 @@
  _______________________________________________________________________
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <X11/StringDefs.h>
 #include <X11/keysym.h>
diff -Naur inventor-2.1.5-32/apps/samples/widgets/MySimpleMtlEditor.c++ inventor/apps/samples/widgets/MySimpleMtlEditor.c++
--- inventor-2.1.5-32/apps/samples/widgets/MySimpleMtlEditor.c++	2000-10-29 16:04:17.000000000 +0100
+++ inventor/apps/samples/widgets/MySimpleMtlEditor.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,9 +52,9 @@
  _______________________________________________________________________
  */
 
-#include <string.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cmath>
+#include <cstdlib>
 
 #include <Xm/Text.h>
 #include <Xm/Form.h>
diff -Naur inventor-2.1.5-32/apps/samples/widgets/MyTextureEd.c++ inventor/apps/samples/widgets/MyTextureEd.c++
--- inventor-2.1.5-32/apps/samples/widgets/MyTextureEd.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/samples/widgets/MyTextureEd.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,14 +52,14 @@
  _______________________________________________________________________
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <X11/StringDefs.h>
 #include <Xm/Xm.h>
diff -Naur inventor-2.1.5-32/apps/samples/widgets/MyThumbWhl.c++ inventor/apps/samples/widgets/MyThumbWhl.c++
--- inventor-2.1.5-32/apps/samples/widgets/MyThumbWhl.c++	2000-10-14 12:46:06.000000000 +0200
+++ inventor/apps/samples/widgets/MyThumbWhl.c++	2009-02-19 04:42:02.000000000 +0100
@@ -51,7 +51,7 @@
  _______________________________________________________________________
  */
 
-#include <math.h>
+#include <cmath>
 
 #include <X11/StringDefs.h>
 #include <X11/Intrinsic.h>
diff -Naur inventor-2.1.5-32/apps/tools/ivAddVP/ivAddVP.c++ inventor/apps/tools/ivAddVP/ivAddVP.c++
--- inventor-2.1.5-32/apps/tools/ivAddVP/ivAddVP.c++	2001-09-25 02:45:29.000000000 +0200
+++ inventor/apps/tools/ivAddVP/ivAddVP.c++	2009-02-19 04:42:19.000000000 +0100
@@ -74,9 +74,9 @@
 #include <Inventor/actions/SoCallbackAction.h>
 #include <Inventor/actions/SoWriteAction.h>
 #include <Inventor/actions/SoSearchAction.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <assert.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/tools/ivcat/ivcat.c++ inventor/apps/tools/ivcat/ivcat.c++
--- inventor-2.1.5-32/apps/tools/ivcat/ivcat.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/tools/ivcat/ivcat.c++	2009-02-19 04:42:19.000000000 +0100
@@ -38,9 +38,9 @@
 // Convert from/to ASCII/binary Inventor
 //
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <assert.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/tools/ivfix/IfSorter.c++ inventor/apps/tools/ivfix/IfSorter.c++
--- inventor-2.1.5-32/apps/tools/ivfix/IfSorter.c++	2000-10-14 12:46:06.000000000 +0200
+++ inventor/apps/tools/ivfix/IfSorter.c++	2009-02-19 04:42:19.000000000 +0100
@@ -34,7 +34,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "IfAssert.h"
 #include "IfShape.h"
 #include "IfSorter.h"
diff -Naur inventor-2.1.5-32/apps/tools/ivfix/ivfix.c++ inventor/apps/tools/ivfix/ivfix.c++
--- inventor-2.1.5-32/apps/tools/ivfix/ivfix.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/tools/ivfix/ivfix.c++	2009-02-19 04:42:19.000000000 +0100
@@ -34,9 +34,9 @@
  *
  */
 
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/apps/tools/ivinfo/ivinfo.c++ inventor/apps/tools/ivinfo/ivinfo.c++
--- inventor-2.1.5-32/apps/tools/ivinfo/ivinfo.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/tools/ivinfo/ivinfo.c++	2009-02-19 04:42:19.000000000 +0100
@@ -57,7 +57,7 @@
  _______________________________________________________________________
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/tools/ivnorm/Faces.c++ inventor/apps/tools/ivnorm/Faces.c++
--- inventor-2.1.5-32/apps/tools/ivnorm/Faces.c++	2000-10-29 16:04:17.000000000 +0100
+++ inventor/apps/tools/ivnorm/Faces.c++	2009-02-19 04:42:02.000000000 +0100
@@ -39,7 +39,7 @@
 //
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 #include "Faces.h"
 #include "Edges.h"
 
diff -Naur inventor-2.1.5-32/apps/tools/ivnorm/FindNormals.c++ inventor/apps/tools/ivnorm/FindNormals.c++
--- inventor-2.1.5-32/apps/tools/ivnorm/FindNormals.c++	2000-08-15 14:56:00.000000000 +0200
+++ inventor/apps/tools/ivnorm/FindNormals.c++	2009-02-19 04:42:02.000000000 +0100
@@ -39,7 +39,7 @@
 //
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <Inventor/SoDB.h>
 #include <Inventor/nodes/SoGroup.h>
diff -Naur inventor-2.1.5-32/apps/tools/ivnorm/ivnorm.c++ inventor/apps/tools/ivnorm/ivnorm.c++
--- inventor-2.1.5-32/apps/tools/ivnorm/ivnorm.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/tools/ivnorm/ivnorm.c++	2009-02-19 04:42:19.000000000 +0100
@@ -57,11 +57,11 @@
 //_____________  S I L I C O N   G R A P H I C S   I N C .  ____________
 //______________________________________________________________________
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
-#include <math.h>
+#include <cmath>
 #include <assert.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <Inventor/SoInteraction.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/apps/tools/ivperf/ivperf.c++ inventor/apps/tools/ivperf/ivperf.c++
--- inventor-2.1.5-32/apps/tools/ivperf/ivperf.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/tools/ivperf/ivperf.c++	2009-02-19 04:42:19.000000000 +0100
@@ -57,8 +57,8 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include <Inventor/Sb.h>
 #include <Inventor/SbTime.h>
diff -Naur inventor-2.1.5-32/apps/tools/ivview/ivview.c++ inventor/apps/tools/ivview/ivview.c++
--- inventor-2.1.5-32/apps/tools/ivview/ivview.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/apps/tools/ivview/ivview.c++	2009-02-19 04:42:19.000000000 +0100
@@ -34,9 +34,9 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #ifdef __sgi
 #include <alloca.h>
diff -Naur inventor-2.1.5-32/doc/man/ivman/Main.c++ inventor/doc/man/ivman/Main.c++
--- inventor-2.1.5-32/doc/man/ivman/Main.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/doc/man/ivman/Main.c++	2009-02-19 04:42:20.000000000 +0100
@@ -34,7 +34,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInteraction.h>
diff -Naur inventor-2.1.5-32/doc/man/ivman/Reader.c++ inventor/doc/man/ivman/Reader.c++
--- inventor-2.1.5-32/doc/man/ivman/Reader.c++	2000-10-14 12:46:06.000000000 +0200
+++ inventor/doc/man/ivman/Reader.c++	2009-02-19 04:42:20.000000000 +0100
@@ -34,7 +34,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <ctype.h>
 #include "Man.h"
 
diff -Naur inventor-2.1.5-32/lib/database/include/Inventor/elements/SoLazyElement.h inventor/lib/database/include/Inventor/elements/SoLazyElement.h
--- inventor-2.1.5-32/lib/database/include/Inventor/elements/SoLazyElement.h	2000-08-15 14:56:15.000000000 +0200
+++ inventor/lib/database/include/Inventor/elements/SoLazyElement.h	2009-02-19 04:47:09.000000000 +0100
@@ -60,7 +60,7 @@
 #include <Inventor/SbColor.h>
 #include <Inventor/elements/SoElement.h>
 #include <Inventor/elements/SoSubElement.h>
-#include <math.h>
+#include <cmath>
 
 class SoMFFloat; class SoMFColor; class SoColorPacker;
 
diff -Naur inventor-2.1.5-32/lib/database/include/Inventor/SbBasic.h inventor/lib/database/include/Inventor/SbBasic.h
--- inventor-2.1.5-32/lib/database/include/Inventor/SbBasic.h	2000-10-14 12:46:06.000000000 +0200
+++ inventor/lib/database/include/Inventor/SbBasic.h	2009-02-19 04:43:06.000000000 +0100
@@ -73,7 +73,7 @@
 #include <sgidefs.h>
 #endif /* __sgi */
 // C-api: begin
-#include <stdio.h>
+#include <cstdio>
 
 #ifndef FALSE
 #   define FALSE	0
diff -Naur inventor-2.1.5-32/lib/database/include/Inventor/SbLinear.h inventor/lib/database/include/Inventor/SbLinear.h
--- inventor-2.1.5-32/lib/database/include/Inventor/SbLinear.h	2000-10-29 16:04:17.000000000 +0100
+++ inventor/lib/database/include/Inventor/SbLinear.h	2009-02-19 04:47:22.000000000 +0100
@@ -71,7 +71,7 @@
 #ifndef _SB_LINEAR_
 #define _SB_LINEAR_
 
-#include <math.h>
+#include <cmath>
 #include <Inventor/SbBasic.h>
 
 // -----------------------------------
diff -Naur inventor-2.1.5-32/lib/database/include/Inventor/SbTime.h inventor/lib/database/include/Inventor/SbTime.h
--- inventor-2.1.5-32/lib/database/include/Inventor/SbTime.h	2001-06-23 00:06:57.000000000 +0200
+++ inventor/lib/database/include/Inventor/SbTime.h	2009-02-19 05:03:53.000000000 +0100
@@ -60,8 +60,8 @@
 #define _SB_TIME_
 
 #include <sys/time.h>
-#include <math.h>
-#include <limits.h>
+#include <cmath>
+#include <climits>
 #include <Inventor/SbBasic.h>
 #include <Inventor/SbString.h>
 
diff -Naur inventor-2.1.5-32/lib/database/include/Inventor/SoOffscreenRenderer.h inventor/lib/database/include/Inventor/SoOffscreenRenderer.h
--- inventor-2.1.5-32/lib/database/include/Inventor/SoOffscreenRenderer.h	2000-08-15 14:56:14.000000000 +0200
+++ inventor/lib/database/include/Inventor/SoOffscreenRenderer.h	2009-02-19 04:43:29.000000000 +0100
@@ -59,7 +59,7 @@
 #ifndef  _SO_OFFSCREEN_RENDERER_
 #define  _SO_OFFSCREEN_RENDERER_
 
-#include <stdio.h>
+#include <cstdio>
 #include <GL/glx.h>
 #include <Inventor/SbColor.h>
 #include <Inventor/SbViewportRegion.h>
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbCylinderPlaneProjector.c++ inventor/lib/database/src/sb/projectors/SbCylinderPlaneProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbCylinderPlaneProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbCylinderPlaneProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -53,7 +53,7 @@
 
 #include <Inventor/projectors/SbCylinderPlaneProjector.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbCylinderProjector.c++ inventor/lib/database/src/sb/projectors/SbCylinderProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbCylinderProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbCylinderProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/projectors/SbCylinderProjector.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbCylinderSectionProjector.c++ inventor/lib/database/src/sb/projectors/SbCylinderSectionProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbCylinderSectionProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbCylinderSectionProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -53,7 +53,7 @@
 
 #include <Inventor/projectors/SbCylinderSectionProjector.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbCylinderSheetProjector.c++ inventor/lib/database/src/sb/projectors/SbCylinderSheetProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbCylinderSheetProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbCylinderSheetProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -53,7 +53,7 @@
 
 #include <Inventor/projectors/SbCylinderSheetProjector.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbLineProjector.c++ inventor/lib/database/src/sb/projectors/SbLineProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbLineProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbLineProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -53,7 +53,7 @@
 
 #include <Inventor/projectors/SbLineProjector.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbPlaneProjector.c++ inventor/lib/database/src/sb/projectors/SbPlaneProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbPlaneProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbPlaneProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -53,7 +53,7 @@
 
 #include <Inventor/projectors/SbPlaneProjector.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbProjector.c++ inventor/lib/database/src/sb/projectors/SbProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/projectors/SbProjector.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbSpherePlaneProjector.c++ inventor/lib/database/src/sb/projectors/SbSpherePlaneProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbSpherePlaneProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbSpherePlaneProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -53,7 +53,7 @@
 
 #include <Inventor/projectors/SbSpherePlaneProjector.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbSphereProjector.c++ inventor/lib/database/src/sb/projectors/SbSphereProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbSphereProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbSphereProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/projectors/SbSphereProjector.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbSphereSectionProjector.c++ inventor/lib/database/src/sb/projectors/SbSphereSectionProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbSphereSectionProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbSphereSectionProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -53,7 +53,7 @@
 
 #include <Inventor/projectors/SbSphereSectionProjector.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/projectors/SbSphereSheetProjector.c++ inventor/lib/database/src/sb/projectors/SbSphereSheetProjector.c++
--- inventor-2.1.5-32/lib/database/src/sb/projectors/SbSphereSheetProjector.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/sb/projectors/SbSphereSheetProjector.c++	2009-02-19 04:41:20.000000000 +0100
@@ -53,7 +53,7 @@
 
 #include <Inventor/projectors/SbSphereSheetProjector.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <stdio.h>
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/SbBox.c++ inventor/lib/database/src/sb/SbBox.c++
--- inventor-2.1.5-32/lib/database/src/sb/SbBox.c++	2000-10-29 16:04:17.000000000 +0100
+++ inventor/lib/database/src/sb/SbBox.c++	2009-02-19 05:04:17.000000000 +0100
@@ -56,7 +56,7 @@
 
 #include <Inventor/SbBox.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <limits.h>
+#include <climits>
 #include <float.h>    /* For FLT_MAX */
 
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/SbColor.c++ inventor/lib/database/src/sb/SbColor.c++
--- inventor-2.1.5-32/lib/database/src/sb/SbColor.c++	2000-09-03 04:24:56.000000000 +0200
+++ inventor/lib/database/src/sb/SbColor.c++	2009-02-19 04:42:02.000000000 +0100
@@ -51,7 +51,7 @@
  _______________________________________________________________________
  */
 
-#include <math.h>
+#include <cmath>
 #include <Inventor/SbColor.h>
 
 //
diff -Naur inventor-2.1.5-32/lib/database/src/sb/SbView.c++ inventor/lib/database/src/sb/SbView.c++
--- inventor-2.1.5-32/lib/database/src/sb/SbView.c++	2000-08-23 03:05:44.000000000 +0200
+++ inventor/lib/database/src/sb/SbView.c++	2009-02-19 04:42:02.000000000 +0100
@@ -53,7 +53,7 @@
 
 #include <Inventor/SbLinear.h>
 #include <Inventor/SbBox.h>
-#include <math.h> // for M_PI_2
+#include <cmath> // for M_PI_2
 
 ////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/caches/SoCache.c++ inventor/lib/database/src/so/caches/SoCache.c++
--- inventor-2.1.5-32/lib/database/src/so/caches/SoCache.c++	2000-08-15 14:56:18.000000000 +0200
+++ inventor/lib/database/src/so/caches/SoCache.c++	2009-02-19 04:42:19.000000000 +0100
@@ -51,7 +51,7 @@
  _______________________________________________________________________
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <Inventor/caches/SoCache.h>
 #include <Inventor/elements/SoElement.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/elements/SoGLCacheContextElement.c++ inventor/lib/database/src/so/elements/SoGLCacheContextElement.c++
--- inventor-2.1.5-32/lib/database/src/so/elements/SoGLCacheContextElement.c++	2000-12-14 07:20:52.000000000 +0100
+++ inventor/lib/database/src/so/elements/SoGLCacheContextElement.c++	2009-02-19 04:42:19.000000000 +0100
@@ -51,7 +51,7 @@
  _______________________________________________________________________
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/caches/SoGLRenderCache.h>
 #include <Inventor/elements/SoCacheElement.h>
 #include <Inventor/elements/SoGLCacheContextElement.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/elements/SoGLModelMatrixElement.c++ inventor/lib/database/src/so/elements/SoGLModelMatrixElement.c++
--- inventor-2.1.5-32/lib/database/src/so/elements/SoGLModelMatrixElement.c++	2000-08-15 14:56:18.000000000 +0200
+++ inventor/lib/database/src/so/elements/SoGLModelMatrixElement.c++	2009-02-19 04:42:02.000000000 +0100
@@ -55,7 +55,7 @@
 #include <Inventor/elements/SoGLModelMatrixElement.h>
 #include <Inventor/elements/SoGLViewingMatrixElement.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <math.h>
+#include <cmath>
 
 SO_ELEMENT_SOURCE(SoGLModelMatrixElement);
 
diff -Naur inventor-2.1.5-32/lib/database/src/so/engines/SoCalcExpr.c++ inventor/lib/database/src/so/engines/SoCalcExpr.c++
--- inventor-2.1.5-32/lib/database/src/so/engines/SoCalcExpr.c++	2000-10-14 12:46:07.000000000 +0200
+++ inventor/lib/database/src/so/engines/SoCalcExpr.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,8 +52,8 @@
  */
 
 #include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <Inventor/errors/SoDebugError.h>
 #include "SoCalcExpr.h"
 
diff -Naur inventor-2.1.5-32/lib/database/src/so/engines/SoUnknownEngine.c++ inventor/lib/database/src/so/engines/SoUnknownEngine.c++
--- inventor-2.1.5-32/lib/database/src/so/engines/SoUnknownEngine.c++	2000-10-14 12:46:07.000000000 +0200
+++ inventor/lib/database/src/so/engines/SoUnknownEngine.c++	2009-02-19 04:42:19.000000000 +0100
@@ -51,7 +51,7 @@
  _______________________________________________________________________
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoInput.h>
 #include <Inventor/SoOutput.h>
 #include <Inventor/fields/SoField.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoField.c++ inventor/lib/database/src/so/fields/SoField.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoField.c++	2000-08-23 08:07:30.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoField.c++	2009-02-19 04:42:19.000000000 +0100
@@ -67,7 +67,7 @@
 #include <Inventor/fields/SoSubField.h>
 #include <Inventor/nodes/SoNode.h>
 #include <Inventor/sensors/SoDataSensor.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include "SoGlobalField.h"
 
 // Special characters in files
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoFieldContainer.c++ inventor/lib/database/src/so/fields/SoFieldContainer.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoFieldContainer.c++	2001-09-25 02:45:39.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoFieldContainer.c++	2009-02-19 04:42:19.000000000 +0100
@@ -65,7 +65,7 @@
 #include <Inventor/fields/SoFieldData.h>
 #include <Inventor/misc/SoNotification.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 // Syntax for reading/writing type information to files
 #define OPEN_BRACE_CHAR		'['
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFBool.c++ inventor/lib/database/src/so/fields/SoMFBool.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFBool.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFBool.c++	2009-02-19 04:42:19.000000000 +0100
@@ -51,7 +51,7 @@
  _______________________________________________________________________
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/errors/SoReadError.h>
 #include <Inventor/fields/SoMFBool.h>
 
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFColor.c++ inventor/lib/database/src/so/fields/SoMFColor.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFColor.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFColor.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFColor.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFEnum.c++ inventor/lib/database/src/so/fields/SoMFEnum.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFEnum.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFEnum.c++	2009-02-19 04:42:19.000000000 +0100
@@ -55,7 +55,7 @@
 #include <Inventor/errors/SoDebugError.h>
 #include <Inventor/errors/SoReadError.h>
 #include <Inventor/fields/SoMFEnum.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFFloat.c++ inventor/lib/database/src/so/fields/SoMFFloat.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFFloat.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFFloat.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFFloat.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFInt32.c++ inventor/lib/database/src/so/fields/SoMFInt32.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFInt32.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFInt32.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFInt32.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFMatrix.c++ inventor/lib/database/src/so/fields/SoMFMatrix.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFMatrix.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFMatrix.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFMatrix.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFPlane.c++ inventor/lib/database/src/so/fields/SoMFPlane.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFPlane.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFPlane.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFPlane.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFRotation.c++ inventor/lib/database/src/so/fields/SoMFRotation.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFRotation.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFRotation.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFRotation.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFShort.c++ inventor/lib/database/src/so/fields/SoMFShort.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFShort.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFShort.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFShort.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFUInt32.c++ inventor/lib/database/src/so/fields/SoMFUInt32.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFUInt32.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFUInt32.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFUInt32.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFUShort.c++ inventor/lib/database/src/so/fields/SoMFUShort.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFUShort.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFUShort.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFUShort.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFVec2f.c++ inventor/lib/database/src/so/fields/SoMFVec2f.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFVec2f.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFVec2f.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFVec2f.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFVec3f.c++ inventor/lib/database/src/so/fields/SoMFVec3f.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFVec3f.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFVec3f.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFVec3f.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/fields/SoMFVec4f.c++ inventor/lib/database/src/so/fields/SoMFVec4f.c++
--- inventor-2.1.5-32/lib/database/src/so/fields/SoMFVec4f.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/fields/SoMFVec4f.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/fields/SoMFVec4f.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/clients/gl4surfeval.c++ inventor/lib/database/src/so/nodes/nurbs/clients/gl4surfeval.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/clients/gl4surfeval.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/clients/gl4surfeval.c++	2009-02-19 04:41:20.000000000 +0100
@@ -46,7 +46,7 @@
 #include "mymath.h"
 #include "gl4surfeval.h"
 #include "nurbsconsts.h"
-#include <stdio.h>
+#include <cstdio>
 
 /*extern "C" {
     void	gl_nurbs_bgncps2( long, float, float, long, float, float, long );
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/clients/nurbsClient.c++ inventor/lib/database/src/so/nodes/nurbs/clients/nurbsClient.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/clients/nurbsClient.c++	2003-05-02 00:19:05.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/clients/nurbsClient.c++	2009-02-19 04:41:20.000000000 +0100
@@ -51,7 +51,7 @@
  _______________________________________________________________________
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include "../SoAddPrefix.h"
 #include "gl4base.c++"
 #include "gl4curveval.c++"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/clients/softsurfeval.c++ inventor/lib/database/src/so/nodes/nurbs/clients/softsurfeval.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/clients/softsurfeval.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/clients/softsurfeval.c++	2009-02-19 04:41:20.000000000 +0100
@@ -42,7 +42,7 @@
 
 #include "../SoAddPrefix.h"
 #include "myassert.h"
-#include <stdio.h>
+#include <cstdio>
 #include <GL/gl.h>
 #include "mystdio.h"
 #include "mymath.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/clients/softsurfmap.c++ inventor/lib/database/src/so/nodes/nurbs/clients/softsurfmap.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/clients/softsurfmap.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/clients/softsurfmap.c++	2009-02-19 04:41:20.000000000 +0100
@@ -40,7 +40,7 @@
  * $Revision: 1.1.1.1 $
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <inttypes.h>   /* defines long and brethren */
 #include "myassert.h"
 #include "mystdio.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/clients/softsurfmaps.c++ inventor/lib/database/src/so/nodes/nurbs/clients/softsurfmaps.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/clients/softsurfmaps.c++	2003-05-01 01:55:34.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/clients/softsurfmaps.c++	2009-02-19 04:41:20.000000000 +0100
@@ -34,7 +34,7 @@
  *
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include "softsurfacemaps.h"
 
 _SoNurbsVertex3SurfaceMap::~_SoNurbsVertex3SurfaceMap(){}
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/libnurbs/basiccrveval.c++ inventor/lib/database/src/so/nodes/nurbs/libnurbs/basiccrveval.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/libnurbs/basiccrveval.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/libnurbs/basiccrveval.c++	2009-02-19 04:41:20.000000000 +0100
@@ -42,7 +42,7 @@
 #include "mystdio.h"
 #include "types.h"
 #include "basiccrveval.h"
-#include <stdio.h>
+#include <cstdio>
 
 void 
 BasicCurveEvaluator::domain1f( REAL, REAL )
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/libnurbs/basicsurfeval.c++ inventor/lib/database/src/so/nodes/nurbs/libnurbs/basicsurfeval.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/libnurbs/basicsurfeval.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/libnurbs/basicsurfeval.c++	2009-02-19 04:41:20.000000000 +0100
@@ -42,7 +42,7 @@
 #include "mystdio.h"
 #include "types.h"
 #include "basicsurfeval.h"
-#include <stdio.h>
+#include <cstdio>
 
 void 
 BasicSurfaceEvaluator::domain2f( REAL, REAL, REAL, REAL )
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/libnurbs/npatch.c++ inventor/lib/database/src/so/nodes/nurbs/libnurbs/npatch.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/libnurbs/npatch.c++	2001-09-25 02:45:42.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/libnurbs/npatch.c++	2009-02-19 04:42:19.000000000 +0100
@@ -40,7 +40,7 @@
  */
 
 #include "myglimports.h"
-#include <stdio.h>
+#include <cstdio>
 #include "mystdio.h"
 #include "myassert.h"
 #include "mymath.h"
@@ -56,7 +56,7 @@
  *--------------------------------------------------------------------------
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 REAL* Patch::alloc_pts( void )
 {
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/libnurbs/patchlist.c++ inventor/lib/database/src/so/nodes/nurbs/libnurbs/patchlist.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/libnurbs/patchlist.c++	2000-08-15 14:56:23.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/libnurbs/patchlist.c++	2009-02-19 04:41:20.000000000 +0100
@@ -38,7 +38,7 @@
  * patchlist.c++ - $Revision: 1.1.1.1 $
  * 	Derrick Burns - 1991
  */
-#include <stdio.h>
+#include <cstdio>
 #include "glimports.h"
 #include "myassert.h"
 #include "mystdio.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoCurveMaps.c++ inventor/lib/database/src/so/nodes/nurbs/SoCurveMaps.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoCurveMaps.c++	2000-10-29 16:04:18.000000000 +0100
+++ inventor/lib/database/src/so/nodes/nurbs/SoCurveMaps.c++	2009-02-19 04:41:41.000000000 +0100
@@ -55,7 +55,7 @@
 
 /* Polynomial Evaluator Interface */
 
-#include <string.h>
+#include <cstring>
 #include "SoCurveMaps.h"
 
 _SoNurbsCurveV3Map::~_SoNurbsCurveV3Map() 
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoCurveMaps.h inventor/lib/database/src/so/nodes/nurbs/SoCurveMaps.h
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoCurveMaps.h	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoCurveMaps.h	2009-02-19 04:46:13.000000000 +0100
@@ -57,8 +57,8 @@
 #ifndef  _SO_NURBS_CURVE_MAPS_
 #define  _SO_NURBS_CURVE_MAPS_
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <Inventor/SbLinear.h>
 #include "clients/softcurvmap.h"
 #include "clients/gl4types.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoCurveRender.c++ inventor/lib/database/src/so/nodes/nurbs/SoCurveRender.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoCurveRender.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoCurveRender.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,8 +52,8 @@
  */
 
 #include <GL/gl.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "SoAddPrefix.h"
 #include "SoCurveRender.h"
 #include "SoCurveRenderEval.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoCurveRender.h inventor/lib/database/src/so/nodes/nurbs/SoCurveRender.h
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoCurveRender.h	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoCurveRender.h	2009-02-19 04:44:57.000000000 +0100
@@ -56,8 +56,8 @@
 #ifndef  _SO_NURBS_CURVE_RENDER_
 #define  _SO_NURBS_CURVE_RENDER_
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <Inventor/SbLinear.h>
 #include "head/nurbstess.h"
 #include "clients/softsurfeval.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoGLRender.c++ inventor/lib/database/src/so/nodes/nurbs/SoGLRender.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoGLRender.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoGLRender.c++	2009-02-19 04:42:19.000000000 +0100
@@ -51,8 +51,8 @@
  _______________________________________________________________________
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <Inventor/errors/SoDebugError.h>
 #include "SoAddPrefix.h"
 #include "SoGLRender.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoGLRender.h inventor/lib/database/src/so/nodes/nurbs/SoGLRender.h
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoGLRender.h	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoGLRender.h	2009-02-19 05:03:03.000000000 +0100
@@ -56,8 +56,8 @@
 #ifndef  _SO_NURBS_GL_RENDER_
 #define  _SO_NURBS_GL_RENDER_
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <Inventor/SbLinear.h>
 #include "head/nurbstess.h"
 #include "clients/softsurfeval.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPickEvals.c++ inventor/lib/database/src/so/nodes/nurbs/SoPickEvals.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPickEvals.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoPickEvals.c++	2009-02-19 04:41:20.000000000 +0100
@@ -55,7 +55,7 @@
 
 /* Polynomial Evaluator Interface */
 
-#include <stdio.h>
+#include <cstdio>
 #include "SoAddPrefix.h"
 #include <Inventor/actions/SoRayPickAction.h>
 #include "SoPickEvals.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPickMaps.c++ inventor/lib/database/src/so/nodes/nurbs/SoPickMaps.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPickMaps.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoPickMaps.c++	2009-02-19 04:41:20.000000000 +0100
@@ -54,7 +54,7 @@
  _______________________________________________________________________
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include "SoAddPrefix.h"
 #include <Inventor/SoPickedPoint.h>
 #include <Inventor/actions/SoRayPickAction.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPickMaps.h inventor/lib/database/src/so/nodes/nurbs/SoPickMaps.h
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPickMaps.h	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoPickMaps.h	2009-02-19 04:44:23.000000000 +0100
@@ -58,8 +58,8 @@
 #ifndef  _SO_NURBS_PICK_MAPS_
 #define  _SO_NURBS_PICK_MAPS_
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoPrimitiveVertex.h>
 #include "clients/softcurvemaps.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPickRender.c++ inventor/lib/database/src/so/nodes/nurbs/SoPickRender.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPickRender.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoPickRender.c++	2009-02-19 04:42:19.000000000 +0100
@@ -51,9 +51,9 @@
  _______________________________________________________________________
  */
 
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cmath>
+#include <cstdlib>
 #include "SoAddPrefix.h"
 #include <Inventor/actions/SoRayPickAction.h>
 #include <Inventor/elements/SoModelMatrixElement.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPickRender.h inventor/lib/database/src/so/nodes/nurbs/SoPickRender.h
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPickRender.h	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoPickRender.h	2009-02-19 04:45:35.000000000 +0100
@@ -56,8 +56,8 @@
 #ifndef  _SO_NURBS_PICK_RENDER_
 #define  _SO_NURBS_PICK_RENDER_
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <Inventor/SbLinear.h>
 #include "head/nurbstess.h"
 #include "SoPickEvals.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPrimEvals.c++ inventor/lib/database/src/so/nodes/nurbs/SoPrimEvals.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPrimEvals.c++	2001-03-14 03:56:35.000000000 +0100
+++ inventor/lib/database/src/so/nodes/nurbs/SoPrimEvals.c++	2009-02-19 04:41:20.000000000 +0100
@@ -55,7 +55,7 @@
 
 /* Polynomial Evaluator Interface */
 
-#include <stdio.h>
+#include <cstdio>
 #include "SoAddPrefix.h"
 #include <Inventor/actions/SoAction.h>
 #include <Inventor/nodes/SoShape.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPrimMaps.c++ inventor/lib/database/src/so/nodes/nurbs/SoPrimMaps.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPrimMaps.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoPrimMaps.c++	2009-02-19 04:41:20.000000000 +0100
@@ -56,7 +56,7 @@
  _______________________________________________________________________
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/actions/SoAction.h>
 #include <Inventor/elements/SoNormalElement.h>
 #include "SoAddPrefix.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPrimMaps.h inventor/lib/database/src/so/nodes/nurbs/SoPrimMaps.h
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPrimMaps.h	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoPrimMaps.h	2009-02-19 04:44:04.000000000 +0100
@@ -58,8 +58,8 @@
 #ifndef  _SO_NURBS_PRIM_MAPS_
 #define  _SO_NURBS_PRIM_MAPS_
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoPrimitiveVertex.h>
 #include "clients/softcurvemaps.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPrimRender.c++ inventor/lib/database/src/so/nodes/nurbs/SoPrimRender.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPrimRender.c++	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoPrimRender.c++	2009-02-19 04:42:19.000000000 +0100
@@ -34,8 +34,8 @@
  *
  */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <Inventor/errors/SoDebugError.h>
 #include "SoAddPrefix.h"
 #include "SoPrimRender.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPrimRender.h inventor/lib/database/src/so/nodes/nurbs/SoPrimRender.h
--- inventor-2.1.5-32/lib/database/src/so/nodes/nurbs/SoPrimRender.h	2000-08-15 14:56:22.000000000 +0200
+++ inventor/lib/database/src/so/nodes/nurbs/SoPrimRender.h	2009-02-19 04:45:57.000000000 +0100
@@ -57,8 +57,8 @@
 #define  _SO_NURBS_PRIM_RENDER_
 
 //#include <GL/gl.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <Inventor/SbLinear.h>
 #include "head/nurbstess.h"
 #include "SoPrimEvals.h"
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/SoCamera.c++ inventor/lib/database/src/so/nodes/SoCamera.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/SoCamera.c++	2000-08-15 14:56:19.000000000 +0200
+++ inventor/lib/database/src/so/nodes/SoCamera.c++	2009-02-19 04:42:19.000000000 +0100
@@ -69,7 +69,7 @@
 #include <Inventor/elements/SoModelMatrixElement.h>
 #include <Inventor/elements/SoViewVolumeElement.h>
 #include <Inventor/nodes/SoCamera.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 SO_NODE_ABSTRACT_SOURCE(SoCamera);
 
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/SoNurbsSurface.c++ inventor/lib/database/src/so/nodes/SoNurbsSurface.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/SoNurbsSurface.c++	2000-08-15 14:56:20.000000000 +0200
+++ inventor/lib/database/src/so/nodes/SoNurbsSurface.c++	2009-02-19 04:42:02.000000000 +0100
@@ -53,7 +53,7 @@
 
 #include <GL/gl.h>
 #include <GL/glu.h>
-#include <math.h>
+#include <cmath>
 #include <Inventor/SbBox.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/actions/SoGLRenderAction.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/SoPerspectiveCamera.c++ inventor/lib/database/src/so/nodes/SoPerspectiveCamera.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/SoPerspectiveCamera.c++	2000-08-15 14:56:20.000000000 +0200
+++ inventor/lib/database/src/so/nodes/SoPerspectiveCamera.c++	2009-02-19 04:42:02.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #include <Inventor/nodes/SoPerspectiveCamera.h>
-#include <math.h>
+#include <cmath>
 
 #define MINIMUM_NEAR_PLANE 0.01	    /* minimum near clipping distance */
 				    /* (from center) */
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/SoSeparator.c++ inventor/lib/database/src/so/nodes/SoSeparator.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/SoSeparator.c++	2000-08-15 14:56:20.000000000 +0200
+++ inventor/lib/database/src/so/nodes/SoSeparator.c++	2009-02-19 04:42:19.000000000 +0100
@@ -76,7 +76,7 @@
 #include <SoDebug.h>
 #endif
 
-#include <stdlib.h>
+#include <cstdlib>
 
 SO_NODE_SOURCE(SoSeparator);
 
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/SoText2.c++ inventor/lib/database/src/so/nodes/SoText2.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/SoText2.c++	2001-09-25 02:45:41.000000000 +0200
+++ inventor/lib/database/src/so/nodes/SoText2.c++	2009-02-19 04:42:02.000000000 +0100
@@ -79,7 +79,7 @@
 
 // 6.2 requires flclient.h, iconv.h for UTF->UCS conversion
 #include <flclient.h>
-#include <math.h>
+#include <cmath>
 #include <iconv.h>
 #include <machine.h>
 
@@ -1411,7 +1411,7 @@
 #include <Inventor/nodes/SoText2.h>
 
 #include <flclient.h>
-#include <math.h>
+#include <cmath>
 
 // An internal class that makes life easier:
 
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/SoTexture2.c++ inventor/lib/database/src/so/nodes/SoTexture2.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/SoTexture2.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/lib/database/src/so/nodes/SoTexture2.c++	2009-02-19 04:42:19.000000000 +0100
@@ -62,8 +62,8 @@
 #include <Inventor/nodes/SoTexture2.h>
 #include <Inventor/sensors/SoFieldSensor.h>
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 SO_NODE_SOURCE(SoTexture2);
 
diff -Naur inventor-2.1.5-32/lib/database/src/so/nodes/SoUnknownNode.c++ inventor/lib/database/src/so/nodes/SoUnknownNode.c++
--- inventor-2.1.5-32/lib/database/src/so/nodes/SoUnknownNode.c++	2000-10-14 12:46:07.000000000 +0200
+++ inventor/lib/database/src/so/nodes/SoUnknownNode.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/misc/SoState.h>
 #include <Inventor/actions/SoWriteAction.h>
 #include <Inventor/fields/SoMFString.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/SoByteStream.c++ inventor/lib/database/src/so/SoByteStream.c++
--- inventor-2.1.5-32/lib/database/src/so/SoByteStream.c++	2000-10-14 12:46:07.000000000 +0200
+++ inventor/lib/database/src/so/SoByteStream.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/misc/SoByteStream.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/SoDB.c++ inventor/lib/database/src/so/SoDB.c++
--- inventor-2.1.5-32/lib/database/src/so/SoDB.c++	2000-10-14 12:46:07.000000000 +0200
+++ inventor/lib/database/src/so/SoDB.c++	2009-02-19 04:42:19.000000000 +0100
@@ -51,7 +51,7 @@
  _______________________________________________________________________
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SbDict.h>
 #include <Inventor/SbString.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/SoDebug.c++ inventor/lib/database/src/so/SoDebug.c++
--- inventor-2.1.5-32/lib/database/src/so/SoDebug.c++	2000-08-15 14:56:17.000000000 +0200
+++ inventor/lib/database/src/so/SoDebug.c++	2009-02-19 04:42:19.000000000 +0100
@@ -56,8 +56,8 @@
 #include <Inventor/actions/SoWriteAction.h>
 #include <Inventor/nodes/SoNode.h>
 #include <Inventor/fields/SoField.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <stdarg.h>
 
 static SbDict *ptrNameDict = NULL;
diff -Naur inventor-2.1.5-32/lib/database/src/so/SoInput.c++ inventor/lib/database/src/so/SoInput.c++
--- inventor-2.1.5-32/lib/database/src/so/SoInput.c++	2009-02-19 03:49:39.000000000 +0100
+++ inventor/lib/database/src/so/SoInput.c++	2009-02-19 04:42:19.000000000 +0100
@@ -56,8 +56,8 @@
 
 #include <machine.h>		// This is included in the Inventor tree
 #include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <Inventor/misc/SoBase.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/SoLists.c++ inventor/lib/database/src/so/SoLists.c++
--- inventor-2.1.5-32/lib/database/src/so/SoLists.c++	2001-09-25 02:45:35.000000000 +0200
+++ inventor/lib/database/src/so/SoLists.c++	2009-02-19 04:42:19.000000000 +0100
@@ -51,7 +51,7 @@
  _______________________________________________________________________
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <Inventor/SoLists.h>
 #include <Inventor/SoPath.h>
 #include <Inventor/SoPickedPoint.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/SoOffscreenRenderer.c++ inventor/lib/database/src/so/SoOffscreenRenderer.c++
--- inventor-2.1.5-32/lib/database/src/so/SoOffscreenRenderer.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/lib/database/src/so/SoOffscreenRenderer.c++	2009-02-19 04:41:20.000000000 +0100
@@ -50,7 +50,7 @@
  ______________  S I L I C O N   G R A P H I C S   I N C .  ____________
  _______________________________________________________________________
  */
-#include <stdio.h>
+#include <cstdio>
 #include <assert.h>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoOffscreenRenderer.h>
diff -Naur inventor-2.1.5-32/lib/database/src/so/SoOutput.c++ inventor/lib/database/src/so/SoOutput.c++
--- inventor-2.1.5-32/lib/database/src/so/SoOutput.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/lib/database/src/so/SoOutput.c++	2009-02-19 04:42:19.000000000 +0100
@@ -54,8 +54,8 @@
  _______________________________________________________________________
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <Inventor/errors/SoDebugError.h>
 
 #include <machine.h>		// Inventor data goo lib
diff -Naur inventor-2.1.5-32/lib/database/src/so/SoType.c++ inventor/lib/database/src/so/SoType.c++
--- inventor-2.1.5-32/lib/database/src/so/SoType.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/lib/database/src/so/SoType.c++	2009-02-19 04:42:19.000000000 +0100
@@ -55,7 +55,7 @@
 #include <Inventor/SoLists.h>
 #include <Inventor/errors/SoDebugError.h>
 #include <dlfcn.h>
-#include <stdlib.h>
+#include <cstdlib>
 #ifdef __sgi
 #include <sgidefs.h>
 #endif // __sgi
diff -Naur inventor-2.1.5-32/lib/interaction/src/actions/SoBoxHL.c++ inventor/lib/interaction/src/actions/SoBoxHL.c++
--- inventor-2.1.5-32/lib/interaction/src/actions/SoBoxHL.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/actions/SoBoxHL.c++	2009-02-19 05:03:36.000000000 +0100
@@ -51,8 +51,8 @@
  _______________________________________________________________________
  */
 
-#include <limits.h>
-#include <math.h>
+#include <climits>
+#include <cmath>
 #include <Inventor/SoPath.h>
 #include <Inventor/SoNodeKitPath.h>
 #include <Inventor/actions/SoSearchAction.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoCenterballDragger.c++ inventor/lib/interaction/src/draggers/SoCenterballDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoCenterballDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoCenterballDragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 
 #include <Inventor/SoDB.h> 
 #include <Inventor/sensors/SoFieldSensor.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoDirectionalLightDragger.c++ inventor/lib/interaction/src/draggers/SoDirectionalLightDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoDirectionalLightDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoDirectionalLightDragger.c++	2009-02-19 04:41:20.000000000 +0100
@@ -64,7 +64,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoPath.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoDragger.c++ inventor/lib/interaction/src/draggers/SoDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoDragger.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/lib/interaction/src/draggers/SoDragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  _______________________________________________________________________
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoDragPointDragger.c++ inventor/lib/interaction/src/draggers/SoDragPointDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoDragPointDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoDragPointDragger.c++	2009-02-19 05:04:33.000000000 +0100
@@ -52,8 +52,8 @@
  */
 
 
-#include <stdio.h>
-#include <limits.h>
+#include <cstdio>
+#include <climits>
 
 #include <Inventor/SoDB.h>
 #include <Inventor/errors/SoDebugError.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoHandleBoxDragger.c++ inventor/lib/interaction/src/draggers/SoHandleBoxDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoHandleBoxDragger.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/lib/interaction/src/draggers/SoHandleBoxDragger.c++	2009-02-19 04:41:20.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SoDB.h>
 #include <Inventor/sensors/SoFieldSensor.h>
 #include <Inventor/events/SoEvent.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoJackDragger.c++ inventor/lib/interaction/src/draggers/SoJackDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoJackDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoJackDragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/sensors/SoFieldSensor.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoPointLightDragger.c++ inventor/lib/interaction/src/draggers/SoPointLightDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoPointLightDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoPointLightDragger.c++	2009-02-19 04:41:20.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SoDB.h>
 #include <Inventor/nodes/SoMaterial.h>
 #include <Inventor/sensors/SoFieldSensor.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoRotateCylindricalDragger.c++ inventor/lib/interaction/src/draggers/SoRotateCylindricalDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoRotateCylindricalDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoRotateCylindricalDragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/sensors/SoFieldSensor.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoRotateDiscDragger.c++ inventor/lib/interaction/src/draggers/SoRotateDiscDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoRotateDiscDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoRotateDiscDragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/sensors/SoFieldSensor.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoRotateSphericalDragger.c++ inventor/lib/interaction/src/draggers/SoRotateSphericalDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoRotateSphericalDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoRotateSphericalDragger.c++	2009-02-19 04:41:20.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoScale1Dragger.c++ inventor/lib/interaction/src/draggers/SoScale1Dragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoScale1Dragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoScale1Dragger.c++	2009-02-19 04:41:20.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoScale2Dragger.c++ inventor/lib/interaction/src/draggers/SoScale2Dragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoScale2Dragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoScale2Dragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoScale2UniformDragger.c++ inventor/lib/interaction/src/draggers/SoScale2UniformDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoScale2UniformDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoScale2UniformDragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoScaleUniformDragger.c++ inventor/lib/interaction/src/draggers/SoScaleUniformDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoScaleUniformDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoScaleUniformDragger.c++	2009-02-19 04:41:20.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoSpotLightDragger.c++ inventor/lib/interaction/src/draggers/SoSpotLightDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoSpotLightDragger.c++	2000-10-14 12:46:08.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoSpotLightDragger.c++	2009-02-19 04:42:02.000000000 +0100
@@ -56,8 +56,8 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoPath.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoTabBoxDragger.c++ inventor/lib/interaction/src/draggers/SoTabBoxDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoTabBoxDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoTabBoxDragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoTrackballDragger.c++ inventor/lib/interaction/src/draggers/SoTrackballDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoTrackballDragger.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/lib/interaction/src/draggers/SoTrackballDragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 
 #include <Inventor/errors/SoDebugError.h>
 #include <Inventor/events/SoEvent.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoTransformBoxDragger.c++ inventor/lib/interaction/src/draggers/SoTransformBoxDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoTransformBoxDragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoTransformBoxDragger.c++	2009-02-19 04:41:20.000000000 +0100
@@ -52,8 +52,8 @@
  */
 
 
-#include <stdio.h>
-#include <stdio.h>
+#include <cstdio>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoTransformerDragger.c++ inventor/lib/interaction/src/draggers/SoTransformerDragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoTransformerDragger.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/lib/interaction/src/draggers/SoTransformerDragger.c++	2009-02-19 04:41:20.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SoDB.h>
 #include <Inventor/sensors/SoFieldSensor.h>
 #include <Inventor/events/SoEvent.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoTranslate1Dragger.c++ inventor/lib/interaction/src/draggers/SoTranslate1Dragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoTranslate1Dragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoTranslate1Dragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/sensors/SoFieldSensor.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/draggers/SoTranslate2Dragger.c++ inventor/lib/interaction/src/draggers/SoTranslate2Dragger.c++
--- inventor-2.1.5-32/lib/interaction/src/draggers/SoTranslate2Dragger.c++	2000-08-15 14:56:24.000000000 +0200
+++ inventor/lib/interaction/src/draggers/SoTranslate2Dragger.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/sensors/SoFieldSensor.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoCenterballManip.c++ inventor/lib/interaction/src/manips/SoCenterballManip.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoCenterballManip.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoCenterballManip.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,8 +52,8 @@
  */
 
 
-#include <stdio.h>
-#include <stdio.h>
+#include <cstdio>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoDirLtManip.c++ inventor/lib/interaction/src/manips/SoDirLtManip.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoDirLtManip.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoDirLtManip.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SoDB.h>
 #include <Inventor/errors/SoDebugError.h>
 #include <Inventor/nodes/SoGroup.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoHbox.c++ inventor/lib/interaction/src/manips/SoHbox.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoHbox.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoHbox.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SoDB.h>
 #include <Inventor/manips/SoHandleBoxManip.h>
 #include <Inventor/draggers/SoHandleBoxDragger.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoJackManip.c++ inventor/lib/interaction/src/manips/SoJackManip.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoJackManip.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoJackManip.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,8 +52,8 @@
  */
 
 
-#include <stdio.h>
-#include <stdio.h>
+#include <cstdio>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoPtLtManip.c++ inventor/lib/interaction/src/manips/SoPtLtManip.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoPtLtManip.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoPtLtManip.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SoDB.h>
 #include <Inventor/errors/SoDebugError.h>
 #include <Inventor/nodes/SoGroup.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoSpotLtManip.c++ inventor/lib/interaction/src/manips/SoSpotLtManip.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoSpotLtManip.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoSpotLtManip.c++	2009-02-19 04:41:19.000000000 +0100
@@ -41,7 +41,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SoDB.h>
 #include <Inventor/errors/SoDebugError.h>
 #include <Inventor/nodes/SoGroup.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoTabBoxManip.c++ inventor/lib/interaction/src/manips/SoTabBoxManip.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoTabBoxManip.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoTabBoxManip.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,8 +52,8 @@
  */
 
 
-#include <stdio.h>
-#include <stdio.h>
+#include <cstdio>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoTball.c++ inventor/lib/interaction/src/manips/SoTball.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoTball.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoTball.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 
 #include <Inventor/SoDB.h>
 #include <Inventor/manips/SoTrackballManip.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoTransformerManip.c++ inventor/lib/interaction/src/manips/SoTransformerManip.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoTransformerManip.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoTransformerManip.c++	2009-02-19 04:41:19.000000000 +0100
@@ -51,7 +51,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoTransformManip.c++ inventor/lib/interaction/src/manips/SoTransformManip.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoTransformManip.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoTransformManip.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <SoDebug.h>
 
 #include <Inventor/errors/SoDebugError.h>
diff -Naur inventor-2.1.5-32/lib/interaction/src/manips/SoXformBox.c++ inventor/lib/interaction/src/manips/SoXformBox.c++
--- inventor-2.1.5-32/lib/interaction/src/manips/SoXformBox.c++	2000-08-15 14:56:25.000000000 +0200
+++ inventor/lib/interaction/src/manips/SoXformBox.c++	2009-02-19 04:41:19.000000000 +0100
@@ -52,8 +52,8 @@
  */
 
 
-#include <stdio.h>
-#include <stdio.h>
+#include <cstdio>
+#include <cstdio>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SoDB.h>
 
diff -Naur inventor-2.1.5-32/lib/interaction/src/nodekits/SoInteractionKit.c++ inventor/lib/interaction/src/nodekits/SoInteractionKit.c++
--- inventor-2.1.5-32/lib/interaction/src/nodekits/SoInteractionKit.c++	2009-02-19 04:06:47.000000000 +0100
+++ inventor/lib/interaction/src/nodekits/SoInteractionKit.c++	2009-02-19 04:42:19.000000000 +0100
@@ -52,8 +52,8 @@
  */
 
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <Inventor/SbDict.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
diff -Naur inventor-2.1.5-32/lib/nodekits/src/nodekits/SoBaseKit.c++ inventor/lib/nodekits/src/nodekits/SoBaseKit.c++
--- inventor-2.1.5-32/lib/nodekits/src/nodekits/SoBaseKit.c++	2000-10-13 22:28:00.000000000 +0200
+++ inventor/lib/nodekits/src/nodekits/SoBaseKit.c++	2009-02-19 04:42:19.000000000 +0100
@@ -78,7 +78,7 @@
 
 #include <SoDebug.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <ctype.h>
 
 // Defines for printing out file data for nodekits
diff -Naur inventor-2.1.5-32/lib/nodekits/src/upgraders/SoV1NkParts.c++ inventor/lib/nodekits/src/upgraders/SoV1NkParts.c++
--- inventor-2.1.5-32/lib/nodekits/src/upgraders/SoV1NkParts.c++	2001-09-25 02:45:47.000000000 +0200
+++ inventor/lib/nodekits/src/upgraders/SoV1NkParts.c++	2009-02-19 04:42:19.000000000 +0100
@@ -58,7 +58,7 @@
 #include <Inventor/misc/upgraders/SoV1BaseKit.h>
 #include <Inventor/SoPath.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 ////////////////////////////////////////////////////////////////////////
 //
diff -Naur inventor-2.1.5-32/libSoXt/src/mixedMode/SoXtColEd.c++ inventor/libSoXt/src/mixedMode/SoXtColEd.c++
--- inventor-2.1.5-32/libSoXt/src/mixedMode/SoXtColEd.c++	2001-06-23 00:06:58.000000000 +0200
+++ inventor/libSoXt/src/mixedMode/SoXtColEd.c++	2009-02-19 04:42:20.000000000 +0100
@@ -85,7 +85,7 @@
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 /*
  * Defines
diff -Naur inventor-2.1.5-32/libSoXt/src/mixedMode/SoXtColSlider.c++ inventor/libSoXt/src/mixedMode/SoXtColSlider.c++
--- inventor-2.1.5-32/libSoXt/src/mixedMode/SoXtColSlider.c++	2001-09-25 02:45:50.000000000 +0200
+++ inventor/libSoXt/src/mixedMode/SoXtColSlider.c++	2009-02-19 04:42:20.000000000 +0100
@@ -52,7 +52,7 @@
  */
 
 #ifdef DEBUG
-#include <stdio.h>
+#include <cstdio>
 #endif
 
 #include <Inventor/SbLinear.h>
@@ -60,7 +60,7 @@
 #include "_SoXtUIRegion.h"
 #include "_SoXtColorSlider.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <X11/StringDefs.h>
 #include <X11/Intrinsic.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/mixedMode/SoXtColWheel.c++ inventor/libSoXt/src/mixedMode/SoXtColWheel.c++
--- inventor-2.1.5-32/libSoXt/src/mixedMode/SoXtColWheel.c++	2001-09-25 02:45:50.000000000 +0200
+++ inventor/libSoXt/src/mixedMode/SoXtColWheel.c++	2009-02-19 04:42:20.000000000 +0100
@@ -59,8 +59,8 @@
 #include "_SoXtColorWheel.h"
 #include "_SoXtUIRegion.h"
 
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
 
 #include <GL/gl.h>
 
diff -Naur inventor-2.1.5-32/libSoXt/src/mixedMode/SoXtSlider.c++ inventor/libSoXt/src/mixedMode/SoXtSlider.c++
--- inventor-2.1.5-32/libSoXt/src/mixedMode/SoXtSlider.c++	2001-09-25 02:45:50.000000000 +0200
+++ inventor/libSoXt/src/mixedMode/SoXtSlider.c++	2009-02-19 04:42:20.000000000 +0100
@@ -58,7 +58,7 @@
 #include "_SoXtUIRegion.h"
 #include "_SoXtSlider.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <X11/StringDefs.h>
 #include <X11/Intrinsic.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/motif/SoXtMltSldrs.c++ inventor/libSoXt/src/motif/SoXtMltSldrs.c++
--- inventor-2.1.5-32/libSoXt/src/motif/SoXtMltSldrs.c++	2000-08-15 14:56:28.000000000 +0200
+++ inventor/libSoXt/src/motif/SoXtMltSldrs.c++	2009-02-19 04:42:02.000000000 +0100
@@ -53,7 +53,7 @@
 */
 
 
-#include <math.h>
+#include <cmath>
 #include <X11/StringDefs.h>
 
 #include <Inventor/sensors/SoSensor.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/mtlEdit/SoXtMtlEdit.c++ inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++
--- inventor-2.1.5-32/libSoXt/src/mtlEdit/SoXtMtlEdit.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/libSoXt/src/mtlEdit/SoXtMtlEdit.c++	2009-02-19 04:41:41.000000000 +0100
@@ -53,7 +53,7 @@
  */
 
 #include <inttypes.h>
-#include <string.h>
+#include <cstring>
 
 #include <X11/StringDefs.h>
 #include <Xm/Xm.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/mtlEdit/SoXtMtlList.c++ inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++
--- inventor-2.1.5-32/libSoXt/src/mtlEdit/SoXtMtlList.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/libSoXt/src/mtlEdit/SoXtMtlList.c++	2009-02-19 04:42:20.000000000 +0100
@@ -53,13 +53,13 @@
  */
 
 #include <inttypes.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <X11/StringDefs.h>
 #include <Xm/Xm.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/SoXtClipboard.c++ inventor/libSoXt/src/SoXtClipboard.c++
--- inventor-2.1.5-32/libSoXt/src/SoXtClipboard.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/libSoXt/src/SoXtClipboard.c++	2009-02-19 04:42:20.000000000 +0100
@@ -53,7 +53,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 
 #include <Inventor/SbDict.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/SoXtComponent.c++ inventor/libSoXt/src/SoXtComponent.c++
--- inventor-2.1.5-32/libSoXt/src/SoXtComponent.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/libSoXt/src/SoXtComponent.c++	2009-02-19 04:42:20.000000000 +0100
@@ -57,10 +57,10 @@
 
 #include <Inventor/errors/SoDebugError.h>
 
-#include <stdio.h>
-#include <stdlib.h> // for system() and getenv()
+#include <cstdio>
+#include <cstdlib> // for system() and getenv()
 #include <unistd.h> // for access()
-#include <string.h> // for strcpy() and strcat()
+#include <cstring> // for strcpy() and strcat()
 
 #include <X11/Intrinsic.h>
 #include <X11/Shell.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/SoXtGLWidget.c++ inventor/libSoXt/src/SoXtGLWidget.c++
--- inventor-2.1.5-32/libSoXt/src/SoXtGLWidget.c++	2001-09-25 02:45:48.000000000 +0200
+++ inventor/libSoXt/src/SoXtGLWidget.c++	2009-02-19 04:42:20.000000000 +0100
@@ -50,9 +50,9 @@
  ______________  S I L I C O N   G R A P H I C S   I N C .  ____________
  _______________________________________________________________________
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <Inventor/errors/SoDebugError.h>
 #include <Inventor/Xt/SoXt.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/SoXtPrintDlog.c++ inventor/libSoXt/src/SoXtPrintDlog.c++
--- inventor-2.1.5-32/libSoXt/src/SoXtPrintDlog.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/libSoXt/src/SoXtPrintDlog.c++	2009-02-19 04:42:20.000000000 +0100
@@ -67,12 +67,12 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <X11/StringDefs.h>
 #include <Xm/BulletinB.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/SoXtRendrArea.c++ inventor/libSoXt/src/SoXtRendrArea.c++
--- inventor-2.1.5-32/libSoXt/src/SoXtRendrArea.c++	2002-06-01 04:02:07.000000000 +0200
+++ inventor/libSoXt/src/SoXtRendrArea.c++	2009-02-19 04:42:20.000000000 +0100
@@ -66,7 +66,7 @@
 #include <Inventor/Xt/devices/SoXtMouse.h>
 #include <GL/gl.h>
 #include <GL/glx.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/viewers/SoXtExamVwr.c++ inventor/libSoXt/src/viewers/SoXtExamVwr.c++
--- inventor-2.1.5-32/libSoXt/src/viewers/SoXtExamVwr.c++	2000-10-14 12:46:09.000000000 +0200
+++ inventor/libSoXt/src/viewers/SoXtExamVwr.c++	2009-02-19 04:42:20.000000000 +0100
@@ -49,7 +49,7 @@
  ______________  S I L I C O N   G R A P H I C S   I N C .  ____________
  _______________________________________________________________________
  */
-#include <stdlib.h>
+#include <cstdlib>
 #include <inttypes.h>
 #include <X11/Intrinsic.h>
 #include <X11/Xlib.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/viewers/SoXtFullVwr.c++ inventor/libSoXt/src/viewers/SoXtFullVwr.c++
--- inventor-2.1.5-32/libSoXt/src/viewers/SoXtFullVwr.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/libSoXt/src/viewers/SoXtFullVwr.c++	2009-02-19 04:42:20.000000000 +0100
@@ -51,9 +51,9 @@
  */
 
 #include <inttypes.h>
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cmath>
+#include <cstdlib>
 
 #include <X11/StringDefs.h>
 #include <X11/Intrinsic.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/viewers/SoXtPlaneVwr.c++ inventor/libSoXt/src/viewers/SoXtPlaneVwr.c++
--- inventor-2.1.5-32/libSoXt/src/viewers/SoXtPlaneVwr.c++	2001-09-25 02:45:56.000000000 +0200
+++ inventor/libSoXt/src/viewers/SoXtPlaneVwr.c++	2009-02-19 04:42:02.000000000 +0100
@@ -50,7 +50,7 @@
  _______________________________________________________________________
  */
 
-#include <math.h>
+#include <cmath>
 #include <inttypes.h>
 #include <X11/Intrinsic.h>
 #include <X11/Xlib.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/viewers/SoXtViewer.c++ inventor/libSoXt/src/viewers/SoXtViewer.c++
--- inventor-2.1.5-32/libSoXt/src/viewers/SoXtViewer.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/libSoXt/src/viewers/SoXtViewer.c++	2009-02-19 04:42:02.000000000 +0100
@@ -51,9 +51,9 @@
  */
 
 #include <inttypes.h>
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
+#include <cstdio>
+#include <cmath>
+#include <cstring>
 
 #include <X11/Intrinsic.h>
 #include <X11/Xlib.h>
diff -Naur inventor-2.1.5-32/libSoXt/src/viewers/SoXtWalkVwr.c++ inventor/libSoXt/src/viewers/SoXtWalkVwr.c++
--- inventor-2.1.5-32/libSoXt/src/viewers/SoXtWalkVwr.c++	2000-08-15 14:56:29.000000000 +0200
+++ inventor/libSoXt/src/viewers/SoXtWalkVwr.c++	2009-02-19 04:42:02.000000000 +0100
@@ -50,7 +50,7 @@
  _______________________________________________________________________
  */
 #include <inttypes.h>
-#include <math.h>
+#include <cmath>
 
 #include <X11/Intrinsic.h>
 #include <X11/Xlib.h>
diff -Naur inventor-2.1.5-32/tools/ppp/ppp.c++ inventor/tools/ppp/ppp.c++
--- inventor-2.1.5-32/tools/ppp/ppp.c++	2009-02-18 16:59:21.000000000 +0100
+++ inventor/tools/ppp/ppp.c++	2009-02-19 04:42:20.000000000 +0100
@@ -108,9 +108,9 @@
 
 #include <inttypes.h>
 #include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 
 // There is a nasty cyclic make dependency if we try to use libdatabase.a,
 // so instead just include the following code directly: