Remove unnecessary #include
Kill some warnings

A couple warnings about reordering and unused variables. Make them go
away.