8 files changed, 12 insertions, 12 deletions
diff --git a/src/trace/filterset.cpp b/src/trace/filterset.cpp
index db6d16eea..cfe120324 100644
--- a/src/trace/filterset.cpp
+++ b/src/trace/filterset.cpp
@@ -11,7 +11,7 @@
  */
 
 #include <cstdio>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "imagemap-gdk.h"
 #include "filterset.h"
diff --git a/src/trace/imagemap-gdk.cpp b/src/trace/imagemap-gdk.cpp
index db8bbdd99..7ce0d3baf 100644
--- a/src/trace/imagemap-gdk.cpp
+++ b/src/trace/imagemap-gdk.cpp
@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "imagemap-gdk.h"
 
diff --git a/src/trace/imagemap.cpp b/src/trace/imagemap.cpp
index e2e97d5ec..1b5b4b791 100644
--- a/src/trace/imagemap.cpp
+++ b/src/trace/imagemap.cpp
@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "imagemap.h"
 
diff --git a/src/trace/pool.h b/src/trace/pool.h
index b4693d941..6ed49b552 100644
--- a/src/trace/pool.h
+++ b/src/trace/pool.h
@@ -51,7 +51,7 @@
 
 */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 template <typename T>
 class pool {
diff --git a/src/trace/potrace/bitmap.h b/src/trace/potrace/bitmap.h
index a47de24d0..679209cf8 100644
--- a/src/trace/potrace/bitmap.h
+++ b/src/trace/potrace/bitmap.h
@@ -5,10 +5,10 @@
 #ifndef BITMAP_H
 #define BITMAP_H
 
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stddef.h>
+#include <cstring>
+#include <cstdlib>
+#include <cerrno>
+#include <cstddef>
 
 /* The bitmap type is defined in potracelib.h */
 #include "potracelib.h"
diff --git a/src/trace/quantize.cpp b/src/trace/quantize.cpp
index a7868fd03..9601219e2 100644
--- a/src/trace/quantize.cpp
+++ b/src/trace/quantize.cpp
@@ -11,7 +11,7 @@
 
 #include <cassert>
 #include <cstdio>
-#include <stdlib.h>
+#include <cstdlib>
 #include <new>
 
 #include "pool.h"
diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index e82f272ab..c04be69fe 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -7,8 +7,8 @@
  */
 #include "siox.h"
 
-#include <math.h>
-#include <stdarg.h>
+#include <cmath>
+#include <cstdarg>
 #include <map>
 #include <algorithm>
 #include <cstdlib>
diff --git a/src/trace/trace.h b/src/trace/trace.h
index 10f7c08be..9f680752b 100644
--- a/src/trace/trace.h
+++ b/src/trace/trace.h
@@ -13,7 +13,7 @@
 # include "config.h"
 #endif
 
-# include <string.h>
+# include <cstring>
 
 #include <glibmm/refptr.h>
 #include <gdkmm/pixbuf.h>