More header fixes for gcc 4.8