Merge pull request #1466 from rubenk/write_riemann-remove-unneeded-include