diff --git a/pw_i2c/BUILD b/pw_i2c/BUILD
index 820c9fe..986f56c 100644
--- a/pw_i2c/BUILD
+++ b/pw_i2c/BUILD
@@ -66,11 +66,11 @@
 
 pw_cc_library(
     name = "register_device",
+    srcs = ["register_device.cc"],
     hdrs = [
         "public/pw_i2c/register_device.h",
     ],
     includes = ["public"],
-    srcs = [ "register_device.cc" ],
     deps = [
         ":address",
         ":device",
diff --git a/pw_snapshot/BUILD b/pw_snapshot/BUILD
index ad9f0dd..558a444 100644
--- a/pw_snapshot/BUILD
+++ b/pw_snapshot/BUILD
@@ -29,7 +29,7 @@
         "pw_snapshot_protos/snapshot.proto",
     ],
     deps = [
-        ":metadata_proto"
+        ":metadata_proto",
     ],
 )
 
diff --git a/pw_string/BUILD b/pw_string/BUILD
index 29d04b4..a46a5f4 100644
--- a/pw_string/BUILD
+++ b/pw_string/BUILD
@@ -39,11 +39,11 @@
     ],
     includes = ["public"],
     deps = [
-        "//pw_preprocessor",
-        "//pw_span",
         "//pw_assert",
-        "//pw_status",
+        "//pw_preprocessor",
         "//pw_result",
+        "//pw_span",
+        "//pw_status",
     ],
 )
 
diff --git a/pw_thread/BUILD b/pw_thread/BUILD
index 9c8c456..828ccc9 100644
--- a/pw_thread/BUILD
+++ b/pw_thread/BUILD
@@ -88,8 +88,8 @@
 pw_cc_facade(
     name = "thread_facade",
     hdrs = [
-        "public/pw_thread/thread.h",
         "public/pw_thread/detached_thread.h",
+        "public/pw_thread/thread.h",
     ],
     includes = ["public"],
     deps = [
diff --git a/third_party/boringssl/BUILD b/third_party/boringssl/BUILD
index 31cc840..e0051e3 100644
--- a/third_party/boringssl/BUILD
+++ b/third_party/boringssl/BUILD
@@ -20,9 +20,9 @@
 
 pw_cc_library(
     name = "sysdeps",
-    hdrs = [ "sysdeps/sys/socket.h" ],
-    includes = [ "sysdeps" ],
-    srcs = [ "crypto_sysrand.cc" ]
+    srcs = ["crypto_sysrand.cc"],
+    hdrs = ["sysdeps/sys/socket.h"],
+    includes = ["sysdeps"],
 )
 
 # TODO(zyecheng): Add build recipes for BoringSSL
diff --git a/third_party/mbedtls/BUILD b/third_party/mbedtls/BUILD
index 89694f2..7d007c5 100644
--- a/third_party/mbedtls/BUILD
+++ b/third_party/mbedtls/BUILD
@@ -24,17 +24,16 @@
 
 # Config targets.
 [
-pw_cc_library(
-    name = "%s_config" % config_name,
-    copts = ["-DMBEDTLS_CONFIG_FILE=\"%s\"" % config_header],
-    hdrs = [
-        config_header,
-        "configs/config_pigweed_common.h",
-    ],
-    includes = [ "." ],
-)
-for config_name, config_header in mbedtls_configs
+    pw_cc_library(
+        name = "%s_config" % config_name,
+        hdrs = [
+            config_header,
+            "configs/config_pigweed_common.h",
+        ],
+        copts = ["-DMBEDTLS_CONFIG_FILE=\"%s\"" % config_header],
+        includes = ["."],
+    )
+    for config_name, config_header in mbedtls_configs
 ]
 
 # TODO(zyecheng): Add build recipe for the library.
-