Merge "Remove useless forward declarations."