diff --git a/assets/asset_manager.h b/assets/asset_manager.h
index 84ae784f66573..42ffa9b1053c4 100644
--- a/assets/asset_manager.h
+++ b/assets/asset_manager.h
@@ -19,7 +19,7 @@ class AssetManager final : public AssetResolver {
  public:
   AssetManager();
 
-  ~AssetManager();
+  ~AssetManager() override;
 
   void PushFront(std::unique_ptr<AssetResolver> resolver);
 
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
index 125b745183048..79f415685ceff 100644
--- a/ci/licenses_golden/licenses_flutter
+++ b/ci/licenses_golden/licenses_flutter
@@ -27,6 +27,7 @@ FILE: ../../../flutter/flow/compositor_context.cc
 FILE: ../../../flutter/flow/compositor_context.h
 FILE: ../../../flutter/flow/debug_print.cc
 FILE: ../../../flutter/flow/debug_print.h
+FILE: ../../../flutter/flow/embedded_views.cc
 FILE: ../../../flutter/flow/embedded_views.h
 FILE: ../../../flutter/flow/export_node.cc
 FILE: ../../../flutter/flow/export_node.h
@@ -189,6 +190,7 @@ FILE: ../../../flutter/fml/task_runner.cc
 FILE: ../../../flutter/fml/task_runner.h
 FILE: ../../../flutter/fml/thread.cc
 FILE: ../../../flutter/fml/thread.h
+FILE: ../../../flutter/fml/thread_local.cc
 FILE: ../../../flutter/fml/thread_local.h
 FILE: ../../../flutter/fml/thread_local_unittests.cc
 FILE: ../../../flutter/fml/thread_unittests.cc
@@ -311,6 +313,7 @@ FILE: ../../../flutter/lib/ui/window/pointer_data.cc
 FILE: ../../../flutter/lib/ui/window/pointer_data.h
 FILE: ../../../flutter/lib/ui/window/pointer_data_packet.cc
 FILE: ../../../flutter/lib/ui/window/pointer_data_packet.h
+FILE: ../../../flutter/lib/ui/window/viewport_metrics.cc
 FILE: ../../../flutter/lib/ui/window/viewport_metrics.h
 FILE: ../../../flutter/lib/ui/window/window.cc
 FILE: ../../../flutter/lib/ui/window/window.h
@@ -496,6 +499,7 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatfor
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterStandardCodec.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterStandardCodec_Internal.h
diff --git a/common/settings.cc b/common/settings.cc
index 620733817eb88..a85d69fc8596c 100644
--- a/common/settings.cc
+++ b/common/settings.cc
@@ -8,6 +8,12 @@
 
 namespace blink {
 
+Settings::Settings() = default;
+
+Settings::Settings(const Settings& other) = default;
+
+Settings::~Settings() = default;
+
 std::string Settings::ToString() const {
   std::stringstream stream;
   stream << "Settings: " << std::endl;
diff --git a/common/settings.h b/common/settings.h
index c7252aa921fa3..92a8e37109ff2 100644
--- a/common/settings.h
+++ b/common/settings.h
@@ -22,6 +22,12 @@ using TaskObserverAdd =
 using TaskObserverRemove = std::function<void(intptr_t /* key */)>;
 
 struct Settings {
+  Settings();
+
+  Settings(const Settings& other);
+
+  ~Settings();
+
   // VM settings
   std::string vm_snapshot_data_path;
   std::string vm_snapshot_instr_path;
diff --git a/common/task_runners.cc b/common/task_runners.cc
index f9d251460e1a0..d76bc20f6ae38 100644
--- a/common/task_runners.cc
+++ b/common/task_runners.cc
@@ -19,6 +19,8 @@ TaskRunners::TaskRunners(std::string label,
       ui_(std::move(ui)),
       io_(std::move(io)) {}
 
+TaskRunners::TaskRunners(const TaskRunners& other) = default;
+
 TaskRunners::~TaskRunners() = default;
 
 const std::string& TaskRunners::GetLabel() const {
diff --git a/common/task_runners.h b/common/task_runners.h
index aca38bebaa227..0bd0c301903ae 100644
--- a/common/task_runners.h
+++ b/common/task_runners.h
@@ -20,6 +20,8 @@ class TaskRunners {
               fml::RefPtr<fml::TaskRunner> ui,
               fml::RefPtr<fml::TaskRunner> io);
 
+  TaskRunners(const TaskRunners& other);
+
   ~TaskRunners();
 
   const std::string& GetLabel() const;
diff --git a/flow/BUILD.gn b/flow/BUILD.gn
index 5a1f50d2ee5ba..799c23caf02d3 100644
--- a/flow/BUILD.gn
+++ b/flow/BUILD.gn
@@ -8,6 +8,7 @@ source_set("flow") {
     "compositor_context.h",
     "debug_print.cc",
     "debug_print.h",
+    "embedded_views.cc",
     "embedded_views.h",
     "instrumentation.cc",
     "instrumentation.h",
diff --git a/flow/embedded_views.cc b/flow/embedded_views.cc
new file mode 100644
index 0000000000000..8dc634ecdd62d
--- /dev/null
+++ b/flow/embedded_views.cc
@@ -0,0 +1,12 @@
+// 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.
+
+#include "flutter/flow/embedded_views.h"
+
+namespace flow {
+
+bool ExternalViewEmbedder::SubmitFrame(GrContext* context) {
+  return false;
+};
+}  // namespace flow
diff --git a/flow/embedded_views.h b/flow/embedded_views.h
index 81c67de9784b5..6f2e684c4841e 100644
--- a/flow/embedded_views.h
+++ b/flow/embedded_views.h
@@ -37,7 +37,7 @@ class ExternalViewEmbedder {
   virtual SkCanvas* CompositeEmbeddedView(int view_id,
                                           const EmbeddedViewParams& params) = 0;
 
-  virtual bool SubmitFrame(GrContext* context) { return false; };
+  virtual bool SubmitFrame(GrContext* context);
 
   virtual ~ExternalViewEmbedder() = default;
 
diff --git a/flow/layers/layer_tree.cc b/flow/layers/layer_tree.cc
index 19df3d27c1286..37b9b0a23b9fb 100644
--- a/flow/layers/layer_tree.cc
+++ b/flow/layers/layer_tree.cc
@@ -96,7 +96,7 @@ sk_sp<SkPicture> LayerTree::Flatten(const SkRect& bounds) {
   TRACE_EVENT0("flutter", "LayerTree::Flatten");
 
   SkPictureRecorder recorder;
-  auto canvas = recorder.beginRecording(bounds);
+  auto* canvas = recorder.beginRecording(bounds);
 
   if (!canvas) {
     return nullptr;
diff --git a/flow/layers/picture_layer.cc b/flow/layers/picture_layer.cc
index 74057039d304d..cef3321df4d19 100644
--- a/flow/layers/picture_layer.cc
+++ b/flow/layers/picture_layer.cc
@@ -15,7 +15,7 @@ PictureLayer::~PictureLayer() = default;
 void PictureLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
   SkPicture* sk_picture = picture();
 
-  if (auto cache = context->raster_cache) {
+  if (auto* cache = context->raster_cache) {
     SkMatrix ctm = matrix;
     ctm.postTranslate(offset_.x(), offset_.y());
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc
index 4de4e1e89a8a4..ccb88ab48c7c7 100644
--- a/flow/raster_cache.cc
+++ b/flow/raster_cache.cc
@@ -18,6 +18,16 @@
 
 namespace flow {
 
+RasterCacheResult::RasterCacheResult() {}
+
+RasterCacheResult::RasterCacheResult(const RasterCacheResult& other) = default;
+
+RasterCacheResult::~RasterCacheResult() = default;
+
+RasterCacheResult::RasterCacheResult(sk_sp<SkImage> image,
+                                     const SkRect& logical_rect)
+    : image_(std::move(image)), logical_rect_(logical_rect) {}
+
 void RasterCacheResult::draw(SkCanvas& canvas, const SkPaint* paint) const {
   SkAutoCanvasRestore auto_restore(&canvas, true);
   SkIRect bounds =
diff --git a/flow/raster_cache.h b/flow/raster_cache.h
index e5a081bb78100..cb4383f41fb52 100644
--- a/flow/raster_cache.h
+++ b/flow/raster_cache.h
@@ -19,10 +19,13 @@ namespace flow {
 
 class RasterCacheResult {
  public:
-  RasterCacheResult() {}
+  RasterCacheResult();
 
-  RasterCacheResult(sk_sp<SkImage> image, const SkRect& logical_rect)
-      : image_(std::move(image)), logical_rect_(logical_rect) {}
+  RasterCacheResult(const RasterCacheResult& other);
+
+  ~RasterCacheResult();
+
+  RasterCacheResult(sk_sp<SkImage> image, const SkRect& logical_rect);
 
   operator bool() const { return static_cast<bool>(image_); }
 
diff --git a/fml/BUILD.gn b/fml/BUILD.gn
index ed5cb2f1ea3f3..f73f7f40714c4 100644
--- a/fml/BUILD.gn
+++ b/fml/BUILD.gn
@@ -56,6 +56,7 @@ source_set("fml") {
     "task_runner.h",
     "thread.cc",
     "thread.h",
+    "thread_local.cc",
     "thread_local.h",
     "time/time_delta.h",
     "time/time_point.cc",
diff --git a/fml/file.cc b/fml/file.cc
index 1c90b2cfef7ee..8deb76c91da0f 100644
--- a/fml/file.cc
+++ b/fml/file.cc
@@ -43,4 +43,19 @@ fml::UniqueFD CreateDirectory(const fml::UniqueFD& base_directory,
   return CreateDirectory(base_directory, components, permission, 0);
 }
 
+ScopedTemporaryDirectory::ScopedTemporaryDirectory() {
+  path_ = CreateTemporaryDirectory();
+  if (path_ != "") {
+    dir_fd_ = OpenDirectory(path_.c_str(), false, FilePermission::kRead);
+  }
+}
+
+ScopedTemporaryDirectory::~ScopedTemporaryDirectory() {
+  if (path_ != "") {
+    if (!UnlinkDirectory(path_.c_str())) {
+      FML_LOG(ERROR) << "Could not remove directory: " << path_;
+    }
+  }
+}
+
 }  // namespace fml
diff --git a/fml/file.h b/fml/file.h
index a0d604f3f2c96..068ddc84c999d 100644
--- a/fml/file.h
+++ b/fml/file.h
@@ -75,20 +75,9 @@ bool WriteAtomically(const fml::UniqueFD& base_directory,
 
 class ScopedTemporaryDirectory {
  public:
-  ScopedTemporaryDirectory() {
-    path_ = CreateTemporaryDirectory();
-    if (path_ != "") {
-      dir_fd_ = OpenDirectory(path_.c_str(), false, FilePermission::kRead);
-    }
-  }
-
-  ~ScopedTemporaryDirectory() {
-    if (path_ != "") {
-      if (!UnlinkDirectory(path_.c_str())) {
-        FML_LOG(ERROR) << "Could not remove directory: " << path_;
-      }
-    }
-  }
+  ScopedTemporaryDirectory();
+
+  ~ScopedTemporaryDirectory();
 
   const UniqueFD& fd() { return dir_fd_; }
 
diff --git a/fml/logging.cc b/fml/logging.cc
index 20aef13d83d80..3cf7c86964392 100644
--- a/fml/logging.cc
+++ b/fml/logging.cc
@@ -34,7 +34,7 @@ const char* StripDots(const char* path) {
 }
 
 const char* StripPath(const char* path) {
-  auto p = strrchr(path, '/');
+  auto* p = strrchr(path, '/');
   if (p)
     return p + 1;
   else
diff --git a/fml/mapping.cc b/fml/mapping.cc
index c3ebb60ff5b87..11882b6662bbf 100644
--- a/fml/mapping.cc
+++ b/fml/mapping.cc
@@ -22,4 +22,12 @@ const uint8_t* DataMapping::GetMapping() const {
   return data_.data();
 }
 
+size_t NonOwnedMapping::GetSize() const {
+  return size_;
+}
+
+const uint8_t* NonOwnedMapping::GetMapping() const {
+  return data_;
+}
+
 }  // namespace fml
diff --git a/fml/mapping.h b/fml/mapping.h
index 7d16366c5f19c..05894a5c219a4 100644
--- a/fml/mapping.h
+++ b/fml/mapping.h
@@ -84,9 +84,9 @@ class NonOwnedMapping : public Mapping {
   NonOwnedMapping(const uint8_t* data, size_t size)
       : data_(data), size_(size) {}
 
-  size_t GetSize() const override { return size_; }
+  size_t GetSize() const override;
 
-  const uint8_t* GetMapping() const override { return data_; }
+  const uint8_t* GetMapping() const override;
 
  private:
   const uint8_t* const data_;
diff --git a/fml/message.cc b/fml/message.cc
index c5c3682ba5626..4ef7ab3b32274 100644
--- a/fml/message.cc
+++ b/fml/message.cc
@@ -8,6 +8,10 @@
 
 namespace fml {
 
+size_t MessageSerializable::GetSerializableTag() const {
+  return 0;
+};
+
 Message::Message() = default;
 
 Message::~Message() = default;
@@ -96,7 +100,7 @@ uint8_t* Message::PrepareDecode(size_t size) {
   if ((size + size_read_) > buffer_length_) {
     return nullptr;
   }
-  auto buffer = buffer_ + size_read_;
+  auto* buffer = buffer_ + size_read_;
   size_read_ += size;
   return buffer;
 }
diff --git a/fml/message.h b/fml/message.h
index 8d7e63a2e7896..f9d6bf804ed85 100644
--- a/fml/message.h
+++ b/fml/message.h
@@ -47,7 +47,7 @@ class MessageSerializable {
 
   virtual bool Deserialize(Message& message) = 0;
 
-  virtual size_t GetSerializableTag() const { return 0; };
+  virtual size_t GetSerializableTag() const;
 };
 
 // The traits passed to the encode/decode calls that accept traits should be
@@ -88,7 +88,7 @@ class Message {
   template <typename T,
             typename = std::enable_if_t<std::is_trivially_copyable<T>::value>>
   FML_WARN_UNUSED_RESULT bool Encode(const T& value) {
-    if (auto buffer = PrepareEncode(sizeof(T))) {
+    if (auto* buffer = PrepareEncode(sizeof(T))) {
       ::memcpy(buffer, &value, sizeof(T));
       return true;
     }
@@ -131,7 +131,7 @@ class Message {
   template <typename T,
             typename = std::enable_if_t<std::is_trivially_copyable<T>::value>>
   FML_WARN_UNUSED_RESULT bool Decode(T& value) {
-    if (auto buffer = PrepareDecode(sizeof(T))) {
+    if (auto* buffer = PrepareDecode(sizeof(T))) {
       ::memcpy(&value, buffer, sizeof(T));
       return true;
     }
diff --git a/fml/message_loop.cc b/fml/message_loop.cc
index 3238e6f443742..469d47207566a 100644
--- a/fml/message_loop.cc
+++ b/fml/message_loop.cc
@@ -19,7 +19,7 @@ FML_THREAD_LOCAL ThreadLocal tls_message_loop([](intptr_t value) {
 });
 
 MessageLoop& MessageLoop::GetCurrent() {
-  auto loop = reinterpret_cast<MessageLoop*>(tls_message_loop.Get());
+  auto* loop = reinterpret_cast<MessageLoop*>(tls_message_loop.Get());
   FML_CHECK(loop != nullptr)
       << "MessageLoop::EnsureInitializedForCurrentThread was not called on "
          "this thread prior to message loop use.";
diff --git a/fml/message_loop_impl.cc b/fml/message_loop_impl.cc
index 6c5024a9a25de..4d2c5bf4ff614 100644
--- a/fml/message_loop_impl.cc
+++ b/fml/message_loop_impl.cc
@@ -145,4 +145,13 @@ void MessageLoopImpl::RunExpiredTasks() {
   }
 }
 
+MessageLoopImpl::DelayedTask::DelayedTask(size_t p_order,
+                                          fml::closure p_task,
+                                          fml::TimePoint p_target_time)
+    : order(p_order), task(std::move(p_task)), target_time(p_target_time) {}
+
+MessageLoopImpl::DelayedTask::DelayedTask(const DelayedTask& other) = default;
+
+MessageLoopImpl::DelayedTask::~DelayedTask() = default;
+
 }  // namespace fml
diff --git a/fml/message_loop_impl.h b/fml/message_loop_impl.h
index de1c4147081fe..9dab218d0d1db 100644
--- a/fml/message_loop_impl.h
+++ b/fml/message_loop_impl.h
@@ -57,8 +57,11 @@ class MessageLoopImpl : public fml::RefCountedThreadSafe<MessageLoopImpl> {
 
     DelayedTask(size_t p_order,
                 fml::closure p_task,
-                fml::TimePoint p_target_time)
-        : order(p_order), task(std::move(p_task)), target_time(p_target_time) {}
+                fml::TimePoint p_target_time);
+
+    DelayedTask(const DelayedTask& other);
+
+    ~DelayedTask();
   };
 
   struct DelayedTaskCompare {
diff --git a/fml/platform/posix/file_posix.cc b/fml/platform/posix/file_posix.cc
index c6911bd0489d3..d30a9c2f1d2df 100644
--- a/fml/platform/posix/file_posix.cc
+++ b/fml/platform/posix/file_posix.cc
@@ -19,7 +19,7 @@ namespace fml {
 
 std::string CreateTemporaryDirectory() {
   char directory_name[] = "/tmp/flutter_XXXXXXXX";
-  auto result = ::mkdtemp(directory_name);
+  auto* result = ::mkdtemp(directory_name);
   if (result == nullptr) {
     return "";
   }
diff --git a/fml/platform/posix/mapping_posix.cc b/fml/platform/posix/mapping_posix.cc
index 670b3873303b4..bc5adbd107544 100644
--- a/fml/platform/posix/mapping_posix.cc
+++ b/fml/platform/posix/mapping_posix.cc
@@ -69,7 +69,7 @@ FileMapping::FileMapping(const fml::UniqueFD& handle,
 
   const auto is_writable = IsWritable(protection);
 
-  auto mapping =
+  auto* mapping =
       ::mmap(nullptr, stat_buffer.st_size, ToPosixProtectionFlags(protection),
              is_writable ? MAP_SHARED : MAP_PRIVATE, handle.get(), 0);
 
diff --git a/fml/platform/posix/native_library_posix.cc b/fml/platform/posix/native_library_posix.cc
index 9d10152848ec8..558061e739673 100644
--- a/fml/platform/posix/native_library_posix.cc
+++ b/fml/platform/posix/native_library_posix.cc
@@ -58,7 +58,7 @@ fml::RefPtr<NativeLibrary> NativeLibrary::CreateForCurrentProcess() {
 }
 
 const uint8_t* NativeLibrary::ResolveSymbol(const char* symbol) {
-  auto resolved_symbol = static_cast<const uint8_t*>(::dlsym(handle_, symbol));
+  auto* resolved_symbol = static_cast<const uint8_t*>(::dlsym(handle_, symbol));
   if (resolved_symbol == nullptr) {
     FML_DLOG(INFO) << "Could not resolve symbol in library: " << symbol;
   }
diff --git a/fml/string_view.cc b/fml/string_view.cc
index bca1452b82e19..5f217c439f50c 100644
--- a/fml/string_view.cc
+++ b/fml/string_view.cc
@@ -84,7 +84,7 @@ size_t StringView::find(StringView s, size_t pos) const {
   if (s.empty())
     return pos;
 
-  auto result = std::search(begin() + pos, end(), s.begin(), s.end());
+  auto* result = std::search(begin() + pos, end(), s.begin(), s.end());
   if (result == end())
     return npos;
   return result - begin();
@@ -94,7 +94,7 @@ size_t StringView::find(char c, size_t pos) const {
   if (pos > size_)
     return npos;
 
-  auto result = std::find(begin() + pos, end(), c);
+  auto* result = std::find(begin() + pos, end(), c);
   if (result == end())
     return npos;
   return result - begin();
@@ -106,8 +106,8 @@ size_t StringView::rfind(StringView s, size_t pos) const {
   if (s.empty())
     return std::min(pos, size_);
 
-  auto last = begin() + std::min(size_ - s.size(), pos) + s.size();
-  auto result = std::find_end(begin(), last, s.begin(), s.end());
+  auto* last = begin() + std::min(size_ - s.size(), pos) + s.size();
+  auto* result = std::find_end(begin(), last, s.begin(), s.end());
   if (result == last)
     return npos;
   return result - begin();
diff --git a/fml/thread_local.cc b/fml/thread_local.cc
new file mode 100644
index 0000000000000..4617f8243c17d
--- /dev/null
+++ b/fml/thread_local.cc
@@ -0,0 +1,36 @@
+// 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.
+
+#include "flutter/fml/thread_local.h"
+
+namespace fml {
+
+ThreadLocal::ThreadLocal() : ThreadLocal(nullptr) {}
+
+ThreadLocal::ThreadLocal(ThreadLocalDestroyCallback destroy)
+    : destroy_(destroy) {
+  auto callback =
+      reinterpret_cast<void (*)(void*)>(&ThreadLocal::ThreadLocalDestroy);
+  FML_CHECK(pthread_key_create(&_key, callback) == 0);
+}
+
+ThreadLocal::~ThreadLocal() {
+  // This will NOT call the destroy callbacks on thread local values still
+  // active in other threads. Those must be cleared manually. The usage
+  // of this class should be similar to the thread_local keyword but with
+  // with a static storage specifier
+
+  // Collect the container
+  delete reinterpret_cast<Box*>(pthread_getspecific(_key));
+
+  // Finally, collect the key
+  FML_CHECK(pthread_key_delete(_key) == 0);
+}
+
+ThreadLocal::Box::Box(ThreadLocalDestroyCallback destroy, intptr_t value)
+    : destroy_(destroy), value_(value) {}
+
+ThreadLocal::Box::~Box() = default;
+
+}  // namespace fml
diff --git a/fml/thread_local.h b/fml/thread_local.h
index daff25bac1155..b2d4bdfa774c0 100644
--- a/fml/thread_local.h
+++ b/fml/thread_local.h
@@ -31,8 +31,9 @@ class ThreadLocal {
  private:
   class Box {
    public:
-    Box(ThreadLocalDestroyCallback destroy, intptr_t value)
-        : destroy_(destroy), value_(value) {}
+    Box(ThreadLocalDestroyCallback destroy, intptr_t value);
+
+    ~Box();
 
     intptr_t Value() const { return value_; }
 
@@ -60,22 +61,18 @@ class ThreadLocal {
 
   static inline void ThreadLocalDestroy(void* value) {
     FML_CHECK(value != nullptr);
-    auto box = reinterpret_cast<Box*>(value);
+    auto* box = reinterpret_cast<Box*>(value);
     box->DestroyValue();
     delete box;
   }
 
  public:
-  ThreadLocal() : ThreadLocal(nullptr) {}
+  ThreadLocal();
 
-  ThreadLocal(ThreadLocalDestroyCallback destroy) : destroy_(destroy) {
-    auto callback =
-        reinterpret_cast<void (*)(void*)>(&ThreadLocal::ThreadLocalDestroy);
-    FML_CHECK(pthread_key_create(&_key, callback) == 0);
-  }
+  ThreadLocal(ThreadLocalDestroyCallback destroy);
 
   void Set(intptr_t value) {
-    auto box = reinterpret_cast<Box*>(pthread_getspecific(_key));
+    auto* box = reinterpret_cast<Box*>(pthread_getspecific(_key));
     if (box == nullptr) {
       box = new Box(destroy_, value);
       FML_CHECK(pthread_setspecific(_key, box) == 0);
@@ -85,22 +82,11 @@ class ThreadLocal {
   }
 
   intptr_t Get() {
-    auto box = reinterpret_cast<Box*>(pthread_getspecific(_key));
+    auto* box = reinterpret_cast<Box*>(pthread_getspecific(_key));
     return box != nullptr ? box->Value() : 0;
   }
 
-  ~ThreadLocal() {
-    // This will NOT call the destroy callbacks on thread local values still
-    // active in other threads. Those must be cleared manually. The usage
-    // of this class should be similar to the thread_local keyword but with
-    // with a static storage specifier
-
-    // Collect the container
-    delete reinterpret_cast<Box*>(pthread_getspecific(_key));
-
-    // Finally, collect the key
-    FML_CHECK(pthread_key_delete(_key) == 0);
-  }
+  ~ThreadLocal();
 
  private:
   pthread_key_t _key;
diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
index 8ecf508e5a2f7..dcfd483638eca 100644
--- a/lib/ui/BUILD.gn
+++ b/lib/ui/BUILD.gn
@@ -92,6 +92,7 @@ source_set("ui") {
     "window/pointer_data.h",
     "window/pointer_data_packet.cc",
     "window/pointer_data_packet.h",
+    "window/viewport_metrics.cc",
     "window/viewport_metrics.h",
     "window/window.cc",
     "window/window.h",
diff --git a/lib/ui/compositing/scene.cc b/lib/ui/compositing/scene.cc
index 2dea867733e25..8d3537750f5fa 100644
--- a/lib/ui/compositing/scene.cc
+++ b/lib/ui/compositing/scene.cc
@@ -69,7 +69,7 @@ Dart_Handle Scene::toImage(uint32_t width,
     return tonic::ToDart("Image dimensions for scene were invalid.");
   }
 
-  auto dart_state = UIDartState::Current();
+  auto* dart_state = UIDartState::Current();
   auto image_callback = std::make_unique<tonic::DartPersistentValue>(
       dart_state, raw_image_callback);
   auto unref_queue = dart_state->GetSkiaUnrefQueue();
@@ -114,7 +114,7 @@ Dart_Handle Scene::toImage(uint32_t width,
 
       auto dart_image = CanvasImage::Create();
       dart_image->set_image({std::move(raster_image), std::move(unref_queue)});
-      auto raw_dart_image = tonic::ToDart(std::move(dart_image));
+      auto* raw_dart_image = tonic::ToDart(std::move(dart_image));
 
       // All done!
       tonic::DartInvoke(image_callback->Get(), {raw_dart_image});
diff --git a/lib/ui/isolate_name_server/isolate_name_server.cc b/lib/ui/isolate_name_server/isolate_name_server.cc
index 0fe928e7e1df2..deae4fe6f8f16 100644
--- a/lib/ui/isolate_name_server/isolate_name_server.cc
+++ b/lib/ui/isolate_name_server/isolate_name_server.cc
@@ -6,6 +6,10 @@
 
 namespace blink {
 
+IsolateNameServer::IsolateNameServer() {}
+
+IsolateNameServer::~IsolateNameServer() = default;
+
 Dart_Port IsolateNameServer::LookupIsolatePortByName(const std::string& name) {
   std::lock_guard<std::mutex> lock(mutex_);
   return LookupIsolatePortByNameUnprotected(name);
diff --git a/lib/ui/isolate_name_server/isolate_name_server.h b/lib/ui/isolate_name_server/isolate_name_server.h
index 97c44d5cd47b4..db62ad871f771 100644
--- a/lib/ui/isolate_name_server/isolate_name_server.h
+++ b/lib/ui/isolate_name_server/isolate_name_server.h
@@ -17,7 +17,9 @@ namespace blink {
 
 class IsolateNameServer {
  public:
-  IsolateNameServer() {}
+  IsolateNameServer();
+
+  ~IsolateNameServer();
 
   // Looks up the Dart_Port associated with a given name. Returns ILLEGAL_PORT
   // if the name does not exist.
diff --git a/lib/ui/painting/codec.cc b/lib/ui/painting/codec.cc
index 608d332f673d5..4cec237fd9ed5 100644
--- a/lib/ui/painting/codec.cc
+++ b/lib/ui/painting/codec.cc
@@ -283,7 +283,7 @@ void InstantiateImageCodec(Dart_NativeArguments args) {
 
   auto buffer = SkData::MakeWithCopy(list.data(), list.num_elements());
 
-  auto dart_state = UIDartState::Current();
+  auto* dart_state = UIDartState::Current();
 
   const auto& task_runners = dart_state->GetTaskRunners();
   task_runners.GetIOTaskRunner()->PostTask(fml::MakeCopyable(
@@ -387,6 +387,16 @@ MultiFrameCodec::MultiFrameCodec(std::unique_ptr<SkCodec> codec,
   nextFrameIndex_ = 0;
 }
 
+MultiFrameCodec::~MultiFrameCodec() {}
+
+int MultiFrameCodec::frameCount() {
+  return frameInfos_.size();
+}
+
+int MultiFrameCodec::repetitionCount() {
+  return repetitionCount_;
+}
+
 sk_sp<SkImage> MultiFrameCodec::GetNextFrameImage(
     fml::WeakPtr<GrContext> resourceContext) {
   // Populate this bitmap from the cache if it exists
@@ -481,7 +491,7 @@ Dart_Handle MultiFrameCodec::getNextFrame(Dart_Handle callback_handle) {
     return ToDart("Callback must be a function");
   }
 
-  auto dart_state = UIDartState::Current();
+  auto* dart_state = UIDartState::Current();
 
   const auto& task_runners = dart_state->GetTaskRunners();
 
@@ -499,6 +509,24 @@ Dart_Handle MultiFrameCodec::getNextFrame(Dart_Handle callback_handle) {
   return Dart_Null();
 }
 
+MultiFrameCodec::DecodedFrame::DecodedFrame(bool required)
+    : required_(required) {}
+
+MultiFrameCodec::DecodedFrame::~DecodedFrame() = default;
+
+SingleFrameCodec::SingleFrameCodec(fml::RefPtr<FrameInfo> frame)
+    : frame_(std::move(frame)) {}
+
+SingleFrameCodec::~SingleFrameCodec() {}
+
+int SingleFrameCodec::frameCount() {
+  return 1;
+}
+
+int SingleFrameCodec::repetitionCount() {
+  return 0;
+}
+
 Dart_Handle SingleFrameCodec::getNextFrame(Dart_Handle callback_handle) {
   if (!Dart_IsClosure(callback_handle)) {
     return ToDart("Callback must be a function");
diff --git a/lib/ui/painting/codec.h b/lib/ui/painting/codec.h
index 4a61d328a828e..e853556e2b4ac 100644
--- a/lib/ui/painting/codec.h
+++ b/lib/ui/painting/codec.h
@@ -36,15 +36,15 @@ class Codec : public RefCountedDartWrappable<Codec> {
 
 class MultiFrameCodec : public Codec {
  public:
-  int frameCount() { return frameInfos_.size(); }
-  int repetitionCount() { return repetitionCount_; }
-  Dart_Handle getNextFrame(Dart_Handle args);
+  int frameCount() override;
+  int repetitionCount() override;
+  Dart_Handle getNextFrame(Dart_Handle args) override;
 
  private:
   MultiFrameCodec(std::unique_ptr<SkCodec> codec,
                   const float decodedCacheRatioCap);
 
-  ~MultiFrameCodec() {}
+  ~MultiFrameCodec() override;
 
   sk_sp<SkImage> GetNextFrameImage(fml::WeakPtr<GrContext> resourceContext);
 
@@ -71,7 +71,8 @@ class MultiFrameCodec : public Codec {
     std::unique_ptr<SkBitmap> bitmap_ = nullptr;
     const bool required_;
 
-    DecodedFrame(bool required) : required_(required) {}
+    DecodedFrame(bool required);
+    ~DecodedFrame();
   };
 
   // A cache of previously loaded bitmaps, indexed by the frame they belong to.
@@ -86,13 +87,13 @@ class MultiFrameCodec : public Codec {
 
 class SingleFrameCodec : public Codec {
  public:
-  int frameCount() { return 1; }
-  int repetitionCount() { return 0; }
-  Dart_Handle getNextFrame(Dart_Handle args);
+  int frameCount() override;
+  int repetitionCount() override;
+  Dart_Handle getNextFrame(Dart_Handle args) override;
 
  private:
-  SingleFrameCodec(fml::RefPtr<FrameInfo> frame) : frame_(std::move(frame)) {}
-  ~SingleFrameCodec() {}
+  SingleFrameCodec(fml::RefPtr<FrameInfo> frame);
+  ~SingleFrameCodec() override;
 
   fml::RefPtr<FrameInfo> frame_;
 
diff --git a/lib/ui/painting/engine_layer.cc b/lib/ui/painting/engine_layer.cc
index f5afb9fde0b43..f365e37cb8fbc 100644
--- a/lib/ui/painting/engine_layer.cc
+++ b/lib/ui/painting/engine_layer.cc
@@ -15,6 +15,9 @@ using tonic::ToDart;
 
 namespace blink {
 
+EngineLayer::EngineLayer(std::shared_ptr<flow::ContainerLayer> layer)
+    : layer_(layer) {}
+
 EngineLayer::~EngineLayer() = default;
 
 size_t EngineLayer::GetAllocationSize() {
diff --git a/lib/ui/painting/engine_layer.h b/lib/ui/painting/engine_layer.h
index 0f1e32bd77ca1..a95e58a9e2e6a 100644
--- a/lib/ui/painting/engine_layer.h
+++ b/lib/ui/painting/engine_layer.h
@@ -35,8 +35,7 @@ class EngineLayer : public RefCountedDartWrappable<EngineLayer> {
   std::shared_ptr<flow::ContainerLayer> Layer() const { return layer_; }
 
  private:
-  explicit EngineLayer(std::shared_ptr<flow::ContainerLayer> layer)
-      : layer_(layer) {}
+  explicit EngineLayer(std::shared_ptr<flow::ContainerLayer> layer);
   std::shared_ptr<flow::ContainerLayer> layer_;
 
   FML_FRIEND_MAKE_REF_COUNTED(EngineLayer);
diff --git a/lib/ui/painting/frame_info.cc b/lib/ui/painting/frame_info.cc
index 123fc955efccf..40359a02dce77 100644
--- a/lib/ui/painting/frame_info.cc
+++ b/lib/ui/painting/frame_info.cc
@@ -18,6 +18,11 @@ IMPLEMENT_WRAPPERTYPEINFO(ui, FrameInfo);
 
 FOR_EACH_BINDING(DART_NATIVE_CALLBACK)
 
+FrameInfo::FrameInfo(fml::RefPtr<CanvasImage> image, int durationMillis)
+    : image_(std::move(image)), durationMillis_(durationMillis) {}
+
+FrameInfo::~FrameInfo(){};
+
 void FrameInfo::RegisterNatives(tonic::DartLibraryNatives* natives) {
   natives->Register({FOR_EACH_BINDING(DART_REGISTER_NATIVE)});
 }
diff --git a/lib/ui/painting/frame_info.h b/lib/ui/painting/frame_info.h
index 15a663dab8a7c..57ff23d91c43a 100644
--- a/lib/ui/painting/frame_info.h
+++ b/lib/ui/painting/frame_info.h
@@ -25,9 +25,9 @@ class FrameInfo final : public RefCountedDartWrappable<FrameInfo> {
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
  private:
-  FrameInfo(fml::RefPtr<CanvasImage> image, int durationMillis)
-      : image_(std::move(image)), durationMillis_(durationMillis) {}
-  ~FrameInfo(){};
+  FrameInfo(fml::RefPtr<CanvasImage> image, int durationMillis);
+
+  ~FrameInfo() override;
 
   const fml::RefPtr<CanvasImage> image_;
   const int durationMillis_;
diff --git a/lib/ui/painting/image.h b/lib/ui/painting/image.h
index 51b24df128e62..a2db734b57516 100644
--- a/lib/ui/painting/image.h
+++ b/lib/ui/painting/image.h
@@ -39,7 +39,7 @@ class CanvasImage final : public RefCountedDartWrappable<CanvasImage> {
     image_ = std::move(image);
   }
 
-  virtual size_t GetAllocationSize() override;
+  size_t GetAllocationSize() override;
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
diff --git a/lib/ui/painting/picture.h b/lib/ui/painting/picture.h
index b7b42acba206d..c95afd30f1f75 100644
--- a/lib/ui/painting/picture.h
+++ b/lib/ui/painting/picture.h
@@ -31,7 +31,7 @@ class Picture : public RefCountedDartWrappable<Picture> {
 
   void dispose();
 
-  virtual size_t GetAllocationSize() override;
+  size_t GetAllocationSize() override;
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
diff --git a/lib/ui/painting/picture_recorder.h b/lib/ui/painting/picture_recorder.h
index f2842ae4a966d..90e5a4c03f365 100644
--- a/lib/ui/painting/picture_recorder.h
+++ b/lib/ui/painting/picture_recorder.h
@@ -23,7 +23,7 @@ class PictureRecorder : public RefCountedDartWrappable<PictureRecorder> {
  public:
   static fml::RefPtr<PictureRecorder> Create();
 
-  ~PictureRecorder();
+  ~PictureRecorder() override;
 
   SkCanvas* BeginRecording(SkRect bounds);
   fml::RefPtr<Picture> endRecording();
diff --git a/lib/ui/plugins/callback_cache.cc b/lib/ui/plugins/callback_cache.cc
index 94cb981dc5556..b2d4cc0d72d44 100644
--- a/lib/ui/plugins/callback_cache.cc
+++ b/lib/ui/plugins/callback_cache.cc
@@ -134,7 +134,7 @@ void DartCallbackCache::LoadCacheFromDisk() {
     return;
   }
   const auto entries = d.GetArray();
-  for (auto it = entries.begin(); it != entries.end(); ++it) {
+  for (auto* it = entries.begin(); it != entries.end(); ++it) {
     const auto root_obj = it->GetObject();
     const auto representation = root_obj[kRepresentationKey].GetObject();
 
diff --git a/lib/ui/semantics/semantics_node.cc b/lib/ui/semantics/semantics_node.cc
index 4931f8ca5c830..cb655bdde8831 100644
--- a/lib/ui/semantics/semantics_node.cc
+++ b/lib/ui/semantics/semantics_node.cc
@@ -10,6 +10,8 @@ namespace blink {
 
 SemanticsNode::SemanticsNode() = default;
 
+SemanticsNode::SemanticsNode(const SemanticsNode& other) = default;
+
 SemanticsNode::~SemanticsNode() = default;
 
 bool SemanticsNode::HasAction(SemanticsAction action) {
diff --git a/lib/ui/semantics/semantics_node.h b/lib/ui/semantics/semantics_node.h
index 1752b73b5aac9..4275cb7d83d30 100644
--- a/lib/ui/semantics/semantics_node.h
+++ b/lib/ui/semantics/semantics_node.h
@@ -69,6 +69,9 @@ enum class SemanticsFlags : int32_t {
 
 struct SemanticsNode {
   SemanticsNode();
+
+  SemanticsNode(const SemanticsNode& other);
+
   ~SemanticsNode();
 
   bool HasAction(SemanticsAction action);
diff --git a/lib/ui/text/asset_manager_font_provider.cc b/lib/ui/text/asset_manager_font_provider.cc
index 3147573404871..da2d0a15be9d7 100644
--- a/lib/ui/text/asset_manager_font_provider.cc
+++ b/lib/ui/text/asset_manager_font_provider.cc
@@ -123,4 +123,12 @@ SkTypeface* AssetManagerFontStyleSet::matchStyle(const SkFontStyle& pattern) {
   return SkRef(assets_[0].typeface.get());
 }
 
+AssetManagerFontStyleSet::TypefaceAsset::TypefaceAsset(std::string a)
+    : asset(std::move(a)) {}
+
+AssetManagerFontStyleSet::TypefaceAsset::TypefaceAsset(
+    const AssetManagerFontStyleSet::TypefaceAsset& other) = default;
+
+AssetManagerFontStyleSet::TypefaceAsset::~TypefaceAsset() = default;
+
 }  // namespace blink
diff --git a/lib/ui/text/asset_manager_font_provider.h b/lib/ui/text/asset_manager_font_provider.h
index 785ff66700907..d55cf71e3bd93 100644
--- a/lib/ui/text/asset_manager_font_provider.h
+++ b/lib/ui/text/asset_manager_font_provider.h
@@ -42,7 +42,12 @@ class AssetManagerFontStyleSet : public SkFontStyleSet {
   std::shared_ptr<blink::AssetManager> asset_manager_;
 
   struct TypefaceAsset {
-    TypefaceAsset(std::string a) : asset(std::move(a)) {}
+    TypefaceAsset(std::string a);
+
+    TypefaceAsset(const TypefaceAsset& other);
+
+    ~TypefaceAsset();
+
     std::string asset;
     sk_sp<SkTypeface> typeface;
   };
diff --git a/lib/ui/text/paragraph.h b/lib/ui/text/paragraph.h
index f5648440fe65b..15df77310c17a 100644
--- a/lib/ui/text/paragraph.h
+++ b/lib/ui/text/paragraph.h
@@ -49,7 +49,7 @@ class Paragraph : public RefCountedDartWrappable<Paragraph> {
   Dart_Handle getPositionForOffset(double dx, double dy);
   Dart_Handle getWordBoundary(unsigned offset);
 
-  virtual size_t GetAllocationSize() override;
+  size_t GetAllocationSize() override;
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
diff --git a/lib/ui/ui_dart_state.h b/lib/ui/ui_dart_state.h
index 80758ae0c27ec..9d45cf479dc5b 100644
--- a/lib/ui/ui_dart_state.h
+++ b/lib/ui/ui_dart_state.h
@@ -61,7 +61,7 @@ class UIDartState : public tonic::DartState {
     if (!object) {
       return {};
     }
-    auto state = UIDartState::Current();
+    auto* state = UIDartState::Current();
     FML_DCHECK(state);
     auto queue = state->GetSkiaUnrefQueue();
     return {std::move(object), std::move(queue)};
diff --git a/lib/ui/window/viewport_metrics.cc b/lib/ui/window/viewport_metrics.cc
new file mode 100644
index 0000000000000..1047b3e4da1cf
--- /dev/null
+++ b/lib/ui/window/viewport_metrics.cc
@@ -0,0 +1,35 @@
+// 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.
+
+#include "flutter/lib/ui/window/viewport_metrics.h"
+
+namespace blink {
+ViewportMetrics::ViewportMetrics() = default;
+
+ViewportMetrics::ViewportMetrics(double p_device_pixel_ratio,
+                                 double p_physical_width,
+                                 double p_physical_height,
+                                 double p_physical_padding_top,
+                                 double p_physical_padding_right,
+                                 double p_physical_padding_bottom,
+                                 double p_physical_padding_left,
+                                 double p_physical_view_inset_top,
+                                 double p_physical_view_inset_right,
+                                 double p_physical_view_inset_bottom,
+                                 double p_physical_view_inset_left)
+    : device_pixel_ratio(p_device_pixel_ratio),
+      physical_width(p_physical_width),
+      physical_height(p_physical_height),
+      physical_padding_top(p_physical_padding_top),
+      physical_padding_right(p_physical_padding_right),
+      physical_padding_bottom(p_physical_padding_bottom),
+      physical_padding_left(p_physical_padding_left),
+      physical_view_inset_top(p_physical_view_inset_top),
+      physical_view_inset_right(p_physical_view_inset_right),
+      physical_view_inset_bottom(p_physical_view_inset_bottom),
+      physical_view_inset_left(p_physical_view_inset_left) {}
+
+ViewportMetrics::ViewportMetrics(const ViewportMetrics& other) = default;
+
+}  // namespace blink
diff --git a/lib/ui/window/viewport_metrics.h b/lib/ui/window/viewport_metrics.h
index 41fe229a5a396..c4daa9ebe7192 100644
--- a/lib/ui/window/viewport_metrics.h
+++ b/lib/ui/window/viewport_metrics.h
@@ -10,6 +10,22 @@
 namespace blink {
 
 struct ViewportMetrics {
+  ViewportMetrics();
+
+  ViewportMetrics(double p_device_pixel_ratio,
+                  double p_physical_width,
+                  double p_physical_height,
+                  double p_physical_padding_top,
+                  double p_physical_padding_right,
+                  double p_physical_padding_bottom,
+                  double p_physical_padding_left,
+                  double p_physical_view_inset_top,
+                  double p_physical_view_inset_right,
+                  double p_physical_view_inset_bottom,
+                  double p_physical_view_inset_left);
+
+  ViewportMetrics(const ViewportMetrics& other);
+
   double device_pixel_ratio = 1.0;
   double physical_width = 0;
   double physical_height = 0;
diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc
index c443e7b2eb5e6..ee480a68ba6b5 100644
--- a/runtime/dart_isolate.cc
+++ b/runtime/dart_isolate.cc
@@ -152,7 +152,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) {
     return false;
   }
 
-  auto isolate_data = static_cast<std::shared_ptr<DartIsolate>*>(
+  auto* isolate_data = static_cast<std::shared_ptr<DartIsolate>*>(
       Dart_IsolateData(dart_isolate));
   if (isolate_data->get() != this) {
     return false;
@@ -620,7 +620,7 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair(
   DartVM* const vm = (*embedder_isolate)->GetDartVM();
 
   if (!is_root_isolate) {
-    auto raw_embedder_isolate = embedder_isolate.release();
+    auto* raw_embedder_isolate = embedder_isolate.release();
 
     blink::TaskRunners null_task_runners(advisory_script_uri, nullptr, nullptr,
                                          nullptr, nullptr);
@@ -730,4 +730,13 @@ void DartIsolate::AddIsolateShutdownCallback(fml::closure closure) {
       std::make_unique<AutoFireClosure>(std::move(closure)));
 }
 
+DartIsolate::AutoFireClosure::AutoFireClosure(fml::closure closure)
+    : closure_(std::move(closure)) {}
+
+DartIsolate::AutoFireClosure::~AutoFireClosure() {
+  if (closure_) {
+    closure_();
+  }
+}
+
 }  // namespace blink
diff --git a/runtime/dart_isolate.h b/runtime/dart_isolate.h
index 1eba6219c0d90..86fce82aaf3b2 100644
--- a/runtime/dart_isolate.h
+++ b/runtime/dart_isolate.h
@@ -98,12 +98,9 @@ class DartIsolate : public UIDartState {
 
   class AutoFireClosure {
    public:
-    AutoFireClosure(fml::closure closure) : closure_(std::move(closure)) {}
-    ~AutoFireClosure() {
-      if (closure_) {
-        closure_();
-      }
-    }
+    AutoFireClosure(fml::closure closure);
+
+    ~AutoFireClosure();
 
    private:
     fml::closure closure_;
diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc
index 55e37f9dd3db3..4c3f67c9f6ff6 100644
--- a/runtime/dart_vm.cc
+++ b/runtime/dart_vm.cc
@@ -313,7 +313,7 @@ DartVM::DartVM(const Settings& settings,
   // it does not recognize, it exits immediately.
   args.push_back("--ignore-unrecognized-flags");
 
-  for (const auto& profiler_flag :
+  for (auto* const profiler_flag :
        ProfilingFlags(settings.enable_dart_profiling)) {
     args.push_back(profiler_flag);
   }
diff --git a/runtime/runtime_controller.cc b/runtime/runtime_controller.cc
index 6af501054e586..0beacff828fcd 100644
--- a/runtime/runtime_controller.cc
+++ b/runtime/runtime_controller.cc
@@ -75,7 +75,7 @@ RuntimeController::RuntimeController(
   root_isolate->SetReturnCodeCallback([this](uint32_t code) {
     root_isolate_return_code_ = {true, code};
   });
-  if (auto window = GetWindowIfAvailable()) {
+  if (auto* window = GetWindowIfAvailable()) {
     tonic::DartState::Scope scope(root_isolate);
     window->DidCreateIsolate();
     if (!FlushRuntimeStateToIsolate()) {
@@ -134,7 +134,7 @@ bool RuntimeController::FlushRuntimeStateToIsolate() {
 bool RuntimeController::SetViewportMetrics(const ViewportMetrics& metrics) {
   window_data_.viewport_metrics = metrics;
 
-  if (auto window = GetWindowIfAvailable()) {
+  if (auto* window = GetWindowIfAvailable()) {
     window->UpdateWindowMetrics(metrics);
     return true;
   }
@@ -145,7 +145,7 @@ bool RuntimeController::SetLocales(
     const std::vector<std::string>& locale_data) {
   window_data_.locale_data = locale_data;
 
-  if (auto window = GetWindowIfAvailable()) {
+  if (auto* window = GetWindowIfAvailable()) {
     window->UpdateLocales(locale_data);
     return true;
   }
@@ -155,7 +155,7 @@ bool RuntimeController::SetLocales(
 bool RuntimeController::SetUserSettingsData(const std::string& data) {
   window_data_.user_settings_data = data;
 
-  if (auto window = GetWindowIfAvailable()) {
+  if (auto* window = GetWindowIfAvailable()) {
     window->UpdateUserSettingsData(window_data_.user_settings_data);
     return true;
   }
@@ -166,7 +166,7 @@ bool RuntimeController::SetUserSettingsData(const std::string& data) {
 bool RuntimeController::SetSemanticsEnabled(bool enabled) {
   window_data_.semantics_enabled = enabled;
 
-  if (auto window = GetWindowIfAvailable()) {
+  if (auto* window = GetWindowIfAvailable()) {
     window->UpdateSemanticsEnabled(window_data_.semantics_enabled);
     return true;
   }
@@ -176,7 +176,7 @@ bool RuntimeController::SetSemanticsEnabled(bool enabled) {
 
 bool RuntimeController::SetAccessibilityFeatures(int32_t flags) {
   window_data_.accessibility_feature_flags_ = flags;
-  if (auto window = GetWindowIfAvailable()) {
+  if (auto* window = GetWindowIfAvailable()) {
     window->UpdateAccessibilityFeatures(
         window_data_.accessibility_feature_flags_);
     return true;
@@ -186,7 +186,7 @@ bool RuntimeController::SetAccessibilityFeatures(int32_t flags) {
 }
 
 bool RuntimeController::BeginFrame(fml::TimePoint frame_time) {
-  if (auto window = GetWindowIfAvailable()) {
+  if (auto* window = GetWindowIfAvailable()) {
     window->BeginFrame(frame_time);
     return true;
   }
@@ -206,7 +206,7 @@ bool RuntimeController::NotifyIdle(int64_t deadline) {
 
 bool RuntimeController::DispatchPlatformMessage(
     fml::RefPtr<PlatformMessage> message) {
-  if (auto window = GetWindowIfAvailable()) {
+  if (auto* window = GetWindowIfAvailable()) {
     TRACE_EVENT1("flutter", "RuntimeController::DispatchPlatformMessage",
                  "mode", "basic");
     window->DispatchPlatformMessage(std::move(message));
@@ -217,7 +217,7 @@ bool RuntimeController::DispatchPlatformMessage(
 
 bool RuntimeController::DispatchPointerDataPacket(
     const PointerDataPacket& packet) {
-  if (auto window = GetWindowIfAvailable()) {
+  if (auto* window = GetWindowIfAvailable()) {
     TRACE_EVENT1("flutter", "RuntimeController::DispatchPointerDataPacket",
                  "mode", "basic");
     window->DispatchPointerDataPacket(packet);
@@ -231,7 +231,7 @@ bool RuntimeController::DispatchSemanticsAction(int32_t id,
                                                 std::vector<uint8_t> args) {
   TRACE_EVENT1("flutter", "RuntimeController::DispatchSemanticsAction", "mode",
                "basic");
-  if (auto window = GetWindowIfAvailable()) {
+  if (auto* window = GetWindowIfAvailable()) {
     window->DispatchSemanticsAction(id, action, std::move(args));
     return true;
   }
@@ -310,4 +310,21 @@ std::pair<bool, uint32_t> RuntimeController::GetRootIsolateReturnCode() {
   return root_isolate_return_code_;
 }
 
+RuntimeController::Locale::Locale(std::string language_code_,
+                                  std::string country_code_,
+                                  std::string script_code_,
+                                  std::string variant_code_)
+    : language_code(language_code_),
+      country_code(country_code_),
+      script_code(script_code_),
+      variant_code(variant_code_) {}
+
+RuntimeController::Locale::~Locale() = default;
+
+RuntimeController::WindowData::WindowData() = default;
+
+RuntimeController::WindowData::WindowData(const WindowData& other) = default;
+
+RuntimeController::WindowData::~WindowData() = default;
+
 }  // namespace blink
diff --git a/runtime/runtime_controller.h b/runtime/runtime_controller.h
index b9b4e7ddb52b9..97941e3a16ac2 100644
--- a/runtime/runtime_controller.h
+++ b/runtime/runtime_controller.h
@@ -38,7 +38,7 @@ class RuntimeController final : public WindowClient {
                     std::string advisory_script_uri,
                     std::string advisory_script_entrypoint);
 
-  ~RuntimeController();
+  ~RuntimeController() override;
 
   std::unique_ptr<RuntimeController> Clone() const;
 
@@ -83,11 +83,9 @@ class RuntimeController final : public WindowClient {
     Locale(std::string language_code_,
            std::string country_code_,
            std::string script_code_,
-           std::string variant_code_)
-        : language_code(language_code_),
-          country_code(country_code_),
-          script_code(script_code_),
-          variant_code(variant_code_) {}
+           std::string variant_code_);
+
+    ~Locale();
 
     std::string language_code;
     std::string country_code;
@@ -96,6 +94,12 @@ class RuntimeController final : public WindowClient {
   };
 
   struct WindowData {
+    WindowData();
+
+    WindowData(const WindowData& other);
+
+    ~WindowData();
+
     ViewportMetrics viewport_metrics;
     std::string language_code;
     std::string country_code;
diff --git a/runtime/service_protocol.cc b/runtime/service_protocol.cc
index 25a52f72f87aa..b25a47f3787b0 100644
--- a/runtime/service_protocol.cc
+++ b/runtime/service_protocol.cc
@@ -177,7 +177,7 @@ bool ServiceProtocol::HandleMessage(fml::StringView method,
   // Find the handler by its "viewId" in the params.
   auto view_id_param_found = params.find(fml::StringView{"viewId"});
   if (view_id_param_found != params.end()) {
-    auto handler = reinterpret_cast<Handler*>(std::stoull(
+    auto* handler = reinterpret_cast<Handler*>(std::stoull(
         view_id_param_found->second.data() + kViewIdPrefx.size(), nullptr, 16));
     auto handler_found = handlers_.find(handler);
     if (handler_found != handlers_.end()) {
@@ -239,7 +239,7 @@ bool ServiceProtocol::HandleListViewsMethod(
   // Collect handler descriptions on their respective task runners.
   std::lock_guard<std::mutex> lock(handlers_mutex_);
   std::vector<std::pair<intptr_t, Handler::Description>> descriptions;
-  for (const auto& handler : handlers_) {
+  for (auto* const handler : handlers_) {
     fml::AutoResetWaitableEvent latch;
     Handler::Description description;
 
diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
index e2274c9a51280..9f3317912e5fa 100644
--- a/shell/common/rasterizer.cc
+++ b/shell/common/rasterizer.cc
@@ -164,9 +164,9 @@ bool Rasterizer::DrawToSurface(flow::LayerTree& layer_tree) {
   // for instrumentation.
   compositor_context_->engine_time().SetLapTime(layer_tree.construction_time());
 
-  auto canvas = frame->SkiaCanvas();
+  auto* canvas = frame->SkiaCanvas();
 
-  auto external_view_embedder = surface_->GetExternalViewEmbedder();
+  auto* external_view_embedder = surface_->GetExternalViewEmbedder();
 
   if (external_view_embedder != nullptr) {
     external_view_embedder->BeginFrame(layer_tree.frame_size());
@@ -253,7 +253,7 @@ static sk_sp<SkData> ScreenshotLayerTreeAsImage(
   }
 
   // Draw the current layer tree into the snapshot surface.
-  auto canvas = snapshot_surface->getCanvas();
+  auto* canvas = snapshot_surface->getCanvas();
 
   // There is no root surface transformation for the screenshot layer. Reset the
   // matrix to identity.
@@ -299,7 +299,7 @@ static sk_sp<SkData> ScreenshotLayerTreeAsImage(
 Rasterizer::Screenshot Rasterizer::ScreenshotLastLayerTree(
     Rasterizer::ScreenshotType type,
     bool base64_encode) {
-  auto layer_tree = GetLastLayerTree();
+  auto* layer_tree = GetLastLayerTree();
   if (layer_tree == nullptr) {
     FML_LOG(ERROR) << "Last layer tree was null when screenshotting.";
     return {};
@@ -352,4 +352,13 @@ void Rasterizer::FireNextFrameCallbackIfPresent() {
   callback();
 }
 
+Rasterizer::Screenshot::Screenshot() {}
+
+Rasterizer::Screenshot::Screenshot(sk_sp<SkData> p_data, SkISize p_size)
+    : data(std::move(p_data)), frame_size(p_size) {}
+
+Rasterizer::Screenshot::Screenshot(const Screenshot& other) = default;
+
+Rasterizer::Screenshot::~Screenshot() = default;
+
 }  // namespace shell
diff --git a/shell/common/rasterizer.h b/shell/common/rasterizer.h
index 4a7ca3a5cb847..cf02e795b15eb 100644
--- a/shell/common/rasterizer.h
+++ b/shell/common/rasterizer.h
@@ -54,10 +54,13 @@ class Rasterizer final : public blink::SnapshotDelegate {
     sk_sp<SkData> data;
     SkISize frame_size = SkISize::MakeEmpty();
 
-    Screenshot() {}
+    Screenshot();
 
-    Screenshot(sk_sp<SkData> p_data, SkISize p_size)
-        : data(std::move(p_data)), frame_size(p_size) {}
+    Screenshot(sk_sp<SkData> p_data, SkISize p_size);
+
+    Screenshot(const Screenshot& other);
+
+    ~Screenshot();
   };
 
   Screenshot ScreenshotLastLayerTree(ScreenshotType type, bool base64_encode);
diff --git a/shell/common/shell.cc b/shell/common/shell.cc
index c27525a609f45..bc948f638191a 100644
--- a/shell/common/shell.cc
+++ b/shell/common/shell.cc
@@ -588,7 +588,7 @@ void Shell::OnPlatformViewRegisterTexture(
   task_runners_.GetGPUTaskRunner()->PostTask(
       [rasterizer = rasterizer_->GetWeakPtr(), texture] {
         if (rasterizer) {
-          if (auto registry = rasterizer->GetTextureRegistry()) {
+          if (auto* registry = rasterizer->GetTextureRegistry()) {
             registry->RegisterTexture(texture);
           }
         }
@@ -603,7 +603,7 @@ void Shell::OnPlatformViewUnregisterTexture(int64_t texture_id) {
   task_runners_.GetGPUTaskRunner()->PostTask(
       [rasterizer = rasterizer_->GetWeakPtr(), texture_id]() {
         if (rasterizer) {
-          if (auto registry = rasterizer->GetTextureRegistry()) {
+          if (auto* registry = rasterizer->GetTextureRegistry()) {
             registry->UnregisterTexture(texture_id);
           }
         }
@@ -618,7 +618,7 @@ void Shell::OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) {
   // Tell the rasterizer that one of its textures has a new frame available.
   task_runners_.GetGPUTaskRunner()->PostTask(
       [rasterizer = rasterizer_->GetWeakPtr(), texture_id]() {
-        auto registry = rasterizer->GetTextureRegistry();
+        auto* registry = rasterizer->GetTextureRegistry();
 
         if (!registry) {
           return;
diff --git a/shell/common/thread_host.cc b/shell/common/thread_host.cc
index 1845a3c529afb..d8a2a73006eb4 100644
--- a/shell/common/thread_host.cc
+++ b/shell/common/thread_host.cc
@@ -8,6 +8,8 @@ namespace shell {
 
 ThreadHost::ThreadHost() = default;
 
+ThreadHost::ThreadHost(ThreadHost&&) = default;
+
 ThreadHost::ThreadHost(std::string name_prefix, uint64_t mask) {
   if (mask & ThreadHost::Type::Platform) {
     platform_thread = std::make_unique<fml::Thread>(name_prefix + ".platform");
diff --git a/shell/common/thread_host.h b/shell/common/thread_host.h
index a0a6875b39878..9e09603095644 100644
--- a/shell/common/thread_host.h
+++ b/shell/common/thread_host.h
@@ -27,7 +27,7 @@ struct ThreadHost {
 
   ThreadHost();
 
-  ThreadHost(ThreadHost&&) = default;
+  ThreadHost(ThreadHost&&);
 
   ThreadHost& operator=(ThreadHost&&) = default;
 
diff --git a/shell/gpu/gpu_surface_gl.cc b/shell/gpu/gpu_surface_gl.cc
index d7c014382f696..d0ff74ffb6e24 100644
--- a/shell/gpu/gpu_surface_gl.cc
+++ b/shell/gpu/gpu_surface_gl.cc
@@ -368,4 +368,27 @@ bool GPUSurfaceGL::MakeRenderContextCurrent() {
   return delegate_->GLContextMakeCurrent();
 }
 
+bool GPUSurfaceGLDelegate::GLContextFBOResetAfterPresent() const {
+  return false;
+}
+
+bool GPUSurfaceGLDelegate::UseOffscreenSurface() const {
+  return false;
+}
+
+SkMatrix GPUSurfaceGLDelegate::GLContextSurfaceTransformation() const {
+  SkMatrix matrix;
+  matrix.setIdentity();
+  return matrix;
+}
+
+flow::ExternalViewEmbedder* GPUSurfaceGLDelegate::GetExternalViewEmbedder() {
+  return nullptr;
+}
+
+GPUSurfaceGLDelegate::GLProcResolver GPUSurfaceGLDelegate::GetGLProcResolver()
+    const {
+  return nullptr;
+}
+
 }  // namespace shell
diff --git a/shell/gpu/gpu_surface_gl.h b/shell/gpu/gpu_surface_gl.h
index 28c22d6a72e8d..a268e6d28020f 100644
--- a/shell/gpu/gpu_surface_gl.h
+++ b/shell/gpu/gpu_surface_gl.h
@@ -26,23 +26,17 @@ class GPUSurfaceGLDelegate {
 
   virtual intptr_t GLContextFBO() const = 0;
 
-  virtual bool GLContextFBOResetAfterPresent() const { return false; }
+  virtual bool GLContextFBOResetAfterPresent() const;
 
-  virtual bool UseOffscreenSurface() const { return false; }
+  virtual bool UseOffscreenSurface() const;
 
-  virtual SkMatrix GLContextSurfaceTransformation() const {
-    SkMatrix matrix;
-    matrix.setIdentity();
-    return matrix;
-  }
+  virtual SkMatrix GLContextSurfaceTransformation() const;
 
-  virtual flow::ExternalViewEmbedder* GetExternalViewEmbedder() {
-    return nullptr;
-  }
+  virtual flow::ExternalViewEmbedder* GetExternalViewEmbedder();
 
   using GLProcResolver =
       std::function<void* /* proc name */ (const char* /* proc address */)>;
-  virtual GLProcResolver GetGLProcResolver() const { return nullptr; }
+  virtual GLProcResolver GetGLProcResolver() const;
 };
 
 class GPUSurfaceGL : public Surface {
diff --git a/shell/platform/android/android_external_texture_gl.h b/shell/platform/android/android_external_texture_gl.h
index 7ac9ce82b3516..09a56766e2a8f 100644
--- a/shell/platform/android/android_external_texture_gl.h
+++ b/shell/platform/android/android_external_texture_gl.h
@@ -19,13 +19,11 @@ class AndroidExternalTextureGL : public flow::Texture {
 
   ~AndroidExternalTextureGL() override;
 
-  virtual void Paint(SkCanvas& canvas,
-                     const SkRect& bounds,
-                     bool freeze) override;
+  void Paint(SkCanvas& canvas, const SkRect& bounds, bool freeze) override;
 
-  virtual void OnGrContextCreated() override;
+  void OnGrContextCreated() override;
 
-  virtual void OnGrContextDestroyed() override;
+  void OnGrContextDestroyed() override;
 
   void MarkNewFrameAvailable() override;
 
diff --git a/shell/platform/android/apk_asset_provider.h b/shell/platform/android/apk_asset_provider.h
index bb8215a191a28..be41a685ebfeb 100644
--- a/shell/platform/android/apk_asset_provider.h
+++ b/shell/platform/android/apk_asset_provider.h
@@ -19,7 +19,7 @@ class APKAssetProvider final : public AssetResolver {
   explicit APKAssetProvider(JNIEnv* env,
                             jobject assetManager,
                             std::string directory);
-  virtual ~APKAssetProvider();
+  ~APKAssetProvider() override;
 
  private:
   fml::jni::ScopedJavaGlobalRef<jobject> java_asset_manager_;
diff --git a/shell/platform/android/platform_message_response_android.cc b/shell/platform/android/platform_message_response_android.cc
index d87e1a6237d22..eb88a6a5840bb 100644
--- a/shell/platform/android/platform_message_response_android.cc
+++ b/shell/platform/android/platform_message_response_android.cc
@@ -17,6 +17,8 @@ PlatformMessageResponseAndroid::PlatformMessageResponseAndroid(
       weak_java_object_(weak_java_object),
       platform_task_runner_(std::move(platform_task_runner)) {}
 
+PlatformMessageResponseAndroid::~PlatformMessageResponseAndroid() = default;
+
 // |blink::PlatformMessageResponse|
 void PlatformMessageResponseAndroid::Complete(
     std::unique_ptr<fml::Mapping> data) {
@@ -27,7 +29,7 @@ void PlatformMessageResponseAndroid::Complete(
   ]() {
         // We are on the platform thread. Attempt to get the strong reference to
         // the Java object.
-        auto env = fml::jni::AttachCurrentThread();
+        auto* env = fml::jni::AttachCurrentThread();
         auto java_object = weak_java_object.get(env);
 
         if (java_object.is_null()) {
@@ -57,7 +59,7 @@ void PlatformMessageResponseAndroid::CompleteEmpty() {
   ]() {
         // We are on the platform thread. Attempt to get the strong reference to
         // the Java object.
-        auto env = fml::jni::AttachCurrentThread();
+        auto* env = fml::jni::AttachCurrentThread();
         auto java_object = weak_java_object.get(env);
 
         if (java_object.is_null()) {
diff --git a/shell/platform/android/platform_message_response_android.h b/shell/platform/android/platform_message_response_android.h
index 71b080cc3348c..f3d79c1aa4faf 100644
--- a/shell/platform/android/platform_message_response_android.h
+++ b/shell/platform/android/platform_message_response_android.h
@@ -26,6 +26,8 @@ class PlatformMessageResponseAndroid : public blink::PlatformMessageResponse {
       fml::jni::JavaObjectWeakGlobalRef weak_java_object,
       fml::RefPtr<fml::TaskRunner> platform_task_runner);
 
+  ~PlatformMessageResponseAndroid() override;
+
   int response_id_;
   fml::jni::JavaObjectWeakGlobalRef weak_java_object_;
   fml::RefPtr<fml::TaskRunner> platform_task_runner_;
diff --git a/shell/platform/android/platform_view_android_jni.cc b/shell/platform/android/platform_view_android_jni.cc
index a829e25f16654..be42414b6c9be 100644
--- a/shell/platform/android/platform_view_android_jni.cc
+++ b/shell/platform/android/platform_view_android_jni.cc
@@ -329,19 +329,18 @@ static void SetViewportMetrics(JNIEnv* env,
                                jint physicalViewInsetRight,
                                jint physicalViewInsetBottom,
                                jint physicalViewInsetLeft) {
-  const blink::ViewportMetrics metrics = {
-      .device_pixel_ratio = static_cast<double>(devicePixelRatio),
-      .physical_width = static_cast<double>(physicalWidth),
-      .physical_height = static_cast<double>(physicalHeight),
-      .physical_padding_top = static_cast<double>(physicalPaddingTop),
-      .physical_padding_right = static_cast<double>(physicalPaddingRight),
-      .physical_padding_bottom = static_cast<double>(physicalPaddingBottom),
-      .physical_padding_left = static_cast<double>(physicalPaddingLeft),
-      .physical_view_inset_top = static_cast<double>(physicalViewInsetTop),
-      .physical_view_inset_right = static_cast<double>(physicalViewInsetRight),
-      .physical_view_inset_bottom =
-          static_cast<double>(physicalViewInsetBottom),
-      .physical_view_inset_left = static_cast<double>(physicalViewInsetLeft),
+  const blink::ViewportMetrics metrics{
+      static_cast<double>(devicePixelRatio),
+      static_cast<double>(physicalWidth),
+      static_cast<double>(physicalHeight),
+      static_cast<double>(physicalPaddingTop),
+      static_cast<double>(physicalPaddingRight),
+      static_cast<double>(physicalPaddingBottom),
+      static_cast<double>(physicalPaddingLeft),
+      static_cast<double>(physicalViewInsetTop),
+      static_cast<double>(physicalViewInsetRight),
+      static_cast<double>(physicalViewInsetBottom),
+      static_cast<double>(physicalViewInsetLeft),
   };
 
   ANDROID_SHELL_HOLDER->SetViewportMetrics(metrics);
@@ -366,7 +365,7 @@ static jobject GetBitmap(JNIEnv* env, jobject jcaller, jlong shell_holder) {
     return nullptr;
   }
 
-  auto pixels_src = static_cast<const int32_t*>(screenshot.data->data());
+  auto* pixels_src = static_cast<const int32_t*>(screenshot.data->data());
 
   // Our configuration of Skia does not support rendering to the
   // BitmapConfig.ARGB_8888 format expected by android.graphics.Bitmap.
diff --git a/shell/platform/android/vsync_waiter_android.cc b/shell/platform/android/vsync_waiter_android.cc
index dc1cb11b3f21e..7d551c71143a8 100644
--- a/shell/platform/android/vsync_waiter_android.cc
+++ b/shell/platform/android/vsync_waiter_android.cc
@@ -84,7 +84,7 @@ bool VsyncWaiterAndroid::Register(JNIEnv* env) {
 static void ConsumePendingCallback(jlong java_baton,
                                    fml::TimePoint frame_start_time,
                                    fml::TimePoint frame_target_time) {
-  auto weak_this = reinterpret_cast<std::weak_ptr<VsyncWaiter>*>(java_baton);
+  auto* weak_this = reinterpret_cast<std::weak_ptr<VsyncWaiter>*>(java_baton);
   auto shared_this = weak_this->lock();
   delete weak_this;
 
diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn
index 235dfa054facd..8adbfc627970e 100644
--- a/shell/platform/darwin/ios/BUILD.gn
+++ b/shell/platform/darwin/ios/BUILD.gn
@@ -62,6 +62,7 @@ shared_library("create_flutter_framework_dylib") {
     "framework/Source/FlutterPlatformPlugin.h",
     "framework/Source/FlutterPlatformPlugin.mm",
     "framework/Source/FlutterPlatformViews_Internal.h",
+    "framework/Source/FlutterPlatformViews_Internal.mm",
     "framework/Source/FlutterPlatformViews.mm",
     "framework/Source/FlutterPluginAppLifeCycleDelegate.mm",
     "framework/Source/FlutterStandardCodec.mm",
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
index f6fa9c4a02a97..4173a1ebf6871 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
@@ -32,10 +32,9 @@ class IOSSurface;
 struct FlutterPlatformViewLayer {
   FlutterPlatformViewLayer(fml::scoped_nsobject<UIView> overlay_view,
                            std::unique_ptr<IOSSurface> ios_surface,
-                           std::unique_ptr<Surface> surface)
-      : overlay_view(std::move(overlay_view)),
-        ios_surface(std::move(ios_surface)),
-        surface(std::move(surface)){};
+                           std::unique_ptr<Surface> surface);
+
+  ~FlutterPlatformViewLayer();
 
   fml::scoped_nsobject<UIView> overlay_view;
   std::unique_ptr<IOSSurface> ios_surface;
@@ -44,7 +43,9 @@ struct FlutterPlatformViewLayer {
 
 class FlutterPlatformViewsController {
  public:
-  FlutterPlatformViewsController() = default;
+  FlutterPlatformViewsController();
+
+  ~FlutterPlatformViewsController();
 
   void SetFlutterView(UIView* flutter_view);
 
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm
new file mode 100644
index 0000000000000..b6c85c60974fb
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm
@@ -0,0 +1,23 @@
+// 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.
+
+#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
+
+#include "flutter/shell/platform/darwin/ios/ios_surface.h"
+
+namespace shell {
+FlutterPlatformViewLayer::FlutterPlatformViewLayer(fml::scoped_nsobject<UIView> overlay_view,
+                                                   std::unique_ptr<IOSSurface> ios_surface,
+                                                   std::unique_ptr<Surface> surface)
+    : overlay_view(std::move(overlay_view)),
+      ios_surface(std::move(ios_surface)),
+      surface(std::move(surface)){};
+
+FlutterPlatformViewLayer::~FlutterPlatformViewLayer() = default;
+
+FlutterPlatformViewsController::FlutterPlatformViewsController() = default;
+
+FlutterPlatformViewsController::~FlutterPlatformViewsController() = default;
+
+}  // namespace shell
diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h
index 48a15dbb36f2a..ee6b929bc9843 100644
--- a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h
+++ b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h
@@ -20,24 +20,15 @@ namespace shell {
 
 class PlatformMessageResponseDarwin : public blink::PlatformMessageResponse {
  public:
-  void Complete(std::unique_ptr<fml::Mapping> data) override {
-    fml::RefPtr<PlatformMessageResponseDarwin> self(this);
-    platform_task_runner_->PostTask(fml::MakeCopyable([self, data = std::move(data)]() mutable {
-      self->callback_.get()(shell::GetNSDataFromMapping(std::move(data)));
-    }));
-  }
-
-  void CompleteEmpty() override {
-    fml::RefPtr<PlatformMessageResponseDarwin> self(this);
-    platform_task_runner_->PostTask(
-        fml::MakeCopyable([self]() mutable { self->callback_.get()(nil); }));
-  }
+  void Complete(std::unique_ptr<fml::Mapping> data) override;
+
+  void CompleteEmpty() override;
 
  private:
   explicit PlatformMessageResponseDarwin(PlatformMessageResponseCallback callback,
-                                         fml::RefPtr<fml::TaskRunner> platform_task_runner)
-      : callback_(callback, fml::OwnershipPolicy::Retain),
-        platform_task_runner_(std::move(platform_task_runner)) {}
+                                         fml::RefPtr<fml::TaskRunner> platform_task_runner);
+
+  ~PlatformMessageResponseDarwin() override;
 
   fml::ScopedBlock<PlatformMessageResponseCallback> callback_;
   fml::RefPtr<fml::TaskRunner> platform_task_runner_;
diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm
index 3eb396a8f52df..0d45e4e2ff4e1 100644
--- a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm
+++ b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm
@@ -6,6 +6,25 @@
 
 namespace shell {
 
-//
+PlatformMessageResponseDarwin::PlatformMessageResponseDarwin(
+    PlatformMessageResponseCallback callback,
+    fml::RefPtr<fml::TaskRunner> platform_task_runner)
+    : callback_(callback, fml::OwnershipPolicy::Retain),
+      platform_task_runner_(std::move(platform_task_runner)) {}
+
+PlatformMessageResponseDarwin::~PlatformMessageResponseDarwin() = default;
+
+void PlatformMessageResponseDarwin::Complete(std::unique_ptr<fml::Mapping> data) {
+  fml::RefPtr<PlatformMessageResponseDarwin> self(this);
+  platform_task_runner_->PostTask(fml::MakeCopyable([self, data = std::move(data)]() mutable {
+    self->callback_.get()(shell::GetNSDataFromMapping(std::move(data)));
+  }));
+}
+
+void PlatformMessageResponseDarwin::CompleteEmpty() {
+  fml::RefPtr<PlatformMessageResponseDarwin> self(this);
+  platform_task_runner_->PostTask(
+      fml::MakeCopyable([self]() mutable { self->callback_.get()(nil); }));
+}
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/ios_external_texture_gl.h b/shell/platform/darwin/ios/ios_external_texture_gl.h
index 5ff841ba0b1b1..d258234708a0b 100644
--- a/shell/platform/darwin/ios/ios_external_texture_gl.h
+++ b/shell/platform/darwin/ios/ios_external_texture_gl.h
@@ -18,13 +18,13 @@ class IOSExternalTextureGL : public flow::Texture {
   ~IOSExternalTextureGL() override;
 
   // Called from GPU thread.
-  virtual void Paint(SkCanvas& canvas, const SkRect& bounds, bool freeze) override;
+  void Paint(SkCanvas& canvas, const SkRect& bounds, bool freeze) override;
 
-  virtual void OnGrContextCreated() override;
+  void OnGrContextCreated() override;
 
-  virtual void OnGrContextDestroyed() override;
+  void OnGrContextDestroyed() override;
 
-  virtual void MarkNewFrameAvailable() override;
+  void MarkNewFrameAvailable() override;
 
  private:
   NSObject<FlutterTexture>* external_texture_;
diff --git a/shell/platform/darwin/ios/ios_surface_gl.h b/shell/platform/darwin/ios/ios_surface_gl.h
index 9f7013c29b100..93fcc0f510624 100644
--- a/shell/platform/darwin/ios/ios_surface_gl.h
+++ b/shell/platform/darwin/ios/ios_surface_gl.h
@@ -63,7 +63,7 @@ class IOSSurfaceGL : public IOSSurface,
   SkCanvas* CompositeEmbeddedView(int view_id, const flow::EmbeddedViewParams& params) override;
 
   // |flow::ExternalViewEmbedder|
-  virtual bool SubmitFrame(GrContext* context) override;
+  bool SubmitFrame(GrContext* context) override;
 
  private:
   std::shared_ptr<IOSGLContext> context_;
diff --git a/shell/platform/darwin/ios/ios_surface_software.h b/shell/platform/darwin/ios/ios_surface_software.h
index 5106bdfb0aa3e..79695b3a2767d 100644
--- a/shell/platform/darwin/ios/ios_surface_software.h
+++ b/shell/platform/darwin/ios/ios_surface_software.h
@@ -58,7 +58,7 @@ class IOSSurfaceSoftware final : public IOSSurface,
   SkCanvas* CompositeEmbeddedView(int view_id, const flow::EmbeddedViewParams& params) override;
 
   // |flow::ExternalViewEmbedder|
-  virtual bool SubmitFrame(GrContext* context) override;
+  bool SubmitFrame(GrContext* context) override;
 
  private:
   fml::scoped_nsobject<CALayer> layer_;
diff --git a/shell/platform/darwin/ios/platform_view_ios.h b/shell/platform/darwin/ios/platform_view_ios.h
index 6db35651d7f8b..a0d85a7ffd0f9 100644
--- a/shell/platform/darwin/ios/platform_view_ios.h
+++ b/shell/platform/darwin/ios/platform_view_ios.h
@@ -27,7 +27,7 @@ class PlatformViewIOS final : public PlatformView {
  public:
   explicit PlatformViewIOS(PlatformView::Delegate& delegate, blink::TaskRunners task_runners);
 
-  ~PlatformViewIOS();
+  ~PlatformViewIOS() override;
 
   PlatformMessageRouter& GetPlatformMessageRouter();