diff --git a/mcrouter/lib/routes/AllAsyncRoute.h b/mcrouter/lib/routes/AllAsyncRoute.h
index 98357537d..da9004744 100644
--- a/mcrouter/lib/routes/AllAsyncRoute.h
+++ b/mcrouter/lib/routes/AllAsyncRoute.h
@@ -54,5 +54,5 @@ class AllAsyncRoute {
  private:
   const std::vector<std::shared_ptr<RouteHandleIf>> children_;
 };
-}
-} // facebook::memcache
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/lib/routes/AllInitialRoute.h b/mcrouter/lib/routes/AllInitialRoute.h
index ba1dd7b3d..5547a2552 100644
--- a/mcrouter/lib/routes/AllInitialRoute.h
+++ b/mcrouter/lib/routes/AllInitialRoute.h
@@ -64,5 +64,5 @@ class AllInitialRoute {
     return std::move(rh[0]);
   }
 };
-}
-} // facebook::memcache
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/lib/test/CompressionCodecManagerTest.cpp b/mcrouter/lib/test/CompressionCodecManagerTest.cpp
index 6e36d4d46..f1c05baf1 100644
--- a/mcrouter/lib/test/CompressionCodecManagerTest.cpp
+++ b/mcrouter/lib/test/CompressionCodecManagerTest.cpp
@@ -335,6 +335,6 @@ TEST(CompressionCodecManager, getBest_serverWithoutCodecs) {
           CodecIdRange{1, 6}, 1234 /* body size */, 0 /* reply type id */));
 }
 
-} // test
-} // memcache
-} // facebook
+} // namespace test
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/lib/test/CompressionTest.cpp b/mcrouter/lib/test/CompressionTest.cpp
index e2599a563..0ef866f36 100644
--- a/mcrouter/lib/test/CompressionTest.cpp
+++ b/mcrouter/lib/test/CompressionTest.cpp
@@ -401,6 +401,6 @@ TEST(Lz4ImmutableCompressionCodec, uncompressChained) {
       CompressionCodecType::LZ4Immutable, getAsciiDictionary(), 1);
   testUncompressChained(compressor.get(), *getAsciiReply(), 3);
 }
-}
-}
-} // facebook::memcache::test
+} // namespace test
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/lib/test/CompressionTestUtil.cpp b/mcrouter/lib/test/CompressionTestUtil.cpp
index 6aead7551..580d0ff79 100644
--- a/mcrouter/lib/test/CompressionTestUtil.cpp
+++ b/mcrouter/lib/test/CompressionTestUtil.cpp
@@ -147,6 +147,6 @@ std::unordered_map<uint32_t, CodecConfigPtr> testCodecConfigs() {
   return codecConfigs;
 }
 
-} // test
-} // memcache
-} // facebook
+} // namespace test
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/lib/test/CompressionTestUtil.h b/mcrouter/lib/test/CompressionTestUtil.h
index c801e48dc..18acc61d4 100644
--- a/mcrouter/lib/test/CompressionTestUtil.h
+++ b/mcrouter/lib/test/CompressionTestUtil.h
@@ -23,6 +23,6 @@ std::string createBinaryData(size_t size);
 // CompressionCodecManager.
 std::unordered_map<uint32_t, CodecConfigPtr> testCodecConfigs();
 
