Revert "treewide: compilation fixups"

This reverts commit e27cd78637c4abb86d6f0f13ad321cb6c4d22628.