winhack.h is not being used anywhere now and can safely be deleted. There 2 instances of this file: sys\wince\winhack.h win\win32\winhack.h The patch is also attached that adjusts for this.