diff --git a/src/configure.in b/src/configure.in
index 29fb29d40e348f95d6906c037dd6572bda20ddb9..4b939325a00958a857e7ea4034cb7a4d7af414b6 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.169 1998/03/25 22:39:39 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.170 1998/03/26 03:10:36 hubbe Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -347,7 +347,7 @@ else
       if test "$CC" = "$BINDIR/smartlink cc" -a -x /usr/bin/cc ; then
         CC="$BINDIR/smartlink /usr/bin/cc"
       fi
-      CFLAGS="-Aa -D_HPUX_SOURCE +Olibcalls $CFLAGS"
+      CFLAGS="-Ae +Olibcalls $CFLAGS"
       AC_TRY_COMPILE([int foo(int bar);],[],[],[
         CC="$OLD_CC"
 	CFLAGS="$OLD_CFLAGS"
diff --git a/src/modules/Gmp/testsuite.in b/src/modules/Gmp/testsuite.in
index 01dc3c62b0131fcd5c959a2141ebd54c37e81848..0cd0d5336ae1dc09af2351e1d714cda7d3416f5a 100644
--- a/src/modules/Gmp/testsuite.in
+++ b/src/modules/Gmp/testsuite.in
@@ -45,14 +45,24 @@ cond( [[ master()->resolv("Gmp")->mpz ]],
   test_false(clone(Gmp.mpz,0))
   test_true(clone(Gmp.mpz,1))
   test_eq(clone(Gmp.mpz,17)->powm(12,4711),85)
+]])
 
   define([[mpz_test_cmp]],[[
-    test_cmp3(clone(Gmp.mpz,$1), $2, $3)
-    test_cmp3($1, clone(Gmp.mpz,$2), $3)
-    test_cmp3(clone(Gmp.mpz, $1), clone(Gmp.mpz, $2), $3)
-    test_cmp3(clone(Gmp.mpz,$1), $2, clone(Gmp.mpz, $3))
-    test_cmp3($1, clone(Gmp.mpz,$2), clone(Gmp.mpz, $3))
-    test_cmp3(clone(Gmp.mpz, $1), clone(Gmp.mpz, $2), clone(Gmp.mpz, $3))
+    cond( [[ master()->resolv("Gmp")->mpz ]],
+    [[
+    test_cmp3(Gmp.mpz($1), $2, $3)
+    test_cmp3($1, Gmp.mpz($2), $3)
+    ]])
+    cond( [[ master()->resolv("Gmp")->mpz ]],
+    [[
+    test_cmp3(Gmp.mpz($1), Gmp.mpz($2), $3)
+    test_cmp3(Gmp.mpz($1), $2, Gmp.mpz($3))
+    ]])
+    cond( [[ master()->resolv("Gmp")->mpz ]],
+    [[
+    test_cmp3($1, Gmp.mpz($2), Gmp.mpz($3))
+    test_cmp3(Gmp.mpz($1), Gmp.mpz($2), Gmp.mpz($3))
+    ]])
   ]])
 
   define([[mpz_test_type1]],[[
@@ -66,14 +76,16 @@ cond( [[ master()->resolv("Gmp")->mpz ]],
   ]])
 
   define([[mpz_test_type3]],[[
-    mpz_test_type1($1,$2,$3)
-    mpz_test_type1($1,$2,$3.0)
+    mpz_test_type2($1,$2,$3)
+    mpz_test_type2($1,$2,$3.0)
   ]])
 
   mpz_test_type3(1,2,3)
   mpz_test_type3(-2,1,4)
   mpz_test_type3(-2,-1,4)
 
+cond( [[ master()->resolv("Gmp")->mpz ]],
+[[
   test_true(catch(Gmp.mpz("abcd", 47)))
   test_true(catch(Gmp.mpz(-17)->digits(256)))
   test_eq(Gmp.mpz(0)->digits(256), "\0");
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index 69229fe4e66e352455172a3d28d5968ef28aab1e..0a06432c0d6d41ca05eafdf6ce3a5ffe5452879b 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,11 +1,12 @@
+#include "global.h"
 #include <config.h>
 
-/* $Id: colortable.c,v 1.40 1998/03/20 16:53:13 mirar Exp $ */
+/* $Id: colortable.c,v 1.41 1998/03/26 03:11:18 hubbe Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: colortable.c,v 1.40 1998/03/20 16:53:13 mirar Exp $
+**!	$Id: colortable.c,v 1.41 1998/03/26 03:11:18 hubbe Exp $
 **! class colortable
 **!
 **!	This object keeps colortable information,
@@ -20,8 +21,7 @@
 #undef COLORTABLE_DEBUG
 #undef COLORTABLE_REDUCE_DEBUG
 
-#include "global.h"
-RCSID("$Id: colortable.c,v 1.40 1998/03/20 16:53:13 mirar Exp $");
+RCSID("$Id: colortable.c,v 1.41 1998/03/26 03:11:18 hubbe Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/modules/Image/encodings/gif.c b/src/modules/Image/encodings/gif.c
index 7a2a8eb06d1e1d8038bc76a43a72abdc41c9a95a..46bf43f367d8c2ebd239d68417d0ac4269b4a7cb 100644
--- a/src/modules/Image/encodings/gif.c
+++ b/src/modules/Image/encodings/gif.c
@@ -1,9 +1,9 @@
-/* $Id: gif.c,v 1.36 1998/03/13 12:37:50 mirar Exp $ */
+/* $Id: gif.c,v 1.37 1998/03/26 03:12:00 hubbe Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: gif.c,v 1.36 1998/03/13 12:37:50 mirar Exp $
+**!	$Id: gif.c,v 1.37 1998/03/26 03:12:00 hubbe Exp $
 **! submodule GIF
 **!
 **!	This submodule keep the GIF encode/decode capabilities
@@ -25,13 +25,13 @@
 **!
 **! see also: Image, Image.image, Image.colortable
 */
+#include "global.h"
 
 #include <math.h>
 #include <ctype.h>
 
 #include "stralloc.h"
-#include "global.h"
-RCSID("$Id: gif.c,v 1.36 1998/03/13 12:37:50 mirar Exp $");
+RCSID("$Id: gif.c,v 1.37 1998/03/26 03:12:00 hubbe Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/encodings/pnm.c b/src/modules/Image/encodings/pnm.c
index 8b19f6f35339062e4c4db714fdde4f3a17cfd84c..272c093edb8e7baf1a4ed1821c4537430f9cc82e 100644
--- a/src/modules/Image/encodings/pnm.c
+++ b/src/modules/Image/encodings/pnm.c
@@ -1,9 +1,9 @@
-/* $Id: pnm.c,v 1.13 1998/02/27 23:36:50 mirar Exp $ */
+/* $Id: pnm.c,v 1.14 1998/03/26 03:12:00 hubbe Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: pnm.c,v 1.13 1998/02/27 23:36:50 mirar Exp $
+**!	$Id: pnm.c,v 1.14 1998/03/26 03:12:00 hubbe Exp $
 **! submodule PNM
 **!
 **!	This submodule keeps the PNM encode/decode capabilities
@@ -43,13 +43,13 @@
 **!
 **! see also: Image, Image.image, Image.GIF
 */
+#include "global.h"
 
 #include <math.h>
 #include <ctype.h>
 
 #include "stralloc.h"
-#include "global.h"
-RCSID("$Id: pnm.c,v 1.13 1998/02/27 23:36:50 mirar Exp $");
+RCSID("$Id: pnm.c,v 1.14 1998/03/26 03:12:00 hubbe Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/encodings/x.c b/src/modules/Image/encodings/x.c
index c00e361c0586bb167f6656476d80fa5679c88387..704d21a96b68ffc0281b4529ab7427bc4bb7ada9 100644
--- a/src/modules/Image/encodings/x.c
+++ b/src/modules/Image/encodings/x.c
@@ -1,9 +1,9 @@
-/* $Id: x.c,v 1.13 1998/03/25 14:55:06 mirar Exp $ */
+/* $Id: x.c,v 1.14 1998/03/26 03:12:00 hubbe Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: x.c,v 1.13 1998/03/25 14:55:06 mirar Exp $
+**!	$Id: x.c,v 1.14 1998/03/26 03:12:00 hubbe Exp $
 **! submodule X
 **!
 **!	This submodule handles encoding and decoding of
@@ -13,12 +13,12 @@
 **!
 **! see also: Image, Image.image, Image.colortable
 */
+#include "global.h"
 
 #include <math.h>
 #include <ctype.h>
 
 #include "stralloc.h"
-#include "global.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -29,7 +29,7 @@
 #include <winsock.h>
 #endif
 
-RCSID("$Id: x.c,v 1.13 1998/03/25 14:55:06 mirar Exp $");
+RCSID("$Id: x.c,v 1.14 1998/03/26 03:12:00 hubbe Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/encodings/xwd.c b/src/modules/Image/encodings/xwd.c
index e6c8ca2e9c914d4cc3877ec77afcef2481fcf36f..62da7ccd3ac19ad707beb8c094d5579b15a46b73 100644
--- a/src/modules/Image/encodings/xwd.c
+++ b/src/modules/Image/encodings/xwd.c
@@ -1,9 +1,9 @@
-/* $Id: xwd.c,v 1.2 1998/03/25 14:55:08 mirar Exp $ */
+/* $Id: xwd.c,v 1.3 1998/03/26 03:12:01 hubbe Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: xwd.c,v 1.2 1998/03/25 14:55:08 mirar Exp $
+**!	$Id: xwd.c,v 1.3 1998/03/26 03:12:01 hubbe Exp $
 **! submodule XWD
 **!
 **!	This submodule keeps the XWD (X Windows Dump) 
@@ -19,13 +19,13 @@
 **!
 **! see also: Image, Image.image, Image.PNM, Image.X
 */
+#include "global.h"
 
 #include <math.h>
 #include <ctype.h>
 
 #include "stralloc.h"
-#include "global.h"
-RCSID("$Id: xwd.c,v 1.2 1998/03/25 14:55:08 mirar Exp $");
+RCSID("$Id: xwd.c,v 1.3 1998/03/26 03:12:01 hubbe Exp $");
 #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 36b62a1dd85ffc0534b4e2bd897fc47dea36ad59..6e60d934d3eae4be45f0e0ac89f915985179ccc4 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -1,4 +1,5 @@
-/* $Id: font.c,v 1.32 1998/02/24 20:36:17 per Exp $ */
+/* $Id: font.c,v 1.33 1998/03/26 03:11:19 hubbe Exp $ */
+#include "global.h"
 #include <config.h>
 
 #define SPACE_CHAR 'i'
@@ -6,7 +7,7 @@
 /*
 **! module Image
 **! note
-**!	$Id: font.c,v 1.32 1998/02/24 20:36:17 per Exp $
+**!	$Id: font.c,v 1.33 1998/03/26 03:11:19 hubbe Exp $
 **! class font
 **!
 **! note
@@ -139,7 +140,6 @@ Kerningtable types:
 
 
 
-#include "global.h"
 #include "fdlib.h"
 
 #include <sys/types.h>
diff --git a/src/modules/Yp/yp.c b/src/modules/Yp/yp.c
index 71fffa5c3a72396458b79f2f6796847135df63c4..ccd686e84bde064354795450874932a15c26d91e 100644
--- a/src/modules/Yp/yp.c
+++ b/src/modules/Yp/yp.c
@@ -1,3 +1,4 @@
+#include "global.h"
 #include "config.h"
 
 #if defined(HAVE_RPCSVC_YPCLNT_H) && defined(HAVE_RPCSVC_YP_PROT_H)
@@ -18,7 +19,6 @@
 
 #include "stralloc.h"
 #include "error.h"
-#include "global.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index 92470bebf234c24e119cb2f2e30d1540d804e3bf..518dd81e335a95676f906c75f03adc3d2045db71 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -3,12 +3,10 @@
 ||| Pike is distributed as GPL (General Public License)
 ||| See the files COPYING and DISCLAIMER for more information.
 \ */
-#define _FILE_OFFSET_BITS 64
-#define _LARGEFILE_SOURCE
 #define READ_BUFFER 8192
 
 #include "global.h"
-RCSID("$Id: file.c,v 1.81 1998/03/25 22:39:40 grubba Exp $");
+RCSID("$Id: file.c,v 1.82 1998/03/26 03:12:39 hubbe Exp $");
 #include "fdlib.h"
 #include "interpret.h"
 #include "svalue.h"
diff --git a/src/modules/readline/readlinemod.c b/src/modules/readline/readlinemod.c
index d1b8c8e661b6bffa1527e48d3d2001b356e855bf..d8bbb0716987f3be1315516751b18afef4c7792f 100644
--- a/src/modules/readline/readlinemod.c
+++ b/src/modules/readline/readlinemod.c
@@ -79,14 +79,17 @@ char *low_do_rl_complete(char *string, int state)
 
     if(sp[-1].type == T_STRING)
       return my_copy_string(sp[-1].u.string);
-    // Note that we do _not_ pop the stack here...
-    // All strings will be pop()ed when f_readline returns.
+    /* Note that we do _not_ pop the stack here...
+     * All strings will be pop()ed when f_readline returns.
+     * DO NOT USE // as comments!!! // Hubbe
+     */
   }
   return 0;
 }
 
 char *my_rl_complete(char *text, int status)
 {
+#ifdef _REENTRANT
   struct thread_state *state;
   char *res;
   if((state = thread_state_for_id(th_self()))!=NULL)
@@ -107,6 +110,9 @@ char *my_rl_complete(char *text, int status)
   } else
     fatal("Bad idea!\n");
   return res;
+#else
+  return low_do_rl_comlete(text,status);
+#endif
 }
 
 static void f_readline(INT32 args)