Missing headers under Ubuntu 12.04 (GCC 4.6.3).
Merge branch 'linux-missing-headers'