I suggest we try, as much as possible to focus our work on browser.c/h and not altering the code of any other file. This way, we can work in a specific branch and have a specific architecture in the file that will merge more efficiently. Then, when we merge, we can split the content of the file into many smaller files if that is relevant, of course.
Yes, or a separate file completely. New file, new history.