23 files changed, 50 insertions, 50 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 bdf5842864..bdf5842864 100644
--- a/gr-trellis/include/trellis/api.h
+++ b/gr-trellis/include/gnuradio/trellis/api.h
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 c85fcbff69..c85fcbff69 100644
--- a/gr-trellis/include/trellis/calc_metric.h
+++ b/gr-trellis/include/gnuradio/trellis/calc_metric.h
diff --git a/gr-trellis/include/trellis/constellation_metrics_cf.h b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h
index 576378dd62..01bfab0140 100644
--- a/gr-trellis/include/trellis/constellation_metrics_cf.h
+++ b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
 #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
 
-#include <trellis/api.h>
+#include <gnuradio/trellis/api.h>
 #include <gnuradio/block.h>
 #include <gnuradio/digital/constellation.h>
 #include <gnuradio/digital/metric_type.h>
diff --git a/gr-trellis/include/trellis/core_algorithms.h b/gr-trellis/include/gnuradio/trellis/core_algorithms.h
index 03d3efa56a..aedff120d8 100644
--- a/gr-trellis/include/trellis/core_algorithms.h
+++ b/gr-trellis/include/gnuradio/trellis/core_algorithms.h
@@ -26,8 +26,8 @@
 #include <cmath>
 #include <vector>
 #include <gnuradio/digital/metric_type.h>
-#include <trellis/fsm.h>
-#include <trellis/interleaver.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 3901797204..7ece5d3f21 100644
--- a/gr-trellis/include/trellis/encoder_XX.h.t
+++ b/gr-trellis/include/gnuradio/trellis/encoder_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
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 d0b8806b62..3f650faf0e 100644
--- a/gr-trellis/include/trellis/metrics_X.h.t
+++ b/gr-trellis/include/gnuradio/trellis/metrics_X.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/calc_metric.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/calc_metric.h>
 #include <gnuradio/block.h>
 
 namespace gr {
diff --git a/gr-trellis/include/trellis/pccc_decoder_X.h.t b/gr-trellis/include/gnuradio/trellis/pccc_decoder_X.h.t
index 7f87250bec..affce07042 100644
--- a/gr-trellis/include/trellis/pccc_decoder_X.h.t
+++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_X.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 <trellis/siso_type.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>
 
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 be9db5a146..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,11 +25,11 @@
 #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 <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>
 
diff --git a/gr-trellis/include/trellis/pccc_encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/pccc_encoder_XX.h.t
index c5d4a2f253..5308fe275d 100644
--- a/gr-trellis/include/trellis/pccc_encoder_XX.h.t
+++ b/gr-trellis/include/gnuradio/trellis/pccc_encoder_XX.h.t
@@ -25,9 +25,9 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/interleaver.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/interleaver.h>
 #include <gnuradio/sync_block.h>
 #include <vector>
 
diff --git a/gr-trellis/include/trellis/permutation.h b/gr-trellis/include/gnuradio/trellis/permutation.h
index 7bac7340d9..80b9fef641 100644
--- a/gr-trellis/include/trellis/permutation.h
+++ b/gr-trellis/include/gnuradio/trellis/permutation.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_TRELLIS_PERMUTATION_H
 #define INCLUDED_TRELLIS_PERMUTATION_H
 
-#include <trellis/api.h>
+#include <gnuradio/trellis/api.h>
 #include <vector>
 #include <gnuradio/sync_block.h>
 
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 1e19bbe950..cc1d86b709 100644
--- a/gr-trellis/include/trellis/sccc_decoder_X.h.t
+++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_X.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 <trellis/siso_type.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>
 
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 a7c7c4c723..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,11 +25,11 @@
 #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 <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>
 
diff --git a/gr-trellis/include/trellis/sccc_encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/sccc_encoder_XX.h.t
index 3c1d334d08..85fad02eeb 100644
--- a/gr-trellis/include/trellis/sccc_encoder_XX.h.t
+++ b/gr-trellis/include/gnuradio/trellis/sccc_encoder_XX.h.t
@@ -25,9 +25,9 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/interleaver.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/interleaver.h>
 #include <gnuradio/sync_block.h>
 #include <vector>
 
diff --git a/gr-trellis/include/trellis/siso_combined_f.h b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h
index 0997b3fdfa..47c34ea81e 100644
--- a/gr-trellis/include/trellis/siso_combined_f.h
+++ b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h
@@ -23,11 +23,11 @@
 #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 <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 {
diff --git a/gr-trellis/include/trellis/siso_f.h b/gr-trellis/include/gnuradio/trellis/siso_f.h
index 7b5351a838..60c3349e11 100644
--- a/gr-trellis/include/trellis/siso_f.h
+++ b/gr-trellis/include/gnuradio/trellis/siso_f.h
@@ -23,10 +23,10 @@
 #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 <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 {
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 574888ec12..2d72cb5e09 100644
--- a/gr-trellis/include/trellis/viterbi_X.h.t
+++ b/gr-trellis/include/gnuradio/trellis/viterbi_X.h.t
@@ -25,9 +25,9 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <trellis/api.h>
-#include <trellis/fsm.h>
-#include <trellis/core_algorithms.h>
+#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/core_algorithms.h>
 #include <gnuradio/block.h>
 
 namespace gr {
diff --git a/gr-trellis/include/trellis/viterbi_combined_XX.h.t b/gr-trellis/include/gnuradio/trellis/viterbi_combined_XX.h.t
index 465b5f518f..2becf8bf18 100644
--- a/gr-trellis/include/trellis/viterbi_combined_XX.h.t
+++ b/gr-trellis/include/gnuradio/trellis/viterbi_combined_XX.h.t
@@ -25,10 +25,10 @@
 #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 <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 {