Index: /trunk/include/iprt/cdefs.h
===================================================================
--- /trunk/include/iprt/cdefs.h	(revision 40944)
+++ /trunk/include/iprt/cdefs.h	(revision 40945)
@@ -1811,16 +1811,4 @@
 #endif
 
-
-/** @def NULL
- * NULL pointer.
- */
-#ifndef NULL
-# ifdef __cplusplus
-#  define NULL 0
-# else
-#  define NULL ((void*)0)
-# endif
-#endif
-
 /** @def NIL_OFFSET
  * NIL offset.
Index: /trunk/include/iprt/types.h
===================================================================
--- /trunk/include/iprt/types.h	(revision 40944)
+++ /trunk/include/iprt/types.h	(revision 40945)
@@ -133,9 +133,4 @@
      */
 #  undef NULL
-#  if defined(__cplusplus)
-#   define NULL 0
-#  else
-#   define NULL ((void *)0)
-#  endif
 #  undef uintptr_t
 #  ifdef __GNUC__
@@ -159,4 +154,15 @@
 #  include <sys/types.h>
 # endif
+
+/** @def NULL
+ * NULL pointer.
+ */
+#ifndef NULL
+# ifdef __cplusplus
+#  define NULL 0
+# else
+#  define NULL ((void*)0)
+# endif
+#endif
 
 /* Define any types missing from sys/types.h on windows. */