Merge "Clean up frontend.h includes and forward declarations."