diff --git a/action/ActionMessage.cpp b/action/ActionMessage.cpp
index 4e56feea..1c00dee0 100644
--- a/action/ActionMessage.cpp
+++ b/action/ActionMessage.cpp
@@ -1,5 +1,6 @@
-#include <fsfw/action/HasActionsIF.h>
 #include "ActionMessage.h"
+#include "HasActionsIF.h"
+
 #include "../objectmanager/ObjectManagerIF.h"
 #include "../storagemanager/StorageManagerIF.h"
 
diff --git a/action/ActionMessage.h b/action/ActionMessage.h
index 7a859de0..be7116d7 100644
--- a/action/ActionMessage.h
+++ b/action/ActionMessage.h
@@ -4,8 +4,15 @@
 #include "../ipc/CommandMessage.h"
 #include "../objectmanager/ObjectManagerIF.h"
 #include "../storagemanager/StorageManagerIF.h"
-typedef uint32_t ActionId_t;
 
+using ActionId_t = uint32_t;
+
+/**
+ * @brief   These messages are part of the action module of the FSFW.
+ * @details
+ * These messages are sent amongst objects implementing the HasActionsIF. The ActionHelper
+ * class is able to process these messages.
+ */
 class ActionMessage {
 private:
 	ActionMessage();