Add missing headers for GCC 4.4

Review 1265 by @srh