Normalize some enumerations.

This change pulls a few enumeration types to the top of their header
file alongside other types.  It also eliminates the use of the now
redundant enum qualifier.

Change-Id: I6f853bed09176cde9a83faccea7a76f595f60f2b
4 files changed