diff --git a/modules/video_coding/protection_bitrate_calculator.cc b/modules/video_coding/protection_bitrate_calculator.cc
index 490a36298a..3c1da234d9 100644
--- a/modules/video_coding/protection_bitrate_calculator.cc
+++ b/modules/video_coding/protection_bitrate_calculator.cc
@@ -14,18 +14,6 @@ namespace webrtc {
 
 using rtc::CritScope;
 
-struct ProtectionBitrateCalculator::EncodedFrameSample {
-  EncodedFrameSample(size_t size_bytes,
-                     uint32_t timestamp,
-                     int64_t time_complete_ms)
-      : size_bytes(size_bytes),
-        timestamp(timestamp),
-        time_complete_ms(time_complete_ms) {}
-  size_t size_bytes;
-  uint32_t timestamp;
-  int64_t time_complete_ms;
-};
-
 ProtectionBitrateCalculator::ProtectionBitrateCalculator(
     Clock* clock,
     VCMProtectionCallback* protection_callback)
diff --git a/modules/video_coding/protection_bitrate_calculator.h b/modules/video_coding/protection_bitrate_calculator.h
index be20391891..bf50589fe8 100644
--- a/modules/video_coding/protection_bitrate_calculator.h
+++ b/modules/video_coding/protection_bitrate_calculator.h
@@ -61,7 +61,6 @@ class ProtectionBitrateCalculator {
   void UpdateWithEncodedData(const EncodedImage& encoded_image);
 
  private:
-  struct EncodedFrameSample;
   enum { kBitrateAverageWinMs = 1000 };
 
   Clock* const clock_;
diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h
index 14553e532b..aa5b781789 100644
--- a/video/rtp_video_stream_receiver.h
+++ b/video/rtp_video_stream_receiver.h
@@ -39,16 +39,12 @@
 namespace webrtc {
 
 class NackModule;
-class PacedSender;
 class PacketRouter;
 class ProcessThread;
 class ReceiveStatistics;
 class ReceiveStatisticsProxy;
-class RemoteNtpTimeEstimator;
 class RtcpRttStats;
-class RtpHeaderParser;
 class RtpPacketReceived;
-class RTPPayloadRegistry;
 class RtpReceiver;
 class Transport;
 class UlpfecReceiver;
diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc
index 02d6d3ec12..38883acafe 100644
--- a/video/video_stream_encoder_unittest.cc
+++ b/video/video_stream_encoder_unittest.cc
@@ -561,10 +561,10 @@ class VideoStreamEncoderTest : public ::testing::Test {
     void WaitForEncodedFrame(uint32_t expected_width,
                              uint32_t expected_height) {
       EXPECT_TRUE(encoded_frame_event_.Wait(kDefaultTimeoutMs));
-      CheckLastFrameSizeMathces(expected_width, expected_height);
+      CheckLastFrameSizeMatches(expected_width, expected_height);
     }
 
-    void CheckLastFrameSizeMathces(uint32_t expected_width,
+    void CheckLastFrameSizeMatches(uint32_t expected_width,
                                    uint32_t expected_height) {
       uint32_t width = 0;
       uint32_t height = 0;
@@ -2485,7 +2485,7 @@ TEST_F(VideoStreamEncoderTest,
     if (!WaitForFrame(kFrameTimeoutMs)) {
       ++num_frames_dropped;
     } else {
-      sink_.CheckLastFrameSizeMathces(kFrameWidth, kFrameHeight);
+      sink_.CheckLastFrameSizeMatches(kFrameWidth, kFrameHeight);
     }
   }
 
@@ -2504,7 +2504,7 @@ TEST_F(VideoStreamEncoderTest,
     if (!WaitForFrame(kFrameTimeoutMs)) {
       ++num_frames_dropped;
     } else {
-      sink_.CheckLastFrameSizeMathces(kFrameWidth, kFrameHeight);
+      sink_.CheckLastFrameSizeMatches(kFrameWidth, kFrameHeight);
     }
   }
   EXPECT_NEAR(num_frames_dropped, max_framerate_ - (max_framerate_ * 4 / 9),
@@ -2520,7 +2520,7 @@ TEST_F(VideoStreamEncoderTest,
     if (!WaitForFrame(kFrameTimeoutMs)) {
       ++num_frames_dropped;
     } else {
-      sink_.CheckLastFrameSizeMathces(kFrameWidth, kFrameHeight);
+      sink_.CheckLastFrameSizeMatches(kFrameWidth, kFrameHeight);
     }
   }
   EXPECT_NEAR(num_frames_dropped, max_framerate_ - (max_framerate_ * 2 / 3),
@@ -2536,7 +2536,7 @@ TEST_F(VideoStreamEncoderTest,
     if (!WaitForFrame(kFrameTimeoutMs)) {
       ++num_frames_dropped;
     } else {
-      sink_.CheckLastFrameSizeMathces(kFrameWidth, kFrameHeight);
+      sink_.CheckLastFrameSizeMatches(kFrameWidth, kFrameHeight);
     }
   }
   EXPECT_NEAR(num_frames_dropped, 0, kErrorMargin);