diff --git a/src/backend.cmod b/src/backend.cmod
index 000eb33e3e22962e1d4f3fd6fc7c10e60af5e408..e49e5cdf1e6fa67887c2361e338794a5e2c9bd59 100644
--- a/src/backend.cmod
+++ b/src/backend.cmod
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: backend.cmod,v 1.23 2002/02/05 19:08:52 mast Exp $");
+RCSID("$Id: backend.cmod,v 1.24 2002/05/11 00:29:57 nilsson Exp $");
 #include "fdlib.h"
 #include "backend.h"
 #include <errno.h>
@@ -88,6 +88,8 @@ struct fd_datum
 #include <sys/poll.h>
 #endif /* HAVE_SYS_POLL_H */
 
+#define sp Pike_sp
+
 /* Some constants... */
 
 /* Notes on POLLRDNORM and POLLIN:
@@ -2161,4 +2163,3 @@ void exit_backend()
   cleanup_close_on_exec();
 #endif /* HAVE_BROKEN_F_SETFD */
 }
-
diff --git a/src/bignum.c b/src/bignum.c
index 325a4dd1754c3aeaae799c403dca0aa671ef1ff3..d20095844eef479ec68dce3a24551e1b9fe10815 100644
--- a/src/bignum.c
+++ b/src/bignum.c
@@ -8,6 +8,8 @@
 #include "svalue.h"
 #include "pike_error.h"
 
