stm: Remove unnecessary #includes; small other changes.