diff --git a/nav2_dwb_controller/dwb_plugins/include/dwb_plugins/kinematic_parameters.hpp b/nav2_dwb_controller/dwb_plugins/include/dwb_plugins/kinematic_parameters.hpp
index 277226890d9e8a09079b7735140a2db5d3280b46..178c2c13172d75f361283a65f03fbfd08d57c5b6 100644
--- a/nav2_dwb_controller/dwb_plugins/include/dwb_plugins/kinematic_parameters.hpp
+++ b/nav2_dwb_controller/dwb_plugins/include/dwb_plugins/kinematic_parameters.hpp
@@ -113,7 +113,7 @@ protected:
   double max_speed_xy_sq_{0};
 
   void reconfigureCB();
-  
+
   // Subscription for parameter change
   rclcpp::AsyncParametersClient::SharedPtr parameters_client_;
   rclcpp::Subscription<rcl_interfaces::msg::ParameterEvent>::SharedPtr parameter_event_sub_;
diff --git a/nav2_dwb_controller/dwb_plugins/src/kinematic_parameters.cpp b/nav2_dwb_controller/dwb_plugins/src/kinematic_parameters.cpp
index dbb194a6e9acbf68dde878eea02bd4b445bec4a0..26f131a95ced614f06903d746c13fbaa3e0f6860 100644
--- a/nav2_dwb_controller/dwb_plugins/src/kinematic_parameters.cpp
+++ b/nav2_dwb_controller/dwb_plugins/src/kinematic_parameters.cpp
@@ -44,12 +44,12 @@
 using std::fabs;
 using nav2_util::declare_parameter_if_not_declared;
 using nav_2d_utils::moveDeprecatedParameter;
+using rcl_interfaces::msg::ParameterType;
+using std::placeholders::_1;
 
 namespace dwb_plugins
 {
 
-using std::placeholders::_1;
-
 KinematicParameters::KinematicParameters()
 {
 }
@@ -120,8 +120,6 @@ void
 KinematicParameters::on_parameter_event_callback(
   const rcl_interfaces::msg::ParameterEvent::SharedPtr event)
 {
-  using namespace rcl_interfaces::msg;
-
   for (auto & changed_parameter : event->changed_parameters) {
     const auto & type = changed_parameter.value.type;
     const auto & name = changed_parameter.name;