Remove replaced file (dead coed), fix definitions for non-windows.