This reverts commit ce4ce6ce36925f154f3ad84983327d76d6e690c1.
This reverts commit 3ca4973ea7062a3afa9ce90804ccb5206fce52ce.
An attempt to fix headers so outdated they no longer compiled.