Merge "Add missing headers for compilation on x86 targets"