Reorganized includes in type.hpp