10 files changed, 38 insertions, 21 deletions
diff --git a/Public/Kits/System.Core/Containers/XIFF.hxx b/Public/Kits/System.Core/Containers/XIFF.hxx
index dbfe5b04..002d05f4 100644
--- a/Public/Kits/System.Core/Containers/XIFF.hxx
+++ b/Public/Kits/System.Core/Containers/XIFF.hxx
@@ -12,7 +12,7 @@
 
 ------------------------------------------------------- */
 
-#include <System.Core/CoreAPI.hxx>
+#include <System.Core/Defs.hxx>
 
 /// @brief four-character code for XIFF.
 #define kFourCCLength_XIFF 4
diff --git a/Public/Kits/System.Core/CoreAPI.hxx b/Public/Kits/System.Core/Defs.hxx
index 66d356d7..3ebe5c2c 100644
--- a/Public/Kits/System.Core/CoreAPI.hxx
+++ b/Public/Kits/System.Core/Defs.hxx
@@ -14,11 +14,26 @@
 #undef CA_MUST_PASS
 #endif
 
-// unused by user side, it's a kernel thing.
-#define CA_MUST_PASS(e) ((void)e)
+#define CA_UNREFERENCED_PARAMETER(e) ((void)e)
+
+/// Assertion macros.
+
+#ifdef _DEBUG
+#define CA_MUST_PASS(e) __assert(e)
+#else
+#define CA_MUST_PASS(e) CA_UNREFERENCED_PARAMETER(e)
+#endif
+
+#ifdef __cplusplus
 
 #define CA_EXTERN_C extern "C"
 
+#else
+
+#define CA_EXTERN_C extern
+
+#endif
+
 #define CA_STDCALL __attribute__((stdcall))
 #define CA_CDECL __attribute__((cdecl))
 #define CA_MSCALL __attribute__((ms_abi))
@@ -53,4 +68,10 @@ typedef WCHAR* PWCHAR;
 #endif 
 
 #define CA_STATIC static
-#define CA_INLINE inline
-\ No newline at end of file
+#define CA_INLINE inline
+
+#ifdef __cplusplus
+#define CA_CONSTEXPR constexpr
+#else
+#define CA_CONSTEXPR
+#endif // __cplusplus
diff --git a/Public/Kits/System.Core/FileAPI.hxx b/Public/Kits/System.Core/File.hxx
index 2f799330..2f799330 100644
--- a/Public/Kits/System.Core/FileAPI.hxx
+++ b/Public/Kits/System.Core/File.hxx
diff --git a/Public/Kits/System.Core/HCoreBase.hxx b/Public/Kits/System.Core/HCoreBase.hxx
index c8a3a99c..5bb6f9af 100644
--- a/Public/Kits/System.Core/HCoreBase.hxx
+++ b/Public/Kits/System.Core/HCoreBase.hxx
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <System.Core/CoreAPI.hxx>
+#include <System.Core/Defs.hxx>
 
 typedef struct HcObject {
   void(*Release)(void);
diff --git a/Public/Kits/System.Core/HeapAPI.cxx b/Public/Kits/System.Core/Heap.cxx
index 232b4927..c7401aad 100644
--- a/Public/Kits/System.Core/HeapAPI.cxx
+++ b/Public/Kits/System.Core/Heap.cxx
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <System.Core/HeapAPI.hxx>
-#include <System.Core/hcore.h>
+#include <System.Core/Heap.hxx>
+#include <System.Core/System.Core.hxx>
 
 using namespace HCore;
 using namespace System;
diff --git a/Public/Kits/System.Core/HeapAPI.hxx b/Public/Kits/System.Core/Heap.hxx
index f50ff6f7..292a1227 100644
--- a/Public/Kits/System.Core/HeapAPI.hxx
+++ b/Public/Kits/System.Core/Heap.hxx
@@ -6,17 +6,13 @@
 
 #pragma once
 
+#include <System.Core/Defs.hxx>
 #include <CompilerKit/CompilerKit.hxx>
-#include <NewKit/Defines.hpp>
-
-/// @brief SOM class, translated to C++
-
-using namespace HCore;
 
 namespace System {
 class MemoryException;
 
-typedef VoidPtr HeapPtr;
+typedef PVOID HeapPtr;
 
 enum {
   kHeapExpandable = 2,
@@ -58,7 +54,7 @@ class MemoryException final {
   const char *Reason();
 
  private:
-  const char *mReason{"HeapAPI: Memory Exception!"};
+  const char *mReason{"System.Core: Process Heap Exception: Catastrophic failure!"};
 
  private:
   friend Heap;
diff --git a/Public/Kits/System.Core/hcore.h b/Public/Kits/System.Core/System.Core.hxx
index b368b997..b368b997 100644
--- a/Public/Kits/System.Core/hcore.h
+++ b/Public/Kits/System.Core/System.Core.hxx
diff --git a/Public/Kits/System.Core/System.hxx b/Public/Kits/System.Core/System.hxx
index 97d4bdac..37cab4a4 100644
--- a/Public/Kits/System.Core/System.hxx
+++ b/Public/Kits/System.Core/System.hxx
@@ -10,9 +10,9 @@
 
 ------------------------------------------------------- */
 
-#include <System.Core/CoreAPI.hxx>
-#include <System.Core/FileAPI.hxx>
-#include <System.Core/HeapAPI.hxx>
+#include <System.Core/Defs.hxx>
+#include <System.Core/File.hxx>
+#include <System.Core/Heap.hxx>
 #include <System.Core/ThreadAPI.hxx>
 
 using namespace HCore;
diff --git a/Public/Kits/System.Graphics/Core.hxx b/Public/Kits/System.Graphics/Core.hxx
index d0f62418..43751891 100644
--- a/Public/Kits/System.Graphics/Core.hxx
+++ b/Public/Kits/System.Graphics/Core.hxx
@@ -22,7 +22,7 @@
 
 #define $() HCore::GApplication::Shared()->Document()
 
-#ifdef __IMPORT_LIB
+#ifndef __EXPORT_LIB
 #define G_API __attribute__((pef_container(".IMPORT")))
 #else
 #define G_API __attribute__((pef_container(".EXPORT")))
@@ -167,11 +167,11 @@ class GException final {
   HCORE_COPY_DEFAULT(GException);
 
  public:
-  const char* Name() { return "GUI Error"; }
+  const char* Name() { return "User Interface error."; }
   const char* Reason() { return mReason; }
 
  private:
-  const char* mReason{"CoreAPI: GUI Exception!"};
+  const char* mReason{"System.Graphics: User Interface error. Check HError."};
 };
 
 template <typename GFrameType, typename GFrameBase>
diff --git a/Public/Kits/System.Zip/Zip.cxx b/Public/Kits/System.Zip/Zip.cxx
index 39818da7..1e4a28cb 100644
--- a/Public/Kits/System.Zip/Zip.cxx
+++ b/Public/Kits/System.Zip/Zip.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <System.Zip/Zip.hpp>
-#include <System.Core/CoreAPI.hxx>
+#include <System.Core/Defs.hxx>
 
 #define kInitialSz 4096