4 files changed, 11 insertions, 8 deletions
diff --git a/gr-fcd/CMakeLists.txt b/gr-fcd/CMakeLists.txt
index ff61ce28c6..810e79e6eb 100644
--- a/gr-fcd/CMakeLists.txt
+++ b/gr-fcd/CMakeLists.txt
@@ -35,6 +35,7 @@ if (LINUX)
     GR_REGISTER_COMPONENT("gr-fcd" ENABLE_GR_FCD
         Boost_FOUND
         ENABLE_GR_CORE
+        ENABLE_GR_BLOCKS
         ENABLE_GR_AUDIO
         LIBUSB_FOUND
     )
diff --git a/gr-fcd/examples/grc/fcd_nfm_rx.grc b/gr-fcd/examples/grc/fcd_nfm_rx.grc
index 98d06d9ef1..96d6f55e2e 100644
--- a/gr-fcd/examples/grc/fcd_nfm_rx.grc
+++ b/gr-fcd/examples/grc/fcd_nfm_rx.grc
@@ -379,10 +379,10 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_const_vxx</key>
+    <key>blocks_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_const_vxx_1</value>
+      <value>blocks_multiply_const_vxx_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -997,20 +997,20 @@
     </param>
   </block>
   <connection>
-    <source_block_id>gr_multiply_const_vxx_1</source_block_id>
+    <source_block_id>blocks_multiply_const_vxx_1</source_block_id>
     <sink_block_id>audio_sink</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_multiply_const_vxx_1</source_block_id>
+    <source_block_id>blocks_multiply_const_vxx_1</source_block_id>
     <sink_block_id>audio_sink</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>nbfm_normal</source_block_id>
-    <sink_block_id>gr_multiply_const_vxx_1</sink_block_id>
+    <sink_block_id>blocks_multiply_const_vxx_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gr-fcd/lib/CMakeLists.txt b/gr-fcd/lib/CMakeLists.txt
index 9a5605d99c..dd0778deef 100644
--- a/gr-fcd/lib/CMakeLists.txt
+++ b/gr-fcd/lib/CMakeLists.txt
@@ -26,6 +26,7 @@ GR_INCLUDE_SUBDIRECTORY(fcd)
 include_directories(
     ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GR_FCD_INCLUDE_DIRS}
+    ${GR_BLOCKS_INCLUDE_DIRS}
     ${GR_AUDIO_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/hid
     ${CMAKE_CURRENT_SOURCE_DIR}/fcd
@@ -44,6 +45,7 @@ list(APPEND gr_fcd_sources
 
 list(APPEND fcd_libs
     gnuradio-core
+    gnuradio-blocks
     gnuradio-audio
     ${Boost_LIBRARIES}
 )
diff --git a/gr-fcd/lib/fcd_source_c_impl.cc b/gr-fcd/lib/fcd_source_c_impl.cc
index 81ccee092d..9d66e8bb4f 100644
--- a/gr-fcd/lib/fcd_source_c_impl.cc
+++ b/gr-fcd/lib/fcd_source_c_impl.cc
@@ -26,7 +26,7 @@
 #include <fcd.h>
 #include <fcdhidcmd.h> // needed for extended API
 #include <gr_io_signature.h>
-#include <gr_float_to_complex.h>
+#include <blocks/float_to_complex.h>
 #include <gruel/attributes.h>
 
 //#include <iostream>
@@ -53,13 +53,13 @@ fcd_source_c_impl::fcd_source_c_impl(const std::string device_name)
     d_freq_corr(-120),
     d_freq_req(0)
 {
-  gr_float_to_complex_sptr f2c;
+  gr::blocks::float_to_complex::sptr f2c;
 
   /* Audio source; sample rate fixed at 96kHz */
   fcd = audio_make_source(96000, device_name, true);
 
   /* block to convert stereo audio to a complex stream */
-  f2c = gr_make_float_to_complex(1);
+  f2c = gr::blocks::float_to_complex::make(1);
 
   connect(fcd, 0, f2c, 0);
   connect(fcd, 1, f2c, 1);