diff --git a/src/generators/html.cpp b/src/generators/html.cpp
index 327fc0e..cf38664 100644
--- a/src/generators/html.cpp
+++ b/src/generators/html.cpp
@@ -30,9 +30,7 @@
 #include <string_view>
 #include <vector>
 
-using namespace FediBlock;
-
-namespace FediBlock
+namespace FediBlock::html
 {
 
 using std::cerr;
@@ -163,7 +161,10 @@ void copy_screenshots(const fs::path &directory)
     }
 }
 
-} // namespace FediBlock
+} // namespace FediBlock::html
+
+using namespace FediBlock;
+using namespace FediBlock::html;
 
 int main(int argc, char *argv[])
 {
diff --git a/src/generators/html.hpp b/src/generators/html.hpp
index 9074373..8c17e17 100644
--- a/src/generators/html.hpp
+++ b/src/generators/html.hpp
@@ -23,7 +23,7 @@
 #include <ostream>
 #include <vector>
 
-namespace FediBlock
+namespace FediBlock::html
 {
 
 using std::ostream;
@@ -35,6 +35,6 @@ void write_html(ostream &out, const vector<entry_type> &entries);
 // Copy screenshots from repo to directory.
 void copy_screenshots(const fs::path &directory);
 
-} // namespace FediBlock
+} // namespace FediBlock::html
 
 #endif // FEDIBLOCK_BACKEND_HTML_HPP
diff --git a/src/generators/rss.cpp b/src/generators/rss.cpp
index 3e20a7e..14d2576 100644
--- a/src/generators/rss.cpp
+++ b/src/generators/rss.cpp
@@ -195,7 +195,6 @@ using std::cerr;
 using std::cout;
 using std::exception;
 using std::runtime_error;
-using std::string_view;
 using std::vector;
 
 using namespace FediBlock;