6 files changed, 24 insertions, 4 deletions
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index b4b1abfc67..eb2ba4a17e 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -53,4 +53,12 @@ grinclude_HEADERS = \
 	uhd_single_usrp_source.h \
 	uhd_single_usrp_sink.h
 
+# add the deprecated headers
+grinclude_HEADERS += \
+	uhd_mimo_source.h \
+	uhd_mimo_sink.h \
+	uhd_simple_source.h \
+	uhd_simple_sink.h
+
+
 noinst_HEADERS =
diff --git a/gr-uhd/lib/uhd_mimo_sink.h b/gr-uhd/lib/uhd_mimo_sink.h
index 28a530b603..29e9298a98 100644
--- a/gr-uhd/lib/uhd_mimo_sink.h
+++ b/gr-uhd/lib/uhd_mimo_sink.h
@@ -37,7 +37,7 @@ boost::shared_ptr<uhd_mimo_sink> uhd_make_mimo_sink(
 /***********************************************************************
  * DEPRECATED
  **********************************************************************/
-class UHD_DEPRECATED uhd_mimo_sink : public gr_sync_block{
+class /*UHD_DEPRECATED*/ uhd_mimo_sink : public gr_sync_block{
 public:
 
     /*!
diff --git a/gr-uhd/lib/uhd_mimo_source.h b/gr-uhd/lib/uhd_mimo_source.h
index dc29275985..36735ae7e8 100644
--- a/gr-uhd/lib/uhd_mimo_source.h
+++ b/gr-uhd/lib/uhd_mimo_source.h
@@ -37,7 +37,7 @@ boost::shared_ptr<uhd_mimo_source> uhd_make_mimo_source(
 /***********************************************************************
  * DEPRECATED
  **********************************************************************/
-class UHD_DEPRECATED uhd_mimo_source : public gr_sync_block{
+class /*UHD_DEPRECATED*/ uhd_mimo_source : public gr_sync_block{
 public:
 
     /*!
diff --git a/gr-uhd/lib/uhd_simple_sink.h b/gr-uhd/lib/uhd_simple_sink.h
index b239e3f212..930487049e 100644
--- a/gr-uhd/lib/uhd_simple_sink.h
+++ b/gr-uhd/lib/uhd_simple_sink.h
@@ -36,7 +36,7 @@ boost::shared_ptr<uhd_simple_sink> uhd_make_simple_sink(
 /***********************************************************************
  * DEPRECATED
  **********************************************************************/
-class UHD_DEPRECATED uhd_simple_sink : public gr_sync_block{
+class /*UHD_DEPRECATED*/ uhd_simple_sink : public gr_sync_block{
 public:
 
     /*!
diff --git a/gr-uhd/lib/uhd_simple_source.h b/gr-uhd/lib/uhd_simple_source.h
index c524a024a8..d9f8d252a3 100644
--- a/gr-uhd/lib/uhd_simple_source.h
+++ b/gr-uhd/lib/uhd_simple_source.h
@@ -36,7 +36,7 @@ boost::shared_ptr<uhd_simple_source> uhd_make_simple_source(
 /***********************************************************************
  * DEPRECATED
  **********************************************************************/
-class UHD_DEPRECATED uhd_simple_source : public gr_sync_block{
+class /*UHD_DEPRECATED*/ uhd_simple_source : public gr_sync_block{
 public:
 
     /*!
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index d332bb6171..3c67733742 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -68,6 +68,7 @@ namespace std {
 // used types
 ////////////////////////////////////////////////////////////////////////
 %include <uhd/config.hpp>
+%include <uhd/utils/pimpl.hpp>
 %include <uhd/types/ranges.hpp>
 %include <uhd/types/tune_request.hpp>
 %include <uhd/types/tune_result.hpp>
@@ -75,6 +76,17 @@ namespace std {
 %include <uhd/types/time_spec.hpp>
 %include <uhd/types/clock_config.hpp>
 
+//Re-create range typedefs here with %template as they are not imported.
+//Replicate all the levels of templated inheritance so swig understands.
+
+%template(float_range_t) uhd::range_t<float>;
+%template(_float_range_vector_t) std::vector<uhd::range_t<float> >;
+%template(gain_range_t) uhd::meta_range_t<float>;
+
+%template(double_range_t) uhd::range_t<double>;
+%template(_double_range_vector_t) std::vector<uhd::range_t<double> >;
+%template(freq_range_t) uhd::meta_range_t<double>;
+
 ////////////////////////////////////////////////////////////////////////
 // block magic
 ////////////////////////////////////////////////////////////////////////