34 files changed, 101 insertions, 101 deletions
diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/gnuradio/analog/CMakeLists.txt
index 0343abcd85..0343abcd85 100644
--- a/gr-analog/include/analog/CMakeLists.txt
+++ b/gr-analog/include/gnuradio/analog/CMakeLists.txt
diff --git a/gr-analog/include/analog/agc.h b/gr-analog/include/gnuradio/analog/agc.h
index ae3af7091d..ca6125082f 100644
--- a/gr-analog/include/analog/agc.h
+++ b/gr-analog/include/gnuradio/analog/agc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_AGC_H
 #define INCLUDED_ANALOG_AGC_H
 
-#include <analog/api.h>
-#include <gr_complex.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/gr_complex.h>
 #include <math.h>
 
 namespace gr {
diff --git a/gr-analog/include/analog/agc2.h b/gr-analog/include/gnuradio/analog/agc2.h
index 1e1f695fe9..225adc4410 100644
--- a/gr-analog/include/analog/agc2.h
+++ b/gr-analog/include/gnuradio/analog/agc2.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_AGC2_H
 #define INCLUDED_ANALOG_AGC2_H
 
-#include <analog/api.h>
-#include <gr_complex.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/gr_complex.h>
 #include <math.h>
 
 namespace gr {
diff --git a/gr-analog/include/analog/agc2_cc.h b/gr-analog/include/gnuradio/analog/agc2_cc.h
index 82efe914d8..76a5263183 100644
--- a/gr-analog/include/analog/agc2_cc.h
+++ b/gr-analog/include/gnuradio/analog/agc2_cc.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ANALOG_AGC2_CC_H
 #define INCLUDED_ANALOG_AGC2_CC_H
 
-#include <analog/api.h>
-#include <analog/agc2.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/analog/agc2.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -38,7 +38,7 @@ namespace gr {
      * \details
      * For Power the absolute value of the complex number is used.
      */
-    class ANALOG_API agc2_cc : virtual public gr_sync_block
+    class ANALOG_API agc2_cc : virtual public sync_block
     {
     public:
       // gr::analog::agc2_cc::sptr
diff --git a/gr-analog/include/analog/agc2_ff.h b/gr-analog/include/gnuradio/analog/agc2_ff.h
index dd2507e33d..740d795e1d 100644
--- a/gr-analog/include/analog/agc2_ff.h
+++ b/gr-analog/include/gnuradio/analog/agc2_ff.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ANALOG_AGC2_FF_H
 #define INCLUDED_ANALOG_AGC2_FF_H
 
-#include <analog/api.h>
-#include <analog/agc2.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/analog/agc2.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -38,7 +38,7 @@ namespace gr {
      * \details
      * Power is approximated by absolute value
      */
-    class ANALOG_API agc2_ff : virtual public gr_sync_block
+    class ANALOG_API agc2_ff : virtual public sync_block
     {
     public:
       // gr::analog::agc2_ff::sptr
diff --git a/gr-analog/include/analog/agc_cc.h b/gr-analog/include/gnuradio/analog/agc_cc.h
index 0c2e831b0c..8319995960 100644
--- a/gr-analog/include/analog/agc_cc.h
+++ b/gr-analog/include/gnuradio/analog/agc_cc.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ANALOG_AGC_CC_H
 #define INCLUDED_ANALOG_AGC_CC_H
 
-#include <analog/api.h>
-#include <analog/agc.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/analog/agc.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -37,7 +37,7 @@ namespace gr {
      * \details
      * For Power the absolute value of the complex number is used.
      */
-    class ANALOG_API agc_cc : virtual public gr_sync_block
+    class ANALOG_API agc_cc : virtual public sync_block
     {
     public:
       // gr::analog::agc_cc::sptr
diff --git a/gr-analog/include/analog/agc_ff.h b/gr-analog/include/gnuradio/analog/agc_ff.h
index ffcafaa642..d55072889b 100644
--- a/gr-analog/include/analog/agc_ff.h
+++ b/gr-analog/include/gnuradio/analog/agc_ff.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ANALOG_AGC_FF_H
 #define INCLUDED_ANALOG_AGC_FF_H
 
-#include <analog/api.h>
-#include <analog/agc.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/analog/agc.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -37,7 +37,7 @@ namespace gr {
      * \details
      * Power is approximated by absolute value
      */
-    class ANALOG_API agc_ff : virtual public gr_sync_block
+    class ANALOG_API agc_ff : virtual public sync_block
     {
     public:
       // gr::analog::agc_ff::sptr
diff --git a/gr-analog/include/analog/api.h b/gr-analog/include/gnuradio/analog/api.h
index 2459ace614..01107345e6 100644
--- a/gr-analog/include/analog/api.h
+++ b/gr-analog/include/gnuradio/analog/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_ANALOG_API_H
 #define INCLUDED_ANALOG_API_H
 
-#include <attributes.h>
+#include <gnuradio/attributes.h>
 
 #ifdef gnuradio_analog_EXPORTS
 #  define ANALOG_API __GR_ATTR_EXPORT
diff --git a/gr-analog/include/analog/cpfsk_bc.h b/gr-analog/include/gnuradio/analog/cpfsk_bc.h
index 8150e0d08f..580c387d45 100644
--- a/gr-analog/include/analog/cpfsk_bc.h
+++ b/gr-analog/include/gnuradio/analog/cpfsk_bc.h
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_ANALOG_CPFSK_BC_H
 #define INCLUDED_ANALOG_CPFSK_BC_H
 
-#include <analog/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_interpolator.h>
 
 namespace gr {
   namespace analog {
@@ -32,7 +32,7 @@ namespace gr {
      * on an input stream of unpacked bits.
      * \ingroup modulators_blk
      */
-    class ANALOG_API cpfsk_bc : virtual public gr_sync_interpolator
+    class ANALOG_API cpfsk_bc : virtual public sync_interpolator
     {
     public:
       // gr::analog::cpfsk_bc::sptr
diff --git a/gr-analog/include/analog/cpm.h b/gr-analog/include/gnuradio/analog/cpm.h
index 43dd0b3729..040f20514a 100644
--- a/gr-analog/include/analog/cpm.h
+++ b/gr-analog/include/gnuradio/analog/cpm.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_ANALOG_CPM_H
 #define INCLUDED_ANALOG_CPM_H
 
-#include <analog/api.h>
+#include <gnuradio/analog/api.h>
 #include <vector>
 
 namespace gr {
diff --git a/gr-analog/include/analog/ctcss_squelch_ff.h b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h
index f8c551d291..f9ecc88a03 100644
--- a/gr-analog/include/analog/ctcss_squelch_ff.h
+++ b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ANALOG_CTCSS_SQUELCH_FF_H
 #define INCLUDED_ANALOG_CTCSS_SQUELCH_FF_H
 
-#include <analog/api.h>
-#include <analog/squelch_base_ff.h>
-#include <gr_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/analog/squelch_base_ff.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace analog {
@@ -35,7 +35,7 @@ namespace gr {
      * \ingroup level_controllers_blk
      */
     class ANALOG_API ctcss_squelch_ff :
-      public squelch_base_ff, virtual public gr_block
+      public squelch_base_ff, virtual public block
     {
     protected:
       virtual void update_state(const float &in) = 0;
diff --git a/gr-analog/include/analog/dpll_bb.h b/gr-analog/include/gnuradio/analog/dpll_bb.h
index f25e860b2c..4f9a6c0dd9 100644
--- a/gr-analog/include/analog/dpll_bb.h
+++ b/gr-analog/include/gnuradio/analog/dpll_bb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_DPLL_BB_H
 #define INCLUDED_ANALOG_DPLL_BB_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -37,7 +37,7 @@ namespace gr {
      * If a peak is detected, this block outputs a 1,
      * or it outputs 0's.
      */
-    class ANALOG_API dpll_bb : virtual public gr_sync_block
+    class ANALOG_API dpll_bb : virtual public sync_block
     {
     public:
       // gr::analog::dpll_bb::sptr
diff --git a/gr-analog/include/analog/fastnoise_source_X.h.t b/gr-analog/include/gnuradio/analog/fastnoise_source_X.h.t
index e1c606692c..c5331fc084 100644
--- a/gr-analog/include/analog/fastnoise_source_X.h.t
+++ b/gr-analog/include/gnuradio/analog/fastnoise_source_X.h.t
@@ -25,9 +25,9 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <analog/api.h>
-#include <analog/noise_type.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/analog/noise_type.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -40,14 +40,14 @@ namespace gr {
      * Generate random values from different distributions.
      * Currently, only Gaussian and uniform are enabled.
      */
-    class ANALOG_API @BASE_NAME@ : virtual public gr_sync_block
+    class ANALOG_API @BASE_NAME@ : virtual public sync_block
     {
     public:
       // gr::analog::@BASE_NAME@::sptr
       typedef boost::shared_ptr<@BASE_NAME@> sptr;
 
       /*! \brief Make a fast noise source
-       * \param type    the random distribution to use (see analog/noise_type.h)
+       * \param type    the random distribution to use (see gnuradio/analog/noise_type.h)
        * \param ampl    a scaling factor for the output
        * \param seed    seed for random generators. Note that for uniform and
        * \param samples Number of samples to pre-generate
diff --git a/gr-analog/include/analog/feedforward_agc_cc.h b/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h
index 0a688ccdde..5d4abfeedb 100644
--- a/gr-analog/include/analog/feedforward_agc_cc.h
+++ b/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_H
 #define INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -34,7 +34,7 @@ namespace gr {
      * absolute value over nsamples
      * \ingroup level_controllers_blk
      */
-    class ANALOG_API feedforward_agc_cc : virtual public gr_sync_block
+    class ANALOG_API feedforward_agc_cc : virtual public sync_block
     {
     public:
       // gr::analog::feedforward_agc_cc::sptr
diff --git a/gr-analog/include/analog/fmdet_cf.h b/gr-analog/include/gnuradio/analog/fmdet_cf.h
index bd26e39226..571795bbd8 100644
--- a/gr-analog/include/analog/fmdet_cf.h
+++ b/gr-analog/include/gnuradio/analog/fmdet_cf.h
@@ -23,14 +23,15 @@
 #ifndef INCLUDED_ANALOG_FMDET_CF_H
 #define INCLUDED_ANALOG_FMDET_CF_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
 
     /*!
      * \brief Implements an IQ slope detector
+     * \ingroup modulators_blk 
      *
      * \details
      * input: stream of complex; output: stream of floats
@@ -38,7 +39,7 @@ namespace gr {
      * This implements a limiting slope detector. The limiter is in
      * the normalization by the magnitude of the sample
      */
-    class ANALOG_API fmdet_cf : virtual public gr_sync_block
+    class ANALOG_API fmdet_cf : virtual public sync_block
     {
     public:
       // gr::analog::fmdet_cf::sptr
diff --git a/gr-analog/include/analog/frequency_modulator_fc.h b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h
index a0d4404729..d6e2b277fe 100644
--- a/gr-analog/include/analog/frequency_modulator_fc.h
+++ b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H
 #define INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -36,7 +36,7 @@ namespace gr {
      * \details
      * float input; complex baseband output
      */
-    class ANALOG_API frequency_modulator_fc : virtual public gr_sync_block
+    class ANALOG_API frequency_modulator_fc : virtual public sync_block
     {
     public:
       // gr::analog::frequency_modulator_fc::sptr
diff --git a/gr-analog/include/analog/noise_source_X.h.t b/gr-analog/include/gnuradio/analog/noise_source_X.h.t
index 1a9630dfdf..b7b0906c06 100644
--- a/gr-analog/include/analog/noise_source_X.h.t
+++ b/gr-analog/include/gnuradio/analog/noise_source_X.h.t
@@ -25,10 +25,9 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <analog/api.h>
-#include <analog/noise_type.h>
-#include <gr_sync_block.h>
-#include <gr_random.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/analog/noise_type.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -41,14 +40,14 @@ namespace gr {
      * Generate random values from different distributions.
      * Currently, only Gaussian and uniform are enabled.
      */
-    class ANALOG_API @BASE_NAME@ : virtual public gr_sync_block 
+    class ANALOG_API @BASE_NAME@ : virtual public sync_block 
     {
     public:
       // gr::analog::@BASE_NAME@::sptr
       typedef boost::shared_ptr<@BASE_NAME@> sptr;
 
       /*! Build a noise source
-       * \param type the random distribution to use (see analog/noise_type.h)
+       * \param type the random distribution to use (see gnuradio/analog/noise_type.h)
        * \param ampl a scaling factor for the output
        * \param seed seed for random generators. Note that for uniform and
        *             Gaussian distributions, this should be a negative number.
diff --git a/gr-analog/include/analog/noise_type.h b/gr-analog/include/gnuradio/analog/noise_type.h
index c3a2146b7e..c3a2146b7e 100644
--- a/gr-analog/include/analog/noise_type.h
+++ b/gr-analog/include/gnuradio/analog/noise_type.h
diff --git a/gr-analog/include/analog/phase_modulator_fc.h b/gr-analog/include/gnuradio/analog/phase_modulator_fc.h
index 2ec7c1a3c4..56c39ce3ea 100644
--- a/gr-analog/include/analog/phase_modulator_fc.h
+++ b/gr-analog/include/gnuradio/analog/phase_modulator_fc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_PHASE_MODULATOR_FC_H
 #define INCLUDED_ANALOG_PHASE_MODULATOR_FC_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -39,7 +39,7 @@ namespace gr {
      * Input stream 0: floats
      * Ouput stream 0: complex
      */
-    class ANALOG_API phase_modulator_fc : virtual public gr_sync_block
+    class ANALOG_API phase_modulator_fc : virtual public sync_block
     {
     public:
       // gr::analog::phase_modulator_fc::sptr
diff --git a/gr-analog/include/analog/pll_carriertracking_cc.h b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h
index 520a2f57da..35da29c8af 100644
--- a/gr-analog/include/analog/pll_carriertracking_cc.h
+++ b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_H
 #define INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_H
 
-#include <analog/api.h>
-#include <blocks/control_loop.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -48,7 +48,7 @@ namespace gr {
      * pll_freqdet_cf, pll_carriertracking_cc
      */
     class ANALOG_API pll_carriertracking_cc
-      : virtual public gr_sync_block,
+      : virtual public sync_block,
         virtual public blocks::control_loop
     {
     public:
diff --git a/gr-analog/include/analog/pll_freqdet_cf.h b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h
index b33fb909ba..1ea7eb97ec 100644
--- a/gr-analog/include/analog/pll_freqdet_cf.h
+++ b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ANALOG_PLL_FREQDET_CF_H
 #define INCLUDED_ANALOG_PLL_FREQDET_CF_H
 
-#include <analog/api.h>
-#include <blocks/control_loop.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -47,7 +47,7 @@ namespace gr {
      * \sa pll_refout_cc, pll_carriertracking_cc
      */
     class ANALOG_API pll_freqdet_cf
-      : virtual public gr_sync_block,
+      : virtual public sync_block,
         virtual public blocks::control_loop
     {
     public:
diff --git a/gr-analog/include/analog/pll_refout_cc.h b/gr-analog/include/gnuradio/analog/pll_refout_cc.h
index 9c713749c7..29a2f43198 100644
--- a/gr-analog/include/analog/pll_refout_cc.h
+++ b/gr-analog/include/gnuradio/analog/pll_refout_cc.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_ANALOG_PLL_REFOUT_CC_H
 #define INCLUDED_ANALOG_PLL_REFOUT_CC_H
 
-#include <analog/api.h>
-#include <blocks/control_loop.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/blocks/control_loop.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -48,7 +48,7 @@ namespace gr {
      * pll_freqdet_cf, pll_carriertracking_cc
      */
     class ANALOG_API pll_refout_cc 
-      : virtual public gr_sync_block,
+      : virtual public sync_block,
         virtual public blocks::control_loop
     {
     public:
diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_c.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h
index 2fed4fff0b..fe67f3ad59 100644
--- a/gr-analog/include/analog/probe_avg_mag_sqrd_c.h
+++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h
@@ -22,8 +22,8 @@
 #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_H
 #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -40,7 +40,7 @@ namespace gr {
      * threshold can be retrieved with the level and unmuted
      * accessors.
      */
-    class ANALOG_API probe_avg_mag_sqrd_c : virtual public gr_sync_block
+    class ANALOG_API probe_avg_mag_sqrd_c : virtual public sync_block
     {
     public:
       // gr::analog::probe_avg_mag_sqrd_c::sptr
diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h
index 303670adee..d491321e68 100644
--- a/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h
+++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_H
 #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -42,7 +42,7 @@ namespace gr {
      * threshold can be retrieved with the level and unmuted
      * accessors.
      */
-    class ANALOG_API probe_avg_mag_sqrd_cf : virtual public gr_sync_block
+    class ANALOG_API probe_avg_mag_sqrd_cf : virtual public sync_block
     {
     public:
       // gr::analog::probe_avg_mag_sqrd_cf::sptr
diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_f.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h
index 2300f8bca1..960480b962 100644
--- a/gr-analog/include/analog/probe_avg_mag_sqrd_f.h
+++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_H
 #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -41,7 +41,7 @@ namespace gr {
      * threshold can be retrieved with the level and unmuted
      * accessors.
      */
-    class ANALOG_API probe_avg_mag_sqrd_f : virtual public gr_sync_block
+    class ANALOG_API probe_avg_mag_sqrd_f : virtual public sync_block
     {
     public:
       // gr::analog::probe_avg_mag_sqrd_f::sptr
diff --git a/gr-analog/include/analog/pwr_squelch_cc.h b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h
index 73b89f0db6..766f76d385 100644
--- a/gr-analog/include/analog/pwr_squelch_cc.h
+++ b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_PWR_SQUELCH_CC_H
 #define INCLUDED_ANALOG_PWR_SQUELCH_CC_H
 
-#include <analog/api.h>
-#include <analog/squelch_base_cc.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/analog/squelch_base_cc.h>
 #include <cmath>
 
 namespace gr {
@@ -35,7 +35,7 @@ namespace gr {
      * \ingroup level_controllers_blk
      */
     class ANALOG_API pwr_squelch_cc :
-      public squelch_base_cc, virtual public gr_block
+      public squelch_base_cc, virtual public block
     {
     protected:
       virtual void update_state(const gr_complex &in) = 0;
diff --git a/gr-analog/include/analog/pwr_squelch_ff.h b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h
index 5490827390..abff53d5e0 100644
--- a/gr-analog/include/analog/pwr_squelch_ff.h
+++ b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_PWR_SQUELCH_FF_H
 #define INCLUDED_ANALOG_PWR_SQUELCH_FF_H
 
-#include <analog/api.h>
-#include <analog/squelch_base_ff.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/analog/squelch_base_ff.h>
 #include <cmath>
 
 namespace gr {
@@ -35,7 +35,7 @@ namespace gr {
      * \ingroup level_controllers_blk
      */
     class ANALOG_API pwr_squelch_ff :
-      public squelch_base_ff, virtual public gr_block
+      public squelch_base_ff, virtual public block
     {
     protected:
       virtual void update_state(const float &in) = 0;
diff --git a/gr-analog/include/analog/quadrature_demod_cf.h b/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h
index c7682649b8..888cb4a20b 100644
--- a/gr-analog/include/analog/quadrature_demod_cf.h
+++ b/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_H
 #define INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -37,7 +37,7 @@ namespace gr {
      * This can be used to demod FM, FSK, GMSK, etc.
      * The input is complex baseband.
      */
-    class ANALOG_API quadrature_demod_cf : virtual public gr_sync_block
+    class ANALOG_API quadrature_demod_cf : virtual public sync_block
     {
     public:
       // gr::analog::quadrature_demod_cf::sptr
diff --git a/gr-analog/include/analog/rail_ff.h b/gr-analog/include/gnuradio/analog/rail_ff.h
index 2018017935..29856bbcbc 100644
--- a/gr-analog/include/analog/rail_ff.h
+++ b/gr-analog/include/gnuradio/analog/rail_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_RAIL_FF_H
 #define INCLUDED_ANALOG_RAIL_FF_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief clips input values to min, max
      * \ingroup level_controllers_blk
      */
-    class ANALOG_API rail_ff : virtual public gr_sync_block
+    class ANALOG_API rail_ff : virtual public sync_block
     {
     public:
       // gr::analog::rail_ff::sptr
diff --git a/gr-analog/include/analog/sig_source_X.h.t b/gr-analog/include/gnuradio/analog/sig_source_X.h.t
index 752fe4cd29..81c42926cf 100644
--- a/gr-analog/include/analog/sig_source_X.h.t
+++ b/gr-analog/include/gnuradio/analog/sig_source_X.h.t
@@ -25,9 +25,9 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <analog/api.h>
-#include <analog/sig_source_waveform.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -36,7 +36,7 @@ namespace gr {
      * \brief signal generator with @TYPE@ output.
      * \ingroup waveform_generators_blk
      */
-    class ANALOG_API @BASE_NAME@ : virtual public gr_sync_block
+    class ANALOG_API @BASE_NAME@ : virtual public sync_block
     {
     public:
       // gr::analog::@BASE_NAME@::sptr
diff --git a/gr-analog/include/analog/sig_source_waveform.h b/gr-analog/include/gnuradio/analog/sig_source_waveform.h
index e3efeb1fbb..e3efeb1fbb 100644
--- a/gr-analog/include/analog/sig_source_waveform.h
+++ b/gr-analog/include/gnuradio/analog/sig_source_waveform.h
diff --git a/gr-analog/include/analog/simple_squelch_cc.h b/gr-analog/include/gnuradio/analog/simple_squelch_cc.h
index bf949e3d2e..de6252b288 100644
--- a/gr-analog/include/analog/simple_squelch_cc.h
+++ b/gr-analog/include/gnuradio/analog/simple_squelch_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_H
 #define INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_H
 
-#include <analog/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace analog {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief simple squelch block based on average signal power and threshold in dB.
      * \ingroup level_controllers_blk
      */
-    class ANALOG_API simple_squelch_cc : virtual public gr_sync_block
+    class ANALOG_API simple_squelch_cc : virtual public sync_block
     {
     public:
       // gr::analog::simple_squelch_cc::sptr
diff --git a/gr-analog/include/analog/squelch_base_cc.h b/gr-analog/include/gnuradio/analog/squelch_base_cc.h
index 11476e7e88..63f84cb374 100644
--- a/gr-analog/include/analog/squelch_base_cc.h
+++ b/gr-analog/include/gnuradio/analog/squelch_base_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_SQUELCH_BASE_CC_H
 #define INCLUDED_ANALOG_SQUELCH_BASE_CC_H
 
-#include <analog/api.h>
-#include <gr_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace analog {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief basic squelch block; to be subclassed for other squelches.
      * \ingroup level_blk
      */
-    class ANALOG_API squelch_base_cc : virtual public gr_block
+    class ANALOG_API squelch_base_cc : virtual public block
     {
     protected:
       virtual void update_state(const gr_complex &sample) = 0;
diff --git a/gr-analog/include/analog/squelch_base_ff.h b/gr-analog/include/gnuradio/analog/squelch_base_ff.h
index 2ce1f1a65a..f68262f015 100644
--- a/gr-analog/include/analog/squelch_base_ff.h
+++ b/gr-analog/include/gnuradio/analog/squelch_base_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_ANALOG_SQUELCH_BASE_FF_H
 #define INCLUDED_ANALOG_SQUELCH_BASE_FF_H
 
-#include <analog/api.h>
-#include <gr_block.h>
+#include <gnuradio/analog/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace analog {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief basic squelch block; to be subclassed for other squelches.
      * \ingroup level_blk
      */
-    class ANALOG_API squelch_base_ff : virtual public gr_block
+    class ANALOG_API squelch_base_ff : virtual public block
     {
     protected:
       virtual void update_state(const float &sample) = 0;