Resolve some warnings from clang

These are simple fixes for some warnings generated by the clang compiler. Mostly just parentheses and two cases of forgotten header files.