diff --git a/cobalt/samples/simple_example/testdata/test_cases/case1.txt b/cobalt/samples/simple_example/testdata/test_cases/case1.txt
index 10f7dace6c7c..0b068020d532 100644
--- a/cobalt/samples/simple_example/testdata/test_cases/case1.txt
+++ b/cobalt/samples/simple_example/testdata/test_cases/case1.txt
@@ -1 +1 @@
-1 2 4
\ No newline at end of file
+1 2 4
diff --git a/cobalt/samples/simple_example/testdata/test_cases/case1.txt.expected b/cobalt/samples/simple_example/testdata/test_cases/case1.txt.expected
index 62f9457511f8..1e8b31496214 100644
--- a/cobalt/samples/simple_example/testdata/test_cases/case1.txt.expected
+++ b/cobalt/samples/simple_example/testdata/test_cases/case1.txt.expected
@@ -1 +1 @@
-6
\ No newline at end of file
+6
diff --git a/cobalt/samples/simple_example/testdata/test_cases/case2.txt b/cobalt/samples/simple_example/testdata/test_cases/case2.txt
index 52339048801d..8767b390f52d 100644
--- a/cobalt/samples/simple_example/testdata/test_cases/case2.txt
+++ b/cobalt/samples/simple_example/testdata/test_cases/case2.txt
@@ -1 +1 @@
--3 10 15
\ No newline at end of file
+-3 10 15
diff --git a/cobalt/samples/simple_example/testdata/test_cases/case2.txt.expected b/cobalt/samples/simple_example/testdata/test_cases/case2.txt.expected
index 2a62ede1ea07..21922364cc6f 100644
--- a/cobalt/samples/simple_example/testdata/test_cases/case2.txt.expected
+++ b/cobalt/samples/simple_example/testdata/test_cases/case2.txt.expected
@@ -1 +1 @@
--15
\ No newline at end of file
+-15
diff --git a/cobalt/samples/simple_example/testdata/test_cases/case3.txt b/cobalt/samples/simple_example/testdata/test_cases/case3.txt
index 52e9a01fdb65..f00316c15d26 100644
--- a/cobalt/samples/simple_example/testdata/test_cases/case3.txt
+++ b/cobalt/samples/simple_example/testdata/test_cases/case3.txt
@@ -1 +1 @@
-10 -5 -4
\ No newline at end of file
+10 -5 -4
diff --git a/cobalt/samples/simple_example/testdata/test_cases/case3.txt.expected b/cobalt/samples/simple_example/testdata/test_cases/case3.txt.expected
index deff07f52836..b7112a43057f 100644
--- a/cobalt/samples/simple_example/testdata/test_cases/case3.txt.expected
+++ b/cobalt/samples/simple_example/testdata/test_cases/case3.txt.expected
@@ -1 +1 @@
--54
\ No newline at end of file
+-54
diff --git a/components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1to2/commands.json b/components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1to2/commands.json
index 83e47336602e..f64d854dbbd7 100644
--- a/components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1to2/commands.json
+++ b/components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1to2/commands.json
@@ -1 +1 @@
-[{"output": "a_changing_text_file", "patch": "f0", "sha256": "aa607adc0b3cd83e7e9f3ebd4ae84671e2b0b288c9b7fed1e0c710025719caf5", "op": "create"}, {"output": "a_changing_binary_file", "input": "a_changing_binary_file", "patch": "f1", "sha256": "dbd6da0fd6f748b7ec95f0eed6c1f6a046d161bebb04994fe1ce730e237a733d", "op": "bsdiff"}, {"output": "manifest.json", "patch": "f2", "sha256": "1cf8d0b433c09c465994e952a79ff6980c68cc7493609f0233a4634de6276e9c", "op": "create"}, {"output": "a_static_text_file", "input": "a_static_text_file", "sha256": "806bfdfbf05afab546b3741e84fb1ccffdf75eef8629c24c5f84add2785b7bcc", "op": "copy"}]
\ No newline at end of file
+[{"output": "a_changing_text_file", "patch": "f0", "sha256": "aa607adc0b3cd83e7e9f3ebd4ae84671e2b0b288c9b7fed1e0c710025719caf5", "op": "create"}, {"output": "a_changing_binary_file", "input": "a_changing_binary_file", "patch": "f1", "sha256": "dbd6da0fd6f748b7ec95f0eed6c1f6a046d161bebb04994fe1ce730e237a733d", "op": "bsdiff"}, {"output": "manifest.json", "patch": "f2", "sha256": "1cf8d0b433c09c465994e952a79ff6980c68cc7493609f0233a4634de6276e9c", "op": "create"}, {"output": "a_static_text_file", "input": "a_static_text_file", "sha256": "806bfdfbf05afab546b3741e84fb1ccffdf75eef8629c24c5f84add2785b7bcc", "op": "copy"}]
diff --git a/components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1to2_bad/commands.json b/components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1to2_bad/commands.json
index b42e1a4c312c..b8b55639999d 100644
--- a/components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1to2_bad/commands.json
+++ b/components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1to2_bad/commands.json
@@ -1 +1 @@
-[{"sha256": "806bfdfbf05afab546b3741e84fb1ccffdf75eef8629c24c5f84add2785b7bcc", "output": "a_static_text_file", "op": "copy", "input": "a_static_text_file"}, {"sha256": "1cf8d0b433c09c465994e952a79ff6980c68cc7493609f0233a4634de6276e9c", "output": "manifest.json", "op": "create", "patch": "f1"}, {"sha256": "aa607adc0b3cd83e7e9f3ebd4ae84671e2b0b288c9b7fed1e0c710025719caf5", "output": "a_changing_text_file", "op": "create", "patch": "f2"}, {"patch": "f3", "sha256": "dbd6da0fd6f748b7ec95f0eed6c1f6a046d161bebb04994fe1ce730e237a733d", "output": "a_changing_binary_file", "op": "courgette", "input": "a_changing_binary_file"}]
\ No newline at end of file
+[{"sha256": "806bfdfbf05afab546b3741e84fb1ccffdf75eef8629c24c5f84add2785b7bcc", "output": "a_static_text_file", "op": "copy", "input": "a_static_text_file"}, {"sha256": "1cf8d0b433c09c465994e952a79ff6980c68cc7493609f0233a4634de6276e9c", "output": "manifest.json", "op": "create", "patch": "f1"}, {"sha256": "aa607adc0b3cd83e7e9f3ebd4ae84671e2b0b288c9b7fed1e0c710025719caf5", "output": "a_changing_text_file", "op": "create", "patch": "f2"}, {"patch": "f3", "sha256": "dbd6da0fd6f748b7ec95f0eed6c1f6a046d161bebb04994fe1ce730e237a733d", "output": "a_changing_binary_file", "op": "courgette", "input": "a_changing_binary_file"}]
diff --git a/starboard/common/common.cc b/starboard/common/common.cc
index e386fb555d49..a73f4a766484 100644
--- a/starboard/common/common.cc
+++ b/starboard/common/common.cc
@@ -17,8 +17,8 @@
 // These audits are here so they are only displayed once every build.
 
 #if SB_API_VERSION == SB_MAXIMUM_API_VERSION
