diff --git a/lib/osmosdr_source_c_impl.cc b/lib/osmosdr_source_c_impl.cc
index 47b1e48..5a19e8f 100644
--- a/lib/osmosdr_source_c_impl.cc
+++ b/lib/osmosdr_source_c_impl.cc
@@ -29,7 +29,7 @@
 
 #include <osmosdr_source_c_impl.h>
 #include <gr_io_signature.h>
-#include <gr_noise_source_c.h>
+#include <analog/noise_source_c.h>
 #include <gr_throttle.h>
 
 #ifdef ENABLE_OSMOSDR
@@ -244,8 +244,8 @@ osmosdr_source_c_impl::osmosdr_source_c_impl (const std::string &args)
 
     /* we try to prevent the whole application from crashing by faking
      * the missing hardware (channels) with a gaussian noise source */
-    gr_noise_source_c_sptr noise_source = \
-        gr_make_noise_source_c( GR_GAUSSIAN, 10 );
+    gr::analog::noise_source_c::sptr noise_source = \
+        gr::analog::noise_source_c::make( gr::analog::GR_GAUSSIAN, 10 );
 
     gr_throttle::sptr throttle = gr_make_throttle(sizeof(gr_complex), 1e6);
 
diff --git a/lib/rtl_tcp/rtl_tcp_source_c.cc b/lib/rtl_tcp/rtl_tcp_source_c.cc
index 861cf59..e7b9c00 100644
--- a/lib/rtl_tcp/rtl_tcp_source_c.cc
+++ b/lib/rtl_tcp/rtl_tcp_source_c.cc
@@ -26,8 +26,8 @@
 #include <boost/algorithm/string.hpp>
 
 #include <gr_io_signature.h>
-#include <gr_deinterleave.h>
-#include <gr_float_to_complex.h>
+#include <blocks/deinterleave.h>
+#include <blocks/float_to_complex.h>
 
 #include "rtl_tcp_source_c.h"
 
@@ -110,10 +110,10 @@ rtl_tcp_source_c::rtl_tcp_source_c(const std::string &args) :
   set_gain_mode(false); /* enable manual gain mode by default */
 
   /* rtl tcp source provides a stream of interleaved IQ floats */
-  gr_deinterleave_sptr deinterleave = gr_make_deinterleave(sizeof(float));
+  gr::blocks::deinterleave::sptr deinterleave = gr::blocks::deinterleave::make(sizeof(float));
 
   /* block to convert deinterleaved floats to a complex stream */
-  gr_float_to_complex_sptr f2c = gr_make_float_to_complex(1);
+  gr::blocks::float_to_complex::sptr f2c = gr::blocks::float_to_complex::make(1);
 
   connect(_src, 0, deinterleave, 0);
   connect(deinterleave, 0, f2c, 0); /* I */