23 files changed, 84 insertions, 84 deletions
diff --git a/gr-trellis/include/trellis/CMakeLists.txt b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt
index b7ceea179e..b7ceea179e 100644
--- a/gr-trellis/include/trellis/CMakeLists.txt
+++ b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt
diff --git a/gr-trellis/include/trellis/api.h b/gr-trellis/include/gnuradio/trellis/api.h
index 8b85addd96..bdf5842864 100644
--- a/gr-trellis/include/trellis/api.h
+++ b/gr-trellis/include/gnuradio/trellis/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_TRELLIS_API_H
 #define INCLUDED_TRELLIS_API_H
 
-#include <attributes.h>
+#include <gnuradio/attributes.h>
 
 #ifdef gnuradio_trellis_EXPORTS
 #  define TRELLIS_API __GR_ATTR_EXPORT
diff --git a/gr-trellis/include/trellis/base.h b/gr-trellis/include/gnuradio/trellis/base.h
index c69500d0df..c69500d0df 100644
--- a/gr-trellis/include/trellis/base.h
+++ b/gr-trellis/include/gnuradio/trellis/base.h
diff --git a/gr-trellis/include/trellis/calc_metric.h b/gr-trellis/include/gnuradio/trellis/calc_metric.h
index b39267dc84..c85fcbff69 100644
--- a/gr-trellis/include/trellis/calc_metric.h
+++ b/gr-trellis/include/gnuradio/trellis/calc_metric.h
@@ -24,8 +24,8 @@
 #define INCLUDED_CALC_METRIC_H
 
 #include <vector>
