diff -ru fillets-ng-0.8.1.orig/src/gengine/OptionAgent.cpp fillets-ng-0.8.1/src/gengine/OptionAgent.cpp
--- fillets-ng-0.8.1.orig/src/gengine/OptionAgent.cpp	2008-12-29 05:43:40.000000000 -0500
+++ fillets-ng-0.8.1/src/gengine/OptionAgent.cpp	2009-02-13 13:35:13.000000000 -0500
@@ -23,8 +23,8 @@
 #include "UnknownMsgException.h"
 #include "minmax.h"
 
-#include <stdlib.h> //getenv
-#include <string.h> //strlen
+#include <cstdlib> //getenv
+#include <cstring> //strlen
 #include <locale.h> //setlocale
 
 #ifndef LC_MESSAGES
diff -ru fillets-ng-0.8.1.orig/src/gengine/StringTool.cpp fillets-ng-0.8.1/src/gengine/StringTool.cpp
--- fillets-ng-0.8.1.orig/src/gengine/StringTool.cpp	2008-08-10 06:00:15.000000000 -0400
+++ fillets-ng-0.8.1/src/gengine/StringTool.cpp	2009-02-13 13:35:29.000000000 -0500
@@ -8,7 +8,7 @@
  */
 #include "StringTool.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sstream>
 
 //-----------------------------------------------------------------
diff -ru fillets-ng-0.8.1.orig/src/level/Landslip.cpp fillets-ng-0.8.1/src/level/Landslip.cpp
--- fillets-ng-0.8.1.orig/src/level/Landslip.cpp	2008-08-10 06:00:29.000000000 -0400
+++ fillets-ng-0.8.1/src/level/Landslip.cpp	2009-02-13 13:36:06.000000000 -0500
@@ -11,7 +11,7 @@
 #include "Rules.h"
 #include "minmax.h"
 
-#include <string.h>
+#include <cstring>
 
 //-----------------------------------------------------------------
     Landslip::Landslip(const ModelList &models)