header ext change/cmake updates