[cleanup] Fix two headers where we included a standard library header
after including the generated code from tablegen.