diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index f09bf93c63..9653f01ffa 100644
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -61,7 +61,7 @@ OemHookStatusCodeInitialize (
   //
   // Cache standard output handle.
   //
-  mStdOut = 1;
+  mStdOut = 1;
 
   return EFI_SUCCESS;
 }
@@ -111,7 +111,7 @@ OemHookStatusCodeReport (
   UINT32          ErrorLevel;
   UINT32          LineNumber;
   UINTN           CharCount;
-  VA_LIST         Marker;
+  BASE_LIST       Marker;
   EFI_DEBUG_INFO  *DebugInfo;
 
   Buffer[0] = '\0';
@@ -137,7 +137,7 @@ OemHookStatusCodeReport (
               mStdOut,
               Buffer,
               CharCount
-	      );
+	      );
 
     return EFI_SUCCESS;
 
@@ -146,7 +146,7 @@ OemHookStatusCodeReport (
     //
     // Print DEBUG() information into output buffer.
     //
-    CharCount = AsciiVSPrint (
+    CharCount = AsciiBSPrint (
                   Buffer, 
                   EFI_STATUS_CODE_DATA_MAX_SIZE, 
                   Format, 
@@ -159,10 +159,10 @@ OemHookStatusCodeReport (
     // Print specific data into output buffer.
     //
     DebugInfo = (EFI_DEBUG_INFO *) (Data + 1);
-    Marker    = (VA_LIST) (DebugInfo + 1);
+    Marker    = (BASE_LIST) (DebugInfo + 1);
     Format    = (CHAR8 *) (((UINT64 *) Marker) + 12);
 
-    CharCount = AsciiVSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker);
+    CharCount = AsciiBSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker);
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {
     //
     // Print ERROR information into output buffer.
diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index ab06814b11..ea028b5f2f 100644
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -119,7 +119,7 @@ OemHookStatusCodeReport (
   UINT32          ErrorLevel;
   UINT32          LineNumber;
   UINTN           CharCount;
-  VA_LIST         Marker;
+  BASE_LIST       Marker;
   EFI_DEBUG_INFO  *DebugInfo;
 
   Buffer[0] = '\0';
@@ -154,7 +154,7 @@ OemHookStatusCodeReport (
     //
     // Print DEBUG() information into output buffer.
     //
-    CharCount = AsciiVSPrint (
+    CharCount = AsciiBSPrint (
                   Buffer, 
                   EFI_STATUS_CODE_DATA_MAX_SIZE, 
                   Format, 
@@ -167,10 +167,10 @@ OemHookStatusCodeReport (
     // Print specific data into output buffer.
     //
     DebugInfo = (EFI_DEBUG_INFO *) (Data + 1);
-    Marker    = (VA_LIST) (DebugInfo + 1);
+    Marker    = (BASE_LIST) (DebugInfo + 1);
     Format    = (CHAR8 *) (((UINT64 *) Marker) + 12);
 
-    CharCount = AsciiVSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker);
+    CharCount = AsciiBSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker);
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {
     //
     // Print ERROR information into output buffer.
diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index ffeed21e75..ae5b1fb306 100644
--- a/UnixPkg/Sec/SecMain.c
+++ b/UnixPkg/Sec/SecMain.c
@@ -448,7 +448,7 @@ Returns:
 // TODO:    Data - add argument and description to function comment
 {
   CHAR8           *Format;
-  VA_LIST         Marker;
+  BASE_LIST       Marker;
   CHAR8           PrintBuffer[BYTES_PER_RECORD * 2];
   CHAR8           *Filename;
   CHAR8           *Description;
@@ -467,7 +467,7 @@ Returns:
     //
     // Process DEBUG () macro 
     //
-    AsciiVSPrint (PrintBuffer, BYTES_PER_RECORD, Format, Marker);
+    AsciiBSPrint (PrintBuffer, BYTES_PER_RECORD, Format, Marker);
     printf (PrintBuffer);
   }