Made includes recursive

Also adjusted the macro define regex to allow whitespace after the comma (only in the definition, not invokation.