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

This reverts commit 2f1884f564559e4d94411e4d203de90521d2204f.