diff --git a/include/spdlog/common.h b/include/spdlog/common.h
index dc5f3795..69f2f6ad 100644
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -143,9 +143,11 @@ enum class pattern_time_type
 //
 // Log exception
 //
-namespace details { namespace os {
+namespace details {
+namespace os {
 std::string errno_str(int err_num);
-}} // namespace details::os
+}
+} // namespace details
 class spdlog_ex : public std::exception
 {
 public:
diff --git a/include/spdlog/details/async_log_helper.h b/include/spdlog/details/async_log_helper.h
index 78058975..569e8e48 100644
--- a/include/spdlog/details/async_log_helper.h
+++ b/include/spdlog/details/async_log_helper.h
@@ -28,7 +28,8 @@
 #include <utility>
 #include <vector>
 
-namespace spdlog { namespace details {
+namespace spdlog {
+namespace details {
 
 class async_log_helper
 {
@@ -184,7 +185,8 @@ private:
     // wait until the queue is empty
     void wait_empty_q();
 };
-}} // namespace spdlog::details
+} // namespace details
+} // namespace spdlog
 
 ///////////////////////////////////////////////////////////////////////////////
 // async_sink class implementation
diff --git a/include/spdlog/details/file_helper.h b/include/spdlog/details/file_helper.h
index 0d24a91b..dc0fa141 100644
--- a/include/spdlog/details/file_helper.h
+++ b/include/spdlog/details/file_helper.h
@@ -19,7 +19,8 @@
 #include <thread>
 #include <tuple>
 
-namespace spdlog { namespace details {
+namespace spdlog {
+namespace details {
 
 class file_helper
 {
@@ -136,4 +137,5 @@ private:
     FILE *_fd{nullptr};
     filename_t _filename;
 };
-}} // namespace spdlog::details
+} // namespace details
+} // namespace spdlog
diff --git a/include/spdlog/details/log_msg.h b/include/spdlog/details/log_msg.h
index a1e8b2ee..9a03318d 100644
--- a/include/spdlog/details/log_msg.h
+++ b/include/spdlog/details/log_msg.h
@@ -11,7 +11,8 @@
 #include <string>
 #include <utility>
 
-namespace spdlog { namespace details {
+namespace spdlog {
+namespace details {
 struct log_msg
 {
     log_msg() = default;
@@ -40,4 +41,5 @@ struct log_msg
     fmt::MemoryWriter formatted;
     size_t msg_id{0};
 };
-}} // namespace spdlog::details
+} // namespace details
+} // namespace spdlog
diff --git a/include/spdlog/details/mpmc_bounded_q.h b/include/spdlog/details/mpmc_bounded_q.h
index 29ec316b..13c7f605 100644
--- a/include/spdlog/details/mpmc_bounded_q.h
+++ b/include/spdlog/details/mpmc_bounded_q.h
@@ -48,7 +48,8 @@ Distributed under the MIT License (http://opensource.org/licenses/MIT)
 #include <atomic>
 #include <utility>
 
-namespace spdlog { namespace details {
+namespace spdlog {
+namespace details {
 
 template<typename T>
 class mpmc_bounded_queue
@@ -166,4 +167,5 @@ private:
     cacheline_pad_t pad3_;
 };
 
-}} // namespace spdlog::details
+} // namespace details
+} // namespace spdlog
diff --git a/include/spdlog/details/null_mutex.h b/include/spdlog/details/null_mutex.h
index 5f4ce46a..3f495bd9 100644
--- a/include/spdlog/details/null_mutex.h
+++ b/include/spdlog/details/null_mutex.h
@@ -8,7 +8,8 @@
 #include <atomic>
 // null, no cost dummy "mutex" and dummy "atomic" int
 
-namespace spdlog { namespace details {
+namespace spdlog {
+namespace details {
 struct null_mutex
 {
     void lock() {}
@@ -40,4 +41,5 @@ struct null_atomic_int
     }
 };
 
-}} // namespace spdlog::details
+} // namespace details
+} // namespace spdlog
diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h
index 271348da..c51eb6ce 100644
--- a/include/spdlog/details/os.h
+++ b/include/spdlog/details/os.h
@@ -53,7 +53,9 @@
 #define __has_feature(x) 0 // Compatibility with non-clang compilers.
 #endif
 
