6 files changed, 22 insertions, 22 deletions
diff --git a/gr-noaa/lib/hrpt_decoder_impl.cc b/gr-noaa/lib/hrpt_decoder_impl.cc
index 76155ac547..dc7b8f0ec2 100644
--- a/gr-noaa/lib/hrpt_decoder_impl.cc
+++ b/gr-noaa/lib/hrpt_decoder_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "hrpt_decoder_impl.h"
-#include <noaa/hrpt.h>
-#include <gr_io_signature.h>
+#include <gnuradio/noaa/hrpt.h>
+#include <gnuradio/io_signature.h>
 #include <cstdio>
 
 namespace gr {
@@ -59,9 +59,9 @@ namespace gr {
     }
 
     hrpt_decoder_impl::hrpt_decoder_impl(bool verbose, bool output_files)
-      : gr_sync_block("noaa_hrpt_decoder",
-		      gr_make_io_signature(1, 1, sizeof(short)),
-		      gr_make_io_signature(0, 0, 0)),
+      : sync_block("noaa_hrpt_decoder",
+		      io_signature::make(1, 1, sizeof(short)),
+		      io_signature::make(0, 0, 0)),
 	d_verbose(verbose),
 	d_output_files(output_files),
 	d_word_num(0),
diff --git a/gr-noaa/lib/hrpt_decoder_impl.h b/gr-noaa/lib/hrpt_decoder_impl.h
index e242c48e0c..9a43c98acd 100644
--- a/gr-noaa/lib/hrpt_decoder_impl.h
+++ b/gr-noaa/lib/hrpt_decoder_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_NOAA_HRPT_DECODER_IMPL_H
 #define INCLUDED_NOAA_HRPT_DECODER_IMPL_H
 
-#include <noaa/hrpt_decoder.h>
+#include <gnuradio/noaa/hrpt_decoder.h>
 
 namespace gr {
   namespace noaa {
diff --git a/gr-noaa/lib/hrpt_deframer_impl.cc b/gr-noaa/lib/hrpt_deframer_impl.cc
index cd6d0800db..65bff09adb 100644
--- a/gr-noaa/lib/hrpt_deframer_impl.cc
+++ b/gr-noaa/lib/hrpt_deframer_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include "hrpt_deframer_impl.h"
-#include <gr_io_signature.h>
-#include <noaa/hrpt.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/noaa/hrpt.h>
 #include <cstring>
 #include <cstdio>
 
@@ -44,9 +44,9 @@ namespace gr {
     }
 
     hrpt_deframer_impl::hrpt_deframer_impl()
-      : gr_block("noaa_hrpt_deframer",
-		 gr_make_io_signature(1, 1, sizeof(char)),
-		 gr_make_io_signature(1, 1, sizeof(short)))
+      : block("noaa_hrpt_deframer",
+		 io_signature::make(1, 1, sizeof(char)),
+		 io_signature::make(1, 1, sizeof(short)))
     {
       set_output_multiple(6); // room for writing full sync when received
       d_mid_bit = true;
diff --git a/gr-noaa/lib/hrpt_deframer_impl.h b/gr-noaa/lib/hrpt_deframer_impl.h
index 9bad0b87bf..d654f9f606 100644
--- a/gr-noaa/lib/hrpt_deframer_impl.h
+++ b/gr-noaa/lib/hrpt_deframer_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_NOAA_HRPT_DEFRAMER_IMPL_H
 #define INCLUDED_NOAA_HRPT_DEFRAMER_IMPL_H
 
-#include <noaa/hrpt_deframer.h>
+#include <gnuradio/noaa/hrpt_deframer.h>
 
 namespace gr {
   namespace noaa {
diff --git a/gr-noaa/lib/hrpt_pll_cf_impl.cc b/gr-noaa/lib/hrpt_pll_cf_impl.cc
index 17114ef302..fc0d32408d 100644
--- a/gr-noaa/lib/hrpt_pll_cf_impl.cc
+++ b/gr-noaa/lib/hrpt_pll_cf_impl.cc
@@ -25,9 +25,9 @@
 #endif
 
 #include "hrpt_pll_cf_impl.h"
-#include <gr_io_signature.h>
-#include <gr_math.h>
-#include <gr_sincos.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/math.h>
+#include <gnuradio/sincos.h>
 
 namespace gr {
   namespace noaa {
@@ -53,9 +53,9 @@ namespace gr {
     }
     
     hrpt_pll_cf_impl::hrpt_pll_cf_impl(float alpha, float beta, float max_offset)
-      : gr_sync_block("noaa_hrpt_pll_cf",
-		      gr_make_io_signature(1, 1, sizeof(gr_complex)),
-		      gr_make_io_signature(1, 1, sizeof(float))),
+      : sync_block("noaa_hrpt_pll_cf",
+		      io_signature::make(1, 1, sizeof(gr_complex)),
+		      io_signature::make(1, 1, sizeof(float))),
 	d_alpha(alpha), d_beta(beta), d_max_offset(max_offset),
 	d_phase(0.0), d_freq(0.0)
     {
@@ -77,12 +77,12 @@ namespace gr {
 
 	// Generate and mix out carrier
 	float re, im;
-	gr_sincosf(d_phase, &im, &re);
+	gr::sincosf(d_phase, &im, &re);
 	out[i] = (in[i]*gr_complex(re, -im)).imag();
 
 	// Adjust PLL phase/frequency
-	float error = phase_wrap(gr_fast_atan2f(in[i].imag(), in[i].real()) - d_phase);
-	d_freq  = gr_branchless_clip(d_freq + error*d_beta, d_max_offset);
+	float error = phase_wrap(gr::fast_atan2f(in[i].imag(), in[i].real()) - d_phase);
+	d_freq  = gr::branchless_clip(d_freq + error*d_beta, d_max_offset);
 	d_phase = phase_wrap(d_phase + error*d_alpha + d_freq);
       }
 
diff --git a/gr-noaa/lib/hrpt_pll_cf_impl.h b/gr-noaa/lib/hrpt_pll_cf_impl.h
index cc0c36137e..40b0a21459 100644
--- a/gr-noaa/lib/hrpt_pll_cf_impl.h
+++ b/gr-noaa/lib/hrpt_pll_cf_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_NOAA_HRPT_PLL_CF_IMPL_H
 #define INCLUDED_NOAA_HRPT_PLL_CF_IMPL_H
 
-#include <noaa/hrpt_pll_cf.h>
+#include <gnuradio/noaa/hrpt_pll_cf.h>
 
 namespace gr {
   namespace noaa {