The only thing from AP_Progmem that's still used are the pgm_read_* function and there's no support for AVR anymore. So remove the dead code and use a single header to contain that inline functions.
Lucas De Marchi