7 files changed, 19 insertions, 19 deletions
diff --git a/gr-wavelet/include/wavelet/api.h b/gr-wavelet/include/wavelet/api.h
index f1b281440d..371ac24d54 100644
--- a/gr-wavelet/include/wavelet/api.h
+++ b/gr-wavelet/include/wavelet/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_WAVELET_API_H
 #define INCLUDED_WAVELET_API_H
 
-#include <attributes.h>
+#include <gnuradio/attributes.h>
 
 #ifdef gnuradio_wavelet_EXPORTS
 #  define WAVELET_API __GR_ATTR_EXPORT
diff --git a/gr-wavelet/include/wavelet/squash_ff.h b/gr-wavelet/include/wavelet/squash_ff.h
index f546148581..1635829a6c 100644
--- a/gr-wavelet/include/wavelet/squash_ff.h
+++ b/gr-wavelet/include/wavelet/squash_ff.h
@@ -24,12 +24,12 @@
 #define	INCLUDED_WAVELET_SQUASH_FF_H
 
 #include <wavelet/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr { 
   namespace wavelet {
 
-    class WAVELET_API squash_ff : virtual public gr_sync_block 
+    class WAVELET_API squash_ff : virtual public sync_block 
     {
     public:
       
diff --git a/gr-wavelet/include/wavelet/wavelet_ff.h b/gr-wavelet/include/wavelet/wavelet_ff.h
index 67bb6b19f8..1cae092e46 100644
--- a/gr-wavelet/include/wavelet/wavelet_ff.h
+++ b/gr-wavelet/include/wavelet/wavelet_ff.h
@@ -24,12 +24,12 @@
 #define INCLUDED_WAVELET_WAVELET_FF_H
 
 #include <wavelet/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr { 
   namespace wavelet {
 
-    class WAVELET_API wavelet_ff : virtual public gr_sync_block
+    class WAVELET_API wavelet_ff : virtual public sync_block
     {
     public:
 
diff --git a/gr-wavelet/include/wavelet/wvps_ff.h b/gr-wavelet/include/wavelet/wvps_ff.h
index 7f1965a6e7..6a799b0bbb 100644
--- a/gr-wavelet/include/wavelet/wvps_ff.h
+++ b/gr-wavelet/include/wavelet/wvps_ff.h
@@ -24,14 +24,14 @@
 #define INCLUDED_WAVELET_WVPS_FF_H
 
 #include <wavelet/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/sync_decimator.h>
 
 class wavelet_wvps_ff;
 
 namespace gr { 
   namespace wavelet {
 
-    class WAVELET_API wvps_ff : virtual public gr_sync_block
+    class WAVELET_API wvps_ff : virtual public sync_block
     {
     public:
 
diff --git a/gr-wavelet/lib/squash_ff_impl.cc b/gr-wavelet/lib/squash_ff_impl.cc
index 081ac900f5..47f8c616d5 100644
--- a/gr-wavelet/lib/squash_ff_impl.cc
+++ b/gr-wavelet/lib/squash_ff_impl.cc
@@ -26,7 +26,7 @@
 
 #include <stdexcept>
 #include <squash_ff_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 
 // expect input vector of igrid.size y-values,
 // produce output vector of ogrid.size y-values
@@ -42,9 +42,9 @@ namespace gr {
 
     squash_ff_impl::squash_ff_impl(const std::vector<float> &igrid,
 				   const std::vector<float> &ogrid)
-      : gr_sync_block("squash_ff",
-		      gr_make_io_signature(1, 1, sizeof(float) * igrid.size()),
-		      gr_make_io_signature(1, 1, sizeof(float) * ogrid.size()))
+      : sync_block("squash_ff",
+		      io_signature::make(1, 1, sizeof(float) * igrid.size()),
+		      io_signature::make(1, 1, sizeof(float) * ogrid.size()))
     {
       d_inum  = igrid.size();
       d_onum  = ogrid.size();
diff --git a/gr-wavelet/lib/wavelet_ff_impl.cc b/gr-wavelet/lib/wavelet_ff_impl.cc
index 73fc8c5440..6b313574b3 100644
--- a/gr-wavelet/lib/wavelet_ff_impl.cc
+++ b/gr-wavelet/lib/wavelet_ff_impl.cc
@@ -26,7 +26,7 @@
 
 #include <stdexcept>
 #include <wavelet_ff_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 
 #include <stdio.h>
 
@@ -46,9 +46,9 @@ namespace gr {
     wavelet_ff_impl::wavelet_ff_impl(int size, 
 				     int order, 
 				     bool forward)
-      : gr_sync_block("wavelet_ff",
-		      gr_make_io_signature(1, 1, size * sizeof(float)),
-		      gr_make_io_signature(1, 1, size * sizeof(float))),
+      : sync_block("wavelet_ff",
+		      io_signature::make(1, 1, size * sizeof(float)),
+		      io_signature::make(1, 1, size * sizeof(float))),
 	d_size(size),
 	d_order(order),
 	d_forward(forward)
diff --git a/gr-wavelet/lib/wvps_ff_impl.cc b/gr-wavelet/lib/wvps_ff_impl.cc
index 6e886bff4e..3dd6bf4ba9 100644
--- a/gr-wavelet/lib/wvps_ff_impl.cc
+++ b/gr-wavelet/lib/wvps_ff_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <wvps_ff_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 #include <string.h>
 
 namespace gr {
@@ -45,9 +45,9 @@ namespace gr {
     }
 
     wvps_ff_impl::wvps_ff_impl(int ilen)
-      : gr_sync_block("wvps_ff",
-		      gr_make_io_signature(1, 1, sizeof(float) * ilen),
-		      gr_make_io_signature(1, 1, sizeof(float) * ceil_log2(ilen))),
+      : sync_block("wvps_ff",
+		      io_signature::make(1, 1, sizeof(float) * ilen),
+		      io_signature::make(1, 1, sizeof(float) * ceil_log2(ilen))),
 	d_ilen(ilen), d_olen(ceil_log2(ilen))
     {
     }