diff --git a/include/command.h b/include/command.h
index 3aca1a9..b938431 100644
--- a/include/command.h
+++ b/include/command.h
@@ -25,10 +25,7 @@
 
 #include <linux/list.h>
 #include <linux/stringify.h>
-
-#ifndef NULL
-#define NULL	0
-#endif
+#include <linux/stddef.h>
 
 #ifndef	__ASSEMBLY__
 
diff --git a/lib/bzlib_private.h b/lib/bzlib_private.h
index 87d8f94..de10dd4 100644
--- a/lib/bzlib_private.h
+++ b/lib/bzlib_private.h
@@ -67,6 +67,7 @@
 #define _BZLIB_PRIVATE_H
 
 #include <malloc.h>
+#include <linux/stddef.h>
 
 #include "bzlib.h"
 
@@ -515,16 +516,6 @@
 
 #endif
 
-
-/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/
-
-#ifdef BZ_NO_STDIO
-#ifndef NULL
-#define NULL 0
-#endif
-#endif
-
-
 /*-------------------------------------------------------------*/
 /*--- end                                   bzlib_private.h ---*/
 /*-------------------------------------------------------------*/