Recreated patch for ozw_types.h due to failure