diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index d386bda50f..4f0de24c55 100644
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -50,10 +50,6 @@
 [Guids.common]
   gEmbeddedTokenSpaceGuid       = { 0xe0d8ca17, 0x4276, 0x4386, { 0xbb, 0x79, 0x48, 0xcb, 0x81, 0x3d, 0x3c, 0x4f }}
 
-  ## FDT Configuration Table
-  # Include/Guid/Fdt.h
-  gFdtTableGuid = { 0xb1b621d5, 0xf19c, 0x41a5, { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } }
-  gFdtVariableGuid = { 0x25a4fd4a, 0x9703, 0x4ba9, { 0xa1, 0x90, 0xb7, 0xc8, 0x4e, 0xfb, 0x3e, 0x57 } }
 
   ## Include/Guid/PlatformHasDeviceTree.h
   gEdkiiPlatformHasDeviceTreeGuid = { 0x7ebb920d, 0x1aaf, 0x46d9, { 0xb2, 0xaf, 0x54, 0x1e, 0x1d, 0xce, 0x14, 0x8b } }
diff --git a/EmbeddedPkg/Include/Guid/Fdt.h b/MdePkg/Include/Guid/Fdt.h
similarity index 66%
rename from EmbeddedPkg/Include/Guid/Fdt.h
rename to MdePkg/Include/Guid/Fdt.h
index e009146829..9f9270ace1 100644
--- a/EmbeddedPkg/Include/Guid/Fdt.h
+++ b/MdePkg/Include/Guid/Fdt.h
@@ -14,9 +14,4 @@
 
 extern EFI_GUID  gFdtTableGuid;
 
-#define FDT_VARIABLE_GUID \
-  { 0x25a4fd4a, 0x9703, 0x4ba9, { 0xa1, 0x90, 0xb7, 0xc8, 0x4e, 0xfb, 0x3e, 0x57 } }
-
-extern EFI_GUID  gFdtVariableGuid;
-
 #endif /* __FDT_H__ */
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 842abaaa75..ed22a67568 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -615,6 +615,10 @@
   ## Include/Guid/FdtHob.h
   gFdtHobGuid   = { 0x16958446, 0x19B7, 0x480B, { 0xB0, 0x47, 0x74, 0x85, 0xAD, 0x3F, 0x71, 0x6D } }
 
+  ## FDT Configuration Table
+  # Include/Guid/Fdt.h
+  gFdtTableGuid = { 0xb1b621d5, 0xf19c, 0x41a5, { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } }
+
   ## Include/Guid/ImageAuthentication.h
   gEfiImageSecurityDatabaseGuid  = { 0xd719b2cb, 0x3d3a, 0x4596, {0xa3, 0xbc, 0xda, 0xd0,  0xe, 0x67, 0x65, 0x6f }}
   gEfiCertSha256Guid             = { 0xc1c41626, 0x504c, 0x4092, {0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 }}