2 files changed, 50 insertions, 47 deletions
diff --git a/host/lib/deprecated.cpp b/host/lib/deprecated.cpp
index eeaba03cb..dd4cc02ad 100644
--- a/host/lib/deprecated.cpp
+++ b/host/lib/deprecated.cpp
@@ -153,3 +153,53 @@ void wax::obj::get(const obj &, obj &){
 void wax::obj::set(const obj &, const obj &){
     throw uhd::type_error("Cannot call set on wax obj base class");
 }
+
+#include <uhd/types/otw_type.hpp>
+#include <uhd/types/io_type.hpp>
+#include <boost/cstdint.hpp>
+#include <stdexcept>
+#include <complex>
+#include <vector>
+
+using namespace uhd;
+
+/***********************************************************************
+ * otw type
+ **********************************************************************/
+size_t otw_type_t::get_sample_size(void) const{
+    return (this->width * 2) / 8;
+}
+
+otw_type_t::otw_type_t(void):
+    width(0),
+    shift(0),
+    byteorder(BO_NATIVE)
+{
+    /* NOP */
+}
+
+/***********************************************************************
+ * io type
+ **********************************************************************/
+static std::vector<size_t> get_tid_size_table(void){
+    std::vector<size_t> table(128, 0);
+    table[size_t(io_type_t::COMPLEX_FLOAT64)] = sizeof(std::complex<double>);
+    table[size_t(io_type_t::COMPLEX_FLOAT32)] = sizeof(std::complex<float>);
+    table[size_t(io_type_t::COMPLEX_INT16)]   = sizeof(std::complex<boost::int16_t>);
+    table[size_t(io_type_t::COMPLEX_INT8)]    = sizeof(std::complex<boost::int8_t>);
+    return table;
+}
+
+static const std::vector<size_t> tid_size_table(get_tid_size_table());
+
+io_type_t::io_type_t(tid_t tid):
+    size(tid_size_table[size_t(tid) & 0x7f]), tid(tid)
+{
+    /* NOP */
+}
+
+io_type_t::io_type_t(size_t size):
+    size(size), tid(CUSTOM_TYPE)
+{
+    /* NOP */
+}
diff --git a/host/lib/types/types.cpp b/host/lib/types/types.cpp
index 7c65d2997..1a3e7e860 100644
--- a/host/lib/types/types.cpp
+++ b/host/lib/types/types.cpp
@@ -17,12 +17,6 @@
 
 #include <uhd/types/stream_cmd.hpp>
 #include <uhd/types/metadata.hpp>
-#include <uhd/types/otw_type.hpp>
-#include <uhd/types/io_type.hpp>
-#include <boost/cstdint.hpp>
-#include <stdexcept>
-#include <complex>
-#include <vector>
 
 using namespace uhd;
 
@@ -48,44 +42,3 @@ tx_metadata_t::tx_metadata_t(void):
 {
     /* NOP */
 }
-
-/***********************************************************************
- * otw type
- **********************************************************************/
-size_t otw_type_t::get_sample_size(void) const{
-    return (this->width * 2) / 8;
-}
-
-otw_type_t::otw_type_t(void):
-    width(0),
-    shift(0),
-    byteorder(BO_NATIVE)
-{
-    /* NOP */
-}
-
-/***********************************************************************
- * io type
- **********************************************************************/
-static std::vector<size_t> get_tid_size_table(void){
-    std::vector<size_t> table(128, 0);
-    table[size_t(io_type_t::COMPLEX_FLOAT64)] = sizeof(std::complex<double>);
-    table[size_t(io_type_t::COMPLEX_FLOAT32)] = sizeof(std::complex<float>);
-    table[size_t(io_type_t::COMPLEX_INT16)]   = sizeof(std::complex<boost::int16_t>);
-    table[size_t(io_type_t::COMPLEX_INT8)]    = sizeof(std::complex<boost::int8_t>);
-    return table;
-}
-
-static const std::vector<size_t> tid_size_table(get_tid_size_table());
-
-io_type_t::io_type_t(tid_t tid):
-    size(tid_size_table[size_t(tid) & 0x7f]), tid(tid)
-{
-    /* NOP */
-}
-
-io_type_t::io_type_t(size_t size):
-    size(size), tid(CUSTOM_TYPE)
-{
-    /* NOP */
-}