add missing std includes
s/NULL/0/ in non-pointer context