added public header support