11 files changed, 15 insertions, 15 deletions
diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt
index 4c1e3afb38..df0dbb9709 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 371ac24d54..371ac24d54 100644
--- a/gr-wavelet/include/wavelet/api.h
+++ b/gr-wavelet/include/gnuradio/wavelet/api.h
diff --git a/gr-wavelet/include/wavelet/squash_ff.h b/gr-wavelet/include/gnuradio/wavelet/squash_ff.h
index 1635829a6c..bf05fe9b5e 100644
--- a/gr-wavelet/include/wavelet/squash_ff.h
+++ b/gr-wavelet/include/gnuradio/wavelet/squash_ff.h
@@ -23,7 +23,7 @@
 #ifndef	INCLUDED_WAVELET_SQUASH_FF_H
 #define	INCLUDED_WAVELET_SQUASH_FF_H
 
-#include <wavelet/api.h>
+#include <gnuradio/wavelet/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr { 
diff --git a/gr-wavelet/include/wavelet/wavelet_ff.h b/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h
index 1cae092e46..ffc73dee93 100644
--- a/gr-wavelet/include/wavelet/wavelet_ff.h
+++ b/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_WAVELET_WAVELET_FF_H
 #define INCLUDED_WAVELET_WAVELET_FF_H
 
-#include <wavelet/api.h>
+#include <gnuradio/wavelet/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr { 
diff --git a/gr-wavelet/include/wavelet/wvps_ff.h b/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h
index 6a799b0bbb..563ffb7db3 100644
--- a/gr-wavelet/include/wavelet/wvps_ff.h
+++ b/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_WAVELET_WVPS_FF_H
 #define INCLUDED_WAVELET_WVPS_FF_H
 
-#include <wavelet/api.h>
+#include <gnuradio/wavelet/api.h>
 #include <gnuradio/sync_decimator.h>
 
 class wavelet_wvps_ff;
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.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.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);