diff --git a/Include/Library/OcMachoLib.h b/Include/Library/OcMachoLib.h
new file mode 100644
index 00000000..f25a1184
--- /dev/null
+++ b/Include/Library/OcMachoLib.h
@@ -0,0 +1,619 @@
+/** @file
+  Provides MACH-O parsing helper functions.
+
+Copyright (c) 2016 - 2018, Download-Fritz.  All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available
+under the terms and conditions of the BSD License which accompanies this
+distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef OC_MACHO_LIB_H_
+#define OC_MACHO_LIB_H_
+
+#include <IndustryStandard/AppleMachoImage.h>
+
+/**
+  Returns the last virtual address of a MACH-O.
+
+  @param[in] MachHeader  Header of the MACH-O.
+
+**/
+UINT64
+MachoGetLastAddress64 (
+  IN CONST MACH_HEADER_64  *MachHeader
+  );
+
+/**
+  Retrieves the first Load Command of type LoadCommandType.
+
+  @param[in] MachHeader       Header of the MACH-O.
+  @param[in] LoadCommandType  Type of the Load Command to retrieve.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+MACH_LOAD_COMMAND *
+MachoGetFirstCommand64 (
+  IN CONST MACH_HEADER_64    *MachHeader,
+  IN MACH_LOAD_COMMAND_TYPE  LoadCommandType
+  );
+
+/**
+  Retrieves the first UUID Load Command.
+
+  @param[in] MachHeader  Header of the MACH-O.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+MACH_UUID_COMMAND *
+MachoGetUuid64 (
+  IN CONST MACH_HEADER_64  *MachHeader
+  );
+
+/**
+  Retrieves the first segment by the name of SegmentName.
+
+  @param[in] MachHeader   Header of the MACH-O.
+  @param[in] SegmentName  Segment name to search for.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+MACH_SEGMENT_COMMAND_64 *
+MachoGetSegmentByName64 (
+  IN CONST MACH_HEADER_64  *MachHeader,
+  IN CONST CHAR8           *SegmentName
+  );
+
+/**
+  Retrieves the first section by the name of SectionName.
+
+  @param[in] MachHeader   Header of the MACH-O.
+  @param[in] Segment      Segment to search in.
+  @param[in] SectionName  Section name to search for.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+MACH_SECTION_64 *
+MachoGetSectionByName64 (
+  IN CONST MACH_HEADER_64           *MachHeader,
+  IN CONST MACH_SEGMENT_COMMAND_64  *Segment,
+  IN CONST CHAR8                    *SectionName
+  );
+
+/**
+  Retrieves a section within a segment by the name of SegmentName.
+
+  @param[in] MachHeader   Header of the MACH-O.
+  @param[in] SegmentName  The name of the segment to search in.
+  @param[in] SectionName  The name of the section to search for.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+MACH_SECTION_64 *
+MachoGetSegmentSectionByName64 (
+  IN CONST MACH_HEADER_64  *MachHeader,
+  IN CONST CHAR8           *SegmentName,
+  IN CONST CHAR8           *SectionName
+  );
+
+/**
+  Retrieves the first segment.
+
+  @param[in] MachHeader  Header of the MACH-O.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+MACH_SEGMENT_COMMAND_64 *
+MachoGetFirstSegment64 (
+  IN CONST MACH_HEADER_64  *MachHeader
+  );
+
+/**
+  Retrieves the next segment.
+
+  @param[in] MachHeader  Header of the MACH-O.
+  @param[in] Segment     Segment to retrieve the successor of.
+
+  @retal NULL  NULL is returned on failure.
+
+**/
+MACH_SEGMENT_COMMAND_64 *
+MachoGetNextSegment64 (
+  IN CONST MACH_HEADER_64           *MachHeader,
+  IN CONST MACH_SEGMENT_COMMAND_64  *Segment
+  );
+
+/**
+  Retrieves the first section of a segment.
+
+  @param[in] Segment  The segment to get the section of.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+MACH_SECTION_64 *
+MachoGetFirstSection64 (
+  IN CONST MACH_SEGMENT_COMMAND_64  *Segment
+  );
+
+/**
+  Retrieves the next section of a segment.
+
+  @param[in] Segment  The segment to get the section of.
+  @param[in] Section  The section to get the successor of.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+MACH_SECTION_64 *
+MachoGetNextSection64 (
+  IN CONST MACH_SEGMENT_COMMAND_64  *Segment,
+  IN CONST MACH_SECTION_64          *Section
+  );
+
+/**
+  Retrieves a section by its index.
+
+  @param[in] MachHeader  Header of the MACH-O.
+  @param[in] Index       Index of the section to retrieve.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+CONST MACH_SECTION_64 *
+MachoGetSectionByIndex64 (
+  IN CONST MACH_HEADER_64  *MachHeader,
+  IN UINTN                 Index
+  );
+
+/**
+  Retrieves a section by its address.
+
+  @param[in] MachHeader  Header of the MACH-O.
+  @param[in] Address     Address of the section to retrieve.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+CONST MACH_SECTION_64 *
+MachoGetSectionByAddress64 (
+  IN CONST MACH_HEADER_64  *MachHeader,
+  IN UINT64                Address
+  );
+
+/**
+  Returns whether Symbol describes a section.
+
+  @param[in] Symbol  Symbol to evaluate.
+
+**/
+BOOLEAN
+MachoSymbolIsSection (
+  IN CONST MACH_NLIST_64  *Symbol
+  );
+
+/**
+  Returns whether Symbol is defined.
+
+  @param[in] Symbol  Symbol to evaluate.
+
+**/
+BOOLEAN
+MachoSymbolIsDefined (
+  IN CONST MACH_NLIST_64  *Symbol
+  );
+
+/**
+  Returns whether Symbol is defined locally.
+
+  @param[in] MachHeader   Header of the MACH-O.
+  @param[in] SymbolTable  Symbol Table of the MACH-O.
+  @param[in] DySymtab     Dynamic Symbol Table of the MACH-O.
+  @param[in] Symbol       Symbol to evaluate.
+
+**/
+BOOLEAN
+MachoSymbolIsLocalDefined (
+  IN CONST MACH_HEADER_64         *MachHeader,
+  IN CONST MACH_NLIST_64          *SymbolTable,
+  IN CONST MACH_DYSYMTAB_COMMAND  *DySymtab,
+  IN CONST MACH_NLIST_64          *Symbol
+  );
+
+/**
+  Retrieves a symbol by its name.
+
+  @param[in] SymbolTable      Symbol Table of the MACH-O.
+  @param[in] StringTable      String Table pf the MACH-O.
+  @param[in] NumberOfSymbols  Number of symbols in SymbolTable.
+  @param[in] Name             Name of the symbol to locate.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+CONST MACH_NLIST_64 *
+MachoGetSymbolByName (
+  IN CONST MACH_NLIST_64  *SymbolTable,
+  IN CONST CHAR8          *StringTable,
+  IN UINTN                NumberOfSymbols,
+  IN CONST CHAR8          *Name
+  );
+
+/**
+  Retrieves a locally defined symbol by its name.
+
+  @param[in] SymbolTable  Symbol Table of the MACH-O.
+  @param[in] StringTable  String Table pf the MACH-O.
+  @param[in] DySymtab     Dynamic Symbol Table of the MACH-O.
+  @param[in] Name         Name of the symbol to locate.
+
+**/
+CONST MACH_NLIST_64 *
+MachoGetLocalDefinedSymbolByName (
+  IN CONST MACH_NLIST_64          *SymbolTable,
+  IN CONST CHAR8                  *StringTable,
+  IN CONST MACH_DYSYMTAB_COMMAND  *DySymtab,
+  IN CONST CHAR8                  *Name
+  );
+
+/**
+  Relocate Symbol to be against LinkAddress.
+
+  @param[in]     MachHeader   MACH-O header of the KEXT to relocate.
+  @param[in]     LinkAddress  The address to be linked against.
+  @param[in,out] Symbol       The symbol to be relocated.
+
+**/
+VOID
+MachoRelocateSymbol64 (
+  IN     CONST MACH_HEADER_64  *MachHeader,
+  IN     UINT64                LinkAddress,
+  IN OUT MACH_NLIST_64         *Symbol
+  );
+
+/**
+  Retrieves a symbol by the Relocation it is referenced by.
+
+  @param[in] MachHeader       Header of the MACH-O.
+  @param[in] NumberOfSymbols  Number of symbols in SymbolTable.
+  @param[in] SymbolTable      Symbol Table of the MACH-O.
+  @param[in] StringTable      String Table of the MACH-O.
+  @param[in] Relocation       The Relocation to evaluate.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+CONST MACH_NLIST_64 *
+MachoGetCxxSymbolByRelocation64 (
+  IN CONST MACH_HEADER_64        *MachHeader,
+  IN UINTN                       NumberOfSymbols,
+  IN CONST MACH_NLIST_64         *SymbolTable,
+  IN CONST CHAR8                 *StringTable,
+  IN CONST MACH_RELOCATION_INFO  *Relocation
+  );
+
+/**
+  Returns whether Name is pure virtual.
+
+  @param[in] Name  The name to evaluate.
+
+**/
+BOOLEAN
+MachoIsNamePureVirtual (
+  IN CONST CHAR8  *Name
+  );
+
+/**
+  Returns whether Name is a Padslot.
+
+  @param[in] Name  The name to evaluate.
+
+**/
+BOOLEAN
+MachoIsNamePadslot (
+  IN CONST CHAR8  *Name
+  );
+
+/**
+  Returns whether Symbol defines a Super Metaclass Pointer.
+
+  @param[in] Symbol       The symbol to check.
+  @param[in] StringTable  The KEXT's String Table.
+
+**/
+BOOLEAN
+MachoSymbolIsSmcp64 (
+  IN CONST MACH_NLIST_64  *Symbol,
+  IN CONST CHAR8          *StringTable
+  );
+
+/**
+  Returns whether Symbol defines a Super Metaclass Pointer.
+
+  @param[in] Symbol       The symbol to check.
+  @param[in] StringTable  The KEXT's String Table.
+
+**/
+BOOLEAN
+MachoSymbolIsMetaclassPointer64 (
+  IN CONST MACH_NLIST_64  *Symbol,
+  IN CONST CHAR8          *StringTable
+  );
+
+/**
+  Retrieves the class name of a Super Meta Class Pointer.
+
+  @param[in]  StringTable    String Table of the MACH-O.
+  @param[in]  SmcpSymbol     SMCP Symbol to get the class name of.
+  @param[in]  ClassNameSize  The size of ClassName.
+  @param[out] ClassName      The output buffer for the class name.
+
+  @returns  Whether the name has been retrieved successfully.
+
+**/
+BOOLEAN
+MachoGetClassNameFromSuperMetaClassPointer (
+  IN  CONST CHAR8          *StringTable,
+  IN  CONST MACH_NLIST_64  *SmcpSymbol,
+  IN  UINTN                ClassNameSize,
+  OUT CHAR8                *ClassName
+  );
+
+/**
+  Retrieves the class name of a VTable.
+
+  @param[out] VtableName  The VTable's name.
+
+**/
+CONST CHAR8 *
+MachoGetClassNameFromVtableName (
+  IN  CONST CHAR8  *VtableName
+  );
+
+/**
+  Retrieves the function prefix of a class name.
+
+  @param[in]  ClassName           The class name to evaluate.
+  @param[in]  FunctionPrefixSize  The size of FunctionPrefix.
+  @param[out] FunctionPrefix      The output buffer for the function prefix.
+
+  @returns  Whether the name has been retrieved successfully.
+
+**/
+BOOLEAN
+MachoGetFunctionPrefixFromClassName (
+  IN  CONST CHAR8  *ClassName,
+  IN  UINTN        FunctionPrefixSize,
+  OUT CHAR8        *FunctionPrefix
+  );
+
+/**
+  Retrieves the class name of a Meta Class Pointer.
+
+  @param[in]  StringTable         String Table of the MACH-O.
+  @param[in]  MetaClassPtrSymbol  MCP Symbol to get the class name of.
+  @param[in]  ClassNameSize       The size of ClassName.
+  @param[out] ClassName           The output buffer for the class name.
+
+  @returns  Whether the name has been retrieved successfully.
+
+**/
+BOOLEAN
+MachoGetClassNameFromMetaClassPointer (
+  IN  CONST CHAR8          *StringTable,
+  IN  CONST MACH_NLIST_64  *MetaClassPtrSymbol,
+  IN  UINTN                ClassNameSize,
+  OUT CHAR8                *ClassName
+  );
+
+/**
+  Retrieves the VTable name of a class name.
+
+  @param[in]  ClassName       Class name to get the VTable name of.
+  @param[in]  VtableNameSize  The size of VtableName.
+  @param[out] VtableName      The output buffer for the VTable name.
+
+  @returns  Whether the name has been retrieved successfully.
+
+**/
+BOOLEAN
+MachoGetVtableNameFromClassName (
+  IN  CONST CHAR8  *ClassName,
+  IN  UINTN        VtableNameSize,
+  OUT CHAR8        *VtableName
+  );
+
+/**
+  Retrieves the Meta VTable name of a class name.
+
+  @param[in]  ClassName       Class name to get the Meta VTable name of.
+  @param[in]  VtableNameSize  The size of VtableName.
+  @param[out] VtableName      The output buffer for the VTable name.
+
+  @returns  Whether the name has been retrieved successfully.
+
+**/
+BOOLEAN
+MachoGetMetaVtableNameFromClassName (
+  IN  CONST CHAR8  *ClassName,
+  IN  UINTN        VtableNameSize,
+  OUT CHAR8        *VtableName
+  );
+
+/**
+  Retrieves the final symbol name of a class name.
+
+  @param[in]  ClassName            Class name to get the final symbol name of.
+  @param[in]  FinalSymbolNameSize  The size of FinalSymbolName.
+  @param[out] FinalSymbolName      The output buffer for the final symbol name.
+
+  @returns  Whether the name has been retrieved successfully.
+
+**/
+BOOLEAN
+MachoGetFinalSymbolNameFromClassName (
+  IN  CONST CHAR8  *ClassName,
+  IN  UINTN        FinalSymbolNameSize,
+  OUT CHAR8        *FinalSymbolName
+  );
+
+/**
+  Returns whether Symbol defines a VTable.
+
+  @param[in] Symbol       The symbol to check.
+  @param[in] StringTable  The KEXT's String Table.
+
+**/
+BOOLEAN
+MachoSymbolIsVtable64 (
+  IN CONST MACH_NLIST_64  *Symbol,
+  IN CONST CHAR8          *StringTable
+  );
+
+/**
+  Returns whether the symbol name describes a C++ symbol.
+
+  @param[in] Name  The name to evaluate.
+
+**/
+BOOLEAN
+MachoIsSymbolNameCxx (
+  IN CONST CHAR8  *Name
+  );
+
+/**
+  Returns the number of VTable entires in VtableData.
+
+  @param[in] VtableData   The VTable's data.
+  @param[in] MachCpuType  CPU Type of the MACH-O.
+
+**/
+UINTN
+MachoVtableGetNumberOfEntries64 (
+  IN CONST UINT64   *VtableData,
+  IN MACH_CPU_TYPE  MachCpuType
+  );
+
+/**
+  Retrieves Metaclass symbol of a SMCP.
+
+  @param[in] MachHeader           Header of the MACH-O.
+  @param[in] NumberOfSymbols      Number of symbols in SymbolTable.
+  @param[in] SymbolTable          Symbol Table of the MACH-O.
+  @param[in] StringTable          String Table of the MACH-O.
+  @param[in] NumberOfRelocations  Number of Relocations in Relocations.
+  @param[in] Relocations          The Relocations to evaluate.
+  @param[in] Smcp                 The SMCP to evaluate.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+CONST MACH_NLIST_64 *
+MachoGetMetaclassSymbolFromSmcpSymbol64 (
+  IN CONST MACH_HEADER_64        *MachHeader,
+  IN UINTN                       NumberOfSymbols,
+  IN CONST MACH_NLIST_64         *SymbolTable,
+  IN CONST CHAR8                 *StringTable,
+  IN UINTN                       NumberOfRelocations,
+  IN CONST MACH_RELOCATION_INFO  *Relocations,
+  IN CONST MACH_NLIST_64         *Smcp
+  );
+
+/**
+  Retrieves VTable and Meta VTable of a SMCP.
+  Logically matches XNU's get_vtable_syms_from_smcp.
+
+  @param[in]  SymbolTable  Symbol Table of the MACH-O.
+  @param[in]  StringTable  String Table of the MACH-O.
+  @param[in]  DySymtab     Dynamic Symbol Table of the MACH-O.
+  @param[in]  SmcpSymbol   SMCP Symbol to retrieve the VTables from.
+  @param[out] Vtable       Output buffer for the VTable symbol pointer.
+  @param[out] MetaVtable   Output buffer for the Meta VTable symbol pointer.
+
+**/
+BOOLEAN
+MachoGetVtableSymbolsFromSmcp64 (
+  IN  CONST MACH_NLIST_64          *SymbolTable,
+  IN  CONST CHAR8                  *StringTable,
+  IN  CONST MACH_DYSYMTAB_COMMAND  *DySymtab,
+  IN  CONST MACH_NLIST_64          *SmcpSymbol,
+  OUT CONST MACH_NLIST_64          **Vtable,
+  OUT CONST MACH_NLIST_64          **MetaVtable
+  );
+
+/**
+  Returns whether the Relocation's type indicates a Pair for the Intel 64
+  platform.
+  
+  @param[in] Type  The Relocation's type to verify.
+
+**/
+BOOLEAN
+MachoRelocationIsPairIntel64 (
+  IN UINT8  Type
+  );
+
+/**
+  Returns whether the Relocation's type matches a Pair's for the Intel 64
+  platform.
+  
+  @param[in] Type  The Relocation's type to verify.
+
+**/
+BOOLEAN
+MachoIsRelocationPairTypeIntel64 (
+  IN UINT8  Type
+  );
+
+/**
+  Returns whether the Relocation shall be preserved for the Intel 64 platform.
+  
+  @param[in] Type  The Relocation's type to verify.
+
+**/
+BOOLEAN
+MachoPreserveRelocationIntel64 (
+  IN UINT8  Type
+  );
+
+/**
+  Returns whether the Relocation shall be preserved.
+  
+  @param[in] Type  The Relocation's type to verify.
+
+**/
+BOOLEAN
+MachoPreserveRelocation (
+  IN UINT8  Type
+  );
+
+/**
+  Retrieves a Relocation by the address it targets.
+
+  @param[in] NumberOfRelocations  Number of Relocations in Relocations.
+  @param[in] Relocations          The Relocations to search.
+  @param[in] Address              The address to search for.
+  @param[in] MachCpuType          CPU Type of the MACH-O.
+
+  @retval NULL  NULL is returned on failure.
+
+**/
+CONST MACH_RELOCATION_INFO *
+MachoGetRelocationByOffset (
+  IN UINTN                       NumberOfRelocations,
+  IN CONST MACH_RELOCATION_INFO  *Relocations,
+  IN UINT64                      Address,
+  IN MACH_CPU_TYPE               MachCpuType
+  );
+
+#endif // OC_MACHO_LIB_H_