Resolve comments, add back some transitive dependencies to fix exampl…

…e code

src/google/protobuf/BUILD.bazel

@@ -142,6 +142,18 @@ genrule(
     visibility = ["//visibility:private"],
 )
 
+staleness_test(
+    name = "well_known_types_staleness_test",
+    outs =
+        [wkt + ".pb.h" for wkt in WELL_KNOWN_TYPES] +
+        [wkt + ".pb.cc" for wkt in WELL_KNOWN_TYPES],
+    generated_pattern = "wkt/google/protobuf/%s",
+    tags = ["manual"],
+)
+
+# This is necessary for our generated cmake configs to pick up the checked in
+# WKT files.
+# TODO(b/246826624) Remove this once we generate WKT code from cmake.
 cc_library(
     name = "cmake_wkt_cc_proto",
     srcs = ["wkt/google/protobuf/" + wkt + ".pb.cc" for wkt in WELL_KNOWN_TYPES],
@@ -153,16 +165,6 @@ cc_library(
     deps = [":protobuf_nowkt"],
 )
 
-
-staleness_test(
-    name = "well_known_types_staleness_test",
-    outs =
-        [wkt + ".pb.h" for wkt in WELL_KNOWN_TYPES] +
-        [wkt + ".pb.cc" for wkt in WELL_KNOWN_TYPES],
-    generated_pattern = "wkt/google/protobuf/%s",
-    tags = ["manual"],
-)
-
 # Built-in runtime types
 
 proto_library(
@@ -489,7 +491,10 @@ cc_library(
         "//src/google/protobuf/io:gzip_stream",
         "//src/google/protobuf/io:printer",
         "//src/google/protobuf/io:tokenizer",
+        "//src/google/protobuf/io:tokenizer",
         "//src/google/protobuf/stubs",
+        "//src/google/protobuf/util:differencer",
+        "//src/google/protobuf/util:time_util",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/base:dynamic_annotations",
         "@com_google_absl//absl/container:btree",