Add boost support, and header fix