diff --git a/mediapipe/framework/tool/BUILD b/mediapipe/framework/tool/BUILD
index cc586a2c3..8e1ef94a4 100644
--- a/mediapipe/framework/tool/BUILD
+++ b/mediapipe/framework/tool/BUILD
@@ -335,6 +335,7 @@ mediapipe_cc_test(
 cc_library(
     name = "packet_generator_wrapper_calculator",
     srcs = ["packet_generator_wrapper_calculator.cc"],
+    hdrs = ["packet_generator_wrapper_calculator.h"],
     visibility = ["//mediapipe/framework:__subpackages__"],
     deps = [
         ":packet_generator_wrapper_calculator_cc_proto",
@@ -342,6 +343,9 @@ cc_library(
         "//mediapipe/framework:calculator_registry",
         "//mediapipe/framework:output_side_packet",
         "//mediapipe/framework:packet_generator",
+        "//mediapipe/framework:packet_set",
+        "//mediapipe/framework/port:status",
+        "@com_google_absl//absl/status",
     ],
     alwayslink = 1,
 )
@@ -386,21 +390,22 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":name_util",
+        ":status_util",
         "//mediapipe/calculators/internal:callback_packet_calculator",
         "//mediapipe/calculators/internal:callback_packet_calculator_cc_proto",
         "//mediapipe/framework:calculator_base",
         "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework:calculator_graph",
         "//mediapipe/framework:calculator_registry",
-        "//mediapipe/framework:input_stream",
         "//mediapipe/framework:packet",
         "//mediapipe/framework:packet_type",
-        "//mediapipe/framework/port:logging",
+        "//mediapipe/framework:timestamp",
         "//mediapipe/framework/port:source_location",
         "//mediapipe/framework/port:status",
         "@com_google_absl//absl/base:core_headers",
+        "@com_google_absl//absl/log:check",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
     ],
     alwayslink = 1,
 )
diff --git a/mediapipe/framework/tool/packet_generator_wrapper_calculator.cc b/mediapipe/framework/tool/packet_generator_wrapper_calculator.cc
index 831918dfa..07eae6f26 100644
--- a/mediapipe/framework/tool/packet_generator_wrapper_calculator.cc
+++ b/mediapipe/framework/tool/packet_generator_wrapper_calculator.cc
@@ -1,52 +1,55 @@
+#include "mediapipe/framework/tool/packet_generator_wrapper_calculator.h"
+
+#include "absl/status/status.h"
 #include "mediapipe/framework/calculator_base.h"
 #include "mediapipe/framework/calculator_registry.h"
 #include "mediapipe/framework/output_side_packet.h"
 #include "mediapipe/framework/packet_generator.h"
