Move defines to THConstants.h.
Add THConstants.h to Prefic.pch.
Merge remote-tracking branch 'origin/master'
Resolve merge conflicts.