11 files changed, 19 insertions, 19 deletions
diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.cc b/gr-fec/lib/decode_ccsds_27_fb_impl.cc
index 87bdc46402..51033a86c0 100644
--- a/gr-fec/lib/decode_ccsds_27_fb_impl.cc
+++ b/gr-fec/lib/decode_ccsds_27_fb_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include "decode_ccsds_27_fb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
   namespace fec {
@@ -36,9 +36,9 @@ namespace gr {
     }
 
     decode_ccsds_27_fb_impl::decode_ccsds_27_fb_impl()
-      : gr_sync_decimator("decode_ccsds_27_fb",
-			  gr_make_io_signature (1, 1, sizeof(float)),
-			  gr_make_io_signature (1, 1, sizeof(char)),
+      : sync_decimator("decode_ccsds_27_fb",
+			  io_signature::make (1, 1, sizeof(float)),
+			  io_signature::make (1, 1, sizeof(char)),
 			  2*8)  // Rate 1/2 code, unpacked to packed conversion
     {
       float RATE = 0.5;
diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.h b/gr-fec/lib/decode_ccsds_27_fb_impl.h
index c28ee77b1a..cd16c6ab1c 100644
--- a/gr-fec/lib/decode_ccsds_27_fb_impl.h
+++ b/gr-fec/lib/decode_ccsds_27_fb_impl.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_FEC_DECODE_CCSDS_27_FB_IMPL_H
 #define INCLUDED_FEC_DECODE_CCSDS_27_FB_IMPL_H
 
-#include <fec/decode_ccsds_27_fb.h>
+#include <gnuradio/fec/decode_ccsds_27_fb.h>
 
 extern "C" {
-#include <fec/viterbi.h>
+#include <gnuradio/fec/viterbi.h>
 }
 
 namespace gr {
diff --git a/gr-fec/lib/encode_ccsds_27_bb_impl.cc b/gr-fec/lib/encode_ccsds_27_bb_impl.cc
index 0a348f372f..56518777c7 100644
--- a/gr-fec/lib/encode_ccsds_27_bb_impl.cc
+++ b/gr-fec/lib/encode_ccsds_27_bb_impl.cc
@@ -25,10 +25,10 @@
 #endif
 
 #include "encode_ccsds_27_bb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 
 extern "C" {
-#include <fec/viterbi.h>
+#include <gnuradio/fec/viterbi.h>
 }
 
 namespace gr {
@@ -40,9 +40,9 @@ namespace gr {
     }
 
     encode_ccsds_27_bb_impl::encode_ccsds_27_bb_impl()
-      : gr_sync_interpolator("encode_ccsds_27_bb",
-			     gr_make_io_signature (1, 1, sizeof(char)),
-			     gr_make_io_signature (1, 1, sizeof(char)),
+      : sync_interpolator("encode_ccsds_27_bb",
+			     io_signature::make (1, 1, sizeof(char)),
+			     io_signature::make (1, 1, sizeof(char)),
 			     16)  // Rate 1/2 code, packed to unpacked conversion
     {
       d_encstate = 0;
diff --git a/gr-fec/lib/encode_ccsds_27_bb_impl.h b/gr-fec/lib/encode_ccsds_27_bb_impl.h
index 140f8c2ae4..b48c1a47f1 100644
--- a/gr-fec/lib/encode_ccsds_27_bb_impl.h
+++ b/gr-fec/lib/encode_ccsds_27_bb_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_FEC_ENCODE_CCSDS_27_BB_IMPL_H
 #define INCLUDED_FEC_ENCODE_CCSDS_27_BB_IMPL_H
 
-#include <fec/encode_ccsds_27_bb.h>
+#include <gnuradio/fec/encode_ccsds_27_bb.h>
 
 namespace gr {
   namespace fec {
diff --git a/gr-fec/lib/reed-solomon/char.h b/gr-fec/lib/reed-solomon/char.h
index bc4fd8a1ba..f76ad95cd4 100644
--- a/gr-fec/lib/reed-solomon/char.h
+++ b/gr-fec/lib/reed-solomon/char.h
@@ -6,7 +6,7 @@
 
 #define DTYPE unsigned char
 
-#include <fec/api.h>
+#include <gnuradio/fec/api.h>
 
 /* Reed-Solomon codec control block */
 struct rs {
diff --git a/gr-fec/lib/reed-solomon/fixed.h b/gr-fec/lib/reed-solomon/fixed.h
index ee4ae2e714..d45f4d47b5 100644
--- a/gr-fec/lib/reed-solomon/fixed.h
+++ b/gr-fec/lib/reed-solomon/fixed.h
@@ -7,7 +7,7 @@
  */
 #define DTYPE unsigned char
 
-#include <fec/api.h>
+#include <gnuradio/fec/api.h>
 
 static inline int mod255(int x){
   while (x >= 255) {
diff --git a/gr-fec/lib/reed-solomon/int.h b/gr-fec/lib/reed-solomon/int.h
index 6bb00fd102..818629abb4 100644
--- a/gr-fec/lib/reed-solomon/int.h
+++ b/gr-fec/lib/reed-solomon/int.h
@@ -5,7 +5,7 @@
  */
 #define DTYPE int
 
-#include <fec/api.h>
+#include <gnuradio/fec/api.h>
 
 /* Reed-Solomon codec control block */
 struct FEC_API rs {
diff --git a/gr-fec/lib/reed-solomon/rstest.c b/gr-fec/lib/reed-solomon/rstest.c
index 5e3f55bcea..767c01d848 100644
--- a/gr-fec/lib/reed-solomon/rstest.c
+++ b/gr-fec/lib/reed-solomon/rstest.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <fec/rs.h>
+#include <gnuradio/fec/rs.h>
 
 int exercise_char(void *,int);
 
diff --git a/gr-fec/lib/viterbi/decode.cc b/gr-fec/lib/viterbi/decode.cc
index f4ea829d55..0af0b34483 100644
--- a/gr-fec/lib/viterbi/decode.cc
+++ b/gr-fec/lib/viterbi/decode.cc
@@ -28,7 +28,7 @@
  */
 
 extern "C" {
-#include <fec/viterbi.h>
+#include <gnuradio/fec/viterbi.h>
 }
 
 #include <cstdio>
diff --git a/gr-fec/lib/viterbi/encode.cc b/gr-fec/lib/viterbi/encode.cc
index 101678718c..4e152781f0 100644
--- a/gr-fec/lib/viterbi/encode.cc
+++ b/gr-fec/lib/viterbi/encode.cc
@@ -30,7 +30,7 @@
  */
 
 extern "C" {
-#include <fec/viterbi.h>
+#include <gnuradio/fec/viterbi.h>
 }
 
 #include <cstdio>
diff --git a/gr-fec/lib/viterbi/viterbi.c b/gr-fec/lib/viterbi/viterbi.c
index 526c9504a2..3c247a3868 100644
--- a/gr-fec/lib/viterbi/viterbi.c
+++ b/gr-fec/lib/viterbi/viterbi.c
@@ -25,7 +25,7 @@
  * Some modifications from original Karn code by Matt Ettus
  */
 
-#include <fec/viterbi.h>
+#include <gnuradio/fec/viterbi.h>
 
 /* The two generator polynomials for the NASA Standard K=7 code.
  * Since these polynomials are known to be optimal for this constraint