-} // test
-} // memcache
-} // facebook
+} // namespace test
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/lib/test/IovecCursorTest.cpp b/mcrouter/lib/test/IovecCursorTest.cpp
index 8bbe9e2d2..2f5023af5 100644
--- a/mcrouter/lib/test/IovecCursorTest.cpp
+++ b/mcrouter/lib/test/IovecCursorTest.cpp
@@ -41,7 +41,7 @@ TEST(IovecCursor, construct) {
 
 TEST(IovecCursor, construct_empty) {
   std::string buf1 = "";
-  auto p = getIovecCursor({ buf1 });
+  auto p = getIovecCursor({buf1});
   auto& cursor = p.first;
 
   EXPECT_FALSE(cursor.hasDataAvailable());
diff --git a/mcrouter/lib/test/TestRouteHandle.h b/mcrouter/lib/test/TestRouteHandle.h
index 2fc5a0f0d..c95ad0cdc 100644
--- a/mcrouter/lib/test/TestRouteHandle.h
+++ b/mcrouter/lib/test/TestRouteHandle.h
@@ -19,5 +19,5 @@ using TestRouterInfo = MemcacheRouterInfo;
 template <class Route>
 using TestRouteHandle = MemcacheRouteHandle<Route>;
 
-} // memcache
-} // facebook
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/options.h b/mcrouter/options.h
index d0ad218fc..94b81c11f 100644
--- a/mcrouter/options.h
+++ b/mcrouter/options.h
@@ -96,6 +96,6 @@ namespace options {
  */
 std::string substituteTemplates(std::string str);
 
-} // facebook::memcache::options
-}
-} // facebook::memcache
+} // namespace options
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/route.cpp b/mcrouter/route.cpp
index b509ae362..2b758a465 100644
--- a/mcrouter/route.cpp
+++ b/mcrouter/route.cpp
@@ -64,6 +64,6 @@ bool match_pattern_route(folly::StringPiece pattern, folly::StringPiece route) {
   return match_pattern_helper(
       pattern.begin(), pattern.end(), route.begin(), route.end());
 }
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/route.h b/mcrouter/route.h
index db95c01d5..b5bdea600 100644
--- a/mcrouter/route.h
+++ b/mcrouter/route.h
@@ -17,6 +17,6 @@ namespace mcrouter {
  * True if pattern (like "/foo/a*c/") matches a route (like "/foo/abc")
  */
 bool match_pattern_route(folly::StringPiece pattern, folly::StringPiece route);
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/AllAsyncRouteFactory.h b/mcrouter/routes/AllAsyncRouteFactory.h
index 6addaa5b1..70203fe05 100644
--- a/mcrouter/routes/AllAsyncRouteFactory.h
+++ b/mcrouter/routes/AllAsyncRouteFactory.h
@@ -31,7 +31,7 @@ typename RouterInfo::RouteHandlePtr makeAllAsyncRoute(
       std::move(rh));
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 typename RouterInfo::RouteHandlePtr makeAllAsyncRoute(
@@ -47,6 +47,6 @@ typename RouterInfo::RouteHandlePtr makeAllAsyncRoute(
   }
   return detail::makeAllAsyncRoute<RouterInfo>(std::move(children));
 }
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/AllFastestRouteFactory.h b/mcrouter/routes/AllFastestRouteFactory.h
index 362e57f00..d797064c4 100644
--- a/mcrouter/routes/AllFastestRouteFactory.h
+++ b/mcrouter/routes/AllFastestRouteFactory.h
@@ -35,7 +35,7 @@ typename RouterInfo::RouteHandlePtr makeAllFastestRoute(
       std::move(rh));
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 typename RouterInfo::RouteHandlePtr makeAllFastestRoute(
@@ -51,6 +51,6 @@ typename RouterInfo::RouteHandlePtr makeAllFastestRoute(
   }
   return detail::makeAllFastestRoute<RouterInfo>(std::move(children));
 }
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/AllInitialRouteFactory.h b/mcrouter/routes/AllInitialRouteFactory.h
index 4449c09ae..a96712b6f 100644
--- a/mcrouter/routes/AllInitialRouteFactory.h
+++ b/mcrouter/routes/AllInitialRouteFactory.h
@@ -35,7 +35,7 @@ typename RouterInfo::RouteHandlePtr makeAllInitialRoute(
       std::move(rh));
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 typename RouterInfo::RouteHandlePtr makeAllInitialRoute(
@@ -51,6 +51,6 @@ typename RouterInfo::RouteHandlePtr makeAllInitialRoute(
   }
   return detail::makeAllInitialRoute<RouterInfo>(std::move(children));
 }
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/AllMajorityRouteFactory.h b/mcrouter/routes/AllMajorityRouteFactory.h
index 93c778a90..aeed63eb3 100644
--- a/mcrouter/routes/AllMajorityRouteFactory.h
+++ b/mcrouter/routes/AllMajorityRouteFactory.h
@@ -47,6 +47,6 @@ typename RouterInfo::RouteHandlePtr makeAllMajorityRoute(
   }
   return createAllMajorityRoute<RouterInfo>(std::move(children));
 }
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/AllSyncRouteFactory.h b/mcrouter/routes/AllSyncRouteFactory.h
index ed00b9a7d..fad1f56ed 100644
--- a/mcrouter/routes/AllSyncRouteFactory.h
+++ b/mcrouter/routes/AllSyncRouteFactory.h
@@ -35,7 +35,7 @@ typename RouterInfo::RouteHandlePtr makeAllSyncRoute(
       std::move(rh));
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 typename RouterInfo::RouteHandlePtr makeAllSyncRoute(
@@ -51,6 +51,6 @@ typename RouterInfo::RouteHandlePtr makeAllSyncRoute(
   }
   return detail::makeAllSyncRoute<RouterInfo>(std::move(children));
 }
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/AsynclogRoute.h b/mcrouter/routes/AsynclogRoute.h
index a85d8bdaa..247f76620 100644
--- a/mcrouter/routes/AsynclogRoute.h
+++ b/mcrouter/routes/AsynclogRoute.h
@@ -69,6 +69,6 @@ typename RouterInfo::RouteHandlePtr makeAsynclogRoute(
       std::move(rh), std::move(asynclogName));
 }
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/BigValueRoute.h b/mcrouter/routes/BigValueRoute.h
index 1bdb8d1b1..71c05bad3 100644
--- a/mcrouter/routes/BigValueRoute.h
+++ b/mcrouter/routes/BigValueRoute.h
@@ -21,7 +21,7 @@
 
 namespace folly {
 class IOBuf;
-} // folly
+} // namespace folly
 
 namespace facebook {
 namespace memcache {
@@ -141,8 +141,8 @@ class BigValueRoute {
   createChunkKey(folly::StringPiece key, uint32_t index, uint64_t suffix) const;
 };
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
 
 #include "BigValueRoute-inl.h"
diff --git a/mcrouter/routes/BigValueRouteIf.h b/mcrouter/routes/BigValueRouteIf.h
index 6cc28e216..0994b47b3 100644
--- a/mcrouter/routes/BigValueRouteIf.h
+++ b/mcrouter/routes/BigValueRouteIf.h
@@ -18,6 +18,6 @@ struct BigValueRouteOptions {
   const size_t batchSize;
 };
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/DevNullRoute.h b/mcrouter/routes/DevNullRoute.h
index a0cc7bbe1..ca11cbcff 100644
--- a/mcrouter/routes/DevNullRoute.h
+++ b/mcrouter/routes/DevNullRoute.h
@@ -55,7 +55,7 @@ typename RouterInfo::RouteHandlePtr makeDevNullRoute() {
   return makeRouteHandleWithInfo<RouterInfo, DevNullRoute>();
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 typename RouterInfo::RouteHandlePtr makeDevNullRoute(
@@ -63,6 +63,6 @@ typename RouterInfo::RouteHandlePtr makeDevNullRoute(
     const folly::dynamic&) {
   return detail::makeDevNullRoute<RouterInfo>();
 }
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/ExtraRouteHandleProviderIf.h b/mcrouter/routes/ExtraRouteHandleProviderIf.h
index 3f36c0f00..488c5fff7 100644
--- a/mcrouter/routes/ExtraRouteHandleProviderIf.h
+++ b/mcrouter/routes/ExtraRouteHandleProviderIf.h
@@ -45,6 +45,6 @@ class ExtraRouteHandleProviderIf {
 
   virtual ~ExtraRouteHandleProviderIf() {}
 };
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/FailoverRateLimiter.cpp b/mcrouter/routes/FailoverRateLimiter.cpp
index 9f51b354e..083648f99 100644
--- a/mcrouter/routes/FailoverRateLimiter.cpp
+++ b/mcrouter/routes/FailoverRateLimiter.cpp
@@ -37,10 +37,10 @@ folly::TokenBucket tbFromJson(const folly::dynamic& json) {
   return {rate, burst, /* allow `burst` requests at time 0 */ -1e6};
 }
 
-} // anonymous
+} // namespace
 
 FailoverRateLimiter::FailoverRateLimiter(const folly::dynamic& json)
     : tb_(tbFromJson(json)) {}
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/FailoverRateLimiter.h b/mcrouter/routes/FailoverRateLimiter.h
index ffbb5f990..790bec189 100644
--- a/mcrouter/routes/FailoverRateLimiter.h
+++ b/mcrouter/routes/FailoverRateLimiter.h
@@ -11,7 +11,7 @@
 
 namespace folly {
 struct dynamic;
-} // folly
+} // namespace folly
 
 namespace facebook {
 namespace memcache {
@@ -60,6 +60,6 @@ class FailoverRateLimiter {
   folly::TokenBucket tb_;
   size_t totalReqs_{0};
 };
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/HostIdRouteFactory.h b/mcrouter/routes/HostIdRouteFactory.h
index ffcb62439..f62539f27 100644
--- a/mcrouter/routes/HostIdRouteFactory.h
+++ b/mcrouter/routes/HostIdRouteFactory.h
@@ -35,7 +35,7 @@ typename RouterInfo::RouteHandlePtr makeHostIdRoute(
   return std::move(rh[hostIdHash % rh.size()]);
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 typename RouterInfo::RouteHandlePtr makeHostIdRoute(
@@ -57,6 +57,6 @@ typename RouterInfo::RouteHandlePtr makeHostIdRoute(
 
   return detail::makeHostIdRoute<RouterInfo>(std::move(children), salt);
 }
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/L1L2CacheRouteFactory.h b/mcrouter/routes/L1L2CacheRouteFactory.h
index f59a1aeb8..f62757b22 100644
--- a/mcrouter/routes/L1L2CacheRouteFactory.h
+++ b/mcrouter/routes/L1L2CacheRouteFactory.h
@@ -35,7 +35,7 @@ typename RouterInfo::RouteHandlePtr makeL1L2CacheRoute(
       ncacheUpdatePeriod);
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 typename RouterInfo::RouteHandlePtr makeL1L2CacheRoute(
@@ -75,6 +75,6 @@ typename RouterInfo::RouteHandlePtr makeL1L2CacheRoute(
       ncacheExptime,
       ncacheUpdatePeriod);
 }
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/McExtraRouteHandleProvider-inl.h b/mcrouter/routes/McExtraRouteHandleProvider-inl.h
index ce8a8e36d..d5689301d 100644
--- a/mcrouter/routes/McExtraRouteHandleProvider-inl.h
+++ b/mcrouter/routes/McExtraRouteHandleProvider-inl.h
@@ -53,6 +53,6 @@ McExtraRouteHandleProvider<RouterInfo>::tryCreate(
   return {};
 }
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/McExtraRouteHandleProvider.h b/mcrouter/routes/McExtraRouteHandleProvider.h
index 15e41af05..1b6c4e465 100644
--- a/mcrouter/routes/McExtraRouteHandleProvider.h
+++ b/mcrouter/routes/McExtraRouteHandleProvider.h
@@ -41,8 +41,8 @@ class McExtraRouteHandleProvider
 
   ~McExtraRouteHandleProvider() override {}
 };
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
 
 #include "McExtraRouteHandleProvider-inl.h"
diff --git a/mcrouter/routes/McImportResolver.cpp b/mcrouter/routes/McImportResolver.cpp
index f1a56e36c..3c5c3ae5b 100644
--- a/mcrouter/routes/McImportResolver.cpp
+++ b/mcrouter/routes/McImportResolver.cpp
@@ -24,6 +24,6 @@ std::string McImportResolver::import(folly::StringPiece path) {
   }
   return ret;
 }
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/McImportResolver.h b/mcrouter/routes/McImportResolver.h
index 054ad7600..ed1e94d9d 100644
--- a/mcrouter/routes/McImportResolver.h
+++ b/mcrouter/routes/McImportResolver.h
@@ -35,6 +35,6 @@ class McImportResolver : public ImportResolverIf {
  private:
   ConfigApiIf& configApi_;
 };
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/McRouteHandleBuilder.h b/mcrouter/routes/McRouteHandleBuilder.h
index fa37e116c..d4055af91 100644
--- a/mcrouter/routes/McRouteHandleBuilder.h
+++ b/mcrouter/routes/McRouteHandleBuilder.h
@@ -32,6 +32,6 @@ McrouterRouteHandlePtr makeMcrouterRouteHandleWithInfo(Args&&... args) {
       std::forward<Args>(args)...);
 }
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/MigrateRouteFactory.h b/mcrouter/routes/MigrateRouteFactory.h
index b9bf94864..c9a0e7991 100644
--- a/mcrouter/routes/MigrateRouteFactory.h
+++ b/mcrouter/routes/MigrateRouteFactory.h
@@ -37,7 +37,7 @@ typename RouterInfo::RouteHandlePtr makeMigrateRoute(
       TimeProviderFunc());
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 typename RouterInfo::RouteHandlePtr makeMigrateRoute(
@@ -63,6 +63,6 @@ typename RouterInfo::RouteHandlePtr makeMigrateRoute(
       startTimeSec,
       intervalSec);
 }
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/NullRoute.cpp b/mcrouter/routes/NullRoute.cpp
index 41e9a3cf9..9680c3f8d 100644
--- a/mcrouter/routes/NullRoute.cpp
+++ b/mcrouter/routes/NullRoute.cpp
@@ -23,6 +23,6 @@ McrouterRouteHandlePtr makeNullRoute(
 McrouterRouteHandlePtr makeNullRoute() {
   return createNullRoute<McrouterRouteHandleIf>();
 }
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/OperationSelectorRoute-inl.h b/mcrouter/routes/OperationSelectorRoute-inl.h
index 22b11f87d..e865b1cf1 100644
--- a/mcrouter/routes/OperationSelectorRoute-inl.h
+++ b/mcrouter/routes/OperationSelectorRoute-inl.h
@@ -31,7 +31,7 @@ typename RouterInfo::RouteHandlePtr makeOperationSelectorRoute(
       std::move(operationPolicies), std::move(defaultPolicy));
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 typename RouterInfo::RouteHandlePtr makeOperationSelectorRoute(
@@ -90,6 +90,6 @@ typename RouterInfo::RouteHandlePtr makeOperationSelectorRoute(
   return defaultPolicy;
 }
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/OperationSelectorRoute.h b/mcrouter/routes/OperationSelectorRoute.h
index 46db0d30d..589ca0fab 100644
--- a/mcrouter/routes/OperationSelectorRoute.h
+++ b/mcrouter/routes/OperationSelectorRoute.h
@@ -84,8 +84,8 @@ typename RouterInfo::RouteHandlePtr makeOperationSelectorRoute(
     RouteHandleFactory<typename RouterInfo::RouteHandleIf>& factory,
     const folly::dynamic& json);
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
 
 #include "OperationSelectorRoute-inl.h"
diff --git a/mcrouter/routes/OutstandingLimitRoute.h b/mcrouter/routes/OutstandingLimitRoute.h
index 473ed6754..0ec7d10f8 100644
--- a/mcrouter/routes/OutstandingLimitRoute.h
+++ b/mcrouter/routes/OutstandingLimitRoute.h
@@ -170,6 +170,6 @@ std::shared_ptr<typename RouterInfo::RouteHandleIf> makeOutstandingLimitRoute(
       std::move(normalRoute), maxOutstanding);
 }
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/PoolRouteUtils.h b/mcrouter/routes/PoolRouteUtils.h
index e76fdd0d8..e2aa94329 100644
--- a/mcrouter/routes/PoolRouteUtils.h
+++ b/mcrouter/routes/PoolRouteUtils.h
@@ -103,6 +103,6 @@ std::vector<typename RouterInfo::RouteHandlePtr> wrapPoolDestinations(
   }
 }
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/PrefixSelectorRoute.h b/mcrouter/routes/PrefixSelectorRoute.h
index f4b9edcd9..5034938f0 100644
--- a/mcrouter/routes/PrefixSelectorRoute.h
+++ b/mcrouter/routes/PrefixSelectorRoute.h
@@ -74,6 +74,6 @@ class PrefixSelectorRoute {
     }
   }
 };
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/ProxyRoute-inl.h b/mcrouter/routes/ProxyRoute-inl.h
index 81a985de7..80ea15282 100644
--- a/mcrouter/routes/ProxyRoute-inl.h
+++ b/mcrouter/routes/ProxyRoute-inl.h
@@ -48,7 +48,7 @@ wrapWithBigValueRoute(
   return std::move(ch);
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 ProxyRoute<RouterInfo>::ProxyRoute(
@@ -84,6 +84,6 @@ ProxyRoute<RouterInfo>::getAllDestinations() const {
   return rh;
 }
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/RandomRouteFactory.h b/mcrouter/routes/RandomRouteFactory.h
index 0b8106fec..51f34b447 100644
--- a/mcrouter/routes/RandomRouteFactory.h
+++ b/mcrouter/routes/RandomRouteFactory.h
@@ -35,7 +35,7 @@ typename RouterInfo::RouteHandlePtr makeRandomRoute(
       std::move(rh));
 }
 
-} // detail
+} // namespace detail
 
 template <class RouterInfo>
 typename RouterInfo::RouteHandlePtr makeRandomRoute(
@@ -51,6 +51,6 @@ typename RouterInfo::RouteHandlePtr makeRandomRoute(
   }
   return detail::makeRandomRoute<RouterInfo>(std::move(children));
 }
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/RateLimiter.cpp b/mcrouter/routes/RateLimiter.cpp
index 19b31eed8..19eb10c63 100644
--- a/mcrouter/routes/RateLimiter.cpp
+++ b/mcrouter/routes/RateLimiter.cpp
@@ -42,7 +42,7 @@ asPositiveDoubleDefault(const dynamic& obj, const string& keyName, double def) {
   return def;
 }
 
