23 files changed, 17 insertions, 23 deletions

diff --git a/abs32_utils.cc b/abs32_utils.cc
index 91bdb61..5d3d6ea 100644
--- a/abs32_utils.cc
+++ b/abs32_utils.cc
@@ -8,7 +8,7 @@
 #include <type_traits>
 #include <utility>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "components/zucchini/io_utils.h"
 
 namespace zucchini {
diff --git a/algorithm_unittest.cc b/algorithm_unittest.cc
index ad5b9b8..2e1f94d 100644
--- a/algorithm_unittest.cc
+++ b/algorithm_unittest.cc
@@ -7,7 +7,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace zucchini {
diff --git a/arm_utils_unittest.cc b/arm_utils_unittest.cc
index 2b669d0..56aa1f9 100644
--- a/arm_utils_unittest.cc
+++ b/arm_utils_unittest.cc
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "components/zucchini/address_translator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/binary_data_histogram.cc b/binary_data_histogram.cc
index 785e8ea..7f6ece8 100644
--- a/binary_data_histogram.cc
+++ b/binary_data_histogram.cc
@@ -8,8 +8,8 @@
 #include <cmath>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/format_macros.h"
-#include "base/logging.h"
 #include "base/strings/stringprintf.h"
 
 namespace zucchini {
diff --git a/crc32.cc b/crc32.cc
index 8a40296..1c45dfe 100644
--- a/crc32.cc
+++ b/crc32.cc
@@ -6,7 +6,7 @@
 
 #include <array>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace zucchini {
 
diff --git a/disassembler.cc b/disassembler.cc
index 897d949..0411791 100644
--- a/disassembler.cc
+++ b/disassembler.cc
@@ -4,7 +4,7 @@
 
 #include "components/zucchini/disassembler.h"
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace zucchini {
 
diff --git a/disassembler_ztf.cc b/disassembler_ztf.cc
index 62e3ed4..c54a7b0 100644
--- a/disassembler_ztf.cc
+++ b/disassembler_ztf.cc
@@ -10,7 +10,7 @@
 #include <limits>
 #include <numeric>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/macros.h"
 #include "base/numerics/checked_math.h"
 #include "base/numerics/safe_conversions.h"
diff --git a/disassembler_ztf_unittest.cc b/disassembler_ztf_unittest.cc
index 1e71359..81891da 100644
--- a/disassembler_ztf_unittest.cc
+++ b/disassembler_ztf_unittest.cc
@@ -13,7 +13,6 @@
 #include <utility>
 #include <vector>
 
-#include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_piece.h"
 #include "components/zucchini/buffer_view.h"
diff --git a/element_detection.cc b/element_detection.cc
index d4347c5..bec16be 100644
--- a/element_detection.cc
+++ b/element_detection.cc
@@ -6,7 +6,6 @@
 
 #include <utility>
 
-#include "base/logging.h"
 #include "components/zucchini/buildflags.h"
 #include "components/zucchini/disassembler.h"
 #include "components/zucchini/disassembler_no_op.h"
diff --git a/encoded_view.cc b/encoded_view.cc
index 90eeba9..205603f 100644
--- a/encoded_view.cc
+++ b/encoded_view.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <utility>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace zucchini {
 
diff --git a/image_utils_unittest.cc b/image_utils_unittest.cc
index 81695e9..2cf6455 100644
--- a/image_utils_unittest.cc
+++ b/image_utils_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "components/zucchini/image_utils.h"
 
-#include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace zucchini {
diff --git a/imposed_ensemble_matcher_unittest.cc b/imposed_ensemble_matcher_unittest.cc
index 97a8898..f3bb277 100644
--- a/imposed_ensemble_matcher_unittest.cc
+++ b/imposed_ensemble_matcher_unittest.cc
@@ -13,7 +13,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/optional.h"
 #include "components/zucchini/buffer_view.h"
 #include "components/zucchini/disassembler.h"
diff --git a/io_utils_unittest.cc b/io_utils_unittest.cc
index f3e82ec..521e7ce 100644
--- a/io_utils_unittest.cc
+++ b/io_utils_unittest.cc
@@ -9,7 +9,6 @@
 #include <sstream>
 #include <string>
 
-#include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace zucchini {
diff --git a/mapped_file.cc b/mapped_file.cc
index 497b42a..2ea973c 100644
--- a/mapped_file.cc
+++ b/mapped_file.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/files/file_util.h"
-#include "base/logging.h"
 #include "build/build_config.h"
 
 namespace zucchini {
diff --git a/reference_bytes_mixer.cc b/reference_bytes_mixer.cc
index a073a6a..d6edd3a 100644
--- a/reference_bytes_mixer.cc
+++ b/reference_bytes_mixer.cc
@@ -4,7 +4,8 @@
 
 #include "components/zucchini/reference_bytes_mixer.h"
 
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
 #include "components/zucchini/disassembler.h"
 
 namespace zucchini {
diff --git a/reference_set.cc b/reference_set.cc
index 0179a51..14d4e54 100644
--- a/reference_set.cc
+++ b/reference_set.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <iterator>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/macros.h"
 #include "components/zucchini/target_pool.h"
 
diff --git a/rel32_finder_unittest.cc b/rel32_finder_unittest.cc
index c32f814..9da88bf 100644
--- a/rel32_finder_unittest.cc
+++ b/rel32_finder_unittest.cc
@@ -13,8 +13,8 @@
 #include <utility>
 #include <vector>
 
+#include "base/check_op.h"
 #include "base/format_macros.h"
-#include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "components/zucchini/buffer_view.h"
 #include "components/zucchini/image_utils.h"
diff --git a/rel32_utils.cc b/rel32_utils.cc
index 2d42975..37bcb6f 100644
--- a/rel32_utils.cc
+++ b/rel32_utils.cc
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "components/zucchini/io_utils.h"
 
 namespace zucchini {
diff --git a/reloc_win32_unittest.cc b/reloc_win32_unittest.cc
index eaf55e1..1b9894f 100644
--- a/reloc_win32_unittest.cc
+++ b/reloc_win32_unittest.cc
@@ -12,7 +12,6 @@
 #include <utility>
 #include <vector>
 
-#include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/test/gtest_util.h"
 #include "components/zucchini/address_translator.h"
diff --git a/target_pool.cc b/target_pool.cc
index 0c1e0a5..23551fd 100644
--- a/target_pool.cc
+++ b/target_pool.cc
@@ -8,7 +8,7 @@
 #include <iterator>
 #include <utility>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "components/zucchini/algorithm.h"
 #include "components/zucchini/equivalence_map.h"
 
diff --git a/targets_affinity.cc b/targets_affinity.cc
index 11903a9..d083787 100644
--- a/targets_affinity.cc
+++ b/targets_affinity.cc
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "components/zucchini/equivalence_map.h"
 
 namespace zucchini {
diff --git a/test_utils.cc b/test_utils.cc
index 91c8a39..bc912b4 100644
--- a/test_utils.cc
+++ b/test_utils.cc
@@ -7,7 +7,7 @@
 #include <ios>
 #include <sstream>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace zucchini {
 
diff --git a/zucchini_tools.cc b/zucchini_tools.cc
index 5fcf066..e8bf734 100644
--- a/zucchini_tools.cc
+++ b/zucchini_tools.cc
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/strings/stringprintf.h"
 #include "components/zucchini/disassembler.h"
 #include "components/zucchini/element_detection.h"