diff --git a/software/include/base/stddef.h b/software/include/base/stddef.h
index 331f39e7c..6f00c4fa7 100644
--- a/software/include/base/stddef.h
+++ b/software/include/base/stddef.h
@@ -1,7 +1,11 @@
 #ifndef __STDDEF_H
 #define __STDDEF_H
 
+#ifdef __cplusplus
+#define NULL 0
+#else
 #define NULL ((void *)0)
+#endif
 
 typedef unsigned long size_t;
 typedef long ptrdiff_t;