clean up include files

- added missing imports
- added missing top level {} blocks (Y2R compatibility)
- 2.24.0