Fixed some more sloppiness.

Fixed various errors with class inclusion.