core: resolve file InstrumentTypes.h
This file bundles forward class declarations and type definitions that are needed in quite different places. Move them to where they are needed.
This file bundles forward class declarations and type definitions that are needed in quite different places. Move them to where they are needed.