8 files changed, 9 insertions, 9 deletions
diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h
index a49f925c3..ba2213e0b 100644
--- a/src/display/cairo-templates.h
+++ b/src/display/cairo-templates.h
@@ -27,7 +27,7 @@ static const int OPENMP_THRESHOLD = 2048;
 
 #include <algorithm>
 #include <cairo.h>
-#include <math.h>
+#include <cmath>
 #include "display/nr-3dutils.h"
 #include "display/cairo-utils.h"
 
diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index 35f46e2ae..b12e617f5 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -12,7 +12,7 @@
  */
 
 #include <sstream>
-#include <string.h>
+#include <cstring>
 #include "desktop.h"
 
 #include "color.h"
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index 9df002f7f..25a0f56a0 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.cpp
@@ -13,7 +13,7 @@
  */
 
 #include <sstream>
-#include <string.h>
+#include <cstring>
 
 #include "sp-canvas-util.h"
 #include "canvas-text.h"
diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp
index e50536ff5..d27e6104a 100644
--- a/src/display/nr-filter-colormatrix.cpp
+++ b/src/display/nr-filter-colormatrix.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <math.h>
+#include <cmath>
 #include <algorithm>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp
index e796d1792..38b66e230 100644
--- a/src/display/nr-filter-component-transfer.cpp
+++ b/src/display/nr-filter-component-transfer.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <math.h>
+#include <cmath>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-component-transfer.h"
diff --git a/src/display/nr-filter-slot.cpp b/src/display/nr-filter-slot.cpp
index 1358530b8..3b7a653dd 100644
--- a/src/display/nr-filter-slot.cpp
+++ b/src/display/nr-filter-slot.cpp
@@ -11,8 +11,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 #include <2geom/transforms.h>
 #include "display/cairo-utils.h"
diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp
index 349bcc242..2c7668631 100644
--- a/src/display/nr-filter-turbulence.cpp
+++ b/src/display/nr-filter-turbulence.cpp
@@ -23,7 +23,7 @@
 #include "display/nr-filter-turbulence.h"
 #include "display/nr-filter-units.h"
 #include "display/nr-filter-utils.h"
-#include <math.h>
+#include <cmath>
 
 namespace Inkscape {
 namespace Filters{
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index d30e0a485..4e9a81d83 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <stdint.h>
+#include <cstdint>
 #include <glibmm/ustring.h>
 #include <2geom/affine.h>
 #include <2geom/rect.h>