diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
index c4404920df..eb3dc3b02d 100644
--- a/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
+++ b/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
@@ -136,7 +136,7 @@ double resolve_tolerance_source(const double default_value, const double goal_va
   // * -1 - The tolerance is "erased".
   //        If there was a default, the joint will be allowed to move without restriction.
   constexpr double ERASE_VALUE = -1.0;
-  auto is_erase_value = [](double value)
+  auto is_erase_value = [=](double value)
   { return fabs(value - ERASE_VALUE) < std::numeric_limits<float>::epsilon(); };
 
   if (goal_value > 0.0)
diff --git a/pid_controller/CMakeLists.txt b/pid_controller/CMakeLists.txt
index 81cbe6f006..6585eb34a8 100644
--- a/pid_controller/CMakeLists.txt
+++ b/pid_controller/CMakeLists.txt
@@ -5,6 +5,16 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
   add_compile_options(-Wall -Wextra)
 endif()
 
+if(WIN32)
+  add_compile_definitions(
+    # For math constants
+    _USE_MATH_DEFINES
+    # Minimize Windows namespace collision
+    NOMINMAX
+    WIN32_LEAN_AND_MEAN
+  )
+endif()
+
 set(THIS_PACKAGE_INCLUDE_DEPENDS
   angles
   control_msgs