-} // anonymous
+} // namespace
 
 RateLimiter::RateLimiter(const folly::dynamic& json) {
   checkLogic(json.isObject(), "RateLimiter settings json is not an object");
@@ -84,6 +84,6 @@ std::string RateLimiter::toDebugStr() const {
   }
   return folly::join('|', pieces);
 }
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/RateLimiter.h b/mcrouter/routes/RateLimiter.h
index afc573f78..1d1ab24af 100644
--- a/mcrouter/routes/RateLimiter.h
+++ b/mcrouter/routes/RateLimiter.h
@@ -14,7 +14,7 @@
 
 namespace folly {
 struct dynamic;
-} // folly
+} // namespace folly
 
 namespace facebook {
 namespace memcache {
@@ -83,6 +83,6 @@ class RateLimiter {
   folly::Optional<folly::TokenBucket> setsTb_;
   folly::Optional<folly::TokenBucket> deletesTb_;
 };
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/RouteHandleMap-inl.h b/mcrouter/routes/RouteHandleMap-inl.h
index 4a7a60257..0b0cf42b8 100644
--- a/mcrouter/routes/RouteHandleMap-inl.h
+++ b/mcrouter/routes/RouteHandleMap-inl.h
@@ -63,7 +63,7 @@ std::shared_ptr<RoutePolicyMap<RouteHandleIf>> makePolicyMap(
   return uniqueVectors[v] = std::make_shared<RoutePolicyMap<RouteHandleIf>>(v);
 }
 
-} // detail
+} // namespace detail
 
 template <class RouteHandleIf>
 RouteHandleMap<RouteHandleIf>::RouteHandleMap(
@@ -259,6 +259,6 @@ RouteHandleMap<RouteHandleIf>::getTargetsForKeyFallback(
   }
   return &emptyV_;
 }
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/RouteHandleMap.h b/mcrouter/routes/RouteHandleMap.h
index 2a9f7ce98..563abb1d4 100644
--- a/mcrouter/routes/RouteHandleMap.h
+++ b/mcrouter/routes/RouteHandleMap.h
@@ -74,8 +74,8 @@ class RouteHandleMap {
   getTargetsForKeyFallback(folly::StringPiece prefix, folly::StringPiece key)
       const;
 };
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
 
 #include "RouteHandleMap-inl.h"
