diff --git a/include/zeus/CColor.hpp b/include/zeus/CColor.hpp
index 41aa432..293c62a 100644
--- a/include/zeus/CColor.hpp
+++ b/include/zeus/CColor.hpp
@@ -9,7 +9,7 @@
 #include <athena/FileWriter.hpp>
 #endif
 #include <iostream>
-#include <assert.h>
+#include <cassert>
 
 #undef min
 #undef max
diff --git a/include/zeus/CMatrix3f.hpp b/include/zeus/CMatrix3f.hpp
index 682decc..e9b2465 100644
--- a/include/zeus/CMatrix3f.hpp
+++ b/include/zeus/CMatrix3f.hpp
@@ -3,8 +3,8 @@
 
 #include "Global.hpp"
 #include "zeus/CVector3f.hpp"
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 /* Column-major matrix class */
 namespace zeus
diff --git a/include/zeus/CTransform.hpp b/include/zeus/CTransform.hpp
index 7306837..d28b46e 100644
--- a/include/zeus/CTransform.hpp
+++ b/include/zeus/CTransform.hpp
@@ -6,8 +6,8 @@
 #include "zeus/CMatrix4f.hpp"
 #include "zeus/CVector3f.hpp"
 #include "zeus/CUnitVector.hpp"
-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
 
 namespace zeus
 {
diff --git a/include/zeus/Math.hpp b/include/zeus/Math.hpp
index eb161e9..5b954fb 100644
--- a/include/zeus/Math.hpp
+++ b/include/zeus/Math.hpp
@@ -1,7 +1,7 @@
 #ifndef MATH_HPP
 #define MATH_HPP
 
-#include <float.h>
+#include <cfloat>
 #undef min
 #undef max
 
diff --git a/src/CVector2f.cpp b/src/CVector2f.cpp
index 3aea9ef..338b638 100644
--- a/src/CVector2f.cpp
+++ b/src/CVector2f.cpp
@@ -1,7 +1,7 @@
 #include "zeus/CVector2f.hpp"
 #include <memory.h>
 #include <cmath>
-#include <assert.h>
+#include <cassert>
 #include "zeus/Math.hpp"
 
 namespace zeus
diff --git a/src/CVector3f.cpp b/src/CVector3f.cpp
index d055e8b..9670eea 100644
--- a/src/CVector3f.cpp
+++ b/src/CVector3f.cpp
@@ -2,7 +2,7 @@
 #include "zeus/CVector3d.hpp"
 #include <memory.h>
 #include <cmath>
-#include <assert.h>
+#include <cassert>
 #include "zeus/Math.hpp"
 
 namespace zeus