cpplint fixes in the headers