Move typedefs from XiEstimator header to types header