diff --git a/device.cpp b/device.cpp
index 34c60c3..cbd6846 100644
--- a/device.cpp
+++ b/device.cpp
@@ -13,7 +13,7 @@
 #include "./queue.hpp"
 
 #include <cruft/util/cast.hpp>
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 
 using cruft::vk::device;
 
diff --git a/except.cpp b/except.cpp
index 72e4b0c..e170342 100644
--- a/except.cpp
+++ b/except.cpp
@@ -9,7 +9,7 @@
 
 #include "./except.hpp"
 
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/panic.hpp>
 #include <cruft/util/preprocessor.hpp>
 
 using cruft::vk::error;
diff --git a/except.hpp b/except.hpp
index 604cdb3..555446c 100644
--- a/except.hpp
+++ b/except.hpp
@@ -12,7 +12,7 @@
 
 #include "./vk.hpp"
 
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 #include <cruft/util/types/traits.hpp>
 
 #include <exception>
diff --git a/fence.cpp b/fence.cpp
index d292554..1b4e34d 100644
--- a/fence.cpp
+++ b/fence.cpp
@@ -12,7 +12,7 @@
 #include "./device.hpp"
 
 #include <cruft/util/cast.hpp>
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 
 using cruft::vk::fence;
 
diff --git a/object.cpp b/object.cpp
index c5c7475..0915780 100644
--- a/object.cpp
+++ b/object.cpp
@@ -13,12 +13,11 @@
 
 #include "./physical_device.hpp"
 
-#include <cruft/util/debug.hpp>
-
 using cruft::vk::object;
 using cruft::vk::enumerated;
 
 
+///////////////////////////////////////////////////////////////////////////////
 #define OBJECT(T) template struct cruft::vk::object<cruft::vk::T>;
 VK_TYPE_MAP (OBJECT)
 
diff --git a/tools/spec.py b/tools/spec.py
index 4313b30..19b49ca 100644
--- a/tools/spec.py
+++ b/tools/spec.py
@@ -848,9 +848,9 @@ def write_dispatch(dst: TextIO, q: List[Type], reg: Registry):
     #include <cruft/vk/vk.hpp>
     #include <cruft/vk/load/vtable.hpp>
     #include <cruft/vk/load/dispatch.hpp>
-
-    #include <cruft/util/debug.hpp>
     
+    #include <cruft/util/debug/panic.hpp>
+
     #include <cstring>
     #include <iostream>