Index: uspace/lib/cpp/include/csetjmp
===================================================================
--- uspace/lib/cpp/include/csetjmp	(revision 7bbf91e6ed519996e55429154b0d7d21549dcf14)
+++ uspace/lib/cpp/include/csetjmp	(revision 0d2bc9d2025f178333a69f6f13a4d3ca746e4365)
@@ -32,8 +32,13 @@
 #include <__bits/common.hpp>
 
+/**
+ * TODO: Currently the <setjmp.h> header uses
+ *       _Noreturn, which is not available in C++.
+ */
+
 namespace std::hel
 {
     extern "C" {
-        #include <setjmp.h>
+        //#include <setjmp.h>
     }
 }
@@ -41,10 +46,10 @@
 namespace std
 {
-    using std::hel::jmp_buf;
-    using std::hel::longjmp;
+    /* using std::hel::jmp_buf; */
+    /* using std::hel::longjmp; */
 }
 
-using std::hel::jmp_buf;
-using std::hel::longjmp;
+/* using std::hel::jmp_buf; */
+/* using std::hel::longjmp; */
 
 #endif