Add missing headers needed to build with g++ 4