update type_utils includes, closes #1