Partially reverting 2a0573103d17120769cfee3371e4c75b93ccb321
"Revert "Set Intel related Boost.Config macro back to CMake, fix order of includes issue""