Ensure files with no common content are aligned

Ensure files with no common content are aligned #3206