* Rework of original patches from Niels Sascha Reedijk
  that include style and build fixes for libc master