Removing using statements from header file