added macros/typedefs