diff --git a/src/lib/system/darwin/clang/x86_64/SYSTEM.h b/src/lib/system/darwin/clang/x86_64/SYSTEM.h
index 71ec724f..db32127b 100644
--- a/src/lib/system/darwin/clang/x86_64/SYSTEM.h
+++ b/src/lib/system/darwin/clang/x86_64/SYSTEM.h
@@ -12,7 +12,6 @@ uses double # as concatenation operator
 */
 
 #include <alloca.h>
-#include <stdint.h> /* for type sizes -- noch */
 //#include <string.h>
 
 extern void *memcpy(void *dest, const void *src, unsigned long n);
@@ -53,10 +52,6 @@ typedef void *SYSTEM_PTR;
 //#define *SYSTEM_PTR void
 //typedef unsigned char SYSTEM_BYTE;
 #define SYSTEM_BYTE unsigned char
-typedef int8_t SYSTEM_INT8;
-typedef int16_t SYSTEM_INT16;
-typedef int32_t SYSTEM_INT32;
-typedef int64_t SYSTEM_INT64;
 
 /* runtime system routines */
 extern long SYSTEM_DIV();
diff --git a/src/lib/system/freebsd/clang/x86_64/SYSTEM.h b/src/lib/system/freebsd/clang/x86_64/SYSTEM.h
index 90bdadd4..4d4b47c5 100644
--- a/src/lib/system/freebsd/clang/x86_64/SYSTEM.h
+++ b/src/lib/system/freebsd/clang/x86_64/SYSTEM.h
@@ -12,7 +12,6 @@ uses double # as concatenation operator
 */
 #include <stdlib.h>
 //#include <alloca.h>
-#include <stdint.h> /* for type sizes -- noch */
 //#include <string.h>
 
 extern void *memcpy(void *dest, const void *src, unsigned long n);
@@ -53,10 +52,6 @@ typedef void *SYSTEM_PTR;
 //#define *SYSTEM_PTR void
 //typedef unsigned char SYSTEM_BYTE;
 #define SYSTEM_BYTE unsigned char
-typedef int8_t SYSTEM_INT8;
-typedef int16_t SYSTEM_INT16;
-typedef int32_t SYSTEM_INT32;
-typedef int64_t SYSTEM_INT64;
 
 /* runtime system routines */
 extern long SYSTEM_DIV();
diff --git a/src/lib/system/linux/clang/armv6j_hardfp/SYSTEM.h b/src/lib/system/linux/clang/armv6j_hardfp/SYSTEM.h
index ea9ae5d6..719a6d18 100644
--- a/src/lib/system/linux/clang/armv6j_hardfp/SYSTEM.h
+++ b/src/lib/system/linux/clang/armv6j_hardfp/SYSTEM.h
@@ -12,7 +12,6 @@ uses double # as concatenation operator
 */
 
 #include <alloca.h>
-#include <stdint.h> /* for type sizes -- noch */
 
 //extern void *memcpy(void *dest, const void *src, long n);
 extern void *memcpy(void *dest, const void *src, size_t n);
@@ -38,10 +37,6 @@ typedef double LONGREAL;
 typedef unsigned long SET;
 typedef void *SYSTEM_PTR;
 typedef unsigned char SYSTEM_BYTE;
-typedef int8_t SYSTEM_INT8;
-typedef int16_t SYSTEM_INT16;
-typedef int32_t SYSTEM_INT32;
-typedef int64_t SYSTEM_INT64;
 
 /* runtime system routines */
 extern long SYSTEM_DIV();
diff --git a/src/lib/system/linux/clang/powerpc/SYSTEM.h b/src/lib/system/linux/clang/powerpc/SYSTEM.h
index ea9ae5d6..719a6d18 100644
--- a/src/lib/system/linux/clang/powerpc/SYSTEM.h
+++ b/src/lib/system/linux/clang/powerpc/SYSTEM.h
@@ -12,7 +12,6 @@ uses double # as concatenation operator
 */
 
 #include <alloca.h>
-#include <stdint.h> /* for type sizes -- noch */
 
 //extern void *memcpy(void *dest, const void *src, long n);
 extern void *memcpy(void *dest, const void *src, size_t n);
