Add some includes
Add a copy of libsvg for those who don't have it
Add more needed headers
Remove unused variables