Adjust autogen headers for Clownfish changes