Switch include of meas_base typedefs to a file we're not removing.

Results.h is being removed on issue DM-1468, but the typedefs we need have
already been moved to constants.h, which will be staying.
Merge branch 'u/jbosch/DM-1468'