diff --git a/pc/channel.cc b/pc/channel.cc
index 73807a46d1..b72f843b6b 100644
--- a/pc/channel.cc
+++ b/pc/channel.cc
@@ -844,19 +844,6 @@ VoiceChannel::~VoiceChannel() {
   DisableMedia_w();
 }
 
-void VoiceChannel::InitCallback() {
-  RTC_DCHECK_RUN_ON(worker_thread());
-  // TODO(bugs.webrtc.org/13931): Remove when values are set
-  // in a more sensible fashion
-  send_channel()->SetSendCodecChangedCallback([this]() {
-    RTC_DCHECK_RUN_ON(worker_thread());
-    // Adjust receive streams based on send codec.
-    receive_channel()->SetReceiveNackEnabled(
-        send_channel()->SendCodecHasNack());
-    receive_channel()->SetReceiveNonSenderRttEnabled(
-        send_channel()->SenderNonSenderRttEnabled());
-  });
-}
 void VoiceChannel::UpdateMediaSendRecvState_w() {
   // Render incoming data if we're the active call, and we have the local
   // content. We receive data on the default channel and multiplexed streams.
diff --git a/pc/channel.h b/pc/channel.h
index d3a7e89366..877c628f4c 100644
--- a/pc/channel.h
+++ b/pc/channel.h
@@ -414,7 +414,6 @@ class VoiceChannel : public BaseChannel {
   }
 
  private:
-  void InitCallback();
   // overrides from BaseChannel
   void UpdateMediaSendRecvState_w() RTC_RUN_ON(worker_thread()) override;
   bool SetLocalContent_w(const MediaContentDescription* content,
diff --git a/rtc_base/system/file_wrapper.cc b/rtc_base/system/file_wrapper.cc
index f7befc6dc5..af34d0e411 100644
--- a/rtc_base/system/file_wrapper.cc
+++ b/rtc_base/system/file_wrapper.cc
@@ -10,15 +10,19 @@
 
 #include "rtc_base/system/file_wrapper.h"
 
+#include <stddef.h>
+
 #include <cerrno>
+#include <cstdint>
+#include <string>
 
 #include "absl/strings/string_view.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/numerics/safe_conversions.h"
 
 #ifdef _WIN32
 #include <Windows.h>
 #else
-#include <string.h>
 #endif
 
 #include <utility>