Merge "Rearrange header libraries"