diff --git a/Firestore/core/include/firebase/firestore/timestamp.h b/Firestore/core/include/firebase/firestore/timestamp.h
index 0ab818532f8..8d76ae45c46 100644
--- a/Firestore/core/include/firebase/firestore/timestamp.h
+++ b/Firestore/core/include/firebase/firestore/timestamp.h
@@ -23,8 +23,8 @@
 #include <string>
 
 #if !defined(_STLPORT_VERSION)
-#include <chrono>  // NOLINT(build/c++11)
-#endif             // !defined(_STLPORT_VERSION)
+#include <chrono>
+#endif  // !defined(_STLPORT_VERSION)
 
 namespace firebase {
 
diff --git a/Firestore/core/src/api/document_reference.cc b/Firestore/core/src/api/document_reference.cc
index 706ef828127..6fc04cd0d94 100644
--- a/Firestore/core/src/api/document_reference.cc
+++ b/Firestore/core/src/api/document_reference.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/api/document_reference.h"
 
-#include <future>  // NOLINT(build/c++11)
+#include <future>
 #include <memory>
 
 #include "Firestore/core/src/api/collection_reference.h"
diff --git a/Firestore/core/src/api/firestore.h b/Firestore/core/src/api/firestore.h
index 9323b0a4e81..0300f6c61f2 100644
--- a/Firestore/core/src/api/firestore.h
+++ b/Firestore/core/src/api/firestore.h
@@ -18,7 +18,7 @@
 #define FIRESTORE_CORE_SRC_API_FIRESTORE_H_
 
 #include <memory>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <string>
 
 #include "Firestore/core/src/api/api_fwd.h"
diff --git a/Firestore/core/src/api/load_bundle_task.cc b/Firestore/core/src/api/load_bundle_task.cc
index 08c6a8238a2..e0da2ae6e94 100644
--- a/Firestore/core/src/api/load_bundle_task.cc
+++ b/Firestore/core/src/api/load_bundle_task.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/api/load_bundle_task.h"
 
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <utility>
 
 #include "Firestore/core/src/util/autoid.h"
diff --git a/Firestore/core/src/api/load_bundle_task.h b/Firestore/core/src/api/load_bundle_task.h
index 9573a5a21dd..e87f245e79a 100644
--- a/Firestore/core/src/api/load_bundle_task.h
+++ b/Firestore/core/src/api/load_bundle_task.h
@@ -19,7 +19,7 @@
 #include <cstdint>
 #include <functional>
 #include <memory>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/Firestore/core/src/api/query_core.cc b/Firestore/core/src/api/query_core.cc
index 132ea52e3e3..e104372d0d5 100644
--- a/Firestore/core/src/api/query_core.cc
+++ b/Firestore/core/src/api/query_core.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/api/query_core.h"
 
-#include <future>  // NOLINT(build/c++11)
+#include <future>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/Firestore/core/src/core/event_listener.h b/Firestore/core/src/core/event_listener.h
index a8edd48ee6b..2e7aaad804b 100644
--- a/Firestore/core/src/core/event_listener.h
+++ b/Firestore/core/src/core/event_listener.h
@@ -18,7 +18,7 @@
 #define FIRESTORE_CORE_SRC_CORE_EVENT_LISTENER_H_
 
 #include <memory>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <utility>
 
 #include "Firestore/core/src/util/executor.h"
diff --git a/Firestore/core/src/core/firestore_client.cc b/Firestore/core/src/core/firestore_client.cc
index 6282cfb2ae0..c6dd50634c1 100644
--- a/Firestore/core/src/core/firestore_client.cc
+++ b/Firestore/core/src/core/firestore_client.cc
@@ -17,7 +17,7 @@
 #include "Firestore/core/src/core/firestore_client.h"
 
 #include <functional>
-#include <future>  // NOLINT(build/c++11)
+#include <future>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.h b/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.h
index 9e3b7f7dab1..a6fb58cec5b 100644
--- a/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.h
+++ b/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.h
@@ -24,7 +24,7 @@
 #import <Foundation/Foundation.h>
 
 #include <memory>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <string>
 #include <utility>
 
diff --git a/Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.h b/Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.h
index c0ceaf5f190..0f6b80824e8 100644
--- a/Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.h
+++ b/Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.h
@@ -24,7 +24,7 @@
 #import <Foundation/Foundation.h>
 
 #include <memory>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <utility>
 
 #include "Firestore/core/src/credentials/credentials_provider.h"
diff --git a/Firestore/core/src/local/leveldb_remote_document_cache.cc b/Firestore/core/src/local/leveldb_remote_document_cache.cc
index 15179a43c08..73342b886e9 100644
--- a/Firestore/core/src/local/leveldb_remote_document_cache.cc
+++ b/Firestore/core/src/local/leveldb_remote_document_cache.cc
@@ -17,7 +17,7 @@
 #include "Firestore/core/src/local/leveldb_remote_document_cache.h"
 
 #include <string>
-#include <thread>  // NOLINT(build/c++11)
+#include <thread>
 #include <utility>
 
 #include "Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h"
diff --git a/Firestore/core/src/local/leveldb_remote_document_cache.h b/Firestore/core/src/local/leveldb_remote_document_cache.h
index e0b0d17446e..a9236184d49 100644
--- a/Firestore/core/src/local/leveldb_remote_document_cache.h
+++ b/Firestore/core/src/local/leveldb_remote_document_cache.h
@@ -19,7 +19,7 @@
 
 #include <memory>
 #include <string>
-#include <thread>  // NOLINT(build/c++11)
+#include <thread>
 #include <vector>
 
 #include "Firestore/core/src/core/query.h"
diff --git a/Firestore/core/src/local/lru_garbage_collector.cc b/Firestore/core/src/local/lru_garbage_collector.cc
index 03f191f8609..9a37b15ab46 100644
--- a/Firestore/core/src/local/lru_garbage_collector.cc
+++ b/Firestore/core/src/local/lru_garbage_collector.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/local/lru_garbage_collector.h"
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 #include <queue>
 #include <string>
 #include <utility>
diff --git a/Firestore/core/src/remote/exponential_backoff.h b/Firestore/core/src/remote/exponential_backoff.h
index 5f628f43b93..49d02556b42 100644
--- a/Firestore/core/src/remote/exponential_backoff.h
+++ b/Firestore/core/src/remote/exponential_backoff.h
@@ -17,7 +17,7 @@
 #ifndef FIRESTORE_CORE_SRC_REMOTE_EXPONENTIAL_BACKOFF_H_
 #define FIRESTORE_CORE_SRC_REMOTE_EXPONENTIAL_BACKOFF_H_
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 #include <memory>
 
 #include "Firestore/core/src/util/async_queue.h"
diff --git a/Firestore/core/src/remote/grpc_completion.h b/Firestore/core/src/remote/grpc_completion.h
index e69d4ffd34c..6f774e635f9 100644
--- a/Firestore/core/src/remote/grpc_completion.h
+++ b/Firestore/core/src/remote/grpc_completion.h
@@ -17,9 +17,9 @@
 #ifndef FIRESTORE_CORE_SRC_REMOTE_GRPC_COMPLETION_H_
 #define FIRESTORE_CORE_SRC_REMOTE_GRPC_COMPLETION_H_
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 #include <functional>
-#include <future>  // NOLINT(build/c++11)
+#include <future>
 #include <memory>
 #include <utility>
 
diff --git a/Firestore/core/src/remote/grpc_connection.cc b/Firestore/core/src/remote/grpc_connection.cc
index f0ac452634e..78de37b5636 100644
--- a/Firestore/core/src/remote/grpc_connection.cc
+++ b/Firestore/core/src/remote/grpc_connection.cc
@@ -19,7 +19,7 @@
 #include <cstdlib>
 
 #include <algorithm>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <string>
 #include <utility>
 
diff --git a/Firestore/core/src/remote/grpc_stream.cc b/Firestore/core/src/remote/grpc_stream.cc
index 7728d33fe67..5101c36fb64 100644
--- a/Firestore/core/src/remote/grpc_stream.cc
+++ b/Firestore/core/src/remote/grpc_stream.cc
@@ -16,8 +16,8 @@
 
 #include "Firestore/core/src/remote/grpc_stream.h"
 
-#include <chrono>  // NOLINT(build/c++11)
-#include <future>  // NOLINT(build/c++11)
+#include <chrono>
+#include <future>
 
 #include "Firestore/core/src/remote/grpc_connection.h"
 #include "Firestore/core/src/remote/grpc_util.h"
diff --git a/Firestore/core/src/remote/online_state_tracker.cc b/Firestore/core/src/remote/online_state_tracker.cc
index ade2f0abe5f..aad5b3ad35e 100644
--- a/Firestore/core/src/remote/online_state_tracker.cc
+++ b/Firestore/core/src/remote/online_state_tracker.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/remote/online_state_tracker.h"
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 
 #include "Firestore/core/src/util/executor.h"
 #include "Firestore/core/src/util/hard_assert.h"
diff --git a/Firestore/core/src/remote/stream.cc b/Firestore/core/src/remote/stream.cc
index ee6774fbf8a..130b440dd9b 100644
--- a/Firestore/core/src/remote/stream.cc
+++ b/Firestore/core/src/remote/stream.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/remote/stream.h"
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 #include <utility>
 
 #include "Firestore/core/include/firebase/firestore/firestore_errors.h"
diff --git a/Firestore/core/src/util/async_queue.h b/Firestore/core/src/util/async_queue.h
index fa1646eca26..b48f4e97a70 100644
--- a/Firestore/core/src/util/async_queue.h
+++ b/Firestore/core/src/util/async_queue.h
@@ -18,10 +18,10 @@
 #define FIRESTORE_CORE_SRC_UTIL_ASYNC_QUEUE_H_
 
 #include <atomic>
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 #include <functional>
 #include <memory>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <vector>
 
 #include "Firestore/core/src/util/executor.h"
diff --git a/Firestore/core/src/util/background_queue.h b/Firestore/core/src/util/background_queue.h
index 1f260772342..377d3286a72 100644
--- a/Firestore/core/src/util/background_queue.h
+++ b/Firestore/core/src/util/background_queue.h
@@ -17,9 +17,9 @@
 #ifndef FIRESTORE_CORE_SRC_UTIL_BACKGROUND_QUEUE_H_
 #define FIRESTORE_CORE_SRC_UTIL_BACKGROUND_QUEUE_H_
 
-#include <condition_variable>  // NOLINT(build/c++11)
+#include <condition_variable>
 #include <functional>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/util/executor.h b/Firestore/core/src/util/executor.h
index 8ba86a952eb..129a0c5e5df 100644
--- a/Firestore/core/src/util/executor.h
+++ b/Firestore/core/src/util/executor.h
@@ -17,7 +17,7 @@
 #ifndef FIRESTORE_CORE_SRC_UTIL_EXECUTOR_H_
 #define FIRESTORE_CORE_SRC_UTIL_EXECUTOR_H_
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 #include <functional>
 #include <memory>
 #include <string>
diff --git a/Firestore/core/src/util/executor_libdispatch.h b/Firestore/core/src/util/executor_libdispatch.h
index 1fe1dc92fae..002123abd2e 100644
--- a/Firestore/core/src/util/executor_libdispatch.h
+++ b/Firestore/core/src/util/executor_libdispatch.h
@@ -19,11 +19,11 @@
 
 #include <dispatch/dispatch.h>
 
-#include <chrono>              // NOLINT(build/c++11)
-#include <condition_variable>  // NOLINT(build/c++11)
+#include <chrono>
+#include <condition_variable>
 #include <functional>
 #include <memory>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/Firestore/core/src/util/executor_std.cc b/Firestore/core/src/util/executor_std.cc
index 1c85e5d9183..80f611af8d3 100644
--- a/Firestore/core/src/util/executor_std.cc
+++ b/Firestore/core/src/util/executor_std.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/util/executor_std.h"
 
-#include <future>  // NOLINT(build/c++11)
+#include <future>
 #include <memory>
 #include <sstream>
 
diff --git a/Firestore/core/src/util/executor_std.h b/Firestore/core/src/util/executor_std.h
index bd411c32941..641c454c5ee 100644
--- a/Firestore/core/src/util/executor_std.h
+++ b/Firestore/core/src/util/executor_std.h
@@ -19,12 +19,12 @@
 
 #include <algorithm>
 #include <atomic>
-#include <condition_variable>  // NOLINT(build/c++11)
+#include <condition_variable>
 #include <deque>
 #include <memory>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <string>
-#include <thread>  // NOLINT(build/c++11)
+#include <thread>
 #include <utility>
 #include <vector>
 
diff --git a/Firestore/core/src/util/schedule.h b/Firestore/core/src/util/schedule.h
index 2d9700bc248..d972a54a759 100644
--- a/Firestore/core/src/util/schedule.h
+++ b/Firestore/core/src/util/schedule.h
@@ -18,9 +18,9 @@
 #define FIRESTORE_CORE_SRC_UTIL_SCHEDULE_H_
 
 #include <algorithm>
-#include <condition_variable>  // NOLINT(build/c++11)
+#include <condition_variable>
 #include <deque>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <vector>
 
 #include "Firestore/core/src/util/executor.h"
diff --git a/Firestore/core/src/util/task.cc b/Firestore/core/src/util/task.cc
index 66232d911de..6716e4cedeb 100644
--- a/Firestore/core/src/util/task.cc
+++ b/Firestore/core/src/util/task.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/util/task.h"
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 #include <cstdint>
 #include <utility>
 
diff --git a/Firestore/core/src/util/task.h b/Firestore/core/src/util/task.h
index ef86f2978ae..cac7fb2e09f 100644
--- a/Firestore/core/src/util/task.h
+++ b/Firestore/core/src/util/task.h
@@ -18,10 +18,10 @@
 #define FIRESTORE_CORE_SRC_UTIL_TASK_H_
 
 #include <atomic>
-#include <condition_variable>  // NOLINT(build/c++11)
+#include <condition_variable>
 #include <memory>
-#include <mutex>   // NOLINT(build/c++11)
-#include <thread>  // NOLINT(build/c++11)
+#include <mutex>
+#include <thread>
 
 #include "Firestore/core/src/util/executor.h"
 
diff --git a/Firestore/core/src/util/testing_hooks.cc b/Firestore/core/src/util/testing_hooks.cc
index 1f48fd0a812..9901c6b4e8c 100644
--- a/Firestore/core/src/util/testing_hooks.cc
+++ b/Firestore/core/src/util/testing_hooks.cc
@@ -17,7 +17,7 @@
 #include "Firestore/core/src/util/testing_hooks.h"
 
 #include <functional>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <type_traits>
 #include <unordered_map>
 #include <utility>
diff --git a/Firestore/core/src/util/testing_hooks.h b/Firestore/core/src/util/testing_hooks.h
index f9d05b96d7e..d072ca5007c 100644
--- a/Firestore/core/src/util/testing_hooks.h
+++ b/Firestore/core/src/util/testing_hooks.h
@@ -19,7 +19,7 @@
 
 #include <functional>
 #include <memory>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <string>
 #include <unordered_map>
 
diff --git a/Firestore/core/src/util/thread_safe_memoizer.h b/Firestore/core/src/util/thread_safe_memoizer.h
index 5bc6fc1c529..d2a991d9371 100644
--- a/Firestore/core/src/util/thread_safe_memoizer.h
+++ b/Firestore/core/src/util/thread_safe_memoizer.h
@@ -18,7 +18,7 @@
 #define FIRESTORE_CORE_SRC_UTIL_THREAD_SAFE_MEMOIZER_H_
 
 #include <functional>
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 #include <vector>
 
 namespace firebase {
diff --git a/Firestore/core/test/unit/api/load_bundle_task_test.cc b/Firestore/core/test/unit/api/load_bundle_task_test.cc
index f487f4d3f6b..bcc05802e96 100644
--- a/Firestore/core/test/unit/api/load_bundle_task_test.cc
+++ b/Firestore/core/test/unit/api/load_bundle_task_test.cc
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <chrono>  // NOLINT(build/c++11)
-#include <mutex>   // NOLINT(build/c++11)
+#include <chrono>
+#include <mutex>
 #include <queue>
-#include <thread>  // NOLINT(build/c++11)
+#include <thread>
 
 #include "Firestore/core/include/firebase/firestore/firestore_errors.h"
 #include "Firestore/core/src/api/load_bundle_task.h"
diff --git a/Firestore/core/test/unit/core/query_listener_test.cc b/Firestore/core/test/unit/core/query_listener_test.cc
index cec9115fdec..9d447167be7 100644
--- a/Firestore/core/test/unit/core/query_listener_test.cc
+++ b/Firestore/core/test/unit/core/query_listener_test.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/core/query_listener.h"
 
-#include <future>  // NOLINT(build/c++11)
+#include <future>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm b/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm
index 9bc1cb3cc24..f743ab69d6c 100644
--- a/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm
+++ b/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm
@@ -18,8 +18,8 @@
 
 #import <FirebaseAppCheckInterop/FirebaseAppCheckInterop.h>
 
-#include <chrono>  // NOLINT(build/c++11)
-#include <future>  // NOLINT(build/c++11)
+#include <chrono>
+#include <future>
 
 #import "FirebaseCore/Extension/FIRAppInternal.h"
 
diff --git a/Firestore/core/test/unit/credentials/firebase_auth_credentials_provider_test.mm b/Firestore/core/test/unit/credentials/firebase_auth_credentials_provider_test.mm
index 4c93cd51163..226c28dba81 100644
--- a/Firestore/core/test/unit/credentials/firebase_auth_credentials_provider_test.mm
+++ b/Firestore/core/test/unit/credentials/firebase_auth_credentials_provider_test.mm
@@ -16,8 +16,8 @@
 
 #include "Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.h"
 
-#include <chrono>  // NOLINT(build/c++11)
-#include <future>  // NOLINT(build/c++11)
+#include <chrono>
+#include <future>
 #include <memory>
 
 #import "FirebaseAuth/Interop/Public/FirebaseAuthInterop/FIRAuthInterop.h"
diff --git a/Firestore/core/test/unit/local/local_store_test.cc b/Firestore/core/test/unit/local/local_store_test.cc
index 9864c681608..2c0affe91ee 100644
--- a/Firestore/core/test/unit/local/local_store_test.cc
+++ b/Firestore/core/test/unit/local/local_store_test.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/test/unit/local/local_store_test.h"
 
-#include <thread>  // NOLINT(build/c++11)
+#include <thread>
 #include <unordered_map>
 #include <utility>
 #include <vector>
diff --git a/Firestore/core/test/unit/remote/exponential_backoff_test.cc b/Firestore/core/test/unit/remote/exponential_backoff_test.cc
index d6b183ad532..f491066ddb5 100644
--- a/Firestore/core/test/unit/remote/exponential_backoff_test.cc
+++ b/Firestore/core/test/unit/remote/exponential_backoff_test.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/remote/exponential_backoff.h"
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 
 #include "Firestore/core/src/util/async_queue.h"
 #include "Firestore/core/src/util/executor.h"
diff --git a/Firestore/core/test/unit/remote/grpc_stream_tester.h b/Firestore/core/test/unit/remote/grpc_stream_tester.h
index 8f06493bee5..22d30fec66c 100644
--- a/Firestore/core/test/unit/remote/grpc_stream_tester.h
+++ b/Firestore/core/test/unit/remote/grpc_stream_tester.h
@@ -18,7 +18,7 @@
 #define FIRESTORE_CORE_TEST_UNIT_REMOTE_GRPC_STREAM_TESTER_H_
 
 #include <functional>
-#include <future>  // NOLINT(build/c++11)
+#include <future>
 #include <initializer_list>
 #include <memory>
 #include <string>
diff --git a/Firestore/core/test/unit/testutil/async_testing.h b/Firestore/core/test/unit/testutil/async_testing.h
index a08e58749ce..88576f54343 100644
--- a/Firestore/core/test/unit/testutil/async_testing.h
+++ b/Firestore/core/test/unit/testutil/async_testing.h
@@ -17,12 +17,12 @@
 #ifndef FIRESTORE_CORE_TEST_UNIT_TESTUTIL_ASYNC_TESTING_H_
 #define FIRESTORE_CORE_TEST_UNIT_TESTUTIL_ASYNC_TESTING_H_
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 #include <functional>
-#include <future>  // NOLINT(build/c++11)
+#include <future>
 #include <memory>
-#include <mutex>   // NOLINT(build/c++11)
-#include <thread>  // NOLINT(build/c++11)
+#include <mutex>
+#include <thread>
 #include <utility>
 #include <vector>
 
diff --git a/Firestore/core/test/unit/testutil/testutil.cc b/Firestore/core/test/unit/testutil/testutil.cc
index b0c46f66dfd..0e851af695d 100644
--- a/Firestore/core/test/unit/testutil/testutil.cc
+++ b/Firestore/core/test/unit/testutil/testutil.cc
@@ -17,7 +17,7 @@
 #include "Firestore/core/test/unit/testutil/testutil.h"
 
 #include <algorithm>
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 #include <set>
 
 #include "Firestore/core/include/firebase/firestore/geo_point.h"
diff --git a/Firestore/core/test/unit/testutil/time_testing.h b/Firestore/core/test/unit/testutil/time_testing.h
index 90410fdb955..3b0f30d670c 100644
--- a/Firestore/core/test/unit/testutil/time_testing.h
+++ b/Firestore/core/test/unit/testutil/time_testing.h
@@ -17,7 +17,7 @@
 #ifndef FIRESTORE_CORE_TEST_UNIT_TESTUTIL_TIME_TESTING_H_
 #define FIRESTORE_CORE_TEST_UNIT_TESTUTIL_TIME_TESTING_H_
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 
 #include "Firestore/core/include/firebase/firestore/timestamp.h"
 
diff --git a/Firestore/core/test/unit/util/async_queue_test.cc b/Firestore/core/test/unit/util/async_queue_test.cc
index 57cdb1f3976..40a727b7f84 100644
--- a/Firestore/core/test/unit/util/async_queue_test.cc
+++ b/Firestore/core/test/unit/util/async_queue_test.cc
@@ -16,8 +16,8 @@
 
 #include "Firestore/core/test/unit/util/async_queue_test.h"
 
-#include <chrono>  // NOLINT(build/c++11)
-#include <future>  // NOLINT(build/c++11)
+#include <chrono>
+#include <future>
 #include <string>
 
 #include "Firestore/core/src/util/executor.h"
diff --git a/Firestore/core/test/unit/util/executor_test.cc b/Firestore/core/test/unit/util/executor_test.cc
index 5a090529e2c..92bc1e3a127 100644
--- a/Firestore/core/test/unit/util/executor_test.cc
+++ b/Firestore/core/test/unit/util/executor_test.cc
@@ -16,12 +16,13 @@
 
 #include "Firestore/core/test/unit/util/executor_test.h"
 
-#include <chrono>              // NOLINT(build/c++11)
-#include <condition_variable>  // NOLINT(build/c++11)
 #include <cstdlib>
-#include <future>  // NOLINT(build/c++11)
+
+#include <chrono>
+#include <condition_variable>
+#include <future>
 #include <string>
-#include <thread>  // NOLINT(build/c++11)
+#include <thread>
 
 #include "Firestore/core/src/util/executor.h"
 #include "Firestore/core/src/util/task.h"
diff --git a/Firestore/core/test/unit/util/schedule_test.cc b/Firestore/core/test/unit/util/schedule_test.cc
index 43352c87bfa..5c858d41eda 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>
 #include <string>
 
 #include "Firestore/core/src/util/task.h"
diff --git a/Firestore/core/test/unit/util/task_test.cc b/Firestore/core/test/unit/util/task_test.cc
index 5a7fc4a1445..654830813d8 100644
--- a/Firestore/core/test/unit/util/task_test.cc
+++ b/Firestore/core/test/unit/util/task_test.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/util/task.h"
 
-#include <chrono>  // NOLINT(build/c++11)
+#include <chrono>
 
 #include "Firestore/core/src/util/defer.h"
 #include "Firestore/core/src/util/hard_assert.h"
diff --git a/Firestore/core/test/unit/util/testing_hooks_test.cc b/Firestore/core/test/unit/util/testing_hooks_test.cc
index b7f27bc6e3d..7f0b3309d56 100644
--- a/Firestore/core/test/unit/util/testing_hooks_test.cc
+++ b/Firestore/core/test/unit/util/testing_hooks_test.cc
@@ -16,11 +16,11 @@
 
 #include "Firestore/core/src/util/testing_hooks.h"
 
-#include <chrono>  // NOLINT(build/c++11)
-#include <future>  // NOLINT(build/c++11)
+#include <chrono>
+#include <future>
 #include <memory>
 #include <string>
-#include <thread>  // NOLINT(build/c++11)
+#include <thread>
 
 #include "Firestore/core/src/api/listener_registration.h"
 #include "Firestore/core/src/nanopb/byte_string.h"
@@ -34,7 +34,7 @@
 
 namespace {
 
-using namespace std::chrono_literals;  // NOLINT(build/namespaces)
+using namespace std::chrono_literals;
 
 using firebase::firestore::api::ListenerRegistration;
 using firebase::firestore::nanopb::ByteString;
diff --git a/Firestore/core/test/unit/util/thread_safe_memoizer_test.cc b/Firestore/core/test/unit/util/thread_safe_memoizer_test.cc
index 767fa7cb318..86c73d9c207 100644
--- a/Firestore/core/test/unit/util/thread_safe_memoizer_test.cc
+++ b/Firestore/core/test/unit/util/thread_safe_memoizer_test.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/util/thread_safe_memoizer.h"
 
-#include <thread>  // NOLINT(build/c++11)
+#include <thread>
 #include "gtest/gtest.h"
 
 namespace firebase {
diff --git a/scripts/cpplint.py b/scripts/cpplint.py
index 87114b951a1..43250d5628a 100644
--- a/scripts/cpplint.py
+++ b/scripts/cpplint.py
@@ -269,9 +269,6 @@
 # here!  cpplint_unittest.py should tell you if you forget to do this.
 _ERROR_CATEGORIES = [
     'build/class',
-    'build/c++11',
-    'build/c++14',
-    'build/c++tr1',
     'build/deprecated',
     'build/endif_comment',
     'build/explicit_make_pair',
@@ -283,7 +280,6 @@
     'build/include_order',
     'build/include_what_you_use',
     'build/namespaces_headers',
-    'build/namespaces_literals',
     'build/namespaces',
     'build/printf_format',
     'build/storage_class',