Remove unnecessary includes and declarations
Merge branch 'master' into gh-pages