diff --git a/localization/autoware_localization_util/include/autoware/localization_util/covariance_ellipse.hpp b/localization/autoware_localization_util/include/autoware/localization_util/covariance_ellipse.hpp
index de73ebeb..abd0af46 100644
--- a/localization/autoware_localization_util/include/autoware/localization_util/covariance_ellipse.hpp
+++ b/localization/autoware_localization_util/include/autoware/localization_util/covariance_ellipse.hpp
@@ -20,8 +20,6 @@
 #include <geometry_msgs/msg/pose_with_covariance.hpp>
 #include <visualization_msgs/msg/marker_array.hpp>
 
-#include <algorithm>
-
 namespace autoware::localization_util
 {
 
diff --git a/localization/autoware_localization_util/include/autoware/localization_util/tree_structured_parzen_estimator.hpp b/localization/autoware_localization_util/include/autoware/localization_util/tree_structured_parzen_estimator.hpp
index 1876586b..3469b9ad 100644
--- a/localization/autoware_localization_util/include/autoware/localization_util/tree_structured_parzen_estimator.hpp
+++ b/localization/autoware_localization_util/include/autoware/localization_util/tree_structured_parzen_estimator.hpp
@@ -26,10 +26,7 @@ Optuna is also used as a reference for implementation.
 
 #include <cstdint>
 #include <random>
-#include <vector>
 
-#include <utility>
-#include <limits>
 
 namespace autoware::localization_util
 {
diff --git a/localization/autoware_localization_util/include/autoware/localization_util/util_func.hpp b/localization/autoware_localization_util/include/autoware/localization_util/util_func.hpp
index bef9968f..624f6222 100644
--- a/localization/autoware_localization_util/include/autoware/localization_util/util_func.hpp
+++ b/localization/autoware_localization_util/include/autoware/localization_util/util_func.hpp
@@ -29,11 +29,9 @@
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
 #endif
 
-#include <algorithm>
 #include <cmath>
 #include <deque>
 #include <random>
-#include <string>
 #include <vector>
 
 namespace autoware::localization_util
diff --git a/localization/autoware_localization_util/src/covariance_ellipse.cpp b/localization/autoware_localization_util/src/covariance_ellipse.cpp
index 4a7d7190..aff6e737 100644
--- a/localization/autoware_localization_util/src/covariance_ellipse.cpp
+++ b/localization/autoware_localization_util/src/covariance_ellipse.cpp
@@ -14,6 +14,8 @@
 
 #include "autoware/localization_util/covariance_ellipse.hpp"
 
+#include <algorithm>
+
 #include <tf2/utils.h>
 #ifdef ROS_DISTRO_GALACTIC
 #include <tf2_geometry_msgs/tf2_geometry_msgs.h>
diff --git a/localization/autoware_localization_util/src/tree_structured_parzen_estimator.cpp b/localization/autoware_localization_util/src/tree_structured_parzen_estimator.cpp
index 064b33eb..aa8f41f2 100644
--- a/localization/autoware_localization_util/src/tree_structured_parzen_estimator.cpp
+++ b/localization/autoware_localization_util/src/tree_structured_parzen_estimator.cpp
@@ -19,6 +19,10 @@
 #include <iostream>
 #include <numeric>
 
+#include <vector>
+#include <utility>
+#include <limits>
+
 namespace autoware::localization_util
 {
 // random number generator
diff --git a/localization/autoware_localization_util/src/util_func.cpp b/localization/autoware_localization_util/src/util_func.cpp
index 6b019f77..12679352 100644
--- a/localization/autoware_localization_util/src/util_func.cpp
+++ b/localization/autoware_localization_util/src/util_func.cpp
@@ -16,6 +16,9 @@
 
 #include "autoware/localization_util/matrix_type.hpp"
 
+#include <string>
+#include <algorithm>
+
 namespace autoware::localization_util
 {
 // ref by http://takacity.blog.fc2.com/blog-entry-69.html