diff --git a/Include/Library/OcStringLib.h b/Include/Library/OcStringLib.h
index cfa2f0c3..22854ba7 100755
--- a/Include/Library/OcStringLib.h
+++ b/Include/Library/OcStringLib.h
@@ -172,12 +172,12 @@ OcAsciiStrnCmp (
   @param[in] StringGuid  A pointer to a buffer containing the ascii string.
   @param[in] Guid        A pointer to location to store the converted GUID.
 
-  @retval EFI_SUCCESS  The conversion completed successfully.
+  @retval RETURN_SUCCESS  The conversion completed successfully.
 **/
-EFI_STATUS
+RETURN_STATUS
 OcAsciiStrToGuid (
   IN     CONST CHAR8  *StringGuid,
-  IN OUT EFI_GUID     *Guid
+  IN OUT GUID         *Guid
   );
 
 // OcAsciiStrToUnicode
@@ -326,12 +326,12 @@ ToUpperChar (
   @param[in] StringGuid  A pointer to a buffer containing the unicode string.
   @param[in] Guid        A pointer to location to store the converted GUID.
 
-  @retval EFI_SUCCESS  The conversion completed successfully.
+  @retval RETURN_SUCCESS  The conversion completed successfully.
 **/
-EFI_STATUS
+RETURN_STATUS
 OcStrToGuid (
   IN     CONST CHAR16  *StringGuid,
-  IN OUT EFI_GUID      *Guid
+  IN OUT GUID          *Guid
   );
 
 // OcStrToAscii
diff --git a/Library/OcStringLib/OcAsciiLib.c b/Library/OcStringLib/OcAsciiLib.c
index 1a8dbe26..096965ab 100755
--- a/Library/OcStringLib/OcAsciiLib.c
+++ b/Library/OcStringLib/OcAsciiLib.c
@@ -12,17 +12,11 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
-#include <Uefi.h>
+#include <Base.h>
 
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
-#include <Library/DebugLib.h>
-#include <Library/MemoryAllocationLib.h>
 #include <Library/OcStringLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiLib.h>
-
-#include <Macros.h>
 
 // IsAsciiPrint
 /** Check if character is printable
@@ -220,17 +214,17 @@ AsciiToUpperChar (
   @param[in] StringGuid  A pointer to a buffer containing the ascii string.
   @param[in] Guid        A pointer to location to store the converted GUID.
 
-  @retval EFI_SUCCESS  The conversion completed successfully.
+  @retval RETURN_SUCCESS  The conversion completed successfully.
 **/
-EFI_STATUS
+RETURN_STATUS
 OcAsciiStrToGuid (
   IN     CONST CHAR8  *StringGuid,
-  IN OUT EFI_GUID     *Guid
+  IN OUT GUID         *Guid
   )
 {
-  EFI_STATUS Status;
+  RETURN_STATUS Status;
 
-  Status = EFI_INVALID_PARAMETER;
+  Status = RETURN_INVALID_PARAMETER;
 
   if ((StringGuid != NULL) && (Guid != NULL)) {
     ZeroMem (Guid, sizeof (*Guid));
@@ -252,7 +246,7 @@ OcAsciiStrToGuid (
       Guid->Data4[6] = (UINT8)(AsciiHexCharToUintn (StringGuid[32]) * 16 + AsciiHexCharToUintn (StringGuid[33]));
       Guid->Data4[7] = (UINT8)(AsciiHexCharToUintn (StringGuid[34]) * 16 + AsciiHexCharToUintn (StringGuid[35]));
 
-      Status = EFI_SUCCESS;
+      Status = RETURN_SUCCESS;
     }
   }
 
diff --git a/Library/OcStringLib/OcStringLib.inf b/Library/OcStringLib/OcStringLib.inf
index 671df154..2d730d6c 100755
--- a/Library/OcStringLib/OcStringLib.inf
+++ b/Library/OcStringLib/OcStringLib.inf
@@ -22,7 +22,7 @@
   FILE_GUID                      = 1E0810F7-9E40-43D0-A036-185407D0231D
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = OcStringLib|PEIM DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_DRIVER UEFI_APPLICATION DXE_SMM_DRIVER
+  LIBRARY_CLASS                  = OcStringLib
 
 
 #
@@ -45,4 +45,6 @@
 
 [LibraryClasses]
   BaseLib
+  BaseMemoryLib
+  MemoryAllocationLib
 
diff --git a/Library/OcStringLib/OcUnicodeLib.c b/Library/OcStringLib/OcUnicodeLib.c
index 9df839e9..00434eb6 100755
--- a/Library/OcStringLib/OcUnicodeLib.c
+++ b/Library/OcStringLib/OcUnicodeLib.c
@@ -12,17 +12,12 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
-#include <Uefi.h>
+#include <Base.h>
 
-#include <Library/DebugLib.h>
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/OcStringLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiLib.h>
-
-#include <Macros.h>
 
 // IsPrint
 /** Check if character is printable
@@ -219,17 +214,17 @@ ToUpperChar (
   @param[in] StringGuid  A pointer to a buffer containing the unicode string.
   @param[in] Guid        A pointer to location to store the converted GUID.
 
-  @retval EFI_SUCCESS  The conversion completed successfully.
+  @retval RETURN_UCCESS  The conversion completed successfully.
 **/
-EFI_STATUS
+RETURN_STATUS
 OcStrToGuid (
   IN     CONST CHAR16  *StringGuid,
-  IN OUT EFI_GUID      *Guid
+  IN OUT GUID          *Guid
   )
 {
-  EFI_STATUS Status;
+  RETURN_STATUS Status;
 
-  Status = EFI_INVALID_PARAMETER;
+  Status = RETURN_INVALID_PARAMETER;
 
   if ((StringGuid != NULL) && (Guid != NULL)) {
     ZeroMem (Guid, sizeof (*Guid));
@@ -251,7 +246,7 @@ OcStrToGuid (
       Guid->Data4[6] = (UINT8)(HexCharToUintn (StringGuid[32]) * 16 + HexCharToUintn (StringGuid[33]));
       Guid->Data4[7] = (UINT8)(HexCharToUintn (StringGuid[34]) * 16 + HexCharToUintn (StringGuid[35]));
 
-      Status = EFI_SUCCESS;
+      Status = RETURN_SUCCESS;
     }
   }