Fix lint errors in includes.

PiperOrigin-RevId: 427158594

14 files changed, 30 insertions, 1 deletions

diff --git a/cc/util/file_output_stream_test.cc b/cc/util/file_output_stream_test.cc
index fb6c94d9b..5b1f3e663 100644
--- a/cc/util/file_output_stream_test.cc
+++ b/cc/util/file_output_stream_test.cc
@@ -16,6 +16,9 @@
 
 #include "tink/util/file_output_stream.h"
 
+#include <algorithm>
+#include <string>
+
 #include "gtest/gtest.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
diff --git a/cc/util/file_random_access_stream_test.cc b/cc/util/file_random_access_stream_test.cc
index ebafb51bd..7b3e22098 100644
--- a/cc/util/file_random_access_stream_test.cc
+++ b/cc/util/file_random_access_stream_test.cc
@@ -16,7 +16,9 @@
 
 #include "tink/util/file_random_access_stream.h"
 
+#include <string>
 #include <thread>  // NOLINT(build/c++11)
+#include <utility>
 
 #include "gtest/gtest.h"
 #include "absl/memory/memory.h"
diff --git a/cc/util/input_stream_util.cc b/cc/util/input_stream_util.cc
index e1337a61f..600353db0 100644
--- a/cc/util/input_stream_util.cc
+++ b/cc/util/input_stream_util.cc
@@ -17,6 +17,7 @@
 #include "tink/util/input_stream_util.h"
 
 #include <algorithm>
+#include <string>
 
 #include "absl/algorithm/container.h"
 #include "absl/strings/str_cat.h"
diff --git a/cc/util/input_stream_util_test.cc b/cc/util/input_stream_util_test.cc
index b66ec5705..a6133a764 100644
--- a/cc/util/input_stream_util_test.cc
+++ b/cc/util/input_stream_util_test.cc
@@ -16,6 +16,9 @@
 
 #include "tink/util/input_stream_util.h"
 
+#include <string>
+#include <utility>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/memory/memory.h"
diff --git a/cc/util/istream_input_stream.cc b/cc/util/istream_input_stream.cc
index 5c02fbc3a..71c642bff 100644
--- a/cc/util/istream_input_stream.cc
+++ b/cc/util/istream_input_stream.cc
@@ -17,9 +17,11 @@
 #include "tink/util/istream_input_stream.h"
 
 #include <unistd.h>
+
 #include <algorithm>
 #include <cstring>
 #include <istream>
+#include <utility>
 
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
diff --git a/cc/util/istream_input_stream_test.cc b/cc/util/istream_input_stream_test.cc
index 590269f78..6b52fa3b8 100644
--- a/cc/util/istream_input_stream_test.cc
+++ b/cc/util/istream_input_stream_test.cc
@@ -17,9 +17,13 @@
 #include "tink/util/istream_input_stream.h"
 
 #include <unistd.h>
+
+#include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <istream>
+#include <string>
+#include <utility>
 
 #include "gtest/gtest.h"
 #include "absl/memory/memory.h"
diff --git a/cc/util/ostream_output_stream.cc b/cc/util/ostream_output_stream.cc
index 41790c71b..228a29ad2 100644
--- a/cc/util/ostream_output_stream.cc
+++ b/cc/util/ostream_output_stream.cc
@@ -21,6 +21,7 @@
 #include <cstring>
 #include <memory>
 #include <ostream>
+#include <utility>
 
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
diff --git a/cc/util/ostream_output_stream_test.cc b/cc/util/ostream_output_stream_test.cc
index 8194e8583..9f3191078 100644
--- a/cc/util/ostream_output_stream_test.cc
+++ b/cc/util/ostream_output_stream_test.cc
@@ -16,9 +16,12 @@
 
 #include "tink/util/ostream_output_stream.h"
 
+#include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <memory>
+#include <string>
+#include <utility>
 
 #include "gtest/gtest.h"
 #include "absl/memory/memory.h"
diff --git a/cc/util/secret_data.h b/cc/util/secret_data.h
index 2da1dd094..f212f17f4 100644
--- a/cc/util/secret_data.h
+++ b/cc/util/secret_data.h
@@ -18,6 +18,7 @@
 #define TINK_UTIL_SECRET_DATA_H_
 
 #include <memory>
+#include <string>
 #include <type_traits>
 #include <vector>
 
diff --git a/cc/util/secret_data_test.cc b/cc/util/secret_data_test.cc
index 85219085a..72f11676e 100644
--- a/cc/util/secret_data_test.cc
+++ b/cc/util/secret_data_test.cc
@@ -16,6 +16,9 @@
 
 #include "tink/util/secret_data.h"
 
+#include <string>
+#include <utility>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/strings/string_view.h"
diff --git a/cc/util/test_keyset_handle.cc b/cc/util/test_keyset_handle.cc
index 464c848cf..f60ca753e 100644
--- a/cc/util/test_keyset_handle.cc
+++ b/cc/util/test_keyset_handle.cc
@@ -16,6 +16,8 @@
 
 #include "tink/util/test_keyset_handle.h"
 
+#include <utility>
+
 #include "absl/memory/memory.h"
 #include "tink/keyset_handle.h"
 #include "proto/tink.pb.h"
diff --git a/cc/util/test_matchers.h b/cc/util/test_matchers.h
index e923fbe1a..c7b889940 100644
--- a/cc/util/test_matchers.h
+++ b/cc/util/test_matchers.h
@@ -17,6 +17,8 @@
 #ifndef TINK_UTIL_TEST_MATCHERS_H_
 #define TINK_UTIL_TEST_MATCHERS_H_
 
+#include <string>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/status/status.h"
diff --git a/cc/util/test_util.cc b/cc/util/test_util.cc
index 0ac9b64b7..35c37ce47 100644
--- a/cc/util/test_util.cc
+++ b/cc/util/test_util.cc
@@ -24,6 +24,7 @@
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
+#include <string>
 
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
@@ -34,10 +35,10 @@
 #include "tink/aead/xchacha20_poly1305_key_manager.h"
 #include "tink/cleartext_keyset_handle.h"
 #include "tink/daead/aes_siv_key_manager.h"
+#include "tink/internal/ec_util.h"
 #include "tink/keyset_handle.h"
 #include "tink/subtle/common_enums.h"
 #include "tink/subtle/random.h"
-#include "tink/internal/ec_util.h"
 #include "tink/util/enums.h"
 #include "tink/util/protobuf_helper.h"
 #include "tink/util/secret_data.h"
diff --git a/cc/util/test_util.h b/cc/util/test_util.h
index 8bde9a92c..37cf6f519 100644
--- a/cc/util/test_util.h
+++ b/cc/util/test_util.h
@@ -19,6 +19,7 @@
 
 #include <limits>
 #include <string>
+#include <utility>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"