Fixup declaration file