Updated to omit the #define for functions we are just wrapping