Revert #defines in header files

These changes in the meterpreter source weren't necessary, so this
revert keeps them inline with upstream.