Changes to includes

Literally forgot all about circular dependencies so I fixed them blah
blah blah