You've added these two includes ( rilmodem.h and vendor.h ), but didn't make the same change to ril.c.  As there's so much duplicate code, we should strive to keep these as much in sync as possible.