Update notes for submitted changes

* Fix some #include problems.