- Add more and organize forward declarations (preparing for splitting up this file)