Merged many headers into more general ones.