diff --git a/mcrouter/routes/RoutePolicyMap.h b/mcrouter/routes/RoutePolicyMap.h
index 5b728bd4f..48dade03f 100644
--- a/mcrouter/routes/RoutePolicyMap.h
+++ b/mcrouter/routes/RoutePolicyMap.h
@@ -68,8 +68,8 @@ class RoutePolicyMap {
    */
   Trie<std::vector<std::shared_ptr<RouteHandleIf>>> ut_;
 };
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
 
 #include "RoutePolicyMap-inl.h"
diff --git a/mcrouter/routes/RouteSelectorMap.h b/mcrouter/routes/RouteSelectorMap.h
index 4676428eb..d9c15de31 100644
--- a/mcrouter/routes/RouteSelectorMap.h
+++ b/mcrouter/routes/RouteSelectorMap.h
@@ -21,6 +21,6 @@ class PrefixSelectorRoute;
 template <class RouteHandleIf>
 using RouteSelectorMap = folly::StringKeyedUnorderedMap<
     std::shared_ptr<PrefixSelectorRoute<RouteHandleIf>>>;
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/ShadowRoute.h b/mcrouter/routes/ShadowRoute.h
index 04f187c2c..d701de883 100644
--- a/mcrouter/routes/ShadowRoute.h
+++ b/mcrouter/routes/ShadowRoute.h
@@ -183,8 +183,8 @@ makeShadowRoutes(
     ProxyBase& proxy,
     ExtraRouteHandleProviderIf<RouterInfo>& extraProvider);
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
 
 #include "ShadowRoute-inl.h"
