diff --git a/src/ipc/capnp/protocol.cpp b/src/ipc/capnp/protocol.cpp
index 691bdf5f924..3326f709314 100644
--- a/src/ipc/capnp/protocol.cpp
+++ b/src/ipc/capnp/protocol.cpp
@@ -16,8 +16,8 @@
 #include <mp/util.h>
 #include <util/threadnames.h>
 
-#include <assert.h>
-#include <errno.h>
+#include <cassert>
+#include <cerrno>
 #include <future>
 #include <memory>
 #include <mutex>
diff --git a/src/ipc/interfaces.cpp b/src/ipc/interfaces.cpp
index 33555f05d4c..1d9c3992607 100644
--- a/src/ipc/interfaces.cpp
+++ b/src/ipc/interfaces.cpp
@@ -15,10 +15,10 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <functional>
 #include <memory>
 #include <stdexcept>
-#include <string.h>
 #include <string>
 #include <unistd.h>
 #include <utility>
diff --git a/src/ipc/process.cpp b/src/ipc/process.cpp
index 33667883b76..6c9ec216653 100644
--- a/src/ipc/process.cpp
+++ b/src/ipc/process.cpp
@@ -13,11 +13,11 @@
 
 #include <cstdint>
 #include <cstdlib>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 #include <exception>
 #include <iostream>
 #include <stdexcept>
-#include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>