diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index f73a81de1..5af865015 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -22,7 +22,7 @@
 #if defined(LIN)
 #include "icon.h"
 #endif
-#include <signal.h>
+#include <csignal>
 #include <stdexcept>
 
 #ifndef WIN
diff --git a/src/Update.cpp b/src/Update.cpp
index 14ee4ccf3..52f2eac5a 100644
--- a/src/Update.cpp
+++ b/src/Update.cpp
@@ -7,7 +7,7 @@
 #include <malloc.h>
 #endif
 #include <cstring>
-#include <stdint.h>
+#include <cstdint>
 
 #ifdef WIN
 #define NOMINMAX
diff --git a/src/bson/BSON.h b/src/bson/BSON.h
index 91e81d986..e6b6b1509 100644
--- a/src/bson/BSON.h
+++ b/src/bson/BSON.h
@@ -31,7 +31,7 @@
 
 #if defined(LIN) || defined(USE_STDINT)
 #include <sys/types.h>
-#include <stdint.h>
+#include <cstdint>
 #else
 typedef long long int int64_t;
 typedef unsigned long long int uint64_t;
diff --git a/src/client/HTTP.cpp b/src/client/HTTP.cpp
index 899122924..91a390399 100644
--- a/src/client/HTTP.cpp
+++ b/src/client/HTTP.cpp
@@ -40,9 +40,9 @@
 #else
 #include <sys/types.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <signal.h>
+#include <csignal>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/src/lua/LuaBit.cpp b/src/lua/LuaBit.cpp
index 96fa00822..52168c3bf 100644
--- a/src/lua/LuaBit.cpp
+++ b/src/lua/LuaBit.cpp
@@ -37,7 +37,7 @@ typedef __int32 int32_t;
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
 #else
-#include <stdint.h>
+#include <cstdint>
 #endif
 
 typedef int32_t SBits;
diff --git a/src/lua/TPTSTypes.cpp b/src/lua/TPTSTypes.cpp
index 9615afbf6..21a2093b3 100644
--- a/src/lua/TPTSTypes.cpp
+++ b/src/lua/TPTSTypes.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <stdint.h>
+#include <cstdint>
 #include "TPTSTypes.h"
 
 AnyType::AnyType(ValueType type_, ValueValue value_):
diff --git a/src/simulation/StructProperty.h b/src/simulation/StructProperty.h
index 07d77c3ff..c7588dbb7 100644
--- a/src/simulation/StructProperty.h
+++ b/src/simulation/StructProperty.h
@@ -2,7 +2,7 @@
 #define STRUCTPROPERTY_H_
 
 #include "common/String.h"
-#include <stdint.h>
+#include <cstdint>
 
 struct StructProperty
 {