Corrections made get the library building under Windows.