diff --git a/include/pclomp/gicp_omp_impl.hpp b/include/pclomp/gicp_omp_impl.hpp
index 8a1409f..5ffc09e 100644
--- a/include/pclomp/gicp_omp_impl.hpp
+++ b/include/pclomp/gicp_omp_impl.hpp
@@ -40,6 +40,7 @@
 #ifndef PCL_REGISTRATION_IMPL_GICP_OMP_HPP_
 #define PCL_REGISTRATION_IMPL_GICP_OMP_HPP_
 
+#include "pclomp/gicp_omp.h"
 #include <pcl/registration/boost.h>
 #include <pcl/registration/exceptions.h>
 
@@ -233,7 +234,7 @@ void pclomp::GeneralizedIterativeClosestPoint<PointSource, PointTarget>::
     if (result) {
       break;
     }
-    result = bfgs.testGradient(gradient_tol);
+    result = bfgs.testGradient(/*gradient_tol*/);
   } while (result == BFGSSpace::Running && inner_iterations_ < max_inner_iterations_);
   if (
     result == BFGSSpace::NoProgress || result == BFGSSpace::Success ||
diff --git a/include/pclomp/ndt_omp.h b/include/pclomp/ndt_omp.h
index 8706215..fd434c8 100644
--- a/include/pclomp/ndt_omp.h
+++ b/include/pclomp/ndt_omp.h
@@ -48,6 +48,7 @@
 #include <unsupported/Eigen/NonLinearOptimization>
 
 #include "boost/optional.hpp"
+#include <set>
 
 #include <pcl/registration/registration.h>