Now all forward declarations/#includes are fixed.