Add missing headers.
Remove useless comments.
Update (DefaultSpearalFactory).