Fix missing imports and @global and @class
Add other missing imports