diff --git a/src/config/auto-aux/align.c b/src/config/auto-aux/align.c
index 87ed378..7b64de6 100644
--- a/src/config/auto-aux/align.c
+++ b/src/config/auto-aux/align.c
@@ -95,7 +95,7 @@ int speedtest(p)
   return total;
 }
 
-main()
+int main(int argc, char ** argv)
 {
   long n[1001];
   int speed_aligned, speed_unaligned;
diff --git a/src/config/auto-aux/bytecopy.c b/src/config/auto-aux/bytecopy.c
index 08f5628..163f182 100644
--- a/src/config/auto-aux/bytecopy.c
+++ b/src/config/auto-aux/bytecopy.c
@@ -8,7 +8,7 @@ char buffer[27];
 #define cpy copy
 #endif
 
-main()
+int main(int argc, char ** argv)
 {
   cpy("abcdefghijklmnopqrstuvwxyz", buffer, 27);
   if (strcmp(buffer, "abcdefghijklmnopqrstuvwxyz") != 0) exit(1);
diff --git a/src/config/auto-aux/dblalign.c b/src/config/auto-aux/dblalign.c
index 0557dab..e240275 100644
--- a/src/config/auto-aux/dblalign.c
+++ b/src/config/auto-aux/dblalign.c
@@ -19,7 +19,7 @@ void sig_handler()
   longjmp(failure, 1);
 }
 
-main()
+int main(int argc, char ** argv)
 {
 #define ARRSIZE 100
   long n[ARRSIZE];
diff --git a/src/config/auto-aux/endian.c b/src/config/auto-aux/endian.c
index d1d9039..7d807fd 100644
--- a/src/config/auto-aux/endian.c
+++ b/src/config/auto-aux/endian.c
@@ -1,9 +1,10 @@
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 
-main()
+int main(int argc, char ** argv)
 {
-  long n[2];
+  int32_t n[2];
   char * p;
 
   n[0] = 0x41424344;
diff --git a/src/config/auto-aux/schar.c b/src/config/auto-aux/schar.c
index de11d5e..a8f7a28 100644
--- a/src/config/auto-aux/schar.c
+++ b/src/config/auto-aux/schar.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
 char foo[]="\377";
-main()
+int main(int argc, char ** argv)
 {
   int i;
   i = foo[0];
diff --git a/src/config/auto-aux/schar2.c b/src/config/auto-aux/schar2.c
index 2e067f2..05816d3 100644
--- a/src/config/auto-aux/schar2.c
+++ b/src/config/auto-aux/schar2.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
 signed char foo[]="\377";
-main()
+int main(int argc, char ** argv)
 {
   int i;
   i = foo[0];
diff --git a/src/config/auto-aux/setjmp.c b/src/config/auto-aux/setjmp.c
index 0867e62..c41c088 100644
--- a/src/config/auto-aux/setjmp.c
+++ b/src/config/auto-aux/setjmp.c
@@ -1,6 +1,7 @@
 #include <setjmp.h>
+#include <stdlib.h>
 
-main()
+int main(int argc, char ** argv)
 {
   jmp_buf buf;
   int i;
diff --git a/src/config/auto-aux/sighandler.c b/src/config/auto-aux/sighandler.c
index 7170fe6..23211e3 100644
--- a/src/config/auto-aux/sighandler.c
+++ b/src/config/auto-aux/sighandler.c
@@ -1,8 +1,8 @@
 #include <signal.h>
 
-int main()
+int main(int argc, char ** argv)
 {
-  SIGRETURN (*old)();
+  sig_t old;
   old = signal(SIGQUIT, SIG_DFL);
   return 0;
 }
diff --git a/src/config/auto-aux/signals.c b/src/config/auto-aux/signals.c
index 17d158f..31ebf6c 100644
--- a/src/config/auto-aux/signals.c
+++ b/src/config/auto-aux/signals.c
@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include <unistd.h>
 
 int counter;