diff --git a/include/export/adoc.hpp b/include/export/adoc.hpp
index 3c3eb51..7eaf467 100644
--- a/include/export/adoc.hpp
+++ b/include/export/adoc.hpp
@@ -23,9 +23,7 @@
 #include <string>
 #include <vector>
 
-namespace remwharead
-{
-namespace Export
+namespace remwharead::Export
 {
 using std::string;
 
@@ -68,7 +66,6 @@ private:
     //! Get ISO-8601 time from Database::entry.
     string get_time(const Database::entry &entry) const;
 };
-} // namespace Export
-} // namespace remwharead
+} // namespace remwharead::Export
 
 #endif  // REMWHAREAD_EXPORT_ADOC_HPP
diff --git a/include/export/bookmarks.hpp b/include/export/bookmarks.hpp
index 805b51f..98842d5 100644
--- a/include/export/bookmarks.hpp
+++ b/include/export/bookmarks.hpp
@@ -19,9 +19,7 @@
 
 #include "export.hpp"
 
-namespace remwharead
-{
-namespace Export
+namespace remwharead::Export
 {
     /*!
      *  @brief  Export as Netscape bookmark file.
@@ -37,7 +35,6 @@ namespace Export
 
         void print() const override;
     };
-} // namespace Export
-} // namespace remwharead
+} // namespace remwharead::Export
 
 #endif  // REMWHAREAD_EXPORT_BOOKMARKS_HPP
diff --git a/include/export/csv.hpp b/include/export/csv.hpp
index a0eaccd..8499835 100644
--- a/include/export/csv.hpp
+++ b/include/export/csv.hpp
@@ -20,9 +20,7 @@
 #include "export.hpp"
 #include <string>
 
-namespace remwharead
-{
-namespace Export
+namespace remwharead::Export
 {
     using std::string;
 
@@ -44,7 +42,6 @@ namespace Export
         //! replaces " with "".
         string quote(string field) const;
     };
-} // namespace Export
-} // namespace remwharead
+} // namespace remwharead::Export
 
 #endif  // REMWHAREAD_EXPORT_CSV_HPP
diff --git a/include/export/export.hpp b/include/export/export.hpp
index de13d2f..0ecf9e0 100644
--- a/include/export/export.hpp
+++ b/include/export/export.hpp
@@ -21,9 +21,7 @@
 #include <iostream>
 #include <list>
 
-namespace remwharead
-{
-namespace Export
+namespace remwharead::Export
 {
 using std::list;
 using std::ostream;
@@ -71,7 +69,6 @@ protected:
      */
     list<Database::entry> sort_entries(list<Database::entry> entries) const;
 };
-} // namespace Export
-} // namespace remwharead
+} // namespace remwharead::Export
 
 #endif  // REMWHAREAD_EXPORT_EXPORT_HPP
diff --git a/include/export/json.hpp b/include/export/json.hpp
index 68648dc..d7b26b8 100644
--- a/include/export/json.hpp
+++ b/include/export/json.hpp
@@ -20,9 +20,7 @@
 #include "export.hpp"
 #include <string>
 
-namespace remwharead
-{
-namespace Export
+namespace remwharead::Export
 {
 using std::string;
 
@@ -40,7 +38,6 @@ public:
 
     void print() const override;
 };
-} // namespace Export
-} // namespace remwharead
+} // namespace remwharead::Export
 
 #endif  // REMWHAREAD_EXPORT_JSON_HPP
diff --git a/include/export/rss.hpp b/include/export/rss.hpp
index 9190d62..6d8e42a 100644
--- a/include/export/rss.hpp
+++ b/include/export/rss.hpp
@@ -20,9 +20,7 @@
 #include <string>
 #include "export.hpp"
 
-namespace remwharead
-{
-namespace Export
+namespace remwharead::Export
 {
 using std::string;
 
@@ -40,7 +38,6 @@ public:
 
     void print() const override;
 };
-} // namespace Export
-} // namespace remwharead
+} // namespace remwharead::Export
 
 #endif  // REMWHAREAD_EXPORT_RSS_HPP
diff --git a/include/export/simple.hpp b/include/export/simple.hpp
index e8f1cc3..918b177 100644
--- a/include/export/simple.hpp
+++ b/include/export/simple.hpp
@@ -19,9 +19,7 @@
 
 #include "export.hpp"
 
-namespace remwharead
-{
-namespace Export
+namespace remwharead::Export
 {
 /*!
  *  @brief  Export as simple list.
@@ -36,7 +34,6 @@ public:
     using ExportBase::ExportBase;
     void print() const override;
 };
-} // namespace Export
-} // namespace remwharead
+} // namespace remwharead::Export
 
 #endif  // REMWHAREAD_EXPORT_SIMPLE_HPP
diff --git a/src/lib/export/export.cpp b/src/lib/export/export.cpp
index 1128e98..745a4ef 100644
--- a/src/lib/export/export.cpp
+++ b/src/lib/export/export.cpp
@@ -17,9 +17,7 @@
 #include "export/export.hpp"
 #include <algorithm>
 
-namespace remwharead
-{
-namespace Export
+namespace remwharead::Export
 {
 ExportBase::ExportBase(const list<Database::entry> &entries, ostream &out)
     : _entries(sort_entries(entries))
@@ -37,5 +35,4 @@ ExportBase::sort_entries(list<Database::entry> entries) const
 
     return entries;
 }
-} // namespace Export
-} // namespace remwharead
+} // namespace remwharead::Export