Reduced inclusions of alt.hpp further.