76 files changed, 164 insertions, 164 deletions
diff --git a/gr-atsc/include/atsc/CMakeLists.txt b/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
index cdf818aab2..cdf818aab2 100644
--- a/gr-atsc/include/atsc/CMakeLists.txt
+++ b/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
diff --git a/gr-atsc/include/atsc/GrAtscBitTimingLoop.h b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop.h
index 1bedbb39ec..e42d37c581 100644
--- a/gr-atsc/include/atsc/GrAtscBitTimingLoop.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop.h
@@ -23,16 +23,16 @@
 #ifndef _GRATSCBITTIMINGLOOP_H_
 #define _GRATSCBITTIMINGLOOP_H_
 
-#include <blocks/nco.h>
+#include <gnuradio/blocks/nco.h>
 #include <VrSigProc.h>
 #include <VrHistoryProc.h>
 #include <VrDecimatingSigProc.h>
-#include <atsc/interleaver_fifo.h>
-#include <filter/single_pole_iir.h>
-#include <filter/mmse_fir_interpolator.h>
-#include <atsc/slicer_agc_impl.h>
+#include <gnuradio/atsc/interleaver_fifo.h>
+#include <gnuradio/filter/single_pole_iir.h>
+#include <gnuradio/filter/mmse_fir_interpolator.h>
+#include <gnuradio/atsc/slicer_agc_impl.h>
 #include <stdio.h>
