6 files changed, 8 insertions, 6 deletions

diff --git a/alloc.c b/alloc.c
index c661453..48a109b 100644
--- a/alloc.c
+++ b/alloc.c
@@ -1,7 +1,6 @@
 #include "alloc.h"
 #include "error.h"
-extern char *malloc();
-extern void free();
+#include <stdlib.h>
 
 #define ALIGNMENT 16 /* XXX: assuming that this alignment is enough */
 #define SPACE 4096 /* must be multiple of ALIGNMENT */
diff --git a/conf-cc b/conf-cc
index d2d73ab..245d8c5 100644
--- a/conf-cc
+++ b/conf-cc
@@ -1,3 +1,3 @@
-gcc -O2 -pipe -DTLS
+gcc -O2 -pipe -DTLS -fno-builtin-puts -fno-builtin-log2
 
 This will be used to compile .c files.
diff --git a/qmail-pw2u.c b/qmail-pw2u.c
index 4146067..f068ab1 100644
--- a/qmail-pw2u.c
+++ b/qmail-pw2u.c
@@ -16,6 +16,7 @@
 #include "auto_break.h"
 #include "auto_qmail.h"
 #include "auto_usera.h"
+#include "exit.h"
 
 void die_chdir()
 {
diff --git a/qmail-qmtpd.c b/qmail-qmtpd.c
index d772206..85a0f99 100644
--- a/qmail-qmtpd.c
+++ b/qmail-qmtpd.c
@@ -11,6 +11,7 @@
 #include "readwrite.h"
 #include "control.h"
 #include "received.h"
+#include "exit.h"
 
 void badproto() { _exit(100); }
 void resources() { _exit(111); }
diff --git a/qsutil.c b/qsutil.c
index 80c619d..a769829 100644
--- a/qsutil.c
+++ b/qsutil.c
@@ -6,7 +6,7 @@
 static stralloc foo = {0};
 
 static char errbuf[1];
-static struct substdio sserr = SUBSTDIO_FDBUF(write,0,errbuf,1);
+static substdio sserr = SUBSTDIO_FDBUF(write,0,errbuf,1);
 
 void logsa(sa) stralloc *sa; {
  substdio_putflush(&sserr,sa->s,sa->len); }
diff --git a/realrcptto.c b/realrcptto.c
index 7ec331a..98dc6e6 100644
--- a/realrcptto.c
+++ b/realrcptto.c
@@ -1,6 +1,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <stdlib.h>
 #include <pwd.h>
 #include "auto_break.h"
 #include "auto_usera.h"
@@ -17,6 +17,7 @@
 #include "substdio.h"
 #include "env.h"
 #include "slurpclose.h"
+#include "readwrite.h"
 
 extern void die_nomem();
 extern void die_control();
@@ -37,7 +38,7 @@ static char *local;
 static struct passwd *pw;
 
 static char errbuf[128];
-static struct substdio sserr = SUBSTDIO_FDBUF(write,2,errbuf,sizeof errbuf);
+static substdio sserr = SUBSTDIO_FDBUF(write,2,errbuf,sizeof errbuf);
 
 static char pidbuf[64];
 static char remoteipbuf[64]=" ";