While here: - Use our system malloc instead of the bundle one - Avoid the dependency on sysinfo with a simple patch - fix some header issues