Fix some padding and inclusions in iOS7.