diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5746562b4..7b4a2cb33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -622,7 +622,9 @@ if(NOT VOLK_GNSSSDR_FOUND)
         if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
             set(STRIP_VOLK_GNSSSDR_PROFILE "-DENABLE_STRIP=ON -DCMAKE_VERBOSE_MAKEFILE=ON")
         endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
-        set(READ_ENVIRO ${CMAKE_COMMAND} -E environment)
+        if(NOT DEFINED ENV{PROTECT_PASSWORDS})
+            set(READ_ENVIRO ${CMAKE_COMMAND} -E environment)
+        endif(NOT DEFINED ENV{PROTECT_PASSWORDS})
     endif(ENABLE_PACKAGING)
 
     set(VOLK_GNSSSDR_BUILD_COMMAND "${CMAKE_MAKE_PROGRAM}")
diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt
index 0eb2becca..cc63d7032 100644
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -25,6 +25,10 @@ set(PVT_ADAPTER_SOURCES
 	rtklib_pvt.cc
 )
 
+set(PVT_ADAPTER_HEADERS
+	rtklib_pvt.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -41,8 +45,6 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
-file(GLOB PVT_ADAPTER_HEADERS "*.h")
-list(SORT PVT_ADAPTER_HEADERS)
 add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS})
 source_group(Headers FILES ${PVT_ADAPTER_HEADERS})
 target_link_libraries(pvt_adapters pvt_gr_blocks ${ARMADILLO_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index 03bf64caf..72ce3f436 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -25,6 +25,10 @@ set(PVT_GR_BLOCKS_SOURCES
 	rtklib_pvt_cc.cc
 )
 
+set(PVT_GR_BLOCKS_HEADERS
+	rtklib_pvt_cc.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -39,8 +43,6 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
-file(GLOB PVT_GR_BLOCKS_HEADERS "*.h")
-list(SORT PVT_GR_BLOCKS_HEADERS)
 add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${PVT_GR_BLOCKS_HEADERS})
 target_link_libraries(pvt_gr_blocks pvt_lib ${ARMADILLO_LIBRARIES})
diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt
index 82d733a19..caf02a4ce 100644
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -31,6 +31,20 @@ set(PVT_LIB_SOURCES
      rtklib_solver.cc
 )
 
+set(PVT_LIB_HEADERS 
+     pvt_solution.h
+     ls_pvt.h
+     hybrid_ls_pvt.h
+     kml_printer.h
+     gpx_printer.h
+     rinex_printer.h
+     nmea_printer.h  
+     rtcm_printer.h
+     geojson_printer.h
+     rtklib_solver.h
+)
+
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -45,8 +59,9 @@ include_directories(
      ${GLOG_INCLUDE_DIRS}
 )
 
-file(GLOB PVT_LIB_HEADERS "*.h")
 list(SORT PVT_LIB_HEADERS)
+list(SORT PVT_LIB_SOURCES)
+
 add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
 source_group(Headers FILES ${PVT_LIB_HEADERS})
 add_dependencies(pvt_lib rtklib_lib armadillo-${armadillo_RELEASE} glog-${glog_RELEASE})
@@ -60,5 +75,4 @@ target_link_libraries(
     ${ARMADILLO_LIBRARIES}
     ${BLAS}
     ${LAPACK}
-    )
-    
+)
diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt
index 8386759b0..b44f7d6f2 100644
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -36,12 +36,43 @@ set(ACQ_ADAPTER_SOURCES
     glonass_l2_ca_pcps_acquisition.cc
 )
 
+set(ACQ_ADAPTER_HEADERS
+    gps_l1_ca_pcps_acquisition.h
+    gps_l1_ca_pcps_assisted_acquisition.h
+    gps_l1_ca_pcps_acquisition_fine_doppler.h
+    gps_l1_ca_pcps_tong_acquisition.h
+    gps_l1_ca_pcps_quicksync_acquisition.h
+    gps_l2_m_pcps_acquisition.h
+    gps_l5i_pcps_acquisition.h
+    galileo_e1_pcps_ambiguous_acquisition.h
+    galileo_e1_pcps_cccwsr_ambiguous_acquisition.h
+    galileo_e1_pcps_quicksync_ambiguous_acquisition.h
+    galileo_e1_pcps_tong_ambiguous_acquisition.h
+    galileo_e1_pcps_8ms_ambiguous_acquisition.h
+    galileo_e5a_noncoherent_iq_acquisition_caf.h
+    galileo_e5a_pcps_acquisition.h
+    glonass_l1_ca_pcps_acquisition.h
+    glonass_l2_ca_pcps_acquisition.h
+)
+
+
 if(ENABLE_FPGA)
-    set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_acquisition_fpga.cc gps_l2_m_pcps_acquisition_fpga.cc galileo_e1_pcps_ambiguous_acquisition_fpga.cc galileo_e5a_pcps_acquisition_fpga.cc gps_l5i_pcps_acquisition_fpga.cc)
+    set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_acquisition_fpga.cc 
+                                                   gps_l2_m_pcps_acquisition_fpga.cc
+                                                   galileo_e1_pcps_ambiguous_acquisition_fpga.cc
+                                                   galileo_e5a_pcps_acquisition_fpga.cc
+                                                   gps_l5i_pcps_acquisition_fpga.cc)
+
+    set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_acquisition_fpga.h 
+                                                   gps_l2_m_pcps_acquisition_fpga.h
+                                                   galileo_e1_pcps_ambiguous_acquisition_fpga.h
+                                                   galileo_e5a_pcps_acquisition_fpga.h
+                                                   gps_l5i_pcps_acquisition_fpga.h)                                                   
 endif(ENABLE_FPGA)
     
 if(OPENCL_FOUND)
     set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_opencl_acquisition.cc)
+    set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_opencl_acquisition.h)
 endif(OPENCL_FOUND)
 
 include_directories(
@@ -61,8 +92,8 @@ include_directories(
      ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )
 
-file(GLOB ACQ_ADAPTER_HEADERS "*.h")
 list(SORT ACQ_ADAPTER_HEADERS)
+list(SORT ACQ_ADAPTER_SOURCES)
 add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
 source_group(Headers FILES ${ACQ_ADAPTER_HEADERS})
 target_link_libraries(acq_adapters acquisition_lib gnss_sp_libs gnss_sdr_flags acq_gr_blocks ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES})
diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
index 4577c3d3b..327b1a927 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
@@ -26,14 +26,27 @@ set(ACQ_GR_BLOCKS_SOURCES
     pcps_quicksync_acquisition_cc.cc
     galileo_pcps_8ms_acquisition_cc.cc
     galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+)
+
+set(ACQ_GR_BLOCKS_HEADERS
+    pcps_acquisition.h
+    pcps_assisted_acquisition_cc.h
+    pcps_acquisition_fine_doppler_cc.h
+    pcps_tong_acquisition_cc.h
+    pcps_cccwsr_acquisition_cc.h
+    pcps_quicksync_acquisition_cc.h
+    galileo_pcps_8ms_acquisition_cc.h
+    galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
 ) 
 
 if(ENABLE_FPGA)
     set(ACQ_GR_BLOCKS_SOURCES ${ACQ_GR_BLOCKS_SOURCES} pcps_acquisition_fpga.cc)
+    set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_acquisition_fpga.h)
 endif(ENABLE_FPGA)
     
 if(OPENCL_FOUND)
     set(ACQ_GR_BLOCKS_SOURCES ${ACQ_GR_BLOCKS_SOURCES} pcps_opencl_acquisition_cc.cc)
+    set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_opencl_acquisition_cc.h)
 endif(OPENCL_FOUND)
 
 include_directories(
@@ -61,8 +74,8 @@ if(OPENCL_FOUND)
     endif(OS_IS_MACOSX)
 endif(OPENCL_FOUND)
 
-file(GLOB ACQ_GR_BLOCKS_HEADERS "*.h")
 list(SORT ACQ_GR_BLOCKS_HEADERS)
+list(SORT ACQ_GR_BLOCKS_SOURCES)
 add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS})
 
diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt
index 05a116e0f..c8720e226 100644
--- a/src/algorithms/acquisition/libs/CMakeLists.txt
+++ b/src/algorithms/acquisition/libs/CMakeLists.txt
@@ -18,6 +18,7 @@
 
 if(ENABLE_FPGA)
    set(ACQUISITION_LIB_SOURCES fpga_acquisition.cc )
+   set(ACQUISITION_LIB_HEADERS fpga_acquisition.h )
    include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -29,15 +30,14 @@ if(ENABLE_FPGA)
      ${GFlags_INCLUDE_DIRS}
      ${VOLK_GNSSSDR_INCLUDE_DIRS}
    )
-
-   file(GLOB ACQUISITION_LIB_HEADERS "*.h")
 endif(ENABLE_FPGA)
 
 set(ACQUISITION_LIB_HEADERS ${ACQUISITION_LIB_HEADERS} acq_conf.h)
-list(SORT ACQUISITION_LIB_HEADERS)
-
 set(ACQUISITION_LIB_SOURCES ${ACQUISITION_LIB_SOURCES} acq_conf.cc)
 
