Some tweaks to module inclusions.
Merge branch 'master' of github.com:setdirection/ios-shared