Add includes for NULL.
Remove debug message.