7 files changed, 22 insertions, 22 deletions
diff --git a/gr-wxgui/include/wxgui/CMakeLists.txt b/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt
index fad84792e1..fad84792e1 100644
--- a/gr-wxgui/include/wxgui/CMakeLists.txt
+++ b/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt
diff --git a/gr-wxgui/include/wxgui/api.h b/gr-wxgui/include/gnuradio/wxgui/api.h
index cf9e980a9c..6439c8e591 100644
--- a/gr-wxgui/include/wxgui/api.h
+++ b/gr-wxgui/include/gnuradio/wxgui/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_WXGUI_API_H
 #define INCLUDED_WXGUI_API_H
 
-#include <attributes.h>
+#include <gnuradio/attributes.h>
 
 #ifdef gnuradio_wxgui_EXPORTS
 #  define WXGUI_API __GR_ATTR_EXPORT
diff --git a/gr-wxgui/include/wxgui/histo_sink_f.h b/gr-wxgui/include/gnuradio/wxgui/histo_sink_f.h
index f65517ca35..30f0bc7c0d 100644
--- a/gr-wxgui/include/wxgui/histo_sink_f.h
+++ b/gr-wxgui/include/gnuradio/wxgui/histo_sink_f.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_HISTO_SINK_F_H
 #define INCLUDED_GR_HISTO_SINK_F_H
 
-#include <wxgui/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/wxgui/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
 
 namespace gr {
   namespace wxgui {
@@ -34,13 +34,13 @@ namespace gr {
      * \brief Histogram module.
      * \ingroup sink_blk
      */
-    class WXGUI_API histo_sink_f : virtual public gr_sync_block
+    class WXGUI_API histo_sink_f : virtual public sync_block
     {
     public:
       // gr::blocks::histo_sink_f::sptr
       typedef boost::shared_ptr<histo_sink_f> sptr;
 
-      static sptr make(gr_msg_queue_sptr msgq);
+      static sptr make(msg_queue::sptr msgq);
 
       virtual unsigned int get_frame_size(void) = 0;
       virtual unsigned int get_num_bins(void) = 0;
diff --git a/gr-wxgui/include/wxgui/oscope_guts.h b/gr-wxgui/include/gnuradio/wxgui/oscope_guts.h
index a6abd81539..c1a521acf2 100644
--- a/gr-wxgui/include/wxgui/oscope_guts.h
+++ b/gr-wxgui/include/gnuradio/wxgui/oscope_guts.h
@@ -24,9 +24,9 @@
 #ifndef INCLUDED_GR_OSCOPE_GUTS_H
 #define INCLUDED_GR_OSCOPE_GUTS_H
 
-#include <wxgui/api.h>
-#include <wxgui/trigger_mode.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/wxgui/api.h>
+#include <gnuradio/wxgui/trigger_mode.h>
+#include <gnuradio/msg_queue.h>
 
 namespace gr {
   namespace wxgui {
@@ -54,7 +54,7 @@ namespace gr {
       enum scope_state  { HOLD_OFF, LOOK_FOR_TRIGGER, POST_TRIGGER };
 
       int d_nchannels;		     // how many channels
-      gr_msg_queue_sptr d_msgq;      // message queue we stuff output records into
+      msg_queue::sptr d_msgq;      // message queue we stuff output records into
       trigger_mode  d_trigger_mode;
       trigger_slope d_trigger_slope;
       int d_trigger_channel;         // which channel to watch for trigger condition
@@ -90,7 +90,7 @@ namespace gr {
 
     public:
       // CREATORS
-      oscope_guts(double sample_rate, gr_msg_queue_sptr msgq);
+      oscope_guts(double sample_rate, msg_queue::sptr msgq);
       ~oscope_guts();
 
       // MANIPULATORS
diff --git a/gr-wxgui/include/wxgui/oscope_sink_f.h b/gr-wxgui/include/gnuradio/wxgui/oscope_sink_f.h
index a7c7657d40..9e86442055 100644
--- a/gr-wxgui/include/wxgui/oscope_sink_f.h
+++ b/gr-wxgui/include/gnuradio/wxgui/oscope_sink_f.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_OSCOPE_SINK_F_H
 #define INCLUDED_GR_OSCOPE_SINK_F_H
 
-#include <wxgui/api.h>
-#include <wxgui/oscope_sink_x.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/wxgui/api.h>
+#include <gnuradio/wxgui/oscope_sink_x.h>
+#include <gnuradio/msg_queue.h>
 
 namespace gr {
   namespace wxgui {
@@ -43,7 +43,7 @@ namespace gr {
       // gr::blocks::oscope_sink_f::sptr
       typedef boost::shared_ptr<oscope_sink_f> sptr;
 
-      static sptr make(double sampling_rate, gr_msg_queue_sptr msgq);
+      static sptr make(double sampling_rate, msg_queue::sptr msgq);
     };
 
   } /* namespace wxgui */
diff --git a/gr-wxgui/include/wxgui/oscope_sink_x.h b/gr-wxgui/include/gnuradio/wxgui/oscope_sink_x.h
index 17fa9a0f5a..b72c1dd370 100644
--- a/gr-wxgui/include/wxgui/oscope_sink_x.h
+++ b/gr-wxgui/include/gnuradio/wxgui/oscope_sink_x.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_GR_OSCOPE_SINK_X_H
 #define INCLUDED_GR_OSCOPE_SINK_X_H
 
-#include <wxgui/api.h>
-#include <wxgui/trigger_mode.h>
-#include <wxgui/oscope_guts.h>
-#include <gr_sync_block.h>
+#include <gnuradio/wxgui/api.h>
+#include <gnuradio/wxgui/trigger_mode.h>
+#include <gnuradio/wxgui/oscope_guts.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace wxgui {
@@ -37,7 +37,7 @@ namespace gr {
      *
      * Don't instantiate this. Use gr::blocks::oscope_sink_f instead.
      */
-    class WXGUI_API oscope_sink_x : public gr_sync_block
+    class WXGUI_API oscope_sink_x : public sync_block
     {
     protected:
       double d_sampling_rate;
@@ -45,7 +45,7 @@ namespace gr {
 
       oscope_sink_x() {};
       oscope_sink_x(const std::string name,
-                    gr_io_signature_sptr input_sig,
+                    gr::io_signature::sptr input_sig,
                     double sampling_rate);
     public:
       virtual ~oscope_sink_x();
@@ -54,7 +54,7 @@ namespace gr {
       //typedef boost::shared_ptr<oscope_sink_x> sptr;
       //
       //static sptr make(const std::string name,
-      //                 gr_io_signature_sptr input_sig,
+      //                 gnuradio/io_signature.h_sptr input_sig,
       //                 double sampling_rate);
 
       bool set_update_rate(double update_rate);
diff --git a/gr-wxgui/include/wxgui/trigger_mode.h b/gr-wxgui/include/gnuradio/wxgui/trigger_mode.h
index 11654ef6c5..11654ef6c5 100644
--- a/gr-wxgui/include/wxgui/trigger_mode.h
+++ b/gr-wxgui/include/gnuradio/wxgui/trigger_mode.h