--- libmfcr2-0.0.3/mfcr2.c	2006-03-30 08:06:29.000000000 -0600
+++ libmfcr2-0.0.3_1.4/mfcr2.c	2007-02-02 17:15:01.000000000 -0600
@@ -52,7 +52,7 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 
-#include <linux/zaptel.h>
+#include <zaptel/zaptel.h>
 
 #include <tiffio.h>
 #include <spandsp.h>
@@ -2781,7 +2781,7 @@
                 maxlen = uc->chan[ch].audio_bufsize;
                 if (uc->chan[ch].active_tx == ACTIVE_MF6)
                 {
-                    len = r2_mf_tx(&mfcr2->mf_gen_state,
+                    len = r2_mf_tx(&mfcr2->mf_tx_state,
                                    pcm_buf,
                                    maxlen,
                                    !mfcr2->call->incoming_call,
@@ -2887,7 +2887,7 @@
     mfcr2->outgoing_calls_allowed = outgoing_calls_allowed;
 
     /* Set the standard values for everything first */
-    r2_mf_tx_init();
+    r2_mf_tx_init(&mfcr2->mf_tx_state);
     r2_mf_rx_init(&mfcr2->mf_rx_state, TRUE);
 
     mfcr2->abcd_mask = 0xC;
--- libmfcr2-0.0.3/mfcr2.h	2005-06-21 09:36:33.000000000 -0500
+++ libmfcr2-0.0.3_1.4/mfcr2.h	2007-02-02 17:13:27.000000000 -0600
@@ -570,7 +570,7 @@
     /*! \brief The MF receiver context. */
     r2_mf_rx_state_t mf_rx_state;
     /*! \brief The MF transmitter context. */
-    tone_gen_state_t mf_gen_state;
+    r2_mf_tx_state_t mf_tx_state;
     /*! \brief The current MF signal being received. Zero means no signal being received. */
     int mf_rx_signal;
     /*! \brief The current MF signal being sent. Zero means no signal being sent. */