diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp
index ef8ad9154..97c77b374 100644
--- a/platform/glfw/main.cpp
+++ b/platform/glfw/main.cpp
@@ -7,7 +7,7 @@
 #include <mbgl/util/default_thread_pool.hpp>
 #include <mbgl/storage/default_file_source.hpp>
 
-#include <signal.h>
+#include <csignal>
 #include <getopt.h>
 #include <fstream>
 #include <sstream>
diff --git a/test/storage/local_file_source.test.cpp b/test/storage/local_file_source.test.cpp
index 1b90e5bb1..4d509e6c7 100644
--- a/test/storage/local_file_source.test.cpp
+++ b/test/storage/local_file_source.test.cpp
@@ -3,7 +3,7 @@
 #include <mbgl/util/run_loop.hpp>
 
 #include <unistd.h>
-#include <limits.h>
+#include <climits>
 #include <gtest/gtest.h>
 
 namespace {
diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp
index 065d024be..f824ba30c 100644
--- a/test/util/memory.test.cpp
+++ b/test/util/memory.test.cpp
@@ -17,7 +17,7 @@
 #include <unordered_map>
 #include <utility>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 
 using namespace mbgl;