remove more global variables from header files