Fixed the circular include problem and now successfully compiles.
Merge remote-tracking branch 'origin/master'