Bring the windows config file in line with the simplifications of the main httpd.conf. Make a vain attempt to modify Makefile.win appropriately.