--- libunicall-0.0.3/testcall.c	2005-08-07 08:14:51.000000000 -0500
+++ libunicall-0.0.3_1.4/testcall.c	2007-02-02 17:03:18.000000000 -0600
@@ -44,7 +44,7 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/time.h>
-#include <linux/zaptel.h>
+#include <zaptel/zaptel.h>
 #include <pthread.h>
 #if defined(HAVE_SPANDSP_H)
 #include <tiffio.h>
@@ -138,7 +138,7 @@
 
 #if defined(HAVE_SPANDSP_H)
     dtmf_rx(&chan_stuff[chan].dtmf_rx_state, pcm_buf, len);
-    xlen = dtmf_get(&chan_stuff[chan].dtmf_rx_state,
+    xlen = dtmf_rx_get(&chan_stuff[chan].dtmf_rx_state,
                     chan_stuff[chan].dtmf + chan_stuff[chan].dtmf_ptr,
                     100 - chan_stuff[chan].dtmf_ptr);
     if (xlen > 0)
@@ -189,7 +189,7 @@
                 }
                 chan_stuff[chan].dtmf_ptr = 0;
                 xlen = 0;
-                dtmf_put(&chan_stuff[chan].dtmf_tx_state, "A");
+                dtmf_tx_put(&chan_stuff[chan].dtmf_tx_state, "A");
                 break;
             }
             else if (*s == 'A')
@@ -497,7 +497,7 @@
         chan_stuff[chan].silent_samples = 4000;
         sprintf(buf, "*%08d*%s*%s*#", chan_stuff[chan].og_call_number, chan_stuff[chan].originating_number, chan_stuff[chan].destination_number);
         printf("%s -- '%s'\n", chan_stuff[chan].tag, buf);
-        dtmf_put(&chan_stuff[chan].dtmf_tx_state, buf);
+        dtmf_tx_put(&chan_stuff[chan].dtmf_tx_state, buf);
 #endif
         uc_set_channel_write_callback(uc, 0, channel_write_file, (void *) (intptr_t) chan);
         break;
@@ -512,7 +512,7 @@
         chan_stuff[chan].silent_samples = 4000;
         sprintf(buf, "*%08d*%s*%s*#", chan_stuff[chan].og_call_number, chan_stuff[chan].originating_number, chan_stuff[chan].destination_number);
         printf("%s -- '%s'\n", chan_stuff[chan].tag, buf);
-        dtmf_put(&chan_stuff[chan].dtmf_tx_state, buf);
+        dtmf_tx_put(&chan_stuff[chan].dtmf_tx_state, buf);
 #endif
         uc_set_channel_write_callback(uc, 0, channel_write_file, (void *) (intptr_t) chan);
         break;
--- libunicall-0.0.3/unicall.c	2005-07-11 08:22:24.000000000 -0500
+++ libunicall-0.0.3_1.4/unicall.c	2007-02-02 17:00:02.000000000 -0600
@@ -50,7 +50,7 @@
 #define __USE_GNU
 #include <dlfcn.h>
 
-#include <linux/zaptel.h>
+#include <zaptel/zaptel.h>
 
 #include "unicall.h"
 #include "unicall/hashtable.h"
--- libunicall-0.0.3/logging.c	2005-05-22 00:45:32.000000000 -0500
+++ libunicall-0.0.3_1.4/logging.c	2007-02-02 17:00:34.000000000 -0600
@@ -48,7 +48,7 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 
-#include <linux/zaptel.h>
+#include <zaptel/zaptel.h>
 
 #include "unicall.h"
 #include "unicall/hashtable.h"