Enhancements to the Win32 API definition macros.
Revise the amalgamation tool to allow 'duplicate' include files to be retained manually while still preserving the existing line numbers.