My previous patch to only include what we use accidentially placed the added inlcudes in non-sorted order.
This is a cleaned up result of running iwyu but without forward declarations on src/basic.