Fix dependency on swapcoords enums

state.h needs these enums, but it seems wrong to introduce
a header dependency on the whole enums.h, when so few places need
these enums at all.

Change-Id: Ia8f080d5c0dc73b19a54f5ff77fbf7ef76f16139