diff --git a/common/engine/keyboardprocessor/src/context.hpp b/common/engine/keyboardprocessor/src/context.hpp
index 1c1401a587..80ff0aa6e3 100644
--- a/common/engine/keyboardprocessor/src/context.hpp
+++ b/common/engine/keyboardprocessor/src/context.hpp
@@ -23,8 +23,8 @@ namespace kbp
 // efficient data structure such as a ring buffer or bounded queue.
 using context = std::list<km_kbp_context_item>;
 
-}
-}
+} // namespace kbp
+} // namespace km
 
 json & operator << (json &, km::kbp::context const &);
 json & operator << (json &, km_kbp_context_item const &);
diff --git a/common/engine/keyboardprocessor/src/keyboard.hpp b/common/engine/keyboardprocessor/src/keyboard.hpp
index 5567849ffc..9de5052449 100644
--- a/common/engine/keyboardprocessor/src/keyboard.hpp
+++ b/common/engine/keyboardprocessor/src/keyboard.hpp
@@ -40,7 +40,8 @@ namespace kbp
   };
 
   json & operator << (json &, km::kbp::keyboard const &);
-}
-}
+
+} // namespace kbp
+} // namespace km
 
 struct km_kbp_keyboard : public km::kbp::keyboard {};
diff --git a/common/engine/keyboardprocessor/src/state.hpp b/common/engine/keyboardprocessor/src/state.hpp
index 2bc583461b..7c9402125e 100644
--- a/common/engine/keyboardprocessor/src/state.hpp
+++ b/common/engine/keyboardprocessor/src/state.hpp
@@ -47,8 +47,8 @@ state::state(kbp::keyboard const & kb, km_kbp_option_item const * env)
 : _options(kb.default_options, env), _kb(kb)
 {}
 
-}
-}
+} // namespace kbp
+} // namespace km
 
 struct km_kbp_state : public km::kbp::state
 {