diff --git a/src/common/args.cpp b/src/common/args.cpp
index 14bd6a6..8ac6c0f 100644
--- a/src/common/args.cpp
+++ b/src/common/args.cpp
@@ -1,7 +1,7 @@
 #include <getopt.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 #include <climits>
 
 #include "args.hpp"
diff --git a/src/common/args.hpp b/src/common/args.hpp
index 401e6c4..4607a2c 100644
--- a/src/common/args.hpp
+++ b/src/common/args.hpp
@@ -1,8 +1,6 @@
 #ifndef __ARGS__
 #define __ARGS__
 
-#include <stdbool.h>
-
 struct color {
   int32_t R;
   int32_t G;
diff --git a/src/common/global.cpp b/src/common/global.cpp
index 81223d0..425f981 100644
--- a/src/common/global.cpp
+++ b/src/common/global.cpp
@@ -1,8 +1,8 @@
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
 
 #include "global.hpp"
 
diff --git a/src/common/global.hpp b/src/common/global.hpp
index 7cbc1e5..3ec98e5 100644
--- a/src/common/global.hpp
+++ b/src/common/global.hpp
@@ -1,7 +1,6 @@
 #ifndef __GLOBAL__
 #define __GLOBAL__
 
-#include <stdbool.h>
 #include <cstddef>
 
 #define STRING_UNKNOWN "Unknown"
diff --git a/src/common/gpu.hpp b/src/common/gpu.hpp
index 8f308c3..d0b6819 100644
--- a/src/common/gpu.hpp
+++ b/src/common/gpu.hpp
@@ -1,8 +1,7 @@
 #ifndef __GPU__
 #define __GPU__
 
-#include <stdint.h>
-#include <stdbool.h>
+#include <cstdint>
 
 #include "../cuda/pci.hpp"
 
diff --git a/src/common/main.cpp b/src/common/main.cpp
index c4bffcd..3e9e351 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -1,6 +1,6 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "args.hpp"
 #include "global.hpp"
diff --git a/src/common/master.cpp b/src/common/master.cpp
index d86711a..fe27de8 100644
--- a/src/common/master.cpp
+++ b/src/common/master.cpp
@@ -1,6 +1,5 @@
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 
 #include "master.hpp"
 #include "../cuda/cuda.hpp"
diff --git a/src/common/printer.cpp b/src/common/printer.cpp
index 00d5404..2d34675 100644
--- a/src/common/printer.cpp
+++ b/src/common/printer.cpp
@@ -1,8 +1,7 @@
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <errno.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <cerrno>
 
 #include "printer.hpp"
 #include "ascii.hpp"
diff --git a/src/common/uarch.cpp b/src/common/uarch.cpp
index 1549fa0..691e9c3 100644
--- a/src/common/uarch.cpp
+++ b/src/common/uarch.cpp
@@ -1,6 +1,6 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
 
 #include "global.hpp"
 #include "uarch.hpp"
diff --git a/src/cuda/pci.cpp b/src/cuda/pci.cpp
index 868d0ac..234638f 100644
--- a/src/cuda/pci.cpp
+++ b/src/cuda/pci.cpp
@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <cstdio>
 
 #include "pci.hpp"
 #include "chips.hpp"
diff --git a/src/cuda/pci.hpp b/src/cuda/pci.hpp
index 4627c8f..232bac7 100644
--- a/src/cuda/pci.hpp
+++ b/src/cuda/pci.hpp
@@ -1,7 +1,7 @@
 #ifndef __PCI_CUDA__
 #define __PCI_CUDA__
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "../common/pci.hpp"
 #include "chips.hpp"
diff --git a/src/cuda/uarch.cpp b/src/cuda/uarch.cpp
index f769b18..436f557 100644
--- a/src/cuda/uarch.cpp
+++ b/src/cuda/uarch.cpp
@@ -1,6 +1,6 @@
 #include <cuda_runtime.h>
 #include <helper_cuda.h>
-#include <stdint.h>
+#include <cstdint>
 #include <cstddef>
 
 #include "../common/uarch.hpp"
diff --git a/src/intel/chips.hpp b/src/intel/chips.hpp
index c4efb35..9b0e35b 100644
--- a/src/intel/chips.hpp
+++ b/src/intel/chips.hpp
@@ -1,7 +1,7 @@
 #ifndef __INTEL_GPUCHIPS__
 #define __INTEL_GPUCHIPS__
 
-#include <stdint.h>
+#include <cstdint>
 
 typedef uint32_t GPUCHIP;
 
diff --git a/src/intel/intel.cpp b/src/intel/intel.cpp
index da32506..b750ac1 100644
--- a/src/intel/intel.cpp
+++ b/src/intel/intel.cpp
@@ -1,5 +1,5 @@
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "intel.hpp"
 #include "uarch.hpp"
diff --git a/src/intel/pci.cpp b/src/intel/pci.cpp
index ea1af9d..f106545 100644
--- a/src/intel/pci.cpp
+++ b/src/intel/pci.cpp
@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <cstdio>
 
 #include "pci.hpp"
 #include "chips.hpp"
diff --git a/src/intel/pci.hpp b/src/intel/pci.hpp
index 9966a04..92c0a26 100644
--- a/src/intel/pci.hpp
+++ b/src/intel/pci.hpp
@@ -1,7 +1,7 @@
 #ifndef __PCI_INTEL__
 #define __PCI_INTEL__
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "../common/pci.hpp"
 #include "chips.hpp"
diff --git a/src/intel/uarch.cpp b/src/intel/uarch.cpp
index 21643e2..b0487ab 100644
--- a/src/intel/uarch.cpp
+++ b/src/intel/uarch.cpp
@@ -1,7 +1,7 @@
-#include <stdint.h>
+#include <cstdint>
 #include <cstddef>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 
 #include "../common/uarch.hpp"
 #include "../common/global.hpp"