Merge "Fix headers to be inclued alone"