--- linux-atm/src/maint/hediag.c.orig
+++ linux-atm/src/maint/hediag.c
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
--- linux-atm/src/arpd/io.c
+++ linux-atm/src/arpd/io.c
@@ -16,7 +16,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <net/if.h>
+#include <linux/if.h>
 #include <netinet/in.h>
 #include <atm.h>
 #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */
--- linux-atm/src/debug/svctor.c
+++ linux-atm/src/debug/svctor.c
@@ -20,6 +20,7 @@
 #define QOS		"ubr,aal5:tx:max_sdu=100,rx:max_sdu=100"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
--- linux-atm/src/ilmid/asn1/asn_bits.c
+++ linux-atm/src/ilmid/asn1/asn_bits.c
@@ -20,6 +20,8 @@
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
 
 #include "asn_config.h"
 #include "asn_len.h"
--- linux-atm/src/ilmid/asn1/asn_list.c
+++ linux-atm/src/ilmid/asn1/asn_list.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include "asn_config.h"
 #include "asn_list.h"
 
--- linux-atm/src/ilmid/asn1/asn_octs.c
+++ linux-atm/src/ilmid/asn1/asn_octs.c
@@ -20,6 +20,8 @@
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
 
 #include "asn_config.h"
 #include "asn_len.h"
--- linux-atm/src/ilmid/asn1/asn_oid.c
+++ linux-atm/src/ilmid/asn1/asn_oid.c
@@ -20,6 +20,8 @@
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
 
 #include "asn_config.h"
 #include "asn_len.h"
--- linux-atm/src/ilmid/asn1/nibble_alloc.c
+++ linux-atm/src/ilmid/asn1/nibble_alloc.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <memory.h>
 #include "asn_config.h"
 #include "nibble_alloc.h"
--- linux-atm/src/ilmid/atmf_uni.c
+++ linux-atm/src/ilmid/atmf_uni.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include "atmf_uni.h"
 #include "atmd.h"
 #include "util.h"
--- linux-atm/src/ilmid/mib.c
+++ linux-atm/src/ilmid/mib.c
@@ -30,6 +30,7 @@
 #include "atmf_uni.h"
 #include "util.h"
 #include "atmd.h"
+#include "io.h"
 
 #include <unistd.h>		/* gethostname()	*/
 #include <netdb.h>		/* gethostbyname()	*/
--- linux-atm/src/lane/lecs_db.l
+++ linux-atm/src/lane/lecs_db.l
@@ -7,6 +7,7 @@
 /*Standard includes*/
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 /* Local includes */
 #include "lecs_load.h"
--- linux-atm/src/lane/load_lex.l
+++ linux-atm/src/lane/load_lex.l
@@ -4,6 +4,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
--- linux-atm/src/lane/mem_lecs.c
+++ linux-atm/src/lane/mem_lecs.c
@@ -13,6 +13,7 @@
 /* System includes */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 
 /* Local includes */
--- linux-atm/src/mpoad/k_interf.c
+++ linux-atm/src/mpoad/k_interf.c
@@ -3,6 +3,7 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
--- linux-atm/src/qgen/ql_y.y
+++ linux-atm/src/qgen/ql_y.y
@@ -26,6 +26,8 @@
 static STRUCTURE *structures = NULL;
 static const char *abort_id; /* indicates abort flag */
 
+void yyerror(const char *s);
+int yylex ( void );
 
 static NAME_LIST *get_name_list(const char *name)
 {
--- linux-atm/src/sigd/cfg_y.y
+++ linux-atm/src/sigd/cfg_y.y
@@ -7,6 +7,7 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
@@ -23,6 +24,9 @@
 static RULE *rule;
 static SIG_ENTITY *curr_sig = &_entity;
 
+void yyerror(const char *s);
+void yywarn(const char *s);
+int yylex ( void );
 
 static int hex2num(char digit)
 {
@@ -126,7 +130,7 @@
 	    for (sig = entities; sig; sig = sig->next)
 		if (atm_equal((struct sockaddr *) &sig->signaling_pvc,
 		  (struct sockaddr *) &$2,0,0))
-		    yyerror("duplicate PVC address %d.%d.%d",S_PVC(sig));
+		    yyerror("duplicate PVC address");
 	    curr_sig = alloc_t(SIG_ENTITY);
 	    *curr_sig = _entity;
 	    curr_sig->signaling_pvc = $2;
--- linux-atm/src/switch/cfg_y.y
+++ linux-atm/src/switch/cfg_y.y
@@ -7,6 +7,7 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
@@ -22,6 +23,9 @@
 static int itf;
 static SIGNALING_ENTITY *sig;
 
+void yyerror(const char *s);
+int yylex ( void );
+
 %}
 
 %union {
--- linux-atm/src/test/ispl_y.y
+++ linux-atm/src/test/ispl_y.y
@@ -19,6 +19,7 @@
 
 static struct atmsvc_msg msg;
 
+int yylex ( void );
 
 %}