diff --git a/src/modules/rtp_rtcp/source/Android.mk b/src/modules/rtp_rtcp/source/Android.mk
index 00bd02a883..68295be7a2 100644
--- a/src/modules/rtp_rtcp/source/Android.mk
+++ b/src/modules/rtp_rtcp/source/Android.mk
@@ -27,6 +27,7 @@ LOCAL_SRC_FILES := \
     rtp_receiver.cc \
     rtp_sender.cc \
     rtp_utility.cc \
+    rtp_header_extension.cc \
     ssrc_database.cc \
     tmmbr_help.cc \
     dtmf_queue.cc \
@@ -37,10 +38,13 @@ LOCAL_SRC_FILES := \
     forward_error_correction_internal.cc \
     overuse_detector.cc \
     remote_rate_control.cc \
+    rtp_packet_history.cc \
     receiver_fec.cc \
     rtp_receiver_video.cc \
     rtp_sender_video.cc \
-    rtp_format_vp8.cc
+    rtp_format_vp8.cc \
+    transmission_bucket.cc \
+    vp8_partition_aggregator.cc
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
diff --git a/src/modules/rtp_rtcp/source/rtp_packet_history.cc b/src/modules/rtp_rtcp/source/rtp_packet_history.cc
index a118162db0..0de75532db 100644
--- a/src/modules/rtp_rtcp/source/rtp_packet_history.cc
+++ b/src/modules/rtp_rtcp/source/rtp_packet_history.cc
@@ -138,7 +138,7 @@ int32_t RTPPacketHistory::PutRTPPacket(const uint8_t* packet,
   // Store packet
   std::vector<std::vector<uint8_t> >::iterator it =
       stored_packets_.begin() + prev_index_;
-  copy(packet, packet + packet_length, it->begin());
+  std::copy(packet, packet + packet_length, it->begin());
 
   stored_seq_nums_[prev_index_] = seq_num;
   stored_lengths_[prev_index_] = packet_length;
@@ -218,7 +218,7 @@ bool RTPPacketHistory::GetRTPPacket(uint16_t sequence_number,
   // Get packet.
   std::vector<std::vector<uint8_t> >::const_iterator it_found_packet =
       stored_packets_.begin() + index;
-  copy(it_found_packet->begin(), it_found_packet->begin() + length, packet);
+  std::copy(it_found_packet->begin(), it_found_packet->begin() + length, packet);
   *packet_length = stored_lengths_.at(index);
   *stored_time_ms = stored_times_.at(index);
   *type = stored_types_.at(index);