Make modular header private header access consistent

(cherry picked from commit 56231f98)

# Conflicts:
#	spec/cocoapods-integration-specs