diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
index 7fc0ed2f62415..cbc9f63d5d765 100644
--- a/ci/licenses_golden/licenses_flutter
+++ b/ci/licenses_golden/licenses_flutter
@@ -3741,7 +3741,6 @@ ORIGIN: ../../../flutter/lib/ui/text/paragraph.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/paragraph.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/lib/ui/text/text_box.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/ui.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/ui_benchmarks.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/ui_dart_state.cc + ../../../flutter/LICENSE
@@ -6505,7 +6504,6 @@ FILE: ../../../flutter/lib/ui/text/paragraph.cc
 FILE: ../../../flutter/lib/ui/text/paragraph.h
 FILE: ../../../flutter/lib/ui/text/paragraph_builder.cc
 FILE: ../../../flutter/lib/ui/text/paragraph_builder.h
-FILE: ../../../flutter/lib/ui/text/text_box.h
 FILE: ../../../flutter/lib/ui/ui.dart
 FILE: ../../../flutter/lib/ui/ui_benchmarks.cc
 FILE: ../../../flutter/lib/ui/ui_dart_state.cc
diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
index 4004b5ea1d372..2f4dfccb2b3ab 100644
--- a/lib/ui/BUILD.gn
+++ b/lib/ui/BUILD.gn
@@ -128,7 +128,6 @@ source_set("ui") {
     "text/paragraph.h",
     "text/paragraph_builder.cc",
     "text/paragraph_builder.h",
-    "text/text_box.h",
     "ui_dart_state.cc",
     "ui_dart_state.h",
     "volatile_path_tracker.cc",
diff --git a/lib/ui/text/paragraph.h b/lib/ui/text/paragraph.h
index 311c33a7fc17e..7f069b7efddab 100644
--- a/lib/ui/text/paragraph.h
+++ b/lib/ui/text/paragraph.h
@@ -9,7 +9,6 @@
 #include "flutter/lib/ui/dart_wrapper.h"
 #include "flutter/lib/ui/painting/canvas.h"
 #include "flutter/lib/ui/text/line_metrics.h"
-#include "flutter/lib/ui/text/text_box.h"
 #include "flutter/third_party/txt/src/txt/paragraph.h"
 
 namespace flutter {
diff --git a/lib/ui/text/text_box.h b/lib/ui/text/text_box.h
deleted file mode 100644
index 27f60670f232f..0000000000000
--- a/lib/ui/text/text_box.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_
-#define FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_
-
-#include "third_party/dart/runtime/include/dart_api.h"
-#include "third_party/skia/include/core/SkRect.h"
-#include "third_party/tonic/converter/dart_converter.h"
-
-namespace flutter {
-
-enum class TextDirection {
-  rtl,
-  ltr,
-};
-
-struct TextBox {
-  SkRect rect;
-  TextDirection direction;
-
-  TextBox(SkRect r, TextDirection d) : rect(r), direction(d) {}
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_
diff --git a/lib/ui/window/platform_message.cc b/lib/ui/window/platform_message.cc
index 14cd7bb21c9d1..88b271d9b5587 100644
--- a/lib/ui/window/platform_message.cc
+++ b/lib/ui/window/platform_message.cc
@@ -13,13 +13,13 @@ PlatformMessage::PlatformMessage(std::string channel,
                                  fml::RefPtr<PlatformMessageResponse> response)
     : channel_(std::move(channel)),
       data_(std::move(data)),
-      hasData_(true),
+      has_data_(true),
       response_(std::move(response)) {}
 PlatformMessage::PlatformMessage(std::string channel,
                                  fml::RefPtr<PlatformMessageResponse> response)
     : channel_(std::move(channel)),
       data_(),
-      hasData_(false),
+      has_data_(false),
       response_(std::move(response)) {}
 
 PlatformMessage::~PlatformMessage() = default;
diff --git a/lib/ui/window/platform_message.h b/lib/ui/window/platform_message.h
index 7fe09cdcac1c7..a732f28764dd8 100644
--- a/lib/ui/window/platform_message.h
+++ b/lib/ui/window/platform_message.h
@@ -25,7 +25,7 @@ class PlatformMessage {
 
   const std::string& channel() const { return channel_; }
   const fml::MallocMapping& data() const { return data_; }
-  bool hasData() { return hasData_; }
+  bool hasData() { return has_data_; }
 
   const fml::RefPtr<PlatformMessageResponse>& response() const {
     return response_;
@@ -36,7 +36,7 @@ class PlatformMessage {
  private:
   std::string channel_;
   fml::MallocMapping data_;
-  bool hasData_;
+  bool has_data_;
   fml::RefPtr<PlatformMessageResponse> response_;
 };
 
diff --git a/lib/ui/window/pointer_data_packet_converter.h b/lib/ui/window/pointer_data_packet_converter.h
index c837d610ae5af..d0e59803255aa 100644
--- a/lib/ui/window/pointer_data_packet_converter.h
+++ b/lib/ui/window/pointer_data_packet_converter.h
@@ -99,7 +99,7 @@ class PointerDataPacketConverter {
  private:
   std::map<int64_t, PointerState> states_;
 
-  int64_t pointer_;
+  int64_t pointer_ = 0;
 
   void ConvertPointerData(PointerData pointer_data,
                           std::vector<PointerData>& converted_pointers);