diff --git a/include/vk.h b/include/vk.h
index 475c6c394..8144a5e57 100644
--- a/include/vk.h
+++ b/include/vk.h
@@ -8,6 +8,10 @@
 
 #if defined(HAVE_VULKAN)
 
+// We undefined NDEBUG for common.h, but some files
+// do not use common.h, causing includes
+// to be a mix of NDEBUG-ed vulkan header and those without
+#undef NDEBUG
 #define VK_ENABLE_BETA_EXTENSIONS
 
 #if defined(_WIN32)
diff --git a/include/vkutils.h b/include/vkutils.h
index ce3ba756e..7e205b354 100644
--- a/include/vkutils.h
+++ b/include/vkutils.h
@@ -2,6 +2,10 @@
 
 #if defined(HAVE_VULKAN)
 
+// We undefined NDEBUG for common.h, but some files
+// do not use common.h, causing includes
+// to be a mix of NDEBUG-ed vulkan header and those without
+#undef NDEBUG
 #include <vulkan/vulkan.hpp>
 
 namespace camp
@@ -15,4 +19,4 @@ void checkVkResult(vk::Result const& result);
 
 }
 }
-#endif
\ No newline at end of file
+#endif