fix imports and macros for use on MAC
Merge branch 'jerry_fix'