8 files changed, 23 insertions, 23 deletions
diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc
index 60838ee302..abcda7d30e 100644
--- a/gr-fft/lib/fft.cc
+++ b/gr-fft/lib/fft.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <fft/fft.h>
-#include <gr_sys_paths.h>
+#include <gnuradio/fft/fft.h>
+#include <gnuradio/sys_paths.h>
 #include <fftw3.h>
 
 #ifdef _MSC_VER //http://www.fftw.org/install/windows.html#DLLwisdom
@@ -36,7 +36,7 @@ static int my_fftw_read_char(void *f) { return fgetc((FILE *) f); }
 #define fftwl_import_wisdom_from_file(f) fftwl_import_wisdom(my_fftw_read_char, (void*) (f))
 #endif //_MSC_VER
 
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -86,7 +86,7 @@ namespace gr {
     wisdom_filename()
     {
       static fs::path path;
-      path = fs::path(gr_appdata_path()) / ".gr_fftw_wisdom";
+      path = fs::path(gr::appdata_path()) / ".gr_fftw_wisdom";
       return path.string().c_str();
     }
 
diff --git a/gr-fft/lib/fft_vcc_fftw.cc b/gr-fft/lib/fft_vcc_fftw.cc
index ebcd5ec53f..96f3e5b51c 100644
--- a/gr-fft/lib/fft_vcc_fftw.cc
+++ b/gr-fft/lib/fft_vcc_fftw.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include "fft_vcc_fftw.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 #include <math.h>
 #include <string.h>
 
@@ -44,9 +44,9 @@ namespace gr {
     fft_vcc_fftw::fft_vcc_fftw(int fft_size, bool forward,
 			       const std::vector<float> &window,
 			       bool shift, int nthreads)
-      : gr_sync_block("fft_vcc_fftw",
-		      gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex)),
-		      gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex))),
+      : sync_block("fft_vcc_fftw",
+		      io_signature::make(1, 1, fft_size * sizeof(gr_complex)),
+		      io_signature::make(1, 1, fft_size * sizeof(gr_complex))),
 	d_fft_size(fft_size), d_forward(forward), d_shift(shift)
     {
       d_fft = new fft_complex(d_fft_size, forward, nthreads);
diff --git a/gr-fft/lib/fft_vcc_fftw.h b/gr-fft/lib/fft_vcc_fftw.h
index ea15dd07bb..2aa2056f5b 100644
--- a/gr-fft/lib/fft_vcc_fftw.h
+++ b/gr-fft/lib/fft_vcc_fftw.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H
 #define INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H
 
-#include <fft/fft_vcc.h>
-#include <fft/fft.h>
+#include <gnuradio/fft/fft_vcc.h>
+#include <gnuradio/fft/fft.h>
 
 namespace gr {
   namespace fft {
diff --git a/gr-fft/lib/fft_vfc_fftw.cc b/gr-fft/lib/fft_vfc_fftw.cc
index 890dac7be7..dec2157b06 100644
--- a/gr-fft/lib/fft_vfc_fftw.cc
+++ b/gr-fft/lib/fft_vfc_fftw.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include "fft_vfc_fftw.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 #include <math.h>
 #include <string.h>
 
@@ -44,9 +44,9 @@ namespace gr {
     fft_vfc_fftw::fft_vfc_fftw(int fft_size, bool forward,
 			       const std::vector<float> &window,
 			       int nthreads)
-      : gr_sync_block("fft_vfc_fftw",
-		      gr_make_io_signature(1, 1, fft_size * sizeof(float)),
-		      gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex))),
+      : sync_block("fft_vfc_fftw",
+		      io_signature::make(1, 1, fft_size * sizeof(float)),
+		      io_signature::make(1, 1, fft_size * sizeof(gr_complex))),
 	d_fft_size(fft_size), d_forward(forward)
     {
       d_fft = new fft_complex(d_fft_size, forward, nthreads);
diff --git a/gr-fft/lib/fft_vfc_fftw.h b/gr-fft/lib/fft_vfc_fftw.h
index 1b6f78ba63..2fe292f8ca 100644
--- a/gr-fft/lib/fft_vfc_fftw.h
+++ b/gr-fft/lib/fft_vfc_fftw.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H
 #define INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H
 
-#include <fft/fft_vfc.h>
-#include <fft/fft.h>
+#include <gnuradio/fft/fft_vfc.h>
+#include <gnuradio/fft/fft.h>
 
 namespace gr {
   namespace fft {
diff --git a/gr-fft/lib/goertzel.cc b/gr-fft/lib/goertzel.cc
index 4bcd5ee190..ddb086c531 100644
--- a/gr-fft/lib/goertzel.cc
+++ b/gr-fft/lib/goertzel.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <cmath>
-#include <fft/goertzel.h>
+#include <gnuradio/fft/goertzel.h>
 
 namespace gr {
   namespace fft {
diff --git a/gr-fft/lib/goertzel_fc_impl.cc b/gr-fft/lib/goertzel_fc_impl.cc
index ee214f24da..fd3755eeaa 100644
--- a/gr-fft/lib/goertzel_fc_impl.cc
+++ b/gr-fft/lib/goertzel_fc_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include "goertzel_fc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
   namespace fft {
@@ -36,9 +36,9 @@ namespace gr {
     }
     
     goertzel_fc_impl::goertzel_fc_impl(int rate, int len, float freq)
-      : gr_sync_decimator("goertzel_fc",
-			  gr_make_io_signature (1, 1, sizeof(float)),
-			  gr_make_io_signature (1, 1, sizeof(gr_complex)),
+      : sync_decimator("goertzel_fc",
+			  io_signature::make (1, 1, sizeof(float)),
+			  io_signature::make (1, 1, sizeof(gr_complex)),
 			  len),
 	d_goertzel(rate, len, freq)
     {
diff --git a/gr-fft/lib/goertzel_fc_impl.h b/gr-fft/lib/goertzel_fc_impl.h
index 426bc71f6b..79b24f15c4 100644
--- a/gr-fft/lib/goertzel_fc_impl.h
+++ b/gr-fft/lib/goertzel_fc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_GOERTZEL_FC_IMPL_H
 #define INCLUDED_FFT_GOERTZEL_FC_IMPL_H
 
-#include <fft/goertzel_fc.h>
-#include <fft/goertzel.h>
+#include <gnuradio/fft/goertzel_fc.h>
+#include <gnuradio/fft/goertzel.h>
 
 namespace gr {
   namespace fft {