Added includes required for compiling on ubuntu 12.10 with gcc 4.7.2