diff --git a/common/include/villas/advio.h b/common/include/villas/advio.h
index 53736eae5..470a16e66 100644
--- a/common/include/villas/advio.h
+++ b/common/include/villas/advio.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <stdio.h>
+#include <cstdio>
 
 #include <curl/curl.h>
 
diff --git a/common/include/villas/buffer.h b/common/include/villas/buffer.h
index 2bf2e2b54..efe9a3929 100644
--- a/common/include/villas/buffer.h
+++ b/common/include/villas/buffer.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <jansson.h>
 
diff --git a/common/include/villas/dsp/moving_average_window.hpp b/common/include/villas/dsp/moving_average_window.hpp
index cc72559ea..f8af2b964 100644
--- a/common/include/villas/dsp/moving_average_window.hpp
+++ b/common/include/villas/dsp/moving_average_window.hpp
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <stddef.h>
+#include <cstddef>
 #include <villas/dsp/window.hpp>
 
 namespace villas {
diff --git a/common/include/villas/hist.hpp b/common/include/villas/hist.hpp
index 4a9634f33..ca3ea0be6 100644
--- a/common/include/villas/hist.hpp
+++ b/common/include/villas/hist.hpp
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include <stdio.h>
-#include <stdint.h>
+#include <cstdio>
+#include <cstdint>
 
 #include <jansson.h>
 
diff --git a/common/include/villas/json_buffer.hpp b/common/include/villas/json_buffer.hpp
index da109a17f..460dade4b 100644
--- a/common/include/villas/json_buffer.hpp
+++ b/common/include/villas/json_buffer.hpp
@@ -25,7 +25,7 @@
 
 #include <vector>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <jansson.h>
 
diff --git a/common/include/villas/kernel/kernel.h b/common/include/villas/kernel/kernel.h
index 6ab4f092c..a1a64b93d 100644
--- a/common/include/villas/kernel/kernel.h
+++ b/common/include/villas/kernel/kernel.h
@@ -27,8 +27,8 @@
 
 #pragma once
 
-#include <string.h>
-#include <stdint.h>
+#include <cstring>
+#include <cstdint>
 
 #if WITH_CAP
 #include <sys/capability.h>
diff --git a/common/include/villas/kernel/pci.h b/common/include/villas/kernel/pci.h
index 4ec8aa27e..cf992b71a 100644
--- a/common/include/villas/kernel/pci.h
+++ b/common/include/villas/kernel/pci.h
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <villas/list.h>
 
 #define PCI_SLOT(devfn)		(((devfn) >> 3) & 0x1f)
diff --git a/common/include/villas/list.h b/common/include/villas/list.h
index a92fbcc12..19a576374 100644
--- a/common/include/villas/list.h
+++ b/common/include/villas/list.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <stdbool.h>
+#include <cstdbool>
 #include <sys/types.h>
 #include <pthread.h>
 
diff --git a/common/include/villas/log.h b/common/include/villas/log.h
index df0e841b6..b7d14c7fc 100644
--- a/common/include/villas/log.h
+++ b/common/include/villas/log.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <stdarg.h>
+#include <cstdarg>
 
 #include <jansson.h>
 
diff --git a/common/include/villas/task.h b/common/include/villas/task.h
index e6a674b3d..3b8392aaf 100644
--- a/common/include/villas/task.h
+++ b/common/include/villas/task.h
@@ -23,10 +23,10 @@
 
 #pragma once
 
-#include <stdio.h>
-#include <stdint.h>
+#include <cstdio>
+#include <cstdint>
 
-#include <time.h>
+#include <ctime>
 
 /** We can choose between two periodic task implementations */
 //#define PERIODIC_TASK_IMPL NANOSLEEP
diff --git a/common/include/villas/timing.h b/common/include/villas/timing.h
index f3b1d68ba..3e3448b06 100644
--- a/common/include/villas/timing.h
+++ b/common/include/villas/timing.h
@@ -23,10 +23,10 @@
 
 #pragma once
 
-#include <stdio.h>
-#include <stdint.h>
+#include <cstdio>
+#include <cstdint>
 
-#include <time.h>
+#include <ctime>
 
 /** Compare two timestamps. Return zero if they are equal */
 ssize_t time_cmp(const struct timespec *a, const struct timespec *b);
diff --git a/common/include/villas/tsc.h b/common/include/villas/tsc.h
index 5429d7ffe..66f41bff3 100644
--- a/common/include/villas/tsc.h
+++ b/common/include/villas/tsc.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
-#include <stdbool.h>
+#include <cstdbool>
 #include <cpuid.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #ifdef __APPLE__
   #include <sys/types.h>
diff --git a/common/include/villas/utils.hpp b/common/include/villas/utils.hpp
index 771aa9c12..b02f9c294 100644
--- a/common/include/villas/utils.hpp
+++ b/common/include/villas/utils.hpp
@@ -28,10 +28,10 @@
 #include <vector>
 
 #include <signal.h>
-#include <stdlib.h>
-#include <stdint.h>
+#include <cstdlib>
+#include <cstdint>
 #include <sched.h>
-#include <assert.h>
+#include <cassert>
 #include <sys/types.h>
 
 #include <openssl/sha.h>
diff --git a/common/lib/advio.cpp b/common/lib/advio.cpp
index 4f7d20917..519fff6d6 100644
--- a/common/lib/advio.cpp
+++ b/common/lib/advio.cpp
@@ -22,12 +22,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <math.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdbool>
+#include <cstring>
+#include <cmath>
+#include <cerrno>
 #include <unistd.h>
 
 #include <curl/curl.h>
diff --git a/common/lib/buffer.cpp b/common/lib/buffer.cpp
index bf5fc02ea..2ba1a2c13 100644
--- a/common/lib/buffer.cpp
+++ b/common/lib/buffer.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include <villas/compat.h>
 #include <villas/buffer.h>
diff --git a/common/lib/common.cpp b/common/lib/common.cpp
index 584d21a72..1e400fd43 100644
--- a/common/lib/common.cpp
+++ b/common/lib/common.cpp
@@ -23,7 +23,7 @@
 
 #include <villas/common.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 const char * state_print(enum State s)
 {
diff --git a/common/lib/compat.cpp b/common/lib/compat.cpp
index de6e29054..a8f77c52b 100644
--- a/common/lib/compat.cpp
+++ b/common/lib/compat.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <jansson.h>
 #include <unistd.h>
 
diff --git a/common/lib/hist.cpp b/common/lib/hist.cpp
index 02990a61a..ef1544cac 100644
--- a/common/lib/hist.cpp
+++ b/common/lib/hist.cpp
@@ -20,12 +20,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <float.h>
-#include <math.h>
-#include <time.h>
+#include <cmath>
+#include <ctime>
 
 #include <villas/utils.hpp>
 #include <villas/hist.hpp>
diff --git a/common/lib/kernel/kernel.cpp b/common/lib/kernel/kernel.cpp
index e94b6bec2..bb5994027 100644
--- a/common/lib/kernel/kernel.cpp
+++ b/common/lib/kernel/kernel.cpp
@@ -21,12 +21,12 @@
  *********************************************************************************/
 
 #include <sys/utsname.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
 #include <unistd.h>
 #include <fcntl.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #include <sys/types.h>
 #include <sys/types.h>
diff --git a/common/lib/kernel/pci.cpp b/common/lib/kernel/pci.cpp
index 5a21886a0..eee9d6a6c 100644
--- a/common/lib/kernel/pci.cpp
+++ b/common/lib/kernel/pci.cpp
@@ -22,7 +22,7 @@
 
 #include <dirent.h>
 #include <libgen.h>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <linux/limits.h>
 
diff --git a/common/lib/kernel/vfio.cpp b/common/lib/kernel/vfio.cpp
index bda7cb431..1b5529bbe 100644
--- a/common/lib/kernel/vfio.cpp
+++ b/common/lib/kernel/vfio.cpp
@@ -37,7 +37,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <stdint.h>
+#include <cstdint>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/common/lib/kernel/vfio_legacy.cpp b/common/lib/kernel/vfio_legacy.cpp
index ea802feee..27b444f42 100644
--- a/common/lib/kernel/vfio_legacy.cpp
+++ b/common/lib/kernel/vfio_legacy.cpp
@@ -6,11 +6,11 @@
 
 #define _DEFAULT_SOURCE
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <unistd.h>
 #include <fcntl.h>
-#include <string.h>
+#include <cstring>
 #include <sys/ioctl.h>
 #include <sys/eventfd.h>
 
diff --git a/common/lib/list.cpp b/common/lib/list.cpp
index c9a23145f..432826bc0 100644
--- a/common/lib/list.cpp
+++ b/common/lib/list.cpp
@@ -22,8 +22,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <villas/list.h>
 #include <villas/utils.hpp>
diff --git a/common/lib/table.cpp b/common/lib/table.cpp
index db3db233e..3b9444724 100644
--- a/common/lib/table.cpp
+++ b/common/lib/table.cpp
@@ -20,8 +20,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <villas/utils.hpp>
 #include <villas/table.hpp>
diff --git a/common/lib/task.cpp b/common/lib/task.cpp
index 2a4336400..2ea7745ce 100644
--- a/common/lib/task.cpp
+++ b/common/lib/task.cpp
@@ -21,8 +21,8 @@
  *********************************************************************************/
 
 #include <unistd.h>
-#include <time.h>
-#include <errno.h>
+#include <ctime>
+#include <cerrno>
 
 #include <villas/utils.hpp>
 #include <villas/task.h>
diff --git a/common/lib/utils.cpp b/common/lib/utils.cpp
index cf4aac879..4a2358d52 100644
--- a/common/lib/utils.cpp
+++ b/common/lib/utils.cpp
@@ -24,16 +24,16 @@
 #include <string>
 #include <iostream>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdarg.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstdint>
+#include <cstdbool>
+#include <cstdarg>
+#include <cstring>
 #include <unistd.h>
-#include <math.h>
+#include <cmath>
 #include <pthread.h>
-#include <ctype.h>
+#include <cctype>
 #include <fcntl.h>
 
 #include <openssl/bio.h>
diff --git a/common/tests/unit/list.cpp b/common/tests/unit/list.cpp
index 2cd865df8..3067b2464 100644
--- a/common/tests/unit/list.cpp
+++ b/common/tests/unit/list.cpp
@@ -20,8 +20,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <criterion/criterion.h>
 
 #include <villas/utils.hpp>