Fix another header, use typedef'd types, fill out return types for a few SBIconModel methods