diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
index 9bbc9475f..e68379712 100644
--- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
@@ -150,7 +150,6 @@ void GlonassL1CaPcpsAcquisition::set_threshold(float threshold)
 
     DLOG(INFO) << "Channel " << channel_ << " Threshold = " << threshold_;
 
-
     if (item_type_.compare("cshort") == 0)
         {
             acquisition_sc_->set_threshold(threshold_);
@@ -237,7 +236,6 @@ void GlonassL1CaPcpsAcquisition::init()
 
 void GlonassL1CaPcpsAcquisition::set_local_code()
 {
-
     std::complex<float>* code = new std::complex<float>[code_length_];
 
     glonass_l1_ca_code_gen_complex_sampled(code,/* gnss_synchro_->PRN,*/ fs_in_, 0);
diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h
index f338a1504..e45e35cb0 100644
--- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h
@@ -42,8 +42,6 @@
 #include "pcps_acquisition_cc.h"
 #include "pcps_acquisition_sc.h"
 #include "complex_byte_to_float_x2.h"
-#include <volk_gnsssdr/volk_gnsssdr.h>
-
 
 
 class ConfigurationInterface;
diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h
index 0996924d2..73e5f8251 100644
--- a/src/tests/common-files/gnuplot_i.h
+++ b/src/tests/common-files/gnuplot_i.h
@@ -941,7 +941,7 @@ bool Gnuplot::set_GNUPlotPath(const std::string &path)
 void Gnuplot::set_terminal_std(const std::string &type)
 {
 #if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
-    if (type.find("x11") != std::string::npos && getenv("DISPLAY") == NULL)
+    if (type.find("x11") != std::string::npos && std::getenv("DISPLAY") == NULL)
         {
             throw GnuplotException("Can't find DISPLAY variable");
         }
@@ -1808,7 +1808,7 @@ void Gnuplot::init()
     // whose name is specified as argument.  If the requested variable is not
     // part of the environment list, the function returns a NULL pointer.
 #if ( defined(unix) || defined(__unix) || defined(__unix__) ) && !defined(__APPLE__)
-    if (getenv("DISPLAY") == NULL)
+    if (std::getenv("DISPLAY") == NULL)
         {
             valid = false;
             throw GnuplotException("Can't find DISPLAY variable");
@@ -1885,7 +1885,7 @@ bool Gnuplot::get_program_path()
     //
     char *path;
     // Retrieves a C string containing the value of environment variable PATH
-    path = getenv("PATH");
+    path = std::getenv("PATH");
 
     if (path == NULL)
         {
@@ -1894,7 +1894,7 @@ bool Gnuplot::get_program_path()
     else
         {
             std::list<std::string> ls;
-            std::string path_str = path;
+            std::string path_str(path);
 
             //split path (one long string) into list ls of strings
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__)
@@ -2007,10 +2007,9 @@ std::string Gnuplot::create_tmpfile(std::ofstream &tmp)
         {
             std::ostringstream except;
             except << "Maximum number of temporary files reached ("
-                    << GP_MAX_TMP_FILES << "): cannot open more files" << std::endl;
+                   << GP_MAX_TMP_FILES << "): cannot open more files" << std::endl;
 
             throw GnuplotException( except.str() );
-            return "";
         }
 
     // int mkstemp(char *name);