diff --git a/include/llmr/geometry/debug_font_buffer.hpp b/include/llmr/geometry/debug_font_buffer.hpp
index fe03297fb..28a50d372 100644
--- a/include/llmr/geometry/debug_font_buffer.hpp
+++ b/include/llmr/geometry/debug_font_buffer.hpp
@@ -2,6 +2,7 @@
 #define LLMR_GEOMETRY_DEBUG_FONT_BUFFER
 
 #include <vector>
+#include <cstdint>
 
 namespace llmr {
 
diff --git a/include/llmr/geometry/fill_buffer.hpp b/include/llmr/geometry/fill_buffer.hpp
index c46fed1d1..626d66179 100644
--- a/include/llmr/geometry/fill_buffer.hpp
+++ b/include/llmr/geometry/fill_buffer.hpp
@@ -2,6 +2,7 @@
 #define LLMR_GEOMETRY_FILL_BUFFER
 
 #include <vector>
+#include <cstdint>
 
 namespace llmr {
 
diff --git a/include/llmr/geometry/line_buffer.hpp b/include/llmr/geometry/line_buffer.hpp
index 3073ef22f..4965a919a 100644
--- a/include/llmr/geometry/line_buffer.hpp
+++ b/include/llmr/geometry/line_buffer.hpp
@@ -2,7 +2,7 @@
 #define LLMR_GEOMETRY_LINE_BUFFER
 
 #include <vector>
-
+#include <cstdint>
 #include <cmath>
 
 namespace llmr {
diff --git a/include/llmr/geometry/vertex_buffer.hpp b/include/llmr/geometry/vertex_buffer.hpp
index b4c31e419..667e3fc8a 100644
--- a/include/llmr/geometry/vertex_buffer.hpp
+++ b/include/llmr/geometry/vertex_buffer.hpp
@@ -2,7 +2,7 @@
 #define LLMR_GEOMETRY_VERTEX_BUFFER
 
 #include <vector>
-
+#include <cstdint>
 #include <cmath>
 
 namespace llmr {
diff --git a/include/llmr/map/vector_tile.hpp b/include/llmr/map/vector_tile.hpp
index cf3fbdc24..3597906c4 100644
--- a/include/llmr/map/vector_tile.hpp
+++ b/include/llmr/map/vector_tile.hpp
@@ -6,6 +6,7 @@
 #include <vector>
 #include <map>
 #include <set>
+#include <limits>
 
 namespace llmr {
 
diff --git a/include/llmr/platform/gl.hpp b/include/llmr/platform/gl.hpp
index fb36b5b79..a86113d7f 100644
--- a/include/llmr/platform/gl.hpp
+++ b/include/llmr/platform/gl.hpp
@@ -18,7 +18,10 @@
         #error Unsupported Apple platform
     #endif
 #else
-    #error Unsupported platform
+    #define GL_GLEXT_PROTOTYPES
+    #include <GL/gl.h>
+    #include <GL/glu.h>
+    #include <GL/glext.h>
 #endif
 
 #endif
diff --git a/include/llmr/renderer/fill_bucket.hpp b/include/llmr/renderer/fill_bucket.hpp
index bf1dd47cb..4ab950731 100644
--- a/include/llmr/renderer/fill_bucket.hpp
+++ b/include/llmr/renderer/fill_bucket.hpp
@@ -5,6 +5,7 @@
 #include <llmr/style/bucket_description.hpp>
 
 #include <vector>
+#include <memory>
 
 namespace llmr {
 
diff --git a/include/llmr/renderer/line_bucket.hpp b/include/llmr/renderer/line_bucket.hpp
index 4c75fd38f..f6caededa 100644
--- a/include/llmr/renderer/line_bucket.hpp
+++ b/include/llmr/renderer/line_bucket.hpp
@@ -3,7 +3,7 @@
 
 #include "bucket.hpp"
 #include <llmr/style/bucket_description.hpp>
-
+#include <memory>
 #include <vector>
 
 namespace llmr {
diff --git a/include/llmr/style/properties.hpp b/include/llmr/style/properties.hpp
index 572ca61ac..4d4ce6895 100644
--- a/include/llmr/style/properties.hpp
+++ b/include/llmr/style/properties.hpp
@@ -4,6 +4,7 @@
 #include <array>
 #include <vector>
 #include <string>
+#include <limits>
 
 namespace llmr {
 
diff --git a/include/llmr/util/vec.hpp b/include/llmr/util/vec.hpp
index 760b66753..f403cded5 100644
--- a/include/llmr/util/vec.hpp
+++ b/include/llmr/util/vec.hpp
@@ -2,6 +2,7 @@
 #define llmr_util_vec2_
 
 #include <limits>
+#include <type_traits>
 
 namespace llmr {
 
diff --git a/src/geometry/debug_font_buffer.cpp b/src/geometry/debug_font_buffer.cpp
index d789df815..ba180ff60 100644
--- a/src/geometry/debug_font_buffer.cpp
+++ b/src/geometry/debug_font_buffer.cpp
@@ -1,6 +1,7 @@
 #include <llmr/geometry/debug_font_buffer.hpp>
 #include <llmr/platform/gl.hpp>
 #include <cmath>
+#include <cstring>
 
 #include "debug_font.cpp"
 
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 341f7f719..1e2326ff3 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -7,7 +7,7 @@
 
 #include <iostream>
 #include <thread>
-
+#include <algorithm>
 #include <cmath>
 #include <cassert>
 
diff --git a/src/map/vector_tile.cpp b/src/map/vector_tile.cpp
index 777dd299e..e0ea5ebbb 100644
--- a/src/map/vector_tile.cpp
+++ b/src/map/vector_tile.cpp
@@ -1,6 +1,6 @@
 #include <llmr/map/vector_tile.hpp>
 #include <llmr/style/bucket_description.hpp>
-
+#include <algorithm>
 
 using namespace llmr;
 
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index cb33964fc..6114c5b21 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -15,6 +15,7 @@
 #include <cmath>
 #include <array>
 #include <numeric>
+#include <algorithm>
 
 using namespace llmr;