diff --git a/contrib/brotli/example/CMakeLists.txt b/contrib/brotli/example/CMakeLists.txt
index 17a0926..14f4a6a 100644
--- a/contrib/brotli/example/CMakeLists.txt
+++ b/contrib/brotli/example/CMakeLists.txt
@@ -15,10 +15,14 @@
 add_executable(sapi_minibrotli
   main.cc
   ../utils/utils_brotli.cc
-  ../utils/utils_brotli_enc.cc
+  ../utils/utils_brotli.h
   ../utils/utils_brotli_dec.cc
+  ../utils/utils_brotli_dec.h
+  ../utils/utils_brotli_enc.cc
+  ../utils/utils_brotli_enc.h
 )
 target_link_libraries(sapi_minibrotli PRIVATE
+  absl::die_if_null
   absl::flags
   absl::flags_parse
   absl::log_globals
diff --git a/contrib/brotli/utils/utils_brotli_dec.h b/contrib/brotli/utils/utils_brotli_dec.h
index 15fc4c8..1ce2182 100644
--- a/contrib/brotli/utils/utils_brotli_dec.h
+++ b/contrib/brotli/utils/utils_brotli_dec.h
@@ -17,13 +17,14 @@
 
 #include <vector>
 
+#include "absl/log/die_if_null.h"
 #include "contrib/brotli/sandboxed.h"
 #include "sandboxed_api/util/status_macros.h"
 
 class BrotliDecoder {
  public:
   explicit BrotliDecoder(BrotliSandbox* sandbox)
-      : sandbox_(CHECK_NOTNULL(sandbox)), api_(sandbox_), state_(nullptr) {
+      : sandbox_(ABSL_DIE_IF_NULL(sandbox)), api_(sandbox_), state_(nullptr) {
     status = InitStructs();
   }
   ~BrotliDecoder();
diff --git a/contrib/brotli/utils/utils_brotli_enc.h b/contrib/brotli/utils/utils_brotli_enc.h
index a173cc4..ed1f25b 100644
--- a/contrib/brotli/utils/utils_brotli_enc.h
+++ b/contrib/brotli/utils/utils_brotli_enc.h
@@ -17,13 +17,14 @@
 
 #include <vector>
 
+#include "absl/log/die_if_null.h"
 #include "contrib/brotli/sandboxed.h"
 #include "sandboxed_api/util/status_macros.h"
 
 class BrotliEncoder {
  public:
   explicit BrotliEncoder(BrotliSandbox* sandbox)
-      : sandbox_(CHECK_NOTNULL(sandbox)), api_(sandbox_), state_(nullptr) {
+      : sandbox_(ABSL_DIE_IF_NULL(sandbox)), api_(sandbox_), state_(nullptr) {
     status = InitStructs();
   }
   ~BrotliEncoder();
diff --git a/contrib/libidn2/CMakeLists.txt b/contrib/libidn2/CMakeLists.txt
index 60ab55d..20229b1 100644
--- a/contrib/libidn2/CMakeLists.txt
+++ b/contrib/libidn2/CMakeLists.txt
@@ -71,7 +71,8 @@ target_link_libraries(libidn2_sapi_wrapper
   # PUBLIC so that the include directories are included in the interface
   PUBLIC libidn2_sapi
          sapi::base
-  PRIVATE idn2
+  PRIVATE absl::die_if_null
+          idn2
 )
 
 if(BUILD_TESTING AND SAPI_BUILD_TESTING)
diff --git a/contrib/libidn2/libidn2_sapi.h b/contrib/libidn2/libidn2_sapi.h
index 2718c9e..edf0c5f 100644
--- a/contrib/libidn2/libidn2_sapi.h
+++ b/contrib/libidn2/libidn2_sapi.h
@@ -21,6 +21,7 @@
 #include <cstdlib>
 
 #include "libidn2_sapi.sapi.h"  // NOLINT(build/include)
+#include "absl/log/die_if_null.h"
 #include "sandboxed_api/util/fileops.h"
 
 class Idn2SapiSandbox : public IDN2Sandbox {
@@ -47,7 +48,7 @@ class Idn2SapiSandbox : public IDN2Sandbox {
 class IDN2Lib {
  public:
   explicit IDN2Lib(Idn2SapiSandbox* sandbox)
-      : sandbox_(CHECK_NOTNULL(sandbox)), api_(sandbox_) {}
+      : sandbox_(ABSL_DIE_IF_NULL(sandbox)), api_(sandbox_) {}
   absl::StatusOr<std::string> idn2_register_u8(const char* ulabel,
                                                const char* alabel);
   absl::StatusOr<std::string> idn2_lookup_u8(const char* data);
diff --git a/contrib/libraw/example/CMakeLists.txt b/contrib/libraw/example/CMakeLists.txt
index 7aa8a8d..7d1e189 100644
--- a/contrib/libraw/example/CMakeLists.txt
+++ b/contrib/libraw/example/CMakeLists.txt
@@ -17,6 +17,7 @@ add_executable(sapi_minilibraw
   ../utils/utils_libraw.cc
 )
 target_link_libraries(sapi_minilibraw PRIVATE
+  absl::die_if_null
   absl::flags
   absl::flags_parse
   absl::log_globals
diff --git a/contrib/libraw/utils/utils_libraw.h b/contrib/libraw/utils/utils_libraw.h
index 021ca22..bcdff67 100644
--- a/contrib/libraw/utils/utils_libraw.h
+++ b/contrib/libraw/utils/utils_libraw.h
@@ -17,6 +17,7 @@
 
 #include <vector>
 
+#include "absl/log/die_if_null.h"
 #include "contrib/libraw/sandboxed.h"
 
 enum LibRaw_errors {
@@ -41,7 +42,7 @@ enum LibRaw_errors {
 class LibRaw {
  public:
   LibRaw(LibRawSapiSandbox* sandbox, const std::string& file_name)
-      : sandbox_(CHECK_NOTNULL(sandbox)),
+      : sandbox_(ABSL_DIE_IF_NULL(sandbox)),
         api_(sandbox_),
         file_name_(file_name) {
     init_status_ = InitLibRaw();
diff --git a/contrib/libxls/example/CMakeLists.txt b/contrib/libxls/example/CMakeLists.txt
index 5c3d3a1..52506a1 100644
--- a/contrib/libxls/example/CMakeLists.txt
+++ b/contrib/libxls/example/CMakeLists.txt
@@ -15,9 +15,11 @@
 add_executable(sapi_minixls
   main.cc
   ../utils/utils_libxls.cc
+  ../utils/utils_libxls.h
 )
 
 target_link_libraries(sapi_minixls PRIVATE
+  absl::die_if_null
   absl::flags
   absl::flags_parse
   absl::log_globals
diff --git a/contrib/libxls/utils/utils_libxls.h b/contrib/libxls/utils/utils_libxls.h
index a46ff47..af73c16 100644
--- a/contrib/libxls/utils/utils_libxls.h
+++ b/contrib/libxls/utils/utils_libxls.h
@@ -17,6 +17,7 @@
 
 #include <fcntl.h>
 
+#include "absl/log/die_if_null.h"
 #include "contrib/libxls/sandboxed.h"
 
 #define XLS_RECORD_FORMULA 0x0006
@@ -60,7 +61,7 @@ class LibXlsSheet {
 
   LibXlsSheet(LibxlsSapiSandbox* sandbox, xlsWorkSheet* rws, size_t row,
               size_t col)
-      : sandbox_(CHECK_NOTNULL(sandbox)), rws_(rws), row_(row), col_(col) {}
+      : sandbox_(ABSL_DIE_IF_NULL(sandbox)), rws_(rws), row_(row), col_(col) {}
 
   absl::StatusOr<std::string> GetStr(const sapi::v::Struct<xlsCell>& sapi_cell);
   absl::StatusOr<LibXlsCell> GetNewCell(
diff --git a/contrib/libzip/CMakeLists.txt b/contrib/libzip/CMakeLists.txt
index 5b587d5..8a4afff 100644
--- a/contrib/libzip/CMakeLists.txt
+++ b/contrib/libzip/CMakeLists.txt
@@ -91,6 +91,9 @@ target_sources(sapi_zip PUBLIC
   utils/utils_zip.cc
   utils/utils_zip.h
 )
+target_link_libraries(sapi_zip PRIVATE
+  absl::die_if_null
+)
 
 if(SAPI_BUILD_EXAMPLES)
   add_subdirectory(example)
diff --git a/contrib/libzip/utils/utils_zip.h b/contrib/libzip/utils/utils_zip.h
index ba86c0e..54dbe40 100644
--- a/contrib/libzip/utils/utils_zip.h
+++ b/contrib/libzip/utils/utils_zip.h
@@ -17,13 +17,14 @@
 
 #include <fcntl.h>
 
+#include "absl/log/die_if_null.h"
 #include "contrib/libzip/sandboxed.h"
 #include "sandboxed_api/util/status_macros.h"
 
 class LibZip {
  public:
   explicit LibZip(ZipSandbox* sandbox, std::string filename, int flags)
-      : sandbox_(CHECK_NOTNULL(sandbox)),
+      : sandbox_(ABSL_DIE_IF_NULL(sandbox)),
         api_(sandbox_),
         filename_(std::move(filename)),
         flags_(flags),
diff --git a/contrib/uriparser/example/CMakeLists.txt b/contrib/uriparser/example/CMakeLists.txt
index d847adc..ea4578d 100644
--- a/contrib/uriparser/example/CMakeLists.txt
+++ b/contrib/uriparser/example/CMakeLists.txt
@@ -18,6 +18,7 @@ add_executable(sapi_miniuriparser
 )
 
 target_link_libraries(sapi_miniuriparser PRIVATE
+  absl::die_if_null
   absl::flags
   absl::flags_parse
   absl::log_globals
diff --git a/contrib/uriparser/utils/utils_uriparser.h b/contrib/uriparser/utils/utils_uriparser.h
index dffdacf..4d0fdcf 100644
--- a/contrib/uriparser/utils/utils_uriparser.h
+++ b/contrib/uriparser/utils/utils_uriparser.h
@@ -18,13 +18,16 @@
 #include <vector>
 
 #include "absl/container/btree_map.h"
+#include "absl/log/die_if_null.h"
 #include "contrib/uriparser/sandboxed.h"
 #include "sandboxed_api/util/status_macros.h"
 
 class UriParser {
  public:
   UriParser(UriparserSandbox* sandbox, const std::string& uri)
-      : sandbox_(CHECK_NOTNULL(sandbox)), api_(sandbox_), c_uri_(uri.c_str()) {
+      : sandbox_(ABSL_DIE_IF_NULL(sandbox)),
+        api_(sandbox_),
+        c_uri_(uri.c_str()) {
     status_ = ParseUri();
   }
 
diff --git a/sandboxed_api/sandbox2/BUILD.bazel b/sandboxed_api/sandbox2/BUILD.bazel
index 4c89d0d..33f66d3 100644
--- a/sandboxed_api/sandbox2/BUILD.bazel
+++ b/sandboxed_api/sandbox2/BUILD.bazel
@@ -656,6 +656,7 @@ cc_library(
         "@com_google_absl//absl/base:config",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/base:dynamic_annotations",
+        "@com_google_absl//absl/log:die_if_null",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
diff --git a/sandboxed_api/sandbox2/CMakeLists.txt b/sandboxed_api/sandbox2/CMakeLists.txt
index 381d64d..f2fe725 100644
--- a/sandboxed_api/sandbox2/CMakeLists.txt
+++ b/sandboxed_api/sandbox2/CMakeLists.txt
@@ -570,7 +570,8 @@ add_library(sandbox2_comms ${SAPI_LIB_TYPE}
 )
 add_library(sandbox2::comms ALIAS sandbox2_comms)
 target_link_libraries(sandbox2_comms
-  PRIVATE absl::status
+  PRIVATE absl::die_if_null
+          absl::status
           absl::statusor
           absl::str_format
           absl::strings
diff --git a/sandboxed_api/sandbox2/comms.cc b/sandboxed_api/sandbox2/comms.cc
index da5fb39..663fcdf 100644
--- a/sandboxed_api/sandbox2/comms.cc
+++ b/sandboxed_api/sandbox2/comms.cc
@@ -39,6 +39,7 @@
 #include "google/protobuf/message.h"
 #include "absl/base/config.h"
 #include "absl/base/dynamic_annotations.h"
+#include "absl/log/die_if_null.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"