Do not use angle brace notation when including local headers
Adding missing include statement
Breaking up circular dependency
Fixing tabbing