diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
index aab494d71..c1d708b28 100644
--- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
@@ -61,7 +61,6 @@ target_link_libraries(telemetry_decoder_adapters
         telemetry_decoder_lib
 )
 
-
 set_property(TARGET telemetry_decoder_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index 08e75247e..6dc4190f8 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/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.
 #
@@ -87,22 +87,6 @@ set(TRACKING_ADAPTER_HEADERS
     ${OPT_TRACKING_ADAPTERS_HEADERS}
 )
 
-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/tracking/gnuradio_blocks
-     #${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs
-     #${CMAKE_SOURCE_DIR}/src/algorithms/libs
-     #${ARMADILLO_INCLUDE_DIRS}
-     #${GLOG_INCLUDE_DIRS}
-     #${GFlags_INCLUDE_DIRS}
-     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-     ${VOLK_GNSSSDR_INCLUDE_DIRS}
-     ${OPT_TRACKING_INCLUDE_DIRS}
-)
-
 list(SORT TRACKING_ADAPTER_HEADERS)
 list(SORT TRACKING_ADAPTER_SOURCES)
 
@@ -120,6 +104,11 @@ target_link_libraries(tracking_adapters
         gnss_sdr_flags
 )
 
+target_include_directories(tracking_adapters
+    PUBLIC
+        ${OPT_TRACKING_INCLUDE_DIRS}
+)
+
 set_property(TARGET tracking_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index bf0a54baf..5451846e2 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -78,20 +78,16 @@ set(TRACKING_GR_BLOCKS_HEADERS
     ${OPT_TRACKING_BLOCKS_HEADERS}
 )
 
-include_directories(
-    ${OPT_TRACKING_INCLUDES}
-)
-
 list(SORT TRACKING_GR_BLOCKS_HEADERS)
 list(SORT TRACKING_GR_BLOCKS_SOURCES)
 
+source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
+
 add_library(tracking_gr_blocks
     ${TRACKING_GR_BLOCKS_SOURCES}
     ${TRACKING_GR_BLOCKS_HEADERS}
 )
 
-source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
-
 target_link_libraries(tracking_gr_blocks
     PUBLIC
         Boost::boost
@@ -105,9 +101,10 @@ target_link_libraries(tracking_gr_blocks
         ${OPT_TRACKING_LIBRARIES}
 )
 
-if(ENABLE_GENERIC_ARCH)
-    target_compile_definitions(tracking_gr_blocks PUBLIC -DGENERIC_ARCH=1)
-endif()
+target_include_directories(tracking_gr_blocks
+    PUBLIC
+        ${OPT_TRACKING_INCLUDES}
+)
 
 set_property(TARGET tracking_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index 66b84d544..d35765875 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/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.
 #
@@ -66,18 +66,6 @@ if(ENABLE_FPGA)
     set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} fpga_multicorrelator.h dll_pll_conf_fpga.h)
 endif()
 
-include_directories(
-    ${OPT_TRACKING_INCLUDES}
-)
-
-if(ENABLE_GENERIC_ARCH)
-    add_definitions(-DGENERIC_ARCH=1)
-endif()
-
-if(SSE3_AVAILABLE)
-    add_definitions(-DHAVE_SSE3=1)
-endif()
-
 list(SORT TRACKING_LIB_HEADERS)
 list(SORT TRACKING_LIB_SOURCES)
 
@@ -98,6 +86,11 @@ target_link_libraries(tracking_lib
         Glog::glog
 )
 
+target_include_directories(tracking_lib
+    PUBLIC
+        ${OPT_TRACKING_INCLUDES}
+)
+
 set_property(TARGET tracking_lib
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>