Progress, but it still doesn't build. I think I'm close, now...

src/c/payloads/cons.c

@@ -12,6 +12,7 @@
 #include "memory/node.h"
 #include "memory/pointer.h"
 #include "memory/pso.h"
+#include "memory/pso2.h"
 #include "payloads/cons.h"
 
 /**

src/c/payloads/stack.c

@@ -8,12 +8,10 @@
  */
 
 #include "memory/node.h"
-#include "memory/pso.h"
+#include "memory/pso2.h"
+#include "memory/pso4.h"
 #include "payloads/stack.h"
 
-#define STACKTAG "STK"
-#define STACKTV  4936787
-
 /** 
  * @brief The maximum depth of stack before we throw an exception.
  *

src/c/payloads/stack.h

@@ -13,8 +13,9 @@
 #define __psse_payloads_stack_h
 
 #include "memory/pointer.h"
-#include "memory/pso2.h"
-#include "memory/pso4.h"
+
+#define STACKTAG "STK"
+#define STACKTV  4936787
 
 /*
  * number of arguments stored in a stack frame

src/c/payloads/time.h

@@ -26,7 +26,7 @@
  * convenience, 14Bn years before 1st Jan 1970 (the UNIX epoch))
  */
 struct time_payload {
-    unsigned __int128 value;
+    unsigned __int128_t value;
 };
 
 #endif