Various Makefile and Windows project/workspace file updates.