Cleaned up headers, added UIKit/Foundation imports. Fixes #1065