Add missing Makefile.in changes / Windows support for changes