diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
index c88018421..7038b70bb 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -19,18 +19,6 @@
 set(SIGNAL_GENERATOR_BLOCK_SOURCES signal_generator_c.cc)
 set(SIGNAL_GENERATOR_BLOCK_HEADERS signal_generator_c.h)
 
-include_directories(
-    #${CMAKE_CURRENT_SOURCE_DIR}
-    #${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    #${CMAKE_SOURCE_DIR}/src/core/interfaces
-    #${CMAKE_SOURCE_DIR}/src/core/receiver
-    #${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    #${GLOG_INCLUDE_DIRS}
-    #${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-)
-
 add_library(signal_generator_blocks
     ${SIGNAL_GENERATOR_BLOCK_SOURCES}
     ${SIGNAL_GENERATOR_BLOCK_HEADERS}
@@ -41,23 +29,19 @@ source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS})
 target_link_libraries(signal_generator_blocks
     PUBLIC
         Boost::boost
+        Gnuradio::runtime
         gnss_system_parameters
-        ${GNURADIO_RUNTIME_LIBRARIES}
-        ${GNURADIO_FFT_LIBRARIES}
-        ${VOLK_GNSSSDR_LIBRARIES}
-        ${ORC_LIBRARIES}
     PRIVATE
         gnss_sp_libs
+        Volkgnsssdr::volkgnsssdr
 )
 
-target_include_directories(signal_generator_blocks PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
-
+target_include_directories(signal_generator_blocks
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+)
 
 set_property(TARGET signal_generator_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
-
-if(NOT VOLKGNSSSDR_FOUND)
-    add_dependencies(signal_generator_blocks volk_gnsssdr_module)
-endif()
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
index d47fc558b..0c412432d 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
@@ -33,7 +33,6 @@
 
 #include "gnss_signal.h"
 #include <boost/scoped_array.hpp>
-//#include <gnuradio/random.h>
 #include <gnuradio/block.h>
 #include <random>
 #include <string>