aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--tensorflow/core/client/tensor_c_api.cc1
-rw-r--r--tensorflow/core/client/tensor_c_api_test.cc1
-rw-r--r--tensorflow/core/common_runtime/device.h1
-rw-r--r--tensorflow/core/common_runtime/device_factory.cc1
-rw-r--r--tensorflow/core/common_runtime/device_mgr.cc1
-rw-r--r--tensorflow/core/common_runtime/device_set_test.cc1
-rw-r--r--tensorflow/core/common_runtime/function.cc1
-rw-r--r--tensorflow/core/common_runtime/gpu/gpu_allocator_retry_test.cc1
-rw-r--r--tensorflow/core/common_runtime/gpu/gpu_debug_allocator.cc1
-rw-r--r--tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h1
-rw-r--r--tensorflow/core/common_runtime/gpu/gpu_device.cc1
-rw-r--r--tensorflow/core/common_runtime/gpu/gpu_device.h1
-rw-r--r--tensorflow/core/common_runtime/gpu/gpu_region_allocator.cc1
-rw-r--r--tensorflow/core/common_runtime/gpu/pool_allocator.h1
-rw-r--r--tensorflow/core/common_runtime/gpu/process_state.cc1
-rw-r--r--tensorflow/core/common_runtime/kernel_benchmark_testlib.cc1
-rw-r--r--tensorflow/core/common_runtime/threadpool_device_factory.cc1
-rw-r--r--tensorflow/core/framework/allocator_test.cc1
-rw-r--r--tensorflow/core/framework/attr_value_util.cc1
-rw-r--r--tensorflow/core/framework/attr_value_util.h1
-rw-r--r--tensorflow/core/framework/attr_value_util_test.cc1
-rw-r--r--tensorflow/core/framework/cancellation.cc2
-rw-r--r--tensorflow/core/framework/cancellation_test.cc1
-rw-r--r--tensorflow/core/framework/fake_input.cc1
-rw-r--r--tensorflow/core/framework/function.cc1
-rw-r--r--tensorflow/core/framework/function.h1
-rw-r--r--tensorflow/core/framework/function_test.cc1
-rw-r--r--tensorflow/core/framework/node_def_builder.cc1
-rw-r--r--tensorflow/core/framework/node_def_builder.h1
-rw-r--r--tensorflow/core/framework/node_def_builder_test.cc1
-rw-r--r--tensorflow/core/framework/node_def_util.cc1
-rw-r--r--tensorflow/core/framework/node_def_util.h1
-rw-r--r--tensorflow/core/framework/op.h1
-rw-r--r--tensorflow/core/framework/op_def_builder.cc1
-rw-r--r--tensorflow/core/framework/op_kernel.cc1
-rw-r--r--tensorflow/core/framework/op_kernel.h1
-rw-r--r--tensorflow/core/framework/op_segment_test.cc1
-rw-r--r--tensorflow/core/framework/reader_interface.h1
-rw-r--r--tensorflow/core/framework/rendezvous.cc1
-rw-r--r--tensorflow/core/framework/tensor_slice.cc1
-rw-r--r--tensorflow/core/framework/tensor_util.cc1
-rw-r--r--tensorflow/core/framework/tensor_util.h1
-rw-r--r--tensorflow/core/framework/tensor_util_test.cc1
-rw-r--r--tensorflow/core/graph/algorithm.h1
-rw-r--r--tensorflow/core/graph/costmodel.cc1
-rw-r--r--tensorflow/core/graph/costutil.cc1
-rw-r--r--tensorflow/core/graph/edgeset_test.cc1
-rw-r--r--tensorflow/core/graph/graph.cc1
-rw-r--r--tensorflow/core/graph/graph_constructor_test.cc1
-rw-r--r--tensorflow/core/graph/graph_partition.cc1
-rw-r--r--tensorflow/core/graph/graph_partition.h1
-rw-r--r--tensorflow/core/graph/graph_test.cc1
-rw-r--r--tensorflow/core/graph/node_builder.cc1
-rw-r--r--tensorflow/core/graph/optimizer_cse.cc1
-rw-r--r--tensorflow/core/graph/optimizer_cse_test.cc1
-rw-r--r--tensorflow/core/graph/tensor_id_test.cc1
-rw-r--r--tensorflow/core/graph/testlib.cc1
-rw-r--r--tensorflow/core/graph/validate_test.cc1
-rw-r--r--tensorflow/core/kernels/adjust_contrast_op_test.cc1
-rw-r--r--tensorflow/core/kernels/attention_ops.cc3
-rw-r--r--tensorflow/core/kernels/avgpooling_op.cc1
-rw-r--r--tensorflow/core/kernels/batch_matmul_op.cc1
-rw-r--r--tensorflow/core/kernels/candidate_sampler_ops.cc1
-rw-r--r--tensorflow/core/kernels/concat_op_cpu.cc3
-rw-r--r--tensorflow/core/kernels/concat_op_gpu.cu.cc1
-rw-r--r--tensorflow/core/kernels/conv_grad_ops.cc1
-rw-r--r--tensorflow/core/kernels/conv_ops.cc1
-rw-r--r--tensorflow/core/kernels/decode_csv_op.cc1
-rw-r--r--tensorflow/core/kernels/dynamic_partition_op.cc1
-rw-r--r--tensorflow/core/kernels/dynamic_partition_op_test.cc1
-rw-r--r--tensorflow/core/kernels/dynamic_stitch_op_test.cc1
-rw-r--r--tensorflow/core/kernels/edit_distance_op.cc1
-rw-r--r--tensorflow/core/kernels/example_parsing_ops.cc1
-rw-r--r--tensorflow/core/kernels/io.cc1
-rw-r--r--tensorflow/core/kernels/lrn_op_test.cc1
-rw-r--r--tensorflow/core/kernels/maxpooling_op.cc1
-rw-r--r--tensorflow/core/kernels/ops_testutil.cc2
-rw-r--r--tensorflow/core/kernels/pooling_ops_common.cc1
-rw-r--r--tensorflow/core/kernels/pooling_ops_common_gpu.h1
-rw-r--r--tensorflow/core/kernels/queue_base.cc1
-rw-r--r--tensorflow/core/kernels/queue_op.h1
-rw-r--r--tensorflow/core/kernels/random_shuffle_op.cc1
-rw-r--r--tensorflow/core/kernels/reader_base.h1
-rw-r--r--tensorflow/core/kernels/reverse_op_test.cc1
-rw-r--r--tensorflow/core/kernels/reverse_sequence_op.cc1
-rw-r--r--tensorflow/core/kernels/save_op_test.cc1
-rw-r--r--tensorflow/core/kernels/segment_reduction_ops.cc3
-rw-r--r--tensorflow/core/kernels/segment_reduction_ops_test.cc4
-rw-r--r--tensorflow/core/kernels/serialize_sparse_op.cc1
-rw-r--r--tensorflow/core/kernels/shape_ops.cc1
-rw-r--r--tensorflow/core/kernels/slice_op_test.cc1
-rw-r--r--tensorflow/core/kernels/sparse_concat_op.cc1
-rw-r--r--tensorflow/core/kernels/sparse_matmul_op.cc1
-rw-r--r--tensorflow/core/kernels/sparse_split_op.cc1
-rw-r--r--tensorflow/core/kernels/split_op.cc2
-rw-r--r--tensorflow/core/kernels/summary_image_op_test.cc1
-rw-r--r--tensorflow/core/kernels/summary_op_test.cc1
-rw-r--r--tensorflow/core/kernels/tile_ops.cc1
-rw-r--r--tensorflow/core/kernels/topk_op.cc1
-rw-r--r--tensorflow/core/kernels/unique_op_test.cc1
-rw-r--r--tensorflow/core/kernels/unpack_op.cc2
-rw-r--r--tensorflow/core/lib/core/coding_test.cc1
-rw-r--r--tensorflow/core/lib/core/command_line_flags.h1
-rw-r--r--tensorflow/core/lib/gtl/array_slice_internal.h1
-rw-r--r--tensorflow/core/lib/gtl/edit_distance_test.cc1
-rw-r--r--tensorflow/core/lib/gtl/inlined_vector.h1
-rw-r--r--tensorflow/core/lib/gtl/map_util.h1
-rw-r--r--tensorflow/core/lib/histogram/histogram.cc1
-rw-r--r--tensorflow/core/lib/histogram/histogram.h1
-rw-r--r--tensorflow/core/lib/io/block.cc1
-rw-r--r--tensorflow/core/lib/io/inputbuffer_test.cc1
-rw-r--r--tensorflow/core/lib/io/match.cc1
-rw-r--r--tensorflow/core/lib/io/match_test.cc1
-rw-r--r--tensorflow/core/lib/io/table_test.cc1
-rw-r--r--tensorflow/core/lib/jpeg/jpeg_mem.h1
-rw-r--r--tensorflow/core/lib/random/distribution_sampler.h1
-rw-r--r--tensorflow/core/lib/strings/str_util.cc1
-rw-r--r--tensorflow/core/lib/strings/str_util.h1
-rw-r--r--tensorflow/core/lib/strings/str_util_test.cc1
-rw-r--r--tensorflow/core/lib/strings/stringprintf.cc1
-rw-r--r--tensorflow/core/lib/strings/stringprintf.h1
-rw-r--r--tensorflow/core/ops/array_grad.cc1
-rw-r--r--tensorflow/core/ops/array_grad_test.cc1
-rw-r--r--tensorflow/core/ops/functional_grad.cc1
-rw-r--r--tensorflow/core/ops/math_grad.cc1
-rw-r--r--tensorflow/core/platform/default/test_benchmark.cc1
-rw-r--r--tensorflow/core/platform/port.h2
-rw-r--r--tensorflow/core/platform/posix/env.cc1
-rw-r--r--tensorflow/core/platform/tensor_coding.cc1
-rw-r--r--tensorflow/core/platform/test_benchmark.h1
-rw-r--r--tensorflow/core/platform/tracing.cc1
-rw-r--r--tensorflow/core/util/bcast.h1
-rw-r--r--tensorflow/core/util/sparse/group_iterator.cc1
-rw-r--r--tensorflow/core/util/sparse/group_iterator.h1
-rw-r--r--tensorflow/core/util/sparse/sparse_tensor.h1
-rw-r--r--tensorflow/core/util/tensor_slice_reader.cc1
-rw-r--r--tensorflow/core/util/tensor_slice_reader.h1
-rw-r--r--tensorflow/core/util/tensor_slice_set.cc1
-rw-r--r--tensorflow/core/util/tensor_slice_set.h1
-rw-r--r--tensorflow/core/util/tensor_slice_set_test.cc1
-rw-r--r--tensorflow/core/util/work_sharder.cc1
-rw-r--r--tensorflow/core/util/work_sharder_test.cc1
142 files changed, 120 insertions, 36 deletions
diff --git a/tensorflow/core/client/tensor_c_api.cc b/tensorflow/core/client/tensor_c_api.cc
index bc6c88f8c0..6b1d88c137 100644
--- a/tensorflow/core/client/tensor_c_api.cc
+++ b/tensorflow/core/client/tensor_c_api.cc
@@ -16,6 +16,7 @@ limitations under the License.
#include "tensorflow/core/public/tensor_c_api.h"
#include <memory>
+#include <vector>
#include "tensorflow/core/lib/core/coding.h"
#include "tensorflow/core/lib/core/errors.h"
diff --git a/tensorflow/core/client/tensor_c_api_test.cc b/tensorflow/core/client/tensor_c_api_test.cc
index 321802bde0..c9033893e3 100644
--- a/tensorflow/core/client/tensor_c_api_test.cc
+++ b/tensorflow/core/client/tensor_c_api_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/public/tensor_c_api.h"
+#include <vector>
#include "tensorflow/core/platform/test.h"
#include "tensorflow/core/public/tensor.h"
diff --git a/tensorflow/core/common_runtime/device.h b/tensorflow/core/common_runtime/device.h
index 65b8f3ef6a..d668b43a12 100644
--- a/tensorflow/core/common_runtime/device.h
+++ b/tensorflow/core/common_runtime/device.h
@@ -31,7 +31,6 @@ limitations under the License.
#include <memory>
#include <string>
-#include <vector>
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/framework/control_flow.h"
diff --git a/tensorflow/core/common_runtime/device_factory.cc b/tensorflow/core/common_runtime/device_factory.cc
index 371862a015..6b5106e92e 100644
--- a/tensorflow/core/common_runtime/device_factory.cc
+++ b/tensorflow/core/common_runtime/device_factory.cc
@@ -18,6 +18,7 @@ limitations under the License.
#include <memory>
#include <string>
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/lib/strings/strcat.h"
#include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/core/common_runtime/device_mgr.cc b/tensorflow/core/common_runtime/device_mgr.cc
index 3d615cf893..b22a8ffeca 100644
--- a/tensorflow/core/common_runtime/device_mgr.cc
+++ b/tensorflow/core/common_runtime/device_mgr.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/common_runtime/device_mgr.h"
+#include <vector>
#include "tensorflow/core/common_runtime/local_device.h"
#include "tensorflow/core/framework/device_attributes.pb.h"
#include "tensorflow/core/lib/core/errors.h"
diff --git a/tensorflow/core/common_runtime/device_set_test.cc b/tensorflow/core/common_runtime/device_set_test.cc
index f3a1db40f2..1969368d5f 100644
--- a/tensorflow/core/common_runtime/device_set_test.cc
+++ b/tensorflow/core/common_runtime/device_set_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/common_runtime/device_set.h"
+#include <vector>
#include "tensorflow/core/platform/test.h"
#include "tensorflow/core/public/status.h"
diff --git a/tensorflow/core/common_runtime/function.cc b/tensorflow/core/common_runtime/function.cc
index dacc761e24..67136c2a7a 100644
--- a/tensorflow/core/common_runtime/function.cc
+++ b/tensorflow/core/common_runtime/function.cc
@@ -16,6 +16,7 @@ limitations under the License.
#include "tensorflow/core/common_runtime/function.h"
#include <deque>
+#include <vector>
#include "tensorflow/core/common_runtime/device.h"
#include "tensorflow/core/common_runtime/executor.h"
diff --git a/tensorflow/core/common_runtime/gpu/gpu_allocator_retry_test.cc b/tensorflow/core/common_runtime/gpu/gpu_allocator_retry_test.cc
index 6c3a50813b..8022f8a243 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_allocator_retry_test.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_allocator_retry_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/common_runtime/gpu/gpu_allocator_retry.h"
+#include <vector>
#include "tensorflow/core/lib/core/notification.h"
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/mutex.h"
diff --git a/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.cc b/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.cc
index 57f690fe0c..b3db96e0ec 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h"
+#include <vector>
#include "tensorflow/core/common_runtime/gpu/gpu_init.h"
#include "tensorflow/core/platform/stream_executor.h"
diff --git a/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h b/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h
index 6f40b1f898..7da2b88fbc 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h
+++ b/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h
@@ -19,7 +19,6 @@ limitations under the License.
#include <memory>
#include <string>
#include <unordered_map>
-#include <vector>
#include "tensorflow/core/common_runtime/gpu/visitable_allocator.h"
#include "tensorflow/core/platform/macros.h"
diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.cc b/tensorflow/core/common_runtime/gpu/gpu_device.cc
index 13acb6e3a1..44874c5189 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.cc
@@ -24,6 +24,7 @@ limitations under the License.
#include <stdlib.h>
#include <string.h>
#include <algorithm>
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/common_runtime/device_factory.h"
diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.h b/tensorflow/core/common_runtime/gpu/gpu_device.h
index 87ca21404b..374bd73517 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.h
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.h
@@ -20,6 +20,7 @@ limitations under the License.
#ifndef TENSORFLOW_COMMON_RUNTIME_GPU_GPU_DEVICE_H_
#define TENSORFLOW_COMMON_RUNTIME_GPU_GPU_DEVICE_H_
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/common_runtime/device_factory.h"
#include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h"
diff --git a/tensorflow/core/common_runtime/gpu/gpu_region_allocator.cc b/tensorflow/core/common_runtime/gpu/gpu_region_allocator.cc
index e40398fc96..75a79cb438 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_region_allocator.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_region_allocator.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/common_runtime/gpu/gpu_region_allocator.h"
+#include <vector>
#include "tensorflow/core/common_runtime/gpu/gpu_allocator_retry.h"
#include "tensorflow/core/common_runtime/gpu/gpu_init.h"
#include "tensorflow/core/lib/core/bits.h"
diff --git a/tensorflow/core/common_runtime/gpu/pool_allocator.h b/tensorflow/core/common_runtime/gpu/pool_allocator.h
index 27d5fb5282..c584d3f17e 100644
--- a/tensorflow/core/common_runtime/gpu/pool_allocator.h
+++ b/tensorflow/core/common_runtime/gpu/pool_allocator.h
@@ -23,6 +23,7 @@ limitations under the License.
#include <atomic>
#include <map>
#include <memory>
+#include <vector>
#include "tensorflow/core/common_runtime/gpu/visitable_allocator.h"
#include "tensorflow/core/lib/core/bits.h"
#include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/core/common_runtime/gpu/process_state.cc b/tensorflow/core/common_runtime/gpu/process_state.cc
index 8ca87b90ed..8a5788ff2f 100644
--- a/tensorflow/core/common_runtime/gpu/process_state.cc
+++ b/tensorflow/core/common_runtime/gpu/process_state.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/common_runtime/gpu/process_state.h"
+#include <vector>
#include "tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.h"
#include "tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h"
#include "tensorflow/core/common_runtime/gpu/gpu_init.h"
diff --git a/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc b/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
index ebbc7eb190..450a08012a 100644
--- a/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
+++ b/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/common_runtime/kernel_benchmark_testlib.h"
+#include <vector>
#include "tensorflow/core/common_runtime/device.h"
#include "tensorflow/core/common_runtime/device_factory.h"
#include "tensorflow/core/framework/op.h"
diff --git a/tensorflow/core/common_runtime/threadpool_device_factory.cc b/tensorflow/core/common_runtime/threadpool_device_factory.cc
index 98656600b3..6d1c482afe 100644
--- a/tensorflow/core/common_runtime/threadpool_device_factory.cc
+++ b/tensorflow/core/common_runtime/threadpool_device_factory.cc
@@ -16,6 +16,7 @@ limitations under the License.
// Register a factory that provides CPU devices.
#include "tensorflow/core/common_runtime/threadpool_device.h"
+#include <vector>
#include "tensorflow/core/common_runtime/device_factory.h"
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/public/session_options.h"
diff --git a/tensorflow/core/framework/allocator_test.cc b/tensorflow/core/framework/allocator_test.cc
index 98e5922684..5736cb9736 100644
--- a/tensorflow/core/framework/allocator_test.cc
+++ b/tensorflow/core/framework/allocator_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/framework/allocator.h"
#include <algorithm>
+#include <vector>
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/test.h"
namespace tensorflow {
diff --git a/tensorflow/core/framework/attr_value_util.cc b/tensorflow/core/framework/attr_value_util.cc
index dc48c03570..ea681d16cc 100644
--- a/tensorflow/core/framework/attr_value_util.cc
+++ b/tensorflow/core/framework/attr_value_util.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/framework/attr_value_util.h"
+#include <vector>
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/core/stringpiece.h"
diff --git a/tensorflow/core/framework/attr_value_util.h b/tensorflow/core/framework/attr_value_util.h
index e378c3e836..996d54d49f 100644
--- a/tensorflow/core/framework/attr_value_util.h
+++ b/tensorflow/core/framework/attr_value_util.h
@@ -17,6 +17,7 @@ limitations under the License.
#define TENSORFLOW_FRAMEWORK_ATTR_VALUE_UTIL_H_
#include <string>
+#include <vector>
#include "tensorflow/core/framework/attr_value.pb.h"
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/lib/core/stringpiece.h"
diff --git a/tensorflow/core/framework/attr_value_util_test.cc b/tensorflow/core/framework/attr_value_util_test.cc
index 0ffb29030d..51c391ec80 100644
--- a/tensorflow/core/framework/attr_value_util_test.cc
+++ b/tensorflow/core/framework/attr_value_util_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/framework/attr_value_util.h"
+#include <vector>
#include "tensorflow/core/platform/test.h"
namespace tensorflow {
diff --git a/tensorflow/core/framework/cancellation.cc b/tensorflow/core/framework/cancellation.cc
index a1a2769ac4..0aab0f21d0 100644
--- a/tensorflow/core/framework/cancellation.cc
+++ b/tensorflow/core/framework/cancellation.cc
@@ -15,8 +15,6 @@ limitations under the License.
#include "tensorflow/core/framework/cancellation.h"
-#include <vector>
-
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/core/framework/cancellation_test.cc b/tensorflow/core/framework/cancellation_test.cc
index ee42d9c197..29ed0ac61c 100644
--- a/tensorflow/core/framework/cancellation_test.cc
+++ b/tensorflow/core/framework/cancellation_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/framework/cancellation.h"
+#include <vector>
#include "tensorflow/core/lib/core/notification.h"
#include "tensorflow/core/lib/core/threadpool.h"
#include "tensorflow/core/platform/test.h"
diff --git a/tensorflow/core/framework/fake_input.cc b/tensorflow/core/framework/fake_input.cc
index 2f2ac7ab34..a1762acf59 100644
--- a/tensorflow/core/framework/fake_input.cc
+++ b/tensorflow/core/framework/fake_input.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/framework/fake_input.h"
+#include <vector>
#include "tensorflow/core/framework/node_def_util.h"
#include "tensorflow/core/framework/op_def.pb.h"
#include "tensorflow/core/framework/op_def_util.h"
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index 42ac0443d2..a394c11dfb 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -16,6 +16,7 @@ limitations under the License.
#include "tensorflow/core/framework/function.h"
#include <unordered_set>
+#include <vector>
#include "tensorflow/core/framework/node_def_util.h"
#include "tensorflow/core/framework/op.h"
diff --git a/tensorflow/core/framework/function.h b/tensorflow/core/framework/function.h
index 16980fb34c..5d11f9ae79 100644
--- a/tensorflow/core/framework/function.h
+++ b/tensorflow/core/framework/function.h
@@ -18,6 +18,7 @@ limitations under the License.
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/framework/attr_value_util.h"
#include "tensorflow/core/framework/function.pb.h"
#include "tensorflow/core/framework/graph.pb.h"
diff --git a/tensorflow/core/framework/function_test.cc b/tensorflow/core/framework/function_test.cc
index 0e008cec9b..433ac005b5 100644
--- a/tensorflow/core/framework/function_test.cc
+++ b/tensorflow/core/framework/function_test.cc
@@ -14,6 +14,7 @@ limitations under the License.
==============================================================================*/
#include "tensorflow/core/framework/function.h"
+#include <vector>
#include "tensorflow/core/framework/function.pb.h"
#include "tensorflow/core/framework/function_testlib.h"
#include "tensorflow/core/framework/graph.pb.h"
diff --git a/tensorflow/core/framework/node_def_builder.cc b/tensorflow/core/framework/node_def_builder.cc
index 8b188a2ab3..b6f5838528 100644
--- a/tensorflow/core/framework/node_def_builder.cc
+++ b/tensorflow/core/framework/node_def_builder.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/framework/node_def_builder.h"
+#include <vector>
#include "tensorflow/core/framework/op_def_util.h"
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/strings/str_util.h"
diff --git a/tensorflow/core/framework/node_def_builder.h b/tensorflow/core/framework/node_def_builder.h
index 3dfe1de098..c475605886 100644
--- a/tensorflow/core/framework/node_def_builder.h
+++ b/tensorflow/core/framework/node_def_builder.h
@@ -17,6 +17,7 @@ limitations under the License.
#define TENSORFLOW_FRAMEWORK_NODE_DEF_BUILDER_H_
#include <functional>
+#include <vector>
#include "tensorflow/core/framework/attr_value_util.h"
#include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/framework/node_def_util.h"
diff --git a/tensorflow/core/framework/node_def_builder_test.cc b/tensorflow/core/framework/node_def_builder_test.cc
index f0b80fff20..b8c453ab8c 100644
--- a/tensorflow/core/framework/node_def_builder_test.cc
+++ b/tensorflow/core/framework/node_def_builder_test.cc
@@ -16,6 +16,7 @@ limitations under the License.
#include "tensorflow/core/framework/node_def_builder.h"
#include <memory>
+#include <vector>
#include "tensorflow/core/framework/fake_input.h"
#include "tensorflow/core/framework/node_def_util.h"
#include "tensorflow/core/framework/op_def_builder.h"
diff --git a/tensorflow/core/framework/node_def_util.cc b/tensorflow/core/framework/node_def_util.cc
index fcd76e3fc4..8bc417a26e 100644
--- a/tensorflow/core/framework/node_def_util.cc
+++ b/tensorflow/core/framework/node_def_util.cc
@@ -17,6 +17,7 @@ limitations under the License.
#include <algorithm>
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/framework/attr_value_util.h"
#include "tensorflow/core/framework/op.h"
diff --git a/tensorflow/core/framework/node_def_util.h b/tensorflow/core/framework/node_def_util.h
index ce2b8ece97..0402631b06 100644
--- a/tensorflow/core/framework/node_def_util.h
+++ b/tensorflow/core/framework/node_def_util.h
@@ -18,6 +18,7 @@ limitations under the License.
#include <string>
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/framework/attr_value_util.h"
#include "tensorflow/core/framework/graph.pb.h"
diff --git a/tensorflow/core/framework/op.h b/tensorflow/core/framework/op.h
index 388ced2d00..558afcf4ac 100644
--- a/tensorflow/core/framework/op.h
+++ b/tensorflow/core/framework/op.h
@@ -18,6 +18,7 @@ limitations under the License.
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/framework/op_def.pb.h"
#include "tensorflow/core/framework/op_def_builder.h"
#include "tensorflow/core/framework/op_def_util.h"
diff --git a/tensorflow/core/framework/op_def_builder.cc b/tensorflow/core/framework/op_def_builder.cc
index a59ddb3e9b..8983371503 100644
--- a/tensorflow/core/framework/op_def_builder.cc
+++ b/tensorflow/core/framework/op_def_builder.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/framework/op_def_builder.h"
+#include <vector>
#include "tensorflow/core/framework/attr_value_util.h"
#include "tensorflow/core/framework/op_def_util.h"
#include "tensorflow/core/framework/types.h"
diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
index aa097ac0b7..f2b9a9e295 100644
--- a/tensorflow/core/framework/op_kernel.cc
+++ b/tensorflow/core/framework/op_kernel.cc
@@ -16,6 +16,7 @@ limitations under the License.
#include "tensorflow/core/framework/op_kernel.h"
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/framework/attr_value_util.h"
#include "tensorflow/core/framework/node_def_util.h"
diff --git a/tensorflow/core/framework/op_kernel.h b/tensorflow/core/framework/op_kernel.h
index 27d07e2abd..5234b4cef3 100644
--- a/tensorflow/core/framework/op_kernel.h
+++ b/tensorflow/core/framework/op_kernel.h
@@ -18,6 +18,7 @@ limitations under the License.
#include <functional>
+#include <vector>
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/framework/cancellation.h"
#include "tensorflow/core/framework/control_flow.h"
diff --git a/tensorflow/core/framework/op_segment_test.cc b/tensorflow/core/framework/op_segment_test.cc
index 60bcf8378c..fcdfdfa794 100644
--- a/tensorflow/core/framework/op_segment_test.cc
+++ b/tensorflow/core/framework/op_segment_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/framework/op_segment.h"
+#include <vector>
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/framework/node_def_builder.h"
diff --git a/tensorflow/core/framework/reader_interface.h b/tensorflow/core/framework/reader_interface.h
index 647475ed2b..0f309fe722 100644
--- a/tensorflow/core/framework/reader_interface.h
+++ b/tensorflow/core/framework/reader_interface.h
@@ -18,7 +18,6 @@ limitations under the License.
#include <memory>
#include <string>
-#include <vector>
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/resource_mgr.h"
#include "tensorflow/core/platform/port.h"
diff --git a/tensorflow/core/framework/rendezvous.cc b/tensorflow/core/framework/rendezvous.cc
index df98adeb8c..0d20e7281e 100644
--- a/tensorflow/core/framework/rendezvous.cc
+++ b/tensorflow/core/framework/rendezvous.cc
@@ -17,6 +17,7 @@ limitations under the License.
#include <unordered_map>
#include <utility>
+#include <vector>
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/core/notification.h"
diff --git a/tensorflow/core/framework/tensor_slice.cc b/tensorflow/core/framework/tensor_slice.cc
index d9f4aa3bdb..7283c78bc9 100644
--- a/tensorflow/core/framework/tensor_slice.cc
+++ b/tensorflow/core/framework/tensor_slice.cc
@@ -14,6 +14,7 @@ limitations under the License.
==============================================================================*/
#include "tensorflow/core/framework/tensor_slice.h"
+#include <vector>
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/strings/str_util.h"
#include "tensorflow/core/lib/strings/strcat.h"
diff --git a/tensorflow/core/framework/tensor_util.cc b/tensorflow/core/framework/tensor_util.cc
index 86cb654c1c..9f6a26d0bc 100644
--- a/tensorflow/core/framework/tensor_util.cc
+++ b/tensorflow/core/framework/tensor_util.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/framework/tensor_util.h"
+#include <vector>
#include "tensorflow/core/lib/core/stringpiece.h"
#include "tensorflow/core/public/tensor.h"
diff --git a/tensorflow/core/framework/tensor_util.h b/tensorflow/core/framework/tensor_util.h
index 55ab1b696c..2a6665f612 100644
--- a/tensorflow/core/framework/tensor_util.h
+++ b/tensorflow/core/framework/tensor_util.h
@@ -18,6 +18,7 @@ limitations under the License.
#include "tensorflow/core/public/tensor.h"
+#include <vector>
namespace tensorflow {
namespace tensor {
diff --git a/tensorflow/core/framework/tensor_util_test.cc b/tensorflow/core/framework/tensor_util_test.cc
index 9c027e345c..6faad188d5 100644
--- a/tensorflow/core/framework/tensor_util_test.cc
+++ b/tensorflow/core/framework/tensor_util_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/framework/tensor_util.h"
+#include <vector>
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/platform/test.h"
#include "tensorflow/core/public/tensor.h"
diff --git a/tensorflow/core/graph/algorithm.h b/tensorflow/core/graph/algorithm.h
index 8e444dd298..f7406803de 100644
--- a/tensorflow/core/graph/algorithm.h
+++ b/tensorflow/core/graph/algorithm.h
@@ -18,6 +18,7 @@ limitations under the License.
#include <functional>
#include <unordered_set>
+#include <vector>
#include "tensorflow/core/graph/graph.h"
diff --git a/tensorflow/core/graph/costmodel.cc b/tensorflow/core/graph/costmodel.cc
index 68ddc1299e..9c71b31500 100644
--- a/tensorflow/core/graph/costmodel.cc
+++ b/tensorflow/core/graph/costmodel.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/graph/costmodel.h"
+#include <vector>
#include "tensorflow/core/framework/step_stats.pb.h"
#include "tensorflow/core/graph/graph.h"
#include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/core/graph/costutil.cc b/tensorflow/core/graph/costutil.cc
index d06dec4b80..bcadf09ebd 100644
--- a/tensorflow/core/graph/costutil.cc
+++ b/tensorflow/core/graph/costutil.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/graph/costutil.h"
+#include <vector>
#include "tensorflow/core/graph/algorithm.h"
#include "tensorflow/core/graph/costmodel.h"
#include "tensorflow/core/graph/graph.h"
diff --git a/tensorflow/core/graph/edgeset_test.cc b/tensorflow/core/graph/edgeset_test.cc
index c9e835f6c0..5092e5195e 100644
--- a/tensorflow/core/graph/edgeset_test.cc
+++ b/tensorflow/core/graph/edgeset_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/graph/edgeset.h"
+#include <vector>
#include "tensorflow/core/graph/graph.h"
#include "tensorflow/core/platform/test.h"
diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index a29f800a26..d93a5a0894 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/graph/graph.h"
+#include <vector>
#include "tensorflow/core/framework/node_def_util.h"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/lib/core/errors.h"
diff --git a/tensorflow/core/graph/graph_constructor_test.cc b/tensorflow/core/graph/graph_constructor_test.cc
index 06109e3470..a39ca21add 100644
--- a/tensorflow/core/graph/graph_constructor_test.cc
+++ b/tensorflow/core/graph/graph_constructor_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/graph/graph_constructor.h"
+#include <vector>
#include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/graph/graph.h"
#include "tensorflow/core/kernels/ops_util.h"
diff --git a/tensorflow/core/graph/graph_partition.cc b/tensorflow/core/graph/graph_partition.cc
index 7935f4808e..de976df150 100644
--- a/tensorflow/core/graph/graph_partition.cc
+++ b/tensorflow/core/graph/graph_partition.cc
@@ -17,6 +17,7 @@ limitations under the License.
#include <deque>
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/framework/node_def_builder.h"
#include "tensorflow/core/framework/op_kernel.h"
diff --git a/tensorflow/core/graph/graph_partition.h b/tensorflow/core/graph/graph_partition.h
index 95f9eae251..4ae0133977 100644
--- a/tensorflow/core/graph/graph_partition.h
+++ b/tensorflow/core/graph/graph_partition.h
@@ -19,6 +19,7 @@ limitations under the License.
#include <functional>
#include <string>
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/graph/costmodel.h"
diff --git a/tensorflow/core/graph/graph_test.cc b/tensorflow/core/graph/graph_test.cc
index 013f1331ec..04566322e5 100644
--- a/tensorflow/core/graph/graph_test.cc
+++ b/tensorflow/core/graph/graph_test.cc
@@ -16,6 +16,7 @@ limitations under the License.
#include "tensorflow/core/graph/graph.h"
#include <set>
+#include <vector>
#include "tensorflow/core/graph/graph_constructor.h"
#include "tensorflow/core/graph/node_builder.h"
#include "tensorflow/core/kernels/ops_util.h"
diff --git a/tensorflow/core/graph/node_builder.cc b/tensorflow/core/graph/node_builder.cc
index e072d8a740..fbea8d03cd 100644
--- a/tensorflow/core/graph/node_builder.cc
+++ b/tensorflow/core/graph/node_builder.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/graph/node_builder.h"
+#include <vector>
#include "tensorflow/core/framework/node_def_util.h"
#include "tensorflow/core/lib/core/errors.h"
diff --git a/tensorflow/core/graph/optimizer_cse.cc b/tensorflow/core/graph/optimizer_cse.cc
index 335b922aa1..26ed552677 100644
--- a/tensorflow/core/graph/optimizer_cse.cc
+++ b/tensorflow/core/graph/optimizer_cse.cc
@@ -39,6 +39,7 @@ limitations under the License.
#include "tensorflow/core/graph/optimizer_cse.h"
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/graph/algorithm.h"
#include "tensorflow/core/lib/gtl/map_util.h"
diff --git a/tensorflow/core/graph/optimizer_cse_test.cc b/tensorflow/core/graph/optimizer_cse_test.cc
index 2cd9b5e0e9..0fe4a93c1e 100644
--- a/tensorflow/core/graph/optimizer_cse_test.cc
+++ b/tensorflow/core/graph/optimizer_cse_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/graph/optimizer_cse.h"
+#include <vector>
#include "tensorflow/core/framework/op.h"
#include "tensorflow/core/graph/graph.h"
#include "tensorflow/core/graph/graph_constructor.h"
diff --git a/tensorflow/core/graph/tensor_id_test.cc b/tensorflow/core/graph/tensor_id_test.cc
index 2ce879413c..d20c07571d 100644
--- a/tensorflow/core/graph/tensor_id_test.cc
+++ b/tensorflow/core/graph/tensor_id_test.cc
@@ -14,6 +14,7 @@ limitations under the License.
==============================================================================*/
#include "tensorflow/core/graph/tensor_id.h"
+#include <vector>
#include "tensorflow/core/lib/random/simple_philox.h"
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/test.h"
diff --git a/tensorflow/core/graph/testlib.cc b/tensorflow/core/graph/testlib.cc
index 86a652e33b..ddf322818c 100644
--- a/tensorflow/core/graph/testlib.cc
+++ b/tensorflow/core/graph/testlib.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/graph/testlib.h"
+#include <vector>
#include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/framework/node_def_builder.h"
#include "tensorflow/core/framework/types.h"
diff --git a/tensorflow/core/graph/validate_test.cc b/tensorflow/core/graph/validate_test.cc
index 1c3cd036d9..bce1608c4b 100644
--- a/tensorflow/core/graph/validate_test.cc
+++ b/tensorflow/core/graph/validate_test.cc
@@ -16,7 +16,6 @@ limitations under the License.
#include "tensorflow/core/graph/validate.h"
#include <string>
-#include <vector>
#include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/framework/graph_def_util.h"
diff --git a/tensorflow/core/kernels/adjust_contrast_op_test.cc b/tensorflow/core/kernels/adjust_contrast_op_test.cc
index e798be37eb..e0807e712a 100644
--- a/tensorflow/core/kernels/adjust_contrast_op_test.cc
+++ b/tensorflow/core/kernels/adjust_contrast_op_test.cc
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
+#include <vector>
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/framework/fake_input.h"
#include "tensorflow/core/framework/graph.pb.h"
diff --git a/tensorflow/core/kernels/attention_ops.cc b/tensorflow/core/kernels/attention_ops.cc
index d355965339..d48f86eabe 100644
--- a/tensorflow/core/kernels/attention_ops.cc
+++ b/tensorflow/core/kernels/attention_ops.cc
@@ -17,12 +17,13 @@ limitations under the License.
#define EIGEN_USE_THREADS
-#include "tensorflow/core/platform/port.h"
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/NeuralNetworks"
#include "tensorflow/core/framework/op.h"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/port.h"
#include "tensorflow/core/public/tensor.h"
#include "tensorflow/core/public/tensor_shape.h"
diff --git a/tensorflow/core/kernels/avgpooling_op.cc b/tensorflow/core/kernels/avgpooling_op.cc
index 98bb3356e1..c62f6004e3 100644
--- a/tensorflow/core/kernels/avgpooling_op.cc
+++ b/tensorflow/core/kernels/avgpooling_op.cc
@@ -19,6 +19,7 @@ limitations under the License.
#include "tensorflow/core/kernels/avgpooling_op.h"
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/NeuralNetworks"
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/numeric_op.h"
diff --git a/tensorflow/core/kernels/batch_matmul_op.cc b/tensorflow/core/kernels/batch_matmul_op.cc
index b88a74170c..2a85ab0247 100644
--- a/tensorflow/core/kernels/batch_matmul_op.cc
+++ b/tensorflow/core/kernels/batch_matmul_op.cc
@@ -17,6 +17,7 @@ limitations under the License.
#define EIGEN_USE_THREADS
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/op.h"
#include "tensorflow/core/framework/op_kernel.h"
diff --git a/tensorflow/core/kernels/candidate_sampler_ops.cc b/tensorflow/core/kernels/candidate_sampler_ops.cc
index 2ec22c0ca5..4f93f378a7 100644
--- a/tensorflow/core/kernels/candidate_sampler_ops.cc
+++ b/tensorflow/core/kernels/candidate_sampler_ops.cc
@@ -19,6 +19,7 @@ limitations under the License.
#include <cfloat>
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/kernels/range_sampler.h"
diff --git a/tensorflow/core/kernels/concat_op_cpu.cc b/tensorflow/core/kernels/concat_op_cpu.cc
index 30b3f3a32a..b95045fd30 100644
--- a/tensorflow/core/kernels/concat_op_cpu.cc
+++ b/tensorflow/core/kernels/concat_op_cpu.cc
@@ -15,8 +15,9 @@ limitations under the License.
#define EIGEN_USE_THREADS
-#include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/kernels/concat_op.h"
+#include <vector>
+#include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/util/work_sharder.h"
namespace tensorflow {
diff --git a/tensorflow/core/kernels/concat_op_gpu.cu.cc b/tensorflow/core/kernels/concat_op_gpu.cu.cc
index 084ca9a764..f832fd5b73 100644
--- a/tensorflow/core/kernels/concat_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/concat_op_gpu.cu.cc
@@ -20,6 +20,7 @@ limitations under the License.
#include <stdio.h>
#include <memory>
+#include <vector>
#include "tensorflow/core/framework/bfloat16.h"
#include "tensorflow/core/framework/register_types.h"
diff --git a/tensorflow/core/kernels/conv_grad_ops.cc b/tensorflow/core/kernels/conv_grad_ops.cc
index 0a636c4e29..fa10826855 100644
--- a/tensorflow/core/kernels/conv_grad_ops.cc
+++ b/tensorflow/core/kernels/conv_grad_ops.cc
@@ -18,6 +18,7 @@ limitations under the License.
#define USE_EIGEN_TENSOR
#define EIGEN_USE_THREADS
+#include <vector>
#include "tensorflow/core/framework/numeric_op.h"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/tensor_slice.h"
diff --git a/tensorflow/core/kernels/conv_ops.cc b/tensorflow/core/kernels/conv_ops.cc
index 8d306768ae..376592b759 100644
--- a/tensorflow/core/kernels/conv_ops.cc
+++ b/tensorflow/core/kernels/conv_ops.cc
@@ -18,6 +18,7 @@ limitations under the License.
#define USE_EIGEN_TENSOR
#define EIGEN_USE_THREADS
+#include <vector>
#include "tensorflow/core/framework/numeric_op.h"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/tensor_slice.h"
diff --git a/tensorflow/core/kernels/decode_csv_op.cc b/tensorflow/core/kernels/decode_csv_op.cc
index 27d6f8b193..4aa7f8b71b 100644
--- a/tensorflow/core/kernels/decode_csv_op.cc
+++ b/tensorflow/core/kernels/decode_csv_op.cc
@@ -14,6 +14,7 @@ limitations under the License.
==============================================================================*/
// See docs in ../ops/parsing_ops.cc.
+#include <vector>
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/lib/core/errors.h"
diff --git a/tensorflow/core/kernels/dynamic_partition_op.cc b/tensorflow/core/kernels/dynamic_partition_op.cc
index f3fc63f375..874bad5c88 100644
--- a/tensorflow/core/kernels/dynamic_partition_op.cc
+++ b/tensorflow/core/kernels/dynamic_partition_op.cc
@@ -15,6 +15,7 @@ limitations under the License.
// See docs in ../ops/data_flow_ops.cc.
+#include <vector>
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/framework/types.h"
diff --git a/tensorflow/core/kernels/dynamic_partition_op_test.cc b/tensorflow/core/kernels/dynamic_partition_op_test.cc
index 5edd200429..9a51ec4fa0 100644
--- a/tensorflow/core/kernels/dynamic_partition_op_test.cc
+++ b/tensorflow/core/kernels/dynamic_partition_op_test.cc
@@ -15,7 +15,6 @@ limitations under the License.
#include <functional>
#include <memory>
-#include <vector>
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/framework/fake_input.h"
diff --git a/tensorflow/core/kernels/dynamic_stitch_op_test.cc b/tensorflow/core/kernels/dynamic_stitch_op_test.cc
index c1e4927146..9e91eb57ae 100644
--- a/tensorflow/core/kernels/dynamic_stitch_op_test.cc
+++ b/tensorflow/core/kernels/dynamic_stitch_op_test.cc
@@ -15,7 +15,6 @@ limitations under the License.
#include <functional>
#include <memory>
-#include <vector>
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/framework/fake_input.h"
diff --git a/tensorflow/core/kernels/edit_distance_op.cc b/tensorflow/core/kernels/edit_distance_op.cc
index eb83bddd75..f464ce2268 100644
--- a/tensorflow/core/kernels/edit_distance_op.cc
+++ b/tensorflow/core/kernels/edit_distance_op.cc
@@ -19,6 +19,7 @@ limitations under the License.
#include <limits>
+#include <vector>
#include "tensorflow/core/common_runtime/device.h"
#include "tensorflow/core/framework/op.h"
#include "tensorflow/core/framework/op_kernel.h"
diff --git a/tensorflow/core/kernels/example_parsing_ops.cc b/tensorflow/core/kernels/example_parsing_ops.cc
index 0d0d00de4f..37fc7a6028 100644
--- a/tensorflow/core/kernels/example_parsing_ops.cc
+++ b/tensorflow/core/kernels/example_parsing_ops.cc
@@ -17,6 +17,7 @@ limitations under the License.
#include <unordered_set>
+#include <vector>
#include "tensorflow/core/example/example.pb.h"
#include "tensorflow/core/framework/numeric_op.h"
#include "tensorflow/core/framework/register_types.h"
diff --git a/tensorflow/core/kernels/io.cc b/tensorflow/core/kernels/io.cc
index fe6a5d0039..ca6317ee08 100644
--- a/tensorflow/core/kernels/io.cc
+++ b/tensorflow/core/kernels/io.cc
@@ -16,6 +16,7 @@ limitations under the License.
// See docs in ../ops/io_ops.cc
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/kernels/io.h"
#include "tensorflow/core/framework/op_kernel.h"
diff --git a/tensorflow/core/kernels/lrn_op_test.cc b/tensorflow/core/kernels/lrn_op_test.cc
index fc5edd26b8..9f38ecde02 100644
--- a/tensorflow/core/kernels/lrn_op_test.cc
+++ b/tensorflow/core/kernels/lrn_op_test.cc
@@ -15,7 +15,6 @@ limitations under the License.
#include <functional>
#include <memory>
-#include <vector>
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/framework/fake_input.h"
diff --git a/tensorflow/core/kernels/maxpooling_op.cc b/tensorflow/core/kernels/maxpooling_op.cc
index 7b0b07dfdc..5dc47cef86 100644
--- a/tensorflow/core/kernels/maxpooling_op.cc
+++ b/tensorflow/core/kernels/maxpooling_op.cc
@@ -19,6 +19,7 @@ limitations under the License.
#include "tensorflow/core/kernels/maxpooling_op.h"
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/NeuralNetworks"
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/common_runtime/device.h"
diff --git a/tensorflow/core/kernels/ops_testutil.cc b/tensorflow/core/kernels/ops_testutil.cc
index 3a4f350c97..a3ce00d355 100644
--- a/tensorflow/core/kernels/ops_testutil.cc
+++ b/tensorflow/core/kernels/ops_testutil.cc
@@ -15,6 +15,8 @@ limitations under the License.
#include "tensorflow/core/kernels/ops_testutil.h"
+#include <vector>
+
namespace tensorflow {
namespace test {
diff --git a/tensorflow/core/kernels/pooling_ops_common.cc b/tensorflow/core/kernels/pooling_ops_common.cc
index d4afb53650..5b43df665a 100644
--- a/tensorflow/core/kernels/pooling_ops_common.cc
+++ b/tensorflow/core/kernels/pooling_ops_common.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/kernels/pooling_ops_common.h"
+#include <vector>
#include "tensorflow/core/common_runtime/device.h"
#include "tensorflow/core/public/tensor.h"
diff --git a/tensorflow/core/kernels/pooling_ops_common_gpu.h b/tensorflow/core/kernels/pooling_ops_common_gpu.h
index 439e0977c2..20c1b9ff13 100644
--- a/tensorflow/core/kernels/pooling_ops_common_gpu.h
+++ b/tensorflow/core/kernels/pooling_ops_common_gpu.h
@@ -20,6 +20,7 @@ limitations under the License.
#ifndef TENSORFLOW_CORE_KERNELS_POOLING_OPS_COMMON_GPU_H_
#define TENSORFLOW_CORE_KERNELS_POOLING_OPS_COMMON_GPU_H_
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/NeuralNetworks"
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/numeric_op.h"
diff --git a/tensorflow/core/kernels/queue_base.cc b/tensorflow/core/kernels/queue_base.cc
index b33af06408..4c497c96eb 100644
--- a/tensorflow/core/kernels/queue_base.cc
+++ b/tensorflow/core/kernels/queue_base.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/kernels/queue_base.h"
+#include <vector>
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/platform/mutex.h"
#include "tensorflow/core/platform/port.h"
diff --git a/tensorflow/core/kernels/queue_op.h b/tensorflow/core/kernels/queue_op.h
index a549439220..c2b54f6102 100644
--- a/tensorflow/core/kernels/queue_op.h
+++ b/tensorflow/core/kernels/queue_op.h
@@ -17,7 +17,6 @@ limitations under the License.
#define TENSORFLOW_KERNELS_QUEUE_OP_H_
#include <deque>
-#include <vector>
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/resource_mgr.h"
diff --git a/tensorflow/core/kernels/random_shuffle_op.cc b/tensorflow/core/kernels/random_shuffle_op.cc
index b84ca14a65..a4665d738e 100644
--- a/tensorflow/core/kernels/random_shuffle_op.cc
+++ b/tensorflow/core/kernels/random_shuffle_op.cc
@@ -15,6 +15,7 @@ limitations under the License.
// See docs in ../ops/random_ops.cc.
+#include <vector>
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/framework/tensor_util.h"
diff --git a/tensorflow/core/kernels/reader_base.h b/tensorflow/core/kernels/reader_base.h
index be48914d04..f1495b4de3 100644
--- a/tensorflow/core/kernels/reader_base.h
+++ b/tensorflow/core/kernels/reader_base.h
@@ -18,7 +18,6 @@ limitations under the License.
#include <memory>
#include <string>
-#include <vector>
#include "tensorflow/core/framework/queue_interface.h"
#include "tensorflow/core/framework/reader_interface.h"
#include "tensorflow/core/kernels/reader_base.pb.h"
diff --git a/tensorflow/core/kernels/reverse_op_test.cc b/tensorflow/core/kernels/reverse_op_test.cc
index 4fa31c7d56..153867358e 100644
--- a/tensorflow/core/kernels/reverse_op_test.cc
+++ b/tensorflow/core/kernels/reverse_op_test.cc
@@ -15,7 +15,6 @@ limitations under the License.
#include <functional>
#include <memory>
-#include <vector>
#include "tensorflow/core/common_runtime/device.h"
#include "tensorflow/core/common_runtime/device_factory.h"
diff --git a/tensorflow/core/kernels/reverse_sequence_op.cc b/tensorflow/core/kernels/reverse_sequence_op.cc
index c435cfd38e..769bd7012c 100644
--- a/tensorflow/core/kernels/reverse_sequence_op.cc
+++ b/tensorflow/core/kernels/reverse_sequence_op.cc
@@ -24,6 +24,7 @@ limitations under the License.
#include "tensorflow/core/kernels/reverse_sequence_op.h"
#include <memory>
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
diff --git a/tensorflow/core/kernels/save_op_test.cc b/tensorflow/core/kernels/save_op_test.cc
index 2241cec423..531600f012 100644
--- a/tensorflow/core/kernels/save_op_test.cc
+++ b/tensorflow/core/kernels/save_op_test.cc
@@ -15,7 +15,6 @@ limitations under the License.
#include <functional>
#include <memory>
-#include <vector>
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/framework/fake_input.h"
diff --git a/tensorflow/core/kernels/segment_reduction_ops.cc b/tensorflow/core/kernels/segment_reduction_ops.cc
index 773016fd51..5e44805381 100644
--- a/tensorflow/core/kernels/segment_reduction_ops.cc
+++ b/tensorflow/core/kernels/segment_reduction_ops.cc
@@ -17,9 +17,10 @@ limitations under the License.
#define EIGEN_USE_THREADS
-#include "tensorflow/core/framework/numeric_op.h"
+#include <vector>
#include "third_party/eigen3/Eigen/Core"
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/numeric_op.h"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/framework/tensor_types.h"
diff --git a/tensorflow/core/kernels/segment_reduction_ops_test.cc b/tensorflow/core/kernels/segment_reduction_ops_test.cc
index 0049a18167..88ec897801 100644
--- a/tensorflow/core/kernels/segment_reduction_ops_test.cc
+++ b/tensorflow/core/kernels/segment_reduction_ops_test.cc
@@ -14,8 +14,7 @@ limitations under the License.
==============================================================================*/
#include <functional>
-
-#include "tensorflow/core/public/session_options.h"
+#include <vector>
#include "tensorflow/core/common_runtime/device.h"
#include "tensorflow/core/common_runtime/device_factory.h"
@@ -34,6 +33,7 @@ limitations under the License.
#include "tensorflow/core/kernels/ops_util.h"
#include "tensorflow/core/platform/test.h"
#include "tensorflow/core/platform/test_benchmark.h"
+#include "tensorflow/core/public/session_options.h"
#include "tensorflow/core/public/tensor.h"
#include "tensorflow/core/public/version.h"
diff --git a/tensorflow/core/kernels/serialize_sparse_op.cc b/tensorflow/core/kernels/serialize_sparse_op.cc
index a0df8288d2..68ff49b93d 100644
--- a/tensorflow/core/kernels/serialize_sparse_op.cc
+++ b/tensorflow/core/kernels/serialize_sparse_op.cc
@@ -18,6 +18,7 @@ limitations under the License.
#include <algorithm>
#include <unordered_map>
#include <utility>
+#include <vector>
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
diff --git a/tensorflow/core/kernels/shape_ops.cc b/tensorflow/core/kernels/shape_ops.cc
index c724f06fb2..09ec271ad0 100644
--- a/tensorflow/core/kernels/shape_ops.cc
+++ b/tensorflow/core/kernels/shape_ops.cc
@@ -17,6 +17,7 @@ limitations under the License.
#include <unordered_set>
+#include <vector>
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/public/tensor.h"
diff --git a/tensorflow/core/kernels/slice_op_test.cc b/tensorflow/core/kernels/slice_op_test.cc
index 43c3f9ddbf..1789bb306f 100644
--- a/tensorflow/core/kernels/slice_op_test.cc
+++ b/tensorflow/core/kernels/slice_op_test.cc
@@ -15,7 +15,6 @@ limitations under the License.
#include <functional>
#include <memory>
-#include <vector>
#include "tensorflow/core/common_runtime/kernel_benchmark_testlib.h"
#include "tensorflow/core/framework/allocator.h"
diff --git a/tensorflow/core/kernels/sparse_concat_op.cc b/tensorflow/core/kernels/sparse_concat_op.cc
index 06f7388470..328d7664c9 100644
--- a/tensorflow/core/kernels/sparse_concat_op.cc
+++ b/tensorflow/core/kernels/sparse_concat_op.cc
@@ -18,6 +18,7 @@ limitations under the License.
#include <algorithm>
#include <unordered_map>
#include <utility>
+#include <vector>
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
diff --git a/tensorflow/core/kernels/sparse_matmul_op.cc b/tensorflow/core/kernels/sparse_matmul_op.cc
index 1b3fedd383..4eb3b54bae 100644
--- a/tensorflow/core/kernels/sparse_matmul_op.cc
+++ b/tensorflow/core/kernels/sparse_matmul_op.cc
@@ -17,6 +17,7 @@ limitations under the License.
#define EIGEN_USE_THREADS
+#include <vector>
#include "third_party/eigen3/Eigen/Core"
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/common_runtime/device.h"
diff --git a/tensorflow/core/kernels/sparse_split_op.cc b/tensorflow/core/kernels/sparse_split_op.cc
index 4b48234211..fa3f79673a 100644
--- a/tensorflow/core/kernels/sparse_split_op.cc
+++ b/tensorflow/core/kernels/sparse_split_op.cc
@@ -15,6 +15,7 @@ limitations under the License.
#define EIGEN_USE_THREADS
+#include <vector>
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/util/sparse/sparse_tensor.h"
diff --git a/tensorflow/core/kernels/split_op.cc b/tensorflow/core/kernels/split_op.cc
index 7bc51fa15d..c03594f5e8 100644
--- a/tensorflow/core/kernels/split_op.cc
+++ b/tensorflow/core/kernels/split_op.cc
@@ -19,8 +19,6 @@ limitations under the License.
#include "tensorflow/core/kernels/split_op.h"
-#include <vector>
-
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
diff --git a/tensorflow/core/kernels/summary_image_op_test.cc b/tensorflow/core/kernels/summary_image_op_test.cc
index 94bf005c84..00c552fbab 100644
--- a/tensorflow/core/kernels/summary_image_op_test.cc
+++ b/tensorflow/core/kernels/summary_image_op_test.cc
@@ -15,7 +15,6 @@ limitations under the License.
#include <functional>
#include <memory>
-#include <vector>
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/framework/fake_input.h"
diff --git a/tensorflow/core/kernels/summary_op_test.cc b/tensorflow/core/kernels/summary_op_test.cc
index 7926271773..5806128f4e 100644
--- a/tensorflow/core/kernels/summary_op_test.cc
+++ b/tensorflow/core/kernels/summary_op_test.cc
@@ -15,7 +15,6 @@ limitations under the License.
#include <functional>
#include <memory>
-#include <vector>
#include "tensorflow/core/framework/allocator.h"
#include "tensorflow/core/framework/fake_input.h"
diff --git a/tensorflow/core/kernels/tile_ops.cc b/tensorflow/core/kernels/tile_ops.cc
index 58f59d072e..fc482a6d1e 100644
--- a/tensorflow/core/kernels/tile_ops.cc
+++ b/tensorflow/core/kernels/tile_ops.cc
@@ -23,6 +23,7 @@ limitations under the License.
#include "tensorflow/core/kernels/tile_ops.h"
+#include <vector>
#include "tensorflow/core/framework/numeric_op.h"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/type_index.h"
diff --git a/tensorflow/core/kernels/topk_op.cc b/tensorflow/core/kernels/topk_op.cc
index 374f67afa7..ae569af4c7 100644
--- a/tensorflow/core/kernels/topk_op.cc
+++ b/tensorflow/core/kernels/topk_op.cc
@@ -17,6 +17,7 @@ limitations under the License.
#define EIGEN_USE_THREADS
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
diff --git a/tensorflow/core/kernels/unique_op_test.cc b/tensorflow/core/kernels/unique_op_test.cc
index a082478cd2..0f12232c10 100644
--- a/tensorflow/core/kernels/unique_op_test.cc
+++ b/tensorflow/core/kernels/unique_op_test.cc
@@ -15,7 +15,6 @@ limitations under the License.
#include <functional>
#include <memory>
-#include <vector>
#include "tensorflow/core/common_runtime/kernel_benchmark_testlib.h"
#include "tensorflow/core/framework/types.h"
diff --git a/tensorflow/core/kernels/unpack_op.cc b/tensorflow/core/kernels/unpack_op.cc
index 4dc1e9219f..9f528460c0 100644
--- a/tensorflow/core/kernels/unpack_op.cc
+++ b/tensorflow/core/kernels/unpack_op.cc
@@ -17,8 +17,6 @@ limitations under the License.
#define EIGEN_USE_THREADS
-#include <vector>
-
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
diff --git a/tensorflow/core/lib/core/coding_test.cc b/tensorflow/core/lib/core/coding_test.cc
index 6f5855c893..1c58eedaa1 100644
--- a/tensorflow/core/lib/core/coding_test.cc
+++ b/tensorflow/core/lib/core/coding_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/lib/core/coding.h"
+#include <vector>
#include "tensorflow/core/platform/test.h"
namespace tensorflow {
diff --git a/tensorflow/core/lib/core/command_line_flags.h b/tensorflow/core/lib/core/command_line_flags.h
index 9e10b3dd57..bfd15292fa 100644
--- a/tensorflow/core/lib/core/command_line_flags.h
+++ b/tensorflow/core/lib/core/command_line_flags.h
@@ -16,6 +16,7 @@ limitations under the License.
#ifndef TENSORFLOW_LIB_CORE_COMMAND_LINE_FLAGS_H_
#define TENSORFLOW_LIB_CORE_COMMAND_LINE_FLAGS_H_
+#include <vector>
#include "tensorflow/core/platform/macros.h"
#include "tensorflow/core/platform/port.h"
#include "tensorflow/core/public/status.h"
diff --git a/tensorflow/core/lib/gtl/array_slice_internal.h b/tensorflow/core/lib/gtl/array_slice_internal.h
index 90f2d6f309..ff2d49b041 100644
--- a/tensorflow/core/lib/gtl/array_slice_internal.h
+++ b/tensorflow/core/lib/gtl/array_slice_internal.h
@@ -28,6 +28,7 @@ limitations under the License.
#include <string>
#include <type_traits>
#include <utility>
+#include <vector>
#include "tensorflow/core/platform/logging.h"
namespace tensorflow {
diff --git a/tensorflow/core/lib/gtl/edit_distance_test.cc b/tensorflow/core/lib/gtl/edit_distance_test.cc
index 3db9772af4..cc1a259310 100644
--- a/tensorflow/core/lib/gtl/edit_distance_test.cc
+++ b/tensorflow/core/lib/gtl/edit_distance_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/lib/gtl/edit_distance.h"
+#include <vector>
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/port.h"
#include "tensorflow/core/platform/test.h"
diff --git a/tensorflow/core/lib/gtl/inlined_vector.h b/tensorflow/core/lib/gtl/inlined_vector.h
index 718c85a22b..c144a11556 100644
--- a/tensorflow/core/lib/gtl/inlined_vector.h
+++ b/tensorflow/core/lib/gtl/inlined_vector.h
@@ -39,6 +39,7 @@ limitations under the License.
#include <iterator>
#include <memory>
#include <type_traits>
+#include <vector>
#include "tensorflow/core/lib/gtl/manual_constructor.h"
#include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/core/lib/gtl/map_util.h b/tensorflow/core/lib/gtl/map_util.h
index 3433081882..cb4bcd61ad 100644
--- a/tensorflow/core/lib/gtl/map_util.h
+++ b/tensorflow/core/lib/gtl/map_util.h
@@ -25,7 +25,6 @@ limitations under the License.
#include <memory>
#include <string>
#include <utility>
-#include <vector>
namespace tensorflow {
namespace gtl {
diff --git a/tensorflow/core/lib/histogram/histogram.cc b/tensorflow/core/lib/histogram/histogram.cc
index 6da972dcb0..d758510279 100644
--- a/tensorflow/core/lib/histogram/histogram.cc
+++ b/tensorflow/core/lib/histogram/histogram.cc
@@ -16,6 +16,7 @@ limitations under the License.
#include "tensorflow/core/lib/histogram/histogram.h"
#include <float.h>
#include <math.h>
+#include <vector>
#include "tensorflow/core/framework/summary.pb.h"
#include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/core/lib/histogram/histogram.h b/tensorflow/core/lib/histogram/histogram.h
index c1f65a2a98..4ad176c4ae 100644
--- a/tensorflow/core/lib/histogram/histogram.h
+++ b/tensorflow/core/lib/histogram/histogram.h
@@ -17,6 +17,7 @@ limitations under the License.
#define TENSORFLOW_LIB_HISTOGRAM_HISTOGRAM_H_
#include <string>
+#include <vector>
#include "tensorflow/core/lib/gtl/array_slice.h"
#include "tensorflow/core/platform/macros.h"
#include "tensorflow/core/platform/mutex.h"
diff --git a/tensorflow/core/lib/io/block.cc b/tensorflow/core/lib/io/block.cc
index 8eb4a882b6..532322e43b 100644
--- a/tensorflow/core/lib/io/block.cc
+++ b/tensorflow/core/lib/io/block.cc
@@ -18,7 +18,6 @@ limitations under the License.
#include "tensorflow/core/lib/io/block.h"
#include <algorithm>
-#include <vector>
#include "tensorflow/core/lib/core/coding.h"
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/io/format.h"
diff --git a/tensorflow/core/lib/io/inputbuffer_test.cc b/tensorflow/core/lib/io/inputbuffer_test.cc
index 98c4c20d4f..17b8cbb363 100644
--- a/tensorflow/core/lib/io/inputbuffer_test.cc
+++ b/tensorflow/core/lib/io/inputbuffer_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/lib/io/inputbuffer.h"
+#include <vector>
#include "tensorflow/core/public/env.h"
#include "tensorflow/core/lib/core/errors.h"
diff --git a/tensorflow/core/lib/io/match.cc b/tensorflow/core/lib/io/match.cc
index 209148cf22..c5d42eeef1 100644
--- a/tensorflow/core/lib/io/match.cc
+++ b/tensorflow/core/lib/io/match.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/lib/io/match.h"
#include <fnmatch.h>
+#include <vector>
#include "tensorflow/core/lib/io/path.h"
#include "tensorflow/core/public/env.h"
diff --git a/tensorflow/core/lib/io/match_test.cc b/tensorflow/core/lib/io/match_test.cc
index 741c37c471..123bf42ed4 100644
--- a/tensorflow/core/lib/io/match_test.cc
+++ b/tensorflow/core/lib/io/match_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/lib/io/match.h"
#include <algorithm>
+#include <vector>
#include "tensorflow/core/lib/core/status_test_util.h"
#include "tensorflow/core/lib/io/path.h"
#include "tensorflow/core/lib/strings/strcat.h"
diff --git a/tensorflow/core/lib/io/table_test.cc b/tensorflow/core/lib/io/table_test.cc
index dcc1eb5558..b3adeac77b 100644
--- a/tensorflow/core/lib/io/table_test.cc
+++ b/tensorflow/core/lib/io/table_test.cc
@@ -17,6 +17,7 @@ limitations under the License.
#include <map>
#include <string>
+#include <vector>
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/io/block.h"
#include "tensorflow/core/lib/io/block_builder.h"
diff --git a/tensorflow/core/lib/jpeg/jpeg_mem.h b/tensorflow/core/lib/jpeg/jpeg_mem.h
index 82701466f0..92a87b6116 100644
--- a/tensorflow/core/lib/jpeg/jpeg_mem.h
+++ b/tensorflow/core/lib/jpeg/jpeg_mem.h
@@ -23,7 +23,6 @@ limitations under the License.
#include <functional>
#include <string>
-#include <vector>
#include "tensorflow/core/lib/core/stringpiece.h"
#include "tensorflow/core/platform/port.h"
diff --git a/tensorflow/core/lib/random/distribution_sampler.h b/tensorflow/core/lib/random/distribution_sampler.h
index 8c41826379..8b4e1157c1 100644
--- a/tensorflow/core/lib/random/distribution_sampler.h
+++ b/tensorflow/core/lib/random/distribution_sampler.h
@@ -33,7 +33,6 @@ limitations under the License.
#include <memory>
#include <utility>
-#include <vector>
#include "tensorflow/core/lib/gtl/array_slice.h"
#include "tensorflow/core/lib/random/simple_philox.h"
diff --git a/tensorflow/core/lib/strings/str_util.cc b/tensorflow/core/lib/strings/str_util.cc
index 5a6a888d3f..4ef34ad6ae 100644
--- a/tensorflow/core/lib/strings/str_util.cc
+++ b/tensorflow/core/lib/strings/str_util.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/lib/strings/str_util.h"
#include <ctype.h>
+#include <vector>
namespace tensorflow {
namespace str_util {
diff --git a/tensorflow/core/lib/strings/str_util.h b/tensorflow/core/lib/strings/str_util.h
index a485d3e4a9..9d5ad81504 100644
--- a/tensorflow/core/lib/strings/str_util.h
+++ b/tensorflow/core/lib/strings/str_util.h
@@ -17,6 +17,7 @@ limitations under the License.
#define TENSORFLOW_LIB_STRINGS_STR_UTIL_H_
#include <string>
+#include <vector>
#include "tensorflow/core/lib/core/stringpiece.h"
#include "tensorflow/core/lib/gtl/array_slice.h"
#include "tensorflow/core/lib/strings/strcat.h"
diff --git a/tensorflow/core/lib/strings/str_util_test.cc b/tensorflow/core/lib/strings/str_util_test.cc
index 0ed9aa8b80..0fdae33ad8 100644
--- a/tensorflow/core/lib/strings/str_util_test.cc
+++ b/tensorflow/core/lib/strings/str_util_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/lib/strings/str_util.h"
+#include <vector>
#include "tensorflow/core/platform/test.h"
namespace tensorflow {
diff --git a/tensorflow/core/lib/strings/stringprintf.cc b/tensorflow/core/lib/strings/stringprintf.cc
index 975406cd64..a28bcc99b8 100644
--- a/tensorflow/core/lib/strings/stringprintf.cc
+++ b/tensorflow/core/lib/strings/stringprintf.cc
@@ -18,7 +18,6 @@ limitations under the License.
#include <errno.h>
#include <stdarg.h> // For va_list and related operations
#include <stdio.h> // MSVC requires this for _vsnprintf
-#include <vector>
namespace tensorflow {
namespace strings {
diff --git a/tensorflow/core/lib/strings/stringprintf.h b/tensorflow/core/lib/strings/stringprintf.h
index adbdd2090a..b114c8e54c 100644
--- a/tensorflow/core/lib/strings/stringprintf.h
+++ b/tensorflow/core/lib/strings/stringprintf.h
@@ -25,7 +25,6 @@ limitations under the License.
#include <stdarg.h>
#include <string>
-#include <vector>
#include "tensorflow/core/platform/macros.h"
#include "tensorflow/core/platform/port.h"
diff --git a/tensorflow/core/ops/array_grad.cc b/tensorflow/core/ops/array_grad.cc
index dbdc1d49b9..66118489dd 100644
--- a/tensorflow/core/ops/array_grad.cc
+++ b/tensorflow/core/ops/array_grad.cc
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
+#include <vector>
#include "tensorflow/core/framework/function.h"
#include "tensorflow/core/lib/core/errors.h"
diff --git a/tensorflow/core/ops/array_grad_test.cc b/tensorflow/core/ops/array_grad_test.cc
index a4f83202f0..9f6ff6f840 100644
--- a/tensorflow/core/ops/array_grad_test.cc
+++ b/tensorflow/core/ops/array_grad_test.cc
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
+#include <vector>
#include "tensorflow/core/framework/function_testlib.h"
#include "tensorflow/core/framework/tensor_testutil.h"
#include "tensorflow/core/platform/test.h"
diff --git a/tensorflow/core/ops/functional_grad.cc b/tensorflow/core/ops/functional_grad.cc
index 687fb2ec61..ca142c73c9 100644
--- a/tensorflow/core/ops/functional_grad.cc
+++ b/tensorflow/core/ops/functional_grad.cc
@@ -14,6 +14,7 @@ limitations under the License.
==============================================================================*/
#include "tensorflow/core/framework/function.h"
+#include <vector>
#include "tensorflow/core/lib/core/errors.h"
namespace tensorflow {
diff --git a/tensorflow/core/ops/math_grad.cc b/tensorflow/core/ops/math_grad.cc
index 70305ab6a2..1a19139452 100644
--- a/tensorflow/core/ops/math_grad.cc
+++ b/tensorflow/core/ops/math_grad.cc
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
+#include <vector>
#include "tensorflow/core/framework/function.h"
#include "tensorflow/core/lib/core/errors.h"
diff --git a/tensorflow/core/platform/default/test_benchmark.cc b/tensorflow/core/platform/default/test_benchmark.cc
index 3d26a2408e..eaeff4ae07 100644
--- a/tensorflow/core/platform/default/test_benchmark.cc
+++ b/tensorflow/core/platform/default/test_benchmark.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/platform/test_benchmark.h"
+#include <vector>
#include "tensorflow/core/lib/strings/str_util.h"
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/regexp.h"
diff --git a/tensorflow/core/platform/port.h b/tensorflow/core/platform/port.h
index e13a8e65d1..57aa956c46 100644
--- a/tensorflow/core/platform/port.h
+++ b/tensorflow/core/platform/port.h
@@ -16,8 +16,6 @@ limitations under the License.
#ifndef TENSORFLOW_PLATFORM_PORT_H_
#define TENSORFLOW_PLATFORM_PORT_H_
-#include <vector>
-
#include "tensorflow/core/platform/types.h"
#endif // TENSORFLOW_PLATFORM_PORT_H_
diff --git a/tensorflow/core/platform/posix/env.cc b/tensorflow/core/platform/posix/env.cc
index 164d11a81f..ee873f3590 100644
--- a/tensorflow/core/platform/posix/env.cc
+++ b/tensorflow/core/platform/posix/env.cc
@@ -24,6 +24,7 @@ limitations under the License.
#include <unistd.h>
#include <thread>
+#include <vector>
#include "tensorflow/core/lib/core/error_codes.pb.h"
#include "tensorflow/core/platform/load_library.h"
diff --git a/tensorflow/core/platform/tensor_coding.cc b/tensorflow/core/platform/tensor_coding.cc
index 13a4df76b6..8f7bd5024d 100644
--- a/tensorflow/core/platform/tensor_coding.cc
+++ b/tensorflow/core/platform/tensor_coding.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/platform/tensor_coding.h"
+#include <vector>
#include "tensorflow/core/lib/core/coding.h"
#include "tensorflow/core/lib/core/stringpiece.h"
diff --git a/tensorflow/core/platform/test_benchmark.h b/tensorflow/core/platform/test_benchmark.h
index 913ed3b6a9..af6a0995d5 100644
--- a/tensorflow/core/platform/test_benchmark.h
+++ b/tensorflow/core/platform/test_benchmark.h
@@ -17,6 +17,7 @@ limitations under the License.
#ifndef TENSORFLOW_PLATFORM_TEST_BENCHMARK_H_
#define TENSORFLOW_PLATFORM_TEST_BENCHMARK_H_
+#include <vector>
#include "tensorflow/core/platform/macros.h"
#include "tensorflow/core/platform/platform.h"
#include "tensorflow/core/platform/port.h"
diff --git a/tensorflow/core/platform/tracing.cc b/tensorflow/core/platform/tracing.cc
index 3084eccec7..81c4397961 100644
--- a/tensorflow/core/platform/tracing.cc
+++ b/tensorflow/core/platform/tracing.cc
@@ -18,6 +18,7 @@ limitations under the License.
#include <atomic>
#include <map>
#include <string>
+#include <vector>
#include "tensorflow/core/lib/strings/str_util.h"
#include "tensorflow/core/lib/strings/strcat.h"
#include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/core/util/bcast.h b/tensorflow/core/util/bcast.h
index 014b2026a2..64576843ba 100644
--- a/tensorflow/core/util/bcast.h
+++ b/tensorflow/core/util/bcast.h
@@ -17,7 +17,6 @@ limitations under the License.
#define TENSORFLOW_UTIL_BCAST_H_
#include <algorithm>
-#include <vector>
#include "tensorflow/core/lib/gtl/inlined_vector.h"
#include "tensorflow/core/platform/macros.h"
diff --git a/tensorflow/core/util/sparse/group_iterator.cc b/tensorflow/core/util/sparse/group_iterator.cc
index c565ac1d16..9922e94f1d 100644
--- a/tensorflow/core/util/sparse/group_iterator.cc
+++ b/tensorflow/core/util/sparse/group_iterator.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/util/sparse/group_iterator.h"
+#include <vector>
namespace tensorflow {
namespace sparse {
diff --git a/tensorflow/core/util/sparse/group_iterator.h b/tensorflow/core/util/sparse/group_iterator.h
index 2b53ef477d..f7b0d896c3 100644
--- a/tensorflow/core/util/sparse/group_iterator.h
+++ b/tensorflow/core/util/sparse/group_iterator.h
@@ -16,6 +16,7 @@ limitations under the License.
#ifndef TENSORFLOW_UTIL_SPARSE_GROUP_ITERATOR_H_
#define TENSORFLOW_UTIL_SPARSE_GROUP_ITERATOR_H_
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/port.h"
diff --git a/tensorflow/core/util/sparse/sparse_tensor.h b/tensorflow/core/util/sparse/sparse_tensor.h
index 18ec7a3a7b..42896df234 100644
--- a/tensorflow/core/util/sparse/sparse_tensor.h
+++ b/tensorflow/core/util/sparse/sparse_tensor.h
@@ -18,6 +18,7 @@ limitations under the License.
#include <limits>
+#include <vector>
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/tensor_types.h"
#include "tensorflow/core/framework/types.h"
diff --git a/tensorflow/core/util/tensor_slice_reader.cc b/tensorflow/core/util/tensor_slice_reader.cc
index 59796c8d3c..71d1d15e34 100644
--- a/tensorflow/core/util/tensor_slice_reader.cc
+++ b/tensorflow/core/util/tensor_slice_reader.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/util/tensor_slice_reader.h"
+#include <vector>
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/gtl/stl_util.h"
#include "tensorflow/core/lib/io/iterator.h"
diff --git a/tensorflow/core/util/tensor_slice_reader.h b/tensorflow/core/util/tensor_slice_reader.h
index e52e44ceb8..5cd8b83670 100644
--- a/tensorflow/core/util/tensor_slice_reader.h
+++ b/tensorflow/core/util/tensor_slice_reader.h
@@ -22,6 +22,7 @@ limitations under the License.
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/framework/tensor_slice.h"
#include "tensorflow/core/framework/types.pb.h"
#include "tensorflow/core/lib/core/stringpiece.h"
diff --git a/tensorflow/core/util/tensor_slice_set.cc b/tensorflow/core/util/tensor_slice_set.cc
index 2ee937242a..3b1d6287a7 100644
--- a/tensorflow/core/util/tensor_slice_set.cc
+++ b/tensorflow/core/util/tensor_slice_set.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/util/tensor_slice_set.h"
+#include <vector>
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/gtl/map_util.h"
#include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/core/util/tensor_slice_set.h b/tensorflow/core/util/tensor_slice_set.h
index 27f6cbfbb9..463b704cc5 100644
--- a/tensorflow/core/util/tensor_slice_set.h
+++ b/tensorflow/core/util/tensor_slice_set.h
@@ -24,6 +24,7 @@ limitations under the License.
#include <string> // for string
#include <unordered_map>
+#include <vector>
#include "tensorflow/core/framework/tensor_slice.h"
#include "tensorflow/core/framework/types.h"
diff --git a/tensorflow/core/util/tensor_slice_set_test.cc b/tensorflow/core/util/tensor_slice_set_test.cc
index 999a544409..f85ee7a7dc 100644
--- a/tensorflow/core/util/tensor_slice_set_test.cc
+++ b/tensorflow/core/util/tensor_slice_set_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/util/tensor_slice_set.h"
+#include <vector>
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/test.h"
#include "tensorflow/core/public/status.h"
diff --git a/tensorflow/core/util/work_sharder.cc b/tensorflow/core/util/work_sharder.cc
index 1350cfb3ae..dfc2c04baa 100644
--- a/tensorflow/core/util/work_sharder.cc
+++ b/tensorflow/core/util/work_sharder.cc
@@ -15,7 +15,6 @@ limitations under the License.
#include "tensorflow/core/util/work_sharder.h"
-#include <vector>
#include "tensorflow/core/lib/core/blocking_counter.h"
#include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/core/util/work_sharder_test.cc b/tensorflow/core/util/work_sharder_test.cc
index cf727403fe..6b5bdb6225 100644
--- a/tensorflow/core/util/work_sharder_test.cc
+++ b/tensorflow/core/util/work_sharder_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
#include "tensorflow/core/util/work_sharder.h"
+#include <vector>
#include "tensorflow/core/lib/core/threadpool.h"
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/mutex.h"