diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index ce175a4d42..7388cf8b61 100755
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -21,6 +21,7 @@ CPPLINT_DIRS = [
   'webrtc/common_video',
   'webrtc/examples',
   'webrtc/modules/bitrate_controller',
+  'webrtc/modules/pacing',
   'webrtc/modules/remote_bitrate_estimator',
   'webrtc/modules/rtp_rtcp',
   'webrtc/modules/video_coding',
diff --git a/webrtc/modules/pacing/mock/mock_paced_sender.h b/webrtc/modules/pacing/mock/mock_paced_sender.h
index 01d5f6a6e9..c710dbcbea 100644
--- a/webrtc/modules/pacing/mock/mock_paced_sender.h
+++ b/webrtc/modules/pacing/mock/mock_paced_sender.h
@@ -11,10 +11,10 @@
 #ifndef WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_
 #define WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_
 
-#include "testing/gmock/include/gmock/gmock.h"
-
 #include <vector>
 
+#include "testing/gmock/include/gmock/gmock.h"
+
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc
index 25ca2cf4c5..23b172c666 100644
--- a/webrtc/modules/pacing/paced_sender.cc
+++ b/webrtc/modules/pacing/paced_sender.cc
@@ -10,9 +10,11 @@
 
 #include "webrtc/modules/pacing/paced_sender.h"
 
+#include <algorithm>
 #include <map>
 #include <queue>
 #include <set>
+#include <vector>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
diff --git a/webrtc/modules/pacing/paced_sender_unittest.cc b/webrtc/modules/pacing/paced_sender_unittest.cc
index 588bf3b669..f40dba3e2b 100644
--- a/webrtc/modules/pacing/paced_sender_unittest.cc
+++ b/webrtc/modules/pacing/paced_sender_unittest.cc
@@ -288,7 +288,7 @@ TEST_F(PacedSenderTest, PaceQueuedPacketsWithDuplicates) {
                   TimeToSendPacket(ssrc, queued_sequence_number++, _, false))
           .Times(1)
           .WillRepeatedly(Return(true));
-   }
+    }
     EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
     EXPECT_EQ(0, send_bucket_->Process());
   }
@@ -422,7 +422,8 @@ TEST_F(PacedSenderTest, VerifyAverageBitrateVaryingMediaPayload) {
   int64_t start_time = clock_.TimeInMilliseconds();
   size_t media_bytes = 0;
   while (clock_.TimeInMilliseconds() - start_time < kBitrateWindow) {
-    size_t media_payload = rand() % 100 + 200;  // [200, 300] bytes.
+    int rand_value = rand();  // NOLINT (rand_r instead of rand)
+    size_t media_payload = rand_value % 100 + 200;  // [200, 300] bytes.
     send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc,
                                sequence_number++, capture_time_ms,
                                media_payload, false);
diff --git a/webrtc/modules/pacing/packet_router.cc b/webrtc/modules/pacing/packet_router.cc
index e98ab0c2b0..ac75d2cd4a 100644
--- a/webrtc/modules/pacing/packet_router.cc
+++ b/webrtc/modules/pacing/packet_router.cc
@@ -40,7 +40,7 @@ bool SendFeedback(rtcp::TransportFeedback* packet,
   }
   return false;
 }
-}
+}  // namespace
 
 PacketRouter::PacketRouter() : transport_seq_(0) {
   pacer_thread_checker_.DetachFromThread();