Fix includes for file renames
Make room in directive for trailing NULL