diff --git a/src/mbgl/gfx/symbol_drawable_data.hpp b/src/mbgl/gfx/symbol_drawable_data.hpp
index 883e81e0b..17b2fa729 100644
--- a/src/mbgl/gfx/symbol_drawable_data.hpp
+++ b/src/mbgl/gfx/symbol_drawable_data.hpp
@@ -26,7 +26,7 @@ struct SymbolDrawableData : public DrawableData {
           rotationAlignment(rotationAlignment_),
           placement(placement_),
           textFit(textFit_) {}
-    ~SymbolDrawableData() = default;
+    ~SymbolDrawableData() override = default;
 
     const bool isHalo;
     bool bucketVariablePlacement;
diff --git a/src/mbgl/renderer/layers/symbol_layer_tweaker.cpp b/src/mbgl/renderer/layers/symbol_layer_tweaker.cpp
index 8325313ca..b173b82e1 100644
--- a/src/mbgl/renderer/layers/symbol_layer_tweaker.cpp
+++ b/src/mbgl/renderer/layers/symbol_layer_tweaker.cpp
@@ -20,6 +20,8 @@ namespace mbgl {
 
 using namespace style;
 
+namespace {
+
 struct alignas(16) SymbolDrawableUBO {
     /*   0 */ std::array<float, 4 * 4> matrix;
     /*  64 */ std::array<float, 4 * 4> label_plane_matrix;
@@ -53,8 +55,8 @@ struct alignas(16) SymbolDrawablePaintUBO {
 };
 static_assert(sizeof(SymbolDrawablePaintUBO) == 3 * 16);
 
-static Size getTexSize(const gfx::Drawable& drawable, const std::string_view name) {
-    if (const auto shader = drawable.getShader()) {
+Size getTexSize(const gfx::Drawable& drawable, const std::string_view name) {
+    if (const auto& shader = drawable.getShader()) {
         if (const auto index = shader->getSamplerLocation(name)) {
             if (const auto& tex = drawable.getTexture(*index)) {
                 return tex->getSize();
@@ -64,7 +66,7 @@ static Size getTexSize(const gfx::Drawable& drawable, const std::string_view nam
     return {0, 0};
 }
 
-static std::array<float, 2> toArray(const Size& s) {
+std::array<float, 2> toArray(const Size& s) {
     return util::cast<float>(std::array<uint32_t, 2>{s.width, s.height});
 }
 
@@ -72,10 +74,12 @@ constexpr auto texUniformName = "u_texture";
 constexpr auto texIconUniformName = "u_texture_icon";
 
 template <typename T, class... Is, class... Ts>
-static auto constOrDefault(const IndexedTuple<TypeList<Is...>, TypeList<Ts...>>& evaluated) {
+auto constOrDefault(const IndexedTuple<TypeList<Is...>, TypeList<Ts...>>& evaluated) {
     return evaluated.template get<T>().constantOr(T::defaultValue());
 }
 
+} // namespace
+
 void SymbolLayerTweaker::execute(LayerGroupBase& layerGroup,
                                  const RenderTree& renderTree,
                                  const PaintParameters& parameters) {