headers-and-namespaces.diff
