Fixed up exposing headers