Revert "Remove non-portable and unnused header includes"

This reverts commit 7ef79d3f4b02e3d2e71d6888fbedd9b3f9c325c7.