Revert "Add required header #include to fix 'make checkheaders'."