add typedefs etc
Merge branch 'master' of github.com:jackbackrack/gui