Merge "Re-unite sources with their headers"