9 files changed, 30 insertions, 30 deletions
diff --git a/gr-pager/lib/flex_deinterleave_impl.cc b/gr-pager/lib/flex_deinterleave_impl.cc
index 01557c49ed..08ced37119 100644
--- a/gr-pager/lib/flex_deinterleave_impl.cc
+++ b/gr-pager/lib/flex_deinterleave_impl.cc
@@ -27,7 +27,7 @@
 #include "flex_deinterleave_impl.h"
 #include "bch3221.h"
 #include "util.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
   namespace pager {
@@ -40,9 +40,9 @@ namespace gr {
     }
 
     flex_deinterleave_impl::flex_deinterleave_impl() :
-      gr_sync_decimator("flex_deinterleave",
-			gr_make_io_signature(1, 1, sizeof(unsigned char)),
-			gr_make_io_signature(1, 1, sizeof(int)), 32)
+      sync_decimator("flex_deinterleave",
+			io_signature::make(1, 1, sizeof(unsigned char)),
+			io_signature::make(1, 1, sizeof(int)), 32)
     {
       set_output_multiple(8); // One FLEX block at a time
     }
diff --git a/gr-pager/lib/flex_deinterleave_impl.h b/gr-pager/lib/flex_deinterleave_impl.h
index 7cce86b6e9..79aabf4320 100644
--- a/gr-pager/lib/flex_deinterleave_impl.h
+++ b/gr-pager/lib/flex_deinterleave_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_PAGER_FLEX_DEINTERLEAVE_IMPL_H
 #define INCLUDED_PAGER_FLEX_DEINTERLEAVE_IMPL_H
 
-#include <pager/flex_deinterleave.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/pager/flex_deinterleave.h>
+#include <gnuradio/sync_decimator.h>
 
 namespace gr {
   namespace pager {
diff --git a/gr-pager/lib/flex_frame_impl.h b/gr-pager/lib/flex_frame_impl.h
index 0a6ec80293..e7d1139041 100644
--- a/gr-pager/lib/flex_frame_impl.h
+++ b/gr-pager/lib/flex_frame_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_PAGER_FLEX_FRAME_IMPL_H
 #define INCLUDED_PAGER_FLEX_FRAME_IMPL_H
 
-#include <pager/flex_frame.h>
+#include <gnuradio/pager/flex_frame.h>
 
 namespace gr {
   namespace pager {
diff --git a/gr-pager/lib/flex_parse_impl.cc b/gr-pager/lib/flex_parse_impl.cc
index 8cf0503de7..425b51f026 100644
--- a/gr-pager/lib/flex_parse_impl.cc
+++ b/gr-pager/lib/flex_parse_impl.cc
@@ -26,7 +26,7 @@
 
 #include "flex_parse_impl.h"
 #include "bch3221.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 #include <ctype.h>
 #include <iostream>
 #include <iomanip>
@@ -35,16 +35,16 @@ namespace gr {
   namespace pager {
 
     flex_parse::sptr
-    flex_parse::make(gr_msg_queue_sptr queue, float freq)
+    flex_parse::make(msg_queue::sptr queue, float freq)
     {
       return gnuradio::get_initial_sptr
 	(new flex_parse_impl(queue, freq));
     }
 
-    flex_parse_impl::flex_parse_impl(gr_msg_queue_sptr queue, float freq) :
-      gr_sync_block("flex_parse",
-		    gr_make_io_signature(1, 1, sizeof(gr_int32)),
-		    gr_make_io_signature(0, 0, 0)),
+    flex_parse_impl::flex_parse_impl(msg_queue::sptr queue, float freq) :
+      sync_block("flex_parse",
+		    io_signature::make(1, 1, sizeof(gr_int32)),
+		    io_signature::make(0, 0, 0)),
       d_queue(queue),
       d_freq(freq)
     {
@@ -159,7 +159,7 @@ namespace gr {
 	else
 	  parse_unknown(mw1, mw2);
 
-	gr_message_sptr msg = gr_make_message_from_string(std::string(d_payload.str()));
+	message::sptr msg = message::make_from_string(std::string(d_payload.str()));
 	d_queue->handle(msg);
       }
     }
diff --git a/gr-pager/lib/flex_parse_impl.h b/gr-pager/lib/flex_parse_impl.h
index a4fcf03d42..f2e4236c56 100644
--- a/gr-pager/lib/flex_parse_impl.h
+++ b/gr-pager/lib/flex_parse_impl.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_PAGER_FLEX_PARSE_IMPL_H
 #define INCLUDED_PAGER_FLEX_PARSE_IMPL_H
 
-#include <pager/flex_parse.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/pager/flex_parse.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
 #include "flex_modes.h"
 #include <sstream>
 
@@ -38,7 +38,7 @@ namespace gr {
     {
     private:
       std::ostringstream d_payload;
-      gr_msg_queue_sptr d_queue;		  // Destination for decoded pages
+      msg_queue::sptr d_queue;		  // Destination for decoded pages
 
       int d_count;	                  // Count of received codewords
       int d_datawords[88];                // 11 blocks of 8 32-bit words
@@ -56,7 +56,7 @@ namespace gr {
       void parse_unknown(int mw1, int mw2);
 
     public:
-      flex_parse_impl(gr_msg_queue_sptr queue, float freq);
+      flex_parse_impl(msg_queue::sptr queue, float freq);
       ~flex_parse_impl();
 
       int work(int noutput_items,
diff --git a/gr-pager/lib/flex_sync_impl.cc b/gr-pager/lib/flex_sync_impl.cc
index 7701f56f7a..5124155d47 100644
--- a/gr-pager/lib/flex_sync_impl.cc
+++ b/gr-pager/lib/flex_sync_impl.cc
@@ -28,8 +28,8 @@
 #include "flex_modes.h"
 #include "bch3221.h"
 #include "util.h"
-#include <gr_io_signature.h>
-#include <blocks/count_bits.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/count_bits.h>
 #include <cstdio>
 
 namespace gr {
@@ -50,9 +50,9 @@ namespace gr {
     // get all zeros, which are considered idle code words.
 
     flex_sync_impl::flex_sync_impl() :
-      gr_block("flex_sync",
-	       gr_make_io_signature(1, 1, sizeof(unsigned char)),
-	       gr_make_io_signature(4, 4, sizeof(unsigned char))),
+      block("flex_sync",
+	       io_signature::make(1, 1, sizeof(unsigned char)),
+	       io_signature::make(4, 4, sizeof(unsigned char))),
       d_sync(10) // Fixed at 10 samples per baud (@ 1600 baud)
     {
       enter_idle();
diff --git a/gr-pager/lib/flex_sync_impl.h b/gr-pager/lib/flex_sync_impl.h
index ba18c147dc..9bc5111e7f 100644
--- a/gr-pager/lib/flex_sync_impl.h
+++ b/gr-pager/lib/flex_sync_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_PAGER_FLEX_SYNC_IMPL_H
 #define INCLUDED_PAGER_FLEX_SYNC_IMPL_H
 
-#include <pager/flex_sync.h>
+#include <gnuradio/pager/flex_sync.h>
 
 namespace gr {
   namespace pager {
diff --git a/gr-pager/lib/slicer_fb_impl.cc b/gr-pager/lib/slicer_fb_impl.cc
index e6c5fcc1d5..7d570ebc70 100644
--- a/gr-pager/lib/slicer_fb_impl.cc
+++ b/gr-pager/lib/slicer_fb_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include "slicer_fb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
   namespace pager {
@@ -38,9 +38,9 @@ namespace gr {
     }
 
     slicer_fb_impl::slicer_fb_impl(float alpha) :
-      gr_sync_block("slicer_fb",
-		    gr_make_io_signature(1, 1, sizeof(float)),
-		    gr_make_io_signature(1, 1, sizeof(unsigned char)))
+      sync_block("slicer_fb",
+		    io_signature::make(1, 1, sizeof(float)),
+		    io_signature::make(1, 1, sizeof(unsigned char)))
     {
       d_alpha = alpha;
       d_beta = 1.0-alpha;
diff --git a/gr-pager/lib/slicer_fb_impl.h b/gr-pager/lib/slicer_fb_impl.h
index c758a4b160..d2d6ba7d89 100644
--- a/gr-pager/lib/slicer_fb_impl.h
+++ b/gr-pager/lib/slicer_fb_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_PAGER_SLICER_FB_IMPL_H
 #define INCLUDED_PAGER_SLICER_FB_IMPL_H
 
-#include <pager/slicer_fb.h>
+#include <gnuradio/pager/slicer_fb.h>
 
 namespace gr {
   namespace pager {