Separating wornitems and corpses from containers

I created new headers to see if we can reduce the include hell that
we're in.