diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h
index 822b26942..c7c98108b 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h
@@ -30,12 +30,14 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef INCLUDED_volk_gnsssdr_32fc_convert_16ic_u_H
-#define INCLUDED_volk_gnsssdr_32fc_convert_16ic_u_H
-
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"
+
+#ifndef INCLUDED_volk_gnsssdr_32fc_convert_16ic_u_H
+#define INCLUDED_volk_gnsssdr_32fc_convert_16ic_u_H
+
 
 #ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
@@ -168,10 +170,6 @@ static inline void volk_gnsssdr_32fc_convert_16ic_generic(lv_16sc_t* outputVecto
 #ifndef INCLUDED_volk_gnsssdr_32fc_convert_16ic_a_H
 #define INCLUDED_volk_gnsssdr_32fc_convert_16ic_a_H
 
-#include <volk/volk_common.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <math.h>
 
 #ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h
index 943f0aa5c..f9ffa8643 100755
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h
@@ -30,12 +30,15 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef INCLUDED_volk_gnsssdr_32fc_convert_8ic_u_H
-#define INCLUDED_volk_gnsssdr_32fc_convert_8ic_u_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"
+
+
+#ifndef INCLUDED_volk_gnsssdr_32fc_convert_8ic_u_H
+#define INCLUDED_volk_gnsssdr_32fc_convert_8ic_u_H
 
 #ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
@@ -129,10 +132,6 @@ static inline void volk_gnsssdr_32fc_convert_8ic_generic(lv_8sc_t* outputVector,
 #ifndef INCLUDED_volk_gnsssdr_32fc_convert_8ic_a_H
 #define INCLUDED_volk_gnsssdr_32fc_convert_8ic_a_H
 
-#include <volk/volk_common.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <math.h>
 
 #ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_convert_8ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_convert_8ic.h
index 2bb62334c..c81a40f57 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_convert_8ic.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_s32f_convert_8ic.h
@@ -30,12 +30,15 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef INCLUDED_volk_gnsssdr_32fc_s32f_convert_8ic_u_H
-#define INCLUDED_volk_gnsssdr_32fc_s32f_convert_8ic_u_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"
+
+
+#ifndef INCLUDED_volk_gnsssdr_32fc_s32f_convert_8ic_u_H
+#define INCLUDED_volk_gnsssdr_32fc_s32f_convert_8ic_u_H
 
 #ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
@@ -138,10 +141,6 @@ static inline void volk_gnsssdr_32fc_s32f_convert_8ic_generic(lv_8sc_t* outputVe
 #ifndef INCLUDED_volk_gnsssdr_32fc_s32f_convert_8ic_a_H
 #define INCLUDED_volk_gnsssdr_32fc_s32f_convert_8ic_a_H
 
-#include <volk/volk_common.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <math.h>
 
 #ifdef LV_HAVE_SSE2
 #include <emmintrin.h>