Modifications to compile natively on Saucy (13.10)

Small changes to included files. Moved some includes from headers to .cpp.