more ibrowse related header fixes