diff --git a/MdePkg/Include/IndustryStandard/SmBus.h b/MdePkg/Include/IndustryStandard/SmBus.h
index fd2c253464..1fe7a9680b 100644
--- a/MdePkg/Include/IndustryStandard/SmBus.h
+++ b/MdePkg/Include/IndustryStandard/SmBus.h
@@ -41,6 +41,19 @@ typedef struct {
   UINTN SmbusDeviceAddress : 7;
 } EFI_SMBUS_DEVICE_ADDRESS;
 
+typedef struct {
+  ///
+  /// The SMBUS hardware address to which the SMBUS device is preassigned or
+  /// allocated. Type EFI_SMBUS_DEVICE_ADDRESS is defined in EFI_PEI_SMBUS2_PPI.Execute().
+  ///
+  EFI_SMBUS_DEVICE_ADDRESS  SmbusDeviceAddress;
+  ///
+  /// The SMBUS Unique Device Identifier (UDID) as defined in EFI_SMBUS_UDID.
+  /// Type EFI_SMBUS_UDID is defined in EFI_PEI_SMBUS2_PPI.ArpDevice().
+  ///
+  EFI_SMBUS_UDID            SmbusDeviceUdid;
+} EFI_SMBUS_DEVICE_MAP;
+
 ///
 /// Smbus Operations
 ///
diff --git a/MdePkg/Include/Ppi/Smbus2.h b/MdePkg/Include/Ppi/Smbus2.h
index 175b2b70a7..091d5e29ae 100644
--- a/MdePkg/Include/Ppi/Smbus2.h
+++ b/MdePkg/Include/Ppi/Smbus2.h
@@ -115,20 +115,6 @@ EFI_STATUS
   IN OUT    EFI_SMBUS_DEVICE_ADDRESS  *SlaveAddress OPTIONAL
 );
 
-
-typedef struct {
-  ///
-  /// The SMBUS hardware address to which the SMBUS device is preassigned or
-  /// allocated. Type EFI_SMBUS_DEVICE_ADDRESS is defined in EFI_PEI_SMBUS2_PPI.Execute().
-  ///
-  EFI_SMBUS_DEVICE_ADDRESS  SmbusDeviceAddress;
-  ///
-  /// The SMBUS Unique Device Identifier (UDID) as defined in EFI_SMBUS_UDID.
-  /// Type EFI_SMBUS_UDID is defined in EFI_PEI_SMBUS2_PPI.ArpDevice().
-  ///
-  EFI_SMBUS_UDID            SmbusDeviceUdid;
-} EFI_SMBUS_DEVICE_MAP;
-
 /**
   The GetArpMap() function returns the mapping of all the SMBus devices 
   that are enumerated by the SMBus host driver.