35 files changed, 95 insertions, 95 deletions
diff --git a/gr-qtgui/include/qtgui/CMakeLists.txt b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
index 8f95837fec..8f95837fec 100644
--- a/gr-qtgui/include/qtgui/CMakeLists.txt
+++ b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
diff --git a/gr-qtgui/include/qtgui/ConstellationDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h
index 041e72d45f..52a74b6d40 100644
--- a/gr-qtgui/include/qtgui/ConstellationDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <qtgui/DisplayPlot.h>
+#include <gnuradio/qtgui/DisplayPlot.h>
 
 /*!
  * \brief QWidget for displaying constellaton (I&Q) plots.
diff --git a/gr-qtgui/include/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
index aee9ce5880..bafc712aac 100644
--- a/gr-qtgui/include/qtgui/DisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
@@ -37,7 +37,7 @@
 #include <qwt_plot_magnifier.h>
 #include <qwt_plot_marker.h>
 #include <qwt_symbol.h>
-#include <qtgui/utils.h>
+#include <gnuradio/qtgui/utils.h>
 
 #if QWT_VERSION >= 0x060000
 #include <qwt_compat.h>
diff --git a/gr-qtgui/include/qtgui/FrequencyDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h
index a835e7de08..220dcd7546 100644
--- a/gr-qtgui/include/qtgui/FrequencyDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <qtgui/DisplayPlot.h>
+#include <gnuradio/qtgui/DisplayPlot.h>
 
 /*!
  * \brief QWidget for displaying frequency domain (PSD) plots.
diff --git a/gr-qtgui/include/qtgui/SpectrumGUIClass.h b/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h
index ebe08bdb85..f95ab6477a 100644
--- a/gr-qtgui/include/qtgui/SpectrumGUIClass.h
+++ b/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h
@@ -23,15 +23,15 @@
 #ifndef SPECTRUM_GUI_CLASS_HPP
 #define SPECTRUM_GUI_CLASS_HPP
 
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
 #include <qwidget.h>
 #include <qapplication.h>
 #include <qlabel.h>
 #include <qslider.h>
-#include <qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 
 class SpectrumDisplayForm;
-#include <qtgui/spectrumdisplayform.h>
+#include <gnuradio/qtgui/spectrumdisplayform.h>
 
 #include <cmath>
 
diff --git a/gr-qtgui/include/qtgui/TimeDomainDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h
index 4f1883a1cf..1ef5ddd85c 100644
--- a/gr-qtgui/include/qtgui/TimeDomainDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <qtgui/DisplayPlot.h>
+#include <gnuradio/qtgui/DisplayPlot.h>
 
 /*!
  * \brief QWidget for displaying time domain plots.
diff --git a/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
index 9d89e0ffa4..f22028c3c9 100644
--- a/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
@@ -27,13 +27,13 @@
 #include <cstdio>
 #include <vector>
 #include <qwt_plot_rasteritem.h>
-#include <qtgui/DisplayPlot.h>
-#include <qtgui/timeRasterGlobalData.h>
-#include <qtgui/plot_raster.h>
-#include <high_res_timer.h>
+#include <gnuradio/qtgui/DisplayPlot.h>
+#include <gnuradio/qtgui/timeRasterGlobalData.h>
+#include <gnuradio/qtgui/plot_raster.h>
+#include <gnuradio/high_res_timer.h>
 
 #if QWT_VERSION < 0x060000
-#include <qtgui/plot_waterfall.h>
+#include <gnuradio/qtgui/plot_waterfall.h>
 #else
 #include <qwt_compat.h>
 #endif
diff --git a/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
index a31c5b9b21..62ea41a87c 100644
--- a/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
@@ -27,12 +27,12 @@
 #include <cstdio>
 #include <vector>
 #include <qwt_plot_spectrogram.h>
-#include <qtgui/DisplayPlot.h>
-#include <qtgui/waterfallGlobalData.h>
-#include <high_res_timer.h>
+#include <gnuradio/qtgui/DisplayPlot.h>
+#include <gnuradio/qtgui/waterfallGlobalData.h>
+#include <gnuradio/high_res_timer.h>
 
 #if QWT_VERSION < 0x060000
-#include <qtgui/plot_waterfall.h>
+#include <gnuradio/qtgui/plot_waterfall.h>
 #else
 #include <qwt_compat.h>
 #endif
diff --git a/gr-qtgui/include/qtgui/api.h b/gr-qtgui/include/gnuradio/qtgui/api.h
index 888dd656c8..0a05544842 100644
--- a/gr-qtgui/include/qtgui/api.h
+++ b/gr-qtgui/include/gnuradio/qtgui/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_QTGUI_API_H
 #define INCLUDED_QTGUI_API_H
 
-#include <attributes.h>
+#include <gnuradio/attributes.h>
 
 #ifdef gnuradio_qtgui_EXPORTS
 #  define QTGUI_API __GR_ATTR_EXPORT
diff --git a/gr-qtgui/include/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
index ee92d6fe22..d430b6ffdd 100644
--- a/gr-qtgui/include/qtgui/const_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
@@ -24,10 +24,10 @@
 #define INCLUDED_QTGUI_CONST_SINK_C_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/sync_block.h>
 #include <qapplication.h>
-#include <filter/firdes.h>
+#include <gnuradio/filter/firdes.h>
 
 namespace gr {
   namespace qtgui {
@@ -41,7 +41,7 @@ namespace gr {
      * This is a QT-based graphical sink the takes set of a complex
      * streams and plots them on an IQ constellation plot.
      */
