Moved things around so that includes are cleaner