diff --git a/configure.in b/configure.in
index e357b2f4eb..2a5b375a7c 100644
--- a/configure.in
+++ b/configure.in
@@ -141,7 +141,7 @@ LIBS="$saved_LIBS -lcrypto"
 
 dnl The warning message here is no longer strictly accurate.
 
-AC_CHECK_HEADERS(unistd.h string.h signal.h netdb.h ctype.h poll.h sys/poll.h sys/types.h sys/fcntl.h sys/ioctl.h sys/socket.h sys/time.h netinet/in.h arpa/inet.h errno.h assert.h, , AC_MSG_WARN(some headers were not found, compilation may fail))
+AC_CHECK_HEADERS(unistd.h string.h signal.h netdb.h ctype.h poll.h sys/poll.h sys/types.h sys/fcntl.h sys/ioctl.h sys/socket.h sys/time.h netinet/in.h arpa/inet.h errno.h assert.h stdint.h, , AC_MSG_WARN(some headers were not found, compilation may fail))
 
 AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/smtpap/Makefile src/orkeygen/Makefile src/httpap/Makefile src/or/Makefile)
 
diff --git a/src/httpap/httpap.c b/src/httpap/httpap.c
index 3e5700cb82..8aa515e621 100644
--- a/src/httpap/httpap.c
+++ b/src/httpap/httpap.c
@@ -8,6 +8,9 @@
 /*
  * Changes :
  * $Log$
+ * Revision 1.9  2002/09/10 13:32:27  nickm
+ * "You got BSD in my MacOS!" "You got MacOS in my BSD!" Anyway, MacOS works again.
+ *
  * Revision 1.8  2002/09/09 04:10:58  arma
  * port to actual BSD
  *
@@ -53,6 +56,8 @@
  *
  */
 
+#include "orconfig.h"
+#undef VERSION
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -71,6 +76,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
 #include "../common/log.h"
 #include "../common/config.h"
diff --git a/src/or/or.h b/src/or/or.h
index 6b473b7d6d..cdec91bb1f 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -16,6 +16,9 @@
 #include <signal.h>
 #include <netdb.h>
 #include <ctype.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>
 #elif HAVE_POLL_H
diff --git a/src/smtpap/smtpap.c b/src/smtpap/smtpap.c
index 7efabccf2c..2bb8e5acb4 100644
--- a/src/smtpap/smtpap.c
+++ b/src/smtpap/smtpap.c
@@ -8,6 +8,9 @@
 /*
  * Changes :
  * $Log$
+ * Revision 1.6  2002/09/10 13:32:27  nickm
+ * "You got BSD in my MacOS!" "You got MacOS in my BSD!" Anyway, MacOS works again.
+ *
  * Revision 1.5  2002/09/09 04:10:58  arma
  * port to actual BSD
  *
@@ -122,6 +125,8 @@
  *
  */
 
+#include "orconfig.h"
+#undef VERSION
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -140,6 +145,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
 #include "../common/log.h"
 #include "../common/config.h"