But luckily the US is changing that by re-defining who is or is not a civilian.

Last I checked the official stance was that any able-bodied adult or adolescent male in a war zone is considered an enemy combatant in official statistics.