Work around an Automake bug.
Remove a few unused includes.

This prevented building for Win32.