Deleted unused include + fixed aliasing warnings