Rename lite/c/c_api_internal.h to lite/c/common.h

The C types in lite/c/c_api_internal.h are not actually internal,
rather, they are common types used throughout the C++ and C APIs.
Rename the header accordingly.

PiperOrigin-RevId: 282494601
Change-Id: Ia784f35724d774db256ffcbbcdc5bb00e6574417

tensorflow/lite/BUILD

@@ -58,7 +58,7 @@ cc_library(
         ":graph_info",
         ":memory_planner",
         ":simple_memory_arena",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
     ],
 )
 
@@ -83,7 +83,7 @@ cc_library(
     name = "context",
     hdrs = ["context.h"],
     copts = TFLITE_DEFAULT_COPTS,
-    deps = ["//tensorflow/lite/c:c_api_internal"],
+    deps = ["//tensorflow/lite/c:common"],
 )
 
 cc_library(
@@ -92,7 +92,7 @@ cc_library(
     hdrs = ["external_cpu_backend_context.h"],
     copts = TFLITE_DEFAULT_COPTS,
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
     ],
 )
 
@@ -100,14 +100,14 @@ cc_library(
     name = "graph_info",
     hdrs = ["graph_info.h"],
     copts = TFLITE_DEFAULT_COPTS,
-    deps = ["//tensorflow/lite/c:c_api_internal"],
+    deps = ["//tensorflow/lite/c:common"],
 )
 
 cc_library(
     name = "memory_planner",
     hdrs = ["memory_planner.h"],
     copts = TFLITE_DEFAULT_COPTS,
-    deps = ["//tensorflow/lite/c:c_api_internal"],
+    deps = ["//tensorflow/lite/c:common"],
 )
 
 cc_library(
@@ -115,7 +115,7 @@ cc_library(
     srcs = ["simple_memory_arena.cc"],
     hdrs = ["simple_memory_arena.h"],
     copts = TFLITE_DEFAULT_COPTS,
-    deps = ["//tensorflow/lite/c:c_api_internal"],
+    deps = ["//tensorflow/lite/c:common"],
 )
 
 cc_library(
@@ -123,7 +123,7 @@ cc_library(
     hdrs = [
         "builtin_op_data.h",
     ],
-    deps = ["//tensorflow/lite/c:c_api_internal"],
+    deps = ["//tensorflow/lite/c:common"],
 )
 
 cc_library(
@@ -133,7 +133,7 @@ cc_library(
         "builtin_ops.h",
         "context_util.h",
     ],
-    deps = ["//tensorflow/lite/c:c_api_internal"],
+    deps = ["//tensorflow/lite/c:common"],
 )
 
 exports_files(["builtin_ops.h"])
@@ -168,7 +168,7 @@ cc_library(
     deps = [
         ":simple_memory_arena",
         ":string",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/core/api",
     ],
 )
@@ -212,7 +212,7 @@ cc_library(
         ":type_to_tflitetype",
         ":util",
         ":version",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/core/api",
         "//tensorflow/lite/delegates/nnapi:nnapi_delegate",
         "//tensorflow/lite/experimental/resource",
@@ -229,7 +229,7 @@ cc_library(
     copts = TFLITE_DEFAULT_COPTS,
     deps = [
         ":string",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
     ],
 )
 
@@ -244,7 +244,7 @@ cc_test(
     deps = [
         ":framework",
         ":string_util",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/testing:util",
         "@com_google_googletest//:gtest",
     ],
@@ -380,7 +380,7 @@ cc_library(
     hdrs = ["util.h"],
     copts = TFLITE_DEFAULT_COPTS + tflite_copts(),
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/schema:schema_fbs",
     ],
 )
@@ -395,7 +395,7 @@ cc_test(
     ],
     deps = [
         ":util",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "@com_google_googletest//:gtest",
     ],
 )
@@ -429,7 +429,7 @@ cc_library(
 cc_library(
     name = "type_to_tflitetype",
     hdrs = ["type_to_tflitetype.h"],
-    deps = ["//tensorflow/lite/c:c_api_internal"],
+    deps = ["//tensorflow/lite/c:common"],
 )
 
 cc_test(

tensorflow/lite/allocation.cc

@@ -25,7 +25,7 @@ limitations under the License.
 #include <cstring>
 #include <utility>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/api/error_reporter.h"
 
 namespace tflite {

tensorflow/lite/allocation.h

@@ -21,7 +21,7 @@ limitations under the License.
 #include <cstdlib>
 #include <vector>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/api/error_reporter.h"
 #include "tensorflow/lite/simple_memory_arena.h"
 #include "tensorflow/lite/string_type.h"

tensorflow/lite/arena_planner.h

@@ -19,7 +19,7 @@ limitations under the License.
 #include <memory>
 #include <vector>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/graph_info.h"
 #include "tensorflow/lite/memory_planner.h"
 #include "tensorflow/lite/simple_memory_arena.h"

tensorflow/lite/c/BUILD

@@ -4,11 +4,11 @@ package(
 )
 
 cc_library(
-    name = "c_api_internal",
+    name = "common",
-    srcs = ["c_api_internal.c"],
+    srcs = ["common.c"],
     hdrs = [
         "builtin_op_data.h",
-        "c_api_internal.h",
+        "common.h",
     ],
     visibility = [
         "//tensorflow/lite:__subpackages__",
@@ -16,15 +16,15 @@ cc_library(
 )
 
 # For use with library targets that can't use relative paths.
-exports_files(["c_api_internal.h"])
+exports_files(["common.h"])
 
 # Test the C extension API code.
 cc_test(
-    name = "c_api_internal_test",
+    name = "common_test",
     size = "small",
-    srcs = ["c_api_internal_test.cc"],
+    srcs = ["common_test.cc"],
     deps = [
-        ":c_api_internal",
+        ":common",
         "@com_google_googletest//:gtest",
     ],
 )
@@ -35,7 +35,7 @@ cc_test(
     srcs = ["builtin_op_data_test.cc"],
     copts = ["-Wno-unused-variable"],
     deps = [
-        ":c_api_internal",
+        ":common",
         "@com_google_googletest//:gtest",
     ],
 )

tensorflow/lite/c/builtin_op_data.h

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <stdint.h>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 #ifdef __cplusplus
 extern "C" {

tensorflow/lite/c/common.c

@@ -1,4 +1,4 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+/* Copyright 2019 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #ifndef TF_LITE_STATIC_MEMORY
 #include <stdlib.h>
 #include <string.h>

tensorflow/lite/c/common.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+/* Copyright 2019 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@ 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.
 ==============================================================================*/
-// This file defines a C API for implementing operations in tflite.
+
-// These operations can be defined using c++ but the interface between
+// This file defines common C types and APIs for implementing operations,
-// the interpreter and the operations are C.
+// delegates and other constructs in TensorFlow Lite. The actual operations and
+// delegtes can be defined using C++, but the interface between the interpreter
+// and the operations are C.
 //
 // Summary of abstractions
 // TF_LITE_ENSURE - Self-sufficient error checking
@@ -24,10 +26,12 @@ limitations under the License.
 // TfLiteTensor - tensor (a multidimensional array)
 // TfLiteNode - a single node or operation
 // TfLiteRegistration - the implementation of a conceptual operation.
+// TfLiteDelegate - allows delegation of nodes to alternative backends.
 //
 // Some abstractions in this file are created and managed by Interpreter.
-#ifndef TENSORFLOW_LITE_C_C_API_INTERNAL_H_
+
-#define TENSORFLOW_LITE_C_C_API_INTERNAL_H_
+#ifndef TENSORFLOW_LITE_C_COMMON_H_
+#define TENSORFLOW_LITE_C_COMMON_H_
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -666,4 +670,4 @@ typedef struct {
 #ifdef __cplusplus
 }  // extern "C"
 #endif  // __cplusplus
-#endif  // TENSORFLOW_LITE_C_C_API_INTERNAL_H_
+#endif  // TENSORFLOW_LITE_C_COMMON_H_

tensorflow/lite/c/common_test.cc

@@ -13,13 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
+
 #include <gtest/gtest.h>
 
 namespace tflite {
 
 // NOTE: this tests only the TfLiteIntArray part of context.
-// most of c_api_internal.h is provided in the context of using it with
+// most of common.h is provided in the context of using it with
 // interpreter.h and interpreter.cc, so interpreter_test.cc tests context
 // structures more thoroughly.
 

tensorflow/lite/context.h

@@ -16,6 +16,6 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_CONTEXT_H_
 #define TENSORFLOW_LITE_CONTEXT_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 #endif  // TENSORFLOW_LITE_CONTEXT_H_

tensorflow/lite/context_util.h

@@ -17,7 +17,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_CONTEXT_UTIL_H_
 #define TENSORFLOW_LITE_CONTEXT_UTIL_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 namespace tflite {
 

tensorflow/lite/core/api/BUILD

@@ -22,7 +22,7 @@ cc_library(
     ],
     copts = tflite_copts(),
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/schema:schema_fbs",
     ],
 )
@@ -54,7 +54,7 @@ cc_test(
     deps = [
         ":api",
         "//tensorflow/lite:string",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "@com_google_googletest//:gtest",
     ],
 )

tensorflow/lite/core/api/flatbuffer_conversions.cc

@@ -18,7 +18,7 @@ limitations under the License.
 #include <cstdlib>
 
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {

tensorflow/lite/core/api/flatbuffer_conversions.h

@@ -19,7 +19,7 @@ limitations under the License.
 // flatbuffer serialization format into in-memory values that are used by the
 // runtime API and interpreter.
 
-#include "tensorflow/lite/c/c_api_internal.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/schema/schema_generated.h"

tensorflow/lite/core/api/op_resolver.h

@@ -15,7 +15,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_CORE_API_OP_RESOLVER_H_
 #define TENSORFLOW_LITE_CORE_API_OP_RESOLVER_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/api/error_reporter.h"
 #include "tensorflow/lite/schema/schema_generated.h"
 

tensorflow/lite/core/api/tensor_utils.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_CORE_API_TENSOR_UTILS_H_
 #define TENSORFLOW_LITE_CORE_API_TENSOR_UTILS_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 namespace tflite {
 

tensorflow/lite/core/subgraph.cc

@@ -18,7 +18,7 @@ limitations under the License.
 #include <algorithm>
 
 #include "tensorflow/lite/arena_planner.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/context_util.h"
 #include "tensorflow/lite/core/api/tensor_utils.h"
 #include "tensorflow/lite/delegates/nnapi/nnapi_delegate.h"

tensorflow/lite/core/subgraph.h

@@ -21,7 +21,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/lite/allocation.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/api/profiler.h"
 #include "tensorflow/lite/delegates/nnapi/nnapi_delegate.h"
 #include "tensorflow/lite/experimental/resource/resource_base.h"

tensorflow/lite/delegates/BUILD

@@ -26,7 +26,7 @@ cc_library(
     hdrs = ["utils.h"],
     copts = tflite_copts(),
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
     ],
 )
 
@@ -37,7 +37,7 @@ cc_test(
     linkstatic = 1,
     deps = [
         ":utils",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "@com_google_googletest//:gtest_main",
     ],
 )

tensorflow/lite/delegates/flex/BUILD

@@ -17,7 +17,7 @@ cc_library(
     hdrs = ["buffer_map.h"],
     deps = [
         ":util",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite:string",
         "//tensorflow/lite:string_util",
     ] + select({
@@ -69,7 +69,7 @@ cc_library(
         ],
         "//conditions:default": [
             "//tensorflow/core:tensorflow",
-            "//tensorflow/lite/c:c_api_internal",
+            "//tensorflow/lite/c:common",
         ],
     }),
     alwayslink = 1,
@@ -92,7 +92,7 @@ cc_library(
         ":kernel",
         ":util",
         "@com_google_absl//absl/strings:strings",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite:kernel_api",
         "//tensorflow/lite:minimal_logging",
         "//tensorflow/lite:string_util",
@@ -154,7 +154,7 @@ tf_cc_test(
         ":delegate_data",
         "//tensorflow/lite:framework",
         "//tensorflow/lite:util",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/testing:util",
         "@com_google_googletest//:gtest",
     ],
@@ -169,7 +169,7 @@ cc_library(
         ":util",
         "@flatbuffers",
         "//tensorflow/lite/core/api",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite:kernel_api",
         "//tensorflow/lite:string",
         "//tensorflow/lite/kernels:kernel_util",
@@ -236,7 +236,7 @@ cc_library(
     srcs = ["util.cc"],
     hdrs = ["util.h"],
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite:kernel_api",
     ] + select({
         "//tensorflow:android": [

tensorflow/lite/delegates/flex/buffer_map.h

@@ -17,8 +17,8 @@ limitations under the License.
 
 #include <map>
 
-#include "tensorflow/lite/c/c_api_internal.h"
 #include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/lite/c/common.h"
 
 namespace tflite {
 namespace flex {

tensorflow/lite/delegates/flex/delegate.h

@@ -15,7 +15,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_DELEGATES_FLEX_DELEGATE_H_
 #define TENSORFLOW_LITE_DELEGATES_FLEX_DELEGATE_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/delegates/flex/delegate_data.h"
 
 namespace tflite {

tensorflow/lite/delegates/flex/delegate_data_test.cc

@@ -16,7 +16,7 @@ limitations under the License.
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/testing/util.h"
 
 namespace tflite {

tensorflow/lite/delegates/flex/kernel.cc

@@ -22,7 +22,7 @@ limitations under the License.
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/lite/builtin_ops.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/context_util.h"
 #include "tensorflow/lite/core/api/profiler.h"
 #include "tensorflow/lite/delegates/flex/delegate_data.h"

tensorflow/lite/delegates/flex/kernel.h

@@ -15,7 +15,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_DELEGATES_FLEX_KERNEL_H_
 #define TENSORFLOW_LITE_DELEGATES_FLEX_KERNEL_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 namespace tflite {
 namespace flex {

tensorflow/lite/delegates/flex/util.h

@@ -16,9 +16,9 @@ limitations under the License.
 #define TENSORFLOW_LITE_DELEGATES_FLEX_UTIL_H_
 
 #include "tensorflow/c/c_api_internal.h"
-#include "tensorflow/lite/c/c_api_internal.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/lite/c/common.h"
 
 namespace tflite {
 namespace flex {

tensorflow/lite/delegates/gpu/BUILD

@@ -40,7 +40,7 @@ cc_library(
         "@com_google_absl//absl/types:span",
         "//tensorflow/lite:kernel_api",
         "//tensorflow/lite:minimal_logging",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/delegates/gpu/common:convert",
         "//tensorflow/lite/delegates/gpu/common:model",
         "//tensorflow/lite/delegates/gpu/common:model_builder",
@@ -79,7 +79,7 @@ objc_library(
     deps = [
         "//tensorflow/lite:kernel_api",
         "//tensorflow/lite:minimal_logging",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/delegates/gpu/common:convert",
         "//tensorflow/lite/delegates/gpu/common:model",
         "//tensorflow/lite/delegates/gpu/common:model_builder",
@@ -198,7 +198,7 @@ cc_library(
     deps = [
         "//tensorflow/lite:kernel_api",
         "//tensorflow/lite:minimal_logging",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/delegates/gpu:api",
         "//tensorflow/lite/delegates/gpu/cl:api",
         "//tensorflow/lite/delegates/gpu/cl:opencl_wrapper",

tensorflow/lite/delegates/gpu/cl/BUILD

@@ -270,7 +270,7 @@ cc_library(
         ":opencl_wrapper",
         ":tensor_type_util",
         "//tensorflow/lite:kernel_api",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/delegates/gpu:api",
         "//tensorflow/lite/delegates/gpu:delegate",
         "//tensorflow/lite/delegates/gpu/common:model",

tensorflow/lite/delegates/gpu/cl/gpu_api_delegate.h

@@ -20,7 +20,7 @@ limitations under the License.
 
 #include <EGL/egl.h>
 #include <GLES3/gl31.h>
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/delegates/gpu/delegate.h"
 
 #ifdef SWIG

tensorflow/lite/delegates/gpu/common/BUILD

@@ -105,7 +105,7 @@ cc_library(
         "//tensorflow/lite:context",
         "//tensorflow/lite:kernel_api",
         "//tensorflow/lite:util",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/schema:schema_fbs",
         "@FP16",
@@ -122,7 +122,7 @@ cc_test(
         ":model_builder",
         "//tensorflow/lite:framework",
         "//tensorflow/lite:kernel_api",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "@com_google_googletest//:gtest_main",
     ],
 )

tensorflow/lite/delegates/gpu/common/model_builder.cc

@@ -34,7 +34,7 @@ limitations under the License.
 #include "tensorflow/lite/builtin_op_data.h"
 #include "tensorflow/lite/builtin_ops.h"
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/context.h"
 #include "tensorflow/lite/delegates/gpu/common/data_type.h"
 #include "tensorflow/lite/delegates/gpu/common/model.h"

tensorflow/lite/delegates/gpu/common/model_builder_test.cc

@@ -20,7 +20,7 @@ limitations under the License.
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "tensorflow/lite/builtin_ops.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/subgraph.h"
 #include "tensorflow/lite/interpreter.h"
 #include "tensorflow/lite/stderr_reporter.h"

tensorflow/lite/delegates/gpu/delegate.h

@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <stdint.h>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 #ifdef SWIG
 #define TFL_CAPI_EXPORT

tensorflow/lite/delegates/gpu/gl_delegate.cc

@@ -26,7 +26,7 @@ limitations under the License.
 #include <GLES3/gl31.h>
 #include "absl/types/span.h"
 #include "tensorflow/lite/builtin_ops.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/delegates/gpu/common/convert.h"
 #include "tensorflow/lite/delegates/gpu/common/model.h"
 #include "tensorflow/lite/delegates/gpu/common/model_builder.h"

tensorflow/lite/delegates/gpu/gl_delegate.h

@@ -19,7 +19,7 @@ limitations under the License.
 #include <stdint.h>
 
 #include <GLES3/gl31.h>
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 #ifdef SWIG
 #define TFL_CAPI_EXPORT

tensorflow/lite/delegates/gpu/metal_delegate.mm

@@ -28,7 +28,7 @@ limitations under the License.
 
 #include "absl/types/span.h"
 #include "tensorflow/lite/builtin_ops.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/delegates/gpu/common/convert.h"
 #include "tensorflow/lite/delegates/gpu/common/model.h"
 #include "tensorflow/lite/delegates/gpu/common/model_builder.h"

tensorflow/lite/delegates/nnapi/BUILD

@@ -31,7 +31,7 @@ cc_library(
         "//tensorflow/lite:kernel_api",
         "//tensorflow/lite:minimal_logging",
         "//tensorflow/lite:util",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/nnapi:nnapi_implementation",
         "//tensorflow/lite/nnapi:nnapi_util",
@@ -63,7 +63,7 @@ cc_library(
         "//tensorflow/lite:kernel_api",
         "//tensorflow/lite:minimal_logging",
         "//tensorflow/lite:util",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/nnapi:nnapi_implementation",
         "//tensorflow/lite/nnapi:nnapi_util",
@@ -124,7 +124,7 @@ cc_test(
         ":nnapi_delegate_mock_test",
         "//tensorflow/lite:framework",
         "//tensorflow/lite:minimal_logging",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:test_util",
         "//tensorflow/lite/nnapi:nnapi_implementation",
         "//tensorflow/lite/nnapi:nnapi_lib",
@@ -148,7 +148,7 @@ cc_test(
         ":nnapi_delegate_mock_test",
         "//tensorflow/lite:framework",
         "//tensorflow/lite:minimal_logging",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:test_util",
         "//tensorflow/lite/nnapi:nnapi_implementation",
         "//tensorflow/lite/nnapi:nnapi_lib",
@@ -167,7 +167,7 @@ cc_test(
     deps = [
         ":nnapi_delegate",
         "//tensorflow/lite:framework",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/testing:util",
         "@com_google_googletest//:gtest",

tensorflow/lite/delegates/nnapi/nnapi_delegate.cc

@@ -44,7 +44,7 @@ limitations under the License.
 #include "tensorflow/lite/builtin_op_data.h"
 #include "tensorflow/lite/builtin_ops.h"
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/context_util.h"
 #include "tensorflow/lite/delegates/nnapi/nnapi_delegate_kernel.h"
 #include "tensorflow/lite/delegates/nnapi/quant_lstm_sup.h"

tensorflow/lite/delegates/nnapi/nnapi_delegate.h

@@ -19,7 +19,7 @@ limitations under the License.
 #include <string>
 #include <vector>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 typedef struct ANeuralNetworksMemory ANeuralNetworksMemory;
 

tensorflow/lite/delegates/nnapi/nnapi_delegate_errno_test.cc

@@ -15,7 +15,7 @@ limitations under the License.
 #include <sys/mman.h>
 
 #include <gtest/gtest.h>
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/delegates/nnapi/nnapi_delegate.h"
 #include "tensorflow/lite/delegates/nnapi/nnapi_delegate_mock_test.h"
 #include "tensorflow/lite/interpreter.h"

tensorflow/lite/delegates/nnapi/nnapi_delegate_kernel.h

@@ -20,7 +20,7 @@ limitations under the License.
 #include <memory>
 
 #include "tensorflow/lite/allocation.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/delegates/nnapi/nnapi_delegate.h"
 #include "tensorflow/lite/nnapi/nnapi_implementation.h"
 

tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc

@@ -17,7 +17,7 @@ limitations under the License.
 #include <sys/mman.h>
 
 #include <gtest/gtest.h>
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/interpreter.h"
 #include "tensorflow/lite/kernels/test_util.h"
 #include "tensorflow/lite/minimal_logging.h"

tensorflow/lite/delegates/nnapi/quant_lstm_sup.h

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <vector>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 namespace tflite {
 namespace delegate {

tensorflow/lite/delegates/nnapi/quant_lstm_sup_test.cc

@@ -21,7 +21,7 @@ limitations under the License.
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/testing/util.h"
 
 namespace {

tensorflow/lite/delegates/utils.cc

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <algorithm>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 namespace tflite {
 namespace delegates {

tensorflow/lite/delegates/utils.h

@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <vector>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 namespace tflite {
 namespace delegates {

tensorflow/lite/delegates/utils_test.cc

@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 namespace tflite {
 namespace delegates {

tensorflow/lite/experimental/c/BUILD

@@ -51,7 +51,7 @@ cc_library(
     ],
     deps = [
         "//tensorflow/lite:framework",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
     ],
 )
 
@@ -70,7 +70,7 @@ cc_library(
         ":c_api_internal",
         "//tensorflow/lite:framework",
         "//tensorflow/lite:version",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:builtin_ops",
     ],
     alwayslink = 1,
@@ -99,7 +99,7 @@ cc_test(
     ],
     deps = [
         ":c_api",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/testing:util",
         "@com_google_googletest//:gtest",
     ],

tensorflow/lite/experimental/c/c_api_types.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+/* Copyright 2019 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@ 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.
 ==============================================================================*/
-// This file defines a C API for implementing operations in tflite.
+
-// These operations can be defined using c++ but the interface between
+// This file defines common C types and APIs for implementing operations,
-// the interpreter and the operations are C.
+// delegates and other constructs in TensorFlow Lite. The actual operations and
+// delegtes can be defined using C++, but the interface between the interpreter
+// and the operations are C.
 //
 // Summary of abstractions
 // TF_LITE_ENSURE - Self-sufficient error checking
@@ -24,10 +26,12 @@ limitations under the License.
 // TfLiteTensor - tensor (a multidimensional array)
 // TfLiteNode - a single node or operation
 // TfLiteRegistration - the implementation of a conceptual operation.
+// TfLiteDelegate - allows delegation of nodes to alternative backends.
 //
 // Some abstractions in this file are created and managed by Interpreter.
-#ifndef TENSORFLOW_LITE_C_C_API_INTERNAL_H_
+
-#define TENSORFLOW_LITE_C_C_API_INTERNAL_H_
+#ifndef TENSORFLOW_LITE_C_COMMON_H_
+#define TENSORFLOW_LITE_C_COMMON_H_
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -666,4 +670,4 @@ typedef struct {
 #ifdef __cplusplus
 }  // extern "C"
 #endif  // __cplusplus
-#endif  // TENSORFLOW_LITE_C_C_API_INTERNAL_H_
+#endif  // TENSORFLOW_LITE_C_COMMON_H_

tensorflow/lite/experimental/kernels/BUILD

@@ -51,7 +51,7 @@ cc_library(
     deps = [
         ":ctc_utils",
         "//tensorflow/lite:framework",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/kernels:op_macros",
         "//tensorflow/lite/kernels/internal:optimized",
@@ -104,7 +104,7 @@ cc_library(
     deps = [
         ":gru_cell",
         "//tensorflow/lite:framework",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:cpu_backend_context",
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/kernels:op_macros",
@@ -136,7 +136,7 @@ cc_library(
     ],
     deps = [
         "//tensorflow/lite:framework",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/resource",
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/kernels:op_macros",

tensorflow/lite/experimental/kernels/ctc_beam_search_decoder.cc

@@ -13,8 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 #include <vector>
+
 #include "flatbuffers/flexbuffers.h"  // TF:flatbuffers
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/kernels/ctc_beam_search.h"
 #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h"
 #include "tensorflow/lite/kernels/internal/tensor.h"

tensorflow/lite/experimental/kernels/hashtable.cc

@@ -15,7 +15,7 @@ limitations under the License.
 #include <string>
 
 #include "flatbuffers/flexbuffers.h"  // TF:flatbuffers
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/subgraph.h"
 #include "tensorflow/lite/experimental/resource/lookup_interfaces.h"
 #include "tensorflow/lite/kernels/kernel_util.h"

tensorflow/lite/experimental/kernels/hashtable_import.cc

@@ -12,7 +12,7 @@ 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/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/subgraph.h"
 #include "tensorflow/lite/experimental/resource/lookup_interfaces.h"
 #include "tensorflow/lite/kernels/internal/tensor_ctypes.h"

tensorflow/lite/experimental/kernels/hashtable_lookup.cc

@@ -12,7 +12,7 @@ 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/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/subgraph.h"
 #include "tensorflow/lite/experimental/resource/lookup_interfaces.h"
 #include "tensorflow/lite/kernels/internal/tensor_ctypes.h"

tensorflow/lite/experimental/kernels/hashtable_size.cc

@@ -12,7 +12,7 @@ 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/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/subgraph.h"
 #include "tensorflow/lite/experimental/resource/lookup_interfaces.h"
 #include "tensorflow/lite/kernels/internal/tensor_ctypes.h"

tensorflow/lite/experimental/kernels/unidirectional_sequence_gru.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 #include <limits>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/kernels/gru_cell.h"
 #include "tensorflow/lite/kernels/cpu_backend_context.h"
 #include "tensorflow/lite/kernels/internal/tensor.h"

tensorflow/lite/experimental/micro/BUILD

@@ -43,7 +43,7 @@ cc_library(
     deps = [
         ":micro_utils",
         "//tensorflow/lite:type_to_tflitetype",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/core/api",
         "//tensorflow/lite/experimental/micro/memory_planner:greedy_memory_planner",
         "//tensorflow/lite/kernels/internal:tensor",
@@ -60,7 +60,7 @@ cc_library(
         "micro_utils.h",
     ],
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
     ],
 )
 

tensorflow/lite/experimental/micro/examples/hello_world/BUILD

@@ -42,7 +42,7 @@ cc_library(
         "output_handler.h",
     ],
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
     ],
 )

tensorflow/lite/experimental/micro/examples/hello_world/hello_world_test.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-// #include "tensorflow/lite/c/c_api_internal.h"
+// #include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/hello_world/sine_model_data.h"
 #include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"

tensorflow/lite/experimental/micro/examples/hello_world/output_handler.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_HELLO_WORLD_OUTPUT_HANDLER_H_
 #define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_HELLO_WORLD_OUTPUT_HANDLER_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 
 // Called by the main loop to produce some output based on the x and y values

tensorflow/lite/experimental/micro/examples/magic_wand/BUILD

@@ -68,7 +68,7 @@ cc_library(
         "accelerometer_handler.h",
     ],
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
     ],
 )
@@ -80,7 +80,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":accelerometer_handler",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -121,7 +121,7 @@ cc_library(
         "output_handler.h",
     ],
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
     ],
 )
@@ -133,7 +133,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":output_handler",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],

tensorflow/lite/experimental/micro/examples/magic_wand/accelerometer_handler.h

@@ -18,7 +18,7 @@ limitations under the License.
 
 #define kChannelNumber 3
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 
 extern int begin_index;

tensorflow/lite/experimental/micro/examples/magic_wand/accelerometer_handler_test.cc

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <string.h>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 #include "tensorflow/lite/experimental/micro/testing/micro_test.h"
 

tensorflow/lite/experimental/micro/examples/magic_wand/output_handler.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MAGIC_WAND_OUTPUT_HANDLER_H_
 #define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MAGIC_WAND_OUTPUT_HANDLER_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 
 void HandleOutput(tflite::ErrorReporter* error_reporter, int kind);

tensorflow/lite/experimental/micro/examples/micro_speech/BUILD

@@ -106,7 +106,7 @@ cc_library(
     ],
     deps = [
         ":simple_model_settings",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
     ],
 )
@@ -121,7 +121,7 @@ tflite_micro_cc_test(
         ":simple_features_generator_reference",
         ":simple_features_generator_test_data",
         ":simple_model_settings",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -137,7 +137,7 @@ cc_library(
     ],
     deps = [
         ":simple_model_settings",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
     ],
 )
@@ -152,7 +152,7 @@ tflite_micro_cc_test(
         ":simple_features_generator_fixed",
         ":simple_features_generator_test_data",
         ":simple_model_settings",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -167,7 +167,7 @@ cc_library(
         "audio_provider.h",
     ],
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_model_settings",
     ],
@@ -183,7 +183,7 @@ cc_library(
     ],
     deps = [
         ":audio_large_sample_test_data",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_model_settings",
     ],
@@ -196,7 +196,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":audio_provider",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_model_settings",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
@@ -211,7 +211,7 @@ tflite_micro_cc_test(
     deps = [
         ":audio_large_sample_test_data",
         ":audio_provider_mock",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_model_settings",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
@@ -228,7 +228,7 @@ cc_library(
     ],
     deps = [
         ":audio_provider",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_features_generator",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_model_settings",
@@ -243,7 +243,7 @@ tflite_micro_cc_test(
     deps = [
         ":audio_provider",
         ":feature_provider",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_model_settings",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
@@ -260,7 +260,7 @@ cc_library(
     ],
     deps = [
         ":audio_provider_mock",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_features_generator",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_model_settings",
@@ -274,7 +274,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":feature_provider_mock",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_features_test_data",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_model_settings",
@@ -291,7 +291,7 @@ cc_library(
         "recognize_commands.h",
     ],
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/examples/micro_speech/micro_features:micro_model_settings",
     ],
@@ -307,7 +307,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":recognize_commands",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -322,7 +322,7 @@ cc_library(
         "command_responder.h",
     ],
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
     ],
 )
@@ -334,7 +334,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":command_responder",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],

tensorflow/lite/experimental/micro/examples/micro_speech/apollo3/preprocessor_1k.cc

@@ -16,7 +16,7 @@ limitations under the License.
 /* This file is a modification of the Tensorflow Micro Lite file preprocessor.cc
  */
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/CMSIS/sin_1k.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 #include "tensorflow/lite/experimental/micro/testing/micro_test.h"

tensorflow/lite/experimental/micro/examples/micro_speech/apollo3/pushbutton_test.cc

@@ -16,7 +16,7 @@ limitations under the License.
 /* This file is a modification of the Tensorflow Micro Lite file
  * micro_speech_test.cc */
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/simple_features/simple_features_generator.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/simple_features/tiny_conv_simple_features_model_data.h"
 #include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h"

tensorflow/lite/experimental/micro/examples/micro_speech/audio_provider.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_AUDIO_PROVIDER_H_
 #define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_AUDIO_PROVIDER_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 
 // This is an abstraction around an audio source like a microphone, and is

tensorflow/lite/experimental/micro/examples/micro_speech/audio_provider_mock_test.cc

@@ -13,17 +13,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/experimental/micro/examples/micro_speech/audio_provider.h"
-
 #include <limits>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
+#include "tensorflow/lite/experimental/micro/examples/micro_speech/audio_provider.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/micro_model_settings.h"
-#include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
-#include "tensorflow/lite/experimental/micro/testing/micro_test.h"
-
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/no_1000ms_sample_data.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/yes_1000ms_sample_data.h"
+#include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
+#include "tensorflow/lite/experimental/micro/testing/micro_test.h"
 
 TF_LITE_MICRO_TESTS_BEGIN
 

tensorflow/lite/experimental/micro/examples/micro_speech/audio_provider_test.cc

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <limits>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/micro_model_settings.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 #include "tensorflow/lite/experimental/micro/testing/micro_test.h"

tensorflow/lite/experimental/micro/examples/micro_speech/command_responder.h

@@ -18,7 +18,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_COMMAND_RESPONDER_H_
 #define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_COMMAND_RESPONDER_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 
 // Called every time the results of an audio recognition run are available. The

tensorflow/lite/experimental/micro/examples/micro_speech/feature_provider.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_FEATURE_PROVIDER_H_
 #define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_FEATURE_PROVIDER_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 
 // Binds itself to an area of memory intended to hold the input features for an

tensorflow/lite/experimental/micro/examples/micro_speech/feature_provider_mock_test.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/feature_provider.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/micro_model_settings.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/no_micro_features_data.h"

tensorflow/lite/experimental/micro/examples/micro_speech/feature_provider_test.cc

@@ -14,7 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/feature_provider.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/micro_model_settings.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 #include "tensorflow/lite/experimental/micro/testing/micro_test.h"

tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/BUILD

@@ -57,7 +57,7 @@ cc_library(
     ],
     deps = [
         ":micro_model_settings",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/microfrontend/lib:frontend",
     ],
@@ -84,7 +84,7 @@ tflite_micro_cc_test(
         ":micro_features_generator",
         ":micro_features_generator_test_data",
         ":micro_model_settings",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/examples/micro_speech:audio_sample_test_data",
         "//tensorflow/lite/experimental/micro/testing:micro_test",

tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/micro_features_generator.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_MICRO_FEATURES_MICRO_FEATURES_GENERATOR_H_
 #define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_MICRO_FEATURES_MICRO_FEATURES_GENERATOR_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 
 // Sets up any resources needed for the feature generation pipeline.

tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/micro_features_generator_test.cc

@@ -14,7 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/micro_features_generator.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/no_feature_data_slice.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/yes_feature_data_slice.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h"

tensorflow/lite/experimental/micro/examples/micro_speech/recognize_commands.h

@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <cstdint>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/micro_features/micro_model_settings.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 

tensorflow/lite/experimental/micro/examples/micro_speech/simple_features/simple_features_generator.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_SIMPLE_FEATURES_SIMPLE_FEATURES_GENERATOR_H_
 #define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_SIMPLE_FEATURES_SIMPLE_FEATURES_GENERATOR_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 
 // Converts audio sample data into a more compact form that's appropriate for

tensorflow/lite/experimental/micro/examples/micro_speech/simple_features/simple_features_generator_test.cc

@@ -14,7 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/simple_features/simple_features_generator.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/simple_features/no_power_spectrum_data.h"
 #include "tensorflow/lite/experimental/micro/examples/micro_speech/simple_features/yes_power_spectrum_data.h"

tensorflow/lite/experimental/micro/examples/person_detection/BUILD

@@ -55,7 +55,7 @@ cc_library(
     ],
     deps = [
         ":model_settings",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
     ],
 )
@@ -68,7 +68,7 @@ tflite_micro_cc_test(
     deps = [
         ":image_provider",
         ":model_settings",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -83,7 +83,7 @@ cc_library(
         "detection_responder.h",
     ],
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
     ],
 )

tensorflow/lite/experimental/micro/examples/person_detection/detection_responder.h

@@ -19,7 +19,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_PERSON_DETECTION_DETECTION_RESPONDER_H_
 #define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_PERSON_DETECTION_DETECTION_RESPONDER_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 
 // Called every time the results of a person detection run are available. The

tensorflow/lite/experimental/micro/examples/person_detection/image_provider.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_PERSON_DETECTION_IMAGE_PROVIDER_H_
 #define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_PERSON_DETECTION_IMAGE_PROVIDER_H_
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 
 // This is an abstraction around an image source like a camera, and is

tensorflow/lite/experimental/micro/examples/person_detection/image_provider_test.cc

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <limits>
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/person_detection/model_settings.h"
 #include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
 #include "tensorflow/lite/experimental/micro/testing/micro_test.h"

tensorflow/lite/experimental/micro/examples/person_detection/person_detection_test.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/examples/person_detection/model_settings.h"
 #include "tensorflow/lite/experimental/micro/examples/person_detection/no_person_image_data.h"
 #include "tensorflow/lite/experimental/micro/examples/person_detection/person_detect_model_data.h"

tensorflow/lite/experimental/micro/kernels/BUILD

@@ -47,7 +47,7 @@ cc_library(
     deps = [
         ":activation_utils",
         ":micro_utils",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_utils",
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/kernels:op_macros",
@@ -110,7 +110,7 @@ cc_library(
     deps = [
         ":activation_utils",
         ":micro_utils",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_utils",
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/kernels:op_macros",
@@ -147,7 +147,7 @@ tflite_micro_cc_test(
     srcs = ["elementwise_test.cc"],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -160,7 +160,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -173,7 +173,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -186,7 +186,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":portable_optimized_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -199,7 +199,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -212,7 +212,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -225,7 +225,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -238,7 +238,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -251,7 +251,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro:micro_utils",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
@@ -265,7 +265,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -278,7 +278,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -291,7 +291,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -304,7 +304,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -317,7 +317,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -330,7 +330,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -344,7 +344,7 @@ tflite_micro_cc_test(
     deps = [
         ":all_ops_resolver",
         ":micro_utils",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -357,7 +357,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/kernels:micro_utils",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
@@ -371,7 +371,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -384,7 +384,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -397,7 +397,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -410,7 +410,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -423,7 +423,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -436,7 +436,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
@@ -449,7 +449,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],
 )
@@ -460,7 +460,7 @@ tflite_micro_cc_test(
         "quantization_util_test.cc",
     ],
     deps = [
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
         "//tensorflow/lite/kernels/internal:quantization_util",
     ],
@@ -469,7 +469,7 @@ tflite_micro_cc_test(
 cc_library(
     name = "activation_utils",
     hdrs = ["activation_utils.h"],
-    deps = ["//tensorflow/lite/c:c_api_internal"],
+    deps = ["//tensorflow/lite/c:common"],
 )
 
 tflite_micro_cc_test(
@@ -479,7 +479,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/kernels:micro_utils",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
@@ -493,7 +493,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/kernels:micro_utils",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
@@ -512,7 +512,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro:micro_utils",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
@@ -527,7 +527,7 @@ tflite_micro_cc_test(
     ],
     deps = [
         ":all_ops_resolver",
-        "//tensorflow/lite/c:c_api_internal",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/experimental/micro:micro_framework",
         "//tensorflow/lite/experimental/micro/testing:micro_test",
     ],

tensorflow/lite/experimental/micro/kernels/activations.cc

@@ -14,7 +14,7 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/micro_utils.h"
 #include "tensorflow/lite/kernels/internal/common.h"
 #include "tensorflow/lite/kernels/internal/quantization_util.h"

tensorflow/lite/experimental/micro/kernels/activations_test.cc

@@ -14,7 +14,7 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h"
 #include "tensorflow/lite/experimental/micro/testing/micro_test.h"
 #include "tensorflow/lite/experimental/micro/testing/test_utils.h"

tensorflow/lite/experimental/micro/kernels/add.cc

@@ -16,7 +16,7 @@ limitations under the License.
 #include "tensorflow/lite/kernels/internal/reference/add.h"
 
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/kernels/internal/quantization_util.h"
 #include "tensorflow/lite/kernels/internal/reference/integer_ops/add.h"
 #include "tensorflow/lite/kernels/internal/reference/process_broadcast_shapes.h"

tensorflow/lite/experimental/micro/kernels/add_test.cc

@@ -16,7 +16,7 @@ limitations under the License.
 #include <cstdint>
 
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h"
 #include "tensorflow/lite/experimental/micro/testing/micro_test.h"
 #include "tensorflow/lite/experimental/micro/testing/test_utils.h"

tensorflow/lite/experimental/micro/kernels/arg_min_max.cc

@@ -16,7 +16,7 @@ limitations under the License.
 #include "tensorflow/lite/kernels/internal/reference/arg_min_max.h"
 
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/kernels/micro_utils.h"
 #include "tensorflow/lite/kernels/internal/tensor_ctypes.h"
 #include "tensorflow/lite/kernels/kernel_util.h"

tensorflow/lite/experimental/micro/kernels/arg_min_max_test.cc

@@ -14,7 +14,7 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h"
 #include "tensorflow/lite/experimental/micro/testing/micro_test.h"
 #include "tensorflow/lite/experimental/micro/testing/test_utils.h"

tensorflow/lite/experimental/micro/kernels/ceil.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 #include "tensorflow/lite/kernels/internal/reference/ceil.h"
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/kernels/internal/tensor_ctypes.h"
 #include "tensorflow/lite/kernels/kernel_util.h"
 

tensorflow/lite/experimental/micro/kernels/ceil_test.cc

@@ -14,7 +14,7 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h"
 #include "tensorflow/lite/experimental/micro/testing/micro_test.h"
 #include "tensorflow/lite/experimental/micro/testing/test_utils.h"

tensorflow/lite/experimental/micro/kernels/cmsis-nn/conv.cc

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include "arm_nnfunctions.h"
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/kernels/cmsis-nn/scratch_buffer.h"
 #include "tensorflow/lite/kernels/internal/common.h"
 #include "tensorflow/lite/kernels/internal/quantization_util.h"

tensorflow/lite/experimental/micro/kernels/cmsis-nn/depthwise_conv.cc

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include "arm_nnfunctions.h"
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/kernels/cmsis-nn/scratch_buffer.h"
 #include "tensorflow/lite/kernels/internal/common.h"
 #include "tensorflow/lite/kernels/internal/quantization_util.h"

tensorflow/lite/experimental/micro/kernels/cmsis-nn/fully_connected.cc

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include "arm_nnfunctions.h"
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/kernels/cmsis-nn/scratch_buffer.h"
 #include "tensorflow/lite/kernels/internal/common.h"
 #include "tensorflow/lite/kernels/internal/quantization_util.h"

tensorflow/lite/experimental/micro/kernels/cmsis-nn/scratch_buffer.h

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 
 // todo: remove this function once context->AllocateTemporaryTensor() is
 // implemented.

tensorflow/lite/experimental/micro/kernels/comparisons.cc

@@ -14,7 +14,7 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/lite/kernels/internal/reference/comparisons.h"
 
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/kernels/internal/quantization_util.h"
 #include "tensorflow/lite/kernels/internal/tensor_ctypes.h"
 #include "tensorflow/lite/kernels/kernel_util.h"

tensorflow/lite/experimental/micro/kernels/comparisons_test.cc

@@ -16,7 +16,7 @@ limitations under the License.
 #include <initializer_list>
 
 #include "tensorflow/lite/c/builtin_op_data.h"
-#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h"
 #include "tensorflow/lite/experimental/micro/testing/micro_test.h"
 #include "tensorflow/lite/experimental/micro/testing/test_utils.h"