Made types.hpp arch-independent