6 files changed, 10 insertions, 10 deletions
diff --git a/gr-noaa/include/noaa/CMakeLists.txt b/gr-noaa/include/gnuradio/noaa/CMakeLists.txt
index a3a18d2c26..a3a18d2c26 100644
--- a/gr-noaa/include/noaa/CMakeLists.txt
+++ b/gr-noaa/include/gnuradio/noaa/CMakeLists.txt
diff --git a/gr-noaa/include/noaa/api.h b/gr-noaa/include/gnuradio/noaa/api.h
index 86bc8eb077..d30cbf4746 100644
--- a/gr-noaa/include/noaa/api.h
+++ b/gr-noaa/include/gnuradio/noaa/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_NOAA_API_H
 #define INCLUDED_NOAA_API_H
 
-#include <attributes.h>
+#include <gnuradio/attributes.h>
 
 #ifdef gnuradio_noaa_EXPORTS
 #  define NOAA_API __GR_ATTR_EXPORT
diff --git a/gr-noaa/include/noaa/hrpt.h b/gr-noaa/include/gnuradio/noaa/hrpt.h
index f0f0e53f4d..f0f0e53f4d 100644
--- a/gr-noaa/include/noaa/hrpt.h
+++ b/gr-noaa/include/gnuradio/noaa/hrpt.h
diff --git a/gr-noaa/include/noaa/hrpt_decoder.h b/gr-noaa/include/gnuradio/noaa/hrpt_decoder.h
index 0eab88375a..1a8882633e 100644
--- a/gr-noaa/include/noaa/hrpt_decoder.h
+++ b/gr-noaa/include/gnuradio/noaa/hrpt_decoder.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_NOAA_HRPT_DECODER_H
 #define INCLUDED_NOAA_HRPT_DECODER_H
 
-#include <noaa/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/noaa/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace noaa {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief NOAA HRPT Decoder
      * \ingroup noaa_blk
      */
-    class NOAA_API hrpt_decoder : virtual public gr_sync_block
+    class NOAA_API hrpt_decoder : virtual public sync_block
     {
     public:
       // gr::noaa::hrpt_decoder::sptr
diff --git a/gr-noaa/include/noaa/hrpt_deframer.h b/gr-noaa/include/gnuradio/noaa/hrpt_deframer.h
index 4e319b9054..cafb2334e8 100644
--- a/gr-noaa/include/noaa/hrpt_deframer.h
+++ b/gr-noaa/include/gnuradio/noaa/hrpt_deframer.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_NOAA_HRPT_DEFRAMER_H
 #define INCLUDED_NOAA_HRPT_DEFRAMER_H
 
-#include <noaa/api.h>
-#include <gr_block.h>
+#include <gnuradio/noaa/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace noaa {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief NOAA HRPT Deframer
      * \ingroup noaa_blk
      */
-    class NOAA_API hrpt_deframer : virtual public gr_block
+    class NOAA_API hrpt_deframer : virtual public block
     {
     public:
       // gr::noaa::hrpt_deframer::sptr
diff --git a/gr-noaa/include/noaa/hrpt_pll_cf.h b/gr-noaa/include/gnuradio/noaa/hrpt_pll_cf.h
index b9d746b90c..d66663da01 100644
--- a/gr-noaa/include/noaa/hrpt_pll_cf.h
+++ b/gr-noaa/include/gnuradio/noaa/hrpt_pll_cf.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_NOAA_HRPT_PLL_CF_H
 #define INCLUDED_NOAA_HRPT_PLL_CF_H
 
-#include <noaa/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/noaa/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace noaa {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief NOAA HRPT PLL
      * \ingroup noaa_blk
      */
-    class NOAA_API hrpt_pll_cf : virtual public gr_sync_block
+    class NOAA_API hrpt_pll_cf : virtual public sync_block
     {
     public:
       // gr::noaa::hrpt_pll_cf::sptr