diff --git a/Firestore/core/src/nanopb/byte_string.cc b/Firestore/core/src/nanopb/byte_string.cc
index 2d4d9670933..2f0f5cf840c 100644
--- a/Firestore/core/src/nanopb/byte_string.cc
+++ b/Firestore/core/src/nanopb/byte_string.cc
@@ -16,8 +16,9 @@
 
 #include "Firestore/core/src/nanopb/byte_string.h"
 
-#include <cctype>
 #include <cstdlib>
+
+#include <cctype>
 #include <cstring>
 #include <iomanip>
 #include <ostream>
diff --git a/Firestore/core/test/unit/nanopb/byte_string_test.cc b/Firestore/core/test/unit/nanopb/byte_string_test.cc
index 8380f33e8e5..8bc6821b9dc 100644
--- a/Firestore/core/test/unit/nanopb/byte_string_test.cc
+++ b/Firestore/core/test/unit/nanopb/byte_string_test.cc
@@ -16,9 +16,10 @@
 
 #include "Firestore/core/src/nanopb/byte_string.h"
 
-#include <cstdint>
 #include <cstdlib>
 
+#include <cstdint>
+
 #include "Firestore/core/src/nanopb/nanopb_util.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/Firestore/core/test/unit/util/executor_test.cc b/Firestore/core/test/unit/util/executor_test.cc
index 5a090529e2c..67b63c1294c 100644
--- a/Firestore/core/test/unit/util/executor_test.cc
+++ b/Firestore/core/test/unit/util/executor_test.cc
@@ -16,10 +16,11 @@
 
 #include "Firestore/core/test/unit/util/executor_test.h"
 
+#include <cstdlib>
+
 #include <chrono>              // NOLINT(build/c++11)
 #include <condition_variable>  // NOLINT(build/c++11)
-#include <cstdlib>
-#include <future>  // NOLINT(build/c++11)
+#include <future>              // NOLINT(build/c++11)
 #include <string>
 #include <thread>  // NOLINT(build/c++11)
 
diff --git a/Firestore/core/test/unit/util/schedule_test.cc b/Firestore/core/test/unit/util/schedule_test.cc
index 43352c87bfa..88f575469a3 100644
--- a/Firestore/core/test/unit/util/schedule_test.cc
+++ b/Firestore/core/test/unit/util/schedule_test.cc
@@ -16,8 +16,9 @@
 
 #include "Firestore/core/src/util/schedule.h"
 
-#include <chrono>  // NOLINT(build/c++11)
 #include <cstdlib>
+
+#include <chrono>  // NOLINT(build/c++11)
 #include <string>
 
 #include "Firestore/core/src/util/task.h"
diff --git a/scripts/check_lint.py b/scripts/check_lint.py
index 3337d1ea06f..6d08f99fa89 100755
--- a/scripts/check_lint.py
+++ b/scripts/check_lint.py
@@ -141,7 +141,7 @@ def lint_py(files):
     global _flake8_warned
     if not _flake8_warned:
       _flake8_warned = True
-      _logger.warn(textwrap.dedent(
+      _logger.warning(textwrap.dedent(
           """
           Could not find flake8 on $PATH; skipping python lint.
           Install with: