add missing macros and declarations