diff --git a/include/services/spm_mm_svc.h b/include/services/spm_mm_svc.h
index 3148beb80..b4ed1ab26 100644
--- a/include/services/spm_mm_svc.h
+++ b/include/services/spm_mm_svc.h
@@ -91,6 +91,17 @@
 #ifndef __ASSEMBLER__
 
 #include <stdint.h>
+#include <tools_share/uuid.h>
+
+/*
+ * MM Communicate information structure. Required to generate MM Communicate
+ * payload to be shared with Standalone MM.
+ */
+typedef struct mm_communicate_header {
+	struct efi_guid	header_guid;
+	size_t message_len;
+	uint8_t data[1];
+} mm_communicate_header_t;
 
 int32_t spm_mm_setup(void);
 
diff --git a/plat/arm/board/neoverse_rd/common/include/nrd_ras.h b/plat/arm/board/neoverse_rd/common/include/nrd_ras.h
index 768689c08..d55e0fe51 100644
--- a/plat/arm/board/neoverse_rd/common/include/nrd_ras.h
+++ b/plat/arm/board/neoverse_rd/common/include/nrd_ras.h
@@ -18,16 +18,6 @@
 #define NRD_RAS_INTR_TYPE_SPI 0
 #define NRD_RAS_INTR_TYPE_PPI 1
 
-/*
- * MM Communicate information structure. Required to generate MM Communicate
- * payload to be shared with Standalone MM.
- */
-typedef struct mm_communicate_header {
-	struct efi_guid	header_guid;
-	size_t		message_len;
-	uint8_t		data[1];
-} mm_communicate_header_t;
-
 /* RAS error info data structure. */
 struct nrd_ras_ev_map {
 	int sdei_ev_num;	/* SDEI Event number */