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.REMOVED.git-id b/voc.REMOVED.git-id
index c25c3f8c..d07e9f07 100644
--- a/voc.REMOVED.git-id
+++ b/voc.REMOVED.git-id
@@ -1 +1 @@
-45b2d2727e8f8537a182291c49032f1618ecc880
\ No newline at end of file
+70f95b7f098514cbf57aeb0108e969c76033c940
\ No newline at end of file
diff --git a/vocstatic.linux.gcc.armv6j_hardfp.REMOVED.git-id b/vocstatic.linux.gcc.armv6j_hardfp.REMOVED.git-id
index 1d45646a..597234dd 100644
--- a/vocstatic.linux.gcc.armv6j_hardfp.REMOVED.git-id
+++ b/vocstatic.linux.gcc.armv6j_hardfp.REMOVED.git-id
@@ -1 +1 @@
-f7898249327a77d199e3b9cc1a85f7b788d8ba1e
\ No newline at end of file
+298e0f0fec276d16d090e85b34af3341fc6f2f0e
\ No newline at end of file
diff --git a/vocstatic.linux.gcc.x86.REMOVED.git-id b/vocstatic.linux.gcc.x86.REMOVED.git-id
index 870508a2..ffe4fb7a 100644
--- a/vocstatic.linux.gcc.x86.REMOVED.git-id
+++ b/vocstatic.linux.gcc.x86.REMOVED.git-id
@@ -1 +1 @@
-a823b7bda0ccc984d4832ab10c73fe590f45367f
\ No newline at end of file
+4bacfbffebb82fe3863b5e4a6460310b75d6c19c
\ No newline at end of file
diff --git a/vocstatic.linux.gcc.x86_64.REMOVED.git-id b/vocstatic.linux.gcc.x86_64.REMOVED.git-id
index c25c3f8c..617b79d7 100644
--- a/vocstatic.linux.gcc.x86_64.REMOVED.git-id
+++ b/vocstatic.linux.gcc.x86_64.REMOVED.git-id
@@ -1 +1 @@
-45b2d2727e8f8537a182291c49032f1618ecc880
\ No newline at end of file
+7ce73aa13bfab8e21eda71e0e351d5d5395e6bd3
\ No newline at end of file