Index: uspace/lib/cpp/include/internal/common.hpp
===================================================================
--- uspace/lib/cpp/include/internal/common.hpp	(revision 7a7ecbd3a5e5f44ea57d819786237449a8ee4fbb)
+++ uspace/lib/cpp/include/internal/common.hpp	(revision 0564a02eb4ba1d23bbdd0040a31077f926e58fba)
@@ -17,3 +17,6 @@
 #define restrict __restrict__
 
+#undef NULL
+#define NULL nullptr
+
 #endif