Fix build with Linaro Toolchain

Hey Kris!

I came across some errors when I tried to build with the Linaro Toolchain (4.6.4).
After I did some research, I found that the problems were inside an include header, this commit should correct the errors.

Erik