-#include <atsc/diag_output_impl.h>
+#include <gnuradio/atsc/diag_output_impl.h>
 
 
 /*!
diff --git a/gr-atsc/include/atsc/GrAtscBitTimingLoop2.h b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop2.h
index 64d25da01e..7acdbb6140 100644
--- a/gr-atsc/include/atsc/GrAtscBitTimingLoop2.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop2.h
@@ -23,13 +23,13 @@
 #ifndef _GRATSCBITTIMINGLOOP2_H_
 #define _GRATSCBITTIMINGLOOP2_H_
 
-#include <blocks/nco.h>
+#include <gnuradio/blocks/nco.h>
 #include <VrSigProc.h>
 #include <VrHistoryProc.h>
 #include <VrDecimatingSigProc.h>
-#include <atsc/interleaver_fifo.h>
+#include <gnuradio/atsc/interleaver_fifo.h>
 #include <filtersingle_pole_iir.h>
-#include <filter/mmse_fir_interpolator.h>
+#include <gnuradio/filter/mmse_fir_interpolator.h>
 
 /*!
  * \brief ATSC BitTimingLoop
diff --git a/gr-atsc/include/atsc/GrAtscBitTimingLoop3.h b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop3.h
index c0fb333ace..cc90e667b6 100644
--- a/gr-atsc/include/atsc/GrAtscBitTimingLoop3.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop3.h
@@ -25,9 +25,9 @@
 
 #include <cstdio>
 #include <VrDecimatingSigProc.h>
-#include <atsc/diag_output_impl.h>
-#include <atsc/sssr_impl.h>
-#include <atsc/syminfo_impl.h>
+#include <gnuradio/atsc/diag_output_impl.h>
+#include <gnuradio/atsc/sssr_impl.h>
+#include <gnuradio/atsc/syminfo_impl.h>
 
 /*!
  * \brief ATSC BitTimingLoop3
diff --git a/gr-atsc/include/atsc/GrAtscConvert2xTo20.h b/gr-atsc/include/gnuradio/atsc/GrAtscConvert2xTo20.h
index 47ea4fb593..5920832bba 100644
--- a/gr-atsc/include/atsc/GrAtscConvert2xTo20.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscConvert2xTo20.h
@@ -23,7 +23,7 @@
 #define _GRATSCCONVERT2XTO20_H_
 
 #include <VrDecimatingSigProc.h>
-#include <filter/mmse_fir_interpolator.h>
+#include <gnuradio/filter/mmse_fir_interpolator.h>
 
 class GrAtscConvert2xTo20 : public VrDecimatingSigProc<float,float> {
   gr_mmse_fir_interpolator	d_interp;
diff --git a/gr-atsc/include/atsc/GrAtscDataSegToSoftDataSeg.h b/gr-atsc/include/gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h
index 5fcb894321..c0f5cf8c33 100644
--- a/gr-atsc/include/atsc/GrAtscDataSegToSoftDataSeg.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h
@@ -24,7 +24,7 @@
 #define _GRATSCDATASEGTOSOFTDATASEG_H_
 
 #include <VrHistoryProc.h>
-#include <atsc/types.h>
+#include <gnuradio/atsc/types.h>
 
 /*!
  * \brief Debug glue routine (atsc_data_segment --> atsc_soft_data_segment)
diff --git a/gr-atsc/include/atsc/GrAtscDeinterleaver.h b/gr-atsc/include/gnuradio/atsc/GrAtscDeinterleaver.h
index 8b602fa2dc..5cb59c057d 100644
--- a/gr-atsc/include/atsc/GrAtscDeinterleaver.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscDeinterleaver.h
@@ -24,8 +24,8 @@
 #define _GRATSCDEINTERLEAVER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc/types.h>
-#include <atsc/data_interleaver_impl.h>
+#include <gnuradio/atsc/types.h>
+#include <gnuradio/atsc/data_interleaver_impl.h>
 
 /*!
  * \brief Deinterleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_packet_rs_encoded)
diff --git a/gr-atsc/include/atsc/GrAtscDerandomizer.h b/gr-atsc/include/gnuradio/atsc/GrAtscDerandomizer.h
index 0075ae2998..2fb6ce3308 100644
--- a/gr-atsc/include/atsc/GrAtscDerandomizer.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscDerandomizer.h
@@ -24,8 +24,8 @@
 #define _GRATSCDERANDOMIZER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc/types.h>
-#include <atsc/randomizer_impl.h>
+#include <gnuradio/atsc/types.h>
+#include <gnuradio/atsc/randomizer_impl.h>
 
 /*!
  * \brief Derandomize ATSC data (atsc_mpeg_packet_no_sync --> atsc_mpeg_packet)
diff --git a/gr-atsc/include/atsc/GrAtscEqualizer.h b/gr-atsc/include/gnuradio/atsc/GrAtscEqualizer.h
index ff944deb7d..ff944deb7d 100644
--- a/gr-atsc/include/atsc/GrAtscEqualizer.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscEqualizer.h
diff --git a/gr-atsc/include/atsc/GrAtscFPLL.h b/gr-atsc/include/gnuradio/atsc/GrAtscFPLL.h
index c1e3302a17..39d053299b 100644
--- a/gr-atsc/include/atsc/GrAtscFPLL.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscFPLL.h
@@ -24,13 +24,13 @@
 #ifndef _GRATSCFPLL_H_
 #define _GRATSCFPLL_H_
 
-#include <blocks/nco.h>
-#include <filter/iir.h>
-#include <filter/single_pole_iir.h>
-#include <analog/agc.h>
+#include <gnuradio/blocks/nco.h>
+#include <gnuradio/filter/iir.h>
+#include <gnuradio/filter/single_pole_iir.h>
+#include <gnuradio/analog/agc.h>
 #include <VrSigProc.h>
 #include <stdio.h>
-#include <atsc/diag_output_impl.h>
+#include <gnuradio/atsc/diag_output_impl.h>
 
 /*!
  * \brief ATSC FPLL (2nd Version)
diff --git a/gr-atsc/include/atsc/GrAtscFieldSyncChecker.h b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncChecker.h
index 28458a19b5..28458a19b5 100644
--- a/gr-atsc/include/atsc/GrAtscFieldSyncChecker.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncChecker.h
diff --git a/gr-atsc/include/atsc/GrAtscFieldSyncCorrelator.h b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncCorrelator.h
index 1a16048b22..1a16048b22 100644
--- a/gr-atsc/include/atsc/GrAtscFieldSyncCorrelator.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncCorrelator.h
diff --git a/gr-atsc/include/atsc/GrAtscFieldSyncDemux.h b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncDemux.h
index 248c257914..ed7eb16215 100644
--- a/gr-atsc/include/atsc/GrAtscFieldSyncDemux.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncDemux.h
@@ -24,7 +24,7 @@
 #define _GRATSCFIELDSYNCDEMUX_H_
 
 #include <VrDecimatingSigProc.h>
-#include <atsc/types.h>
+#include <gnuradio/atsc/types.h>
 
 /*!
  * \brief ATSC Field Sync Demux
diff --git a/gr-atsc/include/atsc/GrAtscFieldSyncMux.h b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncMux.h
index 3045f32846..7998d9a8e1 100644
--- a/gr-atsc/include/atsc/GrAtscFieldSyncMux.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncMux.h
@@ -24,7 +24,7 @@
 #define _GRATSCFIELDSYNCMUX_H_
 
 #include <VrHistoryProc.h>
-#include <atsc/types.h>
+#include <gnuradio/atsc/types.h>
 
 /*!
  * \brief Insert ATSC Field Syncs as required (atsc_data_segment --> atsc_data_segment)
diff --git a/gr-atsc/include/atsc/GrAtscInterleaver.h b/gr-atsc/include/gnuradio/atsc/GrAtscInterleaver.h
index 5b6ad4849c..158c6a6a17 100644
--- a/gr-atsc/include/atsc/GrAtscInterleaver.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscInterleaver.h
@@ -24,8 +24,8 @@
 #define _GRATSCINTERLEAVER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc/types.h>
-#include <atsc/data_interleaver_impl.h>
+#include <gnuradio/atsc/types.h>
+#include <gnuradio/atsc/data_interleaver_impl.h>
 
 /*!
  * \brief Interleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_packet_rs_encoded)
diff --git a/gr-atsc/include/atsc/GrAtscRSDecoder.h b/gr-atsc/include/gnuradio/atsc/GrAtscRSDecoder.h
index 9321b66a5b..160adc5413 100644
--- a/gr-atsc/include/atsc/GrAtscRSDecoder.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscRSDecoder.h
@@ -24,8 +24,8 @@
 #define _GRATSCRSDECODER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc/types.h>
-#include <atsc/reed_solomon_impl.h>
+#include <gnuradio/atsc/types.h>
+#include <gnuradio/atsc/reed_solomon_impl.h>
 
 /*!
  * \brief Pass ATSC data Reed-Solomon decoder( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_rs_no_sync)
diff --git a/gr-atsc/include/atsc/GrAtscRSEncoder.h b/gr-atsc/include/gnuradio/atsc/GrAtscRSEncoder.h
index e18b6bd63f..b59e28dcb5 100644
--- a/gr-atsc/include/atsc/GrAtscRSEncoder.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscRSEncoder.h
@@ -24,8 +24,8 @@
 #define _GRATSCRSENCODER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc/types.h>
-#include <atsc/reed_solomon_impl.h>
+#include <gnuradio/atsc/types.h>
+#include <gnuradio/atsc/reed_solomon_impl.h>
 
 /*!
  * \brief Encode using Reed Solomon ATSC data (atsc_mpeg_packet_no_sync --> atsc_mpeg_packet_rs_encoded)
diff --git a/gr-atsc/include/atsc/GrAtscRandomizer.h b/gr-atsc/include/gnuradio/atsc/GrAtscRandomizer.h
index 565ea7b8eb..44be87349f 100644
--- a/gr-atsc/include/atsc/GrAtscRandomizer.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscRandomizer.h
@@ -24,8 +24,8 @@
 #define _GRATSCRANDOMIZER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc/types.h>
-#include <atsc/randomizer_impl.h>
+#include <gnuradio/atsc/types.h>
+#include <gnuradio/atsc/randomizer_impl.h>
 
 /*!
  * \brief Randomize ATSC data (atsc_mpeg_packet --> atsc_mpeg_packet_no_sync)
diff --git a/gr-atsc/include/atsc/GrAtscSegSymSync.h b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSync.h
index 750483f544..750483f544 100644
--- a/gr-atsc/include/atsc/GrAtscSegSymSync.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSync.h
diff --git a/gr-atsc/include/atsc/GrAtscSegSymSyncImpl.h b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl.h
index 779f311f4f..e7b3a83018 100644
--- a/gr-atsc/include/atsc/GrAtscSegSymSyncImpl.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl.h
@@ -23,7 +23,7 @@
 #define _GRATSCSEGSYMSYNCIMPL_H_
 
 #include <GrAtscSegSymSync.h>
-#include <atsc/sssr_impl.h>
+#include <gnuradio/atsc/sssr_impl.h>
 
 
 /*!
diff --git a/gr-atsc/include/atsc/GrAtscSegSymSyncImpl_export.h b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl_export.h
index 187f1a0395..187f1a0395 100644
--- a/gr-atsc/include/atsc/GrAtscSegSymSyncImpl_export.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl_export.h
diff --git a/gr-atsc/include/atsc/GrAtscSymbolMapper.h b/gr-atsc/include/gnuradio/atsc/GrAtscSymbolMapper.h
index c4e4083aa3..a67b860a45 100644
--- a/gr-atsc/include/atsc/GrAtscSymbolMapper.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscSymbolMapper.h
@@ -25,8 +25,8 @@
 
 
 #include <VrInterpolatingSigProcNoWork.h>
-#include <atsc/types.h>
-#include <blocks/nco.h>
+#include <gnuradio/atsc/types.h>
+#include <gnuradio/blocks/nco.h>
 
 /*!
  * \brief take atsc_data_segments and map them to symbols.
diff --git a/gr-atsc/include/atsc/GrAtscTrellisEncoder.h b/gr-atsc/include/gnuradio/atsc/GrAtscTrellisEncoder.h
index b1a047ce24..5e8115e677 100644
--- a/gr-atsc/include/atsc/GrAtscTrellisEncoder.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscTrellisEncoder.h
@@ -23,7 +23,7 @@
 #ifndef _GRATSCTRELLISENCODER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc/trellis_encoder_impl.h>
+#include <gnuradio/atsc/trellis_encoder_impl.h>
 
 /*!
  * \brief ATSC 12-way interleaved trellis encoder (atsc_mpeg_packet_rs_encoded --> atsc_data_segment)
diff --git a/gr-atsc/include/atsc/GrAtscViterbiDecoder.h b/gr-atsc/include/gnuradio/atsc/GrAtscViterbiDecoder.h
index 35b1ea0dc7..e33aba04ce 100644
--- a/gr-atsc/include/atsc/GrAtscViterbiDecoder.h
+++ b/gr-atsc/include/gnuradio/atsc/GrAtscViterbiDecoder.h
@@ -23,7 +23,7 @@
 #ifndef _GRATSCVITERBIDECODER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc/viterbi_decoder_impl.h>
+#include <gnuradio/atsc/viterbi_decoder_impl.h>
 
 /*!
  * \brief ATSC 12-way interleaved viterbi decoder (atsc_soft_data_segment --> atsc_mpeg_packet_rs_encoded)
diff --git a/gr-atsc/include/atsc/api.h b/gr-atsc/include/gnuradio/atsc/api.h
index 9516892e02..1c1f257059 100644
--- a/gr-atsc/include/atsc/api.h
+++ b/gr-atsc/include/gnuradio/atsc/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_ATSC_API_H
 #define INCLUDED_ATSC_API_H
 
-#include <attributes.h>
+#include <gnuradio/attributes.h>
 
 #ifdef gnuradio_atsc_EXPORTS
 #  define ATSC_API __GR_ATTR_EXPORT
diff --git a/gr-atsc/include/atsc/basic_trellis_encoder_impl.h b/gr-atsc/include/gnuradio/atsc/basic_trellis_encoder_impl.h
index 396ca94957..665a0f9ebf 100644
--- a/gr-atsc/include/atsc/basic_trellis_encoder_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/basic_trellis_encoder_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSC_BASIC_TRELLIS_ENCODER_H_
 #define _ATSC_BASIC_TRELLIS_ENCODER_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 #include <assert.h>
 
 /*!
diff --git a/gr-atsc/include/atsc/bit_timing_loop.h b/gr-atsc/include/gnuradio/atsc/bit_timing_loop.h
index eee2b2f73b..9965ade81d 100644
--- a/gr-atsc/include/atsc/bit_timing_loop.h
+++ b/gr-atsc/include/gnuradio/atsc/bit_timing_loop.h
@@ -23,12 +23,12 @@
 #ifndef INCLUDED_ATSC_BIT_TIMING_LOOP_H
 #define INCLUDED_ATSC_BIT_TIMING_LOOP_H
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 #include <cstdio>
-#include <gr_block.h>
-#include <atsc/diag_output_impl.h>
-#include <atsc/sssr_impl.h>
-#include <atsc/syminfo_impl.h>
+#include <gnuradio/block.h>
+#include <gnuradio/atsc/diag_output_impl.h>
+#include <gnuradio/atsc/sssr_impl.h>
+#include <gnuradio/atsc/syminfo_impl.h>
 
 class atsc_bit_timing_loop;
 typedef boost::shared_ptr<atsc_bit_timing_loop> atsc_bit_timing_loop_sptr;
@@ -42,7 +42,7 @@ ATSC_API atsc_bit_timing_loop_sptr atsc_make_bit_timing_loop();
  * This class accepts a single real input and produces two outputs,
  *  the raw symbol (float) and the tag (atsc_syminfo)
  */
