Commit df172ba4aaeb2e05e6909a463f41a7ea907cdf2a

henry 2001-10-10T22:03:16

Minor changes, mainly to includes, for the windows port