fixed Makefile dependencies; fixed a missing Win32 change.