some changes were ommited from svn Export/Import (likely last few patches v 220+). This should repair the issues with building