A few compiling issues

I had a few issues compiling, and these commits fix them. I'm not sure if perhaps there was an issue on my end with GEANT versions w.r.t. -Werror (I used 4.9.6.p03), so maybe someone can confirm.
I got an error that the file could not be found, and deleting this include seemed to fix the build so I didn't check further. I'm using ROOT v5-34-18