diff --git a/include/mbgl/map/query.hpp b/include/mbgl/map/query.hpp
index 9fac60d71..e114fa2eb 100644
--- a/include/mbgl/map/query.hpp
+++ b/include/mbgl/map/query.hpp
@@ -30,4 +30,4 @@ public:
     optional<style::Filter> filter;
 };
 
-}
+} // namespace mbgl
diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp
index 59d2ce3ec..83cafe50b 100644
--- a/platform/glfw/main.cpp
+++ b/platform/glfw/main.cpp
@@ -19,7 +19,7 @@ namespace {
 
 GLFWView* view = nullptr;
 
-}
+} // namespace
 
 void quit_handler(int) {
     if (view) {
diff --git a/src/mbgl/renderer/render_background_layer.cpp b/src/mbgl/renderer/render_background_layer.cpp
index 485d4b16c..8069209c7 100644
--- a/src/mbgl/renderer/render_background_layer.cpp
+++ b/src/mbgl/renderer/render_background_layer.cpp
@@ -34,4 +34,4 @@ bool RenderBackgroundLayer::hasTransition() const {
     return unevaluated.hasTransition();
 }
 
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/render_background_layer.hpp b/src/mbgl/renderer/render_background_layer.hpp
index b1f709953..9174664a7 100644
--- a/src/mbgl/renderer/render_background_layer.hpp
+++ b/src/mbgl/renderer/render_background_layer.hpp
@@ -32,4 +32,4 @@ inline bool RenderLayer::is<RenderBackgroundLayer>() const {
     return type == style::LayerType::Background;
 }
 
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/render_circle_layer.cpp b/src/mbgl/renderer/render_circle_layer.cpp
index f59c174dd..e9ed46518 100644
--- a/src/mbgl/renderer/render_circle_layer.cpp
+++ b/src/mbgl/renderer/render_circle_layer.cpp
@@ -64,4 +64,4 @@ bool RenderCircleLayer::queryIntersectsFeature(
     return util::polygonIntersectsBufferedMultiPoint(translatedQueryGeometry.value_or(queryGeometry), feature.getGeometries(), circleRadius);
 }
 
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/render_circle_layer.hpp b/src/mbgl/renderer/render_circle_layer.hpp
index 3b82b5c98..60d600fac 100644
--- a/src/mbgl/renderer/render_circle_layer.hpp
+++ b/src/mbgl/renderer/render_circle_layer.hpp
@@ -39,4 +39,4 @@ inline bool RenderLayer::is<RenderCircleLayer>() const {
     return type == style::LayerType::Circle;
 }
 
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/render_custom_layer.cpp b/src/mbgl/renderer/render_custom_layer.cpp
index 66dd57b3d..d89fa7bba 100644
--- a/src/mbgl/renderer/render_custom_layer.cpp
+++ b/src/mbgl/renderer/render_custom_layer.cpp
@@ -26,4 +26,4 @@ std::unique_ptr<Bucket> RenderCustomLayer::createBucket(const BucketParameters&,
     return nullptr;
 }
     
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/render_custom_layer.hpp b/src/mbgl/renderer/render_custom_layer.hpp
index c3af6c77b..f6ef25348 100644
--- a/src/mbgl/renderer/render_custom_layer.hpp
+++ b/src/mbgl/renderer/render_custom_layer.hpp
@@ -27,4 +27,4 @@ inline bool RenderLayer::is<RenderCustomLayer>() const {
     return type == style::LayerType::Custom;
 }
 
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/render_fill_layer.cpp b/src/mbgl/renderer/render_fill_layer.cpp
index 1af139cde..340ec8580 100644
--- a/src/mbgl/renderer/render_fill_layer.cpp
+++ b/src/mbgl/renderer/render_fill_layer.cpp
@@ -68,4 +68,4 @@ bool RenderFillLayer::queryIntersectsFeature(
 }
 
 
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/render_layer.cpp b/src/mbgl/renderer/render_layer.cpp
index 6699f3914..ed8864149 100644
--- a/src/mbgl/renderer/render_layer.cpp
+++ b/src/mbgl/renderer/render_layer.cpp
@@ -22,4 +22,4 @@ bool RenderLayer::needsRendering(float zoom) const {
            && baseImpl.maxZoom >= zoom;
 }
 
-}
\ No newline at end of file
+} // namespace mbgl
\ No newline at end of file
diff --git a/src/mbgl/renderer/render_source.cpp b/src/mbgl/renderer/render_source.cpp
index 643d92fe8..22043f9f3 100644
--- a/src/mbgl/renderer/render_source.cpp
+++ b/src/mbgl/renderer/render_source.cpp
@@ -23,4 +23,4 @@ void RenderSource::onTileError(Tile& tile, std::exception_ptr error) {
     observer->onTileError(*this, tile.id, error);
 }
 
-}
+} // namespace mbgl
diff --git a/src/mbgl/util/i18n.cpp b/src/mbgl/util/i18n.cpp
index 8e56877a6..2d7667ff0 100644
--- a/src/mbgl/util/i18n.cpp
+++ b/src/mbgl/util/i18n.cpp
@@ -310,7 +310,7 @@ const std::map<char16_t, char16_t> verticalPunctuation = {
     { u'｛', u'︷' }, { u'｜', u'―' },  { u'｝', u'︸' }, { u'｟', u'︵' }, { u'｠', u'︶' },
     { u'｡', u'︒' },  { u'｢', u'﹁' },  { u'｣', u'﹂' },
 };
-}
+} // namespace
 
 namespace mbgl {
 namespace util {
diff --git a/test/src/mbgl/test/getrss.hpp b/test/src/mbgl/test/getrss.hpp
index a4420c4b5..be45ae889 100644
--- a/test/src/mbgl/test/getrss.hpp
+++ b/test/src/mbgl/test/getrss.hpp
@@ -41,5 +41,5 @@ size_t getPeakRSS();
  */
 size_t getCurrentRSS();
 
-}
-}
+} // namespace test
+} // namespace mbgl