4 files changed, 7 insertions, 8 deletions
diff --git a/usrp/host/lib/inband/usrp_rx.cc b/usrp/host/lib/inband/usrp_rx.cc
index 45d41bed7..fe9486cf6 100644
--- a/usrp/host/lib/inband/usrp_rx.cc
+++ b/usrp/host/lib/inband/usrp_rx.cc
@@ -119,8 +119,9 @@ usrp_rx::read_and_respond(pmt_t data)
 
   // Need the handle to the RX port to send responses, this is passed
   // by the USRP interface m-block
+  pmt_t handle = pmt_nth(1, data);
   d_urx = 
-    boost::any_cast<usrp_standard_rx *>(pmt_any_ref(pmt_nth(1, data)));
+    boost::any_cast<usrp_standard_rx_sptr>(pmt_any_ref(handle));
 
   if(verbose)
     std::cout << "[usrp_rx] Waiting for packets..\n";
diff --git a/usrp/host/lib/inband/usrp_rx.h b/usrp/host/lib/inband/usrp_rx.h
index 9496b27d9..1006235bf 100644
--- a/usrp/host/lib/inband/usrp_rx.h
+++ b/usrp/host/lib/inband/usrp_rx.h
@@ -23,8 +23,7 @@
 
 #include <mblock/mblock.h>
 #include <fstream>
-
-class usrp_standard_rx;
+#include "usrp_standard.h"
 
 extern bool usrp_rx_stop;   // used to communicate a 'stop' to the RX stub
 
@@ -34,7 +33,7 @@ extern bool usrp_rx_stop;   // used to communicate a 'stop' to the RX stub
 class usrp_rx : public mb_mblock
 {
   mb_port_sptr		d_cs;
-  usrp_standard_rx     *d_urx;
+  usrp_standard_rx_sptr     d_urx;
   
   bool d_disk_write;
   bool d_disk_write_pkt;
diff --git a/usrp/host/lib/inband/usrp_tx.cc b/usrp/host/lib/inband/usrp_tx.cc
index cf7976bca..0d4a84619 100644
--- a/usrp/host/lib/inband/usrp_tx.cc
+++ b/usrp/host/lib/inband/usrp_tx.cc
@@ -100,7 +100,7 @@ usrp_tx::write(pmt_t data)
   pmt_t invocation_handle = pmt_nth(0, data);
   pmt_t channel = pmt_nth(1, data);
   pmt_t v_packets = pmt_nth(2, data);
-  d_utx = boost::any_cast<usrp_standard_tx *>(pmt_any_ref(pmt_nth(3, data)));
+  d_utx = boost::any_cast<usrp_standard_tx_sptr>(pmt_any_ref(pmt_nth(3, data)));
 
   size_t n_bytes;
   bool underrun;  // this will need to go, as it is taken care of in the packet headers
diff --git a/usrp/host/lib/inband/usrp_tx.h b/usrp/host/lib/inband/usrp_tx.h
index 823d5ceaa..d3a6f8b54 100644
--- a/usrp/host/lib/inband/usrp_tx.h
+++ b/usrp/host/lib/inband/usrp_tx.h
@@ -23,8 +23,7 @@
 
 #include <mblock/mblock.h>
 #include <fstream>
-
-class usrp_standard_tx;
+#include "usrp_standard.h"
 
 /*!
  * \brief Implements the low level usb interface to the USRP
@@ -32,7 +31,7 @@ class usrp_standard_tx;
 class usrp_tx : public mb_mblock
 {
   mb_port_sptr		d_cs;
-  usrp_standard_tx     *d_utx;
+  usrp_standard_tx_sptr     d_utx;
   
   bool d_disk_write;
   std::ofstream d_ofile;