5 files changed, 10 insertions, 10 deletions
diff --git a/gr-uhd/include/uhd/CMakeLists.txt b/gr-uhd/include/gnuradio/uhd/CMakeLists.txt
index 71c17b89cd..71c17b89cd 100644
--- a/gr-uhd/include/uhd/CMakeLists.txt
+++ b/gr-uhd/include/gnuradio/uhd/CMakeLists.txt
diff --git a/gr-uhd/include/uhd/amsg_source.h b/gr-uhd/include/gnuradio/uhd/amsg_source.h
index 819f6edad2..4ef7027f13 100644
--- a/gr-uhd/include/uhd/amsg_source.h
+++ b/gr-uhd/include/gnuradio/uhd/amsg_source.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_UHD_AMSG_SOURCE_H
 #define INCLUDED_GR_UHD_AMSG_SOURCE_H
 
-#include <uhd/api.h>
 #include <uhd/usrp/multi_usrp.hpp>
-#include <gr_msg_queue.h>
+#include <gnuradio/uhd/api.h>
+#include <gnuradio/msg_queue.h>
 
 namespace gr {
   namespace uhd {
@@ -43,14 +43,14 @@ namespace gr {
        * \ingroup uhd_blk
        */
       static sptr make(const ::uhd::device_addr_t &device_addr,
-                       gr_msg_queue_sptr msgq);
+                       msg_queue::sptr msgq);
 
       /*!
        * Convert a raw asynchronous message to an asynchronous metatdata object.
        * \return The asynchronous metadata object.
        */
       static ::uhd::async_metadata_t
-        msg_to_async_metadata_t(const gr_message_sptr msg);
+        msg_to_async_metadata_t(const message::sptr msg);
     };
 
   } /* namespace uhd */
diff --git a/gr-uhd/include/uhd/api.h b/gr-uhd/include/gnuradio/uhd/api.h
index 106acd8c76..106acd8c76 100644
--- a/gr-uhd/include/uhd/api.h
+++ b/gr-uhd/include/gnuradio/uhd/api.h
diff --git a/gr-uhd/include/uhd/usrp_sink.h b/gr-uhd/include/gnuradio/uhd/usrp_sink.h
index 242bc0bde6..6d21bbccdd 100644
--- a/gr-uhd/include/uhd/usrp_sink.h
+++ b/gr-uhd/include/gnuradio/uhd/usrp_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_UHD_USRP_SINK_H
 #define INCLUDED_GR_UHD_USRP_SINK_H
 
-#include <uhd/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/uhd/api.h>
+#include <gnuradio/sync_block.h>
 #include <uhd/usrp/multi_usrp.hpp>
 
 #ifndef INCLUDED_UHD_STREAM_HPP
@@ -53,7 +53,7 @@ namespace gr {
 
     class uhd_usrp_sink;
 
-    class GR_UHD_API usrp_sink : virtual public gr_sync_block
+    class GR_UHD_API usrp_sink : virtual public sync_block
     {
     public:
       // gr::uhd::usrp_sink::sptr
diff --git a/gr-uhd/include/uhd/usrp_source.h b/gr-uhd/include/gnuradio/uhd/usrp_source.h
index 7eb0b3111d..f330ee0901 100644
--- a/gr-uhd/include/uhd/usrp_source.h
+++ b/gr-uhd/include/gnuradio/uhd/usrp_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_UHD_USRP_SOURCE_H
 #define INCLUDED_GR_UHD_USRP_SOURCE_H
 
-#include <uhd/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/uhd/api.h>
+#include <gnuradio/sync_block.h>
 #include <uhd/usrp/multi_usrp.hpp>
 
 #ifndef INCLUDED_UHD_STREAM_HPP
@@ -53,7 +53,7 @@ namespace gr {
 
     class uhd_usrp_source;
 
-    class GR_UHD_API usrp_source : virtual public gr_sync_block
+    class GR_UHD_API usrp_source : virtual public sync_block
     {
     public:
       // gr::uhd::usrp_source::sptr