Revert "Remove several unused forward declarations. Fixes PR22605."

This is being resubmitted as it was accidentally dropped in the merge.

GCC fails to compile the following pattern with this patch:

    #include <set>
    std::set<int> foo;
    #include <map>
    using namespace std;
    std::map<int, int> bar;

It looks like a GCC bug, but there is some external code that trips
this issue that I'd rather leave unmodified.

This reverts commit 59f573f670a4ff53919fcdfc2f40725723eb2c04.

Bug: http://b/19606303
Change-Id: I02270c28220578f432a201e1d2cbeefc537e9e25
3 files changed