We should import them just like any other module. This commit makes that change. It does not change any behaviours or the types themselves. EXPECTED_PROTOCOL_DIFF as we're updating the structure of it.