+list(SORT ACQUISITION_LIB_HEADERS)
+list(SORT ACQUISITION_LIB_SOURCES)
+
 add_library(acquisition_lib ${ACQUISITION_LIB_SOURCES} ${ACQUISITION_LIB_HEADERS})
 source_group(Headers FILES ${ACQUISITION_LIB_HEADERS})
 target_link_libraries(acquisition_lib ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt
index a6d5245cd..d3b754e97 100644
--- a/src/algorithms/channel/adapters/CMakeLists.txt
+++ b/src/algorithms/channel/adapters/CMakeLists.txt
@@ -17,6 +17,7 @@
 #
 
 set(CHANNEL_ADAPTER_SOURCES channel.cc)
+set(CHANNEL_ADAPTER_HEADERS channel.h)
 
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
@@ -31,8 +32,6 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
-file(GLOB CHANNEL_ADAPTER_HEADERS "*.h")
-list(SORT CHANNEL_ADAPTER_HEADERS)
 add_library(channel_adapters ${CHANNEL_ADAPTER_SOURCES} ${CHANNEL_ADAPTER_HEADERS})
 source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS})
 target_link_libraries(channel_adapters channel_fsm ${GNURADIO_RUNTIME_LIBRARIES} ${Boost_LIBRARIES} gnss_sdr_flags)
diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt
index ffbc21a42..308e97833 100644
--- a/src/algorithms/channel/libs/CMakeLists.txt
+++ b/src/algorithms/channel/libs/CMakeLists.txt
@@ -20,6 +20,11 @@ set(CHANNEL_FSM_SOURCES
     channel_fsm.cc 
     channel_msg_receiver_cc.cc
     )
+    
+set(CHANNEL_FSM_HEADERS 
+    channel_fsm.h 
+    channel_msg_receiver_cc.h
+    )    
 
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
@@ -33,8 +38,9 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
-file(GLOB CHANNEL_FSM_HEADERS "*.h")
 list(SORT CHANNEL_FSM_HEADERS)
+list(SORT CHANNEL_FSM_SOURCES)
+
 add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
 source_group(Headers FILES ${CHANNEL_FSM_HEADERS})
 add_dependencies(channel_fsm glog-${glog_RELEASE})
diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt
index cb83608aa..fea88dd0a 100644
--- a/src/algorithms/conditioner/adapters/CMakeLists.txt
+++ b/src/algorithms/conditioner/adapters/CMakeLists.txt
@@ -22,6 +22,11 @@ set(COND_ADAPTER_SOURCES
 	array_signal_conditioner.cc
 )
 
+set(COND_ADAPTER_HEADERS 
+	signal_conditioner.h
+	array_signal_conditioner.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -34,8 +39,9 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
-file(GLOB COND_ADAPTER_HEADERS "*.h")
 list(SORT COND_ADAPTER_HEADERS)
+list(SORT COND_ADAPTER_SOURCES)
+
 add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS})
 source_group(Headers FILES ${COND_ADAPTER_HEADERS})
 add_dependencies(conditioner_adapters glog-${glog_RELEASE})
\ No newline at end of file
diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
index 836e2bfd8..26eb01b83 100644
--- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
@@ -24,7 +24,16 @@ set(DATATYPE_ADAPTER_SOURCES
     ibyte_to_cshort.cc
     ishort_to_cshort.cc
 	ishort_to_complex.cc 
-	 )
+)
+	 
+set(DATATYPE_ADAPTER_HEADERS 
+    byte_to_short.h
+    ibyte_to_cbyte.h
+    ibyte_to_complex.h
+    ibyte_to_cshort.h
+    ishort_to_cshort.h
+	ishort_to_complex.h 
+)	 
 
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
@@ -38,10 +47,10 @@ include_directories(
      ${VOLK_INCLUDE_DIRS}
 )
 
-file(GLOB DATATYPE_ADAPTER_HEADERS "*.h")
 list(SORT DATATYPE_ADAPTER_HEADERS)
+list(SORT DATATYPE_ADAPTER_SOURCES)
+
 add_library(datatype_adapters ${DATATYPE_ADAPTER_SOURCES} ${DATATYPE_ADAPTER_HEADERS})
 source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS})
 add_dependencies(datatype_adapters glog-${glog_RELEASE})
 target_link_libraries(datatype_adapters data_type_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES})
-
diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
index 872dabfcf..1bb51014b 100644
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
@@ -23,14 +23,21 @@ set(DATA_TYPE_GR_BLOCKS_SOURCES
      interleaved_byte_to_complex_short.cc
 )
 
+set(DATA_TYPE_GR_BLOCKS_HEADERS 
+     interleaved_byte_to_complex_byte.h
+     interleaved_short_to_complex_short.h
+     interleaved_byte_to_complex_short.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
      ${VOLK_INCLUDE_DIRS}
 )
 
-file(GLOB DATA_TYPE_GR_BLOCKS_HEADERS "*.h")
 list(SORT DATA_TYPE_GR_BLOCKS_HEADERS)
