diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 79e3fb4f60..c66f67261e 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -9,71 +9,73 @@
 import("../../webrtc.gni")
 
 rtc_source_set("rtp_rtcp_format") {
-  sources = [
+  public = [
     "include/rtp_cvo.h",
     "include/rtp_header_extension_map.h",
     "include/rtp_rtcp_defines.h",
     "source/byte_io.h",
-    "source/rtcp_packet.cc",
     "source/rtcp_packet.h",
-    "source/rtcp_packet/app.cc",
     "source/rtcp_packet/app.h",
-    "source/rtcp_packet/bye.cc",
     "source/rtcp_packet/bye.h",
-    "source/rtcp_packet/common_header.cc",
     "source/rtcp_packet/common_header.h",
-    "source/rtcp_packet/compound_packet.cc",
     "source/rtcp_packet/compound_packet.h",
-    "source/rtcp_packet/dlrr.cc",
     "source/rtcp_packet/dlrr.h",
-    "source/rtcp_packet/extended_jitter_report.cc",
     "source/rtcp_packet/extended_jitter_report.h",
-    "source/rtcp_packet/extended_reports.cc",
     "source/rtcp_packet/extended_reports.h",
-    "source/rtcp_packet/fir.cc",
     "source/rtcp_packet/fir.h",
-    "source/rtcp_packet/nack.cc",
     "source/rtcp_packet/nack.h",
-    "source/rtcp_packet/pli.cc",
     "source/rtcp_packet/pli.h",
-    "source/rtcp_packet/psfb.cc",
     "source/rtcp_packet/psfb.h",
-    "source/rtcp_packet/rapid_resync_request.cc",
     "source/rtcp_packet/rapid_resync_request.h",
-    "source/rtcp_packet/receiver_report.cc",
     "source/rtcp_packet/receiver_report.h",
-    "source/rtcp_packet/remb.cc",
     "source/rtcp_packet/remb.h",
-    "source/rtcp_packet/report_block.cc",
     "source/rtcp_packet/report_block.h",
-    "source/rtcp_packet/rrtr.cc",
     "source/rtcp_packet/rrtr.h",
-    "source/rtcp_packet/rtpfb.cc",
     "source/rtcp_packet/rtpfb.h",
-    "source/rtcp_packet/sdes.cc",
     "source/rtcp_packet/sdes.h",
-    "source/rtcp_packet/sender_report.cc",
     "source/rtcp_packet/sender_report.h",
-    "source/rtcp_packet/target_bitrate.cc",
     "source/rtcp_packet/target_bitrate.h",
-    "source/rtcp_packet/tmmb_item.cc",
     "source/rtcp_packet/tmmb_item.h",
-    "source/rtcp_packet/tmmbn.cc",
     "source/rtcp_packet/tmmbn.h",
-    "source/rtcp_packet/tmmbr.cc",
     "source/rtcp_packet/tmmbr.h",
-    "source/rtcp_packet/transport_feedback.cc",
     "source/rtcp_packet/transport_feedback.h",
-    "source/rtcp_packet/voip_metric.cc",
     "source/rtcp_packet/voip_metric.h",
+    "source/rtp_header_extensions.h",
+    "source/rtp_packet_received.h",
+    "source/rtp_packet_to_send.h",
+  ]
+  sources = [
+    "source/rtcp_packet.cc",
+    "source/rtcp_packet/app.cc",
+    "source/rtcp_packet/bye.cc",
+    "source/rtcp_packet/common_header.cc",
+    "source/rtcp_packet/compound_packet.cc",
+    "source/rtcp_packet/dlrr.cc",
+    "source/rtcp_packet/extended_jitter_report.cc",
+    "source/rtcp_packet/extended_reports.cc",
+    "source/rtcp_packet/fir.cc",
+    "source/rtcp_packet/nack.cc",
+    "source/rtcp_packet/pli.cc",
+    "source/rtcp_packet/psfb.cc",
+    "source/rtcp_packet/rapid_resync_request.cc",
+    "source/rtcp_packet/receiver_report.cc",
+    "source/rtcp_packet/remb.cc",
+    "source/rtcp_packet/report_block.cc",
+    "source/rtcp_packet/rrtr.cc",
+    "source/rtcp_packet/rtpfb.cc",
+    "source/rtcp_packet/sdes.cc",
+    "source/rtcp_packet/sender_report.cc",
+    "source/rtcp_packet/target_bitrate.cc",
+    "source/rtcp_packet/tmmb_item.cc",
+    "source/rtcp_packet/tmmbn.cc",
+    "source/rtcp_packet/tmmbr.cc",
+    "source/rtcp_packet/transport_feedback.cc",
+    "source/rtcp_packet/voip_metric.cc",
     "source/rtp_header_extension_map.cc",
     "source/rtp_header_extensions.cc",
-    "source/rtp_header_extensions.h",
     "source/rtp_packet.cc",
     "source/rtp_packet.h",
     "source/rtp_packet_received.cc",
-    "source/rtp_packet_received.h",
-    "source/rtp_packet_to_send.h",
   ]
 
   deps = [