Remove duplicated contents, either a patch bug or PEBKAC.
Move the 10 (!) defintions of NULL to their own mini header file andupdate the NULL definition for C++11. OK deraadt@ guenther@ kettenis@