+list(SORT DATA_TYPE_GR_BLOCKS_SOURCES)
+
 add_library(data_type_gr_blocks ${DATA_TYPE_GR_BLOCKS_SOURCES} ${DATA_TYPE_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${DATA_TYPE_GR_BLOCKS_HEADERS})
-target_link_libraries(data_type_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES})
\ No newline at end of file
+target_link_libraries(data_type_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES})
diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt
index 765789e51..a2520bf39 100644
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -17,7 +17,7 @@
 #
 
 set(INPUT_FILTER_ADAPTER_SOURCES 
-     fir_filter.cc 
+     fir_filter.cc
      freq_xlating_fir_filter.cc
      beamformer_filter.cc
      pulse_blanking_filter.cc
@@ -25,6 +25,15 @@ set(INPUT_FILTER_ADAPTER_SOURCES
      notch_filter_lite.cc
 )
 
+set(INPUT_FILTER_ADAPTER_HEADERS 
+     fir_filter.h
+     freq_xlating_fir_filter.h
+     beamformer_filter.h
+     pulse_blanking_filter.h
+     notch_filter.h
+     notch_filter_lite.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -41,8 +50,9 @@ if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
      add_definitions( -DGR_GREATER_38=1 )
 endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
 
-file(GLOB INPUT_FILTER_ADAPTER_HEADERS "*.h")
 list(SORT INPUT_FILTER_ADAPTER_HEADERS)
+list(SORT INPUT_FILTER_ADAPTER_SOURCES)
+
 add_library(input_filter_adapters ${INPUT_FILTER_ADAPTER_SOURCES} ${INPUT_FILTER_ADAPTER_HEADERS})
 source_group(Headers FILES ${INPUT_FILTER_ADAPTER_HEADERS})
 add_dependencies(input_filter_adapters glog-${glog_RELEASE} gnss_sp_libs)
diff --git a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
index 698c828dd..75f903868 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
@@ -24,6 +24,13 @@ set(INPUT_FILTER_GR_BLOCKS_SOURCES
      notch_lite_cc.cc
 )
 
+set(INPUT_FILTER_GR_BLOCKS_HEADERS
+     beamformer.h
+     pulse_blanking_cc.h
+     notch_cc.h
+     notch_lite_cc.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
@@ -33,8 +40,9 @@ include_directories(
      ${GFlags_INCLUDE_DIRS}
 )
 
-file(GLOB INPUT_FILTER_GR_BLOCKS_HEADERS "*.h")
 list(SORT INPUT_FILTER_GR_BLOCKS_HEADERS)
+list(SORT INPUT_FILTER_GR_BLOCKS_SOURCES)
+
 add_library(input_filter_gr_blocks ${INPUT_FILTER_GR_BLOCKS_SOURCES} ${INPUT_FILTER_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${INPUT_FILTER_GR_BLOCKS_HEADERS})
 
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index 306a755cf..ab7af677e 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -18,14 +18,12 @@
 
 add_subdirectory(rtklib)
 
-if(ENABLE_FPGA)
-    set(GNSS_SPLIBS_SOURCES
+set(GNSS_SPLIBS_SOURCES
         gps_l2c_signal.cc
         gps_l5_signal.cc
         galileo_e1_signal_processing.cc
         gnss_sdr_valve.cc
         gnss_sdr_sample_counter.cc
-        gnss_sdr_time_counter.cc
         gnss_signal_processing.cc
         gps_sdr_signal_processing.cc
         glonass_l1_signal_processing.cc
@@ -40,30 +38,43 @@ if(ENABLE_FPGA)
         conjugate_cc.cc
         conjugate_sc.cc
         conjugate_ic.cc
+)
+
+set(GNSS_SPLIBS_HEADERS
+        gps_l2c_signal.h
+        gps_l5_signal.h
+        galileo_e1_signal_processing.h
+        gnss_sdr_valve.h
+        gnss_sdr_sample_counter.h
+        gnss_signal_processing.h
+        gps_sdr_signal_processing.h
+        glonass_l1_signal_processing.h
+        glonass_l2_signal_processing.h
+        pass_through.h
+        galileo_e5_signal_processing.h
+        complex_byte_to_float_x2.h
+        byte_x2_to_complex_byte.h
+        cshort_to_float_x2.h
+        short_x2_to_cshort.h
+        complex_float_to_complex_byte.h
+        conjugate_cc.h
+        conjugate_sc.h
+        conjugate_ic.h
+        gnss_circular_deque.h
+)
+
+
+if(ENABLE_FPGA)
+    set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES}
+        gnss_sdr_time_counter.cc
         gnss_sdr_fpga_sample_counter.cc
 	)
-else(ENABLE_FPGA)
-    set(GNSS_SPLIBS_SOURCES
-        gps_l2c_signal.cc
-        gps_l5_signal.cc
-        galileo_e1_signal_processing.cc
-        gnss_sdr_valve.cc
-        gnss_sdr_sample_counter.cc
-        gnss_signal_processing.cc
-        gps_sdr_signal_processing.cc
-        glonass_l1_signal_processing.cc
-        glonass_l2_signal_processing.cc
-        pass_through.cc
-        galileo_e5_signal_processing.cc
-        complex_byte_to_float_x2.cc
-        byte_x2_to_complex_byte.cc
-        cshort_to_float_x2.cc
-        short_x2_to_cshort.cc
-        complex_float_to_complex_byte.cc
-        conjugate_cc.cc
-        conjugate_sc.cc
-        conjugate_ic.cc
-    )
+
+    set(GNSS_SPLIBS_HEADERS ${GNSS_SPLIBS_HEADERS}
+        gnss_sdr_time_counter.h
+        gnss_sdr_fpga_sample_counter.h
+	)
+	
 endif(ENABLE_FPGA)
 
 if(OPENCL_FOUND)
@@ -71,7 +82,13 @@ if(OPENCL_FOUND)
                             opencl/fft_execute.cc # Needs OpenCL
                             opencl/fft_setup.cc # Needs OpenCL
                             opencl/fft_kernelstring.cc # Needs OpenCL
-       )
+    )
+       
+    set(GNSS_SPLIBS_HEADERS ${GNSS_SPLIBS_HEADERS}
+                            opencl/fft_execute.h # Needs OpenCL
+                            opencl/fft_setup.h # Needs OpenCL
+                            opencl/fft_kernelstring.h # Needs OpenCL
+    )       
 endif(OPENCL_FOUND)
 
 include_directories(
@@ -99,9 +116,9 @@ endif(OPENCL_FOUND)
 
 add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
 
-file(GLOB GNSS_SPLIBS_HEADERS "*.h")
-list(REMOVE_ITEM GNSS_SPLIBS_HEADERS gnss_sdr_flags.h)
 list(SORT GNSS_SPLIBS_HEADERS)
+list(SORT GNSS_SPLIBS_SOURCES)
+
 add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
 source_group(Headers FILES ${GNSS_SPLIBS_HEADERS})
 
diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt
index 6cb2441a9..ff81a9fb8 100644
--- a/src/algorithms/libs/rtklib/CMakeLists.txt
+++ b/src/algorithms/libs/rtklib/CMakeLists.txt
@@ -38,6 +38,27 @@ set(RTKLIB_LIB_SOURCES
      rtklib_rtcm3.cc
 )
 
+set(RTKLIB_LIB_HEADERS
+     rtklib_rtkcmn.h
+     rtklib_ephemeris.h
+     rtklib_preceph.h
+     rtklib_sbas.h
+     rtklib_ionex.h
+     rtklib_pntpos.h
+     rtklib_ppp.h
+     rtklib_tides.h
+     rtklib_lambda.h
+     rtklib_rtkpos.h
+     rtklib_conversions.h
+     rtklib_stream.h
+     rtklib_rtksvr.h
+     rtklib_solution.h
+     rtklib_rtcm.h
+     rtklib_rtcm2.h
+     rtklib_rtcm3.h
+     rtklib.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -48,8 +69,10 @@ include_directories(
      ${GLOG_INCLUDE_DIRS}
 )
 
-file(GLOB RTKLIB_LIB_HEADERS "*.h")
+
 list(SORT RTKLIB_LIB_HEADERS)
+list(SORT RTKLIB_LIB_SOURCES)
+
 add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
 source_group(Headers FILES ${RTKLIB_LIB_HEADERS})
 add_dependencies(rtklib_lib glog-${glog_RELEASE})
diff --git a/src/algorithms/libs/rtklib/rtklib_ppp.cc b/src/algorithms/libs/rtklib/rtklib_ppp.cc
index b60d627c9..7ac193643 100644
--- a/src/algorithms/libs/rtklib/rtklib_ppp.cc
+++ b/src/algorithms/libs/rtklib/rtklib_ppp.cc
@@ -673,277 +673,6 @@ void pppoutsolstat(rtk_t *rtk, int level, FILE *fp)
 }
 
 
-/* solar/lunar tides (ref [2] 7) ---------------------------------------------*/
-void tide_pl(const double *eu, const double *rp, double GMp,
-    const double *pos, double *dr)
-{
-    const double H3 = 0.292, L3 = 0.015;
-    double r, ep[3], latp, lonp, p, K2, K3, a, H2, L2, dp, du, cosp, sinl, cosl;
-    int i;
-
-    trace(4, "tide_pl : pos=%.3f %.3f\n", pos[0] * R2D, pos[1] * R2D);
-
-    if ((r = norm_rtk(rp, 3)) <= 0.0) return;
-
-    for (i = 0; i < 3; i++) ep[i] = rp[i] / r;
-
-    K2 = GMp / GME * std::pow(RE_WGS84, 2.0) * std::pow(RE_WGS84, 2.0) / (r * r * r);
-    K3 = K2 * RE_WGS84 / r;
-    latp = asin(ep[2]);
-    lonp = atan2(ep[1], ep[0]);
-    cosp = cos(latp);
-    sinl = sin(pos[0]);
-    cosl = cos(pos[0]);
-
-    /* step1 in phase (degree 2) */
-    p = (3.0 * sinl * sinl - 1.0) / 2.0;
-    H2 = 0.6078 - 0.0006 * p;
-    L2 = 0.0847 + 0.0002 * p;
-    a = dot(ep, eu, 3);
-    dp = K2 * 3.0 * L2 * a;
-    du = K2 * (H2 * (1.5 * a * a - 0.5) - 3.0 * L2 * a * a);
-
-    /* step1 in phase (degree 3) */
-    dp += K3 * L3 * (7.5 * a * a - 1.5);
-    du += K3 * (H3 * (2.5 * a * a * a - 1.5 * a) - L3 * (7.5 * a * a - 1.5) * a);
-
-    /* step1 out-of-phase (only radial) */
-    du += 3.0 / 4.0 * 0.0025 * K2 * sin(2.0 * latp) * sin(2.0 * pos[0]) * sin(pos[1] - lonp);
-    du += 3.0 / 4.0 * 0.0022 * K2 * cosp * cosp * cosl * cosl * sin(2.0 * (pos[1] - lonp));
-
-    dr[0] = dp * ep[0] + du * eu[0];
-    dr[1] = dp * ep[1] + du * eu[1];
-    dr[2] = dp * ep[2] + du * eu[2];
-
-    trace(5, "tide_pl : dr=%.3f %.3f %.3f\n", dr[0], dr[1], dr[2]);
-}
-
-
-/* displacement by solid earth tide (ref [2] 7) ------------------------------*/
-void tide_solid(const double *rsun, const double *rmoon,
-    const double *pos, const double *E, double gmst, int opt,
-    double *dr)
-{
-    double dr1[3], dr2[3], eu[3], du, dn, sinl, sin2l;
-
-    trace(3, "tide_solid: pos=%.3f %.3f opt=%d\n", pos[0] * R2D, pos[1] * R2D, opt);
-
-    /* step1: time domain */
-    eu[0] = E[2];
-    eu[1] = E[5];
-    eu[2] = E[8];
-    tide_pl(eu, rsun, GMS, pos, dr1);
-    tide_pl(eu, rmoon, GMM, pos, dr2);
-
-    /* step2: frequency domain, only K1 radial */
-    sin2l = sin(2.0 * pos[0]);
-    du = -0.012 * sin2l * sin(gmst + pos[1]);
-
-    dr[0] = dr1[0] + dr2[0] + du * E[2];
-    dr[1] = dr1[1] + dr2[1] + du * E[5];
-    dr[2] = dr1[2] + dr2[2] + du * E[8];
-
-    /* eliminate permanent deformation */
-    if (opt & 8)
-        {
-            sinl = sin(pos[0]);
-            du = 0.1196 * (1.5 * sinl * sinl - 0.5);
-            dn = 0.0247 * sin2l;
-            dr[0] += du * E[2] + dn * E[1];
-            dr[1] += du * E[5] + dn * E[4];
-            dr[2] += du * E[8] + dn * E[7];
-        }
-    trace(5, "tide_solid: dr=%.3f %.3f %.3f\n", dr[0], dr[1], dr[2]);
-}
-
-
-/* displacement by ocean tide loading (ref [2] 7) ----------------------------*/
-void tide_oload(gtime_t tut, const double *odisp, double *denu)
-{
-    const double args[][5] = {
-        {1.40519E-4, 2.0, -2.0, 0.0, 0.00},  /* M2 */
-        {1.45444E-4, 0.0, 0.0, 0.0, 0.00},   /* S2 */
-        {1.37880E-4, 2.0, -3.0, 1.0, 0.00},  /* N2 */
-        {1.45842E-4, 2.0, 0.0, 0.0, 0.00},   /* K2 */
-        {0.72921E-4, 1.0, 0.0, 0.0, 0.25},   /* K1 */
-        {0.67598E-4, 1.0, -2.0, 0.0, -0.25}, /* O1 */
-        {0.72523E-4, -1.0, 0.0, 0.0, -0.25}, /* P1 */
-        {0.64959E-4, 1.0, -3.0, 1.0, -0.25}, /* Q1 */
-        {0.53234E-5, 0.0, 2.0, 0.0, 0.00},   /* Mf */
-        {0.26392E-5, 0.0, 1.0, -1.0, 0.00},  /* Mm */
-        {0.03982E-5, 2.0, 0.0, 0.0, 0.00}    /* Ssa */
-    };
-    const double ep1975[] = {1975, 1, 1, 0, 0, 0};
-    double ep[6], fday, days, t, t2, t3, a[5], ang, dp[3] = {0};
-    int i, j;
-
-    trace(3, "tide_oload:\n");
-
-    /* angular argument: see subroutine arg.f for reference [1] */
-    time2epoch(tut, ep);
-    fday = ep[3] * 3600.0 + ep[4] * 60.0 + ep[5];
-    ep[3] = ep[4] = ep[5] = 0.0;
-    days = timediff(epoch2time(ep), epoch2time(ep1975)) / 86400.0;
-    t = (27392.500528 + 1.000000035 * days) / 36525.0;
-    t2 = t * t;
-    t3 = t2 * t;
-
-    a[0] = fday;
-    a[1] = (279.69668 + 36000.768930485 * t + 3.03E-4 * t2) * D2R;                 /* H0 */
-    a[2] = (270.434358 + 481267.88314137 * t - 0.001133 * t2 + 1.9E-6 * t3) * D2R; /* S0 */
-    a[3] = (334.329653 + 4069.0340329577 * t - 0.010325 * t2 - 1.2E-5 * t3) * D2R; /* P0 */
-    a[4] = 2.0 * PI;
-
-    /* displacements by 11 constituents */
-    for (i = 0; i < 11; i++)
-        {
-            ang = 0.0;
-            for (j = 0; j < 5; j++) ang += a[j] * args[i][j];
-            for (j = 0; j < 3; j++) dp[j] += odisp[j + i * 6] * cos(ang - odisp[j + 3 + i * 6] * D2R);
-        }
-    denu[0] = -dp[1];
-    denu[1] = -dp[2];
-    denu[2] = dp[0];
-
-    trace(5, "tide_oload: denu=%.3f %.3f %.3f\n", denu[0], denu[1], denu[2]);
-}
-
-
-/* iers mean pole (ref [7] eq.7.25) ------------------------------------------*/
-void iers_mean_pole(gtime_t tut, double *xp_bar, double *yp_bar)
-{
-    const double ep2000[] = {2000, 1, 1, 0, 0, 0};
-    double y, y2, y3;
-
-    y = timediff(tut, epoch2time(ep2000)) / 86400.0 / 365.25;
-
-    if (y < 3653.0 / 365.25)
-        { /* until 2010.0 */
-            y2 = y * y;
-            y3 = y2 * y;
-            *xp_bar = 55.974 + 1.8243 * y + 0.18413 * y2 + 0.007024 * y3; /* (mas) */
-            *yp_bar = 346.346 + 1.7896 * y - 0.10729 * y2 - 0.000908 * y3;
-        }
-    else
-        {                                  /* after 2010.0 */
-            *xp_bar = 23.513 + 7.6141 * y; /* (mas) */
-            *yp_bar = 358.891 - 0.6287 * y;
-        }
-}
-
-
-/* displacement by pole tide (ref [7] eq.7.26) --------------------------------*/
-void tide_pole(gtime_t tut, const double *pos, const double *erpv,
-    double *denu)
-{
-    double xp_bar, yp_bar, m1, m2, cosl, sinl;
-
-    trace(3, "tide_pole: pos=%.3f %.3f\n", pos[0] * R2D, pos[1] * R2D);
-
-    /* iers mean pole (mas) */
-    iers_mean_pole(tut, &xp_bar, &yp_bar);
-
-    /* ref [7] eq.7.24 */
-    m1 = erpv[0] / AS2R - xp_bar * 1E-3; /* (as) */
-    m2 = -erpv[1] / AS2R + yp_bar * 1E-3;
-
-    /* sin(2*theta) = sin(2*phi), cos(2*theta)=-cos(2*phi) */
-    cosl = cos(pos[1]);
-    sinl = sin(pos[1]);
-    denu[0] = 9E-3 * sin(pos[0]) * (m1 * sinl - m2 * cosl);         /* de= Slambda (m) */
-    denu[1] = -9E-3 * cos(2.0 * pos[0]) * (m1 * cosl + m2 * sinl);  /* dn=-Stheta  (m) */
-    denu[2] = -33E-3 * sin(2.0 * pos[0]) * (m1 * cosl + m2 * sinl); /* du= Sr      (m) */
-
-    trace(5, "tide_pole : denu=%.3f %.3f %.3f\n", denu[0], denu[1], denu[2]);
-}
-
-
-/* tidal displacement ----------------------------------------------------------
- * displacements by earth tides
- * args   : gtime_t tutc     I   time in utc
- *          double *rr       I   site position (ecef) (m)
- *          int    opt       I   options (or of the followings)
- *                                 1: solid earth tide
- *                                 2: ocean tide loading
- *                                 4: pole tide
- *                                 8: elimate permanent deformation
- *          double *erp      I   earth rotation parameters (NULL: not used)
- *          double *odisp    I   ocean loading parameters  (NULL: not used)
- *                                 odisp[0+i*6]: consituent i amplitude radial(m)
- *                                 odisp[1+i*6]: consituent i amplitude west  (m)
- *                                 odisp[2+i*6]: consituent i amplitude south (m)
- *                                 odisp[3+i*6]: consituent i phase radial  (deg)
- *                                 odisp[4+i*6]: consituent i phase west    (deg)
- *                                 odisp[5+i*6]: consituent i phase south   (deg)
- *                                (i=0:M2,1:S2,2:N2,3:K2,4:K1,5:O1,6:P1,7:Q1,
- *                                   8:Mf,9:Mm,10:Ssa)
- *          double *dr       O   displacement by earth tides (ecef) (m)
- * return : none
- * notes  : see ref [1], [2] chap 7
- *          see ref [4] 5.2.1, 5.2.2, 5.2.3
- *          ver.2.4.0 does not use ocean loading and pole tide corrections
- *-----------------------------------------------------------------------------*/
-void tidedisp(gtime_t tutc, const double *rr, int opt, const erp_t *erp,
-    const double *odisp, double *dr)
-{
-    gtime_t tut;
-    double pos[2], E[9], drt[3], denu[3], rs[3], rm[3], gmst, erpv[5] = {0};
-    int i;
-#ifdef IERS_MODEL
-    double ep[6], fhr;
-    int year, mon, day;
-#endif
-
-    trace(3, "tidedisp: tutc=%s\n", time_str(tutc, 0));
-
-    if (erp) geterp(erp, tutc, erpv);
-
-    tut = timeadd(tutc, erpv[2]);
-
-    dr[0] = dr[1] = dr[2] = 0.0;
-
-    if (norm_rtk(rr, 3) <= 0.0) return;
-
-    pos[0] = asin(rr[2] / norm_rtk(rr, 3));
-    pos[1] = atan2(rr[1], rr[0]);
-    xyz2enu(pos, E);
-
-    if (opt & 1)
-        { /* solid earth tides */
-
-            /* sun and moon position in ecef */
-            sunmoonpos(tutc, erpv, rs, rm, &gmst);
-
-#ifdef IERS_MODEL
-            time2epoch(tutc, ep);
-            year = (int)ep[0];
-            mon = (int)ep[1];
-            day = (int)ep[2];
-            fhr = ep[3] + ep[4] / 60.0 + ep[5] / 3600.0;
-
-            /* call DEHANTTIDEINEL */
-            dehanttideinel_((double *)rr, &year, &mon, &day, &fhr, rs, rm, drt);
-#else
-            tide_solid(rs, rm, pos, E, gmst, opt, drt);
-#endif
-            for (i = 0; i < 3; i++) dr[i] += drt[i];
-        }
-    if ((opt & 2) && odisp)
-        { /* ocean tide loading */
-            tide_oload(tut, odisp, denu);
-            matmul("TN", 3, 1, 3, 1.0, E, denu, 0.0, drt);
-            for (i = 0; i < 3; i++) dr[i] += drt[i];
-        }
-    if ((opt & 4) && erp)
-        { /* pole tide */
-            tide_pole(tut, pos, erpv, denu);
-            matmul("TN", 3, 1, 3, 1.0, E, denu, 0.0, drt);
-            for (i = 0; i < 3; i++) dr[i] += drt[i];
-        }
-    trace(5, "tidedisp: dr=%.3f %.3f %.3f\n", dr[0], dr[1], dr[2]);
-}
-
-
 /* exclude meas of eclipsing satellite (block IIA) ---------------------------*/
 void testeclipse(const obsd_t *obs, int n, const nav_t *nav, double *rs)
 {
diff --git a/src/algorithms/libs/rtklib/rtklib_ppp.h b/src/algorithms/libs/rtklib/rtklib_ppp.h
index 8d90c3b3e..cd8449e1a 100644
--- a/src/algorithms/libs/rtklib/rtklib_ppp.h
+++ b/src/algorithms/libs/rtklib/rtklib_ppp.h
@@ -129,21 +129,6 @@ int pppamb(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav, const double
 /* functions originally included in RTKLIB/src/ppp.c v2.4.2 */
 void pppoutsolstat(rtk_t *rtk, int level, FILE *fp);
 
-void tide_pl(const double *eu, const double *rp, double GMp, const double *pos, double *dr);
-
-void tide_solid(const double *rsun, const double *rmoon,
-    const double *pos, const double *E, double gmst, int opt,
-    double *dr);
-
-void tide_oload(gtime_t tut, const double *odisp, double *denu);
-
-void iers_mean_pole(gtime_t tut, double *xp_bar, double *yp_bar);
-
-void tide_pole(gtime_t tut, const double *pos, const double *erpv, double *denu);
-
-void tidedisp(gtime_t tutc, const double *rr, int opt, const erp_t *erp,
-    const double *odisp, double *dr);
-
 void testeclipse(const obsd_t *obs, int n, const nav_t *nav, double *rs);
 
 double varerr(int sat, int sys, double el, int type, const prcopt_t *opt);
diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt
index d3cff285a..d3c5b6933 100644
--- a/src/algorithms/observables/adapters/CMakeLists.txt
+++ b/src/algorithms/observables/adapters/CMakeLists.txt
@@ -20,6 +20,10 @@ set(OBS_ADAPTER_SOURCES
 	hybrid_observables.cc
 )
 
+set(OBS_ADAPTER_HEADERS
+	hybrid_observables.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -33,8 +37,6 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
-file(GLOB OBS_ADAPTER_HEADERS "*.h")
-list(SORT OBS_ADAPTER_HEADERS)
 add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS})
 source_group(Headers FILES ${OBS_ADAPTER_HEADERS})
 target_link_libraries(obs_adapters obs_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
index 276908208..d42409de6 100644
--- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
@@ -20,6 +20,10 @@ set(OBS_GR_BLOCKS_SOURCES
 	hybrid_observables_cc.cc
 )
 
+set(OBS_GR_BLOCKS_HEADERS 
+	hybrid_observables_cc.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -34,8 +38,6 @@ include_directories(
      ${MATIO_INCLUDE_DIRS}
 )
 
-file(GLOB OBS_GR_BLOCKS_HEADERS "*.h")
-list(SORT OBS_GR_BLOCKS_HEADERS)
 add_library(obs_gr_blocks ${OBS_GR_BLOCKS_SOURCES} ${OBS_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS})
 if(MATIO_FOUND)
diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt
index 7c3dc92a5..41f5dd8d1 100644
--- a/src/algorithms/resampler/adapters/CMakeLists.txt
+++ b/src/algorithms/resampler/adapters/CMakeLists.txt
@@ -21,6 +21,12 @@ set(RESAMPLER_ADAPTER_SOURCES
         mmse_resampler_conditioner.cc
 )
 
+
+set(RESAMPLER_ADAPTER_HEADERS
+        direct_resampler_conditioner.h
+        mmse_resampler_conditioner.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/interfaces
@@ -36,9 +42,9 @@ if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
      add_definitions( -DGR_GREATER_38=1 )
 endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
 
-
-file(GLOB RESAMPLER_ADAPTER_HEADERS "*.h")
 list(SORT RESAMPLER_ADAPTER_HEADERS)
+list(SORT RESAMPLER_ADAPTER_SOURCES)
+
 add_library(resampler_adapters ${RESAMPLER_ADAPTER_SOURCES} ${RESAMPLER_ADAPTER_HEADERS})
 source_group(Headers FILES ${RESAMPLER_ADAPTER_HEADERS})
 target_link_libraries(resampler_adapters resampler_gr_blocks)
diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
index 70db5015e..81c9e3deb 100644
--- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
@@ -23,6 +23,12 @@ set(RESAMPLER_GR_BLOCKS_SOURCES
      direct_resampler_conditioner_cb.cc
 )
 
+set(RESAMPLER_GR_BLOCKS_HEADERS 
+     direct_resampler_conditioner_cc.h
+     direct_resampler_conditioner_cs.h
+     direct_resampler_conditioner_cb.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${GLOG_INCLUDE_DIRS}
@@ -31,8 +37,9 @@ include_directories(
      ${VOLK_INCLUDE_DIRS}
 )
 
-file(GLOB RESAMPLER_GR_BLOCKS_HEADERS "*.h")
 list(SORT RESAMPLER_GR_BLOCKS_HEADERS)
+list(SORT RESAMPLER_GR_BLOCKS_SOURCES)
+
 add_library(resampler_gr_blocks ${RESAMPLER_GR_BLOCKS_SOURCES} ${RESAMPLER_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS})
 add_dependencies(resampler_gr_blocks glog-${glog_RELEASE})
\ No newline at end of file
diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt
index 3d141ddb3..6562a410c 100644
--- a/src/algorithms/signal_generator/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt
@@ -17,6 +17,7 @@
 #
 
 set(SIGNAL_GENERATOR_ADAPTER_SOURCES signal_generator.cc)
+set(SIGNAL_GENERATOR_ADAPTER_HEADERS signal_generator.h)
 
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
@@ -30,8 +31,6 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
-file(GLOB SIGNAL_GENERATOR_ADAPTER_HEADERS "*.h")
-list(SORT SIGNAL_GENERATOR_ADAPTER_HEADERS)
 add_library(signal_generator_adapters ${SIGNAL_GENERATOR_ADAPTER_SOURCES} ${SIGNAL_GENERATOR_ADAPTER_HEADERS})
 source_group(Headers FILES ${SIGNAL_GENERATOR_ADAPTER_HEADERS})
 target_link_libraries(signal_generator_adapters gnss_sp_libs 
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
index 55e2e9bd6..b8df4e29f 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -17,6 +17,7 @@
 #
 
 set(SIGNAL_GENERATOR_BLOCK_SOURCES signal_generator_c.cc)
+set(SIGNAL_GENERATOR_BLOCK_HEADERS signal_generator_c.h)
 
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
@@ -30,8 +31,6 @@ include_directories(
      ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )
 
-file(GLOB SIGNAL_GENERATOR_BLOCK_HEADERS "*.h")
-list(SORT SIGNAL_GENERATOR_BLOCK_HEADERS)
 add_library(signal_generator_blocks ${SIGNAL_GENERATOR_BLOCK_SOURCES} ${SIGNAL_GENERATOR_BLOCK_HEADERS})
 source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS})
 target_link_libraries(signal_generator_blocks gnss_system_parameters gnss_sp_libs
@@ -44,4 +43,4 @@ if(VOLK_GNSSSDR_FOUND)
     # add_dependencies(signal_generator_blocks glog-${glog_RELEASE})
 else(VOLK_GNSSSDR_FOUND)
     add_dependencies(signal_generator_blocks volk_gnsssdr_module)
-endif()
\ No newline at end of file
+endif(VOLK_GNSSSDR_FOUND)
diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index 4ee93a535..7d37b139f 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -16,8 +16,6 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-file(GLOB SIGNAL_SOURCE_ADAPTER_HEADERS "*.h")
-list(SORT SIGNAL_SOURCE_ADAPTER_HEADERS)
 
 # Optional drivers
 
@@ -30,6 +28,7 @@ if(ENABLE_RAW_UDP)
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${PCAP_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${PCAP_INCLUDE_DIRS})
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} custom_udp_signal_source.cc)
+    set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} custom_udp_signal_source.h)
 endif(ENABLE_RAW_UDP)
 
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
@@ -67,6 +66,7 @@ if(ENABLE_PLUTOSDR)
     ##############################################
     if(IIO_FOUND)
         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} plutosdr_signal_source.cc)
+        set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} plutosdr_signal_source.h)
     endif(IIO_FOUND)
 endif(ENABLE_PLUTOSDR)
 
