7 files changed, 16 insertions, 16 deletions
diff --git a/gr-pager/include/pager/CMakeLists.txt b/gr-pager/include/gnuradio/pager/CMakeLists.txt
index 6577e7f4e6..6577e7f4e6 100644
--- a/gr-pager/include/pager/CMakeLists.txt
+++ b/gr-pager/include/gnuradio/pager/CMakeLists.txt
diff --git a/gr-pager/include/pager/api.h b/gr-pager/include/gnuradio/pager/api.h
index d14756277f..3d76e6761a 100644
--- a/gr-pager/include/pager/api.h
+++ b/gr-pager/include/gnuradio/pager/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_PAGER_API_H
 #define INCLUDED_PAGER_API_H
 
-#include <attributes.h>
+#include <gnuradio/attributes.h>
 
 #ifdef gnuradio_pager_EXPORTS
 #  define PAGER_API __GR_ATTR_EXPORT
diff --git a/gr-pager/include/pager/flex_deinterleave.h b/gr-pager/include/gnuradio/pager/flex_deinterleave.h
index 75e1ec5f99..2b0c4353d6 100644
--- a/gr-pager/include/pager/flex_deinterleave.h
+++ b/gr-pager/include/gnuradio/pager/flex_deinterleave.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
 #define INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
 
-#include <pager/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/pager/api.h>
+#include <gnuradio/sync_decimator.h>
 
 namespace gr {
   namespace pager {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief flex deinterleave description
      * \ingroup pager_blk
      */
-    class PAGER_API flex_deinterleave : virtual public gr_sync_decimator
+    class PAGER_API flex_deinterleave : virtual public sync_decimator
     {
     public:
       // gr::pager::flex_deinterleave::sptr
diff --git a/gr-pager/include/pager/flex_frame.h b/gr-pager/include/gnuradio/pager/flex_frame.h
index 7e2dd3e0a6..7245c9a00c 100644
--- a/gr-pager/include/pager/flex_frame.h
+++ b/gr-pager/include/gnuradio/pager/flex_frame.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_PAGER_FLEX_FRAME_H
 #define INCLUDED_PAGER_FLEX_FRAME_H
 
-#include <pager/api.h>
+#include <gnuradio/pager/api.h>
 #include <boost/shared_ptr.hpp>
 
 namespace gr {
diff --git a/gr-pager/include/pager/flex_parse.h b/gr-pager/include/gnuradio/pager/flex_parse.h
index a8cd4c0f5c..42adaff6e0 100644
--- a/gr-pager/include/pager/flex_parse.h
+++ b/gr-pager/include/gnuradio/pager/flex_parse.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_PAGER_FLEX_PARSE_H
 #define INCLUDED_PAGER_FLEX_PARSE_H
 
-#include <pager/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/pager/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
 #include <sstream>
 
 namespace gr {
@@ -37,13 +37,13 @@ namespace gr {
      * \brief flex parse description
      * \ingroup pager_blk
      */
-    class PAGER_API flex_parse : virtual public gr_sync_block
+    class PAGER_API flex_parse : virtual public sync_block
     {
     public:
       // gr::pager::flex_parse::sptr
       typedef boost::shared_ptr<flex_parse> sptr;
 
-      static sptr make(gr_msg_queue_sptr queue, float freq);
+      static sptr make(msg_queue::sptr queue, float freq);
     };
 
   } /* namespace pager */
diff --git a/gr-pager/include/pager/flex_sync.h b/gr-pager/include/gnuradio/pager/flex_sync.h
index fb1c7ca8b2..54c3d827a2 100644
--- a/gr-pager/include/pager/flex_sync.h
+++ b/gr-pager/include/gnuradio/pager/flex_sync.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_PAGER_FLEX_SYNC_H
 #define INCLUDED_PAGER_FLEX_SYNC_H
 
-#include <pager/api.h>
-#include <gr_block.h>
+#include <gnuradio/pager/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace pager {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief flex sync description
      * \ingroup pager_blk
      */
-    class PAGER_API flex_sync : virtual public gr_block
+    class PAGER_API flex_sync : virtual public block
     {
     public:
       // gr::pager::flex_sync::sptr
diff --git a/gr-pager/include/pager/slicer_fb.h b/gr-pager/include/gnuradio/pager/slicer_fb.h
index 452c0cbb92..6f01a254c3 100644
--- a/gr-pager/include/pager/slicer_fb.h
+++ b/gr-pager/include/gnuradio/pager/slicer_fb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_PAGER_SLICER_FB_H
 #define INCLUDED_PAGER_SLICER_FB_H
 
-#include <pager/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/pager/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace pager {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief slicer description
      * \ingroup pager_blk
      */
-    class PAGER_API slicer_fb : virtual public gr_sync_block
+    class PAGER_API slicer_fb : virtual public sync_block
     {
     public:
       // gr::pager::slicer_fb::sptr