MACRO and other problems on porting to w32api headers