diff --git a/conversions/CMakeLists.txt b/conversions/CMakeLists.txt
index c58eff2..5b6e902 100644
--- a/conversions/CMakeLists.txt
+++ b/conversions/CMakeLists.txt
@@ -20,7 +20,7 @@ if (BUILD_TESTING)
       ${test_output_directory}/${CONVERT_TEST_NAME})
 endif()
 
-set (SOURCES include/vrep_conversion.h vrep_conversion.cpp)
+set (CONVERSION_SOURCES include/vrep_conversion.h vrep_conversion.cpp)
 include_directories (include)
-add_library (conversion_lib SHARED ${SOURCES})
+add_library (conversion_lib SHARED ${CONVERSION_SOURCES})
 target_link_libraries( conversion_lib ${MRPT_LIBS} )
\ No newline at end of file
diff --git a/conversions/include/vrep_conversion.h b/conversions/include/vrep_conversion.h
index 66459a1..f977f3d 100644
--- a/conversions/include/vrep_conversion.h
+++ b/conversions/include/vrep_conversion.h
@@ -1,8 +1,8 @@
 #ifndef VREP_CONVERSION_H
 #define VREP_CONVERSION_H
 
-#include <stdint.h>
-#include <string>
+#include <cstdint>
+#include <cstring>
 
 namespace mrpt::obs
 {
diff --git a/conversions/vrep_conversion.cpp b/conversions/vrep_conversion.cpp
index 95d18a1..1c9c0f4 100644
--- a/conversions/vrep_conversion.cpp
+++ b/conversions/vrep_conversion.cpp
@@ -1,6 +1,6 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 #include <cstring>
 #include "mrpt/obs/CObservation2DRangeScan.h"
 #include "vrep_conversion.h"
diff --git a/mrpt_graphslam_2d/CMakeLists.txt b/mrpt_graphslam_2d/CMakeLists.txt
index 8bcac47..28feeca 100644
--- a/mrpt_graphslam_2d/CMakeLists.txt
+++ b/mrpt_graphslam_2d/CMakeLists.txt
@@ -19,6 +19,5 @@ endif()
 
 add_definitions (-DNON_MATLAB_PARSING)
 add_definitions (-DMAX_EXT_API_CONNECTIONS=255)
-include_directories (${VREP_PATH}/remoteApi ${VREP_PATH}/include)
 add_executable(remoteApi_test remoteApi/remoteApi_test.cpp)
 target_link_libraries(remoteApi_test vrep_lib pthread rt conversion_lib)
\ No newline at end of file
diff --git a/mrpt_graphslam_2d/remoteApi/remoteApi_test.cpp b/mrpt_graphslam_2d/remoteApi/remoteApi_test.cpp
index 1971db5..38088a8 100644
--- a/mrpt_graphslam_2d/remoteApi/remoteApi_test.cpp
+++ b/mrpt_graphslam_2d/remoteApi/remoteApi_test.cpp
@@ -1,6 +1,6 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 #include <cstring>
 #include "mrpt/obs/CObservation2DRangeScan.h"
 #include "mrpt/obs/CObservationOdometry.h"