New compilers and updated includes
Reverted the revert. Idk either.