Made a couple header files public