7 files changed, 3 insertions, 13 deletions
diff --git a/src/win/graph/direct/brush.cpp b/src/win/graph/direct/brush.cpp
index b30d8c24..329ce509 100644
--- a/src/win/graph/direct/brush.cpp
+++ b/src/win/graph/direct/brush.cpp
@@ -4,8 +4,6 @@
 #include "cru/win/graph/direct/exception.hpp"
 #include "cru/win/graph/direct/factory.hpp"
 
-#include <cassert>
-
 namespace cru::platform::graph::win::direct {
 D2DSolidColorBrush::D2DSolidColorBrush(DirectGraphFactory* factory)
     : DirectGraphResource(factory) {
diff --git a/src/win/graph/direct/factory.cpp b/src/win/graph/direct/factory.cpp
index e67bdafe..0f4739ee 100644
--- a/src/win/graph/direct/factory.cpp
+++ b/src/win/graph/direct/factory.cpp
@@ -7,7 +7,6 @@
 #include "cru/win/graph/direct/geometry.hpp"
 #include "cru/win/graph/direct/text_layout.hpp"
 
-#include <cassert>
 #include <cstdlib>
 #include <utility>
 
diff --git a/src/win/graph/direct/font.cpp b/src/win/graph/direct/font.cpp
index 6bd43078..9b5eb477 100644
--- a/src/win/graph/direct/font.cpp
+++ b/src/win/graph/direct/font.cpp
@@ -5,7 +5,6 @@
 #include "cru/win/string.hpp"
 
 #include <array>
-#include <cassert>
 #include <utility>
 
 namespace cru::platform::graph::win::direct {
diff --git a/src/win/graph/direct/geometry.cpp b/src/win/graph/direct/geometry.cpp
index 5540edab..57b7f237 100644
--- a/src/win/graph/direct/geometry.cpp
+++ b/src/win/graph/direct/geometry.cpp
@@ -4,8 +4,6 @@
 #include "cru/win/graph/direct/exception.hpp"
 #include "cru/win/graph/direct/factory.hpp"
 
-#include <cassert>
-
 namespace cru::platform::graph::win::direct {
 D2DGeometryBuilder::D2DGeometryBuilder(DirectGraphFactory* factory)
     : DirectGraphResource(factory) {
diff --git a/src/win/graph/direct/painter.cpp b/src/win/graph/direct/painter.cpp
index fb2a6e7f..c5150ad4 100644
--- a/src/win/graph/direct/painter.cpp
+++ b/src/win/graph/direct/painter.cpp
@@ -7,12 +7,11 @@
 #include "cru/win/graph/direct/geometry.hpp"
 #include "cru/win/graph/direct/text_layout.hpp"
 
-#include <cassert>
 #include <type_traits>
 
 namespace cru::platform::graph::win::direct {
 D2DPainter::D2DPainter(ID2D1RenderTarget* render_target) {
-  assert(render_target);
+  Expects(render_target);
   render_target_ = render_target;
 }
 
diff --git a/src/win/graph/direct/resource.cpp b/src/win/graph/direct/resource.cpp
index 2acc91e4..c2be27ed 100644
--- a/src/win/graph/direct/resource.cpp
+++ b/src/win/graph/direct/resource.cpp
@@ -2,12 +2,10 @@
 
 #include "cru/win/graph/direct/factory.hpp"
 
-#include <cassert>
-
 namespace cru::platform::graph::win::direct {
 DirectGraphResource::DirectGraphResource(DirectGraphFactory* factory)
     : factory_(factory) {
-  assert(factory);
+  Expects(factory);
 }
 
 IGraphFactory* DirectGraphResource::GetGraphFactory() { return factory_; }
diff --git a/src/win/graph/direct/text_layout.cpp b/src/win/graph/direct/text_layout.cpp
index 59101163..6a6a2c45 100644
--- a/src/win/graph/direct/text_layout.cpp
+++ b/src/win/graph/direct/text_layout.cpp
@@ -7,7 +7,6 @@
 #include "cru/win/graph/direct/font.hpp"
 #include "cru/win/string.hpp"
 
-#include <cassert>
 #include <utility>
 
 namespace cru::platform::graph::win::direct {
@@ -18,7 +17,7 @@ DWriteTextLayout::DWriteTextLayout(DirectGraphFactory* factory,
                                    std::shared_ptr<IFont> font,
                                    std::string text)
     : DirectGraphResource(factory), text_(std::move(text)) {
-  assert(font);
+  Expects(font);
   font_ = CheckPlatform<DWriteFont>(font, GetPlatformId());
 
   w_text_ = cru::platform::win::ToUtf16String(text_);