This reverts commit bb9c3118ed, reversing changes made to 7015d84e0c. This is missing quite a few headers
bb9c3118ed
7015d84e0c