Improvements to Makefile; fixed inconsistencies in includes
Worked on Windows linking issues
Merge.