new style includes
Merge branch 'master' of github.com:thinkers/ts