Fixed some warnings

I fixed some warnings from the compiler. I also reordered include files so system includes are after the "class" include. This to avoid include soup