Add missing imports to make gcc from trunk happy.