diff --git a/webrtc/modules/video_coding/main/source/video_sender.cc b/webrtc/modules/video_coding/main/source/video_sender.cc
index c5317ec412..a5ef22a46e 100644
--- a/webrtc/modules/video_coding/main/source/video_sender.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender.cc
@@ -106,9 +106,15 @@ int32_t VideoSender::RegisterSendCodec(const VideoCodec* sendCodec,
     return VCM_CODEC_ERROR;
   }
 
-  int numLayers = (sendCodec->codecType != kVideoCodecVP8)
-                      ? 1
-                      : sendCodec->codecSpecific.VP8.numberOfTemporalLayers;
+  int numLayers;
+  if (sendCodec->codecType == kVideoCodecVP8) {
+    numLayers = sendCodec->codecSpecific.VP8.numberOfTemporalLayers;
+  } else if (sendCodec->codecType == kVideoCodecVP9) {
+    numLayers = sendCodec->codecSpecific.VP9.numberOfTemporalLayers;
+  } else {
+    numLayers = 1;
+  }
+
   // If we have screensharing and we have layers, we disable frame dropper.
   bool disable_frame_dropper =
       numLayers > 1 && sendCodec->mode == kScreensharing;
diff --git a/webrtc/video/video_loopback.cc b/webrtc/video/video_loopback.cc
index 0dceea82e6..0c06f85fcc 100644
--- a/webrtc/video/video_loopback.cc
+++ b/webrtc/video/video_loopback.cc
@@ -10,18 +10,14 @@
 
 #include <stdio.h>
 
-#include <map>
-
 #include "gflags/gflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/test/field_trial.h"
 #include "webrtc/test/run_test.h"
-#include "webrtc/typedefs.h"
 #include "webrtc/video/video_quality_test.h"
 
 namespace webrtc {
-
 namespace flags {
 
 DEFINE_int32(width, 640, "Video width.");
diff --git a/webrtc/video/video_quality_test.h b/webrtc/video/video_quality_test.h
index f47140e3e8..7b62fb3dce 100644
--- a/webrtc/video/video_quality_test.h
+++ b/webrtc/video/video_quality_test.h
@@ -34,8 +34,8 @@ class VideoQualityTest : public test::CallTest {
       int max_bitrate_bps;
       std::string codec;
       size_t num_temporal_layers;
-
       int min_transmit_bps;
+
       Call::Config::BitrateConfig call_bitrate_config;
       size_t tl_discard_threshold;
       bool send_side_bwe;