diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc
index 97a42c8c7..1d76658e4 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc
@@ -20,10 +20,11 @@
 #include <config.h>
 #endif
 
-#include <volk_gnsssdr/constants.h>
-#include "volk_gnsssdr/volk_gnsssdr.h"
-#include <iostream>
-#include "volk_gnsssdr_option_helpers.h"
+#include <volk_gnsssdr/constants.h>      // for volk_gnsssdr_available_machines, volk_gnsssdr_c_compiler ...
+#include <iostream>                      // for operator<<, endl, cout, ostream
+#include <string>                        // for string
+#include "volk_gnsssdr/volk_gnsssdr.h"   // for volk_gnsssdr_get_alignment, volk_gnsssdr_get_machine
+#include "volk_gnsssdr_option_helpers.h" // for option_list, option_t
 
 void print_alignment()
 {
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc
index 298bb062f..61e085423 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc
@@ -17,8 +17,14 @@
  */
 
 #include "volk_gnsssdr_option_helpers.h"
+#include <climits>      // IWYU pragma: keep
+#include <cstdlib>      // IWYU pragma: keep
+#include <cstring>      // IWYU pragma: keep
+#include <exception>    // for exception
+#include <iostream>     // for operator<<, endl, basic_ostream, cout, ostream
+#include <utility>      // for pair
+
 
-#include <iostream>
 
 /*
  * Option type
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h
index 10bde4586..30cb98210 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h
@@ -19,9 +19,13 @@
 #ifndef VOLK_VOLK_OPTION_HELPERS_H
 #define VOLK_VOLK_OPTION_HELPERS_H
 
+#include <climits>
+#include <cstring>
+#include <map>
 #include <string>
 #include <vector>
 
+
 typedef enum
 {
     VOID_CALLBACK,
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
index eff989ef5..bf8a7ec77 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
+/* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
  *
  * This file is part of GNSS-SDR.
  *
@@ -16,19 +16,24 @@
  * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "qa_utils.h"
-#include "kernel_tests.h"
-#include "volk_gnsssdr_option_helpers.h"
+
+#include <sys/stat.h>                          // for stat
+#include <cstddef>                             // for size_t
+#include <iostream>                            // for operator<<, basic_ostream
+#include <fstream>                             // IWYU pragma: keep
+#include <map>                                 // for map, map<>::iterator
+#include <utility>                             // for pair
+#include <vector>                              // for vector, vector<>::const_...
+#include <boost/filesystem/operations.hpp>     // for create_directories, exists
+#include <boost/filesystem/path.hpp>           // for path, operator<<
+#include <boost/filesystem/path_traits.hpp>    // for filesystem
+#include <volk_gnsssdr/volk_gnsssdr_prefs.h>   // for volk_gnsssdr_get_config_path
+#include "kernel_tests.h"                      // for init_test_list
+#include "qa_utils.h"                          // for volk_gnsssdr_test_results_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t
+#include "volk_gnsssdr_option_helpers.h"       // for option_list, option_t
 #include "volk_gnsssdr_profile.h"
 
-#include <volk_gnsssdr/volk_gnsssdr.h>
-#include <volk_gnsssdr/volk_gnsssdr_prefs.h>
-
-#include <vector>
-#include <boost/filesystem.hpp>
-#include <iostream>
-#include <fstream>
-#include <sys/stat.h>
 
 namespace fs = boost::filesystem;
 
@@ -222,7 +227,7 @@ void write_results(const std::vector<volk_gnsssdr_test_results_t> *results, bool
     const fs::path config_path(path);
     // Until we can update the config on a kernel by kernel basis
     // do not overwrite volk_gnsssdr_config when using a regex.
-    if (not fs::exists(config_path.branch_path()))
+    if (! fs::exists(config_path.branch_path()))
     {
         std::cout << "Creating " << config_path.branch_path() << " ..." << std::endl;
         fs::create_directories(config_path.branch_path());
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.h
index 4530c6be7..26ff1249b 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.h
@@ -27,6 +27,12 @@
  * -------------------------------------------------------------------------
  */
 
+#include <cstdbool>   // for bool
+#include <iosfwd>     // for ofstream
+#include <string>     // for string
+#include <vector>     // for vector
+
+class volk_test_results_t;
 
 
 void read_results(std::vector<volk_gnsssdr_test_results_t> *results);
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
index 3d60c2714..35186fc1b 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
+/* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
  *
  * This file is part of GNSS-SDR.
  *
@@ -17,13 +17,25 @@
  */
 
 #include "qa_utils.h"
-#include <chrono>
-#include <random>
-#include <boost/foreach.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/lexical_cast.hpp>
-#include <volk_gnsssdr/volk_gnsssdr_cpu.h>
-#include <volk_gnsssdr/volk_gnsssdr_malloc.h>
+#include <cassert>                                  // for assert
+#include <chrono>                                   // for system_clock, duration,...
+#include <cmath>                                    // for sqrt, fabs, abs
+#include <cstdint>                                  // for uint16_t, uint64_t,int16_t, int32_t
+#include <cstring>                                  // for memcpy, memset
+#include <fstream>                                  // for operator<<
+#include <iostream>                                 // for cout, cerr
+#include <limits>                                   // for numeric_limits
+#include <map>                                      // for map
+#include <random>                                   // for random_device, default_random_engine, uniform_real_distribution
+#include <vector>                                   // for vector
+#include <boost/foreach.hpp>                        // for auto_any_base
+#include <boost/lexical_cast.hpp>                   // for lexical_cast
+#include <boost/token_functions.hpp>                // for char_separator
+#include <boost/token_iterator.hpp>                 // for token_iterator
+#include <boost/tokenizer.hpp>                      // for tokenizer
+#include <volk_gnsssdr/volk_gnsssdr.h>              // for volk_gnsssdr_func_desc_t
+#include <volk_gnsssdr/volk_gnsssdr_malloc.h>       // for volk_gnsssdr_free, volk_gnsssdr_malloc
+
 
 float uniform() {
     std::random_device r;
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
index 8188529b0..b7b16a63d 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
+/* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
  *
  * This file is part of GNSS-SDR.
  *
@@ -23,13 +23,14 @@
 #define _DARWIN_C_SOURCE
 #endif
 
-#include <string>
-#include <iostream>
-#include <fstream>
-#include <vector>
-#include <map>
-#include <volk_gnsssdr/volk_gnsssdr.h>
-#include <volk_gnsssdr/volk_gnsssdr_common.h>
+#include <cstdbool>       // for bool, false
+#include <cstdlib>        // for NULL
+#include <map>            // for map
+#include <string>         // for string, basic_string
+#include <vector>         // for vector
+#include <volk_gnsssdr/volk_gnsssdr.h>          // for volk_gnsssdr_func_desc_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
+
 
 /************************************************
  * VOLK QA type definitions                     *
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc
index 659b111c4..bc9e526dc 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
  *
  * This file is part of GNSS-SDR.
  *
@@ -18,15 +18,16 @@
  */
 
 
-#include "qa_utils.h"
-#include "kernel_tests.h"
-
-#include <volk_gnsssdr/volk_gnsssdr.h>
-
-#include <vector>
-#include <utility>
-#include <iostream>
-#include <fstream>
+#include <cstdbool>             // for bool, false, true
+#include <iostream>             // for operator<<, basic_ostream, endl, char...
+#include <fstream>              // IWYU pragma: keep
+#include <map>                  // for map, map<>::iterator, _Rb_tree_iterator
+#include <string>               // for string, operator<<
+#include <utility>              // for pair
+#include <vector>               // for vector
+#include "kernel_tests.h"       // for init_test_list
+#include "qa_utils.h"           // for volk_gnsssdr_test_case_t, volk_gnsssdr_test_results_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
 
 void print_qa_xml(std::vector<volk_gnsssdr_test_results_t> results, unsigned int nfails);