14 files changed, 12 insertions, 9 deletions
diff --git a/gr-analog/grc/analog_block_tree.xml b/gr-analog/grc/analog_block_tree.xml
index 64ccbdd855..7337c34c3e 100644
--- a/gr-analog/grc/analog_block_tree.xml
+++ b/gr-analog/grc/analog_block_tree.xml
@@ -42,7 +42,6 @@
   </cat>
   <cat>
     <name>Modulators</name>
-    <block>analog_cpfsk_bc</block>
     <block>analog_frequency_modulator_fc</block>
     <block>analog_phase_modulator_fc</block>
     <block>analog_quadrature_demod_cf</block>
diff --git a/gr-analog/grc/analog_cpfsk_bc.xml b/gr-analog/grc/analog_cpfsk_bc.xml
index 7eb85a2ecf..5108ff61f9 100644
--- a/gr-analog/grc/analog_cpfsk_bc.xml
+++ b/gr-analog/grc/analog_cpfsk_bc.xml
@@ -7,6 +7,7 @@
 <block>
 	<name>CPFSK</name>
 	<key>analog_cpfsk_bc</key>
+  	<category>[Core]/Deprecated</category>
 	<import>from gnuradio import analog</import>
 	<make>analog.cpfsk_bc($k, $amplitude, $samples_per_symbol)</make>
 	<callback>set_amplitude($amplitude)</callback>
