Log Message:
Remove a number of spurious semicolons, rename a variable shadowing
itself and fix include of fnmatch.h, which can be obtained from
Heimdal. The latter can go away after the branch, when Heimdal itself
is fixed.