Move type traits to the correct header.