Add missing hearders

Add missing headers that are needed to build the code with gcc-4.9 on Linux.