added explicit includes for NULL-pointer