diff --git a/buffet/commands/command_definition.h b/buffet/commands/command_definition.h
index 3328a94..a5e2916 100644
--- a/buffet/commands/command_definition.h
+++ b/buffet/commands/command_definition.h
@@ -19,7 +19,7 @@
 // constraints. See comments for CommandDefinitions::LoadCommands for the
 // detailed description of what command categories are and what they are used
 // for.
-class CommandDefinition {
+class CommandDefinition final {
  public:
   struct Visibility {
     Visibility() = default;
diff --git a/buffet/commands/command_dictionary.h b/buffet/commands/command_dictionary.h
index 7668fba..97ab596 100644
--- a/buffet/commands/command_dictionary.h
+++ b/buffet/commands/command_dictionary.h
@@ -30,7 +30,7 @@
 // the map) is a compound name in a form of "package_name.command_name",
 // where "package_name" is a name of command package such as "base", "printers",
 // and others. So the full command name could be "base.reboot", for example.
-class CommandDictionary {
+class CommandDictionary final {
  public:
   CommandDictionary() = default;
 
diff --git a/buffet/commands/command_queue.h b/buffet/commands/command_queue.h
index 9178c8a..db6707c 100644
--- a/buffet/commands/command_queue.h
+++ b/buffet/commands/command_queue.h
@@ -66,7 +66,7 @@
   // Returns current time.
   base::Time Now() const;
 
-  // Overrided value to be returned from Now().
+  // Overridden value to be returned from Now().
   base::Time test_now_;
 
   // ID-to-CommandInstance map.
diff --git a/buffet/commands/dbus_command_dispatcher.h b/buffet/commands/dbus_command_dispatcher.h
index ab63a6c..e9f5003 100644
--- a/buffet/commands/dbus_command_dispatcher.h
+++ b/buffet/commands/dbus_command_dispatcher.h
@@ -28,7 +28,7 @@
 // update the command handling progress. Once command is handled,
 // DBusCommandProxy::Done() is called and the command is removed from the
 // command queue and D-Bus ExportedObjectManager.
-class DBusCommandDispacher {
+class DBusCommandDispacher final {
  public:
   explicit DBusCommandDispacher(const base::WeakPtr<
       chromeos::dbus_utils::ExportedObjectManager>& object_manager);
diff --git a/buffet/commands/schema_utils.h b/buffet/commands/schema_utils.h
index 625b854..59e3b39 100644
--- a/buffet/commands/schema_utils.h
+++ b/buffet/commands/schema_utils.h
@@ -43,7 +43,7 @@
 // is inherited or overridden, while |is_inherited| can be used to identify
 // if the attribute was inherited (true) or overridden (false).
 template<typename T>
-class InheritableAttribute {
+class InheritableAttribute final {
  public:
   InheritableAttribute() = default;
   explicit InheritableAttribute(T val)