@@ -77,6 +77,7 @@ if(ENABLE_FMCOMMS2)
     ###############################################
     if(IIO_FOUND)
         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} fmcomms2_signal_source.cc)
+        set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} fmcomms2_signal_source.h)
     endif(IIO_FOUND)
 endif(ENABLE_FMCOMMS2)
 
@@ -86,6 +87,7 @@ if(ENABLE_AD9361)
     ###############################################
     if(LIBIIO_FOUND)
         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} ad9361_fpga_signal_source.cc)
+        set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad9361_fpga_signal_source.h)
     endif(LIBIIO_FOUND)
 endif(ENABLE_AD9361)
 
@@ -103,6 +105,7 @@ if(ENABLE_GN3S)
      set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GR_GN3S_LIBRARIES})
      set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GR_GN3S_INCLUDE_DIRS})
      set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gn3s_signal_source.cc)
+     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gn3s_signal_source.h)
 endif(ENABLE_GN3S)
 
 
@@ -123,6 +126,7 @@ if(ENABLE_FLEXIBAND)
      set(OPT_LIBRARIES ${OPT_LIBRARIES} ${TELEORBIT_LIBRARIES})
      set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${FLEXIBAND_DRIVER_INCLUDE_DIRS})
      set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} flexiband_signal_source.cc)
