diff --git a/MdeModulePkg/Include/Guid/ArmFfaRxTxBufferInfo.h b/MdeModulePkg/Include/Guid/ArmFfaRxTxBufferInfo.h
new file mode 100644
index 0000000000..0b8e2b6419
--- /dev/null
+++ b/MdeModulePkg/Include/Guid/ArmFfaRxTxBufferInfo.h
@@ -0,0 +1,31 @@
+/** @file
+  Arm FF-A ns common library Header file
+
+  Copyright (c) 2024, Arm Limited. All rights reserved.<BR>
+  Copyright (c), Microsoft Corporation.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+**/
+
+#ifndef ARM_FFA_RX_TX_BUFFER_INFO_H_
+#define ARM_FFA_RX_TX_BUFFER_INFO_H_
+
+/**
+ * Guid Hob Data for gArmFfaRxTxBufferInfoGuid Guid Hob.
+ */
+typedef struct ArmFfaRxTxBuffersInfo {
+  /// Tx Buffer Address.
+  VOID      *TxBufferAddr;
+
+  /// Tx Buffer Size.
+  UINT64    TxBufferSize;
+
+  /// Rx Buffer Address.
+  VOID      *RxBufferAddr;
+
+  /// Rx Buffer Size.
+  UINT64    RxBufferSize;
+} ARM_FFA_RX_TX_BUFFER_INFO;
+
+extern EFI_GUID  gArmFfaRxTxBufferInfoGuid;
+
+#endif
diff --git a/MdeModulePkg/Library/ArmFfaLib/ArmFfaDxeLib.c b/MdeModulePkg/Library/ArmFfaLib/ArmFfaDxeLib.c
index 4d82844ee1..8751f2f06e 100644
--- a/MdeModulePkg/Library/ArmFfaLib/ArmFfaDxeLib.c
+++ b/MdeModulePkg/Library/ArmFfaLib/ArmFfaDxeLib.c
@@ -28,6 +28,8 @@
 
 #include <IndustryStandard/ArmFfaSvc.h>
 
+#include <Guid/ArmFfaRxTxBufferInfo.h>
+
 #include "ArmFfaCommon.h"
 #include "ArmFfaRxTxMap.h"
 
diff --git a/MdeModulePkg/Library/ArmFfaLib/ArmFfaPeiLib.c b/MdeModulePkg/Library/ArmFfaLib/ArmFfaPeiLib.c
index 8a1d892941..e65a3d040c 100644
--- a/MdeModulePkg/Library/ArmFfaLib/ArmFfaPeiLib.c
+++ b/MdeModulePkg/Library/ArmFfaLib/ArmFfaPeiLib.c
@@ -29,6 +29,8 @@
 
 #include <IndustryStandard/ArmFfaSvc.h>
 
+#include <Guid/ArmFfaRxTxBufferInfo.h>
+
 #include "ArmFfaCommon.h"
 #include "ArmFfaRxTxMap.h"
 
diff --git a/MdeModulePkg/Library/ArmFfaLib/ArmFfaRxTxMap.h b/MdeModulePkg/Library/ArmFfaLib/ArmFfaRxTxMap.h
index 01db339108..6c6bfaa3cd 100644
--- a/MdeModulePkg/Library/ArmFfaLib/ArmFfaRxTxMap.h
+++ b/MdeModulePkg/Library/ArmFfaLib/ArmFfaRxTxMap.h
@@ -17,23 +17,6 @@
 #ifndef ARM_FFA_RX_TX_MAP_LIB_H_
 #define ARM_FFA_RX_TX_MAP_LIB_H_
 
-/**
- * Guid Hob Data for gArmFfaRxTxBufferInfoGuid Guid Hob.
- */
-typedef struct ArmFfaRxTxBuffersInfo {
-  /// Tx Buffer Address.
-  VOID      *TxBufferAddr;
-
-  /// Tx Buffer Size.
-  UINT64    TxBufferSize;
-
-  /// Rx Buffer Address.
-  VOID      *RxBufferAddr;
-
-  /// Rx Buffer Size.
-  UINT64    RxBufferSize;
-} ARM_FFA_RX_TX_BUFFER_INFO;
-
 /**
   Mapping Rx/Tx buffers.
   This function is only called in ArmFfaLibConstructor because
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 1234ae8383..3698caf902 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -494,6 +494,7 @@
   ## Include/Guid/DelayedDispatch.h
   gEfiDelayedDispatchTableGuid = { 0x4b733449, 0x8eff, 0x488c, { 0x92, 0x1a, 0x15, 0x4a, 0xda, 0x25, 0x18, 0x07 }}
 
+  ## Include/Guid/ArmFfaRxTxBufferInfo.h
   gArmFfaRxTxBufferInfoGuid = { 0x96fd3d26, 0x6fb1, 0x11ef, { 0x8c, 0x11, 0xf3, 0xc9, 0xc5, 0x02, 0x31, 0xab } }
 
 [Ppis]