+#define sp Pike_sp
+
 struct svalue auto_bignum_program = {
   T_INT, 0,
 #ifdef HAVE_UNION_INIT
diff --git a/src/builtin.cmod b/src/builtin.cmod
index 046d5d11b7007645a38b0c1f41cc084e14abf1f6..f7134ff843850dcef45222d7fd7894d9fa1bce05 100644
--- a/src/builtin.cmod
+++ b/src/builtin.cmod
@@ -1,5 +1,5 @@
 /* -*- c -*-
- * $Id: builtin.cmod,v 1.87 2002/05/10 22:38:33 mast Exp $
+ * $Id: builtin.cmod,v 1.88 2002/05/11 00:29:57 nilsson Exp $
  */
 
 #include "global.h"
@@ -29,6 +29,7 @@
 #include "fsort.h"
 #include "port.h"
 
+#define sp Pike_sp
 
 /*! @decl array(array(int|string)) _describe_program(program p)
  *!
diff --git a/src/cpp.c b/src/cpp.c
index dcd8bc15e3e11db88ee6f924abb3e40e494ed73c..4d5b60a4813f948aeed70988c80fbe910b64b175 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: cpp.c,v 1.99 2002/03/10 02:47:16 mast Exp $
+ * $Id: cpp.c,v 1.100 2002/05/11 00:29:57 nilsson Exp $
  */
 #include "global.h"
 #include "stralloc.h"
@@ -29,6 +29,8 @@
 
 #include <ctype.h>
 
+#define sp Pike_sp
+
 #undef ATTRIBUTE
 #define ATTRIBUTE(X)
 
diff --git a/src/iterators.cmod b/src/iterators.cmod
index 34eb86b7e1e0aac654e10d3d489f6dd7b63f4ccb..6e790c1a441c682182f8d34887166606d4d42c78 100644
--- a/src/iterators.cmod
+++ b/src/iterators.cmod
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: iterators.cmod,v 1.18 2002/01/16 02:54:13 nilsson Exp $");
+RCSID("$Id: iterators.cmod,v 1.19 2002/05/11 00:29:57 nilsson Exp $");
 #include "main.h"
 #include "object.h"
 #include "mapping.h"
@@ -29,6 +29,8 @@ RCSID("$Id: iterators.cmod,v 1.18 2002/01/16 02:54:13 nilsson Exp $");
 #include "builtin_functions.h"
 #include "constants.h"
 
+#define sp Pike_sp
+
 DECLARATIONS
 
 PIKECLASS mapping_iterator
diff --git a/src/module_support.c b/src/module_support.c
index 693c7942642fb45c8051dc9aca1276940f755015..a53f5b97c7c35bdd5aebdd3ff7fb62ad3a3fa844 100644
--- a/src/module_support.c
+++ b/src/module_support.c
@@ -9,7 +9,9 @@
 #include "object.h"
 #include "opcodes.h"
 
-RCSID("$Id: module_support.c,v 1.42 2001/12/16 02:49:41 mast Exp $");
+#define sp Pike_sp
+
+RCSID("$Id: module_support.c,v 1.43 2002/05/11 00:29:57 nilsson Exp $");
 
 /* Checks that args_to_check arguments are OK.
  * Returns 1 if everything worked ok, zero otherwise.
diff --git a/src/modules/CommonLog/clf.c b/src/modules/CommonLog/clf.c
index fb029cad0575f95ac724b5a8befacadc6e1633c5..1a401a38b14197bf2fcca591d4d5e212b7bb1e02 100644
--- a/src/modules/CommonLog/clf.c
+++ b/src/modules/CommonLog/clf.c
@@ -1,6 +1,6 @@
 /* MUST BE FIRST */
 #include "global.h"
-RCSID("$Id: clf.c,v 1.7 2002/02/05 19:08:54 mast Exp $");
+RCSID("$Id: clf.c,v 1.8 2002/05/11 00:27:02 nilsson Exp $");
 #include "fdlib.h"
 #include "stralloc.h"
 #include "pike_macros.h"
@@ -19,6 +19,8 @@ RCSID("$Id: clf.c,v 1.7 2002/02/05 19:08:54 mast Exp $");
 /* MUST BE LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 /** Forward declarations of functions implementing Pike functions **/
 
 static void f_read_clf( INT32 args );
diff --git a/src/modules/Gdbm/gdbmmod.c b/src/modules/Gdbm/gdbmmod.c
index 370219855fc192fb5ef6b5af167ae3d0e856ace4..51e9b797fc6e5378603292d4824e9397a4445f85 100644
--- a/src/modules/Gdbm/gdbmmod.c
+++ b/src/modules/Gdbm/gdbmmod.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: gdbmmod.c,v 1.16 2002/01/16 02:59:19 nilsson Exp $");
+RCSID("$Id: gdbmmod.c,v 1.17 2002/05/11 00:27:02 nilsson Exp $");
 #include "gdbm_machine.h"
 #include "threads.h"
 
@@ -17,9 +17,6 @@ RCSID("$Id: gdbmmod.c,v 1.16 2002/01/16 02:59:19 nilsson Exp $");
 #include "object.h"
 #include "pike_macros.h"
 
-/* THIS MUST BE INCLUDED LAST */
-#include "module_magic.h"
-
 #if defined(HAVE_GDBM_H) && defined(HAVE_LIBGDBM)
 
 #include <gdbm.h>
@@ -28,6 +25,11 @@ RCSID("$Id: gdbmmod.c,v 1.16 2002/01/16 02:59:19 nilsson Exp $");
 static MUTEX_T gdbm_lock STATIC_MUTEX_INIT;
 #endif  
 
+/* THIS MUST BE INCLUDED LAST */
+#include "module_magic.h"
+
+#define sp Pike_sp
+
 struct gdbm_glue
 {
   GDBM_FILE dbf;
diff --git a/src/modules/Gettext/gettext.c b/src/modules/Gettext/gettext.c
index 36e48249df2b1ad3de7b93f2bc9131fc1ab8e3f1..64ff933598384f0c1ca1d0556db154e244261b63 100644
--- a/src/modules/Gettext/gettext.c
+++ b/src/modules/Gettext/gettext.c
@@ -23,7 +23,9 @@
 /* This must be included last */
 #include "module_magic.h"
 
-RCSID("$Id: gettext.c,v 1.7 2002/03/03 16:01:03 marcus Exp $");
+#define sp Pike_sp
+
+RCSID("$Id: gettext.c,v 1.8 2002/05/11 00:27:02 nilsson Exp $");
 
 /*
 **! module Locale.Gettext
@@ -31,7 +33,7 @@ RCSID("$Id: gettext.c,v 1.7 2002/03/03 16:01:03 marcus Exp $");
 **!	This module enables access to localization functions from within Pike.
 **!
 **! note
-**!	$Id: gettext.c,v 1.7 2002/03/03 16:01:03 marcus Exp $
+**!	$Id: gettext.c,v 1.8 2002/05/11 00:27:02 nilsson Exp $
 */
 
 /******************** PUBLIC FUNCTIONS BELOW THIS LINE */
diff --git a/src/modules/HTTPLoop/accept_and_parse.c b/src/modules/HTTPLoop/accept_and_parse.c
index 0667b1fc2dedacc6ca7235638b676a22bac65f18..1286d01adb55b0cf4578013b610e92af26ed2860 100644
--- a/src/modules/HTTPLoop/accept_and_parse.c
+++ b/src/modules/HTTPLoop/accept_and_parse.c
@@ -53,6 +53,8 @@
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 static struct callback *my_callback;
 struct program *request_program;
 struct program *c_request_program;
diff --git a/src/modules/HTTPLoop/log.c b/src/modules/HTTPLoop/log.c
index c9d9f08ded9c8e2948bdc33b89089bb9d592b3af..a34ff0edf1e769ae6c32be029d00240f50929917 100644
--- a/src/modules/HTTPLoop/log.c
+++ b/src/modules/HTTPLoop/log.c
@@ -42,6 +42,8 @@
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 int num_log_entries;
 void free_log_entry( struct log_entry *le )
 {
diff --git a/src/modules/HTTPLoop/requestobject.c b/src/modules/HTTPLoop/requestobject.c
index 88bd0d37411eecae2a1d33a9a11e746ae78b2290..19eaca5931a5c373fe39115b2d542064e3ac5ec2 100644
--- a/src/modules/HTTPLoop/requestobject.c
+++ b/src/modules/HTTPLoop/requestobject.c
@@ -1,5 +1,5 @@
 /*
- * $Id: requestobject.c,v 1.18 2001/07/12 13:21:53 grubba Exp $
+ * $Id: requestobject.c,v 1.19 2002/05/11 00:27:02 nilsson Exp $
  */
 
 #include "global.h"
@@ -44,6 +44,8 @@
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #ifdef _REENTRANT
 #include "accept_and_parse.h"
 #include "log.h"
diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index fab5f68b1ccc32ac6d54796148b3dcf39b078abd..499e4083d60d50fe307802f9b1ae7faa32b91816 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -1,10 +1,10 @@
-/* $Id: blit.c,v 1.50 2002/04/10 21:27:10 stewa Exp $ */
+/* $Id: blit.c,v 1.51 2002/05/11 00:27:02 nilsson Exp $ */
 #include "global.h"
 
 /*
 **! module Image
 **! note
-**!	$Id: blit.c,v 1.50 2002/04/10 21:27:10 stewa Exp $
+**!	$Id: blit.c,v 1.51 2002/05/11 00:27:02 nilsson Exp $
 **! class Image
 */
 
@@ -32,6 +32,8 @@
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_program;
 #ifdef THIS
 #undef THIS /* Needed for NT */
@@ -641,5 +643,3 @@ void img_box(INT32 x1,INT32 y1,INT32 x2,INT32 y2)
    if (y1<0) y1 = 0;
    img_box_nocheck(MAXIMUM(x1,0),MAXIMUM(y1,0),MINIMUM(x2,THIS->xsize-1),MINIMUM(y2,THIS->ysize-1));
 }
-
-
diff --git a/src/modules/Image/colors.c b/src/modules/Image/colors.c
index 799808d7bd6d9d5f376577fbbe4895710e9ad313..a5ef603642f116ca080022c51932fd44554abb62 100644
--- a/src/modules/Image/colors.c
+++ b/src/modules/Image/colors.c
@@ -1,7 +1,7 @@
 /*
 **! module Image
 **! note
-**!	$Id: colors.c,v 1.58 2001/11/07 21:37:34 nilsson Exp $
+**!	$Id: colors.c,v 1.59 2002/05/11 00:27:03 nilsson Exp $
 **! submodule Color
 **!
 **!	This module keeps names and easy handling 
@@ -187,7 +187,7 @@
 
 #include "global.h"
 
-RCSID("$Id: colors.c,v 1.58 2001/11/07 21:37:34 nilsson Exp $");
+RCSID("$Id: colors.c,v 1.59 2002/05/11 00:27:03 nilsson Exp $");
 
 #include "image_machine.h"
 
@@ -215,6 +215,8 @@ RCSID("$Id: colors.c,v 1.58 2001/11/07 21:37:34 nilsson Exp $");
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 static struct mapping *colors=NULL;
 static struct object *colortable=NULL;
 static struct array *colornames=NULL;
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index 09698ab4ae0961bd0da91fa417e6fd92cead9d0a..4b0169458a3aeb1358ee26c72371fc44eae3cbe5 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,11 +1,11 @@
 #include "global.h"
 
-/* $Id: colortable.c,v 1.107 2002/01/11 17:56:25 mast Exp $ */
+/* $Id: colortable.c,v 1.108 2002/05/11 00:27:03 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: colortable.c,v 1.107 2002/01/11 17:56:25 mast Exp $
+**!	$Id: colortable.c,v 1.108 2002/05/11 00:27:03 nilsson Exp $
 **! class Colortable
 **!
 **!	This object keeps colortable information,
@@ -21,7 +21,7 @@
 /* #define COLORTABLE_REDUCE_DEBUG */
 /* #define CUBICLE_DEBUG */
 
-RCSID("$Id: colortable.c,v 1.107 2002/01/11 17:56:25 mast Exp $");
+RCSID("$Id: colortable.c,v 1.108 2002/05/11 00:27:03 nilsson Exp $");
 
 #include <math.h> /* fabs() */
 
@@ -50,6 +50,7 @@ RCSID("$Id: colortable.c,v 1.107 2002/01/11 17:56:25 mast Exp $");
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
 
 #define WEIGHT_NEEDED (nct_weight_t)(0x10000000)
 #define WEIGHT_REMOVE (nct_weight_t)(0x10000001)
@@ -4604,4 +4605,3 @@ void exit_image_colortable(void)
    free_string(s_mapping);
    free_string(s_string);
 }
-
diff --git a/src/modules/Image/encodings/_xpm.c b/src/modules/Image/encodings/_xpm.c
index 1f3a39b6e93a983e10fae2ed05bc8002ee39308c..6c251bf00fdf3bc97741955027150805835706a0 100644
--- a/src/modules/Image/encodings/_xpm.c
+++ b/src/modules/Image/encodings/_xpm.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: _xpm.c,v 1.18 2001/12/16 02:49:44 mast Exp $");
+RCSID("$Id: _xpm.c,v 1.19 2002/05/11 00:12:38 nilsson Exp $");
 
 #include "image_machine.h"
 
@@ -33,13 +33,14 @@ RCSID("$Id: _xpm.c,v 1.18 2001/12/16 02:49:44 mast Exp $");
 #include "signal_handler.h"
 #include "security.h"
 
-
 #include "image.h"
 #include "colortable.h"
 
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_program;
 
 static int hextoint( int what )
diff --git a/src/modules/Image/encodings/any.c b/src/modules/Image/encodings/any.c
index 52d9fe1b0c5c738a408b4a46796037f8aa421433..905dfda9a9b93ca58a633f5db0eb16b700b42def 100644
--- a/src/modules/Image/encodings/any.c
+++ b/src/modules/Image/encodings/any.c
@@ -1,9 +1,9 @@
-/* $Id: any.c,v 1.21 2002/05/08 11:39:15 marcus Exp $ */
+/* $Id: any.c,v 1.22 2002/05/11 00:12:38 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: any.c,v 1.21 2002/05/08 11:39:15 marcus Exp $
+**!	$Id: any.c,v 1.22 2002/05/11 00:12:38 nilsson Exp $
 **! submodule ANY
 **!
 **!	This method calls the other decoding methods
@@ -23,7 +23,7 @@
 #include <ctype.h>
 
 #include "stralloc.h"
-RCSID("$Id: any.c,v 1.21 2002/05/08 11:39:15 marcus Exp $");
+RCSID("$Id: any.c,v 1.22 2002/05/11 00:12:38 nilsson Exp $");
 #include "pike_macros.h"
 #include "operators.h"
 #include "builtin_functions.h"
@@ -44,6 +44,7 @@ RCSID("$Id: any.c,v 1.21 2002/05/08 11:39:15 marcus Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
 
 /* PNG module uses "type" for something else than what we want to use
    it for.  Rename "type" to "_type", and insert our own "type"...  */
diff --git a/src/modules/Image/encodings/bmp.c b/src/modules/Image/encodings/bmp.c
index 3fe09303cf48f2460096be03a77815cf0c20d21e..75e0f86efccf14cbd135b500b34a945645ee43c2 100644
--- a/src/modules/Image/encodings/bmp.c
+++ b/src/modules/Image/encodings/bmp.c
@@ -1,9 +1,9 @@
-/* $Id: bmp.c,v 1.33 2002/05/09 14:13:18 marcus Exp $ */
+/* $Id: bmp.c,v 1.34 2002/05/11 00:12:38 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: bmp.c,v 1.33 2002/05/09 14:13:18 marcus Exp $
+**!	$Id: bmp.c,v 1.34 2002/05/11 00:12:38 nilsson Exp $
 **! submodule BMP
 **!
 **!	This submodule keeps the BMP (Windows Bitmap)
@@ -22,7 +22,7 @@
 #include <ctype.h>
 
 #include "stralloc.h"
-RCSID("$Id: bmp.c,v 1.33 2002/05/09 14:13:18 marcus Exp $");
+RCSID("$Id: bmp.c,v 1.34 2002/05/11 00:12:38 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -44,6 +44,7 @@ RCSID("$Id: bmp.c,v 1.33 2002/05/09 14:13:18 marcus Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
 
 extern struct program *image_colortable_program;
 extern struct program *image_program;
diff --git a/src/modules/Image/encodings/dsi.c b/src/modules/Image/encodings/dsi.c
index 3340f1db9c87e85f8da754391f4ce90948bafa0e..d8ec45085aca982285933c92ca1e3f0ab30c062c 100644
--- a/src/modules/Image/encodings/dsi.c
+++ b/src/modules/Image/encodings/dsi.c
@@ -1,7 +1,7 @@
 /* Dream SNES Image file */
 
 #include "global.h"
-RCSID("$Id: dsi.c,v 1.3 2000/12/01 08:10:04 hubbe Exp $");
+RCSID("$Id: dsi.c,v 1.4 2002/05/11 00:12:38 nilsson Exp $");
 
 #include "image_machine.h"
 
@@ -31,6 +31,8 @@ RCSID("$Id: dsi.c,v 1.3 2000/12/01 08:10:04 hubbe Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_program;
 
 void f__decode( INT32 args )
diff --git a/src/modules/Image/encodings/iff.c b/src/modules/Image/encodings/iff.c
index 079e39440c7f269a53a93dd3eac268f31125d07f..c19cfe5e43f7cfebd2a4a729e25995b90a97a0c9 100644
--- a/src/modules/Image/encodings/iff.c
+++ b/src/modules/Image/encodings/iff.c
@@ -1,9 +1,9 @@
-/* $Id: iff.c,v 1.9 2000/12/01 08:10:04 hubbe Exp $ */
+/* $Id: iff.c,v 1.10 2002/05/11 00:12:38 nilsson Exp $ */
 
 #include "global.h"
 
 #include "stralloc.h"
-RCSID("$Id: iff.c,v 1.9 2000/12/01 08:10:04 hubbe Exp $");
+RCSID("$Id: iff.c,v 1.10 2002/05/11 00:12:38 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -18,6 +18,8 @@ RCSID("$Id: iff.c,v 1.9 2000/12/01 08:10:04 hubbe Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 static ptrdiff_t low_parse_iff(unsigned char *data, ptrdiff_t len,
 			       unsigned char *hdr,
 			       struct mapping *m, unsigned char *stopchunk)
diff --git a/src/modules/Image/encodings/ilbm.c b/src/modules/Image/encodings/ilbm.c
index 420c87b6fdd9c89db6e961901f233ccd66b9f8d6..eed85aa5d9e64d153728e5b56024e4bfae8d3e1c 100644
--- a/src/modules/Image/encodings/ilbm.c
+++ b/src/modules/Image/encodings/ilbm.c
@@ -1,9 +1,9 @@
-/* $Id: ilbm.c,v 1.23 2001/12/16 02:49:44 mast Exp $ */
+/* $Id: ilbm.c,v 1.24 2002/05/11 00:12:39 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: ilbm.c,v 1.23 2001/12/16 02:49:44 mast Exp $
+**!	$Id: ilbm.c,v 1.24 2002/05/11 00:12:39 nilsson Exp $
 **! submodule ILBM
 **!
 **!	This submodule keep the ILBM encode/decode capabilities
@@ -14,7 +14,7 @@
 #include "global.h"
 
 #include "stralloc.h"
-RCSID("$Id: ilbm.c,v 1.23 2001/12/16 02:49:44 mast Exp $");
+RCSID("$Id: ilbm.c,v 1.24 2002/05/11 00:12:39 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -35,6 +35,8 @@ RCSID("$Id: ilbm.c,v 1.23 2001/12/16 02:49:44 mast Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_colortable_program;
 extern struct program *image_program;
 
diff --git a/src/modules/Image/encodings/pcx.c b/src/modules/Image/encodings/pcx.c
index 42699de7e0ccf4a8ea66643a21436aecacf0bbbc..41d48d88b56192fd88679d44b4bf08304528e0b8 100644
--- a/src/modules/Image/encodings/pcx.c
+++ b/src/modules/Image/encodings/pcx.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: pcx.c,v 1.16 2001/06/13 12:56:42 grubba Exp $");
+RCSID("$Id: pcx.c,v 1.17 2002/05/11 00:12:39 nilsson Exp $");
 
 #include "image_machine.h"
 
@@ -28,6 +28,8 @@ RCSID("$Id: pcx.c,v 1.16 2001/06/13 12:56:42 grubba Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_colortable_program;
 extern struct program *image_program;
 
diff --git a/src/modules/Image/encodings/png.c b/src/modules/Image/encodings/png.c
index bb3d5f492071c672c173daac5a7c2877a06d9a99..fab8bc5d803dd0f6452f8d8b86bcc84a242f4660 100644
--- a/src/modules/Image/encodings/png.c
+++ b/src/modules/Image/encodings/png.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: png.c,v 1.43 2001/12/16 02:49:45 mast Exp $");
+RCSID("$Id: png.c,v 1.44 2002/05/11 00:12:39 nilsson Exp $");
 
 #include "image_machine.h"
 
@@ -23,6 +23,8 @@ RCSID("$Id: png.c,v 1.43 2001/12/16 02:49:45 mast Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_colortable_program;
 extern struct program *image_program;
 
diff --git a/src/modules/Image/encodings/pnm.c b/src/modules/Image/encodings/pnm.c
index 015d3b1788b61008cb742eb2ae54dc97c1af9c19..54c12e05eb31352f883dd54e89e41585acf3cee1 100644
--- a/src/modules/Image/encodings/pnm.c
+++ b/src/modules/Image/encodings/pnm.c
@@ -1,9 +1,9 @@
-/* $Id: pnm.c,v 1.25 2001/03/15 16:56:08 mirar Exp $ */
+/* $Id: pnm.c,v 1.26 2002/05/11 00:12:39 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: pnm.c,v 1.25 2001/03/15 16:56:08 mirar Exp $
+**!	$Id: pnm.c,v 1.26 2002/05/11 00:12:39 nilsson Exp $
 **! submodule PNM
 **!
 **!	This submodule keeps the PNM encode/decode capabilities
@@ -49,7 +49,7 @@
 #include <ctype.h>
 
 #include "stralloc.h"
-RCSID("$Id: pnm.c,v 1.25 2001/03/15 16:56:08 mirar Exp $");
+RCSID("$Id: pnm.c,v 1.26 2002/05/11 00:12:39 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -60,7 +60,6 @@ RCSID("$Id: pnm.c,v 1.25 2001/03/15 16:56:08 mirar Exp $");
 #include "pike_error.h"
 #include "operators.h"
 
-
 #include "image.h"
 #include "builtin_functions.h"
 
@@ -69,6 +68,8 @@ RCSID("$Id: pnm.c,v 1.25 2001/03/15 16:56:08 mirar Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_colortable_program;
 extern struct program *image_program;
 
diff --git a/src/modules/Image/encodings/pvr.c b/src/modules/Image/encodings/pvr.c
index ba1fb3ac4864e7cc6e9cb1ec1201b989b5ec25e9..890dd6aede98fc966a1c2987bac13f346614ea08 100644
--- a/src/modules/Image/encodings/pvr.c
+++ b/src/modules/Image/encodings/pvr.c
@@ -4,7 +4,7 @@
 #include <ctype.h>
 
 #include "stralloc.h"
-RCSID("$Id: pvr.c,v 1.16 2001/12/16 02:49:45 mast Exp $");
+RCSID("$Id: pvr.c,v 1.17 2002/05/11 00:12:39 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -19,7 +19,6 @@ RCSID("$Id: pvr.c,v 1.16 2001/12/16 02:49:45 mast Exp $");
 #include "builtin_functions.h"
 #include "module_support.h"
 
-
 #include "image.h"
 
 #include "encodings.h"
@@ -27,6 +26,8 @@ RCSID("$Id: pvr.c,v 1.16 2001/12/16 02:49:45 mast Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_program;
 
 /*
diff --git a/src/modules/Image/encodings/ras.c b/src/modules/Image/encodings/ras.c
index 2d2871de8e154c4a2d2d08c206fd223600bd3957..1cf4fb7258f9a69f35eaed3c2f1795ac5e1c725a 100644
--- a/src/modules/Image/encodings/ras.c
+++ b/src/modules/Image/encodings/ras.c
@@ -1,9 +1,9 @@
-/* $Id: ras.c,v 1.15 2001/12/16 02:49:46 mast Exp $ */
+/* $Id: ras.c,v 1.16 2002/05/11 00:12:39 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: ras.c,v 1.15 2001/12/16 02:49:46 mast Exp $
+**!	$Id: ras.c,v 1.16 2002/05/11 00:12:39 nilsson Exp $
 **! submodule RAS
 **!
 **!	This submodule keep the RAS encode/decode capabilities
@@ -14,7 +14,7 @@
 #include "global.h"
 
 #include "stralloc.h"
-RCSID("$Id: ras.c,v 1.15 2001/12/16 02:49:46 mast Exp $");
+RCSID("$Id: ras.c,v 1.16 2002/05/11 00:12:39 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -37,6 +37,8 @@ RCSID("$Id: ras.c,v 1.15 2001/12/16 02:49:46 mast Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_colortable_program;
 extern struct program *image_program;
 
diff --git a/src/modules/Image/encodings/wbf.c b/src/modules/Image/encodings/wbf.c
index 9f77d29fecd9c4fc93ce207cbdab4ebbd103bb51..97873b608e239822b5ad68eab6d4c60956421a99 100644
--- a/src/modules/Image/encodings/wbf.c
+++ b/src/modules/Image/encodings/wbf.c
@@ -5,7 +5,7 @@
 #include <ctype.h>
 
 #include "stralloc.h"
-RCSID("$Id: wbf.c,v 1.9 2001/11/07 22:03:03 nilsson Exp $");
+RCSID("$Id: wbf.c,v 1.10 2002/05/11 00:12:39 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "mapping.h"
@@ -19,7 +19,6 @@ RCSID("$Id: wbf.c,v 1.9 2001/11/07 22:03:03 nilsson Exp $");
 #include "builtin_functions.h"
 #include "program.h"
 
-
 #include "image.h"
 #include "builtin_functions.h"
 #include "module_support.h"
@@ -27,6 +26,7 @@ RCSID("$Id: wbf.c,v 1.9 2001/11/07 22:03:03 nilsson Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
 
 extern struct program *image_program;
 
diff --git a/src/modules/Image/encodings/x.c b/src/modules/Image/encodings/x.c
index b23ac30f071195331d5ebc196541fe3920eb39c2..fbc9c91f2255398cd81247390bb3eba68fce8b71 100644
--- a/src/modules/Image/encodings/x.c
+++ b/src/modules/Image/encodings/x.c
@@ -1,9 +1,9 @@
-/* $Id: x.c,v 1.36 2001/06/29 15:15:31 marcus Exp $ */
+/* $Id: x.c,v 1.37 2002/05/11 00:12:39 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: x.c,v 1.36 2001/06/29 15:15:31 marcus Exp $
+**!	$Id: x.c,v 1.37 2002/05/11 00:12:39 nilsson Exp $
 **! submodule X
 **!
 **!	This submodule handles encoding and decoding of
@@ -29,7 +29,7 @@
 #include <winsock.h>
 #endif
 
-RCSID("$Id: x.c,v 1.36 2001/06/29 15:15:31 marcus Exp $");
+RCSID("$Id: x.c,v 1.37 2002/05/11 00:12:39 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -39,9 +39,6 @@ RCSID("$Id: x.c,v 1.36 2001/06/29 15:15:31 marcus Exp $");
 #include "array.h"
 #include "pike_error.h"
 
-
-
-
 #include "image.h"
 #include "colortable.h"
 #include "builtin_functions.h"
@@ -49,6 +46,7 @@ RCSID("$Id: x.c,v 1.36 2001/06/29 15:15:31 marcus Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
 
 /* #define BITDEBUG */
 
diff --git a/src/modules/Image/encodings/xwd.c b/src/modules/Image/encodings/xwd.c
index d380e1169d5de23750c85b14e2be2d8ec87d9cd2..8f78c047b170160c949385be900577fc96cedd35 100644
--- a/src/modules/Image/encodings/xwd.c
+++ b/src/modules/Image/encodings/xwd.c
@@ -1,9 +1,9 @@
-/* $Id: xwd.c,v 1.20 2001/04/07 00:58:13 nilsson Exp $ */
+/* $Id: xwd.c,v 1.21 2002/05/11 00:12:39 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: xwd.c,v 1.20 2001/04/07 00:58:13 nilsson Exp $
+**!	$Id: xwd.c,v 1.21 2002/05/11 00:12:39 nilsson Exp $
 **! submodule XWD
 **!
 **!	This submodule keeps the XWD (X Windows Dump) 
@@ -25,7 +25,7 @@
 #include <ctype.h>
 
 #include "stralloc.h"
-RCSID("$Id: xwd.c,v 1.20 2001/04/07 00:58:13 nilsson Exp $");
+RCSID("$Id: xwd.c,v 1.21 2002/05/11 00:12:39 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -44,6 +44,7 @@ RCSID("$Id: xwd.c,v 1.20 2001/04/07 00:58:13 nilsson Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
 
 extern struct program *image_colortable_program;
 extern struct program *image_program;
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index ca1d6425891685e0297bc1d2ecb8d8e7648a72fb..edea5eef9518a9a29dc62d52ecbe189d7f91febe 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.70 2002/02/05 19:08:56 mast Exp $ */
+/* $Id: font.c,v 1.71 2002/05/11 00:27:03 nilsson Exp $ */
 #include "global.h"
 
 #define SPACE_CHAR 'i'
@@ -137,6 +137,8 @@ extern unsigned char * image_default_font;
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *font_program;
 extern struct program *image_program;
 
@@ -946,5 +948,3 @@ void init_image_font(void)
 void exit_image_font(void) 
 {
 }
-
-
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index b27fc855c77ec4c78853e8bed46da487436e5056..8c9bc60e78c0b3eea783a7d5d3281e61d9467a02 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,9 +1,9 @@
-/* $Id: image.c,v 1.195 2002/05/10 21:53:52 per Exp $ */
+/* $Id: image.c,v 1.196 2002/05/11 00:27:03 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: image.c,v 1.195 2002/05/10 21:53:52 per Exp $
+**!	$Id: image.c,v 1.196 2002/05/11 00:27:03 nilsson Exp $
 **! class Image
 **!
 **!	The main object of the <ref>Image</ref> module, this object
@@ -98,7 +98,7 @@
 
 #include "stralloc.h"
 #include "global.h"
-RCSID("$Id: image.c,v 1.195 2002/05/10 21:53:52 per Exp $");
+RCSID("$Id: image.c,v 1.196 2002/05/11 00:27:03 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -122,6 +122,7 @@ RCSID("$Id: image.c,v 1.195 2002/05/10 21:53:52 per Exp $");
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
 
 extern struct program *image_program;
 extern struct program *image_colortable_program;
diff --git a/src/modules/Image/matrix.c b/src/modules/Image/matrix.c
index 36200da6d2c4c3ad73e9b268766c38871211ec0c..d018e6849fcbfb4ed962ebe7dcdbead295a2f28f 100644
--- a/src/modules/Image/matrix.c
+++ b/src/modules/Image/matrix.c
@@ -1,9 +1,9 @@
-/* $Id: matrix.c,v 1.39 2002/04/06 16:28:42 bash-peter Exp $ */
+/* $Id: matrix.c,v 1.40 2002/05/11 00:27:03 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: matrix.c,v 1.39 2002/04/06 16:28:42 bash-peter Exp $
+**!	$Id: matrix.c,v 1.40 2002/05/11 00:27:03 nilsson Exp $
 **! class Image
 */
 
@@ -28,6 +28,8 @@
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_program;
 #ifdef THIS
 #undef THIS /* Needed for NT */
diff --git a/src/modules/Image/operator.c b/src/modules/Image/operator.c
index 90ca07fbaf3bce8877bfd4a8eb06e389ab197055..ef10d061115b321b2f3deeca978a25fee2479952 100644
--- a/src/modules/Image/operator.c
+++ b/src/modules/Image/operator.c
@@ -1,9 +1,9 @@
-/* $Id: operator.c,v 1.38 2002/02/21 05:31:10 per-bash Exp $ */
+/* $Id: operator.c,v 1.39 2002/05/11 00:27:03 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: operator.c,v 1.38 2002/02/21 05:31:10 per-bash Exp $
+**!	$Id: operator.c,v 1.39 2002/05/11 00:27:03 nilsson Exp $
 **! class Image
 */
 
@@ -31,6 +31,8 @@
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_program;
 #ifdef THIS
 #undef THIS
@@ -1079,4 +1081,3 @@ void image_find_max(INT32 args)
 
    f_aggregate(2);
 }
-
diff --git a/src/modules/Image/orient.c b/src/modules/Image/orient.c
index 55b085370405ca3c76861b82815be70373117949..31db6e1eed7aad1a1281d54489de37700969f5d0 100644
--- a/src/modules/Image/orient.c
+++ b/src/modules/Image/orient.c
@@ -1,9 +1,9 @@
-/* $Id: orient.c,v 1.19 2001/07/19 21:11:12 nilsson Exp $ */
+/* $Id: orient.c,v 1.20 2002/05/11 00:27:03 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: orient.c,v 1.19 2001/07/19 21:11:12 nilsson Exp $
+**!	$Id: orient.c,v 1.20 2002/05/11 00:27:03 nilsson Exp $
 **! class Image
 */
 
@@ -30,6 +30,8 @@
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_program;
 #ifdef THIS
 #undef THIS /* Needed for NT */
@@ -289,4 +291,3 @@ void image_orient4(INT32 args)
   pop_n_elems(1);
   f_aggregate(4);
 }
-
diff --git a/src/modules/Image/pattern.c b/src/modules/Image/pattern.c
index 65f33ac42b6fcb66467f8a4d09f2202d7e9c56a5..46b2565635b60f7872dadad80422f3f3b0eb71f1 100644
--- a/src/modules/Image/pattern.c
+++ b/src/modules/Image/pattern.c
@@ -1,9 +1,9 @@
-/* $Id: pattern.c,v 1.24 2001/07/18 18:49:59 nilsson Exp $ */
+/* $Id: pattern.c,v 1.25 2002/05/11 00:27:03 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: pattern.c,v 1.24 2001/07/18 18:49:59 nilsson Exp $
+**!	$Id: pattern.c,v 1.25 2002/05/11 00:27:03 nilsson Exp $
 **! class Image
 */
 
@@ -29,6 +29,8 @@
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_program;
 #ifdef THIS
 #undef THIS
diff --git a/src/modules/Image/poly.c b/src/modules/Image/poly.c
index 653ca5b3369a1ecc382743a481a0c72f5d6e2428..cbdf098d0ae730f51dbb5e79183fffc2f792d555 100644
--- a/src/modules/Image/poly.c
+++ b/src/modules/Image/poly.c
@@ -1,7 +1,7 @@
 /*
 **! module Image
 **! note
-**!	$Id: poly.c,v 1.13 2001/09/24 11:36:06 grubba Exp $
+**!	$Id: poly.c,v 1.14 2002/05/11 00:27:03 nilsson Exp $
 **! class Poly
 **!
 */
@@ -18,7 +18,7 @@ another?
 
 #include "global.h"
 
-RCSID("$Id: poly.c,v 1.13 2001/09/24 11:36:06 grubba Exp $");
+RCSID("$Id: poly.c,v 1.14 2002/05/11 00:27:03 nilsson Exp $");
 
 #include "image_machine.h"
 
@@ -47,6 +47,8 @@ RCSID("$Id: poly.c,v 1.13 2001/09/24 11:36:06 grubba Exp $");
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #ifdef PFLOAT
 #undef PFLOAT
 #endif
@@ -807,4 +809,3 @@ void exit_image_poly(void)
 {
    free_string(str_array);
 }
-
diff --git a/src/modules/Image/polyfill.c b/src/modules/Image/polyfill.c
index 32540c34e27c25122c2c4b3f0d648679381b210d..071eb1ed240020693e5c026bc8a28207cb5f164f 100644
--- a/src/modules/Image/polyfill.c
+++ b/src/modules/Image/polyfill.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: polyfill.c,v 1.38 2001/07/12 13:51:15 grubba Exp $");
+RCSID("$Id: polyfill.c,v 1.39 2002/05/11 00:27:03 nilsson Exp $");
 
 /* Prototypes are needed for these */
 extern double floor(double);
@@ -29,6 +29,8 @@ extern double floor(double);
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #ifdef THIS
 #undef THIS
 #endif
@@ -40,7 +42,7 @@ extern double floor(double);
 /*
 **! module Image
 **! note
-**!	$Id: polyfill.c,v 1.38 2001/07/12 13:51:15 grubba Exp $
+**!	$Id: polyfill.c,v 1.39 2002/05/11 00:27:03 nilsson Exp $
 **! class Image
 */
 
@@ -796,4 +798,3 @@ void image_polyfill(INT32 args)
 
    ref_push_object(THISOBJ);
 }