-    class QTGUI_API const_sink_c : virtual public gr_sync_block
+    class QTGUI_API const_sink_c : virtual public sync_block
     {
     public:
       // gr::qtgui::const_sink_c::sptr
diff --git a/gr-qtgui/include/qtgui/constellationdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h
index 48c70beaed..8e04218ed0 100644
--- a/gr-qtgui/include/qtgui/constellationdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h
@@ -23,12 +23,12 @@
 #ifndef CONSTELLATION_DISPLAY_FORM_H
 #define CONSTELLATION_DISPLAY_FORM_H
 
-#include <qtgui/spectrumUpdateEvents.h>
-#include <qtgui/ConstellationDisplayPlot.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/qtgui/ConstellationDisplayPlot.h>
 #include <QtGui/QtGui>
 #include <vector>
 
-#include <qtgui/displayform.h>
+#include <gnuradio/qtgui/displayform.h>
 
 /*!
  * \brief DisplayForm child for managing constellaton (I&Q) plots.
diff --git a/gr-qtgui/include/qtgui/displayform.h b/gr-qtgui/include/gnuradio/qtgui/displayform.h
index ac7ee9bf8d..df0d5a94d6 100644
--- a/gr-qtgui/include/qtgui/displayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h
@@ -23,15 +23,15 @@
 #ifndef DISPLAY_FORM_H
 #define DISPLAY_FORM_H
 
-#include <qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
 #include <QtGui/QtGui>
 #include <vector>
 
 #include <qwt_plot_grid.h>
 #include <qwt_plot_layout.h>
 
-#include <qtgui/DisplayPlot.h>
-#include <qtgui/form_menus.h>
+#include <gnuradio/qtgui/DisplayPlot.h>
+#include <gnuradio/qtgui/form_menus.h>
 
 /*!
  * \brief Base class for setting up and  managing QTGUI plot forms.
diff --git a/gr-qtgui/include/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h
index 7f5b8ae6e7..1158f337a2 100644
--- a/gr-qtgui/include/qtgui/form_menus.h
+++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h
@@ -27,8 +27,8 @@
 #include <vector>
 #include <QtGui/QtGui>
 #include <qwt_symbol.h>
-#include <filter/firdes.h>
-#include <qtgui/qtgui_types.h>
+#include <gnuradio/filter/firdes.h>
+#include <gnuradio/qtgui/qtgui_types.h>
 
 class LineColorMenu: public QMenu
 {
diff --git a/gr-qtgui/include/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
index c0b053060c..667ee95e18 100644
--- a/gr-qtgui/include/qtgui/freq_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
@@ -24,10 +24,10 @@
 #define INCLUDED_QTGUI_FREQ_SINK_C_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/sync_block.h>
 #include <qapplication.h>
-#include <filter/firdes.h>
+#include <gnuradio/filter/firdes.h>
 
 namespace gr {
   namespace qtgui {
@@ -44,7 +44,7 @@ namespace gr {
      * functions can be used to change the lable and color for a given
      * input number.
      */
-    class QTGUI_API freq_sink_c : virtual public gr_sync_block
+    class QTGUI_API freq_sink_c : virtual public sync_block
     {
     public:
       // gr::qtgui::freq_sink_c::sptr
@@ -54,7 +54,7 @@ namespace gr {
        * \brief Build a complex PSD sink.
        *
        * \param fftsize size of the FFT to compute and display
-       * \param wintype type of window to apply (see filter/firdes.h)
+       * \param wintype type of window to apply (see gnuradio/filter/firdes.h)
        * \param fc center frequency of signal (use for x-axis labels)
        * \param bw bandwidth of signal (used to set x-axis labels)
        * \param name title for the plot
diff --git a/gr-qtgui/include/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
index 501c377483..77e9159fe3 100644
--- a/gr-qtgui/include/qtgui/freq_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
@@ -24,10 +24,10 @@
 #define INCLUDED_QTGUI_FREQ_SINK_F_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/sync_block.h>
 #include <qapplication.h>
-#include <filter/firdes.h>
+#include <gnuradio/filter/firdes.h>
 
 namespace gr {
   namespace qtgui {
@@ -44,7 +44,7 @@ namespace gr {
      * functions can be used to change the lable and color for a given
      * input number.
      */
-    class QTGUI_API freq_sink_f : virtual public gr_sync_block
+    class QTGUI_API freq_sink_f : virtual public sync_block
     {
     public:
       // gr::qtgui::freq_sink_f::sptr
@@ -54,7 +54,7 @@ namespace gr {
        * \brief Build a floating point PSD sink.
        *
        * \param fftsize size of the FFT to compute and display
-       * \param wintype type of window to apply (see filter/firdes.h)
+       * \param wintype type of window to apply (see gnuradio/filter/firdes.h)
        * \param fc center frequency of signal (use for x-axis labels)
        * \param bw bandwidth of signal (used to set x-axis labels)
        * \param name title for the plot
diff --git a/gr-qtgui/include/qtgui/freqdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h
index e54b507993..48dd1a6377 100644
--- a/gr-qtgui/include/qtgui/freqdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h
@@ -23,13 +23,13 @@
 #ifndef FREQ_DISPLAY_FORM_H
 #define FREQ_DISPLAY_FORM_H
 
-#include <qtgui/spectrumUpdateEvents.h>
-#include <qtgui/FrequencyDisplayPlot.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/qtgui/FrequencyDisplayPlot.h>
 #include <QtGui/QtGui>
 #include <vector>
-#include <filter/firdes.h>
+#include <gnuradio/filter/firdes.h>
 
-#include <qtgui/displayform.h>
+#include <gnuradio/qtgui/displayform.h>
 
 /*!
  * \brief DisplayForm child for managing frequency (PSD) plots.
diff --git a/gr-qtgui/include/qtgui/plot_raster.h b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h
index 2a5159e00e..6352e9f0db 100644
--- a/gr-qtgui/include/qtgui/plot_raster.h
+++ b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h
@@ -24,7 +24,7 @@
 #define PLOT_TIMERASTER_H
 
 #include <qglobal.h>
-#include <qtgui/timeRasterGlobalData.h>
+#include <gnuradio/qtgui/timeRasterGlobalData.h>
 #include <qwt_plot_rasteritem.h>
 
 #if QWT_VERSION >= 0x060000
diff --git a/gr-qtgui/include/qtgui/plot_waterfall.h b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h
index ed8edbbd0c..bd550ec676 100644
--- a/gr-qtgui/include/qtgui/plot_waterfall.h
+++ b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h
@@ -24,7 +24,7 @@
 #define PLOT_WATERFALL_H
 
 #include <qglobal.h>
-#include <qtgui/waterfallGlobalData.h>
+#include <gnuradio/qtgui/waterfallGlobalData.h>
 #include <qwt_plot_rasteritem.h>
 
 #if QWT_VERSION >= 0x060000
diff --git a/gr-qtgui/include/qtgui/qtgui_types.h b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
index 135350dbb8..f71ab9eda3 100644
--- a/gr-qtgui/include/qtgui/qtgui_types.h
+++ b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
@@ -25,7 +25,7 @@
 
 #include <qwt_color_map.h>
 #include <qwt_scale_draw.h>
-#include <high_res_timer.h>
+#include <gnuradio/high_res_timer.h>
 
 class FreqOffsetAndPrecisionClass
 {
diff --git a/gr-qtgui/include/qtgui/sink_c.h b/gr-qtgui/include/gnuradio/qtgui/sink_c.h
index 8d8a1e97ab..9b30e74c95 100644
--- a/gr-qtgui/include/qtgui/sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h
@@ -24,8 +24,8 @@
 #define INCLUDED_QTGUI_SINK_C_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/block.h>
 #include <qapplication.h>
 #include <qwt_symbol.h>
 
@@ -46,7 +46,7 @@ namespace gr {
      * appropriate boolean value in the constructor to False.
      */
 
-    class QTGUI_API sink_c : virtual public gr_block
+    class QTGUI_API sink_c : virtual public block
     {
     public:
       // gr::qtgui::sink_c::sptr
@@ -56,7 +56,7 @@ namespace gr {
        * \brief Build a complex qtgui sink.
        *
        * \param fftsize size of the FFT to compute and display
-       * \param wintype type of window to apply (see filter/firdes.h)
+       * \param wintype type of window to apply (see gnuradio/filter/firdes.h)
        * \param fc center frequency of signal (use for x-axis labels)
        * \param bw bandwidth of signal (used to set x-axis labels)
        * \param name title for the plot
diff --git a/gr-qtgui/include/qtgui/sink_f.h b/gr-qtgui/include/gnuradio/qtgui/sink_f.h
index 6a7783db50..99e499421b 100644
--- a/gr-qtgui/include/qtgui/sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h
@@ -24,8 +24,8 @@
 #define INCLUDED_QTGUI_SINK_F_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/block.h>
 #include <qapplication.h>
 #include <qwt_symbol.h>
 
@@ -46,7 +46,7 @@ namespace gr {
      * constructor to False.
      */
 
-    class QTGUI_API sink_f : virtual public gr_block
+    class QTGUI_API sink_f : virtual public block
     {
     public:
       // gr::qtgui::sink_f::sptr
@@ -56,7 +56,7 @@ namespace gr {
        * \brief Build a floating point qtgui sink.
        *
        * \param fftsize size of the FFT to compute and display
-       * \param wintype type of window to apply (see filter/firdes.h)
+       * \param wintype type of window to apply (see gnuradio/filter/firdes.h)
        * \param fc center frequency of signal (use for x-axis labels)
        * \param bw bandwidth of signal (used to set x-axis labels)
        * \param name title for the plot
diff --git a/gr-qtgui/include/qtgui/spectrumUpdateEvents.h b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
index df61f7fdb2..361610d095 100644
--- a/gr-qtgui/include/qtgui/spectrumUpdateEvents.h
+++ b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
@@ -28,7 +28,7 @@
 #include <QString>
 #include <complex>
 #include <vector>
-#include <high_res_timer.h>
+#include <gnuradio/high_res_timer.h>
 
 static const int SpectrumUpdateEventType = 10005;
 static const int SpectrumWindowCaptionEventType = 10008;
diff --git a/gr-qtgui/include/qtgui/spectrumdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h
index 37a481245c..6b43661cb4 100644
--- a/gr-qtgui/include/qtgui/spectrumdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h
@@ -26,13 +26,13 @@
 #include <spectrumdisplayform.ui.h>
 
 class SpectrumGUIClass;
-#include <qtgui/SpectrumGUIClass.h>
+#include <gnuradio/qtgui/SpectrumGUIClass.h>
 
-#include <qtgui/SpectrumGUIClass.h>
-#include <qtgui/FrequencyDisplayPlot.h>
-#include <qtgui/WaterfallDisplayPlot.h>
-#include <qtgui/TimeDomainDisplayPlot.h>
-#include <qtgui/ConstellationDisplayPlot.h>
+#include <gnuradio/qtgui/SpectrumGUIClass.h>
+#include <gnuradio/qtgui/FrequencyDisplayPlot.h>
+#include <gnuradio/qtgui/WaterfallDisplayPlot.h>
+#include <gnuradio/qtgui/TimeDomainDisplayPlot.h>
+#include <gnuradio/qtgui/ConstellationDisplayPlot.h>
 #include <QValidator>
 #include <QTimer>
 #include <vector>
diff --git a/gr-qtgui/include/qtgui/timeRasterGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h
index 0a414432d1..0a414432d1 100644
--- a/gr-qtgui/include/qtgui/timeRasterGlobalData.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h
diff --git a/gr-qtgui/include/qtgui/time_raster_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
index 083a6a2d24..22130e56aa 100644
--- a/gr-qtgui/include/qtgui/time_raster_sink_b.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
@@ -24,8 +24,8 @@
 #define INCLUDED_QTGUI_TIME_RASTER_SINK_B_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/sync_block.h>
 #include <qapplication.h>
 #include <qwt_symbol.h>
 
@@ -46,7 +46,7 @@ namespace gr {
      * byte). It will display packed bytes but the display will have
      * to be autoscaled.
      */
-    class QTGUI_API time_raster_sink_b : virtual public gr_sync_block
+    class QTGUI_API time_raster_sink_b : virtual public sync_block
     {
     public:
       // gr::qtgui::time_raster_sink_b::sptr
diff --git a/gr-qtgui/include/qtgui/time_raster_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
index 07deb25fc0..5a82587074 100644
--- a/gr-qtgui/include/qtgui/time_raster_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
@@ -24,8 +24,8 @@
 #define INCLUDED_QTGUI_TIME_RASTER_SINK_F_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/sync_block.h>
 #include <qapplication.h>
 #include <qwt_symbol.h>
 
@@ -43,7 +43,7 @@ namespace gr {
      * point streams and plots a time_raster (spectrogram) plot.
      *
      */
-    class QTGUI_API time_raster_sink_f : virtual public gr_sync_block
+    class QTGUI_API time_raster_sink_f : virtual public sync_block
     {
     public:
       // gr::qtgui::time_raster_sink_f::sptr
diff --git a/gr-qtgui/include/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
index d3234b94bb..8563cf5cd1 100644
--- a/gr-qtgui/include/qtgui/time_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
@@ -24,8 +24,8 @@
 #define INCLUDED_QTGUI_TIME_SINK_C_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/sync_block.h>
 #include <qapplication.h>
 
 namespace gr {
@@ -44,7 +44,7 @@ namespace gr {
      * functions can be used to change the lable and color for a given
      * input number.
      */
-    class QTGUI_API time_sink_c : virtual public gr_sync_block
+    class QTGUI_API time_sink_c : virtual public sync_block
     {
     public:
       // gr::qtgui::time_sink_c::sptr
diff --git a/gr-qtgui/include/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
index cf0df05337..f9457f7a72 100644
--- a/gr-qtgui/include/qtgui/time_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
@@ -24,8 +24,8 @@
 #define INCLUDED_QTGUI_TIME_SINK_F_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/sync_block.h>
 #include <qapplication.h>
 
 namespace gr {
@@ -42,7 +42,7 @@ namespace gr {
      * different color, and the \a set_title and \a set_color functions
      * can be used to change the lable and color for a given input number.
      */
-    class QTGUI_API time_sink_f : virtual public gr_sync_block
+    class QTGUI_API time_sink_f : virtual public sync_block
     {
     public:
       // gr::qtgui::time_sink_f::sptr
diff --git a/gr-qtgui/include/qtgui/timedisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
index 4e216abb0c..07118a4baa 100644
--- a/gr-qtgui/include/qtgui/timedisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
@@ -23,12 +23,12 @@
 #ifndef TIME_DISPLAY_FORM_H
 #define TIME_DISPLAY_FORM_H
 
-#include <qtgui/spectrumUpdateEvents.h>
-#include <qtgui/TimeDomainDisplayPlot.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/qtgui/TimeDomainDisplayPlot.h>
 #include <QtGui/QtGui>
 #include <vector>
 
-#include <qtgui/displayform.h>
+#include <gnuradio/qtgui/displayform.h>
 
 /*!
  * \brief DisplayForm child for managing time domain plots.
diff --git a/gr-qtgui/include/qtgui/timerasterdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h
index 7d6af9f5dd..24933c3c05 100644
--- a/gr-qtgui/include/qtgui/timerasterdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h
@@ -23,13 +23,13 @@
 #ifndef TIMERASTER_DISPLAY_FORM_H
 #define TIMERASTER_DISPLAY_FORM_H
 
-#include <qtgui/spectrumUpdateEvents.h>
-#include <qtgui/TimeRasterDisplayPlot.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/qtgui/TimeRasterDisplayPlot.h>
 #include <QtGui/QtGui>
 #include <vector>
-#include <filter/firdes.h>
+#include <gnuradio/filter/firdes.h>
 
-#include <qtgui/displayform.h>
+#include <gnuradio/qtgui/displayform.h>
 
 /*!
  * \brief DisplayForm child for managing time raster plots.
diff --git a/gr-qtgui/include/qtgui/utils.h b/gr-qtgui/include/gnuradio/qtgui/utils.h
index f490c48567..c4271288fa 100644
--- a/gr-qtgui/include/qtgui/utils.h
+++ b/gr-qtgui/include/gnuradio/qtgui/utils.h
@@ -24,7 +24,7 @@
 #define INCLUDED_QTGUI_UTILS_H
 
 #include <qevent.h>
-#include <qtgui/api.h>
+#include <gnuradio/qtgui/api.h>
 #include <qwt_plot_picker.h>
 #include <qwt_picker_machine.h>
 
diff --git a/gr-qtgui/include/qtgui/waterfallGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h
index 8ab9590d0b..8ab9590d0b 100644
--- a/gr-qtgui/include/qtgui/waterfallGlobalData.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h
diff --git a/gr-qtgui/include/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
index 060c0f14b6..74b94bb4b4 100644
--- a/gr-qtgui/include/qtgui/waterfall_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
@@ -24,10 +24,10 @@
 #define INCLUDED_QTGUI_WATERFALL_SINK_C_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/sync_block.h>
 #include <qapplication.h>
-#include <filter/firdes.h>
+#include <gnuradio/filter/firdes.h>
 
 namespace gr {
   namespace qtgui {
@@ -50,7 +50,7 @@ namespace gr {
      * here, it's probably best to sum the signals together and
      * connect that here.
      */
-    class QTGUI_API waterfall_sink_c : virtual public gr_sync_block
+    class QTGUI_API waterfall_sink_c : virtual public sync_block
     {
     public:
       // gr::qtgui::waterfall_sink_c::sptr
@@ -61,7 +61,7 @@ namespace gr {
        * \brief Build a complex waterfall sink.
        *
        * \param size size of the FFT to compute and display
-       * \param wintype type of window to apply (see filter/firdes.h)
+       * \param wintype type of window to apply (see gnuradio/filter/firdes.h)
        * \param fc center frequency of signal (use for x-axis labels)
        * \param bw bandwidth of signal (used to set x-axis labels)
        * \param name title for the plot
diff --git a/gr-qtgui/include/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
index a550d3d2d2..8b6fce2651 100644
--- a/gr-qtgui/include/qtgui/waterfall_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
@@ -24,10 +24,10 @@
 #define INCLUDED_QTGUI_WATERFALL_SINK_F_H
 
 #include <Python.h>
-#include <qtgui/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/sync_block.h>
 #include <qapplication.h>
-#include <filter/firdes.h>
+#include <gnuradio/filter/firdes.h>
 
 namespace gr {
   namespace qtgui {
@@ -50,7 +50,7 @@ namespace gr {
      * here, it's probably best to sum the signals together and
      * connect that here.
      */
-    class QTGUI_API waterfall_sink_f : virtual public gr_sync_block
+    class QTGUI_API waterfall_sink_f : virtual public sync_block
     {
     public:
       // gr::qtgui::waterfall_sink_f::sptr
@@ -60,7 +60,7 @@ namespace gr {
        * \brief Build a floating point waterfall sink.
        *
        * \param size size of the FFT to compute and display
-       * \param wintype type of window to apply (see filter/firdes.h)
+       * \param wintype type of window to apply (see gnuradio/filter/firdes.h)
        * \param fc center frequency of signal (use for x-axis labels)
        * \param bw bandwidth of signal (used to set x-axis labels)
        * \param name title for the plot
diff --git a/gr-qtgui/include/qtgui/waterfalldisplayform.h b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
index 00e678bd0c..8d78bb015a 100644
--- a/gr-qtgui/include/qtgui/waterfalldisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
@@ -23,13 +23,13 @@
 #ifndef WATERFALL_DISPLAY_FORM_H
 #define WATERFALL_DISPLAY_FORM_H
 
-#include <qtgui/spectrumUpdateEvents.h>
-#include <qtgui/WaterfallDisplayPlot.h>
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/qtgui/WaterfallDisplayPlot.h>
 #include <QtGui/QtGui>
 #include <vector>
-#include <filter/firdes.h>
+#include <gnuradio/filter/firdes.h>
 
-#include <qtgui/displayform.h>
+#include <gnuradio/qtgui/displayform.h>
 
 /*!
  * \brief DisplayForm child for managing waterfall (spectrogram) plots.