diff --git a/src/mbgl/gl/vertex_attribute_gl.cpp b/src/mbgl/gl/vertex_attribute_gl.cpp
index 5846b51c3..122099f13 100644
--- a/src/mbgl/gl/vertex_attribute_gl.cpp
+++ b/src/mbgl/gl/vertex_attribute_gl.cpp
@@ -110,7 +110,10 @@ bool VertexAttributeGL::get(const gfx::VertexAttribute::ElementType& element, GL
             return gl::get<float3>(element, buffer);
         case GL_FLOAT_VEC4:
         case GL_FLOAT_MAT2:
-            return gl::get<float4>(element, buffer);
+            return gl::get<float4>(element, buffer) ||
+                    gl::get<int4, float4>(element, buffer, [](int4 x) {
+                        return float4{(float)x[0], (float)x[1], (float)x[2], (float)x[3]};
+                    });
         case GL_INT:
             return gl::get<std::int32_t>(element, buffer) || gl::get<float, std::int32_t>(element, buffer);
         case GL_UNSIGNED_INT:
diff --git a/src/mbgl/renderer/layers/fill_layer_tweaker.cpp b/src/mbgl/renderer/layers/fill_layer_tweaker.cpp
index d76d0bbb9..822a0968a 100644
--- a/src/mbgl/renderer/layers/fill_layer_tweaker.cpp
+++ b/src/mbgl/renderer/layers/fill_layer_tweaker.cpp
@@ -7,7 +7,6 @@
 #include <mbgl/renderer/layer_group.hpp>
 #include <mbgl/renderer/render_tree.hpp>
 #include <mbgl/renderer/paint_parameters.hpp>
-#include <mbgl/renderer/render_tile.cpp>
 #include <mbgl/style/layers/fill_layer_properties.hpp>
 #include <mbgl/util/convert.hpp>