[lite] Include-what-you-use fixes.

PiperOrigin-RevId: 352793429
Change-Id: I303a9d3c0549cf11729ddaf854d8d3dace31718c

tensorflow/lite/BUILD

@@ -122,7 +122,9 @@ cc_test(
     ],
     deps = [
         ":arena_planner",
+        ":graph_info",
         "//tensorflow/core:tflite_portable_logging",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/testing:util",
         "@com_google_googletest//:gtest",
     ],
@@ -247,32 +249,24 @@ cc_library(
     ],
     deps = [
         ":allocation",
-        ":arena_planner",
         ":cc_api",
         ":external_cpu_backend_context",
         ":graph_info",
         ":kernel_api",
         ":macros",
         ":memory_planner",
-        ":minimal_logging",
         ":mutable_op_resolver",
         ":optional_debug_tools",
-        ":shared_library",
-        ":simple_memory_arena",
         ":stderr_reporter",
         ":string",
         ":type_to_tflitetype",
         ":util",
-        ":version",
         "//tensorflow/lite/c:common",
         "//tensorflow/lite/core/api",
         "//tensorflow/lite/core/api:verifier",
-        "//tensorflow/lite/delegates:telemetry",
         "//tensorflow/lite/experimental/resource",
-        "//tensorflow/lite/kernels/internal:compatibility",
-        "//tensorflow/lite/profiling:platform_profiler",
         "//tensorflow/lite/schema:schema_fbs",
-        "//tensorflow/lite/schema:schema_utils",
+        "@flatbuffers//:runtime_cc",
     ],
     alwayslink = 1,  # Why?? TODO(b/161243354): eliminate this.
 )
@@ -289,23 +283,20 @@ cc_library(
     copts = tflite_copts() + tflite_copts_warnings(),
     deps = [
         ":allocation",
-        ":arena_planner",
         ":cc_api",
         ":external_cpu_backend_context",
         ":framework_lib",
         ":graph_info",
         ":memory_planner",
-        ":minimal_logging",
-        ":simple_memory_arena",
         ":string",
         ":type_to_tflitetype",
         ":util",
-        ":version",
         "//tensorflow/lite/c:common",
         "//tensorflow/lite/core/api",
         "//tensorflow/lite/core/api:verifier",
         "//tensorflow/lite/experimental/resource",
         "//tensorflow/lite/schema:schema_fbs",
+        "@flatbuffers//:runtime_cc",
     ],
 )
 
@@ -360,6 +351,7 @@ cc_library(
         "//tensorflow/lite/profiling:platform_profiler",
         "//tensorflow/lite/schema:schema_fbs",
         "//tensorflow/lite/schema:schema_utils",
+        "@flatbuffers//:runtime_cc",
     ],
     alwayslink = 1,  # Why?? TODO(b/161243354): eliminate this.
 )
@@ -438,6 +430,7 @@ cc_library(
     ],
     deps = [
         ":util",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/core/api:op_resolver",
         "//tensorflow/lite/schema:schema_fbs",
     ],
