bridge-utils: Cleanup and add patch to correct for broken headers