-namespace spdlog { namespace details { namespace os {
+namespace spdlog {
+namespace details {
+namespace os {
 
 inline spdlog::log_clock::time_point now()
 {
@@ -445,4 +447,6 @@ inline bool in_terminal(FILE *file)
     return isatty(fileno(file)) != 0;
 #endif
 }
-}}} // namespace spdlog::details::os
+} // namespace os
+} // namespace details
+} // namespace spdlog
diff --git a/include/spdlog/details/pattern_formatter_impl.h b/include/spdlog/details/pattern_formatter_impl.h
index 670538d5..c12c3d68 100644
--- a/include/spdlog/details/pattern_formatter_impl.h
+++ b/include/spdlog/details/pattern_formatter_impl.h
@@ -20,7 +20,8 @@
 #include <utility>
 #include <vector>
 
-namespace spdlog { namespace details {
+namespace spdlog {
+namespace details {
 class flag_formatter
 {
 public:
@@ -466,7 +467,8 @@ class full_formatter SPDLOG_FINAL : public flag_formatter
     }
 };
 
-}} // namespace spdlog::details
+} // namespace details
+} // namespace spdlog
 ///////////////////////////////////////////////////////////////////////////////
 // pattern_formatter inline impl
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/include/spdlog/details/registry.h b/include/spdlog/details/registry.h
index ac0a58a5..46397302 100644
--- a/include/spdlog/details/registry.h
+++ b/include/spdlog/details/registry.h
@@ -22,7 +22,8 @@
 #include <string>
 #include <unordered_map>
 
-namespace spdlog { namespace details {
+namespace spdlog {
+namespace details {
 template<class Mutex>
 class registry_t
 {
@@ -232,4 +233,5 @@ using registry = registry_t<spdlog::details::null_mutex>;
 using registry = registry_t<std::mutex>;
 #endif
 
-}} // namespace spdlog::details
+} // namespace details
+} // namespace spdlog
diff --git a/include/spdlog/fmt/bundled/format.h b/include/spdlog/fmt/bundled/format.h
index 9b2fe3b4..b4295cd7 100644
--- a/include/spdlog/fmt/bundled/format.h
+++ b/include/spdlog/fmt/bundled/format.h
@@ -345,7 +345,8 @@ typedef __int64 intmax_t;
 #if FMT_MSC_VER && !defined(FMT_BUILTIN_CLZLL) && !defined(_MANAGED)
 #include <intrin.h> // _BitScanReverse, _BitScanReverse64
 
-namespace fmt { namespace internal {
+namespace fmt {
+namespace internal {
 // avoid Clang with Microsoft CodeGen's -Wunknown-pragmas warning
 #ifndef __clang__
 #pragma intrinsic(_BitScanReverse)
@@ -391,10 +392,12 @@ inline uint32_t clzll(uint64_t x)
     return 63 - r;
 }
 #define FMT_BUILTIN_CLZLL(n) fmt::internal::clzll(n)
-}} // namespace fmt::internal
+} // namespace internal
+} // namespace fmt
 #endif
 
