Merge pull request #926 from rouault/reformat_h_files