Miscellaneous header import and CGFloat fixes.