-
diff --git a/src/modules/Image/search.c b/src/modules/Image/search.c
index d4b2d4389e058090bc91552444092c5629108553..cc97530b888baf59564d1b1ff0e7bf367b82c87f 100644
--- a/src/modules/Image/search.c
+++ b/src/modules/Image/search.c
@@ -27,6 +27,8 @@
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *image_program;
 #ifdef THIS
 #undef THIS /* Needed for NT */
@@ -729,5 +731,3 @@ void image_apply_max(INT32 args)
    pop_n_elems(args);
    push_object(o);
 }
-
-
diff --git a/src/modules/MIME/mime.c b/src/modules/MIME/mime.c
index 05ce34600b8770a3125ecc70c8423fb4584f1577..4a3462f097fe4d29d361466fed7c1691d5eb6090 100644
--- a/src/modules/MIME/mime.c
+++ b/src/modules/MIME/mime.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mime.c,v 1.31 2001/07/01 16:07:25 grubba Exp $
+ * $Id: mime.c,v 1.32 2002/05/11 00:27:03 nilsson Exp $
  *
  * RFC1521 functionality for Pike
  *
@@ -10,7 +10,7 @@
 
 #include "config.h"
 
-RCSID("$Id: mime.c,v 1.31 2001/07/01 16:07:25 grubba Exp $");
+RCSID("$Id: mime.c,v 1.32 2002/05/11 00:27:03 nilsson Exp $");
 #include "stralloc.h"
 #include "pike_macros.h"
 #include "object.h"
