switch to using header files