diff --git a/src/backend.c b/src/backend.c
index 6c4bf106f5ebf6228dd220b51e337dfbe01970ba..c2cee4a597745c920120250b5af6c937a996c572 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: backend.c,v 1.11 1997/05/19 09:28:41 hubbe Exp $");
+RCSID("$Id: backend.c,v 1.12 1997/05/19 22:48:05 hubbe Exp $");
 #include "backend.h"
 #include <errno.h>
 #ifdef HAVE_SYS_TYPES_H
@@ -14,7 +14,6 @@ RCSID("$Id: backend.c,v 1.11 1997/05/19 09:28:41 hubbe Exp $");
 #include <string.h>
 #include "interpret.h"
 #include "object.h"
-#include "types.h"
 #include "error.h"
 #include "fd_control.h"
 #include "main.h"
diff --git a/src/dynamic_buffer.h b/src/dynamic_buffer.h
index 50d6fce474e2549a490487fb47988dad10128159..2858274a0a47367f536ec6c28868b27d03375681 100644
--- a/src/dynamic_buffer.h
+++ b/src/dynamic_buffer.h
@@ -8,8 +8,6 @@
 
 #define BUFFER_BEGIN_SIZE 4080
 
-#include "types.h"
-
 struct string_s
 {
   char *str;
diff --git a/src/efun.h b/src/efun.h
index f7e0c60b397cd6adebdf9a6957fa93360c8d1d1c..368a3a688ed8f3436f13035d9f88e893a8301dc4 100644
--- a/src/efun.h
+++ b/src/efun.h
@@ -6,8 +6,6 @@
 #ifndef EFUN_H
 #define EFUN_H
 
-#include "types.h"
-
 typdef void (*efun_t) (INT32);
 
 /* I need:
diff --git a/src/encode.c b/src/encode.c
index 300436c193ade30fb5ae78110cf2184daa3e426a..12e9c3127dd79a341da702def84e4aa3ef000cee 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -5,7 +5,6 @@
 \*/
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/gc.h b/src/gc.h
index 8bf24ac20e346ee332244c8b4d3b830cf6300ce1..74876eec46d8ab3b9817e6cad2635ff2cc2fbdb3 100644
--- a/src/gc.h
+++ b/src/gc.h
@@ -3,8 +3,7 @@
 
 #ifdef GC2
 
-#include "types.h"
-#include "callback.h"
+#include "global.h"
 
 extern INT32 num_objects;
 extern INT32 num_allocs;
diff --git a/src/global.h b/src/global.h
index 2a14b28e799b43428411fe581a708d841d366228..21585e30dfd77c913580acb2c729b76c97679ed4 100644
--- a/src/global.h
+++ b/src/global.h
@@ -107,6 +107,42 @@ char *alloca ();
 #define INLINE
 #endif
 
+/* we here define a few types with more defined values */
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#undef HAVE_LIMITS_H
+#endif
+
+#define INT64 long long
+
+#if SIZEOF_SHORT >= 4
+#define INT32 short
+#else
+#if SIZEOF_INT >= 4
+#define INT32 int
+#else
+#define INT32 long
+#endif
+#endif
+
+#define INT16 short
+#define INT8 char
+
+#define SIZE_T unsigned INT32
+
+#define TYPE_T unsigned INT8
+#define TYPE_FIELD unsigned INT16
+
+#define FLOAT_TYPE float
+
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#undef HAVE_SYS_TYPES_H
+#endif
+
+
 #include "port.h"
 
 
diff --git a/src/hashtable.h b/src/hashtable.h
index c5271c188ecf6dbe3d017b69631e23f556e523ad..3d2ad14188b135a820c442cc3042a4ca7b46638e 100644
--- a/src/hashtable.h
+++ b/src/hashtable.h
@@ -6,7 +6,7 @@
 #ifndef HASHTABLE_H
 #define HASHTABLE_H
 
-#include "types.h"
+#include "global.h"
 
 #define AVERAGE_HASH_LENGTH 16
 #define NEW_HASHTABLE_SIZE 4
diff --git a/src/las.h b/src/las.h
index 078670474766d8fde6c66d094b511c50d5441205..b92cc7b2ed427fd0add9397865c376ce2dfa1ca9 100644
--- a/src/las.h
+++ b/src/las.h
@@ -7,7 +7,6 @@
 #define LAS_H
 
 #include "global.h"
-#include "types.h"
 #include "svalue.h"
 #include "dynamic_buffer.h"
 #include "program.h"
diff --git a/src/main.c b/src/main.c
index c780f60a94ede77cd1c75b2b7472fc38781d4a77..8379bf57e93ac01b8cbfde91c6191618101ee1a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4,8 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: main.c,v 1.21 1997/04/16 03:09:13 hubbe Exp $");
-#include "types.h"
+RCSID("$Id: main.c,v 1.22 1997/05/19 22:48:07 hubbe Exp $");
 #include "backend.h"
 #include "module.h"
 #include "object.h"
diff --git a/src/mapping.c b/src/mapping.c
index 82a95a0f3f8370dcf7b29c3ed833447b01f2f337..4e23c21d60e0ff1a2b1e831be309ce719c0bb302 100644
--- a/src/mapping.c
+++ b/src/mapping.c
@@ -4,9 +4,8 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mapping.c,v 1.18 1997/04/23 23:06:16 hubbe Exp $");
+RCSID("$Id: mapping.c,v 1.19 1997/05/19 22:48:08 hubbe Exp $");
 #include "main.h"
-#include "types.h"
 #include "object.h"
 #include "mapping.h"
 #include "svalue.h"
diff --git a/src/memory.h b/src/memory.h
index 67bd3403351dd6c10f0a7ddbd076d0d2eb7116de..e53a9fe6ef9d676fa3f6634ceed07be7f49ab81f 100644
--- a/src/memory.h
+++ b/src/memory.h
@@ -6,7 +6,7 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-#include "types.h"
+#include "global.h"
 
 #define MEMSEARCH_LINKS 512
 
diff --git a/src/module.h b/src/module.h
index 85c5d5a216a71cb03f70e5d3b8949de8a6342976..006fd2b5aa935a2f866541fb5786e5060dcf4495 100644
--- a/src/module.h
+++ b/src/module.h
@@ -6,8 +6,6 @@
 #ifndef MODULE_H
 #define MODULE_H
 
-#include "types.h"
-
 /* Prototypes begin here */
 struct static_module;
 void init_modules(void);
diff --git a/src/modules/Gdbm/gdbmmod.c b/src/modules/Gdbm/gdbmmod.c
index 1f269fbb49e90066f733be03b566982c582ef520..7a5e2a7a808c253e0ab77a500794061b4f1ee34a 100644
--- a/src/modules/Gdbm/gdbmmod.c
+++ b/src/modules/Gdbm/gdbmmod.c
@@ -4,9 +4,8 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: gdbmmod.c,v 1.2 1997/03/17 03:06:36 hubbe Exp $");
+RCSID("$Id: gdbmmod.c,v 1.3 1997/05/19 22:48:34 hubbe Exp $");
 #include "gdbm_machine.h"
-#include "types.h"
 #include "threads.h"
 
 /* Todo: make sure only one thread accesses the same gdbmmod */
diff --git a/src/modules/Gmp/mpz_glue.c b/src/modules/Gmp/mpz_glue.c
index e28c580b31235c9d05acb78042012c0ec143fc1f..1ed2123be94ea90a2f8c596d786b6a87f3149142 100644
--- a/src/modules/Gmp/mpz_glue.c
+++ b/src/modules/Gmp/mpz_glue.c
@@ -4,9 +4,8 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mpz_glue.c,v 1.17 1997/05/15 17:36:01 grubba Exp $");
+RCSID("$Id: mpz_glue.c,v 1.18 1997/05/19 22:48:54 hubbe Exp $");
 #include "gmp_machine.h"
-#include "types.h"
 
 #if !defined(HAVE_LIBGMP)
 #undef HAVE_GMP_H
diff --git a/src/modules/Gz/zlibmod.c b/src/modules/Gz/zlibmod.c
index 5a9551f0b57014b868b2bd9a101e757f846f56c2..723afe9f55679210734a70454b72eeffb5fe89a5 100644
--- a/src/modules/Gz/zlibmod.c
+++ b/src/modules/Gz/zlibmod.c
@@ -4,10 +4,9 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: zlibmod.c,v 1.7 1997/04/07 03:26:31 hubbe Exp $");
+RCSID("$Id: zlibmod.c,v 1.8 1997/05/19 22:49:09 hubbe Exp $");
 
 #include "zlib_machine.h"
-#include "types.h"
 
 #if !defined(HAVE_LIBZ) && !defined(HAVE_LIBGZ)
 #undef HAVE_ZLIB_H
diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index 52726e222b8f303fc5effbe0189ce47ec0b52ea3..0fb1976871e538db4b1962a04afbbdec7d16ee3a 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -1,4 +1,4 @@
-/* $Id: blit.c,v 1.8 1997/04/18 06:47:18 mirar Exp $ */
+/* $Id: blit.c,v 1.9 1997/05/19 22:50:24 hubbe Exp $ */
 #include "global.h"
 
 /*
@@ -11,7 +11,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index 89bdf2a924a342c2c2ed3a4b3967b9fefc4da485..c6a5294d1b392e20e014c69211a1d6794132bc14 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-/* $Id: colortable.c,v 1.1 1997/05/01 12:38:41 mirar Exp $ */
+/* $Id: colortable.c,v 1.2 1997/05/19 22:50:24 hubbe Exp $ */
 
 /*
 **! module Image
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/dct.c b/src/modules/Image/dct.c
index a7bab6da10d265f2568328deab114b1c5e14e2ed..9cd2cd5f1c2acd7d789e15dfb2423364dd0eb2c6 100644
--- a/src/modules/Image/dct.c
+++ b/src/modules/Image/dct.c
@@ -1,4 +1,4 @@
-/* $Id: dct.c,v 1.6 1997/04/30 01:45:57 mirar Exp $ */
+/* $Id: dct.c,v 1.7 1997/05/19 22:50:24 hubbe Exp $ */
 
 /*
 **! module Image
@@ -12,7 +12,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index 0f13ee4b231666740e577d4727effb6c23dff54e..7cd3de2af7e25b0e0b6b1b1bd32636b60fea6370 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -39,7 +39,7 @@
 **! see also: Image, Image.image
 */
 
-/* $Id: font.c,v 1.9 1997/04/19 12:33:47 mirar Exp $ */
+/* $Id: font.c,v 1.10 1997/05/19 22:50:25 hubbe Exp $ */
 
 #include "global.h"
 
@@ -60,7 +60,6 @@
 #include "config.h"
 
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index de5284943f8f67b7c742f29695a0a0bc3bfc0d00..61ad68553ca1a50a73d440bef75471a2a4ac1c0d 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.27 1997/05/14 00:40:57 per Exp $ */
+/* $Id: image.c,v 1.28 1997/05/19 22:50:25 hubbe Exp $ */
 
 /*
 **! module Image
@@ -100,8 +100,7 @@
 
 #include "stralloc.h"
 #include "global.h"
-RCSID("$Id: image.c,v 1.27 1997/05/14 00:40:57 per Exp $");
-#include "types.h"
+RCSID("$Id: image.c,v 1.28 1997/05/19 22:50:25 hubbe Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/matrix.c b/src/modules/Image/matrix.c
index 75ac84808cca57be3161b1c69030669cae5708dc..338e2899284d054d89e94912650908512d4324c9 100644
--- a/src/modules/Image/matrix.c
+++ b/src/modules/Image/matrix.c
@@ -1,4 +1,4 @@
-/* $Id: matrix.c,v 1.4 1997/04/03 07:00:26 mirar Exp $ */
+/* $Id: matrix.c,v 1.5 1997/05/19 22:50:26 hubbe Exp $ */
 
 /*
 **! module Image
@@ -12,7 +12,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/operator.c b/src/modules/Image/operator.c
index 378aae72506984d3fa7923095f508ba98dccc009..0b7f1f59e83eb394ee6039211a42dc473b0da70f 100644
--- a/src/modules/Image/operator.c
+++ b/src/modules/Image/operator.c
@@ -1,4 +1,4 @@
-/* $Id: operator.c,v 1.6 1997/05/01 13:29:48 mirar Exp $ */
+/* $Id: operator.c,v 1.7 1997/05/19 22:50:26 hubbe Exp $ */
 
 /*
 **! module Image
@@ -12,7 +12,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/pattern.c b/src/modules/Image/pattern.c
index 26c05921cec8b4740de7d8c67d42e57dcad61e11..2dd80e8624df7d3f4f5f4dd0007c0253c6a4c828 100644
--- a/src/modules/Image/pattern.c
+++ b/src/modules/Image/pattern.c
@@ -1,4 +1,4 @@
-/* $Id: pattern.c,v 1.3 1997/03/17 03:08:01 hubbe Exp $ */
+/* $Id: pattern.c,v 1.4 1997/05/19 22:50:26 hubbe Exp $ */
 
 #include "global.h"
 
@@ -7,7 +7,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/pnm.c b/src/modules/Image/pnm.c
index c837bccae2fdeef86b1e9bee3395d8fdf0ba233f..9ed34a94ceb5228d743771593440873377b55b8f 100644
--- a/src/modules/Image/pnm.c
+++ b/src/modules/Image/pnm.c
@@ -1,4 +1,4 @@
-/* $Id: pnm.c,v 1.3 1997/04/03 07:00:37 mirar Exp $ */
+/* $Id: pnm.c,v 1.4 1997/05/19 22:50:27 hubbe Exp $ */
 
 /*
 **! module Image
@@ -12,7 +12,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/polyfill.c b/src/modules/Image/polyfill.c
index 6a10e3c424133434a23971abce003076582318b4..5dbdc3c4142104c63f159aff025e695a3375e48a 100644
--- a/src/modules/Image/polyfill.c
+++ b/src/modules/Image/polyfill.c
@@ -6,7 +6,6 @@
 #include "config.h"
 
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/quant.c b/src/modules/Image/quant.c
index 2067fccddc6088ddf532b7757e8ac0d16abefd71..182dd345e279021b02e8e2f2f85d68733642f633 100644
--- a/src/modules/Image/quant.c
+++ b/src/modules/Image/quant.c
@@ -1,5 +1,5 @@
 #include <config.h>
-/* $Id: quant.c,v 1.7 1997/03/18 16:15:24 mirar Exp $ */
+/* $Id: quant.c,v 1.8 1997/05/19 22:50:27 hubbe Exp $ */
 
 /*
 
@@ -19,7 +19,6 @@ David K
 #include <stdlib.h>
 #endif
 
-#include "types.h"
 #include "error.h"
 #include "global.h"
 #include "array.h"
diff --git a/src/modules/Image/togif.c b/src/modules/Image/togif.c
index 4b31aeb62647b0c78891b127348e9de04f84c9d9..ed87496b768aaba610b3d53e07248511761cc6f7 100644
--- a/src/modules/Image/togif.c
+++ b/src/modules/Image/togif.c
@@ -4,7 +4,7 @@ togif
 
 Pontus Hagland, law@infovav.se
 
-$Id: togif.c,v 1.10 1997/05/07 23:07:14 per Exp $ 
+$Id: togif.c,v 1.11 1997/05/19 22:50:28 hubbe Exp $ 
 
 */
 
@@ -21,7 +21,6 @@ $Id: togif.c,v 1.10 1997/05/07 23:07:14 per Exp $
 #include "stralloc.h"
 #include "global.h"
 #include "threads.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/x.c b/src/modules/Image/x.c
index 2df655b808bdc0831040b0ae150a7df9417754da..2467c0019f9e35eb5b028c0d579fa56434915fbf 100644
--- a/src/modules/Image/x.c
+++ b/src/modules/Image/x.c
@@ -1,4 +1,4 @@
-/* $Id: x.c,v 1.8 1997/05/07 23:07:16 per Exp $ */
+/* $Id: x.c,v 1.9 1997/05/19 22:50:28 hubbe Exp $ */
 
 /*
 **! module Image
@@ -12,8 +12,7 @@
 
 #include "stralloc.h"
 #include "global.h"
-RCSID("$Id: x.c,v 1.8 1997/05/07 23:07:16 per Exp $");
-#include "types.h"
+RCSID("$Id: x.c,v 1.9 1997/05/19 22:50:28 hubbe Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/MIME/mime.c b/src/modules/MIME/mime.c
index 433827a94ce04c1b6d8edadd04d846e5d3f2e821..449cf116c5a979f0817af59c1f40463c9bcad8e7 100644
--- a/src/modules/MIME/mime.c
+++ b/src/modules/MIME/mime.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mime.c,v 1.8 1997/05/05 22:33:54 marcus Exp $
+ * $Id: mime.c,v 1.9 1997/05/19 22:51:08 hubbe Exp $
  *
  * RFC1521 functionality for Pike
  *
@@ -9,9 +9,8 @@
 #include "config.h"
 
 #include "global.h"
-RCSID("$Id: mime.c,v 1.8 1997/05/05 22:33:54 marcus Exp $");
+RCSID("$Id: mime.c,v 1.9 1997/05/19 22:51:08 hubbe Exp $");
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "program.h"
diff --git a/src/modules/Pipe/pipe.c b/src/modules/Pipe/pipe.c
index 9de668125daa96120cb746305b3b70a05533abf4..149bb51a9a7710a4c7cf610f572ba46e738c226e 100644
--- a/src/modules/Pipe/pipe.c
+++ b/src/modules/Pipe/pipe.c
@@ -20,10 +20,9 @@
 #include <fcntl.h>
 
 #include "global.h"
-RCSID("$Id: pipe.c,v 1.7 1997/05/07 23:07:17 per Exp $");
+RCSID("$Id: pipe.c,v 1.8 1997/05/19 22:51:33 hubbe Exp $");
 
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c
index acc7b881d48aa451544200de07f3f2c3436cc9a8..b1ecb995d05c933889a4f7315f13ddc9fcf64b96 100644
--- a/src/modules/Regexp/glue.c
+++ b/src/modules/Regexp/glue.c
@@ -9,7 +9,6 @@
 #endif /* HAVE_CONFIG_H */
 
 #include "global.h"
-#include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/Ssleay/ssleay.c b/src/modules/Ssleay/ssleay.c
index 39e3c5b7a6f8dfa8637b1d49ffdd0745abe29bab..4905f856db9a03046d1285b608bfea07ae1f7864 100644
--- a/src/modules/Ssleay/ssleay.c
+++ b/src/modules/Ssleay/ssleay.c
@@ -7,8 +7,7 @@
 #include "config.h"
 
 #include "global.h"
-RCSID("$Id: ssleay.c,v 1.4 1997/03/17 03:10:48 hubbe Exp $");
-#include "types.h"
+RCSID("$Id: ssleay.c,v 1.5 1997/05/19 22:52:03 hubbe Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/Yp/yp.c b/src/modules/Yp/yp.c
index 3e2a46bed85b7f6e5ef0b79308fae76b594fccc0..163afc9212dc8856e54d18bc953341a068f6ceaf 100644
--- a/src/modules/Yp/yp.c
+++ b/src/modules/Yp/yp.c
@@ -19,7 +19,6 @@
 #include "stralloc.h"
 #include "error.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/files/efuns.c b/src/modules/files/efuns.c
index a0b34014d384ae5905f49c1a168b482ec92b2e4d..53cb1350391b9863e32a78bac4d4d77d748ced88 100644
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -4,7 +4,6 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-#include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index aa3d9881b5eec47dc1f0ede709e079b6ca2ea31e..b3895cfdb813d49ddff9df1e70941fab20e3862c 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -6,8 +6,7 @@
 #define READ_BUFFER 8192
 
 #include "global.h"
-RCSID("$Id: file.c,v 1.38 1997/05/19 09:42:29 hubbe Exp $");
-#include "types.h"
+RCSID("$Id: file.c,v 1.39 1997/05/19 22:52:39 hubbe Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/files/socket.c b/src/modules/files/socket.c
index a5b51be6e71d46cb1e6d99ecb6bff727d9fa9936..77fc68de741ec14efcfeacd208e3850a656bb317 100644
--- a/src/modules/files/socket.c
+++ b/src/modules/files/socket.c
@@ -4,7 +4,6 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-#include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/readline/readlinemod.c b/src/modules/readline/readlinemod.c
index 6aa2001375e34380c93973ac1b759ce43015f6dd..d77e7d8819a9dfb65d949e7ffe9ed3425deaa1eb 100644
--- a/src/modules/readline/readlinemod.c
+++ b/src/modules/readline/readlinemod.c
@@ -5,7 +5,6 @@
 \*/
 #include "global.h"
 #include "readline_machine.h"
-#include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/spider/accesseddb.c b/src/modules/spider/accesseddb.c
index 78a9ffb50a86f0d21ff82aa688a3eb892d47b13c..2b081f63f66fe145793a9eb70a970a8bdc25e30a 100644
--- a/src/modules/spider/accesseddb.c
+++ b/src/modules/spider/accesseddb.c
@@ -2,7 +2,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "backend.h"
 #include "object.h"
diff --git a/src/modules/spider/discdate.c b/src/modules/spider/discdate.c
index 545d36adea1fc54dad390918fa2a76605647fae8..022c757033d2eef270b8a1c9aaaff2e46b439135 100644
--- a/src/modules/spider/discdate.c
+++ b/src/modules/spider/discdate.c
@@ -10,7 +10,6 @@
 
 #include "global.h"
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/spider/dumudp.c b/src/modules/spider/dumudp.c
index 4a584986ce14b36447a44170d615d53c1121d711..7e1a70ef7a313c70f07d7a6b0bf03a24f952d22f 100644
--- a/src/modules/spider/dumudp.c
+++ b/src/modules/spider/dumudp.c
@@ -1,8 +1,7 @@
 #include <config.h>
 
 #include "global.h"
-RCSID("$Id: dumudp.c,v 1.9 1997/04/21 19:29:50 grubba Exp $");
-#include "types.h"
+RCSID("$Id: dumudp.c,v 1.10 1997/05/19 22:53:26 hubbe Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c
index 91995f7dcc911ebb7657e5c02c8c2f34f1863c51..bfe3cd7dd8b7a8b77264b75ce3867709c654217f 100644
--- a/src/modules/spider/spider.c
+++ b/src/modules/spider/spider.c
@@ -24,7 +24,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "machine.h"
 #include "object.h"
diff --git a/src/modules/spider/stardate.c b/src/modules/spider/stardate.c
index 60546b4d2f38a81dd56bbe94b0126d6795beb788..64fdff266c117389f652a5a1c3502e85639e1d7b 100644
--- a/src/modules/spider/stardate.c
+++ b/src/modules/spider/stardate.c
@@ -2,7 +2,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/spider/streamed_parser.c b/src/modules/spider/streamed_parser.c
index 5af6673d5b921edd97c9b4c066330f4aa0ecad5b..1f7bc06854a2082553ce4456f47ab1049ff8fd49 100644
--- a/src/modules/spider/streamed_parser.c
+++ b/src/modules/spider/streamed_parser.c
@@ -1,6 +1,5 @@
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/multiset.c b/src/multiset.c
index 806ad6328330057adae393ad3a56f0d13384a9ad..c7a8f6dd604415ede84b38764141ba1e6995758e 100644
--- a/src/multiset.c
+++ b/src/multiset.c
@@ -5,7 +5,6 @@
 \*/
 #include "global.h"
 #include "array.h"
-#include "types.h"
 #include "multiset.h"
 #include "svalue.h"
 #include "pike_macros.h"
diff --git a/src/object.h b/src/object.h
index 28f4d91878d3b76152f5425300398fa3ac88317a..7cff78322e4ac3a7e3916b62c37579c564536f15 100644
--- a/src/object.h
+++ b/src/object.h
@@ -6,7 +6,7 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
-#include "types.h"
+#include "global.h"
 #include "svalue.h"
 
 /* a destructed object has no program */
diff --git a/src/peep.c b/src/peep.c
index 49e19ea939253f05c3a322ae526ffa8d75af270b..1552fe2dc6ea106a0a8774fb3102f64c36fa7a91 100644
--- a/src/peep.c
+++ b/src/peep.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "types.h"
 #include "language.h"
 #include "stralloc.h"
 #include "dynamic_buffer.h"
diff --git a/src/port.h b/src/port.h
index 9a1eff5b71781d7423521effc4c919ae4821bedd..a6f2f3ff70dc391cd565e3241e813905f90351da 100644
--- a/src/port.h
+++ b/src/port.h
@@ -6,7 +6,7 @@
 #ifndef PORT_H
 #define PORT_H
 
-#include "types.h"
+#include "global.h"
 
 #ifndef STRUCT_TIMEVAL_DECLARED
 #define STRUCT_TIMEVAL_DECLARED
diff --git a/src/program.h b/src/program.h
index 900c03156d0f7bc5fc0178566c14a7c201c64a48..6e2b42c41c5296b3b7e1ef422f63edb33c567dc3 100644
--- a/src/program.h
+++ b/src/program.h
@@ -8,7 +8,6 @@
 
 #include <stdarg.h>
 #include "global.h"
-#include "types.h"
 
 #define LFUN___INIT 0
 #define LFUN_CREATE 1
diff --git a/src/rusage.c b/src/rusage.c
index c50771e76ba2b6682fc0f550595dbb9cf127562a..83d90ba55e0ebda15e65911ed917743572badfd7 100644
--- a/src/rusage.c
+++ b/src/rusage.c
@@ -11,7 +11,6 @@
 #include "time_stuff.h"
 #include <fcntl.h>
 #include <errno.h>
-#include "types.h"
 #include "rusage.h"
 
 #ifdef HAVE_SYS_TIMES_H
diff --git a/src/stralloc.h b/src/stralloc.h
index aeb3b12cf50d4a62c817a3e487b5543ce2c43bfe..80ef15d45bc001ea4bf2946fd3f7af45e53f86f6 100644
--- a/src/stralloc.h
+++ b/src/stralloc.h
@@ -5,7 +5,7 @@
 \*/
 #ifndef STRALLOC_H
 #define STRALLOC_H
-#include "types.h"
+#include "global.h"
 
 #define STRINGS_ARE_SHARED
 
diff --git a/src/stuff.h b/src/stuff.h
index fc0fe0dd89d2c5f5fa36a508095e46604a1493e0..ffded4a18c73fdd23a46bd17dd2978185ba3cb81 100644
--- a/src/stuff.h
+++ b/src/stuff.h
@@ -6,7 +6,7 @@
 #ifndef STUFF_H
 #define STUFF_H
 
-#include "types.h"
+#include "global.h"
 
 /* Prototypes begin here */
 int my_log2(unsigned INT32 x);
diff --git a/src/svalue.h b/src/svalue.h
index 965388fffd2d4b4f5b68813a2f3c7bc706c4d38f..3001f4b165733f1a4234b8059f5e7702b116e56e 100644
--- a/src/svalue.h
+++ b/src/svalue.h
@@ -6,7 +6,7 @@
 #ifndef SVALUE_H
 #define SVALUE_H
 
-#include "types.h"
+#include "global.h"
 
 #ifndef STRUCT_ARRAY_DECLARED
 #define STRUCT_ARRAY_DECLARED
diff --git a/src/types.h b/src/types.h
deleted file mode 100644
index 66d7cb537ed750ba9c424960684063d9d5e4aac8..0000000000000000000000000000000000000000
--- a/src/types.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*\
-||| This file a part of Pike, and is copyright by Fredrik Hubinette
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
-\*/
-#ifndef TYPES_H
-#define TYPES_H
-
-#include "machine.h"
-/* we here define a few types with more defined values */
-
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#undef HAVE_LIMITS_H
-#endif
-
-#define INT64 long long
-
-#if SIZEOF_SHORT >= 4
-#define INT32 short
-#else
-#if SIZEOF_INT >= 4
-#define INT32 int
-#else
-#define INT32 long
-#endif
-#endif
-
-#define INT16 short
-#define INT8 char
-
-#define SIZE_T unsigned INT32
-
-#define TYPE_T unsigned INT8
-#define TYPE_FIELD unsigned INT16
-
-#define FLOAT_TYPE float
-
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#undef HAVE_SYS_TYPES_H
-#endif
-
-#endif