[cvs-nhc98] patch applied (hat): Fix bit-rot compilation errors (due to changes in supporting libraries).