am d6c3ae63: Merge "Clean up frontend.h includes and forward declarations."

* commit 'd6c3ae638a47db3970054843d2aa2f0d961cec4c':
  Clean up frontend.h includes and forward declarations.