diff --git a/gr-analog/include/gnuradio/analog/cpfsk_bc.h b/gr-analog/include/gnuradio/analog/cpfsk_bc.h
index 0d889d3e20..fe28c4536a 100644
--- a/gr-analog/include/gnuradio/analog/cpfsk_bc.h
+++ b/gr-analog/include/gnuradio/analog/cpfsk_bc.h
@@ -31,6 +31,7 @@ namespace gr {
      * \brief Perform continuous phase 2-level frequency shift keying modulation
      * on an input stream of unpacked bits.
      * \ingroup modulators_blk
+     * \ingroup deprecated_blk
      */
     class ANALOG_API cpfsk_bc : virtual public sync_interpolator
     {
diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml
index 9443525f03..f11f27e5c3 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -48,17 +48,11 @@
   <cat>
     <name>Modulators</name>
     <block>digital_cpmmod_bc</block>
-    <block>digital_dxpsk_mod</block>
-    <block>digital_dxpsk_demod</block>
     <block>digital_gfsk_mod</block>
     <block>digital_gfsk_demod</block>
     <block>digital_gmskmod_bc</block>
     <block>digital_gmsk_mod</block>
     <block>digital_gmsk_demod</block>
-    <block>digital_psk_mod</block>
-    <block>digital_psk_demod</block>
-    <block>digital_qam_mod</block>
-    <block>digital_qam_demod</block>
     <block>digital_constellation_modulator</block>
     <block>digital_constellation_receiver_cb</block>
     <block>variable_constellation</block>
diff --git a/gr-digital/grc/digital_dxpsk_demod.xml b/gr-digital/grc/digital_dxpsk_demod.xml
index 5b26d5b8ec..12089ad771 100644
--- a/gr-digital/grc/digital_dxpsk_demod.xml
+++ b/gr-digital/grc/digital_dxpsk_demod.xml
@@ -29,6 +29,7 @@
 <block>
 	<name>DPSK Demod</name>
 	<key>digital_dxpsk_demod</key>
+  	<category>[Core]/Deprecated</category>
 	<import>from gnuradio import digital</import>
 	<make>digital.$(type)_demod(
 	samples_per_symbol=$samples_per_symbol,
diff --git a/gr-digital/grc/digital_dxpsk_mod.xml b/gr-digital/grc/digital_dxpsk_mod.xml
index 02da10028e..4198b8805c 100644
--- a/gr-digital/grc/digital_dxpsk_mod.xml
+++ b/gr-digital/grc/digital_dxpsk_mod.xml
@@ -29,6 +29,7 @@
 <block>
 	<name>DPSK Mod</name>
 	<key>digital_dxpsk_mod</key>
+	<category>[Core]/Deprecated</category>
 	<import>from gnuradio import digital</import>
 	<make>digital.$(type)_mod(
 	samples_per_symbol=$samples_per_symbol,
diff --git a/gr-digital/grc/digital_mpsk_receiver_cc.xml b/gr-digital/grc/digital_mpsk_receiver_cc.xml
index a9b66b7a19..76f0ccd5ea 100644
--- a/gr-digital/grc/digital_mpsk_receiver_cc.xml
+++ b/gr-digital/grc/digital_mpsk_receiver_cc.xml
@@ -7,6 +7,7 @@
 <block>
 	<name>MPSK Receiver</name>
 	<key>digital_mpsk_receiver_cc</key>
+  	<category>[Core]/Deprecated</category>
 	<import>from gnuradio import digital;import cmath</import>
 	<make>digital.mpsk_receiver_cc($M, $theta, $w, $fmin, $fmax, $mu, $gain_mu, $omega, $gain_omega, $omega_relative_limit)</make>
 	<callback>set_loop_bandwidth($w)</callback>
diff --git a/gr-digital/grc/digital_psk_demod.xml b/gr-digital/grc/digital_psk_demod.xml
index 36e803ae73..02beed01ac 100644
--- a/gr-digital/grc/digital_psk_demod.xml
+++ b/gr-digital/grc/digital_psk_demod.xml
@@ -29,6 +29,7 @@
 <block>
   <name>PSK Demod</name>
   <key>digital_psk_demod</key>
+  <category>[Core]/Deprecated</category>
   <import>from gnuradio import digital</import>
   <make>digital.psk.psk_demod(
   constellation_points=$constellation_points,
diff --git a/gr-digital/grc/digital_psk_mod.xml b/gr-digital/grc/digital_psk_mod.xml
index e7788842a8..43e60562ee 100644
--- a/gr-digital/grc/digital_psk_mod.xml
+++ b/gr-digital/grc/digital_psk_mod.xml
@@ -29,6 +29,7 @@
 <block>
   <name>PSK Mod</name>
   <key>digital_psk_mod</key>
+  <category>[Core]/Deprecated</category>
   <import>from gnuradio import digital</import>
   <make>digital.psk.psk_mod(
   constellation_points=$constellation_points,
diff --git a/gr-digital/grc/digital_qam_demod.xml b/gr-digital/grc/digital_qam_demod.xml
index 21ccba856b..c9a6c6aa4b 100644
--- a/gr-digital/grc/digital_qam_demod.xml
+++ b/gr-digital/grc/digital_qam_demod.xml
@@ -29,6 +29,7 @@
 <block>
   <name>QAM Demod</name>
   <key>digital_qam_demod</key>
+  <category>[Core]/Deprecated</category>
   <import>from gnuradio import digital</import>
   <make>digital.qam.qam_demod(
   constellation_points=$constellation_points,
diff --git a/gr-digital/grc/digital_qam_mod.xml b/gr-digital/grc/digital_qam_mod.xml
index 435ca7058e..5c3d5139d2 100644
--- a/gr-digital/grc/digital_qam_mod.xml
+++ b/gr-digital/grc/digital_qam_mod.xml
@@ -29,6 +29,7 @@
 <block>
   <name>QAM Mod</name>
   <key>digital_qam_mod</key>
+  <category>[Core]/Deprecated</category>
   <import>from gnuradio import digital</import>
   <make>digital.qam.qam_mod(
   constellation_points=$constellation_points,
diff --git a/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h b/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
index 618d192771..0cb1a8ba7b 100644
--- a/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
+++ b/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
@@ -34,6 +34,7 @@ namespace gr {
      * \brief This block takes care of receiving M-PSK modulated
      * signals through phase, frequency, and symbol synchronization.
      * \ingroup synchronizers_blk
+     * \ingroup deprecated_blk
      *
      * \details
      * It performs carrier frequency and phase locking as well as
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt
index 2427516c9a..0ad4618d5a 100644
--- a/gr-uhd/lib/CMakeLists.txt
+++ b/gr-uhd/lib/CMakeLists.txt
@@ -21,12 +21,12 @@
 # Setup the include and linker paths
 ########################################################################
 include_directories(
+    ${UHD_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GR_UHD_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
-    ${UHD_INCLUDE_DIRS}
 )
 
 link_directories(
diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt
index 5cbc6c642c..4cfa77d1d5 100644
--- a/gr-uhd/swig/CMakeLists.txt
+++ b/gr-uhd/swig/CMakeLists.txt
@@ -26,10 +26,10 @@ include(GrSwig)
 set(GR_SWIG_FLAGS -DGR_HAVE_UHD) #needed to parse uhd_swig.i
 
 set(GR_SWIG_INCLUDE_DIRS
+    ${UHD_INCLUDE_DIRS}
     ${GR_UHD_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
-    ${UHD_INCLUDE_DIRS}
 )
 
 if(ENABLE_GR_CTRLPORT)