Actually remove definitions of DEFINE_NON_INLINE_P and DEFINE_INLINE_P