Fixes #10520 in Boost Trac
Removed some unused preprocessor includes