8 files changed, 18 insertions, 8 deletions
diff --git a/src/mbgl/renderer/debug_bucket.cpp b/src/mbgl/renderer/debug_bucket.cpp
index 8c7a25c675..b4218485b2 100644
--- a/src/mbgl/renderer/debug_bucket.cpp
+++ b/src/mbgl/renderer/debug_bucket.cpp
@@ -8,7 +8,7 @@
 #include <cassert>
 #include <string>
 
-using namespace mbgl;
+namespace mbgl {
 
 DebugBucket::DebugBucket(const OverscaledTileID& id,
                          const bool renderable_,
@@ -51,3 +51,5 @@ void DebugBucket::drawPoints(PlainShader& shader, gl::ObjectStore& store) {
         MBGL_CHECK_ERROR(glDrawArrays(GL_POINTS, 0, (GLsizei)(fontBuffer.index())));
     }
 }
+
+} // namespace mbgl
diff --git a/src/mbgl/renderer/frame_history.cpp b/src/mbgl/renderer/frame_history.cpp
index 5173d9d5a1..68b6bf863e 100644
--- a/src/mbgl/renderer/frame_history.cpp
+++ b/src/mbgl/renderer/frame_history.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/renderer/frame_history.hpp>
 #include <mbgl/math/minmax.hpp>
 
-using namespace mbgl;
+namespace mbgl {
 
 FrameHistory::FrameHistory() {
     changeOpacities.fill(0);
@@ -110,3 +110,5 @@ void FrameHistory::bind(gl::ObjectStore& store) {
     }
 
 }
+
+} // namespace mbgl
diff --git a/src/mbgl/renderer/painter_clipping.cpp b/src/mbgl/renderer/painter_clipping.cpp
index e6ce1a040e..f0fc836f74 100644
--- a/src/mbgl/renderer/painter_clipping.cpp
+++ b/src/mbgl/renderer/painter_clipping.cpp
@@ -5,7 +5,7 @@
 #include <mbgl/util/string.hpp>
 #include <mbgl/gl/debugging.hpp>
 
-using namespace mbgl;
+namespace mbgl {
 
 
 void Painter::drawClippingMasks(const std::map<UnwrappedTileID, ClipID>& stencils) {
@@ -38,3 +38,5 @@ void Painter::drawClippingMasks(const std::map<UnwrappedTileID, ClipID>& stencil
         MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLES, 0, (GLsizei)tileStencilBuffer.index()));
     }
 }
+
+} // namespace mbgl
diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp
index 9ddae289ee..7e751aa016 100644
--- a/src/mbgl/renderer/painter_debug.cpp
+++ b/src/mbgl/renderer/painter_debug.cpp
@@ -10,7 +10,7 @@
 #include <mbgl/gl/gl_helper.hpp>
 #include <mbgl/util/color.hpp>
 
-using namespace mbgl;
+namespace mbgl {
 
 void Painter::renderTileDebug(const RenderTile& tile) {
     MBGL_DEBUG_GROUP(std::string { "debug " } + util::toString(tile.id));
@@ -118,3 +118,5 @@ void Painter::renderClipMasks() {
     MBGL_CHECK_ERROR(glDrawPixels(fbSize[0], fbSize[1], GL_LUMINANCE, GL_UNSIGNED_BYTE, pixels.get()));
 #endif // GL_ES_VERSION_2_0
 }
+
+} // namespace mbgl
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
index 206255095d..638d0b6f82 100644
--- a/src/mbgl/renderer/painter_line.cpp
+++ b/src/mbgl/renderer/painter_line.cpp
@@ -98,7 +98,7 @@ void Painter::renderLine(LineBucket& bucket,
     } else if (!properties.linePattern.value.from.empty()) {
         optional<SpriteAtlasPosition> imagePosA = spriteAtlas->getPosition(properties.linePattern.value.from, true);
         optional<SpriteAtlasPosition> imagePosB = spriteAtlas->getPosition(properties.linePattern.value.to, true);
-        
+
         if (!imagePosA || !imagePosB)
             return;
 
diff --git a/src/mbgl/renderer/render_tile.cpp b/src/mbgl/renderer/render_tile.cpp
index 2f407a2895..513515ddf0 100644
--- a/src/mbgl/renderer/render_tile.cpp
+++ b/src/mbgl/renderer/render_tile.cpp
@@ -1,3 +1,5 @@
 #include <mbgl/renderer/render_tile.hpp>
 
-using namespace mbgl;
+namespace mbgl {
+
+} // namespace mbgl
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index d853265861..c198ac8a38 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -370,7 +370,7 @@ void SymbolBucket::addFeature(const GeometryCollection &lines,
         }
     }
 }
-    
+
 bool SymbolBucket::anchorIsTooClose(const std::u32string &text, const float repeatDistance, Anchor &anchor) {
     if (compareText.find(text) == compareText.end()) {
         compareText.emplace(text, Anchors());
diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp
index 98b8116c26..6f16cccf34 100644
--- a/src/mbgl/renderer/symbol_bucket.hpp
+++ b/src/mbgl/renderer/symbol_bucket.hpp
@@ -98,7 +98,7 @@ private:
             const size_t index);
     bool anchorIsTooClose(const std::u32string &text, const float repeatDistance, Anchor &anchor);
     std::map<std::u32string, std::vector<Anchor>> compareText;
-    
+
     void addToDebugBuffers(CollisionTile &collisionTile);
 
     void swapRenderData() override;