diff --git a/project/include/hl.h b/project/include/hl.h
index d7c10343b..3205a1cf8 100644
--- a/project/include/hl.h
+++ b/project/include/hl.h
@@ -237,6 +237,12 @@ typedef uint16_t char16_t;
 typedef uint32_t char32_t;
 #elif defined(HL_NATIVE_UCHAR_FUN)
 #	include <uchar.h>
+#elif __cplusplus <= 199711L
+#	include <stdint.h>
+typedef int16_t char16_t;
+typedef uint16_t uchar16_t;
+typedef int32_t char32_t;
+typedef uint32_t uchar32_t;
 #endif
 typedef char16_t uchar;
 #	undef USTR
diff --git a/project/include/system/CFFI.h b/project/include/system/CFFI.h
index 99cf83de8..d0f2b18b9 100644
--- a/project/include/system/CFFI.h
+++ b/project/include/system/CFFI.h
@@ -15,6 +15,9 @@ typedef vdynobj hl_vdynobj;
 typedef venum hl_venum;
 typedef vstring hl_vstring;
 
+#undef hl_aptr
+#define hl_aptr(a,t)	((t*)(((hl_varray*)(a))+1))
+
 
 #include <hx/CFFIPrime.h>