-#include <gr_complex.h>
-#include <digital/metric_type.h>
+#include <gnuradio/gr_complex.h>
+#include <gnuradio/digital/metric_type.h>
 
 namespace gr {
   namespace trellis {
diff --git a/gr-trellis/include/trellis/constellation_metrics_cf.h b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h
index f4b94223c7..01bfab0140 100644
--- a/gr-trellis/include/trellis/constellation_metrics_cf.h
+++ b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
 #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
 
-#include <trellis/api.h>
-#include <gr_block.h>
-#include <digital/constellation.h>
-#include <digital/metric_type.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/block.h>
+#include <gnuradio/digital/constellation.h>
+#include <gnuradio/digital/metric_type.h>
 
 namespace gr {
   namespace trellis {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief Evaluate metrics for use by the Viterbi algorithm.
      * \ingroup trellis_coding_blk
      */
-    class TRELLIS_API constellation_metrics_cf : virtual public gr_block
+    class TRELLIS_API constellation_metrics_cf : virtual public block
     {
     public:
       // gr::trellis::constellation_metrics_cf::sptr
diff --git a/gr-trellis/include/trellis/core_algorithms.h b/gr-trellis/include/gnuradio/trellis/core_algorithms.h
index 2292845629..aedff120d8 100644
--- a/gr-trellis/include/trellis/core_algorithms.h
+++ b/gr-trellis/include/gnuradio/trellis/core_algorithms.h
@@ -25,9 +25,9 @@
 
 #include <cmath>
 #include <vector>
-#include <digital/metric_type.h>
-#include <trellis/fsm.h>
-#include <trellis/interleaver.h>
+#include <gnuradio/digital/metric_type.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/interleaver.h>
 
 namespace gr {
   namespace trellis {
diff --git a/gr-trellis/include/trellis/encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/encoder_XX.h.t
index 9ca7cb30ce..7ece5d3f21 100644
--- a/gr-trellis/include/trellis/encoder_XX.h.t
+++ b/gr-trellis/include/gnuradio/trellis/encoder_XX.h.t
@@ -25,9 +25,9 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <gr_sync_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
      * \brief Convolutional encoder.
      * \ingroup trellis_coding_blk
      */
-    class TRELLIS_API @NAME@ : virtual public gr_sync_block
+    class TRELLIS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/fsm.h b/gr-trellis/include/gnuradio/trellis/fsm.h
index d88732b29b..cc8893f1e3 100644
--- a/gr-trellis/include/trellis/fsm.h
+++ b/gr-trellis/include/gnuradio/trellis/fsm.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_TRELLIS_FSM_H
 #define INCLUDED_TRELLIS_FSM_H
 
-#include <trellis/api.h>
+#include <gnuradio/trellis/api.h>
 #include <vector>
 #include <iosfwd>
 
diff --git a/gr-trellis/include/trellis/interleaver.h b/gr-trellis/include/gnuradio/trellis/interleaver.h
index 35fff0ac88..2147db6600 100644
--- a/gr-trellis/include/trellis/interleaver.h
+++ b/gr-trellis/include/gnuradio/trellis/interleaver.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_TRELLIS_INTERLEAVER_H
 #define INCLUDED_TRELLIS_INTERLEAVER_H
 
-#include <trellis/api.h>
+#include <gnuradio/trellis/api.h>
 #include <vector>
 
 namespace gr {
diff --git a/gr-trellis/include/trellis/metrics_X.h.t b/gr-trellis/include/gnuradio/trellis/metrics_X.h.t
index dab7924a8b..3f650faf0e 100644
--- a/gr-trellis/include/trellis/metrics_X.h.t
+++ b/gr-trellis/include/gnuradio/trellis/metrics_X.h.t
@@ -25,9 +25,9 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/calc_metric.h>
-#include <gr_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/calc_metric.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
      * \brief Evaluate metrics for use by the Viterbi algorithm.
      * \ingroup trellis_coding_blk
      */
-    class TRELLIS_API @NAME@ : virtual public gr_block
+    class TRELLIS_API @NAME@ : virtual public block
     {
     public:
       // gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/pccc_decoder_X.h.t b/gr-trellis/include/gnuradio/trellis/pccc_decoder_X.h.t
index d5b6af7b87..affce07042 100644
--- a/gr-trellis/include/trellis/pccc_decoder_X.h.t
+++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_X.h.t
@@ -25,11 +25,11 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/interleaver.h>
-#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/interleaver.h>
+#include <gnuradio/trellis/siso_type.h>
+#include <gnuradio/block.h>
 #include <vector>
 
 namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
     /*!
      *  \ingroup trellis_coding_blk
      */
-    class TRELLIS_API @NAME@ : virtual public gr_block
+    class TRELLIS_API @NAME@ : virtual public block
     {
     public:
       // gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_XX.h.t
index 87b110a945..719b0aa1e5 100644
--- a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t
+++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_XX.h.t
@@ -25,12 +25,12 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/interleaver.h>
-#include <trellis/calc_metric.h>
-#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/interleaver.h>
+#include <gnuradio/trellis/calc_metric.h>
+#include <gnuradio/trellis/siso_type.h>
+#include <gnuradio/block.h>
 #include <vector>
 
 namespace gr {
@@ -39,7 +39,7 @@ namespace gr {
     /*!
      *  \ingroup trellis_coding_blk
      */
-    class TRELLIS_API @NAME@ : virtual public gr_block
+    class TRELLIS_API @NAME@ : virtual public block
     {
     public:
       // gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/pccc_encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/pccc_encoder_XX.h.t
index 2a62b7520f..5308fe275d 100644
--- a/gr-trellis/include/trellis/pccc_encoder_XX.h.t
+++ b/gr-trellis/include/gnuradio/trellis/pccc_encoder_XX.h.t
@@ -25,10 +25,10 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/interleaver.h>
-#include <gr_sync_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/interleaver.h>
+#include <gnuradio/sync_block.h>
 #include <vector>
 
 namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
      * \brief PCCC encoder.
      * \ingroup trellis_coding_blk
      */
-    class TRELLIS_API @NAME@ : virtual public gr_sync_block
+    class TRELLIS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/permutation.h b/gr-trellis/include/gnuradio/trellis/permutation.h
index 0f974abb97..80b9fef641 100644
--- a/gr-trellis/include/trellis/permutation.h
+++ b/gr-trellis/include/gnuradio/trellis/permutation.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_TRELLIS_PERMUTATION_H
 #define INCLUDED_TRELLIS_PERMUTATION_H
 
-#include <trellis/api.h>
+#include <gnuradio/trellis/api.h>
 #include <vector>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace trellis {
@@ -34,7 +34,7 @@ namespace gr {
      * \brief Permutation.
      * \ingroup trellis_coding_blk
      */
-    class TRELLIS_API permutation : virtual public gr_sync_block
+    class TRELLIS_API permutation : virtual public sync_block
     {
     public:
       // gr::trellis::permutation::sptr
diff --git a/gr-trellis/include/trellis/quicksort_index.h b/gr-trellis/include/gnuradio/trellis/quicksort_index.h
index 402962172a..402962172a 100644
--- a/gr-trellis/include/trellis/quicksort_index.h
+++ b/gr-trellis/include/gnuradio/trellis/quicksort_index.h
diff --git a/gr-trellis/include/trellis/sccc_decoder_X.h.t b/gr-trellis/include/gnuradio/trellis/sccc_decoder_X.h.t
index 1a63facad9..cc1d86b709 100644
--- a/gr-trellis/include/trellis/sccc_decoder_X.h.t
+++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_X.h.t
@@ -25,11 +25,11 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/interleaver.h>
-#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/interleaver.h>
+#include <gnuradio/trellis/siso_type.h>
+#include <gnuradio/block.h>
 #include <vector>
 
 namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
     /*!
      *  \ingroup trellis_coding_blk
      */
-    class TRELLIS_API @NAME@ : virtual public gr_block
+    class TRELLIS_API @NAME@ : virtual public block
     {
     public:
       // gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_XX.h.t
index f5f9bef464..699de12fd8 100644
--- a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t
+++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_XX.h.t
@@ -25,12 +25,12 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/interleaver.h>
-#include <trellis/calc_metric.h>
-#include <trellis/siso_type.h>
-#include <gr_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/interleaver.h>
+#include <gnuradio/trellis/calc_metric.h>
+#include <gnuradio/trellis/siso_type.h>
+#include <gnuradio/block.h>
 #include <vector>
 
 namespace gr {
@@ -39,7 +39,7 @@ namespace gr {
     /*!
      *  \ingroup trellis_coding_blk
      */
-    class TRELLIS_API @NAME@ : virtual public gr_block
+    class TRELLIS_API @NAME@ : virtual public block
     {
     public:
       // gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/sccc_encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/sccc_encoder_XX.h.t
index f62a1e7cfb..85fad02eeb 100644
--- a/gr-trellis/include/trellis/sccc_encoder_XX.h.t
+++ b/gr-trellis/include/gnuradio/trellis/sccc_encoder_XX.h.t
@@ -25,10 +25,10 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/interleaver.h>
-#include <gr_sync_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/interleaver.h>
+#include <gnuradio/sync_block.h>
 #include <vector>
 
 namespace gr {
@@ -38,7 +38,7 @@ namespace gr {
      * \brief SCCC encoder.
      * \ingroup trellis_coding_blk
      */
-    class TRELLIS_API @NAME@ : virtual public gr_sync_block
+    class TRELLIS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/siso_combined_f.h b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h
index 48089f86e4..47c34ea81e 100644
--- a/gr-trellis/include/trellis/siso_combined_f.h
+++ b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h
@@ -23,12 +23,12 @@
 #ifndef INCLUDED_TRELLIS_SISO_COMBINED_F_H
 #define INCLUDED_TRELLIS_SISO_COMBINED_F_H
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/siso_type.h>
-#include <trellis/calc_metric.h>
-#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/siso_type.h>
+#include <gnuradio/trellis/calc_metric.h>
+#include <gnuradio/trellis/core_algorithms.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
     /*!
      *  \ingroup trellis_coding_blk
      */
-    class TRELLIS_API siso_combined_f : virtual public gr_block
+    class TRELLIS_API siso_combined_f : virtual public block
     {
     public:
       // gr::trellis::siso_combined_f::sptr
diff --git a/gr-trellis/include/trellis/siso_f.h b/gr-trellis/include/gnuradio/trellis/siso_f.h
index 6d4d414f38..60c3349e11 100644
--- a/gr-trellis/include/trellis/siso_f.h
+++ b/gr-trellis/include/gnuradio/trellis/siso_f.h
@@ -23,11 +23,11 @@
 #ifndef INCLUDED_TRELLIS_SISO_F_H
 #define INCLUDED_TRELLIS_SISO_F_H
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/siso_type.h>
-#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/siso_type.h>
+#include <gnuradio/trellis/core_algorithms.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace trellis {
@@ -35,7 +35,7 @@ namespace gr {
     /*!
      *  \ingroup trellis_coding_blk
      */
-    class TRELLIS_API siso_f : virtual public gr_block
+    class TRELLIS_API siso_f : virtual public block
     {
     public:
       // gr::trellis::siso_f::sptr
diff --git a/gr-trellis/include/trellis/siso_type.h b/gr-trellis/include/gnuradio/trellis/siso_type.h
index 9167381164..9167381164 100644
--- a/gr-trellis/include/trellis/siso_type.h
+++ b/gr-trellis/include/gnuradio/trellis/siso_type.h
diff --git a/gr-trellis/include/trellis/viterbi_X.h.t b/gr-trellis/include/gnuradio/trellis/viterbi_X.h.t
index 817c98508a..2d72cb5e09 100644
--- a/gr-trellis/include/trellis/viterbi_X.h.t
+++ b/gr-trellis/include/gnuradio/trellis/viterbi_X.h.t
@@ -25,10 +25,10 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/core_algorithms.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace trellis {
@@ -36,7 +36,7 @@ namespace gr {
     /*!
      *  \ingroup trellis_coding_blk
      */
-    class TRELLIS_API @NAME@ : virtual public gr_block
+    class TRELLIS_API @NAME@ : virtual public block
     {
     public:
       // gr::trellis::@BASE_NAME@::sptr
diff --git a/gr-trellis/include/trellis/viterbi_combined_XX.h.t b/gr-trellis/include/gnuradio/trellis/viterbi_combined_XX.h.t
index a2cc4b946c..2becf8bf18 100644
--- a/gr-trellis/include/trellis/viterbi_combined_XX.h.t
+++ b/gr-trellis/include/gnuradio/trellis/viterbi_combined_XX.h.t
@@ -25,11 +25,11 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/calc_metric.h>
-#include <trellis/core_algorithms.h>
-#include <gr_block.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/calc_metric.h>
+#include <gnuradio/trellis/core_algorithms.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace trellis {
@@ -37,7 +37,7 @@ namespace gr {
     /*!
      *  \ingroup trellis_coding_blk
      */
-    class TRELLIS_API @NAME@ : virtual public gr_block
+    class TRELLIS_API @NAME@ : virtual public block
     {
     public:
       // gr::trellis::@BASE_NAME@::sptr