The plans should show the boundries of the bedroom "area."

I would make the closet as "not part of the bedroom area." That should make the issue clear for the AHJ.