-class ATSC_API atsc_bit_timing_loop : public gr_block
+class ATSC_API atsc_bit_timing_loop : public gr::block
 {
   friend ATSC_API atsc_bit_timing_loop_sptr atsc_make_bit_timing_loop();
 
diff --git a/gr-atsc/include/atsc/consts.h b/gr-atsc/include/gnuradio/atsc/consts.h
index bbe2ec69aa..bbe2ec69aa 100644
--- a/gr-atsc/include/atsc/consts.h
+++ b/gr-atsc/include/gnuradio/atsc/consts.h
diff --git a/gr-atsc/include/atsc/convolutional_interleaver.h b/gr-atsc/include/gnuradio/atsc/convolutional_interleaver.h
index 00c843b015..02c0c4dc44 100644
--- a/gr-atsc/include/atsc/convolutional_interleaver.h
+++ b/gr-atsc/include/gnuradio/atsc/convolutional_interleaver.h
@@ -24,7 +24,7 @@
 #define _CONVOLUTIONAL_INTERLEAVER_H_
 
 #include <vector>
-#include <atsc/interleaver_fifo.h>
+#include <gnuradio/atsc/interleaver_fifo.h>
 #include <assert.h>
 
 /*!
diff --git a/gr-atsc/include/atsc/create_atsci_equalizer.h b/gr-atsc/include/gnuradio/atsc/create_atsci_equalizer.h
index adc4991703..63773a80bb 100644
--- a/gr-atsc/include/atsc/create_atsci_equalizer.h
+++ b/gr-atsc/include/gnuradio/atsc/create_atsci_equalizer.h
@@ -23,7 +23,7 @@
 #ifndef _CREATE_ATSC_EQUALIZER_H_
 #define _CREATE_ATSC_EQUALIZER_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 
 class atsci_equalizer;
 
diff --git a/gr-atsc/include/atsc/create_atsci_fs_checker.h b/gr-atsc/include/gnuradio/atsc/create_atsci_fs_checker.h
index 5d8e9ea407..73b0c7443f 100644
--- a/gr-atsc/include/atsc/create_atsci_fs_checker.h
+++ b/gr-atsc/include/gnuradio/atsc/create_atsci_fs_checker.h
@@ -23,7 +23,7 @@
 #ifndef _CREATE_ATSC_FS_CHECKER_H_
 #define _CREATE_ATSC_FS_CHECKER_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 
 class atsci_fs_checker;
 
diff --git a/gr-atsc/include/atsc/create_atsci_fs_correlator.h b/gr-atsc/include/gnuradio/atsc/create_atsci_fs_correlator.h
index 0488645ace..dc6d81499f 100644
--- a/gr-atsc/include/atsc/create_atsci_fs_correlator.h
+++ b/gr-atsc/include/gnuradio/atsc/create_atsci_fs_correlator.h
@@ -23,7 +23,7 @@
 #ifndef _CREATE_ATSC_FS_CORRELATOR_H_
 #define _CREATE_ATSC_FS_CORRELATOR_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 
 class atsci_fs_correlator;
 
diff --git a/gr-atsc/include/atsc/data_interleaver_impl.h b/gr-atsc/include/gnuradio/atsc/data_interleaver_impl.h
index a7765bd43f..e44125864b 100644
--- a/gr-atsc/include/atsc/data_interleaver_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/data_interleaver_impl.h
@@ -23,9 +23,9 @@
 #ifndef _ATSC_DATA_INTERLEAVER_H_
 #define _ATSC_DATA_INTERLEAVER_H_
 
-#include <atsc/api.h>
-#include <atsc/types.h>
-#include <atsc/convolutional_interleaver.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/types.h>
+#include <gnuradio/atsc/convolutional_interleaver.h>
 
 /*!
  * \brief atsc convolutional data interleaver
diff --git a/gr-atsc/include/atsc/deinterleaver.h b/gr-atsc/include/gnuradio/atsc/deinterleaver.h
index 7864526cfd..22b5461aaf 100644
--- a/gr-atsc/include/atsc/deinterleaver.h
+++ b/gr-atsc/include/gnuradio/atsc/deinterleaver.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ATSC_DEINTERLEAVER_H
 #define INCLUDED_ATSC_DEINTERLEAVER_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/data_interleaver_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/data_interleaver_impl.h>
 
 class atsc_deinterleaver;
 typedef boost::shared_ptr<atsc_deinterleaver> atsc_deinterleaver_sptr;
@@ -38,7 +38,7 @@ ATSC_API atsc_deinterleaver_sptr atsc_make_deinterleaver();
  *
  * input: atsc_mpeg_packet_rs_encoded; output: atsc_mpeg_packet_rs_encoded
  */
-class ATSC_API atsc_deinterleaver : public gr_sync_block
+class ATSC_API atsc_deinterleaver : public gr::sync_block
 {
   friend ATSC_API atsc_deinterleaver_sptr atsc_make_deinterleaver();
 
diff --git a/gr-atsc/include/atsc/depad.h b/gr-atsc/include/gnuradio/atsc/depad.h
index ffced87a39..3a638c46fe 100644
--- a/gr-atsc/include/atsc/depad.h
+++ b/gr-atsc/include/gnuradio/atsc/depad.h
@@ -22,8 +22,8 @@
 #ifndef INCLUDED_ATSC_DEPAD_H
 #define INCLUDED_ATSC_DEPAD_H
 
-#include <atsc/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_interpolator.h>
 
 class atsc_depad;
 typedef boost::shared_ptr<atsc_depad> atsc_depad_sptr;
@@ -36,7 +36,7 @@ ATSC_API atsc_depad_sptr atsc_make_depad();
  *
  * input: atsc_mpeg_packet; output: unsigned char
  */
-class ATSC_API atsc_depad : public gr_sync_interpolator
+class ATSC_API atsc_depad : public gr::sync_interpolator
 {
   friend ATSC_API atsc_depad_sptr atsc_make_depad();
 
diff --git a/gr-atsc/include/atsc/derandomizer.h b/gr-atsc/include/gnuradio/atsc/derandomizer.h
index 4def872aa6..86eaca427c 100644
--- a/gr-atsc/include/atsc/derandomizer.h
+++ b/gr-atsc/include/gnuradio/atsc/derandomizer.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_ATSC_DERANDOMIZER_H
 #define INCLUDED_ATSC_DERANDOMIZER_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/randomizer_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/randomizer_impl.h>
 
 class atsc_derandomizer;
 typedef boost::shared_ptr<atsc_derandomizer> atsc_derandomizer_sptr;
@@ -37,7 +37,7 @@ ATSC_API atsc_derandomizer_sptr atsc_make_derandomizer();
  *
  * input: atsc_mpeg_packet_no_sync; output: atsc_mpeg_packet;
  */
-class ATSC_API atsc_derandomizer : public gr_sync_block
+class ATSC_API atsc_derandomizer : public gr::sync_block
 {
   friend ATSC_API atsc_derandomizer_sptr atsc_make_derandomizer();
 
diff --git a/gr-atsc/include/atsc/diag_output_impl.h b/gr-atsc/include/gnuradio/atsc/diag_output_impl.h
index 09fd763d6a..09fd763d6a 100644
--- a/gr-atsc/include/atsc/diag_output_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/diag_output_impl.h
diff --git a/gr-atsc/include/atsc/ds_to_softds.h b/gr-atsc/include/gnuradio/atsc/ds_to_softds.h
index 6356506663..197aafb7ad 100644
--- a/gr-atsc/include/atsc/ds_to_softds.h
+++ b/gr-atsc/include/gnuradio/atsc/ds_to_softds.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ATSC_DS_TO_SOFTDS_H
 #define INCLUDED_ATSC_DS_TO_SOFTDS_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/types.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/types.h>
 
 class atsc_ds_to_softds;
 typedef boost::shared_ptr<atsc_ds_to_softds> atsc_ds_to_softds_sptr;
@@ -38,7 +38,7 @@ ATSC_API atsc_ds_to_softds_sptr atsc_make_ds_to_softds();
  *
  * input: atsc_data_segment; output: atsc_soft_data_segment
  */
-class ATSC_API atsc_ds_to_softds : public gr_sync_block
+class ATSC_API atsc_ds_to_softds : public gr::sync_block
 {
   friend ATSC_API atsc_ds_to_softds_sptr atsc_make_ds_to_softds();
 
diff --git a/gr-atsc/include/atsc/equalizer.h b/gr-atsc/include/gnuradio/atsc/equalizer.h
index a910ab7562..4e9103fb12 100644
--- a/gr-atsc/include/atsc/equalizer.h
+++ b/gr-atsc/include/gnuradio/atsc/equalizer.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ATSC_EQUALIZER_H
 #define INCLUDED_ATSC_EQUALIZER_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/equalizer_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/equalizer_impl.h>
 #include <vector>
 
 class atsc_equalizer;
@@ -40,7 +40,7 @@ atsc_equalizer_sptr ATSC_API atsc_make_equalizer();
  * first inputs are data samples, second inputs are tags.
  * first outputs are equalized data samples, second outputs are tags.
  */
-class ATSC_API atsc_equalizer : public gr_sync_block
+class ATSC_API atsc_equalizer : public gr::sync_block
 {
   friend ATSC_API atsc_equalizer_sptr atsc_make_equalizer();
 
diff --git a/gr-atsc/include/atsc/equalizer_impl.h b/gr-atsc/include/gnuradio/atsc/equalizer_impl.h
index e2baf537df..a6d849b00f 100644
--- a/gr-atsc/include/atsc/equalizer_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/equalizer_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_EQUALIZER_H_
 #define _ATSC_EQUALIZER_H_
 
-#include <atsc/api.h>
-#include <atsc/syminfo_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/syminfo_impl.h>
 #include <vector>
 
 /*!
diff --git a/gr-atsc/include/atsc/equalizer_lms2_impl.h b/gr-atsc/include/gnuradio/atsc/equalizer_lms2_impl.h
index ebd6c13d0f..5f4ab66c96 100644
--- a/gr-atsc/include/atsc/equalizer_lms2_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/equalizer_lms2_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_EQUALIZER_LMS2_H_
 #define _ATSC_EQUALIZER_LMS2_H_
 
-#include <atsc/api.h>
-#include <atsc/equalizer_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/equalizer_impl.h>
 #include <vector>
 #include <stdio.h>
 
diff --git a/gr-atsc/include/atsc/equalizer_lms_impl.h b/gr-atsc/include/gnuradio/atsc/equalizer_lms_impl.h
index c91349de69..0daa00e67c 100644
--- a/gr-atsc/include/atsc/equalizer_lms_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/equalizer_lms_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_EQUALIZER_LMS_H_
 #define _ATSC_EQUALIZER_LMS_H_
 
-#include <atsc/api.h>
-#include <atsc/equalizer_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/equalizer_impl.h>
 #include <vector>
 #include <stdio.h>
 
diff --git a/gr-atsc/include/atsc/equalizer_nop_impl.h b/gr-atsc/include/gnuradio/atsc/equalizer_nop_impl.h
index 85549e326b..1c075c5220 100644
--- a/gr-atsc/include/atsc/equalizer_nop_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/equalizer_nop_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_EQUALIZER_NOP_H_
 #define _ATSC_EQUALIZER_NOP_H_
 
-#include <atsc/api.h>
-#include <atsc/equalizer_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/equalizer_impl.h>
 
 class ATSC_API atsci_equalizer_nop : public atsci_equalizer
 {
diff --git a/gr-atsc/include/atsc/exp2_lp_impl.h b/gr-atsc/include/gnuradio/atsc/exp2_lp_impl.h
index b0fbc46432..2d61fc8667 100644
--- a/gr-atsc/include/atsc/exp2_lp_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/exp2_lp_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSC_EXP2_LP_H_
 #define _ATSC_EXP2_LP_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 #include <gr_fir_builder.h>
 
 class ATSC_API atsci_exp2_lp : public gr_fir_builder
diff --git a/gr-atsc/include/atsc/fake_single_viterbi_impl.h b/gr-atsc/include/gnuradio/atsc/fake_single_viterbi_impl.h
index 5895e0ac61..ae671832b4 100644
--- a/gr-atsc/include/atsc/fake_single_viterbi_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/fake_single_viterbi_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSCFAKESINGLEVITERBI_H_
 #define _ATSCFAKESINGLEVITERBI_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 
 /*!
  * \brief single channel viterbi decoder
diff --git a/gr-atsc/include/atsc/field_sync_demux.h b/gr-atsc/include/gnuradio/atsc/field_sync_demux.h
index bec3590096..e12a456b51 100644
--- a/gr-atsc/include/atsc/field_sync_demux.h
+++ b/gr-atsc/include/gnuradio/atsc/field_sync_demux.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
 #define INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
 
-#include <atsc/api.h>
-#include <gr_block.h>
-#include <atsc/types.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/block.h>
+#include <gnuradio/atsc/types.h>
 
 class atsc_field_sync_demux;
 typedef boost::shared_ptr<atsc_field_sync_demux> atsc_field_sync_demux_sptr;
@@ -38,7 +38,7 @@ ATSC_API atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
  * \ingroup atsc
  *
  */
-class ATSC_API atsc_field_sync_demux : public gr_block
+class ATSC_API atsc_field_sync_demux : public gr::block
 {
   friend ATSC_API atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
 
diff --git a/gr-atsc/include/atsc/field_sync_mux.h b/gr-atsc/include/gnuradio/atsc/field_sync_mux.h
index 21a2f0fdab..dbf08c5132 100644
--- a/gr-atsc/include/atsc/field_sync_mux.h
+++ b/gr-atsc/include/gnuradio/atsc/field_sync_mux.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ATSC_FIELD_SYNC_MUX_H
 #define INCLUDED_ATSC_FIELD_SYNC_MUX_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/types.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/types.h>
 
 class atsc_field_sync_mux;
 typedef boost::shared_ptr<atsc_field_sync_mux> atsc_field_sync_mux_sptr;
@@ -38,7 +38,7 @@ ATSC_API atsc_field_sync_mux_sptr atsc_make_field_sync_mux();
  *
  * input: atsc_data_segment; output: atsc_data_segment
  */
-class ATSC_API atsc_field_sync_mux : public gr_sync_block
+class ATSC_API atsc_field_sync_mux : public gr::sync_block
 {
   friend ATSC_API atsc_field_sync_mux_sptr atsc_make_field_sync_mux();
 
diff --git a/gr-atsc/include/atsc/fpll.h b/gr-atsc/include/gnuradio/atsc/fpll.h
index 2bffc327eb..9c565ed2eb 100644
--- a/gr-atsc/include/atsc/fpll.h
+++ b/gr-atsc/include/gnuradio/atsc/fpll.h
@@ -23,13 +23,13 @@
 #ifndef INCLUDED_ATSC_FPLL_H
 #define INCLUDED_ATSC_FPLL_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <gr_nco.h>
-#include <filter/single_pole_iir.h>
-#include <analog/agc.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/nco.h>
+#include <gnuradio/filter/single_pole_iir.h>
+#include <gnuradio/analog/agc.h>
 #include <stdio.h>
-#include <atsc/diag_output_impl.h>
+#include <gnuradio/atsc/diag_output_impl.h>
 
 using namespace gr;
 
@@ -49,7 +49,7 @@ ATSC_API atsc_fpll_sptr atsc_make_fpll();
  * This class accepts a single real input and produces a single real output
  */
 
-class ATSC_API atsc_fpll : public gr_sync_block
+class ATSC_API atsc_fpll : public gr::sync_block
 {
   friend ATSC_API atsc_fpll_sptr atsc_make_fpll();
 
@@ -70,7 +70,7 @@ public:
   double                        initial_freq;
   double                        initial_phase;
   bool                          debug_no_update;
-  gr_nco<float,float>           nco;
+  gr::nco<float,float>          nco;
   analog::kernel::agc_ff        agc;    // automatic gain control
   filter::single_pole_iir<float,float,float> afci;
   filter::single_pole_iir<float,float,float> afcq;
diff --git a/gr-atsc/include/atsc/fs_checker.h b/gr-atsc/include/gnuradio/atsc/fs_checker.h
index 1bd304090f..7a7d73852a 100644
--- a/gr-atsc/include/atsc/fs_checker.h
+++ b/gr-atsc/include/gnuradio/atsc/fs_checker.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ATSC_FS_CHECKER_H
 #define INCLUDED_ATSC_FS_CHECKER_H
 
-#include <atsc/api.h>
-#include <atsc/fs_checker_impl.h>
-#include <gr_sync_block.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/fs_checker_impl.h>
+#include <gnuradio/sync_block.h>
 
 class atsc_fs_checker;
 typedef boost::shared_ptr<atsc_fs_checker> atsc_fs_checker_sptr;
@@ -40,7 +40,7 @@ ATSC_API atsc_fs_checker_sptr atsc_make_fs_checker();
  * second output is set of tags, one-for-one with first output.
  */
 
-class ATSC_API atsc_fs_checker : public gr_sync_block
+class ATSC_API atsc_fs_checker : public gr::sync_block
 {
   friend ATSC_API atsc_fs_checker_sptr atsc_make_fs_checker();
 
diff --git a/gr-atsc/include/atsc/fs_checker_impl.h b/gr-atsc/include/gnuradio/atsc/fs_checker_impl.h
index a4975d243e..3ac1b8d913 100644
--- a/gr-atsc/include/atsc/fs_checker_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/fs_checker_impl.h
@@ -22,8 +22,8 @@
 #ifndef _ATSC_FS_CHECKER_H_
 #define _ATSC_FS_CHECKER_H_
 
-#include <atsc/api.h>
-#include <atsc/syminfo_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/syminfo_impl.h>
 
 /*!
  * \brief abstract base class for ATSC field sync checker
diff --git a/gr-atsc/include/atsc/fs_checker_naive_impl.h b/gr-atsc/include/gnuradio/atsc/fs_checker_naive_impl.h
index 0056bf69c8..002af5c645 100644
--- a/gr-atsc/include/atsc/fs_checker_naive_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/fs_checker_naive_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_FS_CHECKER_NAIVE_H_
 #define _ATSC_FS_CHECKER_NAIVE_H_
 
-#include <atsc/api.h>
-#include <atsc/fs_checker_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/fs_checker_impl.h>
 
 /*!
  * \brief Naive concrete implementation of field sync checker
diff --git a/gr-atsc/include/atsc/fs_correlator_impl.h b/gr-atsc/include/gnuradio/atsc/fs_correlator_impl.h
index b55b1b9854..2517877666 100644
--- a/gr-atsc/include/atsc/fs_correlator_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/fs_correlator_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSC_FS_CORRELATOR_H_
 #define _ATSC_FS_CORRELATOR_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 
 /*!
  * \brief abstract base class for ATSC field sync correlator
diff --git a/gr-atsc/include/atsc/fs_correlator_naive_impl.h b/gr-atsc/include/gnuradio/atsc/fs_correlator_naive_impl.h
index e2fd19557b..4f8b5a8d76 100644
--- a/gr-atsc/include/atsc/fs_correlator_naive_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/fs_correlator_naive_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_FS_CORRELATOR_NAIVE_H_
 #define _ATSC_FS_CORRELATOR_NAIVE_H_
 
-#include <atsc/api.h>
-#include <atsc/fs_correlator_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/fs_correlator_impl.h>
 
 /*!
  * \brief Naive concrete implementation of field sync correlator
diff --git a/gr-atsc/include/atsc/interleaver.h b/gr-atsc/include/gnuradio/atsc/interleaver.h
index f426381add..1f245bbbe0 100644
--- a/gr-atsc/include/atsc/interleaver.h
+++ b/gr-atsc/include/gnuradio/atsc/interleaver.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ATSC_INTERLEAVER_H
 #define INCLUDED_ATSC_INTERLEAVER_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/data_interleaver_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/data_interleaver_impl.h>
 
 class atsc_interleaver;
 typedef boost::shared_ptr<atsc_interleaver> atsc_interleaver_sptr;
@@ -37,7 +37,7 @@ ATSC_API atsc_interleaver_sptr atsc_make_interleaver();
  *
  * input: atsc_mpeg_packet_rs_encoded; output: atsc_mpeg_packet_rs_encoded
  */
-class ATSC_API atsc_interleaver : public gr_sync_block
+class ATSC_API atsc_interleaver : public gr::sync_block
 {
   friend ATSC_API atsc_interleaver_sptr atsc_make_interleaver();
 
diff --git a/gr-atsc/include/atsc/interleaver_fifo.h b/gr-atsc/include/gnuradio/atsc/interleaver_fifo.h
index 5c29a82563..aee42104e7 100644
--- a/gr-atsc/include/atsc/interleaver_fifo.h
+++ b/gr-atsc/include/gnuradio/atsc/interleaver_fifo.h
@@ -24,7 +24,7 @@
 #define _INTERLEAVER_FIFO_H_
 
 
-#include <atsc/interleaver_fifo.h>
+#include <gnuradio/atsc/interleaver_fifo.h>
 #include <string.h>
 
 /*!
diff --git a/gr-atsc/include/atsc/pad.h b/gr-atsc/include/gnuradio/atsc/pad.h
index b48d17f7b7..cbe5b11e5d 100644
--- a/gr-atsc/include/atsc/pad.h
+++ b/gr-atsc/include/gnuradio/atsc/pad.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ATSC_PAD_H
 #define INCLUDED_ATSC_PAD_H
 
-#include <atsc/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_decimator.h>
 
 class atsc_pad;
 typedef boost::shared_ptr<atsc_pad> atsc_pad_sptr;
@@ -38,7 +38,7 @@ ATSC_API atsc_pad_sptr atsc_make_pad();
  *
  * input: unsigned char; output: atsc_mpeg_packet
  */
-class ATSC_API atsc_pad : public gr_sync_decimator
+class ATSC_API atsc_pad : public gr::sync_decimator
 {
   friend ATSC_API atsc_pad_sptr atsc_make_pad();
 
diff --git a/gr-atsc/include/atsc/pnXXX_impl.h b/gr-atsc/include/gnuradio/atsc/pnXXX_impl.h
index 3de6eb1f51..b33d82cec6 100644
--- a/gr-atsc/include/atsc/pnXXX_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/pnXXX_impl.h
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 
 ATSC_API extern const unsigned char atsc_pn511[];
 ATSC_API extern const unsigned char atsc_pn63[];
diff --git a/gr-atsc/include/atsc/randomizer.h b/gr-atsc/include/gnuradio/atsc/randomizer.h
index 8825062bbc..dfda95d032 100644
--- a/gr-atsc/include/atsc/randomizer.h
+++ b/gr-atsc/include/gnuradio/atsc/randomizer.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ATSC_RANDOMIZER_H
 #define INCLUDED_ATSC_RANDOMIZER_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/randomizer_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/randomizer_impl.h>
 
 class atsc_randomizer;
 typedef boost::shared_ptr<atsc_randomizer> atsc_randomizer_sptr;
@@ -38,7 +38,7 @@ ATSC_API atsc_randomizer_sptr atsc_make_randomizer();
  *
  * input: atsc_mpeg_packet; output: atsc_mpeg_packet_no_sync
  */
-class ATSC_API atsc_randomizer : public gr_sync_block
+class ATSC_API atsc_randomizer : public gr::sync_block
 {
   friend ATSC_API atsc_randomizer_sptr atsc_make_randomizer();
 
diff --git a/gr-atsc/include/atsc/randomizer_impl.h b/gr-atsc/include/gnuradio/atsc/randomizer_impl.h
index 4fdbebc06d..d798629de2 100644
--- a/gr-atsc/include/atsc/randomizer_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/randomizer_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_RANDOMIZER_H_
 #define _ATSC_RANDOMIZER_H_
 
-#include <atsc/api.h>
-#include <atsc/types.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/types.h>
 
 /*!
  * \brief ATSC data "whitener"
diff --git a/gr-atsc/include/atsc/reed_solomon_impl.h b/gr-atsc/include/gnuradio/atsc/reed_solomon_impl.h
index 484b6d0ce2..53584b4dbf 100644
--- a/gr-atsc/include/atsc/reed_solomon_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/reed_solomon_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_REED_SOLOMON_H_
 #define _ATSC_REED_SOLOMON_H_
 
-#include <atsc/api.h>
-#include <atsc/types.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/types.h>
 
 /*!
  * \brief ATSC Reed-Solomon encoder / decoder
diff --git a/gr-atsc/include/atsc/root_raised_cosine_bandpass_impl.h b/gr-atsc/include/gnuradio/atsc/root_raised_cosine_bandpass_impl.h
index 50548bec89..318d888712 100644
--- a/gr-atsc/include/atsc/root_raised_cosine_bandpass_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/root_raised_cosine_bandpass_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_RRC_BANDPASS_H_
 #define _ATSC_RRC_BANDPASS_H_
 
-#include <atsc/api.h>
-#include <atsc/root_raised_cosine_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/root_raised_cosine_impl.h>
 
 class ATSC_API atsc_root_raised_cosine_bandpass : public atsc_root_raised_cosine
 {
diff --git a/gr-atsc/include/atsc/root_raised_cosine_impl.h b/gr-atsc/include/gnuradio/atsc/root_raised_cosine_impl.h
index ae884bfb19..3489a7a908 100644
--- a/gr-atsc/include/atsc/root_raised_cosine_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/root_raised_cosine_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSC_RRC_H_
 #define _ATSC_RRC_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 #include <gr_fir_builder.h>
 
 class ATSC_API atsc_root_raised_cosine : public gr_fir_builder
diff --git a/gr-atsc/include/atsc/rs_decoder.h b/gr-atsc/include/gnuradio/atsc/rs_decoder.h
index 308fb46432..99ab875869 100644
--- a/gr-atsc/include/atsc/rs_decoder.h
+++ b/gr-atsc/include/gnuradio/atsc/rs_decoder.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ATSC_RS_DECODER_H
 #define INCLUDED_ATSC_RS_DECODER_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/reed_solomon_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/reed_solomon_impl.h>
 
 class atsc_rs_decoder;
 typedef boost::shared_ptr<atsc_rs_decoder> atsc_rs_decoder_sptr;
@@ -38,7 +38,7 @@ ATSC_API atsc_rs_decoder_sptr atsc_make_rs_decoder();
  *
  * input: atsc_mpeg_packet_rs_encoded; output: atsc_mpeg_packet_no_sync
  */
-class ATSC_API atsc_rs_decoder : public gr_sync_block
+class ATSC_API atsc_rs_decoder : public gr::sync_block
 {
   friend ATSC_API atsc_rs_decoder_sptr atsc_make_rs_decoder();
 
diff --git a/gr-atsc/include/atsc/rs_encoder.h b/gr-atsc/include/gnuradio/atsc/rs_encoder.h
index ace2806da3..49f67d2762 100644
--- a/gr-atsc/include/atsc/rs_encoder.h
+++ b/gr-atsc/include/gnuradio/atsc/rs_encoder.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ATSC_RS_ENCODER_H
 #define INCLUDED_ATSC_RS_ENCODER_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/reed_solomon_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/reed_solomon_impl.h>
 
 class atsc_rs_encoder;
 typedef boost::shared_ptr<atsc_rs_encoder> atsc_rs_encoder_sptr;
@@ -38,7 +38,7 @@ ATSC_API atsc_rs_encoder_sptr atsc_make_rs_encoder();
  *
  * input: atsc_mpeg_packet_no_sync; output: atsc_mpeg_packet_rs_encoded
  */
-class ATSC_API atsc_rs_encoder : public gr_sync_block
+class ATSC_API atsc_rs_encoder : public gr::sync_block
 {
   friend ATSC_API atsc_rs_encoder_sptr atsc_make_rs_encoder();
 
diff --git a/gr-atsc/include/atsc/single_viterbi_impl.h b/gr-atsc/include/gnuradio/atsc/single_viterbi_impl.h
index d92ded80e5..d6578ce259 100644
--- a/gr-atsc/include/atsc/single_viterbi_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/single_viterbi_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSCSINGLEVITERBI_H_
 #define _ATSCSINGLEVITERBI_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 
 /*!
  * \brief single channel viterbi decoder
diff --git a/gr-atsc/include/atsc/slicer_agc_impl.h b/gr-atsc/include/gnuradio/atsc/slicer_agc_impl.h
index 91694c09db..d55e744fea 100644
--- a/gr-atsc/include/atsc/slicer_agc_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/slicer_agc_impl.h
@@ -23,9 +23,9 @@
 #ifndef _ATSC_SLICER_AGC_H_
 #define _ATSC_SLICER_AGC_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 #include <math.h>
-#include <filter/single_pole_iir.h>
+#include <gnuradio/filter/single_pole_iir.h>
 
 /*!
  * \brief Automatic Gain Control class for atsc slicer
diff --git a/gr-atsc/include/atsc/sliding_correlator_impl.h b/gr-atsc/include/gnuradio/atsc/sliding_correlator_impl.h
index 45c0caa241..eca63df609 100644
--- a/gr-atsc/include/atsc/sliding_correlator_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/sliding_correlator_impl.h
@@ -23,10 +23,10 @@
 #ifndef _ATSC_SLIDING_CORRELATOR_H_
 #define _ATSC_SLIDING_CORRELATOR_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 #include <string.h>
 
-#include <atsc/pnXXX_impl.h>
+#include <gnuradio/atsc/pnXXX_impl.h>
 //extern const unsigned char atsc_pn511[511];
 //extern const unsigned char atsc_pn63[63];
 
diff --git a/gr-atsc/include/atsc/sssr_impl.h b/gr-atsc/include/gnuradio/atsc/sssr_impl.h
index 60d116577b..f61d0f340f 100644
--- a/gr-atsc/include/atsc/sssr_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/sssr_impl.h
@@ -27,10 +27,10 @@
 #ifndef _ATSC_SSSR_H_
 #define _ATSC_SSSR_H_
 
-#include <atsc/api.h>
-#include <atsc/consts.h>
-#include <filter/mmse_fir_interpolator_ff.h>
-#include <filter/single_pole_iir.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/consts.h>
+#include <gnuradio/filter/mmse_fir_interpolator_ff.h>
+#include <gnuradio/filter/single_pole_iir.h>
 #include <cstdio>
 
 /*
diff --git a/gr-atsc/include/atsc/syminfo_impl.h b/gr-atsc/include/gnuradio/atsc/syminfo_impl.h
index 9f25e4902a..9f25e4902a 100644
--- a/gr-atsc/include/atsc/syminfo_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/syminfo_impl.h
diff --git a/gr-atsc/include/atsc/sync_tag_impl.h b/gr-atsc/include/gnuradio/atsc/sync_tag_impl.h
index bdb64c5d3d..bdb64c5d3d 100644
--- a/gr-atsc/include/atsc/sync_tag_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/sync_tag_impl.h
diff --git a/gr-atsc/include/atsc/trellis_encoder.h b/gr-atsc/include/gnuradio/atsc/trellis_encoder.h
index 243dd7c2ce..6eb424650f 100644
--- a/gr-atsc/include/atsc/trellis_encoder.h
+++ b/gr-atsc/include/gnuradio/atsc/trellis_encoder.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_ATSC_TRELLIS_ENCODER_H
 #define INCLUDED_ATSC_TRELLIS_ENCODER_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/trellis_encoder_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/trellis_encoder_impl.h>
 
 class atsc_trellis_encoder;
 typedef boost::shared_ptr<atsc_trellis_encoder> atsc_trellis_encoder_sptr;
@@ -37,7 +37,7 @@ ATSC_API atsc_trellis_encoder_sptr atsc_make_trellis_encoder();
  *
  * input: atsc_mpeg_packet_rs_encoded; output: atsc_data_segment
  */
-class ATSC_API atsc_trellis_encoder : public gr_sync_block
+class ATSC_API atsc_trellis_encoder : public gr::sync_block
 {
   friend ATSC_API atsc_trellis_encoder_sptr atsc_make_trellis_encoder();
 
diff --git a/gr-atsc/include/atsc/trellis_encoder_impl.h b/gr-atsc/include/gnuradio/atsc/trellis_encoder_impl.h
index d20885ef36..93aab1b190 100644
--- a/gr-atsc/include/atsc/trellis_encoder_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/trellis_encoder_impl.h
@@ -23,9 +23,9 @@
 #ifndef _ATSC_TRELLIS_ENCODER_H_
 #define _ATSC_TRELLIS_ENCODER_H_
 
-#include <atsc/api.h>
-#include <atsc/basic_trellis_encoder_impl.h>
-#include <atsc/types.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/basic_trellis_encoder_impl.h>
+#include <gnuradio/atsc/types.h>
 
 /*!
  * \brief fancy, schmancy 12-way interleaved trellis encoder for ATSC
diff --git a/gr-atsc/include/atsc/types.h b/gr-atsc/include/gnuradio/atsc/types.h
index 759ef68ba7..1d93bb0d6a 100644
--- a/gr-atsc/include/atsc/types.h
+++ b/gr-atsc/include/gnuradio/atsc/types.h
@@ -23,7 +23,7 @@
 #ifndef _ATSC_TYPES_H_
 #define _ATSC_TYPES_H_
 
-#include <atsc/consts.h>
+#include <gnuradio/atsc/consts.h>
 #include <cstring>
 #include <cassert>
 
diff --git a/gr-atsc/include/atsc/viterbi_decoder.h b/gr-atsc/include/gnuradio/atsc/viterbi_decoder.h
index e119337553..a529c18d3b 100644
--- a/gr-atsc/include/atsc/viterbi_decoder.h
+++ b/gr-atsc/include/gnuradio/atsc/viterbi_decoder.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ATSC_VITERBI_DECODER_H
 #define INCLUDED_ATSC_VITERBI_DECODER_H
 
-#include <atsc/api.h>
-#include <gr_sync_block.h>
-#include <atsc/viterbi_decoder_impl.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/atsc/viterbi_decoder_impl.h>
 
 class atsc_viterbi_decoder;
 typedef boost::shared_ptr<atsc_viterbi_decoder> atsc_viterbi_decoder_sptr;
@@ -38,7 +38,7 @@ ATSC_API atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder();
  *
  * input: atsc_soft_data_segment; output: atsc_mpeg_packet_rs_encoded
  */
-class ATSC_API atsc_viterbi_decoder : public gr_sync_block
+class ATSC_API atsc_viterbi_decoder : public gr::sync_block
 {
   friend ATSC_API atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder();
 
diff --git a/gr-atsc/include/atsc/viterbi_decoder_impl.h b/gr-atsc/include/gnuradio/atsc/viterbi_decoder_impl.h
index 307b157a9b..447d43911d 100644
--- a/gr-atsc/include/atsc/viterbi_decoder_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/viterbi_decoder_impl.h
@@ -25,15 +25,15 @@
 
 #define	USE_SIMPLE_SLICER  0
 
-#include <atsc/api.h>
-#include <atsc/types.h>
-#include <atsc/interleaver_fifo.h>
+#include <gnuradio/atsc/api.h>
+#include <gnuradio/atsc/types.h>
+#include <gnuradio/atsc/interleaver_fifo.h>
 
 #if (USE_SIMPLE_SLICER)
-#include <atsc/fake_single_viterbi_impl.h>
+#include <gnuradio/atsc/fake_single_viterbi_impl.h>
 typedef atsci_fake_single_viterbi	single_viterbi_t;
 #else
-#include <atsc/single_viterbi_impl.h>
+#include <gnuradio/atsc/single_viterbi_impl.h>
 typedef atsci_single_viterbi		single_viterbi_t;
 #endif
 
diff --git a/gr-atsc/include/atsc/vsbtx_lp_impl.h b/gr-atsc/include/gnuradio/atsc/vsbtx_lp_impl.h
index d9640ca483..ce6f8bfefb 100644
--- a/gr-atsc/include/atsc/vsbtx_lp_impl.h
+++ b/gr-atsc/include/gnuradio/atsc/vsbtx_lp_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSC_VSBTX_LP_H_
 #define _ATSC_VSBTX_LP_H_
 
-#include <atsc/api.h>
+#include <gnuradio/atsc/api.h>
 #include <gr_fir_builder.h>
 
 class ATSC_API atsc_vsbtx_lp : public gr_fir_builder