It seemed cleaner to me to do it with a separate header, because it enforces the requirement that our builtin DSM is 1.x and uses no 2.x features. But I can do it the other way if you prefer.