Fix public header issue