4 files changed, 23 insertions, 7 deletions
diff --git a/Public/Kits/SystemKit/CoreAPI.hxx b/Public/Kits/SystemKit/CoreAPI.hxx
index 46af0cef..5d9bfb1a 100644
--- a/Public/Kits/SystemKit/CoreAPI.hxx
+++ b/Public/Kits/SystemKit/CoreAPI.hxx
@@ -30,3 +30,15 @@ typedef __UINT8_TYPE__ BYTE;
 typedef __UINT16_TYPE__ WORD;
 typedef __UINT32_TYPE__ DWORD;
 typedef __UINT64_TYPE__ QWORD;
+
+#ifdef __x86_64__
+#   define _M_AMD64
+#endif 
+
+#ifdef __aarch64__
+#   define _M_AARCH64
+#endif 
+
+#ifdef __powerpc64__
+#   define _M_PPC64
+#endif 
diff --git a/Public/Kits/SystemKit/FileAPI.hxx b/Public/Kits/SystemKit/FileAPI.hxx
index 7dc3dc74..cc91a8a5 100644
--- a/Public/Kits/SystemKit/FileAPI.hxx
+++ b/Public/Kits/SystemKit/FileAPI.hxx
@@ -15,6 +15,8 @@
 
 using namespace HCore;
 
+/// @brief OC class, translated to C++
+
 class HFile final {
  public:
   explicit HFile(const char *path);
diff --git a/Public/Kits/SystemKit/HeapAPI.hxx b/Public/Kits/SystemKit/HeapAPI.hxx
index e9bda42d..c4c4a297 100644
--- a/Public/Kits/SystemKit/HeapAPI.hxx
+++ b/Public/Kits/SystemKit/HeapAPI.hxx
@@ -12,6 +12,8 @@
 #include <CompilerKit/CompilerKit.hpp>
 #include <NewKit/Defines.hpp>
 
+/// @brief OC class, translated to C++
+
 using namespace HCore;
 
 class HMemoryException;
diff --git a/Public/Kits/SystemKit/XIFF.hxx b/Public/Kits/SystemKit/XIFF.hxx
index 665a8b67..c2a8371b 100644
--- a/Public/Kits/SystemKit/XIFF.hxx
+++ b/Public/Kits/SystemKit/XIFF.hxx
@@ -19,13 +19,13 @@
  * Used by XIFF based containers.
  */
 
-struct PACKED XiffHeader {
-  unsigned char mag[5];      // XIFF string (includes \0)
-  unsigned int size;         // overall size of header (XiffHeader) in bytes
-  unsigned int format_type;  // format type. generic
-  unsigned char specific_mag[4];      // The sub header magic
-  unsigned int specific_size;         // length of the format data
-  unsigned int specific_format_type;  // format type. generic
+struct PACKED XiffHeader final {
+  unsigned char f_Mag[5];      // XIFF string (includes \0)
+  unsigned int f_Size;         // overall size of header (XiffHeader) in bytes
+  unsigned int f_FormatType;  // format type. generic
+  unsigned char f_SpecificMag[4];      // The sub header magic
+  unsigned int f_SpecificSize;         // length of the format data
+  unsigned int f_SpecificFormatType;  // format type. generic
 };
 
 #define kXIFFVideo "XVFF"