@@ -28,6 +28,8 @@ RCSID("$Id: mime.c,v 1.31 2001/07/01 16:07:25 grubba Exp $");
 /* must be included last */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 /** Forward declarations of functions implementing Pike functions **/
 
 static void f_decode_base64( INT32 args );
diff --git a/src/modules/Mysql/mysql.c b/src/modules/Mysql/mysql.c
index 68e0d9c42633b87ca6fda3c05c8fc1e6a99bec6b..373bbd36a8dc3687f1b275eca1cbbefbe3f3c32e 100644
--- a/src/modules/Mysql/mysql.c
+++ b/src/modules/Mysql/mysql.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mysql.c,v 1.56 2002/04/11 10:10:20 jhs Exp $
+ * $Id: mysql.c,v 1.57 2002/05/11 00:27:03 nilsson Exp $
  *
  * SQL database functionality for Pike
  *
@@ -84,6 +84,8 @@ typedef struct dynamic_buffer_s dynamic_buffer;
 
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #ifdef HAVE_MYSQL
 
 /* Local includes */
@@ -93,7 +95,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
  * Globals
  */
 
-RCSID("$Id: mysql.c,v 1.56 2002/04/11 10:10:20 jhs Exp $");
+RCSID("$Id: mysql.c,v 1.57 2002/05/11 00:27:03 nilsson Exp $");
 
 /*! @module Mysql
  *!
diff --git a/src/modules/Mysql/result.c b/src/modules/Mysql/result.c
index be9901124f546ba4f8d8cd1a398081c9ff204e1d..2bdcbdb6b75b8390e972cb56995ab586d10f6898 100644
--- a/src/modules/Mysql/result.c
+++ b/src/modules/Mysql/result.c
@@ -1,5 +1,5 @@
 /*
- * $Id: result.c,v 1.24 2002/01/27 01:00:53 mast Exp $
+ * $Id: result.c,v 1.25 2002/05/11 00:27:03 nilsson Exp $
  *
  * mysql query result
  *
@@ -72,6 +72,8 @@ typedef struct dynamic_buffer_s dynamic_buffer;
 #include <memory.h>
 #endif
 
+#define sp Pike_sp
+
 /* Define this to get support for field->default. NOT SUPPORTED */
 #undef SUPPORT_DEFAULT
 
