The IMF recently published a working paper[1] on energy subsidies at global and regional levels that might be of interest. They do use an fairly broad definition of what counts as a subsidy (including cost of damages environmental damages and global warming effect of CO2 emissions).

[1] http://www.imf.org/external/pubs/cat/longres.aspx?sk=42940.0