XCode build
Eclipse build; expanded imports; qualified constants