@@ -85,7 +87,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
  * Globals
  */
 
-RCSID("$Id: result.c,v 1.24 2002/01/27 01:00:53 mast Exp $");
+RCSID("$Id: result.c,v 1.25 2002/05/11 00:27:03 nilsson Exp $");
 
 struct program *mysql_result_program = NULL;
 
diff --git a/src/modules/Odbc/odbc_result.c b/src/modules/Odbc/odbc_result.c
index 972b43d703ca088460f39de42887f1937b22de8b..f9c596dfe7fdd2eda08b14486718ee97423a08c4 100644
--- a/src/modules/Odbc/odbc_result.c
+++ b/src/modules/Odbc/odbc_result.c
@@ -1,5 +1,5 @@
 /*
- * $Id: odbc_result.c,v 1.29 2001/10/16 09:17:53 tomas Exp $
+ * $Id: odbc_result.c,v 1.30 2002/05/11 00:27:03 nilsson Exp $
  *
  * Pike  interface to ODBC compliant databases
  *
@@ -16,7 +16,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-RCSID("$Id: odbc_result.c,v 1.29 2001/10/16 09:17:53 tomas Exp $");
+RCSID("$Id: odbc_result.c,v 1.30 2002/05/11 00:27:03 nilsson Exp $");
 
 #include "interpret.h"
 #include "object.h"
@@ -39,6 +39,8 @@ RCSID("$Id: odbc_result.c,v 1.29 2001/10/16 09:17:53 tomas Exp $");
 /* must be included last */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #ifdef HAVE_ODBC
 
 /* #define ODBC_DEBUG */
diff --git a/src/modules/PDF/pdflib_glue.c b/src/modules/PDF/pdflib_glue.c
index 1399973d1329b09adee531a2696e00e8e81ca773..578716b5ec8b1e5afa38ff515207061e8d54c19d 100644
--- a/src/modules/PDF/pdflib_glue.c
+++ b/src/modules/PDF/pdflib_glue.c
@@ -1,9 +1,9 @@
 /*
- * $Id: pdflib_glue.c,v 1.7 2002/03/15 22:13:08 nilsson Exp $
+ * $Id: pdflib_glue.c,v 1.8 2002/05/11 00:27:03 nilsson Exp $
  */
 
 #include "global.h"
-RCSID("$Id: pdflib_glue.c,v 1.7 2002/03/15 22:13:08 nilsson Exp $");
+RCSID("$Id: pdflib_glue.c,v 1.8 2002/05/11 00:27:03 nilsson Exp $");
 
 #include "pdf_machine.h"
 
@@ -35,6 +35,8 @@ RCSID("$Id: pdflib_glue.c,v 1.7 2002/03/15 22:13:08 nilsson Exp $");
 
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 /*! @module PDF
  */
 
diff --git a/src/modules/Parser/html.c b/src/modules/Parser/html.c
index 993067319fd8ae4d5f1e8ce067660706f514da3f..0f69db4f6ac7db35651568ed8e552b679f997889 100644
--- a/src/modules/Parser/html.c
+++ b/src/modules/Parser/html.c
@@ -1,4 +1,4 @@
-/* $Id: html.c,v 1.149 2002/01/11 17:56:36 mast Exp $ */
+/* $Id: html.c,v 1.150 2002/05/11 00:27:03 nilsson Exp $ */
 
 #include "global.h"
 #include "config.h"
