diff --git a/include/logvisor/logvisor.hpp b/include/logvisor/logvisor.hpp
index 51579bc..98d6f47 100644
--- a/include/logvisor/logvisor.hpp
+++ b/include/logvisor/logvisor.hpp
@@ -1,10 +1,10 @@
 #ifndef __LOG_VISOR_HPP__
 #define __LOG_VISOR_HPP__
 
-#include <stdarg.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdarg>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 #include <vector>
 #include <atomic>
 #include <memory>
diff --git a/lib/logvisor.cpp b/lib/logvisor.cpp
index 3f9c091..acfa4a2 100644
--- a/lib/logvisor.cpp
+++ b/lib/logvisor.cpp
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <string.h>
+#include <cstring>
 #endif
 
 #include <fcntl.h>
@@ -21,8 +21,8 @@
 #include <thread>
 #include <string>
 #include <unordered_map>
-#include <stdio.h>
-#include <inttypes.h>
+#include <cstdio>
+#include <cinttypes>
 #include <signal.h>
 #include "logvisor/logvisor.hpp"