Public headers should not have any internal references
Merge pull request #634 from jin-eld/fix-public-headers

Public headers should not have any internal references