Handle more plugin header file formats

Signed-off-by: Sudar <sudar@sudarmuthu.com>