Added some missing macro definitions.