diff --git a/groups/bal/ball/ball_attributecontainer.h b/groups/bal/ball/ball_attributecontainer.h
index 11cebe36e4..56acda439a 100644
--- a/groups/bal/ball/ball_attributecontainer.h
+++ b/groups/bal/ball/ball_attributecontainer.h
@@ -329,9 +329,9 @@ BSLS_IDENT("$Id: $")
 
 
 namespace BloombergLP {
+namespace ball {
 
-
-namespace ball {class Attribute;
+class Attribute;
 
                     // ========================
                     // class AttributeContainer
diff --git a/groups/bal/ball/ball_attributecontainerlist.h b/groups/bal/ball/ball_attributecontainerlist.h
index 14e8c45132..6f58b9a554 100644
--- a/groups/bal/ball/ball_attributecontainerlist.h
+++ b/groups/bal/ball/ball_attributecontainerlist.h
@@ -123,11 +123,10 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
+namespace ball {
 
-
-namespace ball {class Attribute;
-class AttributeContainer;
-
+class  Attribute;
+class  AttributeContainer;
 struct AttributeContainerList_Node;
 
               // ====================================
diff --git a/groups/bal/ball/ball_attributecontext.h b/groups/bal/ball/ball_attributecontext.h
index d6495e5151..d8f1d67a94 100644
--- a/groups/bal/ball/ball_attributecontext.h
+++ b/groups/bal/ball/ball_attributecontext.h
@@ -312,9 +312,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
+namespace ball {
 
-
-namespace ball {class Category;
+class Category;
 class CategoryManager;
 
              // ===============================================
diff --git a/groups/bal/balm/balm_collectorrepository.h b/groups/bal/balm/balm_collectorrepository.h
index c7a0214cda..86fbbe71be 100644
--- a/groups/bal/balm/balm_collectorrepository.h
+++ b/groups/bal/balm/balm_collectorrepository.h
@@ -158,10 +158,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
+namespace balm {
 
-
-namespace balm {class Category;
-
+class Category;
 class CollectorRepository_MetricCollectors;  // defined in implementation
 
                          // =========================
diff --git a/groups/bal/balm/balm_configurationutil.h b/groups/bal/balm/balm_configurationutil.h
index 2941122dfe..63120be62f 100644
--- a/groups/bal/balm/balm_configurationutil.h
+++ b/groups/bal/balm/balm_configurationutil.h
@@ -252,9 +252,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
+namespace balm {
 
-
-namespace balm {class MetricFormat;
+class MetricFormat;
 class MetricFormatSpec;
 class MetricsManager;
 
diff --git a/groups/bal/balst/balst_assertionlogger.h b/groups/bal/balst/balst_assertionlogger.h
index 56f400077a..49bf3ecbd9 100644
--- a/groups/bal/balst/balst_assertionlogger.h
+++ b/groups/bal/balst/balst_assertionlogger.h
@@ -141,8 +141,8 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
-
-namespace balst {                        // ============================
+namespace balst {
+                        // ============================
                         // struct AssertionLogger
                         // ============================
 
diff --git a/groups/bal/balst/balst_stacktraceresolverimpl_dladdr.h b/groups/bal/balst/balst_stacktraceresolverimpl_dladdr.h
index f5b8604afc..c5a6c150aa 100644
--- a/groups/bal/balst/balst_stacktraceresolverimpl_dladdr.h
+++ b/groups/bal/balst/balst_stacktraceresolverimpl_dladdr.h
@@ -83,7 +83,9 @@ namespace BloombergLP {
 #if defined(BALST_OBJECTFILEFORMAT_RESOLVER_DLADDR)
 
 
-namespace balst {template <typename RESOLVER_POLICY>
+namespace balst {
+
+template <typename RESOLVER_POLICY>
 class StackTraceResolverImpl;
 
            // ======================================================
diff --git a/groups/bal/balst/balst_stacktraceresolverimpl_elf.h b/groups/bal/balst/balst_stacktraceresolverimpl_elf.h
index 4a1541b981..652fb9ff34 100644
--- a/groups/bal/balst/balst_stacktraceresolverimpl_elf.h
+++ b/groups/bal/balst/balst_stacktraceresolverimpl_elf.h
@@ -77,7 +77,9 @@ namespace BloombergLP {
 
 #if defined(BALST_OBJECTFILEFORMAT_RESOLVER_ELF)
 
-namespace balst {template <class RESOLVER_POLICY>
+namespace balst {
+
+template <class RESOLVER_POLICY>
 class StackTraceResolverImpl;
 
             // ===================================================
diff --git a/groups/bal/balxml/balxml_decoder.h b/groups/bal/balxml/balxml_decoder.h
index 693b8d780f..cce00a07b4 100644
--- a/groups/bal/balxml/balxml_decoder.h
+++ b/groups/bal/balxml/balxml_decoder.h
@@ -393,9 +393,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
+namespace balxml {
 
-
-namespace balxml {class Reader;
+class Reader;
 class ErrorInfo;
 class Decoder;
 
@@ -779,7 +779,9 @@ class Decoder_ErrorLogger {
 // FORWARD DECLARATIONS
 
 
-namespace balxml {class Decoder_ElementContext;
+namespace balxml {
+
+class Decoder_ElementContext;
 
 template <class TYPE>
 class Decoder_ChoiceContext;
@@ -880,8 +882,9 @@ class Decoder_ListParser {
               // struct balxml::Decoder_InstantiateContext<TYPE>
               // ===============================================
 
+namespace balxml {
 
-namespace balxml {template <class CATEGORY, class TYPE>
+template <class CATEGORY, class TYPE>
 struct Decoder_InstantiateContext;
     // COMPONENT-PRIVATE CLASS.  DO NOT USE OUTSIDE OF THIS COMPONENT.
     //
diff --git a/groups/bal/balxml/balxml_elementattribute.h b/groups/bal/balxml/balxml_elementattribute.h
index e0ae0e0e0d..880dc7eced 100644
--- a/groups/bal/balxml/balxml_elementattribute.h
+++ b/groups/bal/balxml/balxml_elementattribute.h
@@ -234,9 +234,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
-
-
-namespace balxml {class PrefixStack;
+namespace balxml {
+        
+class PrefixStack;
 
                            // ======================
                            // class ElementAttribute
diff --git a/groups/bal/balxml/balxml_encoder.h b/groups/bal/balxml/balxml_encoder.h
index c577a3b186..6f4f4bc4b5 100644
--- a/groups/bal/balxml/balxml_encoder.h
+++ b/groups/bal/balxml/balxml_encoder.h
@@ -217,9 +217,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
+namespace balxml {
 
-
-namespace balxml {class Encoder_Context;
+class Encoder_Context;
 
                                // =============
                                // class Encoder
diff --git a/groups/bal/balxml/balxml_prefixstack.h b/groups/bal/balxml/balxml_prefixstack.h
index 8bf899d877..e922170a0f 100644
--- a/groups/bal/balxml/balxml_prefixstack.h
+++ b/groups/bal/balxml/balxml_prefixstack.h
@@ -106,8 +106,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
+namespace balxml {
 
-namespace balxml {class NamespaceRegistry;
+class NamespaceRegistry;
 
                              // =================
                              // class PrefixStack
diff --git a/groups/bal/balxml/balxml_reader.h b/groups/bal/balxml/balxml_reader.h
index aeb4987759..ad6fe381c3 100644
--- a/groups/bal/balxml/balxml_reader.h
+++ b/groups/bal/balxml/balxml_reader.h
@@ -230,9 +230,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP  {
+namespace balxml {
 
-
-namespace balxml {class ElementAttribute;
+class ElementAttribute;
 class PrefixStack;
 
                                 // ============
diff --git a/groups/bbl/bbldc/bbldc_basicbasicdaycountadapter.h b/groups/bbl/bbldc/bbldc_basicbasicdaycountadapter.h
index c62841bb92..6a8d7fd54d 100644
--- a/groups/bbl/bbldc/bbldc_basicbasicdaycountadapter.h
+++ b/groups/bbl/bbldc/bbldc_basicbasicdaycountadapter.h
@@ -74,7 +74,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
-namespace bdlt {  class Date;  }
+
+namespace bdlt { class Date; }
+
 namespace bbldc {
 
                      // ===============================
diff --git a/groups/bdl/bdlcc/bdlcc_objectcatalog.h b/groups/bdl/bdlcc/bdlcc_objectcatalog.h
index 794a9dad16..ee67c453bd 100644
--- a/groups/bdl/bdlcc/bdlcc_objectcatalog.h
+++ b/groups/bdl/bdlcc/bdlcc_objectcatalog.h
@@ -322,8 +322,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
-namespace bdlcc {template <class TYPE> class ObjectCatalog_AutoCleanup;
+namespace bdlcc {
 
+template <class TYPE> class ObjectCatalog_AutoCleanup;
 template <class TYPE> class ObjectCatalogIter;
 template <class TYPE> class ObjectCatalog;
 
diff --git a/groups/bdl/bdlcc/bdlcc_skiplist.h b/groups/bdl/bdlcc/bdlcc_skiplist.h
index 1cc2d1ecb1..c04e119039 100644
--- a/groups/bdl/bdlcc/bdlcc_skiplist.h
+++ b/groups/bdl/bdlcc/bdlcc_skiplist.h
@@ -395,7 +395,10 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
-namespace bdlcc {template <class KEY, class DATA> class SkipList;
+namespace bdlcc {
+
+template <class KEY, class DATA>
+class SkipList;
 
 template <class KEY, class DATA>
 bool operator==(const SkipList<KEY, DATA>& lhs,
@@ -527,7 +530,9 @@ class SkipList_RandomLevelGenerator {
                     // local class bdlcc::SkipList_PoolUtil
                     // ====================================
 
-namespace bdlcc {class SkipList_PoolManager;
+namespace bdlcc {
+
+class SkipList_PoolManager;
 
 struct SkipList_PoolUtil {
     // This component-private utility handles the lock-free pool of list nodes.
diff --git a/groups/bdl/bdlcc/bdlcc_timequeue.h b/groups/bdl/bdlcc/bdlcc_timequeue.h
index 011c893a65..2f509b08bb 100644
--- a/groups/bdl/bdlcc/bdlcc_timequeue.h
+++ b/groups/bdl/bdlcc/bdlcc_timequeue.h
@@ -661,8 +661,9 @@ BSLS_IDENT("$Id: $")
 #endif
 
 namespace BloombergLP {
-namespace bdlcc {template <class DATA>
+namespace bdlcc {
 
+template <class DATA>
 class TimeQueueItem;
 
                               // ===============
@@ -1796,8 +1797,8 @@ DATA& TimeQueueItem<DATA>::data()
 
 #if 0
 
-namespace bdlcc {// this definition was moved into the class declaration
-
+namespace bdlcc {
+// this definition was moved into the class declaration
 // to work around a Visual Studio .NET 2003 bug.
 template <typename DATA>
 inline
@@ -1837,8 +1838,8 @@ const DATA& TimeQueueItem<DATA>::data() const
 
 #if 0
 
-namespace bdlcc {// this definition was moved into the class declaration
-
+namespace bdlcc {
+// this definition was moved into the class declaration
 // to work around a Visual Studio .NET 2003 bug.
 template <typename DATA>
 inline
diff --git a/groups/bdl/bdlf/bdlf_bind.h b/groups/bdl/bdlf/bdlf_bind.h
index a499431896..95918c6e82 100644
--- a/groups/bdl/bdlf/bdlf_bind.h
+++ b/groups/bdl/bdlf/bdlf_bind.h
@@ -985,7 +985,9 @@ template <class A1, class A2, class A3, class A4, class A5, class A6, class A7,
 
 }  // close package namespace
 
-namespace bdlf {struct Bind_Tuple0;
+namespace bdlf {
+
+    struct Bind_Tuple0;
 template <class A1>
     struct Bind_Tuple1;
 template <class A1, class A2>
diff --git a/groups/bdl/bdlt/bdlt_dayofweekset.h b/groups/bdl/bdlt/bdlt_dayofweekset.h
index 113729a442..cc3ada1dba 100644
--- a/groups/bdl/bdlt/bdlt_dayofweekset.h
+++ b/groups/bdl/bdlt/bdlt_dayofweekset.h
@@ -929,8 +929,7 @@ void bdlt::hashAppend(HASHALG& hashAlg, const DayOfWeekSet& object)
 }
 
 // TRAITS SPECIALIZATIONS
-namespace bslmf
-{
+namespace bslmf {
 template <>
 struct IsBitwiseMoveable<bdlt::DayOfWeekSet> : ::bsl::true_type {};
 }
diff --git a/groups/bsl/bsl+bslhdrs/bsl_c_stddef.h b/groups/bsl/bsl+bslhdrs/bsl_c_stddef.h
index f8af18fb43..4385e0eb61 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_c_stddef.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_c_stddef.h
@@ -40,8 +40,7 @@ BSLS_IDENT("$Id: $")
 extern "C++" {
 
 // On Sun, 'std::size_t' is defined in 'stddef.h'.
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::size_t;
 }
diff --git a/groups/bsl/bsl+bslhdrs/bsl_cctype.h b/groups/bsl/bsl+bslhdrs/bsl_cctype.h
index 452375fdf0..e0e4f0d383 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_cctype.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_cctype.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <cctype>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::isalnum;
     using native_std::isalpha;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_clocale.h b/groups/bsl/bsl+bslhdrs/bsl_clocale.h
index 85f37ee6fe..916b395c32 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_clocale.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_clocale.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <clocale>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::lconv;
     using native_std::localeconv;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_cmath.h b/groups/bsl/bsl+bslhdrs/bsl_cmath.h
index 663ff8916c..6c415db589 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_cmath.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_cmath.h
@@ -36,8 +36,7 @@ BSLS_IDENT("$Id: $")
 #endif
 #endif  // BDE_OMIT_INTERNAL_DEPRECATED
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::abs;
     using native_std::acos;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_complex.h b/groups/bsl/bsl+bslhdrs/bsl_complex.h
index 8b78852044..d44bfc8c6e 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_complex.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_complex.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <complex>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::abs;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_csetjmp.h b/groups/bsl/bsl+bslhdrs/bsl_csetjmp.h
index 3c469c2474..fd69125fa3 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_csetjmp.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_csetjmp.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <csetjmp>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::jmp_buf;
     using native_std::longjmp;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_csignal.h b/groups/bsl/bsl+bslhdrs/bsl_csignal.h
index b37b1a86a6..a772a23484 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_csignal.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_csignal.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <csignal>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::signal;
     using native_std::raise;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_cstdarg.h b/groups/bsl/bsl+bslhdrs/bsl_cstdarg.h
index 84b3b025a1..3d83759ee0 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_cstdarg.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_cstdarg.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <cstdarg>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::va_list;
 }  // close package namespace
diff --git a/groups/bsl/bsl+bslhdrs/bsl_cstddef.h b/groups/bsl/bsl+bslhdrs/bsl_cstddef.h
index 8a447ee2c4..2d625343ea 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_cstddef.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_cstddef.h
@@ -29,8 +29,7 @@ BSLS_IDENT("$Id: $")
 
 #include <cstddef>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::ptrdiff_t;
     using native_std::size_t;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_cstdio.h b/groups/bsl/bsl+bslhdrs/bsl_cstdio.h
index 7a0daa21e3..886fed2b22 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_cstdio.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_cstdio.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <cstdio>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::FILE;
     using native_std::fpos_t;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_cstdlib.h b/groups/bsl/bsl+bslhdrs/bsl_cstdlib.h
index 87193f8afe..6d11e13625 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_cstdlib.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_cstdlib.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <cstdlib>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::abort;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_cstring.h b/groups/bsl/bsl+bslhdrs/bsl_cstring.h
index 5219d5d5d1..2cebe89e3c 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_cstring.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_cstring.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <cstring>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::memchr;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_ctime.h b/groups/bsl/bsl+bslhdrs/bsl_ctime.h
index 3a15fb1840..3b24317fd9 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_ctime.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_ctime.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <ctime>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::asctime;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_cwchar.h b/groups/bsl/bsl+bslhdrs/bsl_cwchar.h
index d311464a85..189f88a2ed 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_cwchar.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_cwchar.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <cwchar>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::btowc;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_cwctype.h b/groups/bsl/bsl+bslhdrs/bsl_cwctype.h
index d4b206fb06..17cc6addeb 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_cwctype.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_cwctype.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <cwctype>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::iswalnum;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_exception.h b/groups/bsl/bsl+bslhdrs/bsl_exception.h
index 8c227583ad..9d433ee8fc 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_exception.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_exception.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <exception>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::bad_exception;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_fstream.h b/groups/bsl/bsl+bslhdrs/bsl_fstream.h
index c04fd8212b..cd0e7a0b3c 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_fstream.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_fstream.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <fstream>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::basic_filebuf;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_functional.h b/groups/bsl/bsl+bslhdrs/bsl_functional.h
index 6fc6eecc5f..44cb56f57d 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_functional.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_functional.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <functional>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::binary_function;
     using native_std::binary_negate;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_iomanip.h b/groups/bsl/bsl+bslhdrs/bsl_iomanip.h
index 588fcadc2d..c3f5f4f5f4 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_iomanip.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_iomanip.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <iomanip>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::resetiosflags;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_ios.h b/groups/bsl/bsl+bslhdrs/bsl_ios.h
index 6646b7ad32..c8ed617309 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_ios.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_ios.h
@@ -33,8 +33,7 @@ BSLS_IDENT("$Id: $")
 
 #include <ios>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::basic_ios;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_iosfwd.h b/groups/bsl/bsl+bslhdrs/bsl_iosfwd.h
index b4c5f584f0..5a4dfb1124 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_iosfwd.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_iosfwd.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <iosfwd>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
 
diff --git a/groups/bsl/bsl+bslhdrs/bsl_iostream.h b/groups/bsl/bsl+bslhdrs/bsl_iostream.h
index f2f74355cc..69df9265a6 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_iostream.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_iostream.h
@@ -41,8 +41,7 @@ BSLS_IDENT("$Id: $")
 
 #include <iostream>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::cerr;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_istream.h b/groups/bsl/bsl+bslhdrs/bsl_istream.h
index 902667337c..33062a95e8 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_istream.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_istream.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <istream>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::basic_iostream;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_limits.h b/groups/bsl/bsl+bslhdrs/bsl_limits.h
index 98084c0c26..faf351c33c 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_limits.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_limits.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <limits>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::denorm_absent;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_locale.h b/groups/bsl/bsl+bslhdrs/bsl_locale.h
index 5c2e3adab8..c67850715f 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_locale.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_locale.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <locale>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::codecvt;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_memory.h b/groups/bsl/bsl+bslhdrs/bsl_memory.h
index af635cde13..49736779ad 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_memory.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_memory.h
@@ -44,8 +44,7 @@ BSLS_IDENT("$Id: $")
 #define BSL_MEMORY_SUPPORT_UNIQUE_PTR
 #endif
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     // These are declared in bslstl_iosfwd.h (so cannot be using declarations):
diff --git a/groups/bsl/bsl+bslhdrs/bsl_new.h b/groups/bsl/bsl+bslhdrs/bsl_new.h
index 07c9a51194..9e5906f48d 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_new.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_new.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <new>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::bad_alloc;
     using native_std::new_handler;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_numeric.h b/groups/bsl/bsl+bslhdrs/bsl_numeric.h
index d462252c6b..6260306b7a 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_numeric.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_numeric.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <numeric>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::accumulate;
     using native_std::adjacent_difference;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_ostream.h b/groups/bsl/bsl+bslhdrs/bsl_ostream.h
index a748e45c06..8b219ece8a 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_ostream.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_ostream.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <ostream>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::basic_ostream;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_stdexcept.h b/groups/bsl/bsl+bslhdrs/bsl_stdexcept.h
index e99ba59100..faa32bb109 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_stdexcept.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_stdexcept.h
@@ -29,8 +29,7 @@ BSLS_IDENT("$Id: $")
 
 #include <stdexcept>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::domain_error;
     using native_std::invalid_argument;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_streambuf.h b/groups/bsl/bsl+bslhdrs/bsl_streambuf.h
index a3b66c4aa8..3eecf0bbf1 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_streambuf.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_streambuf.h
@@ -36,8 +36,7 @@ BSLS_IDENT("$Id: $")
 #endif
 #endif  // BDE_OMIT_INTERNAL_DEPRECATED
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     using native_std::basic_streambuf;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_strstream.h b/groups/bsl/bsl+bslhdrs/bsl_strstream.h
index a4e5f6fbe3..b7af07e174 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_strstream.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_strstream.h
@@ -29,8 +29,7 @@ BSLS_IDENT("$Id: $")
 
 #include <strstream>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::istrstream;
     using native_std::ostrstream;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_type_traits.h b/groups/bsl/bsl+bslhdrs/bsl_type_traits.h
index f412983306..b7cc5efd3f 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_type_traits.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_type_traits.h
@@ -103,8 +103,7 @@ BSLS_IDENT("$Id: $")
 #  endif
 #endif
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
 
     // 20.10.4.1, primary type categories:
diff --git a/groups/bsl/bsl+bslhdrs/bsl_typeinfo.h b/groups/bsl/bsl+bslhdrs/bsl_typeinfo.h
index 7b03a13a4d..3b89cfc9c1 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_typeinfo.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_typeinfo.h
@@ -34,8 +34,7 @@ BSLS_IDENT("$Id: $")
 #include <exception>
 #endif
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::bad_cast;
     using native_std::bad_typeid;
diff --git a/groups/bsl/bsl+bslhdrs/bsl_utility.h b/groups/bsl/bsl+bslhdrs/bsl_utility.h
index 9774956787..33aae0bd8b 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_utility.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_utility.h
@@ -29,8 +29,7 @@ BSLS_IDENT("$Id: $")
 
 #include <utility>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace.  Note that 'pair' is
     // provided by 'bslstl_pair.h' (but 'make_pair' currently is not):
 
diff --git a/groups/bsl/bsl+bslhdrs/bsl_valarray.h b/groups/bsl/bsl+bslhdrs/bsl_valarray.h
index 9119e67413..e2908f6271 100644
--- a/groups/bsl/bsl+bslhdrs/bsl_valarray.h
+++ b/groups/bsl/bsl+bslhdrs/bsl_valarray.h
@@ -25,8 +25,7 @@ BSLS_IDENT("$Id: $")
 
 #include <valarray>
 
-namespace bsl
-{
+namespace bsl {
     // Import selected symbols into bsl namespace
     using native_std::abs;
     using native_std::acos;
diff --git a/groups/bsl/bsl+stdhdrs/stddef.h b/groups/bsl/bsl+stdhdrs/stddef.h
index 965969eb8e..b7b4a2d208 100644
--- a/groups/bsl/bsl+stdhdrs/stddef.h
+++ b/groups/bsl/bsl+stdhdrs/stddef.h
@@ -76,8 +76,7 @@ BSLS_IDENT("$Id: $")
 // 'extern "C++"' block.
 extern "C++" {
 
-    namespace bsl
-    {
+    namespace bsl {
         // Import selected symbols into bsl namespace
         using native_std::size_t;
     }
diff --git a/groups/bsl/bslstl/bslstl_badweakptr.h b/groups/bsl/bslstl/bslstl_badweakptr.h
index c4c9b0e084..515f14bc93 100644
--- a/groups/bsl/bslstl/bslstl_badweakptr.h
+++ b/groups/bsl/bslstl/bslstl_badweakptr.h
@@ -56,7 +56,7 @@ BSL_OVERRIDES_STD mode"
 #endif
 
 namespace BloombergLP {
-namespace bslstl {  class BadWeakPtr; }  // close namespace bslalg
+namespace bslstl { class BadWeakPtr; }
 }  // close enterprise namespace
 
 namespace bsl {
diff --git a/groups/bsl/bsltf/bsltf_allocemplacabletesttype.h b/groups/bsl/bsltf/bsltf_allocemplacabletesttype.h
index 176ac62dfa..d7ad65fd9a 100644
--- a/groups/bsl/bsltf/bsltf_allocemplacabletesttype.h
+++ b/groups/bsl/bsltf/bsltf_allocemplacabletesttype.h
@@ -54,12 +54,11 @@ BSLS_IDENT("$Id: $")
 #include <bslma_usesbslmaallocator.h>
 #endif
 
-namespace BloombergLP
-{
+namespace BloombergLP {
+
 namespace bslma { class Allocator; }
 
-namespace bsltf
-{
+namespace bsltf {
 
                          // =============================
                          // class AllocEmplacableTestType
diff --git a/groups/bsl/bsltf/bsltf_movablealloctesttype.h b/groups/bsl/bsltf/bsltf_movablealloctesttype.h
index 3e355cb310..63f00cb99a 100644
--- a/groups/bsl/bsltf/bsltf_movablealloctesttype.h
+++ b/groups/bsl/bsltf/bsltf_movablealloctesttype.h
@@ -95,13 +95,11 @@ BSLS_IDENT("$Id: $")
 #include <bslmf_movableref.h>
 #endif
 
-namespace BloombergLP
-{
+namespace BloombergLP {
 
 namespace bslma { class Allocator; }
 
-namespace bsltf
-{
+namespace bsltf {
 
                         // ==========================
                         // class MovableAllocTestType
diff --git a/groups/bsl/bsltf/bsltf_movabletesttype.h b/groups/bsl/bsltf/bsltf_movabletesttype.h
index 9165f6c689..e50f0ec3b0 100644
--- a/groups/bsl/bsltf/bsltf_movabletesttype.h
+++ b/groups/bsl/bsltf/bsltf_movabletesttype.h
@@ -93,11 +93,8 @@ BSLS_IDENT("$Id: $")
 #include <bsls_cpp11.h>
 #endif
 
-namespace BloombergLP
-{
-
-namespace bsltf
-{
+namespace BloombergLP {
+namespace bsltf {
 
                         // =====================
                         // class MovableTestType
diff --git a/groups/bsl/bsltf/bsltf_moveonlyalloctesttype.h b/groups/bsl/bsltf/bsltf_moveonlyalloctesttype.h
index bba71ac20e..cf16d59993 100644
--- a/groups/bsl/bsltf/bsltf_moveonlyalloctesttype.h
+++ b/groups/bsl/bsltf/bsltf_moveonlyalloctesttype.h
@@ -95,13 +95,11 @@ BSLS_IDENT("$Id: $")
 #include <bslmf_movableref.h>
 #endif
 
-namespace BloombergLP
-{
+namespace BloombergLP {
 
 namespace bslma { class Allocator; }
 
-namespace bsltf
-{
+namespace bsltf {
 
                         // ===========================
                         // class MoveOnlyAllocTestType
diff --git a/groups/bsl/bsltf/bsltf_stdalloctesttype.h b/groups/bsl/bsltf/bsltf_stdalloctesttype.h
index 746602ea48..57bc9a5361 100644
--- a/groups/bsl/bsltf/bsltf_stdalloctesttype.h
+++ b/groups/bsl/bsltf/bsltf_stdalloctesttype.h
@@ -86,11 +86,8 @@ BSLS_IDENT("$Id: $")
 #include <bslma_allocatortraits.h>
 #endif
 
-namespace BloombergLP
-{
-
-namespace bsltf
-{
+namespace BloombergLP {
+namespace bsltf {
 
                         // ======================
                         // class StdAllocTestType
diff --git a/groups/bsl/bsltf/bsltf_testvaluesarray.h b/groups/bsl/bsltf/bsltf_testvaluesarray.h
index 70756de0c9..1ec4d4c737 100644
--- a/groups/bsl/bsltf/bsltf_testvaluesarray.h
+++ b/groups/bsl/bsltf/bsltf_testvaluesarray.h
@@ -580,8 +580,7 @@ bool bsltf::operator!=(const bsltf::TestValuesArrayIterator<VALUE>& lhs,
     return !(lhs == rhs);
 }
 
-namespace bsltf
-{
+namespace bsltf {
                        // ---------------------
                        // class TestValuesArray
                        // ---------------------
diff --git a/groups/btl/btlsos/btlsos_tcpcbacceptor.h b/groups/btl/btlsos/btlsos_tcpcbacceptor.h
index 3b6a2c70d2..c10ada09e0 100644
--- a/groups/btl/btlsos/btlsos_tcpcbacceptor.h
+++ b/groups/btl/btlsos/btlsos_tcpcbacceptor.h
@@ -457,7 +457,9 @@ namespace BloombergLP {
 namespace btlso { template<class ADDRESS> class StreamSocketFactory; }
 namespace btlso { template<class ADDRESS> class StreamSocket; }
 namespace btlso { class TimerEventManager; }
-namespace btlsos {class TcpCbAcceptor_Reg; // component-local class declaration
+namespace btlsos {
+
+class TcpCbAcceptor_Reg; // component-local class declaration
 
                            // ===================
                            // class TcpCbAcceptor
diff --git a/groups/btl/btlsos/btlsos_tcpcbchannel.h b/groups/btl/btlsos/btlsos_tcpcbchannel.h
index 90205f101b..ab8ab73ff7 100644
--- a/groups/btl/btlsos/btlsos_tcpcbchannel.h
+++ b/groups/btl/btlsos/btlsos_tcpcbchannel.h
@@ -100,10 +100,9 @@ namespace BloombergLP {
 namespace btlso { class IPv4Address; }
 namespace btlso { template<class ADDRESS> class StreamSocket; }
 namespace btlso { class TimerEventManager; }
-namespace btlsos {class TcpCbChannel_RReg;  // Component local class
-
-                                            // declaration
+namespace btlsos {
 
+class TcpCbChannel_RReg;  // Component local class declaration
 class TcpCbChannel_WReg;  // Component local class declaration
 
                             // ==================
diff --git a/groups/btl/btlsos/btlsos_tcptimedcbchannel.h b/groups/btl/btlsos/btlsos_tcptimedcbchannel.h
index 761fa0ef1b..14254bff0c 100644
--- a/groups/btl/btlsos/btlsos_tcptimedcbchannel.h
+++ b/groups/btl/btlsos/btlsos_tcptimedcbchannel.h
@@ -102,10 +102,9 @@ namespace BloombergLP {
 namespace btlso { class IPv4Address; }
 namespace btlso { template<class ADDRESS> class StreamSocket; }
 namespace btlso { class TimerEventManager; }
-namespace btlsos {class TcpTimedCbChannel_RReg;  // Component local class
-
-                                                 // declaration
+namespace btlsos {
 
+class TcpTimedCbChannel_RReg;  // Component local class declaration
 class TcpTimedCbChannel_WReg;  // Component local class declaration
 
                          // =======================
diff --git a/samples/customer/pkg_customer.h b/samples/customer/pkg_customer.h
index 877466f440..230b79564d 100644
--- a/samples/customer/pkg_customer.h
+++ b/samples/customer/pkg_customer.h
@@ -97,7 +97,9 @@
 #include <bsl_vector.h>
 #endif
 
-namespace BloombergLP { namespace bslma { class Allocator; } }
+namespace BloombergLP {
+namespace bslma { class Allocator; }
+}
 
 namespace Enterprise {
 namespace pkg {