Make more headers public