diff --git a/src/tools/trackgen/ac3d.cpp b/src/tools/trackgen/ac3d.cpp
index 230de0834..d55affc5e 100644
--- a/src/tools/trackgen/ac3d.cpp
+++ b/src/tools/trackgen/ac3d.cpp
@@ -23,9 +23,9 @@
     @version	$Id$
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cctype>
 #include <cstring>
 #ifndef WIN32
 #include <unistd.h>
diff --git a/src/tools/trackgen/easymesh.cpp b/src/tools/trackgen/easymesh.cpp
index 230e80cf8..fc7ea62b2 100644
--- a/src/tools/trackgen/easymesh.cpp
+++ b/src/tools/trackgen/easymesh.cpp
@@ -10,9 +10,9 @@
  ************************************************************************************************/
 
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
 
 #include <tgf.h>
diff --git a/src/tools/trackgen/elevation.cpp b/src/tools/trackgen/elevation.cpp
index 8fbe2b204..1dd3f17da 100644
--- a/src/tools/trackgen/elevation.cpp
+++ b/src/tools/trackgen/elevation.cpp
@@ -24,15 +24,15 @@
  */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cctype>
 #include <cstring>
-#include <stdlib.h>
+#include <cstdlib>
 #ifndef WIN32
 #include <unistd.h>
 #endif
-#include <math.h>
+#include <cmath>
 
 #include <tgfclient.h>
 #include <track.h>
diff --git a/src/tools/trackgen/main.cpp b/src/tools/trackgen/main.cpp
index 7d443ab72..d330cf1e7 100644
--- a/src/tools/trackgen/main.cpp
+++ b/src/tools/trackgen/main.cpp
@@ -23,7 +23,7 @@
     @version	$Id$
 */
 #include <cstdio>
-#include <ctype.h>
+#include <cctype>
 
 #include <sstream>
 
diff --git a/src/tools/trackgen/objects.cpp b/src/tools/trackgen/objects.cpp
index 4525ea2d1..32eb9b4e0 100644
--- a/src/tools/trackgen/objects.cpp
+++ b/src/tools/trackgen/objects.cpp
@@ -24,14 +24,14 @@
 */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cctype>
 #include <cstring>
 #ifndef WIN32
 #include <unistd.h>
 #endif
-#include <math.h>
+#include <cmath>
 #include <plib/ssg.h>
 
 #include <tgfclient.h>
diff --git a/src/tools/trackgen/raceline.cpp b/src/tools/trackgen/raceline.cpp
index 17e1a0681..b1675795b 100644
--- a/src/tools/trackgen/raceline.cpp
+++ b/src/tools/trackgen/raceline.cpp
@@ -21,7 +21,7 @@
 #include <track.h>
 #include <robottools.h>
 #include <portability.h>
-#include <math.h>
+#include <cmath>
 #include <linalg_t.h>
 
 struct RacelineSegment
diff --git a/src/tools/trackgen/relief.cpp b/src/tools/trackgen/relief.cpp
index a184beaba..3c67b5d5c 100644
--- a/src/tools/trackgen/relief.cpp
+++ b/src/tools/trackgen/relief.cpp
@@ -25,7 +25,7 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <ctype.h>
+#include <cctype>
 #include <cstring>
 #ifndef WIN32
 #include <unistd.h>
diff --git a/src/tools/trackgen/track.cpp b/src/tools/trackgen/track.cpp
index 9c6e67f4b..43b9714e9 100644
--- a/src/tools/trackgen/track.cpp
+++ b/src/tools/trackgen/track.cpp
@@ -23,14 +23,14 @@
     @version	$Id$
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cctype>
 #include <cstring>
 #ifndef WIN32
 #include <unistd.h>
 #endif
-#include <math.h>
+#include <cmath>
 
 #include <tgfclient.h>
 #include <track.h>
diff --git a/src/tools/trackgen/util.cpp b/src/tools/trackgen/util.cpp
index 4ed099f64..78efac6b2 100644
--- a/src/tools/trackgen/util.cpp
+++ b/src/tools/trackgen/util.cpp
@@ -23,14 +23,14 @@
     @version	$Id$
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cctype>
 #include <cstring>
 #ifndef WIN32
 #include <unistd.h>
 #endif
-#include <math.h>
+#include <cmath>
 
 #include <plib/ul.h>
 #include <tgfclient.h>