diff --git a/compiler/C_CodeGen.jrag b/compiler/C_CodeGen.jrag
index 008bf70042672734c06980143a43b6bcdd79c29a..d14895095392a1e7bdff9270a7cf72ec8aa1efa7 100644
--- a/compiler/C_CodeGen.jrag
+++ b/compiler/C_CodeGen.jrag
@@ -161,7 +161,7 @@ aspect C_CodeGen {
     env.println("");
 
     // Include
-    env.println("#include <stdint.h>");
+    // env.println("#include <stdint.h>");
     env.println("#include \"labcomm.h\"");
     for (int i = 0 ; i < includes.size() ; i++) {
       env.println("#include \"" + includes.get(i) + "\"");
diff --git a/lib/c/labcomm_compat_vxworks.h b/lib/c/labcomm_compat_vxworks.h
index 00a2b5acf931475e22533ab52502dd8fe5a6a8ac..c5c1572eca289fe2a5baa4d72145a33c9bc2791e 100644
--- a/lib/c/labcomm_compat_vxworks.h
+++ b/lib/c/labcomm_compat_vxworks.h
@@ -6,8 +6,16 @@
 #endif
 
 #include <types/vxTypes.h>
+#include <selectLib.h>
+#include <types.h>
+#include <timers.h>
 #include <stdio.h>
 
+#ifdef __INT64_MAX__
+#undef INT64_MAX
+#define INT64_MAX __INT64_MAX__
+#endif
+
 #if (CPU == PPC603)
   #undef _LITTLE_ENDIAN
 #endif
diff --git a/lib/c/labcomm_decoder.c b/lib/c/labcomm_decoder.c
index 0606e6fd18a424963830a5e3eb59a12adfdcd065..559cb21926bfeb734beb8696b216239f3e2f89d6 100644
--- a/lib/c/labcomm_decoder.c
+++ b/lib/c/labcomm_decoder.c
@@ -199,9 +199,9 @@ static int decode_typedef_or_sample(struct labcomm_decoder *d, int kind)
 		     LABCOMM_IOCTL_WRITER_GET_BYTES_WRITTEN,
 		     &signature.size);
   if (err < 0) {
-    /* fprintf(stderr, "Failed to get size: %s\n", strerror(-err)); */
-    labcomm_error_warning(d->error, LABCOMM_ERROR_BAD_WRITER,
-			  "Failed to get size: %s\n", strerror(-err));
+	printf("Failed to get size: %s\n", strerror(-err));
+    /* labcomm_error_fatal_global(LABCOMM_ERROR_BAD_WRITER, */
+    /* 			  "Failed to get size: %s\n", strerror(-err)); */
     result = -ENOENT;
     goto free_signature_name;
   }
@@ -209,9 +209,9 @@ static int decode_typedef_or_sample(struct labcomm_decoder *d, int kind)
 		     LABCOMM_IOCTL_WRITER_GET_BYTE_POINTER,
 		     &signature.signature);
   if (err < 0) {
-    /* fprintf(stderr, "Failed to get pointer: %s\n", strerror(-err)); */
-    labcomm_error_warning(d->error, LABCOMM_ERROR_BAD_WRITER,
-			  "Failed to get pointer: %s\n", strerror(-err));
+    printf("Failed to get pointer: %s\n", strerror(-err));
+    /* labcomm_error_fatal_global(LABCOMM_ERROR_BAD_WRITER, */
+    /* 			  "Failed to get pointer: %s\n", strerror(-err)); */
     result = -ENOENT;
     goto free_signature_name;
   }
diff --git a/lib/c/labcomm_error.c b/lib/c/labcomm_error.c
index 278c5f3549f4df229bba97cde7fa08bd89e12ea3..9cae3e73508b1c4b14d2dc94bc766e75501bd28b 100644
--- a/lib/c/labcomm_error.c
+++ b/lib/c/labcomm_error.c
@@ -27,6 +27,6 @@ void labcomm_error_fatal_global(enum labcomm_error error,
 				char *format,
 				...)
 {
-  fprintf(stderr, "Fatal error %d\n", error);
+  printf("Fatal error %d\n", error);
   exit(1);
 }