Update .gitignore
Use guint consistently
Add missing include
Reinstate gtk2 support