fixes for includes and removed boost_regex depend