fix Windows-ism path
fix include case and remove windows.h
not-so-good improvements