General rule: Include C headers, import Objective-C headers.
Merge branch 'master' into imageRep