diff -ubwr ../../work_orig/asterisk-current/acl.c ./acl.c
--- ../../work_orig/asterisk-current/acl.c Fri Apr 22 15:11:34 2005
+++ ./acl.c Sat Apr 30 00:39:26 2005
@@ -18,6 +18,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netdb.h>
diff -ubwr ../../work_orig/asterisk-current/channels/chan_zap.c ./channels/chan_zap.c
--- ../../work_orig/asterisk-current/channels/chan_zap.c Thu Apr 28 01:44:24 2005
+++ ./channels/chan_zap.c Sat Apr 30 00:48:14 2005
@@ -42,7 +42,7 @@
 #include <sys/signal.h>
 #include <errno.h>
 #include <stdlib.h>
-#ifndef SOLARIS
+#if !defined(SOLARIS) && !defined(__FreeBSD__)
 #include <stdint.h>
 #endif
 #include <unistd.h>