Adding mutex/conditions (for sync package) and a few std::