14 files changed, 35 insertions, 35 deletions
diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt
index 1110ee6e25..bdc19a1ebc 100644
--- a/gr-wavelet/CMakeLists.txt
+++ b/gr-wavelet/CMakeLists.txt
@@ -84,7 +84,7 @@ CPACK_COMPONENT("wavelet_swig"
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(include/wavelet)
+add_subdirectory(include/gnuradio/wavelet)
 add_subdirectory(lib)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
diff --git a/gr-wavelet/include/wavelet/CMakeLists.txt b/gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt
index 43c1603d15..43c1603d15 100644
--- a/gr-wavelet/include/wavelet/CMakeLists.txt
+++ b/gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt
diff --git a/gr-wavelet/include/wavelet/api.h b/gr-wavelet/include/gnuradio/wavelet/api.h
index f1b281440d..371ac24d54 100644
--- a/gr-wavelet/include/wavelet/api.h
+++ b/gr-wavelet/include/gnuradio/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/gnuradio/wavelet/squash_ff.h
index 77ae4ec9e3..5f3f0a0ad5 100644
--- a/gr-wavelet/include/wavelet/squash_ff.h
+++ b/gr-wavelet/include/gnuradio/wavelet/squash_ff.h
@@ -23,18 +23,18 @@
 #ifndef	INCLUDED_WAVELET_SQUASH_FF_H
 #define	INCLUDED_WAVELET_SQUASH_FF_H
 
-#include <wavelet/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/wavelet/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr { 
   namespace wavelet {
 
     /*!
-     * \brief implements cheap resampling of spectrum directly from
+     * \brief Implements cheap resampling of spectrum directly from
      * spectral points, using gsl interpolation
      * \ingroup misc
      */
-    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/gnuradio/wavelet/wavelet_ff.h
index 17998ae473..3cdf105ac3 100644
--- a/gr-wavelet/include/wavelet/wavelet_ff.h
+++ b/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_WAVELET_WAVELET_FF_H
 #define INCLUDED_WAVELET_WAVELET_FF_H
 
-#include <wavelet/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/wavelet/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr { 
   namespace wavelet {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief Compute wavelet transform using gsl routines.
      * \ingroup wavelet_blk
      */
-    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/gnuradio/wavelet/wvps_ff.h
index aca3f73794..2daa000cfb 100644
--- a/gr-wavelet/include/wavelet/wvps_ff.h
+++ b/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_WAVELET_WVPS_FF_H
 #define INCLUDED_WAVELET_WVPS_FF_H
 
-#include <wavelet/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/wavelet/api.h>
+#include <gnuradio/sync_decimator.h>
 
 class wavelet_wvps_ff;
 
@@ -35,7 +35,7 @@ namespace gr {
      * \brief computes the Wavelet Power Spectrum from a set of wavelet coefficients
      * \ingroup wavelet_blk
      */
-    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/squash_ff_impl.h b/gr-wavelet/lib/squash_ff_impl.h
index b6ddb45363..b9ab994558 100644
--- a/gr-wavelet/lib/squash_ff_impl.h
+++ b/gr-wavelet/lib/squash_ff_impl.h
@@ -23,8 +23,8 @@
 #ifndef	INCLUDED_WAVELET_SQUASH_FF_IMPL_H
 #define	INCLUDED_WAVELET_SQUASH_FF_IMPL_H
 
-#include <wavelet/api.h>
-#include <wavelet/squash_ff.h>
+#include <gnuradio/wavelet/api.h>
+#include <gnuradio/wavelet/squash_ff.h>
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_interp.h>
 #include <gsl/gsl_spline.h>
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/wavelet_ff_impl.h b/gr-wavelet/lib/wavelet_ff_impl.h
index bec3935f33..b8d6500487 100644
--- a/gr-wavelet/lib/wavelet_ff_impl.h
+++ b/gr-wavelet/lib/wavelet_ff_impl.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_WAVELET_WAVELET_FF_IMPL_H
 #define INCLUDED_WAVELET_WAVELET_FF_IMPL_H
 
-#include <wavelet/wavelet_ff.h>
+#include <gnuradio/wavelet/wavelet_ff.h>
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_wavelet.h>
 
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))
     {
     }
diff --git a/gr-wavelet/lib/wvps_ff_impl.h b/gr-wavelet/lib/wvps_ff_impl.h
index ab64395d24..b9951f40a7 100644
--- a/gr-wavelet/lib/wvps_ff_impl.h
+++ b/gr-wavelet/lib/wvps_ff_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_WAVELET_WVPS_FF_IMPL_H
 #define INCLUDED_WAVELET_WVPS_FF_IMPL_H
 
-#include <wavelet/wvps_ff.h>
+#include <gnuradio/wavelet/wvps_ff.h>
 
 namespace gr {
   namespace wavelet {
diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt
index aa0d800af8..c539898575 100644
--- a/gr-wavelet/swig/CMakeLists.txt
+++ b/gr-wavelet/swig/CMakeLists.txt
@@ -37,7 +37,7 @@ if(ENABLE_GR_CTRLPORT)
 endif(ENABLE_GR_CTRLPORT)
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/wavelet_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/wavelet)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/wavelet)
 set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
 
 set(GR_SWIG_LIBRARIES gnuradio-wavelet ${GSL_LDFLAGS})
diff --git a/gr-wavelet/swig/wavelet_swig.i b/gr-wavelet/swig/wavelet_swig.i
index d9b8e3144b..5aa2973647 100644
--- a/gr-wavelet/swig/wavelet_swig.i
+++ b/gr-wavelet/swig/wavelet_swig.i
@@ -28,14 +28,14 @@
 %include "wavelet_swig_doc.i"
 
 %{
-#include "wavelet/squash_ff.h"
-#include "wavelet/wavelet_ff.h"
-#include "wavelet/wvps_ff.h"
+#include "gnuradio/wavelet/squash_ff.h"
+#include "gnuradio/wavelet/wavelet_ff.h"
+#include "gnuradio/wavelet/wvps_ff.h"
 %}
 
-%include "wavelet/squash_ff.h"
-%include "wavelet/wavelet_ff.h"
-%include "wavelet/wvps_ff.h"
+%include "gnuradio/wavelet/squash_ff.h"
+%include "gnuradio/wavelet/wavelet_ff.h"
+%include "gnuradio/wavelet/wvps_ff.h"
 
 GR_SWIG_BLOCK_MAGIC2(wavelet, squash_ff);
 GR_SWIG_BLOCK_MAGIC2(wavelet, wavelet_ff);