diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
index 300724a132..69c45e1583 100644
--- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
+++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
@@ -28,6 +28,17 @@ Abstract:
 #include "Tiano.h"
 
 VOID *
+memcpy (
+  OUT VOID        *Dest,
+  IN  const VOID  *Src,
+  IN  UINTN       Count
+  )
+;
+
+#ifdef _MSC_EXTENSIONS
+#pragma intrinsic(memcpy)
+#else
+ VOID *
 memcpy (
   OUT VOID        *Dest,
   IN  const VOID  *Src,
@@ -43,4 +54,5 @@ memcpy (
 
   return Dest;
 }
+#endif
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
index 0f0f40db97..a51ea10a98 100644
--- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
+++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
@@ -26,7 +26,17 @@ Abstract:
 --*/
 
 #include "Tiano.h"
+VOID *
+memset (
+  OUT VOID    *Dest,
+  IN  UINTN   Char,
+  IN  UINTN   Count
+  )
+;
 
+#ifdef _MSC_EXTENSIONS
+#pragma intrinsic(memset)
+#else
 VOID *
 memset (
   OUT VOID    *Dest,
@@ -42,4 +52,5 @@ memset (
 
   return Dest;
 }
+#endif