Cleanup main includes
Make compatible with 2.0
Merge remote-tracking branch 'origin/master'