Fix libstdc build

A few missing headers have been reintroduced

This one depends on #305