Null headers

Hi there, i forked and have this compilation problem that I corrected. Mind pulling this into your null-headers branch?