-namespace fmt { namespace internal {
+namespace fmt {
+namespace internal {
 struct DummyInt
 {
     int data[2];
@@ -439,7 +442,8 @@ inline T const_check(T value)
 {
     return value;
 }
-}} // namespace fmt::internal
+} // namespace internal
+} // namespace fmt
 
 namespace std {
 // Standard permits specialization of std::numeric_limits. This specialization
diff --git a/include/spdlog/sinks/android_sink.h b/include/spdlog/sinks/android_sink.h
index 1284441e..dd811633 100644
--- a/include/spdlog/sinks/android_sink.h
+++ b/include/spdlog/sinks/android_sink.h
@@ -20,7 +20,8 @@
 #define SPDLOG_ANDROID_RETRIES 2
 #endif
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 
 /*
  * Android sink (logging using __android_log_write)
@@ -84,6 +85,7 @@ private:
     bool _use_raw_msg;
 };
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
 
 #endif
diff --git a/include/spdlog/sinks/ansicolor_sink.h b/include/spdlog/sinks/ansicolor_sink.h
index 2a5203c3..9e7f1a59 100644
--- a/include/spdlog/sinks/ansicolor_sink.h
+++ b/include/spdlog/sinks/ansicolor_sink.h
@@ -12,7 +12,8 @@
 #include <string>
 #include <unordered_map>
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 
 /**
  * This sink prefixes the output with an ANSI escape sequence color code depending on the severity
@@ -133,4 +134,5 @@ public:
 using ansicolor_stderr_sink_mt = ansicolor_stderr_sink<std::mutex>;
 using ansicolor_stderr_sink_st = ansicolor_stderr_sink<details::null_mutex>;
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
diff --git a/include/spdlog/sinks/base_sink.h b/include/spdlog/sinks/base_sink.h
index 16035ec9..96cd001e 100644
--- a/include/spdlog/sinks/base_sink.h
+++ b/include/spdlog/sinks/base_sink.h
@@ -17,7 +17,8 @@
 
 #include <mutex>
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 template<class Mutex>
 class base_sink : public sink
 {
@@ -44,4 +45,5 @@ protected:
     virtual void _flush() = 0;
     Mutex _mutex;
 };
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
diff --git a/include/spdlog/sinks/dist_sink.h b/include/spdlog/sinks/dist_sink.h
index 3191783a..1265cc7e 100644
--- a/include/spdlog/sinks/dist_sink.h
+++ b/include/spdlog/sinks/dist_sink.h
@@ -17,7 +17,8 @@
 
 // Distribution sink (mux). Stores a vector of sinks which get called when log is called
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 template<class Mutex>
 class dist_sink : public base_sink<Mutex>
 {
@@ -66,4 +67,5 @@ public:
 using dist_sink_mt = dist_sink<std::mutex>;
 using dist_sink_st = dist_sink<details::null_mutex>;
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
diff --git a/include/spdlog/sinks/file_sinks.h b/include/spdlog/sinks/file_sinks.h
index 6f8517e8..7d755587 100644
--- a/include/spdlog/sinks/file_sinks.h
+++ b/include/spdlog/sinks/file_sinks.h
@@ -18,7 +18,8 @@
 #include <mutex>
 #include <string>
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 /*
  * Trivial file sink with single file as target
  */
@@ -246,4 +247,5 @@ private:
 using daily_file_sink_mt = daily_file_sink<std::mutex>;
 using daily_file_sink_st = daily_file_sink<details::null_mutex>;
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
diff --git a/include/spdlog/sinks/msvc_sink.h b/include/spdlog/sinks/msvc_sink.h
index fa83a18c..09a5d671 100644
--- a/include/spdlog/sinks/msvc_sink.h
+++ b/include/spdlog/sinks/msvc_sink.h
@@ -15,7 +15,8 @@
 #include <mutex>
 #include <string>
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 /*
  * MSVC sink (logging using OutputDebugStringA)
  */
@@ -37,6 +38,7 @@ protected:
 using msvc_sink_mt = msvc_sink<std::mutex>;
 using msvc_sink_st = msvc_sink<details::null_mutex>;
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
 
 #endif
diff --git a/include/spdlog/sinks/null_sink.h b/include/spdlog/sinks/null_sink.h
index c0ae4167..c254bc59 100644
--- a/include/spdlog/sinks/null_sink.h
+++ b/include/spdlog/sinks/null_sink.h
@@ -10,7 +10,8 @@
 
 #include <mutex>
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 
 template<class Mutex>
 class null_sink : public base_sink<Mutex>
@@ -24,4 +25,5 @@ protected:
 using null_sink_mt = null_sink<details::null_mutex>;
 using null_sink_st = null_sink<details::null_mutex>;
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
diff --git a/include/spdlog/sinks/ostream_sink.h b/include/spdlog/sinks/ostream_sink.h
index 7d91a1ee..97281384 100644
--- a/include/spdlog/sinks/ostream_sink.h
+++ b/include/spdlog/sinks/ostream_sink.h
@@ -11,7 +11,8 @@
 #include <mutex>
 #include <ostream>
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 template<class Mutex>
 class ostream_sink : public base_sink<Mutex>
 {
@@ -44,4 +45,5 @@ protected:
 using ostream_sink_mt = ostream_sink<std::mutex>;
 using ostream_sink_st = ostream_sink<details::null_mutex>;
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
diff --git a/include/spdlog/sinks/sink.h b/include/spdlog/sinks/sink.h
index f3c146d9..b4e38068 100644
--- a/include/spdlog/sinks/sink.h
+++ b/include/spdlog/sinks/sink.h
@@ -7,7 +7,8 @@
 
 #include "../details/log_msg.h"
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 class sink
 {
 public:
@@ -39,4 +40,5 @@ inline level::level_enum sink::level() const
     return static_cast<spdlog::level::level_enum>(_level.load(std::memory_order_relaxed));
 }
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
diff --git a/include/spdlog/sinks/stdout_sinks.h b/include/spdlog/sinks/stdout_sinks.h
index 35324370..b15d0803 100644
--- a/include/spdlog/sinks/stdout_sinks.h
+++ b/include/spdlog/sinks/stdout_sinks.h
@@ -12,7 +12,8 @@
 #include <memory>
 #include <mutex>
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 
 template<class Mutex>
 class stdout_sink SPDLOG_FINAL : public base_sink<Mutex>
@@ -74,4 +75,5 @@ protected:
 using stderr_sink_mt = stderr_sink<std::mutex>;
 using stderr_sink_st = stderr_sink<details::null_mutex>;
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
diff --git a/include/spdlog/sinks/syslog_sink.h b/include/spdlog/sinks/syslog_sink.h
index e4472f2f..17bbb1df 100644
--- a/include/spdlog/sinks/syslog_sink.h
+++ b/include/spdlog/sinks/syslog_sink.h
@@ -16,7 +16,8 @@
 #include <string>
 #include <syslog.h>
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 /**
  * Sink that write to syslog using the `syscall()` library call.
  *
@@ -69,6 +70,7 @@ private:
         return _priorities[static_cast<size_t>(msg.level)];
     }
 };
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
 
 #endif
diff --git a/include/spdlog/sinks/wincolor_sink.h b/include/spdlog/sinks/wincolor_sink.h
index bc036d44..60f4286f 100644
--- a/include/spdlog/sinks/wincolor_sink.h
+++ b/include/spdlog/sinks/wincolor_sink.h
@@ -14,7 +14,8 @@
 #include <unordered_map>
 #include <wincon.h>
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 /*
  * Windows color console sink. Uses WriteConsoleA to write to the console with colors
  */
@@ -119,4 +120,5 @@ public:
 using wincolor_stderr_sink_mt = wincolor_stderr_sink<std::mutex>;
 using wincolor_stderr_sink_st = wincolor_stderr_sink<details::null_mutex>;
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
diff --git a/include/spdlog/sinks/windebug_sink.h b/include/spdlog/sinks/windebug_sink.h
index 353a7bde..2c7f1bc2 100644
--- a/include/spdlog/sinks/windebug_sink.h
+++ b/include/spdlog/sinks/windebug_sink.h
@@ -9,7 +9,8 @@
 
 #include "msvc_sink.h"
 
-namespace spdlog { namespace sinks {
+namespace spdlog {
+namespace sinks {
 
 /*
  * Windows debug sink (logging using OutputDebugStringA, synonym for msvc_sink)
@@ -20,6 +21,7 @@ using windebug_sink = msvc_sink<Mutex>;
 using windebug_sink_mt = msvc_sink_mt;
 using windebug_sink_st = msvc_sink_st;
 
-}} // namespace spdlog::sinks
+} // namespace sinks
+} // namespace spdlog
 
 #endif