+     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} flexiband_signal_source.h)
 endif(ENABLE_FLEXIBAND)
 
 
@@ -138,6 +142,7 @@ if(ENABLE_ARRAY)
      set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GR_DBFCTTC_LIBRARIES})
      set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GR_DBFCTTC_INCLUDE_DIRS})
      set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} raw_array_signal_source.cc)
+     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} raw_array_signal_source.h)
 endif(ENABLE_ARRAY)
 
 
@@ -154,8 +159,9 @@ if(ENABLE_OSMOSDR)
         set(OSMO_DRIVER_INCLUDE_DIRS
             ${OPT_DRIVER_INCLUDE_DIRS}
             ${GROSMOSDR_INCLUDE_DIR}/osmosdr
-           )
+        )
         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} osmosdr_signal_source.cc)
+        set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} osmosdr_signal_source.h)
         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GROSMOSDR_LIBRARIES})
         set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${OSMO_DRIVER_INCLUDE_DIRS})
     endif(NOT GROSMOSDR_FOUND)
@@ -163,10 +169,9 @@ endif(ENABLE_OSMOSDR)
 
 if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} uhd_signal_source.cc)
+    set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} uhd_signal_source.h)
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${UHD_INCLUDE_DIRS})
-else(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
-    list(REMOVE_ITEM SIGNAL_SOURCE_ADAPTER_HEADERS ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/adapters/uhd_signal_source.h)
 endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
 
 
@@ -180,10 +185,24 @@ set(SIGNAL_SOURCE_ADAPTER_SOURCES file_signal_source.cc
                                   ${OPT_DRIVER_SOURCES}
 )
 
+set(SIGNAL_SOURCE_ADAPTER_HEADERS file_signal_source.h
+                                  gen_signal_source.h
+                                  nsr_file_signal_source.h
+                                  spir_file_signal_source.h
+                                  spir_gss6450_file_signal_source.h
+                                  rtl_tcp_signal_source.h
+                                  labsat_signal_source.h
+                                  ${OPT_DRIVER_HEADERS}
+)
+
+
 if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
      set(SIGNAL_SOURCE_ADAPTER_SOURCES ${SIGNAL_SOURCE_ADAPTER_SOURCES}
          two_bit_cpx_file_signal_source.cc
          two_bit_packed_file_signal_source.cc )
+     set(SIGNAL_SOURCE_ADAPTER_HEADERS ${SIGNAL_SOURCE_ADAPTER_HEADERS}
+         two_bit_cpx_file_signal_source.h
+         two_bit_packed_file_signal_source.h )         
 endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
 
 include_directories(
@@ -207,6 +226,9 @@ endif(ARCH_64BITS)
 
 add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
 
+list(SORT SIGNAL_SOURCE_ADAPTER_HEADERS)
+list(SORT SIGNAL_SOURCE_ADAPTER_SOURCES)
+
 add_library(signal_source_adapters ${SIGNAL_SOURCE_ADAPTER_SOURCES} ${SIGNAL_SOURCE_ADAPTER_HEADERS})
 source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS})
 target_link_libraries(signal_source_adapters signal_source_gr_blocks
diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index 4108bed58..5c16fac07 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -26,8 +26,10 @@ if(ENABLE_RAW_UDP)
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${PCAP_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${PCAP_INCLUDE_DIRS})
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gr_complex_ip_packet_source.cc)
+    set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gr_complex_ip_packet_source.h)
 endif(ENABLE_RAW_UDP)
 