-#pragma message(                                                            \
-        "Your platform's SB_API_VERSION == SB_MAXIMUM_API_VERSION. "        \
-        "You are implementing the Unreleased version of Starboard at your " \
-        "own risk!  We don't recommend this for third parties.")
+#pragma message(                                                        \
+    "Your platform's SB_API_VERSION == SB_MAXIMUM_API_VERSION. "        \
+    "You are implementing the Unreleased version of Starboard at your " \
+    "own risk!  We don't recommend this for third parties.")
 #endif
diff --git a/starboard/common/flat_map.h b/starboard/common/flat_map.h
index 05e227b8db57..73055973ce7f 100644
--- a/starboard/common/flat_map.h
+++ b/starboard/common/flat_map.h
@@ -15,14 +15,14 @@
 #ifndef STARBOARD_COMMON_FLAT_MAP_H_
 #define STARBOARD_COMMON_FLAT_MAP_H_
 
-#include "starboard/common/log.h"
-#include "starboard/types.h"
-
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
 
+#include "starboard/common/log.h"
+#include "starboard/types.h"
+
 namespace starboard {
 namespace flat_map_detail {
 // IsPod<> is a white list of common types that are "plain-old-data'.
diff --git a/starboard/elf_loader/elf.h b/starboard/elf_loader/elf.h
index 770c90144e3d..bf320a18f35c 100644
--- a/starboard/elf_loader/elf.h
+++ b/starboard/elf_loader/elf.h
@@ -440,11 +440,11 @@ typedef Elf64_Sword Sword;
 #endif
 
 #define ELF32_R_SYM(val) ((val) >> 8)
-#define ELF32_R_TYPE(val) ((val)&0xff)
-#define ELF32_R_INFO(sym, type) (((sym) << 8) + ((type)&0xff))
+#define ELF32_R_TYPE(val) ((val) & 0xff)
+#define ELF32_R_INFO(sym, type) (((sym) << 8) + ((type) & 0xff))
 
 #define ELF64_R_SYM(i) ((i) >> 32)
-#define ELF64_R_TYPE(i) ((i)&0xffffffff)
+#define ELF64_R_TYPE(i) ((i) & 0xffffffff)
 #define ELF64_R_INFO(sym, type) ((((Elf64_Xword)(sym)) << 32) + (type))
 
 #define ELFMAG "\177ELF"
@@ -680,7 +680,7 @@ typedef enum RelocationTypes {
 #define PAGE_MASK (~(PAGE_SIZE - 1))
 #endif
 
-#define PAGE_START(x) ((x)&PAGE_MASK)
+#define PAGE_START(x) ((x) & PAGE_MASK)
 #define PAGE_OFFSET(x) ((x) & ~PAGE_MASK)
 #define PAGE_END(x) PAGE_START((x) + (PAGE_SIZE - 1))
 
diff --git a/starboard/shared/win32/memory_flush.cc b/starboard/shared/win32/memory_flush.cc
index 456d830489ae..297c01b42190 100644
--- a/starboard/shared/win32/memory_flush.cc
+++ b/starboard/shared/win32/memory_flush.cc
@@ -15,7 +15,7 @@
 #include "starboard/common/log.h"
 #include "starboard/memory.h"
 
-#include <windows.h>
+#include <windows.h>  // NOLINT(build/include_order)
 
 #if !SB_CAN(MAP_EXECUTABLE_MEMORY)
 #error \
diff --git a/starboard/shared/win32/system_symbolize.cc b/starboard/shared/win32/system_symbolize.cc
index 42c9de242bf9..ef9dd9b5a1b9 100644
--- a/starboard/shared/win32/system_symbolize.cc
+++ b/starboard/shared/win32/system_symbolize.cc
@@ -19,8 +19,9 @@
 #include <functional>
 #include <string>
 
-#include <Windows.h>  // Must go before dbghelp.h
-#include <dbghelp.h>
+// Must go before dbghelp.h
+#include <Windows.h>  // NOLINT(build/include_order)
+#include <dbghelp.h>  // NOLINT(build/include_order)
 
 #include "starboard/common/log.h"
 #include "starboard/common/mutex.h"