Some forwards and includes added.