diff --git a/include/jbus/Common.hpp b/include/jbus/Common.hpp
index 04ecf52..e3db8bb 100644
--- a/include/jbus/Common.hpp
+++ b/include/jbus/Common.hpp
@@ -2,8 +2,8 @@
 #define JBUS_COMMON_HPP
 
 #include <functional>
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 
 namespace jbus
 {
diff --git a/include/jbus/Socket.hpp b/include/jbus/Socket.hpp
index e0c281c..72de245 100644
--- a/include/jbus/Socket.hpp
+++ b/include/jbus/Socket.hpp
@@ -8,7 +8,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #else
 #include <winsock2.h>
 #include <Ws2tcpip.h>
@@ -21,9 +21,7 @@
 
 #include "Common.hpp"
 
-namespace jbus
-{
-namespace net
+namespace jbus::net
 {
 
 /* Define the low-level send/receive flags, which depend on the OS */
@@ -371,7 +369,6 @@ public:
     SocketTp GetInternalSocket() const { return m_socket; }
 };
 
-}
 }
 
 #endif // JBUS_SOCKET_HPP
diff --git a/tools/joyboot.cpp b/tools/joyboot.cpp
index 3e17d35..fc50dad 100644
--- a/tools/joyboot.cpp
+++ b/tools/joyboot.cpp
@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <cstdio>
 #include "jbus/Listener.hpp"
 #include "jbus/Endpoint.hpp"
 #include <functional>