Fixing autogen'd headers