Enhanced Windows XP and Makefile support