@@ -38,10 +37,6 @@ typedef double LONGREAL;
 typedef unsigned long SET;
 typedef void *SYSTEM_PTR;
 typedef unsigned char SYSTEM_BYTE;
-typedef int8_t SYSTEM_INT8;
-typedef int16_t SYSTEM_INT16;
-typedef int32_t SYSTEM_INT32;
-typedef int64_t SYSTEM_INT64;
 
 /* runtime system routines */
 extern long SYSTEM_DIV();
diff --git a/src/lib/system/linux/clang/x86/SYSTEM.h b/src/lib/system/linux/clang/x86/SYSTEM.h
index ea9ae5d6..719a6d18 100644
--- a/src/lib/system/linux/clang/x86/SYSTEM.h
+++ b/src/lib/system/linux/clang/x86/SYSTEM.h
@@ -12,7 +12,6 @@ uses double # as concatenation operator
 */
 
 #include <alloca.h>
-#include <stdint.h> /* for type sizes -- noch */
 
 //extern void *memcpy(void *dest, const void *src, long n);
 extern void *memcpy(void *dest, const void *src, size_t n);
@@ -38,10 +37,6 @@ typedef double LONGREAL;
 typedef unsigned long SET;
 typedef void *SYSTEM_PTR;
 typedef unsigned char SYSTEM_BYTE;
-typedef int8_t SYSTEM_INT8;
-typedef int16_t SYSTEM_INT16;
-typedef int32_t SYSTEM_INT32;
-typedef int64_t SYSTEM_INT64;
 
 /* runtime system routines */
 extern long SYSTEM_DIV();
diff --git a/src/lib/system/linux/clang/x86_64/SYSTEM.h b/src/lib/system/linux/clang/x86_64/SYSTEM.h
index 2c8e71d0..c0cd257a 100644
--- a/src/lib/system/linux/clang/x86_64/SYSTEM.h
+++ b/src/lib/system/linux/clang/x86_64/SYSTEM.h
@@ -12,7 +12,6 @@ uses double # as concatenation operator
 */
 
 #include <alloca.h>
-#include <stdint.h> /* for type sizes -- noch */
 
 extern void *memcpy(void *dest, const void *src, unsigned long n);
 extern void *malloc(unsigned long size);
@@ -52,10 +51,6 @@ typedef void *SYSTEM_PTR;
 //#define *SYSTEM_PTR void
 //typedef unsigned char SYSTEM_BYTE;
 #define SYSTEM_BYTE unsigned char
-typedef int8_t SYSTEM_INT8;
-typedef int16_t SYSTEM_INT16;
-typedef int32_t SYSTEM_INT32;
-typedef int64_t SYSTEM_INT64;
 
 /* runtime system routines */
 extern long SYSTEM_DIV();
diff --git a/src/lib/system/linux/gcc/armv6j_hardfp/SYSTEM.h b/src/lib/system/linux/gcc/armv6j_hardfp/SYSTEM.h
index ea9ae5d6..719a6d18 100644
--- a/src/lib/system/linux/gcc/armv6j_hardfp/SYSTEM.h
+++ b/src/lib/system/linux/gcc/armv6j_hardfp/SYSTEM.h
@@ -12,7 +12,6 @@ uses double # as concatenation operator
 */
 
 #include <alloca.h>
-#include <stdint.h> /* for type sizes -- noch */
 
 //extern void *memcpy(void *dest, const void *src, long n);
 extern void *memcpy(void *dest, const void *src, size_t n);
@@ -38,10 +37,6 @@ typedef double LONGREAL;
 typedef unsigned long SET;
 typedef void *SYSTEM_PTR;
 typedef unsigned char SYSTEM_BYTE;
-typedef int8_t SYSTEM_INT8;
-typedef int16_t SYSTEM_INT16;
-typedef int32_t SYSTEM_INT32;
-typedef int64_t SYSTEM_INT64;
 
 /* runtime system routines */
 extern long SYSTEM_DIV();
diff --git a/src/lib/system/linux/gcc/powerpc/SYSTEM.h b/src/lib/system/linux/gcc/powerpc/SYSTEM.h
index ea9ae5d6..719a6d18 100644
--- a/src/lib/system/linux/gcc/powerpc/SYSTEM.h
+++ b/src/lib/system/linux/gcc/powerpc/SYSTEM.h
@@ -12,7 +12,6 @@ uses double # as concatenation operator
 */
 
 #include <alloca.h>
