Cleanup of header file sepeartion