diff --git a/src/array.c b/src/array.c
index 4414e9c3e4d4a7d3d2294ee5b5d4ae18c9b6e0e4..4be78178b79a9a1b64e92cc69aab7eda5a1397e8 100644
--- a/src/array.c
+++ b/src/array.c
@@ -538,7 +538,7 @@ INT32 *get_order(struct array *v, cmpfun fun)
 static int set_svalue_cmpfun(struct svalue *a, struct svalue *b)
 {
   INT32 tmp;
-  if(tmp=(a->type - b->type)) return tmp;
+  if((tmp=(a->type - b->type))) return tmp;
   switch(a->type)
   {
   case T_FLOAT:
@@ -1251,7 +1251,7 @@ struct array *explode(struct pike_string *str,
     
     init_memsearch(&searcher, del->str, del->len, str->len);
     
-    while(tmp=memory_search(&searcher, s, end-s))
+    while((tmp=memory_search(&searcher, s, end-s)))
     {
       check_stack(1);
       push_string(make_shared_binary_string(s, tmp-s));
diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 0c749b884907344a502090654537c2a0a936a5f0..b88904a358132f09455adcb6268056aa5c380285 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: builtin_functions.c,v 1.34 1997/03/17 03:04:35 hubbe Exp $");
+RCSID("$Id: builtin_functions.c,v 1.35 1997/04/16 03:09:09 hubbe Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "pike_macros.h"
@@ -33,6 +33,8 @@ RCSID("$Id: builtin_functions.c,v 1.34 1997/03/17 03:04:35 hubbe Exp $");
 #include <math.h>
 #include <ctype.h>
 #include "module_support.h"
+#include "module.h"
+#include "opcodes.h"
 
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
diff --git a/src/callback.c b/src/callback.c
index 4441271462ec0b7491e26ee9e16d57f30c5e6f75..80200d268a67fb009ba306cc88b967ac138a20c5 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -5,6 +5,7 @@
 \*/
 #include "pike_macros.h"
 #include "callback.h"
+#include "error.h"
 
 /*
  * This file is used to simplify the management of callbacks when certain
@@ -152,7 +153,7 @@ void call_callback(struct callback_list *lst, void *arg)
 
   check_callback_chain(lst);
   ptr=&lst->callbacks;
-  while(l=*ptr)
+  while((l=*ptr))
   {
     if(l->call)
     {
@@ -225,7 +226,7 @@ void free_callback(struct callback_list *lst)
   struct callback *l,**ptr;
   check_callback_chain(lst);
   ptr=& lst->callbacks;
-  while(l=*ptr)
+  while((l=*ptr))
   {
     if(l->free_func)
       l->free_func(l, l->arg, 0);
diff --git a/src/configure.in b/src/configure.in
index a8bd40aec9978a51a181406baced25c1b5cda1b2..bfb05968ec2e21bb796129568593464213d8da67 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.83 1997/04/15 11:31:14 hubbe Exp $")
+AC_REVISION("$Id: configure.in,v 1.84 1997/04/16 03:09:10 hubbe Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -150,7 +150,7 @@ OPTIMIZE=""
 
 if test $cflags_is_set = no; then
  if test "x${GCC-}" = xyes ; then
-  WARN="-W -Wformat"
+  WARN="-W -Wall -Wpointer-arith -Wno-unused"
 ### Optimize for different SUN machines. If there is no working 'uname'
 ### no extra optimization will be done, but nothing should break either.
   AC_SYS_CPU_COMPILER_FLAG(sun4c,-msparclite,sparclite)
diff --git a/src/constants.c b/src/constants.c
index ab354663463822e125f53151a0fc25dd8d9b7bf4..49f697bcf919ac7920e1604e74edeb6b5270e4d8 100644
--- a/src/constants.c
+++ b/src/constants.c
@@ -12,6 +12,7 @@
 #include "memory.h"
 #include "interpret.h"
 #include "mapping.h"
+#include "error.h"
 
 static INT32 num_callable=0;
 static struct mapping *builtin_constants = 0;
diff --git a/src/encode.c b/src/encode.c
index eacb199e932cca2f02fdd8c860f964a23d92e878..300436c193ade30fb5ae78110cf2184daa3e426a 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -124,7 +124,7 @@ static void encode_value2(struct svalue *val, struct encode_data *data)
 {
   INT32 i;
   struct svalue *tmp;
-  if(tmp=low_mapping_lookup(data->encoded, val))
+  if((tmp=low_mapping_lookup(data->encoded, val)))
   {
     code_entry(T_AGAIN, tmp->u.integer, data);
     return;
@@ -287,7 +287,7 @@ static void decode_value2(struct decode_data *data)
     tmp.type=T_INT;
     tmp.subtype=0;
     tmp.u.integer=num;
-    if(tmp2=low_mapping_lookup(data->decoded, &tmp))
+    if((tmp2=low_mapping_lookup(data->decoded, &tmp)))
     {
       push_svalue(tmp2);
     }else{
diff --git a/src/fd_control.c b/src/fd_control.c
index 99ef961d60fb6e6b7cefd632ec97a6444857ab9c..52e3b87152a20c43b90b4821d2f0ab132492f3d6 100644
--- a/src/fd_control.c
+++ b/src/fd_control.c
@@ -10,6 +10,7 @@
 
 #ifndef TESTING
 #include "global.h"
+#include "error.h"
 #else
 #undef DEBUG
 #endif
diff --git a/src/gc.c b/src/gc.c
index 193f73d5e23a63e3dc3afa1535dfd982b4358090..a3d1f008beb46c7849bceb88b46fa92d0a97e391 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -16,6 +16,8 @@ struct callback *gc_evaluator_callback=0;
 #include "object.h"
 #include "program.h"
 #include "stralloc.h"
+#include "stuff.h"
+#include "error.h"
 
 #include "gc.h"
 #include "main.h"
@@ -280,7 +282,7 @@ void do_gc()
 
   /* Free hash table */
   free((char *)hash);
-  while(m=chunk)
+  while((m=chunk))
   {
     chunk=m->next;
     free((char *)m);
diff --git a/src/interpret.c b/src/interpret.c
index 85e71f44a6bc6231fe021a9ea4c792dded4e176d..5c6d7a6f3c267d843cb8473afe1ef32da9fc9d9d 100644
--- a/src/interpret.c
+++ b/src/interpret.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: interpret.c,v 1.41 1997/04/10 23:13:48 hubbe Exp $");
+RCSID("$Id: interpret.c,v 1.42 1997/04/16 03:09:11 hubbe Exp $");
 #include "interpret.h"
 #include "object.h"
 #include "program.h"
@@ -27,6 +27,7 @@ RCSID("$Id: interpret.c,v 1.41 1997/04/10 23:13:48 hubbe Exp $");
 #include "gc.h"
 #include "threads.h"
 #include "callback.h"
+#include "fd_control.h"
 
 #include <fcntl.h>
 #include <errno.h>
diff --git a/src/las.c b/src/las.c
index 379aca497080137624d49c02abd1571678ae79e1..eb420234242bf3327965048014a468627ac7ece0 100644
--- a/src/las.c
+++ b/src/las.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: las.c,v 1.30 1997/03/17 03:04:39 hubbe Exp $");
+RCSID("$Id: las.c,v 1.31 1997/04/16 03:09:12 hubbe Exp $");
 
 #include "language.h"
 #include "interpret.h"
@@ -25,6 +25,7 @@ RCSID("$Id: las.c,v 1.30 1997/03/17 03:04:39 hubbe Exp $");
 #include "operators.h"
 #include "callback.h"
 #include "pike_macros.h"
+#include "peep.h"
 
 #define LASDEBUG
 
@@ -1432,7 +1433,7 @@ static void optimize(node *n)
 	 CAR(n)->u.sval.subtype == FUNCTION_BUILTIN && /* driver fun? */
 	 CAR(n)->u.sval.u.efun->optimize)
       {
-	if(tmp1=CAR(n)->u.sval.u.efun->optimize(n))
+	if((tmp1=CAR(n)->u.sval.u.efun->optimize(n)))
 	{
 	  goto use_tmp1;
 	}
@@ -1947,7 +1948,7 @@ static int stupid_args(node *n, int expected,int vargs)
   }
 }
 
-static is_null_branch(node *n)
+static int is_null_branch(node *n)
 {
   if(!n) return 1;
   if(n->token==F_CAST && n->type==void_type_string)
@@ -2022,7 +2023,7 @@ int dooptcode(struct pike_string *name,
   }
   n=mknode(F_ARG_LIST,n,0);
 
-  if(foo=is_stupid_func(n, args, vargs))
+  if((foo=is_stupid_func(n, args, vargs)))
   {
     if(foo->type == T_FUNCTION && foo->subtype==FUNCTION_BUILTIN)
     {
diff --git a/src/lex.c b/src/lex.c
index de55d5a21c03d2a972c7e48426f7fc27f4fbd90f..e6dcfed7987511ac9f7f28bf4561e5e4ec7dac63 100644
--- a/src/lex.c
+++ b/src/lex.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: lex.c,v 1.20 1997/03/17 03:04:40 hubbe Exp $");
+RCSID("$Id: lex.c,v 1.21 1997/04/16 03:09:12 hubbe Exp $");
 #include "language.h"
 #include "array.h"
 #include "lex.h"
@@ -22,6 +22,7 @@ RCSID("$Id: lex.c,v 1.20 1997/03/17 03:04:40 hubbe Exp $");
 #include "opcodes.h"
 #include "builtin_functions.h"
 #include "main.h"
+#include "mapping.h"
 
 #include "pike_macros.h"
 #include <sys/param.h>
diff --git a/src/main.c b/src/main.c
index 790a7508014f1f145eaa92172f3a634099f2207c..c780f60a94ede77cd1c75b2b7472fc38781d4a77 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: main.c,v 1.20 1997/03/24 00:44:37 hubbe Exp $");
+RCSID("$Id: main.c,v 1.21 1997/04/16 03:09:13 hubbe Exp $");
 #include "types.h"
 #include "backend.h"
 #include "module.h"
@@ -20,6 +20,9 @@ RCSID("$Id: main.c,v 1.20 1997/03/24 00:44:37 hubbe Exp $");
 #include "callback.h"
 #include "signal_handler.h"
 #include "threads.h"
+#include "dynamic_load.h"
+#include "gc.h"
+#include "mapping.h"
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
diff --git a/src/mapping.c b/src/mapping.c
index 9040e10746dc89f188cbb1aa74d199b9ea2f7a24..6ce714a4b28dbcd358204c9a843bee3563fa0408 100644
--- a/src/mapping.c
+++ b/src/mapping.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mapping.c,v 1.16 1997/03/17 03:04:41 hubbe Exp $");
+RCSID("$Id: mapping.c,v 1.17 1997/04/16 03:09:13 hubbe Exp $");
 #include "main.h"
 #include "types.h"
 #include "object.h"
@@ -266,7 +266,7 @@ void mapping_insert(struct mapping *m,
 #endif
     if(m->ind_types & (1 << key->type))
     {
-      for(prev= m->hash + h;k=*prev;prev=&k->next)
+      for(prev= m->hash + h;(k=*prev);prev=&k->next)
       {
 	if(is_eq(& k->ind, key))
 	{
@@ -326,7 +326,7 @@ union anything *mapping_get_item_ptr(struct mapping *m,
   if(d_flag > 1) check_mapping_type_fields(m);
 #endif
 
-    for(prev= m->hash + h;k=*prev;prev=&k->next)
+    for(prev= m->hash + h;(k=*prev);prev=&k->next)
     {
       if(is_eq(& k->ind, key))
       {
@@ -384,7 +384,7 @@ void map_delete(struct mapping *m,
 
   h=hash_svalue(key) % m->hashsize;
   
-  for(prev= m->hash + h;k=*prev;prev=&k->next)
+  for(prev= m->hash + h;(k=*prev);prev=&k->next)
   {
     if(is_eq(& k->ind, key))
     {
@@ -424,7 +424,7 @@ void check_mapping_for_destruct(struct mapping *m)
     m->val_types |= BIT_INT;
     for(e=0;e<m->hashsize;e++)
     {
-      for(prev= m->hash + e;k=*prev;)
+      for(prev= m->hash + e;(k=*prev);)
       {
 	check_destructed(& k->val);
 	
@@ -470,7 +470,7 @@ struct svalue *low_mapping_lookup(struct mapping *m,
   {
     h=hash_svalue(key) % m->hashsize;
   
-    for(prev= m->hash + h;k=*prev;prev=&k->next)
+    for(prev= m->hash + h;(k=*prev);prev=&k->next)
     {
       if(is_eq(& k->ind, key))
       {
@@ -501,7 +501,7 @@ void mapping_index_no_free(struct svalue *dest,
 {
   struct svalue *p;
 
-  if(p=low_mapping_lookup(m,key))
+  if((p=low_mapping_lookup(m,key)))
   {
     if(p->type==T_INT)
       p->subtype=NUMBER_NUMBER;
@@ -692,7 +692,7 @@ int mapping_equal_p(struct mapping *a, struct mapping *b, struct processing *p)
   LOOP(a)
   {
     struct svalue *s;
-    if(s=low_mapping_lookup(b, & k->ind))
+    if((s=low_mapping_lookup(b, & k->ind)))
     {
       if(!low_is_equal(s, &k->val, &curr)) return 0;
     }else{
@@ -1072,7 +1072,7 @@ void zap_all_mappings()
 
     for(e=0;e<m->hashsize;e++)
     {
-      while(k=m->hash[e])
+      while((k=m->hash[e]))
       {
 	m->hash[e]=k->next;
 	k->next=m->free_list;
diff --git a/src/memory.h b/src/memory.h
index 0e749d4ab736bb7b345aa590940f9a1d3475bcad..67bd3403351dd6c10f0a7ddbd076d0d2eb7116de 100644
--- a/src/memory.h
+++ b/src/memory.h
@@ -35,6 +35,8 @@ struct mem_searcher
 
 /* Prototypes begin here */
 char *xalloc(SIZE_T size);
+void swap(char *a, char *b, INT32 size);
+void reverse(char *memory, INT32 nitems, INT32 size);
 void reorder(char *memory, INT32 nitems, INT32 size,INT32 *order);
 unsigned INT32 hashmem(const unsigned char *a,INT32 len,INT32 mlen);
 unsigned INT32 hashstr(const unsigned char *str,INT32 maxn);
diff --git a/src/module_support.c b/src/module_support.c
index 478fb65bf0afd407c25c9daa10d995fdef7e5894..3adddd7c478dc4cf4d02b498f33f411f5d7a3902 100644
--- a/src/module_support.c
+++ b/src/module_support.c
@@ -4,6 +4,7 @@
 #include "svalue.h"
 #include "stralloc.h"
 #include "pike_types.h"
+#include "error.h"
 
 enum error_type {
   ERR_NONE,
@@ -222,6 +223,7 @@ int get_args(struct svalue *s,
   va_start(ptr, fmt);
   ret=va_get_args(s, num_args, fmt, ptr);
   va_end(fmt);
+  return ret;
 }
 
 void get_all_args(char *fname, INT32 args, char *format,  ... )
diff --git a/src/modules/Gmp/mpz_glue.c b/src/modules/Gmp/mpz_glue.c
index 99327d1e776d6690c09d3dafc6a4a238593e2746..f7e9526511286bf1b65460fee31f5ab12a32dfb5 100644
--- a/src/modules/Gmp/mpz_glue.c
+++ b/src/modules/Gmp/mpz_glue.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mpz_glue.c,v 1.10 1997/04/15 20:12:49 nisse Exp $");
+RCSID("$Id: mpz_glue.c,v 1.11 1997/04/16 03:10:27 hubbe Exp $");
 #include "gmp_machine.h"
 #include "types.h"
 
@@ -23,6 +23,9 @@ RCSID("$Id: mpz_glue.c,v 1.10 1997/04/15 20:12:49 nisse Exp $");
 #include "stralloc.h"
 #include "object.h"
 #include "pike_types.h"
+#include "error.h"
+#include "builtin_functions.h"
+#include "opcodes.h"
 
 #include <gmp.h>
 
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index 3fe67f387cf5707ad8bd9b516fe4861295be42d1..4fbffbb72687fcf46989fa3bbb0c725ac6798a20 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -23,7 +23,7 @@
 **!
 */
 
-/* $Id: font.c,v 1.6 1997/04/09 01:49:47 mirar Exp $ */
+/* $Id: font.c,v 1.7 1997/04/16 03:10:45 hubbe Exp $ */
 
 #include "global.h"
 
@@ -52,6 +52,7 @@
 #include "svalue.h"
 #include "array.h"
 #include "threads.h"
+#include "builtin_functions.h"
 
 #include "image.h"
 #ifdef HAVE_MMAP
@@ -147,10 +148,10 @@ static inline long file_size(int fd)
   return -1;
 }
 
-static inline write_char(struct _char *ci,
-			 rgb_group *pos,
-			 INT32 xsize,
-			 INT32 height)
+static inline void write_char(struct _char *ci,
+			      rgb_group *pos,
+			      INT32 xsize,
+			      INT32 height)
 {
    rgb_group *nl;
    INT32 x,y;
diff --git a/src/modules/Pipe/pipe.c b/src/modules/Pipe/pipe.c
index fcd61f765db86fc588e55a94af0608a6422f0a54..340c89dd0031d219023a8302393f5f03dc74fd65 100644
--- a/src/modules/Pipe/pipe.c
+++ b/src/modules/Pipe/pipe.c
@@ -20,7 +20,7 @@
 #include <fcntl.h>
 
 #include "global.h"
-RCSID("$Id: pipe.c,v 1.5 1997/03/20 16:05:49 grubba Exp $");
+RCSID("$Id: pipe.c,v 1.6 1997/04/16 03:11:06 hubbe Exp $");
 
 #include "stralloc.h"
 #include "types.h"
@@ -30,6 +30,7 @@ RCSID("$Id: pipe.c,v 1.5 1997/03/20 16:05:49 grubba Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "error.h"
+#include "builtin_functions.h"
 
 #ifndef S_ISREG
 #ifdef S_IFREG
@@ -212,6 +213,8 @@ static INLINE void free_input(struct input *i)
     error("I_MMAP input when MMAP is diabled!");
 #endif
     break;
+
+  case I_NONE: break;
   }
   free((char *)i);
 }
@@ -353,6 +356,8 @@ static INLINE void input_finish(void)
 
     case I_STRING:
       append_buffer(i->u.str);
+
+    case I_NONE: break;
     }
   }
   THIS->sleeping=0;
diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c
index 5f978356b93480a522b64166ceb28f2160292713..acc7b881d48aa451544200de07f3f2c3436cc9a8 100644
--- a/src/modules/Regexp/glue.c
+++ b/src/modules/Regexp/glue.c
@@ -17,6 +17,7 @@
 #include "object.h"
 #include "pike_macros.h"
 #include "threads.h"
+#include "module_support.h"
 
 #ifdef USE_SYSTEM_REGEXP
 #include <regexp.h>
diff --git a/src/modules/Yp/yp.c b/src/modules/Yp/yp.c
index 5deaff489df8378807360cdc7ea20e874ed2ccd2..3e2a46bed85b7f6e5ef0b79308fae76b594fccc0 100644
--- a/src/modules/Yp/yp.c
+++ b/src/modules/Yp/yp.c
@@ -17,6 +17,7 @@
 #include <rpcsvc/yp_prot.h>
 
 #include "stralloc.h"
+#include "error.h"
 #include "global.h"
 #include "types.h"
 #include "pike_macros.h"
@@ -26,6 +27,7 @@
 #include "svalue.h"
 #include "mapping.h"
 #include "builtin_functions.h"
+#include "module_support.h"
 
 #define YPERROR(fun,err) do{if(err)error("yp->%s(): %s\n", (fun), yperr_string( err ));}while(0)
 
diff --git a/src/modules/_Crypto/Makefile.in b/src/modules/_Crypto/Makefile.in
index ade7be8e7109e0c06ab22c1b2049a8c115d39995..6e05df232d4c43918fe46efd181bee46c4c2990a 100644
--- a/src/modules/_Crypto/Makefile.in
+++ b/src/modules/_Crypto/Makefile.in
@@ -1,6 +1,7 @@
 SRCDIR=@srcdir@
 VPATH=@srcdir@:@srcdir@/../..:../..
 OBJS=crypto.o idea.o des.o rc4.o invert.o sha.o md5.o pipe.o cbc.o lib/algorithms.a
+MODULE_SUBDIRS=lib
 
 @SET_MAKE@
 
diff --git a/src/modules/_Crypto/lib/Makefile.in b/src/modules/_Crypto/lib/Makefile.in
index edd89bc9d6f7ee521ffe06c1c846111e8152ab2d..da3fbeb5acb8415ada520a01bbbe3b1c6b417938 100644
--- a/src/modules/_Crypto/lib/Makefile.in
+++ b/src/modules/_Crypto/lib/Makefile.in
@@ -58,6 +58,11 @@ sure:
 		rm *.i; make 'CPPFLAGS=-Dmc68000 -Usparc'
 		rm *.i; make 'CPPFLAGS=-Dsparc   -Umc68000'
 
+clean:
+	-rm -f *.o *.i *.x *.a
+
+depend:
+
 desCore.a:	$O
 		ar cru $@ $O
 		$(RANLIB) $@
@@ -75,32 +80,32 @@ desdata:	desdata.o
 		$(LINK.c) -o $@ desdata.o
 
 # new rules  (note: tr|sed|tr is NOT necessary,  just there so .i is readable)
-.c.i:
-	$(CPP) $(CFLAGS) $< > $*.x
-	@tr ';'\\012 \\012';' < $*.x |			\
-	 sed	-e 's/[ 	][ 	]*/ /g'		\
-		-e 's/^ //'				\
-		-e 's/ $$//'				\
-		-e '/^$$/d'				\
-		-e '/^[^;]/s/^/;/'			\
-		-e 's/#[^;]*;//g'			\
-		-e 's/\([){]\) *\(register\)/\1;\2/g'	\
-		-e 's/\([[(]\) /\1/g'			\
-		-e 's/ \([])]\)/\1/g'			\
-		-e 's/\([^]+0123 ]\) =/\1  =/g'		\
-		-e 's/}/};;/g'				\
-		-e 's/ *; */;/g'			\
-		-e 's/;;;*/;;/g'			\
-		-e '1s/^;*//' |				\
-	 tr ';'\\012 \\012';' > $@
-	@echo ""  >> $@
-#	@echo "}" >> $@			# last definition must be a procedure
-
-#		-e 's/\(;[kmxyz][0-9]*\)\([^;]*=\)/\1  \2/g'
-
-.i.o:
-		$(CODEGEN.c) $<
-		$(COMPILE.c) $*.s
+#.c.i:
+#	$(CPP) $(CFLAGS) $< > $*.x
+#	@tr ';'\\012 \\012';' < $*.x |			\
+#	 sed	-e 's/[ 	][ 	]*/ /g'		\
+#		-e 's/^ //'				\
+#		-e 's/ $$//'				\
+#		-e '/^$$/d'				\
+#		-e '/^[^;]/s/^/;/'			\
+#		-e 's/#[^;]*;//g'			\
+#		-e 's/\([){]\) *\(register\)/\1;\2/g'	\
+#		-e 's/\([[(]\) /\1/g'			\
+#		-e 's/ \([])]\)/\1/g'			\
+#		-e 's/\([^]+0123 ]\) =/\1  =/g'		\
+#		-e 's/}/};;/g'				\
+#		-e 's/ *; */;/g'			\
+#		-e 's/;;;*/;;/g'			\
+#		-e '1s/^;*//' |				\
+#	 tr ';'\\012 \\012';' > $@
+#	@echo ""  >> $@
+##	@echo "}" >> $@			# last definition must be a procedure
+#
+##		-e 's/\(;[kmxyz][0-9]*\)\([^;]*=\)/\1  \2/g'
+#
+#.i.o:
+#		$(CODEGEN.c) $<
+#		$(COMPILE.c) $*.s
 
 # slowest to quickest
 desSmallFips.c:
diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in
index c6ceae156408d47ee909d57124eaa024fc2c8b91..4873268051c7960ce380bf12ab436ae218c7dde0 100644
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -23,9 +23,11 @@ module.so: $(OBJS)
 
 clean:
 	-rm -f *.o *.a *.so module.so
+	for a in $(MODULE_SUBDIRS) ; do ( cd $$a ; $(MAKE) $(MAKE_FLAGS) clean ) ; done
 
 depend:
 	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
+	for a in $(MODULE_SUBDIRS) ; do ( cd $$a ; $(MAKE) $(MAKE_FLAGS) depend ) ; done
 
 #verify / debug
 module_testsuite: $(SRCDIR)/testsuite.in
diff --git a/src/modules/files/efuns.c b/src/modules/files/efuns.c
index b08cabe53777db5f29ae5ddb871e29f98569e5ca..a0b34014d384ae5905f49c1a168b482ec92b2e4d 100644
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -14,8 +14,12 @@
 #include "fd_control.h"
 #include "threads.h"
 #include "module_support.h"
+#include "constants.h"
+#include "backend.h"
+#include "operators.h"
 
 #include "file_machine.h"
+#include "file.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index e687a031c08e6fda7b6566ec5a1c50ea82230422..25cc983602695897912905616a27c829dc9ab67b 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -6,7 +6,7 @@
 #define READ_BUFFER 8192
 
 #include "global.h"
-RCSID("$Id: file.c,v 1.35 1997/04/08 20:40:18 marcus Exp $");
+RCSID("$Id: file.c,v 1.36 1997/04/16 03:12:41 hubbe Exp $");
 #include "types.h"
 #include "interpret.h"
 #include "svalue.h"
@@ -16,6 +16,9 @@ RCSID("$Id: file.c,v 1.35 1997/04/08 20:40:18 marcus Exp $");
 #include "pike_macros.h"
 #include "backend.h"
 #include "fd_control.h"
+#include "module_support.h"
+#include "gc.h"
+#include "opcodes.h"
 
 #include "file_machine.h"
 #include "file.h"
@@ -402,7 +405,7 @@ static void file_read(INT32 args)
 
   pop_n_elems(args);
 
-  if(tmp=do_read(FD, len, all, & ERRNO))
+  if((tmp=do_read(FD, len, all, & ERRNO)))
     push_string(tmp);
   else
     push_int(0);
@@ -1443,6 +1446,7 @@ void init_files_efuns(void);
 
 void pike_module_init()
 {
+  extern void port_setup_program(void);
   int e;
   for(e=0;e<MAX_OPEN_FILEDESCRIPTORS;e++)
   {
diff --git a/src/modules/math/math.c b/src/modules/math/math.c
index 45dc6b5dd71b322ab195a9c71b067ae63b123c88..d9b21d125dcf4b6e57f27b5e916499a3bc5c2659 100644
--- a/src/modules/math/math.c
+++ b/src/modules/math/math.c
@@ -7,6 +7,7 @@
 #include "interpret.h"
 #include "constants.h"
 #include "svalue.h"
+#include "error.h"
 
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795080
diff --git a/src/modules/spider/accesseddb.c b/src/modules/spider/accesseddb.c
index 53a66ffa1e1cee9320d7cdb16b5536ba43d23b54..5a2bb8be8a6b40abb93743bea5d4a4f5f097da42 100644
--- a/src/modules/spider/accesseddb.c
+++ b/src/modules/spider/accesseddb.c
@@ -11,6 +11,7 @@
 #include "svalue.h"
 #include "mapping.h"
 #include "array.h"
+#include "error.h"
 #include "builtin_functions.h"
 
 #include <stdio.h>
@@ -127,7 +128,7 @@ int mread(struct file_head *this, char *data, int len, int pos)
   return len;
 }
 
-int mwrite(struct file_head *this, char *data, int len, int pos)
+void mwrite(struct file_head *this, char *data, int len, int pos)
 {
   this->pos = pos;
   lseek(this->fd, this->pos, SEEK_SET);
@@ -281,12 +282,12 @@ static node_t *fast_find_entry(struct string *name, struct file_head *this)
 static node_t *find_entry(struct string *name, struct file_head *this)
 {
   struct node *me;
-  if(me = fast_find_entry( name, this ))
+  if((me = fast_find_entry( name, this )))
   {
     this->fast_hits++;
     return me;
   }
-  if(me=slow_find_entry( name, this ))
+  if((me=slow_find_entry( name, this )))
   {
     this->other_hits++;
     return me;
diff --git a/src/modules/spider/discdate.c b/src/modules/spider/discdate.c
index e93a04dbf3dde12e772bd3ca085867bab31e1127..545d36adea1fc54dad390918fa2a76605647fae8 100644
--- a/src/modules/spider/discdate.c
+++ b/src/modules/spider/discdate.c
@@ -18,6 +18,7 @@
 #include "svalue.h"
 #include "mapping.h"
 #include "array.h"
+#include "error.h"
 #include "builtin_functions.h"
 #include <time.h>
 #include <string.h>
@@ -42,7 +43,7 @@ void f_discdate(INT32 argc)
   struct disc_time hastur;
   if (argc != 1) 
   {
-    error(stderr,"Error: discdate(time)");
+    error("Error: discdate(time)");
     exit(1);
   } else {
     struct tm *eris;
@@ -124,11 +125,11 @@ static char *seasons[5] =
 
 static char *holidays[5][2] = 
 { 
-  "Mungday", "Chaoflux",
-  "Mojoday", "Discoflux",
-  "Syaday",  "Confuflux",
-  "Zaraday", "Bureflux",
-  "Maladay", "Afflux"
+  { "Mungday", "Chaoflux" },
+  { "Mojoday", "Discoflux" },
+  { "Syaday",  "Confuflux" },
+  { "Zaraday", "Bureflux" } ,
+  { "Maladay", "Afflux" }
   };
 
 static void print(struct disc_time tick)
diff --git a/src/modules/spider/dumudp.c b/src/modules/spider/dumudp.c
index 4e7abc266eb9cae0ff2d7fd41b03a415ff4710b5..6ea2db255c8e7a4eec084ca1d92e50cab4eadb8d 100644
--- a/src/modules/spider/dumudp.c
+++ b/src/modules/spider/dumudp.c
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #include "global.h"
-RCSID("$Id: dumudp.c,v 1.7 1997/03/17 03:13:16 hubbe Exp $");
+RCSID("$Id: dumudp.c,v 1.8 1997/04/16 03:13:24 hubbe Exp $");
 #include "types.h"
 #include "interpret.h"
 #include "svalue.h"
@@ -11,6 +11,9 @@ RCSID("$Id: dumudp.c,v 1.7 1997/03/17 03:13:16 hubbe Exp $");
 #include "pike_macros.h"
 #include "backend.h"
 #include "fd_control.h"
+#include "error.h"
+#include "builtin_functions.h"
+#include "mapping.h"
 
 #include "error.h"
 #include "signal_handler.h"
diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c
index e1a75f4cb4c0ffd9dbc817159eff4bbf8ef2ed9a..8c13d7c14a51b6a83e57f11eb06e1518eca6adfa 100644
--- a/src/modules/spider/spider.c
+++ b/src/modules/spider/spider.c
@@ -34,6 +34,7 @@
 #include "array.h"
 #include "builtin_functions.h"
 #include "threads.h"
+#include "operators.h"
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>
diff --git a/src/modules/spider/streamed_parser.c b/src/modules/spider/streamed_parser.c
index 782d7f5ff079d0489b610e5b2be8b2b34d16914a..5af6673d5b921edd97c9b4c066330f4aa0ecad5b 100644
--- a/src/modules/spider/streamed_parser.c
+++ b/src/modules/spider/streamed_parser.c
@@ -9,6 +9,10 @@
 #include "mapping.h"
 #include "array.h"
 #include "builtin_functions.h"
+#include "error.h"
+#include "module_support.h"
+#include "multiset.h"
+#include "operators.h"
 
 #include "streamed_parser.h"
 
@@ -339,7 +343,7 @@ void streamed_parser_parse( INT32 args )
 	  ind2 = c-1;
 	push_string( make_shared_binary_string( str + ind, ind2 - ind ) );
 	f_lower_case( 1 );
-	if (multiset_member( DATA->end_tags, sp-1 ))
+	if (low_mapping_lookup( DATA->end_tags, sp-1 ))
 	{
 	  if (handle_end_tag( data_arg ))
 	  {
@@ -401,14 +405,14 @@ void streamed_parser_parse( INT32 args )
        case WS:
 	push_string( make_shared_binary_string( str + ind, c - ind ) );
 	f_lower_case( 1 );
-	if (multiset_member( DATA->start_tags, sp-1 ))
+	if (low_mapping_lookup( DATA->start_tags, sp-1 ))
 	{
 	  f_aggregate_mapping( 0 );
 	  state = TAG_WS;
 	  sp_tag_save = sp-1;
 	  content_tag = 0;
 	}
-	else if (multiset_member( DATA->content_tags, sp-1 ))
+	else if (low_mapping_lookup( DATA->content_tags, sp-1 ))
 	{
 	  f_aggregate_mapping( 0 );
 	  state = TAG_WS;
@@ -424,7 +428,7 @@ void streamed_parser_parse( INT32 args )
        case '>':
 	push_string( make_shared_binary_string( str + ind, c - ind ) );
 	f_lower_case( 1 );
-	if (multiset_member( DATA->start_tags, sp-1 ))
+	if (low_mapping_lookup( DATA->start_tags, sp-1 ))
 	{
 	  f_aggregate_mapping( 0 );
 	  if (handle_tag( data_arg ))
@@ -441,7 +445,7 @@ void streamed_parser_parse( INT32 args )
 	    ;
 #endif
 	}
-	else if (multiset_member( DATA->content_tags, sp-1 ))
+	else if (low_mapping_lookup( DATA->content_tags, sp-1 ))
 	{
 	  f_aggregate_mapping( 0 );
 	  ind2 = c+1;
diff --git a/src/modules/sprintf/sprintf.c b/src/modules/sprintf/sprintf.c
index eaf8952630f6808e6558949ccff04aa389699436..4f13157115add827e81ee3bd07135fb2f06b0c7a 100644
--- a/src/modules/sprintf/sprintf.c
+++ b/src/modules/sprintf/sprintf.c
@@ -96,7 +96,7 @@
 */
 
 #include "global.h"
-RCSID("$Id: sprintf.c,v 1.9 1997/02/07 00:45:06 hubbe Exp $");
+RCSID("$Id: sprintf.c,v 1.10 1997/04/16 03:13:41 hubbe Exp $");
 #include "error.h"
 #include "array.h"
 #include "svalue.h"
@@ -626,7 +626,7 @@ static string low_pike_sprintf(char *format,
 	    struct svalue *s;
 	    union anything *q;
 
-	    check_signals();
+	    check_threads_etc();
 	    q=low_array_get_item_ptr(w,tmp,T_ARRAY);
 	    s=sp;
 	    if(q)
diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in
index d298cb09796fe46c03d5cce3bed67718bcf28198..7b6c5c46c5786fb7bc6bdbc2ad9d83eabf863dfa 100644
--- a/src/modules/static_module_makefile.in
+++ b/src/modules/static_module_makefile.in
@@ -27,9 +27,11 @@ module.a: $(OBJS)
 
 clean:
 	-rm -f *.o *.a *.so module.so module.pmod
+	for a in $(MODULE_SUBDIRS) ; do ( cd $$a ; $(MAKE) $(MAKE_FLAGS) clean ) ; done
 
 depend:
 	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
+	for a in $(MODULE_SUBDIRS) ; do ( cd $$a ; $(MAKE) $(MAKE_FLAGS) depend ) ; done
 
 #verify / debug
 module_testsuite: $(SRCDIR)/testsuite.in
diff --git a/src/modules/system/passwords.c b/src/modules/system/passwords.c
index f05963a6f877c3d71f2f226724cbca1a7fab7158..a33db534d13f687fda9a4340259aab1e7060911a 100644
--- a/src/modules/system/passwords.c
+++ b/src/modules/system/passwords.c
@@ -1,5 +1,5 @@
 /*
- * $Id: passwords.c,v 1.1 1997/01/28 22:40:06 grubba Exp $
+ * $Id: passwords.c,v 1.2 1997/04/16 03:14:05 hubbe Exp $
  *
  * Password handling for Pike.
  *
@@ -15,13 +15,14 @@
 
 #include <global.h>
 
-RCSID("$Id: passwords.c,v 1.1 1997/01/28 22:40:06 grubba Exp $");
+RCSID("$Id: passwords.c,v 1.2 1997/04/16 03:14:05 hubbe Exp $");
 
 #include <module_support.h>
 #include <interpret.h>
 #include <stralloc.h>
 #include <threads.h>
 #include <svalue.h>
+#include <builtin_functions.h>
 
 #ifdef HAVE_PASSWD_H
 # include <passwd.h>
diff --git a/src/modules/system/syslog.c b/src/modules/system/syslog.c
index 5b3c57fd642dada25c2fa0bfa2598f64e4f7b4be..74eeede36e1cce2f157e83a7105f7af1a88db026 100644
--- a/src/modules/system/syslog.c
+++ b/src/modules/system/syslog.c
@@ -1,5 +1,5 @@
 /*
- * $Id: syslog.c,v 1.2 1997/01/28 22:40:07 grubba Exp $
+ * $Id: syslog.c,v 1.3 1997/04/16 03:14:05 hubbe Exp $
  *
  * Access to syslog from Pike.
  *
@@ -17,12 +17,14 @@
 
 #ifdef HAVE_SYSLOG
 
-RCSID("$Id: syslog.c,v 1.2 1997/01/28 22:40:07 grubba Exp $");
+RCSID("$Id: syslog.c,v 1.3 1997/04/16 03:14:05 hubbe Exp $");
 
 #include <interpret.h>
 #include <svalue.h>
 #include <stralloc.h>
 #include <threads.h>
+#include <module_support.h>
+#include <builtin_functions.h>
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
diff --git a/src/modules/system/system.c b/src/modules/system/system.c
index a23c7daced54245b8383812d1711c8e6c09dbc22..9f46bfaf45db45bf2ae47a0eae0d3f15da4797e7 100644
--- a/src/modules/system/system.c
+++ b/src/modules/system/system.c
@@ -1,5 +1,5 @@
 /*
- * $Id: system.c,v 1.15 1997/04/11 04:11:03 hubbe Exp $
+ * $Id: system.c,v 1.16 1997/04/16 03:14:06 hubbe Exp $
  *
  * System-call module for Pike
  *
@@ -14,13 +14,16 @@
 #include "system.h"
 
 #include <global.h>
-RCSID("$Id: system.c,v 1.15 1997/04/11 04:11:03 hubbe Exp $");
+RCSID("$Id: system.c,v 1.16 1997/04/16 03:14:06 hubbe Exp $");
 #include <module_support.h>
 #include <las.h>
 #include <interpret.h>
 #include <stralloc.h>
 #include <threads.h>
 #include <svalue.h>
+#include <mapping.h>
+#include <builtin_functions.h>
+#include <constants.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/object.c b/src/object.c
index bcf2644df4e98b1cbcb2eb10d7ded4e87e6b0a7a..93cd6cac8c85b88ce3f332ce0a7dfa0a8d800343 100644
--- a/src/object.c
+++ b/src/object.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: object.c,v 1.16 1997/03/17 03:04:42 hubbe Exp $");
+RCSID("$Id: object.c,v 1.17 1997/04/16 03:09:14 hubbe Exp $");
 #include "object.h"
 #include "dynamic_buffer.h"
 #include "interpret.h"
@@ -250,7 +250,7 @@ void destruct_objects_to_destruct()
 {
   struct object *o, *next;
 
-  while(o=objects_to_destruct)
+  while((o=objects_to_destruct))
   {
     /* Link object back to list of objects */
     objects_to_destruct=o->next;
diff --git a/src/opcodes.c b/src/opcodes.c
index 8faf5655ec37d453a76f711b5872b144fbead694..71698888919e54da0859a41649ec2741045f2e03 100644
--- a/src/opcodes.c
+++ b/src/opcodes.c
@@ -17,6 +17,7 @@
 #include "error.h"
 #include "pike_types.h"
 #include "memory.h"
+#include "fd_control.h"
 
 void index_no_free(struct svalue *to,struct svalue *what,struct svalue *ind)
 {
diff --git a/src/operators.c b/src/operators.c
index fef1e67c0e5282b55164fd30a30ae2e2514b96d9..7ff23d9bf8ce63beb784018e3a293e5ac4962db8 100644
--- a/src/operators.c
+++ b/src/operators.c
@@ -5,7 +5,7 @@
 \*/
 #include <math.h>
 #include "global.h"
-RCSID("$Id: operators.c,v 1.12 1997/03/14 04:37:17 hubbe Exp $");
+RCSID("$Id: operators.c,v 1.13 1997/04/16 03:09:15 hubbe Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "multiset.h"
@@ -23,6 +23,7 @@ RCSID("$Id: operators.c,v 1.12 1997/03/14 04:37:17 hubbe Exp $");
 #include "lex.h"
 #include "program.h"
 #include "object.h"
+#include "pike_types.h"
 
 #define COMPARISON(ID,NAME,EXPR) \
 void ID(INT32 args) \
diff --git a/src/peep.c b/src/peep.c
index ad9581fb955428fbac277660e7fd462e89386314..49e19ea939253f05c3a322ae526ffa8d75af270b 100644
--- a/src/peep.c
+++ b/src/peep.c
@@ -427,7 +427,7 @@ static void advance()
     fifo_len--;
   }else{
     p_instr *p;
-    if(p=instr(0))
+    if((p=instr(0)))
       insert_opcode(p->opcode, p->arg, p->line, p->file);
     eye++;
   }
diff --git a/src/pike_types.c b/src/pike_types.c
index d91d53b1cccc8dc2e6e5bf4a9590a66f43b78614..92c102e6bffc616153fcf80684721db1c6d8018b 100644
--- a/src/pike_types.c
+++ b/src/pike_types.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: pike_types.c,v 1.20 1997/03/17 03:04:43 hubbe Exp $");
+RCSID("$Id: pike_types.c,v 1.21 1997/04/16 03:09:15 hubbe Exp $");
 #include <ctype.h>
 #include "svalue.h"
 #include "pike_types.h"
@@ -20,6 +20,7 @@ RCSID("$Id: pike_types.c,v 1.20 1997/03/17 03:04:43 hubbe Exp $");
 #include "error.h"
 #include "las.h"
 #include "language.h"
+#include "memory.h"
 
 int max_correct_args;
 
@@ -711,7 +712,7 @@ static char *low_match_types(char *a,char *b, int flags)
   case TWOT(T_OBJECT, T_FUNCTION):
   {
     struct program *p;
-    if(p=id_to_program(EXTRACT_INT(a+1)))
+    if((p=id_to_program(EXTRACT_INT(a+1))))
     {
       int i=p->lfuns[LFUN_CALL];
       if(i == -1) return 0;
@@ -723,7 +724,7 @@ static char *low_match_types(char *a,char *b, int flags)
   case TWOT(T_FUNCTION, T_OBJECT):
   {
     struct program *p;
-    if(p=id_to_program(EXTRACT_INT(b+1)))
+    if((p=id_to_program(EXTRACT_INT(b+1))))
     {
       int i=p->lfuns[LFUN_CALL];
       if(i == -1) return 0;
diff --git a/src/port.c b/src/port.c
index 89c7393316f1cc6bff7466c2b0f33f3b14fc148e..f7591cf49421e2b1fa10f169f967d7427b3c0361 100644
--- a/src/port.c
+++ b/src/port.c
@@ -55,8 +55,8 @@ static unsigned long slow_rand(void)
 
 static void slow_srand(long seed)
 {
-  RandSeed1 = (seed - 1) ^ 0xA5B96384;
-  RandSeed2 = (seed + 1) ^ 0x56F04021;
+  RandSeed1 = (seed - 1) ^ 0xA5B96384UL;
+  RandSeed2 = (seed + 1) ^ 0x56F04021UL;
 }
 
 #define RNDBUF 250
diff --git a/src/port.h b/src/port.h
index d34be8787a5d827ade3c98f90c1cfd7cc805cf43..9a1eff5b71781d7423521effc4c919ae4821bedd 100644
--- a/src/port.h
+++ b/src/port.h
@@ -164,9 +164,9 @@ static INLINE int EXTRACT_CHAR(char *p) { return *p > 0x7f ? *p - 0x100 : *p; }
 #  define EXTRACT_INT(p) (*(INT32 *)(p))
 #else
 #ifdef DEBUG
-unsigned INT16 EXTRACT_UWORD(unsigned char *p);
-INT16 EXTRACT_WORD(unsigned char *p);
-INT32 EXTRACT_INT(unsigned char *p);
+unsigned INT16 EXTRACT_UWORD_(unsigned char *p);
+INT16 EXTRACT_WORD_(unsigned char *p);
+INT32 EXTRACT_INT_(unsigned char *p);
 #else
 static INLINE unsigned INT16 EXTRACT_UWORD_(unsigned char *p)
 {
diff --git a/src/program.c b/src/program.c
index d95de3e5bad6df8b04682db6f555cad5bc8115e1..c1020557eb92db19505d3bc7be2b58d251e467db 100644
--- a/src/program.c
+++ b/src/program.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: program.c,v 1.32 1997/04/15 03:50:10 hubbe Exp $");
+RCSID("$Id: program.c,v 1.33 1997/04/16 03:09:16 hubbe Exp $");
 #include "program.h"
 #include "object.h"
 #include "dynamic_buffer.h"
@@ -23,6 +23,7 @@ RCSID("$Id: program.c,v 1.32 1997/04/15 03:50:10 hubbe Exp $");
 #include "gc.h"
 #include "threads.h"
 #include "constants.h"
+#include "operators.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -635,7 +636,7 @@ struct program *end_program()
 
     prog->inherits[0].prog=prog;
     prog->prev=0;
-    if(prog->next=first_program)
+    if((prog->next=first_program))
       first_program->prev=prog;
     first_program=prog;
 
diff --git a/src/signal_handler.c b/src/signal_handler.c
index fee73c172ea6a3355c8b5a08f7040e471c9345de..dbcf0020d3524e938d184c66730c308cc957a6f9 100644
--- a/src/signal_handler.c
+++ b/src/signal_handler.c
@@ -159,7 +159,7 @@ static struct sigdesc signal_desc []={
 
 typedef RETSIGTYPE (*sigfunctype) (int);
 
-static int my_signal(int sig, sigfunctype fun)
+static void my_signal(int sig, sigfunctype fun)
 {
 #ifdef HAVE_SIGACTION
   {
diff --git a/src/stralloc.c b/src/stralloc.c
index 298ab38b56a8af6def35c01526dc75f0e27c5945..4cbbeafb885ec6443e8b322898405496dc1dc581 100644
--- a/src/stralloc.c
+++ b/src/stralloc.c
@@ -10,6 +10,7 @@
 #include "pike_macros.h"
 #include "memory.h"
 #include "error.h"
+#include "gc.h"
 
 #define BEGIN_HASH_SIZE 997
 #define MAX_AVG_LINK_LENGTH 3
diff --git a/src/stuff.c b/src/stuff.c
index d399eb60f2e08e2a9860fe5f9f03eeb6567abc1a..26ad4a61c8d0909e51de1a07579e1e904f912cd3 100644
--- a/src/stuff.c
+++ b/src/stuff.c
@@ -30,12 +30,12 @@ int my_log2(unsigned INT32 x)
      7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
   };
   register unsigned int tmp;
-  if(tmp=(x>>16))
+  if((tmp=(x>>16)))
   {
-    if(x=(tmp>>8)) return bit[x]+24;
+    if((x=(tmp>>8))) return bit[x]+24;
     return bit[tmp]+16;
   }
-  if(tmp=(x>>8)) return bit[tmp]+8;
+  if((tmp=(x>>8))) return bit[tmp]+8;
   return bit[x];
 }
 
@@ -64,10 +64,10 @@ int count_bits(unsigned INT32 x)
 /* Return true for integers with more than one bit set */
 int is_more_than_one_bit(unsigned INT32 x)
 {
-  return ((x & 0xaaaaaaaa) && (x & 0x55555555)) ||
-         ((x & 0xcccccccc) && (x & 0x33333333)) ||
-         ((x & 0xf0f0f0f0) && (x & 0x0f0f0f0f)) ||
-         ((x & 0xff00ff00) && (x & 0x00ff00ff)) ||
-         ((x & 0xff00ff00) && (x & 0x00ff00ff)) ||
-         ((x & 0xffff0000) && (x & 0x0000ffff));
+  return ((x & 0xaaaaaaaaUL) && (x & 0x55555555UL)) ||
+         ((x & 0xccccccccUL) && (x & 0x33333333UL)) ||
+         ((x & 0xf0f0f0f0UL) && (x & 0x0f0f0f0fUL)) ||
+         ((x & 0xff00ff00UL) && (x & 0x00ff00ffUL)) ||
+         ((x & 0xff00ff00UL) && (x & 0x00ff00ffUL)) ||
+         ((x & 0xffff0000UL) && (x & 0x0000ffffUL));
 }
diff --git a/src/svalue.c b/src/svalue.c
index 6f5f86663ca47063546c0b3e11e9cdf4ffdcf8c1..f88a5a61171bbaf22427b40bf22fcf0872590ab3 100644
--- a/src/svalue.c
+++ b/src/svalue.c
@@ -16,9 +16,9 @@
 #include "error.h"
 #include "dynamic_buffer.h"
 #include "interpret.h"
+#include "gc.h"
 
-
-struct svalue dest_ob_zero = { T_INT, 0, 0 };
+struct svalue dest_ob_zero = { T_INT, 0 };
 
 
 /*
@@ -184,7 +184,7 @@ void assign_svalues_no_free(struct svalue *to,
     return;
   }
 
-  if((type_hint & (BIT_INT | BIT_FLOAT)==0))
+  if(((type_hint & (BIT_INT | BIT_FLOAT))==0))
   {
     while(--num > 0)
     {
diff --git a/src/threads.c b/src/threads.c
index d5a2d7aa0e80979ecd13f0d800579633ffc21fec..2a4c9d86819c751429421a43b4eb76579ce2ba2d 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: threads.c,v 1.20 1997/03/17 03:04:44 hubbe Exp $");
+RCSID("$Id: threads.c,v 1.21 1997/04/16 03:09:18 hubbe Exp $");
 
 int num_threads = 1;
 int threads_disabled = 0;
@@ -10,6 +10,8 @@ int threads_disabled = 0;
 #include "object.h"
 #include "pike_macros.h"
 #include "callback.h"
+#include "builtin_functions.h"
+#include "constants.h"
 
 
 struct object *thread_id;
@@ -45,7 +47,7 @@ void *new_thread_func(void * data)
   INT32 tmp;
 
 /*  fprintf(stderr, "Thread create[%d]...",dbt++);*/
-  if(tmp=mt_lock( & interpreter_lock))
+  if((tmp=mt_lock( & interpreter_lock)))
     fatal("Failed to lock interpreter, errno %d\n",tmp);
 /*  fprintf(stderr,"Created[%d]...",dbt);*/
   free((char *)data); /* Moved by per, to avoid some bugs.... */