cleaning up includes and adding include for boost/bind.hpp