Fix build on Windows.
Attempt to fix Borland.
Merge topic 'minor-cleanups' into next

ead3919 Attempt to fix Borland.
29e1f06 Fix build on Windows.