--- chan_unicall.c.orig Mon Jun  4 23:37:31 2007
+++ chan_unicall.c      Mon Jun  4 23:46:28 2007
@@ -16,10 +16,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/signal.h>
-#include <sys/select.h>
 #include <errno.h>
 #include <stdlib.h>
+#if !defined(SOLARIS) && !defined(__FreeBSD__)
 #include <stdint.h>
+#endif
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <math.h>
@@ -31,10 +32,6 @@
 #include <libsupertone.h>
 #include <unicall.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
@@ -2485,7 +2482,7 @@
     }
     while (x < 3);
 
-    if ( ( tmp = ast_channel_alloc(0, state, 0, 0, chan_name) ) == NULL)
+       if ( ( tmp = ast_channel_alloc(0, state, 0, 0, i->accountcode, i->exten, i->context, i->amaflags, chan_name) ) == NULL)
     {
         ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
         return  NULL;