diff --git a/mcrouter/routes/ShadowRouteIf.h b/mcrouter/routes/ShadowRouteIf.h
index c5856206f..f078a8099 100644
--- a/mcrouter/routes/ShadowRouteIf.h
+++ b/mcrouter/routes/ShadowRouteIf.h
@@ -26,6 +26,6 @@ using ShadowData = std::vector<std::pair<
 
 using McrouterShadowData = ShadowData<McrouterRouterInfo>;
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/ShardHashFunc.cpp b/mcrouter/routes/ShardHashFunc.cpp
index 3f5c6977b..1259933b1 100644
--- a/mcrouter/routes/ShardHashFunc.cpp
+++ b/mcrouter/routes/ShardHashFunc.cpp
@@ -64,6 +64,6 @@ bool ConstShardHashFunc::shardLookup(folly::StringPiece key, size_t* result)
   *result = index;
   return true;
 }
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/ShardHashFunc.h b/mcrouter/routes/ShardHashFunc.h
index b031c909a..666146b81 100644
--- a/mcrouter/routes/ShardHashFunc.h
+++ b/mcrouter/routes/ShardHashFunc.h
@@ -16,7 +16,7 @@
 
 namespace folly {
 struct dynamic;
-} // folly
+} // namespace folly
 
 namespace facebook {
 namespace memcache {
@@ -62,6 +62,6 @@ class ConstShardHashFunc {
 
   bool shardLookup(folly::StringPiece key, size_t* result) const;
 };
-}
-}
-} // facebook::memcache::mcrouter
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook
diff --git a/mcrouter/routes/ShardSplitRoute.cpp b/mcrouter/routes/ShardSplitRoute.cpp
index fe07923e4..88e6a42e9 100644
--- a/mcrouter/routes/ShardSplitRoute.cpp
+++ b/mcrouter/routes/ShardSplitRoute.cpp
@@ -43,8 +43,8 @@ std::string createSplitKey(
   return newKey;
 }
 
-} // detail
+} // namespace detail
 
-} // mcrouter
-} // memcache
-} // facebook
+} // namespace mcrouter
+} // namespace memcache
+} // namespace facebook