[PATCH 0/2] use libosmogsm and new header file paths