diff --git a/src/rpc/tinyxml2/tinyxml2.cpp b/src/rpc/tinyxml2/tinyxml2.cpp
index 568919ab..48a4f342 100644
--- a/src/rpc/tinyxml2/tinyxml2.cpp
+++ b/src/rpc/tinyxml2/tinyxml2.cpp
@@ -133,9 +133,7 @@ static const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
 static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
 static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
 
-namespace rpc // rtorrent-specific namespace
-{
-namespace tinyxml2
+namespace rpc::tinyxml2 // rpc is a rtorrent-specific namespace
 {
 
 struct Entity {
@@ -3029,6 +3027,5 @@ bool XMLPrinter::Visit( const XMLUnknown& unknown )
     return true;
 }
 
-}   // namespace tinyxml2
-}   // namespace rpc
+}   // namespace rpc::tinyxml2
 #endif
diff --git a/src/rpc/tinyxml2/tinyxml2.h b/src/rpc/tinyxml2/tinyxml2.h
index 6e433c42..492bd4ec 100644
--- a/src/rpc/tinyxml2/tinyxml2.h
+++ b/src/rpc/tinyxml2/tinyxml2.h
@@ -113,9 +113,7 @@ static const int TIXML2_PATCH_VERSION = 0;
 // so there needs to be a limit in place.
 static const int TINYXML2_MAX_ELEMENT_DEPTH = 500;
 
-namespace rpc // rtorrent-specific namespace
-{
-namespace tinyxml2
+namespace rpc::tinyxml2 // rpc is a rtorrent-specific namespace
 {
 class XMLDocument;
 class XMLElement;
@@ -2378,8 +2376,7 @@ private:
 };
 
 
-} // namespace tinyxml2
-} // namespace rpc
+} // namespace rpc::tinyxml2
 
 #if defined(_MSC_VER)
 #   pragma warning(pop)