+#include "mediapipe/framework/packet_set.h"
+#include "mediapipe/framework/port/status_macros.h"
 #include "mediapipe/framework/tool/packet_generator_wrapper_calculator.pb.h"
 
 namespace mediapipe {
 
-class PacketGeneratorWrapperCalculator : public CalculatorBase {
- public:
-  static absl::Status GetContract(CalculatorContract* cc) {
-    const auto& options =
-        cc->Options<::mediapipe::PacketGeneratorWrapperCalculatorOptions>();
-    ASSIGN_OR_RETURN(auto static_access,
-                     mediapipe::internal::StaticAccessToGeneratorRegistry::
-                         CreateByNameInNamespace(options.package(),
-                                                 options.packet_generator()));
-    MP_RETURN_IF_ERROR(static_access->FillExpectations(
-                           options.options(), &cc->InputSidePackets(),
-                           &cc->OutputSidePackets()))
-            .SetPrepend()
-        << options.packet_generator() << "::FillExpectations() failed: ";
-    return absl::OkStatus();
-  }
+absl::Status PacketGeneratorWrapperCalculator::GetContract(
+    CalculatorContract* cc) {
+  const auto& options =
+      cc->Options<::mediapipe::PacketGeneratorWrapperCalculatorOptions>();
+  ASSIGN_OR_RETURN(auto static_access,
+                   mediapipe::internal::StaticAccessToGeneratorRegistry::
+                       CreateByNameInNamespace(options.package(),
+                                               options.packet_generator()));
+  MP_RETURN_IF_ERROR(static_access->FillExpectations(options.options(),
+                                                     &cc->InputSidePackets(),
+                                                     &cc->OutputSidePackets()))
+          .SetPrepend()
+      << options.packet_generator() << "::FillExpectations() failed: ";
+  return absl::OkStatus();
+}
 
-  absl::Status Open(CalculatorContext* cc) override {
-    const auto& options =
-        cc->Options<::mediapipe::PacketGeneratorWrapperCalculatorOptions>();
-    ASSIGN_OR_RETURN(auto static_access,
-                     mediapipe::internal::StaticAccessToGeneratorRegistry::
-                         CreateByNameInNamespace(options.package(),
-                                                 options.packet_generator()));
-    mediapipe::PacketSet output_packets(cc->OutputSidePackets().TagMap());
-    MP_RETURN_IF_ERROR(static_access->Generate(options.options(),
-                                               cc->InputSidePackets(),
-                                               &output_packets))
-            .SetPrepend()
-        << options.packet_generator() << "::Generate() failed: ";
-    for (auto id = output_packets.BeginId(); id < output_packets.EndId();
-         ++id) {
-      cc->OutputSidePackets().Get(id).Set(output_packets.Get(id));
-    }
-    return absl::OkStatus();
+absl::Status PacketGeneratorWrapperCalculator::Open(CalculatorContext* cc) {
+  const auto& options =
+      cc->Options<::mediapipe::PacketGeneratorWrapperCalculatorOptions>();
+  ASSIGN_OR_RETURN(auto static_access,
+                   mediapipe::internal::StaticAccessToGeneratorRegistry::
+                       CreateByNameInNamespace(options.package(),
+                                               options.packet_generator()));
+  mediapipe::PacketSet output_packets(cc->OutputSidePackets().TagMap());
+  MP_RETURN_IF_ERROR(static_access->Generate(options.options(),
+                                             cc->InputSidePackets(),
+                                             &output_packets))
+          .SetPrepend()
+      << options.packet_generator() << "::Generate() failed: ";
+  for (auto id = output_packets.BeginId(); id < output_packets.EndId(); ++id) {
+    cc->OutputSidePackets().Get(id).Set(output_packets.Get(id));
   }
+  return absl::OkStatus();
+}
+
+absl::Status PacketGeneratorWrapperCalculator::Process(CalculatorContext* cc) {
+  return absl::OkStatus();
+}
 
-  absl::Status Process(CalculatorContext* cc) override {
-    return absl::OkStatus();
-  }
-};
 REGISTER_CALCULATOR(PacketGeneratorWrapperCalculator);
 
 }  // namespace mediapipe
diff --git a/mediapipe/framework/tool/packet_generator_wrapper_calculator.h b/mediapipe/framework/tool/packet_generator_wrapper_calculator.h
new file mode 100644
index 000000000..012281ca0
--- /dev/null
+++ b/mediapipe/framework/tool/packet_generator_wrapper_calculator.h
@@ -0,0 +1,32 @@
+// Copyright 2023 The MediaPipe Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+#ifndef MEDIAPIPE_FRAMEWORK_TOOL_PACKET_GENERATOR_WRAPPER_CALCULATOR_H_
+#define MEDIAPIPE_FRAMEWORK_TOOL_PACKET_GENERATOR_WRAPPER_CALCULATOR_H_
+
+#include "absl/status/status.h"
+#include "mediapipe/framework/calculator_base.h"
+
+namespace mediapipe {
+
+class PacketGeneratorWrapperCalculator : public CalculatorBase {
+ public:
+  static absl::Status GetContract(CalculatorContract* cc);
+  absl::Status Open(CalculatorContext* cc) override;
+  absl::Status Process(CalculatorContext* cc) override;
+};
+
+}  // namespace mediapipe
+
+#endif  // MEDIAPIPE_FRAMEWORK_TOOL_PACKET_GENERATOR_WRAPPER_CALCULATOR_H_
diff --git a/mediapipe/framework/tool/sink.cc b/mediapipe/framework/tool/sink.cc
index f8abf4925..4111d884c 100644
--- a/mediapipe/framework/tool/sink.cc
+++ b/mediapipe/framework/tool/sink.cc
@@ -18,54 +18,58 @@
 
 #include "mediapipe/framework/tool/sink.h"
 
+#include <stdio.h>
+
+#include <functional>
+#include <map>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
+#include "absl/log/check.h"
+#include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
 #include "mediapipe/calculators/internal/callback_packet_calculator.pb.h"
 #include "mediapipe/framework/calculator.pb.h"
 #include "mediapipe/framework/calculator_base.h"
 #include "mediapipe/framework/calculator_graph.h"
 #include "mediapipe/framework/calculator_registry.h"
-#include "mediapipe/framework/input_stream.h"
 #include "mediapipe/framework/packet.h"
 #include "mediapipe/framework/packet_type.h"
-#include "mediapipe/framework/port/logging.h"
 #include "mediapipe/framework/port/source_location.h"
 #include "mediapipe/framework/port/status_builder.h"
+#include "mediapipe/framework/timestamp.h"
 #include "mediapipe/framework/tool/name_util.h"
+#include "mediapipe/framework/tool/status_util.h"
 
 namespace mediapipe {
 
 namespace tool {
-namespace {
-// Produces an output packet with the PostStream timestamp containing the
-// input side packet.
-class MediaPipeInternalSidePacketToPacketStreamCalculator
-    : public CalculatorBase {
- public:
-  static absl::Status GetContract(CalculatorContract* cc) {
-    cc->InputSidePackets().Index(0).SetAny();
-    cc->Outputs().Index(0).SetSameAs(&cc->InputSidePackets().Index(0));
-    return absl::OkStatus();
-  }
 
-  absl::Status Open(CalculatorContext* cc) final {
-    cc->Outputs().Index(0).AddPacket(
-        cc->InputSidePackets().Index(0).At(Timestamp::PostStream()));
-    cc->Outputs().Index(0).Close();
-    return absl::OkStatus();
-  }
+absl::Status MediaPipeInternalSidePacketToPacketStreamCalculator::GetContract(
+    CalculatorContract* cc) {
+  cc->InputSidePackets().Index(0).SetAny();
+  cc->Outputs().Index(0).SetSameAs(&cc->InputSidePackets().Index(0));
+  return absl::OkStatus();
+}
+
+absl::Status MediaPipeInternalSidePacketToPacketStreamCalculator::Open(
+    CalculatorContext* cc) {
+  cc->Outputs().Index(0).AddPacket(
+      cc->InputSidePackets().Index(0).At(Timestamp::PostStream()));
+  cc->Outputs().Index(0).Close();
+  return absl::OkStatus();
+}
+
+absl::Status MediaPipeInternalSidePacketToPacketStreamCalculator::Process(
+    CalculatorContext* cc) {
+  // The framework treats this calculator as a source calculator.
+  return mediapipe::tool::StatusStop();
+}
 
-  absl::Status Process(CalculatorContext* cc) final {
-    // The framework treats this calculator as a source calculator.
-    return mediapipe::tool::StatusStop();
-  }
-};
 REGISTER_CALCULATOR(MediaPipeInternalSidePacketToPacketStreamCalculator);
-}  // namespace
 
 void AddVectorSink(const std::string& stream_name,  //
                    CalculatorGraphConfig* config,   //
diff --git a/mediapipe/framework/tool/sink.h b/mediapipe/framework/tool/sink.h
index f786e60a7..c5d45332d 100644
--- a/mediapipe/framework/tool/sink.h
+++ b/mediapipe/framework/tool/sink.h
@@ -28,10 +28,12 @@
 #ifndef MEDIAPIPE_FRAMEWORK_TOOL_SINK_H_
 #define MEDIAPIPE_FRAMEWORK_TOOL_SINK_H_
 
+#include <functional>
 #include <string>
 #include <vector>
 
 #include "absl/base/macros.h"
+#include "absl/status/status.h"
 #include "mediapipe/framework/calculator_base.h"
 #include "mediapipe/framework/packet_type.h"
 #include "mediapipe/framework/port/status.h"
@@ -205,6 +207,16 @@ class CallbackWithHeaderCalculator : public CalculatorBase {
   Packet header_packet_;
 };
 
+// Produces an output packet with the PostStream timestamp containing the
+// input side packet.
+class MediaPipeInternalSidePacketToPacketStreamCalculator
+    : public CalculatorBase {
+ public:
+  static absl::Status GetContract(CalculatorContract* cc);
+  absl::Status Open(CalculatorContext* cc) final;
+  absl::Status Process(CalculatorContext* cc) final;
+};
+
 }  // namespace tool
 }  // namespace mediapipe