diff --git a/xla/service/cpu/tests/cpu_dyn_shape_test.cc b/xla/service/cpu/tests/cpu_dyn_shape_test.cc
index ab279dc384269..c07b7306df289 100644
--- a/xla/service/cpu/tests/cpu_dyn_shape_test.cc
+++ b/xla/service/cpu/tests/cpu_dyn_shape_test.cc
@@ -14,6 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #include <memory>
+#include <string>
+#include <utility>
 
 #include <gtest/gtest.h>
 #include "xla/hlo/ir/hlo_computation.h"
diff --git a/xla/service/cpu/tests/cpu_fusion_test.cc b/xla/service/cpu/tests/cpu_fusion_test.cc
index 4ef2c8ec0adfe..6c45827b0ee89 100644
--- a/xla/service/cpu/tests/cpu_fusion_test.cc
+++ b/xla/service/cpu/tests/cpu_fusion_test.cc
@@ -15,7 +15,6 @@ limitations under the License.
 
 #include <memory>
 #include <utility>
-#include <vector>
 
 #include "xla/error_spec.h"
 #include "xla/hlo/ir/hlo_computation.h"
diff --git a/xla/service/cpu/tests/cpu_infeed_test.cc b/xla/service/cpu/tests/cpu_infeed_test.cc
index aa25e0f2f99f2..d421d2043b88a 100644
--- a/xla/service/cpu/tests/cpu_infeed_test.cc
+++ b/xla/service/cpu/tests/cpu_infeed_test.cc
@@ -13,6 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include <cstdint>
+
 #include "xla/error_spec.h"
 #include "xla/layout.h"
 #include "xla/layout_util.h"
diff --git a/xla/service/cpu/tests/cpu_intrinsic_test.cc b/xla/service/cpu/tests/cpu_intrinsic_test.cc
index ea52375327f14..0c25d256d6824 100644
--- a/xla/service/cpu/tests/cpu_intrinsic_test.cc
+++ b/xla/service/cpu/tests/cpu_intrinsic_test.cc
@@ -14,7 +14,10 @@ limitations under the License.
 ==============================================================================*/
 
 #include <algorithm>
+#include <cctype>
+#include <memory>
 #include <string>
+#include <utility>
 
 #include <gtest/gtest.h>
 #include "absl/strings/ascii.h"
diff --git a/xla/service/cpu/tests/cpu_key_value_sort_test.cc b/xla/service/cpu/tests/cpu_key_value_sort_test.cc
index 2a8d9d8a24442..35bab1103c894 100644
--- a/xla/service/cpu/tests/cpu_key_value_sort_test.cc
+++ b/xla/service/cpu/tests/cpu_key_value_sort_test.cc
@@ -14,6 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #include <memory>
+#include <string>
+#include <utility>
 
 #include <gtest/gtest.h>
 #include "xla/service/cpu/cpu_compiler.h"
diff --git a/xla/service/cpu/tests/cpu_literal_caching_test.cc b/xla/service/cpu/tests/cpu_literal_caching_test.cc
index 23f3fd39c9448..c88b76b89f546 100644
--- a/xla/service/cpu/tests/cpu_literal_caching_test.cc
+++ b/xla/service/cpu/tests/cpu_literal_caching_test.cc
@@ -13,6 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <gtest/gtest.h>
 #include "xla/hlo/ir/hlo_module.h"
 #include "xla/service/cpu/cpu_compiler.h"
diff --git a/xla/service/cpu/tests/cpu_outfeed_test.cc b/xla/service/cpu/tests/cpu_outfeed_test.cc
index 4dd41d5d8c9dc..1729726c690ec 100644
--- a/xla/service/cpu/tests/cpu_outfeed_test.cc
+++ b/xla/service/cpu/tests/cpu_outfeed_test.cc
@@ -14,6 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #include <memory>
+#include <string>
+#include <utility>
 
 #include <gtest/gtest.h>
 #include "xla/service/cpu/cpu_compiler.h"
diff --git a/xla/service/cpu/tests/cpu_profiling_test.cc b/xla/service/cpu/tests/cpu_profiling_test.cc
index 80acbd762715c..e6da64e09c015 100644
--- a/xla/service/cpu/tests/cpu_profiling_test.cc
+++ b/xla/service/cpu/tests/cpu_profiling_test.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include <algorithm>
 #include <string>
+#include <utility>
 
 #include <gtest/gtest.h>
 #include "absl/strings/string_view.h"
diff --git a/xla/service/cpu/tests/cpu_topk_test.cc b/xla/service/cpu/tests/cpu_topk_test.cc
index 3f230aef53c27..9d7e7d3a76abd 100644
--- a/xla/service/cpu/tests/cpu_topk_test.cc
+++ b/xla/service/cpu/tests/cpu_topk_test.cc
@@ -14,6 +14,7 @@ limitations under the License.
 ==============================================================================*/
 
 #include <memory>
+#include <utility>
 
 #include <gtest/gtest.h>
 #include "xla/hlo/builder/lib/sorting.h"
diff --git a/xla/service/cpu/tests/cpu_vectorization_test.cc b/xla/service/cpu/tests/cpu_vectorization_test.cc
index 1b4f77d8ddb79..3ede88b638b1c 100644
--- a/xla/service/cpu/tests/cpu_vectorization_test.cc
+++ b/xla/service/cpu/tests/cpu_vectorization_test.cc
@@ -13,8 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include <algorithm>
+#include <cctype>
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <gtest/gtest.h>