clean up a lot of th header files