Merge "Fixed to #include correct 32-bit headers"