diff --git a/.github/workflows/bazel_lint.yml b/.github/workflows/bazel_lint.yml
index 12bf84b..aad10d8 100644
--- a/.github/workflows/bazel_lint.yml
+++ b/.github/workflows/bazel_lint.yml
@@ -18,15 +18,9 @@
 name: bazel_lint
 on:
   push:
-    paths:
-      - '**/BUILD'
-      - '**.bzl'
-      - '**/BUILD.bazel'
+    branches: [main]
   pull_request:
-    paths:
-      - '**/BUILD'
-      - '**.bzl'
-      - '**/BUILD.bazel'
+    branches: [main]
 jobs:
   bazel_lint:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/bazel_test.yml b/.github/workflows/bazel_test.yml
index 7d5d4f2..0cd931e 100644
--- a/.github/workflows/bazel_test.yml
+++ b/.github/workflows/bazel_test.yml
@@ -16,7 +16,9 @@ name: Bazel Test
 
 on:
   push:
+    branches: [main]
   pull_request:
+    branches: [main]
   schedule:
     - cron: '0 0 * * *'
   workflow_dispatch:
diff --git a/.github/workflows/cpp_lint.yml b/.github/workflows/cpp_lint.yml
index 5171606..52db398 100644
--- a/.github/workflows/cpp_lint.yml
+++ b/.github/workflows/cpp_lint.yml
@@ -18,20 +18,14 @@
 name: cpplint
 on:
   push:
-    paths:
-      - '**.cc'
-      - '**.h'
-      - '**.cpp'
+    branches: [main]
   pull_request:
-    paths:
-      - '**.cc'
-      - '**.h'
-      - '**.cpp'
+    branches: [main]
 jobs:
   cpplint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-python@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
     - run: pip install cpplint
     - run: cpplint --recursive .
diff --git a/.github/workflows/oss_fuzz.yml b/.github/workflows/oss_fuzz.yml
index f93b9c3..b60a1e4 100644
--- a/.github/workflows/oss_fuzz.yml
+++ b/.github/workflows/oss_fuzz.yml
@@ -15,9 +15,9 @@
 name: OSS-Fuzz CI Fuzz Test
 on:
   push:
-    branches:
-      - master
+    branches: [main]
   pull_request:
+    branches: [main]
   schedule:
     - cron: '0 0 * * *'
 
diff --git a/examples/fuzzed_data_provider_fuzz_test.cc b/examples/fuzzed_data_provider_fuzz_test.cc
index c8d340e..2ba77dc 100644
--- a/examples/fuzzed_data_provider_fuzz_test.cc
+++ b/examples/fuzzed_data_provider_fuzz_test.cc
@@ -16,6 +16,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <vector>
 
 // Workaround for
 // https://github.com/llvm/llvm-project/commit/0cccccf0d2cbd707503263785f9a0407d3e2bd5ea
diff --git a/examples/runfiles_fuzz_test.cc b/examples/runfiles_fuzz_test.cc
index 2383946..c6549d1 100644
--- a/examples/runfiles_fuzz_test.cc
+++ b/examples/runfiles_fuzz_test.cc
@@ -26,7 +26,7 @@
 using ::bazel::tools::cpp::runfiles::Runfiles;
 
 namespace {
-  Runfiles *runfiles = nullptr;
+Runfiles *runfiles = nullptr;
 }
 
 extern "C" void LLVMFuzzerInitialize(int *argc, char ***argv) {
diff --git a/fuzzing/replay/test_replayer.cc b/fuzzing/replay/test_replayer.cc
index 17122c6..f8d7bee 100644
--- a/fuzzing/replay/test_replayer.cc
+++ b/fuzzing/replay/test_replayer.cc
@@ -19,6 +19,7 @@
 #include <unistd.h>
 
 #include <memory>
+#include <string>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"