Merge headers

Merge related files into one