@@ -534,6 +527,7 @@ cc_test(
     features = ["-dynamic_link_test_srcs"],  # see go/dynamic_link_test_srcs
     deps = [
         ":framework",
+        ":string",
         ":string_util",
         "//tensorflow/lite/c:common",
         "//tensorflow/lite/testing:util",
@@ -577,19 +571,16 @@ cc_test(
         "tflite_smoke_test",
     ],
     deps = [
-        ":builtin_op_data",
         ":external_cpu_backend_context",
         ":framework",
         ":interpreter_test_util",
+        ":string",
         ":string_util",
         ":util",
-        ":version",
-        "//tensorflow/lite/core/api",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:builtin_ops",
-        "//tensorflow/lite/kernels:cpu_backend_context",
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/kernels/internal:compatibility",
-        "//tensorflow/lite/schema:schema_fbs",
         "//tensorflow/lite/testing:util",
         "//third_party/eigen3",
         "@com_google_googletest//:gtest",
@@ -604,6 +595,7 @@ cc_test(
     features = ["-dynamic_link_test_srcs"],  # see go/dynamic_link_test_srcs
     deps = [
         ":framework",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/testing:util",
         "@com_google_googletest//:gtest",
     ],
@@ -617,7 +609,7 @@ cc_test(
     features = ["-dynamic_link_test_srcs"],  # see go/dynamic_link_test_srcs
     deps = [
         ":simple_memory_arena",
-        "//tensorflow/core:tflite_portable_logging",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/testing:util",
         "@com_google_googletest//:gtest",
     ],
@@ -648,11 +640,15 @@ cc_test(
     deps = [
         ":framework",
         ":interpreter_test_util",
+        ":string",
         "//tensorflow/lite:string_util",
         "//tensorflow/lite/core/api",
+        "//tensorflow/lite/core/api:verifier",
         "//tensorflow/lite/kernels:builtin_ops",
+        "//tensorflow/lite/schema:schema_fbs",
         "//tensorflow/lite/testing:util",
         "@com_google_googletest//:gtest",
+        "@flatbuffers//:runtime_cc",
     ],
 )
 
@@ -698,6 +694,7 @@ cc_test(
     ],
     deps = [
         ":framework",
+        ":string",
         ":tflite_with_xnnpack",
         ":util",
         "//tensorflow/lite/c:common",
@@ -714,6 +711,8 @@ cc_test(
     features = ["-dynamic_link_test_srcs"],  # see go/dynamic_link_test_srcs
     deps = [
         ":framework",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/schema:schema_fbs",
         "//tensorflow/lite/testing:util",
         "@com_google_googletest//:gtest",
     ],
@@ -724,6 +723,7 @@ cc_test(
     srcs = ["stderr_reporter_test.cc"],
     deps = [
         ":stderr_reporter",
+        "//tensorflow/lite/core/api:error_reporter",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -748,8 +748,8 @@ cc_library(
     hdrs = ["create_op_resolver.h"],
     copts = tflite_copts(),
     deps = [
-        "//tensorflow/lite:op_resolver",
-        "//tensorflow/lite/core/api",
+        ":mutable_op_resolver",
+        ":op_resolver",
         "//tensorflow/lite/kernels:builtin_ops",
     ],
 )
@@ -815,6 +815,7 @@ cc_test(
     srcs = ["type_to_tflitetype_test.cc"],
     deps = [
         ":type_to_tflitetype",
+        "//tensorflow/lite/c:c_api_types",
         "@com_google_googletest//:gtest_main",
     ],
 )

tensorflow/lite/allocation.cc

@@ -15,17 +15,14 @@ limitations under the License.
 
 #include "tensorflow/lite/allocation.h"
 
+#include <stddef.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <cassert>
-#include <cstdarg>
 #include <cstdint>
 #include <cstdio>
-#include <cstring>
-#include <utility>
+#include <memory>
 
-#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/api/error_reporter.h"
 
 namespace tflite {

tensorflow/lite/allocation.h

@@ -17,6 +17,8 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_ALLOCATION_H_
 #define TENSORFLOW_LITE_ALLOCATION_H_
 
+#include <stddef.h>
+
 #include <cstdio>
 #include <cstdlib>
 #include <memory>

tensorflow/lite/arena_planner.cc

@@ -14,12 +14,18 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/arena_planner.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <limits>
-#include <set>
-#include <type_traits>
+#include <memory>
 #include <utility>
+#include <vector>
+
+#include "tensorflow/lite/c/common.h"
+#include "tensorflow/lite/graph_info.h"
+#include "tensorflow/lite/simple_memory_arena.h"
 
 namespace tflite {
 namespace {

tensorflow/lite/arena_planner_test.cc

@@ -14,12 +14,22 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/arena_planner.h"
 
-#include <cstdarg>
-#include <cstdint>
+#include <stdio.h>
+
+#include <algorithm>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <initializer_list>
+#include <memory>
+#include <set>
+#include <utility>
+#include <vector>
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/lite/c/common.h"
+#include "tensorflow/lite/graph_info.h"
 #include "tensorflow/lite/testing/util.h"
 
 namespace tflite {

tensorflow/lite/context_util.h

@@ -17,6 +17,8 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_CONTEXT_UTIL_H_
 #define TENSORFLOW_LITE_CONTEXT_UTIL_H_
 
+#include <stddef.h>
+
 #include "tensorflow/lite/c/common.h"
 
 namespace tflite {

tensorflow/lite/core/api/op_resolver.h

@@ -15,6 +15,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_CORE_API_OP_RESOLVER_H_
 #define TENSORFLOW_LITE_CORE_API_OP_RESOLVER_H_
 
+#include <memory>
 #include <vector>
 
 #include "tensorflow/lite/c/common.h"

tensorflow/lite/core/subgraph.cc

@@ -15,15 +15,30 @@ limitations under the License.
 
 #include "tensorflow/lite/core/subgraph.h"
 
+#include <stdarg.h>
+#include <stddef.h>
+
 #include <algorithm>
 #include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <iterator>
+#include <memory>
+#include <utility>
+#include <vector>
 
+#include "tensorflow/lite/allocation.h"
 #include "tensorflow/lite/arena_planner.h"
 #include "tensorflow/lite/builtin_ops.h"
 #include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/context_util.h"
+#include "tensorflow/lite/core/api/error_reporter.h"
+#include "tensorflow/lite/core/api/profiler.h"
 #include "tensorflow/lite/core/api/tensor_utils.h"
+#include "tensorflow/lite/core/macros.h"
+#include "tensorflow/lite/experimental/resource/resource_base.h"
 #include "tensorflow/lite/graph_info.h"
+#include "tensorflow/lite/memory_planner.h"
 #include "tensorflow/lite/minimal_logging.h"
 #include "tensorflow/lite/schema/schema_generated.h"
 #include "tensorflow/lite/util.h"

tensorflow/lite/core/subgraph.h

@@ -15,14 +15,19 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_CORE_SUBGRAPH_H_
 #define TENSORFLOW_LITE_CORE_SUBGRAPH_H_
 
+#include <stdarg.h>
+#include <stddef.h>
+
 #include <cstdint>
 #include <cstdlib>
 #include <map>
+#include <memory>
 #include <utility>
 #include <vector>
 
 #include "tensorflow/lite/allocation.h"
 #include "tensorflow/lite/c/common.h"
+#include "tensorflow/lite/core/api/error_reporter.h"
 #include "tensorflow/lite/core/api/profiler.h"
 #include "tensorflow/lite/core/macros.h"
 #include "tensorflow/lite/experimental/resource/resource_base.h"

tensorflow/lite/create_op_resolver.h

@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <memory>
 
+#include "tensorflow/lite/mutable_op_resolver.h"
 #include "tensorflow/lite/op_resolver.h"
 
 namespace tflite {

tensorflow/lite/external_cpu_backend_context.cc

@@ -14,6 +14,8 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/external_cpu_backend_context.h"
 
+#include "tensorflow/lite/c/common.h"
+
 namespace tflite {
 namespace {
 

tensorflow/lite/graph_info.cc

@@ -15,6 +15,7 @@ limitations under the License.
 #include "tensorflow/lite/graph_info.h"
 
 #include <algorithm>
+#include <vector>
 
 #include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/context_util.h"

tensorflow/lite/graph_info.h

@@ -15,6 +15,8 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_GRAPH_INFO_H_
 #define TENSORFLOW_LITE_GRAPH_INFO_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "tensorflow/lite/c/common.h"

tensorflow/lite/graph_info_test.cc

@@ -15,8 +15,12 @@ limitations under the License.
 
 #include "tensorflow/lite/graph_info.h"
 
-#include <gmock/gmock.h>
+#include <stddef.h>
+
+#include <vector>
+
 #include <gtest/gtest.h>
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/testing/util.h"
 
 namespace tflite {

tensorflow/lite/interpreter.cc

@@ -15,21 +15,22 @@ limitations under the License.
 
 #include "tensorflow/lite/interpreter.h"
 
-#include <cassert>
-#include <cstdarg>
-#include <cstdint>
-#include <cstring>
-#include <utility>
+#include <stddef.h>
+#include <stdlib.h>
 
-#include "tensorflow/lite/c/common.h"
-#include "tensorflow/lite/context_util.h"
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "tensorflow/lite/allocation.h"
 #include "tensorflow/lite/core/api/error_reporter.h"
-#include "tensorflow/lite/delegates/telemetry.h"
-#include "tensorflow/lite/graph_info.h"
-#include "tensorflow/lite/memory_planner.h"
+#include "tensorflow/lite/core/api/profiler.h"
+#include "tensorflow/lite/core/subgraph.h"
+#include "tensorflow/lite/external_cpu_backend_context.h"
 #include "tensorflow/lite/minimal_logging.h"
-#include "tensorflow/lite/schema/schema_generated.h"
-#include "tensorflow/lite/util.h"
+#include "tensorflow/lite/stderr_reporter.h"
 
 // TODO(b/139446230): Move to portable platform header.
 #if defined(__ANDROID__)

tensorflow/lite/interpreter.h

@@ -18,6 +18,9 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_INTERPRETER_H_
 #define TENSORFLOW_LITE_INTERPRETER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <complex>
 #include <cstdio>
 #include <cstdlib>
@@ -25,6 +28,7 @@ limitations under the License.
 #include <map>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "tensorflow/lite/allocation.h"
@@ -35,14 +39,18 @@ limitations under the License.
 #include "tensorflow/lite/experimental/resource/resource_base.h"
 #include "tensorflow/lite/external_cpu_backend_context.h"
 #include "tensorflow/lite/memory_planner.h"
+#include "tensorflow/lite/portable_type_to_tflitetype.h"
 #include "tensorflow/lite/stderr_reporter.h"
+#include "tensorflow/lite/string_type.h"
 #include "tensorflow/lite/type_to_tflitetype.h"
 
 namespace tflite {
 
 class InterpreterTest;  // Class for friend declarations.
+
 namespace delegates {
 class InterpreterUtils;  // Class for friend declarations.
+
 namespace test_utils {
 class TestDelegate;  // Class for friend declarations.
 }  // namespace test_utils

tensorflow/lite/interpreter_builder.cc

@@ -14,26 +14,33 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/interpreter_builder.h"
 
-#include <fcntl.h>
+#include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <string.h>
 
+#include <algorithm>
 #include <map>
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
-#include "tensorflow/lite/allocation.h"
-#include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/common.h"
+#include "flatbuffers/flatbuffers.h"  // from @flatbuffers
 #include "tensorflow/lite/core/api/error_reporter.h"
 #include "tensorflow/lite/core/api/flatbuffer_conversions.h"
+#include "tensorflow/lite/core/api/op_resolver.h"
+#include "tensorflow/lite/core/macros.h"
+#include "tensorflow/lite/core/subgraph.h"
+#include "tensorflow/lite/interpreter.h"
 #include "tensorflow/lite/kernels/internal/compatibility.h"
+#include "tensorflow/lite/model_builder.h"
 #include "tensorflow/lite/profiling/platform_profiler.h"
 #include "tensorflow/lite/schema/schema_generated.h"
 #include "tensorflow/lite/schema/schema_utils.h"
 #include "tensorflow/lite/shared_library.h"
+#include "tensorflow/lite/stderr_reporter.h"
+#include "tensorflow/lite/string_type.h"
 #include "tensorflow/lite/util.h"
 #include "tensorflow/lite/version.h"
 

tensorflow/lite/interpreter_builder.h

@@ -19,14 +19,19 @@ limitations under the License.
 #define TENSORFLOW_LITE_INTERPRETER_BUILDER_H_
 
 #include <memory>
+#include <vector>
 
+#include "flatbuffers/flatbuffers.h"  // from @flatbuffers
+#include "tensorflow/lite/allocation.h"
 #include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/api/error_reporter.h"
 #include "tensorflow/lite/core/api/op_resolver.h"
+#include "tensorflow/lite/core/subgraph.h"
 #include "tensorflow/lite/interpreter.h"
 #include "tensorflow/lite/model_builder.h"
 #include "tensorflow/lite/mutable_op_resolver.h"
 #include "tensorflow/lite/schema/schema_generated.h"
+#include "tensorflow/lite/stderr_reporter.h"
 
 namespace tflite {
 

tensorflow/lite/interpreter_test.cc

@@ -15,26 +15,31 @@ limitations under the License.
 
 #include "tensorflow/lite/interpreter.h"
 
+#include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include <map>
 #include <memory>
+#include <new>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "third_party/eigen3/Eigen/Core"
-#include "tensorflow/lite/builtin_op_data.h"
-#include "tensorflow/lite/core/api/error_reporter.h"
+#include "tensorflow/lite/c/builtin_op_data.h"
 #include "tensorflow/lite/external_cpu_backend_context.h"
 #include "tensorflow/lite/interpreter_test_util.h"
 #include "tensorflow/lite/kernels/builtin_op_kernels.h"
-#include "tensorflow/lite/kernels/cpu_backend_context.h"
 #include "tensorflow/lite/kernels/internal/compatibility.h"
 #include "tensorflow/lite/kernels/kernel_util.h"
-#include "tensorflow/lite/kernels/register.h"
-#include "tensorflow/lite/schema/schema_generated.h"
+#include "tensorflow/lite/string_type.h"
 #include "tensorflow/lite/string_util.h"
 #include "tensorflow/lite/testing/util.h"
-#include "tensorflow/lite/version.h"
+#include "tensorflow/lite/util.h"
 
 namespace tflite {
 

tensorflow/lite/minimal_logging_default.cc

@@ -13,10 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/minimal_logging.h"
+#include <stdarg.h>
 
 #include <cstdio>
 
+#include "tensorflow/lite/minimal_logging.h"
+
 namespace tflite {
 namespace logging_internal {
 

tensorflow/lite/minimal_logging_test.cc

@@ -15,8 +15,6 @@ limitations under the License.
 
 #include "tensorflow/lite/minimal_logging.h"
 
-#include <string>
-
 #include <gtest/gtest.h>
 
 namespace tflite {

tensorflow/lite/mmap_allocation.cc

@@ -14,9 +14,9 @@ limitations under the License.
 ==============================================================================*/
 
 #include <fcntl.h>
+#include <stddef.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "tensorflow/lite/allocation.h"

tensorflow/lite/model_builder.cc

@@ -14,20 +14,20 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/model_builder.h"
 
-#include <fcntl.h>
+#include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
-#include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/common.h"
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "flatbuffers/flatbuffers.h"  // from @flatbuffers
+#include "tensorflow/lite/allocation.h"
 #include "tensorflow/lite/core/api/error_reporter.h"
-#include "tensorflow/lite/core/api/flatbuffer_conversions.h"
+#include "tensorflow/lite/core/api/verifier.h"
 #include "tensorflow/lite/schema/schema_generated.h"
-#include "tensorflow/lite/util.h"
-#include "tensorflow/lite/version.h"
+#include "tensorflow/lite/stderr_reporter.h"
+#include "tensorflow/lite/string_type.h"
 
 namespace tflite {
 

tensorflow/lite/model_builder.h

@@ -20,7 +20,10 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_MODEL_BUILDER_H_
 #define TENSORFLOW_LITE_MODEL_BUILDER_H_
 
+#include <stddef.h>
+
 #include <memory>
+#include <string>
 
 #include "tensorflow/lite/allocation.h"
 #include "tensorflow/lite/c/common.h"
@@ -30,6 +33,7 @@ limitations under the License.
 #include "tensorflow/lite/mutable_op_resolver.h"
 #include "tensorflow/lite/schema/schema_generated.h"
 #include "tensorflow/lite/stderr_reporter.h"
+#include "tensorflow/lite/string_type.h"
 
 namespace tflite {
 

tensorflow/lite/model_flex_test.cc

@@ -12,10 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-#include "tensorflow/lite/model.h"
+#include <memory>
 
 #include <gtest/gtest.h>
+#include "tensorflow/lite/interpreter.h"
+#include "tensorflow/lite/interpreter_builder.h"
 #include "tensorflow/lite/kernels/register.h"
+#include "tensorflow/lite/model_builder.h"
 #include "tensorflow/lite/testing/util.h"
 
 namespace tflite {

tensorflow/lite/model_test.cc

@@ -14,18 +14,31 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/model.h"
 
-#include <fcntl.h>
+#include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <fstream>
-#include <iostream>
+#include <iterator>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <gtest/gtest.h>
+#include "flatbuffers/flatbuffers.h"  // from @flatbuffers
+#include "tensorflow/lite/allocation.h"
 #include "tensorflow/lite/core/api/error_reporter.h"
+#include "tensorflow/lite/core/api/op_resolver.h"
+#include "tensorflow/lite/core/api/verifier.h"
+#include "tensorflow/lite/interpreter.h"
+#include "tensorflow/lite/interpreter_builder.h"
 #include "tensorflow/lite/interpreter_test_util.h"
 #include "tensorflow/lite/kernels/register.h"
+#include "tensorflow/lite/model_builder.h"
+#include "tensorflow/lite/schema/schema_generated.h"
+#include "tensorflow/lite/string_type.h"
 #include "tensorflow/lite/string_util.h"
 #include "tensorflow/lite/testing/util.h"
 

tensorflow/lite/model_xnnpack_test.cc

@@ -12,12 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include <gtest/gtest.h>
 #include "tensorflow/lite/core/macros.h"
+#include "tensorflow/lite/interpreter.h"
+#include "tensorflow/lite/interpreter_builder.h"
 #include "tensorflow/lite/kernels/register.h"
-#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/model_builder.h"
+#include "tensorflow/lite/string_type.h"
 #include "tensorflow/lite/util.h"
 
 namespace tflite {

tensorflow/lite/mutable_op_resolver.cc

@@ -15,6 +15,13 @@ limitations under the License.
 
 #include "tensorflow/lite/mutable_op_resolver.h"
 
+#include <string>
+#include <unordered_map>
+#include <utility>
+
+#include "tensorflow/lite/c/common.h"
+#include "tensorflow/lite/schema/schema_generated.h"
+
 namespace tflite {
 
 const TfLiteRegistration* MutableOpResolver::FindOp(tflite::BuiltinOperator op,

tensorflow/lite/mutable_op_resolver.h

@@ -15,10 +15,15 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_MUTABLE_OP_RESOLVER_H_
 #define TENSORFLOW_LITE_MUTABLE_OP_RESOLVER_H_
 
+#include <stddef.h>
+
 #include <string>
 #include <unordered_map>
+#include <utility>
 
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/api/op_resolver.h"
+#include "tensorflow/lite/schema/schema_generated.h"
 #include "tensorflow/lite/util.h"
 
 namespace tflite {

tensorflow/lite/mutable_op_resolver_test.cc

@@ -15,7 +15,11 @@ limitations under the License.
 
 #include "tensorflow/lite/mutable_op_resolver.h"
 
+#include <stddef.h>
+
 #include <gtest/gtest.h>
+#include "tensorflow/lite/c/common.h"
+#include "tensorflow/lite/schema/schema_generated.h"
 #include "tensorflow/lite/testing/util.h"
 
 namespace tflite {

tensorflow/lite/optional_debug_tools.cc

@@ -14,8 +14,15 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/optional_debug_tools.h"
 
-#include "tensorflow/lite/c/common.h"
+#include <stddef.h>
+#include <stdio.h>
+
+#include <utility>
+#include <vector>
+
+#include "tensorflow/lite/interpreter.h"
 #include "tensorflow/lite/schema/schema_generated.h"
+
 namespace tflite {
 
 void PrintIntVector(const std::vector<int>& v) {

tensorflow/lite/portable_type_to_tflitetype.h

@@ -25,6 +25,8 @@ limitations under the License.
 #undef abs
 #endif
 
+#include <stdint.h>
+
 #include "tensorflow/lite/c/common.h"
 
 namespace tflite {

tensorflow/lite/simple_memory_arena.cc

@@ -15,11 +15,18 @@ limitations under the License.
 
 #include "tensorflow/lite/simple_memory_arena.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 #include <cstring>
+#include <iterator>
 #include <limits>
+#include <memory>
 #include <vector>
 
+#include "tensorflow/lite/c/common.h"
+
 namespace {
 
 template <typename T>

tensorflow/lite/simple_memory_arena.h

@@ -15,6 +15,8 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_SIMPLE_MEMORY_ARENA_H_
 #define TENSORFLOW_LITE_SIMPLE_MEMORY_ARENA_H_
 
+#include <stddef.h>
+
 #include <cstdint>
 #include <memory>
 #include <vector>

tensorflow/lite/simple_memory_arena_test.cc

@@ -14,9 +14,8 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/simple_memory_arena.h"
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/testing/util.h"
 
 namespace tflite {

tensorflow/lite/stderr_reporter.cc

@@ -14,6 +14,9 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/stderr_reporter.h"
 
+#include <stdarg.h>
+
+#include "tensorflow/lite/core/api/error_reporter.h"
 #include "tensorflow/lite/minimal_logging.h"
 
 namespace tflite {

tensorflow/lite/stderr_reporter_test.cc

@@ -14,9 +14,8 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/stderr_reporter.h"
 
-#include <cstdio>
-
 #include <gtest/gtest.h>
+#include "tensorflow/lite/core/api/error_reporter.h"
 
 namespace tflite {
 

tensorflow/lite/string_util.cc

@@ -15,6 +15,9 @@ limitations under the License.
 
 #include "tensorflow/lite/string_util.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <cstdlib>
 #include <cstring>
 #include <vector>

tensorflow/lite/string_util.h

@@ -41,6 +41,9 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_STRING_UTIL_H_
 #define TENSORFLOW_LITE_STRING_UTIL_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "tensorflow/lite/c/common.h"

tensorflow/lite/string_util_test.cc

@@ -14,9 +14,13 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/string_util.h"
 
+#include <stdint.h>
+
+#include <string>
+
 #include <gtest/gtest.h>
-#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/interpreter.h"
+#include "tensorflow/lite/string_type.h"
 #include "tensorflow/lite/testing/util.h"
 
 namespace tflite {

tensorflow/lite/tflite_with_xnnpack_optional.cc

@@ -14,6 +14,9 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/tflite_with_xnnpack_optional.h"
 
+#include <memory>
+
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/macros.h"
 
 #ifdef TFLITE_BUILD_WITH_XNNPACK_DELEGATE

tensorflow/lite/type_to_tflitetype_test.cc

@@ -16,8 +16,11 @@ limitations under the License.
 #include "tensorflow/lite/type_to_tflitetype.h"
 
 #include <string>
+#include <type_traits>
 
 #include <gtest/gtest.h>
+#include "tensorflow/lite/c/c_api_types.h"
+#include "tensorflow/lite/portable_type_to_tflitetype.h"
 
 namespace tflite {
 namespace {

tensorflow/lite/util.cc

@@ -14,8 +14,16 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/util.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include <algorithm>
 #include <complex>
 #include <cstring>
+#include <initializer_list>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include "tensorflow/lite/builtin_ops.h"
 #include "tensorflow/lite/c/common.h"

tensorflow/lite/util.h

@@ -21,6 +21,9 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_UTIL_H_
 #define TENSORFLOW_LITE_UTIL_H_
 
+#include <stddef.h>
+
+#include <initializer_list>
 #include <memory>
 #include <string>
 #include <vector>

tensorflow/lite/util_test.cc

@@ -15,9 +15,12 @@ limitations under the License.
 
 #include "tensorflow/lite/util.h"
 
+#include <stddef.h>
+#include <stdlib.h>
+
+#include <string>
 #include <vector>
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/schema/schema_generated.h"