Somehow missed in my bulk, grab a patch from ubuntu and remove a duplicated weird typedef. build failure reported by naddy@