@@ -25,6 +25,8 @@
 /* must be included last */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 extern struct program *parser_html_program;
 
 /* #define SCAN_DEBUG */
diff --git a/src/modules/Pipe/pipe.c b/src/modules/Pipe/pipe.c
index 0785d03acfca80a5440d9b569a7efa56968cd088..5d86bb040ce029001d3c6ed4374884912edf0cc4 100644
--- a/src/modules/Pipe/pipe.c
+++ b/src/modules/Pipe/pipe.c
@@ -30,7 +30,7 @@
 
 #include <fcntl.h>
 
-RCSID("$Id: pipe.c,v 1.47 2002/02/05 19:08:57 mast Exp $");
+RCSID("$Id: pipe.c,v 1.48 2002/05/11 00:27:03 nilsson Exp $");
 
 #include "threads.h"
 #include "stralloc.h"
@@ -54,6 +54,7 @@ RCSID("$Id: pipe.c,v 1.47 2002/02/05 19:08:57 mast Exp $");
 /* must be included last */
 #include "module_magic.h"
 
+#define sp Pike_sp
 
 /*
 #define PIPE_STRING_DEBUG
diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c
index 764594d6c986f3ffbc6d5a5cc1bc926f881e8654..dd31a13a410ed0b0a5b88bd660b37605eeb0709e 100644
--- a/src/modules/Regexp/glue.c
+++ b/src/modules/Regexp/glue.c
@@ -21,7 +21,7 @@
 #include "module_support.h"
 #include "builtin_functions.h"
 
-RCSID("$Id: glue.c,v 1.25 2002/01/16 03:02:33 nilsson Exp $");
+RCSID("$Id: glue.c,v 1.26 2002/05/11 00:27:03 nilsson Exp $");
 
 #ifdef USE_SYSTEM_REGEXP
 #include <regexp.h>
@@ -44,6 +44,7 @@ struct regexp_glue
 /* must be included last */
 #include "module_magic.h"
 
+#define sp Pike_sp
 
 #ifdef THIS
 #undef THIS
diff --git a/src/modules/SANE/sane.c b/src/modules/SANE/sane.c
index aa388c1253559dcceb4a0e2b7c3255ae3f2c292e..d27c9845c07e80a22c5d329bfba3b46fb558b442 100644
--- a/src/modules/SANE/sane.c
+++ b/src/modules/SANE/sane.c
@@ -32,7 +32,9 @@
 /* must be included last */
 #include "module_magic.h"
 
-RCSID("$Id: sane.c,v 1.9 2001/07/21 00:54:31 nilsson Exp $");
+#define sp Pike_sp
+
+RCSID("$Id: sane.c,v 1.10 2002/05/11 00:27:03 nilsson Exp $");
 
 /*
 **! module SANE
@@ -41,7 +43,7 @@ RCSID("$Id: sane.c,v 1.9 2001/07/21 00:54:31 nilsson Exp $");
 **!     library from pike
 **!
 **! note
-**!	$Id: sane.c,v 1.9 2001/07/21 00:54:31 nilsson Exp $
+**!	$Id: sane.c,v 1.10 2002/05/11 00:27:03 nilsson Exp $
 */
 
 static int sane_is_inited;
diff --git a/src/modules/_Crypto/cbc.c b/src/modules/_Crypto/cbc.c
index 8b9845a7cd5c1b416038ec4e23117613bb818e61..4de22f939ef8bcf4f5661090f2c1e0d85d9eacf8 100644
--- a/src/modules/_Crypto/cbc.c
+++ b/src/modules/_Crypto/cbc.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cbc.c,v 1.20 2001/03/28 15:07:40 grubba Exp $
+ * $Id: cbc.c,v 1.21 2002/05/11 00:08:58 nilsson Exp $
  *
  * CBC (Cipher Block Chaining Mode) crypto module for Pike.
  *
@@ -29,6 +29,7 @@
 /* THIS MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
 
 struct pike_crypto_cbc {
   struct object *object;
diff --git a/src/modules/_Crypto/crypto.c b/src/modules/_Crypto/crypto.c
index 9af82cc4d9152d2c928d0da34716bedd77bd3e8e..c91474000b06f8e42afa85f31c88af3e7ebbc603 100644
--- a/src/modules/_Crypto/crypto.c
+++ b/src/modules/_Crypto/crypto.c
@@ -1,5 +1,5 @@
 /*
- * $Id: crypto.c,v 1.48 2002/02/26 16:54:15 marcus Exp $
+ * $Id: crypto.c,v 1.49 2002/05/11 00:08:58 nilsson Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -40,6 +40,8 @@
 /* THIS MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 struct pike_crypto {
   struct object *object;
   ptrdiff_t block_size;
@@ -682,4 +684,3 @@ void pike_module_exit(void)
 
   /* END NATIONAL SECURITY */
 }
-
diff --git a/src/modules/_Crypto/des.c b/src/modules/_Crypto/des.c
index 2b6aff4e472b3472e33e4ad57cd82bb8b8e8f378..4572ad8d0c225454ac4254ce9bb8061904ee814e 100644
--- a/src/modules/_Crypto/des.c
+++ b/src/modules/_Crypto/des.c
@@ -1,5 +1,5 @@
 /*
- * $Id: des.c,v 1.23 2001/04/23 00:13:37 grubba Exp $
+ * $Id: des.c,v 1.24 2002/05/11 00:08:58 nilsson Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -44,6 +44,8 @@
 /* THIS MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 struct pike_crypto_des {
   unsigned INT32 method[DES_EXPANDED_KEYLEN];
   void (*crypt_fun)(unsigned INT8 *dest,
diff --git a/src/modules/_Crypto/invert.c b/src/modules/_Crypto/invert.c
index fa156ddc40ff50137e265a2931e019469b342777..6ded9e6e1cd4611d8e0387aa3f11facd91bb998d 100644
--- a/src/modules/_Crypto/invert.c
+++ b/src/modules/_Crypto/invert.c
@@ -1,5 +1,5 @@
 /*
- * $Id: invert.c,v 1.12 2001/02/13 14:03:17 grubba Exp $
+ * $Id: invert.c,v 1.13 2002/05/11 00:08:58 nilsson Exp $
  *
  * INVERT crypto module for Pike
  *
@@ -27,6 +27,8 @@
 /* THIS MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 /*
  * Globals
  */
diff --git a/src/modules/_Crypto/pipe.c b/src/modules/_Crypto/pipe.c
index e9adff21612972181f9bf1034ab93f1fa0e0628d..22ba9c67bfcfa2f388b95d1f60cab64f6301b886 100644
--- a/src/modules/_Crypto/pipe.c
+++ b/src/modules/_Crypto/pipe.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pipe.c,v 1.21 2001/03/28 15:07:41 grubba Exp $
+ * $Id: pipe.c,v 1.22 2002/05/11 00:08:58 nilsson Exp $
  *
  * PIPE crypto module for Pike.
  *
@@ -31,6 +31,8 @@
 /* THIS MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 struct pike_crypto_pipe {
   struct object **objects;
   INT32 num_objs;
diff --git a/src/modules/_Crypto/rijndael.c b/src/modules/_Crypto/rijndael.c
index 147dc4f4764bbd3e7dd57da22a31cd432142711e..a580554b1554f02f0435f6b257d5fcaa79d8eb9e 100644
--- a/src/modules/_Crypto/rijndael.c
+++ b/src/modules/_Crypto/rijndael.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rijndael.c,v 1.6 2001/03/24 20:06:45 grubba Exp $
+ * $Id: rijndael.c,v 1.7 2002/05/11 00:08:58 nilsson Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -41,6 +41,8 @@
 /* THIS MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 struct pike_crypto_rijndael {
   int rounds;
   word8 keySchedule[MAXROUNDS+1][4][4];
diff --git a/src/modules/_Crypto/rsa.c b/src/modules/_Crypto/rsa.c
index 3b4bd9ca596967e5531abd7e5046c1c9ae3068e8..51a81de9be4cf121d521fdf924a7af2946433c36 100644
--- a/src/modules/_Crypto/rsa.c
+++ b/src/modules/_Crypto/rsa.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rsa.c,v 1.24 2000/12/01 08:10:30 hubbe Exp $
+ * $Id: rsa.c,v 1.25 2002/05/11 00:08:58 nilsson Exp $
  *
  * Glue to RSA BSAFE's RSA implementation.
  *
@@ -34,7 +34,9 @@
 /* THIS MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
-RCSID("$Id: rsa.c,v 1.24 2000/12/01 08:10:30 hubbe Exp $");
+#define sp Pike_sp
+
+RCSID("$Id: rsa.c,v 1.25 2002/05/11 00:08:58 nilsson Exp $");
 
 struct pike_rsa_data
 {
diff --git a/src/modules/_Image_GIF/image_gif.c b/src/modules/_Image_GIF/image_gif.c
index 1b70cb8868f491ff6d26b76314291144f3498433..e64439fba956e7fc3c27907c3a1d0625af4b596e 100644
--- a/src/modules/_Image_GIF/image_gif.c
+++ b/src/modules/_Image_GIF/image_gif.c
@@ -1,9 +1,9 @@
-/* $Id: image_gif.c,v 1.9 2002/05/10 21:54:28 per Exp $ */
+/* $Id: image_gif.c,v 1.10 2002/05/11 00:27:03 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: image_gif.c,v 1.9 2002/05/10 21:54:28 per Exp $
+**!	$Id: image_gif.c,v 1.10 2002/05/11 00:27:03 nilsson Exp $
 **! submodule GIF
 **!
 **!	This submodule keep the GIF encode/decode capabilities
@@ -35,7 +35,7 @@
 #include <ctype.h>
 
 #include "stralloc.h"
-RCSID("$Id: image_gif.c,v 1.9 2002/05/10 21:54:28 per Exp $");
+RCSID("$Id: image_gif.c,v 1.10 2002/05/11 00:27:03 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -60,6 +60,8 @@ RCSID("$Id: image_gif.c,v 1.9 2002/05/10 21:54:28 per Exp $");
 /* MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #ifdef DYNAMIC_MODULE
 static struct program *image_program = NULL;
 static struct program *image_colortable_program = NULL;
diff --git a/src/modules/_Image_JPEG/image_jpeg.c b/src/modules/_Image_JPEG/image_jpeg.c
index 9ef7f68b6c85e4c70959af9c1a3aa38ab099ae14..78f88c37adb6e3f0b362d227f134f9471e5a1ba2 100644
--- a/src/modules/_Image_JPEG/image_jpeg.c
+++ b/src/modules/_Image_JPEG/image_jpeg.c
@@ -1,5 +1,5 @@
 /*
- * $Id: image_jpeg.c,v 1.45 2001/09/24 12:11:42 grubba Exp $
+ * $Id: image_jpeg.c,v 1.46 2002/05/11 00:27:03 nilsson Exp $
  */
 
 #include "global.h"
