clean up mpl_utils.hpp includes and defs