Move usage of iconh into the branch that assigns it