re-order includes in preprocessor/make.hpp