Merge "Fix headers to be included alone"