diff -Nur -X no.freeciv freeciv-cvs/common/astring.c freeciv-mod/common/astring.c
--- freeciv-cvs/common/astring.c	Sat Aug  7 07:30:37 1999
+++ freeciv-mod/common/astring.c	Sat Aug  7 14:41:12 1999
@@ -104,9 +104,11 @@
 ***********************************************************************/
 void ath_init(struct athing *ath, int size)
 {
-  struct athing zero_ath = ATHING_INIT(size);
   assert(ath);
-  *ath = zero_ath;
+  ath->ptr = NULL;
+  ath->size = size;
+  ath->n = 0;
+  ath->n_alloc = 0;
 }
 
 /**********************************************************************
diff -Nur -X no.freeciv freeciv-cvs/common/city.c freeciv-mod/common/city.c
--- freeciv-cvs/common/city.c	Sat Jul 31 12:46:23 1999
+++ freeciv-mod/common/city.c	Sat Aug  7 16:28:54 1999
@@ -12,6 +12,7 @@
 ***********************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "game.h"
 #include "log.h"
diff -Nur -X no.freeciv freeciv-cvs/common/packets.c freeciv-mod/common/packets.c
--- freeciv-cvs/common/packets.c	Sat Aug  7 12:06:21 1999
+++ freeciv-mod/common/packets.c	Sat Aug  7 16:00:16 1999
@@ -425,7 +425,7 @@
 /**************************************************************************
 ...
 **************************************************************************/
-unsigned char *put_int32(unsigned char *buffer, int val)
+static unsigned char *put_int32(unsigned char *buffer, int val)
 {
   unsigned long x = htonl(val);
   memcpy(buffer,&x,4);
diff -Nur -X no.freeciv freeciv-cvs/common/sbuffer.c freeciv-mod/common/sbuffer.c
--- freeciv-cvs/common/sbuffer.c	Mon May 10 11:20:12 1999
+++ freeciv-mod/common/sbuffer.c	Sat Aug  7 16:14:56 1999
@@ -31,6 +31,7 @@
 ***************************************************************************/
 
 #include <assert.h>
+#include <string.h>
 
 #include "mem.h"
 #include "sbuffer.h"
diff -Nur -X no.freeciv freeciv-cvs/common/tech.c freeciv-mod/common/tech.c
--- freeciv-cvs/common/tech.c	Wed Jul 14 14:07:02 1999
+++ freeciv-mod/common/tech.c	Sat Aug  7 16:33:53 1999
@@ -12,6 +12,7 @@
 ***********************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "game.h"
 #include "player.h"
diff -Nur -X no.freeciv freeciv-cvs/server/cityturn.c freeciv-mod/server/cityturn.c
--- freeciv-cvs/server/cityturn.c	Sat Jul 31 12:46:25 1999
+++ freeciv-mod/server/cityturn.c	Sat Aug  7 16:41:35 1999
@@ -963,7 +963,7 @@
 return 0 if the city is removed
 return 1 otherwise
 **************************************************************************/
-int city_build_stuff(struct player *pplayer, struct city *pcity)
+static int city_build_stuff(struct player *pplayer, struct city *pcity)
 {
   int space_part;
   
@@ -1254,7 +1254,7 @@
 /**************************************************************************
  called every turn, for every city. 
 **************************************************************************/
-int update_city_activity(struct player *pplayer, struct city *pcity)
+static int update_city_activity(struct player *pplayer, struct city *pcity)
 {
   int got_tech = 0;
   int turns_growth, turns_granary;
diff -Nur -X no.freeciv freeciv-cvs/server/ruleset.c freeciv-mod/server/ruleset.c
--- freeciv-cvs/server/ruleset.c	Sun Jul 25 04:56:05 1999
+++ freeciv-mod/server/ruleset.c	Sat Aug  7 16:47:26 1999
@@ -865,7 +865,7 @@
 /**************************************************************************
 ...
 **************************************************************************/
-void send_ruleset_units(struct player *dest)
+static void send_ruleset_units(struct player *dest)
 {
   struct packet_ruleset_unit packet;
   struct unit_type *u;
@@ -901,7 +901,7 @@
 /**************************************************************************
 ...  
 **************************************************************************/
-void send_ruleset_techs(struct player *dest)
+static void send_ruleset_techs(struct player *dest)
 {
   struct packet_ruleset_tech packet;
   struct advance *a;
@@ -924,7 +924,7 @@
 /**************************************************************************
 ...  
 **************************************************************************/
-void send_ruleset_buildings(struct player *dest)
+static void send_ruleset_buildings(struct player *dest)
 {
   struct packet_ruleset_building packet;
   struct improvement_type *b;
diff -Nur -X no.freeciv freeciv-cvs/server/sernet.c freeciv-mod/server/sernet.c
--- freeciv-cvs/server/sernet.c	Sat Aug  7 12:06:29 1999
+++ freeciv-mod/server/sernet.c	Sat Aug  7 16:58:44 1999
@@ -278,8 +278,10 @@
 
 
   /* broken pipes are ignored. */
+#ifdef SIGPIPE
   signal (SIGPIPE, SIG_IGN);
-  
+#endif
+
   if((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
     freelog(LOG_FATAL, "socket failed: %s", mystrerror(errno));
     exit(1);