summaryrefslogtreecommitdiff
path: root/gr-digital
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2013-04-29 20:59:55 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2013-04-29 20:59:55 -0700
commitbc462ac6f6841c16fe3f6a777f32589c3b546aba (patch)
treec3561c5c8570caa004e4dedd977d548659920e51 /gr-digital
parenta23eb76138baad68e2a6eb6a53b2d7f87bc1288a (diff)
digital: moved include dir to gnuradio/digital
Diffstat (limited to 'gr-digital')
-rw-r--r--gr-digital/CMakeLists.txt2
-rw-r--r--gr-digital/include/gnuradio/digital/CMakeLists.txt (renamed from gr-digital/include/digital/CMakeLists.txt)0
-rw-r--r--gr-digital/include/gnuradio/digital/additive_scrambler_bb.h (renamed from gr-digital/include/digital/additive_scrambler_bb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/api.h (renamed from gr-digital/include/digital/api.h)0
-rw-r--r--gr-digital/include/gnuradio/digital/binary_slicer_fb.h (renamed from gr-digital/include/digital/binary_slicer_fb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/chunks_to_symbols_XX.h.t (renamed from gr-digital/include/digital/chunks_to_symbols_XX.h.t)2
-rw-r--r--gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h (renamed from gr-digital/include/digital/clock_recovery_mm_cc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h (renamed from gr-digital/include/digital/clock_recovery_mm_ff.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/cma_equalizer_cc.h (renamed from gr-digital/include/digital/cma_equalizer_cc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/constellation.h (renamed from gr-digital/include/digital/constellation.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/constellation_decoder_cb.h (renamed from gr-digital/include/digital/constellation_decoder_cb.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/constellation_receiver_cb.h (renamed from gr-digital/include/digital/constellation_receiver_cb.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/correlate_access_code_bb.h (renamed from gr-digital/include/digital/correlate_access_code_bb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h (renamed from gr-digital/include/digital/correlate_access_code_tag_bb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/costas_loop_cc.h (renamed from gr-digital/include/digital/costas_loop_cc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/cpmmod_bc.h (renamed from gr-digital/include/digital/cpmmod_bc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/crc32.h (renamed from gr-digital/include/digital/crc32.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/crc32_bb.h (renamed from gr-digital/include/digital/crc32_bb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/descrambler_bb.h (renamed from gr-digital/include/digital/descrambler_bb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/diff_decoder_bb.h (renamed from gr-digital/include/digital/diff_decoder_bb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/diff_encoder_bb.h (renamed from gr-digital/include/digital/diff_encoder_bb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/diff_phasor_cc.h (renamed from gr-digital/include/digital/diff_phasor_cc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/fll_band_edge_cc.h (renamed from gr-digital/include/digital/fll_band_edge_cc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/framer_sink_1.h (renamed from gr-digital/include/digital/framer_sink_1.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/glfsr.h (renamed from gr-digital/include/digital/glfsr.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/glfsr_source_b.h (renamed from gr-digital/include/digital/glfsr_source_b.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/glfsr_source_f.h (renamed from gr-digital/include/digital/glfsr_source_f.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/header_payload_demux.h (renamed from gr-digital/include/digital/header_payload_demux.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h (renamed from gr-digital/include/digital/kurtotic_equalizer_cc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/lfsr.h (renamed from gr-digital/include/digital/lfsr.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h (renamed from gr-digital/include/digital/lms_dd_equalizer_cc.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/map_bb.h (renamed from gr-digital/include/digital/map_bb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/metric_type.h (renamed from gr-digital/include/digital/metric_type.h)0
-rw-r--r--gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h (renamed from gr-digital/include/digital/mpsk_receiver_cc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/mpsk_snr_est.h (renamed from gr-digital/include/digital/mpsk_snr_est.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h (renamed from gr-digital/include/digital/mpsk_snr_est_cc.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h (renamed from gr-digital/include/digital/ofdm_carrier_allocator_cvc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h (renamed from gr-digital/include/digital/ofdm_chanest_vcvc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h (renamed from gr-digital/include/digital/ofdm_cyclic_prefixer.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h (renamed from gr-digital/include/digital/ofdm_equalizer_base.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h (renamed from gr-digital/include/digital/ofdm_equalizer_simpledfe.h)6
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h (renamed from gr-digital/include/digital/ofdm_equalizer_static.h)6
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_frame_acquisition.h (renamed from gr-digital/include/digital/ofdm_frame_acquisition.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h (renamed from gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_frame_sink.h (renamed from gr-digital/include/digital/ofdm_frame_sink.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_insert_preamble.h (renamed from gr-digital/include/digital/ofdm_insert_preamble.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_mapper_bcv.h (renamed from gr-digital/include/digital/ofdm_mapper_bcv.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_sampler.h (renamed from gr-digital/include/digital/ofdm_sampler.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h (renamed from gr-digital/include/digital/ofdm_serializer_vcc.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h (renamed from gr-digital/include/digital/ofdm_sync_sc_cfb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/packet_header_default.h (renamed from gr-digital/include/digital/packet_header_default.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/packet_header_ofdm.h (renamed from gr-digital/include/digital/packet_header_ofdm.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h (renamed from gr-digital/include/digital/packet_headergenerator_bb.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/packet_headerparser_b.h (renamed from gr-digital/include/digital/packet_headerparser_b.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/packet_sink.h (renamed from gr-digital/include/digital/packet_sink.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h (renamed from gr-digital/include/digital/pfb_clock_sync_ccf.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h (renamed from gr-digital/include/digital/pfb_clock_sync_fff.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/pn_correlator_cc.h (renamed from gr-digital/include/digital/pn_correlator_cc.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/probe_density_b.h (renamed from gr-digital/include/digital/probe_density_b.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h (renamed from gr-digital/include/digital/probe_mpsk_snr_est_c.h)4
-rw-r--r--gr-digital/include/gnuradio/digital/scrambler_bb.h (renamed from gr-digital/include/digital/scrambler_bb.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/simple_correlator.h (renamed from gr-digital/include/digital/simple_correlator.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/simple_framer.h (renamed from gr-digital/include/digital/simple_framer.h)2
-rw-r--r--gr-digital/include/gnuradio/digital/simple_framer_sync.h (renamed from gr-digital/include/digital/simple_framer_sync.h)0
-rw-r--r--gr-digital/lib/additive_scrambler_bb_impl.h4
-rw-r--r--gr-digital/lib/binary_slicer_fb_impl.h2
-rw-r--r--gr-digital/lib/chunks_to_symbols_XX_impl.h.t2
-rw-r--r--gr-digital/lib/clock_recovery_mm_cc_impl.h2
-rw-r--r--gr-digital/lib/clock_recovery_mm_ff_impl.h2
-rw-r--r--gr-digital/lib/cma_equalizer_cc_impl.h2
-rw-r--r--gr-digital/lib/constellation.cc2
-rw-r--r--gr-digital/lib/constellation_decoder_cb_impl.h2
-rw-r--r--gr-digital/lib/constellation_receiver_cb_impl.h2
-rw-r--r--gr-digital/lib/correlate_access_code_bb_impl.h2
-rw-r--r--gr-digital/lib/correlate_access_code_tag_bb_impl.h2
-rw-r--r--gr-digital/lib/costas_loop_cc_impl.h2
-rw-r--r--gr-digital/lib/cpmmod_bc_impl.h2
-rw-r--r--gr-digital/lib/crc32.cc2
-rw-r--r--gr-digital/lib/crc32_bb_impl.cc2
-rw-r--r--gr-digital/lib/crc32_bb_impl.h2
-rw-r--r--gr-digital/lib/descrambler_bb_impl.h4
-rw-r--r--gr-digital/lib/diff_decoder_bb_impl.h2
-rw-r--r--gr-digital/lib/diff_encoder_bb_impl.h2
-rw-r--r--gr-digital/lib/diff_phasor_cc_impl.h2
-rw-r--r--gr-digital/lib/fll_band_edge_cc_impl.h2
-rw-r--r--gr-digital/lib/framer_sink_1_impl.h2
-rw-r--r--gr-digital/lib/glfsr.cc2
-rw-r--r--gr-digital/lib/glfsr_source_b_impl.h4
-rw-r--r--gr-digital/lib/glfsr_source_f_impl.h4
-rw-r--r--gr-digital/lib/header_payload_demux_impl.h2
-rw-r--r--gr-digital/lib/kurtotic_equalizer_cc_impl.h2
-rw-r--r--gr-digital/lib/lms_dd_equalizer_cc_impl.h2
-rw-r--r--gr-digital/lib/map_bb_impl.h2
-rw-r--r--gr-digital/lib/mpsk_receiver_cc_impl.h2
-rw-r--r--gr-digital/lib/mpsk_snr_est.cc2
-rw-r--r--gr-digital/lib/mpsk_snr_est_cc_impl.h4
-rw-r--r--gr-digital/lib/ofdm_carrier_allocator_cvc_impl.h2
-rw-r--r--gr-digital/lib/ofdm_chanest_vcvc_impl.h2
-rw-r--r--gr-digital/lib/ofdm_cyclic_prefixer_impl.h2
-rw-r--r--gr-digital/lib/ofdm_equalizer_base.cc2
-rw-r--r--gr-digital/lib/ofdm_equalizer_simpledfe.cc2
-rw-r--r--gr-digital/lib/ofdm_equalizer_static.cc2
-rw-r--r--gr-digital/lib/ofdm_frame_acquisition_impl.h2
-rw-r--r--gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h2
-rw-r--r--gr-digital/lib/ofdm_frame_sink_impl.h2
-rw-r--r--gr-digital/lib/ofdm_insert_preamble_impl.h2
-rw-r--r--gr-digital/lib/ofdm_mapper_bcv_impl.h2
-rw-r--r--gr-digital/lib/ofdm_sampler_impl.h2
-rw-r--r--gr-digital/lib/ofdm_serializer_vcc_impl.h2
-rw-r--r--gr-digital/lib/ofdm_sync_sc_cfb_impl.h2
-rw-r--r--gr-digital/lib/packet_header_default.cc2
-rw-r--r--gr-digital/lib/packet_header_ofdm.cc2
-rw-r--r--gr-digital/lib/packet_headergenerator_bb_impl.h2
-rw-r--r--gr-digital/lib/packet_headerparser_b_impl.h2
-rw-r--r--gr-digital/lib/packet_sink_impl.h2
-rw-r--r--gr-digital/lib/pfb_clock_sync_ccf_impl.h2
-rw-r--r--gr-digital/lib/pfb_clock_sync_fff_impl.h2
-rw-r--r--gr-digital/lib/pn_correlator_cc_impl.h4
-rw-r--r--gr-digital/lib/probe_density_b_impl.h2
-rw-r--r--gr-digital/lib/probe_mpsk_snr_est_c_impl.h2
-rw-r--r--gr-digital/lib/scrambler_bb_impl.h4
-rw-r--r--gr-digital/lib/simple_correlator_impl.cc2
-rw-r--r--gr-digital/lib/simple_correlator_impl.h2
-rw-r--r--gr-digital/lib/simple_framer_impl.cc2
-rw-r--r--gr-digital/lib/simple_framer_impl.h2
-rw-r--r--gr-digital/swig/CMakeLists.txt2
-rw-r--r--gr-digital/swig/digital_swig.i262
127 files changed, 275 insertions, 275 deletions
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
index 7d5a7541d1..4c7647a4db 100644
--- a/gr-digital/CMakeLists.txt
+++ b/gr-digital/CMakeLists.txt
@@ -91,7 +91,7 @@ CPACK_COMPONENT("digital_swig"
########################################################################
# Add subdirectories
########################################################################
-add_subdirectory(include/digital)
+add_subdirectory(include/gnuradio/digital)
add_subdirectory(lib)
add_subdirectory(doc)
if(ENABLE_PYTHON)
diff --git a/gr-digital/include/digital/CMakeLists.txt b/gr-digital/include/gnuradio/digital/CMakeLists.txt
index 275da16d87..275da16d87 100644
--- a/gr-digital/include/digital/CMakeLists.txt
+++ b/gr-digital/include/gnuradio/digital/CMakeLists.txt
diff --git a/gr-digital/include/digital/additive_scrambler_bb.h b/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h
index 9f0493b756..73fd395d67 100644
--- a/gr-digital/include/digital/additive_scrambler_bb.h
+++ b/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_ADDITIVE_SCRAMBLER_BB_H
#define INCLUDED_DIGITAL_ADDITIVE_SCRAMBLER_BB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/api.h b/gr-digital/include/gnuradio/digital/api.h
index 71ca19ad58..71ca19ad58 100644
--- a/gr-digital/include/digital/api.h
+++ b/gr-digital/include/gnuradio/digital/api.h
diff --git a/gr-digital/include/digital/binary_slicer_fb.h b/gr-digital/include/gnuradio/digital/binary_slicer_fb.h
index 2d5bf6e51d..ef83a9dbd4 100644
--- a/gr-digital/include/digital/binary_slicer_fb.h
+++ b/gr-digital/include/gnuradio/digital/binary_slicer_fb.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_BINARY_SLICER_FB_H
#define INCLUDED_DIGITAL_BINARY_SLICER_FB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/chunks_to_symbols_XX.h.t b/gr-digital/include/gnuradio/digital/chunks_to_symbols_XX.h.t
index 5d25e68943..3835c80bee 100644
--- a/gr-digital/include/digital/chunks_to_symbols_XX.h.t
+++ b/gr-digital/include/gnuradio/digital/chunks_to_symbols_XX.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME@
#define @GUARD_NAME@
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_interpolator.h>
namespace gr {
diff --git a/gr-digital/include/digital/clock_recovery_mm_cc.h b/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h
index e2c948ac4d..9bca249afd 100644
--- a/gr-digital/include/digital/clock_recovery_mm_cc.h
+++ b/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_H
#define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/block.h>
namespace gr {
diff --git a/gr-digital/include/digital/clock_recovery_mm_ff.h b/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h
index e5a229c704..9637546ed4 100644
--- a/gr-digital/include/digital/clock_recovery_mm_ff.h
+++ b/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_H
#define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/block.h>
namespace gr {
diff --git a/gr-digital/include/digital/cma_equalizer_cc.h b/gr-digital/include/gnuradio/digital/cma_equalizer_cc.h
index bfe851e689..108c2cfc7d 100644
--- a/gr-digital/include/digital/cma_equalizer_cc.h
+++ b/gr-digital/include/gnuradio/digital/cma_equalizer_cc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H
#define INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_decimator.h>
namespace gr {
diff --git a/gr-digital/include/digital/constellation.h b/gr-digital/include/gnuradio/digital/constellation.h
index d81cac478e..f8b99bb9c5 100644
--- a/gr-digital/include/digital/constellation.h
+++ b/gr-digital/include/gnuradio/digital/constellation.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_DIGITAL_CONSTELLATION_H
#define INCLUDED_DIGITAL_CONSTELLATION_H
-#include <digital/api.h>
-#include <digital/metric_type.h>
+#include <gnuradio/digital/api.h>
+#include <gnuradio/digital/metric_type.h>
#include <boost/enable_shared_from_this.hpp>
#include <gnuradio/gr_complex.h>
#include <vector>
diff --git a/gr-digital/include/digital/constellation_decoder_cb.h b/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h
index fd6e3d0ec3..51feb95b7c 100644
--- a/gr-digital/include/digital/constellation_decoder_cb.h
+++ b/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
#define INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
-#include <digital/api.h>
-#include <digital/constellation.h>
+#include <gnuradio/digital/api.h>
+#include <gnuradio/digital/constellation.h>
#include <gnuradio/block.h>
namespace gr {
diff --git a/gr-digital/include/digital/constellation_receiver_cb.h b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h
index 255ae4da67..e8f269a139 100644
--- a/gr-digital/include/digital/constellation_receiver_cb.h
+++ b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
#define INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
-#include <digital/api.h>
-#include <digital/constellation.h>
+#include <gnuradio/digital/api.h>
+#include <gnuradio/digital/constellation.h>
#include <gnuradio/block.h>
namespace gr {
diff --git a/gr-digital/include/digital/correlate_access_code_bb.h b/gr-digital/include/gnuradio/digital/correlate_access_code_bb.h
index 544d427f60..2f7b700ac9 100644
--- a/gr-digital/include/digital/correlate_access_code_bb.h
+++ b/gr-digital/include/gnuradio/digital/correlate_access_code_bb.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_H
#define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
#include <string>
diff --git a/gr-digital/include/digital/correlate_access_code_tag_bb.h b/gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h
index 51d088e82f..475c038dc7 100644
--- a/gr-digital/include/digital/correlate_access_code_tag_bb.h
+++ b/gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_TAG_BB_H
#define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_TAG_BB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
#include <string>
diff --git a/gr-digital/include/digital/costas_loop_cc.h b/gr-digital/include/gnuradio/digital/costas_loop_cc.h
index 555d5ad09f..38a41a5db5 100644
--- a/gr-digital/include/digital/costas_loop_cc.h
+++ b/gr-digital/include/gnuradio/digital/costas_loop_cc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
#define INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/blocks/control_loop.h>
#include <gnuradio/sync_block.h>
diff --git a/gr-digital/include/digital/cpmmod_bc.h b/gr-digital/include/gnuradio/digital/cpmmod_bc.h
index 13c778943c..885c653de4 100644
--- a/gr-digital/include/digital/cpmmod_bc.h
+++ b/gr-digital/include/gnuradio/digital/cpmmod_bc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CPMMOD_BC_H
#define INCLUDED_DIGITAL_CPMMOD_BC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/hier_block2.h>
#include <gnuradio/analog/cpm.h>
diff --git a/gr-digital/include/digital/crc32.h b/gr-digital/include/gnuradio/digital/crc32.h
index a10960084d..1f7581fd69 100644
--- a/gr-digital/include/digital/crc32.h
+++ b/gr-digital/include/gnuradio/digital/crc32.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CRC32_H
#define INCLUDED_DIGITAL_CRC32_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <string>
#include <gnuradio/types.h>
diff --git a/gr-digital/include/digital/crc32_bb.h b/gr-digital/include/gnuradio/digital/crc32_bb.h
index 8b44e79efa..79e8a974b8 100644
--- a/gr-digital/include/digital/crc32_bb.h
+++ b/gr-digital/include/gnuradio/digital/crc32_bb.h
@@ -24,7 +24,7 @@
#ifndef INCLUDED_DIGITAL_CRC32_BB_H
#define INCLUDED_DIGITAL_CRC32_BB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/tagged_stream_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/descrambler_bb.h b/gr-digital/include/gnuradio/digital/descrambler_bb.h
index 5494f3fac1..10efde275e 100644
--- a/gr-digital/include/digital/descrambler_bb.h
+++ b/gr-digital/include/gnuradio/digital/descrambler_bb.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_DESCRAMBLER_BB_H
#define INCLUDED_GR_DESCRAMBLER_BB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/diff_decoder_bb.h b/gr-digital/include/gnuradio/digital/diff_decoder_bb.h
index bb1b254f27..463e65756f 100644
--- a/gr-digital/include/digital/diff_decoder_bb.h
+++ b/gr-digital/include/gnuradio/digital/diff_decoder_bb.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_DIFF_DECODER_BB_H
#define INCLUDED_GR_DIFF_DECODER_BB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/diff_encoder_bb.h b/gr-digital/include/gnuradio/digital/diff_encoder_bb.h
index 20ef12dae6..e59c6e82bd 100644
--- a/gr-digital/include/digital/diff_encoder_bb.h
+++ b/gr-digital/include/gnuradio/digital/diff_encoder_bb.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_DIFF_ENCODER_BB_H
#define INCLUDED_GR_DIFF_ENCODER_BB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/diff_phasor_cc.h b/gr-digital/include/gnuradio/digital/diff_phasor_cc.h
index 803f025ce0..efcc3b367a 100644
--- a/gr-digital/include/digital/diff_phasor_cc.h
+++ b/gr-digital/include/gnuradio/digital/diff_phasor_cc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_DIFF_PHASOR_CC_H
#define INCLUDED_GR_DIFF_PHASOR_CC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/fll_band_edge_cc.h b/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h
index 9802f825b1..309c23a496 100644
--- a/gr-digital/include/digital/fll_band_edge_cc.h
+++ b/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_H
#define INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
#include <gnuradio/blocks/control_loop.h>
diff --git a/gr-digital/include/digital/framer_sink_1.h b/gr-digital/include/gnuradio/digital/framer_sink_1.h
index e317ada5bd..7d13e4d6c0 100644
--- a/gr-digital/include/digital/framer_sink_1.h
+++ b/gr-digital/include/gnuradio/digital/framer_sink_1.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_FRAMER_SINK_1_H
#define INCLUDED_GR_FRAMER_SINK_1_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
#include <gnuradio/msg_queue.h>
diff --git a/gr-digital/include/digital/glfsr.h b/gr-digital/include/gnuradio/digital/glfsr.h
index 4c7701d7ee..445904969e 100644
--- a/gr-digital/include/digital/glfsr.h
+++ b/gr-digital/include/gnuradio/digital/glfsr.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_GLFSR_H
#define INCLUDED_DIGITAL_GLFSR_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/include/digital/glfsr_source_b.h b/gr-digital/include/gnuradio/digital/glfsr_source_b.h
index 1a08b5a328..3491d73315 100644
--- a/gr-digital/include/digital/glfsr_source_b.h
+++ b/gr-digital/include/gnuradio/digital/glfsr_source_b.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_GLFSR_SOURCE_B_H
#define INCLUDED_GR_GLFSR_SOURCE_B_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/glfsr_source_f.h b/gr-digital/include/gnuradio/digital/glfsr_source_f.h
index bf840dc3b2..24c0713792 100644
--- a/gr-digital/include/digital/glfsr_source_f.h
+++ b/gr-digital/include/gnuradio/digital/glfsr_source_f.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_GLFSR_SOURCE_F_H
#define INCLUDED_GR_GLFSR_SOURCE_F_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/header_payload_demux.h b/gr-digital/include/gnuradio/digital/header_payload_demux.h
index da703fb5fb..b3b7c596ef 100644
--- a/gr-digital/include/digital/header_payload_demux.h
+++ b/gr-digital/include/gnuradio/digital/header_payload_demux.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_HEADER_PAYLOAD_DEMUX_H
#define INCLUDED_DIGITAL_HEADER_PAYLOAD_DEMUX_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/block.h>
namespace gr {
diff --git a/gr-digital/include/digital/kurtotic_equalizer_cc.h b/gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h
index e15e962776..a23cfa1377 100644
--- a/gr-digital/include/digital/kurtotic_equalizer_cc.h
+++ b/gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H
#define INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_decimator.h>
namespace gr {
diff --git a/gr-digital/include/digital/lfsr.h b/gr-digital/include/gnuradio/digital/lfsr.h
index 0dd419b791..ce82f6f5e1 100644
--- a/gr-digital/include/digital/lfsr.h
+++ b/gr-digital/include/gnuradio/digital/lfsr.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_LFSR_H
#define INCLUDED_DIGITAL_LFSR_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <stdexcept>
#include <stdint.h>
diff --git a/gr-digital/include/digital/lms_dd_equalizer_cc.h b/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h
index ca8d882358..01e5b6e71a 100644
--- a/gr-digital/include/digital/lms_dd_equalizer_cc.h
+++ b/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
#define INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_decimator.h>
-#include <digital/constellation.h>
+#include <gnuradio/digital/constellation.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/include/digital/map_bb.h b/gr-digital/include/gnuradio/digital/map_bb.h
index 4ad04b95cb..e1bbb1d9b5 100644
--- a/gr-digital/include/digital/map_bb.h
+++ b/gr-digital/include/gnuradio/digital/map_bb.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_MAP_BB_H
#define INCLUDED_GR_MAP_BB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/metric_type.h b/gr-digital/include/gnuradio/digital/metric_type.h
index c277f01d27..c277f01d27 100644
--- a/gr-digital/include/digital/metric_type.h
+++ b/gr-digital/include/gnuradio/digital/metric_type.h
diff --git a/gr-digital/include/digital/mpsk_receiver_cc.h b/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
index fcf4030978..94e765d4ac 100644
--- a/gr-digital/include/digital/mpsk_receiver_cc.h
+++ b/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_MPSK_RECEIVER_CC_H
#define INCLUDED_DIGITAL_MPSK_RECEIVER_CC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/block.h>
namespace gr {
diff --git a/gr-digital/include/digital/mpsk_snr_est.h b/gr-digital/include/gnuradio/digital/mpsk_snr_est.h
index 30c20e755e..46df06164d 100644
--- a/gr-digital/include/digital/mpsk_snr_est.h
+++ b/gr-digital/include/gnuradio/digital/mpsk_snr_est.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_MPSK_SNR_EST_H
#define INCLUDED_DIGITAL_MPSK_SNR_EST_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/gr_complex.h>
namespace gr {
diff --git a/gr-digital/include/digital/mpsk_snr_est_cc.h b/gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h
index 45acda5764..41a649cf58 100644
--- a/gr-digital/include/digital/mpsk_snr_est_cc.h
+++ b/gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_DIGITAL_MPSK_SNR_EST_CC_H
#define INCLUDED_DIGITAL_MPSK_SNR_EST_CC_H
-#include <digital/api.h>
-#include <digital/mpsk_snr_est.h>
+#include <gnuradio/digital/api.h>
+#include <gnuradio/digital/mpsk_snr_est.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/ofdm_carrier_allocator_cvc.h b/gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h
index 9ada039b31..26b11fceb4 100644
--- a/gr-digital/include/digital/ofdm_carrier_allocator_cvc.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h
@@ -24,7 +24,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_CARRIER_ALLOCATOR_CVC_H
#define INCLUDED_DIGITAL_OFDM_CARRIER_ALLOCATOR_CVC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/tagged_stream_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/ofdm_chanest_vcvc.h b/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h
index cfea140a9b..e3f9975d8f 100644
--- a/gr-digital/include/digital/ofdm_chanest_vcvc.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_CHANEST_VCVC_H
#define INCLUDED_DIGITAL_OFDM_CHANEST_VCVC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/block.h>
namespace gr {
diff --git a/gr-digital/include/digital/ofdm_cyclic_prefixer.h b/gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h
index e924adb92d..70d37a6bc1 100644
--- a/gr-digital/include/digital/ofdm_cyclic_prefixer.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_CYCLIC_PREFIXER_H
#define INCLUDED_DIGITAL_OFDM_CYCLIC_PREFIXER_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/tagged_stream_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/ofdm_equalizer_base.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h
index a0b9c76673..c1e47ea1d5 100644
--- a/gr-digital/include/digital/ofdm_equalizer_base.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_EQUALIZER_BASE_H
#define INCLUDED_DIGITAL_OFDM_EQUALIZER_BASE_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/tags.h>
#include <gnuradio/gr_complex.h>
#include <boost/enable_shared_from_this.hpp>
diff --git a/gr-digital/include/digital/ofdm_equalizer_simpledfe.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h
index b81f3c7022..d526f9f157 100644
--- a/gr-digital/include/digital/ofdm_equalizer_simpledfe.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h
@@ -22,9 +22,9 @@
#ifndef INCLUDED_DIGITAL_OFDM_EQUALIZER_SIMPLEDFE_H
#define INCLUDED_DIGITAL_OFDM_EQUALIZER_SIMPLEDFE_H
-#include <digital/api.h>
-#include <digital/constellation.h>
-#include <digital/ofdm_equalizer_base.h>
+#include <gnuradio/digital/api.h>
+#include <gnuradio/digital/constellation.h>
+#include <gnuradio/digital/ofdm_equalizer_base.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/include/digital/ofdm_equalizer_static.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h
index 3856871c99..892025c2b0 100644
--- a/gr-digital/include/digital/ofdm_equalizer_static.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h
@@ -22,9 +22,9 @@
#ifndef INCLUDED_DIGITAL_OFDM_EQUALIZER_STATIC_H
#define INCLUDED_DIGITAL_OFDM_EQUALIZER_STATIC_H
-#include <digital/api.h>
-#include <digital/constellation.h>
-#include <digital/ofdm_equalizer_base.h>
+#include <gnuradio/digital/api.h>
+#include <gnuradio/digital/constellation.h>
+#include <gnuradio/digital/ofdm_equalizer_base.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/include/digital/ofdm_frame_acquisition.h b/gr-digital/include/gnuradio/digital/ofdm_frame_acquisition.h
index cf2ae27e21..a398e18454 100644
--- a/gr-digital/include/digital/ofdm_frame_acquisition.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_frame_acquisition.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_FRAME_ACQUISITION_H
#define INCLUDED_DIGITAL_OFDM_FRAME_ACQUISITION_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/block.h>
#include <vector>
diff --git a/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h b/gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h
index e0ecb6a004..0cdafe7a98 100644
--- a/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h
@@ -22,8 +22,8 @@
#ifndef INCLUDED_OFDM_FRAME_EQUALIZER_VCVC_H
#define INCLUDED_OFDM_FRAME_EQUALIZER_VCVC_H
-#include <digital/api.h>
-#include <digital/ofdm_equalizer_base.h>
+#include <gnuradio/digital/api.h>
+#include <gnuradio/digital/ofdm_equalizer_base.h>
#include <gnuradio/tagged_stream_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/ofdm_frame_sink.h b/gr-digital/include/gnuradio/digital/ofdm_frame_sink.h
index 9408578554..439e1ca135 100644
--- a/gr-digital/include/digital/ofdm_frame_sink.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_frame_sink.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_FRAME_SINK_H
#define INCLUDED_DIGITAL_OFDM_FRAME_SINK_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
#include <gnuradio/msg_queue.h>
diff --git a/gr-digital/include/digital/ofdm_insert_preamble.h b/gr-digital/include/gnuradio/digital/ofdm_insert_preamble.h
index 8abe4772b7..a98e7cf814 100644
--- a/gr-digital/include/digital/ofdm_insert_preamble.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_insert_preamble.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_INSERT_PREAMBLE_H
#define INCLUDED_DIGITAL_OFDM_INSERT_PREAMBLE_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/block.h>
#include <vector>
diff --git a/gr-digital/include/digital/ofdm_mapper_bcv.h b/gr-digital/include/gnuradio/digital/ofdm_mapper_bcv.h
index 9719ab3e86..cdd4a60bc2 100644
--- a/gr-digital/include/digital/ofdm_mapper_bcv.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_mapper_bcv.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_MAPPER_BCV_H
#define INCLUDED_DIGITAL_OFDM_MAPPER_BCV_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
#include <gnuradio/msg_queue.h>
diff --git a/gr-digital/include/digital/ofdm_sampler.h b/gr-digital/include/gnuradio/digital/ofdm_sampler.h
index 10c43c28ef..59bc36a7c2 100644
--- a/gr-digital/include/digital/ofdm_sampler.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_sampler.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_SAMPLER_H
#define INCLUDED_DIGITAL_OFDM_SAMPLER_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/ofdm_serializer_vcc.h b/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h
index 6210821699..bfaefbc96e 100644
--- a/gr-digital/include/digital/ofdm_serializer_vcc.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h
@@ -22,9 +22,9 @@
#ifndef INCLUDED_DIGITAL_OFDM_SERIALIZER_VCC_H
#define INCLUDED_DIGITAL_OFDM_SERIALIZER_VCC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/tagged_stream_block.h>
-#include <digital/ofdm_carrier_allocator_cvc.h>
+#include <gnuradio/digital/ofdm_carrier_allocator_cvc.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/include/digital/ofdm_sync_sc_cfb.h b/gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h
index db01e14dc7..822e109221 100644
--- a/gr-digital/include/digital/ofdm_sync_sc_cfb.h
+++ b/gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h
@@ -24,7 +24,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_SYNC_SC_CFB_H
#define INCLUDED_DIGITAL_OFDM_SYNC_SC_CFB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/hier_block2.h>
namespace gr {
diff --git a/gr-digital/include/digital/packet_header_default.h b/gr-digital/include/gnuradio/digital/packet_header_default.h
index 0e619c9a95..c7f1833d11 100644
--- a/gr-digital/include/digital/packet_header_default.h
+++ b/gr-digital/include/gnuradio/digital/packet_header_default.h
@@ -23,7 +23,7 @@
#define INCLUDED_DIGITAL_PACKET_HEADER_DEFAULT_H
#include <gnuradio/tags.h>
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <boost/enable_shared_from_this.hpp>
namespace gr {
diff --git a/gr-digital/include/digital/packet_header_ofdm.h b/gr-digital/include/gnuradio/digital/packet_header_ofdm.h
index 734c04692a..f3b85038b5 100644
--- a/gr-digital/include/digital/packet_header_ofdm.h
+++ b/gr-digital/include/gnuradio/digital/packet_header_ofdm.h
@@ -23,8 +23,8 @@
#define INCLUDED_DIGITAL_PACKET_HEADER_OFDM_H
#include <vector>
-#include <digital/api.h>
-#include <digital/packet_header_default.h>
+#include <gnuradio/digital/api.h>
+#include <gnuradio/digital/packet_header_default.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/include/digital/packet_headergenerator_bb.h b/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h
index 52e260f446..1ad67b7031 100644
--- a/gr-digital/include/digital/packet_headergenerator_bb.h
+++ b/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h
@@ -22,9 +22,9 @@
#ifndef INCLUDED_PACKET_HEADERGENERATOR_BB_H
#define INCLUDED_PACKET_HEADERGENERATOR_BB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/tagged_stream_block.h>
-#include <digital/packet_header_default.h>
+#include <gnuradio/digital/packet_header_default.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/include/digital/packet_headerparser_b.h b/gr-digital/include/gnuradio/digital/packet_headerparser_b.h
index a387cd7282..a0ca48f192 100644
--- a/gr-digital/include/digital/packet_headerparser_b.h
+++ b/gr-digital/include/gnuradio/digital/packet_headerparser_b.h
@@ -22,9 +22,9 @@
#ifndef INCLUDED_DIGITAL_PACKET_HEADERPARSER_B_H
#define INCLUDED_DIGITAL_PACKET_HEADERPARSER_B_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
-#include <digital/packet_header_default.h>
+#include <gnuradio/digital/packet_header_default.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/include/digital/packet_sink.h b/gr-digital/include/gnuradio/digital/packet_sink.h
index 41992d98eb..a0a56bc4ff 100644
--- a/gr-digital/include/digital/packet_sink.h
+++ b/gr-digital/include/gnuradio/digital/packet_sink.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_PACKET_SINK_H
#define INCLUDED_GR_PACKET_SINK_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
#include <gnuradio/msg_queue.h>
diff --git a/gr-digital/include/digital/pfb_clock_sync_ccf.h b/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h
index 29da5dff48..619f835ee8 100644
--- a/gr-digital/include/digital/pfb_clock_sync_ccf.h
+++ b/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h
@@ -24,7 +24,7 @@
#ifndef INCLUDED_DIGITAL_PFB_CLOCK_SYNC_CCF_H
#define INCLUDED_DIGITAL_PFB_CLOCK_SYNC_CCF_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <filter/fir_filter.h>
#include <gnuradio/block.h>
diff --git a/gr-digital/include/digital/pfb_clock_sync_fff.h b/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h
index 8c18a1788a..f0e4e88247 100644
--- a/gr-digital/include/digital/pfb_clock_sync_fff.h
+++ b/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_PFB_CLOCK_SYNC_FFF_H
#define INCLUDED_DIGITAL_PFB_CLOCK_SYNC_FFF_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <filter/fir_filter.h>
#include <gnuradio/block.h>
diff --git a/gr-digital/include/digital/pn_correlator_cc.h b/gr-digital/include/gnuradio/digital/pn_correlator_cc.h
index ae3ebe9ef4..c98f086aa0 100644
--- a/gr-digital/include/digital/pn_correlator_cc.h
+++ b/gr-digital/include/gnuradio/digital/pn_correlator_cc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_PN_CORRELATOR_CC_H
#define INCLUDED_GR_PN_CORRELATOR_CC_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_decimator.h>
namespace gr {
diff --git a/gr-digital/include/digital/probe_density_b.h b/gr-digital/include/gnuradio/digital/probe_density_b.h
index f2ed8f9441..ff5ce22080 100644
--- a/gr-digital/include/digital/probe_density_b.h
+++ b/gr-digital/include/gnuradio/digital/probe_density_b.h
@@ -21,7 +21,7 @@
#ifndef INCLUDED_GR_PROBE_DENSITY_B_H
#define INCLUDED_GR_PROBE_DENSITY_B_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/probe_mpsk_snr_est_c.h b/gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h
index 98a4bbcc2e..f78c767bf1 100644
--- a/gr-digital/include/digital/probe_mpsk_snr_est_c.h
+++ b/gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_DIGITAL_PROBE_MPSK_SNR_EST_C_H
#define INCLUDED_DIGITAL_PROBE_MPSK_SNR_EST_C_H
-#include <digital/api.h>
-#include <digital/mpsk_snr_est.h>
+#include <gnuradio/digital/api.h>
+#include <gnuradio/digital/mpsk_snr_est.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/scrambler_bb.h b/gr-digital/include/gnuradio/digital/scrambler_bb.h
index 2c6b97571f..4ba83daf60 100644
--- a/gr-digital/include/digital/scrambler_bb.h
+++ b/gr-digital/include/gnuradio/digital/scrambler_bb.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_SCRAMBLER_BB_H
#define INCLUDED_GR_SCRAMBLER_BB_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/include/digital/simple_correlator.h b/gr-digital/include/gnuradio/digital/simple_correlator.h
index 05863cbf35..763705c6b9 100644
--- a/gr-digital/include/digital/simple_correlator.h
+++ b/gr-digital/include/gnuradio/digital/simple_correlator.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_SIMPLE_CORRELATOR_H
#define INCLUDED_GR_SIMPLE_CORRELATOR_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/block.h>
namespace gr {
diff --git a/gr-digital/include/digital/simple_framer.h b/gr-digital/include/gnuradio/digital/simple_framer.h
index ad17e97d53..f0588eb20e 100644
--- a/gr-digital/include/digital/simple_framer.h
+++ b/gr-digital/include/gnuradio/digital/simple_framer.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_SIMPLE_FRAMER_H
#define INCLUDED_GR_SIMPLE_FRAMER_H
-#include <digital/api.h>
+#include <gnuradio/digital/api.h>
#include <gnuradio/block.h>
namespace gr {
diff --git a/gr-digital/include/digital/simple_framer_sync.h b/gr-digital/include/gnuradio/digital/simple_framer_sync.h
index f6c8f148e6..f6c8f148e6 100644
--- a/gr-digital/include/digital/simple_framer_sync.h
+++ b/gr-digital/include/gnuradio/digital/simple_framer_sync.h
diff --git a/gr-digital/lib/additive_scrambler_bb_impl.h b/gr-digital/lib/additive_scrambler_bb_impl.h
index 5a4c2f5025..b621637e67 100644
--- a/gr-digital/lib/additive_scrambler_bb_impl.h
+++ b/gr-digital/lib/additive_scrambler_bb_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_DIGITAL_ADDITIVE_SCRAMBLER_BB_IMPL_H
#define INCLUDED_DIGITAL_ADDITIVE_SCRAMBLER_BB_IMPL_H
-#include <digital/additive_scrambler_bb.h>
-#include <digital/lfsr.h>
+#include <gnuradio/digital/additive_scrambler_bb.h>
+#include <gnuradio/digital/lfsr.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/binary_slicer_fb_impl.h b/gr-digital/lib/binary_slicer_fb_impl.h
index 7416d9cd52..c3ae16c7d5 100644
--- a/gr-digital/lib/binary_slicer_fb_impl.h
+++ b/gr-digital/lib/binary_slicer_fb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_BINARY_SLICER_FB_IMPL_H
#define INCLUDED_DIGITAL_BINARY_SLICER_FB_IMPL_H
-#include <digital/binary_slicer_fb.h>
+#include <gnuradio/digital/binary_slicer_fb.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/chunks_to_symbols_XX_impl.h.t b/gr-digital/lib/chunks_to_symbols_XX_impl.h.t
index ea44c71ad4..0e80754d10 100644
--- a/gr-digital/lib/chunks_to_symbols_XX_impl.h.t
+++ b/gr-digital/lib/chunks_to_symbols_XX_impl.h.t
@@ -25,7 +25,7 @@
#ifndef @GUARD_NAME@
#define @GUARD_NAME@
-#include <digital/@BASE_NAME@.h>
+#include <gnuradio/digital/@BASE_NAME@.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/clock_recovery_mm_cc_impl.h b/gr-digital/lib/clock_recovery_mm_cc_impl.h
index fa62bd127f..9b9aa8655c 100644
--- a/gr-digital/lib/clock_recovery_mm_cc_impl.h
+++ b/gr-digital/lib/clock_recovery_mm_cc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_IMPL_H
#define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_IMPL_H
-#include <digital/clock_recovery_mm_cc.h>
+#include <gnuradio/digital/clock_recovery_mm_cc.h>
#include <filter/mmse_fir_interpolator_cc.h>
namespace gr {
diff --git a/gr-digital/lib/clock_recovery_mm_ff_impl.h b/gr-digital/lib/clock_recovery_mm_ff_impl.h
index 920a05a496..c16bc580ba 100644
--- a/gr-digital/lib/clock_recovery_mm_ff_impl.h
+++ b/gr-digital/lib/clock_recovery_mm_ff_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_IMPL_H
#define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_IMPL_H
-#include <digital/clock_recovery_mm_ff.h>
+#include <gnuradio/digital/clock_recovery_mm_ff.h>
#include <filter/mmse_fir_interpolator_ff.h>
namespace gr {
diff --git a/gr-digital/lib/cma_equalizer_cc_impl.h b/gr-digital/lib/cma_equalizer_cc_impl.h
index 5c45209dc8..5e9715c7af 100644
--- a/gr-digital/lib/cma_equalizer_cc_impl.h
+++ b/gr-digital/lib/cma_equalizer_cc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CMA_EQUALIZER_CC_IMPL_H
#define INCLUDED_DIGITAL_CMA_EQUALIZER_CC_IMPL_H
-#include <digital/cma_equalizer_cc.h>
+#include <gnuradio/digital/cma_equalizer_cc.h>
#include <filter/fir_filter.h>
#include <gnuradio/math.h>
#include <stdexcept>
diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
index 13d6029a06..2c70bb0944 100644
--- a/gr-digital/lib/constellation.cc
+++ b/gr-digital/lib/constellation.cc
@@ -25,7 +25,7 @@
#endif
#include <gnuradio/io_signature.h>
-#include <digital/constellation.h>
+#include <gnuradio/digital/constellation.h>
#include <gnuradio/math.h>
#include <gnuradio/gr_complex.h>
#include <math.h>
diff --git a/gr-digital/lib/constellation_decoder_cb_impl.h b/gr-digital/lib/constellation_decoder_cb_impl.h
index 5972760507..286a281171 100644
--- a/gr-digital/lib/constellation_decoder_cb_impl.h
+++ b/gr-digital/lib/constellation_decoder_cb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_IMPL_H
#define INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_IMPL_H
-#include <digital/constellation_decoder_cb.h>
+#include <gnuradio/digital/constellation_decoder_cb.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.h b/gr-digital/lib/constellation_receiver_cb_impl.h
index 47453e67bc..4cd5f72bfa 100644
--- a/gr-digital/lib/constellation_receiver_cb_impl.h
+++ b/gr-digital/lib/constellation_receiver_cb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_IMPL_H
#define INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_IMPL_H
-#include <digital/constellation_receiver_cb.h>
+#include <gnuradio/digital/constellation_receiver_cb.h>
#include <gnuradio/attributes.h>
#include <gnuradio/gr_complex.h>
#include <gnuradio/blocks/control_loop.h>
diff --git a/gr-digital/lib/correlate_access_code_bb_impl.h b/gr-digital/lib/correlate_access_code_bb_impl.h
index ad44b36400..5c46565a1c 100644
--- a/gr-digital/lib/correlate_access_code_bb_impl.h
+++ b/gr-digital/lib/correlate_access_code_bb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_IMPL_H
#define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_IMPL_H
-#include <digital/correlate_access_code_bb.h>
+#include <gnuradio/digital/correlate_access_code_bb.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/correlate_access_code_tag_bb_impl.h b/gr-digital/lib/correlate_access_code_tag_bb_impl.h
index 17a016fc9c..df558dd17e 100644
--- a/gr-digital/lib/correlate_access_code_tag_bb_impl.h
+++ b/gr-digital/lib/correlate_access_code_tag_bb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_TAG_BB_IMPL_H
#define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_TAG_BB_IMPL_H
-#include <digital/correlate_access_code_tag_bb.h>
+#include <gnuradio/digital/correlate_access_code_tag_bb.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/costas_loop_cc_impl.h b/gr-digital/lib/costas_loop_cc_impl.h
index ecba2cdd4f..ceb45ce32f 100644
--- a/gr-digital/lib/costas_loop_cc_impl.h
+++ b/gr-digital/lib/costas_loop_cc_impl.h
@@ -24,7 +24,7 @@
#ifndef INCLUDED_DIGITAL_COSTAS_LOOP_CC_IMPL_H
#define INCLUDED_DIGITAL_COSTAS_LOOP_CC_IMPL_H
-#include <digital/costas_loop_cc.h>
+#include <gnuradio/digital/costas_loop_cc.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/cpmmod_bc_impl.h b/gr-digital/lib/cpmmod_bc_impl.h
index 08c936478c..6fdd8d5d67 100644
--- a/gr-digital/lib/cpmmod_bc_impl.h
+++ b/gr-digital/lib/cpmmod_bc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CPMMOD_BC_IMPL_H
#define INCLUDED_DIGITAL_CPMMOD_BC_IMPL_H
-#include <digital/cpmmod_bc.h>
+#include <gnuradio/digital/cpmmod_bc.h>
#include <gnuradio/blocks/char_to_float.h>
#include <gnuradio/analog/frequency_modulator_fc.h>
#include <filter/interp_fir_filter_fff.h>
diff --git a/gr-digital/lib/crc32.cc b/gr-digital/lib/crc32.cc
index b203727114..cdff9f7e7a 100644
--- a/gr-digital/lib/crc32.cc
+++ b/gr-digital/lib/crc32.cc
@@ -28,7 +28,7 @@
#include <config.h>
#endif
-#include <digital/crc32.h>
+#include <gnuradio/digital/crc32.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/crc32_bb_impl.cc b/gr-digital/lib/crc32_bb_impl.cc
index 5a72d528ab..67dbfd328b 100644
--- a/gr-digital/lib/crc32_bb_impl.cc
+++ b/gr-digital/lib/crc32_bb_impl.cc
@@ -26,7 +26,7 @@
#include <gnuradio/io_signature.h>
#include "crc32_bb_impl.h"
-#include <digital/crc32.h>
+#include <gnuradio/digital/crc32.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/crc32_bb_impl.h b/gr-digital/lib/crc32_bb_impl.h
index 7b9dbb6351..9d5fddc557 100644
--- a/gr-digital/lib/crc32_bb_impl.h
+++ b/gr-digital/lib/crc32_bb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_CRC32_BB_IMPL_H
#define INCLUDED_DIGITAL_CRC32_BB_IMPL_H
-#include <digital/crc32_bb.h>
+#include <gnuradio/digital/crc32_bb.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/descrambler_bb_impl.h b/gr-digital/lib/descrambler_bb_impl.h
index 4f07b7c329..aeada30566 100644
--- a/gr-digital/lib/descrambler_bb_impl.h
+++ b/gr-digital/lib/descrambler_bb_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_DESCRAMBLER_BB_IMPL_H
#define INCLUDED_GR_DESCRAMBLER_BB_IMPL_H
-#include <digital/descrambler_bb.h>
-#include <digital/lfsr.h>
+#include <gnuradio/digital/descrambler_bb.h>
+#include <gnuradio/digital/lfsr.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/diff_decoder_bb_impl.h b/gr-digital/lib/diff_decoder_bb_impl.h
index 2e06d3cf5f..c827c8e35f 100644
--- a/gr-digital/lib/diff_decoder_bb_impl.h
+++ b/gr-digital/lib/diff_decoder_bb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_DIFF_DECODER_BB_IMPL_H
#define INCLUDED_GR_DIFF_DECODER_BB_IMPL_H
-#include <digital/diff_decoder_bb.h>
+#include <gnuradio/digital/diff_decoder_bb.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/lib/diff_encoder_bb_impl.h b/gr-digital/lib/diff_encoder_bb_impl.h
index e088d79f86..7c761b235b 100644
--- a/gr-digital/lib/diff_encoder_bb_impl.h
+++ b/gr-digital/lib/diff_encoder_bb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_DIFF_ENCODER_BB_IMPL_H
#define INCLUDED_GR_DIFF_ENCODER_BB_IMPL_H
-#include <digital/diff_encoder_bb.h>
+#include <gnuradio/digital/diff_encoder_bb.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/diff_phasor_cc_impl.h b/gr-digital/lib/diff_phasor_cc_impl.h
index 7e06b35ad4..4b54e11f44 100644
--- a/gr-digital/lib/diff_phasor_cc_impl.h
+++ b/gr-digital/lib/diff_phasor_cc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_DIFF_PHASOR_CC_IMPL_H
#define INCLUDED_GR_DIFF_PHASOR_CC_IMPL_H
-#include <digital/diff_phasor_cc.h>
+#include <gnuradio/digital/diff_phasor_cc.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/lib/fll_band_edge_cc_impl.h b/gr-digital/lib/fll_band_edge_cc_impl.h
index 6237b53cff..3334fda615 100644
--- a/gr-digital/lib/fll_band_edge_cc_impl.h
+++ b/gr-digital/lib/fll_band_edge_cc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_IMPL_H
#define INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_IMPL_H
-#include <digital/fll_band_edge_cc.h>
+#include <gnuradio/digital/fll_band_edge_cc.h>
#include <gnuradio/blocks/control_loop.h>
#include <filter/fir_filter.h>
diff --git a/gr-digital/lib/framer_sink_1_impl.h b/gr-digital/lib/framer_sink_1_impl.h
index d30c1f316d..e33c93de16 100644
--- a/gr-digital/lib/framer_sink_1_impl.h
+++ b/gr-digital/lib/framer_sink_1_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_FRAMER_SINK_1_IMPL_H
#define INCLUDED_GR_FRAMER_SINK_1_IMPL_H
-#include <digital/framer_sink_1.h>
+#include <gnuradio/digital/framer_sink_1.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/glfsr.cc b/gr-digital/lib/glfsr.cc
index 5c9d22af88..fc2762fd5b 100644
--- a/gr-digital/lib/glfsr.cc
+++ b/gr-digital/lib/glfsr.cc
@@ -20,7 +20,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <digital/glfsr.h>
+#include <gnuradio/digital/glfsr.h>
#include <stdexcept>
namespace gr {
diff --git a/gr-digital/lib/glfsr_source_b_impl.h b/gr-digital/lib/glfsr_source_b_impl.h
index f52cfa0f20..a063eb7c0a 100644
--- a/gr-digital/lib/glfsr_source_b_impl.h
+++ b/gr-digital/lib/glfsr_source_b_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_GLFSR_SOURCE_B_IMPL_H
#define INCLUDED_GR_GLFSR_SOURCE_B_IMPL_H
-#include <digital/glfsr_source_b.h>
-#include <digital/glfsr.h>
+#include <gnuradio/digital/glfsr_source_b.h>
+#include <gnuradio/digital/glfsr.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/glfsr_source_f_impl.h b/gr-digital/lib/glfsr_source_f_impl.h
index 4168016097..194e2ff3b9 100644
--- a/gr-digital/lib/glfsr_source_f_impl.h
+++ b/gr-digital/lib/glfsr_source_f_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_GLFSR_SOURCE_F_IMPL_H
#define INCLUDED_GR_GLFSR_SOURCE_F_IMPL_H
-#include <digital/glfsr_source_f.h>
-#include <digital/glfsr.h>
+#include <gnuradio/digital/glfsr_source_f.h>
+#include <gnuradio/digital/glfsr.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/header_payload_demux_impl.h b/gr-digital/lib/header_payload_demux_impl.h
index dc8cc7883a..a11430b175 100644
--- a/gr-digital/lib/header_payload_demux_impl.h
+++ b/gr-digital/lib/header_payload_demux_impl.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_HEADER_PAYLOAD_DEMUX_IMPL_H
#define INCLUDED_DIGITAL_HEADER_PAYLOAD_DEMUX_IMPL_H
-#include <digital/header_payload_demux.h>
+#include <gnuradio/digital/header_payload_demux.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/kurtotic_equalizer_cc_impl.h b/gr-digital/lib/kurtotic_equalizer_cc_impl.h
index 41178c3eb8..3e2a0c9aef 100644
--- a/gr-digital/lib/kurtotic_equalizer_cc_impl.h
+++ b/gr-digital/lib/kurtotic_equalizer_cc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_IMPL_H
#define INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_IMPL_H
-#include <digital/kurtotic_equalizer_cc.h>
+#include <gnuradio/digital/kurtotic_equalizer_cc.h>
#include <filter/fir_filter.h>
#include <gnuradio/math.h>
#include <stdexcept>
diff --git a/gr-digital/lib/lms_dd_equalizer_cc_impl.h b/gr-digital/lib/lms_dd_equalizer_cc_impl.h
index ca6ba4d84c..04e541d462 100644
--- a/gr-digital/lib/lms_dd_equalizer_cc_impl.h
+++ b/gr-digital/lib/lms_dd_equalizer_cc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_IMPL_H
#define INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_IMPL_H
-#include <digital/lms_dd_equalizer_cc.h>
+#include <gnuradio/digital/lms_dd_equalizer_cc.h>
#include <filter/fir_filter.h>
#include <stdexcept>
diff --git a/gr-digital/lib/map_bb_impl.h b/gr-digital/lib/map_bb_impl.h
index 356bf8bde6..18a82d18e9 100644
--- a/gr-digital/lib/map_bb_impl.h
+++ b/gr-digital/lib/map_bb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_MAP_BB_IMPL_H
#define INCLUDED_GR_MAP_BB_IMPL_H
-#include <digital/map_bb.h>
+#include <gnuradio/digital/map_bb.h>
#include <gnuradio/thread/thread.h>
namespace gr {
diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.h b/gr-digital/lib/mpsk_receiver_cc_impl.h
index c8807c2a4e..e9914993f3 100644
--- a/gr-digital/lib/mpsk_receiver_cc_impl.h
+++ b/gr-digital/lib/mpsk_receiver_cc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_MPSK_RECEIVER_CC_IMPL_H
#define INCLUDED_DIGITAL_MPSK_RECEIVER_CC_IMPL_H
-#include <digital/mpsk_receiver_cc.h>
+#include <gnuradio/digital/mpsk_receiver_cc.h>
#include <gnuradio/attributes.h>
#include <gnuradio/blocks/control_loop.h>
#include <gnuradio/gr_complex.h>
diff --git a/gr-digital/lib/mpsk_snr_est.cc b/gr-digital/lib/mpsk_snr_est.cc
index 9b52334806..6edb0274f5 100644
--- a/gr-digital/lib/mpsk_snr_est.cc
+++ b/gr-digital/lib/mpsk_snr_est.cc
@@ -24,7 +24,7 @@
#include <config.h>
#endif
-#include <digital/mpsk_snr_est.h>
+#include <gnuradio/digital/mpsk_snr_est.h>
#include <stdexcept>
#include <cstdio>
diff --git a/gr-digital/lib/mpsk_snr_est_cc_impl.h b/gr-digital/lib/mpsk_snr_est_cc_impl.h
index 49bf078457..36a6daa9d0 100644
--- a/gr-digital/lib/mpsk_snr_est_cc_impl.h
+++ b/gr-digital/lib/mpsk_snr_est_cc_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_DIGITAL_MPSK_SNR_EST_CC_IMPL_H
#define INCLUDED_DIGITAL_MPSK_SNR_EST_CC_IMPL_H
-#include <digital/api.h>
-#include <digital/mpsk_snr_est_cc.h>
+#include <gnuradio/digital/api.h>
+#include <gnuradio/digital/mpsk_snr_est_cc.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.h b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.h
index 6e478b3389..8599355ebb 100644
--- a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.h
+++ b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_CARRIER_ALLOCATOR_CVC_IMPL_H
#define INCLUDED_DIGITAL_OFDM_CARRIER_ALLOCATOR_CVC_IMPL_H
-#include <digital/ofdm_carrier_allocator_cvc.h>
+#include <gnuradio/digital/ofdm_carrier_allocator_cvc.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_chanest_vcvc_impl.h b/gr-digital/lib/ofdm_chanest_vcvc_impl.h
index def8734e64..9a21fbdf87 100644
--- a/gr-digital/lib/ofdm_chanest_vcvc_impl.h
+++ b/gr-digital/lib/ofdm_chanest_vcvc_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_CHANEST_VCVC_IMPL_H
#define INCLUDED_DIGITAL_OFDM_CHANEST_VCVC_IMPL_H
-#include <digital/ofdm_chanest_vcvc.h>
+#include <gnuradio/digital/ofdm_chanest_vcvc.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_cyclic_prefixer_impl.h b/gr-digital/lib/ofdm_cyclic_prefixer_impl.h
index 5a5766f131..936fe995f4 100644
--- a/gr-digital/lib/ofdm_cyclic_prefixer_impl.h
+++ b/gr-digital/lib/ofdm_cyclic_prefixer_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_CYCLIC_PREFIXER_IMPL_H
#define INCLUDED_DIGITAL_OFDM_CYCLIC_PREFIXER_IMPL_H
-#include <digital/ofdm_cyclic_prefixer.h>
+#include <gnuradio/digital/ofdm_cyclic_prefixer.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_equalizer_base.cc b/gr-digital/lib/ofdm_equalizer_base.cc
index 5209b09c29..7e69b07634 100644
--- a/gr-digital/lib/ofdm_equalizer_base.cc
+++ b/gr-digital/lib/ofdm_equalizer_base.cc
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <digital/ofdm_equalizer_base.h>
+#include <gnuradio/digital/ofdm_equalizer_base.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_equalizer_simpledfe.cc b/gr-digital/lib/ofdm_equalizer_simpledfe.cc
index a822c6cc60..8f518aa454 100644
--- a/gr-digital/lib/ofdm_equalizer_simpledfe.cc
+++ b/gr-digital/lib/ofdm_equalizer_simpledfe.cc
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <digital/ofdm_equalizer_simpledfe.h>
+#include <gnuradio/digital/ofdm_equalizer_simpledfe.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_equalizer_static.cc b/gr-digital/lib/ofdm_equalizer_static.cc
index 72c7d14064..ed24f1fe26 100644
--- a/gr-digital/lib/ofdm_equalizer_static.cc
+++ b/gr-digital/lib/ofdm_equalizer_static.cc
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <digital/ofdm_equalizer_static.h>
+#include <gnuradio/digital/ofdm_equalizer_static.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_frame_acquisition_impl.h b/gr-digital/lib/ofdm_frame_acquisition_impl.h
index 867d86736f..a28fc7177d 100644
--- a/gr-digital/lib/ofdm_frame_acquisition_impl.h
+++ b/gr-digital/lib/ofdm_frame_acquisition_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_FRAME_ACQUISITION_IMPL_H
#define INCLUDED_DIGITAL_OFDM_FRAME_ACQUISITION_IMPL_H
-#include <digital/ofdm_frame_acquisition.h>
+#include <gnuradio/digital/ofdm_frame_acquisition.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h
index c219052148..c5f039d1a6 100644
--- a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h
+++ b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_FRAME_EQUALIZER_VCVC_IMPL_H
#define INCLUDED_DIGITAL_OFDM_FRAME_EQUALIZER_VCVC_IMPL_H
-#include <digital/ofdm_frame_equalizer_vcvc.h>
+#include <gnuradio/digital/ofdm_frame_equalizer_vcvc.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_frame_sink_impl.h b/gr-digital/lib/ofdm_frame_sink_impl.h
index dcf4a06163..4f16a29701 100644
--- a/gr-digital/lib/ofdm_frame_sink_impl.h
+++ b/gr-digital/lib/ofdm_frame_sink_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_FRAME_SINK_IMPL_H
#define INCLUDED_DIGITAL_OFDM_FRAME_SINK_IMPL_H
-#include <digital/ofdm_frame_sink.h>
+#include <gnuradio/digital/ofdm_frame_sink.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_insert_preamble_impl.h b/gr-digital/lib/ofdm_insert_preamble_impl.h
index cd47810daf..f926d1a16b 100644
--- a/gr-digital/lib/ofdm_insert_preamble_impl.h
+++ b/gr-digital/lib/ofdm_insert_preamble_impl.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_INSERT_PREAMBLE_IMPL_H
#define INCLUDED_DIGITAL_OFDM_INSERT_PREAMBLE_IMPL_H
-#include <digital/ofdm_insert_preamble.h>
+#include <gnuradio/digital/ofdm_insert_preamble.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_mapper_bcv_impl.h b/gr-digital/lib/ofdm_mapper_bcv_impl.h
index 2754b0a04b..fc2daf5bd8 100644
--- a/gr-digital/lib/ofdm_mapper_bcv_impl.h
+++ b/gr-digital/lib/ofdm_mapper_bcv_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_MAPPER_BCV_IMPL_H
#define INCLUDED_DIGITAL_OFDM_MAPPER_BCV_IMPL_H
-#include <digital/ofdm_mapper_bcv.h>
+#include <gnuradio/digital/ofdm_mapper_bcv.h>
#include <gnuradio/message.h>
#include <vector>
diff --git a/gr-digital/lib/ofdm_sampler_impl.h b/gr-digital/lib/ofdm_sampler_impl.h
index a562bc54b3..b1f57cb330 100644
--- a/gr-digital/lib/ofdm_sampler_impl.h
+++ b/gr-digital/lib/ofdm_sampler_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_SAMPLER_IMPL_H
#define INCLUDED_DIGITAL_OFDM_SAMPLER_IMPL_H
-#include <digital/ofdm_sampler.h>
+#include <gnuradio/digital/ofdm_sampler.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-digital/lib/ofdm_serializer_vcc_impl.h b/gr-digital/lib/ofdm_serializer_vcc_impl.h
index 4f750eac71..0ec0ec3505 100644
--- a/gr-digital/lib/ofdm_serializer_vcc_impl.h
+++ b/gr-digital/lib/ofdm_serializer_vcc_impl.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_SERIALIZER_VCC_IMPL_H
#define INCLUDED_DIGITAL_OFDM_SERIALIZER_VCC_IMPL_H
-#include <digital/ofdm_serializer_vcc.h>
+#include <gnuradio/digital/ofdm_serializer_vcc.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/ofdm_sync_sc_cfb_impl.h b/gr-digital/lib/ofdm_sync_sc_cfb_impl.h
index 207ea41ae1..b217002038 100644
--- a/gr-digital/lib/ofdm_sync_sc_cfb_impl.h
+++ b/gr-digital/lib/ofdm_sync_sc_cfb_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_OFDM_SYNC_SC_CFB_IMPL_H
#define INCLUDED_DIGITAL_OFDM_SYNC_SC_CFB_IMPL_H
-#include <digital/ofdm_sync_sc_cfb.h>
+#include <gnuradio/digital/ofdm_sync_sc_cfb.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/packet_header_default.cc b/gr-digital/lib/packet_header_default.cc
index 8299e5625e..eb639260c6 100644
--- a/gr-digital/lib/packet_header_default.cc
+++ b/gr-digital/lib/packet_header_default.cc
@@ -24,7 +24,7 @@
#endif
#include <string.h>
-#include <digital/packet_header_default.h>
+#include <gnuradio/digital/packet_header_default.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/packet_header_ofdm.cc b/gr-digital/lib/packet_header_ofdm.cc
index bf0f642932..03a9581a6c 100644
--- a/gr-digital/lib/packet_header_ofdm.cc
+++ b/gr-digital/lib/packet_header_ofdm.cc
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <digital/packet_header_ofdm.h>
+#include <gnuradio/digital/packet_header_ofdm.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/packet_headergenerator_bb_impl.h b/gr-digital/lib/packet_headergenerator_bb_impl.h
index aaad42aebc..3cca23fc5e 100644
--- a/gr-digital/lib/packet_headergenerator_bb_impl.h
+++ b/gr-digital/lib/packet_headergenerator_bb_impl.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_PACKET_HEADERGENERATOR_BB_IMPL_H
#define INCLUDED_DIGITAL_PACKET_HEADERGENERATOR_BB_IMPL_H
-#include <digital/packet_headergenerator_bb.h>
+#include <gnuradio/digital/packet_headergenerator_bb.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/packet_headerparser_b_impl.h b/gr-digital/lib/packet_headerparser_b_impl.h
index a7ded1143f..41641eda4d 100644
--- a/gr-digital/lib/packet_headerparser_b_impl.h
+++ b/gr-digital/lib/packet_headerparser_b_impl.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_PACKET_HEADERPARSER_B_IMPL_H
#define INCLUDED_DIGITAL_PACKET_HEADERPARSER_B_IMPL_H
-#include <digital/packet_headerparser_b.h>
+#include <gnuradio/digital/packet_headerparser_b.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/packet_sink_impl.h b/gr-digital/lib/packet_sink_impl.h
index a6c80629c6..2a1da67b7f 100644
--- a/gr-digital/lib/packet_sink_impl.h
+++ b/gr-digital/lib/packet_sink_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_PACKET_SINK_IMPL_H
#define INCLUDED_GR_PACKET_SINK_IMPL_H
-#include <digital/packet_sink.h>
+#include <gnuradio/digital/packet_sink.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.h b/gr-digital/lib/pfb_clock_sync_ccf_impl.h
index c7fdc9183e..7020dd0bd5 100644
--- a/gr-digital/lib/pfb_clock_sync_ccf_impl.h
+++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_PFB_CLOCK_SYNC_CCF_IMPL_H
#define INCLUDED_DIGITAL_PFB_CLOCK_SYNC_CCF_IMPL_H
-#include <digital/pfb_clock_sync_ccf.h>
+#include <gnuradio/digital/pfb_clock_sync_ccf.h>
using namespace gr::filter;
diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.h b/gr-digital/lib/pfb_clock_sync_fff_impl.h
index 2ade1e646f..7f78b4e60c 100644
--- a/gr-digital/lib/pfb_clock_sync_fff_impl.h
+++ b/gr-digital/lib/pfb_clock_sync_fff_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_PFB_CLOCK_SYNC_FFF_IMPL_H
#define INCLUDED_DIGITAL_PFB_CLOCK_SYNC_FFF_IMPL_H
-#include <digital/pfb_clock_sync_fff.h>
+#include <gnuradio/digital/pfb_clock_sync_fff.h>
using namespace gr::filter;
diff --git a/gr-digital/lib/pn_correlator_cc_impl.h b/gr-digital/lib/pn_correlator_cc_impl.h
index bea9a30505..a98721eb70 100644
--- a/gr-digital/lib/pn_correlator_cc_impl.h
+++ b/gr-digital/lib/pn_correlator_cc_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_GR_PN_CORRELATOR_CC_IMPL_H
#define INCLUDED_GR_PN_CORRELATOR_CC_IMPL_H
-#include <digital/pn_correlator_cc.h>
-#include <digital/glfsr.h>
+#include <gnuradio/digital/pn_correlator_cc.h>
+#include <gnuradio/digital/glfsr.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/probe_density_b_impl.h b/gr-digital/lib/probe_density_b_impl.h
index e792403dc5..a7a6086dd1 100644
--- a/gr-digital/lib/probe_density_b_impl.h
+++ b/gr-digital/lib/probe_density_b_impl.h
@@ -21,7 +21,7 @@
#ifndef INCLUDED_GR_PROBE_DENSITY_B_IMPL_H
#define INCLUDED_GR_PROBE_DENSITY_B_IMPL_H
-#include <digital/probe_density_b.h>
+#include <gnuradio/digital/probe_density_b.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/probe_mpsk_snr_est_c_impl.h b/gr-digital/lib/probe_mpsk_snr_est_c_impl.h
index 90da85d21b..0663595928 100644
--- a/gr-digital/lib/probe_mpsk_snr_est_c_impl.h
+++ b/gr-digital/lib/probe_mpsk_snr_est_c_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_DIGITAL_PROBE_MPSK_SNR_EST_C_IMPL_H
#define INCLUDED_DIGITAL_PROBE_MPSK_SNR_EST_C_IMPL_H
-#include <digital/probe_mpsk_snr_est_c.h>
+#include <gnuradio/digital/probe_mpsk_snr_est_c.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/scrambler_bb_impl.h b/gr-digital/lib/scrambler_bb_impl.h
index 31a0e294ba..7d09e9709c 100644
--- a/gr-digital/lib/scrambler_bb_impl.h
+++ b/gr-digital/lib/scrambler_bb_impl.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_GR_SCRAMBLER_BB_IMPL_H
#define INCLUDED_GR_SCRAMBLER_BB_IMPL_H
-#include <digital/scrambler_bb.h>
+#include <gnuradio/digital/scrambler_bb.h>
#include <gnuradio/sync_block.h>
-#include <digital/lfsr.h>
+#include <gnuradio/digital/lfsr.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/simple_correlator_impl.cc b/gr-digital/lib/simple_correlator_impl.cc
index 37ee137525..6524e906a4 100644
--- a/gr-digital/lib/simple_correlator_impl.cc
+++ b/gr-digital/lib/simple_correlator_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "simple_correlator_impl.h"
-#include <digital/simple_framer_sync.h>
+#include <gnuradio/digital/simple_framer_sync.h>
#include <gnuradio/io_signature.h>
#include <gnuradio/blocks/count_bits.h>
#include <assert.h>
diff --git a/gr-digital/lib/simple_correlator_impl.h b/gr-digital/lib/simple_correlator_impl.h
index fe324131fd..09868682e7 100644
--- a/gr-digital/lib/simple_correlator_impl.h
+++ b/gr-digital/lib/simple_correlator_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_SIMPLE_CORRELATOR_IMPL_H
#define INCLUDED_GR_SIMPLE_CORRELATOR_IMPL_H
-#include <digital/simple_correlator.h>
+#include <gnuradio/digital/simple_correlator.h>
//#define DEBUG_SIMPLE_CORRELATOR
diff --git a/gr-digital/lib/simple_framer_impl.cc b/gr-digital/lib/simple_framer_impl.cc
index 64e70d5cfb..0f8a068276 100644
--- a/gr-digital/lib/simple_framer_impl.cc
+++ b/gr-digital/lib/simple_framer_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "simple_framer_impl.h"
-#include <digital/simple_framer_sync.h>
+#include <gnuradio/digital/simple_framer_sync.h>
#include <gnuradio/io_signature.h>
#include <assert.h>
#include <string>
diff --git a/gr-digital/lib/simple_framer_impl.h b/gr-digital/lib/simple_framer_impl.h
index fe967eb26a..25dda4429e 100644
--- a/gr-digital/lib/simple_framer_impl.h
+++ b/gr-digital/lib/simple_framer_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_GR_SIMPLE_FRAMER_IMPL_H
#define INCLUDED_GR_SIMPLE_FRAMER_IMPL_H
-#include <digital/simple_framer.h>
+#include <gnuradio/digital/simple_framer.h>
namespace gr {
namespace digital {
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
index a77627ca20..15922a34e4 100644
--- a/gr-digital/swig/CMakeLists.txt
+++ b/gr-digital/swig/CMakeLists.txt
@@ -41,7 +41,7 @@ endif(ENABLE_GR_CTRLPORT)
# Setup swig docs to depend on includes and pull in from build directory
set(GR_SWIG_TARGET_DEPS digital_generated_includes)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/digital_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/digital)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/digital)
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
set(GR_SWIG_LIBRARIES gnuradio-digital
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index bc5481a2a1..253bc6f3b8 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -37,139 +37,139 @@
%include <gnuradio/blocks/control_loop.h>
%{
-#include "digital/additive_scrambler_bb.h"
-#include "digital/binary_slicer_fb.h"
-#include "digital/chunks_to_symbols_bc.h"
-#include "digital/chunks_to_symbols_bf.h"
-#include "digital/chunks_to_symbols_ic.h"
-#include "digital/chunks_to_symbols_if.h"
-#include "digital/chunks_to_symbols_sc.h"
-#include "digital/chunks_to_symbols_sf.h"
-#include "digital/clock_recovery_mm_cc.h"
-#include "digital/clock_recovery_mm_ff.h"
-#include "digital/cma_equalizer_cc.h"
-#include "digital/constellation.h"
-#include "digital/constellation_decoder_cb.h"
-#include "digital/constellation_receiver_cb.h"
-#include "digital/correlate_access_code_bb.h"
-#include "digital/correlate_access_code_tag_bb.h"
-#include "digital/costas_loop_cc.h"
-#include "digital/cpmmod_bc.h"
-#include "digital/crc32.h"
-#include "digital/crc32_bb.h"
-#include "digital/descrambler_bb.h"
-#include "digital/diff_decoder_bb.h"
-#include "digital/diff_encoder_bb.h"
-#include "digital/diff_phasor_cc.h"
-#include "digital/fll_band_edge_cc.h"
-#include "digital/framer_sink_1.h"
-#include "digital/glfsr_source_b.h"
-#include "digital/glfsr_source_f.h"
-#include "digital/header_payload_demux.h"
-#include "digital/kurtotic_equalizer_cc.h"
-#include "digital/lfsr.h"
-#include "digital/lms_dd_equalizer_cc.h"
-#include "digital/map_bb.h"
-#include "digital/metric_type.h"
-#include "digital/mpsk_receiver_cc.h"
-#include "digital/mpsk_snr_est.h"
-#include "digital/mpsk_snr_est_cc.h"
-#include "digital/ofdm_carrier_allocator_cvc.h"
-#include "digital/ofdm_chanest_vcvc.h"
-#include "digital/ofdm_cyclic_prefixer.h"
-#include "digital/ofdm_equalizer_base.h"
-#include "digital/ofdm_equalizer_simpledfe.h"
-#include "digital/ofdm_equalizer_static.h"
-#include "digital/ofdm_frame_acquisition.h"
-#include "digital/ofdm_frame_equalizer_vcvc.h"
-#include "digital/ofdm_frame_sink.h"
-#include "digital/ofdm_insert_preamble.h"
-#include "digital/ofdm_mapper_bcv.h"
-#include "digital/ofdm_sampler.h"
-#include "digital/ofdm_serializer_vcc.h"
-#include "digital/ofdm_sync_sc_cfb.h"
-#include "digital/packet_header_default.h"
-#include "digital/packet_header_ofdm.h"
-#include "digital/packet_headergenerator_bb.h"
-#include "digital/packet_headerparser_b.h"
-#include "digital/packet_sink.h"
-#include "digital/pfb_clock_sync_ccf.h"
-#include "digital/pfb_clock_sync_fff.h"
-#include "digital/pn_correlator_cc.h"
-#include "digital/probe_density_b.h"
-#include "digital/probe_mpsk_snr_est_c.h"
-#include "digital/scrambler_bb.h"
-#include "digital/simple_correlator.h"
-#include "digital/simple_framer.h"
-#include "digital/ofdm_serializer_vcc.h"
-#include "digital/packet_headerparser_b.h"
-#include "digital/header_payload_demux.h"
+#include "gnuradio/digital/additive_scrambler_bb.h"
+#include "gnuradio/digital/binary_slicer_fb.h"
+#include "gnuradio/digital/chunks_to_symbols_bc.h"
+#include "gnuradio/digital/chunks_to_symbols_bf.h"
+#include "gnuradio/digital/chunks_to_symbols_ic.h"
+#include "gnuradio/digital/chunks_to_symbols_if.h"
+#include "gnuradio/digital/chunks_to_symbols_sc.h"
+#include "gnuradio/digital/chunks_to_symbols_sf.h"
+#include "gnuradio/digital/clock_recovery_mm_cc.h"
+#include "gnuradio/digital/clock_recovery_mm_ff.h"
+#include "gnuradio/digital/cma_equalizer_cc.h"
+#include "gnuradio/digital/constellation.h"
+#include "gnuradio/digital/constellation_decoder_cb.h"
+#include "gnuradio/digital/constellation_receiver_cb.h"
+#include "gnuradio/digital/correlate_access_code_bb.h"
+#include "gnuradio/digital/correlate_access_code_tag_bb.h"
+#include "gnuradio/digital/costas_loop_cc.h"
+#include "gnuradio/digital/cpmmod_bc.h"
+#include "gnuradio/digital/crc32.h"
+#include "gnuradio/digital/crc32_bb.h"
+#include "gnuradio/digital/descrambler_bb.h"
+#include "gnuradio/digital/diff_decoder_bb.h"
+#include "gnuradio/digital/diff_encoder_bb.h"
+#include "gnuradio/digital/diff_phasor_cc.h"
+#include "gnuradio/digital/fll_band_edge_cc.h"
+#include "gnuradio/digital/framer_sink_1.h"
+#include "gnuradio/digital/glfsr_source_b.h"
+#include "gnuradio/digital/glfsr_source_f.h"
+#include "gnuradio/digital/header_payload_demux.h"
+#include "gnuradio/digital/kurtotic_equalizer_cc.h"
+#include "gnuradio/digital/lfsr.h"
+#include "gnuradio/digital/lms_dd_equalizer_cc.h"
+#include "gnuradio/digital/map_bb.h"
+#include "gnuradio/digital/metric_type.h"
+#include "gnuradio/digital/mpsk_receiver_cc.h"
+#include "gnuradio/digital/mpsk_snr_est.h"
+#include "gnuradio/digital/mpsk_snr_est_cc.h"
+#include "gnuradio/digital/ofdm_carrier_allocator_cvc.h"
+#include "gnuradio/digital/ofdm_chanest_vcvc.h"
+#include "gnuradio/digital/ofdm_cyclic_prefixer.h"
+#include "gnuradio/digital/ofdm_equalizer_base.h"
+#include "gnuradio/digital/ofdm_equalizer_simpledfe.h"
+#include "gnuradio/digital/ofdm_equalizer_static.h"
+#include "gnuradio/digital/ofdm_frame_acquisition.h"
+#include "gnuradio/digital/ofdm_frame_equalizer_vcvc.h"
+#include "gnuradio/digital/ofdm_frame_sink.h"
+#include "gnuradio/digital/ofdm_insert_preamble.h"
+#include "gnuradio/digital/ofdm_mapper_bcv.h"
+#include "gnuradio/digital/ofdm_sampler.h"
+#include "gnuradio/digital/ofdm_serializer_vcc.h"
+#include "gnuradio/digital/ofdm_sync_sc_cfb.h"
+#include "gnuradio/digital/packet_header_default.h"
+#include "gnuradio/digital/packet_header_ofdm.h"
+#include "gnuradio/digital/packet_headergenerator_bb.h"
+#include "gnuradio/digital/packet_headerparser_b.h"
+#include "gnuradio/digital/packet_sink.h"
+#include "gnuradio/digital/pfb_clock_sync_ccf.h"
+#include "gnuradio/digital/pfb_clock_sync_fff.h"
+#include "gnuradio/digital/pn_correlator_cc.h"
+#include "gnuradio/digital/probe_density_b.h"
+#include "gnuradio/digital/probe_mpsk_snr_est_c.h"
+#include "gnuradio/digital/scrambler_bb.h"
+#include "gnuradio/digital/simple_correlator.h"
+#include "gnuradio/digital/simple_framer.h"
+#include "gnuradio/digital/ofdm_serializer_vcc.h"
+#include "gnuradio/digital/packet_headerparser_b.h"
+#include "gnuradio/digital/header_payload_demux.h"
%}
-%include "digital/additive_scrambler_bb.h"
-%include "digital/binary_slicer_fb.h"
-%include "digital/chunks_to_symbols_bc.h"
-%include "digital/chunks_to_symbols_bf.h"
-%include "digital/chunks_to_symbols_ic.h"
-%include "digital/chunks_to_symbols_if.h"
-%include "digital/chunks_to_symbols_sc.h"
-%include "digital/chunks_to_symbols_sf.h"
-%include "digital/clock_recovery_mm_cc.h"
-%include "digital/clock_recovery_mm_ff.h"
-%include "digital/cma_equalizer_cc.h"
-%include "digital/constellation.h"
-%include "digital/constellation_decoder_cb.h"
-%include "digital/constellation_receiver_cb.h"
-%include "digital/correlate_access_code_bb.h"
-%include "digital/correlate_access_code_tag_bb.h"
-%include "digital/costas_loop_cc.h"
-%include "digital/cpmmod_bc.h"
-%include "digital/crc32.h"
-%include "digital/crc32_bb.h"
-%include "digital/descrambler_bb.h"
-%include "digital/diff_decoder_bb.h"
-%include "digital/diff_encoder_bb.h"
-%include "digital/diff_phasor_cc.h"
-%include "digital/fll_band_edge_cc.h"
-%include "digital/framer_sink_1.h"
-%include "digital/glfsr_source_b.h"
-%include "digital/glfsr_source_f.h"
-%include "digital/header_payload_demux.h"
-%include "digital/kurtotic_equalizer_cc.h"
-%include "digital/lfsr.h"
-%include "digital/lms_dd_equalizer_cc.h"
-%include "digital/map_bb.h"
-%include "digital/metric_type.h"
-%include "digital/mpsk_receiver_cc.h"
-%include "digital/mpsk_snr_est.h"
-%include "digital/mpsk_snr_est_cc.h"
-%include "digital/ofdm_carrier_allocator_cvc.h"
-%include "digital/ofdm_chanest_vcvc.h"
-%include "digital/ofdm_cyclic_prefixer.h"
-%include "digital/ofdm_equalizer_base.h"
-%include "digital/ofdm_equalizer_simpledfe.h"
-%include "digital/ofdm_equalizer_static.h"
-%include "digital/ofdm_frame_acquisition.h"
-%include "digital/ofdm_frame_equalizer_vcvc.h"
-%include "digital/ofdm_frame_sink.h"
-%include "digital/ofdm_insert_preamble.h"
-%include "digital/ofdm_mapper_bcv.h"
-%include "digital/ofdm_sampler.h"
-%include "digital/ofdm_serializer_vcc.h"
-%include "digital/ofdm_sync_sc_cfb.h"
-%include "digital/packet_header_default.h"
-%include "digital/packet_header_ofdm.h"
-%include "digital/packet_headergenerator_bb.h"
-%include "digital/packet_headerparser_b.h"
-%include "digital/packet_sink.h"
-%include "digital/pfb_clock_sync_ccf.h"
-%include "digital/pfb_clock_sync_fff.h"
-%include "digital/pn_correlator_cc.h"
-%include "digital/probe_density_b.h"
-%include "digital/probe_mpsk_snr_est_c.h"
-%include "digital/scrambler_bb.h"
-%include "digital/simple_correlator.h"
-%include "digital/simple_framer.h"
+%include "gnuradio/digital/additive_scrambler_bb.h"
+%include "gnuradio/digital/binary_slicer_fb.h"
+%include "gnuradio/digital/chunks_to_symbols_bc.h"
+%include "gnuradio/digital/chunks_to_symbols_bf.h"
+%include "gnuradio/digital/chunks_to_symbols_ic.h"
+%include "gnuradio/digital/chunks_to_symbols_if.h"
+%include "gnuradio/digital/chunks_to_symbols_sc.h"
+%include "gnuradio/digital/chunks_to_symbols_sf.h"
+%include "gnuradio/digital/clock_recovery_mm_cc.h"
+%include "gnuradio/digital/clock_recovery_mm_ff.h"
+%include "gnuradio/digital/cma_equalizer_cc.h"
+%include "gnuradio/digital/constellation.h"
+%include "gnuradio/digital/constellation_decoder_cb.h"
+%include "gnuradio/digital/constellation_receiver_cb.h"
+%include "gnuradio/digital/correlate_access_code_bb.h"
+%include "gnuradio/digital/correlate_access_code_tag_bb.h"
+%include "gnuradio/digital/costas_loop_cc.h"
+%include "gnuradio/digital/cpmmod_bc.h"
+%include "gnuradio/digital/crc32.h"
+%include "gnuradio/digital/crc32_bb.h"
+%include "gnuradio/digital/descrambler_bb.h"
+%include "gnuradio/digital/diff_decoder_bb.h"
+%include "gnuradio/digital/diff_encoder_bb.h"
+%include "gnuradio/digital/diff_phasor_cc.h"
+%include "gnuradio/digital/fll_band_edge_cc.h"
+%include "gnuradio/digital/framer_sink_1.h"
+%include "gnuradio/digital/glfsr_source_b.h"
+%include "gnuradio/digital/glfsr_source_f.h"
+%include "gnuradio/digital/header_payload_demux.h"
+%include "gnuradio/digital/kurtotic_equalizer_cc.h"
+%include "gnuradio/digital/lfsr.h"
+%include "gnuradio/digital/lms_dd_equalizer_cc.h"
+%include "gnuradio/digital/map_bb.h"
+%include "gnuradio/digital/metric_type.h"
+%include "gnuradio/digital/mpsk_receiver_cc.h"
+%include "gnuradio/digital/mpsk_snr_est.h"
+%include "gnuradio/digital/mpsk_snr_est_cc.h"
+%include "gnuradio/digital/ofdm_carrier_allocator_cvc.h"
+%include "gnuradio/digital/ofdm_chanest_vcvc.h"
+%include "gnuradio/digital/ofdm_cyclic_prefixer.h"
+%include "gnuradio/digital/ofdm_equalizer_base.h"
+%include "gnuradio/digital/ofdm_equalizer_simpledfe.h"
+%include "gnuradio/digital/ofdm_equalizer_static.h"
+%include "gnuradio/digital/ofdm_frame_acquisition.h"
+%include "gnuradio/digital/ofdm_frame_equalizer_vcvc.h"
+%include "gnuradio/digital/ofdm_frame_sink.h"
+%include "gnuradio/digital/ofdm_insert_preamble.h"
+%include "gnuradio/digital/ofdm_mapper_bcv.h"
+%include "gnuradio/digital/ofdm_sampler.h"
+%include "gnuradio/digital/ofdm_serializer_vcc.h"
+%include "gnuradio/digital/ofdm_sync_sc_cfb.h"
+%include "gnuradio/digital/packet_header_default.h"
+%include "gnuradio/digital/packet_header_ofdm.h"
+%include "gnuradio/digital/packet_headergenerator_bb.h"
+%include "gnuradio/digital/packet_headerparser_b.h"
+%include "gnuradio/digital/packet_sink.h"
+%include "gnuradio/digital/pfb_clock_sync_ccf.h"
+%include "gnuradio/digital/pfb_clock_sync_fff.h"
+%include "gnuradio/digital/pn_correlator_cc.h"
+%include "gnuradio/digital/probe_density_b.h"
+%include "gnuradio/digital/probe_mpsk_snr_est_c.h"
+%include "gnuradio/digital/scrambler_bb.h"
+%include "gnuradio/digital/simple_correlator.h"
+%include "gnuradio/digital/simple_framer.h"
GR_SWIG_BLOCK_MAGIC2(digital, additive_scrambler_bb);
GR_SWIG_BLOCK_MAGIC2(digital, binary_slicer_fb);