-#include <stdint.h> /* for type sizes -- noch */
 
 //extern void *memcpy(void *dest, const void *src, long n);
 extern void *memcpy(void *dest, const void *src, size_t n);
@@ -38,10 +37,6 @@ typedef double LONGREAL;
 typedef unsigned long SET;
 typedef void *SYSTEM_PTR;
 typedef unsigned char SYSTEM_BYTE;
-typedef int8_t SYSTEM_INT8;
-typedef int16_t SYSTEM_INT16;
-typedef int32_t SYSTEM_INT32;
-typedef int64_t SYSTEM_INT64;
 
 /* runtime system routines */
 extern long SYSTEM_DIV();
diff --git a/src/lib/system/linux/gcc/x86/SYSTEM.h b/src/lib/system/linux/gcc/x86/SYSTEM.h
index ea9ae5d6..719a6d18 100644
--- a/src/lib/system/linux/gcc/x86/SYSTEM.h
+++ b/src/lib/system/linux/gcc/x86/SYSTEM.h
@@ -12,7 +12,6 @@ uses double # as concatenation operator
 */
 
 #include <alloca.h>
-#include <stdint.h> /* for type sizes -- noch */
 
 //extern void *memcpy(void *dest, const void *src, long n);
 extern void *memcpy(void *dest, const void *src, size_t n);
@@ -38,10 +37,6 @@ typedef double LONGREAL;
 typedef unsigned long SET;
 typedef void *SYSTEM_PTR;
 typedef unsigned char SYSTEM_BYTE;
-typedef int8_t SYSTEM_INT8;
-typedef int16_t SYSTEM_INT16;
-typedef int32_t SYSTEM_INT32;
-typedef int64_t SYSTEM_INT64;
 
 /* runtime system routines */
 extern long SYSTEM_DIV();
diff --git a/src/lib/system/linux/gcc/x86_64/SYSTEM.h b/src/lib/system/linux/gcc/x86_64/SYSTEM.h
index 2c8e71d0..bda47b9d 100644
--- a/src/lib/system/linux/gcc/x86_64/SYSTEM.h
+++ b/src/lib/system/linux/gcc/x86_64/SYSTEM.h
@@ -12,8 +12,7 @@ uses double # as concatenation operator
 */
 
 #include <alloca.h>
-#include <stdint.h> /* for type sizes -- noch */
-
+#include <stdint.h>
 extern void *memcpy(void *dest, const void *src, unsigned long n);
 extern void *malloc(unsigned long size);
 extern void exit(int status);
@@ -52,11 +51,10 @@ typedef void *SYSTEM_PTR;
 //#define *SYSTEM_PTR void
 //typedef unsigned char SYSTEM_BYTE;
 #define SYSTEM_BYTE unsigned char
-typedef int8_t SYSTEM_INT8;
-typedef int16_t SYSTEM_INT16;
-typedef int32_t SYSTEM_INT32;
-typedef int64_t SYSTEM_INT64;
-
+#define SYSTEM_INT8 int8_t
+#define SYSTEM_INT16 int16_t
+#define SYSTEM_INT32 int32_t
+#define SYSTEM_INT64 int64_t
 /* runtime system routines */
 extern long SYSTEM_DIV();
 extern long SYSTEM_MOD();
diff --git a/voc b/voc
index 45b2d272..70f95b7f 100755
Binary files a/voc and b/voc differ
diff --git a/vocstatic.linux.gcc.armv6j_hardfp b/vocstatic.linux.gcc.armv6j_hardfp
index f7898249..298e0f0f 100755
Binary files a/vocstatic.linux.gcc.armv6j_hardfp and b/vocstatic.linux.gcc.armv6j_hardfp differ
diff --git a/vocstatic.linux.gcc.x86 b/vocstatic.linux.gcc.x86
index a823b7bd..4bacfbff 100755
Binary files a/vocstatic.linux.gcc.x86 and b/vocstatic.linux.gcc.x86 differ
diff --git a/vocstatic.linux.gcc.x86_64 b/vocstatic.linux.gcc.x86_64
index 45b2d272..7ce73aa1 100755
Binary files a/vocstatic.linux.gcc.x86_64 and b/vocstatic.linux.gcc.x86_64 differ