diff --git a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
index 5128091dc4..5cbeaee9bf 100644
--- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
+++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
@@ -22,6 +22,7 @@
 #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h"
 #include "modules/desktop_capture/linux/wayland/screencast_stream_utils.h"
 #include "modules/desktop_capture/screen_capture_frame_queue.h"
+#include "modules/desktop_capture/shared_desktop_frame.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/sanitizer.h"
diff --git a/modules/desktop_capture/screen_capture_frame_queue.h b/modules/desktop_capture/screen_capture_frame_queue.h
index f54b8b606a..46e19da77e 100644
--- a/modules/desktop_capture/screen_capture_frame_queue.h
+++ b/modules/desktop_capture/screen_capture_frame_queue.h
@@ -13,11 +13,6 @@
 
 #include <memory>
 
-// TODO(zijiehe): These headers are not used in this file, but to avoid build
-// break in remoting/host. We should add headers in each individual files.
-#include "modules/desktop_capture/desktop_frame.h"         // Remove
-#include "modules/desktop_capture/shared_desktop_frame.h"  // Remove
-
 namespace webrtc {
 
 // Represents a queue of reusable video frames. Provides access to the 'current'
@@ -36,7 +31,7 @@ namespace webrtc {
 template <typename FrameType>
 class ScreenCaptureFrameQueue {
  public:
-  ScreenCaptureFrameQueue() : current_(0) {}
+  ScreenCaptureFrameQueue() = default;
   ~ScreenCaptureFrameQueue() = default;
 
   ScreenCaptureFrameQueue(const ScreenCaptureFrameQueue&) = delete;
@@ -69,7 +64,7 @@ class ScreenCaptureFrameQueue {
 
  private:
   // Index of the current frame.
-  int current_;
+  int current_ = 0;
 
   static const int kQueueLength = 2;
   std::unique_ptr<FrameType> frames_[kQueueLength];