Get rid of unneeded header files