@@ -37,7 +37,7 @@
 #ifdef HAVE_STDLIB_H
 #undef HAVE_STDLIB_H
 #endif
-RCSID("$Id: image_jpeg.c,v 1.45 2001/09/24 12:11:42 grubba Exp $");
+RCSID("$Id: image_jpeg.c,v 1.46 2002/05/11 00:27:03 nilsson Exp $");
 
 /* For some reason EXTERN can be defined here.
  * This is not good, since it confuses compilation.h.
@@ -64,6 +64,8 @@ RCSID("$Id: image_jpeg.c,v 1.45 2001/09/24 12:11:42 grubba Exp $");
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #ifdef HAVE_JPEGLIB_H
 
 #include "../Image/image.h"
diff --git a/src/modules/_Image_TIFF/image_tiff.c b/src/modules/_Image_TIFF/image_tiff.c
index 2bab511426c2d44f0796890f453d5589231673e7..befe5935438eba42379370efe23cb15026951b4d 100644
--- a/src/modules/_Image_TIFF/image_tiff.c
+++ b/src/modules/_Image_TIFF/image_tiff.c
@@ -7,7 +7,7 @@
 */
 
 #ifdef HAVE_LIBTIFF
-RCSID("$Id: image_tiff.c,v 1.27 2001/09/24 12:13:52 grubba Exp $");
+RCSID("$Id: image_tiff.c,v 1.28 2002/05/11 00:27:03 nilsson Exp $");
 
 #include "global.h"
 #include "machine.h"
@@ -38,6 +38,8 @@ RCSID("$Id: image_tiff.c,v 1.27 2001/09/24 12:13:52 grubba Exp $");
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #ifdef DYNAMIC_MODULE
 static struct program *image_program=NULL;
 static struct program *image_colortable_program=NULL;
diff --git a/src/modules/_Image_TTF/image_ttf.c b/src/modules/_Image_TTF/image_ttf.c
index 19cd88dd101ac6223b5b6d48c9c149713fc845e3..35ca010468d612a467268aa541bf4a77913e5a9a 100644
--- a/src/modules/_Image_TTF/image_ttf.c
+++ b/src/modules/_Image_TTF/image_ttf.c
@@ -1,12 +1,12 @@
 /*
- * $Id: image_ttf.c,v 1.41 2001/09/24 12:14:42 grubba Exp $
+ * $Id: image_ttf.c,v 1.42 2002/05/11 00:27:04 nilsson Exp $
  */
 
 #include "config.h"
 
 
 #include "global.h"
-RCSID("$Id: image_ttf.c,v 1.41 2001/09/24 12:14:42 grubba Exp $");
+RCSID("$Id: image_ttf.c,v 1.42 2002/05/11 00:27:04 nilsson Exp $");
 
 #ifdef HAVE_LIBTTF
 #if defined(HAVE_FREETYPE_FREETYPE_H) && defined(HAVE_FREETYPE_FTXKERN_H)
@@ -53,6 +53,8 @@ static TT_Engine engine;
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 static struct pike_string *param_baseline;
 static struct pike_string *param_quality;
 
diff --git a/src/modules/_Image_XFace/image_xface.c b/src/modules/_Image_XFace/image_xface.c
index 6588c5541ba31cdc609142e94b603093d0d366fb..caf189552d35203a367454f47f3def1e2e4aca8b 100644
--- a/src/modules/_Image_XFace/image_xface.c
+++ b/src/modules/_Image_XFace/image_xface.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: image_xface.c,v 1.14 2000/12/01 08:10:33 hubbe Exp $");
+RCSID("$Id: image_xface.c,v 1.15 2002/05/11 00:27:04 nilsson Exp $");
 
 #include "config.h"
 
@@ -54,6 +54,8 @@ RCSID("$Id: image_xface.c,v 1.14 2000/12/01 08:10:33 hubbe Exp $");
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #ifdef DYNAMIC_MODULE
 static struct program *image_program=NULL;
 #else
@@ -534,4 +536,3 @@ void pike_module_init(void)
 #endif /* USE_GMP || USE_GMP2 */
 
 }
-
diff --git a/src/modules/_math/math.c b/src/modules/_math/math.c
index 9378a0ff287e605af60e51d0e35c7cfda9bbd14b..018fc69ac98a2f408bf62799cd3eabcdf67b7eb0 100644
--- a/src/modules/_math/math.c
+++ b/src/modules/_math/math.c
@@ -29,7 +29,9 @@
 #include <floatingpoint.h>
 #endif
 
-RCSID("$Id: math.c,v 1.43 2002/05/05 16:06:29 nilsson Exp $");
+#define sp Pike_sp
+
+RCSID("$Id: math.c,v 1.44 2002/05/11 00:27:04 nilsson Exp $");
 
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795080
diff --git a/src/modules/files/efuns.c b/src/modules/files/efuns.c
index 958d0c4169217fec17072f896ff04d12bb1b3edd..8d88030b52116adca12a11aa307ad23329df1aa3 100644
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -25,7 +25,7 @@
 #include "file_machine.h"
 #include "file.h"
 
