diff --git a/src/app/core/common.h b/src/app/core/common.h
index b393e5ca..ec1dc08f 100644
--- a/src/app/core/common.h
+++ b/src/app/core/common.h
@@ -14,8 +14,16 @@
 
 namespace yaze {
 namespace app {
+/**
+ * @namespace yaze::app::core
+ * @brief Core application logic and utilities.
+ */
 namespace core {
 
+/**
+ * @class ExperimentFlags
+ * @brief A class to manage experimental feature flags.
+ */
 class ExperimentFlags {
  public:
   struct Flags {
@@ -99,6 +107,11 @@ class ExperimentFlags {
   static std::shared_ptr<Flags> flags_;
 };
 
+/**
+ * @class NotifyValue
+ * @brief A class to manage a value that can be modified and notify when it
+ * changes.
+ */
 template <typename T>
 class NotifyValue {
  public:
diff --git a/src/app/editor/utils/editor.h b/src/app/editor/utils/editor.h
index 330d8716..805bc168 100644
--- a/src/app/editor/utils/editor.h
+++ b/src/app/editor/utils/editor.h
@@ -7,7 +7,7 @@ namespace yaze {
 namespace app {
 
 /**
- * @namespace editor
+ * @namespace yaze::app::editor
  * @brief Editors are the view controllers for the application.
  */
 namespace editor {
diff --git a/src/app/emu/emulator.h b/src/app/emu/emulator.h
index 688ba6ef..66ac631a 100644
--- a/src/app/emu/emulator.h
+++ b/src/app/emu/emulator.h
@@ -11,8 +11,17 @@
 
 namespace yaze {
 namespace app {
+
+/**
+ * @namespace yaze::app::emu
+ * @brief SNES Emulation and debugging tools.
+ */
 namespace emu {
 
+/**
+ * @class Emulator
+ * @brief A class for emulating and debugging SNES ROMs.
+ */
 class Emulator : public SharedROM {
  public:
   void Run();