diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
index dfb31c4661..b5d2185113 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
@@ -318,15 +318,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
 
   const Clock* clock() const { return clock_; }
 
-  // TODO(nisse): Demote all member variables to private, as soon as
-  // downstream code is updated to use the above accessor methods.
-  RTPSender rtp_sender_;
-
-  RTCPSender rtcp_sender_;
-  RTCPReceiver rtcp_receiver_;
-
-  const Clock* const clock_;
-
  private:
   FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, Rtt);
   FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, RttForReceiverOnly);
@@ -338,6 +329,12 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
 
   bool TimeToSendFullNackList(int64_t now) const;
 
+  RTPSender rtp_sender_;
+  RTCPSender rtcp_sender_;
+  RTCPReceiver rtcp_receiver_;
+
+  const Clock* const clock_;
+
   const bool audio_;
   int64_t last_process_time_;
   int64_t last_bitrate_process_time_;