avoids forward referenced enums, and includes standard type defns Signed-off-by: Khazhismel Kumykov <khazhy@google.com>