header fixes for cpp