Index: uspace/lib/cpp/include/cassert
===================================================================
--- uspace/lib/cpp/include/cassert	(revision de531389c322cef1786b1778fe09191b13780aab)
+++ uspace/lib/cpp/include/cassert	(revision 323ae8055d3fba3ff947e7bdc53fe86a2825fd4f)
@@ -45,3 +45,15 @@
 }
 
+/**
+ * We need to fix the assert macro because it uses
+ * a non-standard function that we have in the
+ * std::hel namespace.
+ */
+#undef assert
+#define assert(expr) \
+	do { \
+		if (!(expr)) \
+			std::hel::assert_abort(#expr, __FILE__, __LINE__); \
+	} while (0)
+
 #endif