Fixed some includes that were missing without libstdc++