4 files changed, 2 insertions, 18 deletions
diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp
index 5ca1da687..bd7f01c4f 100644
--- a/host/lib/transport/super_recv_packet_handler.hpp
+++ b/host/lib/transport/super_recv_packet_handler.hpp
@@ -18,6 +18,7 @@
 #ifndef INCLUDED_LIBUHD_TRANSPORT_SUPER_RECV_PACKET_HANDLER_HPP
 #define INCLUDED_LIBUHD_TRANSPORT_SUPER_RECV_PACKET_HANDLER_HPP
 
+#include "../rfnoc/rx_stream_terminator.hpp"
 #include <uhd/config.hpp>
 #include <uhd/exception.hpp>
 #include <uhd/convert.hpp>
@@ -28,9 +29,6 @@
 #include <uhd/types/metadata.hpp>
 #include <uhd/transport/vrt_if_packet.hpp>
 #include <uhd/transport/zero_copy.hpp>
-#ifdef DEVICE3_STREAMER
-#  include "../rfnoc/rx_stream_terminator.hpp"
-#endif
 #include <boost/dynamic_bitset.hpp>
 #include <boost/foreach.hpp>
 #include <boost/function.hpp>
@@ -131,7 +129,6 @@ public:
         }
     }
 
-    #ifdef DEVICE3_STREAMER
     void set_terminator(uhd::rfnoc::rx_stream_terminator::sptr terminator)
     {
         _terminator = terminator;
@@ -141,7 +138,6 @@ public:
     {
         return _terminator;
     }
-    #endif
     ////////////////// RFNOC ///////////////////////////
 
     /*!
@@ -397,9 +393,7 @@ private:
     int recvd_packets;
     #endif
 
-    #ifdef DEVICE3_STREAMER
     uhd::rfnoc::rx_stream_terminator::sptr _terminator;
-    #endif
 
     /*******************************************************************
      * Get and process a single packet from the transport:
diff --git a/host/lib/transport/super_send_packet_handler.hpp b/host/lib/transport/super_send_packet_handler.hpp
index 5e81fb442..d49fb19ca 100644
--- a/host/lib/transport/super_send_packet_handler.hpp
+++ b/host/lib/transport/super_send_packet_handler.hpp
@@ -18,6 +18,7 @@
 #ifndef INCLUDED_LIBUHD_TRANSPORT_SUPER_SEND_PACKET_HANDLER_HPP
 #define INCLUDED_LIBUHD_TRANSPORT_SUPER_SEND_PACKET_HANDLER_HPP
 
+#include "../rfnoc/tx_stream_terminator.hpp"
 #include <uhd/config.hpp>
 #include <uhd/exception.hpp>
 #include <uhd/convert.hpp>
@@ -28,9 +29,6 @@
 #include <uhd/types/metadata.hpp>
 #include <uhd/transport/vrt_if_packet.hpp>
 #include <uhd/transport/zero_copy.hpp>
-#ifdef DEVICE3_STREAMER
-#  include "../rfnoc/tx_stream_terminator.hpp"
-#endif
 #include <boost/thread/thread.hpp>
 #include <boost/thread/thread_time.hpp>
 #include <boost/foreach.hpp>
@@ -115,7 +113,6 @@ public:
         }
     }
 
-    #ifdef DEVICE3_STREAMER
     void set_terminator(uhd::rfnoc::tx_stream_terminator::sptr terminator)
     {
         _terminator = terminator;
@@ -125,7 +122,6 @@ public:
     {
         return _terminator;
     }
-    #endif
     ///////// RFNOC ///////////////////
 
     void set_enable_trailer(const bool enable)
@@ -322,9 +318,7 @@ private:
     bool _cached_metadata;
     uhd::tx_metadata_t _metadata_cache;
 
-    #ifdef DEVICE3_STREAMER
     uhd::rfnoc::tx_stream_terminator::sptr _terminator;
-    #endif
 
 #ifdef UHD_TXRX_DEBUG_PRINTS
     struct dbg_send_stat_t {
diff --git a/host/lib/usrp/device3/device3_io_impl.cpp b/host/lib/usrp/device3/device3_io_impl.cpp
index 8c61f8f15..af8ce772f 100644
--- a/host/lib/usrp/device3/device3_io_impl.cpp
+++ b/host/lib/usrp/device3/device3_io_impl.cpp
@@ -17,8 +17,6 @@
 
 // Provides streaming-related functions which are used by device3 objects.
 
-#define DEVICE3_STREAMER // For the super_*_packet_handlers
-
 #include "device3_impl.hpp"
 #include <uhd/rfnoc/constants.hpp>
 #include <uhd/rfnoc/source_block_ctrl_base.hpp>
diff --git a/host/lib/usrp/x300/x300_io_impl.cpp b/host/lib/usrp/x300/x300_io_impl.cpp
index 614a98590..1584cee24 100644
--- a/host/lib/usrp/x300/x300_io_impl.cpp
+++ b/host/lib/usrp/x300/x300_io_impl.cpp
@@ -15,8 +15,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#define DEVICE3_STREAMER
-
 #include "x300_regs.hpp"
 #include "x300_impl.hpp"
 #include "../../transport/super_recv_packet_handler.hpp"