+
 set(SIGNAL_SOURCE_GR_BLOCKS_SOURCES
      unpack_byte_2bit_samples.cc
      unpack_byte_2bit_cpx_samples.cc
@@ -40,6 +42,19 @@ set(SIGNAL_SOURCE_GR_BLOCKS_SOURCES
      ${OPT_DRIVER_SOURCES}
 )
 
+set(SIGNAL_SOURCE_GR_BLOCKS_HEADERS
+     unpack_byte_2bit_samples.h
+     unpack_byte_2bit_cpx_samples.h
+     unpack_byte_4bit_samples.h
+     unpack_intspir_1bit_samples.h
+     rtl_tcp_signal_source_c.h
+     unpack_2bit_samples.h
+     unpack_spir_gss6450_samples.h
+     labsat23_source.h
+     ${OPT_DRIVER_HEADERS}
+)
+
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs
@@ -50,8 +65,9 @@ include_directories(
      ${OPT_DRIVER_INCLUDE_DIRS}
 )
 
-file(GLOB SIGNAL_SOURCE_GR_BLOCKS_HEADERS "*.h")
 list(SORT SIGNAL_SOURCE_GR_BLOCKS_HEADERS)
+list(SORT SIGNAL_SOURCE_GR_BLOCKS_SOURCES)
+
 add_library(signal_source_gr_blocks ${SIGNAL_SOURCE_GR_BLOCKS_SOURCES} ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS})
 target_link_libraries(signal_source_gr_blocks 
diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt
index 8ace0c109..a7e5c8495 100644
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -63,21 +63,23 @@ include_directories(
      ${GLOG_INCLUDE_DIRS}
      ${GFlags_INCLUDE_DIRS}
      ${OPT_DRIVER_INCLUDE_DIRS}
-     )
+)
 
 set(SIGNAL_SOURCE_LIB_SOURCES
      rtl_tcp_commands.cc
      rtl_tcp_dongle_info.cc
      ${OPT_SIGNAL_SOURCE_LIB_SOURCES}
-     )
+)
  
 set(SIGNAL_SOURCE_LIB_HEADERS
      rtl_tcp_commands.h
      rtl_tcp_dongle_info.h
      ${OPT_SIGNAL_SOURCE_LIB_HEADERS}
-     )
+)
 
 list(SORT SIGNAL_SOURCE_LIB_HEADERS)
+list(SORT SIGNAL_SOURCE_LIB_SOURCES)
+
 add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
 source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
 target_link_libraries(signal_source_lib ${OPT_LIBRARIES})
diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
index 6722ce03b..db68a7cce 100644
--- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
@@ -28,6 +28,17 @@ set(TELEMETRY_DECODER_ADAPTER_SOURCES
     glonass_l2_ca_telemetry_decoder.cc 
 )
 
+set(TELEMETRY_DECODER_ADAPTER_HEADERS
+    gps_l1_ca_telemetry_decoder.h
+    gps_l2c_telemetry_decoder.h
+    gps_l5_telemetry_decoder.h 
+    galileo_e1b_telemetry_decoder.h
+    sbas_l1_telemetry_decoder.h
+    galileo_e5a_telemetry_decoder.h
+    glonass_l1_ca_telemetry_decoder.h
+    glonass_l2_ca_telemetry_decoder.h 
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -42,8 +53,9 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
-file(GLOB TELEMETRY_DECODER_ADAPTER_HEADERS "*.h")
 list(SORT TELEMETRY_DECODER_ADAPTER_HEADERS)
+list(SORT TELEMETRY_DECODER_ADAPTER_SOURCES)
+
 add_library(telemetry_decoder_adapters ${TELEMETRY_DECODER_ADAPTER_SOURCES} ${TELEMETRY_DECODER_ADAPTER_HEADERS})
 source_group(Headers FILES ${TELEMETRY_DECODER_ADAPTER_HEADERS})
 target_link_libraries(telemetry_decoder_adapters telemetry_decoder_gr_blocks gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
index 5a49bf03a..e0a102148 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
@@ -26,6 +26,16 @@ set(TELEMETRY_DECODER_GR_BLOCKS_SOURCES
      galileo_telemetry_decoder_cc.cc
 )
 
+set(TELEMETRY_DECODER_GR_BLOCKS_HEADERS
+     gps_l1_ca_telemetry_decoder_cc.h
+     gps_l2c_telemetry_decoder_cc.h
+     gps_l5_telemetry_decoder_cc.h
+     sbas_l1_telemetry_decoder_cc.h
+     glonass_l1_ca_telemetry_decoder_cc.h
+     glonass_l2_ca_telemetry_decoder_cc.h
+     galileo_telemetry_decoder_cc.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -39,8 +49,9 @@ include_directories(
      ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )
 
-file(GLOB TELEMETRY_DECODER_GR_BLOCKS_HEADERS "*.h")
 list(SORT TELEMETRY_DECODER_GR_BLOCKS_HEADERS)
+list(SORT TELEMETRY_DECODER_GR_BLOCKS_SOURCES)
+
 add_library(telemetry_decoder_gr_blocks ${TELEMETRY_DECODER_GR_BLOCKS_SOURCES} ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS})
 target_link_libraries(telemetry_decoder_gr_blocks telemetry_decoder_libswiftcnav telemetry_decoder_lib gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES})
diff --git a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
index b8a2fcd2f..5c663c93a 100644
--- a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
@@ -22,6 +22,11 @@ set(TELEMETRY_DECODER_LIB_SOURCES
      viterbi_decoder.cc
 )
 
+set(TELEMETRY_DECODER_LIB_HEADERS
+     viterbi_decoder.h
+     convolutional.h
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -33,9 +38,9 @@ include_directories(
      ${GFlags_INCLUDE_DIRS}
 )
 
-file(GLOB TELEMETRY_DECODER_LIB_HEADERS "*.h")
-
 list(SORT TELEMETRY_DECODER_LIB_HEADERS)
+list(SORT TELEMETRY_DECODER_LIB_SOURCES)
+
 add_library(telemetry_decoder_lib ${TELEMETRY_DECODER_LIB_SOURCES} ${TELEMETRY_DECODER_LIB_HEADERS})
 source_group(Headers FILES ${TELEMETRY_DECODER_LIB_HEADERS})
 target_link_libraries(telemetry_decoder_lib gnss_system_parameters)
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt
index a9f7a1622..8dba92115 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt
@@ -23,13 +23,21 @@ set(TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES
      viterbi27.c   
 )
 
+set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS 
+     cnav_msg.h
+     bits.h
+     edc.h
+     swift_common.h  
+     fec.h 
+)
+
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-file(GLOB TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS "*.h")
 list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS)
