diff --git a/xla/codegen/ir/xla_attrs.cc b/xla/codegen/ir/xla_attrs.cc
index 5f0e416064ec6..ce84444d4de79 100644
--- a/xla/codegen/ir/xla_attrs.cc
+++ b/xla/codegen/ir/xla_attrs.cc
@@ -16,7 +16,6 @@ limitations under the License.
 #include <cstdint>
 #include <optional>
 #include <sstream>
-#include <string>
 #include <utility>
 
 #include "llvm/ADT/StringRef.h"
diff --git a/xla/codegen/ir/xla_ops.cc b/xla/codegen/ir/xla_ops.cc
index 1d72b0264b66f..c2e2941d5f374 100644
--- a/xla/codegen/ir/xla_ops.cc
+++ b/xla/codegen/ir/xla_ops.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <cstdint>
 #include <optional>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/xla/codegen/ir/xla_ops.h b/xla/codegen/ir/xla_ops.h
index 30d046555249e..a13540c921577 100644
--- a/xla/codegen/ir/xla_ops.h
+++ b/xla/codegen/ir/xla_ops.h
@@ -15,6 +15,7 @@ limitations under the License.
 #ifndef XLA_CODEGEN_IR_XLA_OPS_H_
 #define XLA_CODEGEN_IR_XLA_OPS_H_
 
+#include <optional>
 #include <utility>
 
 #include "llvm/ADT/DenseMap.h"