move imports/includes (to make YCP -> Ruby translation easier)

- 2.24.0