This change might cause ABI breakages for /opt/cosmos. It's needed to help us better conform to header declaration practices.