+list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES)
 
 add_library(telemetry_decoder_libswiftcnav STATIC ${TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES} ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS})
 source_group(Headers FILES ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS})
-set_target_properties(telemetry_decoder_libswiftcnav PROPERTIES LINKER_LANGUAGE C)
\ No newline at end of file
+set_target_properties(telemetry_decoder_libswiftcnav PROPERTIES LINKER_LANGUAGE C)
diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index ae1754aa2..e8d12d844 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -17,12 +17,25 @@
 #
 
 if(ENABLE_CUDA)
-     set(OPT_TRACKING_ADAPTERS ${OPT_TRACKING_ADAPTERS} gps_l1_ca_dll_pll_tracking_gpu.cc)
+     set(OPT_TRACKING_ADAPTERS_SOURCES ${OPT_TRACKING_ADAPTERS_SOURCES} gps_l1_ca_dll_pll_tracking_gpu.cc)
+     set(OPT_TRACKING_ADAPTERS_HEADERS ${OPT_TRACKING_ADAPTERS_HEADERS} gps_l1_ca_dll_pll_tracking_gpu.h)
      set(OPT_TRACKING_INCLUDE_DIRS ${OPT_TRACKING_INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS})
 endif(ENABLE_CUDA)
 
 if(ENABLE_FPGA)
-     SET(OPT_TRACKING_ADAPTERS ${OPT_TRACKING_ADAPTERS} gps_l1_ca_dll_pll_tracking_fpga.cc gps_l2_m_dll_pll_tracking_fpga.cc galileo_e1_dll_pll_veml_tracking_fpga.cc galileo_e5a_dll_pll_tracking_fpga.cc gps_l5_dll_pll_tracking_fpga.cc)
+     set(OPT_TRACKING_ADAPTERS_SOURCES ${OPT_TRACKING_ADAPTERS_SOURCES} 
+                                       gps_l1_ca_dll_pll_tracking_fpga.cc
+                                       gps_l2_m_dll_pll_tracking_fpga.cc
+                                       galileo_e1_dll_pll_veml_tracking_fpga.cc
+                                       galileo_e5a_dll_pll_tracking_fpga.cc
+                                       gps_l5_dll_pll_tracking_fpga.cc)
+
+     set(OPT_TRACKING_ADAPTERS_HEADERS ${OPT_TRACKING_ADAPTERS_HEADERS} 
+                                       gps_l1_ca_dll_pll_tracking_fpga.h
+                                       gps_l2_m_dll_pll_tracking_fpga.h
+                                       galileo_e1_dll_pll_veml_tracking_fpga.h
+                                       galileo_e5a_dll_pll_tracking_fpga.h
+                                       gps_l5_dll_pll_tracking_fpga.h)                       
 endif(ENABLE_FPGA)
 
 set(TRACKING_ADAPTER_SOURCES
@@ -39,7 +52,24 @@ set(TRACKING_ADAPTER_SOURCES
      gps_l5_dll_pll_tracking.cc
      glonass_l2_ca_dll_pll_tracking.cc
      glonass_l2_ca_dll_pll_c_aid_tracking.cc
-     ${OPT_TRACKING_ADAPTERS}
+     ${OPT_TRACKING_ADAPTERS_SOURCES}
+)
+
+set(TRACKING_ADAPTER_HEADERS
+     galileo_e1_dll_pll_veml_tracking.h
+     galileo_e1_tcp_connector_tracking.h
+     gps_l1_ca_dll_pll_tracking.h
+     gps_l1_ca_dll_pll_c_aid_tracking.h
+     gps_l1_ca_tcp_connector_tracking.h
+     galileo_e5a_dll_pll_tracking.h
+     gps_l2_m_dll_pll_tracking.h
+     glonass_l1_ca_dll_pll_tracking.h
+     glonass_l1_ca_dll_pll_c_aid_tracking.h
+     gps_l1_ca_kf_tracking.h
+     gps_l5_dll_pll_tracking.h
+     glonass_l2_ca_dll_pll_tracking.h
+     glonass_l2_ca_dll_pll_c_aid_tracking.h
+     ${OPT_TRACKING_ADAPTERS_HEADERS}
 )
 
 include_directories(
@@ -58,8 +88,9 @@ include_directories(
      ${OPT_TRACKING_INCLUDE_DIRS}
 )
 
-file(GLOB TRACKING_ADAPTER_HEADERS "*.h")
 list(SORT TRACKING_ADAPTER_HEADERS)
+list(SORT TRACKING_ADAPTER_SOURCES)
+
 add_library(tracking_adapters ${TRACKING_ADAPTER_SOURCES} ${TRACKING_ADAPTER_HEADERS})
 source_group(Headers FILES ${TRACKING_ADAPTER_HEADERS})
 target_link_libraries(tracking_adapters tracking_gr_blocks gnss_sp_libs gnss_sdr_flags)
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index b1a67d6bb..d31676a64 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -17,13 +17,15 @@
 #
 
 if(ENABLE_CUDA)
-     set(OPT_TRACKING_BLOCKS ${OPT_TRACKING_BLOCKS} gps_l1_ca_dll_pll_tracking_gpu_cc.cc)
+     set(OPT_TRACKING_BLOCKS_SOURCES ${OPT_TRACKING_BLOCKS_SOURCES} gps_l1_ca_dll_pll_tracking_gpu_cc.cc)
+     set(OPT_TRACKING_BLOCKS_HEADERS ${OPT_TRACKING_BLOCKS_HEADERS} gps_l1_ca_dll_pll_tracking_gpu_cc.h)
      set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS})
      set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} ${CUDA_LIBRARIES})
 endif(ENABLE_CUDA)
 
 if(ENABLE_FPGA)
