Added a few module imports to ios-shared.h, and a little cleanup.