Added includes required for compiling on ubuntu 12.10 with gcc 4.7.2
remove comment flags.
Merge pull request #1 from mtholder/master

more include statements which are required for gcc 4.7.2 on ubuntu 12.10