-     set(OPT_TRACKING_BLOCKS ${OPT_TRACKING_BLOCKS} dll_pll_veml_tracking_fpga.cc)
+     set(OPT_TRACKING_BLOCKS_SOURCES ${OPT_TRACKING_BLOCKS_SOURCES} dll_pll_veml_tracking_fpga.cc)
+     set(OPT_TRACKING_BLOCKS_HEADERS ${OPT_TRACKING_BLOCKS_HEADERS} dll_pll_veml_tracking_fpga.h)
 endif(ENABLE_FPGA)
 
 set(TRACKING_GR_BLOCKS_SOURCES
@@ -39,7 +41,23 @@ set(TRACKING_GR_BLOCKS_SOURCES
      glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
      glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
      dll_pll_veml_tracking.cc
-     ${OPT_TRACKING_BLOCKS}
+     ${OPT_TRACKING_BLOCKS_SOURCES}
+)
+
+set(TRACKING_GR_BLOCKS_HEADERS
+     galileo_e1_tcp_connector_tracking_cc.h
+     gps_l1_ca_tcp_connector_tracking_cc.h
+     gps_l1_ca_dll_pll_c_aid_tracking_cc.h
+     gps_l1_ca_dll_pll_c_aid_tracking_sc.h
+     glonass_l1_ca_dll_pll_tracking_cc.h
+     glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
+     glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
+     gps_l1_ca_kf_tracking_cc.h  
+     glonass_l2_ca_dll_pll_tracking_cc.h
+     glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
+     glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
+     dll_pll_veml_tracking.h
+     ${OPT_TRACKING_BLOCKS_HEADERS}
 )
 
 include_directories(
@@ -63,8 +81,9 @@ if(ENABLE_GENERIC_ARCH)
     add_definitions( -DGENERIC_ARCH=1 )
 endif(ENABLE_GENERIC_ARCH)
 
-file(GLOB TRACKING_GR_BLOCKS_HEADERS "*.h")
 list(SORT TRACKING_GR_BLOCKS_HEADERS)
+list(SORT TRACKING_GR_BLOCKS_SOURCES)
+
 add_library(tracking_gr_blocks ${TRACKING_GR_BLOCKS_SOURCES} ${TRACKING_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
 
diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index 6ee4d4fce..72d3c66e0 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -30,7 +30,6 @@ if(ENABLE_CUDA)
 endif(ENABLE_CUDA)
 
 
-
 set(TRACKING_LIB_SOURCES
      cpu_multicorrelator.cc
      cpu_multicorrelator_real_codes.cc
@@ -47,8 +46,25 @@ set(TRACKING_LIB_SOURCES
      bayesian_estimation.cc
 )
 
+set(TRACKING_LIB_HEADERS
+     cpu_multicorrelator.h
+     cpu_multicorrelator_real_codes.h
+     cpu_multicorrelator_16sc.h
+     lock_detectors.h
+     tcp_communication.h
+     tcp_packet_data.h
+     tracking_2nd_DLL_filter.h
+     tracking_2nd_PLL_filter.h
+     tracking_discriminators.h
+     tracking_FLL_PLL_filter.h
+     tracking_loop_filter.h
+     dll_pll_conf.h
+     bayesian_estimation.h
+)
+
 if(ENABLE_FPGA)
-    SET(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} fpga_multicorrelator.cc dll_pll_conf_fpga.cc)
+    set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} fpga_multicorrelator.cc dll_pll_conf_fpga.cc)
+    set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} fpga_multicorrelator.h dll_pll_conf_fpga.h)
 endif(ENABLE_FPGA)
 
 include_directories(
@@ -74,8 +90,9 @@ if (SSE3_AVAILABLE)
 endif(SSE3_AVAILABLE)
 
 
-file(GLOB TRACKING_LIB_HEADERS "*.h")
 list(SORT TRACKING_LIB_HEADERS)
+list(SORT TRACKING_LIB_SOURCES)
+
 add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
 source_group(Headers FILES ${TRACKING_LIB_HEADERS})
 target_link_libraries(tracking_lib ${OPT_TRACKING_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt
index c68d6d1d0..f8b7f7dc0 100644
--- a/src/core/libs/CMakeLists.txt
+++ b/src/core/libs/CMakeLists.txt
@@ -23,11 +23,18 @@ if(OPENSSL_FOUND)
 endif(OPENSSL_FOUND)
 
 set(CORE_LIBS_SOURCES 
-    ini.cc 
-    INIReader.cc 
+    ini.cc
+    INIReader.cc
     string_converter.cc
     gnss_sdr_supl_client.cc
 )
+
+set(CORE_LIBS_HEADERS 
+    ini.h
+    INIReader.h
+    string_converter.h
+    gnss_sdr_supl_client.h
+)
 	
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -40,8 +47,9 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
 )
 
-file(GLOB CORE_LIBS_HEADERS "*.h")
 list(SORT CORE_LIBS_HEADERS)
+list(SORT CORE_LIBS_SOURCES)
+
 add_library(rx_core_lib ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS})
 source_group(Headers FILES ${CORE_LIBS_HEADERS})
 target_link_libraries(rx_core_lib supl_library) 
diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt
index 00f051f39..ccbdd9f44 100644
--- a/src/core/monitor/CMakeLists.txt
+++ b/src/core/monitor/CMakeLists.txt
@@ -21,7 +21,13 @@ set(CORE_MONITOR_LIBS_SOURCES
 	gnss_synchro_monitor.cc
 	gnss_synchro_udp_sink.cc
 )
-	
+
+set(CORE_MONITOR_LIBS_HEADERS 
+	gnss_synchro_monitor.h
+	gnss_synchro_udp_sink.h
+)
+
+
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -31,8 +37,9 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
 )
 
-file(GLOB CORE_MONITOR_LIBS_HEADERS "*.h")
 list(SORT CORE_MONITOR_LIBS_HEADERS)
+list(SORT CORE_MONITOR_LIBS_SOURCES)
+
 add_library(core_monitor_lib ${CORE_MONITOR_LIBS_SOURCES} ${CORE_MONITOR_LIBS_HEADERS})
 source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS})
 target_link_libraries(core_monitor_lib ${Boost_LIBRARIES}) 
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index c135cb0c0..decc866d9 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -26,6 +26,17 @@ set(GNSS_RECEIVER_SOURCES
      in_memory_configuration.cc
 )
 
+set(GNSS_RECEIVER_HEADERS
+     control_thread.h
+     control_message_factory.h
+     file_configuration.h
+     gnss_block_factory.h
+     gnss_flowgraph.h
+     in_memory_configuration.h
+     concurrent_map.h
+     concurrent_queue.h
+     control_message.h
+)
 
 if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
      add_definitions(-DMODERN_GNURADIO=1)
@@ -149,10 +160,21 @@ include_directories(
      ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )
 
-file(GLOB GNSS_RECEIVER_HEADERS "*.h")
 list(SORT GNSS_RECEIVER_HEADERS)
-file(GLOB GNSS_RECEIVER_INTERFACE_HEADERS "../interfaces/*.h")
+list(SORT GNSS_RECEIVER_SOURCES)
+
+set(GNSS_RECEIVER_INTERFACE_HEADERS ../interfaces/acquisition_interface.h
+                                    ../interfaces/channel_interface.h
+                                    ../interfaces/configuration_interface.h
+                                    ../interfaces/gnss_block_interface.h
+                                    ../interfaces/observables_interface.h
+                                    ../interfaces/pvt_interface.h
+                                    ../interfaces/telemetry_decoder_interface.h
+                                    ../interfaces/tracking_interface.h
+)
+
 list(SORT GNSS_RECEIVER_INTERFACE_HEADERS)
+
 add_library(gnss_rx ${GNSS_RECEIVER_SOURCES} ${GNSS_RECEIVER_HEADERS} ${GNSS_RECEIVER_INTERFACE_HEADERS})
 source_group(Headers FILES ${GNSS_RECEIVER_HEADERS} ${GNSS_RECEIVER_INTERFACE_HEADERS})
 
diff --git a/src/core/system_parameters/CMakeLists.txt b/src/core/system_parameters/CMakeLists.txt
index 2d7c10f23..ec8880116 100644
--- a/src/core/system_parameters/CMakeLists.txt
+++ b/src/core/system_parameters/CMakeLists.txt
@@ -45,6 +45,47 @@ set(SYSTEM_PARAMETERS_SOURCES
      glonass_gnav_navigation_message.cc
 )
 
+set(SYSTEM_PARAMETERS_HEADERS
+     gnss_satellite.h
+     gnss_signal.h
+     gps_navigation_message.h
+     gps_ephemeris.h
+     gps_iono.h
+     gps_almanac.h
+     gps_utc_model.h
+     gps_acq_assist.h
+     gps_ref_time.h
+     gps_ref_location.h
+     galileo_utc_model.h
+     galileo_ephemeris.h
+     galileo_almanac.h
+     galileo_iono.h
+     galileo_navigation_message.h
+     sbas_ephemeris.h
+     galileo_fnav_message.h
+     gps_cnav_ephemeris.h
+     gps_cnav_navigation_message.h
+     gps_cnav_iono.h
+     gps_cnav_utc_model.h
+     rtcm.h
+     glonass_gnav_ephemeris.h
+     glonass_gnav_almanac.h
+     glonass_gnav_utc_model.h
+     glonass_gnav_navigation_message.h
+     display.h
+     Galileo_E1.h
+     Galileo_E5a.h
+     GLONASS_L1_L2_CA.h
+     gnss_frequencies.h
+     gnss_obs_codes.h
+     gnss_synchro.h
+     GPS_CNAV.h
+     GPS_L1_CA.h
+     GPS_L2C.h
+     GPS_L5.h
+     MATH_CONSTANTS.h     
+)
+
 
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
@@ -57,8 +98,10 @@ include_directories(
 )
 
 link_directories(${Boost_LIBRARY_DIR})
-file(GLOB SYSTEM_PARAMETERS_HEADERS "*.h")
+
 list(SORT SYSTEM_PARAMETERS_HEADERS)
+list(SORT SYSTEM_PARAMETERS_SOURCES)
+
 add_library(gnss_system_parameters ${SYSTEM_PARAMETERS_SOURCES} ${SYSTEM_PARAMETERS_HEADERS})
 source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS})
 add_dependencies(gnss_system_parameters rtklib_lib glog-${glog_RELEASE})
diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index 81ecf1e54..6f0b15acb 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -22,6 +22,8 @@ if(OPENSSL_FOUND)
 endif(OPENSSL_FOUND)
 
 set(FRONT_END_CAL_SOURCES front_end_cal.cc)
+set(FRONT_END_CAL_HEADERS front_end_cal.h)
+
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -44,8 +46,6 @@ include_directories(
     ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )
 
-file(GLOB FRONT_END_CAL_HEADERS "*.h")
-list(SORT FRONT_END_CAL_HEADERS)
 add_library(front_end_cal_lib ${FRONT_END_CAL_SOURCES} ${FRONT_END_CAL_HEADERS})
 source_group(Headers FILES ${FRONT_END_CAL_HEADERS})
 
@@ -114,5 +114,3 @@ if(NOT GZIP_NOTFOUND)
 
     install(FILES ${CMAKE_BINARY_DIR}/front-end-cal.1.gz DESTINATION share/man/man1)
 endif(NOT GZIP_NOTFOUND)
-
-