Comment 7 for bug 195220

After consulting some documentation I think that replaceArgs is necessary only if the filename supplied on the command line is not representable in the system character encoding, which is a pathological situation anyway. Otherwise, handing argc and argv to GOption should be OK.

The new patch fixes a typo that would cause a compilation error on Windows and cleans up some unnecessary includes.