diff --git a/pw_allocator/block.cc b/pw_allocator/block.cc
index 7390419..c673eb5 100644
--- a/pw_allocator/block.cc
+++ b/pw_allocator/block.cc
@@ -16,6 +16,8 @@
 
 #include <cstring>
 
+#include "pw_assert/check.h"
+
 namespace pw::allocator {
 
 Status Block::Init(const std::span<std::byte> region, Block** block) {
diff --git a/pw_allocator/freelist_heap.cc b/pw_allocator/freelist_heap.cc
index 750a857..8d04b49 100644
--- a/pw_allocator/freelist_heap.cc
+++ b/pw_allocator/freelist_heap.cc
@@ -16,7 +16,7 @@
 
 #include <cstring>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_log/log.h"
 
 namespace pw::allocator {
diff --git a/pw_allocator/public/pw_allocator/block.h b/pw_allocator/public/pw_allocator/block.h
index fcea0e0..30753c0 100644
--- a/pw_allocator/public/pw_allocator/block.h
+++ b/pw_allocator/public/pw_allocator/block.h
@@ -18,7 +18,6 @@
 
 #include <span>
 
-#include "pw_assert/assert.h"
 #include "pw_status/status.h"
 
 namespace pw::allocator {
@@ -211,7 +210,7 @@
   // return false to indicate this block is corrupted.
   bool IsValid() const { return CheckStatus() == BlockStatus::VALID; }
 
-  // Uses PW_DCHECK to log information about the reason if a blcok is invalid.
+  // Uses PW_DCHECK to log information about the reason if a block is invalid.
   // This function will do nothing if the block is valid.
   void CrashIfInvalid();
 
diff --git a/pw_assert/assert_backend_compile_test.cc b/pw_assert/assert_backend_compile_test.cc
index 833e8b5..946d3ac 100644
--- a/pw_assert/assert_backend_compile_test.cc
+++ b/pw_assert/assert_backend_compile_test.cc
@@ -37,7 +37,7 @@
 
 // clang-format off
 #define PW_ASSERT_USE_SHORT_NAMES 1
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 // clang-format on
 
 #include "gtest/gtest.h"
diff --git a/pw_assert/assert_backend_compile_test_c.c b/pw_assert/assert_backend_compile_test_c.c
index a4aaced..a23c58b 100644
--- a/pw_assert/assert_backend_compile_test_c.c
+++ b/pw_assert/assert_backend_compile_test_c.c
@@ -23,7 +23,7 @@
 #undef PW_ASSERT_USE_SHORT_NAMES
 #define PW_ASSERT_USE_SHORT_NAMES 1
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 
 static void EnsureNullIsIncluded(void) {
   // This is a compile check to ensure NULL is defined. It comes before the
@@ -34,7 +34,7 @@
 
 #include <stdbool.h>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_status/status.h"
 
 #ifdef __cplusplus
diff --git a/pw_assert/light_test.cc b/pw_assert/light_test.cc
index 1710e4f..8c23df0 100644
--- a/pw_assert/light_test.cc
+++ b/pw_assert/light_test.cc
@@ -12,8 +12,6 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_assert/light.h"
-
 #include "gtest/gtest.h"
 #include "pw_assert/assert.h"
 
diff --git a/pw_assert_basic/public_overrides/pw_assert_backend/assert_backend.h b/pw_assert_basic/public_overrides/pw_assert_backend/assert_backend.h
index e7e1840..5cdee4f 100644
--- a/pw_assert_basic/public_overrides/pw_assert_backend/assert_backend.h
+++ b/pw_assert_basic/public_overrides/pw_assert_backend/assert_backend.h
@@ -14,7 +14,7 @@
 
 // This override header merely points to the true backend, in this case the
 // basic one. The reason to redirect is to permit the use of multiple backends
-// (though only pw_assert/assert.h can only point to 1 backend).
+// (though only pw_assert/check.h can only point to 1 backend).
 #pragma once
 
 #include "pw_assert_basic/assert_basic.h"
diff --git a/pw_assert_log/public_overrides/pw_assert_backend/assert_backend.h b/pw_assert_log/public_overrides/pw_assert_backend/assert_backend.h
index 376f51e..8522926 100644
--- a/pw_assert_log/public_overrides/pw_assert_backend/assert_backend.h
+++ b/pw_assert_log/public_overrides/pw_assert_backend/assert_backend.h
@@ -14,7 +14,7 @@
 
 // This override header merely points to the true backend, in this case the
 // basic one. The reason to redirect is to permit the use of multiple backends
-// (though only pw_assert/assert.h can only point to 1 backend).
+// (though only pw_assert/check.h can only point to 1 backend).
 #pragma once
 
 #include "pw_assert_log/assert_log.h"
diff --git a/pw_bloat/bloat_this_binary.cc b/pw_bloat/bloat_this_binary.cc
index bf09f22..425c8f6 100644
--- a/pw_bloat/bloat_this_binary.cc
+++ b/pw_bloat/bloat_this_binary.cc
@@ -17,7 +17,7 @@
 #include <cstring>
 
 #include "pw_assert/assert.h"
-#include "pw_assert/light.h"
+#include "pw_assert/check.h"
 #include "pw_log/log.h"
 
 namespace pw::bloat {
diff --git a/pw_blob_store/blob_store.cc b/pw_blob_store/blob_store.cc
index 39d259c..e584b74 100644
--- a/pw_blob_store/blob_store.cc
+++ b/pw_blob_store/blob_store.cc
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_log/log.h"
 #include "pw_status/try.h"
 
diff --git a/pw_blob_store/public/pw_blob_store/blob_store.h b/pw_blob_store/public/pw_blob_store/blob_store.h
index f8f7b80..e5bb6a1 100644
--- a/pw_blob_store/public/pw_blob_store/blob_store.h
+++ b/pw_blob_store/public/pw_blob_store/blob_store.h
@@ -15,7 +15,7 @@
 
 #include <span>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_kvs/checksum.h"
 #include "pw_kvs/flash_memory.h"
 #include "pw_kvs/key_value_store.h"
diff --git a/pw_blob_store/size_report/base.cc b/pw_blob_store/size_report/base.cc
index 8f0cc65..e020725 100644
--- a/pw_blob_store/size_report/base.cc
+++ b/pw_blob_store/size_report/base.cc
@@ -14,7 +14,7 @@
 
 #include <cstring>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_kvs/flash_test_partition.h"
 #include "pw_kvs/key_value_store.h"
diff --git a/pw_blob_store/size_report/basic_blob.cc b/pw_blob_store/size_report/basic_blob.cc
index 667bc01..77c25e7 100644
--- a/pw_blob_store/size_report/basic_blob.cc
+++ b/pw_blob_store/size_report/basic_blob.cc
@@ -14,7 +14,7 @@
 
 #include <cstring>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_blob_store/blob_store.h"
 #include "pw_kvs/flash_test_partition.h"
diff --git a/pw_blob_store/size_report/deferred_write_blob.cc b/pw_blob_store/size_report/deferred_write_blob.cc
index db2f18a..c654411 100644
--- a/pw_blob_store/size_report/deferred_write_blob.cc
+++ b/pw_blob_store/size_report/deferred_write_blob.cc
@@ -14,7 +14,7 @@
 
 #include <cstring>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_blob_store/blob_store.h"
 #include "pw_kvs/flash_test_partition.h"
diff --git a/pw_containers/intrusive_list.cc b/pw_containers/intrusive_list.cc
index ba35f61..e923684 100644
--- a/pw_containers/intrusive_list.cc
+++ b/pw_containers/intrusive_list.cc
@@ -14,7 +14,7 @@
 
 #include "pw_containers/intrusive_list.h"
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 
 namespace pw::intrusive_list_impl {
 
diff --git a/pw_hdlc/decoder.cc b/pw_hdlc/decoder.cc
index c2e10aa..b66cdf9 100644
--- a/pw_hdlc/decoder.cc
+++ b/pw_hdlc/decoder.cc
@@ -14,7 +14,7 @@
 
 #include "pw_hdlc/decoder.h"
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bytes/endian.h"
 #include "pw_hdlc/internal/protocol.h"
 #include "pw_log/log.h"
diff --git a/pw_hdlc/public/pw_hdlc/decoder.h b/pw_hdlc/public/pw_hdlc/decoder.h
index f6f5707..73e17e8 100644
--- a/pw_hdlc/public/pw_hdlc/decoder.h
+++ b/pw_hdlc/public/pw_hdlc/decoder.h
@@ -19,7 +19,7 @@
 #include <cstring>
 #include <functional>  // std::invoke
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_bytes/span.h"
 #include "pw_checksum/crc32.h"
 #include "pw_result/result.h"
diff --git a/pw_hdlc/public/pw_hdlc/rpc_channel.h b/pw_hdlc/public/pw_hdlc/rpc_channel.h
index 58dac72..03cd7ad 100644
--- a/pw_hdlc/public/pw_hdlc/rpc_channel.h
+++ b/pw_hdlc/public/pw_hdlc/rpc_channel.h
@@ -16,7 +16,7 @@
 #include <array>
 #include <span>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_hdlc/encoder.h"
 #include "pw_rpc/channel.h"
 #include "pw_stream/stream.h"
diff --git a/pw_i2c/address.cc b/pw_i2c/address.cc
index 5cca79a..74584b4 100644
--- a/pw_i2c/address.cc
+++ b/pw_i2c/address.cc
@@ -14,7 +14,7 @@
 
 #include "pw_i2c/address.h"
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 
 namespace pw::i2c {
 
diff --git a/pw_i2c/register_device_test.cc b/pw_i2c/register_device_test.cc
index ef83eed..bfa038c 100644
--- a/pw_i2c/register_device_test.cc
+++ b/pw_i2c/register_device_test.cc
@@ -14,7 +14,7 @@
 #include "pw_i2c/register_device.h"
 
 #include "gtest/gtest.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bytes/byte_builder.h"
 
 namespace pw {
diff --git a/pw_kvs/flash_memory.cc b/pw_kvs/flash_memory.cc
index 8424496..142e7eb 100644
--- a/pw_kvs/flash_memory.cc
+++ b/pw_kvs/flash_memory.cc
@@ -21,7 +21,7 @@
 #include <cinttypes>
 #include <cstring>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_kvs_private/config.h"
 #include "pw_log/log.h"
 #include "pw_status/status_with_size.h"
diff --git a/pw_kvs/key_value_store.cc b/pw_kvs/key_value_store.cc
index 335efd5..56d706c 100644
--- a/pw_kvs/key_value_store.cc
+++ b/pw_kvs/key_value_store.cc
@@ -22,7 +22,7 @@
 #include <cstring>
 #include <type_traits>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_kvs_private/config.h"
 #include "pw_log/shorter.h"
 #include "pw_status/try.h"
diff --git a/pw_kvs/public/pw_kvs/flash_memory.h b/pw_kvs/public/pw_kvs/flash_memory.h
index b767386..8fe6076 100644
--- a/pw_kvs/public/pw_kvs/flash_memory.h
+++ b/pw_kvs/public/pw_kvs/flash_memory.h
@@ -18,7 +18,7 @@
 #include <initializer_list>
 #include <span>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_kvs/alignment.h"
 #include "pw_status/status.h"
 #include "pw_status/status_with_size.h"
diff --git a/pw_kvs/size_report/base.cc b/pw_kvs/size_report/base.cc
index be6d89c..103ca10 100644
--- a/pw_kvs/size_report/base.cc
+++ b/pw_kvs/size_report/base.cc
@@ -14,7 +14,7 @@
 
 #include <cstring>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 
diff --git a/pw_kvs/size_report/base_with_only_flash.cc b/pw_kvs/size_report/base_with_only_flash.cc
index bb7c182..8e8ef68 100644
--- a/pw_kvs/size_report/base_with_only_flash.cc
+++ b/pw_kvs/size_report/base_with_only_flash.cc
@@ -14,7 +14,7 @@
 
 #include <cstring>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_kvs/flash_test_partition.h"
 #include "pw_log/log.h"
diff --git a/pw_kvs/size_report/with_kvs.cc b/pw_kvs/size_report/with_kvs.cc
index fc99e55..d414665 100644
--- a/pw_kvs/size_report/with_kvs.cc
+++ b/pw_kvs/size_report/with_kvs.cc
@@ -14,7 +14,7 @@
 
 #include <cstring>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_kvs/flash_test_partition.h"
 #include "pw_kvs/key_value_store.h"
diff --git a/pw_log_multisink/log_queue.cc b/pw_log_multisink/log_queue.cc
index 48f9661..191c477 100644
--- a/pw_log_multisink/log_queue.cc
+++ b/pw_log_multisink/log_queue.cc
@@ -14,7 +14,7 @@
 
 #include "pw_log_multisink/log_queue.h"
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_log/levels.h"
 #include "pw_log_proto/log.pwpb.h"
 #include "pw_protobuf/wire_format.h"
diff --git a/pw_metric/metric.cc b/pw_metric/metric.cc
index 5e99329..48f3421 100644
--- a/pw_metric/metric.cc
+++ b/pw_metric/metric.cc
@@ -17,6 +17,7 @@
 #include <array>
 #include <span>
 
+#include "pw_assert/check.h"
 #include "pw_log/log.h"
 #include "pw_tokenizer/base64.h"
 
diff --git a/pw_metric/metric_service_nanopb.cc b/pw_metric/metric_service_nanopb.cc
index 96d246d..b5d5bf3 100644
--- a/pw_metric/metric_service_nanopb.cc
+++ b/pw_metric/metric_service_nanopb.cc
@@ -17,7 +17,7 @@
 #include <cstring>
 #include <span>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_containers/vector.h"
 #include "pw_metric/metric.h"
 #include "pw_preprocessor/util.h"
diff --git a/pw_metric/public/pw_metric/metric.h b/pw_metric/public/pw_metric/metric.h
index e229a6f..1ee998d 100644
--- a/pw_metric/public/pw_metric/metric.h
+++ b/pw_metric/public/pw_metric/metric.h
@@ -17,7 +17,6 @@
 #include <initializer_list>
 #include <limits>
 
-#include "pw_assert/assert.h"
 #include "pw_containers/intrusive_list.h"
 #include "pw_preprocessor/arguments.h"
 #include "pw_tokenizer/tokenize.h"
diff --git a/pw_metric/size_report/base.cc b/pw_metric/size_report/base.cc
index 967201c..5fde3b6 100644
--- a/pw_metric/size_report/base.cc
+++ b/pw_metric/size_report/base.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 
diff --git a/pw_metric/size_report/dump.cc b/pw_metric/size_report/dump.cc
index 12a83fb..9e2dfbb 100644
--- a/pw_metric/size_report/dump.cc
+++ b/pw_metric/size_report/dump.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 #include "pw_metric/metric.h"
diff --git a/pw_metric/size_report/more_metrics.cc b/pw_metric/size_report/more_metrics.cc
index 2ceb7f0..5d683f5 100644
--- a/pw_metric/size_report/more_metrics.cc
+++ b/pw_metric/size_report/more_metrics.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 #include "pw_metric/metric.h"
diff --git a/pw_metric/size_report/one_metric.cc b/pw_metric/size_report/one_metric.cc
index 2869267..98db857 100644
--- a/pw_metric/size_report/one_metric.cc
+++ b/pw_metric/size_report/one_metric.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 #include "pw_metric/metric.h"
diff --git a/pw_multisink/drain.cc b/pw_multisink/drain.cc
index 73b935d..e4548c5 100644
--- a/pw_multisink/drain.cc
+++ b/pw_multisink/drain.cc
@@ -13,8 +13,6 @@
 // the License.
 #include "pw_multisink/drain.h"
 
-#include "pw_assert/light.h"
-
 namespace pw {
 namespace multisink {
 
diff --git a/pw_multisink/multisink.cc b/pw_multisink/multisink.cc
index 929eec6..a956071 100644
--- a/pw_multisink/multisink.cc
+++ b/pw_multisink/multisink.cc
@@ -15,7 +15,7 @@
 
 #include <cstring>
 
-#include "pw_assert/light.h"
+#include "pw_assert/check.h"
 #include "pw_multisink/drain.h"
 #include "pw_status/try.h"
 #include "pw_varint/varint.h"
diff --git a/pw_persistent_ram/docs.rst b/pw_persistent_ram/docs.rst
index 19384bd..548e334 100644
--- a/pw_persistent_ram/docs.rst
+++ b/pw_persistent_ram/docs.rst
@@ -47,7 +47,7 @@
 
    .. code-block:: cpp
 
-      #include "pw_assert/assert.h"
+      #include "pw_assert/check.h"
       #include "pw_persistent_ram/persistent.h"
 
       // Provided for example through a linker script.
diff --git a/pw_persistent_ram/public/pw_persistent_ram/persistent.h b/pw_persistent_ram/public/pw_persistent_ram/persistent.h
index 6067d3b..8268666 100644
--- a/pw_persistent_ram/public/pw_persistent_ram/persistent.h
+++ b/pw_persistent_ram/public/pw_persistent_ram/persistent.h
@@ -19,7 +19,7 @@
 #include <type_traits>
 #include <utility>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_checksum/crc16_ccitt.h"
 
 namespace pw::persistent_ram {
diff --git a/pw_result/public/pw_result/result.h b/pw_result/public/pw_result/result.h
index 6c93697..c0c0ca4 100644
--- a/pw_result/public/pw_result/result.h
+++ b/pw_result/public/pw_result/result.h
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <utility>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_status/status.h"
 
 namespace pw {
diff --git a/pw_ring_buffer/prefixed_entry_ring_buffer.cc b/pw_ring_buffer/prefixed_entry_ring_buffer.cc
index 86bdd53..a2d4b2b 100644
--- a/pw_ring_buffer/prefixed_entry_ring_buffer.cc
+++ b/pw_ring_buffer/prefixed_entry_ring_buffer.cc
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cstring>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_varint/varint.h"
 
 namespace pw {
diff --git a/pw_ring_buffer/prefixed_entry_ring_buffer_test.cc b/pw_ring_buffer/prefixed_entry_ring_buffer_test.cc
index bba5bb3..80190b8 100644
--- a/pw_ring_buffer/prefixed_entry_ring_buffer_test.cc
+++ b/pw_ring_buffer/prefixed_entry_ring_buffer_test.cc
@@ -17,7 +17,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_containers/vector.h"
 #include "pw_unit_test/framework.h"
 
diff --git a/pw_router/size_report/base.cc b/pw_router/size_report/base.cc
index 8d63f6f..132616e 100644
--- a/pw_router/size_report/base.cc
+++ b/pw_router/size_report/base.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 #include "pw_sys_io/sys_io.h"
diff --git a/pw_router/size_report/static_router_with_one_route.cc b/pw_router/size_report/static_router_with_one_route.cc
index a285954..266b852 100644
--- a/pw_router/size_report/static_router_with_one_route.cc
+++ b/pw_router/size_report/static_router_with_one_route.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 #include "pw_router/egress_function.h"
diff --git a/pw_router/static_router_test.cc b/pw_router/static_router_test.cc
index 72ca116..172cc01 100644
--- a/pw_router/static_router_test.cc
+++ b/pw_router/static_router_test.cc
@@ -15,6 +15,7 @@
 #include "pw_router/static_router.h"
 
 #include "gtest/gtest.h"
+#include "pw_assert/check.h"
 #include "pw_router/egress_function.h"
 
 namespace pw::router {
diff --git a/pw_rpc/base_server_writer.cc b/pw_rpc/base_server_writer.cc
index 9d4423d..64d73bc 100644
--- a/pw_rpc/base_server_writer.cc
+++ b/pw_rpc/base_server_writer.cc
@@ -14,7 +14,7 @@
 
 #include "pw_rpc/internal/base_server_writer.h"
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_rpc/internal/method.h"
 #include "pw_rpc/internal/packet.h"
 #include "pw_rpc/internal/server.h"
diff --git a/pw_rpc/nanopb/public/pw_rpc/nanopb_test_method_context.h b/pw_rpc/nanopb/public/pw_rpc/nanopb_test_method_context.h
index 1dbc1e1..ba20aa2 100644
--- a/pw_rpc/nanopb/public/pw_rpc/nanopb_test_method_context.h
+++ b/pw_rpc/nanopb/public/pw_rpc/nanopb_test_method_context.h
@@ -16,7 +16,7 @@
 #include <tuple>
 #include <utility>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_containers/vector.h"
 #include "pw_preprocessor/arguments.h"
 #include "pw_rpc/channel.h"
diff --git a/pw_rpc/public/pw_rpc/channel.h b/pw_rpc/public/pw_rpc/channel.h
index 7776ca8..6394b55 100644
--- a/pw_rpc/public/pw_rpc/channel.h
+++ b/pw_rpc/public/pw_rpc/channel.h
@@ -17,7 +17,7 @@
 #include <span>
 #include <type_traits>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_status/status.h"
 
 namespace pw::rpc {
diff --git a/pw_rpc/public/pw_rpc/internal/base_client_call.h b/pw_rpc/public/pw_rpc/internal/base_client_call.h
index 24acafc..49cf513 100644
--- a/pw_rpc/public/pw_rpc/internal/base_client_call.h
+++ b/pw_rpc/public/pw_rpc/internal/base_client_call.h
@@ -13,7 +13,7 @@
 // the License.
 #pragma once
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_containers/intrusive_list.h"
 #include "pw_rpc/internal/channel.h"
 #include "pw_rpc/internal/packet.h"
diff --git a/pw_rpc/public/pw_rpc/internal/call.h b/pw_rpc/public/pw_rpc/internal/call.h
index bdfa56c..b5d5266 100644
--- a/pw_rpc/public/pw_rpc/internal/call.h
+++ b/pw_rpc/public/pw_rpc/internal/call.h
@@ -16,7 +16,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_rpc/internal/channel.h"
 
 namespace pw::rpc {
diff --git a/pw_rpc/public/pw_rpc/internal/channel.h b/pw_rpc/public/pw_rpc/internal/channel.h
index 077ed6a..34dc555 100644
--- a/pw_rpc/public/pw_rpc/internal/channel.h
+++ b/pw_rpc/public/pw_rpc/internal/channel.h
@@ -38,12 +38,12 @@
 
     OutputBuffer(OutputBuffer&& other) { *this = std::move(other); }
 
-    ~OutputBuffer() { PW_DCHECK(buffer_.empty()); }
+    ~OutputBuffer() { PW_DASSERT(buffer_.empty()); }
 
     OutputBuffer& operator=(const OutputBuffer&) = delete;
 
     OutputBuffer& operator=(OutputBuffer&& other) {
-      PW_DCHECK(buffer_.empty());
+      PW_DASSERT(buffer_.empty());
       buffer_ = other.buffer_;
       other.buffer_ = {};
       return *this;
diff --git a/pw_rpc/pw_rpc_private/internal_test_utils.h b/pw_rpc/pw_rpc_private/internal_test_utils.h
index ef0b468..5dbdb11 100644
--- a/pw_rpc/pw_rpc_private/internal_test_utils.h
+++ b/pw_rpc/pw_rpc_private/internal_test_utils.h
@@ -21,7 +21,7 @@
 #include <cstdint>
 #include <span>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_rpc/client.h"
 #include "pw_rpc/internal/channel.h"
 #include "pw_rpc/internal/method.h"
diff --git a/pw_rpc/raw/public/pw_rpc/raw_test_method_context.h b/pw_rpc/raw/public/pw_rpc/raw_test_method_context.h
index 321ea61..aa69a99 100644
--- a/pw_rpc/raw/public/pw_rpc/raw_test_method_context.h
+++ b/pw_rpc/raw/public/pw_rpc/raw_test_method_context.h
@@ -15,7 +15,7 @@
 
 #include <type_traits>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_bytes/span.h"
 #include "pw_containers/vector.h"
 #include "pw_rpc/channel.h"
diff --git a/pw_rpc/server_test.cc b/pw_rpc/server_test.cc
index 685e4fc..b15d276 100644
--- a/pw_rpc/server_test.cc
+++ b/pw_rpc/server_test.cc
@@ -18,7 +18,7 @@
 #include <cstdint>
 
 #include "gtest/gtest.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_rpc/internal/method.h"
 #include "pw_rpc/internal/packet.h"
 #include "pw_rpc/internal/test_method.h"
diff --git a/pw_rpc/size_report/base.cc b/pw_rpc/size_report/base.cc
index 031afee..e0fe44b 100644
--- a/pw_rpc/size_report/base.cc
+++ b/pw_rpc/size_report/base.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 #include "pw_sys_io/sys_io.h"
diff --git a/pw_rpc/size_report/base_with_nanopb.cc b/pw_rpc/size_report/base_with_nanopb.cc
index a5333db..26d9605 100644
--- a/pw_rpc/size_report/base_with_nanopb.cc
+++ b/pw_rpc/size_report/base_with_nanopb.cc
@@ -14,7 +14,7 @@
 
 #include "pb_decode.h"
 #include "pb_encode.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 #include "pw_sys_io/sys_io.h"
diff --git a/pw_rpc/size_report/server_only.cc b/pw_rpc/size_report/server_only.cc
index b57102b..9fbc768 100644
--- a/pw_rpc/size_report/server_only.cc
+++ b/pw_rpc/size_report/server_only.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 #include "pw_rpc/server.h"
diff --git a/pw_rpc/size_report/server_with_echo_service.cc b/pw_rpc/size_report/server_with_echo_service.cc
index 9b2f4cf..a1e9b50 100644
--- a/pw_rpc/size_report/server_with_echo_service.cc
+++ b/pw_rpc/size_report/server_with_echo_service.cc
@@ -14,7 +14,7 @@
 
 #include "pb_decode.h"
 #include "pb_encode.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_bloat/bloat_this_binary.h"
 #include "pw_log/log.h"
 #include "pw_rpc/echo_service_nanopb.h"
diff --git a/pw_stream/public/pw_stream/stream.h b/pw_stream/public/pw_stream/stream.h
index 2fcde9c..7014203 100644
--- a/pw_stream/public/pw_stream/stream.h
+++ b/pw_stream/public/pw_stream/stream.h
@@ -17,7 +17,7 @@
 #include <cstddef>
 #include <span>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_bytes/span.h"
 #include "pw_result/result.h"
 #include "pw_status/status.h"
diff --git a/pw_sync_baremetal/public/pw_sync_baremetal/interrupt_spin_lock_inline.h b/pw_sync_baremetal/public/pw_sync_baremetal/interrupt_spin_lock_inline.h
index 369c956..505cef3 100644
--- a/pw_sync_baremetal/public/pw_sync_baremetal/interrupt_spin_lock_inline.h
+++ b/pw_sync_baremetal/public/pw_sync_baremetal/interrupt_spin_lock_inline.h
@@ -13,7 +13,7 @@
 // the License.
 #pragma once
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_sync/interrupt_spin_lock.h"
 #include "pw_sync/yield_core.h"
 
diff --git a/pw_sync_embos/binary_semaphore.cc b/pw_sync_embos/binary_semaphore.cc
index 7f77afe..6073761 100644
--- a/pw_sync_embos/binary_semaphore.cc
+++ b/pw_sync_embos/binary_semaphore.cc
@@ -17,7 +17,7 @@
 #include <algorithm>
 
 #include "RTOS.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_embos/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_embos/counting_semaphore.cc b/pw_sync_embos/counting_semaphore.cc
index a2dd40e..099cde9 100644
--- a/pw_sync_embos/counting_semaphore.cc
+++ b/pw_sync_embos/counting_semaphore.cc
@@ -17,7 +17,7 @@
 #include <algorithm>
 
 #include "RTOS.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_embos/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_embos/interrupt_spin_lock.cc b/pw_sync_embos/interrupt_spin_lock.cc
index 9d17ba6..2bb029c 100644
--- a/pw_sync_embos/interrupt_spin_lock.cc
+++ b/pw_sync_embos/interrupt_spin_lock.cc
@@ -15,7 +15,7 @@
 #include "pw_sync/interrupt_spin_lock.h"
 
 #include "RTOS.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 
 namespace pw::sync {
 
diff --git a/pw_sync_embos/public/pw_sync_embos/binary_semaphore_inline.h b/pw_sync_embos/public/pw_sync_embos/binary_semaphore_inline.h
index d8abf72..1064d08 100644
--- a/pw_sync_embos/public/pw_sync_embos/binary_semaphore_inline.h
+++ b/pw_sync_embos/public/pw_sync_embos/binary_semaphore_inline.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "RTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_embos/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_embos/public/pw_sync_embos/counting_semaphore_inline.h b/pw_sync_embos/public/pw_sync_embos/counting_semaphore_inline.h
index 55ad150..b222353 100644
--- a/pw_sync_embos/public/pw_sync_embos/counting_semaphore_inline.h
+++ b/pw_sync_embos/public/pw_sync_embos/counting_semaphore_inline.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "RTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_embos/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_embos/public/pw_sync_embos/mutex_inline.h b/pw_sync_embos/public/pw_sync_embos/mutex_inline.h
index 9f8c147..d902f6b 100644
--- a/pw_sync_embos/public/pw_sync_embos/mutex_inline.h
+++ b/pw_sync_embos/public/pw_sync_embos/mutex_inline.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "RTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_interrupt/context.h"
 #include "pw_sync/mutex.h"
 
diff --git a/pw_sync_embos/timed_mutex.cc b/pw_sync_embos/timed_mutex.cc
index c08bef4..3ec1067 100644
--- a/pw_sync_embos/timed_mutex.cc
+++ b/pw_sync_embos/timed_mutex.cc
@@ -17,7 +17,7 @@
 #include <algorithm>
 
 #include "RTOS.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_embos/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_freertos/binary_semaphore.cc b/pw_sync_freertos/binary_semaphore.cc
index ef32b83..8f7b132 100644
--- a/pw_sync_freertos/binary_semaphore.cc
+++ b/pw_sync_freertos/binary_semaphore.cc
@@ -17,7 +17,7 @@
 #include <algorithm>
 
 #include "FreeRTOS.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_freertos/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_freertos/counting_semaphore.cc b/pw_sync_freertos/counting_semaphore.cc
index 3b57397..4ea0ff8 100644
--- a/pw_sync_freertos/counting_semaphore.cc
+++ b/pw_sync_freertos/counting_semaphore.cc
@@ -17,7 +17,7 @@
 #include <algorithm>
 
 #include "FreeRTOS.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_freertos/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_freertos/interrupt_spin_lock.cc b/pw_sync_freertos/interrupt_spin_lock.cc
index 7c96aa8..656b05c 100644
--- a/pw_sync_freertos/interrupt_spin_lock.cc
+++ b/pw_sync_freertos/interrupt_spin_lock.cc
@@ -14,7 +14,7 @@
 
 #include "pw_sync/interrupt_spin_lock.h"
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_interrupt/context.h"
 #include "task.h"
 
diff --git a/pw_sync_freertos/public/pw_sync_freertos/binary_semaphore_inline.h b/pw_sync_freertos/public/pw_sync_freertos/binary_semaphore_inline.h
index 143ef0f..8f48993 100644
--- a/pw_sync_freertos/public/pw_sync_freertos/binary_semaphore_inline.h
+++ b/pw_sync_freertos/public/pw_sync_freertos/binary_semaphore_inline.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "FreeRTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_freertos/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_freertos/public/pw_sync_freertos/counting_semaphore_inline.h b/pw_sync_freertos/public/pw_sync_freertos/counting_semaphore_inline.h
index e5fb377..395161d 100644
--- a/pw_sync_freertos/public/pw_sync_freertos/counting_semaphore_inline.h
+++ b/pw_sync_freertos/public/pw_sync_freertos/counting_semaphore_inline.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "FreeRTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_freertos/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_freertos/public/pw_sync_freertos/mutex_inline.h b/pw_sync_freertos/public/pw_sync_freertos/mutex_inline.h
index 92f7c07..a757860 100644
--- a/pw_sync_freertos/public/pw_sync_freertos/mutex_inline.h
+++ b/pw_sync_freertos/public/pw_sync_freertos/mutex_inline.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "FreeRTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_interrupt/context.h"
 #include "pw_sync/mutex.h"
 #include "semphr.h"
diff --git a/pw_sync_freertos/timed_mutex.cc b/pw_sync_freertos/timed_mutex.cc
index 0143b84..a141ff8 100644
--- a/pw_sync_freertos/timed_mutex.cc
+++ b/pw_sync_freertos/timed_mutex.cc
@@ -17,7 +17,7 @@
 #include <algorithm>
 
 #include "FreeRTOS.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_freertos/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_stl/binary_semaphore.cc b/pw_sync_stl/binary_semaphore.cc
index fdff483..9352f3e 100644
--- a/pw_sync_stl/binary_semaphore.cc
+++ b/pw_sync_stl/binary_semaphore.cc
@@ -14,7 +14,7 @@
 
 #include "pw_sync/binary_semaphore.h"
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 
 using pw::chrono::SystemClock;
 
diff --git a/pw_sync_stl/counting_semaphore.cc b/pw_sync_stl/counting_semaphore.cc
index 629d0dc..b7f0721 100644
--- a/pw_sync_stl/counting_semaphore.cc
+++ b/pw_sync_stl/counting_semaphore.cc
@@ -14,7 +14,7 @@
 
 #include "pw_sync/counting_semaphore.h"
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 
 using pw::chrono::SystemClock;
 
diff --git a/pw_sync_threadx/binary_semaphore.cc b/pw_sync_threadx/binary_semaphore.cc
index 5e16fa9..820a6b0 100644
--- a/pw_sync_threadx/binary_semaphore.cc
+++ b/pw_sync_threadx/binary_semaphore.cc
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_threadx/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_threadx/counting_semaphore.cc b/pw_sync_threadx/counting_semaphore.cc
index e2e5c86..298da13 100644
--- a/pw_sync_threadx/counting_semaphore.cc
+++ b/pw_sync_threadx/counting_semaphore.cc
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_threadx/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_sync_threadx/interrupt_spin_lock.cc b/pw_sync_threadx/interrupt_spin_lock.cc
index 96d5c54..bb73d4e 100644
--- a/pw_sync_threadx/interrupt_spin_lock.cc
+++ b/pw_sync_threadx/interrupt_spin_lock.cc
@@ -14,7 +14,7 @@
 
 #include "pw_sync/interrupt_spin_lock.h"
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "tx_api.h"
 
 namespace pw::sync {
diff --git a/pw_sync_threadx/public/pw_sync_threadx/binary_semaphore_inline.h b/pw_sync_threadx/public/pw_sync_threadx/binary_semaphore_inline.h
index 844a6e6..ae272a5 100644
--- a/pw_sync_threadx/public/pw_sync_threadx/binary_semaphore_inline.h
+++ b/pw_sync_threadx/public/pw_sync_threadx/binary_semaphore_inline.h
@@ -13,7 +13,7 @@
 // the License.
 #pragma once
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_interrupt/context.h"
 #include "pw_sync/binary_semaphore.h"
diff --git a/pw_sync_threadx/public/pw_sync_threadx/counting_semaphore_inline.h b/pw_sync_threadx/public/pw_sync_threadx/counting_semaphore_inline.h
index 7125e01..c3da0cf 100644
--- a/pw_sync_threadx/public/pw_sync_threadx/counting_semaphore_inline.h
+++ b/pw_sync_threadx/public/pw_sync_threadx/counting_semaphore_inline.h
@@ -15,7 +15,7 @@
 
 #include <algorithm>
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_interrupt/context.h"
 #include "pw_sync/counting_semaphore.h"
diff --git a/pw_sync_threadx/public/pw_sync_threadx/mutex_inline.h b/pw_sync_threadx/public/pw_sync_threadx/mutex_inline.h
index 564b24e..d8feabc 100644
--- a/pw_sync_threadx/public/pw_sync_threadx/mutex_inline.h
+++ b/pw_sync_threadx/public/pw_sync_threadx/mutex_inline.h
@@ -13,7 +13,7 @@
 // the License.
 #pragma once
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_interrupt/context.h"
 #include "pw_sync/mutex.h"
 #include "tx_api.h"
diff --git a/pw_sync_threadx/timed_mutex.cc b/pw_sync_threadx/timed_mutex.cc
index 92b14ed..3f06620 100644
--- a/pw_sync_threadx/timed_mutex.cc
+++ b/pw_sync_threadx/timed_mutex.cc
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_threadx/system_clock_constants.h"
 #include "pw_interrupt/context.h"
diff --git a/pw_thread_embos/public/pw_thread_embos/id_inline.h b/pw_thread_embos/public/pw_thread_embos/id_inline.h
index b11078a..e9dd8fe 100644
--- a/pw_thread_embos/public/pw_thread_embos/id_inline.h
+++ b/pw_thread_embos/public/pw_thread_embos/id_inline.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "RTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_thread/id.h"
 
 namespace pw::this_thread {
diff --git a/pw_thread_embos/public/pw_thread_embos/yield_inline.h b/pw_thread_embos/public/pw_thread_embos/yield_inline.h
index 2ad21fb..5bedcb3 100644
--- a/pw_thread_embos/public/pw_thread_embos/yield_inline.h
+++ b/pw_thread_embos/public/pw_thread_embos/yield_inline.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "RTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_thread/id.h"
 
 namespace pw::this_thread {
diff --git a/pw_thread_embos/sleep.cc b/pw_thread_embos/sleep.cc
index 03ca25f..33cb00e 100644
--- a/pw_thread_embos/sleep.cc
+++ b/pw_thread_embos/sleep.cc
@@ -17,7 +17,7 @@
 #include <algorithm>
 
 #include "RTOS.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_embos/system_clock_constants.h"
 #include "pw_thread/id.h"
diff --git a/pw_thread_freertos/public/pw_thread_freertos/id_inline.h b/pw_thread_freertos/public/pw_thread_freertos/id_inline.h
index 0c152e6..0acbea8 100644
--- a/pw_thread_freertos/public/pw_thread_freertos/id_inline.h
+++ b/pw_thread_freertos/public/pw_thread_freertos/id_inline.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "FreeRTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_interrupt/context.h"
 #include "pw_thread/id.h"
 #include "task.h"
diff --git a/pw_thread_freertos/public/pw_thread_freertos/thread_inline.h b/pw_thread_freertos/public/pw_thread_freertos/thread_inline.h
index e0d38b3..e692122 100644
--- a/pw_thread_freertos/public/pw_thread_freertos/thread_inline.h
+++ b/pw_thread_freertos/public/pw_thread_freertos/thread_inline.h
@@ -16,7 +16,7 @@
 #include <algorithm>
 
 #include "FreeRTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_thread/id.h"
 #include "pw_thread_freertos/config.h"
 #include "pw_thread_freertos/options.h"
diff --git a/pw_thread_freertos/public/pw_thread_freertos/yield_inline.h b/pw_thread_freertos/public/pw_thread_freertos/yield_inline.h
index e428c38..1d7aaa9 100644
--- a/pw_thread_freertos/public/pw_thread_freertos/yield_inline.h
+++ b/pw_thread_freertos/public/pw_thread_freertos/yield_inline.h
@@ -16,7 +16,7 @@
 #include <algorithm>
 
 #include "FreeRTOS.h"
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_thread/id.h"
 #include "task.h"
 
diff --git a/pw_thread_freertos/sleep.cc b/pw_thread_freertos/sleep.cc
index 0decfa0..3c64a1b 100644
--- a/pw_thread_freertos/sleep.cc
+++ b/pw_thread_freertos/sleep.cc
@@ -17,7 +17,7 @@
 #include <algorithm>
 
 #include "FreeRTOS.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_freertos/system_clock_constants.h"
 #include "pw_thread/id.h"
diff --git a/pw_thread_freertos/thread.cc b/pw_thread_freertos/thread.cc
index b77df78..5f63291 100644
--- a/pw_thread_freertos/thread.cc
+++ b/pw_thread_freertos/thread.cc
@@ -14,7 +14,7 @@
 #include "pw_thread/thread.h"
 
 #include "FreeRTOS.h"
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_preprocessor/compiler.h"
 #include "pw_thread/id.h"
 #include "pw_thread_freertos/config.h"
diff --git a/pw_thread_threadx/public/pw_thread_threadx/id_inline.h b/pw_thread_threadx/public/pw_thread_threadx/id_inline.h
index 7004996..1ae08b8 100644
--- a/pw_thread_threadx/public/pw_thread_threadx/id_inline.h
+++ b/pw_thread_threadx/public/pw_thread_threadx/id_inline.h
@@ -13,7 +13,7 @@
 // the License.
 #pragma once
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_thread/id.h"
 #include "tx_api.h"
 // Prior to ThreadX 6.1, this contained TX_THREAD_GET_SYSTEM_STATE().
diff --git a/pw_thread_threadx/public/pw_thread_threadx/yield_inline.h b/pw_thread_threadx/public/pw_thread_threadx/yield_inline.h
index 32ce45c..26bfb34 100644
--- a/pw_thread_threadx/public/pw_thread_threadx/yield_inline.h
+++ b/pw_thread_threadx/public/pw_thread_threadx/yield_inline.h
@@ -13,7 +13,7 @@
 // the License.
 #pragma once
 
-#include "pw_assert/light.h"
+#include "pw_assert/assert.h"
 #include "pw_thread/id.h"
 #include "tx_api.h"
 
diff --git a/pw_thread_threadx/sleep.cc b/pw_thread_threadx/sleep.cc
index 1cb5e5c..404ad67 100644
--- a/pw_thread_threadx/sleep.cc
+++ b/pw_thread_threadx/sleep.cc
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_chrono/system_clock.h"
 #include "pw_chrono_threadx/system_clock_constants.h"
 #include "pw_thread/id.h"
diff --git a/pw_thread_threadx/thread.cc b/pw_thread_threadx/thread.cc
index 72befae..500803f 100644
--- a/pw_thread_threadx/thread.cc
+++ b/pw_thread_threadx/thread.cc
@@ -13,7 +13,7 @@
 // the License.
 #include "pw_thread/thread.h"
 
-#include "pw_assert/assert.h"
+#include "pw_assert/check.h"
 #include "pw_preprocessor/compiler.h"
 #include "pw_thread/id.h"
 #include "pw_thread_threadx/config.h"