Make the CBSE header usage work with the latest version