polish header files
update logics of parsing path