From 28a88cc4f7aef7ec2efe75b1ea2d0a7bdfae3a17 Mon Sep 17 00:00:00 2001
From: Fergus Henderson <fergus@google.com>
Date: Thu, 8 Oct 2020 11:24:53 -0700
Subject: [PATCH] [lite] Partial reversion of some changes in CL 336001737
 (which were previously automatically rolled back in CL 336109212 and then
 wrongly rolled forward again in CL 336109212).

In particular, roll back the removal of #includes from header files.
These parts need to be reverted because they break many targets
due to widespread include-what-you-use violations in code that
depends on these header files.

PiperOrigin-RevId: 336127165
Change-Id: I7c9e6dd0dde6f25424314133fa759f8970dbf988
---
 tensorflow/lite/kernels/register.h | 1 +
 tensorflow/lite/tools/BUILD        | 1 +
 tensorflow/lite/tools/verifier.h   | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/tensorflow/lite/kernels/register.h b/tensorflow/lite/kernels/register.h
index e5cd7bcb4ad..f40798ffd0a 100644
--- a/tensorflow/lite/kernels/register.h
+++ b/tensorflow/lite/kernels/register.h
@@ -15,6 +15,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_KERNELS_REGISTER_H_
 #define TENSORFLOW_LITE_KERNELS_REGISTER_H_
 
+#include "tensorflow/lite/model.h"  // Legacy.
 #include "tensorflow/lite/mutable_op_resolver.h"
 
 namespace tflite {
diff --git a/tensorflow/lite/tools/BUILD b/tensorflow/lite/tools/BUILD
index 150ab907a66..869dd8501e2 100644
--- a/tensorflow/lite/tools/BUILD
+++ b/tensorflow/lite/tools/BUILD
@@ -191,6 +191,7 @@ cc_library(
     srcs = ["verifier.cc"],
     hdrs = ["verifier.h"],
     deps = [
+        "//tensorflow/lite:framework",
         "//tensorflow/lite:schema_fbs_version",
         "//tensorflow/lite:string_util",
         "//tensorflow/lite/c:common",
diff --git a/tensorflow/lite/tools/verifier.h b/tensorflow/lite/tools/verifier.h
index a19dfcf5fc0..35d7e30a172 100644
--- a/tensorflow/lite/tools/verifier.h
+++ b/tensorflow/lite/tools/verifier.h
@@ -20,6 +20,8 @@ limitations under the License.
 
 #include "tensorflow/lite/core/api/error_reporter.h"
 #include "tensorflow/lite/core/api/op_resolver.h"
+#include "tensorflow/lite/error_reporter.h"  // Legacy.
+#include "tensorflow/lite/model.h"           // Legacy.
 
 namespace tflite {