I was able to fix this after more investigation. The undef/define did work, but I was missing the fact that SteamVR was also pulling the steam headers.
I submitted a pull request to make needed changes to the PCH headers for 4.7
edit: https://github.com/EpicGames/UnrealEngine/pull/819 (forgot to branch and had made some version changes that weren’t intended)