diff --git a/src/lib/util/io/socketsession.cc b/src/lib/util/io/socketsession.cc
index 15b040c190..32e63d0950 100644
--- a/src/lib/util/io/socketsession.cc
+++ b/src/lib/util/io/socketsession.cc
@@ -19,13 +19,14 @@
 
 #include <netinet/in.h>
 
-#include <errno.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <stdint.h>
-#include <string.h>
 
+#include <cerrno>
+#include <csignal>
+#include <cstring>
 #include <cassert>
+
 #include <string>
 #include <vector>
 
diff --git a/src/lib/util/tests/socketsession_unittest.cc b/src/lib/util/tests/socketsession_unittest.cc
index cfc8a1646e..83cf493435 100644
--- a/src/lib/util/tests/socketsession_unittest.cc
+++ b/src/lib/util/tests/socketsession_unittest.cc
@@ -16,12 +16,13 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 #include <netdb.h>
 #include <unistd.h>
 
+#include <cerrno>
+#include <cstring>
+
 #include <string>
 #include <utility>
 #include <vector>