Add missing includes
Update Makefile
Merge branch 'master' into debian
debian packaging: upgrade compat, Standards-Version
Update Debian packaging for 0.2-1 release