diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
index e9189bd6c8..21d48d7239 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
@@ -366,6 +366,19 @@ typedef struct {
 #define ISCSI_LOGIN_OPTION_CHAP_BI                      0x0000
 #define ISCSI_LOGIN_OPTION_CHAP_UNI                     0x2000
 
+///
+/// VLAN Device Path SubType.
+///
+#define MSG_VLAN_DP               0x14
+typedef struct {
+  EFI_DEVICE_PATH_PROTOCOL        Header;
+  ///
+  /// VLAN identifier (0-4094).
+  ///
+  UINT16                          VlanId;
+} VLAN_DEVICE_PATH;
+
+
 //
 // Media Device Path
 //
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h
index b0b22357e3..2249a12a85 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h
@@ -537,7 +537,8 @@ typedef enum {
   IsaIa32 = EFI_IMAGE_MACHINE_IA32,
   IsaX64  = EFI_IMAGE_MACHINE_X64,
   IsaIpf  = EFI_IMAGE_MACHINE_IA64,
-  IsaEbc  = EFI_IMAGE_MACHINE_EBC
+  IsaEbc  = EFI_IMAGE_MACHINE_EBC,
+  IsaArm  = EFI_IMAGE_MACHINE_ARMTHUMB_MIXED
 } EFI_INSTRUCTION_SET_ARCHITECTURE;
 
 EFI_FORWARD_DECLARATION (EFI_DEBUG_SUPPORT_PROTOCOL);
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
index a7a3c65c36..de28353320 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
@@ -89,5 +89,7 @@ COMPONENT_TYPE  = LIBRARY
 [libraries.ipf]
   CpuIA64Lib
   
+[libraries.ARM]
+  CompilerIntrinsicsLib
 
 [nmake.common]
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
index 934954bbc7..8aff8813ad 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
@@ -94,4 +94,7 @@ COMPONENT_TYPE  = LIBRARY
 [libraries.common]
   EdkFrameworkGuidLib
 
+[libraries.ARM]
+  CompilerIntrinsicsLib
+
 [nmake.common]