-RCSID("$Id: efuns.c,v 1.111 2002/03/05 20:00:23 mast Exp $");
+RCSID("$Id: efuns.c,v 1.112 2002/05/11 00:27:04 nilsson Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -75,6 +75,8 @@ RCSID("$Id: efuns.c,v 1.111 2002/03/05 20:00:23 mast Exp $");
 #include <process.h>
 #endif
 
+#define sp Pike_sp
+
 /* #define DEBUG_FILE */
 /* #define READDIR_DEBUG */
 
diff --git a/src/modules/files/sendfile.c b/src/modules/files/sendfile.c
index 973c41040241cc2da13fcf407f0dcd66f59b77f1..e67176172709713831a5aaf529df1049a6b21857 100644
--- a/src/modules/files/sendfile.c
+++ b/src/modules/files/sendfile.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sendfile.c,v 1.55 2001/11/01 18:10:40 mast Exp $
+ * $Id: sendfile.c,v 1.56 2002/05/11 00:27:04 nilsson Exp $
  *
  * Sends headers + from_fd[off..off+len-1] + trailers to to_fd asyncronously.
  *
@@ -68,6 +68,8 @@
 #endif /* HAVE_SYS_MMAN_H */
 #endif
 
+#define sp Pike_sp
+
 /* #define SF_DEBUG */
 
 #ifdef SF_DEBUG
diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c
index e138558790fc5c0373f4a45eab0ad14bf24ba35d..717e34058ce0bf87760fcabc5ab569cbd8ac48c2 100644
--- a/src/modules/spider/spider.c
+++ b/src/modules/spider/spider.c
@@ -43,7 +43,7 @@
 #include "threads.h"
 #include "operators.h"
 
-RCSID("$Id: spider.c,v 1.114 2002/04/06 23:50:08 mast Exp $");
+RCSID("$Id: spider.c,v 1.115 2002/05/11 00:27:04 nilsson Exp $");
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>
@@ -90,6 +90,8 @@ RCSID("$Id: spider.c,v 1.114 2002/04/06 23:50:08 mast Exp $");
 /* This must be included last! */
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #define MAX_PARSE_RECURSE 102
 
 void do_html_parse(struct pike_string *ss,
diff --git a/src/modules/sprintf/sprintf.c b/src/modules/sprintf/sprintf.c
index 087394c0f842a6dd080ad6d0c8011e4c4db12a4f..3b9ce9261533c55fa1e2d6e7524a4bbcdc1a8987 100644
--- a/src/modules/sprintf/sprintf.c
+++ b/src/modules/sprintf/sprintf.c
@@ -281,7 +281,7 @@
  *!   @[lfun::_sprintf()]
  */
 #include "global.h"
-RCSID("$Id: sprintf.c,v 1.89 2002/03/07 10:57:53 grubba Exp $");
+RCSID("$Id: sprintf.c,v 1.90 2002/05/11 00:27:04 nilsson Exp $");
 #include "pike_error.h"
 #include "array.h"
 #include "svalue.h"
@@ -315,6 +315,8 @@ RCSID("$Id: sprintf.c,v 1.89 2002/03/07 10:57:53 grubba Exp $");
 #include <fp_class.h>
 #endif
 
+#define sp Pike_sp
+
 #define FORMAT_INFO_STACK_SIZE 200
 #define RETURN_SHARED_STRING
 
diff --git a/src/modules/system/memory.c b/src/modules/system/memory.c
index c671accf46cb0496746c1d727463d1cbf1bd644e..0a19acca59223f7ddc5b67f0907d2fc602985848 100644
--- a/src/modules/system/memory.c
+++ b/src/modules/system/memory.c
@@ -1,5 +1,5 @@
 /*
- * $Id: memory.c,v 1.14 2002/01/16 01:46:48 nilsson Exp $
+ * $Id: memory.c,v 1.15 2002/05/11 00:14:16 nilsson Exp $
  */
 
 /*! @module System
@@ -16,7 +16,7 @@
  *!	Don't blame Pike if you shoot your foot off.
  */
 #include "global.h"
-RCSID("$Id: memory.c,v 1.14 2002/01/16 01:46:48 nilsson Exp $");
+RCSID("$Id: memory.c,v 1.15 2002/05/11 00:14:16 nilsson Exp $");
 
 #include "system_machine.h"
 
@@ -86,6 +86,8 @@ RCSID("$Id: memory.c,v 1.14 2002/01/16 01:46:48 nilsson Exp $");
 
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 static void memory__mmap(INT32 args,int complain,int private);
 static void memory_allocate(INT32 args);
 static void memory_shm(INT32 args);
@@ -958,4 +960,3 @@ void init_system_memory(void)
    ADD_INT_CONSTANT("__MMAP__",1,0);
 #endif
 }
-
diff --git a/src/modules/system/passwords.c b/src/modules/system/passwords.c
index 348509965775273c2e00f62db90310b52f4e103f..93f88a61a330ce9253c0eab8b6f8199c13869006 100644
--- a/src/modules/system/passwords.c
+++ b/src/modules/system/passwords.c
@@ -1,5 +1,5 @@
 /*
- * $Id: passwords.c,v 1.35 2002/03/04 16:32:16 grubba Exp $
+ * $Id: passwords.c,v 1.36 2002/05/11 00:14:16 nilsson Exp $
  *
  * Password handling for Pike.
  *
@@ -22,7 +22,7 @@
 #include "system_machine.h"
 #include "system.h"
 
-RCSID("$Id: passwords.c,v 1.35 2002/03/04 16:32:16 grubba Exp $");
+RCSID("$Id: passwords.c,v 1.36 2002/05/11 00:14:16 nilsson Exp $");
 
 #include "module_support.h"
 #include "interpret.h"
@@ -49,6 +49,8 @@ RCSID("$Id: passwords.c,v 1.35 2002/03/04 16:32:16 grubba Exp $");
 # include <shadow.h>
 #endif /* HAVE_SHADOW_H */
 
+#define sp Pike_sp
+
 /*
  * Emulation
  */
diff --git a/src/object.c b/src/object.c
index e483527d5053e48774b0310244404f6f8f0cd613..98af4af3791e02cd974cd546e0af520f8cf35f1a 100644
--- a/src/object.c
+++ b/src/object.c
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: object.c,v 1.199 2002/04/03 12:11:53 mast Exp $");
+RCSID("$Id: object.c,v 1.200 2002/05/11 00:29:57 nilsson Exp $");
 #include "object.h"
 #include "dynamic_buffer.h"
 #include "interpret.h"
@@ -44,6 +44,7 @@ RCSID("$Id: object.c,v 1.199 2002/04/03 12:11:53 mast Exp $");
 
 #include "dmalloc.h"
 
+#define sp Pike_sp
 
 /* #define GC_VERBOSE */
 
diff --git a/src/opcodes.c b/src/opcodes.c
index f302f4e73642bdd61fa7d61e43a200d4b7d6fe57..38796175c63918bed8d2bf30444d15768e08b8a2 100644
--- a/src/opcodes.c
+++ b/src/opcodes.c
@@ -27,7 +27,9 @@
 #include "bignum.h"
 #include "operators.h"
 
-RCSID("$Id: opcodes.c,v 1.119 2002/01/16 02:54:16 nilsson Exp $");
+#define sp Pike_sp
+
+RCSID("$Id: opcodes.c,v 1.120 2002/05/11 00:29:58 nilsson Exp $");
 
 void index_no_free(struct svalue *to,struct svalue *what,struct svalue *ind)
 {
diff --git a/src/operators.c b/src/operators.c
index 46040cffcc549ea98a0076fa03fea37f441ceea6..f48bb23f06d585244a8ef830bf01bb637dd0abbd 100644
--- a/src/operators.c
+++ b/src/operators.c
@@ -6,7 +6,7 @@
 /**/
 #include "global.h"
 #include <math.h>
-RCSID("$Id: operators.c,v 1.148 2002/04/20 15:11:50 jhs Exp $");
+RCSID("$Id: operators.c,v 1.149 2002/05/11 00:29:58 nilsson Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "multiset.h"
@@ -30,6 +30,8 @@ RCSID("$Id: operators.c,v 1.148 2002/04/20 15:11:50 jhs Exp $");
 #include "bignum.h"
 #include "builtin_functions.h"
 
+#define sp Pike_sp
+
 #define OP_DIVISION_BY_ZERO_ERROR(FUNC) \
      math_error(FUNC, sp-2, 2, 0, "Division by zero.\n")
 #define OP_MODULO_BY_ZERO_ERROR(FUNC) \
diff --git a/src/post_modules/GL/auto.c.in b/src/post_modules/GL/auto.c.in
index bc3938fd851c430e0be38da78b14212d80601c8e..ce4a86979d1c797941c25af2591f4b2dcaffcd7f 100644
--- a/src/post_modules/GL/auto.c.in
+++ b/src/post_modules/GL/auto.c.in
@@ -1,6 +1,6 @@
 /* -*- C -*-
  *
- * $Id: auto.c.in,v 1.19 2002/01/11 23:07:10 per-bash Exp $
+ * $Id: auto.c.in,v 1.20 2002/05/11 00:00:33 nilsson Exp $
  *
  */
 
@@ -8,7 +8,7 @@
 
 #include "config.h"
 
-RCSID("$Id: auto.c.in,v 1.19 2002/01/11 23:07:10 per-bash Exp $");
+RCSID("$Id: auto.c.in,v 1.20 2002/05/11 00:00:33 nilsson Exp $");
 #include "stralloc.h"
 #include "pike_macros.h"
 #include "object.h"
@@ -32,6 +32,8 @@ RCSID("$Id: auto.c.in,v 1.19 2002/01/11 23:07:10 per-bash Exp $");
 
 #include "module_magic.h"
 
+#define sp Pike_sp
+
 #define ZT_INT    1
 #define ZT_FLOAT  2
 #define ZT_DOUBLE 4
diff --git a/src/program.c b/src/program.c
index 18d1f3832c44812ee7ecb96383f48f88245027b6..1aa2dfca379e60c28148c8284afb246a37bfc9dc 100644
--- a/src/program.c
+++ b/src/program.c
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: program.c,v 1.428 2002/05/10 22:39:30 mast Exp $");
+RCSID("$Id: program.c,v 1.429 2002/05/11 00:29:58 nilsson Exp $");
 #include "program.h"
 #include "object.h"
 #include "dynamic_buffer.h"
@@ -39,6 +39,7 @@ RCSID("$Id: program.c,v 1.428 2002/05/10 22:39:30 mast Exp $");
 #include <errno.h>
 #include <fcntl.h>
 
+#define sp Pike_sp
 
 #undef ATTRIBUTE
 #define ATTRIBUTE(X)
diff --git a/src/svalue.c b/src/svalue.c
index 6275445be301e903c5b034ecde55c597c2e46593..dd267ede6eb64bd3e77d17c47b763c0a6d63e16d 100644
--- a/src/svalue.c
+++ b/src/svalue.c
@@ -37,6 +37,8 @@
 #include <float.h>
 #endif /* HAVE_FLOAT_H */
 
+#define sp Pike_sp
+
 /* isnan()...
  */
 #ifdef HAVE_ISNAN
@@ -63,7 +65,7 @@ static int pike_isnan(double x)
 #endif /* HAVE__ISNAN */
 #endif /* HAVE_ISNAN */
 
-RCSID("$Id: svalue.c,v 1.137 2002/05/02 09:14:46 mast Exp $");
+RCSID("$Id: svalue.c,v 1.138 2002/05/11 00:29:58 nilsson Exp $");
 
 struct svalue dest_ob_zero = {
   T_INT, 0,